Added autoconf makefiles for FoldBar extended samples

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

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index af73418c9ab0d8fdbe9254568e4b609ba7bdba03..668b6d526433eec07bf06b75c37a121a4022c0a4 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -32,7 +32,7 @@ struct wxVisualAttributes
     %extend {
         wxVisualAttributes() { return new wxVisualAttributes; }
         ~wxVisualAttributes() { delete self; }
     %extend {
         wxVisualAttributes() { return new wxVisualAttributes; }
         ~wxVisualAttributes() { delete self; }

-    }
+    } 

     
     // the font used for control label/text inside it
     wxFont font;
     
     // the font used for control label/text inside it
     wxFont font;


@@ -187,12 +187,19 @@ Extra Styles
 ");
 
 
 ");
 
 

+MustHaveApp(wxWindow);
+MustHaveApp(wxWindow::FindFocus);
+MustHaveApp(wxWindow::GetCapture);
+
+// This one is not restricted to wxWindow
+MustHaveApp(GetClassDefaultAttributes);

 
 class wxWindow : public wxEvtHandler
 {
 public:
     %pythonAppend wxWindow         "self._setOORInfo(self)"
     %pythonAppend wxWindow()       ""
 
 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,
 
     DocCtorStr(
         wxWindow(wxWindow* parent, const wxWindowID id=-1,


@@ -207,7 +214,10 @@ public:
         "Precreate a Window for 2-phase creation.", "",
         PreWindow);
     
         "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,
     DocDeclStr(
         bool , Create(wxWindow* parent, const wxWindowID id=-1,
                 const wxPoint& pos = wxDefaultPosition,


@@ -222,7 +232,7 @@ public:
 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        bool , Close( bool force = False ),
+        bool , Close( bool force = false ),

         "This function simply generates a EVT_CLOSE event whose handler usually
 tries to close the window. It doesn't close the window itself,
 however.  If force is False (the default) then the window's close
         "This function simply generates a EVT_CLOSE event whose handler usually
 tries to close the window. It doesn't close the window itself,
 however.  If force is False (the default) then the window's close


@@ -379,11 +389,18 @@ autogenerated) id", "");
                         int sizeFlags = wxSIZE_AUTO ),
         "Sets the position and size of the window in pixels.  The sizeFlags
 parameter indicates the interpretation of the other params if they are
                         int sizeFlags = wxSIZE_AUTO ),
         "Sets the position and size of the window in pixels.  The sizeFlags
 parameter indicates the interpretation of the other params if they are

--1.  wx.SIZE_AUTO*: a -1 indicates that a class-specific default
-shoudl be used.  wx.SIZE_USE_EXISTING: existing dimensions should be
-used if -1 values are supplied.  wxSIZE_ALLOW_MINUS_ONE: allow
-dimensions of -1 and less to be interpreted as real dimensions, not
-default values.", "",
+equal to -1.
+
+    ========================  ======================================
+    wx.SIZE_AUTO              A -1 indicates that a class-specific
+                              default should be used.
+    wx.SIZE_USE_EXISTING      Axisting dimensions should be used if
+                              -1 values are supplied.
+    wxSIZE_ALLOW_MINUS_ONE    Allow dimensions of -1 and less to be
+                              interpreted as real dimensions, not
+                              default values.
+    ========================  ======================================
+", "",

         SetDimensions);
     
 
         SetDimensions);
     
 


@@ -411,8 +428,13 @@ default values.", "",
         "Moves the window to the given position.", "",
         MoveXY);
     
         "Moves the window to the given position.", "",
         MoveXY);
     

+    DocDeclStr(
+        void , SetBestFittingSize(const wxSize& size=wxDefaultSize),
+        "A 'Smart' SetSize that will fill in default size components with the
+window's *best size* values.  Also set's the minsize for use with sizers.", "");
+    

 
 

-
+    

     DocDeclStr(
         virtual void , Raise(),
         "Raises the window to the top of the window hierarchy if it is a
     DocDeclStr(
         virtual void , Raise(),
         "Raises the window to the top of the window hierarchy if it is a


@@ -433,8 +455,8 @@ wx.Window.SetSize, since the application need not worry about what
 dimensions the border or title bar have when trying to fit the window
 around panel items, for example.", "");
     void SetClientSize( const wxSize& size );
 dimensions the border or title bar have when trying to fit the window
 around panel items, for example.", "");
     void SetClientSize( const wxSize& size );

-    %name(SetClientSizeWH) void SetClientSize( int width, int height );
-    %name(SetClientRect) void SetClientSize(const wxRect& rect);
+    %Rename(SetClientSizeWH, void,  SetClientSize( int width, int height ));
+    %Rename(SetClientRect,  void,  SetClientSize(const wxRect& rect));

 
 
     DocStr(GetPosition,   // sets the docstring for both
 
 
     DocStr(GetPosition,   // sets the docstring for both


@@ -482,12 +504,12 @@ the borders, scrollbars, other decorations...)", "");
 
     DocDeclStr(
         wxRect , GetClientRect() const,
 
     DocDeclStr(
         wxRect , GetClientRect() const,

-        "Get the client area position and size as a wx.Rect object.", "");
+        "Get the client area position and size as a `wx.Rect` object.", "");

     
 
     
     DocStr(GetBestSize,
     
 
     
     DocStr(GetBestSize,

-           "This functions returns the best acceptable minimal size for the
+           "This function returns the best acceptable minimal size for the

 window, if applicable. For example, for a static text control, it will
 be the minimal size such that the control label is not truncated. For
 windows containing subwindows (suzh aswx.Panel), the size returned by
 window, if applicable. For example, for a static text control, it will
 be the minimal size such that the control label is not truncated. For
 windows containing subwindows (suzh aswx.Panel), the size returned by


@@ -500,6 +522,21 @@ after calling Fit.", "");
         GetBestSizeTuple);
     
 
         GetBestSizeTuple);
     
 

+    DocDeclStr(
+        void , InvalidateBestSize(),
+        "Reset the cached best size value so it will be recalculated the next
+time it is needed.", "");
+
+
+    
+    DocDeclStr(
+        wxSize , GetBestFittingSize() const,
+        "This function will merge the window's best size into the window's
+minimum size, giving priority to the min size components, and returns
+the results.
+", "");
+    
+

     DocDeclStr(
         wxSize , GetAdjustedBestSize() const,
         "This method is similar to GetBestSize, except in one
     DocDeclStr(
         wxSize , GetAdjustedBestSize() const,
         "This method is similar to GetBestSize, except in one


@@ -558,22 +595,26 @@ 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
 default values will be used.  If this function is called, the user
     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
 default values will be used.  If this function is called, the user

-will not be able to size the window outside the given bounds. The
-resizing increments are only significant under Motif or Xt.", "");
+will not be able to size the window outside the given bounds (if it is
+a top-level window.)  Sizers will also inspect the minimum window size
+and will use that value if set when calculating layout.
+
+The resizing increments are only significant under Motif or Xt.", "
+
+:see: `GetMinSize`, `GetMaxSize`, `SetMinSize`, `SetMaxSize`
+");

     virtual void SetSizeHints( int minW, int minH,
                                int maxW = -1, int maxH = -1,
                                int incW = -1, int incH = -1 );
     virtual void SetSizeHints( int minW, int minH,
                                int maxW = -1, int maxH = -1,
                                int incW = -1, int incH = -1 );

-    void SetSizeHints( const wxSize& minSize,
-                       const wxSize& maxSize=wxDefaultSize,
-                       const wxSize& incSize=wxDefaultSize);
+    %Rename(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
     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


@@ -581,42 +622,55 @@ used.  If this function is called, the user will not be able to size
 the virtual area of the window outside the given bounds.", "");
     virtual void SetVirtualSizeHints( int minW, int minH,
                                       int maxW = -1, int maxH = -1 );
 the virtual area of the window outside the given bounds.", "");
     virtual void SetVirtualSizeHints( int minW, int minH,
                                       int maxW = -1, int maxH = -1 );

-    void SetVirtualSizeHints( const wxSize& minSize,
-                              const wxSize& maxSize=wxDefaultSize);
+    %Rename(SetVirtualSizeHintsSz, void,  SetVirtualSizeHints(
+                const wxSize& minSize, const wxSize& maxSize=wxDefaultSize));
+
+

     
     DocDeclStr(
     
     DocDeclStr(

-        virtual int , GetMinWidth() const,
+        virtual wxSize , GetMaxSize() const,

         "", "");
     
     DocDeclStr(
         "", "");
     
     DocDeclStr(

-        virtual int , GetMinHeight() const,
+        virtual wxSize , GetMinSize() const,

         "", "");
     
     DocDeclStr(
         "", "");
     
     DocDeclStr(

-        int , GetMaxWidth() const,
+        void , SetMinSize(const wxSize& minSize),
+        "A more convenient method than `SetSizeHints` for setting just the
+min size.", "");
+    
+    DocDeclStr(
+        void , SetMaxSize(const wxSize& maxSize),
+        "A more convenient method than `SetSizeHints` for setting just the
+max size.", "");
+    
+
+
+    DocDeclStr(
+        virtual int , GetMinWidth() const,

         "", "");
     
     DocDeclStr(
         "", "");
     
     DocDeclStr(

-        int , GetMaxHeight() const,
+        virtual int , GetMinHeight() const,

         "", "");
     
         "", "");
     

-

     DocDeclStr(
     DocDeclStr(

-        virtual wxSize , GetMaxSize() const,
+        int , GetMaxWidth() const,

         "", "");
     
         "", "");
     

-

     DocDeclStr(
     DocDeclStr(

-        virtual wxSize , GetMinSize() const,
+        int , GetMaxHeight() const,

         "", "");
     
     
         "", "");
     
     

+    

     DocStr(SetVirtualSize,
            "Set the the virtual size of a window in pixels.  For most windows this
 is just the client area of the window, but for some like scrolled
 windows it is more or less independent of the screen window size.", "");
     void SetVirtualSize(const wxSize& size );
     DocStr(SetVirtualSize,
            "Set the the virtual size of a window in pixels.  For most windows this
 is just the client area of the window, but for some like scrolled
 windows it is more or less independent of the screen window size.", "");
     void SetVirtualSize(const wxSize& size );

-    %name(SetVirtualSizeWH) void SetVirtualSize( int w, int h );
+    %Rename(SetVirtualSizeWH, void,  SetVirtualSize( int w, int h ));

 
     
     DocStr(GetVirtualSize,
 
     
     DocStr(GetVirtualSize,


@@ -649,7 +703,7 @@ sizer, interior children, or other means)", "");
     // ------------
 
     DocDeclStr(
     // ------------
 
     DocDeclStr(

-        virtual bool , Show( bool show = True ),
+        virtual bool , Show( bool show = true ),

         "Shows or hides the window. You may need to call Raise for a top level
 window if you want to bring it to top, although this is not needed if
 Show is called immediately after the frame creation.  Returns True if
         "Shows or hides the window. You may need to call Raise for a top level
 window if you want to bring it to top, although this is not needed if
 Show is called immediately after the frame creation.  Returns True if


@@ -662,7 +716,7 @@ because it already was in the requested state.", "");
     
 
     DocDeclStr(
     
 
     DocDeclStr(

-        virtual bool , Enable( bool enable = True ),
+        virtual bool , Enable( bool enable = true ),

         "Enable or disable the window for user input. Note that when a parent
 window is disabled, all of its children are disabled as well and they
 are reenabled again when the parent is.  Returns true if the window
         "Enable or disable the window for user input. Note that when a parent
 window is disabled, all of its children are disabled as well and they
 are reenabled again when the parent is.  Returns true if the window


@@ -725,7 +779,7 @@ SetWindowStyleFlag()", "");
 
     
     DocDeclStr(
 
     
     DocDeclStr(

-        virtual void , MakeModal(bool modal = True),
+        virtual void , MakeModal(bool modal = true),

         "Disables all other windows in the application so that the user can
 only interact with this window.  Passing False will reverse this
 effect.", "");
         "Disables all other windows in the application so that the user can
 only interact with this window.  Passing False will reverse this
 effect.", "");


@@ -808,9 +862,53 @@ by pressing <Enter> such as the OK button on a wx.Dialog.", "");
         "Set this child as temporary default", "");
     
 
         "Set this child as temporary default", "");
     
 

+    DocDeclAStr(
+        virtual bool , Navigate(int flags = wxNavigationKeyEvent::IsForward),
+        "Navigate(self, int flags=NavigationKeyEvent.IsForward) -> bool",
+        "Does keyboard navigation from this window to another, by sending a
+`wx.NavigationKeyEvent`.", "
+ 
+    :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
+for the tab key, since the standard default behaviour for a multiline
+text control with the wx.TE_PROCESS_TAB style is to insert a tab and
+not navigate to the next control.");
+
+    
+
+    DocDeclStr(
+        void , MoveAfterInTabOrder(wxWindow *win),
+        "Moves this window in the tab navigation order after the specified
+sibling window.  This means that when the user presses the TAB key on
+that other window, the focus switches to this window.
+
+The default tab order is the same as creation order.  This function
+and `MoveBeforeInTabOrder` allow to change it after creating all the
+windows.
+", "");
+
+    
+    DocDeclStr(
+        void , MoveBeforeInTabOrder(wxWindow *win),
+        "Same as `MoveAfterInTabOrder` except that it inserts this window just
+before win instead of putting it right after it.", "");
+    
+

     
 
 
     
 
 

+
+
+

     // parent/children relations
     // -------------------------
 
     // parent/children relations
     // -------------------------
 


@@ -924,7 +1022,7 @@ remove the event handler.", "");
 
     
     DocDeclStr(
 
     
     DocDeclStr(

-        wxEvtHandler *, PopEventHandler( bool deleteHandler = False ),
+        wxEvtHandler *, PopEventHandler( bool deleteHandler = false ),

         "Removes and returns the top-most event handler on the event handler
 stack.  If deleteHandler is True then the wx.EvtHandler object will be
 destroyed after it is popped.", "");
         "Removes and returns the top-most event handler on the event handler
 stack.  If deleteHandler is True then the wx.EvtHandler object will be
 destroyed after it is popped.", "");


@@ -1019,7 +1117,7 @@ hotkey was registered successfully.", "");
         %#if wxUSE_HOTKEY
             return self->RegisterHotKey(hotkeyId, modifiers, keycode);
         %#else
         %#if wxUSE_HOTKEY
             return self->RegisterHotKey(hotkeyId, modifiers, keycode);
         %#else

-            return False;
+            return false;

         %#endif
         }
 
         %#endif
         }
 


@@ -1030,7 +1128,7 @@ hotkey was registered successfully.", "");
         #if wxUSE_HOTKEY
             return self->UnregisterHotKey(hotkeyId);
         #else
         #if wxUSE_HOTKEY
             return self->UnregisterHotKey(hotkeyId);
         #else

-            return False;
+            return false;

         #endif
         }
     }
         #endif
         }
     }


@@ -1047,10 +1145,10 @@ changes. For the x dimension, the dialog units are multiplied by the
 average character width and then divided by 4. For the y dimension,
 the dialog units are multiplied by the average character height and
 then divided by 8.", "");
 average character width and then divided by 4. For the y dimension,
 the dialog units are multiplied by the average character height and
 then divided by 8.", "");

-    %name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt);
-    %name(ConvertDialogSizeToPixels)  wxSize  ConvertDialogToPixels(const wxSize& sz);
-    %name(DLG_PNT) wxPoint ConvertDialogToPixels(const wxPoint& pt);
-    %name(DLG_SZE) wxSize  ConvertDialogToPixels(const wxSize& sz);
+    %Rename(ConvertDialogPointToPixels, wxPoint, ConvertDialogToPixels(const wxPoint& pt));
+    %Rename(ConvertDialogSizeToPixels,  wxSize,  ConvertDialogToPixels(const wxSize& sz));
+    %Rename(DLG_PNT, wxPoint, ConvertDialogToPixels(const wxPoint& pt));
+    %Rename(DLG_SZE, wxSize,  ConvertDialogToPixels(const wxSize& sz));

 
 
     DocStr(ConvertPixelPointToDialog,
 
 
     DocStr(ConvertPixelPointToDialog,


@@ -1060,8 +1158,8 @@ changes. For the x dimension, the dialog units are multiplied by the
 average character width and then divided by 4. For the y dimension,
 the dialog units are multiplied by the average character height and
 then divided by 8.", "");
 average character width and then divided by 4. For the y dimension,
 the dialog units are multiplied by the average character height and
 then divided by 8.", "");

-    %name(ConvertPixelPointToDialog) wxPoint ConvertPixelsToDialog(const wxPoint& pt);
-    %name(ConvertPixelSizeToDialog)  wxSize  ConvertPixelsToDialog(const wxSize& sz);
+    %Rename(ConvertPixelPointToDialog, wxPoint, ConvertPixelsToDialog(const wxPoint& pt));
+    %Rename(ConvertPixelSizeToDialog,  wxSize,  ConvertPixelsToDialog(const wxSize& sz));

 
 
 
 
 
 


@@ -1109,7 +1207,7 @@ release the mouse as many times as you capture it.", "");
     // -------------------
 
     DocDeclStr(
     // -------------------
 
     DocDeclStr(

-        virtual void , Refresh( bool eraseBackground = True,
+        virtual void , Refresh( bool eraseBackground = true,

                                 const wxRect *rect = NULL ),
         "Mark the specified rectangle (or the whole window) as \"dirty\" so it
 will be repainted.  Causes an EVT_PAINT event to be generated and sent
                                 const wxRect *rect = NULL ),
         "Mark the specified rectangle (or the whole window) as \"dirty\" so it
 will be repainted.  Causes an EVT_PAINT event to be generated and sent


@@ -1117,7 +1215,7 @@ to the window.", "");
     
 
     DocDeclStr(
     
 
     DocDeclStr(

-        void , RefreshRect(const wxRect& rect),
+        void , RefreshRect(const wxRect& rect, bool eraseBackground = true),

         "Redraws the contents of the given rectangle: the area inside it will
 be repainted.  This is the same as Refresh but has a nicer syntax.", "");
     
         "Redraws the contents of the given rectangle: the area inside it will
 be repainted.  This is the same as Refresh but has a nicer syntax.", "");
     


@@ -1186,8 +1284,8 @@ since the last repaint. Call this in an paint event handler to
 optimize redrawing by only redrawing those areas, which have been
 exposed.", "");
     bool IsExposed( int x, int y, int w=1, int h=1 ) const;
 optimize redrawing by only redrawing those areas, which have been
 exposed.", "");
     bool IsExposed( int x, int y, int w=1, int h=1 ) const;

-    %name(IsExposedPoint) bool IsExposed( const wxPoint& pt ) const;
-    %name(IsExposedRect)  bool IsExposed( const wxRect& rect ) const;
+    %Rename(IsExposedPoint, bool, IsExposed( const wxPoint& pt ) const);
+    %Rename(IsExposedRect,  bool, IsExposed( const wxRect& rect ) const);

 
 
 
 
 
 


@@ -1201,7 +1299,7 @@ exposed.", "");
 useful if you want to use the same font or colour in your own control
 as in a standard control -- which is a much better idea than hard
 coding specific colours or fonts which might look completely out of
 useful if you want to use the same font or colour in your own control
 as in a standard control -- which is a much better idea than hard
 coding specific colours or fonts which might look completely out of

-place on the users system, especially if it uses themes.", "");
+place on the user's system, especially if it uses themes.", "");

     
 
     DocDeclStr(
     
 
     DocDeclStr(


@@ -1210,12 +1308,13 @@ place on the users system, especially if it uses themes.", "");
         "Get the default attributes for this class.  This is useful if you want
 to use the same font or colour in your own control as in a standard
 control -- which is a much better idea than hard coding specific
         "Get the default attributes for this class.  This is useful if you want
 to use the same font or colour in your own control as in a standard
 control -- which is a much better idea than hard coding specific

-colours or fonts which might look completely out of place on the users
-system, especially if it uses themes.
+colours or fonts which might look completely out of place on the
+user's system, especially if it uses themes.

 
 The variant parameter is only relevant under Mac currently and is
 ignore under other platforms. Under Mac, it will change the size of
 
 The variant parameter is only relevant under Mac currently and is
 ignore under other platforms. Under Mac, it will change the size of

-the returned font. See SetWindowVariant for more about this.", "");
+the returned font. See `wx.Window.SetWindowVariant` for more about
+this.", "");

     
     
     DocDeclStr(
     
     
     DocDeclStr(


@@ -1223,19 +1322,20 @@ the returned font. See SetWindowVariant for more about this.", "");
         "Sets the background colour of the window.  Returns True if the colour
 was changed.  The background colour is usually painted by the default
 EVT_ERASE_BACKGROUND event handler function under Windows and
         "Sets the background colour of the window.  Returns True if the colour
 was changed.  The background colour is usually painted by the default
 EVT_ERASE_BACKGROUND event handler function under Windows and

-automatically under GTK.
+automatically under GTK.  Using `wx.NullColour` will reset the window
+to the default background colour.

 
 

-Note that setting the background colour does not cause an immediate
-refresh, so you may wish to call ClearBackground or Refresh after
+Note that setting the background colour may not cause an immediate
+refresh, so you may wish to call `ClearBackground` or `Refresh` after

 calling this function.
 
 calling this function.
 

-Use this function with care under GTK+ as the new appearance of the
-window might not look equally well when used with themes, i.e GTK+'s
-ability to change its look as the user wishes with run-time loadable
-modules.", "");
+Using this function will disable attempts to use themes for this
+window, if the system supports them.  Use with care since usually the
+themes represent the appearance chosen by the user to be used for all
+applications on the system.", "");

 
     DocDeclStr(
 
     DocDeclStr(

-        void , SetDefaultBackgroundColour(const wxColour& colour),
+        void , SetOwnBackgroundColour(const wxColour& colour),

         "", "");
     
 
         "", "");
     
 


@@ -1248,7 +1348,7 @@ the window class; it may be the text colour or other colour, or it may
 not be used at all.", "");
 
     DocDeclStr(
 not be used at all.", "");
 
     DocDeclStr(

-        void , SetDefaultForegroundColour(const wxColour& colour),
+        void , SetOwnForegroundColour(const wxColour& colour),

         "", "");
     
 
         "", "");
     
 


@@ -1262,9 +1362,64 @@ not be used at all.", "");
         "Returns the foreground colour of the window.  The interpretation of
 foreground colour is dependent on the window class; it may be the text
 colour or other colour, or it may not be used at all.", "");
         "Returns the foreground colour of the window.  The interpretation of
 foreground colour is dependent on the window class; it may be the text
 colour or other colour, or it may not be used at all.", "");

+
+    DocDeclStr(
+        bool , InheritsBackgroundColour() const,
+        "", "");
+    
+    DocDeclStr(
+        bool , UseBgCol() const,
+        "", "");
+    

     
     

+// TODO:
+//     // if the window shouldn't inherit its colour from the parent, override
+//     // this function to return true
+//     //
+//     // this is currently only used by wxMSW and wxUniv but should be useful for
+//     // the other ports too
+//     virtual bool ProvidesBackground() const;

 
 
 
 

+    // Set/get the background style.
+    // Pass one of wxBG_STYLE_SYSTEM, wxBG_STYLE_COLOUR, wxBG_STYLE_CUSTOM
+    DocDeclStr(
+        virtual bool , SetBackgroundStyle(wxBackgroundStyle style),
+        "Returns the background style of the window. The background style
+indicates how the background of the window is drawn.
+
+    ======================  ========================================
+    wx.BG_STYLE_SYSTEM      The background colour or pattern should
+                            be determined by the system
+    wx.BG_STYLE_COLOUR      The background should be a solid colour
+    wx.BG_STYLE_CUSTOM      The background will be implemented by the
+                            application.
+    ======================  ========================================
+
+On GTK+, use of wx.BG_STYLE_CUSTOM allows the flicker-free drawing of
+a custom background, such as a tiled bitmap. Currently the style has
+no effect on other platforms.
+
+:see: `GetBackgroundStyle`, `SetBackgroundColour`", "");
+    
+    DocDeclStr(
+        virtual wxBackgroundStyle , GetBackgroundStyle() const,
+        "Returns the background style of the window.
+
+:see: `SetBackgroundStyle`", "");
+
+    
+    DocDeclStr(
+        bool , HasTransparentBackground(),
+        "Returns True if this window's background is transparent (as, for
+example, for `wx.StaticText`) and should show the parent window's
+background.
+
+This method is mostly used internally by the library itself and you
+normally shouldn't have to call it. You may, however, have to override
+it in your custom control classes to ensure that background is painted
+correctly.", "");
+    

     
     DocDeclStr(
         virtual bool , SetCursor( const wxCursor &cursor ),
     
     DocDeclStr(
         virtual bool , SetCursor( const wxCursor &cursor ),


@@ -1275,7 +1430,7 @@ The cursor may be wx.NullCursor in which case the window cursor will
 be reset back to default.", "");
     
     DocDeclStr(
 be reset back to default.", "");
     
     DocDeclStr(

-        wxCursor& , GetCursor(),
+        wxCursor , GetCursor(),

         "Return the cursor associated with this window.", "");
     
 
         "Return the cursor associated with this window.", "");
     
 


@@ -1285,13 +1440,13 @@ be reset back to default.", "");
         "Sets the font for this window.", "");
     
     DocDeclStr(
         "Sets the font for this window.", "");
     
     DocDeclStr(

-        void , SetDefaultFont(const wxFont& font),
+        void , SetOwnFont(const wxFont& font),

         "", "");
     
 
     
     DocDeclStr(
         "", "");
     
 
     
     DocDeclStr(

-        wxFont& , GetFont(),
+        wxFont , GetFont(),

         "Returns the default font used for this window.", "");
 
     
         "Returns the default font used for this window.", "");
 
     


@@ -1431,12 +1586,13 @@ of how to call UpdateWindowUI from an idle function::
 
 
     DocStr(PopupMenu,
 
 
     DocStr(PopupMenu,

-           "Pops up the given menu at the specified coordinates, relative to this
-window, and returns control when the user has dismissed the menu. If a
-menu item is selected, the corresponding menu event is generated and
-will be processed as usual.", "");
-    %name(PopupMenuXY) bool PopupMenu(wxMenu *menu, int x, int y);
-    bool PopupMenu(wxMenu *menu, const wxPoint& pos);
+           "Pops up the given menu at the specified coordinates, relative to this window,
+and returns control when the user has dismissed the menu. If a menu item is
+selected, the corresponding menu event is generated and will be processed as
+usual.  If the default position is given then the current position of the
+mouse cursor will be used.", "");
+    %Rename(PopupMenuXY,  bool, PopupMenu(wxMenu *menu, int x=-1, int y=-1));
+    bool PopupMenu(wxMenu *menu, const wxPoint& pos=wxDefaultPosition);

 
 
 
 
 
 


@@ -1451,6 +1607,20 @@ toplevel parent of the window.", "");
         }
     }
 
         }
     }
 

+    DocStr(
+        AssociateHandle,
+        "Associate the window with a new native handle", "");
+    %extend {
+        void  AssociateHandle(long handle) {
+            self->AssociateHandle((WXWidget)handle);
+        }
+    }
+        
+           
+    DocDeclStr(
+        virtual void , DissociateHandle(),
+        "Dissociate the current native handle from the window", "");
+    

 
     
 #ifdef __WXMSW__
 
     
 #ifdef __WXMSW__


@@ -1475,7 +1645,7 @@ toplevel parent of the window.", "");
                                      int position,
                                      int thumbSize,
                                      int range,
                                      int position,
                                      int thumbSize,
                                      int range,

-                                     bool refresh = True ),
+                                     bool refresh = true ),

         "Sets the scrollbar properties of a built-in scrollbar.",
         "
     :param orientation: Determines the scrollbar whose page size is to
         "Sets the scrollbar properties of a built-in scrollbar.",
         "
     :param orientation: Determines the scrollbar whose page size is to


@@ -1492,7 +1662,7 @@ toplevel parent of the window.", "");
 ");
     
     DocDeclStr(
 ");
     
     DocDeclStr(

-        virtual void , SetScrollPos( int orientation, int pos, bool refresh = True ),
+        virtual void , SetScrollPos( int orientation, int pos, bool refresh = true ),

         "Sets the position of one of the built-in scrollbars.", "");
     
     DocDeclStr(
         "Sets the position of one of the built-in scrollbars.", "");
     
     DocDeclStr(


@@ -1516,8 +1686,8 @@ toplevel parent of the window.", "");
         "Physically scrolls the pixels in the window and move child windows
 accordingly.  Use this function to optimise your scrolling
 implementations, to minimise the area that must be redrawn. Note that
         "Physically scrolls the pixels in the window and move child windows
 accordingly.  Use this function to optimise your scrolling
 implementations, to minimise the area that must be redrawn. Note that

-it is rarely required to call this function from a user program.",
-"
+it is rarely required to call this function from a user program.","
+

     :param dx:   Amount to scroll horizontally.
 
     :param dy:   Amount to scroll vertically.
     :param dx:   Amount to scroll horizontally.
 
     :param dy:   Amount to scroll vertically.


@@ -1593,7 +1763,7 @@ wxHelpProvider implementation, and not in the window object itself.", "");
 
     DocStr(SetToolTip,
            "Attach a tooltip to the window.", "");
 
     DocStr(SetToolTip,
            "Attach a tooltip to the window.", "");

-    %name(SetToolTipString) void SetToolTip( const wxString &tip );
+    %Rename(SetToolTipString, void,  SetToolTip( const wxString &tip ));

     void SetToolTip( wxToolTip *tip );
 
     DocDeclStr(
     void SetToolTip( wxToolTip *tip );
 
     DocDeclStr(


@@ -1679,16 +1849,16 @@ handler when the window is resized.", "");
     
 
     DocDeclStr(
     
 
     DocDeclStr(

-        void , SetSizer(wxSizer *sizer, bool deleteOld = True ),
+        void , SetSizer(wxSizer *sizer, bool deleteOld = true ),

         "Sets the window to have the given layout sizer. The window will then
 own the object, and will take care of its deletion. If an existing
 layout sizer object is already owned by the window, it will be deleted
 if the deleteOld parameter is true. Note that this function will also
 call SetAutoLayout implicitly with a True parameter if the sizer is
         "Sets the window to have the given layout sizer. The window will then
 own the object, and will take care of its deletion. If an existing
 layout sizer object is already owned by the window, it will be deleted
 if the deleteOld parameter is true. Note that this function will also
 call SetAutoLayout implicitly with a True parameter if the sizer is

-non-NoneL and False otherwise.", "");
+non-None, and False otherwise.", "");

     
     DocDeclStr(
     
     DocDeclStr(

-        void , SetSizerAndFit( wxSizer *sizer, bool deleteOld = True ),
+        void , SetSizerAndFit( wxSizer *sizer, bool deleteOld = true ),

         "The same as SetSizer, except it also sets the size hints for the
 window based on the sizer's minimum size.", "");
     
         "The same as SetSizer, except it also sets the size hints for the
 window based on the sizer's minimum size.", "");
     


@@ -1742,14 +1912,14 @@ colours.
 By 'intelligently' the following is meant: by default, all windows use
 their own default attributes. However if some of the parent's
 attributes are explicitly changed (that is, using SetFont and not
 By 'intelligently' the following is meant: by default, all windows use
 their own default attributes. However if some of the parent's
 attributes are explicitly changed (that is, using SetFont and not

-SetDefaultFont) and if the corresponding attribute hadn't been
+SetOwnFont) and if the corresponding attribute hadn't been

 explicitly set for this window itself, then this window takes the same
 value as used by the parent. In addition, if the window overrides
 ShouldInheritColours to return false, the colours will not be changed
 no matter what and only the font might.
 
 explicitly set for this window itself, then this window takes the same
 value as used by the parent. In addition, if the window overrides
 ShouldInheritColours to return false, the colours will not be changed
 no matter what and only the font might.
 

-This rather complicated logic is necessary in order to accomodate the
-different usage scenarius. The most common one is when all default
+This rather complicated logic is necessary in order to accommodate the
+different usage scenarios. The most common one is when all default

 attributes are used and in this case, nothing should be inherited as
 in modern GUIs different controls use different fonts (and colours)
 than their siblings so they can't inherit the same value from the
 attributes are used and in this case, nothing should be inherited as
 in modern GUIs different controls use different fonts (and colours)
 than their siblings so they can't inherit the same value from the


@@ -1849,6 +2019,10 @@ non-None, the search will be limited to the given window
 hierarchy. The search is recursive in both cases.", "");
 
 
 hierarchy. The search is recursive in both cases.", "");
 
 

+MustHaveApp(wxFindWindowById);
+MustHaveApp(wxFindWindowByName);
+MustHaveApp(wxFindWindowByLabel);
+

 %inline %{
 wxWindow* wxFindWindowById( long id, const wxWindow *parent = NULL ) {
     return wxWindow::FindWindowById(id, parent);
 %inline %{
 wxWindow* wxFindWindowById( long id, const wxWindow *parent = NULL ) {
     return wxWindow::FindWindowById(id, parent);