X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/705b61cce0e6c2167d7457c7c2b633688e9c67b6..ae5aafdc71da118d56fcd9f2d9252e94acb8d05c:/wxPython/src/_window.i

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index f30260b297..be6b0561d0 100644
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -199,6 +199,7 @@ class wxWindow : public wxEvtHandler
 public:
     %pythonAppend wxWindow         "self._setOORInfo(self)"
     %pythonAppend wxWindow()       ""
+    %typemap(out) wxWindow*;    // turn off this typemap
 
     DocCtorStr(
         wxWindow(wxWindow* parent, const wxWindowID id=-1,
@@ -213,7 +214,10 @@ public:
         "Precreate a Window for 2-phase creation.", "",
         PreWindow);
     
+    // Turn it back on again
+    %typemap(out) wxWindow* { $result = wxPyMake_wxObject($1, $owner); }
 
+    
     DocDeclStr(
         bool , Create(wxWindow* parent, const wxWindowID id=-1,
                 const wxPoint& pos = wxDefaultPosition,
@@ -584,7 +588,6 @@ anything if there are no subwindows.", "");
     
 
     
-    %nokwargs SetSizeHints;
     DocStr(SetSizeHints,
         "Allows specification of minimum and maximum window sizes, and window
 size increments. If a pair of values is not set (or set to -1), the
@@ -597,24 +600,25 @@ The resizing increments are only significant under Motif or Xt.", "
 
 :see: `GetMinSize`, `GetMaxSize`, `SetMinSize`, `SetMaxSize`
 ");
-    void SetSizeHints( const wxSize& minSize,
-                       const wxSize& maxSize=wxDefaultSize,
-                       const wxSize& incSize=wxDefaultSize);
     virtual void SetSizeHints( int minW, int minH,
                                int maxW = -1, int maxH = -1,
                                int incW = -1, int incH = -1 );
+    %name(SetSizeHintsSz) void SetSizeHints( const wxSize& minSize,
+                                             const wxSize& maxSize=wxDefaultSize,
+                                             const wxSize& incSize=wxDefaultSize);
 
     
-    %nokwargs SetVirtualSizeHints;
     DocStr(SetVirtualSizeHints,
         "Allows specification of minimum and maximum virtual window sizes. If a
 pair of values is not set (or set to -1), the default values will be
 used.  If this function is called, the user will not be able to size
 the virtual area of the window outside the given bounds.", "");
-    void SetVirtualSizeHints( const wxSize& minSize,
-                              const wxSize& maxSize=wxDefaultSize);
     virtual void SetVirtualSizeHints( int minW, int minH,
                                       int maxW = -1, int maxH = -1 );
+    %name(SetVirtualSizeHintsSz)void SetVirtualSizeHints(
+        const wxSize& minSize, const wxSize& maxSize=wxDefaultSize);
+
+
     
     DocDeclStr(
         virtual wxSize , GetMaxSize() const,
@@ -857,14 +861,14 @@ by pressing <Enter> such as the OK button on a wx.Dialog.", "");
         "Does keyboard navigation from this window to another, by sending a
 `wx.NavigationKeyEvent`.", "
  
-    :param flags: A combination of the ``IsForward`` and ``WinChange``
-        values in the `wx.NavigationKeyEvent` class, which determine
-        if the navigation should be in forward or reverse order, and
-        if it should be able to cross parent window boundaries, such
-        as between notebook pages or MDI child frames.  Typically the
-        status of the Shift key (for forward or reverse) or the
-        Control key (for WinChange) would be used to determine how to
-        set the flags.
+    :param flags: A combination of the ``IsForward`` or ``IsBackward``
+        and the ``WinChange`` values in the `wx.NavigationKeyEvent`
+        class, which determine if the navigation should be in forward
+        or reverse order, and if it should be able to cross parent
+        window boundaries, such as between notebook pages or MDI child
+        frames.  Typically the status of the Shift key (for forward or
+        backward) or the Control key (for WinChange) would be used to
+        determine how to set the flags.
 
 One situation in which you may wish to call this method is from a text
 control custom keypress handler to do the default navigation behaviour