X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe161a2685012cf90bb5bfe95f2260aee71d8ad7..6bda7508c6e41365b69fdf690b3070991098a7af:/wxPython/src/_control.i

diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i
index 8860f56552..be2565fa70 100644
--- a/wxPython/src/_control.i
+++ b/wxPython/src/_control.i
@@ -34,6 +34,7 @@ class wxControl : public wxWindow
 public:
     %pythonAppend wxControl         "self._setOORInfo(self)"
     %pythonAppend wxControl()       ""
+    %typemap(out) wxControl*;    // turn off this typemap
 
     DocCtorStr(
         wxControl(wxWindow *parent,
@@ -51,6 +52,10 @@ __init__ as a plain old wx.Control is not very useful.", "");
         "Precreate a Control control for 2-phase creation", "",
         PreControl);
 
+    // Turn it back on again
+    %typemap(out) wxControl* { $result = wxPyMake_wxObject($1, $owner); }
+
+
     DocDeclStr(
         bool , Create(wxWindow *parent,
                       wxWindowID id=-1,
@@ -78,19 +83,19 @@ __init__ as a plain old wx.Control is not very useful.", "");
         "Sets the item's text.", "");
 
 
-    DocDeclStr(
-        bool , GetAdjustMinSizeFlag(),
-        "Returns whether the minsize should be adjusted for this control when
-`SetLabel` or `SetFont` are called.", "");
+//     DocDeclStr(
+//         bool , GetAdjustMinSizeFlag(),
+//         "Returns whether the minsize should be adjusted for this control when
+// `SetLabel` or `SetFont` are called.", "");
     
-    DocDeclStr(
-        void , SetAdjustMinSizeFlag(bool adjust),
-        "By default controls will readjust their size and minsize when
-`SetLabel` or `SetFont` are called.  This flag will allow you to
-control this behavior.", "
-
-:see: `GetAdjustMinSizeFlag`
-");
+//     DocDeclStr(
+//         void , SetAdjustMinSizeFlag(bool adjust),
+//         "By default controls will readjust their size and minsize when
+// `SetLabel` or `SetFont` are called.  This flag will allow you to
+// control this behavior.", "
+
+// :see: `GetAdjustMinSizeFlag`
+// ");
     
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
@@ -119,7 +124,7 @@ optionally, client data associated with them.
 class wxItemContainer
 {
 public:
-    // wxItemContainer() { m_clientDataItemsType = wxClientData_None; }  ** It's an ABC
+    // wxItemContainer()  ** It's an ABC
     
 
     %extend {
@@ -137,8 +142,9 @@ has wx.LB_SORT or wx.CB_SORT style).", "");
         }
     }
     
-    DocDeclStrName(
+    DocDeclAStrName(
         void , Append(const wxArrayString& strings),
+        "AppendItems(self, List strings)",
         "Apend several items at once to the control.  Notice that calling this
 method may be much faster than appending the items one by one if you
 need to add a lot of items.", "",