2008-01-17 Igor Zelmanovich <igorz@mainsoft.com>

	* HtmlSelect.cs: refactoring.

svn path=/trunk/mcs/; revision=93138

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
index 72a5b1b31c27310e631140a97ce51cb1b9354c13..c160621dfeba003a4b66493a46b7f0ec38eab13f 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-17 Igor Zelmanovich  <igorz@mainsoft.com>
+
+       * HtmlSelect.cs: refactoring. 
+
 2008-01-17 Igor Zelmanovich  <igorz@mainsoft.com>
 
        * HtmlSelect.cs: fix databinding (only 2.0), state management. 

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs
index 0fa24df6e45b714ae17a94b509323aae0eae3e40..8d5b136c7d1220d04c4e3c7e5f89f7fdf040e3a8 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs
@@ -752,17 +752,17 @@ namespace System.Web.UI.HtmlControls
                }
 
 #if NET_2_0
-               protected virtual bool LoadPostData (string postDataKey, NameValueCollection postCollection)
-               {
-                       return DefaultLoadPostData (postDataKey, postCollection);
-               }
-
-               protected virtual void RaisePostDataChangedEvent ()
+               protected virtual
+#endif
+               void RaisePostDataChangedEvent ()
                {
                        OnServerChange (EventArgs.Empty);
                }
+
+#if NET_2_0
+               protected virtual
 #endif
-               bool DefaultLoadPostData (string postDataKey, NameValueCollection postCollection)
+               bool LoadPostData (string postDataKey, NameValueCollection postCollection)
                {
                        /* postCollection contains the values that are
                         * selected
@@ -811,20 +811,12 @@ namespace System.Web.UI.HtmlControls
 
                bool IPostBackDataHandler.LoadPostData (string postDataKey, NameValueCollection postCollection)
                {
-#if NET_2_0
                        return LoadPostData (postDataKey, postCollection);
-#else
-                       return DefaultLoadPostData (postDataKey, postCollection);
-#endif
                }
 
                void IPostBackDataHandler.RaisePostDataChangedEvent ()
                {
-#if NET_2_0
                        RaisePostDataChangedEvent ();
-#else
-                       OnServerChange (EventArgs.Empty);
-#endif
                }
        }
 }