X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d07d2bc9d05408c58b76c53a0a291915b88e5064..84f85550e5e9f026d8518244cc47227e3e428a0f:/wxPython/src/_control.i

diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i
index f681865741..c89a9ecb89 100644
--- a/wxPython/src/_control.i
+++ b/wxPython/src/_control.i
@@ -27,15 +27,18 @@ DocStr(wxControl,
 A control is generally a small window which processes user input
 and/or displays one or more item of data.", "");
 
+MustHaveApp(wxControl);
+
 class wxControl : public wxWindow
 {
 public:
     %pythonAppend wxControl         "self._setOORInfo(self)"
     %pythonAppend wxControl()       ""
+    %typemap(out) wxControl*;    // turn off this typemap
 
     DocCtorStr(
         wxControl(wxWindow *parent,
-              wxWindowID id,
+              wxWindowID id=-1,
               const wxPoint& pos=wxDefaultPosition,
               const wxSize& size=wxDefaultSize,
               long style=0,
@@ -49,9 +52,13 @@ __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,
+                      wxWindowID id=-1,
                       const wxPoint& pos=wxDefaultPosition,
                       const wxSize& size=wxDefaultSize,
                       long style=0,
@@ -75,6 +82,20 @@ __init__ as a plain old wx.Control is not very useful.", "");
         void , SetLabel(const wxString& label),
         "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(
+//         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);
@@ -121,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.", "",