Factory some of wxFilterClassFactory into a base class.

[wxWidgets.git] / wxPython / src / _control.i

diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i
index 10b7b43f45ec73a79d5a464177361387f1f07b54..94b33f048a1793ad37785f9217fd37937f9884cb 100644 (file)
--- a/wxPython/src/_control.i
+++ b/wxPython/src/_control.i
@@ -72,11 +72,6 @@ __init__ as a plain old wx.Control is not very useful.", "");
         "Get the control alignment (left/right/centre, top/bottom/centre)", "");
     
 
         "Get the control alignment (left/right/centre, top/bottom/centre)", "");
     
 

-//     DocDeclStr(
-//         static wxString , GetLabelText(const wxString& label),
-//         "Get the string without mnemonic characters ('&')", "");
-    
-

     DocDeclStr(
         wxString , GetLabelText() const,
         "Get just the text of the label, without mnemonic characters ('&')", "");
     DocDeclStr(
         wxString , GetLabelText() const,
         "Get just the text of the label, without mnemonic characters ('&')", "");


@@ -90,14 +85,6 @@ __init__ as a plain old wx.Control is not very useful.", "");
 :see: `wx.CommandEvent`
 ", "");
    
 :see: `wx.CommandEvent`
 ", "");
    

-    DocDeclStr(
-        wxString , GetLabel(),
-        "Return a control's text.", "");
-    
-    DocDeclStr(
-        void , SetLabel(const wxString& label),
-        "Sets the item's text.", "");
-

 
 //     DocDeclStr(
 //         bool , GetAdjustMinSizeFlag(),
 
 //     DocDeclStr(
 //         bool , GetAdjustMinSizeFlag(),


@@ -117,7 +104,6 @@ __init__ as a plain old wx.Control is not very useful.", "");
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     %property(Alignment, GetAlignment, doc="See `GetAlignment`");
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     %property(Alignment, GetAlignment, doc="See `GetAlignment`");

-    %property(Label, GetLabel, doc="See `GetLabel`");

     %property(LabelText, GetLabelText, doc="See `GetLabelText`");
 
 };
     %property(LabelText, GetLabelText, doc="See `GetLabelText`");
 
 };


@@ -288,7 +274,12 @@ slightly more natural for controls which support multiple selection.", "");
             for i in items:
                 self.Append(i)        
     }
             for i in items:
                 self.Append(i)        
     }

-    %property(Items, GetItems, SetItems);
+    
+    %property(Count, GetCount, doc="See `GetCount`");
+    %property(Items, GetItems, SetItems, doc="See `GetItems` and `SetItems`");
+    %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`");
+    %property(StringSelection, GetStringSelection, SetStringSelection, doc="See `GetStringSelection` and `SetStringSelection`");
+    %property(Strings, GetStrings, doc="See `GetStrings`");

     
 };
 
     
 };