Merge pull request #4045 from lambdageek/bug-47867

[mono.git] / mcs / class / System.Design / System.Web.UI.Design.WebControls / ListControlDesigner.cs

diff --git a/mcs/class/System.Design/System.Web.UI.Design.WebControls/ListControlDesigner.cs b/mcs/class/System.Design/System.Web.UI.Design.WebControls/ListControlDesigner.cs
index 4958805fda21027ce104d91dbc02283fc099c93c..00a2a297af04e02b0b04e3a5f486dd9d75fd0595 100644 (file)
--- a/mcs/class/System.Design/System.Web.UI.Design.WebControls/ListControlDesigner.cs
+++ b/mcs/class/System.Design/System.Web.UI.Design.WebControls/ListControlDesigner.cs
@@ -34,16 +34,9 @@ using System.Windows.Forms.Design;
 
 namespace System.Web.UI.Design.WebControls {
 
-       public class ListControlDesigner :
-#if NET_2_0
-       DataBoundControlDesigner
-#else
-       ControlDesigner,
-       IDataSourceProvider
-#endif
+       public class ListControlDesigner : DataBoundControlDesigner
        {
                string data_key_field;
-               string data_member;
                string data_text_field;
                string data_value_field;
                
@@ -52,7 +45,6 @@ namespace System.Web.UI.Design.WebControls {
                {
                }
 
-#if NET_2_0
                public override DesignerActionListCollection ActionLists {
                        get { throw new NotImplementedException (); }
                }
@@ -61,20 +53,11 @@ namespace System.Web.UI.Design.WebControls {
                        get { throw new NotImplementedException (); }
                }
 
-               public string DataSource {
-                       get; set;
-               }
-#endif
                public string DataKeyField {
                        get { return data_key_field; }
                        set { data_key_field = value; }
                }
 
-               public string DataMember {
-                       get { return data_member; }
-                       set { data_member = value; }
-               }
-
                public string DataTextField {
                        get { return data_text_field; }
                        set { data_text_field = value; }
@@ -85,7 +68,6 @@ namespace System.Web.UI.Design.WebControls {
                        set { data_value_field = value; }
                }
 
-#if NET_2_0
                protected override void DataBind (BaseDataBoundControl dataBoundControl)
                {
                        throw new NotImplementedException ();
@@ -95,7 +77,6 @@ namespace System.Web.UI.Design.WebControls {
                {
                        throw new NotImplementedException ();
                }
-#endif
                
                public override string GetDesignTimeHtml ()
                {