wxSystemSettings::GetMetric returns -1 if the metric is not supported

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

diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i
index 8860f56552d91b99a9cecd4cdff2a6bf777d7666..c89a9ecb89e26643204050a0711edea3c148eac4 100644 (file)
--- 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()       ""
 public:
     %pythonAppend wxControl         "self._setOORInfo(self)"
     %pythonAppend wxControl()       ""

+    %typemap(out) wxControl*;    // turn off this typemap

 
     DocCtorStr(
         wxControl(wxWindow *parent,
 
     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);
 
         "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,
     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.", "");
 
 
         "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);
     
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);


@@ -137,8 +142,9 @@ has wx.LB_SORT or wx.CB_SORT style).", "");
         }
     }
     
         }
     }
     

-    DocDeclStrName(
+    DocDeclAStrName(

         void , Append(const wxArrayString& strings),
         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.", "",
         "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.", "",