Don't override the Label property in the base class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i
index d755d752702c2d5dd6031c6a412e4323210b819b..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`");
 
 };