Fixes so bg colors in a notebook on XP are visible again

[wxWidgets.git] / wxPython / docs / xml / wxPython-metadata.xml

diff --git a/wxPython/docs/xml/wxPython-metadata.xml b/wxPython/docs/xml/wxPython-metadata.xml
index 0c7460d458dbdb97280c7c36f4315385cfb32aa7..82f5edf3df6c1e5233053ab9ebdbe99ea5e29d29 100644 (file)
--- a/wxPython/docs/xml/wxPython-metadata.xml
+++ b/wxPython/docs/xml/wxPython-metadata.xml
@@ -890,16 +890,16 @@ it is moved to the left or top respectively.</docstring>
         <autodoc>FindNext() -&gt; String</autodoc>
       </method>
       <staticmethod name="AddHandler" type="" overloaded="no">
         <autodoc>FindNext() -&gt; String</autodoc>
       </method>
       <staticmethod name="AddHandler" type="" overloaded="no">

-        <autodoc>FileSystem.AddHandler(CPPFileSystemHandler handler)</autodoc>
+        <autodoc>AddHandler(CPPFileSystemHandler handler)</autodoc>

         <paramlist>
           <param name="handler" type="CPPFileSystemHandler" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="CleanUpHandlers" type="" overloaded="no">
         <paramlist>
           <param name="handler" type="CPPFileSystemHandler" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="CleanUpHandlers" type="" overloaded="no">

-        <autodoc>FileSystem.CleanUpHandlers()</autodoc>
+        <autodoc>CleanUpHandlers()</autodoc>

       </staticmethod>
       <staticmethod name="FileNameToURL" type="String" overloaded="no">
       </staticmethod>
       <staticmethod name="FileNameToURL" type="String" overloaded="no">

-        <autodoc>FileSystem.FileNameToURL(String filename) -&gt; String</autodoc>
+        <autodoc>FileNameToURL(String filename) -&gt; String</autodoc>

         <paramlist>
           <param name="filename" type="String" default=""/>
         </paramlist>
         <paramlist>
           <param name="filename" type="String" default=""/>
         </paramlist>


@@ -998,7 +998,7 @@ def MemoryFSHandler_AddFile(filename, a, b=''):
         <autodoc>__init__() -&gt; MemoryFSHandler</autodoc>
       </constructor>
       <staticmethod name="RemoveFile" type="" overloaded="no">
         <autodoc>__init__() -&gt; MemoryFSHandler</autodoc>
       </constructor>
       <staticmethod name="RemoveFile" type="" overloaded="no">

-        <autodoc>MemoryFSHandler.RemoveFile(String filename)</autodoc>
+        <autodoc>RemoveFile(String filename)</autodoc>

         <paramlist>
           <param name="filename" type="String" default=""/>
         </paramlist>
         <paramlist>
           <param name="filename" type="String" default=""/>
         </paramlist>


@@ -1080,7 +1080,7 @@ def MemoryFSHandler_AddFile(filename, a, b=''):
         <autodoc>__init__() -&gt; ImageHistogram</autodoc>
       </constructor>
       <staticmethod name="MakeKey" type="unsigned long" overloaded="no">
         <autodoc>__init__() -&gt; ImageHistogram</autodoc>
       </constructor>
       <staticmethod name="MakeKey" type="unsigned long" overloaded="no">

-        <autodoc>ImageHistogram.MakeKey(unsigned char r, unsigned char g, unsigned char b) -&gt; unsigned long</autodoc>
+        <autodoc>MakeKey(unsigned char r, unsigned char g, unsigned char b) -&gt; unsigned long</autodoc>

         <docstring>Get the key in the histogram for the given RGB values</docstring>
         <paramlist>
           <param name="r" type="unsigned char" default=""/>
         <docstring>Get the key in the histogram for the given RGB values</docstring>
         <paramlist>
           <param name="r" type="unsigned char" default=""/>


@@ -1267,13 +1267,13 @@ values.</docstring>
         </paramlist>
       </method>
       <staticmethod name="CanRead" type="bool" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="CanRead" type="bool" overloaded="no">

-        <autodoc>Image.CanRead(String name) -&gt; bool</autodoc>
+        <autodoc>CanRead(String name) -&gt; bool</autodoc>

         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetImageCount" type="int" overloaded="no">
         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetImageCount" type="int" overloaded="no">

-        <autodoc>Image.GetImageCount(String name, long type=BITMAP_TYPE_ANY) -&gt; int</autodoc>
+        <autodoc>GetImageCount(String name, long type=BITMAP_TYPE_ANY) -&gt; int</autodoc>

         <paramlist>
           <param name="name" type="String" default=""/>
           <param name="type" type="long" default="wxBITMAP_TYPE_ANY"/>
         <paramlist>
           <param name="name" type="String" default=""/>
           <param name="type" type="long" default="wxBITMAP_TYPE_ANY"/>


@@ -1310,7 +1310,7 @@ values.</docstring>
         </paramlist>
       </method>
       <staticmethod name="CanReadStream" type="bool" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="CanReadStream" type="bool" overloaded="no">

-        <autodoc>Image.CanReadStream(InputStream stream) -&gt; bool</autodoc>
+        <autodoc>CanReadStream(InputStream stream) -&gt; bool</autodoc>

         <paramlist>
           <param name="stream" type="wxInputStream" default=""/>
         </paramlist>
         <paramlist>
           <param name="stream" type="wxInputStream" default=""/>
         </paramlist>


@@ -1506,25 +1506,25 @@ values.</docstring>
         </paramlist>
       </method>
       <staticmethod name="AddHandler" type="" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="AddHandler" type="" overloaded="no">

-        <autodoc>Image.AddHandler(ImageHandler handler)</autodoc>
+        <autodoc>AddHandler(ImageHandler handler)</autodoc>

         <paramlist>
           <param name="handler" type="ImageHandler" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="InsertHandler" type="" overloaded="no">
         <paramlist>
           <param name="handler" type="ImageHandler" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="InsertHandler" type="" overloaded="no">

-        <autodoc>Image.InsertHandler(ImageHandler handler)</autodoc>
+        <autodoc>InsertHandler(ImageHandler handler)</autodoc>

         <paramlist>
           <param name="handler" type="ImageHandler" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="RemoveHandler" type="bool" overloaded="no">
         <paramlist>
           <param name="handler" type="ImageHandler" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="RemoveHandler" type="bool" overloaded="no">

-        <autodoc>Image.RemoveHandler(String name) -&gt; bool</autodoc>
+        <autodoc>RemoveHandler(String name) -&gt; bool</autodoc>

         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetImageExtWildcard" type="String" overloaded="no">
         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetImageExtWildcard" type="String" overloaded="no">

-        <autodoc>Image.GetImageExtWildcard() -&gt; String</autodoc>
+        <autodoc>GetImageExtWildcard() -&gt; String</autodoc>

       </staticmethod>
       <method name="ConvertToBitmap" type="wxBitmap" overloaded="no">
         <autodoc>ConvertToBitmap() -&gt; Bitmap</autodoc>
       </staticmethod>
       <method name="ConvertToBitmap" type="wxBitmap" overloaded="no">
         <autodoc>ConvertToBitmap() -&gt; Bitmap</autodoc>


@@ -2761,31 +2761,31 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
         </paramlist>
       </method>
       <staticmethod name="SetUpdateInterval" type="" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="SetUpdateInterval" type="" overloaded="no">

-        <autodoc>UpdateUIEvent.SetUpdateInterval(long updateInterval)</autodoc>
+        <autodoc>SetUpdateInterval(long updateInterval)</autodoc>

         <paramlist>
           <param name="updateInterval" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetUpdateInterval" type="long" overloaded="no">
         <paramlist>
           <param name="updateInterval" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetUpdateInterval" type="long" overloaded="no">

-        <autodoc>UpdateUIEvent.GetUpdateInterval() -&gt; long</autodoc>
+        <autodoc>GetUpdateInterval() -&gt; long</autodoc>

       </staticmethod>
       <staticmethod name="CanUpdate" type="bool" overloaded="no">
       </staticmethod>
       <staticmethod name="CanUpdate" type="bool" overloaded="no">

-        <autodoc>UpdateUIEvent.CanUpdate(Window win) -&gt; bool</autodoc>
+        <autodoc>CanUpdate(Window win) -&gt; bool</autodoc>

         <paramlist>
           <param name="win" type="wxWindow" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="ResetUpdateTime" type="" overloaded="no">
         <paramlist>
           <param name="win" type="wxWindow" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="ResetUpdateTime" type="" overloaded="no">

-        <autodoc>UpdateUIEvent.ResetUpdateTime()</autodoc>
+        <autodoc>ResetUpdateTime()</autodoc>

       </staticmethod>
       <staticmethod name="SetMode" type="" overloaded="no">
       </staticmethod>
       <staticmethod name="SetMode" type="" overloaded="no">

-        <autodoc>UpdateUIEvent.SetMode(int mode)</autodoc>
+        <autodoc>SetMode(int mode)</autodoc>

         <paramlist>
           <param name="mode" type="wxUpdateUIMode" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetMode" type="wxUpdateUIMode" overloaded="no">
         <paramlist>
           <param name="mode" type="wxUpdateUIMode" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetMode" type="wxUpdateUIMode" overloaded="no">

-        <autodoc>UpdateUIEvent.GetMode() -&gt; int</autodoc>
+        <autodoc>GetMode() -&gt; int</autodoc>

       </staticmethod>
     </class>
     <pythoncode>
       </staticmethod>
     </class>
     <pythoncode>


@@ -2968,16 +2968,16 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
         <autodoc>MoreRequested() -&gt; bool</autodoc>
       </method>
       <staticmethod name="SetMode" type="" overloaded="no">
         <autodoc>MoreRequested() -&gt; bool</autodoc>
       </method>
       <staticmethod name="SetMode" type="" overloaded="no">

-        <autodoc>IdleEvent.SetMode(int mode)</autodoc>
+        <autodoc>SetMode(int mode)</autodoc>

         <paramlist>
           <param name="mode" type="wxIdleMode" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetMode" type="wxIdleMode" overloaded="no">
         <paramlist>
           <param name="mode" type="wxIdleMode" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetMode" type="wxIdleMode" overloaded="no">

-        <autodoc>IdleEvent.GetMode() -&gt; int</autodoc>
+        <autodoc>GetMode() -&gt; int</autodoc>

       </staticmethod>
       <staticmethod name="CanSend" type="bool" overloaded="no">
       </staticmethod>
       <staticmethod name="CanSend" type="bool" overloaded="no">

-        <autodoc>IdleEvent.CanSend(Window win) -&gt; bool</autodoc>
+        <autodoc>CanSend(Window win) -&gt; bool</autodoc>

         <paramlist>
           <param name="win" type="wxWindow" default=""/>
         </paramlist>
         <paramlist>
           <param name="win" type="wxWindow" default=""/>
         </paramlist>


@@ -3037,6 +3037,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <baseclass name="EvtHandler"/>
       <constructor name="PyApp" overloaded="no">
         <autodoc>__init__() -&gt; PyApp</autodoc>
       <baseclass name="EvtHandler"/>
       <constructor name="PyApp" overloaded="no">
         <autodoc>__init__() -&gt; PyApp</autodoc>

+        <docstring>Create a new application object, starting the bootstrap process.</docstring>

       </constructor>
       <destructor name="~wxPyApp" overloaded="no">
         <autodoc>__del__()</autodoc>
       </constructor>
       <destructor name="~wxPyApp" overloaded="no">
         <autodoc>__del__()</autodoc>


@@ -3227,46 +3228,46 @@ may be or'd together:
         <docstring>Get the current OnAssert behaviour setting.</docstring>
       </method>
       <staticmethod name="GetMacSupportPCMenuShortcuts" type="bool" overloaded="no">
         <docstring>Get the current OnAssert behaviour setting.</docstring>
       </method>
       <staticmethod name="GetMacSupportPCMenuShortcuts" type="bool" overloaded="no">

-        <autodoc>PyApp.GetMacSupportPCMenuShortcuts() -&gt; bool</autodoc>
+        <autodoc>GetMacSupportPCMenuShortcuts() -&gt; bool</autodoc>

       </staticmethod>
       <staticmethod name="GetMacAboutMenuItemId" type="long" overloaded="no">
       </staticmethod>
       <staticmethod name="GetMacAboutMenuItemId" type="long" overloaded="no">

-        <autodoc>PyApp.GetMacAboutMenuItemId() -&gt; long</autodoc>
+        <autodoc>GetMacAboutMenuItemId() -&gt; long</autodoc>

       </staticmethod>
       <staticmethod name="GetMacPreferencesMenuItemId" type="long" overloaded="no">
       </staticmethod>
       <staticmethod name="GetMacPreferencesMenuItemId" type="long" overloaded="no">

-        <autodoc>PyApp.GetMacPreferencesMenuItemId() -&gt; long</autodoc>
+        <autodoc>GetMacPreferencesMenuItemId() -&gt; long</autodoc>

       </staticmethod>
       <staticmethod name="GetMacExitMenuItemId" type="long" overloaded="no">
       </staticmethod>
       <staticmethod name="GetMacExitMenuItemId" type="long" overloaded="no">

-        <autodoc>PyApp.GetMacExitMenuItemId() -&gt; long</autodoc>
+        <autodoc>GetMacExitMenuItemId() -&gt; long</autodoc>

       </staticmethod>
       <staticmethod name="GetMacHelpMenuTitleName" type="String" overloaded="no">
       </staticmethod>
       <staticmethod name="GetMacHelpMenuTitleName" type="String" overloaded="no">

-        <autodoc>PyApp.GetMacHelpMenuTitleName() -&gt; String</autodoc>
+        <autodoc>GetMacHelpMenuTitleName() -&gt; String</autodoc>

       </staticmethod>
       <staticmethod name="SetMacSupportPCMenuShortcuts" type="" overloaded="no">
       </staticmethod>
       <staticmethod name="SetMacSupportPCMenuShortcuts" type="" overloaded="no">

-        <autodoc>PyApp.SetMacSupportPCMenuShortcuts(bool val)</autodoc>
+        <autodoc>SetMacSupportPCMenuShortcuts(bool val)</autodoc>

         <paramlist>
           <param name="val" type="bool" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="SetMacAboutMenuItemId" type="" overloaded="no">
         <paramlist>
           <param name="val" type="bool" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="SetMacAboutMenuItemId" type="" overloaded="no">

-        <autodoc>PyApp.SetMacAboutMenuItemId(long val)</autodoc>
+        <autodoc>SetMacAboutMenuItemId(long val)</autodoc>

         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="SetMacPreferencesMenuItemId" type="" overloaded="no">
         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="SetMacPreferencesMenuItemId" type="" overloaded="no">

-        <autodoc>PyApp.SetMacPreferencesMenuItemId(long val)</autodoc>
+        <autodoc>SetMacPreferencesMenuItemId(long val)</autodoc>

         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="SetMacExitMenuItemId" type="" overloaded="no">
         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="SetMacExitMenuItemId" type="" overloaded="no">

-        <autodoc>PyApp.SetMacExitMenuItemId(long val)</autodoc>
+        <autodoc>SetMacExitMenuItemId(long val)</autodoc>

         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="SetMacHelpMenuTitleName" type="" overloaded="no">
         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="SetMacHelpMenuTitleName" type="" overloaded="no">

-        <autodoc>PyApp.SetMacHelpMenuTitleName(String val)</autodoc>
+        <autodoc>SetMacHelpMenuTitleName(String val)</autodoc>

         <paramlist>
           <param name="val" type="String" default=""/>
         </paramlist>
         <paramlist>
           <param name="val" type="String" default=""/>
         </paramlist>


@@ -3276,7 +3277,7 @@ may be or'd together:
         <docstring>For internal use only</docstring>
       </method>
       <staticmethod name="GetComCtl32Version" type="int" overloaded="no">
         <docstring>For internal use only</docstring>
       </method>
       <staticmethod name="GetComCtl32Version" type="int" overloaded="no">

-        <autodoc>PyApp.GetComCtl32Version() -&gt; int</autodoc>
+        <autodoc>GetComCtl32Version() -&gt; int</autodoc>

         <docstring>Returns 400, 470, 471 for comctl32.dll 4.00, 4.70, 4.71 or 0 if it
 wasn't found at all.  Raises an exception on non-Windows platforms.</docstring>
       </staticmethod>
         <docstring>Returns 400, 470, 471 for comctl32.dll 4.00, 4.70, 4.71 or 0 if it
 wasn't found at all.  Raises an exception on non-Windows platforms.</docstring>
       </staticmethod>


@@ -3360,6 +3361,13 @@ class PyOnDemandOutputWindow:
         EVT_CLOSE(self.frame, self.OnCloseWindow)
         
 
         EVT_CLOSE(self.frame, self.OnCloseWindow)
         
 

+    def OnCloseWindow(self, event):
+        if self.frame is not None:
+            self.frame.Destroy()
+        self.frame = None
+        self.text  = None
+
+

     # These methods provide the file-like output behaviour.
     def write(self, text):
         """
     # These methods provide the file-like output behaviour.
     def write(self, text):
         """


@@ -3384,11 +3392,6 @@ class PyOnDemandOutputWindow:
             wx.CallAfter(self.frame.Close)
 
 
             wx.CallAfter(self.frame.Close)
 
 

-    def OnCloseWindow(self, event):
-        if self.frame is not None:
-            self.frame.Destroy()
-        self.frame = None
-        self.text  = None

 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 


@@ -3462,7 +3465,7 @@ your Mac."""
         self.RestoreStdio()
 
 
         self.RestoreStdio()
 
 

-    def RedirectStdio(self, filename):
+    def RedirectStdio(self, filename=None):

         """Redirect sys.stdout and sys.stderr to a file or a popup window."""
         if filename:
             _sys.stdout = _sys.stderr = open(filename, 'a')
         """Redirect sys.stdout and sys.stderr to a file or a popup window."""
         if filename:
             _sys.stdout = _sys.stderr = open(filename, 'a')


@@ -3616,10 +3619,133 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Window" oldname="wxWindow" module="core">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Window" oldname="wxWindow" module="core">

+      <docstring>
+wx.Window is the base class for all windows and represents any visible
+object on the screen. All controls, top level windows and so on are
+wx.Windows. Sizers and device contexts are not however, as they don't
+appear on screen themselves.
+</docstring>
+      <refdoc>
+  Styles
+
+    wx.SIMPLE_BORDER:          Displays a thin border around the window.
+
+    wx.DOUBLE_BORDER:          Displays a double border. Windows and Mac only.
+
+    wx.SUNKEN_BORDER:          Displays a sunken border.
+
+    wx.RAISED_BORDER:          Displays a raised border.
+
+    wx.STATIC_BORDER:           Displays a border suitable for a static
+                                control. Windows only.
+
+    wx.NO_BORDER:               Displays no border, overriding the default
+                                border style for the window.
+
+    wx.TRANSPARENT_WINDOW:      The window is transparent, that is, it
+                                will not receive paint events. Windows only.
+
+    wx.TAB_TRAVERSAL:           Use this to enable tab traversal for
+                                non-dialog windows.
+
+    wx.WANTS_CHARS:             Use this to indicate that the window
+                                wants to get all char/key events for
+                                all keys - even for keys like TAB or
+                                ENTER which are usually used for
+                                dialog navigation and which wouldn't
+                                be generated without this style. If
+                                you need to use this style in order to
+                                get the arrows or etc., but would
+                                still like to have normal keyboard
+                                navigation take place, you should
+                                create and send a wxNavigationKeyEvent
+                                in response to the key events for Tab
+                                and Shift-Tab.
+
+    wx.NO_FULL_REPAINT_ON_RESIZE: Disables repainting the window
+                                  completely when its size is changed
+                                  - you will have to repaint the new
+                                  window area manually if you use this
+                                  style. As of version 2.5.1 this
+                                  style is on by default.  Use
+                                  wx.FULL_REPAINT_ON_RESIZE to
+                                  deactivate it.
+
+    wx.VSCROLL:          Use this style to enable a vertical scrollbar.
+
+    wx.HSCROLL:          Use this style to enable a horizontal scrollbar.
+
+    wx.ALWAYS_SHOW_SB:          If a window has scrollbars, disable them
+                                instead of hiding them when they are
+                                not needed (i.e. when the size of the
+                                window is big enough to not require
+                                the scrollbars to navigate it). This
+                                style is currently only implemented
+                                for wxMSW and wxUniversal and does
+                                nothing on the other platforms.
+
+    wx.CLIP_CHILDREN:           Use this style to eliminate flicker caused by
+                                the background being repainted, then
+                                children being painted over
+                                them. Windows only.
+
+    wx.FULL_REPAINT_ON_RESIZE:  Use this style to force a complete
+                                redraw of the window whenever it is
+                                resized instead of redrawing just the
+                                part of the window affected by
+                                resizing. Note that this was the
+                                behaviour by default before 2.5.1
+                                release and that if you experience
+                                redraw problems with the code which
+                                previously used to work you may want
+                                to try this.
+
+  Extra Styles
+
+    wx.WS_EX_VALIDATE_RECURSIVELY:  By default,
+                                    Validate/TransferDataTo/FromWindow()
+                                    only work on direct children of
+                                    the window (compatible
+                                    behaviour). Set this flag to make
+                                    them recursively descend into all
+                                    subwindows.
+
+    wx.WS_EX_BLOCK_EVENTS:          wx.CommandEvents and the objects of the
+                                    derived classes are forwarded to
+                                    the parent window and so on
+                                    recursively by default. Using this
+                                    flag for the given window allows
+                                    to block this propagation at this
+                                    window, i.e. prevent the events
+                                    from being propagated further
+                                    upwards. Dialogs have this flag on
+                                    by default.
+
+    wx.WS_EX_TRANSIENT              Don't use this window as an implicit parent for
+                                    the other windows: this must be
+                                    used with transient windows as
+                                    otherwise there is the risk of
+                                    creating a dialog/frame with this
+                                    window as a parent which would
+                                    lead to a crash if the parent is
+                                    destroyed before the child.
+
+    wx.WS_EX_PROCESS_IDLE:          This window should always process idle
+                                    events, even if the mode set by
+                                    wx.IdleEvent.SetMode is
+                                    wx.IDLE_PROCESS_SPECIFIED.
+
+    wx.WS_EX_PROCESS_UI_UPDATES     This window should always process UI
+                                    update events, even if the mode
+                                    set by wxUpdateUIEvent::SetMode is
+                                    wxUPDATE_UI_PROCESS_SPECIFIED.
+
+</refdoc>

       <baseclass name="EvtHandler"/>
       <constructor name="Window" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=PanelNameStr) -&gt; Window</autodoc>
       <baseclass name="EvtHandler"/>
       <constructor name="Window" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=PanelNameStr) -&gt; Window</autodoc>

+        <docstring>Construct and show a generic Window.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>


@@ -3631,10 +3757,12 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
       </constructor>
       <constructor name="PreWindow" overloaded="no">
         <autodoc>PreWindow() -&gt; Window</autodoc>
       </constructor>
       <constructor name="PreWindow" overloaded="no">
         <autodoc>PreWindow() -&gt; Window</autodoc>

+        <docstring>Precreate a Window for 2-phase creation.</docstring>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=PanelNameStr) -&gt; bool</autodoc>
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=PanelNameStr) -&gt; bool</autodoc>

+        <docstring>Create the GUI part of the Window for 2-phase creation mode.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>


@@ -3646,79 +3774,158 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
       </method>
       <method name="Close" type="bool" overloaded="no">
         <autodoc>Close(bool force=False) -&gt; bool</autodoc>
       </method>
       <method name="Close" type="bool" overloaded="no">
         <autodoc>Close(bool force=False) -&gt; bool</autodoc>

+        <docstring>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
+handler will be allowed to veto the destruction of the window.
+
+Usually Close is only used with the top level windows (wx.Frame and
+wx.Dialog classes) as the others are not supposed to have any special
+EVT_CLOSE logic.
+
+The close handler should check whether the window is being deleted
+forcibly, using wx.CloseEvent.GetForce, in which case it should
+destroy the window using wx.Window.Destroy.
+
+Note that calling Close does not guarantee that the window will be
+destroyed; but it provides a way to simulate a manual close of a
+window, which may or may not be implemented by destroying the
+window. The default EVT_CLOSE handler for wx.Dialog does not
+necessarily delete the dialog, since it will simply simulate an
+wxID_CANCEL event which is handled by the appropriate button event
+handler and may do anything at all.
+
+To guarantee that the window will be destroyed, call wx.Window.Destroy
+instead.</docstring>

         <paramlist>
           <param name="force" type="bool" default="False"/>
         </paramlist>
       </method>
       <method name="Destroy" type="bool" overloaded="no">
         <autodoc>Destroy() -&gt; bool</autodoc>
         <paramlist>
           <param name="force" type="bool" default="False"/>
         </paramlist>
       </method>
       <method name="Destroy" type="bool" overloaded="no">
         <autodoc>Destroy() -&gt; bool</autodoc>

-        <docstring>Deletes the C++ object this Python object is a proxy for.</docstring>
+        <docstring>Destroys the window safely.  Frames and dialogs are not destroyed
+immediately when this function is called -- they are added to a list
+of windows to be deleted on idle time, when all the window's events
+have been processed. This prevents problems with events being sent to
+non-existent windows.
+
+Returns True if the window has either been successfully deleted, or it
+has been added to the list of windows pending real deletion.</docstring>

       </method>
       <method name="DestroyChildren" type="bool" overloaded="no">
         <autodoc>DestroyChildren() -&gt; bool</autodoc>
       </method>
       <method name="DestroyChildren" type="bool" overloaded="no">
         <autodoc>DestroyChildren() -&gt; bool</autodoc>

+        <docstring>Destroys all children of a window. Called automatically by the destructor.</docstring>

       </method>
       <method name="IsBeingDeleted" type="bool" overloaded="no">
         <autodoc>IsBeingDeleted() -&gt; bool</autodoc>
       </method>
       <method name="IsBeingDeleted" type="bool" overloaded="no">
         <autodoc>IsBeingDeleted() -&gt; bool</autodoc>

+        <docstring>Is the window in the process of being deleted?</docstring>

       </method>
       <method name="SetTitle" type="" overloaded="no">
         <autodoc>SetTitle(String title)</autodoc>
       </method>
       <method name="SetTitle" type="" overloaded="no">
         <autodoc>SetTitle(String title)</autodoc>

+        <docstring>Sets the window's title. Applicable only to frames and dialogs.</docstring>

         <paramlist>
           <param name="title" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetTitle" type="String" overloaded="no">
         <autodoc>GetTitle() -&gt; String</autodoc>
         <paramlist>
           <param name="title" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetTitle" type="String" overloaded="no">
         <autodoc>GetTitle() -&gt; String</autodoc>

+        <docstring>Gets the window's title. Applicable only to frames and dialogs.</docstring>

       </method>
       <method name="SetLabel" type="" overloaded="no">
         <autodoc>SetLabel(String label)</autodoc>
       </method>
       <method name="SetLabel" type="" overloaded="no">
         <autodoc>SetLabel(String label)</autodoc>

+        <docstring>Set the text which the window shows in its label if applicable.</docstring>

         <paramlist>
           <param name="label" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetLabel" type="String" overloaded="no">
         <autodoc>GetLabel() -&gt; String</autodoc>
         <paramlist>
           <param name="label" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetLabel" type="String" overloaded="no">
         <autodoc>GetLabel() -&gt; String</autodoc>

+        <docstring>Generic way of getting a label from any window, for
+identification purposes.  The interpretation of this function
+differs from class to class. For frames and dialogs, the value
+returned is the title. For buttons or static text controls, it is
+the button text. This function can be useful for meta-programs
+(such as testing tools or special-needs access programs) which
+need to identify windows by name.</docstring>

       </method>
       <method name="SetName" type="" overloaded="no">
         <autodoc>SetName(String name)</autodoc>
       </method>
       <method name="SetName" type="" overloaded="no">
         <autodoc>SetName(String name)</autodoc>

+        <docstring>Sets the window's name.  The window name is used for ressource
+setting in X, it is not the same as the window title/label</docstring>

         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetName" type="String" overloaded="no">
         <autodoc>GetName() -&gt; String</autodoc>
         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetName" type="String" overloaded="no">
         <autodoc>GetName() -&gt; String</autodoc>

+        <docstring>Returns the window's name.  This name is not guaranteed to be
+unique; it is up to the programmer to supply an appropriate name
+in the window constructor or via wx.Window.SetName.</docstring>
+      </method>
+      <method name="SetWindowVariant" type="" overloaded="no">
+        <autodoc>SetWindowVariant(int variant)</autodoc>
+        <docstring>Sets the variant of the window/font size to use for this window,
+if the platform supports variants, (for example, wxMac.)</docstring>
+        <paramlist>
+          <param name="variant" type="wxWindowVariant" default=""/>
+        </paramlist>
+      </method>
+      <method name="GetWindowVariant" type="wxWindowVariant" overloaded="no">
+        <autodoc>GetWindowVariant() -&gt; int</autodoc>

       </method>
       <method name="SetId" type="" overloaded="no">
         <autodoc>SetId(int winid)</autodoc>
       </method>
       <method name="SetId" type="" overloaded="no">
         <autodoc>SetId(int winid)</autodoc>

+        <docstring>Sets the identifier of the window.  Each window has an integer
+identifier. If the application has not provided one, an identifier
+will be generated. Normally, the identifier should be provided on
+creation and should not be modified subsequently.</docstring>

         <paramlist>
           <param name="winid" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetId" type="int" overloaded="no">
         <autodoc>GetId() -&gt; int</autodoc>
         <paramlist>
           <param name="winid" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetId" type="int" overloaded="no">
         <autodoc>GetId() -&gt; int</autodoc>

+        <docstring>Returns the identifier of the window.  Each window has an integer
+identifier. If the application has not provided one (or the default Id
+-1 is used) then an unique identifier with a negative value will be
+generated.</docstring>

       </method>
       <staticmethod name="NewControlId" type="int" overloaded="no">
       </method>
       <staticmethod name="NewControlId" type="int" overloaded="no">

-        <autodoc>Window.NewControlId() -&gt; int</autodoc>
+        <autodoc>NewControlId() -&gt; int</autodoc>
+        <docstring>Generate a control id for the controls which were not given one.</docstring>

       </staticmethod>
       <staticmethod name="NextControlId" type="int" overloaded="no">
       </staticmethod>
       <staticmethod name="NextControlId" type="int" overloaded="no">

-        <autodoc>Window.NextControlId(int winid) -&gt; int</autodoc>
+        <autodoc>NextControlId(int winid) -&gt; int</autodoc>
+        <docstring>Get the id of the control following the one with the given
+(autogenerated) id</docstring>

         <paramlist>
           <param name="winid" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="PrevControlId" type="int" overloaded="no">
         <paramlist>
           <param name="winid" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="PrevControlId" type="int" overloaded="no">

-        <autodoc>Window.PrevControlId(int winid) -&gt; int</autodoc>
+        <autodoc>PrevControlId(int winid) -&gt; int</autodoc>
+        <docstring>Get the id of the control preceding the one with the given
+(autogenerated) id</docstring>

         <paramlist>
           <param name="winid" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <method name="SetSize" type="" overloaded="no">
         <autodoc>SetSize(Size size)</autodoc>
         <paramlist>
           <param name="winid" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <method name="SetSize" type="" overloaded="no">
         <autodoc>SetSize(Size size)</autodoc>

+        <docstring>Sets the size of the window in pixels.</docstring>

         <paramlist>
           <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
       <method name="SetDimensions" type="" overloaded="no">
         <autodoc>SetDimensions(int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)</autodoc>
         <paramlist>
           <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
       <method name="SetDimensions" type="" overloaded="no">
         <autodoc>SetDimensions(int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)</autodoc>

+        <docstring>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.</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -3729,6 +3936,7 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
       </method>
       <method name="SetRect" type="" overloaded="no">
         <autodoc>SetRect(Rect rect, int sizeFlags=SIZE_AUTO)</autodoc>
       </method>
       <method name="SetRect" type="" overloaded="no">
         <autodoc>SetRect(Rect rect, int sizeFlags=SIZE_AUTO)</autodoc>

+        <docstring>Sets the position and size of the window in pixels using a wx.Rect.</docstring>

         <paramlist>
           <param name="rect" type="Rect" default=""/>
           <param name="sizeFlags" type="int" default="wxSIZE_AUTO"/>
         <paramlist>
           <param name="rect" type="Rect" default=""/>
           <param name="sizeFlags" type="int" default="wxSIZE_AUTO"/>


@@ -3736,6 +3944,7 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
       </method>
       <method name="SetSizeWH" type="" overloaded="no">
         <autodoc>SetSizeWH(int width, int height)</autodoc>
       </method>
       <method name="SetSizeWH" type="" overloaded="no">
         <autodoc>SetSizeWH(int width, int height)</autodoc>

+        <docstring>Sets the size of the window in pixels.</docstring>

         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>


@@ -3743,6 +3952,7 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
       </method>
       <method name="Move" type="" overloaded="no">
         <autodoc>Move(Point pt, int flags=SIZE_USE_EXISTING)</autodoc>
       </method>
       <method name="Move" type="" overloaded="no">
         <autodoc>Move(Point pt, int flags=SIZE_USE_EXISTING)</autodoc>

+        <docstring>Moves the window to the given position.</docstring>

         <paramlist>
           <param name="pt" type="Point" default=""/>
           <param name="flags" type="int" default="wxSIZE_USE_EXISTING"/>
         <paramlist>
           <param name="pt" type="Point" default=""/>
           <param name="flags" type="int" default="wxSIZE_USE_EXISTING"/>


@@ -3750,6 +3960,7 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
       </method>
       <method name="MoveXY" type="" overloaded="no">
         <autodoc>MoveXY(int x, int y, int flags=SIZE_USE_EXISTING)</autodoc>
       </method>
       <method name="MoveXY" type="" overloaded="no">
         <autodoc>MoveXY(int x, int y, int flags=SIZE_USE_EXISTING)</autodoc>

+        <docstring>Moves the window to the given position.</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -3758,18 +3969,32 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
       </method>
       <method name="Raise" type="" overloaded="no">
         <autodoc>Raise()</autodoc>
       </method>
       <method name="Raise" type="" overloaded="no">
         <autodoc>Raise()</autodoc>

+        <docstring>Raises the window to the top of the window hierarchy if it is a
+managed window (dialog or frame).</docstring>

       </method>
       <method name="Lower" type="" overloaded="no">
         <autodoc>Lower()</autodoc>
       </method>
       <method name="Lower" type="" overloaded="no">
         <autodoc>Lower()</autodoc>

+        <docstring>Lowers the window to the bottom of the window hierarchy if it is a
+managed window (dialog or frame).</docstring>

       </method>
       <method name="SetClientSize" type="" overloaded="no">
         <autodoc>SetClientSize(Size size)</autodoc>
       </method>
       <method name="SetClientSize" type="" overloaded="no">
         <autodoc>SetClientSize(Size size)</autodoc>

+        <docstring>This sets the size of the window client area in pixels. Using this
+function to size a window tends to be more device-independent than
+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.</docstring>

         <paramlist>
           <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
       <method name="SetClientSizeWH" type="" overloaded="no">
         <autodoc>SetClientSizeWH(int width, int height)</autodoc>
         <paramlist>
           <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
       <method name="SetClientSizeWH" type="" overloaded="no">
         <autodoc>SetClientSizeWH(int width, int height)</autodoc>

+        <docstring>This sets the size of the window client area in pixels. Using this
+function to size a window tends to be more device-independent than
+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.</docstring>

         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>


@@ -3777,6 +4002,11 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
       </method>
       <method name="SetClientRect" type="" overloaded="no">
         <autodoc>SetClientRect(Rect rect)</autodoc>
       </method>
       <method name="SetClientRect" type="" overloaded="no">
         <autodoc>SetClientRect(Rect rect)</autodoc>

+        <docstring>This sets the size of the window client area in pixels. Using this
+function to size a window tends to be more device-independent than
+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.</docstring>

         <paramlist>
           <param name="rect" type="Rect" default=""/>
         </paramlist>
         <paramlist>
           <param name="rect" type="Rect" default=""/>
         </paramlist>


@@ -3807,14 +4037,19 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
       </method>
       <method name="GetRect" type="Rect" overloaded="no">
         <autodoc>GetRect() -&gt; Rect</autodoc>
       </method>
       <method name="GetRect" type="Rect" overloaded="no">
         <autodoc>GetRect() -&gt; Rect</autodoc>

+        <docstring>Returns the size and position of the window as a wx.Rect object.</docstring>

       </method>
       <method name="GetClientSize" type="Size" overloaded="no">
         <autodoc>GetClientSize() -&gt; Size</autodoc>
       </method>
       <method name="GetClientSize" type="Size" overloaded="no">
         <autodoc>GetClientSize() -&gt; Size</autodoc>

-        <docstring>Get the window's client size.</docstring>
+        <docstring>This gets the size of the window's 'client area' in pixels. The client
+area is the area which may be drawn on by the programmer, excluding
+title bar, border, scrollbars, etc.</docstring>

       </method>
       <method name="GetClientSizeTuple" type="" overloaded="no">
         <autodoc>GetClientSizeTuple() -&gt; (width, height)</autodoc>
       </method>
       <method name="GetClientSizeTuple" type="" overloaded="no">
         <autodoc>GetClientSizeTuple() -&gt; (width, height)</autodoc>

-        <docstring>Get the window's client size.</docstring>
+        <docstring>This gets the size of the window's 'client area' in pixels. The client
+area is the area which may be drawn on by the programmer, excluding
+title bar, border, scrollbars, etc.</docstring>

         <paramlist>
           <param name="OUTPUT" type="int" default=""/>
           <param name="OUTPUT" type="int" default=""/>
         <paramlist>
           <param name="OUTPUT" type="int" default=""/>
           <param name="OUTPUT" type="int" default=""/>


@@ -3822,19 +4057,31 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
       </method>
       <method name="GetClientAreaOrigin" type="Point" overloaded="no">
         <autodoc>GetClientAreaOrigin() -&gt; Point</autodoc>
       </method>
       <method name="GetClientAreaOrigin" type="Point" overloaded="no">
         <autodoc>GetClientAreaOrigin() -&gt; Point</autodoc>

+        <docstring>Get the origin of the client area of the window relative to the
+window's top left corner (the client area may be shifted because of
+the borders, scrollbars, other decorations...)</docstring>

       </method>
       <method name="GetClientRect" type="Rect" overloaded="no">
         <autodoc>GetClientRect() -&gt; Rect</autodoc>
       </method>
       <method name="GetClientRect" type="Rect" overloaded="no">
         <autodoc>GetClientRect() -&gt; Rect</autodoc>

+        <docstring>Get the client area position and size as a wx.Rect object.</docstring>

       </method>
       <method name="GetBestSize" type="Size" overloaded="no">
         <autodoc>GetBestSize() -&gt; Size</autodoc>
       </method>
       <method name="GetBestSize" type="Size" overloaded="no">
         <autodoc>GetBestSize() -&gt; Size</autodoc>

-        <docstring>Get the size best suited for the window (in fact, minimal acceptable size
-using which it will still look "nice")</docstring>
+        <docstring>This functions 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 this function will be the same as the size the window would have
+had after calling Fit.</docstring>

       </method>
       <method name="GetBestSizeTuple" type="" overloaded="no">
         <autodoc>GetBestSizeTuple() -&gt; (width, height)</autodoc>
       </method>
       <method name="GetBestSizeTuple" type="" overloaded="no">
         <autodoc>GetBestSizeTuple() -&gt; (width, height)</autodoc>

-        <docstring>Get the size best suited for the window (in fact, minimal acceptable size
-using which it will still look "nice")</docstring>
+        <docstring>This functions 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 this function will be the same as the size the window would have
+had after calling Fit.</docstring>

         <paramlist>
           <param name="OUTPUT" type="int" default=""/>
           <param name="OUTPUT" type="int" default=""/>
         <paramlist>
           <param name="OUTPUT" type="int" default=""/>
           <param name="OUTPUT" type="int" default=""/>


@@ -3842,34 +4089,65 @@ using which it will still look "nice")</docstring>
       </method>
       <method name="GetAdjustedBestSize" type="Size" overloaded="no">
         <autodoc>GetAdjustedBestSize() -&gt; Size</autodoc>
       </method>
       <method name="GetAdjustedBestSize" type="Size" overloaded="no">
         <autodoc>GetAdjustedBestSize() -&gt; Size</autodoc>

+        <docstring>This method is similar to GetBestSize, except in one
+thing. GetBestSize should return the minimum untruncated size of the
+window, while this method will return the largest of BestSize and any
+user specified minimum size. ie. it is the minimum size the window
+should currently be drawn at, not the minimal size it can possibly
+tolerate.</docstring>

       </method>
       <method name="Center" type="" overloaded="no">
         <autodoc>Center(int direction=BOTH)</autodoc>
       </method>
       <method name="Center" type="" overloaded="no">
         <autodoc>Center(int direction=BOTH)</autodoc>

+        <docstring>Centers the window.  The parameter specifies the direction for
+cetering, and may be wx.HORIZONTAL, wx.VERTICAL or wx.BOTH. It may
+also include wx.CENTER_ON_SCREEN flag if you want to center the window
+on the entire screen and not on its parent window.  If it is a
+top-level window and has no parent then it will always be centered
+relative to the screen.</docstring>

         <paramlist>
           <param name="direction" type="int" default="wxBOTH"/>
         </paramlist>
       </method>
       <method name="CenterOnScreen" type="" overloaded="no">
         <autodoc>CenterOnScreen(int dir=BOTH)</autodoc>
         <paramlist>
           <param name="direction" type="int" default="wxBOTH"/>
         </paramlist>
       </method>
       <method name="CenterOnScreen" type="" overloaded="no">
         <autodoc>CenterOnScreen(int dir=BOTH)</autodoc>

+        <docstring>Center on screen (only works for top level windows)</docstring>

         <paramlist>
           <param name="dir" type="int" default="wxBOTH"/>
         </paramlist>
       </method>
       <method name="CenterOnParent" type="" overloaded="no">
         <autodoc>CenterOnParent(int dir=BOTH)</autodoc>
         <paramlist>
           <param name="dir" type="int" default="wxBOTH"/>
         </paramlist>
       </method>
       <method name="CenterOnParent" type="" overloaded="no">
         <autodoc>CenterOnParent(int dir=BOTH)</autodoc>

+        <docstring>Center with respect to the the parent window</docstring>

         <paramlist>
           <param name="dir" type="int" default="wxBOTH"/>
         </paramlist>
       </method>
       <method name="Fit" type="" overloaded="no">
         <autodoc>Fit()</autodoc>
         <paramlist>
           <param name="dir" type="int" default="wxBOTH"/>
         </paramlist>
       </method>
       <method name="Fit" type="" overloaded="no">
         <autodoc>Fit()</autodoc>

+        <docstring>Sizes the window so that it fits around its subwindows. This function
+won't do anything if there are no subwindows and will only really work
+correctly if sizers are used for the subwindows layout. Also, if the
+window has exactly one subwindow it is better (faster and the result
+is more precise as Fit adds some margin to account for fuzziness of
+its calculations) to call window.SetClientSize(child.GetSize())
+instead of calling Fit.</docstring>

       </method>
       <method name="FitInside" type="" overloaded="no">
         <autodoc>FitInside()</autodoc>
       </method>
       <method name="FitInside" type="" overloaded="no">
         <autodoc>FitInside()</autodoc>

+        <docstring>Similar to Fit, but sizes the interior (virtual) size of a
+window. Mainly useful with scrolled windows to reset scrollbars after
+sizing changes that do not trigger a size event, and/or scrolled
+windows without an interior sizer. This function similarly won't do
+anything if there are no subwindows.</docstring>

       </method>
       <method name="SetSizeHints" type="" overloaded="no">
         <autodoc>SetSizeHints(int minW, int minH, int maxW=-1, int maxH=-1, int incW=-1, 
     int incH=-1)</autodoc>
       </method>
       <method name="SetSizeHints" type="" overloaded="no">
         <autodoc>SetSizeHints(int minW, int minH, int maxW=-1, int maxH=-1, int incW=-1, 
     int incH=-1)</autodoc>

+        <docstring>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.</docstring>

         <paramlist>
           <param name="minW" type="int" default=""/>
           <param name="minH" type="int" default=""/>
         <paramlist>
           <param name="minW" type="int" default=""/>
           <param name="minH" type="int" default=""/>


@@ -3881,6 +4159,10 @@ using which it will still look "nice")</docstring>
       </method>
       <method name="SetVirtualSizeHints" type="" overloaded="no">
         <autodoc>SetVirtualSizeHints(int minW, int minH, int maxW=-1, int maxH=-1)</autodoc>
       </method>
       <method name="SetVirtualSizeHints" type="" overloaded="no">
         <autodoc>SetVirtualSizeHints(int minW, int minH, int maxW=-1, int maxH=-1)</autodoc>

+        <docstring>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.</docstring>

         <paramlist>
           <param name="minW" type="int" default=""/>
           <param name="minH" type="int" default=""/>
         <paramlist>
           <param name="minW" type="int" default=""/>
           <param name="minH" type="int" default=""/>


@@ -3905,18 +4187,18 @@ using which it will still look "nice")</docstring>
       </method>
       <method name="SetVirtualSize" type="" overloaded="no">
         <autodoc>SetVirtualSize(Size size)</autodoc>
       </method>
       <method name="SetVirtualSize" type="" overloaded="no">
         <autodoc>SetVirtualSize(Size size)</autodoc>

-        <docstring>Set the the virtual size of a window.  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.</docstring>
+        <docstring>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.</docstring>

         <paramlist>
           <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
       <method name="SetVirtualSizeWH" type="" overloaded="no">
         <autodoc>SetVirtualSizeWH(int w, int h)</autodoc>
         <paramlist>
           <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
       <method name="SetVirtualSizeWH" type="" overloaded="no">
         <autodoc>SetVirtualSizeWH(int w, int h)</autodoc>

-        <docstring>Set the the virtual size of a window.  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.</docstring>
+        <docstring>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.</docstring>

         <paramlist>
           <param name="w" type="int" default=""/>
           <param name="h" type="int" default=""/>
         <paramlist>
           <param name="w" type="int" default=""/>
           <param name="h" type="int" default=""/>


@@ -3924,15 +4206,15 @@ less independent of the screen window size.</docstring>
       </method>
       <method name="GetVirtualSize" type="Size" overloaded="no">
         <autodoc>GetVirtualSize() -&gt; Size</autodoc>
       </method>
       <method name="GetVirtualSize" type="Size" overloaded="no">
         <autodoc>GetVirtualSize() -&gt; Size</autodoc>

-        <docstring>Get the the virtual size of the window.  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.</docstring>
+        <docstring>Get the the virtual size of the 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.</docstring>

       </method>
       <method name="GetVirtualSizeTuple" type="" overloaded="no">
         <autodoc>GetVirtualSizeTuple() -&gt; (width, height)</autodoc>
       </method>
       <method name="GetVirtualSizeTuple" type="" overloaded="no">
         <autodoc>GetVirtualSizeTuple() -&gt; (width, height)</autodoc>

-        <docstring>Get the the virtual size of the window.  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.</docstring>
+        <docstring>Get the the virtual size of the 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.</docstring>

         <paramlist>
           <param name="OUTPUT" type="int" default=""/>
           <param name="OUTPUT" type="int" default=""/>
         <paramlist>
           <param name="OUTPUT" type="int" default=""/>
           <param name="OUTPUT" type="int" default=""/>


@@ -3940,204 +4222,311 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="GetBestVirtualSize" type="Size" overloaded="no">
         <autodoc>GetBestVirtualSize() -&gt; Size</autodoc>
       </method>
       <method name="GetBestVirtualSize" type="Size" overloaded="no">
         <autodoc>GetBestVirtualSize() -&gt; Size</autodoc>

+        <docstring>Return the largest of ClientSize and BestSize (as determined by a
+sizer, interior children, or other means)</docstring>

       </method>
       <method name="Show" type="bool" overloaded="no">
         <autodoc>Show(bool show=True) -&gt; bool</autodoc>
       </method>
       <method name="Show" type="bool" overloaded="no">
         <autodoc>Show(bool show=True) -&gt; bool</autodoc>

+        <docstring>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
+the window has been shown or hidden or False if nothing was done
+because it already was in the requested state.</docstring>

         <paramlist>
           <param name="show" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="Hide" type="bool" overloaded="no">
         <autodoc>Hide() -&gt; bool</autodoc>
         <paramlist>
           <param name="show" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="Hide" type="bool" overloaded="no">
         <autodoc>Hide() -&gt; bool</autodoc>

+        <docstring>Equivalent to calling Show(False).</docstring>

       </method>
       <method name="Enable" type="bool" overloaded="no">
         <autodoc>Enable(bool enable=True) -&gt; bool</autodoc>
       </method>
       <method name="Enable" type="bool" overloaded="no">
         <autodoc>Enable(bool enable=True) -&gt; bool</autodoc>

+        <docstring>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
+has been enabled or disabled, false if nothing was done, i.e. if the
+window had already been in the specified state.</docstring>

         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="Disable" type="bool" overloaded="no">
         <autodoc>Disable() -&gt; bool</autodoc>
         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="Disable" type="bool" overloaded="no">
         <autodoc>Disable() -&gt; bool</autodoc>

+        <docstring>Disables the window, same as Enable(false).</docstring>

       </method>
       <method name="IsShown" type="bool" overloaded="no">
         <autodoc>IsShown() -&gt; bool</autodoc>
       </method>
       <method name="IsShown" type="bool" overloaded="no">
         <autodoc>IsShown() -&gt; bool</autodoc>

+        <docstring>Returns true if the window is shown, false if it has been hidden.</docstring>

       </method>
       <method name="IsEnabled" type="bool" overloaded="no">
         <autodoc>IsEnabled() -&gt; bool</autodoc>
       </method>
       <method name="IsEnabled" type="bool" overloaded="no">
         <autodoc>IsEnabled() -&gt; bool</autodoc>

+        <docstring>Returns true if the window is enabled for input, false otherwise.</docstring>

       </method>
       <method name="SetWindowStyleFlag" type="" overloaded="no">
         <autodoc>SetWindowStyleFlag(long style)</autodoc>
       </method>
       <method name="SetWindowStyleFlag" type="" overloaded="no">
         <autodoc>SetWindowStyleFlag(long style)</autodoc>

+        <docstring>Sets the style of the window. Please note that some styles cannot be
+changed after the window creation and that Refresh() might be called
+after changing the others for the change to take place immediately.</docstring>

         <paramlist>
           <param name="style" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetWindowStyleFlag" type="long" overloaded="no">
         <autodoc>GetWindowStyleFlag() -&gt; long</autodoc>
         <paramlist>
           <param name="style" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetWindowStyleFlag" type="long" overloaded="no">
         <autodoc>GetWindowStyleFlag() -&gt; long</autodoc>

-      </method>
-      <method name="SetWindowStyle" type="" overloaded="no">
-        <autodoc>SetWindowStyle(long style)</autodoc>
-        <paramlist>
-          <param name="style" type="long" default=""/>
-        </paramlist>
-      </method>
-      <method name="GetWindowStyle" type="long" overloaded="no">
-        <autodoc>GetWindowStyle() -&gt; long</autodoc>
+        <docstring>Gets the window style that was passed to the constructor or Create
+method.</docstring>

       </method>
       <method name="HasFlag" type="bool" overloaded="no">
         <autodoc>HasFlag(int flag) -&gt; bool</autodoc>
       </method>
       <method name="HasFlag" type="bool" overloaded="no">
         <autodoc>HasFlag(int flag) -&gt; bool</autodoc>

+        <docstring>Test if the given style is set for this window.</docstring>

         <paramlist>
           <param name="flag" type="int" default=""/>
         </paramlist>
       </method>
       <method name="IsRetained" type="bool" overloaded="no">
         <autodoc>IsRetained() -&gt; bool</autodoc>
         <paramlist>
           <param name="flag" type="int" default=""/>
         </paramlist>
       </method>
       <method name="IsRetained" type="bool" overloaded="no">
         <autodoc>IsRetained() -&gt; bool</autodoc>

+        <docstring>Returns true if the window is retained, false otherwise.  Retained
+windows are only available on X platforms.</docstring>

       </method>
       <method name="SetExtraStyle" type="" overloaded="no">
         <autodoc>SetExtraStyle(long exStyle)</autodoc>
       </method>
       <method name="SetExtraStyle" type="" overloaded="no">
         <autodoc>SetExtraStyle(long exStyle)</autodoc>

+        <docstring>Sets the extra style bits for the window.  Extra styles are the less
+often used style bits which can't be set with the constructor or with
+SetWindowStyleFlag()</docstring>

         <paramlist>
           <param name="exStyle" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetExtraStyle" type="long" overloaded="no">
         <autodoc>GetExtraStyle() -&gt; long</autodoc>
         <paramlist>
           <param name="exStyle" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetExtraStyle" type="long" overloaded="no">
         <autodoc>GetExtraStyle() -&gt; long</autodoc>

+        <docstring>Returns the extra style bits for the window.</docstring>

       </method>
       <method name="MakeModal" type="" overloaded="no">
         <autodoc>MakeModal(bool modal=True)</autodoc>
       </method>
       <method name="MakeModal" type="" overloaded="no">
         <autodoc>MakeModal(bool modal=True)</autodoc>

+        <docstring>Disables all other windows in the application so that the user can
+only interact with this window.  Passing False will reverse this
+effect.</docstring>

         <paramlist>
           <param name="modal" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="SetThemeEnabled" type="" overloaded="no">
         <autodoc>SetThemeEnabled(bool enableTheme)</autodoc>
         <paramlist>
           <param name="modal" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="SetThemeEnabled" type="" overloaded="no">
         <autodoc>SetThemeEnabled(bool enableTheme)</autodoc>

+        <docstring>This function tells a window if it should use the system's "theme"
+ code to draw the windows' background instead if its own background
+ drawing code. This will only have an effect on platforms that support
+ the notion of themes in user defined windows. One such platform is
+ GTK+ where windows can have (very colourful) backgrounds defined by a
+ user's selected theme.
+
+Dialogs, notebook pages and the status bar have this flag set to true
+by default so that the default look and feel is simulated best.</docstring>

         <paramlist>
           <param name="enableTheme" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="GetThemeEnabled" type="bool" overloaded="no">
         <autodoc>GetThemeEnabled() -&gt; bool</autodoc>
         <paramlist>
           <param name="enableTheme" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="GetThemeEnabled" type="bool" overloaded="no">
         <autodoc>GetThemeEnabled() -&gt; bool</autodoc>

-      </method>
-      <method name="ShouldInheritColours" type="bool" overloaded="no">
-        <autodoc>ShouldInheritColours() -&gt; bool</autodoc>
+        <docstring>Return the themeEnabled flag.</docstring>

       </method>
       <method name="SetFocus" type="" overloaded="no">
         <autodoc>SetFocus()</autodoc>
       </method>
       <method name="SetFocus" type="" overloaded="no">
         <autodoc>SetFocus()</autodoc>

+        <docstring>Set's the focus to this window, allowing it to receive keyboard input.</docstring>

       </method>
       <method name="SetFocusFromKbd" type="" overloaded="no">
         <autodoc>SetFocusFromKbd()</autodoc>
       </method>
       <method name="SetFocusFromKbd" type="" overloaded="no">
         <autodoc>SetFocusFromKbd()</autodoc>

+        <docstring>Set focus to this window as the result of a keyboard action.  Normally
+only called internally.</docstring>

       </method>
       <staticmethod name="FindFocus" type="Window" overloaded="no">
       </method>
       <staticmethod name="FindFocus" type="Window" overloaded="no">

-        <autodoc>Window.FindFocus() -&gt; Window</autodoc>
+        <autodoc>FindFocus() -&gt; Window</autodoc>
+        <docstring>Returns the window or control that currently has the keyboard focus,
+or None.</docstring>

       </staticmethod>
       <method name="AcceptsFocus" type="bool" overloaded="no">
         <autodoc>AcceptsFocus() -&gt; bool</autodoc>
       </staticmethod>
       <method name="AcceptsFocus" type="bool" overloaded="no">
         <autodoc>AcceptsFocus() -&gt; bool</autodoc>

+        <docstring>Can this window have focus?</docstring>

       </method>
       <method name="AcceptsFocusFromKeyboard" type="bool" overloaded="no">
         <autodoc>AcceptsFocusFromKeyboard() -&gt; bool</autodoc>
       </method>
       <method name="AcceptsFocusFromKeyboard" type="bool" overloaded="no">
         <autodoc>AcceptsFocusFromKeyboard() -&gt; bool</autodoc>

+        <docstring>Can this window be given focus by keyboard navigation? if not, the
+only way to give it focus (provided it accepts it at all) is to click
+it.</docstring>

       </method>
       <method name="GetDefaultItem" type="Window" overloaded="no">
         <autodoc>GetDefaultItem() -&gt; Window</autodoc>
       </method>
       <method name="GetDefaultItem" type="Window" overloaded="no">
         <autodoc>GetDefaultItem() -&gt; Window</autodoc>

+        <docstring>Get the default child of this parent, i.e. the one which is activated
+by pressing &lt;Enter&gt; such as the OK button on a wx.Dialog.</docstring>

       </method>
       <method name="SetDefaultItem" type="Window" overloaded="no">
         <autodoc>SetDefaultItem(Window child) -&gt; Window</autodoc>
       </method>
       <method name="SetDefaultItem" type="Window" overloaded="no">
         <autodoc>SetDefaultItem(Window child) -&gt; Window</autodoc>

+        <docstring>Set this child as default, return the old default.</docstring>

         <paramlist>
           <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="SetTmpDefaultItem" type="" overloaded="no">
         <autodoc>SetTmpDefaultItem(Window win)</autodoc>
         <paramlist>
           <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="SetTmpDefaultItem" type="" overloaded="no">
         <autodoc>SetTmpDefaultItem(Window win)</autodoc>

+        <docstring>Set this child as temporary default</docstring>

         <paramlist>
           <param name="win" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="GetChildren" type="PyObject" overloaded="no">
         <autodoc>GetChildren() -&gt; PyObject</autodoc>
         <paramlist>
           <param name="win" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="GetChildren" type="PyObject" overloaded="no">
         <autodoc>GetChildren() -&gt; PyObject</autodoc>

+        <docstring>Returns a list of the window's children.  NOTE: Currently this is a
+copy of the child window list maintained by the window, so the return
+value of this function is only valid as long as the window's children
+do not change.</docstring>

       </method>
       <method name="GetParent" type="Window" overloaded="no">
         <autodoc>GetParent() -&gt; Window</autodoc>
       </method>
       <method name="GetParent" type="Window" overloaded="no">
         <autodoc>GetParent() -&gt; Window</autodoc>

+        <docstring>Returns the parent window of this window, or None if there isn't one.</docstring>

       </method>
       <method name="GetGrandParent" type="Window" overloaded="no">
         <autodoc>GetGrandParent() -&gt; Window</autodoc>
       </method>
       <method name="GetGrandParent" type="Window" overloaded="no">
         <autodoc>GetGrandParent() -&gt; Window</autodoc>

+        <docstring>Returns the parent of the parent of this window, or None if there isn't one.</docstring>

       </method>
       <method name="IsTopLevel" type="bool" overloaded="no">
         <autodoc>IsTopLevel() -&gt; bool</autodoc>
       </method>
       <method name="IsTopLevel" type="bool" overloaded="no">
         <autodoc>IsTopLevel() -&gt; bool</autodoc>

+        <docstring>Returns true if the given window is a top-level one. Currently all
+frames and dialogs are always considered to be top-level windows (even
+if they have a parent window).</docstring>

       </method>
       <method name="Reparent" type="bool" overloaded="no">
         <autodoc>Reparent(Window newParent) -&gt; bool</autodoc>
       </method>
       <method name="Reparent" type="bool" overloaded="no">
         <autodoc>Reparent(Window newParent) -&gt; bool</autodoc>

+        <docstring>Reparents the window, i.e the window will be removed from its current
+parent window (e.g. a non-standard toolbar in a wxFrame) and then
+re-inserted into another. Available on Windows and GTK.  Returns True
+if the parent was changed, False otherwise (error or newParent ==
+oldParent)</docstring>

         <paramlist>
           <param name="newParent" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="AddChild" type="" overloaded="no">
         <autodoc>AddChild(Window child)</autodoc>
         <paramlist>
           <param name="newParent" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="AddChild" type="" overloaded="no">
         <autodoc>AddChild(Window child)</autodoc>

+        <docstring>Adds a child window. This is called automatically by window creation
+functions so should not be required by the application programmer.</docstring>

         <paramlist>
           <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="RemoveChild" type="" overloaded="no">
         <autodoc>RemoveChild(Window child)</autodoc>
         <paramlist>
           <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="RemoveChild" type="" overloaded="no">
         <autodoc>RemoveChild(Window child)</autodoc>

+        <docstring>Removes a child window. This is called automatically by window
+deletion functions so should not be required by the application
+programmer.</docstring>

         <paramlist>
           <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="FindWindowById" type="Window" overloaded="no">
         <autodoc>FindWindowById(long winid) -&gt; Window</autodoc>
         <paramlist>
           <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="FindWindowById" type="Window" overloaded="no">
         <autodoc>FindWindowById(long winid) -&gt; Window</autodoc>

+        <docstring>Find a chld of this window by window ID</docstring>

         <paramlist>
           <param name="winid" type="long" default=""/>
         </paramlist>
       </method>
       <method name="FindWindowByName" type="Window" overloaded="no">
         <autodoc>FindWindowByName(String name) -&gt; Window</autodoc>
         <paramlist>
           <param name="winid" type="long" default=""/>
         </paramlist>
       </method>
       <method name="FindWindowByName" type="Window" overloaded="no">
         <autodoc>FindWindowByName(String name) -&gt; Window</autodoc>

+        <docstring>Find a child of this window by name</docstring>

         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetEventHandler" type="EvtHandler" overloaded="no">
         <autodoc>GetEventHandler() -&gt; EvtHandler</autodoc>
         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetEventHandler" type="EvtHandler" overloaded="no">
         <autodoc>GetEventHandler() -&gt; EvtHandler</autodoc>

+        <docstring>Returns the event handler for this window. By default, the window is
+its own event handler.</docstring>

       </method>
       <method name="SetEventHandler" type="" overloaded="no">
         <autodoc>SetEventHandler(EvtHandler handler)</autodoc>
       </method>
       <method name="SetEventHandler" type="" overloaded="no">
         <autodoc>SetEventHandler(EvtHandler handler)</autodoc>

+        <docstring>Sets the event handler for this window.  An event handler is an object
+that is capable of processing the events sent to a window. By default,
+the window is its own event handler, but an application may wish to
+substitute another, for example to allow central implementation of
+event-handling for a variety of different window classes.
+
+It is usually better to use wx.Window.PushEventHandler since this sets
+up a chain of event handlers, where an event not handled by one event
+handler is handed to the next one in the chain.</docstring>

         <paramlist>
           <param name="handler" type="EvtHandler" default=""/>
         </paramlist>
       </method>
       <method name="PushEventHandler" type="" overloaded="no">
         <autodoc>PushEventHandler(EvtHandler handler)</autodoc>
         <paramlist>
           <param name="handler" type="EvtHandler" default=""/>
         </paramlist>
       </method>
       <method name="PushEventHandler" type="" overloaded="no">
         <autodoc>PushEventHandler(EvtHandler handler)</autodoc>

+        <docstring>Pushes this event handler onto the event handler stack for the window.
+An event handler is an object that is capable of processing the events
+sent to a window. By default, the window is its own event handler, but
+an application may wish to substitute another, for example to allow
+central implementation of event-handling for a variety of different
+window classes.
+
+wx.Window.PushEventHandler allows an application to set up a chain of
+event handlers, where an event not handled by one event handler is
+handed to the next one in the chain. Use wx.Window.PopEventHandler to
+remove the event handler.</docstring>

         <paramlist>
           <param name="handler" type="EvtHandler" default=""/>
         </paramlist>
       </method>
       <method name="PopEventHandler" type="EvtHandler" overloaded="no">
         <autodoc>PopEventHandler(bool deleteHandler=False) -&gt; EvtHandler</autodoc>
         <paramlist>
           <param name="handler" type="EvtHandler" default=""/>
         </paramlist>
       </method>
       <method name="PopEventHandler" type="EvtHandler" overloaded="no">
         <autodoc>PopEventHandler(bool deleteHandler=False) -&gt; EvtHandler</autodoc>

+        <docstring>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.</docstring>

         <paramlist>
           <param name="deleteHandler" type="bool" default="False"/>
         </paramlist>
       </method>
       <method name="RemoveEventHandler" type="bool" overloaded="no">
         <autodoc>RemoveEventHandler(EvtHandler handler) -&gt; bool</autodoc>
         <paramlist>
           <param name="deleteHandler" type="bool" default="False"/>
         </paramlist>
       </method>
       <method name="RemoveEventHandler" type="bool" overloaded="no">
         <autodoc>RemoveEventHandler(EvtHandler handler) -&gt; bool</autodoc>

+        <docstring>Find the given handler in the event handler chain and remove (but
+not delete) it from the event handler chain, return True if it was
+found and False otherwise (this also results in an assert failure so
+this function should only be called when the handler is supposed to
+be there.)</docstring>

         <paramlist>
           <param name="handler" type="EvtHandler" default=""/>
         </paramlist>
       </method>
       <method name="SetValidator" type="" overloaded="no">
         <autodoc>SetValidator(Validator validator)</autodoc>
         <paramlist>
           <param name="handler" type="EvtHandler" default=""/>
         </paramlist>
       </method>
       <method name="SetValidator" type="" overloaded="no">
         <autodoc>SetValidator(Validator validator)</autodoc>

+        <docstring>Deletes the current validator (if any) and sets the window validator,
+having called wx.Validator.Clone to create a new validator of this
+type.</docstring>

         <paramlist>
           <param name="validator" type="wxValidator" default=""/>
         </paramlist>
       </method>
       <method name="GetValidator" type="wxValidator" overloaded="no">
         <autodoc>GetValidator() -&gt; Validator</autodoc>
         <paramlist>
           <param name="validator" type="wxValidator" default=""/>
         </paramlist>
       </method>
       <method name="GetValidator" type="wxValidator" overloaded="no">
         <autodoc>GetValidator() -&gt; Validator</autodoc>

+        <docstring>Returns a pointer to the current validator for the window, or None if
+there is none.</docstring>

       </method>
       <method name="SetAcceleratorTable" type="" overloaded="no">
         <autodoc>SetAcceleratorTable(AcceleratorTable accel)</autodoc>
       </method>
       <method name="SetAcceleratorTable" type="" overloaded="no">
         <autodoc>SetAcceleratorTable(AcceleratorTable accel)</autodoc>

+        <docstring>Sets the accelerator table for this window.</docstring>

         <paramlist>
           <param name="accel" type="AcceleratorTable" default=""/>
         </paramlist>
       </method>
       <method name="GetAcceleratorTable" type="AcceleratorTable" overloaded="no">
         <autodoc>GetAcceleratorTable() -&gt; AcceleratorTable</autodoc>
         <paramlist>
           <param name="accel" type="AcceleratorTable" default=""/>
         </paramlist>
       </method>
       <method name="GetAcceleratorTable" type="AcceleratorTable" overloaded="no">
         <autodoc>GetAcceleratorTable() -&gt; AcceleratorTable</autodoc>

+        <docstring>Gets the accelerator table for this window.</docstring>

       </method>
       <method name="RegisterHotKey" type="bool" overloaded="no">
         <autodoc>RegisterHotKey(int hotkeyId, int modifiers, int keycode) -&gt; bool</autodoc>
       </method>
       <method name="RegisterHotKey" type="bool" overloaded="no">
         <autodoc>RegisterHotKey(int hotkeyId, int modifiers, int keycode) -&gt; bool</autodoc>

+        <docstring>Registers a system wide hotkey. Every time the user presses the hotkey
+registered here, this window will receive a hotkey event. It will
+receive the event even if the application is in the background and
+does not have the input focus because the user is working with some
+other application.  To bind an event handler function to this hotkey
+use EVT_HOTKEY with an id equal to hotkeyId.  Returns True if the
+hotkey was registered successfully.</docstring>

         <paramlist>
           <param name="hotkeyId" type="int" default=""/>
           <param name="modifiers" type="int" default=""/>
         <paramlist>
           <param name="hotkeyId" type="int" default=""/>
           <param name="modifiers" type="int" default=""/>


@@ -4146,30 +4535,55 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="UnregisterHotKey" type="bool" overloaded="no">
         <autodoc>UnregisterHotKey(int hotkeyId) -&gt; bool</autodoc>
       </method>
       <method name="UnregisterHotKey" type="bool" overloaded="no">
         <autodoc>UnregisterHotKey(int hotkeyId) -&gt; bool</autodoc>

+        <docstring>Unregisters a system wide hotkey.</docstring>

         <paramlist>
           <param name="hotkeyId" type="int" default=""/>
         </paramlist>
       </method>
       <method name="ConvertDialogPointToPixels" type="Point" overloaded="no">
         <autodoc>ConvertDialogPointToPixels(Point pt) -&gt; Point</autodoc>
         <paramlist>
           <param name="hotkeyId" type="int" default=""/>
         </paramlist>
       </method>
       <method name="ConvertDialogPointToPixels" type="Point" overloaded="no">
         <autodoc>ConvertDialogPointToPixels(Point pt) -&gt; Point</autodoc>

+        <docstring>Converts a point or size from dialog units to pixels.  Dialog units
+are used for maintaining a dialog's proportions even if the font
+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.</docstring>

         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="ConvertDialogSizeToPixels" type="Size" overloaded="no">
         <autodoc>ConvertDialogSizeToPixels(Size sz) -&gt; Size</autodoc>
         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="ConvertDialogSizeToPixels" type="Size" overloaded="no">
         <autodoc>ConvertDialogSizeToPixels(Size sz) -&gt; Size</autodoc>

+        <docstring>Converts a point or size from dialog units to pixels.  Dialog units
+are used for maintaining a dialog's proportions even if the font
+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.</docstring>

         <paramlist>
           <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
       <method name="DLG_PNT" type="Point" overloaded="no">
         <autodoc>DLG_PNT(Point pt) -&gt; Point</autodoc>
         <paramlist>
           <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
       <method name="DLG_PNT" type="Point" overloaded="no">
         <autodoc>DLG_PNT(Point pt) -&gt; Point</autodoc>

+        <docstring>Converts a point or size from dialog units to pixels.  Dialog units
+are used for maintaining a dialog's proportions even if the font
+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.</docstring>

         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="DLG_SZE" type="Size" overloaded="no">
         <autodoc>DLG_SZE(Size sz) -&gt; Size</autodoc>
         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="DLG_SZE" type="Size" overloaded="no">
         <autodoc>DLG_SZE(Size sz) -&gt; Size</autodoc>

+        <docstring>Converts a point or size from dialog units to pixels.  Dialog units
+are used for maintaining a dialog's proportions even if the font
+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.</docstring>

         <paramlist>
           <param name="sz" type="Size" default=""/>
         </paramlist>
         <paramlist>
           <param name="sz" type="Size" default=""/>
         </paramlist>


@@ -4188,6 +4602,10 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="WarpPointer" type="" overloaded="no">
         <autodoc>WarpPointer(int x, int y)</autodoc>
       </method>
       <method name="WarpPointer" type="" overloaded="no">
         <autodoc>WarpPointer(int x, int y)</autodoc>

+        <docstring>Moves the pointer to the given position on the window.
+
+NOTE: This function is not supported under Mac because Apple Human
+Interface Guidelines forbid moving the mouse cursor programmatically.</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -4195,18 +4613,32 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="CaptureMouse" type="" overloaded="no">
         <autodoc>CaptureMouse()</autodoc>
       </method>
       <method name="CaptureMouse" type="" overloaded="no">
         <autodoc>CaptureMouse()</autodoc>

+        <docstring>Directs all mouse input to this window. Call wx.Window.ReleaseMouse to
+release the capture.
+
+Note that wxWindows maintains the stack of windows having captured the
+mouse and when the mouse is released the capture returns to the window
+which had had captured it previously and it is only really released if
+there were no previous window. In particular, this means that you must
+release the mouse as many times as you capture it.</docstring>

       </method>
       <method name="ReleaseMouse" type="" overloaded="no">
         <autodoc>ReleaseMouse()</autodoc>
       </method>
       <method name="ReleaseMouse" type="" overloaded="no">
         <autodoc>ReleaseMouse()</autodoc>

+        <docstring>Releases mouse input captured with wx.Window.CaptureMouse.</docstring>

       </method>
       <staticmethod name="GetCapture" type="Window" overloaded="no">
       </method>
       <staticmethod name="GetCapture" type="Window" overloaded="no">

-        <autodoc>Window.GetCapture() -&gt; Window</autodoc>
+        <autodoc>GetCapture() -&gt; Window</autodoc>
+        <docstring>Returns the window which currently captures the mouse or None</docstring>

       </staticmethod>
       <method name="HasCapture" type="bool" overloaded="no">
         <autodoc>HasCapture() -&gt; bool</autodoc>
       </staticmethod>
       <method name="HasCapture" type="bool" overloaded="no">
         <autodoc>HasCapture() -&gt; bool</autodoc>

+        <docstring>Returns true if this window has the current mouse capture.</docstring>

       </method>
       <method name="Refresh" type="" overloaded="no">
         <autodoc>Refresh(bool eraseBackground=True, Rect rect=None)</autodoc>
       </method>
       <method name="Refresh" type="" overloaded="no">
         <autodoc>Refresh(bool eraseBackground=True, Rect rect=None)</autodoc>

+        <docstring>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
+to the window.</docstring>

         <paramlist>
           <param name="eraseBackground" type="bool" default="True"/>
           <param name="rect" type="Rect" default="NULL"/>
         <paramlist>
           <param name="eraseBackground" type="bool" default="True"/>
           <param name="rect" type="Rect" default="NULL"/>


@@ -4214,36 +4646,70 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="RefreshRect" type="" overloaded="no">
         <autodoc>RefreshRect(Rect rect)</autodoc>
       </method>
       <method name="RefreshRect" type="" overloaded="no">
         <autodoc>RefreshRect(Rect rect)</autodoc>

+        <docstring>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.</docstring>

         <paramlist>
           <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="Update" type="" overloaded="no">
         <autodoc>Update()</autodoc>
         <paramlist>
           <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="Update" type="" overloaded="no">
         <autodoc>Update()</autodoc>

+        <docstring>Calling this method immediately repaints the invalidated area of the
+window instead of waiting for the EVT_PAINT event to happen, (normally
+this would usually only happen when the flow of control returns to the
+event loop.)  Notice that this function doesn't refresh the window and
+does nothing if the window has been already repainted.  Use Refresh
+first if you want to immediately redraw the window (or some portion of
+it) unconditionally.</docstring>

       </method>
       <method name="ClearBackground" type="" overloaded="no">
         <autodoc>ClearBackground()</autodoc>
       </method>
       <method name="ClearBackground" type="" overloaded="no">
         <autodoc>ClearBackground()</autodoc>

+        <docstring>Clears the window by filling it with the current background
+colour. Does not cause an erase background event to be generated.</docstring>

       </method>
       <method name="Freeze" type="" overloaded="no">
         <autodoc>Freeze()</autodoc>
       </method>
       <method name="Freeze" type="" overloaded="no">
         <autodoc>Freeze()</autodoc>

+        <docstring>Freezes the window or, in other words, prevents any updates from taking place
+on screen, the window is not redrawn at all. Thaw must be called to reenable
+window redrawing.  Calls to Freeze/Thaw may be nested, with the actual Thaw
+being delayed until all the nesting has been undone.
+
+This method is useful for visual appearance optimization (for example,
+it is a good idea to use it before inserting large amount of text into
+a wxTextCtrl under wxGTK) but is not implemented on all platforms nor
+for all controls so it is mostly just a hint to wxWindows and not a
+mandatory directive.</docstring>

       </method>
       <method name="Thaw" type="" overloaded="no">
         <autodoc>Thaw()</autodoc>
       </method>
       <method name="Thaw" type="" overloaded="no">
         <autodoc>Thaw()</autodoc>

+        <docstring>Reenables window updating after a previous call to Freeze.  Calls to
+Freeze/Thaw may be nested, so Thaw must be called the same number of times
+that Freeze was before the window will be updated.</docstring>

       </method>
       <method name="PrepareDC" type="" overloaded="no">
         <autodoc>PrepareDC(DC dc)</autodoc>
       </method>
       <method name="PrepareDC" type="" overloaded="no">
         <autodoc>PrepareDC(DC dc)</autodoc>

+        <docstring>Call this function to prepare the device context for drawing a
+scrolled image. It sets the device origin according to the current
+scroll position.</docstring>

         <paramlist>
           <param name="dc" type="wxDC" default=""/>
         </paramlist>
       </method>
       <method name="GetUpdateRegion" type="wxRegion" overloaded="no">
         <autodoc>GetUpdateRegion() -&gt; Region</autodoc>
         <paramlist>
           <param name="dc" type="wxDC" default=""/>
         </paramlist>
       </method>
       <method name="GetUpdateRegion" type="wxRegion" overloaded="no">
         <autodoc>GetUpdateRegion() -&gt; Region</autodoc>

+        <docstring>Returns the region specifying which parts of the window have been
+damaged. Should only be called within an EVT_PAINT handler.</docstring>

       </method>
       <method name="GetUpdateClientRect" type="Rect" overloaded="no">
         <autodoc>GetUpdateClientRect() -&gt; Rect</autodoc>
       </method>
       <method name="GetUpdateClientRect" type="Rect" overloaded="no">
         <autodoc>GetUpdateClientRect() -&gt; Rect</autodoc>

+        <docstring>Get the update rectangle region bounding box in client coords.</docstring>

       </method>
       <method name="IsExposed" type="bool" overloaded="no">
         <autodoc>IsExposed(int x, int y, int w=1, int h=1) -&gt; bool</autodoc>
       </method>
       <method name="IsExposed" type="bool" overloaded="no">
         <autodoc>IsExposed(int x, int y, int w=1, int h=1) -&gt; bool</autodoc>

+        <docstring>Returns true if the given point or rectangle area has been exposed
+since the last repaint. Call this in an paint event handler to
+optimize redrawing by only redrawing those areas, which have been
+exposed.</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -4253,66 +4719,107 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="IsExposedPoint" type="bool" overloaded="no">
         <autodoc>IsExposedPoint(Point pt) -&gt; bool</autodoc>
       </method>
       <method name="IsExposedPoint" type="bool" overloaded="no">
         <autodoc>IsExposedPoint(Point pt) -&gt; bool</autodoc>

+        <docstring>Returns true if the given point or rectangle area has been exposed
+since the last repaint. Call this in an paint event handler to
+optimize redrawing by only redrawing those areas, which have been
+exposed.</docstring>

         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>

-      <method name="isExposedRect" type="bool" overloaded="no">
-        <autodoc>isExposedRect(Rect rect) -&gt; bool</autodoc>
+      <method name="IsExposedRect" type="bool" overloaded="no">
+        <autodoc>IsExposedRect(Rect rect) -&gt; bool</autodoc>
+        <docstring>Returns true if the given point or rectangle area has been exposed
+since the last repaint. Call this in an paint event handler to
+optimize redrawing by only redrawing those areas, which have been
+exposed.</docstring>

         <paramlist>
           <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="SetBackgroundColour" type="bool" overloaded="no">
         <autodoc>SetBackgroundColour(Colour colour) -&gt; bool</autodoc>
         <paramlist>
           <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="SetBackgroundColour" type="bool" overloaded="no">
         <autodoc>SetBackgroundColour(Colour colour) -&gt; bool</autodoc>

+        <docstring>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.
+
+Note that setting the background colour does not cause an immediate
+refresh, so you may wish to call ClearBackground or Refresh after
+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.</docstring>

         <paramlist>
           <param name="colour" type="wxColour" default=""/>
         </paramlist>
       </method>
       <method name="SetForegroundColour" type="bool" overloaded="no">
         <autodoc>SetForegroundColour(Colour colour) -&gt; bool</autodoc>
         <paramlist>
           <param name="colour" type="wxColour" default=""/>
         </paramlist>
       </method>
       <method name="SetForegroundColour" type="bool" overloaded="no">
         <autodoc>SetForegroundColour(Colour colour) -&gt; bool</autodoc>

+        <docstring>Sets the foreground colour of the window.  Returns True is the colour
+was changed.  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.</docstring>

         <paramlist>
           <param name="colour" type="wxColour" default=""/>
         </paramlist>
       </method>
       <method name="GetBackgroundColour" type="wxColour" overloaded="no">
         <autodoc>GetBackgroundColour() -&gt; Colour</autodoc>
         <paramlist>
           <param name="colour" type="wxColour" default=""/>
         </paramlist>
       </method>
       <method name="GetBackgroundColour" type="wxColour" overloaded="no">
         <autodoc>GetBackgroundColour() -&gt; Colour</autodoc>

+        <docstring>Returns the background colour of the window.</docstring>

       </method>
       <method name="GetForegroundColour" type="wxColour" overloaded="no">
         <autodoc>GetForegroundColour() -&gt; Colour</autodoc>
       </method>
       <method name="GetForegroundColour" type="wxColour" overloaded="no">
         <autodoc>GetForegroundColour() -&gt; Colour</autodoc>

+        <docstring>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.</docstring>

       </method>
       <method name="SetCursor" type="bool" overloaded="no">
         <autodoc>SetCursor(Cursor cursor) -&gt; bool</autodoc>
       </method>
       <method name="SetCursor" type="bool" overloaded="no">
         <autodoc>SetCursor(Cursor cursor) -&gt; bool</autodoc>

+        <docstring>Sets the window's cursor. Notice that the window cursor also sets it
+for the children of the window implicitly.
+
+The cursor may be wx.NullCursor in which case the window cursor will
+be reset back to default.</docstring>

         <paramlist>
           <param name="cursor" type="wxCursor" default=""/>
         </paramlist>
       </method>
       <method name="GetCursor" type="wxCursor" overloaded="no">
         <autodoc>GetCursor() -&gt; Cursor</autodoc>
         <paramlist>
           <param name="cursor" type="wxCursor" default=""/>
         </paramlist>
       </method>
       <method name="GetCursor" type="wxCursor" overloaded="no">
         <autodoc>GetCursor() -&gt; Cursor</autodoc>

+        <docstring>Return the cursor associated with this window.</docstring>

       </method>
       <method name="SetFont" type="bool" overloaded="no">
         <autodoc>SetFont(Font font) -&gt; bool</autodoc>
       </method>
       <method name="SetFont" type="bool" overloaded="no">
         <autodoc>SetFont(Font font) -&gt; bool</autodoc>

+        <docstring>Sets the font for this window.</docstring>

         <paramlist>
           <param name="font" type="wxFont" default=""/>
         </paramlist>
       </method>
       <method name="GetFont" type="wxFont" overloaded="no">
         <autodoc>GetFont() -&gt; Font</autodoc>
         <paramlist>
           <param name="font" type="wxFont" default=""/>
         </paramlist>
       </method>
       <method name="GetFont" type="wxFont" overloaded="no">
         <autodoc>GetFont() -&gt; Font</autodoc>

+        <docstring>Returns the default font used for this window.</docstring>

       </method>
       <method name="SetCaret" type="" overloaded="no">
         <autodoc>SetCaret(Caret caret)</autodoc>
       </method>
       <method name="SetCaret" type="" overloaded="no">
         <autodoc>SetCaret(Caret caret)</autodoc>

+        <docstring>Sets the caret associated with the window.</docstring>

         <paramlist>
           <param name="caret" type="wxCaret" default=""/>
         </paramlist>
       </method>
       <method name="GetCaret" type="wxCaret" overloaded="no">
         <autodoc>GetCaret() -&gt; Caret</autodoc>
         <paramlist>
           <param name="caret" type="wxCaret" default=""/>
         </paramlist>
       </method>
       <method name="GetCaret" type="wxCaret" overloaded="no">
         <autodoc>GetCaret() -&gt; Caret</autodoc>

+        <docstring>Returns the caret associated with the window.</docstring>

       </method>
       <method name="GetCharHeight" type="int" overloaded="no">
         <autodoc>GetCharHeight() -&gt; int</autodoc>
       </method>
       <method name="GetCharHeight" type="int" overloaded="no">
         <autodoc>GetCharHeight() -&gt; int</autodoc>

+        <docstring>Get the (average) character size for the current font.</docstring>

       </method>
       <method name="GetCharWidth" type="int" overloaded="no">
         <autodoc>GetCharWidth() -&gt; int</autodoc>
       </method>
       <method name="GetCharWidth" type="int" overloaded="no">
         <autodoc>GetCharWidth() -&gt; int</autodoc>

+        <docstring>Get the (average) character size for the current font.</docstring>

       </method>
       <method name="GetTextExtent" type="" overloaded="no">
         <autodoc>GetTextExtent(String string) -&gt; (width, height)</autodoc>
       </method>
       <method name="GetTextExtent" type="" overloaded="no">
         <autodoc>GetTextExtent(String string) -&gt; (width, height)</autodoc>


@@ -4326,7 +4833,8 @@ more or less independent of the screen window size.</docstring>
       <method name="GetFullTextExtent" type="" overloaded="no">
         <autodoc>GetFullTextExtent(String string, Font font=None) -&gt;
    (width, height, descent, externalLeading)</autodoc>
       <method name="GetFullTextExtent" type="" overloaded="no">
         <autodoc>GetFullTextExtent(String string, Font font=None) -&gt;
    (width, height, descent, externalLeading)</autodoc>

-        <docstring>Get the width, height, decent and leading of the text using the current or specified font.</docstring>
+        <docstring>Get the width, height, decent and leading of the text using the
+current or specified font.</docstring>

         <paramlist>
           <param name="string" type="String" default=""/>
           <param name="OUTPUT" type="int" default=""/>
         <paramlist>
           <param name="string" type="String" default=""/>
           <param name="OUTPUT" type="int" default=""/>


@@ -4337,14 +4845,16 @@ more or less independent of the screen window size.</docstring>
         </paramlist>
       </method>
       <method name="ClientToScreenXY" type="" overloaded="no">
         </paramlist>
       </method>
       <method name="ClientToScreenXY" type="" overloaded="no">

-        <autodoc>ClientToScreenXY(int x, int y)</autodoc>
+        <autodoc>ClientToScreenXY(int x, int y) -&gt; (x,y)</autodoc>
+        <docstring>Converts to screen coordinates from coordinates relative to this window.</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
       <method name="ScreenToClientXY" type="" overloaded="no">
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
       <method name="ScreenToClientXY" type="" overloaded="no">

-        <autodoc>ScreenToClientXY(int x, int y)</autodoc>
+        <autodoc>ScreenToClientXY(int x, int y) -&gt; (x,y)</autodoc>
+        <docstring>Converts from screen to client window coordinates.</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -4352,18 +4862,21 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="ClientToScreen" type="Point" overloaded="no">
         <autodoc>ClientToScreen(Point pt) -&gt; Point</autodoc>
       </method>
       <method name="ClientToScreen" type="Point" overloaded="no">
         <autodoc>ClientToScreen(Point pt) -&gt; Point</autodoc>

+        <docstring>Converts to screen coordinates from coordinates relative to this window.</docstring>

         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="ScreenToClient" type="Point" overloaded="no">
         <autodoc>ScreenToClient(Point pt) -&gt; Point</autodoc>
         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="ScreenToClient" type="Point" overloaded="no">
         <autodoc>ScreenToClient(Point pt) -&gt; Point</autodoc>

+        <docstring>Converts from screen to client window coordinates.</docstring>

         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="HitTestXY" type="wxHitTest" overloaded="no">
         <autodoc>HitTestXY(int x, int y) -&gt; int</autodoc>
         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="HitTestXY" type="wxHitTest" overloaded="no">
         <autodoc>HitTestXY(int x, int y) -&gt; int</autodoc>

+        <docstring>Test where the given (in client coords) point lies</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -4371,27 +4884,66 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="HitTest" type="wxHitTest" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>
       </method>
       <method name="HitTest" type="wxHitTest" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>

+        <docstring>Test where the given (in client coords) point lies</docstring>

         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>

-      <method name="GetBorderFlags" type="wxBorder" overloaded="no">
-        <autodoc>GetBorderFlags(long flags) -&gt; int</autodoc>
+      <method name="GetBorder" type="wxBorder" overloaded="yes">
+        <docstring>Get the window border style from the given flags: this is different
+from simply doing flags &amp; wxBORDER_MASK because it uses
+GetDefaultBorder() to translate wxBORDER_DEFAULT to something
+reasonable.
+</docstring>

         <paramlist>
           <param name="flags" type="long" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="flags" type="long" default=""/>
         </paramlist>
       </method>

-      <method name="GetBorder" type="wxBorder" overloaded="no">
-        <autodoc>GetBorder() -&gt; int</autodoc>
+      <method name="GetBorder" type="wxBorder" overloaded="yes">
+        <autodoc>GetBorder(long flags) -&gt; int
+GetBorder() -&gt; int</autodoc>
+        <docstring>Get border for the flags of this window</docstring>

       </method>
       <method name="UpdateWindowUI" type="" overloaded="no">
         <autodoc>UpdateWindowUI(long flags=UPDATE_UI_NONE)</autodoc>
       </method>
       <method name="UpdateWindowUI" type="" overloaded="no">
         <autodoc>UpdateWindowUI(long flags=UPDATE_UI_NONE)</autodoc>

+        <docstring>This function sends EVT_UPDATE_UI events to the window. The particular
+implementation depends on the window; for example a wx.ToolBar will
+send an update UI event for each toolbar button, and a wx.Frame will
+send an update UI event for each menubar menu item. You can call this
+function from your application to ensure that your UI is up-to-date at
+a particular point in time (as far as your EVT_UPDATE_UI handlers are
+concerned). This may be necessary if you have called
+wx.UpdateUIEvent.SetMode or wx.UpdateUIEvent.SetUpdateInterval to
+limit the overhead that wxWindows incurs by sending update UI events
+in idle time.
+
+The flags should be a bitlist of one or more of the following values:
+
+    wx.UPDATE_UI_NONE          No particular value
+    wx.UPDATE_UI_RECURSE       Call the function for descendants
+    wx.UPDATE_UI_FROMIDLE      Invoked from OnIdle
+
+If you are calling this function from an OnIdle function, make sure
+you pass the wx.UPDATE_UI_FROMIDLE flag, since this tells the window to
+only update the UI elements that need to be updated in idle time. Some
+windows update their elements only when necessary, for example when a
+menu is about to be shown. The following is an example of how to call
+UpdateWindowUI from an idle function.
+
+    def OnIdle(self, evt):
+        if wx.UpdateUIEvent.CanUpdate(self):
+            self.UpdateWindowUI(wx.UPDATE_UI_FROMIDLE);
+</docstring>

         <paramlist>
           <param name="flags" type="long" default="wxUPDATE_UI_NONE"/>
         </paramlist>
       </method>
       <method name="PopupMenuXY" type="bool" overloaded="no">
         <autodoc>PopupMenuXY(Menu menu, int x, int y) -&gt; bool</autodoc>
         <paramlist>
           <param name="flags" type="long" default="wxUPDATE_UI_NONE"/>
         </paramlist>
       </method>
       <method name="PopupMenuXY" type="bool" overloaded="no">
         <autodoc>PopupMenuXY(Menu menu, int x, int y) -&gt; bool</autodoc>

+        <docstring>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.</docstring>

         <paramlist>
           <param name="menu" type="wxMenu" default=""/>
           <param name="x" type="int" default=""/>
         <paramlist>
           <param name="menu" type="wxMenu" default=""/>
           <param name="x" type="int" default=""/>


@@ -4400,6 +4952,10 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="PopupMenu" type="bool" overloaded="no">
         <autodoc>PopupMenu(Menu menu, Point pos) -&gt; bool</autodoc>
       </method>
       <method name="PopupMenu" type="bool" overloaded="no">
         <autodoc>PopupMenu(Menu menu, Point pos) -&gt; bool</autodoc>

+        <docstring>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.</docstring>

         <paramlist>
           <param name="menu" type="wxMenu" default=""/>
           <param name="pos" type="Point" default=""/>
         <paramlist>
           <param name="menu" type="wxMenu" default=""/>
           <param name="pos" type="Point" default=""/>


@@ -4407,17 +4963,35 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="GetHandle" type="long" overloaded="no">
         <autodoc>GetHandle() -&gt; long</autodoc>
       </method>
       <method name="GetHandle" type="long" overloaded="no">
         <autodoc>GetHandle() -&gt; long</autodoc>

+        <docstring>Returns the platform-specific handle (as a long integer) of the
+physical window.  Currently on wxMac it returns the handle of the
+toplevel parent of the window.</docstring>

       </method>
       <method name="HasScrollbar" type="bool" overloaded="no">
         <autodoc>HasScrollbar(int orient) -&gt; bool</autodoc>
       </method>
       <method name="HasScrollbar" type="bool" overloaded="no">
         <autodoc>HasScrollbar(int orient) -&gt; bool</autodoc>

+        <docstring>Does the window have the scrollbar for this orientation?</docstring>

         <paramlist>
           <param name="orient" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SetScrollbar" type="" overloaded="no">
         <paramlist>
           <param name="orient" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SetScrollbar" type="" overloaded="no">

-        <autodoc>SetScrollbar(int orient, int pos, int thumbvisible, int range, bool refresh=True)</autodoc>
+        <autodoc>SetScrollbar(int orientation, int pos, int thumbvisible, int range, 
+    bool refresh=True)</autodoc>
+        <docstring>Sets the scrollbar properties of a built-in scrollbar.
+
+    orientation: Determines the scrollbar whose page size is to be
+                 set. May be wx.HORIZONTAL or wx.VERTICAL.
+
+    position:    The position of the scrollbar in scroll units.
+
+    thumbSize:   The size of the thumb, or visible portion of the
+                 scrollbar, in scroll units.
+
+    range:       The maximum position of the scrollbar.
+
+    refresh:     True to redraw the scrollbar, false otherwise.</docstring>

         <paramlist>
         <paramlist>

-          <param name="orient" type="int" default=""/>
+          <param name="orientation" type="int" default=""/>

           <param name="pos" type="int" default=""/>
           <param name="thumbvisible" type="int" default=""/>
           <param name="range" type="int" default=""/>
           <param name="pos" type="int" default=""/>
           <param name="thumbvisible" type="int" default=""/>
           <param name="range" type="int" default=""/>


@@ -4425,33 +4999,51 @@ more or less independent of the screen window size.</docstring>
         </paramlist>
       </method>
       <method name="SetScrollPos" type="" overloaded="no">
         </paramlist>
       </method>
       <method name="SetScrollPos" type="" overloaded="no">

-        <autodoc>SetScrollPos(int orient, int pos, bool refresh=True)</autodoc>
+        <autodoc>SetScrollPos(int orientation, int pos, bool refresh=True)</autodoc>
+        <docstring>Sets the position of one of the built-in scrollbars.</docstring>

         <paramlist>
         <paramlist>

-          <param name="orient" type="int" default=""/>
+          <param name="orientation" type="int" default=""/>

           <param name="pos" type="int" default=""/>
           <param name="refresh" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="GetScrollPos" type="int" overloaded="no">
           <param name="pos" type="int" default=""/>
           <param name="refresh" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="GetScrollPos" type="int" overloaded="no">

-        <autodoc>GetScrollPos(int orient) -&gt; int</autodoc>
+        <autodoc>GetScrollPos(int orientation) -&gt; int</autodoc>
+        <docstring>Returns the built-in scrollbar position.</docstring>

         <paramlist>
         <paramlist>

-          <param name="orient" type="int" default=""/>
+          <param name="orientation" type="int" default=""/>

         </paramlist>
       </method>
       <method name="GetScrollThumb" type="int" overloaded="no">
         </paramlist>
       </method>
       <method name="GetScrollThumb" type="int" overloaded="no">

-        <autodoc>GetScrollThumb(int orient) -&gt; int</autodoc>
+        <autodoc>GetScrollThumb(int orientation) -&gt; int</autodoc>
+        <docstring>Returns the built-in scrollbar thumb size.</docstring>

         <paramlist>
         <paramlist>

-          <param name="orient" type="int" default=""/>
+          <param name="orientation" type="int" default=""/>

         </paramlist>
       </method>
       <method name="GetScrollRange" type="int" overloaded="no">
         </paramlist>
       </method>
       <method name="GetScrollRange" type="int" overloaded="no">

-        <autodoc>GetScrollRange(int orient) -&gt; int</autodoc>
+        <autodoc>GetScrollRange(int orientation) -&gt; int</autodoc>
+        <docstring>Returns the built-in scrollbar range.</docstring>

         <paramlist>
         <paramlist>

-          <param name="orient" type="int" default=""/>
+          <param name="orientation" type="int" default=""/>

         </paramlist>
       </method>
       <method name="ScrollWindow" type="" overloaded="no">
         <autodoc>ScrollWindow(int dx, int dy, Rect rect=None)</autodoc>
         </paramlist>
       </method>
       <method name="ScrollWindow" type="" overloaded="no">
         <autodoc>ScrollWindow(int dx, int dy, Rect rect=None)</autodoc>

+        <docstring>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.
+
+    dx:   Amount to scroll horizontally.
+
+    dy:   Amount to scroll vertically.
+
+    rect: Rectangle to invalidate. If this is None, the whole window
+          is invalidated. If you pass a rectangle corresponding to the
+          area of the window exposed by the scroll, your painting
+          handler can optimize painting by checking for the
+          invalidated region.</docstring>

         <paramlist>
           <param name="dx" type="int" default=""/>
           <param name="dy" type="int" default=""/>
         <paramlist>
           <param name="dx" type="int" default=""/>
           <param name="dy" type="int" default=""/>


@@ -4460,90 +5052,143 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="ScrollLines" type="bool" overloaded="no">
         <autodoc>ScrollLines(int lines) -&gt; bool</autodoc>
       </method>
       <method name="ScrollLines" type="bool" overloaded="no">
         <autodoc>ScrollLines(int lines) -&gt; bool</autodoc>

+        <docstring>If the platform and window class supports it, scrolls the window by
+the given number of lines down, if lines is positive, or up if lines
+is negative.  Returns True if the window was scrolled, False if it was
+already on top/bottom and nothing was done.</docstring>

         <paramlist>
           <param name="lines" type="int" default=""/>
         </paramlist>
       </method>
       <method name="ScrollPages" type="bool" overloaded="no">
         <autodoc>ScrollPages(int pages) -&gt; bool</autodoc>
         <paramlist>
           <param name="lines" type="int" default=""/>
         </paramlist>
       </method>
       <method name="ScrollPages" type="bool" overloaded="no">
         <autodoc>ScrollPages(int pages) -&gt; bool</autodoc>

+        <docstring>If the platform and window class supports it,  scrolls the window by
+the given number of pages down, if pages is positive, or up if pages
+is negative.  Returns True if the window was scrolled, False if it was
+already on top/bottom and nothing was done.</docstring>

         <paramlist>
           <param name="pages" type="int" default=""/>
         </paramlist>
       </method>
       <method name="LineUp" type="bool" overloaded="no">
         <autodoc>LineUp() -&gt; bool</autodoc>
         <paramlist>
           <param name="pages" type="int" default=""/>
         </paramlist>
       </method>
       <method name="LineUp" type="bool" overloaded="no">
         <autodoc>LineUp() -&gt; bool</autodoc>

+        <docstring>This is just a wrapper for ScrollLines(-1).</docstring>

       </method>
       <method name="LineDown" type="bool" overloaded="no">
         <autodoc>LineDown() -&gt; bool</autodoc>
       </method>
       <method name="LineDown" type="bool" overloaded="no">
         <autodoc>LineDown() -&gt; bool</autodoc>

+        <docstring>This is just a wrapper for ScrollLines(1).</docstring>

       </method>
       <method name="PageUp" type="bool" overloaded="no">
         <autodoc>PageUp() -&gt; bool</autodoc>
       </method>
       <method name="PageUp" type="bool" overloaded="no">
         <autodoc>PageUp() -&gt; bool</autodoc>

+        <docstring>This is just a wrapper for ScrollPages(-1).</docstring>

       </method>
       <method name="PageDown" type="bool" overloaded="no">
         <autodoc>PageDown() -&gt; bool</autodoc>
       </method>
       <method name="PageDown" type="bool" overloaded="no">
         <autodoc>PageDown() -&gt; bool</autodoc>

+        <docstring>This is just a wrapper for ScrollPages(1).</docstring>

       </method>
       <method name="SetHelpText" type="" overloaded="no">
         <autodoc>SetHelpText(String text)</autodoc>
       </method>
       <method name="SetHelpText" type="" overloaded="no">
         <autodoc>SetHelpText(String text)</autodoc>

+        <docstring>Sets the help text to be used as context-sensitive help for this
+window.  Note that the text is actually stored by the current
+wxHelpProvider implementation, and not in the window object itself.</docstring>

         <paramlist>
           <param name="text" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetHelpTextForId" type="" overloaded="no">
         <autodoc>SetHelpTextForId(String text)</autodoc>
         <paramlist>
           <param name="text" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetHelpTextForId" type="" overloaded="no">
         <autodoc>SetHelpTextForId(String text)</autodoc>

+        <docstring>Associate this help text with all windows with the same id as this
+one.</docstring>

         <paramlist>
           <param name="text" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetHelpText" type="String" overloaded="no">
         <autodoc>GetHelpText() -&gt; String</autodoc>
         <paramlist>
           <param name="text" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetHelpText" type="String" overloaded="no">
         <autodoc>GetHelpText() -&gt; String</autodoc>

+        <docstring>Gets the help text to be used as context-sensitive help for this
+window.  Note that the text is actually stored by the current
+wxHelpProvider implementation, and not in the window object itself.</docstring>

       </method>
       <method name="SetToolTipString" type="" overloaded="no">
         <autodoc>SetToolTipString(String tip)</autodoc>
       </method>
       <method name="SetToolTipString" type="" overloaded="no">
         <autodoc>SetToolTipString(String tip)</autodoc>

+        <docstring>Attach a tooltip to the window.</docstring>

         <paramlist>
           <param name="tip" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetToolTip" type="" overloaded="no">
         <autodoc>SetToolTip(ToolTip tip)</autodoc>
         <paramlist>
           <param name="tip" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetToolTip" type="" overloaded="no">
         <autodoc>SetToolTip(ToolTip tip)</autodoc>

+        <docstring>Attach a tooltip to the window.</docstring>

         <paramlist>
           <param name="tip" type="wxToolTip" default=""/>
         </paramlist>
       </method>
       <method name="GetToolTip" type="wxToolTip" overloaded="no">
         <autodoc>GetToolTip() -&gt; ToolTip</autodoc>
         <paramlist>
           <param name="tip" type="wxToolTip" default=""/>
         </paramlist>
       </method>
       <method name="GetToolTip" type="wxToolTip" overloaded="no">
         <autodoc>GetToolTip() -&gt; ToolTip</autodoc>

+        <docstring>get the associated tooltip or None if none</docstring>

       </method>
       <method name="SetDropTarget" type="" overloaded="no">
       </method>
       <method name="SetDropTarget" type="" overloaded="no">

-        <autodoc>SetDropTarget(PyDropTarget dropTarget)</autodoc>
+        <autodoc>SetDropTarget(DropTarget dropTarget)</autodoc>
+        <docstring>Associates a drop target with this window.  If the window already has
+a drop target, it is deleted.</docstring>

         <paramlist>
           <param name="dropTarget" type="wxPyDropTarget" default=""/>
         </paramlist>
       </method>
       <method name="GetDropTarget" type="wxPyDropTarget" overloaded="no">
         <paramlist>
           <param name="dropTarget" type="wxPyDropTarget" default=""/>
         </paramlist>
       </method>
       <method name="GetDropTarget" type="wxPyDropTarget" overloaded="no">

-        <autodoc>GetDropTarget() -&gt; PyDropTarget</autodoc>
+        <autodoc>GetDropTarget() -&gt; DropTarget</autodoc>
+        <docstring>Returns the associated drop target, which may be None.</docstring>

       </method>
       <method name="SetConstraints" type="" overloaded="no">
         <autodoc>SetConstraints(LayoutConstraints constraints)</autodoc>
       </method>
       <method name="SetConstraints" type="" overloaded="no">
         <autodoc>SetConstraints(LayoutConstraints constraints)</autodoc>

+        <docstring>Sets the window to have the given layout constraints. If an existing
+layout constraints object is already owned by the window, it will be
+deleted.  Pass None to disassociate and delete the window's current
+constraints.
+
+You must call SetAutoLayout to tell a window to use the constraints
+automatically in its default EVT_SIZE handler; otherwise, you must
+handle EVT_SIZE yourself and call Layout() explicitly. When setting
+both a wx.LayoutConstraints and a wx.Sizer, only the sizer will have
+effect.</docstring>

         <paramlist>
           <param name="constraints" type="wxLayoutConstraints" default=""/>
         </paramlist>
       </method>
       <method name="GetConstraints" type="wxLayoutConstraints" overloaded="no">
         <autodoc>GetConstraints() -&gt; LayoutConstraints</autodoc>
         <paramlist>
           <param name="constraints" type="wxLayoutConstraints" default=""/>
         </paramlist>
       </method>
       <method name="GetConstraints" type="wxLayoutConstraints" overloaded="no">
         <autodoc>GetConstraints() -&gt; LayoutConstraints</autodoc>

+        <docstring>Returns a pointer to the window's layout constraints, or None if there
+are none.</docstring>

       </method>
       <method name="SetAutoLayout" type="" overloaded="no">
         <autodoc>SetAutoLayout(bool autoLayout)</autodoc>
       </method>
       <method name="SetAutoLayout" type="" overloaded="no">
         <autodoc>SetAutoLayout(bool autoLayout)</autodoc>

+        <docstring>Determines whether the Layout function will be called automatically
+when the window is resized.  It is called implicitly by SetSizer but
+if you use SetConstraints you should call it manually or otherwise the
+window layout won't be correctly updated when its size changes.</docstring>

         <paramlist>
           <param name="autoLayout" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="GetAutoLayout" type="bool" overloaded="no">
         <autodoc>GetAutoLayout() -&gt; bool</autodoc>
         <paramlist>
           <param name="autoLayout" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="GetAutoLayout" type="bool" overloaded="no">
         <autodoc>GetAutoLayout() -&gt; bool</autodoc>

+        <docstring>Returns the current autoLayout setting</docstring>

       </method>
       <method name="Layout" type="bool" overloaded="no">
         <autodoc>Layout() -&gt; bool</autodoc>
       </method>
       <method name="Layout" type="bool" overloaded="no">
         <autodoc>Layout() -&gt; bool</autodoc>

+        <docstring>Invokes the constraint-based layout algorithm or the sizer-based
+algorithm for this window.  See SetAutoLayout: when auto layout is on,
+this function gets called automatically by the default EVT_SIZE
+handler when the window is resized.</docstring>

       </method>
       <method name="SetSizer" type="" overloaded="no">
         <autodoc>SetSizer(Sizer sizer, bool deleteOld=True)</autodoc>
       </method>
       <method name="SetSizer" type="" overloaded="no">
         <autodoc>SetSizer(Sizer sizer, bool deleteOld=True)</autodoc>

+        <docstring>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.</docstring>

         <paramlist>
           <param name="sizer" type="wxSizer" default=""/>
           <param name="deleteOld" type="bool" default="True"/>
         <paramlist>
           <param name="sizer" type="wxSizer" default=""/>
           <param name="deleteOld" type="bool" default="True"/>


@@ -4551,6 +5196,8 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="SetSizerAndFit" type="" overloaded="no">
         <autodoc>SetSizerAndFit(Sizer sizer, bool deleteOld=True)</autodoc>
       </method>
       <method name="SetSizerAndFit" type="" overloaded="no">
         <autodoc>SetSizerAndFit(Sizer sizer, bool deleteOld=True)</autodoc>

+        <docstring>The same as SetSizer, except it also sets the size hints for the
+window based on the sizer's minimum size.</docstring>

         <paramlist>
           <param name="sizer" type="wxSizer" default=""/>
           <param name="deleteOld" type="bool" default="True"/>
         <paramlist>
           <param name="sizer" type="wxSizer" default=""/>
           <param name="deleteOld" type="bool" default="True"/>


@@ -4558,25 +5205,39 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="GetSizer" type="wxSizer" overloaded="no">
         <autodoc>GetSizer() -&gt; Sizer</autodoc>
       </method>
       <method name="GetSizer" type="wxSizer" overloaded="no">
         <autodoc>GetSizer() -&gt; Sizer</autodoc>

+        <docstring>Return the sizer associated with the window by a previous call to
+SetSizer or None if there isn't one.</docstring>

       </method>
       <method name="SetContainingSizer" type="" overloaded="no">
         <autodoc>SetContainingSizer(Sizer sizer)</autodoc>
       </method>
       <method name="SetContainingSizer" type="" overloaded="no">
         <autodoc>SetContainingSizer(Sizer sizer)</autodoc>

+        <docstring>This normally does not need to be called by application code. It is
+called internally when a window is added to a sizer, and is used so
+the window can remove itself from the sizer when it is destroyed.</docstring>

         <paramlist>
           <param name="sizer" type="wxSizer" default=""/>
         </paramlist>
       </method>
       <method name="GetContainingSizer" type="wxSizer" overloaded="no">
         <autodoc>GetContainingSizer() -&gt; Sizer</autodoc>
         <paramlist>
           <param name="sizer" type="wxSizer" default=""/>
         </paramlist>
       </method>
       <method name="GetContainingSizer" type="wxSizer" overloaded="no">
         <autodoc>GetContainingSizer() -&gt; Sizer</autodoc>

+        <docstring>Return the sizer that this window is a member of, if any, otherwise None.</docstring>

       </method>
     </class>
     <pythoncode>
 def DLG_PNT(win, point_or_x, y=None):
       </method>
     </class>
     <pythoncode>
 def DLG_PNT(win, point_or_x, y=None):

+    """
+    Convenience function for converting a Point or (x,y) in
+    dialog units to pixel units.
+    """

     if y is None:
         return win.ConvertDialogPointToPixels(point_or_x)
     else:
         return win.ConvertDialogPointToPixels(wx.Point(point_or_x, y))
 
 def DLG_SZE(win, size_width, height=None):
     if y is None:
         return win.ConvertDialogPointToPixels(point_or_x)
     else:
         return win.ConvertDialogPointToPixels(wx.Point(point_or_x, y))
 
 def DLG_SZE(win, size_width, height=None):

+    """
+    Convenience function for converting a Size or (w,h) in
+    dialog units to pixel units.
+    """

     if height is None:
         return win.ConvertDialogSizeToPixels(size_width)
     else:
     if height is None:
         return win.ConvertDialogSizeToPixels(size_width)
     else:


@@ -4584,6 +5245,10 @@ def DLG_SZE(win, size_width, height=None):
 </pythoncode>
     <method name="FindWindowById" oldname="wxFindWindowById" type="Window" overloaded="no">
       <autodoc>FindWindowById(long id, Window parent=None) -&gt; Window</autodoc>
 </pythoncode>
     <method name="FindWindowById" oldname="wxFindWindowById" type="Window" overloaded="no">
       <autodoc>FindWindowById(long id, Window parent=None) -&gt; Window</autodoc>

+      <docstring>Find the first window in the application with the given id. If parent
+is None, the search will start from all top-level frames and dialog
+boxes; if non-None, the search will be limited to the given window
+hierarchy. The search is recursive in both cases.</docstring>

       <paramlist>
         <param name="id" type="long" default=""/>
         <param name="parent" type="Window" default="NULL"/>
       <paramlist>
         <param name="id" type="long" default=""/>
         <param name="parent" type="Window" default="NULL"/>


@@ -4591,6 +5256,13 @@ def DLG_SZE(win, size_width, height=None):
     </method>
     <method name="FindWindowByName" oldname="wxFindWindowByName" type="Window" overloaded="no">
       <autodoc>FindWindowByName(String name, Window parent=None) -&gt; Window</autodoc>
     </method>
     <method name="FindWindowByName" oldname="wxFindWindowByName" type="Window" overloaded="no">
       <autodoc>FindWindowByName(String name, Window parent=None) -&gt; Window</autodoc>

+      <docstring>Find a window by its name (as given in a window constructor or Create
+function call). If parent is None, the search will start from all
+top-level frames and dialog boxes; if non-None, the search will be
+limited to the given window hierarchy. The search is recursive in both
+cases.
+
+If no window with such name is found, wx.FindWindowByLabel is called.</docstring>

       <paramlist>
         <param name="name" type="String" default=""/>
         <param name="parent" type="Window" default="NULL"/>
       <paramlist>
         <param name="name" type="String" default=""/>
         <param name="parent" type="Window" default="NULL"/>


@@ -4598,15 +5270,21 @@ def DLG_SZE(win, size_width, height=None):
     </method>
     <method name="FindWindowByLabel" oldname="wxFindWindowByLabel" type="Window" overloaded="no">
       <autodoc>FindWindowByLabel(String label, Window parent=None) -&gt; Window</autodoc>
     </method>
     <method name="FindWindowByLabel" oldname="wxFindWindowByLabel" type="Window" overloaded="no">
       <autodoc>FindWindowByLabel(String label, Window parent=None) -&gt; Window</autodoc>

+      <docstring>Find a window by its label. Depending on the type of window, the label
+may be a window title or panel item label. If parent is None, the
+search will start from all top-level frames and dialog boxes; if
+non-None, the search will be limited to the given window
+hierarchy. The search is recursive in both cases.</docstring>

       <paramlist>
         <param name="label" type="String" default=""/>
         <param name="parent" type="Window" default="NULL"/>
       </paramlist>
     </method>
     <method name="Window_FromHWND" oldname="wxWindow_FromHWND" type="Window" overloaded="no">
       <paramlist>
         <param name="label" type="String" default=""/>
         <param name="parent" type="Window" default="NULL"/>
       </paramlist>
     </method>
     <method name="Window_FromHWND" oldname="wxWindow_FromHWND" type="Window" overloaded="no">

-      <autodoc>Window_FromHWND(unsigned long hWnd) -&gt; Window</autodoc>
+      <autodoc>Window_FromHWND(Window parent, unsigned long _hWnd) -&gt; Window</autodoc>

       <paramlist>
       <paramlist>

-        <param name="hWnd" type="unsigned long" default=""/>
+        <param name="parent" type="Window" default=""/>
+        <param name="_hWnd" type="unsigned long" default=""/>

       </paramlist>
     </method>
     <pythoncode>
       </paramlist>
     </method>
     <pythoncode>


@@ -4642,10 +5320,10 @@ def DLG_SZE(win, size_width, height=None):
         </paramlist>
       </method>
       <staticmethod name="IsSilent" type="bool" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="IsSilent" type="bool" overloaded="no">

-        <autodoc>Validator.IsSilent() -&gt; bool</autodoc>
+        <autodoc>IsSilent() -&gt; bool</autodoc>

       </staticmethod>
       <staticmethod name="SetBellOnError" type="" overloaded="no">
       </staticmethod>
       <staticmethod name="SetBellOnError" type="" overloaded="no">

-        <autodoc>Validator.SetBellOnError(int doIt=True)</autodoc>
+        <autodoc>SetBellOnError(int doIt=True)</autodoc>

         <paramlist>
           <param name="doIt" type="int" default="True"/>
         </paramlist>
         <paramlist>
           <param name="doIt" type="int" default="True"/>
         </paramlist>


@@ -4677,8 +5355,8 @@ def DLG_SZE(win, size_width, height=None):
           <param name="style" type="long" default="0"/>
         </paramlist>
       </constructor>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </constructor>

-      <method name="Append" type="" overloaded="no">
-        <autodoc>Append(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL)</autodoc>
+      <method name="Append" type="wxMenuItem" overloaded="no">
+        <autodoc>Append(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>


@@ -4686,27 +5364,27 @@ def DLG_SZE(win, size_width, height=None):
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
         </paramlist>
       </method>
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
         </paramlist>
       </method>

-      <method name="AppendSeparator" type="" overloaded="no">
-        <autodoc>AppendSeparator()</autodoc>
+      <method name="AppendSeparator" type="wxMenuItem" overloaded="no">
+        <autodoc>AppendSeparator() -&gt; MenuItem</autodoc>

       </method>
       </method>

-      <method name="AppendCheckItem" type="" overloaded="no">
-        <autodoc>AppendCheckItem(int id, String text, String help=EmptyString)</autodoc>
+      <method name="AppendCheckItem" type="wxMenuItem" overloaded="no">
+        <autodoc>AppendCheckItem(int id, String text, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>

-      <method name="AppendRadioItem" type="" overloaded="no">
-        <autodoc>AppendRadioItem(int id, String text, String help=EmptyString)</autodoc>
+      <method name="AppendRadioItem" type="wxMenuItem" overloaded="no">
+        <autodoc>AppendRadioItem(int id, String text, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>

-      <method name="AppendMenu" type="" overloaded="no">
-        <autodoc>AppendMenu(int id, String text, Menu submenu, String help=EmptyString)</autodoc>
+      <method name="AppendMenu" type="wxMenuItem" overloaded="no">
+        <autodoc>AppendMenu(int id, String text, Menu submenu, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>


@@ -4714,8 +5392,8 @@ def DLG_SZE(win, size_width, height=None):
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>

-      <method name="AppendItem" type="" overloaded="no">
-        <autodoc>AppendItem(MenuItem item)</autodoc>
+      <method name="AppendItem" type="wxMenuItem" overloaded="no">
+        <autodoc>AppendItem(MenuItem item) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="item" type="wxMenuItem" default=""/>
         </paramlist>
         <paramlist>
           <param name="item" type="wxMenuItem" default=""/>
         </paramlist>


@@ -4723,16 +5401,16 @@ def DLG_SZE(win, size_width, height=None):
       <method name="Break" type="" overloaded="no">
         <autodoc>Break()</autodoc>
       </method>
       <method name="Break" type="" overloaded="no">
         <autodoc>Break()</autodoc>
       </method>

-      <method name="InsertItem" type="bool" overloaded="no">
-        <autodoc>InsertItem(size_t pos, MenuItem item) -&gt; bool</autodoc>
+      <method name="InsertItem" type="wxMenuItem" overloaded="no">
+        <autodoc>InsertItem(size_t pos, MenuItem item) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="item" type="wxMenuItem" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="item" type="wxMenuItem" default=""/>
         </paramlist>
       </method>

-      <method name="Insert" type="" overloaded="no">
+      <method name="Insert" type="wxMenuItem" overloaded="no">

         <autodoc>Insert(size_t pos, int id, String text, String help=EmptyString, 
         <autodoc>Insert(size_t pos, int id, String text, String help=EmptyString, 

-    int kind=ITEM_NORMAL)</autodoc>
+    int kind=ITEM_NORMAL) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>


@@ -4741,14 +5419,14 @@ def DLG_SZE(win, size_width, height=None):
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
         </paramlist>
       </method>
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
         </paramlist>
       </method>

-      <method name="InsertSeparator" type="" overloaded="no">
-        <autodoc>InsertSeparator(size_t pos)</autodoc>
+      <method name="InsertSeparator" type="wxMenuItem" overloaded="no">
+        <autodoc>InsertSeparator(size_t pos) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="pos" type="size_t" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
         </paramlist>
       </method>

-      <method name="InsertCheckItem" type="" overloaded="no">
-        <autodoc>InsertCheckItem(size_t pos, int id, String text, String help=EmptyString)</autodoc>
+      <method name="InsertCheckItem" type="wxMenuItem" overloaded="no">
+        <autodoc>InsertCheckItem(size_t pos, int id, String text, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>


@@ -4756,8 +5434,8 @@ def DLG_SZE(win, size_width, height=None):
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>

-      <method name="InsertRadioItem" type="" overloaded="no">
-        <autodoc>InsertRadioItem(size_t pos, int id, String text, String help=EmptyString)</autodoc>
+      <method name="InsertRadioItem" type="wxMenuItem" overloaded="no">
+        <autodoc>InsertRadioItem(size_t pos, int id, String text, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>


@@ -4765,8 +5443,8 @@ def DLG_SZE(win, size_width, height=None):
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>

-      <method name="InsertMenu" type="" overloaded="no">
-        <autodoc>InsertMenu(size_t pos, int id, String text, Menu submenu, String help=EmptyString)</autodoc>
+      <method name="InsertMenu" type="wxMenuItem" overloaded="no">
+        <autodoc>InsertMenu(size_t pos, int id, String text, Menu submenu, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>


@@ -4775,14 +5453,14 @@ def DLG_SZE(win, size_width, height=None):
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>

-      <method name="PrependItem" type="" overloaded="no">
-        <autodoc>PrependItem(MenuItem item)</autodoc>
+      <method name="PrependItem" type="wxMenuItem" overloaded="no">
+        <autodoc>PrependItem(MenuItem item) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="item" type="wxMenuItem" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="item" type="wxMenuItem" default=""/>
         </paramlist>
       </method>

-      <method name="Prepend" type="" overloaded="no">
-        <autodoc>Prepend(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL)</autodoc>
+      <method name="Prepend" type="wxMenuItem" overloaded="no">
+        <autodoc>Prepend(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>


@@ -4790,27 +5468,27 @@ def DLG_SZE(win, size_width, height=None):
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
         </paramlist>
       </method>
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
         </paramlist>
       </method>

-      <method name="PrependSeparator" type="" overloaded="no">
-        <autodoc>PrependSeparator()</autodoc>
+      <method name="PrependSeparator" type="wxMenuItem" overloaded="no">
+        <autodoc>PrependSeparator() -&gt; MenuItem</autodoc>

       </method>
       </method>

-      <method name="PrependCheckItem" type="" overloaded="no">
-        <autodoc>PrependCheckItem(int id, String text, String help=EmptyString)</autodoc>
+      <method name="PrependCheckItem" type="wxMenuItem" overloaded="no">
+        <autodoc>PrependCheckItem(int id, String text, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>

-      <method name="PrependRadioItem" type="" overloaded="no">
-        <autodoc>PrependRadioItem(int id, String text, String help=EmptyString)</autodoc>
+      <method name="PrependRadioItem" type="wxMenuItem" overloaded="no">
+        <autodoc>PrependRadioItem(int id, String text, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>
           <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>

-      <method name="PrependMenu" type="" overloaded="no">
-        <autodoc>PrependMenu(int id, String text, Menu submenu, String help=EmptyString)</autodoc>
+      <method name="PrependMenu" type="wxMenuItem" overloaded="no">
+        <autodoc>PrependMenu(int id, String text, Menu submenu, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>


@@ -5211,7 +5889,7 @@ def DLG_SZE(win, size_width, height=None):
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
       <staticmethod name="GetLabelFromText" type="String" overloaded="no">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
       <staticmethod name="GetLabelFromText" type="String" overloaded="no">

-        <autodoc>MenuItem.GetLabelFromText(String text) -&gt; String</autodoc>
+        <autodoc>GetLabelFromText(String text) -&gt; String</autodoc>

         <paramlist>
           <param name="text" type="String" default=""/>
         </paramlist>
         <paramlist>
           <param name="text" type="String" default=""/>
         </paramlist>


@@ -5280,7 +5958,7 @@ def DLG_SZE(win, size_width, height=None):
         </paramlist>
       </method>
       <staticmethod name="GetDefaultMarginWidth" type="int" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="GetDefaultMarginWidth" type="int" overloaded="no">

-        <autodoc>MenuItem.GetDefaultMarginWidth() -&gt; int</autodoc>
+        <autodoc>GetDefaultMarginWidth() -&gt; int</autodoc>

       </staticmethod>
       <method name="SetBitmap" type="" overloaded="no">
         <autodoc>SetBitmap(Bitmap bitmap)</autodoc>
       </staticmethod>
       <method name="SetBitmap" type="" overloaded="no">
         <autodoc>SetBitmap(Bitmap bitmap)</autodoc>


@@ -5296,11 +5974,17 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Control" oldname="wxControl" module="core">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Control" oldname="wxControl" module="core">

+      <docstring>This is the base class for a control or 'widget'.
+
+A control is generally a small window which processes user input and/or
+displays one or more item of data.</docstring>

       <baseclass name="Window"/>
       <constructor name="Control" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ControlNameStr) -&gt; Control</autodoc>
       <baseclass name="Window"/>
       <constructor name="Control" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ControlNameStr) -&gt; Control</autodoc>

+        <docstring>Create a Control.  Normally you should only call this from a
+subclass' __init__ as a plain old wx.Control is not very useful.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>


@@ -5313,11 +5997,13 @@ def DLG_SZE(win, size_width, height=None):
       </constructor>
       <constructor name="PreControl" overloaded="no">
         <autodoc>PreControl() -&gt; Control</autodoc>
       </constructor>
       <constructor name="PreControl" overloaded="no">
         <autodoc>PreControl() -&gt; Control</autodoc>

+        <docstring>Precreate a Control control for 2-phase creation</docstring>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ControlNameStr) -&gt; bool</autodoc>
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ControlNameStr) -&gt; bool</autodoc>

+        <docstring>Do the 2nd phase and create the GUI control.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>


@@ -5330,15 +6016,19 @@ def DLG_SZE(win, size_width, height=None):
       </method>
       <method name="Command" type="" overloaded="no">
         <autodoc>Command(CommandEvent event)</autodoc>
       </method>
       <method name="Command" type="" overloaded="no">
         <autodoc>Command(CommandEvent event)</autodoc>

+        <docstring>Simulates the effect of the user issuing a command to the
+item. See wxCommandEvent.</docstring>

         <paramlist>
           <param name="event" type="CommandEvent" default=""/>
         </paramlist>
       </method>
       <method name="GetLabel" type="String" overloaded="no">
         <autodoc>GetLabel() -&gt; String</autodoc>
         <paramlist>
           <param name="event" type="CommandEvent" default=""/>
         </paramlist>
       </method>
       <method name="GetLabel" type="String" overloaded="no">
         <autodoc>GetLabel() -&gt; String</autodoc>

+        <docstring>Return a control's text.</docstring>

       </method>
       <method name="SetLabel" type="" overloaded="no">
         <autodoc>SetLabel(String label)</autodoc>
       </method>
       <method name="SetLabel" type="" overloaded="no">
         <autodoc>SetLabel(String label)</autodoc>

+        <docstring>Sets the item's text.</docstring>

         <paramlist>
           <param name="label" type="String" default=""/>
         </paramlist>
         <paramlist>
           <param name="label" type="String" default=""/>
         </paramlist>


@@ -5348,8 +6038,25 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ItemContainer" oldname="wxItemContainer" module="core">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ItemContainer" oldname="wxItemContainer" module="core">

+      <docstring>wx.ItemContainer defines an interface which is implemented by all
+controls which have string subitems, each of which may be
+selected, such as wx.ListBox, wx.CheckListBox, wx.Choice and
+wx.ComboBox (which implements an extended interface deriving from
+this one)
+
+It defines the methods for accessing the control's items and
+although each of the derived classes implements them differently,
+they still all conform to the same interface.
+
+The items in a wx.ItemContainer have (non empty) string labels
+and, optionally, client data associated with them.
+</docstring>

       <method name="Append" type="int" overloaded="no">
         <autodoc>Append(String item, PyObject clientData=None) -&gt; int</autodoc>
       <method name="Append" type="int" overloaded="no">
         <autodoc>Append(String item, PyObject clientData=None) -&gt; int</autodoc>

+        <docstring>Adds the item to the control, associating the given data with the
+item if not None.  The return value is the index of the newly
+added item which may be different from the last one if the
+control is sorted (e.g. has wx.LB_SORT or wx.CB_SORT style).</docstring>

         <paramlist>
           <param name="item" type="String" default=""/>
           <param name="clientData" type="PyObject" default="NULL"/>
         <paramlist>
           <param name="item" type="String" default=""/>
           <param name="clientData" type="PyObject" default="NULL"/>


@@ -5357,12 +6064,17 @@ def DLG_SZE(win, size_width, height=None):
       </method>
       <method name="AppendItems" type="" overloaded="no">
         <autodoc>AppendItems(wxArrayString strings)</autodoc>
       </method>
       <method name="AppendItems" type="" overloaded="no">
         <autodoc>AppendItems(wxArrayString strings)</autodoc>

+        <docstring>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.</docstring>

         <paramlist>
           <param name="strings" type="wxArrayString" default=""/>
         </paramlist>
       </method>
       <method name="Insert" type="int" overloaded="no">
         <autodoc>Insert(String item, int pos, PyObject clientData=None) -&gt; int</autodoc>
         <paramlist>
           <param name="strings" type="wxArrayString" default=""/>
         </paramlist>
       </method>
       <method name="Insert" type="int" overloaded="no">
         <autodoc>Insert(String item, int pos, PyObject clientData=None) -&gt; int</autodoc>

+        <docstring>Insert an item into the control before the item at the pos index,
+optionally associating some data object with the item.</docstring>

         <paramlist>
           <param name="item" type="String" default=""/>
           <param name="pos" type="int" default=""/>
         <paramlist>
           <param name="item" type="String" default=""/>
           <param name="pos" type="int" default=""/>


@@ -5371,21 +6083,29 @@ def DLG_SZE(win, size_width, height=None):
       </method>
       <method name="Clear" type="" overloaded="no">
         <autodoc>Clear()</autodoc>
       </method>
       <method name="Clear" type="" overloaded="no">
         <autodoc>Clear()</autodoc>

+        <docstring>Removes all items from the control.</docstring>

       </method>
       <method name="Delete" type="" overloaded="no">
         <autodoc>Delete(int n)</autodoc>
       </method>
       <method name="Delete" type="" overloaded="no">
         <autodoc>Delete(int n)</autodoc>

+        <docstring>Deletes the item at the zero-based index 'n' from the control.
+Note that it is an error (signalled by a PyAssertionError
+exception if enabled) to remove an item with the index negative
+or greater or equal than the number of items in the control.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetCount" type="int" overloaded="no">
         <autodoc>GetCount() -&gt; int</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetCount" type="int" overloaded="no">
         <autodoc>GetCount() -&gt; int</autodoc>

+        <docstring>Returns the number of items in the control.</docstring>

       </method>
       <method name="IsEmpty" type="bool" overloaded="no">
         <autodoc>IsEmpty() -&gt; bool</autodoc>
       </method>
       <method name="IsEmpty" type="bool" overloaded="no">
         <autodoc>IsEmpty() -&gt; bool</autodoc>

+        <docstring>Returns True if the control is empty or False if it has some items.</docstring>

       </method>
       <method name="GetString" type="String" overloaded="no">
         <autodoc>GetString(int n) -&gt; String</autodoc>
       </method>
       <method name="GetString" type="String" overloaded="no">
         <autodoc>GetString(int n) -&gt; String</autodoc>

+        <docstring>Returns the label of the item with the given index.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>


@@ -5395,6 +6115,7 @@ def DLG_SZE(win, size_width, height=None):
       </method>
       <method name="SetString" type="" overloaded="no">
         <autodoc>SetString(int n, String s)</autodoc>
       </method>
       <method name="SetString" type="" overloaded="no">
         <autodoc>SetString(int n, String s)</autodoc>

+        <docstring>Sets the label for the given item.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
           <param name="s" type="String" default=""/>
         <paramlist>
           <param name="n" type="int" default=""/>
           <param name="s" type="String" default=""/>


@@ -5402,30 +6123,38 @@ def DLG_SZE(win, size_width, height=None):
       </method>
       <method name="FindString" type="int" overloaded="no">
         <autodoc>FindString(String s) -&gt; int</autodoc>
       </method>
       <method name="FindString" type="int" overloaded="no">
         <autodoc>FindString(String s) -&gt; int</autodoc>

+        <docstring>Finds an item whose label matches the given string.  Returns the
+zero-based position of the item, or wx.NOT_FOUND if the string
+was not found.</docstring>

         <paramlist>
           <param name="s" type="String" default=""/>
         </paramlist>
       </method>
       <method name="Select" type="" overloaded="no">
         <autodoc>Select(int n)</autodoc>
         <paramlist>
           <param name="s" type="String" default=""/>
         </paramlist>
       </method>
       <method name="Select" type="" overloaded="no">
         <autodoc>Select(int n)</autodoc>

+        <docstring>Sets the item at index 'n' to be the selected item.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetSelection" type="int" overloaded="no">
         <autodoc>GetSelection() -&gt; int</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetSelection" type="int" overloaded="no">
         <autodoc>GetSelection() -&gt; int</autodoc>

+        <docstring>Returns the index of the selected item or wx.NOT_FOUND if no item is selected.</docstring>

       </method>
       <method name="GetStringSelection" type="String" overloaded="no">
         <autodoc>GetStringSelection() -&gt; String</autodoc>
       </method>
       <method name="GetStringSelection" type="String" overloaded="no">
         <autodoc>GetStringSelection() -&gt; String</autodoc>

+        <docstring>Returns the label of the selected item or an empty string if no item is selected.</docstring>

       </method>
       <method name="GetClientData" type="PyObject" overloaded="no">
         <autodoc>GetClientData(int n) -&gt; PyObject</autodoc>
       </method>
       <method name="GetClientData" type="PyObject" overloaded="no">
         <autodoc>GetClientData(int n) -&gt; PyObject</autodoc>

+        <docstring>Returns the client data associated with the given item, (if any.)</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SetClientData" type="" overloaded="no">
         <autodoc>SetClientData(int n, PyObject clientData)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SetClientData" type="" overloaded="no">
         <autodoc>SetClientData(int n, PyObject clientData)</autodoc>

+        <docstring>Associate the given client data with the item at position n.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
           <param name="clientData" type="PyObject" default=""/>
         <paramlist>
           <param name="n" type="int" default=""/>
           <param name="clientData" type="PyObject" default=""/>


@@ -5436,6 +6165,9 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ControlWithItems" oldname="wxControlWithItems" module="core">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ControlWithItems" oldname="wxControlWithItems" module="core">

+      <docstring>wx.ControlWithItems combines the wx.ItemContainer class with the
+wx.Control class, and is used for the base class of various
+controls that have items.</docstring>

       <baseclass name="Control"/>
       <baseclass name="ItemContainer"/>
     </class>
       <baseclass name="Control"/>
       <baseclass name="ItemContainer"/>
     </class>


@@ -6000,15 +6732,15 @@ def DLG_SZE(win, size_width, height=None):
         </paramlist>
       </method>
       <method name="__eq__" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="__eq__" type="bool" overloaded="no">

-        <autodoc>__eq__(GBPosition p) -&gt; bool</autodoc>
+        <autodoc>__eq__(GBPosition other) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="p" type="GBPosition" default=""/>
+          <param name="other" type="GBPosition" default=""/>

         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">

-        <autodoc>__ne__(GBPosition p) -&gt; bool</autodoc>
+        <autodoc>__ne__(GBPosition other) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="p" type="GBPosition" default=""/>
+          <param name="other" type="GBPosition" default=""/>

         </paramlist>
       </method>
       <method name="Set" type="" overloaded="no">
         </paramlist>
       </method>
       <method name="Set" type="" overloaded="no">


@@ -6049,15 +6781,15 @@ def DLG_SZE(win, size_width, height=None):
         </paramlist>
       </method>
       <method name="__eq__" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="__eq__" type="bool" overloaded="no">

-        <autodoc>__eq__(GBSpan o) -&gt; bool</autodoc>
+        <autodoc>__eq__(GBSpan other) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="o" type="GBSpan" default=""/>
+          <param name="other" type="GBSpan" default=""/>

         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">

-        <autodoc>__ne__(GBSpan o) -&gt; bool</autodoc>
+        <autodoc>__ne__(GBSpan other) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="o" type="GBSpan" default=""/>
+          <param name="other" type="GBSpan" default=""/>

         </paramlist>
       </method>
       <method name="Set" type="" overloaded="no">
         </paramlist>
       </method>
       <method name="Set" type="" overloaded="no">


@@ -6331,6 +7063,49 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="IndividualLayoutConstraint" oldname="wxIndividualLayoutConstraint" module="core">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="IndividualLayoutConstraint" oldname="wxIndividualLayoutConstraint" module="core">

+      <docstring>Objects of this class are stored in the wx.LayoutConstraint class as one of
+eight possible constraints that a window can be involved in.  You will never
+need to create an instance of wx.IndividualLayoutConstraint, rather you should
+use create a wx.LayoutContstraints instance and use the individual contstraints
+that it contains.
+
+Constraints are initially set to have the relationship wx.Unconstrained, which
+means that their values should be calculated by looking at known constraints.
+
+The Edge specifies the type of edge or dimension of a window.
+
+ Edges
+
+    wx.Left  The left edge.
+    wx.Top  The top edge.
+    wx.Right  The right edge.
+    wx.Bottom  The bottom edge.
+    wx.CentreX  The x-coordinate of the centre of the window.
+    wx.CentreY  The y-coordinate of the centre of the window. 
+
+
+The Relationship specifies the relationship that this edge or dimension has
+with another specified edge or dimension. Normally, the user doesn't use these
+directly because functions such as Below and RightOf are a convenience for
+using the more general Set function.
+
+ Relationships
+
+    wx.Unconstrained  The edge or dimension is unconstrained
+                        (the default for edges.)
+    wx.AsIs          The edge or dimension is to be taken from the current
+                        window position or size (the default for dimensions.)
+    wx.Above          The edge should be above another edge.
+    wx.Below          The edge should be below another edge.
+    wx.LeftOf          The edge should be to the left of another edge.
+    wx.RightOf          The edge should be to the right of another edge.
+    wx.SameAs          The edge or dimension should be the same as another edge
+                        or dimension.
+    wx.PercentOf  The edge or dimension should be a percentage of another
+                        edge or dimension.
+    wx.Absolute  The edge or dimension should be a given absolute value.
+
+</docstring>

       <baseclass name="Object"/>
       <method name="Set" type="" overloaded="no">
         <autodoc>Set(int rel, Window otherW, int otherE, int val=0, int marg=wxLAYOUT_DEFAULT_MARGIN)</autodoc>
       <baseclass name="Object"/>
       <method name="Set" type="" overloaded="no">
         <autodoc>Set(int rel, Window otherW, int otherE, int val=0, int marg=wxLAYOUT_DEFAULT_MARGIN)</autodoc>


@@ -6344,6 +7119,7 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       </method>
       <method name="LeftOf" type="" overloaded="no">
         <autodoc>LeftOf(Window sibling, int marg=0)</autodoc>
       </method>
       <method name="LeftOf" type="" overloaded="no">
         <autodoc>LeftOf(Window sibling, int marg=0)</autodoc>

+        <docstring>Sibling relationship</docstring>

         <paramlist>
           <param name="sibling" type="Window" default=""/>
           <param name="marg" type="int" default="0"/>
         <paramlist>
           <param name="sibling" type="Window" default=""/>
           <param name="marg" type="int" default="0"/>


@@ -6351,6 +7127,7 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       </method>
       <method name="RightOf" type="" overloaded="no">
         <autodoc>RightOf(Window sibling, int marg=0)</autodoc>
       </method>
       <method name="RightOf" type="" overloaded="no">
         <autodoc>RightOf(Window sibling, int marg=0)</autodoc>

+        <docstring>Sibling relationship</docstring>

         <paramlist>
           <param name="sibling" type="Window" default=""/>
           <param name="marg" type="int" default="0"/>
         <paramlist>
           <param name="sibling" type="Window" default=""/>
           <param name="marg" type="int" default="0"/>


@@ -6358,6 +7135,7 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       </method>
       <method name="Above" type="" overloaded="no">
         <autodoc>Above(Window sibling, int marg=0)</autodoc>
       </method>
       <method name="Above" type="" overloaded="no">
         <autodoc>Above(Window sibling, int marg=0)</autodoc>

+        <docstring>Sibling relationship</docstring>

         <paramlist>
           <param name="sibling" type="Window" default=""/>
           <param name="marg" type="int" default="0"/>
         <paramlist>
           <param name="sibling" type="Window" default=""/>
           <param name="marg" type="int" default="0"/>


@@ -6365,6 +7143,7 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       </method>
       <method name="Below" type="" overloaded="no">
         <autodoc>Below(Window sibling, int marg=0)</autodoc>
       </method>
       <method name="Below" type="" overloaded="no">
         <autodoc>Below(Window sibling, int marg=0)</autodoc>

+        <docstring>Sibling relationship</docstring>

         <paramlist>
           <param name="sibling" type="Window" default=""/>
           <param name="marg" type="int" default="0"/>
         <paramlist>
           <param name="sibling" type="Window" default=""/>
           <param name="marg" type="int" default="0"/>


@@ -6372,6 +7151,7 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       </method>
       <method name="SameAs" type="" overloaded="no">
         <autodoc>SameAs(Window otherW, int edge, int marg=0)</autodoc>
       </method>
       <method name="SameAs" type="" overloaded="no">
         <autodoc>SameAs(Window otherW, int edge, int marg=0)</autodoc>

+        <docstring>'Same edge' alignment</docstring>

         <paramlist>
           <param name="otherW" type="Window" default=""/>
           <param name="edge" type="wxEdge" default=""/>
         <paramlist>
           <param name="otherW" type="Window" default=""/>
           <param name="edge" type="wxEdge" default=""/>


@@ -6380,6 +7160,7 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       </method>
       <method name="PercentOf" type="" overloaded="no">
         <autodoc>PercentOf(Window otherW, int wh, int per)</autodoc>
       </method>
       <method name="PercentOf" type="" overloaded="no">
         <autodoc>PercentOf(Window otherW, int wh, int per)</autodoc>

+        <docstring>The edge is a percentage of the other window's edge</docstring>

         <paramlist>
           <param name="otherW" type="Window" default=""/>
           <param name="wh" type="wxEdge" default=""/>
         <paramlist>
           <param name="otherW" type="Window" default=""/>
           <param name="wh" type="wxEdge" default=""/>


@@ -6388,15 +7169,18 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       </method>
       <method name="Absolute" type="" overloaded="no">
         <autodoc>Absolute(int val)</autodoc>
       </method>
       <method name="Absolute" type="" overloaded="no">
         <autodoc>Absolute(int val)</autodoc>

+        <docstring>Edge has absolute value</docstring>

         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
       <method name="Unconstrained" type="" overloaded="no">
         <autodoc>Unconstrained()</autodoc>
         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
       <method name="Unconstrained" type="" overloaded="no">
         <autodoc>Unconstrained()</autodoc>

+        <docstring>Dimension is unconstrained</docstring>

       </method>
       <method name="AsIs" type="" overloaded="no">
         <autodoc>AsIs()</autodoc>
       </method>
       <method name="AsIs" type="" overloaded="no">
         <autodoc>AsIs()</autodoc>

+        <docstring>Dimension is 'as is' (use current size settings)</docstring>

       </method>
       <method name="GetOtherWindow" type="Window" overloaded="no">
         <autodoc>GetOtherWindow() -&gt; Window</autodoc>
       </method>
       <method name="GetOtherWindow" type="Window" overloaded="no">
         <autodoc>GetOtherWindow() -&gt; Window</autodoc>


@@ -6454,12 +7238,14 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       </method>
       <method name="ResetIfWin" type="bool" overloaded="no">
         <autodoc>ResetIfWin(Window otherW) -&gt; bool</autodoc>
       </method>
       <method name="ResetIfWin" type="bool" overloaded="no">
         <autodoc>ResetIfWin(Window otherW) -&gt; bool</autodoc>

+        <docstring>Reset constraint if it mentions otherWin</docstring>

         <paramlist>
           <param name="otherW" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="SatisfyConstraint" type="bool" overloaded="no">
         <autodoc>SatisfyConstraint(LayoutConstraints constraints, Window win) -&gt; bool</autodoc>
         <paramlist>
           <param name="otherW" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="SatisfyConstraint" type="bool" overloaded="no">
         <autodoc>SatisfyConstraint(LayoutConstraints constraints, Window win) -&gt; bool</autodoc>

+        <docstring>Try to satisfy constraint</docstring>

         <paramlist>
           <param name="constraints" type="wxLayoutConstraints" default=""/>
           <param name="win" type="Window" default=""/>
         <paramlist>
           <param name="constraints" type="wxLayoutConstraints" default=""/>
           <param name="win" type="Window" default=""/>


@@ -6467,6 +7253,8 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       </method>
       <method name="GetEdge" type="int" overloaded="no">
         <autodoc>GetEdge(int which, Window thisWin, Window other) -&gt; int</autodoc>
       </method>
       <method name="GetEdge" type="int" overloaded="no">
         <autodoc>GetEdge(int which, Window thisWin, Window other) -&gt; int</autodoc>

+        <docstring>Get the value of this edge or dimension, or if this
+is not determinable, -1.</docstring>

         <paramlist>
           <param name="which" type="wxEdge" default=""/>
           <param name="thisWin" type="Window" default=""/>
         <paramlist>
           <param name="which" type="wxEdge" default=""/>
           <param name="thisWin" type="Window" default=""/>


@@ -6475,6 +7263,31 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       </method>
     </class>
     <class name="LayoutConstraints" oldname="wxLayoutConstraints" module="core">
       </method>
     </class>
     <class name="LayoutConstraints" oldname="wxLayoutConstraints" module="core">

+      <docstring>Note: constraints are now deprecated and you should use sizers instead.
+
+Objects of this class can be associated with a window to define its layout
+constraints, with respect to siblings or its parent.
+
+The class consists of the following eight constraints of class
+wx.IndividualLayoutConstraint, some or all of which should be accessed
+directly to set the appropriate constraints.
+
+    * left: represents the left hand edge of the window
+    * right: represents the right hand edge of the window
+    * top: represents the top edge of the window
+    * bottom: represents the bottom edge of the window
+    * width: represents the width of the window
+    * height: represents the height of the window
+    * centreX: represents the horizontal centre point of the window
+    * centreY: represents the vertical centre point of the window 
+
+Most constraints are initially set to have the relationship wxUnconstrained,
+which means that their values should be calculated by looking at known
+constraints. The exceptions are width and height, which are set to wxAsIs to
+ensure that if the user does not specify a constraint, the existing width and
+height will be used, to be compatible with panel items which often have take a
+default size. If the constraint is wxAsIs, the dimension will not be changed.
+</docstring>

       <baseclass name="Object"/>
       <constructor name="LayoutConstraints" overloaded="no">
         <autodoc>__init__() -&gt; LayoutConstraints</autodoc>
       <baseclass name="Object"/>
       <constructor name="LayoutConstraints" overloaded="no">
         <autodoc>__init__() -&gt; LayoutConstraints</autodoc>


@@ -6506,6 +7319,8 @@ try:
 except NameError:
     __builtins__.True = 1==1
     __builtins__.False = 1==0
 except NameError:
     __builtins__.True = 1==1
     __builtins__.False = 1==0

+    def bool(value): return not not value
+    __builtins__.bool = bool

 
 
 
 
 
 


@@ -6617,7 +7432,7 @@ def CallAfter(callable, *args, **kw):
 
 class FutureCall:
     """
 
 class FutureCall:
     """

-    A convenience class for wxTimer, that calls the given callable
+    A convenience class for wx.Timer, that calls the given callable

     object once after the given amount of milliseconds, passing any
     positional or keyword args.  The return value of the callable is
     availbale after it has been run with the GetResult method.
     object once after the given amount of milliseconds, passing any
     positional or keyword args.  The return value of the callable is
     availbale after it has been run with the GetResult method.


@@ -6634,6 +7449,7 @@ class FutureCall:
         self.callable = callable
         self.SetArgs(*args, **kwargs)
         self.runCount = 0
         self.callable = callable
         self.SetArgs(*args, **kwargs)
         self.runCount = 0

+        self.running = False

         self.hasRun = False
         self.result = None
         self.timer = None
         self.hasRun = False
         self.result = None
         self.timer = None


@@ -6655,6 +7471,7 @@ class FutureCall:
         self.Stop()
         self.timer = wx.PyTimer(self.Notify)
         self.timer.Start(self.millis, wx.TIMER_ONE_SHOT)
         self.Stop()
         self.timer = wx.PyTimer(self.Notify)
         self.timer.Start(self.millis, wx.TIMER_ONE_SHOT)

+        self.running = True

     Restart = Start
 
 
     Restart = Start
 
 


@@ -6701,9 +7518,12 @@ class FutureCall:
         """
         if self.callable and getattr(self.callable, 'im_self', True):
             self.runCount += 1
         """
         if self.callable and getattr(self.callable, 'im_self', True):
             self.runCount += 1

+            self.running = False

             self.result = self.callable(*self.args, **self.kwargs)
         self.hasRun = True
             self.result = self.callable(*self.args, **self.kwargs)
         self.hasRun = True

-        wx.CallAfter(self.Stop)
+        if not self.running:
+            # if it wasn't restarted, then cleanup
+            wx.CallAfter(self.Stop)

 
 
 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------


@@ -6756,9 +7576,25 @@ _core._wxPyFixStockObjects()
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Colour" oldname="wxColour" module="gdi">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Colour" oldname="wxColour" module="gdi">

+      <docstring>A colour is an object representing a combination of Red, Green, and Blue (RGB)
+intensity values, and is used to determine drawing colours, window colours,
+etc.  Valid RGB values are in the range 0 to 255.
+
+In wxPython there are typemaps that will automatically convert from a colour
+name, or from a "#RRGGBB" colour hex value string to a wx.Colour object when
+calling C++ methods that expect a wxColour.  This means that the following are
+all equivallent:
+
+    win.SetBackgroundColour(wxColour(0,0,255))
+    win.SetBackgroundColour("BLUE")
+    win.SetBackgroundColour("#0000FF")
+
+You can retrieve the various current system colour settings with
+wx.SystemSettings.GetColour.</docstring>

       <baseclass name="Object"/>
       <constructor name="Colour" overloaded="no">
         <autodoc>__init__(unsigned char red=0, unsigned char green=0, unsigned char blue=0) -&gt; Colour</autodoc>
       <baseclass name="Object"/>
       <constructor name="Colour" overloaded="no">
         <autodoc>__init__(unsigned char red=0, unsigned char green=0, unsigned char blue=0) -&gt; Colour</autodoc>

+        <docstring>Constructs a colour from red, green and blue values.</docstring>

         <paramlist>
           <param name="red" type="unsigned char" default="0"/>
           <param name="green" type="unsigned char" default="0"/>
         <paramlist>
           <param name="red" type="unsigned char" default="0"/>
           <param name="green" type="unsigned char" default="0"/>


@@ -6767,12 +7603,14 @@ _core._wxPyFixStockObjects()
       </constructor>
       <constructor name="NamedColour" overloaded="no">
         <autodoc>NamedColour(String colorName) -&gt; Colour</autodoc>
       </constructor>
       <constructor name="NamedColour" overloaded="no">
         <autodoc>NamedColour(String colorName) -&gt; Colour</autodoc>

+        <docstring>Constructs a colour object using a colour name listed in wx.TheColourDatabase.</docstring>

         <paramlist>
           <param name="colorName" type="String" default=""/>
         </paramlist>
       </constructor>
       <constructor name="ColourRGB" overloaded="no">
         <autodoc>ColourRGB(unsigned long colRGB) -&gt; Colour</autodoc>
         <paramlist>
           <param name="colorName" type="String" default=""/>
         </paramlist>
       </constructor>
       <constructor name="ColourRGB" overloaded="no">
         <autodoc>ColourRGB(unsigned long colRGB) -&gt; Colour</autodoc>

+        <docstring>Constructs a colour from a packed RGB value.</docstring>

         <paramlist>
           <param name="colRGB" type="unsigned long" default=""/>
         </paramlist>
         <paramlist>
           <param name="colRGB" type="unsigned long" default=""/>
         </paramlist>


@@ -6782,18 +7620,24 @@ _core._wxPyFixStockObjects()
       </destructor>
       <method name="Red" type="unsigned char" overloaded="no">
         <autodoc>Red() -&gt; unsigned char</autodoc>
       </destructor>
       <method name="Red" type="unsigned char" overloaded="no">
         <autodoc>Red() -&gt; unsigned char</autodoc>

+        <docstring>Returns the red intensity.</docstring>

       </method>
       <method name="Green" type="unsigned char" overloaded="no">
         <autodoc>Green() -&gt; unsigned char</autodoc>
       </method>
       <method name="Green" type="unsigned char" overloaded="no">
         <autodoc>Green() -&gt; unsigned char</autodoc>

+        <docstring>Returns the green intensity.</docstring>

       </method>
       <method name="Blue" type="unsigned char" overloaded="no">
         <autodoc>Blue() -&gt; unsigned char</autodoc>
       </method>
       <method name="Blue" type="unsigned char" overloaded="no">
         <autodoc>Blue() -&gt; unsigned char</autodoc>

+        <docstring>Returns the blue intensity.</docstring>

       </method>
       <method name="Ok" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
       <method name="Ok" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>

+        <docstring>Returns True if the colour object is valid (the colour has been
+initialised with RGB values).</docstring>

       </method>
       <method name="Set" type="" overloaded="no">
         <autodoc>Set(unsigned char red, unsigned char green, unsigned char blue)</autodoc>
       </method>
       <method name="Set" type="" overloaded="no">
         <autodoc>Set(unsigned char red, unsigned char green, unsigned char blue)</autodoc>

+        <docstring>Sets the RGB intensity values.</docstring>

         <paramlist>
           <param name="red" type="unsigned char" default=""/>
           <param name="green" type="unsigned char" default=""/>
         <paramlist>
           <param name="red" type="unsigned char" default=""/>
           <param name="green" type="unsigned char" default=""/>


@@ -6802,32 +7646,52 @@ _core._wxPyFixStockObjects()
       </method>
       <method name="SetRGB" type="" overloaded="no">
         <autodoc>SetRGB(unsigned long colRGB)</autodoc>
       </method>
       <method name="SetRGB" type="" overloaded="no">
         <autodoc>SetRGB(unsigned long colRGB)</autodoc>

+        <docstring>Sets the RGB intensity values from a packed RGB value.</docstring>

         <paramlist>
           <param name="colRGB" type="unsigned long" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="colRGB" type="unsigned long" default=""/>
         </paramlist>
       </method>

+      <method name="SetFromName" type="" overloaded="no">
+        <autodoc>SetFromName(String colourName)</autodoc>
+        <docstring>Sets the RGB intensity values using a colour name listed in wx.TheColourDatabase.</docstring>
+        <paramlist>
+          <param name="colourName" type="String" default=""/>
+        </paramlist>
+      </method>
+      <method name="GetPixel" type="long" overloaded="no">
+        <autodoc>GetPixel() -&gt; long</autodoc>
+        <docstring>Returns a pixel value which is platform-dependent. On Windows, a
+COLORREF is returned. On X, an allocated pixel value is returned.
+-1 is returned if the pixel is invalid (on X, unallocated).</docstring>
+      </method>

       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(Colour colour) -&gt; bool</autodoc>
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(Colour colour) -&gt; bool</autodoc>

+        <docstring>Compare colours for equality</docstring>

         <paramlist>
           <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(Colour colour) -&gt; bool</autodoc>
         <paramlist>
           <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(Colour colour) -&gt; bool</autodoc>

+        <docstring>Compare colours for inequality</docstring>

         <paramlist>
           <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>

-      <method name="InitFromName" type="" overloaded="no">
-        <autodoc>InitFromName(String colourName)</autodoc>
-        <paramlist>
-          <param name="colourName" type="String" default=""/>
-        </paramlist>
-      </method>

       <method name="Get" type="PyObject" overloaded="no">
       <method name="Get" type="PyObject" overloaded="no">

-        <autodoc>Get() -&gt; PyObject</autodoc>
+        <autodoc>Get() -&gt; (r, g, b)</autodoc>
+        <docstring>Returns the RGB intensity values as a tuple.</docstring>
+      </method>
+      <method name="GetRGB" type="unsigned long" overloaded="no">
+        <autodoc>GetRGB() -&gt; unsigned long</autodoc>
+        <docstring>Return the colour as a packed RGB value</docstring>

       </method>
     </class>
       </method>
     </class>

+    <pythoncode>
+    Color = Colour
+    NamedColor = NamedColour
+    ColorRGB = ColourRGB
+</pythoncode>

     <class name="Palette" oldname="wxPalette" module="gdi">
       <baseclass name="GDIObject"/>
       <constructor name="Palette" overloaded="no">
     <class name="Palette" oldname="wxPalette" module="gdi">
       <baseclass name="GDIObject"/>
       <constructor name="Palette" overloaded="no">


@@ -6937,6 +7801,18 @@ _core._wxPyFixStockObjects()
       <method name="GetDashes" type="PyObject" overloaded="no">
         <autodoc>GetDashes() -&gt; PyObject</autodoc>
       </method>
       <method name="GetDashes" type="PyObject" overloaded="no">
         <autodoc>GetDashes() -&gt; PyObject</autodoc>
       </method>

+      <method name="__eq__" type="bool" overloaded="no">
+        <autodoc>__eq__(Pen other) -&gt; bool</autodoc>
+        <paramlist>
+          <param name="other" type="Pen" default=""/>
+        </paramlist>
+      </method>
+      <method name="__ne__" type="bool" overloaded="no">
+        <autodoc>__ne__(Pen other) -&gt; bool</autodoc>
+        <paramlist>
+          <param name="other" type="Pen" default=""/>
+        </paramlist>
+      </method>

       <method name="GetDashCount" type="int" overloaded="no">
         <autodoc>GetDashCount() -&gt; int</autodoc>
       </method>
       <method name="GetDashCount" type="int" overloaded="no">
         <autodoc>GetDashCount() -&gt; int</autodoc>
       </method>


@@ -7167,6 +8043,18 @@ to the bitmap. This function preserves bit depth and mask information.</docstrin
           <param name="depth" type="int" default=""/>
         </paramlist>
       </method>
           <param name="depth" type="int" default=""/>
         </paramlist>
       </method>

+      <method name="__eq__" type="bool" overloaded="no">
+        <autodoc>__eq__(Bitmap other) -&gt; bool</autodoc>
+        <paramlist>
+          <param name="other" type="Bitmap" default=""/>
+        </paramlist>
+      </method>
+      <method name="__ne__" type="bool" overloaded="no">
+        <autodoc>__ne__(Bitmap other) -&gt; bool</autodoc>
+        <paramlist>
+          <param name="other" type="Bitmap" default=""/>
+        </paramlist>
+      </method>

     </class>
     <class name="Mask" oldname="wxMask" module="gdi">
       <docstring>This class encapsulates a monochrome mask bitmap, where the masked area is
     </class>
     <class name="Mask" oldname="wxMask" module="gdi">
       <docstring>This class encapsulates a monochrome mask bitmap, where the masked area is


@@ -7175,22 +8063,16 @@ in a device context, the unmasked area of the bitmap will be drawn, and the
 masked area will not be drawn.</docstring>
       <baseclass name="Object"/>
       <constructor name="Mask" overloaded="no">
 masked area will not be drawn.</docstring>
       <baseclass name="Object"/>
       <constructor name="Mask" overloaded="no">

-        <autodoc>__init__(Bitmap bitmap) -&gt; Mask</autodoc>
-        <docstring>Constructs a mask from a monochrome bitmap.</docstring>
+        <autodoc>__init__(Bitmap bitmap, Colour colour=NullColour) -&gt; Mask</autodoc>
+        <docstring>Constructs a mask from a bitmap and a colour in that bitmap that indicates
+the transparent portions of the mask, by default BLACK is used.</docstring>

         <paramlist>
           <param name="bitmap" type="Bitmap" default=""/>
         <paramlist>
           <param name="bitmap" type="Bitmap" default=""/>

-        </paramlist>
-      </constructor>
-      <constructor name="MaskColour" overloaded="no">
-        <autodoc>MaskColour(Bitmap bitmap, Colour colour) -&gt; Mask</autodoc>
-        <docstring>Constructs a mask from a bitmap and a colour in that bitmap that indicates the
-background.</docstring>
-        <paramlist>
-          <param name="bitmap" type="Bitmap" default=""/>
-          <param name="colour" type="Colour" default=""/>
+          <param name="colour" type="Colour" default="wxNullColour"/>

         </paramlist>
       </constructor>
     </class>
         </paramlist>
       </constructor>
     </class>

+    <pythoncode> MaskColour = Mask </pythoncode>

     <class name="Icon" oldname="wxIcon" module="gdi">
       <baseclass name="GDIObject"/>
       <constructor name="Icon" overloaded="no">
     <class name="Icon" oldname="wxIcon" module="gdi">
       <baseclass name="GDIObject"/>
       <constructor name="Icon" overloaded="no">


@@ -7344,40 +8226,88 @@ background.</docstring>
       </method>
     </class>
     <class name="Cursor" oldname="wxCursor" module="gdi">
       </method>
     </class>
     <class name="Cursor" oldname="wxCursor" module="gdi">

+      <docstring>A cursor is a small bitmap usually used for denoting where the
+mouse pointer is, with a picture that might indicate the
+interpretation of a mouse click.
+
+A single cursor object may be used in many windows (any subwindow
+type). The wxWindows convention is to set the cursor for a
+window, as in X, rather than to set it globally as in MS Windows,
+although a global wx.SetCursor function is also available for use
+on MS Windows.</docstring>

       <baseclass name="GDIObject"/>
       <constructor name="Cursor" overloaded="no">
       <baseclass name="GDIObject"/>
       <constructor name="Cursor" overloaded="no">

-        <autodoc>__init__(String cursorName, long flags, int hotSpotX=0, int hotSpotY=0) -&gt; Cursor</autodoc>
+        <autodoc>__init__(String cursorName, long type, int hotSpotX=0, int hotSpotY=0) -&gt; Cursor</autodoc>
+        <docstring>Construct a Cursor from a file.  Specify the type of file using
+wx.BITAMP_TYPE* constants, and specify the hotspot if not using a
+.cur file.
+
+This cursor is not available on wxGTK, use wx.StockCursor,
+wx.CursorFromImage, or wx.CursorFromBits instead.</docstring>

         <paramlist>
           <param name="cursorName" type="String" default=""/>
         <paramlist>
           <param name="cursorName" type="String" default=""/>

-          <param name="flags" type="long" default=""/>
+          <param name="type" type="long" default=""/>

           <param name="hotSpotX" type="int" default="0"/>
           <param name="hotSpotY" type="int" default="0"/>
         </paramlist>
       </constructor>
       <constructor name="StockCursor" overloaded="no">
         <autodoc>StockCursor(int id) -&gt; Cursor</autodoc>
           <param name="hotSpotX" type="int" default="0"/>
           <param name="hotSpotY" type="int" default="0"/>
         </paramlist>
       </constructor>
       <constructor name="StockCursor" overloaded="no">
         <autodoc>StockCursor(int id) -&gt; Cursor</autodoc>

+        <docstring>Create a cursor using one of the stock cursors.  Note that not
+all cursors are available on all platforms.</docstring>
+        <refdoc>
+  Stock Cursor IDs
+
+    wx.CURSOR_ARROW             A standard arrow cursor.
+    wx.CURSOR_RIGHT_ARROW       A standard arrow cursor pointing to the right.
+    wx.CURSOR_BLANK             Transparent cursor.
+    wx.CURSOR_BULLSEYE          Bullseye cursor.
+    wx.CURSOR_CHAR              Rectangular character cursor.
+    wx.CURSOR_CROSS             A cross cursor.
+    wx.CURSOR_HAND              A hand cursor.
+    wx.CURSOR_IBEAM             An I-beam cursor (vertical line).
+    wx.CURSOR_LEFT_BUTTON       Represents a mouse with the left button depressed.
+    wx.CURSOR_MAGNIFIER         A magnifier icon.
+    wx.CURSOR_MIDDLE_BUTTON     Represents a mouse with the middle button depressed.
+    wx.CURSOR_NO_ENTRY          A no-entry sign cursor.
+    wx.CURSOR_PAINT_BRUSH       A paintbrush cursor.
+    wx.CURSOR_PENCIL            A pencil cursor.
+    wx.CURSOR_POINT_LEFT        A cursor that points left.
+    wx.CURSOR_POINT_RIGHT       A cursor that points right.
+    wx.CURSOR_QUESTION_ARROW    An arrow and question mark.
+    wx.CURSOR_RIGHT_BUTTON      Represents a mouse with the right button depressed.
+    wx.CURSOR_SIZENESW          A sizing cursor pointing NE-SW.
+    wx.CURSOR_SIZENS            A sizing cursor pointing N-S.
+    wx.CURSOR_SIZENWSE          A sizing cursor pointing NW-SE.
+    wx.CURSOR_SIZEWE            A sizing cursor pointing W-E.
+    wx.CURSOR_SIZING            A general sizing cursor.
+    wx.CURSOR_SPRAYCAN          A spraycan cursor.
+    wx.CURSOR_WAIT              A wait cursor.
+    wx.CURSOR_WATCH             A watch cursor.
+    wx.CURSOR_ARROWWAIT         A cursor with both an arrow and an hourglass, (windows.)
+
+</refdoc>

         <paramlist>
           <param name="id" type="int" default=""/>
         </paramlist>
       </constructor>
       <constructor name="CursorFromImage" overloaded="no">
         <autodoc>CursorFromImage(Image image) -&gt; Cursor</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
         </paramlist>
       </constructor>
       <constructor name="CursorFromImage" overloaded="no">
         <autodoc>CursorFromImage(Image image) -&gt; Cursor</autodoc>

+        <docstring>Constructs a cursor from a wxImage. The cursor is monochrome,
+colors with the RGB elements all greater than 127 will be
+foreground, colors less than this background. The mask (if any)
+will be used as transparent.
+
+In MSW the foreground will be white and the background black. The
+cursor is resized to 32x32 In GTK, the two most frequent colors
+will be used for foreground and background. The cursor will be
+displayed at the size of the image. On MacOS the cursor is
+resized to 16x16 and currently only shown as black/white (mask
+respected).</docstring>

         <paramlist>
           <param name="image" type="Image" default=""/>
         </paramlist>
       </constructor>
         <paramlist>
           <param name="image" type="Image" default=""/>
         </paramlist>
       </constructor>

-      <constructor name="CursorFromBits" overloaded="no">
-        <autodoc>CursorFromBits(PyObject bits, int width, int height, int hotSpotX=-1, 
-    int hotSpotY=-1, PyObject maskBits=0) -&gt; Cursor</autodoc>
-        <paramlist>
-          <param name="bits" type="PyObject" default=""/>
-          <param name="width" type="int" default=""/>
-          <param name="height" type="int" default=""/>
-          <param name="hotSpotX" type="int" default="-1"/>
-          <param name="hotSpotY" type="int" default="-1"/>
-          <param name="maskBits" type="PyObject" default="0"/>
-        </paramlist>
-      </constructor>

       <destructor name="~wxCursor" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <destructor name="~wxCursor" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>


@@ -7752,10 +8682,10 @@ background.</docstring>
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="Get" type="FontMapper" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="Get" type="FontMapper" overloaded="no">

-        <autodoc>FontMapper.Get() -&gt; FontMapper</autodoc>
+        <autodoc>Get() -&gt; FontMapper</autodoc>

       </staticmethod>
       <staticmethod name="Set" type="FontMapper" overloaded="no">
       </staticmethod>
       <staticmethod name="Set" type="FontMapper" overloaded="no">

-        <autodoc>FontMapper.Set(FontMapper mapper) -&gt; FontMapper</autodoc>
+        <autodoc>Set(FontMapper mapper) -&gt; FontMapper</autodoc>

         <paramlist>
           <param name="mapper" type="FontMapper" default=""/>
         </paramlist>
         <paramlist>
           <param name="mapper" type="FontMapper" default=""/>
         </paramlist>


@@ -7768,22 +8698,22 @@ background.</docstring>
         </paramlist>
       </method>
       <staticmethod name="GetSupportedEncodingsCount" type="size_t" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="GetSupportedEncodingsCount" type="size_t" overloaded="no">

-        <autodoc>FontMapper.GetSupportedEncodingsCount() -&gt; size_t</autodoc>
+        <autodoc>GetSupportedEncodingsCount() -&gt; size_t</autodoc>

       </staticmethod>
       <staticmethod name="GetEncoding" type="wxFontEncoding" overloaded="no">
       </staticmethod>
       <staticmethod name="GetEncoding" type="wxFontEncoding" overloaded="no">

-        <autodoc>FontMapper.GetEncoding(size_t n) -&gt; int</autodoc>
+        <autodoc>GetEncoding(size_t n) -&gt; int</autodoc>

         <paramlist>
           <param name="n" type="size_t" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetEncodingName" type="String" overloaded="no">
         <paramlist>
           <param name="n" type="size_t" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetEncodingName" type="String" overloaded="no">

-        <autodoc>FontMapper.GetEncodingName(int encoding) -&gt; String</autodoc>
+        <autodoc>GetEncodingName(int encoding) -&gt; String</autodoc>

         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetEncodingDescription" type="String" overloaded="no">
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetEncodingDescription" type="String" overloaded="no">

-        <autodoc>FontMapper.GetEncodingDescription(int encoding) -&gt; String</autodoc>
+        <autodoc>GetEncodingDescription(int encoding) -&gt; String</autodoc>

         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>


@@ -7801,7 +8731,7 @@ background.</docstring>
         </paramlist>
       </method>
       <staticmethod name="GetDefaultConfigPath" type="String" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="GetDefaultConfigPath" type="String" overloaded="no">

-        <autodoc>FontMapper.GetDefaultConfigPath() -&gt; String</autodoc>
+        <autodoc>GetDefaultConfigPath() -&gt; String</autodoc>

       </staticmethod>
       <method name="GetAltForEncoding" type="PyObject" overloaded="no">
         <autodoc>GetAltForEncoding(int encoding, String facename=EmptyString, bool interactive=True) -&gt; PyObject</autodoc>
       </staticmethod>
       <method name="GetAltForEncoding" type="PyObject" overloaded="no">
         <autodoc>GetAltForEncoding(int encoding, String facename=EmptyString, bool interactive=True) -&gt; PyObject</autodoc>


@@ -7880,15 +8810,15 @@ background.</docstring>
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
       <method name="__eq__" type="bool" overloaded="no">

-        <autodoc>__eq__(Font font) -&gt; bool</autodoc>
+        <autodoc>__eq__(Font other) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="font" type="Font" default=""/>
+          <param name="other" type="Font" default=""/>

         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">

-        <autodoc>__ne__(Font font) -&gt; bool</autodoc>
+        <autodoc>__ne__(Font other) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="font" type="Font" default=""/>
+          <param name="other" type="Font" default=""/>

         </paramlist>
       </method>
       <method name="GetPointSize" type="int" overloaded="no">
         </paramlist>
       </method>
       <method name="GetPointSize" type="int" overloaded="no">


@@ -8003,10 +8933,10 @@ background.</docstring>
         <autodoc>GetNoAntiAliasing() -&gt; bool</autodoc>
       </method>
       <staticmethod name="GetDefaultEncoding" type="wxFontEncoding" overloaded="no">
         <autodoc>GetNoAntiAliasing() -&gt; bool</autodoc>
       </method>
       <staticmethod name="GetDefaultEncoding" type="wxFontEncoding" overloaded="no">

-        <autodoc>Font.GetDefaultEncoding() -&gt; int</autodoc>
+        <autodoc>GetDefaultEncoding() -&gt; int</autodoc>

       </staticmethod>
       <staticmethod name="SetDefaultEncoding" type="" overloaded="no">
       </staticmethod>
       <staticmethod name="SetDefaultEncoding" type="" overloaded="no">

-        <autodoc>Font.SetDefaultEncoding(int encoding)</autodoc>
+        <autodoc>SetDefaultEncoding(int encoding)</autodoc>

         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>


@@ -8089,13 +9019,13 @@ background.</docstring>
         </paramlist>
       </method>
       <staticmethod name="GetSystemLanguage" type="int" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="GetSystemLanguage" type="int" overloaded="no">

-        <autodoc>Locale.GetSystemLanguage() -&gt; int</autodoc>
+        <autodoc>GetSystemLanguage() -&gt; int</autodoc>

       </staticmethod>
       <staticmethod name="GetSystemEncoding" type="wxFontEncoding" overloaded="no">
       </staticmethod>
       <staticmethod name="GetSystemEncoding" type="wxFontEncoding" overloaded="no">

-        <autodoc>Locale.GetSystemEncoding() -&gt; int</autodoc>
+        <autodoc>GetSystemEncoding() -&gt; int</autodoc>

       </staticmethod>
       <staticmethod name="GetSystemEncodingName" type="String" overloaded="no">
       </staticmethod>
       <staticmethod name="GetSystemEncodingName" type="String" overloaded="no">

-        <autodoc>Locale.GetSystemEncodingName() -&gt; String</autodoc>
+        <autodoc>GetSystemEncodingName() -&gt; String</autodoc>

       </staticmethod>
       <method name="IsOk" type="bool" overloaded="no">
         <autodoc>IsOk() -&gt; bool</autodoc>
       </staticmethod>
       <method name="IsOk" type="bool" overloaded="no">
         <autodoc>IsOk() -&gt; bool</autodoc>


@@ -8113,7 +9043,7 @@ background.</docstring>
         <autodoc>GetCanonicalName() -&gt; String</autodoc>
       </method>
       <staticmethod name="AddCatalogLookupPathPrefix" type="" overloaded="no">
         <autodoc>GetCanonicalName() -&gt; String</autodoc>
       </method>
       <staticmethod name="AddCatalogLookupPathPrefix" type="" overloaded="no">

-        <autodoc>Locale.AddCatalogLookupPathPrefix(String prefix)</autodoc>
+        <autodoc>AddCatalogLookupPathPrefix(String prefix)</autodoc>

         <paramlist>
           <param name="prefix" type="String" default=""/>
         </paramlist>
         <paramlist>
           <param name="prefix" type="String" default=""/>
         </paramlist>


@@ -8131,25 +9061,25 @@ background.</docstring>
         </paramlist>
       </method>
       <staticmethod name="GetLanguageInfo" type="LanguageInfo" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="GetLanguageInfo" type="LanguageInfo" overloaded="no">

-        <autodoc>Locale.GetLanguageInfo(int lang) -&gt; LanguageInfo</autodoc>
+        <autodoc>GetLanguageInfo(int lang) -&gt; LanguageInfo</autodoc>

         <paramlist>
           <param name="lang" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetLanguageName" type="String" overloaded="no">
         <paramlist>
           <param name="lang" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetLanguageName" type="String" overloaded="no">

-        <autodoc>Locale.GetLanguageName(int lang) -&gt; String</autodoc>
+        <autodoc>GetLanguageName(int lang) -&gt; String</autodoc>

         <paramlist>
           <param name="lang" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="FindLanguageInfo" type="LanguageInfo" overloaded="no">
         <paramlist>
           <param name="lang" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="FindLanguageInfo" type="LanguageInfo" overloaded="no">

-        <autodoc>Locale.FindLanguageInfo(String locale) -&gt; LanguageInfo</autodoc>
+        <autodoc>FindLanguageInfo(String locale) -&gt; LanguageInfo</autodoc>

         <paramlist>
           <param name="locale" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="AddLanguage" type="" overloaded="no">
         <paramlist>
           <param name="locale" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="AddLanguage" type="" overloaded="no">

-        <autodoc>Locale.AddLanguage(LanguageInfo info)</autodoc>
+        <autodoc>AddLanguage(LanguageInfo info)</autodoc>

         <paramlist>
           <param name="info" type="LanguageInfo" default=""/>
         </paramlist>
         <paramlist>
           <param name="info" type="LanguageInfo" default=""/>
         </paramlist>


@@ -8170,15 +9100,15 @@ background.</docstring>
     </method>
     <method name="GetTranslation" oldname="wxGetTranslation" type="String" overloaded="yes">
       <paramlist>
     </method>
     <method name="GetTranslation" oldname="wxGetTranslation" type="String" overloaded="yes">
       <paramlist>

-        <param name="sz" type="String" default=""/>
+        <param name="str" type="String" default=""/>

       </paramlist>
     </method>
     <method name="GetTranslation" oldname="wxGetTranslation" type="String" overloaded="yes">
       </paramlist>
     </method>
     <method name="GetTranslation" oldname="wxGetTranslation" type="String" overloaded="yes">

-      <autodoc>GetTranslation(String sz) -&gt; String
-GetTranslation(String sz1, String sz2, size_t n) -&gt; String</autodoc>
+      <autodoc>GetTranslation(String str) -&gt; String
+GetTranslation(String str, String strPlural, size_t n) -&gt; String</autodoc>

       <paramlist>
       <paramlist>

-        <param name="sz1" type="String" default=""/>
-        <param name="sz2" type="String" default=""/>
+        <param name="str" type="String" default=""/>
+        <param name="strPlural" type="String" default=""/>

         <param name="n" type="size_t" default=""/>
       </paramlist>
     </method>
         <param name="n" type="size_t" default=""/>
       </paramlist>
     </method>


@@ -8208,20 +9138,20 @@ GetTranslation(String sz1, String sz2, size_t n) -&gt; String</autodoc>
         </paramlist>
       </method>
       <staticmethod name="GetPlatformEquivalents" type="wxFontEncodingArray" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="GetPlatformEquivalents" type="wxFontEncodingArray" overloaded="no">

-        <autodoc>EncodingConverter.GetPlatformEquivalents(int enc, int platform=PLATFORM_CURRENT) -&gt; wxFontEncodingArray</autodoc>
+        <autodoc>GetPlatformEquivalents(int enc, int platform=PLATFORM_CURRENT) -&gt; wxFontEncodingArray</autodoc>

         <paramlist>
           <param name="enc" type="wxFontEncoding" default=""/>
           <param name="platform" type="int" default="wxPLATFORM_CURRENT"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetAllEquivalents" type="wxFontEncodingArray" overloaded="no">
         <paramlist>
           <param name="enc" type="wxFontEncoding" default=""/>
           <param name="platform" type="int" default="wxPLATFORM_CURRENT"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetAllEquivalents" type="wxFontEncodingArray" overloaded="no">

-        <autodoc>EncodingConverter.GetAllEquivalents(int enc) -&gt; wxFontEncodingArray</autodoc>
+        <autodoc>GetAllEquivalents(int enc) -&gt; wxFontEncodingArray</autodoc>

         <paramlist>
           <param name="enc" type="wxFontEncoding" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="CanConvert" type="bool" overloaded="no">
         <paramlist>
           <param name="enc" type="wxFontEncoding" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="CanConvert" type="bool" overloaded="no">

-        <autodoc>EncodingConverter.CanConvert(int encIn, int encOut) -&gt; bool</autodoc>
+        <autodoc>CanConvert(int encIn, int encOut) -&gt; bool</autodoc>

         <paramlist>
           <param name="encIn" type="wxFontEncoding" default=""/>
           <param name="encOut" type="wxFontEncoding" default=""/>
         <paramlist>
           <param name="encIn" type="wxFontEncoding" default=""/>
           <param name="encOut" type="wxFontEncoding" default=""/>


@@ -8755,6 +9685,12 @@ Works for single as well as multi-line strings.</docstring>
           <param name="font" type="Font" default="NULL"/>
         </paramlist>
       </method>
           <param name="font" type="Font" default="NULL"/>
         </paramlist>
       </method>

+      <method name="GetPartialTextExtents" type="wxArrayInt" overloaded="no">
+        <autodoc>GetPartialTextExtents(String text) -&gt; wxArrayInt</autodoc>
+        <paramlist>
+          <param name="text" type="String" default=""/>
+        </paramlist>
+      </method>

       <method name="GetSize" type="Size" overloaded="no">
         <autodoc>GetSize() -&gt; Size</autodoc>
         <docstring>Get the DC size in device units.</docstring>
       <method name="GetSize" type="Size" overloaded="no">
         <autodoc>GetSize() -&gt; Size</autodoc>
         <docstring>Get the DC size in device units.</docstring>


@@ -9079,13 +10015,20 @@ Works for single as well as multi-line strings.</docstring>
 </pythoncode>
     <class name="BufferedDC" oldname="wxBufferedDC" module="gdi">
       <baseclass name="MemoryDC"/>
 </pythoncode>
     <class name="BufferedDC" oldname="wxBufferedDC" module="gdi">
       <baseclass name="MemoryDC"/>

-      <constructor name="BufferedDC" overloaded="no">
-        <autodoc>__init__(DC dc, Bitmap buffer) -&gt; BufferedDC</autodoc>
+      <constructor name="BufferedDC" overloaded="yes">

         <paramlist>
           <param name="dc" type="DC" default=""/>
           <param name="buffer" type="Bitmap" default=""/>
         </paramlist>
       </constructor>
         <paramlist>
           <param name="dc" type="DC" default=""/>
           <param name="buffer" type="Bitmap" default=""/>
         </paramlist>
       </constructor>

+      <constructor name="BufferedDC" overloaded="yes">
+        <autodoc>__init__(DC dc, Bitmap buffer) -&gt; BufferedDC
+__init__(DC dc, Size area) -&gt; BufferedDC</autodoc>
+        <paramlist>
+          <param name="dc" type="DC" default=""/>
+          <param name="area" type="Size" default=""/>
+        </paramlist>
+      </constructor>

       <constructor name="BufferedDCInternalBuffer" overloaded="no">
         <autodoc>BufferedDCInternalBuffer(DC dc, Size area) -&gt; BufferedDC</autodoc>
         <paramlist>
       <constructor name="BufferedDCInternalBuffer" overloaded="no">
         <autodoc>BufferedDCInternalBuffer(DC dc, Size area) -&gt; BufferedDC</autodoc>
         <paramlist>


@@ -9093,6 +10036,9 @@ Works for single as well as multi-line strings.</docstring>
           <param name="area" type="Size" default=""/>
         </paramlist>
       </constructor>
           <param name="area" type="Size" default=""/>
         </paramlist>
       </constructor>

+      <destructor name="~wxBufferedDC" overloaded="no">
+        <autodoc>__del__()</autodoc>
+      </destructor>

       <method name="UnMask" type="" overloaded="no">
         <autodoc>UnMask()</autodoc>
       </method>
       <method name="UnMask" type="" overloaded="no">
         <autodoc>UnMask()</autodoc>
       </method>


@@ -9201,13 +10147,13 @@ Works for single as well as multi-line strings.</docstring>
         </paramlist>
       </method>
       <staticmethod name="SetResolution" type="" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="SetResolution" type="" overloaded="no">

-        <autodoc>PostScriptDC.SetResolution(int ppi)</autodoc>
+        <autodoc>SetResolution(int ppi)</autodoc>

         <paramlist>
           <param name="ppi" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetResolution" type="int" overloaded="no">
         <paramlist>
           <param name="ppi" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetResolution" type="int" overloaded="no">

-        <autodoc>PostScriptDC.GetResolution() -&gt; int</autodoc>
+        <autodoc>GetResolution() -&gt; int</autodoc>

       </staticmethod>
     </class>
     <pythoncode>
       </staticmethod>
     </class>
     <pythoncode>


@@ -9699,6 +10645,7 @@ Works for single as well as multi-line strings.</docstring>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>

+    <pythoncode> NullColor = NullColour </pythoncode>

     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>


@@ -9809,6 +10756,7 @@ Works for single as well as multi-line strings.</docstring>
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
     String name=PanelNameStr) -&gt; bool</autodoc>
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
     String name=PanelNameStr) -&gt; bool</autodoc>

+        <docstring>Create the GUI part of the Window for 2-phase creation mode.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>


@@ -9847,6 +10795,7 @@ Works for single as well as multi-line strings.</docstring>
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
     String name=PanelNameStr) -&gt; bool</autodoc>
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
     String name=PanelNameStr) -&gt; bool</autodoc>

+        <docstring>Create the GUI part of the Window for 2-phase creation mode.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>


@@ -10038,12 +10987,14 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       </method>
       <method name="SetTitle" type="" overloaded="no">
         <autodoc>SetTitle(String title)</autodoc>
       </method>
       <method name="SetTitle" type="" overloaded="no">
         <autodoc>SetTitle(String title)</autodoc>

+        <docstring>Sets the window's title. Applicable only to frames and dialogs.</docstring>

         <paramlist>
           <param name="title" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetTitle" type="String" overloaded="no">
         <autodoc>GetTitle() -&gt; String</autodoc>
         <paramlist>
           <param name="title" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetTitle" type="String" overloaded="no">
         <autodoc>GetTitle() -&gt; String</autodoc>

+        <docstring>Gets the window's title. Applicable only to frames and dialogs.</docstring>

       </method>
       <method name="SetShape" type="bool" overloaded="no">
         <autodoc>SetShape(Region region) -&gt; bool</autodoc>
       </method>
       <method name="SetShape" type="bool" overloaded="no">
         <autodoc>SetShape(Region region) -&gt; bool</autodoc>


@@ -10090,6 +11041,9 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       </method>
       <method name="GetClientAreaOrigin" type="Point" overloaded="no">
         <autodoc>GetClientAreaOrigin() -&gt; Point</autodoc>
       </method>
       <method name="GetClientAreaOrigin" type="Point" overloaded="no">
         <autodoc>GetClientAreaOrigin() -&gt; Point</autodoc>

+        <docstring>Get the origin of the client area of the window relative to the
+window's top left corner (the client area may be shifted because of
+the borders, scrollbars, other decorations...)</docstring>

       </method>
       <method name="SendSizeEvent" type="" overloaded="no">
         <autodoc>SendSizeEvent()</autodoc>
       </method>
       <method name="SendSizeEvent" type="" overloaded="no">
         <autodoc>SendSizeEvent()</autodoc>


@@ -10110,11 +11064,11 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
         </paramlist>
       </method>
       <method name="CreateStatusBar" type="wxStatusBar" overloaded="no">
         </paramlist>
       </method>
       <method name="CreateStatusBar" type="wxStatusBar" overloaded="no">

-        <autodoc>CreateStatusBar(int number=1, long style=ST_SIZEGRIP, int winid=0, 
-    String name=StatusLineNameStr) -&gt; StatusBar</autodoc>
+        <autodoc>CreateStatusBar(int number=1, long style=wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE, 
+    int winid=0, String name=StatusLineNameStr) -&gt; StatusBar</autodoc>

         <paramlist>
           <param name="number" type="int" default="1"/>
         <paramlist>
           <param name="number" type="int" default="1"/>

-          <param name="style" type="long" default="wxST_SIZEGRIP"/>
+          <param name="style" type="long" default="wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE"/>

           <param name="winid" type="int" default="0"/>
           <param name="name" type="String" default="wxPyStatusLineNameStr"/>
         </paramlist>
           <param name="winid" type="int" default="0"/>
           <param name="name" type="String" default="wxPyStatusLineNameStr"/>
         </paramlist>


@@ -10365,11 +11319,12 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
     <class name="StatusBar" oldname="wxStatusBar" module="windows">
       <baseclass name="Window"/>
       <constructor name="StatusBar" overloaded="no">
     <class name="StatusBar" oldname="wxStatusBar" module="windows">
       <baseclass name="Window"/>
       <constructor name="StatusBar" overloaded="no">

-        <autodoc>__init__(Window parent, int id=-1, long style=ST_SIZEGRIP, String name=StatusLineNameStr) -&gt; StatusBar</autodoc>
+        <autodoc>__init__(Window parent, int id=-1, long style=wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE, 
+    String name=StatusLineNameStr) -&gt; StatusBar</autodoc>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>

-          <param name="style" type="long" default="wxST_SIZEGRIP"/>
+          <param name="style" type="long" default="wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE"/>

           <param name="name" type="String" default="wxPyStatusLineNameStr"/>
         </paramlist>
       </constructor>
           <param name="name" type="String" default="wxPyStatusLineNameStr"/>
         </paramlist>
       </constructor>


@@ -10450,14 +11405,64 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SplitterWindow" oldname="wxSplitterWindow" module="windows">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SplitterWindow" oldname="wxSplitterWindow" module="windows">

+      <docstring>wx.SplitterWindow manages up to two subwindows or panes,
+with an optional vertical or horizontal split which can be
+used with the mouse or programmatically.
+</docstring>
+      <refdoc>
+ Styles
+    wx.SP_3D               Draws a 3D effect border and sash.
+    wx.SP_3DSASH           Draws a 3D effect sash.
+    wx.SP_3DBORDER         Synonym for wxSP_BORDER.
+    wx.SP_BORDER           Draws a standard border.
+    wx.SP_NOBORDER         No border (default).
+    wx.SP_NO_XP_THEME      Under Windows XP, switches off the
+                           attempt to draw the splitter
+                           using Windows XP theming, so the
+                           borders and sash will take on the
+                           pre-XP look.
+    wx.SP_PERMIT_UNSPLIT   Always allow to unsplit, even with
+                           the minimum pane size other than zero.
+    wx.SP_LIVE_UPDATE      Don't draw XOR line but resize the
+                           child windows immediately.
+
+ Events
+
+    EVT_SPLITTER_SASH_POS_CHANGING
+                           The sash position is in the
+                           process of being changed. May be
+                           used to modify the position of
+                           the tracking bar to properly
+                           reflect the position that would
+                           be set if the drag were to be
+                           completed at this point.
+
+    EVT_SPLITTER_SASH_POS_CHANGED
+                           The sash position was
+                           changed. May be used to modify
+                           the sash position before it is
+                           set, or to prevent the change
+                           from taking place. 
+
+    EVT_SPLITTER_UNSPLIT   The splitter has been just unsplit.
+
+    EVT_SPLITTER_DCLICK    The sash was double clicked. The
+                           default behaviour is to unsplit
+                           the window when this happens
+                           (unless the minimum pane size has
+                           been set to a value greater than
+                           zero.)
+
+</refdoc>

       <baseclass name="Window"/>
       <constructor name="SplitterWindow" overloaded="no">
       <baseclass name="Window"/>
       <constructor name="SplitterWindow" overloaded="no">

-        <autodoc>__init__(Window parent, int id, Point point=DefaultPosition, 
-    Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -&gt; SplitterWindow</autodoc>
+        <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=SP_3D, String name=SplitterNameStr) -&gt; SplitterWindow</autodoc>
+        <docstring>Constructor.  Creates and shows a SplitterWindow.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>

-          <param name="point" type="Point" default="wxDefaultPosition"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>

           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSP_3D"/>
           <param name="name" type="String" default="wxPySplitterNameStr"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSP_3D"/>
           <param name="name" type="String" default="wxPySplitterNameStr"/>


@@ -10465,14 +11470,16 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       </constructor>
       <constructor name="PreSplitterWindow" overloaded="no">
         <autodoc>PreSplitterWindow() -&gt; SplitterWindow</autodoc>
       </constructor>
       <constructor name="PreSplitterWindow" overloaded="no">
         <autodoc>PreSplitterWindow() -&gt; SplitterWindow</autodoc>

+        <docstring>Precreate a SplitterWindow for 2-phase creation.</docstring>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
       </constructor>
       <method name="Create" type="bool" overloaded="no">

-        <autodoc>Create(Window parent, int id, Point point=DefaultPosition, 
-    Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -&gt; bool</autodoc>
+        <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=SP_3D, String name=SplitterNameStr) -&gt; bool</autodoc>
+        <docstring>Create the GUI part of the SplitterWindow for the 2-phase create.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>

-          <param name="point" type="Point" default="wxDefaultPosition"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>

           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSP_3D"/>
           <param name="name" type="String" default="wxPySplitterNameStr"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSP_3D"/>
           <param name="name" type="String" default="wxPySplitterNameStr"/>


@@ -10480,27 +11487,55 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       </method>
       <method name="GetWindow1" type="Window" overloaded="no">
         <autodoc>GetWindow1() -&gt; Window</autodoc>
       </method>
       <method name="GetWindow1" type="Window" overloaded="no">
         <autodoc>GetWindow1() -&gt; Window</autodoc>

+        <docstring>Gets the only or left/top pane.</docstring>

       </method>
       <method name="GetWindow2" type="Window" overloaded="no">
         <autodoc>GetWindow2() -&gt; Window</autodoc>
       </method>
       <method name="GetWindow2" type="Window" overloaded="no">
         <autodoc>GetWindow2() -&gt; Window</autodoc>

+        <docstring>Gets the right/bottom pane.</docstring>

       </method>
       <method name="SetSplitMode" type="" overloaded="no">
         <autodoc>SetSplitMode(int mode)</autodoc>
       </method>
       <method name="SetSplitMode" type="" overloaded="no">
         <autodoc>SetSplitMode(int mode)</autodoc>

+        <docstring>Sets the split mode.  The mode can be wx.SPLIT_VERTICAL or
+wx.SPLIT_HORIZONTAL.  This only sets the internal variable;
+does not update the display.</docstring>

         <paramlist>
           <param name="mode" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetSplitMode" type="wxSplitMode" overloaded="no">
         <autodoc>GetSplitMode() -&gt; int</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetSplitMode" type="wxSplitMode" overloaded="no">
         <autodoc>GetSplitMode() -&gt; int</autodoc>

+        <docstring>Gets the split mode</docstring>

       </method>
       <method name="Initialize" type="" overloaded="no">
         <autodoc>Initialize(Window window)</autodoc>
       </method>
       <method name="Initialize" type="" overloaded="no">
         <autodoc>Initialize(Window window)</autodoc>

+        <docstring>Initializes the splitter window to have one pane.  This
+should be called if you wish to initially view only a single
+pane in the splitter window.</docstring>

         <paramlist>
           <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="SplitVertically" type="bool" overloaded="no">
         <autodoc>SplitVertically(Window window1, Window window2, int sashPosition=0) -&gt; bool</autodoc>
         <paramlist>
           <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="SplitVertically" type="bool" overloaded="no">
         <autodoc>SplitVertically(Window window1, Window window2, int sashPosition=0) -&gt; bool</autodoc>

+        <docstring>Initializes the left and right panes of the splitter window.
+
+    window1       The left pane.
+    window2       The right pane.
+    sashPosition  The initial position of the sash. If this
+                  value is positive, it specifies the size
+                  of the left pane. If it is negative, it is
+                  absolute value gives the size of the right
+                  pane. Finally, specify 0 (default) to
+                  choose the default position (half of the
+                  total window width).
+
+Returns True if successful, False otherwise (the window was
+already split).
+
+SplitVertically should be called if you wish to initially
+view two panes. It can also be called at any subsequent
+time, but the application should check that the window is
+not currently split using IsSplit.</docstring>

         <paramlist>
           <param name="window1" type="Window" default=""/>
           <param name="window2" type="Window" default=""/>
         <paramlist>
           <param name="window1" type="Window" default=""/>
           <param name="window2" type="Window" default=""/>


@@ -10509,6 +11544,25 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       </method>
       <method name="SplitHorizontally" type="bool" overloaded="no">
         <autodoc>SplitHorizontally(Window window1, Window window2, int sashPosition=0) -&gt; bool</autodoc>
       </method>
       <method name="SplitHorizontally" type="bool" overloaded="no">
         <autodoc>SplitHorizontally(Window window1, Window window2, int sashPosition=0) -&gt; bool</autodoc>

+        <docstring>Initializes the top and bottom panes of the splitter window.
+
+    window1       The top pane.
+    window2       The bottom pane.
+    sashPosition  The initial position of the sash. If this
+                  value is positive, it specifies the size
+                  of the upper pane. If it is negative, it
+                  is absolute value gives the size of the
+                  lower pane. Finally, specify 0 (default)
+                  to choose the default position (half of
+                  the total window height).
+
+Returns True if successful, False otherwise (the window was
+already split).
+
+SplitHorizontally should be called if you wish to initially
+view two panes. It can also be called at any subsequent
+time, but the application should check that the window is
+not currently split using IsSplit.</docstring>

         <paramlist>
           <param name="window1" type="Window" default=""/>
           <param name="window2" type="Window" default=""/>
         <paramlist>
           <param name="window1" type="Window" default=""/>
           <param name="window2" type="Window" default=""/>


@@ -10517,40 +11571,81 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       </method>
       <method name="Unsplit" type="bool" overloaded="no">
         <autodoc>Unsplit(Window toRemove=None) -&gt; bool</autodoc>
       </method>
       <method name="Unsplit" type="bool" overloaded="no">
         <autodoc>Unsplit(Window toRemove=None) -&gt; bool</autodoc>

+        <docstring>Unsplits the window.  Pass the pane to remove, or None to
+remove the right or bottom pane.  Returns True if
+successful, False otherwise (the window was not split).
+
+This function will not actually delete the pane being
+removed; it sends EVT_SPLITTER_UNSPLIT which can be handled
+for the desired behaviour. By default, the pane being
+removed is only hidden.</docstring>

         <paramlist>
           <param name="toRemove" type="Window" default="NULL"/>
         </paramlist>
       </method>
       <method name="ReplaceWindow" type="bool" overloaded="no">
         <autodoc>ReplaceWindow(Window winOld, Window winNew) -&gt; bool</autodoc>
         <paramlist>
           <param name="toRemove" type="Window" default="NULL"/>
         </paramlist>
       </method>
       <method name="ReplaceWindow" type="bool" overloaded="no">
         <autodoc>ReplaceWindow(Window winOld, Window winNew) -&gt; bool</autodoc>

+        <docstring>This function replaces one of the windows managed by the
+SplitterWindow with another one. It is in general better to
+use it instead of calling Unsplit() and then resplitting the
+window back because it will provoke much less flicker. It is
+valid to call this function whether the splitter has two
+windows or only one.
+
+Both parameters should be non-None and winOld must specify
+one of the windows managed by the splitter. If the
+parameters are incorrect or the window couldn't be replaced,
+False is returned. Otherwise the function will return True,
+but please notice that it will not Destroy the replaced
+window and you may wish to do it yourself.</docstring>

         <paramlist>
           <param name="winOld" type="Window" default=""/>
           <param name="winNew" type="Window" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="winOld" type="Window" default=""/>
           <param name="winNew" type="Window" default=""/>
         </paramlist>
       </method>

+      <method name="UpdateSize" type="" overloaded="no">
+        <autodoc>UpdateSize()</autodoc>
+        <docstring>Causes any pending sizing of the sash and child panes to
+take place immediately.
+
+Such resizing normally takes place in idle time, in order to
+wait for layout to be completed. However, this can cause
+unacceptable flicker as the panes are resized after the
+window has been shown. To work around this, you can perform
+window layout (for example by sending a size event to the
+parent window), and then call this function, before showing
+the top-level window.</docstring>
+      </method>

       <method name="IsSplit" type="bool" overloaded="no">
         <autodoc>IsSplit() -&gt; bool</autodoc>
       <method name="IsSplit" type="bool" overloaded="no">
         <autodoc>IsSplit() -&gt; bool</autodoc>

+        <docstring>Is the window split?</docstring>

       </method>
       <method name="SetSashSize" type="" overloaded="no">
         <autodoc>SetSashSize(int width)</autodoc>
       </method>
       <method name="SetSashSize" type="" overloaded="no">
         <autodoc>SetSashSize(int width)</autodoc>

+        <docstring>Sets the sash size</docstring>

         <paramlist>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SetBorderSize" type="" overloaded="no">
         <autodoc>SetBorderSize(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SetBorderSize" type="" overloaded="no">
         <autodoc>SetBorderSize(int width)</autodoc>

+        <docstring>Sets the border size</docstring>

         <paramlist>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetSashSize" type="int" overloaded="no">
         <autodoc>GetSashSize() -&gt; int</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetSashSize" type="int" overloaded="no">
         <autodoc>GetSashSize() -&gt; int</autodoc>

+        <docstring>Gets the sash size</docstring>

       </method>
       <method name="GetBorderSize" type="int" overloaded="no">
         <autodoc>GetBorderSize() -&gt; int</autodoc>
       </method>
       <method name="GetBorderSize" type="int" overloaded="no">
         <autodoc>GetBorderSize() -&gt; int</autodoc>

+        <docstring>Gets the border size</docstring>

       </method>
       <method name="SetSashPosition" type="" overloaded="no">
         <autodoc>SetSashPosition(int position, bool redraw=True)</autodoc>
       </method>
       <method name="SetSashPosition" type="" overloaded="no">
         <autodoc>SetSashPosition(int position, bool redraw=True)</autodoc>

+        <docstring>Sets the sash position, in pixels.  If redraw is Ttrue then
+the panes are resized and the sash and border are redrawn.</docstring>

         <paramlist>
           <param name="position" type="int" default=""/>
           <param name="redraw" type="bool" default="True"/>
         <paramlist>
           <param name="position" type="int" default=""/>
           <param name="redraw" type="bool" default="True"/>


@@ -10558,18 +11653,30 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       </method>
       <method name="GetSashPosition" type="int" overloaded="no">
         <autodoc>GetSashPosition() -&gt; int</autodoc>
       </method>
       <method name="GetSashPosition" type="int" overloaded="no">
         <autodoc>GetSashPosition() -&gt; int</autodoc>

+        <docstring>Returns the surrent sash position.</docstring>

       </method>
       <method name="SetMinimumPaneSize" type="" overloaded="no">
         <autodoc>SetMinimumPaneSize(int min)</autodoc>
       </method>
       <method name="SetMinimumPaneSize" type="" overloaded="no">
         <autodoc>SetMinimumPaneSize(int min)</autodoc>

+        <docstring>Sets the minimum pane size in pixels.
+
+The default minimum pane size is zero, which means that
+either pane can be reduced to zero by dragging the sash,
+thus removing one of the panes. To prevent this behaviour (and
+veto out-of-range sash dragging), set a minimum size,
+for example 20 pixels. If the wx.SP_PERMIT_UNSPLIT style is
+used when a splitter window is created, the window may be
+unsplit even if minimum size is non-zero.</docstring>

         <paramlist>
           <param name="min" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetMinimumPaneSize" type="int" overloaded="no">
         <autodoc>GetMinimumPaneSize() -&gt; int</autodoc>
         <paramlist>
           <param name="min" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetMinimumPaneSize" type="int" overloaded="no">
         <autodoc>GetMinimumPaneSize() -&gt; int</autodoc>

+        <docstring>Gets the minimum pane size in pixels.</docstring>

       </method>
       <method name="SashHitTest" type="bool" overloaded="no">
         <autodoc>SashHitTest(int x, int y, int tolerance=5) -&gt; bool</autodoc>
       </method>
       <method name="SashHitTest" type="bool" overloaded="no">
         <autodoc>SashHitTest(int x, int y, int tolerance=5) -&gt; bool</autodoc>

+        <docstring>Tests for x, y over the sash</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -10578,6 +11685,7 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       </method>
       <method name="SizeWindows" type="" overloaded="no">
         <autodoc>SizeWindows()</autodoc>
       </method>
       <method name="SizeWindows" type="" overloaded="no">
         <autodoc>SizeWindows()</autodoc>

+        <docstring>Resizes subwindows</docstring>

       </method>
       <method name="SetNeedUpdating" type="" overloaded="no">
         <autodoc>SetNeedUpdating(bool needUpdating)</autodoc>
       </method>
       <method name="SetNeedUpdating" type="" overloaded="no">
         <autodoc>SetNeedUpdating(bool needUpdating)</autodoc>


@@ -10590,9 +11698,11 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       </method>
     </class>
     <class name="SplitterEvent" oldname="wxSplitterEvent" module="windows">
       </method>
     </class>
     <class name="SplitterEvent" oldname="wxSplitterEvent" module="windows">

+      <docstring>This class represents the events generated by a splitter control.</docstring>

       <baseclass name="NotifyEvent"/>
       <constructor name="SplitterEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, SplitterWindow splitter=(wxSplitterWindow *) NULL) -&gt; SplitterEvent</autodoc>
       <baseclass name="NotifyEvent"/>
       <constructor name="SplitterEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, SplitterWindow splitter=(wxSplitterWindow *) NULL) -&gt; SplitterEvent</autodoc>

+        <docstring>This class represents the events generated by a splitter control.</docstring>

         <paramlist>
           <param name="type" type="wxEventType" default="wxEVT_NULL"/>
           <param name="splitter" type="SplitterWindow" default="(wxSplitterWindow *) NULL"/>
         <paramlist>
           <param name="type" type="wxEventType" default="wxEVT_NULL"/>
           <param name="splitter" type="SplitterWindow" default="(wxSplitterWindow *) NULL"/>


@@ -10600,21 +11710,38 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       </constructor>
       <method name="SetSashPosition" type="" overloaded="no">
         <autodoc>SetSashPosition(int pos)</autodoc>
       </constructor>
       <method name="SetSashPosition" type="" overloaded="no">
         <autodoc>SetSashPosition(int pos)</autodoc>

+        <docstring>This funciton is only meaningful during
+EVT_SPLITTER_SASH_POS_CHANGING and
+EVT_SPLITTER_SASH_POS_CHANGED events.  In the case of
+_CHANGED events, sets the the new sash position. In the case
+of _CHANGING events, sets the new tracking bar position so
+visual feedback during dragging will represent that change
+that will actually take place. Set to -1 from the event
+handler code to prevent repositioning.</docstring>

         <paramlist>
           <param name="pos" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetSashPosition" type="int" overloaded="no">
         <autodoc>GetSashPosition() -&gt; int</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetSashPosition" type="int" overloaded="no">
         <autodoc>GetSashPosition() -&gt; int</autodoc>

+        <docstring>Returns the new sash position while in
+EVT_SPLITTER_SASH_POS_CHANGING and
+EVT_SPLITTER_SASH_POS_CHANGED events.</docstring>

       </method>
       <method name="GetWindowBeingRemoved" type="Window" overloaded="no">
         <autodoc>GetWindowBeingRemoved() -&gt; Window</autodoc>
       </method>
       <method name="GetWindowBeingRemoved" type="Window" overloaded="no">
         <autodoc>GetWindowBeingRemoved() -&gt; Window</autodoc>

+        <docstring>Returns a pointer to the window being removed when a
+splitter window is unsplit.</docstring>

       </method>
       <method name="GetX" type="int" overloaded="no">
         <autodoc>GetX() -&gt; int</autodoc>
       </method>
       <method name="GetX" type="int" overloaded="no">
         <autodoc>GetX() -&gt; int</autodoc>

+        <docstring>Returns the x coordinate of the double-click point in a
+EVT_SPLITTER_DCLICK event.</docstring>

       </method>
       <method name="GetY" type="int" overloaded="no">
         <autodoc>GetY() -&gt; int</autodoc>
       </method>
       <method name="GetY" type="int" overloaded="no">
         <autodoc>GetY() -&gt; int</autodoc>

+        <docstring>Returns the y coordinate of the double-click point in a
+EVT_SPLITTER_DCLICK event.</docstring>

       </method>
     </class>
     <pythoncode>
       </method>
     </class>
     <pythoncode>


@@ -10622,6 +11749,7 @@ EVT_SPLITTER_SASH_POS_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_SASH_PO
 EVT_SPLITTER_SASH_POS_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 1 )
 EVT_SPLITTER_DOUBLECLICKED = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 1 )
 EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 EVT_SPLITTER_SASH_POS_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 1 )
 EVT_SPLITTER_DOUBLECLICKED = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 1 )
 EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )

+EVT_SPLITTER_DCLICK = EVT_SPLITTER_DOUBLECLICKED

 </pythoncode>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <pythoncode>
 #---------------------------------------------------------------------------


@@ -11109,12 +12237,20 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       </method>
       <method name="ScrollLines" type="bool" overloaded="no">
         <autodoc>ScrollLines(int lines) -&gt; bool</autodoc>
       </method>
       <method name="ScrollLines" type="bool" overloaded="no">
         <autodoc>ScrollLines(int lines) -&gt; bool</autodoc>

+        <docstring>If the platform and window class supports it, scrolls the window by
+the given number of lines down, if lines is positive, or up if lines
+is negative.  Returns True if the window was scrolled, False if it was
+already on top/bottom and nothing was done.</docstring>

         <paramlist>
           <param name="lines" type="int" default=""/>
         </paramlist>
       </method>
       <method name="ScrollPages" type="bool" overloaded="no">
         <autodoc>ScrollPages(int pages) -&gt; bool</autodoc>
         <paramlist>
           <param name="lines" type="int" default=""/>
         </paramlist>
       </method>
       <method name="ScrollPages" type="bool" overloaded="no">
         <autodoc>ScrollPages(int pages) -&gt; bool</autodoc>

+        <docstring>If the platform and window class supports it,  scrolls the window by
+the given number of pages down, if pages is positive, or up if pages
+is negative.  Returns True if the window was scrolled, False if it was
+already on top/bottom and nothing was done.</docstring>

         <paramlist>
           <param name="pages" type="int" default=""/>
         </paramlist>
         <paramlist>
           <param name="pages" type="int" default=""/>
         </paramlist>


@@ -11134,6 +12270,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       </method>
       <method name="HitTestXT" type="int" overloaded="no">
         <autodoc>HitTestXT(int x, int y) -&gt; int</autodoc>
       </method>
       <method name="HitTestXT" type="int" overloaded="no">
         <autodoc>HitTestXT(int x, int y) -&gt; int</autodoc>

+        <docstring>Test where the given (in client coords) point lies</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -11141,6 +12278,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       </method>
       <method name="HitTest" type="int" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>
       </method>
       <method name="HitTest" type="int" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>

+        <docstring>Test where the given (in client coords) point lies</docstring>

         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>


@@ -11406,39 +12544,53 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ColourData" oldname="wxColourData" module="windows">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ColourData" oldname="wxColourData" module="windows">

+      <docstring>This class holds a variety of information related to colour dialogs.</docstring>

       <baseclass name="Object"/>
       <constructor name="ColourData" overloaded="no">
         <autodoc>__init__() -&gt; ColourData</autodoc>
       <baseclass name="Object"/>
       <constructor name="ColourData" overloaded="no">
         <autodoc>__init__() -&gt; ColourData</autodoc>

+        <docstring>Constructor, sets default values.</docstring>

       </constructor>
       <destructor name="~wxColourData" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <method name="GetChooseFull" type="bool" overloaded="no">
         <autodoc>GetChooseFull() -&gt; bool</autodoc>
       </constructor>
       <destructor name="~wxColourData" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <method name="GetChooseFull" type="bool" overloaded="no">
         <autodoc>GetChooseFull() -&gt; bool</autodoc>

+        <docstring>Under Windows, determines whether the Windows colour dialog will display
+the full dialog with custom colour selection controls. Has no meaning
+under other platforms.  The default value is true.</docstring>

       </method>
       <method name="GetColour" type="Colour" overloaded="no">
         <autodoc>GetColour() -&gt; Colour</autodoc>
       </method>
       <method name="GetColour" type="Colour" overloaded="no">
         <autodoc>GetColour() -&gt; Colour</autodoc>

+        <docstring>Gets the colour (pre)selected by the dialog.</docstring>

       </method>
       <method name="GetCustomColour" type="Colour" overloaded="no">
         <autodoc>GetCustomColour(int i) -&gt; Colour</autodoc>
       </method>
       <method name="GetCustomColour" type="Colour" overloaded="no">
         <autodoc>GetCustomColour(int i) -&gt; Colour</autodoc>

+        <docstring>Gets the i'th custom colour associated with the colour dialog. i should
+be an integer between 0 and 15. The default custom colours are all white.</docstring>

         <paramlist>
           <param name="i" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SetChooseFull" type="" overloaded="no">
         <autodoc>SetChooseFull(int flag)</autodoc>
         <paramlist>
           <param name="i" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SetChooseFull" type="" overloaded="no">
         <autodoc>SetChooseFull(int flag)</autodoc>

+        <docstring>Under Windows, tells the Windows colour dialog to display the full dialog
+with custom colour selection controls. Under other platforms, has no effect.
+The default value is true.</docstring>

         <paramlist>
           <param name="flag" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SetColour" type="" overloaded="no">
         <autodoc>SetColour(Colour colour)</autodoc>
         <paramlist>
           <param name="flag" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SetColour" type="" overloaded="no">
         <autodoc>SetColour(Colour colour)</autodoc>

+        <docstring>Sets the default colour for the colour dialog.  The default colour is black.</docstring>

         <paramlist>
           <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
       <method name="SetCustomColour" type="" overloaded="no">
         <autodoc>SetCustomColour(int i, Colour colour)</autodoc>
         <paramlist>
           <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
       <method name="SetCustomColour" type="" overloaded="no">
         <autodoc>SetCustomColour(int i, Colour colour)</autodoc>

+        <docstring>Sets the i'th custom colour for the colour dialog. i should be an integer
+between 0 and 15. The default custom colours are all white.</docstring>

         <paramlist>
           <param name="i" type="int" default=""/>
           <param name="colour" type="Colour" default=""/>
         <paramlist>
           <param name="i" type="int" default=""/>
           <param name="colour" type="Colour" default=""/>


@@ -11446,9 +12598,12 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </method>
     </class>
     <class name="ColourDialog" oldname="wxColourDialog" module="windows">
       </method>
     </class>
     <class name="ColourDialog" oldname="wxColourDialog" module="windows">

+      <docstring>This class represents the colour chooser dialog.</docstring>

       <baseclass name="Dialog"/>
       <constructor name="ColourDialog" overloaded="no">
         <autodoc>__init__(Window parent, ColourData data=None) -&gt; ColourDialog</autodoc>
       <baseclass name="Dialog"/>
       <constructor name="ColourDialog" overloaded="no">
         <autodoc>__init__(Window parent, ColourData data=None) -&gt; ColourDialog</autodoc>

+        <docstring>Constructor. Pass a parent window, and optionally a ColourData, which
+will be copied to the colour dialog's internal ColourData instance.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="data" type="ColourData" default="NULL"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="data" type="ColourData" default="NULL"/>


@@ -11456,18 +12611,24 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </constructor>
       <method name="GetColourData" type="ColourData" overloaded="no">
         <autodoc>GetColourData() -&gt; ColourData</autodoc>
       </constructor>
       <method name="GetColourData" type="ColourData" overloaded="no">
         <autodoc>GetColourData() -&gt; ColourData</autodoc>

-      </method>
-      <method name="ShowModal" type="int" overloaded="no">
-        <autodoc>ShowModal() -&gt; int</autodoc>
+        <docstring>Returns a reference to the ColourData used by the dialog.</docstring>

       </method>
     </class>
     <class name="DirDialog" oldname="wxDirDialog" module="windows">
       </method>
     </class>
     <class name="DirDialog" oldname="wxDirDialog" module="windows">

+      <docstring>This class represents the directory chooser dialog.</docstring>
+      <refdoc>
+ Styles
+    wxDD_NEW_DIR_BUTTON     Add "Create new directory" button and allow
+                            directory names to be editable. On Windows the new
+                            directory button is only available with recent
+                            versions of the common dialogs.</refdoc>

       <baseclass name="Dialog"/>
       <constructor name="DirDialog" overloaded="no">
         <autodoc>__init__(Window parent, String message=DirSelectorPromptStr, 
     String defaultPath=EmptyString, long style=0, 
     Point pos=DefaultPosition, Size size=DefaultSize, 
     String name=DirDialogNameStr) -&gt; DirDialog</autodoc>
       <baseclass name="Dialog"/>
       <constructor name="DirDialog" overloaded="no">
         <autodoc>__init__(Window parent, String message=DirSelectorPromptStr, 
     String defaultPath=EmptyString, long style=0, 
     Point pos=DefaultPosition, Size size=DefaultSize, 
     String name=DirDialogNameStr) -&gt; DirDialog</autodoc>

+        <docstring>Constructor.  Use ShowModal method to show the dialog.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="message" type="String" default="wxPyDirSelectorPromptStr"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="message" type="String" default="wxPyDirSelectorPromptStr"/>


@@ -11480,36 +12641,73 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </constructor>
       <method name="GetPath" type="String" overloaded="no">
         <autodoc>GetPath() -&gt; String</autodoc>
       </constructor>
       <method name="GetPath" type="String" overloaded="no">
         <autodoc>GetPath() -&gt; String</autodoc>

+        <docstring>Returns the default or user-selected path.</docstring>

       </method>
       <method name="GetMessage" type="String" overloaded="no">
         <autodoc>GetMessage() -&gt; String</autodoc>
       </method>
       <method name="GetMessage" type="String" overloaded="no">
         <autodoc>GetMessage() -&gt; String</autodoc>

+        <docstring>Returns the message that will be displayed on the dialog.</docstring>

       </method>
       <method name="GetStyle" type="long" overloaded="no">
         <autodoc>GetStyle() -&gt; long</autodoc>
       </method>
       <method name="GetStyle" type="long" overloaded="no">
         <autodoc>GetStyle() -&gt; long</autodoc>

+        <docstring>Returns the dialog style.</docstring>

       </method>
       <method name="SetMessage" type="" overloaded="no">
         <autodoc>SetMessage(String message)</autodoc>
       </method>
       <method name="SetMessage" type="" overloaded="no">
         <autodoc>SetMessage(String message)</autodoc>

+        <docstring>Sets the message that will be displayed on the dialog.</docstring>

         <paramlist>
           <param name="message" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetPath" type="" overloaded="no">
         <autodoc>SetPath(String path)</autodoc>
         <paramlist>
           <param name="message" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetPath" type="" overloaded="no">
         <autodoc>SetPath(String path)</autodoc>

+        <docstring>Sets the default path.</docstring>

         <paramlist>
           <param name="path" type="String" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="path" type="String" default=""/>
         </paramlist>
       </method>

-      <method name="ShowModal" type="int" overloaded="no">
-        <autodoc>ShowModal() -&gt; int</autodoc>
-      </method>

     </class>
     <class name="FileDialog" oldname="wxFileDialog" module="windows">
     </class>
     <class name="FileDialog" oldname="wxFileDialog" module="windows">

+      <docstring>This class represents the file chooser dialog.</docstring>
+      <refdoc>
+In Windows, this is the common file selector dialog. In X, this is a file
+selector box with somewhat less functionality. The path and filename are
+distinct elements of a full file pathname. If path is "", the current
+directory will be used. If filename is "", no default filename will be
+supplied. The wildcard determines what files are displayed in the file
+selector, and file extension supplies a type extension for the required
+filename.
+
+Both the X and Windows versions implement a wildcard filter. Typing a filename
+containing wildcards (*, ?) in the filename text item, and clicking on Ok,
+will result in only those files matching the pattern being displayed. The
+wildcard may be a specification for multiple types of file with a description
+for each, such as:
+
+   "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"
+
+ Styles
+    wx.OPEN              This is an open dialog.
+
+    wx.SAVE              This is a save dialog.
+
+    wx.HIDE_READONLY     For open dialog only: hide the checkbox allowing to
+                         open the file in read-only mode.
+
+    wx.OVERWRITE_PROMPT  For save dialog only: prompt for a confirmation if a
+                         file will be overwritten.
+
+    wx.MULTIPLE          For open dialog only: allows selecting multiple files.
+
+    wx.CHANGE_DIR        Change the current working directory to the directory
+                         where the file(s) chosen by the user are.
+</refdoc>

       <baseclass name="Dialog"/>
       <constructor name="FileDialog" overloaded="no">
         <autodoc>__init__(Window parent, String message=FileSelectorPromptStr, 
     String defaultDir=EmptyString, String defaultFile=EmptyString, 
     String wildcard=FileSelectorDefaultWildcardStr, 
     long style=0, Point pos=DefaultPosition) -&gt; FileDialog</autodoc>
       <baseclass name="Dialog"/>
       <constructor name="FileDialog" overloaded="no">
         <autodoc>__init__(Window parent, String message=FileSelectorPromptStr, 
     String defaultDir=EmptyString, String defaultFile=EmptyString, 
     String wildcard=FileSelectorDefaultWildcardStr, 
     long style=0, Point pos=DefaultPosition) -&gt; FileDialog</autodoc>

+        <docstring>Constructor.  Use ShowModal method to show the dialog.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="message" type="String" default="wxPyFileSelectorPromptStr"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="message" type="String" default="wxPyFileSelectorPromptStr"/>


@@ -11522,106 +12720,137 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </constructor>
       <method name="SetMessage" type="" overloaded="no">
         <autodoc>SetMessage(String message)</autodoc>
       </constructor>
       <method name="SetMessage" type="" overloaded="no">
         <autodoc>SetMessage(String message)</autodoc>

+        <docstring>Sets the message that will be displayed on the dialog.</docstring>

         <paramlist>
           <param name="message" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetPath" type="" overloaded="no">
         <autodoc>SetPath(String path)</autodoc>
         <paramlist>
           <param name="message" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetPath" type="" overloaded="no">
         <autodoc>SetPath(String path)</autodoc>

+        <docstring>Sets the path (the combined directory and filename that will
+be returned when the dialog is dismissed).</docstring>

         <paramlist>
           <param name="path" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetDirectory" type="" overloaded="no">
         <autodoc>SetDirectory(String dir)</autodoc>
         <paramlist>
           <param name="path" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetDirectory" type="" overloaded="no">
         <autodoc>SetDirectory(String dir)</autodoc>

+        <docstring>Sets the default directory.</docstring>

         <paramlist>
           <param name="dir" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetFilename" type="" overloaded="no">
         <autodoc>SetFilename(String name)</autodoc>
         <paramlist>
           <param name="dir" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetFilename" type="" overloaded="no">
         <autodoc>SetFilename(String name)</autodoc>

+        <docstring>Sets the default filename.</docstring>

         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetWildcard" type="" overloaded="no">
         <autodoc>SetWildcard(String wildCard)</autodoc>
         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetWildcard" type="" overloaded="no">
         <autodoc>SetWildcard(String wildCard)</autodoc>

+        <docstring>Sets the wildcard, which can contain multiple file types, for example:
+    "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"</docstring>

         <paramlist>
           <param name="wildCard" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetStyle" type="" overloaded="no">
         <autodoc>SetStyle(long style)</autodoc>
         <paramlist>
           <param name="wildCard" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetStyle" type="" overloaded="no">
         <autodoc>SetStyle(long style)</autodoc>

+        <docstring>Sets the dialog style.</docstring>

         <paramlist>
           <param name="style" type="long" default=""/>
         </paramlist>
       </method>
       <method name="SetFilterIndex" type="" overloaded="no">
         <autodoc>SetFilterIndex(int filterIndex)</autodoc>
         <paramlist>
           <param name="style" type="long" default=""/>
         </paramlist>
       </method>
       <method name="SetFilterIndex" type="" overloaded="no">
         <autodoc>SetFilterIndex(int filterIndex)</autodoc>

+        <docstring>Sets the default filter index, starting from zero.</docstring>

         <paramlist>
           <param name="filterIndex" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetMessage" type="String" overloaded="no">
         <autodoc>GetMessage() -&gt; String</autodoc>
         <paramlist>
           <param name="filterIndex" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetMessage" type="String" overloaded="no">
         <autodoc>GetMessage() -&gt; String</autodoc>

+        <docstring>Returns the message that will be displayed on the dialog.</docstring>

       </method>
       <method name="GetPath" type="String" overloaded="no">
         <autodoc>GetPath() -&gt; String</autodoc>
       </method>
       <method name="GetPath" type="String" overloaded="no">
         <autodoc>GetPath() -&gt; String</autodoc>

+        <docstring>Returns the full path (directory and filename) of the selected file.</docstring>

       </method>
       <method name="GetDirectory" type="String" overloaded="no">
         <autodoc>GetDirectory() -&gt; String</autodoc>
       </method>
       <method name="GetDirectory" type="String" overloaded="no">
         <autodoc>GetDirectory() -&gt; String</autodoc>

+        <docstring>Returns the default directory.</docstring>

       </method>
       <method name="GetFilename" type="String" overloaded="no">
         <autodoc>GetFilename() -&gt; String</autodoc>
       </method>
       <method name="GetFilename" type="String" overloaded="no">
         <autodoc>GetFilename() -&gt; String</autodoc>

+        <docstring>Returns the default filename.</docstring>

       </method>
       <method name="GetWildcard" type="String" overloaded="no">
         <autodoc>GetWildcard() -&gt; String</autodoc>
       </method>
       <method name="GetWildcard" type="String" overloaded="no">
         <autodoc>GetWildcard() -&gt; String</autodoc>

+        <docstring>Returns the file dialog wildcard.</docstring>

       </method>
       <method name="GetStyle" type="long" overloaded="no">
         <autodoc>GetStyle() -&gt; long</autodoc>
       </method>
       <method name="GetStyle" type="long" overloaded="no">
         <autodoc>GetStyle() -&gt; long</autodoc>

+        <docstring>Returns the dialog style.</docstring>

       </method>
       <method name="GetFilterIndex" type="int" overloaded="no">
         <autodoc>GetFilterIndex() -&gt; int</autodoc>
       </method>
       <method name="GetFilterIndex" type="int" overloaded="no">
         <autodoc>GetFilterIndex() -&gt; int</autodoc>

+        <docstring>Returns the index into the list of filters supplied, optionally, in
+the wildcard parameter. Before the dialog is shown, this is the index
+which will be used when the dialog is first displayed. After the dialog
+is shown, this is the index selected by the user.</docstring>

       </method>
       <method name="GetFilenames" type="PyObject" overloaded="no">
         <autodoc>GetFilenames() -&gt; PyObject</autodoc>
       </method>
       <method name="GetFilenames" type="PyObject" overloaded="no">
         <autodoc>GetFilenames() -&gt; PyObject</autodoc>

+        <docstring>Returns a list of filenames chosen in the dialog.  This function should
+only be used with the dialogs which have wx.MULTIPLE style, use
+GetFilename for the others.</docstring>

       </method>
       <method name="GetPaths" type="PyObject" overloaded="no">
         <autodoc>GetPaths() -&gt; PyObject</autodoc>
       </method>
       <method name="GetPaths" type="PyObject" overloaded="no">
         <autodoc>GetPaths() -&gt; PyObject</autodoc>

+        <docstring>Fills the array paths with the full paths of the files chosen. This
+function should only be used with the dialogs which have wx.MULTIPLE style,
+use GetPath for the others.</docstring>

       </method>
     </class>
     <class name="MultiChoiceDialog" oldname="wxMultiChoiceDialog" module="windows">
       </method>
     </class>
     <class name="MultiChoiceDialog" oldname="wxMultiChoiceDialog" module="windows">

+      <docstring>A simple dialog with a multi selection listbox.</docstring>

       <baseclass name="Dialog"/>
       <constructor name="MultiChoiceDialog" overloaded="no">
       <baseclass name="Dialog"/>
       <constructor name="MultiChoiceDialog" overloaded="no">

-        <autodoc>__init__(Window parent, String message, String caption, int LCOUNT, 
-    String choices, long style=CHOICEDLG_STYLE, 
+        <autodoc>__init__(Window parent, String message, String caption,
+    List choices=[], long style=CHOICEDLG_STYLE,

     Point pos=DefaultPosition) -&gt; MultiChoiceDialog</autodoc>
     Point pos=DefaultPosition) -&gt; MultiChoiceDialog</autodoc>

+        <docstring>Constructor.  Use ShowModal method to show the dialog.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="message" type="String" default=""/>
           <param name="caption" type="String" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="message" type="String" default=""/>
           <param name="caption" type="String" default=""/>

-          <param name="LCOUNT" type="int" default=""/>
-          <param name="choices" type="String" default=""/>
+          <param name="choices" type="int" default="0"/>
+          <param name="choices_array" type="String" default=""/>

           <param name="style" type="long" default="wxCHOICEDLG_STYLE"/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
         </paramlist>
       </constructor>
       <method name="SetSelections" type="" overloaded="no">
           <param name="style" type="long" default="wxCHOICEDLG_STYLE"/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
         </paramlist>
       </constructor>
       <method name="SetSelections" type="" overloaded="no">

-        <autodoc>SetSelections(wxArrayInt selections)</autodoc>
+        <autodoc>SetSelections(List selections)</autodoc>
+        <docstring>Specify the items in the list that shoudl be selected, using a list of integers.</docstring>

         <paramlist>
           <param name="selections" type="wxArrayInt" default=""/>
         </paramlist>
       </method>
       <method name="GetSelections" type="PyObject" overloaded="no">
         <paramlist>
           <param name="selections" type="wxArrayInt" default=""/>
         </paramlist>
       </method>
       <method name="GetSelections" type="PyObject" overloaded="no">

-        <autodoc>GetSelections() -&gt; PyObject</autodoc>
+        <autodoc>GetSelections() -&gt; [selections]</autodoc>
+        <docstring>Returns a list of integers representing the items that are selected.</docstring>

       </method>
     </class>
     <class name="SingleChoiceDialog" oldname="wxSingleChoiceDialog" module="windows">
       </method>
     </class>
     <class name="SingleChoiceDialog" oldname="wxSingleChoiceDialog" module="windows">

+      <docstring>A simple dialog with a single selection listbox.</docstring>

       <baseclass name="Dialog"/>
       <constructor name="SingleChoiceDialog" overloaded="no">
       <baseclass name="Dialog"/>
       <constructor name="SingleChoiceDialog" overloaded="no">

-        <autodoc>__init__(Window parent, String message, String caption, int choices, 
-    String choices_array, long style=CHOICEDLG_STYLE, 
+        <autodoc>__init__(Window parent, String message, String caption,
+    List choices=[], long style=CHOICEDLG_STYLE,

     Point pos=DefaultPosition) -&gt; SingleChoiceDialog</autodoc>
     Point pos=DefaultPosition) -&gt; SingleChoiceDialog</autodoc>

+        <docstring>Constructor.  Use ShowModal method to show the dialog.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="message" type="String" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="message" type="String" default=""/>


@@ -11634,26 +12863,28 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </constructor>
       <method name="GetSelection" type="int" overloaded="no">
         <autodoc>GetSelection() -&gt; int</autodoc>
       </constructor>
       <method name="GetSelection" type="int" overloaded="no">
         <autodoc>GetSelection() -&gt; int</autodoc>

+        <docstring>Get the index of teh currently selected item.</docstring>

       </method>
       <method name="GetStringSelection" type="String" overloaded="no">
         <autodoc>GetStringSelection() -&gt; String</autodoc>
       </method>
       <method name="GetStringSelection" type="String" overloaded="no">
         <autodoc>GetStringSelection() -&gt; String</autodoc>

+        <docstring>Returns the string value of the currently selected item</docstring>

       </method>
       <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int sel)</autodoc>
       </method>
       <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int sel)</autodoc>

+        <docstring>Set the current selected item to sel</docstring>

         <paramlist>
           <param name="sel" type="int" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="sel" type="int" default=""/>
         </paramlist>
       </method>

-      <method name="ShowModal" type="int" overloaded="no">
-        <autodoc>ShowModal() -&gt; int</autodoc>
-      </method>

     </class>
     <class name="TextEntryDialog" oldname="wxTextEntryDialog" module="windows">
     </class>
     <class name="TextEntryDialog" oldname="wxTextEntryDialog" module="windows">

+      <docstring>A dialog with text control, [ok] and [cancel] buttons</docstring>

       <baseclass name="Dialog"/>
       <constructor name="TextEntryDialog" overloaded="no">
         <autodoc>__init__(Window parent, String message, String caption=GetTextFromUserPromptStr, 
     String defaultValue=EmptyString, 
     long style=wxOK|wxCANCEL|wxCENTRE, Point pos=DefaultPosition) -&gt; TextEntryDialog</autodoc>
       <baseclass name="Dialog"/>
       <constructor name="TextEntryDialog" overloaded="no">
         <autodoc>__init__(Window parent, String message, String caption=GetTextFromUserPromptStr, 
     String defaultValue=EmptyString, 
     long style=wxOK|wxCANCEL|wxCENTRE, Point pos=DefaultPosition) -&gt; TextEntryDialog</autodoc>

+        <docstring>Constructor.  Use ShowModal method to show the dialog.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="message" type="String" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="message" type="String" default=""/>


@@ -11665,75 +12896,97 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </constructor>
       <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>
       </constructor>
       <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>

+        <docstring>Returns the text that the user has entered if the user has pressed OK,
+or the original value if the user has pressed Cancel.</docstring>

       </method>
       <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(String value)</autodoc>
       </method>
       <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(String value)</autodoc>

+        <docstring>Sets the default text value.</docstring>

         <paramlist>
           <param name="value" type="String" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="value" type="String" default=""/>
         </paramlist>
       </method>

-      <method name="ShowModal" type="int" overloaded="no">
-        <autodoc>ShowModal() -&gt; int</autodoc>
-      </method>

     </class>
     <class name="FontData" oldname="wxFontData" module="windows">
     </class>
     <class name="FontData" oldname="wxFontData" module="windows">

+      <docstring>This class holds a variety of information related to font dialogs.</docstring>

       <baseclass name="Object"/>
       <constructor name="FontData" overloaded="no">
         <autodoc>__init__() -&gt; FontData</autodoc>
       <baseclass name="Object"/>
       <constructor name="FontData" overloaded="no">
         <autodoc>__init__() -&gt; FontData</autodoc>

+        <docstring>This class holds a variety of information related to font dialogs.</docstring>

       </constructor>
       <destructor name="~wxFontData" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <method name="EnableEffects" type="" overloaded="no">
         <autodoc>EnableEffects(bool enable)</autodoc>
       </constructor>
       <destructor name="~wxFontData" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <method name="EnableEffects" type="" overloaded="no">
         <autodoc>EnableEffects(bool enable)</autodoc>

+        <docstring>Enables or disables 'effects' under MS Windows only. This refers
+to the controls for manipulating colour, strikeout and underline
+properties.  The default value is true.</docstring>

         <paramlist>
           <param name="enable" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="GetAllowSymbols" type="bool" overloaded="no">
         <autodoc>GetAllowSymbols() -&gt; bool</autodoc>
         <paramlist>
           <param name="enable" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="GetAllowSymbols" type="bool" overloaded="no">
         <autodoc>GetAllowSymbols() -&gt; bool</autodoc>

+        <docstring>Under MS Windows, returns a flag determining whether symbol fonts can be
+selected. Has no effect on other platforms. The default value is true.</docstring>

       </method>
       <method name="GetColour" type="Colour" overloaded="no">
         <autodoc>GetColour() -&gt; Colour</autodoc>
       </method>
       <method name="GetColour" type="Colour" overloaded="no">
         <autodoc>GetColour() -&gt; Colour</autodoc>

+        <docstring>Gets the colour associated with the font dialog. The default value is black.</docstring>

       </method>
       <method name="GetChosenFont" type="Font" overloaded="no">
         <autodoc>GetChosenFont() -&gt; Font</autodoc>
       </method>
       <method name="GetChosenFont" type="Font" overloaded="no">
         <autodoc>GetChosenFont() -&gt; Font</autodoc>

+        <docstring>Gets the font chosen by the user.</docstring>

       </method>
       <method name="GetEnableEffects" type="bool" overloaded="no">
         <autodoc>GetEnableEffects() -&gt; bool</autodoc>
       </method>
       <method name="GetEnableEffects" type="bool" overloaded="no">
         <autodoc>GetEnableEffects() -&gt; bool</autodoc>

+        <docstring>Determines whether 'effects' are enabled under Windows.</docstring>

       </method>
       <method name="GetInitialFont" type="Font" overloaded="no">
         <autodoc>GetInitialFont() -&gt; Font</autodoc>
       </method>
       <method name="GetInitialFont" type="Font" overloaded="no">
         <autodoc>GetInitialFont() -&gt; Font</autodoc>

+        <docstring>Gets the font that will be initially used by the font dialog. This should have
+previously been set by the application.</docstring>

       </method>
       <method name="GetShowHelp" type="bool" overloaded="no">
         <autodoc>GetShowHelp() -&gt; bool</autodoc>
       </method>
       <method name="GetShowHelp" type="bool" overloaded="no">
         <autodoc>GetShowHelp() -&gt; bool</autodoc>

+        <docstring>Returns true if the Help button will be shown (Windows only).  The default
+value is false.</docstring>

       </method>
       <method name="SetAllowSymbols" type="" overloaded="no">
         <autodoc>SetAllowSymbols(bool allowSymbols)</autodoc>
       </method>
       <method name="SetAllowSymbols" type="" overloaded="no">
         <autodoc>SetAllowSymbols(bool allowSymbols)</autodoc>

+        <docstring>Under MS Windows, determines whether symbol fonts can be selected. Has no
+effect on other platforms.  The default value is true.</docstring>

         <paramlist>
           <param name="allowSymbols" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="SetChosenFont" type="" overloaded="no">
         <autodoc>SetChosenFont(Font font)</autodoc>
         <paramlist>
           <param name="allowSymbols" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="SetChosenFont" type="" overloaded="no">
         <autodoc>SetChosenFont(Font font)</autodoc>

+        <docstring>Sets the font that will be returned to the user (for internal use only).</docstring>

         <paramlist>
           <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
       <method name="SetColour" type="" overloaded="no">
         <autodoc>SetColour(Colour colour)</autodoc>
         <paramlist>
           <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
       <method name="SetColour" type="" overloaded="no">
         <autodoc>SetColour(Colour colour)</autodoc>

+        <docstring>Sets the colour that will be used for the font foreground colour.  The default
+colour is black.</docstring>

         <paramlist>
           <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
       <method name="SetInitialFont" type="" overloaded="no">
         <autodoc>SetInitialFont(Font font)</autodoc>
         <paramlist>
           <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
       <method name="SetInitialFont" type="" overloaded="no">
         <autodoc>SetInitialFont(Font font)</autodoc>

+        <docstring>Sets the font that will be initially used by the font dialog.</docstring>

         <paramlist>
           <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
       <method name="SetRange" type="" overloaded="no">
         <autodoc>SetRange(int min, int max)</autodoc>
         <paramlist>
           <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
       <method name="SetRange" type="" overloaded="no">
         <autodoc>SetRange(int min, int max)</autodoc>

+        <docstring>Sets the valid range for the font point size (Windows only).  The default is
+0, 0 (unrestricted range).</docstring>

         <paramlist>
           <param name="min" type="int" default=""/>
           <param name="max" type="int" default=""/>
         <paramlist>
           <param name="min" type="int" default=""/>
           <param name="max" type="int" default=""/>


@@ -11741,15 +12994,20 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </method>
       <method name="SetShowHelp" type="" overloaded="no">
         <autodoc>SetShowHelp(bool showHelp)</autodoc>
       </method>
       <method name="SetShowHelp" type="" overloaded="no">
         <autodoc>SetShowHelp(bool showHelp)</autodoc>

+        <docstring>Determines whether the Help button will be displayed in the font dialog
+(Windows only).  The default value is false.</docstring>

         <paramlist>
           <param name="showHelp" type="bool" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="FontDialog" oldname="wxFontDialog" module="windows">
         <paramlist>
           <param name="showHelp" type="bool" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="FontDialog" oldname="wxFontDialog" module="windows">

+      <docstring>This class represents the font chooser dialog.</docstring>

       <baseclass name="Dialog"/>
       <constructor name="FontDialog" overloaded="no">
         <autodoc>__init__(Window parent, FontData data) -&gt; FontDialog</autodoc>
       <baseclass name="Dialog"/>
       <constructor name="FontDialog" overloaded="no">
         <autodoc>__init__(Window parent, FontData data) -&gt; FontDialog</autodoc>

+        <docstring>Constructor. Pass a parent window and the FontData object to be
+used to initialize the dialog controls.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="data" type="FontData" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="data" type="FontData" default=""/>


@@ -11757,17 +13015,43 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </constructor>
       <method name="GetFontData" type="FontData" overloaded="no">
         <autodoc>GetFontData() -&gt; FontData</autodoc>
       </constructor>
       <method name="GetFontData" type="FontData" overloaded="no">
         <autodoc>GetFontData() -&gt; FontData</autodoc>

-      </method>
-      <method name="ShowModal" type="int" overloaded="no">
-        <autodoc>ShowModal() -&gt; int</autodoc>
+        <docstring>Returns a reference to the internal FontData used by the FontDialog.</docstring>

       </method>
     </class>
     <class name="MessageDialog" oldname="wxMessageDialog" module="windows">
       </method>
     </class>
     <class name="MessageDialog" oldname="wxMessageDialog" module="windows">

+      <docstring>This class provides a dialog that shows a single or multi-line message, with
+a choice of OK, Yes, No and Cancel buttons.</docstring>
+      <refdoc>
+  Styles
+    wx.OK:                Show an OK button.
+
+    wx.CANCEL:            Show a Cancel button.
+
+    wx.YES_NO:            Show Yes and No buttons.
+
+    wx.YES_DEFAULT:       Used with wxYES_NO, makes Yes button the default - which is the default behaviour.
+
+    wx.NO_DEFAULT:        Used with wxYES_NO, makes No button the default.
+
+    wx.ICON_EXCLAMATION:  Shows an exclamation mark icon.
+
+    wx.ICON_HAND:         Shows an error icon.
+
+    wx.ICON_ERROR:        Shows an error icon - the same as wxICON_HAND.
+
+    wx.ICON_QUESTION:     Shows a question mark icon.
+
+    wx.ICON_INFORMATION:  Shows an information (i) icon.
+
+    wx.STAY_ON_TOP:       The message box stays on top of all other window, even those of the other applications (Windows only).
+</refdoc>

       <baseclass name="Dialog"/>
       <constructor name="MessageDialog" overloaded="no">
         <autodoc>__init__(Window parent, String message, String caption=MessageBoxCaptionStr, 
     long style=wxOK|wxCANCEL|wxCENTRE, 
     Point pos=DefaultPosition) -&gt; MessageDialog</autodoc>
       <baseclass name="Dialog"/>
       <constructor name="MessageDialog" overloaded="no">
         <autodoc>__init__(Window parent, String message, String caption=MessageBoxCaptionStr, 
     long style=wxOK|wxCANCEL|wxCENTRE, 
     Point pos=DefaultPosition) -&gt; MessageDialog</autodoc>

+        <docstring>This class provides a dialog that shows a single or multi-line message, with
+a choice of OK, Yes, No and Cancel buttons.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="message" type="String" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="message" type="String" default=""/>


@@ -11776,15 +13060,42 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
           <param name="pos" type="Point" default="wxDefaultPosition"/>
         </paramlist>
       </constructor>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
         </paramlist>
       </constructor>

-      <method name="ShowModal" type="int" overloaded="no">
-        <autodoc>ShowModal() -&gt; int</autodoc>
-      </method>

     </class>
     <class name="ProgressDialog" oldname="wxProgressDialog" module="windows">
     </class>
     <class name="ProgressDialog" oldname="wxProgressDialog" module="windows">

+      <docstring>A dialog that shows a short message and a progress bar. Optionally, it can
+display an ABORT button.</docstring>
+      <refdoc>
+  Styles
+
+    wx.PD_APP_MODAL:            Make the progress dialog modal. If this flag is
+                                not given, it is only "locally" modal - that is
+                                the input to the parent window is disabled,
+                                but not to the other ones.
+
+    wx.PD_AUTO_HIDE:            Causes the progress dialog to disappear from screen 
+                                as soon as the maximum value of the progress
+                                meter has been reached.
+
+    wx.PD_CAN_ABORT:            This flag tells the dialog that it should have
+                                a "Cancel" button which the user may press. If
+                                this happens, the next call to Update() will
+                                return false.
+
+    wx.PD_ELAPSED_TIME:         This flag tells the dialog that it should show
+                                elapsed time (since creating the dialog).
+
+    wx.PD_ESTIMATED_TIME:  This flag tells the dialog that it should show
+                                estimated time.
+
+    wx.PD_REMAINING_TIME:  This flag tells the dialog that it should show
+                                remaining time.
+</refdoc>

       <baseclass name="Frame"/>
       <constructor name="ProgressDialog" overloaded="no">
         <autodoc>__init__(String title, String message, int maximum=100, Window parent=None, 
     int style=wxPD_AUTO_HIDE|wxPD_APP_MODAL) -&gt; ProgressDialog</autodoc>
       <baseclass name="Frame"/>
       <constructor name="ProgressDialog" overloaded="no">
         <autodoc>__init__(String title, String message, int maximum=100, Window parent=None, 
     int style=wxPD_AUTO_HIDE|wxPD_APP_MODAL) -&gt; ProgressDialog</autodoc>

+        <docstring>Constructor. Creates the dialog, displays it and disables user input for other
+windows, or, if wxPD_APP_MODAL flag is not given, for its parent window only.</docstring>

         <paramlist>
           <param name="title" type="String" default=""/>
           <param name="message" type="String" default=""/>
         <paramlist>
           <param name="title" type="String" default=""/>
           <param name="message" type="String" default=""/>


@@ -11795,6 +13106,13 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </constructor>
       <method name="Update" type="bool" overloaded="no">
         <autodoc>Update(int value, String newmsg=EmptyString) -&gt; bool</autodoc>
       </constructor>
       <method name="Update" type="bool" overloaded="no">
         <autodoc>Update(int value, String newmsg=EmptyString) -&gt; bool</autodoc>

+        <docstring>Updates the dialog, setting the progress bar to the new value and, if given
+changes the message above it. Returns true unless the Cancel button has been
+pressed.
+
+If false is returned, the application can either immediately destroy the
+dialog or ask the user for the confirmation and if the abort is not confirmed
+the dialog may be resumed with Resume function.</docstring>

         <paramlist>
           <param name="value" type="int" default=""/>
           <param name="newmsg" type="String" default="wxPyEmptyString"/>
         <paramlist>
           <param name="value" type="int" default=""/>
           <param name="newmsg" type="String" default="wxPyEmptyString"/>


@@ -11802,6 +13120,7 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </method>
       <method name="Resume" type="" overloaded="no">
         <autodoc>Resume()</autodoc>
       </method>
       <method name="Resume" type="" overloaded="no">
         <autodoc>Resume()</autodoc>

+        <docstring>Can be used to continue with the dialog, after the user had chosen to abort.</docstring>

       </method>
     </class>
     <pythoncode>
       </method>
     </class>
     <pythoncode>


@@ -11819,9 +13138,11 @@ EVT_COMMAND_FIND_REPLACE_ALL = EVT_FIND_REPLACE_ALL
 EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE        
 </pythoncode>
     <class name="FindDialogEvent" oldname="wxFindDialogEvent" module="windows">
 EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE        
 </pythoncode>
     <class name="FindDialogEvent" oldname="wxFindDialogEvent" module="windows">

+      <docstring>Events for the FindReplaceDialog</docstring>

       <baseclass name="CommandEvent"/>
       <constructor name="FindDialogEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int id=0) -&gt; FindDialogEvent</autodoc>
       <baseclass name="CommandEvent"/>
       <constructor name="FindDialogEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int id=0) -&gt; FindDialogEvent</autodoc>

+        <docstring>Events for the FindReplaceDialog</docstring>

         <paramlist>
           <param name="commandType" type="wxEventType" default="wxEVT_NULL"/>
           <param name="id" type="int" default="0"/>
         <paramlist>
           <param name="commandType" type="wxEventType" default="wxEVT_NULL"/>
           <param name="id" type="int" default="0"/>


@@ -11829,15 +13150,21 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       </constructor>
       <method name="GetFlags" type="int" overloaded="no">
         <autodoc>GetFlags() -&gt; int</autodoc>
       </constructor>
       <method name="GetFlags" type="int" overloaded="no">
         <autodoc>GetFlags() -&gt; int</autodoc>

+        <docstring>Get the currently selected flags: this is the combination of
+wx.FR_DOWN, wx.FR_WHOLEWORD and wx.FR_MATCHCASE flags.</docstring>

       </method>
       <method name="GetFindString" type="String" overloaded="no">
         <autodoc>GetFindString() -&gt; String</autodoc>
       </method>
       <method name="GetFindString" type="String" overloaded="no">
         <autodoc>GetFindString() -&gt; String</autodoc>

+        <docstring>Return the string to find (never empty).</docstring>

       </method>
       <method name="GetReplaceString" type="String" overloaded="no">
         <autodoc>GetReplaceString() -&gt; String</autodoc>
       </method>
       <method name="GetReplaceString" type="String" overloaded="no">
         <autodoc>GetReplaceString() -&gt; String</autodoc>

+        <docstring>Return the string to replace the search string with (only
+for replace and replace all events).</docstring>

       </method>
       <method name="GetDialog" type="wxFindReplaceDialog" overloaded="no">
         <autodoc>GetDialog() -&gt; FindReplaceDialog</autodoc>
       </method>
       <method name="GetDialog" type="wxFindReplaceDialog" overloaded="no">
         <autodoc>GetDialog() -&gt; FindReplaceDialog</autodoc>

+        <docstring>Return the pointer to the dialog which generated this event.</docstring>

       </method>
       <method name="SetFlags" type="" overloaded="no">
         <autodoc>SetFlags(int flags)</autodoc>
       </method>
       <method name="SetFlags" type="" overloaded="no">
         <autodoc>SetFlags(int flags)</autodoc>


@@ -11859,9 +13186,27 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       </method>
     </class>
     <class name="FindReplaceData" oldname="wxFindReplaceData" module="windows">
       </method>
     </class>
     <class name="FindReplaceData" oldname="wxFindReplaceData" module="windows">

+      <docstring>FindReplaceData holds the data for FindReplaceDialog. It is used to initialize
+the dialog with the default values and will keep the last values from the
+dialog when it is closed. It is also updated each time a wxFindDialogEvent is
+generated so instead of using the wxFindDialogEvent methods you can also
+directly query this object.
+
+Note that all SetXXX() methods may only be called before showing the dialog
+and calling them has no effect later.
+
+ Flags
+    wxFR_DOWN:          downward search/replace selected (otherwise, upwards)
+
+    wxFR_WHOLEWORD:     whole word search/replace selected
+
+    wxFR_MATCHCASE:     case sensitive search/replace selected (otherwise,
+                        case insensitive)
+</docstring>

       <baseclass name="Object"/>
       <constructor name="FindReplaceData" overloaded="no">
         <autodoc>__init__(int flags=0) -&gt; FindReplaceData</autodoc>
       <baseclass name="Object"/>
       <constructor name="FindReplaceData" overloaded="no">
         <autodoc>__init__(int flags=0) -&gt; FindReplaceData</autodoc>

+        <docstring>Constuctor initializes the flags to default value (0).</docstring>

         <paramlist>
           <param name="flags" type="int" default="0"/>
         </paramlist>
         <paramlist>
           <param name="flags" type="int" default="0"/>
         </paramlist>


@@ -11871,37 +13216,62 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       </destructor>
       <method name="GetFindString" type="String" overloaded="no">
         <autodoc>GetFindString() -&gt; String</autodoc>
       </destructor>
       <method name="GetFindString" type="String" overloaded="no">
         <autodoc>GetFindString() -&gt; String</autodoc>

+        <docstring>Get the string to find.</docstring>

       </method>
       <method name="GetReplaceString" type="String" overloaded="no">
         <autodoc>GetReplaceString() -&gt; String</autodoc>
       </method>
       <method name="GetReplaceString" type="String" overloaded="no">
         <autodoc>GetReplaceString() -&gt; String</autodoc>

+        <docstring>Get the replacement string.</docstring>

       </method>
       <method name="GetFlags" type="int" overloaded="no">
         <autodoc>GetFlags() -&gt; int</autodoc>
       </method>
       <method name="GetFlags" type="int" overloaded="no">
         <autodoc>GetFlags() -&gt; int</autodoc>

+        <docstring>Get the combination of flag values.</docstring>

       </method>
       <method name="SetFlags" type="" overloaded="no">
         <autodoc>SetFlags(int flags)</autodoc>
       </method>
       <method name="SetFlags" type="" overloaded="no">
         <autodoc>SetFlags(int flags)</autodoc>

+        <docstring>Set the flags to use to initialize the controls of the dialog.</docstring>

         <paramlist>
           <param name="flags" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SetFindString" type="" overloaded="no">
         <autodoc>SetFindString(String str)</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SetFindString" type="" overloaded="no">
         <autodoc>SetFindString(String str)</autodoc>

+        <docstring>Set the string to find (used as initial value by the dialog).</docstring>

         <paramlist>
           <param name="str" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetReplaceString" type="" overloaded="no">
         <autodoc>SetReplaceString(String str)</autodoc>
         <paramlist>
           <param name="str" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetReplaceString" type="" overloaded="no">
         <autodoc>SetReplaceString(String str)</autodoc>

+        <docstring>Set the replacement string (used as initial value by the dialog).</docstring>

         <paramlist>
           <param name="str" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="FindReplaceDialog" oldname="wxFindReplaceDialog" module="windows">
         <paramlist>
           <param name="str" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="FindReplaceDialog" oldname="wxFindReplaceDialog" module="windows">

+      <docstring>FindReplaceDialog is a standard modeless dialog which is used to allow the
+user to search for some text (and possibly replace it with something
+else). The actual searching is supposed to be done in the owner window which
+is the parent of this dialog. Note that it means that unlike for the other
+standard dialogs this one must have a parent window. Also note that there is
+no way to use this dialog in a modal way; it is always, by design and
+implementation, modeless.</docstring>
+      <refdoc>
+ Styles
+    wx.FR_REPLACEDIALOG:        replace dialog (otherwise find dialog)
+
+    wx.FR_NOUPDOWN:             don't allow changing the search direction
+
+    wx.FR_NOMATCHCASE:          don't allow case sensitive searching
+
+    wx.FR_NOWHOLEWORD:          don't allow whole word searching
+</refdoc>

       <baseclass name="Dialog"/>
       <constructor name="FindReplaceDialog" overloaded="no">
         <autodoc>__init__(Window parent, FindReplaceData data, String title, 
     int style=0) -&gt; FindReplaceDialog</autodoc>
       <baseclass name="Dialog"/>
       <constructor name="FindReplaceDialog" overloaded="no">
         <autodoc>__init__(Window parent, FindReplaceData data, String title, 
     int style=0) -&gt; FindReplaceDialog</autodoc>

+        <docstring>Create a FindReplaceDialog.  The parent and data parameters must be
+non-None.  Use Show to display the dialog.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="data" type="FindReplaceData" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="data" type="FindReplaceData" default=""/>


@@ -11911,10 +13281,12 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       </constructor>
       <constructor name="PreFindReplaceDialog" overloaded="no">
         <autodoc>PreFindReplaceDialog() -&gt; FindReplaceDialog</autodoc>
       </constructor>
       <constructor name="PreFindReplaceDialog" overloaded="no">
         <autodoc>PreFindReplaceDialog() -&gt; FindReplaceDialog</autodoc>

+        <docstring>Precreate a FindReplaceDialog for 2-phase creation</docstring>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, FindReplaceData data, String title, 
     int style=0) -&gt; bool</autodoc>
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, FindReplaceData data, String title, 
     int style=0) -&gt; bool</autodoc>

+        <docstring>Create the dialog, for 2-phase create.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="data" type="FindReplaceData" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="data" type="FindReplaceData" default=""/>


@@ -11924,9 +13296,11 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       </method>
       <method name="GetData" type="FindReplaceData" overloaded="no">
         <autodoc>GetData() -&gt; FindReplaceData</autodoc>
       </method>
       <method name="GetData" type="FindReplaceData" overloaded="no">
         <autodoc>GetData() -&gt; FindReplaceData</autodoc>

+        <docstring>Get the FindReplaceData object used by this dialog.</docstring>

       </method>
       <method name="SetData" type="" overloaded="no">
         <autodoc>SetData(FindReplaceData data)</autodoc>
       </method>
       <method name="SetData" type="" overloaded="no">
         <autodoc>SetData(FindReplaceData data)</autodoc>

+        <docstring>Set the FindReplaceData object used by this dialog.</docstring>

         <paramlist>
           <param name="data" type="FindReplaceData" default=""/>
         </paramlist>
         <paramlist>
           <param name="data" type="FindReplaceData" default=""/>
         </paramlist>


@@ -12491,6 +13865,15 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="printMode" type="wxPrintMode" default=""/>
         </paramlist>
       </method>
           <param name="printMode" type="wxPrintMode" default=""/>
         </paramlist>
       </method>

+      <method name="GetOutputStream" type="OutputStream" overloaded="no">
+        <autodoc>GetOutputStream() -&gt; OutputStream</autodoc>
+      </method>
+      <method name="SetOutputStream" type="" overloaded="no">
+        <autodoc>SetOutputStream(OutputStream outputstream)</autodoc>
+        <paramlist>
+          <param name="outputstream" type="OutputStream" default=""/>
+        </paramlist>
+      </method>

     </class>
     <class name="PageSetupDialogData" oldname="wxPageSetupDialogData" module="windows">
       <baseclass name="Object"/>
     </class>
     <class name="PageSetupDialogData" oldname="wxPageSetupDialogData" module="windows">
       <baseclass name="Object"/>


@@ -12648,8 +14031,13 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
     </class>
     <class name="PrintDialogData" oldname="wxPrintDialogData" module="windows">
       <baseclass name="Object"/>
     </class>
     <class name="PrintDialogData" oldname="wxPrintDialogData" module="windows">
       <baseclass name="Object"/>

-      <constructor name="PrintDialogData" overloaded="no">
-        <autodoc>__init__() -&gt; PrintDialogData</autodoc>
+      <constructor name="PrintDialogData" overloaded="yes"/>
+      <constructor name="PrintDialogData" overloaded="yes">
+        <autodoc>__init__() -&gt; PrintDialogData
+__init__(PrintData printData) -&gt; PrintDialogData</autodoc>
+        <paramlist>
+          <param name="printData" type="PrintData" default=""/>
+        </paramlist>

       </constructor>
       <destructor name="~wxPrintDialogData" overloaded="no">
         <autodoc>__del__()</autodoc>
       </constructor>
       <destructor name="~wxPrintDialogData" overloaded="no">
         <autodoc>__del__()</autodoc>


@@ -12865,7 +14253,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
         <autodoc>GetAbort() -&gt; bool</autodoc>
       </method>
       <staticmethod name="GetLastError" type="wxPrinterError" overloaded="no">
         <autodoc>GetAbort() -&gt; bool</autodoc>
       </method>
       <staticmethod name="GetLastError" type="wxPrinterError" overloaded="no">

-        <autodoc>Printer.GetLastError() -&gt; int</autodoc>
+        <autodoc>GetLastError() -&gt; int</autodoc>

       </staticmethod>
     </class>
     <class name="Printout" oldname="wxPyPrintout" module="windows">
       </staticmethod>
     </class>
     <class name="Printout" oldname="wxPyPrintout" module="windows">


@@ -13086,12 +14474,20 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
     </class>
     <class name="PrintPreview" oldname="wxPrintPreview" module="windows">
       <baseclass name="Object"/>
     </class>
     <class name="PrintPreview" oldname="wxPrintPreview" module="windows">
       <baseclass name="Object"/>

-      <constructor name="PrintPreview" overloaded="no">
-        <autodoc>__init__(Printout printout, Printout printoutForPrinting, PrintData data=None) -&gt; PrintPreview</autodoc>
+      <constructor name="PrintPreview" overloaded="yes">
+        <paramlist>
+          <param name="printout" type="Printout" default=""/>
+          <param name="printoutForPrinting" type="Printout" default=""/>
+          <param name="data" type="PrintDialogData" default="NULL"/>
+        </paramlist>
+      </constructor>
+      <constructor name="PrintPreview" overloaded="yes">
+        <autodoc>__init__(Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -&gt; PrintPreview
+__init__(Printout printout, Printout printoutForPrinting, PrintData data) -&gt; PrintPreview</autodoc>

         <paramlist>
           <param name="printout" type="Printout" default=""/>
           <param name="printoutForPrinting" type="Printout" default=""/>
         <paramlist>
           <param name="printout" type="Printout" default=""/>
           <param name="printoutForPrinting" type="Printout" default=""/>

-          <param name="data" type="PrintData" default="NULL"/>
+          <param name="data" type="PrintData" default=""/>

         </paramlist>
       </constructor>
       <method name="SetCurrentPage" type="bool" overloaded="no">
         </paramlist>
       </constructor>
       <method name="SetCurrentPage" type="bool" overloaded="no">


@@ -13198,12 +14594,20 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
     </class>
     <class name="PyPrintPreview" oldname="wxPyPrintPreview" module="windows">
       <baseclass name="PrintPreview"/>
     </class>
     <class name="PyPrintPreview" oldname="wxPyPrintPreview" module="windows">
       <baseclass name="PrintPreview"/>

-      <constructor name="PyPrintPreview" overloaded="no">
-        <autodoc>__init__(Printout printout, Printout printoutForPrinting, PrintData data=None) -&gt; PyPrintPreview</autodoc>
+      <constructor name="PyPrintPreview" overloaded="yes">

         <paramlist>
           <param name="printout" type="Printout" default=""/>
           <param name="printoutForPrinting" type="Printout" default=""/>
         <paramlist>
           <param name="printout" type="Printout" default=""/>
           <param name="printoutForPrinting" type="Printout" default=""/>

-          <param name="data" type="PrintData" default="NULL"/>
+          <param name="data" type="PrintDialogData" default="NULL"/>
+        </paramlist>
+      </constructor>
+      <constructor name="PyPrintPreview" overloaded="yes">
+        <autodoc>__init__(Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -&gt; PyPrintPreview
+__init__(Printout printout, Printout printoutForPrinting, PrintData data) -&gt; PyPrintPreview</autodoc>
+        <paramlist>
+          <param name="printout" type="Printout" default=""/>
+          <param name="printoutForPrinting" type="Printout" default=""/>
+          <param name="data" type="PrintData" default=""/>

         </paramlist>
       </constructor>
       <method name="_setCallbackInfo" type="" overloaded="no">
         </paramlist>
       </constructor>
       <method name="_setCallbackInfo" type="" overloaded="no">


@@ -13404,18 +14808,39 @@ indeed almost any other window.</docstring>
         <docstring>This sets the button to be the default item for the panel or dialog box.</docstring>
       </method>
       <staticmethod name="GetDefaultSize" type="Size" overloaded="no">
         <docstring>This sets the button to be the default item for the panel or dialog box.</docstring>
       </method>
       <staticmethod name="GetDefaultSize" type="Size" overloaded="no">

-        <autodoc>Button.GetDefaultSize() -&gt; Size</autodoc>
+        <autodoc>GetDefaultSize() -&gt; Size</autodoc>

       </staticmethod>
     </class>
     <class name="BitmapButton" oldname="wxBitmapButton" module="controls">
       </staticmethod>
     </class>
     <class name="BitmapButton" oldname="wxBitmapButton" module="controls">

-      <docstring>A Buttont that contains a bitmap.</docstring>
+      <docstring>A Button that contains a bitmap.  A bitmap button can be supplied with a
+single bitmap, and wxWindows will draw all button states using this bitmap. If
+the application needs more control, additional bitmaps for the selected state,
+unpressed focused state, and greyed-out state may be supplied.
+</docstring>
+      <refdoc>
+ Styles
+    wx.BU_AUTODRAW: If this is specified, the button will be drawn
+                    automatically using the label bitmap only, providing a
+                    3D-look border. If this style is not specified, the button
+                    will be drawn without borders and using all provided
+                    bitmaps. WIN32 only.
+    wx.BU_LEFT:     Left-justifies the label. WIN32 only.
+    wx.BU_TOP:      Aligns the label to the top of the button. WIN32 only.
+    wx.BU_RIGHT:    Right-justifies the bitmap label. WIN32 only.
+    wx.BU_BOTTOM:   Aligns the label to the bottom of the button. WIN32 only.
+    wx.BU_EXACTFIT: Creates the button as small as possible instead of making
+                    it of the standard size (which is the default behaviour.)
+
+ Events
+     EVT_BUTTON:    Sent when the button is clicked.
+</refdoc>

       <baseclass name="Button"/>
       <constructor name="BitmapButton" overloaded="no">
         <autodoc>__init__(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=BU_AUTODRAW, 
     Validator validator=DefaultValidator, 
     String name=ButtonNameStr) -&gt; BitmapButton</autodoc>
       <baseclass name="Button"/>
       <constructor name="BitmapButton" overloaded="no">
         <autodoc>__init__(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=BU_AUTODRAW, 
     Validator validator=DefaultValidator, 
     String name=ButtonNameStr) -&gt; BitmapButton</autodoc>

-        <docstring>Create and show a button.</docstring>
+        <docstring>Create and show a button with a bitmap for the label.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>


@@ -13511,11 +14936,30 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="CheckBox" oldname="wxCheckBox" module="controls">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="CheckBox" oldname="wxCheckBox" module="controls">

+      <docstring>A checkbox is a labelled box which by default is either on (checkmark is
+visible) or off (no checkmark). Optionally (When the wxCHK_3STATE style flag
+is set) it can have a third state, called the mixed or undetermined
+state. Often this is used as a "Does Not Apply" state.</docstring>
+      <refdoc>
+ Styles
+    wx.CHK_2STATE:  Create a 2-state checkbox. This is the default.
+    wx.CHK_3STATE:  Create a 3-state checkbox.
+    wx.CHK_ALLOW_3RD_STATE_FOR_USER: By default a user can't set a 3-state
+                                     checkbox to the third state. It can only
+                                     be done from code. Using this flags
+                                     allows the user to set the checkbox to
+                                     the third state by clicking.
+    wx.ALIGN_RIGHT:  Makes the text appear on the left of the checkbox.
+
+ Events
+    EVT_CHECKBOX:       Sent when checkbox is clicked.
+</refdoc>

       <baseclass name="Control"/>
       <constructor name="CheckBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, String label, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, 
     Validator validator=DefaultValidator, String name=CheckBoxNameStr) -&gt; CheckBox</autodoc>
       <baseclass name="Control"/>
       <constructor name="CheckBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, String label, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, 
     Validator validator=DefaultValidator, String name=CheckBoxNameStr) -&gt; CheckBox</autodoc>

+        <docstring>Creates and shows a CheckBox control</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>


@@ -13529,11 +14973,13 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </constructor>
       <constructor name="PreCheckBox" overloaded="no">
         <autodoc>PreCheckBox() -&gt; CheckBox</autodoc>
       </constructor>
       <constructor name="PreCheckBox" overloaded="no">
         <autodoc>PreCheckBox() -&gt; CheckBox</autodoc>

+        <docstring>Precreate a CheckBox for 2-phase creation.</docstring>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, String label, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, 
     Validator validator=DefaultValidator, String name=CheckBoxNameStr) -&gt; bool</autodoc>
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, String label, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, 
     Validator validator=DefaultValidator, String name=CheckBoxNameStr) -&gt; bool</autodoc>

+        <docstring>Actually create the GUI CheckBox for 2-phase creation.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>


@@ -13547,49 +14993,69 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </method>
       <method name="GetValue" type="bool" overloaded="no">
         <autodoc>GetValue() -&gt; bool</autodoc>
       </method>
       <method name="GetValue" type="bool" overloaded="no">
         <autodoc>GetValue() -&gt; bool</autodoc>

+        <docstring>Gets the state of a 2-state CheckBox.  Returns True if it is checked,
+False otherwise.</docstring>

       </method>
       <method name="IsChecked" type="bool" overloaded="no">
         <autodoc>IsChecked() -&gt; bool</autodoc>
       </method>
       <method name="IsChecked" type="bool" overloaded="no">
         <autodoc>IsChecked() -&gt; bool</autodoc>

+        <docstring>Similar to GetValue, but raises an exception if it is not a 2-state CheckBox.</docstring>

       </method>
       <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(bool state)</autodoc>
       </method>
       <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(bool state)</autodoc>

+        <docstring>Set the state of a 2-state CheckBox.  Pass True for checked,
+False for unchecked.</docstring>

         <paramlist>
           <param name="state" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="Get3StateValue" type="wxCheckBoxState" overloaded="no">
         <autodoc>Get3StateValue() -&gt; int</autodoc>
         <paramlist>
           <param name="state" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="Get3StateValue" type="wxCheckBoxState" overloaded="no">
         <autodoc>Get3StateValue() -&gt; int</autodoc>

+        <docstring>Returns wx.CHK_UNCHECKED when the CheckBox is unchecked, wx.CHK_CHECKED when
+it is checked and wx.CHK_UNDETERMINED when it's in the undetermined state.
+Raises an exceptiion when the function is used with a 2-state CheckBox.</docstring>

       </method>
       <method name="Set3StateValue" type="" overloaded="no">
         <autodoc>Set3StateValue(int state)</autodoc>
       </method>
       <method name="Set3StateValue" type="" overloaded="no">
         <autodoc>Set3StateValue(int state)</autodoc>

+        <docstring>Sets the CheckBox to the given state.  The state parameter can be
+one of the following: wx.CHK_UNCHECKED (Check is off), wx.CHK_CHECKED
+(Check is on) or wx.CHK_UNDETERMINED (Check is mixed). Raises an
+exception  when the CheckBox is a 2-state checkbox and setting the state
+to wx.CHK_UNDETERMINED.</docstring>

         <paramlist>
           <param name="state" type="wxCheckBoxState" default=""/>
         </paramlist>
       </method>
       <method name="Is3State" type="bool" overloaded="no">
         <autodoc>Is3State() -&gt; bool</autodoc>
         <paramlist>
           <param name="state" type="wxCheckBoxState" default=""/>
         </paramlist>
       </method>
       <method name="Is3State" type="bool" overloaded="no">
         <autodoc>Is3State() -&gt; bool</autodoc>

+        <docstring>Returns whether or not the CheckBox is a 3-state CheckBox.</docstring>

       </method>
       <method name="Is3rdStateAllowedForUser" type="bool" overloaded="no">
         <autodoc>Is3rdStateAllowedForUser() -&gt; bool</autodoc>
       </method>
       <method name="Is3rdStateAllowedForUser" type="bool" overloaded="no">
         <autodoc>Is3rdStateAllowedForUser() -&gt; bool</autodoc>

+        <docstring>Returns whether or not the user can set the CheckBox to the third state.</docstring>

       </method>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Choice" oldname="wxChoice" module="controls">
       </method>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Choice" oldname="wxChoice" module="controls">

+      <docstring>A Choice control is used to select one of a list of strings. Unlike a ListBox,
+only the selection is visible until the user pulls down the menu of choices.</docstring>
+      <refdoc>
+ Events
+    EVT_CHOICE:         Sent when an item in the list is selected.
+</refdoc>

       <baseclass name="ControlWithItems"/>
       <constructor name="Choice" overloaded="no">
       <baseclass name="ControlWithItems"/>
       <constructor name="Choice" overloaded="no">

-        <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-    int choices=0, String choices_array=None, 
-    long style=0, Validator validator=DefaultValidator, 
+        <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
+    List choices=[], long style=0, Validator validator=DefaultValidator,

     String name=ChoiceNameStr) -&gt; Choice</autodoc>
     String name=ChoiceNameStr) -&gt; Choice</autodoc>

+        <docstring>Create and show a Choice control</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>

-          <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="String" default="NULL"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="name" type="String" default="wxPyChoiceNameStr"/>
           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="name" type="String" default="wxPyChoiceNameStr"/>


@@ -13597,50 +15063,44 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </constructor>
       <constructor name="PreChoice" overloaded="no">
         <autodoc>PreChoice() -&gt; Choice</autodoc>
       </constructor>
       <constructor name="PreChoice" overloaded="no">
         <autodoc>PreChoice() -&gt; Choice</autodoc>

+        <docstring>Precreate a Choice control for 2-phase creation.</docstring>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
       </constructor>
       <method name="Create" type="bool" overloaded="no">

-        <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-    int choices=0, String choices_array=None, 
-    long style=0, Validator validator=DefaultValidator, 
+        <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
+    List choices=[], long style=0, Validator validator=DefaultValidator,

     String name=ChoiceNameStr) -&gt; bool</autodoc>
     String name=ChoiceNameStr) -&gt; bool</autodoc>

+        <docstring>Actually create the GUI Choice control for 2-phase creation</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>

-          <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="String" default="NULL"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="name" type="String" default="wxPyChoiceNameStr"/>
         </paramlist>
       </method>
           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="name" type="String" default="wxPyChoiceNameStr"/>
         </paramlist>
       </method>

-      <method name="GetColumns" type="int" overloaded="no">
-        <autodoc>GetColumns() -&gt; int</autodoc>
-      </method>
-      <method name="SetColumns" type="" overloaded="no">
-        <autodoc>SetColumns(int n=1)</autodoc>
-        <paramlist>
-          <param name="n" type="int" default="1"/>
-        </paramlist>
-      </method>

       <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int n)</autodoc>
       <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int n)</autodoc>

+        <docstring>Select the n'th item (zero based) in the list.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SetStringSelection" type="" overloaded="no">
         <autodoc>SetStringSelection(String string)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SetStringSelection" type="" overloaded="no">
         <autodoc>SetStringSelection(String string)</autodoc>

+        <docstring>Select the item with the specifed string</docstring>

         <paramlist>
           <param name="string" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetString" type="" overloaded="no">
         <paramlist>
           <param name="string" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetString" type="" overloaded="no">

-        <autodoc>SetString(int n, String s)</autodoc>
+        <autodoc>SetString(int n, String string)</autodoc>
+        <docstring>Set the label for the n'th item (zero based) in the list.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         <paramlist>
           <param name="n" type="int" default=""/>

-          <param name="s" type="String" default=""/>
+          <param name="string" type="String" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -13648,22 +15108,43 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ComboBox" oldname="wxComboBox" module="controls">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ComboBox" oldname="wxComboBox" module="controls">

+      <docstring>A combobox is like a combination of an edit control and a listbox. It can be
+displayed as static list with editable or read-only text field; or a drop-down
+list with text field.</docstring>
+      <refdoc>
+ Styles
+    wx.CB_SIMPLE:  Creates a combobox with a permanently displayed list.
+                        Windows only.
+
+    wx.CB_DROPDOWN:  Creates a combobox with a drop-down list.
+
+    wx.CB_READONLY:  Same as wxCB_DROPDOWN but only the strings specified as
+                        the combobox choices can be selected, it is impossible
+                        to select (even from a program) a string which is not in
+                        the choices list.
+
+    wx.CB_SORT:  Sorts the entries in the list alphabetically.
+
+ Events
+
+    EVT_COMBOBOX:  Sent when an item on the list is selected.
+    EVT_TEXT:          Sent when the combobox text changes.
+</refdoc>

       <baseclass name="Control"/>
       <baseclass name="ItemContainer"/>
       <constructor name="ComboBox" overloaded="no">
       <baseclass name="Control"/>
       <baseclass name="ItemContainer"/>
       <constructor name="ComboBox" overloaded="no">

-        <autodoc>__init__(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, 
-    Size size=DefaultSize, 
-    int choices=0, String choices_array=None, 
-    long style=0, Validator validator=DefaultValidator, 
-    String name=ComboBoxNameStr) -&gt; ComboBox</autodoc>
+        <autodoc>__init__(Window parent, int id, String value=EmptyString,
+    Point pos=DefaultPosition, Size size=DefaultSize,
+     List choices=[], long style=0, Validator validator=DefaultValidator,
+     String name=ComboBoxNameStr) -&gt; ComboBox</autodoc>
+        <docstring>Constructor, creates and shows a ComboBox control.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="value" type="String" default="wxPyEmptyString"/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="value" type="String" default="wxPyEmptyString"/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>

-          <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="String" default="NULL"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="name" type="String" default="wxPyComboBoxNameStr"/>
           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="name" type="String" default="wxPyComboBoxNameStr"/>


@@ -13671,28 +15152,29 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </constructor>
       <constructor name="PreComboBox" overloaded="no">
         <autodoc>PreComboBox() -&gt; ComboBox</autodoc>
       </constructor>
       <constructor name="PreComboBox" overloaded="no">
         <autodoc>PreComboBox() -&gt; ComboBox</autodoc>

+        <docstring>Precreate a ComboBox control for 2-phase creation.</docstring>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
       </constructor>
       <method name="Create" type="bool" overloaded="no">

-        <autodoc>Create(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, 
-    Size size=DefaultSize, 
-    int choices=0, String choices_array=None, 
-    long style=0, Validator validator=DefaultValidator, 
-    String name=ComboBoxNameStr) -&gt; bool</autodoc>
+        <autodoc>Create(Window parent, int id, String value=EmptyString,
+    Point pos=DefaultPosition, Size size=DefaultSize,
+    List choices=[], long style=0, Validator validator=DefaultValidator,
+    String name=ChoiceNameStr) -&gt; bool</autodoc>
+        <docstring>Actually create the GUI wxComboBox control for 2-phase creation</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="value" type="String" default="wxPyEmptyString"/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="value" type="String" default="wxPyEmptyString"/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>

-          <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="String" default="NULL"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>

-          <param name="name" type="String" default="wxPyComboBoxNameStr"/>
+          <param name="name" type="String" default="wxPyChoiceNameStr"/>

         </paramlist>
       </method>
       <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>
         </paramlist>
       </method>
       <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>

+        <docstring>Returns the current value in the combobox text field.</docstring>

       </method>
       <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(String value)</autodoc>
       </method>
       <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(String value)</autodoc>


@@ -13702,27 +15184,35 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </method>
       <method name="Copy" type="" overloaded="no">
         <autodoc>Copy()</autodoc>
       </method>
       <method name="Copy" type="" overloaded="no">
         <autodoc>Copy()</autodoc>

+        <docstring>Copies the selected text to the clipboard.</docstring>

       </method>
       <method name="Cut" type="" overloaded="no">
         <autodoc>Cut()</autodoc>
       </method>
       <method name="Cut" type="" overloaded="no">
         <autodoc>Cut()</autodoc>

+        <docstring>Copies the selected text to the clipboard and removes the selection.</docstring>

       </method>
       <method name="Paste" type="" overloaded="no">
         <autodoc>Paste()</autodoc>
       </method>
       <method name="Paste" type="" overloaded="no">
         <autodoc>Paste()</autodoc>

+        <docstring>Pastes text from the clipboard to the text field.</docstring>

       </method>
       <method name="SetInsertionPoint" type="" overloaded="no">
         <autodoc>SetInsertionPoint(long pos)</autodoc>
       </method>
       <method name="SetInsertionPoint" type="" overloaded="no">
         <autodoc>SetInsertionPoint(long pos)</autodoc>

+        <docstring>Sets the insertion point in the combobox text field.</docstring>

         <paramlist>
           <param name="pos" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetInsertionPoint" type="long" overloaded="no">
         <autodoc>GetInsertionPoint() -&gt; long</autodoc>
         <paramlist>
           <param name="pos" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetInsertionPoint" type="long" overloaded="no">
         <autodoc>GetInsertionPoint() -&gt; long</autodoc>

+        <docstring>Returns the insertion point for the combobox's text field.</docstring>

       </method>
       <method name="GetLastPosition" type="long" overloaded="no">
         <autodoc>GetLastPosition() -&gt; long</autodoc>
       </method>
       <method name="GetLastPosition" type="long" overloaded="no">
         <autodoc>GetLastPosition() -&gt; long</autodoc>

+        <docstring>Returns the last position in the combobox text field.</docstring>

       </method>
       <method name="Replace" type="" overloaded="no">
         <autodoc>Replace(long from, long to, String value)</autodoc>
       </method>
       <method name="Replace" type="" overloaded="no">
         <autodoc>Replace(long from, long to, String value)</autodoc>

+        <docstring>Replaces the text between two positions with the given text, in the
+combobox text field.</docstring>

         <paramlist>
           <param name="from" type="long" default=""/>
           <param name="to" type="long" default=""/>
         <paramlist>
           <param name="from" type="long" default=""/>
           <param name="to" type="long" default=""/>


@@ -13731,6 +15221,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </method>
       <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int n)</autodoc>
       </method>
       <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int n)</autodoc>

+        <docstring>Selects the text between the two positions, in the combobox text field.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>


@@ -13750,9 +15241,11 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </method>
       <method name="SetInsertionPointEnd" type="" overloaded="no">
         <autodoc>SetInsertionPointEnd()</autodoc>
       </method>
       <method name="SetInsertionPointEnd" type="" overloaded="no">
         <autodoc>SetInsertionPointEnd()</autodoc>

+        <docstring>Sets the insertion point at the end of the combobox text field.</docstring>

       </method>
       <method name="Remove" type="" overloaded="no">
         <autodoc>Remove(long from, long to)</autodoc>
       </method>
       <method name="Remove" type="" overloaded="no">
         <autodoc>Remove(long from, long to)</autodoc>

+        <docstring>Removes the text between the two positions in the combobox text field.</docstring>

         <paramlist>
           <param name="from" type="long" default=""/>
           <param name="to" type="long" default=""/>
         <paramlist>
           <param name="from" type="long" default=""/>
           <param name="to" type="long" default=""/>


@@ -13914,7 +15407,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
         <autodoc>IsVertical() -&gt; bool</autodoc>
       </method>
       <staticmethod name="GetDefaultSize" type="int" overloaded="no">
         <autodoc>IsVertical() -&gt; bool</autodoc>
       </method>
       <staticmethod name="GetDefaultSize" type="int" overloaded="no">

-        <autodoc>StaticLine.GetDefaultSize() -&gt; int</autodoc>
+        <autodoc>GetDefaultSize() -&gt; int</autodoc>

       </staticmethod>
     </class>
     <pythoncode>
       </staticmethod>
     </class>
     <pythoncode>


@@ -14013,7 +15506,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       <baseclass name="ControlWithItems"/>
       <constructor name="ListBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
       <baseclass name="ControlWithItems"/>
       <constructor name="ListBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-    int choices=0, String choices_array=None, 
+    wxArrayString choices=wxPyEmptyStringArray, 

     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; ListBox</autodoc>
         <paramlist>
     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; ListBox</autodoc>
         <paramlist>


@@ -14021,8 +15514,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
           <param name="id" type="int" default=""/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="id" type="int" default=""/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>

-          <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="String" default="NULL"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="name" type="String" default="wxPyListBoxNameStr"/>
           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="name" type="String" default="wxPyListBoxNameStr"/>


@@ -14033,7 +15525,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-    int choices=0, String choices_array=None, 
+    wxArrayString choices=wxPyEmptyStringArray, 

     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; bool</autodoc>
         <paramlist>


@@ -14041,8 +15533,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
           <param name="id" type="int" default=""/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="id" type="int" default=""/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>

-          <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="String" default="NULL"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="name" type="String" default="wxPyListBoxNameStr"/>
           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="name" type="String" default="wxPyListBoxNameStr"/>


@@ -14050,6 +15541,8 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </method>
       <method name="Insert" type="" overloaded="no">
         <autodoc>Insert(String item, int pos, PyObject clientData=None)</autodoc>
       </method>
       <method name="Insert" type="" overloaded="no">
         <autodoc>Insert(String item, int pos, PyObject clientData=None)</autodoc>

+        <docstring>Insert an item into the control before the item at the pos index,
+optionally associating some data object with the item.</docstring>

         <paramlist>
           <param name="item" type="String" default=""/>
           <param name="pos" type="int" default=""/>
         <paramlist>
           <param name="item" type="String" default=""/>
           <param name="pos" type="int" default=""/>


@@ -14084,6 +15577,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </method>
       <method name="Select" type="" overloaded="no">
         <autodoc>Select(int n)</autodoc>
       </method>
       <method name="Select" type="" overloaded="no">
         <autodoc>Select(int n)</autodoc>

+        <docstring>Sets the item at index 'n' to be the selected item.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>


@@ -14137,6 +15631,27 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       <method name="IsSorted" type="bool" overloaded="no">
         <autodoc>IsSorted() -&gt; bool</autodoc>
       </method>
       <method name="IsSorted" type="bool" overloaded="no">
         <autodoc>IsSorted() -&gt; bool</autodoc>
       </method>

+      <method name="SetItemForegroundColour" type="" overloaded="no">
+        <autodoc>SetItemForegroundColour(int item, Colour c)</autodoc>
+        <paramlist>
+          <param name="item" type="int" default=""/>
+          <param name="c" type="Colour" default=""/>
+        </paramlist>
+      </method>
+      <method name="SetItemBackgroundColour" type="" overloaded="no">
+        <autodoc>SetItemBackgroundColour(int item, Colour c)</autodoc>
+        <paramlist>
+          <param name="item" type="int" default=""/>
+          <param name="c" type="Colour" default=""/>
+        </paramlist>
+      </method>
+      <method name="SetItemFont" type="" overloaded="no">
+        <autodoc>SetItemFont(int item, Font f)</autodoc>
+        <paramlist>
+          <param name="item" type="int" default=""/>
+          <param name="f" type="Font" default=""/>
+        </paramlist>
+      </method>

     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------


@@ -14145,7 +15660,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       <baseclass name="ListBox"/>
       <constructor name="CheckListBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
       <baseclass name="ListBox"/>
       <constructor name="CheckListBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-    int choices=0, String choices_array=None, 
+    wxArrayString choices=wxPyEmptyStringArray, 

     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; CheckListBox</autodoc>
         <paramlist>
     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; CheckListBox</autodoc>
         <paramlist>


@@ -14153,8 +15668,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
           <param name="id" type="int" default=""/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="id" type="int" default=""/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>

-          <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="String" default="NULL"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="name" type="String" default="wxPyListBoxNameStr"/>
           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="name" type="String" default="wxPyListBoxNameStr"/>


@@ -14165,7 +15679,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-    int choices=0, String choices_array=None, 
+    wxArrayString choices=wxPyEmptyStringArray, 

     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; bool</autodoc>
         <paramlist>


@@ -14173,8 +15687,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
           <param name="id" type="int" default=""/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="id" type="int" default=""/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>

-          <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="String" default="NULL"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="name" type="String" default="wxPyListBoxNameStr"/>
           <param name="style" type="long" default="0"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="name" type="String" default="wxPyListBoxNameStr"/>


@@ -14198,12 +15711,14 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </method>
       <method name="HitTest" type="int" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>
       </method>
       <method name="HitTest" type="int" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>

+        <docstring>Test where the given (in client coords) point lies</docstring>

         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="HitTestXY" type="int" overloaded="no">
         <autodoc>HitTestXY(int x, int y) -&gt; int</autodoc>
         <paramlist>
           <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="HitTestXY" type="int" overloaded="no">
         <autodoc>HitTestXY(int x, int y) -&gt; int</autodoc>

+        <docstring>Test where the given (in client coords) point lies</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -14226,6 +15741,9 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
           <param name="alignment" type="wxTextAttrAlignment" default="wxTEXT_ALIGNMENT_DEFAULT"/>
         </paramlist>
       </constructor>
           <param name="alignment" type="wxTextAttrAlignment" default="wxTEXT_ALIGNMENT_DEFAULT"/>
         </paramlist>
       </constructor>

+      <destructor name="~wxTextAttr" overloaded="no">
+        <autodoc>__del__()</autodoc>
+      </destructor>

       <method name="Init" type="" overloaded="no">
         <autodoc>Init()</autodoc>
       </method>
       <method name="Init" type="" overloaded="no">
         <autodoc>Init()</autodoc>
       </method>


@@ -14333,7 +15851,7 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
         <autodoc>IsDefault() -&gt; bool</autodoc>
       </method>
       <staticmethod name="Combine" type="TextAttr" overloaded="no">
         <autodoc>IsDefault() -&gt; bool</autodoc>
       </method>
       <staticmethod name="Combine" type="TextAttr" overloaded="no">

-        <autodoc>TextAttr.Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -&gt; TextAttr</autodoc>
+        <autodoc>Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -&gt; TextAttr</autodoc>

         <paramlist>
           <param name="attr" type="TextAttr" default=""/>
           <param name="attrDef" type="TextAttr" default=""/>
         <paramlist>
           <param name="attr" type="TextAttr" default=""/>
           <param name="attrDef" type="TextAttr" default=""/>


@@ -14537,6 +16055,17 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
           <param name="pos" type="long" default=""/>
         </paramlist>
       </method>
           <param name="pos" type="long" default=""/>
         </paramlist>
       </method>

+      <method name="HitTest" type="wxTextCtrlHitTestResult" overloaded="no">
+        <autodoc>HitTest(Point pt) -&gt; (result, row, col)</autodoc>
+        <docstring>Find the character at position given in pixels.
+NB: pt is in device coords (not adjusted for the client area
+origin nor scrolling)</docstring>
+        <paramlist>
+          <param name="pt" type="Point" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
+        </paramlist>
+      </method>

       <method name="Copy" type="" overloaded="no">
         <autodoc>Copy()</autodoc>
       </method>
       <method name="Copy" type="" overloaded="no">
         <autodoc>Copy()</autodoc>
       </method>


@@ -14665,6 +16194,7 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=SB_HORIZONTAL, 
     Validator validator=DefaultValidator, String name=ScrollBarNameStr) -&gt; bool</autodoc>
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=SB_HORIZONTAL, 
     Validator validator=DefaultValidator, String name=ScrollBarNameStr) -&gt; bool</autodoc>

+        <docstring>Do the 2nd phase and create the GUI control.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>


@@ -14699,6 +16229,19 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
       <method name="SetScrollbar" type="" overloaded="no">
         <autodoc>SetScrollbar(int position, int thumbSize, int range, int pageSize, 
     bool refresh=True)</autodoc>
       <method name="SetScrollbar" type="" overloaded="no">
         <autodoc>SetScrollbar(int position, int thumbSize, int range, int pageSize, 
     bool refresh=True)</autodoc>

+        <docstring>Sets the scrollbar properties of a built-in scrollbar.
+
+    orientation: Determines the scrollbar whose page size is to be
+                 set. May be wx.HORIZONTAL or wx.VERTICAL.
+
+    position:    The position of the scrollbar in scroll units.
+
+    thumbSize:   The size of the thumb, or visible portion of the
+                 scrollbar, in scroll units.
+
+    range:       The maximum position of the scrollbar.
+
+    refresh:     True to redraw the scrollbar, false otherwise.</docstring>

         <paramlist>
           <param name="position" type="int" default=""/>
           <param name="thumbSize" type="int" default=""/>
         <paramlist>
           <param name="position" type="int" default=""/>
           <param name="thumbSize" type="int" default=""/>


@@ -14888,19 +16431,18 @@ EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
     <class name="RadioBox" oldname="wxRadioBox" module="controls">
       <baseclass name="Control"/>
       <constructor name="RadioBox" overloaded="no">
     <class name="RadioBox" oldname="wxRadioBox" module="controls">
       <baseclass name="Control"/>
       <constructor name="RadioBox" overloaded="no">

-        <autodoc>__init__(Window parent, int id, String label, Point point=DefaultPosition, 
-    Size size=DefaultSize, int choices=0, 
-    String choices_array=None, int majorDimension=0, 
+        <autodoc>__init__(Window parent, int id, String label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray, 
+    int majorDimension=0, 

     long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=RadioBoxNameStr) -&gt; RadioBox</autodoc>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="label" type="String" default=""/>
     long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=RadioBoxNameStr) -&gt; RadioBox</autodoc>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="label" type="String" default=""/>

-          <param name="point" type="Point" default="wxDefaultPosition"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>

           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="size" type="Size" default="wxDefaultSize"/>

-          <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="String" default="NULL"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="majorDimension" type="int" default="0"/>
           <param name="style" type="long" default="wxRA_HORIZONTAL"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="majorDimension" type="int" default="0"/>
           <param name="style" type="long" default="wxRA_HORIZONTAL"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>


@@ -14911,19 +16453,18 @@ EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
         <autodoc>PreRadioBox() -&gt; RadioBox</autodoc>
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>PreRadioBox() -&gt; RadioBox</autodoc>
       </constructor>
       <method name="Create" type="bool" overloaded="no">

-        <autodoc>Create(Window parent, int id, String label, Point point=DefaultPosition, 
-    Size size=DefaultSize, int choices=0, 
-    String choices_array=None, int majorDimension=0, 
+        <autodoc>Create(Window parent, int id, String label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray, 
+    int majorDimension=0, 

     long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=RadioBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="label" type="String" default=""/>
     long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=RadioBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="label" type="String" default=""/>

-          <param name="point" type="Point" default="wxDefaultPosition"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>

           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="size" type="Size" default="wxDefaultSize"/>

-          <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="String" default="NULL"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="majorDimension" type="int" default="0"/>
           <param name="style" type="long" default="wxRA_HORIZONTAL"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="majorDimension" type="int" default="0"/>
           <param name="style" type="long" default="wxRA_HORIZONTAL"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>


@@ -15054,7 +16595,7 @@ EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       <baseclass name="Control"/>
       <constructor name="Slider" overloaded="no">
         <autodoc>__init__(Window parent, int id, int value, int minValue, int maxValue, 
       <baseclass name="Control"/>
       <constructor name="Slider" overloaded="no">
         <autodoc>__init__(Window parent, int id, int value, int minValue, int maxValue, 

-    Point point=DefaultPosition, Size size=DefaultSize, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 

     long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=SliderNameStr) -&gt; Slider</autodoc>
         <paramlist>
     long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=SliderNameStr) -&gt; Slider</autodoc>
         <paramlist>


@@ -15063,7 +16604,7 @@ EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
           <param name="value" type="int" default=""/>
           <param name="minValue" type="int" default=""/>
           <param name="maxValue" type="int" default=""/>
           <param name="value" type="int" default=""/>
           <param name="minValue" type="int" default=""/>
           <param name="maxValue" type="int" default=""/>

-          <param name="point" type="Point" default="wxDefaultPosition"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>

           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSL_HORIZONTAL"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSL_HORIZONTAL"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>


@@ -15075,7 +16616,7 @@ EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, int value, int minValue, int maxValue, 
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, int value, int minValue, int maxValue, 

-    Point point=DefaultPosition, Size size=DefaultSize, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 

     long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=SliderNameStr) -&gt; bool</autodoc>
         <paramlist>
     long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=SliderNameStr) -&gt; bool</autodoc>
         <paramlist>


@@ -15084,7 +16625,7 @@ EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
           <param name="value" type="int" default=""/>
           <param name="minValue" type="int" default=""/>
           <param name="maxValue" type="int" default=""/>
           <param name="value" type="int" default=""/>
           <param name="minValue" type="int" default=""/>
           <param name="maxValue" type="int" default=""/>

-          <param name="point" type="Point" default="wxDefaultPosition"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>

           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSL_HORIZONTAL"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSL_HORIZONTAL"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>


@@ -15153,10 +16694,10 @@ EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
         <autodoc>GetThumbLength() -&gt; int</autodoc>
       </method>
       <method name="SetTickFreq" type="" overloaded="no">
         <autodoc>GetThumbLength() -&gt; int</autodoc>
       </method>
       <method name="SetTickFreq" type="" overloaded="no">

-        <autodoc>SetTickFreq(int n, int pos)</autodoc>
+        <autodoc>SetTickFreq(int n, int pos=1)</autodoc>

         <paramlist>
           <param name="n" type="int" default=""/>
         <paramlist>
           <param name="n" type="int" default=""/>

-          <param name="pos" type="int" default=""/>
+          <param name="pos" type="int" default="1"/>

         </paramlist>
       </method>
       <method name="GetTickFreq" type="int" overloaded="no">
         </paramlist>
       </method>
       <method name="GetTickFreq" type="int" overloaded="no">


@@ -15240,6 +16781,7 @@ EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       </method>
       <method name="SetLabel" type="" overloaded="no">
         <autodoc>SetLabel(String label)</autodoc>
       </method>
       <method name="SetLabel" type="" overloaded="no">
         <autodoc>SetLabel(String label)</autodoc>

+        <docstring>Sets the item's text.</docstring>

         <paramlist>
           <param name="label" type="String" default=""/>
         </paramlist>
         <paramlist>
           <param name="label" type="String" default=""/>
         </paramlist>


@@ -15400,11 +16942,11 @@ EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
     <class name="Notebook" oldname="wxNotebook" module="controls">
       <baseclass name="BookCtrl"/>
       <constructor name="Notebook" overloaded="no">
     <class name="Notebook" oldname="wxNotebook" module="controls">
       <baseclass name="BookCtrl"/>
       <constructor name="Notebook" overloaded="no">

-        <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-    long style=0, String name=NOTEBOOK_NAME) -&gt; Notebook</autodoc>
+        <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, String name=NOTEBOOK_NAME) -&gt; Notebook</autodoc>

         <paramlist>
           <param name="parent" type="Window" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>

-          <param name="id" type="int" default=""/>
+          <param name="id" type="int" default="-1"/>

           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>


@@ -15443,7 +16985,7 @@ EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       </method>
       <method name="HitTest" type="int" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; (tab, where)</autodoc>
       </method>
       <method name="HitTest" type="int" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; (tab, where)</autodoc>

-        <docstring>Returns the tab which is hit, and flags indicating where using wxNB_HITTEST_ flags.</docstring>
+        <docstring>Returns the tab which is hit, and flags indicating where using wx.NB_HITTEST_ flags.</docstring>

         <paramlist>
           <param name="pt" type="Point" default=""/>
           <param name="OUTPUT" type="long" default=""/>
         <paramlist>
           <param name="pt" type="Point" default=""/>
           <param name="OUTPUT" type="long" default=""/>


@@ -15511,11 +17053,11 @@ class NotebookPage(wx.Panel):
     <class name="Listbook" oldname="wxListbook" module="controls">
       <baseclass name="BookCtrl"/>
       <constructor name="Listbook" overloaded="no">
     <class name="Listbook" oldname="wxListbook" module="controls">
       <baseclass name="BookCtrl"/>
       <constructor name="Listbook" overloaded="no">

-        <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-    long style=0, String name=EmptyString) -&gt; Listbook</autodoc>
+        <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, String name=EmptyString) -&gt; Listbook</autodoc>

         <paramlist>
           <param name="parent" type="Window" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>

-          <param name="id" type="int" default=""/>
+          <param name="id" type="int" default="-1"/>

           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
           <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>


@@ -16338,6 +17880,7 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=LC_ICON, 
     Validator validator=DefaultValidator, String name=ListCtrlNameStr) -&gt; bool</autodoc>
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=LC_ICON, 
     Validator validator=DefaultValidator, String name=ListCtrlNameStr) -&gt; bool</autodoc>

+        <docstring>Do the 2nd phase and create the GUI control.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>


@@ -16530,6 +18073,9 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
       </method>
       <method name="SetWindowStyleFlag" type="" overloaded="no">
         <autodoc>SetWindowStyleFlag(long style)</autodoc>
       </method>
       <method name="SetWindowStyleFlag" type="" overloaded="no">
         <autodoc>SetWindowStyleFlag(long style)</autodoc>

+        <docstring>Sets the style of the window. Please note that some styles cannot be
+changed after the window creation and that Refresh() might be called
+after changing the others for the change to take place immediately.</docstring>

         <paramlist>
           <param name="style" type="long" default=""/>
         </paramlist>
         <paramlist>
           <param name="style" type="long" default=""/>
         </paramlist>


@@ -16562,6 +18108,9 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
           <param name="which" type="int" default=""/>
         </paramlist>
       </method>
           <param name="which" type="int" default=""/>
         </paramlist>
       </method>

+      <method name="InReportView" type="bool" overloaded="no">
+        <autodoc>InReportView() -&gt; bool</autodoc>
+      </method>

       <method name="IsVirtual" type="bool" overloaded="no">
         <autodoc>IsVirtual() -&gt; bool</autodoc>
       </method>
       <method name="IsVirtual" type="bool" overloaded="no">
         <autodoc>IsVirtual() -&gt; bool</autodoc>
       </method>


@@ -16769,6 +18318,7 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=LC_REPORT, 
     Validator validator=DefaultValidator, String name=ListCtrlNameStr) -&gt; bool</autodoc>
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=LC_REPORT, 
     Validator validator=DefaultValidator, String name=ListCtrlNameStr) -&gt; bool</autodoc>

+        <docstring>Do the 2nd phase and create the GUI control.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>


@@ -16852,7 +18402,7 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
           <param name="other" type="TreeItemId" default=""/>
         </paramlist>
       </method>
           <param name="other" type="TreeItemId" default=""/>
         </paramlist>
       </method>

-      <property name="m_pItem" type="wxTreeItemIdValue" readonly="no"/>
+      <property name="m_pItem" type="" readonly="no"/>

     </class>
     <class name="TreeItemData" oldname="wxPyTreeItemData" module="controls">
       <constructor name="wxPyTreeItemData" overloaded="no">
     </class>
     <class name="TreeItemData" oldname="wxPyTreeItemData" module="controls">
       <constructor name="wxPyTreeItemData" overloaded="no">


@@ -17010,6 +18560,7 @@ EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
     Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
     Validator validator=DefaultValidator, 
     String name=TreeCtrlNameStr) -&gt; bool</autodoc>
     Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
     Validator validator=DefaultValidator, 
     String name=TreeCtrlNameStr) -&gt; bool</autodoc>

+        <docstring>Do the 2nd phase and create the GUI control.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>


@@ -17244,10 +18795,10 @@ EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
         </paramlist>
       </method>
       <method name="GetNextChild" type="PyObject" overloaded="no">
         </paramlist>
       </method>
       <method name="GetNextChild" type="PyObject" overloaded="no">

-        <autodoc>GetNextChild(TreeItemId item, wxTreeItemIdValue cookie) -&gt; PyObject</autodoc>
+        <autodoc>GetNextChild(TreeItemId item, void cookie) -&gt; PyObject</autodoc>

         <paramlist>
           <param name="item" type="TreeItemId" default=""/>
         <paramlist>
           <param name="item" type="TreeItemId" default=""/>

-          <param name="cookie" type="wxTreeItemIdValue" default=""/>
+          <param name="cookie" type="" default=""/>

         </paramlist>
       </method>
       <method name="GetLastChild" type="TreeItemId" overloaded="no">
         </paramlist>
       </method>
       <method name="GetLastChild" type="TreeItemId" overloaded="no">


@@ -17380,11 +18931,24 @@ EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
       <method name="Unselect" type="" overloaded="no">
         <autodoc>Unselect()</autodoc>
       </method>
       <method name="Unselect" type="" overloaded="no">
         <autodoc>Unselect()</autodoc>
       </method>

+      <method name="UnselectItem" type="" overloaded="no">
+        <autodoc>UnselectItem(TreeItemId item)</autodoc>
+        <paramlist>
+          <param name="item" type="TreeItemId" default=""/>
+        </paramlist>
+      </method>

       <method name="UnselectAll" type="" overloaded="no">
         <autodoc>UnselectAll()</autodoc>
       </method>
       <method name="SelectItem" type="" overloaded="no">
       <method name="UnselectAll" type="" overloaded="no">
         <autodoc>UnselectAll()</autodoc>
       </method>
       <method name="SelectItem" type="" overloaded="no">

-        <autodoc>SelectItem(TreeItemId item)</autodoc>
+        <autodoc>SelectItem(TreeItemId item, bool select=True)</autodoc>
+        <paramlist>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="select" type="bool" default="True"/>
+        </paramlist>
+      </method>
+      <method name="ToggleItemSelection" type="" overloaded="no">
+        <autodoc>ToggleItemSelection(TreeItemId item)</autodoc>

         <paramlist>
           <param name="item" type="TreeItemId" default=""/>
         </paramlist>
         <paramlist>
           <param name="item" type="TreeItemId" default=""/>
         </paramlist>


@@ -17727,6 +19291,29 @@ EVT_DETAILED_HELP = wx.PyEventBinder( wxEVT_DETAILED_HELP, 1)
 EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 </pythoncode>
     <class name="HelpEvent" oldname="wxHelpEvent" module="controls">
 EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 </pythoncode>
     <class name="HelpEvent" oldname="wxHelpEvent" module="controls">

+      <docstring>A help event is sent when the user has requested
+context-sensitive help. This can either be caused by the
+application requesting context-sensitive help mode via
+wx.ContextHelp, or (on MS Windows) by the system generating a
+WM_HELP message when the user pressed F1 or clicked on the query
+button in a dialog caption.
+
+A help event is sent to the window that the user clicked on, and
+is propagated up the window hierarchy until the event is
+processed or there are no more event handlers. The application
+should call event.GetId to check the identity of the clicked-on
+window, and then either show some suitable help or call
+event.Skip if the identifier is unrecognised. Calling Skip is
+important because it allows wxWindows to generate further events
+for ancestors of the clicked-on window. Otherwise it would be
+impossible to show help for container windows, since processing
+would stop after the first window found.
+
+ Events
+    EVT_HELP            Sent when the user has requested context-
+                        sensitive help.
+    EVT_HELP_RANGE      Allows to catch EVT_HELP for a range of IDs
+</docstring>

       <baseclass name="CommandEvent"/>
       <constructor name="HelpEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -&gt; HelpEvent</autodoc>
       <baseclass name="CommandEvent"/>
       <constructor name="HelpEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -&gt; HelpEvent</autodoc>


@@ -17738,36 +19325,68 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       </constructor>
       <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </constructor>
       <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>

+        <docstring>Returns the left-click position of the mouse, in screen
+coordinates. This allows the application to position the help
+appropriately.</docstring>

       </method>
       <method name="SetPosition" type="" overloaded="no">
         <autodoc>SetPosition(Point pos)</autodoc>
       </method>
       <method name="SetPosition" type="" overloaded="no">
         <autodoc>SetPosition(Point pos)</autodoc>

+        <docstring>Sets the left-click position of the mouse, in screen coordinates.</docstring>

         <paramlist>
           <param name="pos" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="GetLink" type="String" overloaded="no">
         <autodoc>GetLink() -&gt; String</autodoc>
         <paramlist>
           <param name="pos" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="GetLink" type="String" overloaded="no">
         <autodoc>GetLink() -&gt; String</autodoc>

+        <docstring>Get an optional link to further help</docstring>

       </method>
       <method name="SetLink" type="" overloaded="no">
         <autodoc>SetLink(String link)</autodoc>
       </method>
       <method name="SetLink" type="" overloaded="no">
         <autodoc>SetLink(String link)</autodoc>

+        <docstring>Set an optional link to further help</docstring>

         <paramlist>
           <param name="link" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetTarget" type="String" overloaded="no">
         <autodoc>GetTarget() -&gt; String</autodoc>
         <paramlist>
           <param name="link" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetTarget" type="String" overloaded="no">
         <autodoc>GetTarget() -&gt; String</autodoc>

+        <docstring>Get an optional target to display help in. E.g. a window specification</docstring>

       </method>
       <method name="SetTarget" type="" overloaded="no">
         <autodoc>SetTarget(String target)</autodoc>
       </method>
       <method name="SetTarget" type="" overloaded="no">
         <autodoc>SetTarget(String target)</autodoc>

+        <docstring>Set an optional target to display help in. E.g. a window specification</docstring>

         <paramlist>
           <param name="target" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="ContextHelp" oldname="wxContextHelp" module="controls">
         <paramlist>
           <param name="target" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="ContextHelp" oldname="wxContextHelp" module="controls">

+      <docstring>This class changes the cursor to a query and puts the application
+into a 'context-sensitive help mode'. When the user left-clicks
+on a window within the specified window, a EVT_HELP event is sent
+to that control, and the application may respond to it by popping
+up some help.
+
+There are a couple of ways to invoke this behaviour implicitly:
+
+    * Use the wx.DIALOG_EX_CONTEXTHELP extended style for a
+      dialog (Windows only). This will put a question mark in the
+      titlebar, and Windows will put the application into
+      context-sensitive help mode automatically, with further
+      programming.
+
+    * Create a wx.ContextHelpButton, whose predefined behaviour
+      is to create a context help object. Normally you will write
+      your application so that this button is only added to a
+      dialog for non-Windows platforms (use
+      wx.DIALOG_EX_CONTEXTHELP on Windows).
+</docstring>

       <baseclass name="Object"/>
       <constructor name="ContextHelp" overloaded="no">
         <autodoc>__init__(Window window=None, bool doNow=True) -&gt; ContextHelp</autodoc>
       <baseclass name="Object"/>
       <constructor name="ContextHelp" overloaded="no">
         <autodoc>__init__(Window window=None, bool doNow=True) -&gt; ContextHelp</autodoc>

+        <docstring>Constructs a context help object, calling BeginContextHelp if
+doNow is true (the default).
+
+If window is None, the top window is used.</docstring>

         <paramlist>
           <param name="window" type="Window" default="NULL"/>
           <param name="doNow" type="bool" default="True"/>
         <paramlist>
           <param name="window" type="Window" default="NULL"/>
           <param name="doNow" type="bool" default="True"/>


@@ -17778,19 +19397,40 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       </destructor>
       <method name="BeginContextHelp" type="bool" overloaded="no">
         <autodoc>BeginContextHelp(Window window=None) -&gt; bool</autodoc>
       </destructor>
       <method name="BeginContextHelp" type="bool" overloaded="no">
         <autodoc>BeginContextHelp(Window window=None) -&gt; bool</autodoc>

+        <docstring>Puts the application into context-sensitive help mode. window is
+the window which will be used to catch events; if NULL, the top
+window will be used.
+
+Returns true if the application was successfully put into
+context-sensitive help mode. This function only returns when the
+event loop has finished.</docstring>

         <paramlist>
           <param name="window" type="Window" default="NULL"/>
         </paramlist>
       </method>
       <method name="EndContextHelp" type="bool" overloaded="no">
         <autodoc>EndContextHelp() -&gt; bool</autodoc>
         <paramlist>
           <param name="window" type="Window" default="NULL"/>
         </paramlist>
       </method>
       <method name="EndContextHelp" type="bool" overloaded="no">
         <autodoc>EndContextHelp() -&gt; bool</autodoc>

+        <docstring>Ends context-sensitive help mode. Not normally called by the
+application.</docstring>

       </method>
     </class>
     <class name="ContextHelpButton" oldname="wxContextHelpButton" module="controls">
       </method>
     </class>
     <class name="ContextHelpButton" oldname="wxContextHelpButton" module="controls">

+      <docstring>Instances of this class may be used to add a question mark button
+that when pressed, puts the application into context-help
+mode. It does this by creating a wx.ContextHelp object which
+itself generates a EVT_HELP event when the user clicks on a
+window.
+
+On Windows, you may add a question-mark icon to a dialog by use
+of the wx.DIALOG_EX_CONTEXTHELP extra style, but on other
+platforms you will have to add a button explicitly, usually next
+to OK, Cancel or similar buttons.
+</docstring>

       <baseclass name="BitmapButton"/>
       <constructor name="ContextHelpButton" overloaded="no">
         <autodoc>__init__(Window parent, int id=ID_CONTEXT_HELP, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=BU_AUTODRAW) -&gt; ContextHelpButton</autodoc>
       <baseclass name="BitmapButton"/>
       <constructor name="ContextHelpButton" overloaded="no">
         <autodoc>__init__(Window parent, int id=ID_CONTEXT_HELP, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=BU_AUTODRAW) -&gt; ContextHelpButton</autodoc>

+        <docstring>Constructor, creating and showing a context help button.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="wxID_CONTEXT_HELP"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="wxID_CONTEXT_HELP"/>


@@ -17801,29 +19441,49 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       </constructor>
     </class>
     <class name="HelpProvider" oldname="wxHelpProvider" module="controls">
       </constructor>
     </class>
     <class name="HelpProvider" oldname="wxHelpProvider" module="controls">

+      <docstring>wx.HelpProvider is an abstract class used by a program
+implementing context-sensitive help to show the help text for the
+given window.
+
+The current help provider must be explicitly set by the
+application using wx.HelpProvider.Set().</docstring>

       <staticmethod name="Set" type="HelpProvider" overloaded="no">
       <staticmethod name="Set" type="HelpProvider" overloaded="no">

-        <autodoc>HelpProvider.Set(HelpProvider helpProvider) -&gt; HelpProvider</autodoc>
+        <autodoc>Set(HelpProvider helpProvider) -&gt; HelpProvider</autodoc>
+        <docstring>Sset the current, application-wide help provider. Returns the
+previous one.  Unlike some other classes, the help provider is
+not created on demand. This must be explicitly done by the
+application.</docstring>

         <paramlist>
           <param name="helpProvider" type="HelpProvider" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Get" type="HelpProvider" overloaded="no">
         <paramlist>
           <param name="helpProvider" type="HelpProvider" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Get" type="HelpProvider" overloaded="no">

-        <autodoc>HelpProvider.Get() -&gt; HelpProvider</autodoc>
+        <autodoc>Get() -&gt; HelpProvider</autodoc>
+        <docstring>Return the current application-wide help provider.</docstring>

       </staticmethod>
       <method name="GetHelp" type="String" overloaded="no">
         <autodoc>GetHelp(Window window) -&gt; String</autodoc>
       </staticmethod>
       <method name="GetHelp" type="String" overloaded="no">
         <autodoc>GetHelp(Window window) -&gt; String</autodoc>

+        <docstring>Gets the help string for this window. Its interpretation is
+dependent on the help provider except that empty string always
+means that no help is associated with the window.</docstring>

         <paramlist>
           <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="ShowHelp" type="bool" overloaded="no">
         <autodoc>ShowHelp(Window window) -&gt; bool</autodoc>
         <paramlist>
           <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="ShowHelp" type="bool" overloaded="no">
         <autodoc>ShowHelp(Window window) -&gt; bool</autodoc>

+        <docstring>Shows help for the given window. Uses GetHelp internally if
+applicable.
+
+Returns true if it was done, or false if no help was available
+for this window.</docstring>

         <paramlist>
           <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="AddHelp" type="" overloaded="no">
         <autodoc>AddHelp(Window window, String text)</autodoc>
         <paramlist>
           <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="AddHelp" type="" overloaded="no">
         <autodoc>AddHelp(Window window, String text)</autodoc>

+        <docstring>Associates the text with the given window.</docstring>

         <paramlist>
           <param name="window" type="Window" default=""/>
           <param name="text" type="String" default=""/>
         <paramlist>
           <param name="window" type="Window" default=""/>
           <param name="text" type="String" default=""/>


@@ -17831,19 +19491,38 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       </method>
       <method name="AddHelpById" type="" overloaded="no">
         <autodoc>AddHelpById(int id, String text)</autodoc>
       </method>
       <method name="AddHelpById" type="" overloaded="no">
         <autodoc>AddHelpById(int id, String text)</autodoc>

+        <docstring>This version associates the given text with all windows with this
+id. May be used to set the same help string for all Cancel
+buttons in the application, for example.</docstring>

         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="text" type="String" default=""/>
         </paramlist>
       </method>

+      <method name="RemoveHelp" type="" overloaded="no">
+        <autodoc>RemoveHelp(Window window)</autodoc>
+        <docstring>Removes the association between the window pointer and the help
+text. This is called by the wx.Window destructor. Without this,
+the table of help strings will fill up and when window pointers
+are reused, the wrong help string will be found.</docstring>
+        <paramlist>
+          <param name="window" type="Window" default=""/>
+        </paramlist>
+      </method>

       <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>
       </method>
     </class>
     <class name="SimpleHelpProvider" oldname="wxSimpleHelpProvider" module="controls">
       <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>
       </method>
     </class>
     <class name="SimpleHelpProvider" oldname="wxSimpleHelpProvider" module="controls">

+      <docstring>wx.SimpleHelpProvider is an implementation of wx.HelpProvider
+which supports only plain text help strings, and shows the string
+associated with the control (if any) in a tooltip.</docstring>

       <baseclass name="HelpProvider"/>
       <constructor name="SimpleHelpProvider" overloaded="no">
         <autodoc>__init__() -&gt; SimpleHelpProvider</autodoc>
       <baseclass name="HelpProvider"/>
       <constructor name="SimpleHelpProvider" overloaded="no">
         <autodoc>__init__() -&gt; SimpleHelpProvider</autodoc>

+        <docstring>wx.SimpleHelpProvider is an implementation of wx.HelpProvider
+which supports only plain text help strings, and shows the string
+associated with the control (if any) in a tooltip.</docstring>

       </constructor>
     </class>
     <pythoncode>
       </constructor>
     </class>
     <pythoncode>


@@ -17969,34 +19648,34 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 </pythoncode>
     <class name="SystemSettings" oldname="wxSystemSettings" module="misc">
       <staticmethod name="GetColour" type="Colour" overloaded="no">
 </pythoncode>
     <class name="SystemSettings" oldname="wxSystemSettings" module="misc">
       <staticmethod name="GetColour" type="Colour" overloaded="no">

-        <autodoc>SystemSettings.GetColour(int index) -&gt; Colour</autodoc>
+        <autodoc>GetColour(int index) -&gt; Colour</autodoc>

         <paramlist>
           <param name="index" type="wxSystemColour" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetFont" type="Font" overloaded="no">
         <paramlist>
           <param name="index" type="wxSystemColour" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetFont" type="Font" overloaded="no">

-        <autodoc>SystemSettings.GetFont(int index) -&gt; Font</autodoc>
+        <autodoc>GetFont(int index) -&gt; Font</autodoc>

         <paramlist>
           <param name="index" type="wxSystemFont" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetMetric" type="int" overloaded="no">
         <paramlist>
           <param name="index" type="wxSystemFont" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetMetric" type="int" overloaded="no">

-        <autodoc>SystemSettings.GetMetric(int index) -&gt; int</autodoc>
+        <autodoc>GetMetric(int index) -&gt; int</autodoc>

         <paramlist>
           <param name="index" type="wxSystemMetric" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="HasFeature" type="bool" overloaded="no">
         <paramlist>
           <param name="index" type="wxSystemMetric" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="HasFeature" type="bool" overloaded="no">

-        <autodoc>SystemSettings.HasFeature(int index) -&gt; bool</autodoc>
+        <autodoc>HasFeature(int index) -&gt; bool</autodoc>

         <paramlist>
           <param name="index" type="wxSystemFeature" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetScreenType" type="wxSystemScreenType" overloaded="no">
         <paramlist>
           <param name="index" type="wxSystemFeature" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetScreenType" type="wxSystemScreenType" overloaded="no">

-        <autodoc>SystemSettings.GetScreenType() -&gt; int</autodoc>
+        <autodoc>GetScreenType() -&gt; int</autodoc>

       </staticmethod>
       <staticmethod name="SetScreenType" type="" overloaded="no">
       </staticmethod>
       <staticmethod name="SetScreenType" type="" overloaded="no">

-        <autodoc>SystemSettings.SetScreenType(int screen)</autodoc>
+        <autodoc>SetScreenType(int screen)</autodoc>

         <paramlist>
           <param name="screen" type="wxSystemScreenType" default=""/>
         </paramlist>
         <paramlist>
           <param name="screen" type="wxSystemScreenType" default=""/>
         </paramlist>


@@ -18008,33 +19687,33 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
         <autodoc>__init__() -&gt; SystemOptions</autodoc>
       </constructor>
       <staticmethod name="SetOption" type="" overloaded="no">
         <autodoc>__init__() -&gt; SystemOptions</autodoc>
       </constructor>
       <staticmethod name="SetOption" type="" overloaded="no">

-        <autodoc>SystemOptions.SetOption(String name, String value)</autodoc>
+        <autodoc>SetOption(String name, String value)</autodoc>

         <paramlist>
           <param name="name" type="String" default=""/>
           <param name="value" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="SetOptionInt" type="" overloaded="no">
         <paramlist>
           <param name="name" type="String" default=""/>
           <param name="value" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="SetOptionInt" type="" overloaded="no">

-        <autodoc>SystemOptions.SetOptionInt(String name, int value)</autodoc>
+        <autodoc>SetOptionInt(String name, int value)</autodoc>

         <paramlist>
           <param name="name" type="String" default=""/>
           <param name="value" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetOption" type="String" overloaded="no">
         <paramlist>
           <param name="name" type="String" default=""/>
           <param name="value" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetOption" type="String" overloaded="no">

-        <autodoc>SystemOptions.GetOption(String name) -&gt; String</autodoc>
+        <autodoc>GetOption(String name) -&gt; String</autodoc>

         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetOptionInt" type="int" overloaded="no">
         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetOptionInt" type="int" overloaded="no">

-        <autodoc>SystemOptions.GetOptionInt(String name) -&gt; int</autodoc>
+        <autodoc>GetOptionInt(String name) -&gt; int</autodoc>

         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="HasOption" type="bool" overloaded="no">
         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="HasOption" type="bool" overloaded="no">

-        <autodoc>SystemOptions.HasOption(String name) -&gt; bool</autodoc>
+        <autodoc>HasOption(String name) -&gt; bool</autodoc>

         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>


@@ -18423,13 +20102,13 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
         <autodoc>GetWindow() -&gt; Window</autodoc>
       </method>
       <staticmethod name="Enable" type="" overloaded="no">
         <autodoc>GetWindow() -&gt; Window</autodoc>
       </method>
       <staticmethod name="Enable" type="" overloaded="no">

-        <autodoc>ToolTip.Enable(bool flag)</autodoc>
+        <autodoc>Enable(bool flag)</autodoc>

         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="SetDelay" type="" overloaded="no">
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="SetDelay" type="" overloaded="no">

-        <autodoc>ToolTip.SetDelay(long milliseconds)</autodoc>
+        <autodoc>SetDelay(long milliseconds)</autodoc>

         <paramlist>
           <param name="milliseconds" type="long" default=""/>
         </paramlist>
         <paramlist>
           <param name="milliseconds" type="long" default=""/>
         </paramlist>


@@ -18743,10 +20422,11 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
         <autodoc>__del__()</autodoc>
       </destructor>
       <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <method name="_setCallbackInfo" type="" overloaded="no">

-        <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
+        <autodoc>_setCallbackInfo(PyObject self, PyObject _class, int incref=1)</autodoc>

         <paramlist>
           <param name="self" type="PyObject" default=""/>
           <param name="_class" type="PyObject" default=""/>
         <paramlist>
           <param name="self" type="PyObject" default=""/>
           <param name="_class" type="PyObject" default=""/>

+          <param name="incref" type="int" default="1"/>

         </paramlist>
       </method>
       <method name="SetOwner" type="" overloaded="no">
         </paramlist>
       </method>
       <method name="SetOwner" type="" overloaded="no">


@@ -18779,7 +20459,7 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
         <autodoc>GetId() -&gt; int</autodoc>
       </method>
     </class>
         <autodoc>GetId() -&gt; int</autodoc>
       </method>
     </class>

-    <pythoncode>    
+    <pythoncode>

 # For backwards compatibility with 2.4
 class PyTimer(Timer):
     def __init__(self, notify):
 # For backwards compatibility with 2.4
 class PyTimer(Timer):
     def __init__(self, notify):


@@ -18792,7 +20472,7 @@ class PyTimer(Timer):
 
 
 EVT_TIMER = wx.PyEventBinder( wxEVT_TIMER, 1 )
 
 
 EVT_TIMER = wx.PyEventBinder( wxEVT_TIMER, 1 )

-                   
+

 </pythoncode>
     <class name="TimerEvent" oldname="wxTimerEvent" module="misc">
       <baseclass name="Event"/>
 </pythoncode>
     <class name="TimerEvent" oldname="wxTimerEvent" module="misc">
       <baseclass name="Event"/>


@@ -18841,16 +20521,16 @@ __init__(wxTimer timer, int milli, bool oneShot=False) -&gt; TimerRunner</autodo
         <autodoc>__init__() -&gt; Log</autodoc>
       </constructor>
       <staticmethod name="IsEnabled" type="bool" overloaded="no">
         <autodoc>__init__() -&gt; Log</autodoc>
       </constructor>
       <staticmethod name="IsEnabled" type="bool" overloaded="no">

-        <autodoc>Log.IsEnabled() -&gt; bool</autodoc>
+        <autodoc>IsEnabled() -&gt; bool</autodoc>

       </staticmethod>
       <staticmethod name="EnableLogging" type="bool" overloaded="no">
       </staticmethod>
       <staticmethod name="EnableLogging" type="bool" overloaded="no">

-        <autodoc>Log.EnableLogging(bool doIt=True) -&gt; bool</autodoc>
+        <autodoc>EnableLogging(bool doIt=True) -&gt; bool</autodoc>

         <paramlist>
           <param name="doIt" type="bool" default="True"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="OnLog" type="" overloaded="no">
         <paramlist>
           <param name="doIt" type="bool" default="True"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="OnLog" type="" overloaded="no">

-        <autodoc>Log.OnLog(wxLogLevel level, wxChar szString, time_t t)</autodoc>
+        <autodoc>OnLog(wxLogLevel level, wxChar szString, time_t t)</autodoc>

         <paramlist>
           <param name="level" type="wxLogLevel" default=""/>
           <param name="szString" type="wxChar" default=""/>
         <paramlist>
           <param name="level" type="wxLogLevel" default=""/>
           <param name="szString" type="wxChar" default=""/>


@@ -18861,88 +20541,88 @@ __init__(wxTimer timer, int milli, bool oneShot=False) -&gt; TimerRunner</autodo
         <autodoc>Flush()</autodoc>
       </method>
       <staticmethod name="FlushActive" type="" overloaded="no">
         <autodoc>Flush()</autodoc>
       </method>
       <staticmethod name="FlushActive" type="" overloaded="no">

-        <autodoc>Log.FlushActive()</autodoc>
+        <autodoc>FlushActive()</autodoc>

       </staticmethod>
       <staticmethod name="GetActiveTarget" type="Log" overloaded="no">
       </staticmethod>
       <staticmethod name="GetActiveTarget" type="Log" overloaded="no">

-        <autodoc>Log.GetActiveTarget() -&gt; Log</autodoc>
+        <autodoc>GetActiveTarget() -&gt; Log</autodoc>

       </staticmethod>
       <staticmethod name="SetActiveTarget" type="Log" overloaded="no">
       </staticmethod>
       <staticmethod name="SetActiveTarget" type="Log" overloaded="no">

-        <autodoc>Log.SetActiveTarget(Log pLogger) -&gt; Log</autodoc>
+        <autodoc>SetActiveTarget(Log pLogger) -&gt; Log</autodoc>

         <paramlist>
           <param name="pLogger" type="Log" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Suspend" type="" overloaded="no">
         <paramlist>
           <param name="pLogger" type="Log" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Suspend" type="" overloaded="no">

-        <autodoc>Log.Suspend()</autodoc>
+        <autodoc>Suspend()</autodoc>

       </staticmethod>
       <staticmethod name="Resume" type="" overloaded="no">
       </staticmethod>
       <staticmethod name="Resume" type="" overloaded="no">

-        <autodoc>Log.Resume()</autodoc>
+        <autodoc>Resume()</autodoc>

       </staticmethod>
       <staticmethod name="SetVerbose" type="" overloaded="no">
       </staticmethod>
       <staticmethod name="SetVerbose" type="" overloaded="no">

-        <autodoc>Log.SetVerbose(bool bVerbose=True)</autodoc>
+        <autodoc>SetVerbose(bool bVerbose=True)</autodoc>

         <paramlist>
           <param name="bVerbose" type="bool" default="True"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="SetLogLevel" type="" overloaded="no">
         <paramlist>
           <param name="bVerbose" type="bool" default="True"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="SetLogLevel" type="" overloaded="no">

-        <autodoc>Log.SetLogLevel(wxLogLevel logLevel)</autodoc>
+        <autodoc>SetLogLevel(wxLogLevel logLevel)</autodoc>

         <paramlist>
           <param name="logLevel" type="wxLogLevel" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="DontCreateOnDemand" type="" overloaded="no">
         <paramlist>
           <param name="logLevel" type="wxLogLevel" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="DontCreateOnDemand" type="" overloaded="no">

-        <autodoc>Log.DontCreateOnDemand()</autodoc>
+        <autodoc>DontCreateOnDemand()</autodoc>

       </staticmethod>
       <staticmethod name="SetTraceMask" type="" overloaded="no">
       </staticmethod>
       <staticmethod name="SetTraceMask" type="" overloaded="no">

-        <autodoc>Log.SetTraceMask(wxTraceMask ulMask)</autodoc>
+        <autodoc>SetTraceMask(wxTraceMask ulMask)</autodoc>

         <paramlist>
           <param name="ulMask" type="wxTraceMask" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="AddTraceMask" type="" overloaded="no">
         <paramlist>
           <param name="ulMask" type="wxTraceMask" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="AddTraceMask" type="" overloaded="no">

-        <autodoc>Log.AddTraceMask(String str)</autodoc>
+        <autodoc>AddTraceMask(String str)</autodoc>

         <paramlist>
           <param name="str" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="RemoveTraceMask" type="" overloaded="no">
         <paramlist>
           <param name="str" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="RemoveTraceMask" type="" overloaded="no">

-        <autodoc>Log.RemoveTraceMask(String str)</autodoc>
+        <autodoc>RemoveTraceMask(String str)</autodoc>

         <paramlist>
           <param name="str" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="ClearTraceMasks" type="" overloaded="no">
         <paramlist>
           <param name="str" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="ClearTraceMasks" type="" overloaded="no">

-        <autodoc>Log.ClearTraceMasks()</autodoc>
+        <autodoc>ClearTraceMasks()</autodoc>

       </staticmethod>
       <staticmethod name="GetTraceMasks" type="wxArrayString" overloaded="no">
       </staticmethod>
       <staticmethod name="GetTraceMasks" type="wxArrayString" overloaded="no">

-        <autodoc>Log.GetTraceMasks() -&gt; wxArrayString</autodoc>
+        <autodoc>GetTraceMasks() -&gt; wxArrayString</autodoc>

       </staticmethod>
       <staticmethod name="SetTimestamp" type="" overloaded="no">
       </staticmethod>
       <staticmethod name="SetTimestamp" type="" overloaded="no">

-        <autodoc>Log.SetTimestamp(wxChar ts)</autodoc>
+        <autodoc>SetTimestamp(wxChar ts)</autodoc>

         <paramlist>
           <param name="ts" type="wxChar" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetVerbose" type="bool" overloaded="no">
         <paramlist>
           <param name="ts" type="wxChar" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetVerbose" type="bool" overloaded="no">

-        <autodoc>Log.GetVerbose() -&gt; bool</autodoc>
+        <autodoc>GetVerbose() -&gt; bool</autodoc>

       </staticmethod>
       <staticmethod name="GetTraceMask" type="wxTraceMask" overloaded="no">
       </staticmethod>
       <staticmethod name="GetTraceMask" type="wxTraceMask" overloaded="no">

-        <autodoc>Log.GetTraceMask() -&gt; wxTraceMask</autodoc>
+        <autodoc>GetTraceMask() -&gt; wxTraceMask</autodoc>

       </staticmethod>
       <staticmethod name="IsAllowedTraceMask" type="bool" overloaded="no">
       </staticmethod>
       <staticmethod name="IsAllowedTraceMask" type="bool" overloaded="no">

-        <autodoc>Log.IsAllowedTraceMask(wxChar mask) -&gt; bool</autodoc>
+        <autodoc>IsAllowedTraceMask(wxChar mask) -&gt; bool</autodoc>

         <paramlist>
           <param name="mask" type="wxChar" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetLogLevel" type="wxLogLevel" overloaded="no">
         <paramlist>
           <param name="mask" type="wxChar" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetLogLevel" type="wxLogLevel" overloaded="no">

-        <autodoc>Log.GetLogLevel() -&gt; wxLogLevel</autodoc>
+        <autodoc>GetLogLevel() -&gt; wxLogLevel</autodoc>

       </staticmethod>
       <staticmethod name="GetTimestamp" type="wxChar" overloaded="no">
       </staticmethod>
       <staticmethod name="GetTimestamp" type="wxChar" overloaded="no">

-        <autodoc>Log.GetTimestamp() -&gt; wxChar</autodoc>
+        <autodoc>GetTimestamp() -&gt; wxChar</autodoc>

       </staticmethod>
       <staticmethod name="TimeStamp" type="String" overloaded="no">
       </staticmethod>
       <staticmethod name="TimeStamp" type="String" overloaded="no">

-        <autodoc>Log.TimeStamp() -&gt; String</autodoc>
+        <autodoc>TimeStamp() -&gt; String</autodoc>

       </staticmethod>
       <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>
       </staticmethod>
       <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>


@@ -19161,20 +20841,20 @@ LogTrace(String mask, String msg)</autodoc>
         </paramlist>
       </constructor>
       <staticmethod name="Kill" type="wxKillError" overloaded="no">
         </paramlist>
       </constructor>
       <staticmethod name="Kill" type="wxKillError" overloaded="no">

-        <autodoc>Process.Kill(int pid, int sig=SIGTERM) -&gt; int</autodoc>
+        <autodoc>Kill(int pid, int sig=SIGTERM) -&gt; int</autodoc>

         <paramlist>
           <param name="pid" type="int" default=""/>
           <param name="sig" type="wxSignal" default="wxSIGTERM"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Exists" type="bool" overloaded="no">
         <paramlist>
           <param name="pid" type="int" default=""/>
           <param name="sig" type="wxSignal" default="wxSIGTERM"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Exists" type="bool" overloaded="no">

-        <autodoc>Process.Exists(int pid) -&gt; bool</autodoc>
+        <autodoc>Exists(int pid) -&gt; bool</autodoc>

         <paramlist>
           <param name="pid" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Open" type="Process" overloaded="no">
         <paramlist>
           <param name="pid" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Open" type="Process" overloaded="no">

-        <autodoc>Process.Open(String cmd, int flags=EXEC_ASYNC) -&gt; Process</autodoc>
+        <autodoc>Open(String cmd, int flags=EXEC_ASYNC) -&gt; Process</autodoc>

         <paramlist>
           <param name="cmd" type="String" default=""/>
           <param name="flags" type="int" default="wxEXEC_ASYNC"/>
         <paramlist>
           <param name="cmd" type="String" default=""/>
           <param name="flags" type="int" default="wxEXEC_ASYNC"/>


@@ -19508,33 +21188,59 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>

-    <class name="Wave" oldname="wxWave" module="misc">
-      <constructor name="Wave" overloaded="no">
-        <autodoc>__init__(String fileName, bool isResource=False) -&gt; Wave</autodoc>
+    <class name="Sound" oldname="wxSound" module="misc">
+      <constructor name="Sound" overloaded="yes"/>
+      <constructor name="Sound" overloaded="yes">

         <paramlist>
           <param name="fileName" type="String" default=""/>
         <paramlist>
           <param name="fileName" type="String" default=""/>

-          <param name="isResource" type="bool" default="False"/>
+          <param name="isResource" type="bool" default="false"/>

         </paramlist>
       </constructor>
         </paramlist>
       </constructor>

-      <constructor name="WaveData" overloaded="no">
-        <autodoc>WaveData(String data) -&gt; Wave</autodoc>
+      <constructor name="Sound" overloaded="yes">
+        <autodoc>__init__() -&gt; Sound
+__init__(String fileName, bool isResource=false) -&gt; Sound
+__init__(int size, wxByte data) -&gt; Sound</autodoc>

         <paramlist>
         <paramlist>

-          <param name="data" type="String" default=""/>
+          <param name="size" type="int" default=""/>
+          <param name="data" type="wxByte" default=""/>

         </paramlist>
       </constructor>
         </paramlist>
       </constructor>

-      <destructor name="~wxWave" overloaded="no">
+      <destructor name="~wxSound" overloaded="no">

         <autodoc>__del__()</autodoc>
       </destructor>
         <autodoc>__del__()</autodoc>
       </destructor>

+      <method name="Create" type="bool" overloaded="yes">
+        <paramlist>
+          <param name="fileName" type="String" default=""/>
+          <param name="isResource" type="bool" default="false"/>
+        </paramlist>
+      </method>
+      <method name="Create" type="bool" overloaded="yes">
+        <autodoc>Create(String fileName, bool isResource=false) -&gt; bool
+Create(int size, wxByte data) -&gt; bool</autodoc>
+        <paramlist>
+          <param name="size" type="int" default=""/>
+          <param name="data" type="wxByte" default=""/>
+        </paramlist>
+      </method>

       <method name="IsOk" type="bool" overloaded="no">
         <autodoc>IsOk() -&gt; bool</autodoc>
       </method>
       <method name="Play" type="bool" overloaded="no">
       <method name="IsOk" type="bool" overloaded="no">
         <autodoc>IsOk() -&gt; bool</autodoc>
       </method>
       <method name="Play" type="bool" overloaded="no">

-        <autodoc>Play(bool async=True, bool looped=False) -&gt; bool</autodoc>
+        <autodoc>Play(unsigned int flags=SOUND_ASYNC) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="async" type="bool" default="True"/>
-          <param name="looped" type="bool" default="False"/>
+          <param name="flags" type="unsigned int" default="wxSOUND_ASYNC"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

+      <staticmethod name="PlaySound" type="bool" overloaded="no">
+        <autodoc>PlaySound(String filename, unsigned int flags=SOUND_ASYNC) -&gt; bool</autodoc>
+        <paramlist>
+          <param name="filename" type="String" default=""/>
+          <param name="flags" type="unsigned int" default="wxSOUND_ASYNC"/>
+        </paramlist>
+      </staticmethod>
+      <staticmethod name="Stop" type="" overloaded="no">
+        <autodoc>Stop()</autodoc>
+      </staticmethod>

     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------


@@ -19670,7 +21376,7 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
         <autodoc>Unassociate() -&gt; bool</autodoc>
       </method>
       <staticmethod name="ExpandCommand" type="String" overloaded="no">
         <autodoc>Unassociate() -&gt; bool</autodoc>
       </method>
       <staticmethod name="ExpandCommand" type="String" overloaded="no">

-        <autodoc>FileType.ExpandCommand(String command, String filename, String mimetype=EmptyString) -&gt; String</autodoc>
+        <autodoc>ExpandCommand(String command, String filename, String mimetype=EmptyString) -&gt; String</autodoc>

         <paramlist>
           <param name="command" type="String" default=""/>
           <param name="filename" type="String" default=""/>
         <paramlist>
           <param name="command" type="String" default=""/>
           <param name="filename" type="String" default=""/>


@@ -19686,7 +21392,7 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="IsOfType" type="bool" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="IsOfType" type="bool" overloaded="no">

-        <autodoc>MimeTypesManager.IsOfType(String mimeType, String wildcard) -&gt; bool</autodoc>
+        <autodoc>IsOfType(String mimeType, String wildcard) -&gt; bool</autodoc>

         <paramlist>
           <param name="mimeType" type="String" default=""/>
           <param name="wildcard" type="String" default=""/>
         <paramlist>
           <param name="mimeType" type="String" default=""/>
           <param name="wildcard" type="String" default=""/>


@@ -19764,18 +21470,18 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
         </paramlist>
       </method>
       <staticmethod name="PushProvider" type="" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="PushProvider" type="" overloaded="no">

-        <autodoc>ArtProvider.PushProvider(ArtProvider provider)</autodoc>
+        <autodoc>PushProvider(ArtProvider provider)</autodoc>

         <docstring>Add new provider to the top of providers stack.</docstring>
         <paramlist>
           <param name="provider" type="ArtProvider" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="PopProvider" type="bool" overloaded="no">
         <docstring>Add new provider to the top of providers stack.</docstring>
         <paramlist>
           <param name="provider" type="ArtProvider" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="PopProvider" type="bool" overloaded="no">

-        <autodoc>ArtProvider.PopProvider() -&gt; bool</autodoc>
+        <autodoc>PopProvider() -&gt; bool</autodoc>

         <docstring>Remove latest added provider and delete it.</docstring>
       </staticmethod>
       <staticmethod name="RemoveProvider" type="bool" overloaded="no">
         <docstring>Remove latest added provider and delete it.</docstring>
       </staticmethod>
       <staticmethod name="RemoveProvider" type="bool" overloaded="no">

-        <autodoc>ArtProvider.RemoveProvider(ArtProvider provider) -&gt; bool</autodoc>
+        <autodoc>RemoveProvider(ArtProvider provider) -&gt; bool</autodoc>

         <docstring>Remove provider. The provider must have been added previously!
 The provider is _not_ deleted.</docstring>
         <paramlist>
         <docstring>Remove provider. The provider must have been added previously!
 The provider is _not_ deleted.</docstring>
         <paramlist>


@@ -19783,7 +21489,7 @@ The provider is _not_ deleted.</docstring>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetBitmap" type="Bitmap" overloaded="no">
         </paramlist>
       </staticmethod>
       <staticmethod name="GetBitmap" type="Bitmap" overloaded="no">

-        <autodoc>ArtProvider.GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -&gt; Bitmap</autodoc>
+        <autodoc>GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -&gt; Bitmap</autodoc>

         <docstring>Query the providers for bitmap with given ID and return it. Return
 wx.NullBitmap if no provider provides it.</docstring>
         <paramlist>
         <docstring>Query the providers for bitmap with given ID and return it. Return
 wx.NullBitmap if no provider provides it.</docstring>
         <paramlist>


@@ -19793,7 +21499,7 @@ wx.NullBitmap if no provider provides it.</docstring>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetIcon" type="Icon" overloaded="no">
         </paramlist>
       </staticmethod>
       <staticmethod name="GetIcon" type="Icon" overloaded="no">

-        <autodoc>ArtProvider.GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -&gt; Icon</autodoc>
+        <autodoc>GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -&gt; Icon</autodoc>

         <docstring>Query the providers for icon with given ID and return it. Return
 wx.NullIcon if no provider provides it.</docstring>
         <paramlist>
         <docstring>Query the providers for icon with given ID and return it. Return
 wx.NullIcon if no provider provides it.</docstring>
         <paramlist>


@@ -19810,92 +21516,147 @@ wx.NullIcon if no provider provides it.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ConfigBase" oldname="wxConfigBase" module="misc">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ConfigBase" oldname="wxConfigBase" module="misc">

+      <docstring>wx.ConfigBase class defines the basic interface of all config
+classes. It can not be used by itself (it is an abstract base
+class) and you will always use one of its derivations: wx.Config
+or wx.FileConfig.
+
+wx.ConfigBase organizes the items in a tree-like structure,
+modeled after the Unix/Dos filesystem. There are groups that act
+like directories and entries, key/value pairs that act like
+files.  There is always one current group given by the current
+path.  As in the file system case, to specify a key in the config
+class you must use a path to it.  Config classes also support the
+notion of the current group, which makes it possible to use
+relative paths.
+
+Keys are pairs "key_name = value" where value may be of string,
+integer floating point or boolean, you can not store binary data
+without first encoding it as a string.  For performance reasons
+items should be kept small, no more than a couple kilobytes.
+</docstring>

       <destructor name="~wxConfigBase" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="Set" type="ConfigBase" overloaded="no">
       <destructor name="~wxConfigBase" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="Set" type="ConfigBase" overloaded="no">

-        <autodoc>ConfigBase.Set(ConfigBase pConfig) -&gt; ConfigBase</autodoc>
+        <autodoc>Set(ConfigBase config) -&gt; ConfigBase</autodoc>
+        <docstring>Sets the global config object (the one returned by Get) and
+returns a reference to the previous global config object.</docstring>

         <paramlist>
         <paramlist>

-          <param name="pConfig" type="ConfigBase" default=""/>
+          <param name="config" type="ConfigBase" default=""/>

         </paramlist>
       </staticmethod>
       <staticmethod name="Get" type="ConfigBase" overloaded="no">
         </paramlist>
       </staticmethod>
       <staticmethod name="Get" type="ConfigBase" overloaded="no">

-        <autodoc>ConfigBase.Get(bool createOnDemand=True) -&gt; ConfigBase</autodoc>
+        <autodoc>Get(bool createOnDemand=True) -&gt; ConfigBase</autodoc>
+        <docstring>Returns the current global config object, creating one if neccessary.</docstring>

         <paramlist>
           <param name="createOnDemand" type="bool" default="True"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Create" type="ConfigBase" overloaded="no">
         <paramlist>
           <param name="createOnDemand" type="bool" default="True"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Create" type="ConfigBase" overloaded="no">

-        <autodoc>ConfigBase.Create() -&gt; ConfigBase</autodoc>
+        <autodoc>Create() -&gt; ConfigBase</autodoc>
+        <docstring>Create and return a new global config object.  This function will
+create the "best" implementation of wx.Config available for the
+current platform.</docstring>

       </staticmethod>
       <staticmethod name="DontCreateOnDemand" type="" overloaded="no">
       </staticmethod>
       <staticmethod name="DontCreateOnDemand" type="" overloaded="no">

-        <autodoc>ConfigBase.DontCreateOnDemand()</autodoc>
+        <autodoc>DontCreateOnDemand()</autodoc>
+        <docstring>Should Get() try to create a new log object if there isn't a current one?</docstring>

       </staticmethod>
       <method name="SetPath" type="" overloaded="no">
       </staticmethod>
       <method name="SetPath" type="" overloaded="no">

-        <autodoc>SetPath(String strPath)</autodoc>
+        <autodoc>SetPath(String path)</autodoc>
+        <docstring>Set current path: if the first character is '/', it's the absolute path,
+otherwise it's a relative path. '..' is supported. If the strPath
+doesn't exist it is created.</docstring>

         <paramlist>
         <paramlist>

-          <param name="strPath" type="String" default=""/>
+          <param name="path" type="String" default=""/>

         </paramlist>
       </method>
       <method name="GetPath" type="String" overloaded="no">
         <autodoc>GetPath() -&gt; String</autodoc>
         </paramlist>
       </method>
       <method name="GetPath" type="String" overloaded="no">
         <autodoc>GetPath() -&gt; String</autodoc>

+        <docstring>Retrieve the current path (always as absolute path)</docstring>

       </method>
       <method name="GetFirstGroup" type="PyObject" overloaded="no">
       </method>
       <method name="GetFirstGroup" type="PyObject" overloaded="no">

-        <autodoc>GetFirstGroup() -&gt; PyObject</autodoc>
+        <autodoc>GetFirstGroup() -&gt; (more, value, index)</autodoc>
+        <docstring>Allows enumerating the subgroups in a config object.  Returns
+a tuple containing a flag indicating there are more items, the
+name of the current item, and an index to pass to GetNextGroup to
+fetch the next item.</docstring>

       </method>
       <method name="GetNextGroup" type="PyObject" overloaded="no">
       </method>
       <method name="GetNextGroup" type="PyObject" overloaded="no">

-        <autodoc>GetNextGroup(long index) -&gt; PyObject</autodoc>
+        <autodoc>GetNextGroup(long index) -&gt; (more, value, index)</autodoc>
+        <docstring>Allows enumerating the subgroups in a config object.  Returns
+a tuple containing a flag indicating there are more items, the
+name of the current item, and an index to pass to GetNextGroup to
+fetch the next item.</docstring>

         <paramlist>
           <param name="index" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetFirstEntry" type="PyObject" overloaded="no">
         <paramlist>
           <param name="index" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetFirstEntry" type="PyObject" overloaded="no">

-        <autodoc>GetFirstEntry() -&gt; PyObject</autodoc>
+        <autodoc>GetFirstEntry() -&gt; (more, value, index)</autodoc>
+        <docstring>Allows enumerating the entries in the current group in a config
+object.  Returns a tuple containing a flag indicating there are
+more items, the name of the current item, and an index to pass to
+GetNextGroup to fetch the next item.</docstring>

       </method>
       <method name="GetNextEntry" type="PyObject" overloaded="no">
       </method>
       <method name="GetNextEntry" type="PyObject" overloaded="no">

-        <autodoc>GetNextEntry(long index) -&gt; PyObject</autodoc>
+        <autodoc>GetNextEntry(long index) -&gt; (more, value, index)</autodoc>
+        <docstring>Allows enumerating the entries in the current group in a config
+object.  Returns a tuple containing a flag indicating there are
+more items, the name of the current item, and an index to pass to
+GetNextGroup to fetch the next item.</docstring>

         <paramlist>
           <param name="index" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetNumberOfEntries" type="size_t" overloaded="no">
         <paramlist>
           <param name="index" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetNumberOfEntries" type="size_t" overloaded="no">

-        <autodoc>GetNumberOfEntries(bool bRecursive=False) -&gt; size_t</autodoc>
+        <autodoc>GetNumberOfEntries(bool recursive=False) -&gt; size_t</autodoc>
+        <docstring>Get the number of entries in the current group, with or
+without its subgroups.</docstring>

         <paramlist>
         <paramlist>

-          <param name="bRecursive" type="bool" default="False"/>
+          <param name="recursive" type="bool" default="False"/>

         </paramlist>
       </method>
       <method name="GetNumberOfGroups" type="size_t" overloaded="no">
         </paramlist>
       </method>
       <method name="GetNumberOfGroups" type="size_t" overloaded="no">

-        <autodoc>GetNumberOfGroups(bool bRecursive=False) -&gt; size_t</autodoc>
+        <autodoc>GetNumberOfGroups(bool recursive=False) -&gt; size_t</autodoc>
+        <docstring>Get the number of subgroups in the current group, with or
+without its subgroups.</docstring>

         <paramlist>
         <paramlist>

-          <param name="bRecursive" type="bool" default="False"/>
+          <param name="recursive" type="bool" default="False"/>

         </paramlist>
       </method>
       <method name="HasGroup" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="HasGroup" type="bool" overloaded="no">

-        <autodoc>HasGroup(String strName) -&gt; bool</autodoc>
+        <autodoc>HasGroup(String name) -&gt; bool</autodoc>
+        <docstring>Returns True if the group by this name exists</docstring>

         <paramlist>
         <paramlist>

-          <param name="strName" type="String" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </method>
       <method name="HasEntry" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="HasEntry" type="bool" overloaded="no">

-        <autodoc>HasEntry(String strName) -&gt; bool</autodoc>
+        <autodoc>HasEntry(String name) -&gt; bool</autodoc>
+        <docstring>Returns True if the entry by this name exists</docstring>

         <paramlist>
         <paramlist>

-          <param name="strName" type="String" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </method>
       <method name="Exists" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="Exists" type="bool" overloaded="no">

-        <autodoc>Exists(String strName) -&gt; bool</autodoc>
+        <autodoc>Exists(String name) -&gt; bool</autodoc>
+        <docstring>Returns True if either a group or an entry with a given name exists</docstring>

         <paramlist>
         <paramlist>

-          <param name="strName" type="String" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </method>
       <method name="GetEntryType" type="wxConfigBase::EntryType" overloaded="no">
         <autodoc>GetEntryType(String name) -&gt; int</autodoc>
         </paramlist>
       </method>
       <method name="GetEntryType" type="wxConfigBase::EntryType" overloaded="no">
         <autodoc>GetEntryType(String name) -&gt; int</autodoc>

+        <docstring>Get the type of the entry.  Returns one of the wx.Config.Type_XXX values.</docstring>

         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="Read" type="String" overloaded="no">
         <autodoc>Read(String key, String defaultVal=EmptyString) -&gt; String</autodoc>
         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="Read" type="String" overloaded="no">
         <autodoc>Read(String key, String defaultVal=EmptyString) -&gt; String</autodoc>

+        <docstring>Returns the value of key if it exists, defaultVal otherwise.</docstring>

         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="defaultVal" type="String" default="wxPyEmptyString"/>
         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="defaultVal" type="String" default="wxPyEmptyString"/>


@@ -19903,6 +21664,7 @@ wx.NullIcon if no provider provides it.</docstring>
       </method>
       <method name="ReadInt" type="long" overloaded="no">
         <autodoc>ReadInt(String key, long defaultVal=0) -&gt; long</autodoc>
       </method>
       <method name="ReadInt" type="long" overloaded="no">
         <autodoc>ReadInt(String key, long defaultVal=0) -&gt; long</autodoc>

+        <docstring>Returns the value of key if it exists, defaultVal otherwise.</docstring>

         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="defaultVal" type="long" default="0"/>
         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="defaultVal" type="long" default="0"/>


@@ -19910,6 +21672,7 @@ wx.NullIcon if no provider provides it.</docstring>
       </method>
       <method name="ReadFloat" type="double" overloaded="no">
         <autodoc>ReadFloat(String key, double defaultVal=0.0) -&gt; double</autodoc>
       </method>
       <method name="ReadFloat" type="double" overloaded="no">
         <autodoc>ReadFloat(String key, double defaultVal=0.0) -&gt; double</autodoc>

+        <docstring>Returns the value of key if it exists, defaultVal otherwise.</docstring>

         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="defaultVal" type="double" default="0.0"/>
         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="defaultVal" type="double" default="0.0"/>


@@ -19917,6 +21680,7 @@ wx.NullIcon if no provider provides it.</docstring>
       </method>
       <method name="ReadBool" type="bool" overloaded="no">
         <autodoc>ReadBool(String key, bool defaultVal=False) -&gt; bool</autodoc>
       </method>
       <method name="ReadBool" type="bool" overloaded="no">
         <autodoc>ReadBool(String key, bool defaultVal=False) -&gt; bool</autodoc>

+        <docstring>Returns the value of key if it exists, defaultVal otherwise.</docstring>

         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="defaultVal" type="bool" default="False"/>
         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="defaultVal" type="bool" default="False"/>


@@ -19924,6 +21688,7 @@ wx.NullIcon if no provider provides it.</docstring>
       </method>
       <method name="Write" type="bool" overloaded="no">
         <autodoc>Write(String key, String value) -&gt; bool</autodoc>
       </method>
       <method name="Write" type="bool" overloaded="no">
         <autodoc>Write(String key, String value) -&gt; bool</autodoc>

+        <docstring>write the value (return True on success)</docstring>

         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="value" type="String" default=""/>
         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="value" type="String" default=""/>


@@ -19931,6 +21696,7 @@ wx.NullIcon if no provider provides it.</docstring>
       </method>
       <method name="WriteInt" type="bool" overloaded="no">
         <autodoc>WriteInt(String key, long value) -&gt; bool</autodoc>
       </method>
       <method name="WriteInt" type="bool" overloaded="no">
         <autodoc>WriteInt(String key, long value) -&gt; bool</autodoc>

+        <docstring>write the value (return True on success)</docstring>

         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="value" type="long" default=""/>
         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="value" type="long" default=""/>


@@ -19938,6 +21704,7 @@ wx.NullIcon if no provider provides it.</docstring>
       </method>
       <method name="WriteFloat" type="bool" overloaded="no">
         <autodoc>WriteFloat(String key, double value) -&gt; bool</autodoc>
       </method>
       <method name="WriteFloat" type="bool" overloaded="no">
         <autodoc>WriteFloat(String key, double value) -&gt; bool</autodoc>

+        <docstring>write the value (return True on success)</docstring>

         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="value" type="double" default=""/>
         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="value" type="double" default=""/>


@@ -19945,19 +21712,23 @@ wx.NullIcon if no provider provides it.</docstring>
       </method>
       <method name="WriteBool" type="bool" overloaded="no">
         <autodoc>WriteBool(String key, bool value) -&gt; bool</autodoc>
       </method>
       <method name="WriteBool" type="bool" overloaded="no">
         <autodoc>WriteBool(String key, bool value) -&gt; bool</autodoc>

+        <docstring>write the value (return True on success)</docstring>

         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="value" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="Flush" type="bool" overloaded="no">
         <paramlist>
           <param name="key" type="String" default=""/>
           <param name="value" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="Flush" type="bool" overloaded="no">

-        <autodoc>Flush(bool bCurrentOnly=False) -&gt; bool</autodoc>
+        <autodoc>Flush(bool currentOnly=False) -&gt; bool</autodoc>
+        <docstring>permanently writes all changes</docstring>

         <paramlist>
         <paramlist>

-          <param name="bCurrentOnly" type="bool" default="False"/>
+          <param name="currentOnly" type="bool" default="False"/>

         </paramlist>
       </method>
       <method name="RenameEntry" type="bool" overloaded="no">
         <autodoc>RenameEntry(String oldName, String newName) -&gt; bool</autodoc>
         </paramlist>
       </method>
       <method name="RenameEntry" type="bool" overloaded="no">
         <autodoc>RenameEntry(String oldName, String newName) -&gt; bool</autodoc>

+        <docstring>Rename an entry.  Returns False on failure (probably because the new
+name is already taken by an existing entry)</docstring>

         <paramlist>
           <param name="oldName" type="String" default=""/>
           <param name="newName" type="String" default=""/>
         <paramlist>
           <param name="oldName" type="String" default=""/>
           <param name="newName" type="String" default=""/>


@@ -19965,47 +21736,60 @@ wx.NullIcon if no provider provides it.</docstring>
       </method>
       <method name="RenameGroup" type="bool" overloaded="no">
         <autodoc>RenameGroup(String oldName, String newName) -&gt; bool</autodoc>
       </method>
       <method name="RenameGroup" type="bool" overloaded="no">
         <autodoc>RenameGroup(String oldName, String newName) -&gt; bool</autodoc>

+        <docstring>Rename aa group.  Returns False on failure (probably because the new
+name is already taken by an existing entry)</docstring>

         <paramlist>
           <param name="oldName" type="String" default=""/>
           <param name="newName" type="String" default=""/>
         </paramlist>
       </method>
       <method name="DeleteEntry" type="bool" overloaded="no">
         <paramlist>
           <param name="oldName" type="String" default=""/>
           <param name="newName" type="String" default=""/>
         </paramlist>
       </method>
       <method name="DeleteEntry" type="bool" overloaded="no">

-        <autodoc>DeleteEntry(String key, bool bDeleteGroupIfEmpty=True) -&gt; bool</autodoc>
+        <autodoc>DeleteEntry(String key, bool deleteGroupIfEmpty=True) -&gt; bool</autodoc>
+        <docstring>Deletes the specified entry and the group it belongs to if
+it was the last key in it and the second parameter is True</docstring>

         <paramlist>
           <param name="key" type="String" default=""/>
         <paramlist>
           <param name="key" type="String" default=""/>

-          <param name="bDeleteGroupIfEmpty" type="bool" default="True"/>
+          <param name="deleteGroupIfEmpty" type="bool" default="True"/>

         </paramlist>
       </method>
       <method name="DeleteGroup" type="bool" overloaded="no">
         <autodoc>DeleteGroup(String key) -&gt; bool</autodoc>
         </paramlist>
       </method>
       <method name="DeleteGroup" type="bool" overloaded="no">
         <autodoc>DeleteGroup(String key) -&gt; bool</autodoc>

+        <docstring>Delete the group (with all subgroups)</docstring>

         <paramlist>
           <param name="key" type="String" default=""/>
         </paramlist>
       </method>
       <method name="DeleteAll" type="bool" overloaded="no">
         <autodoc>DeleteAll() -&gt; bool</autodoc>
         <paramlist>
           <param name="key" type="String" default=""/>
         </paramlist>
       </method>
       <method name="DeleteAll" type="bool" overloaded="no">
         <autodoc>DeleteAll() -&gt; bool</autodoc>

-      </method>
-      <method name="IsExpandingEnvVars" type="bool" overloaded="no">
-        <autodoc>IsExpandingEnvVars() -&gt; bool</autodoc>
+        <docstring>Delete the whole underlying object (disk file, registry key, ...)
+primarly intended for use by desinstallation routine.</docstring>

       </method>
       <method name="SetExpandEnvVars" type="" overloaded="no">
       </method>
       <method name="SetExpandEnvVars" type="" overloaded="no">

-        <autodoc>SetExpandEnvVars(bool bDoIt=True)</autodoc>
+        <autodoc>SetExpandEnvVars(bool doIt=True)</autodoc>
+        <docstring>We can automatically expand environment variables in the config entries
+(this option is on by default, you can turn it on/off at any time)</docstring>

         <paramlist>
         <paramlist>

-          <param name="bDoIt" type="bool" default="True"/>
+          <param name="doIt" type="bool" default="True"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

+      <method name="IsExpandingEnvVars" type="bool" overloaded="no">
+        <autodoc>IsExpandingEnvVars() -&gt; bool</autodoc>
+        <docstring>Are we currently expanding environment variables?</docstring>
+      </method>

       <method name="SetRecordDefaults" type="" overloaded="no">
       <method name="SetRecordDefaults" type="" overloaded="no">

-        <autodoc>SetRecordDefaults(bool bDoIt=True)</autodoc>
+        <autodoc>SetRecordDefaults(bool doIt=True)</autodoc>
+        <docstring>Set whether the config objec should record default values.</docstring>

         <paramlist>
         <paramlist>

-          <param name="bDoIt" type="bool" default="True"/>
+          <param name="doIt" type="bool" default="True"/>

         </paramlist>
       </method>
       <method name="IsRecordingDefaults" type="bool" overloaded="no">
         <autodoc>IsRecordingDefaults() -&gt; bool</autodoc>
         </paramlist>
       </method>
       <method name="IsRecordingDefaults" type="bool" overloaded="no">
         <autodoc>IsRecordingDefaults() -&gt; bool</autodoc>

+        <docstring>Are we currently recording default values?</docstring>

       </method>
       <method name="ExpandEnvVars" type="String" overloaded="no">
         <autodoc>ExpandEnvVars(String str) -&gt; String</autodoc>
       </method>
       <method name="ExpandEnvVars" type="String" overloaded="no">
         <autodoc>ExpandEnvVars(String str) -&gt; String</autodoc>

+        <docstring>Expand any environment variables in str and return the result</docstring>

         <paramlist>
           <param name="str" type="String" default=""/>
         </paramlist>
         <paramlist>
           <param name="str" type="String" default=""/>
         </paramlist>


@@ -20038,33 +21822,20 @@ wx.NullIcon if no provider provides it.</docstring>
         <autodoc>GetStyle() -&gt; long</autodoc>
       </method>
     </class>
         <autodoc>GetStyle() -&gt; long</autodoc>
       </method>
     </class>

-    <class name="ConfigPathChanger" oldname="wxConfigPathChanger" module="misc">
-      <constructor name="ConfigPathChanger" overloaded="no">
-        <autodoc>__init__(ConfigBase pContainer, String strEntry) -&gt; ConfigPathChanger</autodoc>
-        <paramlist>
-          <param name="pContainer" type="ConfigBase" default=""/>
-          <param name="strEntry" type="String" default=""/>
-        </paramlist>
-      </constructor>
-      <destructor name="~wxConfigPathChanger" overloaded="no">
-        <autodoc>__del__()</autodoc>
-      </destructor>
-      <method name="Name" type="String" overloaded="no">
-        <autodoc>Name() -&gt; String</autodoc>
-      </method>
-    </class>

     <class name="Config" oldname="wxConfig" module="misc">
     <class name="Config" oldname="wxConfig" module="misc">

+      <docstring>This ConfigBase-derived class will use the registry on Windows,
+and will be a wx.FileConfig on other platforms.</docstring>

       <baseclass name="ConfigBase"/>
       <constructor name="Config" overloaded="no">
         <autodoc>__init__(String appName=EmptyString, String vendorName=EmptyString, 
     String localFilename=EmptyString, String globalFilename=EmptyString, 
       <baseclass name="ConfigBase"/>
       <constructor name="Config" overloaded="no">
         <autodoc>__init__(String appName=EmptyString, String vendorName=EmptyString, 
     String localFilename=EmptyString, String globalFilename=EmptyString, 

-    long style=0) -&gt; Config</autodoc>
+    long style=wxCONFIG_USE_LOCAL_FILE|wxCONFIG_USE_GLOBAL_FILE) -&gt; Config</autodoc>

         <paramlist>
           <param name="appName" type="String" default="wxPyEmptyString"/>
           <param name="vendorName" type="String" default="wxPyEmptyString"/>
           <param name="localFilename" type="String" default="wxPyEmptyString"/>
           <param name="globalFilename" type="String" default="wxPyEmptyString"/>
         <paramlist>
           <param name="appName" type="String" default="wxPyEmptyString"/>
           <param name="vendorName" type="String" default="wxPyEmptyString"/>
           <param name="localFilename" type="String" default="wxPyEmptyString"/>
           <param name="globalFilename" type="String" default="wxPyEmptyString"/>

-          <param name="style" type="long" default="0"/>
+          <param name="style" type="long" default="wxCONFIG_USE_LOCAL_FILE|wxCONFIG_USE_GLOBAL_FILE"/>

         </paramlist>
       </constructor>
       <destructor name="~wxConfig" overloaded="no">
         </paramlist>
       </constructor>
       <destructor name="~wxConfig" overloaded="no">


@@ -20072,25 +21843,50 @@ wx.NullIcon if no provider provides it.</docstring>
       </destructor>
     </class>
     <class name="FileConfig" oldname="wxFileConfig" module="misc">
       </destructor>
     </class>
     <class name="FileConfig" oldname="wxFileConfig" module="misc">

+      <docstring>This config class will use a file for storage on all platforms.</docstring>

       <baseclass name="ConfigBase"/>
       <constructor name="FileConfig" overloaded="no">
         <autodoc>__init__(String appName=EmptyString, String vendorName=EmptyString, 
     String localFilename=EmptyString, String globalFilename=EmptyString, 
       <baseclass name="ConfigBase"/>
       <constructor name="FileConfig" overloaded="no">
         <autodoc>__init__(String appName=EmptyString, String vendorName=EmptyString, 
     String localFilename=EmptyString, String globalFilename=EmptyString, 

-    long style=0) -&gt; FileConfig</autodoc>
+    long style=wxCONFIG_USE_LOCAL_FILE|wxCONFIG_USE_GLOBAL_FILE) -&gt; FileConfig</autodoc>

         <paramlist>
           <param name="appName" type="String" default="wxPyEmptyString"/>
           <param name="vendorName" type="String" default="wxPyEmptyString"/>
           <param name="localFilename" type="String" default="wxPyEmptyString"/>
           <param name="globalFilename" type="String" default="wxPyEmptyString"/>
         <paramlist>
           <param name="appName" type="String" default="wxPyEmptyString"/>
           <param name="vendorName" type="String" default="wxPyEmptyString"/>
           <param name="localFilename" type="String" default="wxPyEmptyString"/>
           <param name="globalFilename" type="String" default="wxPyEmptyString"/>

-          <param name="style" type="long" default="0"/>
+          <param name="style" type="long" default="wxCONFIG_USE_LOCAL_FILE|wxCONFIG_USE_GLOBAL_FILE"/>

         </paramlist>
       </constructor>
       <destructor name="~wxFileConfig" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
     </class>
         </paramlist>
       </constructor>
       <destructor name="~wxFileConfig" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
     </class>

+    <class name="ConfigPathChanger" oldname="wxConfigPathChanger" module="misc">
+      <docstring>A handy little class which changes current path to the path of
+given entry and restores it in the destructoir: so if you declare
+a local variable of this type, you work in the entry directory
+and the path is automatically restored when the function returns.</docstring>
+      <constructor name="ConfigPathChanger" overloaded="no">
+        <autodoc>__init__(ConfigBase config, String entry) -&gt; ConfigPathChanger</autodoc>
+        <paramlist>
+          <param name="config" type="ConfigBase" default=""/>
+          <param name="entry" type="String" default=""/>
+        </paramlist>
+      </constructor>
+      <destructor name="~wxConfigPathChanger" overloaded="no">
+        <autodoc>__del__()</autodoc>
+      </destructor>
+      <method name="Name" type="String" overloaded="no">
+        <autodoc>Name() -&gt; String</autodoc>
+        <docstring>Get the key name</docstring>
+      </method>
+    </class>

     <method name="ExpandEnvVars" oldname="wxExpandEnvVars" type="String" overloaded="no">
       <autodoc>ExpandEnvVars(String sz) -&gt; String</autodoc>
     <method name="ExpandEnvVars" oldname="wxExpandEnvVars" type="String" overloaded="no">
       <autodoc>ExpandEnvVars(String sz) -&gt; String</autodoc>

+      <docstring>Replace environment variables ($SOMETHING) with their values. The
+format is $VARNAME or ${VARNAME} where VARNAME contains
+alphanumeric characters and '_' only. '$' must be escaped ('\\$')
+in order to be taken literally.</docstring>

       <paramlist>
         <param name="sz" type="String" default=""/>
       </paramlist>
       <paramlist>
         <param name="sz" type="String" default=""/>
       </paramlist>


@@ -20140,60 +21936,60 @@ wx.NullIcon if no provider provides it.</docstring>
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="SetCountry" type="" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="SetCountry" type="" overloaded="no">

-        <autodoc>DateTime.SetCountry(int country)</autodoc>
+        <autodoc>SetCountry(int country)</autodoc>

         <paramlist>
           <param name="country" type="wxDateTime::Country" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCountry" type="wxDateTime::Country" overloaded="no">
         <paramlist>
           <param name="country" type="wxDateTime::Country" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCountry" type="wxDateTime::Country" overloaded="no">

-        <autodoc>DateTime.GetCountry() -&gt; int</autodoc>
+        <autodoc>GetCountry() -&gt; int</autodoc>

       </staticmethod>
       <staticmethod name="IsWestEuropeanCountry" type="bool" overloaded="no">
       </staticmethod>
       <staticmethod name="IsWestEuropeanCountry" type="bool" overloaded="no">

-        <autodoc>DateTime.IsWestEuropeanCountry(int country=Country_Default) -&gt; bool</autodoc>
+        <autodoc>IsWestEuropeanCountry(int country=Country_Default) -&gt; bool</autodoc>

         <paramlist>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCurrentYear" type="int" overloaded="no">
         <paramlist>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCurrentYear" type="int" overloaded="no">

-        <autodoc>DateTime.GetCurrentYear(int cal=Gregorian) -&gt; int</autodoc>
+        <autodoc>GetCurrentYear(int cal=Gregorian) -&gt; int</autodoc>

         <paramlist>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="ConvertYearToBC" type="int" overloaded="no">
         <paramlist>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="ConvertYearToBC" type="int" overloaded="no">

-        <autodoc>DateTime.ConvertYearToBC(int year) -&gt; int</autodoc>
+        <autodoc>ConvertYearToBC(int year) -&gt; int</autodoc>

         <paramlist>
           <param name="year" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCurrentMonth" type="wxDateTime::Month" overloaded="no">
         <paramlist>
           <param name="year" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCurrentMonth" type="wxDateTime::Month" overloaded="no">

-        <autodoc>DateTime.GetCurrentMonth(int cal=Gregorian) -&gt; int</autodoc>
+        <autodoc>GetCurrentMonth(int cal=Gregorian) -&gt; int</autodoc>

         <paramlist>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="IsLeapYear" type="bool" overloaded="no">
         <paramlist>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="IsLeapYear" type="bool" overloaded="no">

-        <autodoc>DateTime.IsLeapYear(int year=Inv_Year, int cal=Gregorian) -&gt; bool</autodoc>
+        <autodoc>IsLeapYear(int year=Inv_Year, int cal=Gregorian) -&gt; bool</autodoc>

         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCentury" type="int" overloaded="no">
         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCentury" type="int" overloaded="no">

-        <autodoc>DateTime.GetCentury(int year=Inv_Year) -&gt; int</autodoc>
+        <autodoc>GetCentury(int year=Inv_Year) -&gt; int</autodoc>

         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetNumberOfDaysinYear" type="int" overloaded="no">
         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetNumberOfDaysinYear" type="int" overloaded="no">

-        <autodoc>DateTime.GetNumberOfDaysinYear(int year, int cal=Gregorian) -&gt; int</autodoc>
+        <autodoc>GetNumberOfDaysinYear(int year, int cal=Gregorian) -&gt; int</autodoc>

         <paramlist>
           <param name="year" type="int" default=""/>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetNumberOfDaysInMonth" type="int" overloaded="no">
         <paramlist>
           <param name="year" type="int" default=""/>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetNumberOfDaysInMonth" type="int" overloaded="no">

-        <autodoc>DateTime.GetNumberOfDaysInMonth(int month, int year=Inv_Year, int cal=Gregorian) -&gt; int</autodoc>
+        <autodoc>GetNumberOfDaysInMonth(int month, int year=Inv_Year, int cal=Gregorian) -&gt; int</autodoc>

         <paramlist>
           <param name="month" type="wxDateTime::Month" default=""/>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
         <paramlist>
           <param name="month" type="wxDateTime::Month" default=""/>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>


@@ -20201,14 +21997,14 @@ wx.NullIcon if no provider provides it.</docstring>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetMonthName" type="String" overloaded="no">
         </paramlist>
       </staticmethod>
       <staticmethod name="GetMonthName" type="String" overloaded="no">

-        <autodoc>DateTime.GetMonthName(int month, int flags=Name_Full) -&gt; String</autodoc>
+        <autodoc>GetMonthName(int month, int flags=Name_Full) -&gt; String</autodoc>

         <paramlist>
           <param name="month" type="wxDateTime::Month" default=""/>
           <param name="flags" type="wxDateTime::NameFlags" default="wxDateTime::Name_Full"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetWeekDayName" type="String" overloaded="no">
         <paramlist>
           <param name="month" type="wxDateTime::Month" default=""/>
           <param name="flags" type="wxDateTime::NameFlags" default="wxDateTime::Name_Full"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetWeekDayName" type="String" overloaded="no">

-        <autodoc>DateTime.GetWeekDayName(int weekday, int flags=Name_Full) -&gt; String</autodoc>
+        <autodoc>GetWeekDayName(int weekday, int flags=Name_Full) -&gt; String</autodoc>

         <paramlist>
           <param name="weekday" type="wxDateTime::WeekDay" default=""/>
           <param name="flags" type="wxDateTime::NameFlags" default="wxDateTime::Name_Full"/>
         <paramlist>
           <param name="weekday" type="wxDateTime::WeekDay" default=""/>
           <param name="flags" type="wxDateTime::NameFlags" default="wxDateTime::Name_Full"/>


@@ -20223,34 +22019,34 @@ wx.NullIcon if no provider provides it.</docstring>
         </paramlist>
       </staticmethod>
       <staticmethod name="IsDSTApplicable" type="bool" overloaded="no">
         </paramlist>
       </staticmethod>
       <staticmethod name="IsDSTApplicable" type="bool" overloaded="no">

-        <autodoc>DateTime.IsDSTApplicable(int year=Inv_Year, int country=Country_Default) -&gt; bool</autodoc>
+        <autodoc>IsDSTApplicable(int year=Inv_Year, int country=Country_Default) -&gt; bool</autodoc>

         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetBeginDST" type="DateTime" overloaded="no">
         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetBeginDST" type="DateTime" overloaded="no">

-        <autodoc>DateTime.GetBeginDST(int year=Inv_Year, int country=Country_Default) -&gt; DateTime</autodoc>
+        <autodoc>GetBeginDST(int year=Inv_Year, int country=Country_Default) -&gt; DateTime</autodoc>

         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetEndDST" type="DateTime" overloaded="no">
         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetEndDST" type="DateTime" overloaded="no">

-        <autodoc>DateTime.GetEndDST(int year=Inv_Year, int country=Country_Default) -&gt; DateTime</autodoc>
+        <autodoc>GetEndDST(int year=Inv_Year, int country=Country_Default) -&gt; DateTime</autodoc>

         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Now" type="DateTime" overloaded="no">
         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Now" type="DateTime" overloaded="no">

-        <autodoc>DateTime.Now() -&gt; DateTime</autodoc>
+        <autodoc>Now() -&gt; DateTime</autodoc>

       </staticmethod>
       <staticmethod name="UNow" type="DateTime" overloaded="no">
       </staticmethod>
       <staticmethod name="UNow" type="DateTime" overloaded="no">

-        <autodoc>DateTime.UNow() -&gt; DateTime</autodoc>
+        <autodoc>UNow() -&gt; DateTime</autodoc>

       </staticmethod>
       <staticmethod name="Today" type="DateTime" overloaded="no">
       </staticmethod>
       <staticmethod name="Today" type="DateTime" overloaded="no">

-        <autodoc>DateTime.Today() -&gt; DateTime</autodoc>
+        <autodoc>Today() -&gt; DateTime</autodoc>

       </staticmethod>
       <method name="SetToCurrent" type="DateTime" overloaded="no">
         <autodoc>SetToCurrent() -&gt; DateTime</autodoc>
       </staticmethod>
       <method name="SetToCurrent" type="DateTime" overloaded="no">
         <autodoc>SetToCurrent() -&gt; DateTime</autodoc>


@@ -20744,7 +22540,7 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
         </paramlist>
       </method>
       <method name="ParseFormat" type="int" overloaded="no">
         </paramlist>
       </method>
       <method name="ParseFormat" type="int" overloaded="no">

-        <autodoc>ParseFormat(String date, String format=DateFormatStr, DateTime dateDef=wxDefaultDateTime) -&gt; int</autodoc>
+        <autodoc>ParseFormat(String date, String format=DateFormatStr, DateTime dateDef=DefaultDateTime) -&gt; int</autodoc>

         <paramlist>
           <param name="date" type="String" default=""/>
           <param name="format" type="String" default="wxPyDateFormatStr"/>
         <paramlist>
           <param name="date" type="String" default=""/>
           <param name="format" type="String" default="wxPyDateFormatStr"/>


@@ -20803,49 +22599,49 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="Seconds" type="TimeSpan" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="Seconds" type="TimeSpan" overloaded="no">

-        <autodoc>TimeSpan.Seconds(long sec) -&gt; TimeSpan</autodoc>
+        <autodoc>Seconds(long sec) -&gt; TimeSpan</autodoc>

         <paramlist>
           <param name="sec" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Second" type="TimeSpan" overloaded="no">
         <paramlist>
           <param name="sec" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Second" type="TimeSpan" overloaded="no">

-        <autodoc>TimeSpan.Second() -&gt; TimeSpan</autodoc>
+        <autodoc>Second() -&gt; TimeSpan</autodoc>

       </staticmethod>
       <staticmethod name="Minutes" type="TimeSpan" overloaded="no">
       </staticmethod>
       <staticmethod name="Minutes" type="TimeSpan" overloaded="no">

-        <autodoc>TimeSpan.Minutes(long min) -&gt; TimeSpan</autodoc>
+        <autodoc>Minutes(long min) -&gt; TimeSpan</autodoc>

         <paramlist>
           <param name="min" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Minute" type="TimeSpan" overloaded="no">
         <paramlist>
           <param name="min" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Minute" type="TimeSpan" overloaded="no">

-        <autodoc>TimeSpan.Minute() -&gt; TimeSpan</autodoc>
+        <autodoc>Minute() -&gt; TimeSpan</autodoc>

       </staticmethod>
       <staticmethod name="Hours" type="TimeSpan" overloaded="no">
       </staticmethod>
       <staticmethod name="Hours" type="TimeSpan" overloaded="no">

-        <autodoc>TimeSpan.Hours(long hours) -&gt; TimeSpan</autodoc>
+        <autodoc>Hours(long hours) -&gt; TimeSpan</autodoc>

         <paramlist>
           <param name="hours" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Hour" type="TimeSpan" overloaded="no">
         <paramlist>
           <param name="hours" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Hour" type="TimeSpan" overloaded="no">

-        <autodoc>TimeSpan.Hour() -&gt; TimeSpan</autodoc>
+        <autodoc>Hour() -&gt; TimeSpan</autodoc>

       </staticmethod>
       <staticmethod name="Days" type="TimeSpan" overloaded="no">
       </staticmethod>
       <staticmethod name="Days" type="TimeSpan" overloaded="no">

-        <autodoc>TimeSpan.Days(long days) -&gt; TimeSpan</autodoc>
+        <autodoc>Days(long days) -&gt; TimeSpan</autodoc>

         <paramlist>
           <param name="days" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Day" type="TimeSpan" overloaded="no">
         <paramlist>
           <param name="days" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Day" type="TimeSpan" overloaded="no">

-        <autodoc>TimeSpan.Day() -&gt; TimeSpan</autodoc>
+        <autodoc>Day() -&gt; TimeSpan</autodoc>

       </staticmethod>
       <staticmethod name="Weeks" type="TimeSpan" overloaded="no">
       </staticmethod>
       <staticmethod name="Weeks" type="TimeSpan" overloaded="no">

-        <autodoc>TimeSpan.Weeks(long days) -&gt; TimeSpan</autodoc>
+        <autodoc>Weeks(long days) -&gt; TimeSpan</autodoc>

         <paramlist>
           <param name="days" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Week" type="TimeSpan" overloaded="no">
         <paramlist>
           <param name="days" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Week" type="TimeSpan" overloaded="no">

-        <autodoc>TimeSpan.Week() -&gt; TimeSpan</autodoc>
+        <autodoc>Week() -&gt; TimeSpan</autodoc>

       </staticmethod>
       <method name="Add" type="TimeSpan" overloaded="no">
         <autodoc>Add(TimeSpan diff) -&gt; TimeSpan</autodoc>
       </staticmethod>
       <method name="Add" type="TimeSpan" overloaded="no">
         <autodoc>Add(TimeSpan diff) -&gt; TimeSpan</autodoc>


@@ -21018,40 +22814,40 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="Days" type="DateSpan" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="Days" type="DateSpan" overloaded="no">

-        <autodoc>DateSpan.Days(int days) -&gt; DateSpan</autodoc>
+        <autodoc>Days(int days) -&gt; DateSpan</autodoc>

         <paramlist>
           <param name="days" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Day" type="DateSpan" overloaded="no">
         <paramlist>
           <param name="days" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Day" type="DateSpan" overloaded="no">

-        <autodoc>DateSpan.Day() -&gt; DateSpan</autodoc>
+        <autodoc>Day() -&gt; DateSpan</autodoc>

       </staticmethod>
       <staticmethod name="Weeks" type="DateSpan" overloaded="no">
       </staticmethod>
       <staticmethod name="Weeks" type="DateSpan" overloaded="no">

-        <autodoc>DateSpan.Weeks(int weeks) -&gt; DateSpan</autodoc>
+        <autodoc>Weeks(int weeks) -&gt; DateSpan</autodoc>

         <paramlist>
           <param name="weeks" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Week" type="DateSpan" overloaded="no">
         <paramlist>
           <param name="weeks" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Week" type="DateSpan" overloaded="no">

-        <autodoc>DateSpan.Week() -&gt; DateSpan</autodoc>
+        <autodoc>Week() -&gt; DateSpan</autodoc>

       </staticmethod>
       <staticmethod name="Months" type="DateSpan" overloaded="no">
       </staticmethod>
       <staticmethod name="Months" type="DateSpan" overloaded="no">

-        <autodoc>DateSpan.Months(int mon) -&gt; DateSpan</autodoc>
+        <autodoc>Months(int mon) -&gt; DateSpan</autodoc>

         <paramlist>
           <param name="mon" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Month" type="DateSpan" overloaded="no">
         <paramlist>
           <param name="mon" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Month" type="DateSpan" overloaded="no">

-        <autodoc>DateSpan.Month() -&gt; DateSpan</autodoc>
+        <autodoc>Month() -&gt; DateSpan</autodoc>

       </staticmethod>
       <staticmethod name="Years" type="DateSpan" overloaded="no">
       </staticmethod>
       <staticmethod name="Years" type="DateSpan" overloaded="no">

-        <autodoc>DateSpan.Years(int years) -&gt; DateSpan</autodoc>
+        <autodoc>Years(int years) -&gt; DateSpan</autodoc>

         <paramlist>
           <param name="years" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Year" type="DateSpan" overloaded="no">
         <paramlist>
           <param name="years" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Year" type="DateSpan" overloaded="no">

-        <autodoc>DateSpan.Year() -&gt; DateSpan</autodoc>
+        <autodoc>Year() -&gt; DateSpan</autodoc>

       </staticmethod>
       <method name="SetYears" type="DateSpan" overloaded="no">
         <autodoc>SetYears(int n) -&gt; DateSpan</autodoc>
       </staticmethod>
       <method name="SetYears" type="DateSpan" overloaded="no">
         <autodoc>SetYears(int n) -&gt; DateSpan</autodoc>


@@ -21187,14 +22983,27 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="DataFormat" oldname="wxDataFormat" module="misc">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="DataFormat" oldname="wxDataFormat" module="misc">

+      <docstring>A wx.DataFormat is an encapsulation of a platform-specific format
+handle which is used by the system for the clipboard and drag and
+drop operations. The applications are usually only interested in,
+for example, pasting data from the clipboard only if the data is
+in a format the program understands.  A data format is is used to
+uniquely identify this format.
+
+On the system level, a data format is usually just a number
+(CLIPFORMAT under Windows or Atom under X11, for example).</docstring>

       <constructor name="DataFormat" overloaded="no">
         <autodoc>__init__(int type) -&gt; DataFormat</autodoc>
       <constructor name="DataFormat" overloaded="no">
         <autodoc>__init__(int type) -&gt; DataFormat</autodoc>

+        <docstring>Constructs a data format object for one of the standard data
+formats or an empty data object (use SetType or SetId later in
+this case)</docstring>

         <paramlist>
           <param name="type" type="wxDataFormatId" default=""/>
         </paramlist>
       </constructor>
       <constructor name="CustomDataFormat" overloaded="no">
         <autodoc>CustomDataFormat(String format) -&gt; DataFormat</autodoc>
         <paramlist>
           <param name="type" type="wxDataFormatId" default=""/>
         </paramlist>
       </constructor>
       <constructor name="CustomDataFormat" overloaded="no">
         <autodoc>CustomDataFormat(String format) -&gt; DataFormat</autodoc>

+        <docstring>Constructs a data format object for a custom format identified by its name.</docstring>

         <paramlist>
           <param name="format" type="String" default=""/>
         </paramlist>
         <paramlist>
           <param name="format" type="String" default=""/>
         </paramlist>


@@ -21228,18 +23037,22 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       </method>
       <method name="SetType" type="" overloaded="no">
         <autodoc>SetType(int format)</autodoc>
       </method>
       <method name="SetType" type="" overloaded="no">
         <autodoc>SetType(int format)</autodoc>

+        <docstring>Sets the format to the given value, which should be one of wx.DF_XXX constants.</docstring>

         <paramlist>
           <param name="format" type="wxDataFormatId" default=""/>
         </paramlist>
       </method>
       <method name="GetType" type="wxDataFormatId" overloaded="no">
         <autodoc>GetType() -&gt; int</autodoc>
         <paramlist>
           <param name="format" type="wxDataFormatId" default=""/>
         </paramlist>
       </method>
       <method name="GetType" type="wxDataFormatId" overloaded="no">
         <autodoc>GetType() -&gt; int</autodoc>

+        <docstring>Returns the platform-specific number identifying the format.</docstring>

       </method>
       <method name="GetId" type="String" overloaded="no">
         <autodoc>GetId() -&gt; String</autodoc>
       </method>
       <method name="GetId" type="String" overloaded="no">
         <autodoc>GetId() -&gt; String</autodoc>

+        <docstring>Returns the name of a custom format (this function will fail for a standard format).</docstring>

       </method>
       <method name="SetId" type="" overloaded="no">
         <autodoc>SetId(String format)</autodoc>
       </method>
       <method name="SetId" type="" overloaded="no">
         <autodoc>SetId(String format)</autodoc>

+        <docstring>Sets the format to be the custom format identified by the given name.</docstring>

         <paramlist>
           <param name="format" type="String" default=""/>
         </paramlist>
         <paramlist>
           <param name="format" type="String" default=""/>
         </paramlist>


@@ -21423,6 +23236,12 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       <method name="GetFilenames" type="wxArrayString" overloaded="no">
         <autodoc>GetFilenames() -&gt; wxArrayString</autodoc>
       </method>
       <method name="GetFilenames" type="wxArrayString" overloaded="no">
         <autodoc>GetFilenames() -&gt; wxArrayString</autodoc>
       </method>

+      <method name="AddFile" type="" overloaded="no">
+        <autodoc>AddFile(String filename)</autodoc>
+        <paramlist>
+          <param name="filename" type="String" default=""/>
+        </paramlist>
+      </method>

     </class>
     <class name="CustomDataObject" oldname="wxCustomDataObject" module="misc">
       <baseclass name="DataObjectSimple"/>
     </class>
     <class name="CustomDataObject" oldname="wxCustomDataObject" module="misc">
       <baseclass name="DataObjectSimple"/>


@@ -21533,8 +23352,8 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       </method>
     </class>
     <class name="DropTarget" oldname="wxPyDropTarget" module="misc">
       </method>
     </class>
     <class name="DropTarget" oldname="wxPyDropTarget" module="misc">

-      <constructor name="PyDropTarget" overloaded="no">
-        <autodoc>PyDropTarget(DataObject dataObject=None) -&gt; DropTarget</autodoc>
+      <constructor name="DropTarget" overloaded="no">
+        <autodoc>__init__(DataObject dataObject=None) -&gt; DropTarget</autodoc>

         <paramlist>
           <param name="dataObject" type="DataObject" default="NULL"/>
         </paramlist>
         <paramlist>
           <param name="dataObject" type="DataObject" default="NULL"/>
         </paramlist>


@@ -21687,6 +23506,16 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Clipboard" oldname="wxClipboard" module="misc">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Clipboard" oldname="wxClipboard" module="misc">

+      <docstring>wx.Clipboard represents the system clipboard and provides methods to copy data
+to or paste data from it.  Normally, you should only use wx.TheClipboard which
+is a reference to a global wx.Clipboard instance.
+
+Call wx.TheClipboard.Open to get ownership of the clipboard. If this operation
+returns True, you now own the clipboard. Call wx.TheClipboard.SetData to put
+data on the clipboard, or wx.TheClipboard.GetData to retrieve data from the
+clipboard.  Call wx.TheClipboard.Close to close the clipboard and relinquish
+ownership. You should keep the clipboard open only momentarily.
+</docstring>

       <baseclass name="Object"/>
       <constructor name="Clipboard" overloaded="no">
         <autodoc>__init__() -&gt; Clipboard</autodoc>
       <baseclass name="Object"/>
       <constructor name="Clipboard" overloaded="no">
         <autodoc>__init__() -&gt; Clipboard</autodoc>


@@ -21696,53 +23525,81 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       </destructor>
       <method name="Open" type="bool" overloaded="no">
         <autodoc>Open() -&gt; bool</autodoc>
       </destructor>
       <method name="Open" type="bool" overloaded="no">
         <autodoc>Open() -&gt; bool</autodoc>

+        <docstring>Call this function to open the clipboard before calling SetData
+and GetData.  Call Close when you have finished with the clipboard.
+You should keep the clipboard open for only a very short time.
+Returns true on success. </docstring>

       </method>
       <method name="Close" type="" overloaded="no">
         <autodoc>Close()</autodoc>
       </method>
       <method name="Close" type="" overloaded="no">
         <autodoc>Close()</autodoc>

+        <docstring>Closes the clipboard.</docstring>

       </method>
       <method name="IsOpened" type="bool" overloaded="no">
         <autodoc>IsOpened() -&gt; bool</autodoc>
       </method>
       <method name="IsOpened" type="bool" overloaded="no">
         <autodoc>IsOpened() -&gt; bool</autodoc>

+        <docstring>Query whether the clipboard is opened</docstring>

       </method>
       <method name="AddData" type="bool" overloaded="no">
         <autodoc>AddData(DataObject data) -&gt; bool</autodoc>
       </method>
       <method name="AddData" type="bool" overloaded="no">
         <autodoc>AddData(DataObject data) -&gt; bool</autodoc>

+        <docstring>Call this function to add the data object to the clipboard. You
+may call this function repeatedly after having cleared the clipboard.
+After this function has been called, the clipboard owns the data, so
+do not delete the data explicitly.</docstring>

         <paramlist>
           <param name="data" type="DataObject" default=""/>
         </paramlist>
       </method>
       <method name="SetData" type="bool" overloaded="no">
         <autodoc>SetData(DataObject data) -&gt; bool</autodoc>
         <paramlist>
           <param name="data" type="DataObject" default=""/>
         </paramlist>
       </method>
       <method name="SetData" type="bool" overloaded="no">
         <autodoc>SetData(DataObject data) -&gt; bool</autodoc>

+        <docstring>Set the clipboard data, this is the same as Clear followed by AddData.</docstring>

         <paramlist>
           <param name="data" type="DataObject" default=""/>
         </paramlist>
       </method>
       <method name="IsSupported" type="bool" overloaded="no">
         <autodoc>IsSupported(DataFormat format) -&gt; bool</autodoc>
         <paramlist>
           <param name="data" type="DataObject" default=""/>
         </paramlist>
       </method>
       <method name="IsSupported" type="bool" overloaded="no">
         <autodoc>IsSupported(DataFormat format) -&gt; bool</autodoc>

+        <docstring>Returns True if the given format is available in the data object(s) on
+the clipboard.</docstring>

         <paramlist>
           <param name="format" type="DataFormat" default=""/>
         </paramlist>
       </method>
       <method name="GetData" type="bool" overloaded="no">
         <autodoc>GetData(DataObject data) -&gt; bool</autodoc>
         <paramlist>
           <param name="format" type="DataFormat" default=""/>
         </paramlist>
       </method>
       <method name="GetData" type="bool" overloaded="no">
         <autodoc>GetData(DataObject data) -&gt; bool</autodoc>

+        <docstring>Call this function to fill data with data on the clipboard, if available
+in the required format. Returns true on success.</docstring>

         <paramlist>
           <param name="data" type="DataObject" default=""/>
         </paramlist>
       </method>
       <method name="Clear" type="" overloaded="no">
         <autodoc>Clear()</autodoc>
         <paramlist>
           <param name="data" type="DataObject" default=""/>
         </paramlist>
       </method>
       <method name="Clear" type="" overloaded="no">
         <autodoc>Clear()</autodoc>

+        <docstring>Clears data from the clipboard object and also  the system's clipboard
+if possible.</docstring>

       </method>
       <method name="Flush" type="bool" overloaded="no">
         <autodoc>Flush() -&gt; bool</autodoc>
       </method>
       <method name="Flush" type="bool" overloaded="no">
         <autodoc>Flush() -&gt; bool</autodoc>

+        <docstring>Flushes the clipboard: this means that the data which is currently on
+clipboard will stay available even after the application exits (possibly
+eating memory), otherwise the clipboard will be emptied on exit.
+Returns False if the operation is unsuccesful for any reason.</docstring>

       </method>
       <method name="UsePrimarySelection" type="" overloaded="no">
       </method>
       <method name="UsePrimarySelection" type="" overloaded="no">

-        <autodoc>UsePrimarySelection(bool primary=False)</autodoc>
+        <autodoc>UsePrimarySelection(bool primary=True)</autodoc>
+        <docstring>On platforms supporting it (the X11 based platforms), selects the so
+called PRIMARY SELECTION as the clipboard as opposed to the normal
+clipboard, if primary is True.</docstring>

         <paramlist>
         <paramlist>

-          <param name="primary" type="bool" default="False"/>
+          <param name="primary" type="bool" default="True"/>

         </paramlist>
       </method>
     </class>
     <class name="ClipboardLocker" oldname="wxClipboardLocker" module="misc">
         </paramlist>
       </method>
     </class>
     <class name="ClipboardLocker" oldname="wxClipboardLocker" module="misc">

+      <docstring>A helpful class for opening the clipboard and automatically closing it when
+the locker is destroyed.</docstring>

       <constructor name="ClipboardLocker" overloaded="no">
         <autodoc>__init__(Clipboard clipboard=None) -&gt; ClipboardLocker</autodoc>
       <constructor name="ClipboardLocker" overloaded="no">
         <autodoc>__init__(Clipboard clipboard=None) -&gt; ClipboardLocker</autodoc>

+        <docstring>A helpful class for opening the clipboard and automatically closing it when
+the locker is destroyed.</docstring>

         <paramlist>
           <param name="clipboard" type="Clipboard" default="NULL"/>
         </paramlist>
         <paramlist>
           <param name="clipboard" type="Clipboard" default="NULL"/>
         </paramlist>


@@ -21752,6 +23609,153 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       </destructor>
       <method name="__nonzero__" type="bool" overloaded="no">
         <autodoc>__nonzero__() -&gt; bool</autodoc>
       </destructor>
       <method name="__nonzero__" type="bool" overloaded="no">
         <autodoc>__nonzero__() -&gt; bool</autodoc>

+        <docstring>A ClipboardLocker instance evaluates to True if the clipboard was
+successfully opened.</docstring>
+      </method>
+    </class>
+    <pythoncode>
+#---------------------------------------------------------------------------
+</pythoncode>
+    <class name="VideoMode" oldname="wxVideoMode" module="misc">
+      <docstring>A simple struct containing video mode parameters for a display</docstring>
+      <constructor name="VideoMode" overloaded="no">
+        <autodoc>__init__(int width=0, int height=0, int depth=0, int freq=0) -&gt; VideoMode</autodoc>
+        <docstring>A simple struct containing video mode parameters for a display</docstring>
+        <paramlist>
+          <param name="width" type="int" default="0"/>
+          <param name="height" type="int" default="0"/>
+          <param name="depth" type="int" default="0"/>
+          <param name="freq" type="int" default="0"/>
+        </paramlist>
+      </constructor>
+      <destructor name="~wxVideoMode" overloaded="no">
+        <autodoc>__del__()</autodoc>
+      </destructor>
+      <method name="Matches" type="bool" overloaded="no">
+        <autodoc>Matches(VideoMode other) -&gt; bool</autodoc>
+        <docstring>Returns true if this mode matches the other one in the sense that
+all non zero fields of the other mode have the same value in this
+one (except for refresh which is allowed to have a greater value)</docstring>
+        <paramlist>
+          <param name="other" type="VideoMode" default=""/>
+        </paramlist>
+      </method>
+      <method name="GetWidth" type="int" overloaded="no">
+        <autodoc>GetWidth() -&gt; int</autodoc>
+        <docstring>Returns the screen width in pixels (e.g. 640*480), 0 means
+unspecified</docstring>
+      </method>
+      <method name="GetHeight" type="int" overloaded="no">
+        <autodoc>GetHeight() -&gt; int</autodoc>
+        <docstring>Returns the screen width in pixels (e.g. 640*480), 0 means
+unspecified</docstring>
+      </method>
+      <method name="GetDepth" type="int" overloaded="no">
+        <autodoc>GetDepth() -&gt; int</autodoc>
+        <docstring>Returns the screen's bits per pixel (e.g. 32), 1 is monochrome
+and 0 means unspecified/known</docstring>
+      </method>
+      <method name="IsOk" type="bool" overloaded="no">
+        <autodoc>IsOk() -&gt; bool</autodoc>
+        <docstring>returns true if the object has been initialized</docstring>
+      </method>
+      <method name="__eq__" type="bool" overloaded="no">
+        <autodoc>__eq__(VideoMode other) -&gt; bool</autodoc>
+        <paramlist>
+          <param name="other" type="VideoMode" default=""/>
+        </paramlist>
+      </method>
+      <method name="__ne__" type="bool" overloaded="no">
+        <autodoc>__ne__(VideoMode other) -&gt; bool</autodoc>
+        <paramlist>
+          <param name="other" type="VideoMode" default=""/>
+        </paramlist>
+      </method>
+      <property name="w" type="int" readonly="no"/>
+      <property name="h" type="int" readonly="no"/>
+      <property name="bpp" type="int" readonly="no"/>
+      <property name="refresh" type="int" readonly="no"/>
+    </class>
+    <class name="Display" oldname="wxDisplay" module="misc">
+      <docstring>Represents a display/monitor attached to the system</docstring>
+      <constructor name="Display" overloaded="no">
+        <autodoc>__init__(size_t index=0) -&gt; Display</autodoc>
+        <docstring>Set up a Display instance with the specified display.  The
+displays are numbered from 0 to GetCount() - 1, 0 is always the
+primary display and the only one which is always supported</docstring>
+        <paramlist>
+          <param name="index" type="size_t" default="0"/>
+        </paramlist>
+      </constructor>
+      <destructor name="~wxDisplay" overloaded="no">
+        <autodoc>__del__()</autodoc>
+      </destructor>
+      <staticmethod name="GetCount" type="size_t" overloaded="no">
+        <autodoc>GetCount() -&gt; size_t</autodoc>
+        <docstring>Return the number of available displays.</docstring>
+      </staticmethod>
+      <staticmethod name="GetFromPoint" type="int" overloaded="no">
+        <autodoc>GetFromPoint(Point pt) -&gt; int</autodoc>
+        <docstring>Find the display where the given point lies, return wx.NOT_FOUND
+if it doesn't belong to any display</docstring>
+        <paramlist>
+          <param name="pt" type="Point" default=""/>
+        </paramlist>
+      </staticmethod>
+      <staticmethod name="GetFromWindow" type="int" overloaded="no">
+        <autodoc>GetFromWindow(Window window) -&gt; int</autodoc>
+        <docstring>Find the display where the given window lies, return wx.NOT_FOUND
+if it is not shown at all.</docstring>
+        <paramlist>
+          <param name="window" type="Window" default=""/>
+        </paramlist>
+      </staticmethod>
+      <method name="IsOk" type="bool" overloaded="no">
+        <autodoc>IsOk() -&gt; bool</autodoc>
+        <docstring>Return true if the object was initialized successfully</docstring>
+      </method>
+      <method name="GetGeometry" type="Rect" overloaded="no">
+        <autodoc>GetGeometry() -&gt; Rect</autodoc>
+        <docstring>Returns the bounding rectangle of the display whose index was
+passed to the constructor.</docstring>
+      </method>
+      <method name="GetName" type="String" overloaded="no">
+        <autodoc>GetName() -&gt; String</autodoc>
+        <docstring>Returns the display's name. A name is not available on all platforms.</docstring>
+      </method>
+      <method name="IsPrimary" type="bool" overloaded="no">
+        <autodoc>IsPrimary() -&gt; bool</autodoc>
+        <docstring>Returns true if the display is the primary display. The primary
+display is the one whose index is 0.</docstring>
+      </method>
+      <method name="GetModes" type="PyObject" overloaded="no">
+        <autodoc>GetModes(VideoMode mode=DefaultVideoMode) -&gt; [videoMode...]</autodoc>
+        <docstring>Enumerate all video modes supported by this display matching the
+given one (in the sense of VideoMode.Match()).
+
+As any mode matches the default value of the argument and there
+is always at least one video mode supported by display, the
+returned array is only empty for the default value of the
+argument if this function is not supported at all on this
+platform.</docstring>
+        <paramlist>
+          <param name="mode" type="VideoMode" default="wxDefaultVideoMode"/>
+        </paramlist>
+      </method>
+      <method name="GetCurrentMode" type="VideoMode" overloaded="no">
+        <autodoc>GetCurrentMode() -&gt; VideoMode</autodoc>
+        <docstring>Get the current video mode.</docstring>
+      </method>
+      <method name="ChangeMode" type="bool" overloaded="no">
+        <autodoc>ChangeMode(VideoMode mode=DefaultVideoMode) -&gt; bool</autodoc>
+        <docstring>Change current mode, return true if succeeded, false otherwise</docstring>
+        <paramlist>
+          <param name="mode" type="VideoMode" default="wxDefaultVideoMode"/>
+        </paramlist>
+      </method>
+      <method name="ResetMode" type="" overloaded="no">
+        <autodoc>ResetMode()</autodoc>
+        <docstring>Restore the default video mode (just a more readable synonym)</docstring>

       </method>
     </class>
   </module>
       </method>
     </class>
   </module>


@@ -21759,25 +23763,21 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
     <import name="misc"/>
     <pythoncode> wx = core </pythoncode>
     <class name="CalendarDateAttr" oldname="wxCalendarDateAttr" module="calendar">
     <import name="misc"/>
     <pythoncode> wx = core </pythoncode>
     <class name="CalendarDateAttr" oldname="wxCalendarDateAttr" module="calendar">

+      <docstring>A set of customization attributes for a calendar date, which can be used to
+control the look of the Calendar object.</docstring>

       <constructor name="CalendarDateAttr" overloaded="no">
       <constructor name="CalendarDateAttr" overloaded="no">

-        <autodoc>__init__(Colour colText, Colour colBack=wxNullColour, Colour colBorder=wxNullColour, 
-    Font font=wxNullFont, 
+        <autodoc>__init__(Colour colText=wxNullColour, Colour colBack=wxNullColour, 
+    Colour colBorder=wxNullColour, Font font=wxNullFont, 

     int border=CAL_BORDER_NONE) -&gt; CalendarDateAttr</autodoc>
     int border=CAL_BORDER_NONE) -&gt; CalendarDateAttr</autodoc>

+        <docstring>Create a CalendarDateAttr.</docstring>

         <paramlist>
         <paramlist>

-          <param name="colText" type="Colour" default=""/>
+          <param name="colText" type="Colour" default="wxNullColour"/>

           <param name="colBack" type="Colour" default="wxNullColour"/>
           <param name="colBorder" type="Colour" default="wxNullColour"/>
           <param name="font" type="Font" default="wxNullFont"/>
           <param name="border" type="wxCalendarDateBorder" default="wxCAL_BORDER_NONE"/>
         </paramlist>
       </constructor>
           <param name="colBack" type="Colour" default="wxNullColour"/>
           <param name="colBorder" type="Colour" default="wxNullColour"/>
           <param name="font" type="Font" default="wxNullFont"/>
           <param name="border" type="wxCalendarDateBorder" default="wxCAL_BORDER_NONE"/>
         </paramlist>
       </constructor>

-      <constructor name="CalendarDateAttrBorder" overloaded="no">
-        <autodoc>CalendarDateAttrBorder(int border, Colour colBorder=wxNullColour) -&gt; CalendarDateAttr</autodoc>
-        <paramlist>
-          <param name="border" type="wxCalendarDateBorder" default=""/>
-          <param name="colBorder" type="Colour" default="wxNullColour"/>
-        </paramlist>
-      </constructor>

       <method name="SetTextColour" type="" overloaded="no">
         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>
       <method name="SetTextColour" type="" overloaded="no">
         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>


@@ -21885,12 +23885,60 @@ EVT_CALENDAR_YEAR =            wx.PyEventBinder( wxEVT_CALENDAR_YEAR_CHANGED, 1)
 EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED, 1)
 </pythoncode>
     <class name="CalendarCtrl" oldname="wxCalendarCtrl" module="calendar">
 EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED, 1)
 </pythoncode>
     <class name="CalendarCtrl" oldname="wxCalendarCtrl" module="calendar">

+      <docstring>The calendar control allows the user to pick a date interactively.</docstring>
+      <refdoc>The CalendarCtrl displays a window containing several parts: the control to
+pick the month and the year at the top (either or both of them may be
+disabled) and a month area below them which shows all the days in the
+month. The user can move the current selection using the keyboard and select
+the date (generating EVT_CALENDAR event) by pressing &lt;Return&gt; or double
+clicking it.
+
+It has advanced possibilities for the customization of its display. All global
+settings (such as colours and fonts used) can, of course, be changed. But
+also, the display style for each day in the month can be set independently
+using CalendarDateAttr class.
+
+An item without custom attributes is drawn with the default colours and font
+and without border, but setting custom attributes with SetAttr allows to
+modify its appearance. Just create a custom attribute object and set it for
+the day you want to be displayed specially A day may be marked as being a
+holiday, (even if it is not recognized as one by wx.DateTime) by using the
+SetHoliday method.
+
+As the attributes are specified for each day, they may change when the month
+is changed, so you will often want to update them in an EVT_CALENDAR_MONTH
+event handler.
+
+ Styles
+    CAL_SUNDAY_FIRST:         Show Sunday as the first day in the week
+    CAL_MONDAY_FIRST:         Show Monday as the first day in the week
+    CAL_SHOW_HOLIDAYS:         Highlight holidays in the calendar
+    CAL_NO_YEAR_CHANGE:         Disable the year changing
+    CAL_NO_MONTH_CHANGE: Disable the month (and, implicitly, the year) changing
+    CAL_SHOW_SURROUNDING_WEEKS: Show the neighbouring weeks in the previous and next months
+    CAL_SEQUENTIAL_MONTH_SELECTION: Use alternative, more compact, style for the month and year selection controls.
+
+The default calendar style is wxCAL_SHOW_HOLIDAYS.
+
+ Events
+    EVT_CALENDAR:        A day was double clicked in the calendar.
+    EVT_CALENDAR_SEL_CHANGED: The selected date changed.
+    EVT_CALENDAR_DAY:     The selected day changed.
+    EVT_CALENDAR_MONTH:  The selected month changed.
+    EVT_CALENDAR_YEAR:    The selected year changed.
+    EVT_CALENDAR_WEEKDAY_CLICKED:  User clicked on the week day header
+
+Note that changing the selected date will result in either of
+EVT_CALENDAR_DAY, MONTH or YEAR events and an EVT_CALENDAR_SEL_CHANGED event.
+    
+</refdoc>

       <baseclass name="Control"/>
       <constructor name="CalendarCtrl" overloaded="no">
       <baseclass name="Control"/>
       <constructor name="CalendarCtrl" overloaded="no">

-        <autodoc>__init__(Window parent, int id, DateTime date=wxDefaultDateTime, 
+        <autodoc>__init__(Window parent, int id, DateTime date=DefaultDateTime, 

     Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
     String name=CalendarNameStr) -&gt; CalendarCtrl</autodoc>
     Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
     String name=CalendarNameStr) -&gt; CalendarCtrl</autodoc>

+        <docstring>Create and show a calendar control.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>


@@ -21903,12 +23951,14 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </constructor>
       <constructor name="PreCalendarCtrl" overloaded="no">
         <autodoc>PreCalendarCtrl() -&gt; CalendarCtrl</autodoc>
       </constructor>
       <constructor name="PreCalendarCtrl" overloaded="no">
         <autodoc>PreCalendarCtrl() -&gt; CalendarCtrl</autodoc>

+        <docstring>Precreate a CalendarCtrl for 2-phase creation.</docstring>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
       </constructor>
       <method name="Create" type="bool" overloaded="no">

-        <autodoc>Create(Window parent, int id, DateTime date=wxDefaultDateTime, 
+        <autodoc>Create(Window parent, int id, DateTime date=DefaultDateTime, 

     Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
     String name=CalendarNameStr) -&gt; bool</autodoc>
     Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
     String name=CalendarNameStr) -&gt; bool</autodoc>

+        <docstring>Acutally create the GUI portion of the CalendarCtrl for 2-phase creation.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>


@@ -21921,33 +23971,40 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
       <method name="SetDate" type="" overloaded="no">
         <autodoc>SetDate(DateTime date)</autodoc>
       </method>
       <method name="SetDate" type="" overloaded="no">
         <autodoc>SetDate(DateTime date)</autodoc>

+        <docstring>Sets the current date.</docstring>

         <paramlist>
           <param name="date" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="GetDate" type="DateTime" overloaded="no">
         <autodoc>GetDate() -&gt; DateTime</autodoc>
         <paramlist>
           <param name="date" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="GetDate" type="DateTime" overloaded="no">
         <autodoc>GetDate() -&gt; DateTime</autodoc>

+        <docstring>Gets the currently selected date.</docstring>

       </method>
       <method name="SetLowerDateLimit" type="bool" overloaded="no">
       </method>
       <method name="SetLowerDateLimit" type="bool" overloaded="no">

-        <autodoc>SetLowerDateLimit(DateTime date=wxDefaultDateTime) -&gt; bool</autodoc>
+        <autodoc>SetLowerDateLimit(DateTime date=DefaultDateTime) -&gt; bool</autodoc>
+        <docstring>set the range in which selection can occur</docstring>

         <paramlist>
           <param name="date" type="DateTime" default="wxDefaultDateTime"/>
         </paramlist>
       </method>
         <paramlist>
           <param name="date" type="DateTime" default="wxDefaultDateTime"/>
         </paramlist>
       </method>

-      <method name="GetLowerDateLimit" type="DateTime" overloaded="no">
-        <autodoc>GetLowerDateLimit() -&gt; DateTime</autodoc>
-      </method>

       <method name="SetUpperDateLimit" type="bool" overloaded="no">
       <method name="SetUpperDateLimit" type="bool" overloaded="no">

-        <autodoc>SetUpperDateLimit(DateTime date=wxDefaultDateTime) -&gt; bool</autodoc>
+        <autodoc>SetUpperDateLimit(DateTime date=DefaultDateTime) -&gt; bool</autodoc>
+        <docstring>set the range in which selection can occur</docstring>

         <paramlist>
           <param name="date" type="DateTime" default="wxDefaultDateTime"/>
         </paramlist>
       </method>
         <paramlist>
           <param name="date" type="DateTime" default="wxDefaultDateTime"/>
         </paramlist>
       </method>

+      <method name="GetLowerDateLimit" type="DateTime" overloaded="no">
+        <autodoc>GetLowerDateLimit() -&gt; DateTime</autodoc>
+        <docstring>get the range in which selection can occur</docstring>
+      </method>

       <method name="GetUpperDateLimit" type="DateTime" overloaded="no">
         <autodoc>GetUpperDateLimit() -&gt; DateTime</autodoc>
       <method name="GetUpperDateLimit" type="DateTime" overloaded="no">
         <autodoc>GetUpperDateLimit() -&gt; DateTime</autodoc>

+        <docstring>get the range in which selection can occur</docstring>

       </method>
       <method name="SetDateRange" type="bool" overloaded="no">
       </method>
       <method name="SetDateRange" type="bool" overloaded="no">

-        <autodoc>SetDateRange(DateTime lowerdate=wxDefaultDateTime, DateTime upperdate=wxDefaultDateTime) -&gt; bool</autodoc>
+        <autodoc>SetDateRange(DateTime lowerdate=DefaultDateTime, DateTime upperdate=DefaultDateTime) -&gt; bool</autodoc>
+        <docstring>set the range in which selection can occur</docstring>

         <paramlist>
           <param name="lowerdate" type="DateTime" default="wxDefaultDateTime"/>
           <param name="upperdate" type="DateTime" default="wxDefaultDateTime"/>
         <paramlist>
           <param name="lowerdate" type="DateTime" default="wxDefaultDateTime"/>
           <param name="upperdate" type="DateTime" default="wxDefaultDateTime"/>


@@ -21955,24 +24012,33 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
       <method name="EnableYearChange" type="" overloaded="no">
         <autodoc>EnableYearChange(bool enable=True)</autodoc>
       </method>
       <method name="EnableYearChange" type="" overloaded="no">
         <autodoc>EnableYearChange(bool enable=True)</autodoc>

+        <docstring>This function should be used instead of changing CAL_NO_YEAR_CHANGE
+style bit directly. It allows or disallows the user to change the year
+interactively.</docstring>

         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="EnableMonthChange" type="" overloaded="no">
         <autodoc>EnableMonthChange(bool enable=True)</autodoc>
         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="EnableMonthChange" type="" overloaded="no">
         <autodoc>EnableMonthChange(bool enable=True)</autodoc>

+        <docstring>This function should be used instead of changing CAL_NO_MONTH_CHANGE style
+bit. It allows or disallows the user to change the month interactively. Note
+that if the month can not be changed, the year can not be changed either.</docstring>

         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="EnableHolidayDisplay" type="" overloaded="no">
         <autodoc>EnableHolidayDisplay(bool display=True)</autodoc>
         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="EnableHolidayDisplay" type="" overloaded="no">
         <autodoc>EnableHolidayDisplay(bool display=True)</autodoc>

+        <docstring>This function should be used instead of changing CAL_SHOW_HOLIDAYS style
+bit directly. It enables or disables the special highlighting of the holidays.</docstring>

         <paramlist>
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="SetHeaderColours" type="" overloaded="no">
         <autodoc>SetHeaderColours(Colour colFg, Colour colBg)</autodoc>
         <paramlist>
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="SetHeaderColours" type="" overloaded="no">
         <autodoc>SetHeaderColours(Colour colFg, Colour colBg)</autodoc>

+        <docstring>header colours are used for painting the weekdays at the top</docstring>

         <paramlist>
           <param name="colFg" type="Colour" default=""/>
           <param name="colBg" type="Colour" default=""/>
         <paramlist>
           <param name="colFg" type="Colour" default=""/>
           <param name="colBg" type="Colour" default=""/>


@@ -21980,12 +24046,15 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
       <method name="GetHeaderColourFg" type="Colour" overloaded="no">
         <autodoc>GetHeaderColourFg() -&gt; Colour</autodoc>
       </method>
       <method name="GetHeaderColourFg" type="Colour" overloaded="no">
         <autodoc>GetHeaderColourFg() -&gt; Colour</autodoc>

+        <docstring>header colours are used for painting the weekdays at the top</docstring>

       </method>
       <method name="GetHeaderColourBg" type="Colour" overloaded="no">
         <autodoc>GetHeaderColourBg() -&gt; Colour</autodoc>
       </method>
       <method name="GetHeaderColourBg" type="Colour" overloaded="no">
         <autodoc>GetHeaderColourBg() -&gt; Colour</autodoc>

+        <docstring>header colours are used for painting the weekdays at the top</docstring>

       </method>
       <method name="SetHighlightColours" type="" overloaded="no">
         <autodoc>SetHighlightColours(Colour colFg, Colour colBg)</autodoc>
       </method>
       <method name="SetHighlightColours" type="" overloaded="no">
         <autodoc>SetHighlightColours(Colour colFg, Colour colBg)</autodoc>

+        <docstring>highlight colour is used for the currently selected date</docstring>

         <paramlist>
           <param name="colFg" type="Colour" default=""/>
           <param name="colBg" type="Colour" default=""/>
         <paramlist>
           <param name="colFg" type="Colour" default=""/>
           <param name="colBg" type="Colour" default=""/>


@@ -21993,12 +24062,15 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
       <method name="GetHighlightColourFg" type="Colour" overloaded="no">
         <autodoc>GetHighlightColourFg() -&gt; Colour</autodoc>
       </method>
       <method name="GetHighlightColourFg" type="Colour" overloaded="no">
         <autodoc>GetHighlightColourFg() -&gt; Colour</autodoc>

+        <docstring>highlight colour is used for the currently selected date</docstring>

       </method>
       <method name="GetHighlightColourBg" type="Colour" overloaded="no">
         <autodoc>GetHighlightColourBg() -&gt; Colour</autodoc>
       </method>
       <method name="GetHighlightColourBg" type="Colour" overloaded="no">
         <autodoc>GetHighlightColourBg() -&gt; Colour</autodoc>

+        <docstring>highlight colour is used for the currently selected date</docstring>

       </method>
       <method name="SetHolidayColours" type="" overloaded="no">
         <autodoc>SetHolidayColours(Colour colFg, Colour colBg)</autodoc>
       </method>
       <method name="SetHolidayColours" type="" overloaded="no">
         <autodoc>SetHolidayColours(Colour colFg, Colour colBg)</autodoc>

+        <docstring>holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is used)</docstring>

         <paramlist>
           <param name="colFg" type="Colour" default=""/>
           <param name="colBg" type="Colour" default=""/>
         <paramlist>
           <param name="colFg" type="Colour" default=""/>
           <param name="colBg" type="Colour" default=""/>


@@ -22006,18 +24078,24 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
       <method name="GetHolidayColourFg" type="Colour" overloaded="no">
         <autodoc>GetHolidayColourFg() -&gt; Colour</autodoc>
       </method>
       <method name="GetHolidayColourFg" type="Colour" overloaded="no">
         <autodoc>GetHolidayColourFg() -&gt; Colour</autodoc>

+        <docstring>holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is used)</docstring>

       </method>
       <method name="GetHolidayColourBg" type="Colour" overloaded="no">
         <autodoc>GetHolidayColourBg() -&gt; Colour</autodoc>
       </method>
       <method name="GetHolidayColourBg" type="Colour" overloaded="no">
         <autodoc>GetHolidayColourBg() -&gt; Colour</autodoc>

+        <docstring>holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is used)</docstring>

       </method>
       <method name="GetAttr" type="CalendarDateAttr" overloaded="no">
         <autodoc>GetAttr(size_t day) -&gt; CalendarDateAttr</autodoc>
       </method>
       <method name="GetAttr" type="CalendarDateAttr" overloaded="no">
         <autodoc>GetAttr(size_t day) -&gt; CalendarDateAttr</autodoc>

+        <docstring>Returns the attribute for the given date (should be in the range 1...31).
+The returned value may be None</docstring>

         <paramlist>
           <param name="day" type="size_t" default=""/>
         </paramlist>
       </method>
       <method name="SetAttr" type="" overloaded="no">
         <autodoc>SetAttr(size_t day, CalendarDateAttr attr)</autodoc>
         <paramlist>
           <param name="day" type="size_t" default=""/>
         </paramlist>
       </method>
       <method name="SetAttr" type="" overloaded="no">
         <autodoc>SetAttr(size_t day, CalendarDateAttr attr)</autodoc>

+        <docstring>Associates the attribute with the specified date (in the range 1...31).
+If the attribute passed is None, the items attribute is cleared.</docstring>

         <paramlist>
           <param name="day" type="size_t" default=""/>
           <param name="attr" type="CalendarDateAttr" default=""/>
         <paramlist>
           <param name="day" type="size_t" default=""/>
           <param name="attr" type="CalendarDateAttr" default=""/>


@@ -22025,41 +24103,39 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
       <method name="SetHoliday" type="" overloaded="no">
         <autodoc>SetHoliday(size_t day)</autodoc>
       </method>
       <method name="SetHoliday" type="" overloaded="no">
         <autodoc>SetHoliday(size_t day)</autodoc>

+        <docstring>Marks the specified day as being a holiday in the current month.</docstring>

         <paramlist>
           <param name="day" type="size_t" default=""/>
         </paramlist>
       </method>
       <method name="ResetAttr" type="" overloaded="no">
         <autodoc>ResetAttr(size_t day)</autodoc>
         <paramlist>
           <param name="day" type="size_t" default=""/>
         </paramlist>
       </method>
       <method name="ResetAttr" type="" overloaded="no">
         <autodoc>ResetAttr(size_t day)</autodoc>

+        <docstring>Clears any attributes associated with the given day (in the range 1...31).</docstring>

         <paramlist>
           <param name="day" type="size_t" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="day" type="size_t" default=""/>
         </paramlist>
       </method>

-      <method name="HitTest" type="wxCalendarHitTestResult" overloaded="no">
-        <autodoc>HitTest(Point pos, DateTime date=None, int wd=None) -&gt; int</autodoc>
+      <method name="HitTest" type="PyObject" overloaded="no">
+        <autodoc>HitTest(Point pos) -&gt; (result, date, weekday)</autodoc>
+        <docstring>Returns 3-tuple with information about the given position on the calendar
+control.  The first value of the tuple is a result code and determines the
+validity of the remaining two values.  The result codes are:
+
+    CAL_HITTEST_NOWHERE:    hit outside of anything
+    CAL_HITTEST_HEADER:     hit on the header, weekday is valid
+    CAL_HITTEST_DAY:        hit on a day in the calendar, date is set.
+</docstring>

         <paramlist>
           <param name="pos" type="Point" default=""/>
         <paramlist>
           <param name="pos" type="Point" default=""/>

-          <param name="date" type="DateTime" default="NULL"/>
-          <param name="wd" type="wxDateTime::WeekDay" default="NULL"/>
-        </paramlist>
-      </method>
-      <method name="Enable" type="bool" overloaded="no">
-        <autodoc>Enable(bool enable=True) -&gt; bool</autodoc>
-        <paramlist>
-          <param name="enable" type="bool" default="True"/>
-        </paramlist>
-      </method>
-      <method name="Show" type="bool" overloaded="no">
-        <autodoc>Show(bool show=True) -&gt; bool</autodoc>
-        <paramlist>
-          <param name="show" type="bool" default="True"/>

         </paramlist>
       </method>
       <method name="GetMonthControl" type="Control" overloaded="no">
         <autodoc>GetMonthControl() -&gt; Control</autodoc>
         </paramlist>
       </method>
       <method name="GetMonthControl" type="Control" overloaded="no">
         <autodoc>GetMonthControl() -&gt; Control</autodoc>

+        <docstring>get the currently shown control for month</docstring>

       </method>
       <method name="GetYearControl" type="Control" overloaded="no">
         <autodoc>GetYearControl() -&gt; Control</autodoc>
       </method>
       <method name="GetYearControl" type="Control" overloaded="no">
         <autodoc>GetYearControl() -&gt; Control</autodoc>

+        <docstring>get the currently shown control for year</docstring>

       </method>
     </class>
   </module>
       </method>
     </class>
   </module>


@@ -23342,13 +25418,6 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="ForceRefresh" type="" overloaded="no">
         <autodoc>ForceRefresh()</autodoc>
       </method>
       <method name="ForceRefresh" type="" overloaded="no">
         <autodoc>ForceRefresh()</autodoc>
       </method>

-      <method name="Refresh" type="" overloaded="no">
-        <autodoc>Refresh(bool eraseb=True, Rect rect=None)</autodoc>
-        <paramlist>
-          <param name="eraseb" type="bool" default="True"/>
-          <param name="rect" type="Rect" default="NULL"/>
-        </paramlist>
-      </method>

       <method name="IsEditable" type="bool" overloaded="no">
         <autodoc>IsEditable() -&gt; bool</autodoc>
       </method>
       <method name="IsEditable" type="bool" overloaded="no">
         <autodoc>IsEditable() -&gt; bool</autodoc>
       </method>


@@ -24954,6 +27023,9 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetDescent" type="int" overloaded="no">
         <autodoc>GetDescent() -&gt; int</autodoc>
       </method>
       <method name="GetDescent" type="int" overloaded="no">
         <autodoc>GetDescent() -&gt; int</autodoc>
       </method>

+      <method name="GetMaxTotalWidth" type="int" overloaded="no">
+        <autodoc>GetMaxTotalWidth() -&gt; int</autodoc>
+      </method>

       <method name="GetId" type="String" overloaded="no">
         <autodoc>GetId() -&gt; String</autodoc>
       </method>
       <method name="GetId" type="String" overloaded="no">
         <autodoc>GetId() -&gt; String</autodoc>
       </method>


@@ -25405,11 +27477,26 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
         </paramlist>
       </method>
       <staticmethod name="AddFilter" type="" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="AddFilter" type="" overloaded="no">

-        <autodoc>HtmlWindow.AddFilter(HtmlFilter filter)</autodoc>
+        <autodoc>AddFilter(HtmlFilter filter)</autodoc>

         <paramlist>
           <param name="filter" type="HtmlFilter" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="filter" type="HtmlFilter" default=""/>
         </paramlist>
       </staticmethod>

+      <method name="SelectWord" type="" overloaded="no">
+        <autodoc>SelectWord(Point pos)</autodoc>
+        <paramlist>
+          <param name="pos" type="Point" default=""/>
+        </paramlist>
+      </method>
+      <method name="SelectLine" type="" overloaded="no">
+        <autodoc>SelectLine(Point pos)</autodoc>
+        <paramlist>
+          <param name="pos" type="Point" default=""/>
+        </paramlist>
+      </method>
+      <method name="SelectAll" type="" overloaded="no">
+        <autodoc>SelectAll()</autodoc>
+      </method>

       <method name="base_OnLinkClicked" type="" overloaded="no">
         <autodoc>base_OnLinkClicked(HtmlLinkInfo link)</autodoc>
         <paramlist>
       <method name="base_OnLinkClicked" type="" overloaded="no">
         <autodoc>base_OnLinkClicked(HtmlLinkInfo link)</autodoc>
         <paramlist>


@@ -25554,13 +27641,13 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
         </paramlist>
       </method>
       <staticmethod name="AddFilter" type="" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="AddFilter" type="" overloaded="no">

-        <autodoc>HtmlPrintout.AddFilter(wxHtmlFilter filter)</autodoc>
+        <autodoc>AddFilter(wxHtmlFilter filter)</autodoc>

         <paramlist>
           <param name="filter" type="wxHtmlFilter" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="CleanUpStatics" type="" overloaded="no">
         <paramlist>
           <param name="filter" type="wxHtmlFilter" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="CleanUpStatics" type="" overloaded="no">

-        <autodoc>HtmlPrintout.CleanUpStatics()</autodoc>
+        <autodoc>CleanUpStatics()</autodoc>

       </staticmethod>
     </class>
     <class name="HtmlEasyPrinting" oldname="wxHtmlEasyPrinting" module="html">
       </staticmethod>
     </class>
     <class name="HtmlEasyPrinting" oldname="wxHtmlEasyPrinting" module="html">


@@ -26142,7 +28229,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         </paramlist>
       </method>
       <staticmethod name="Chain" type="" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="Chain" type="" overloaded="no">

-        <autodoc>WizardPageSimple.Chain(WizardPageSimple first, WizardPageSimple second)</autodoc>
+        <autodoc>Chain(WizardPageSimple first, WizardPageSimple second)</autodoc>

         <paramlist>
           <param name="first" type="WizardPageSimple" default=""/>
           <param name="second" type="WizardPageSimple" default=""/>
         <paramlist>
           <param name="first" type="WizardPageSimple" default=""/>
           <param name="second" type="WizardPageSimple" default=""/>


@@ -26304,8 +28391,8 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="palette" type="Palette" default="wxNullPalette"/>
         </paramlist>
       </constructor>
           <param name="palette" type="Palette" default="wxNullPalette"/>
         </paramlist>
       </constructor>

-      <constructor name="wxGLCanvasWithContext" overloaded="no">
-        <autodoc>wxGLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, 
+      <constructor name="GLCanvasWithContext" overloaded="no">
+        <autodoc>GLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, 

     Size size=DefaultSize, 
     long style=0, String name=GLCanvasNameStr, 
     int attribList=None, wxPalette palette=wxNullPalette) -&gt; GLCanvas</autodoc>
     Size size=DefaultSize, 
     long style=0, String name=GLCanvasNameStr, 
     int attribList=None, wxPalette palette=wxNullPalette) -&gt; GLCanvas</autodoc>


@@ -32198,6 +34285,7 @@ ControlPoint =      PyControlPoint
   </module>
   <module name="stc">
     <import name="core"/>
   </module>
   <module name="stc">
     <import name="core"/>

+    <import name="misc"/>

     <pythoncode> wx = core </pythoncode>
     <class name="StyledTextCtrl" oldname="wxStyledTextCtrl" module="stc">
       <baseclass name="Control"/>
     <pythoncode> wx = core </pythoncode>
     <class name="StyledTextCtrl" oldname="wxStyledTextCtrl" module="stc">
       <baseclass name="Control"/>


@@ -33517,9 +35605,148 @@ ControlPoint =      PyControlPoint
           <param name="fore" type="Colour" default=""/>
         </paramlist>
       </method>
           <param name="fore" type="Colour" default=""/>
         </paramlist>
       </method>

+      <method name="LineDown" type="" overloaded="no">
+        <autodoc>LineDown()</autodoc>
+        <docstring>This is just a wrapper for ScrollLines(1).</docstring>
+      </method>
+      <method name="LineDownExtend" type="" overloaded="no">
+        <autodoc>LineDownExtend()</autodoc>
+      </method>
+      <method name="LineUp" type="" overloaded="no">
+        <autodoc>LineUp()</autodoc>
+        <docstring>This is just a wrapper for ScrollLines(-1).</docstring>
+      </method>
+      <method name="LineUpExtend" type="" overloaded="no">
+        <autodoc>LineUpExtend()</autodoc>
+      </method>
+      <method name="CharLeft" type="" overloaded="no">
+        <autodoc>CharLeft()</autodoc>
+      </method>
+      <method name="CharLeftExtend" type="" overloaded="no">
+        <autodoc>CharLeftExtend()</autodoc>
+      </method>
+      <method name="CharRight" type="" overloaded="no">
+        <autodoc>CharRight()</autodoc>
+      </method>
+      <method name="CharRightExtend" type="" overloaded="no">
+        <autodoc>CharRightExtend()</autodoc>
+      </method>
+      <method name="WordLeft" type="" overloaded="no">
+        <autodoc>WordLeft()</autodoc>
+      </method>
+      <method name="WordLeftExtend" type="" overloaded="no">
+        <autodoc>WordLeftExtend()</autodoc>
+      </method>
+      <method name="WordRight" type="" overloaded="no">
+        <autodoc>WordRight()</autodoc>
+      </method>
+      <method name="WordRightExtend" type="" overloaded="no">
+        <autodoc>WordRightExtend()</autodoc>
+      </method>
+      <method name="Home" type="" overloaded="no">
+        <autodoc>Home()</autodoc>
+      </method>
+      <method name="HomeExtend" type="" overloaded="no">
+        <autodoc>HomeExtend()</autodoc>
+      </method>
+      <method name="LineEnd" type="" overloaded="no">
+        <autodoc>LineEnd()</autodoc>
+      </method>
+      <method name="LineEndExtend" type="" overloaded="no">
+        <autodoc>LineEndExtend()</autodoc>
+      </method>
+      <method name="DocumentStart" type="" overloaded="no">
+        <autodoc>DocumentStart()</autodoc>
+      </method>
+      <method name="DocumentStartExtend" type="" overloaded="no">
+        <autodoc>DocumentStartExtend()</autodoc>
+      </method>
+      <method name="DocumentEnd" type="" overloaded="no">
+        <autodoc>DocumentEnd()</autodoc>
+      </method>
+      <method name="DocumentEndExtend" type="" overloaded="no">
+        <autodoc>DocumentEndExtend()</autodoc>
+      </method>
+      <method name="PageUp" type="" overloaded="no">
+        <autodoc>PageUp()</autodoc>
+        <docstring>This is just a wrapper for ScrollPages(-1).</docstring>
+      </method>
+      <method name="PageUpExtend" type="" overloaded="no">
+        <autodoc>PageUpExtend()</autodoc>
+      </method>
+      <method name="PageDown" type="" overloaded="no">
+        <autodoc>PageDown()</autodoc>
+        <docstring>This is just a wrapper for ScrollPages(1).</docstring>
+      </method>
+      <method name="PageDownExtend" type="" overloaded="no">
+        <autodoc>PageDownExtend()</autodoc>
+      </method>
+      <method name="EditToggleOvertype" type="" overloaded="no">
+        <autodoc>EditToggleOvertype()</autodoc>
+      </method>
+      <method name="Cancel" type="" overloaded="no">
+        <autodoc>Cancel()</autodoc>
+      </method>
+      <method name="DeleteBack" type="" overloaded="no">
+        <autodoc>DeleteBack()</autodoc>
+      </method>
+      <method name="Tab" type="" overloaded="no">
+        <autodoc>Tab()</autodoc>
+      </method>
+      <method name="BackTab" type="" overloaded="no">
+        <autodoc>BackTab()</autodoc>
+      </method>
+      <method name="NewLine" type="" overloaded="no">
+        <autodoc>NewLine()</autodoc>
+      </method>
+      <method name="FormFeed" type="" overloaded="no">
+        <autodoc>FormFeed()</autodoc>
+      </method>
+      <method name="VCHome" type="" overloaded="no">
+        <autodoc>VCHome()</autodoc>
+      </method>
+      <method name="VCHomeExtend" type="" overloaded="no">
+        <autodoc>VCHomeExtend()</autodoc>
+      </method>
+      <method name="ZoomIn" type="" overloaded="no">
+        <autodoc>ZoomIn()</autodoc>
+      </method>
+      <method name="ZoomOut" type="" overloaded="no">
+        <autodoc>ZoomOut()</autodoc>
+      </method>
+      <method name="DelWordLeft" type="" overloaded="no">
+        <autodoc>DelWordLeft()</autodoc>
+      </method>
+      <method name="DelWordRight" type="" overloaded="no">
+        <autodoc>DelWordRight()</autodoc>
+      </method>
+      <method name="LineCut" type="" overloaded="no">
+        <autodoc>LineCut()</autodoc>
+      </method>
+      <method name="LineDelete" type="" overloaded="no">
+        <autodoc>LineDelete()</autodoc>
+      </method>
+      <method name="LineTranspose" type="" overloaded="no">
+        <autodoc>LineTranspose()</autodoc>
+      </method>

       <method name="LineDuplicate" type="" overloaded="no">
         <autodoc>LineDuplicate()</autodoc>
       </method>
       <method name="LineDuplicate" type="" overloaded="no">
         <autodoc>LineDuplicate()</autodoc>
       </method>

+      <method name="LowerCase" type="" overloaded="no">
+        <autodoc>LowerCase()</autodoc>
+      </method>
+      <method name="UpperCase" type="" overloaded="no">
+        <autodoc>UpperCase()</autodoc>
+      </method>
+      <method name="LineScrollDown" type="" overloaded="no">
+        <autodoc>LineScrollDown()</autodoc>
+      </method>
+      <method name="LineScrollUp" type="" overloaded="no">
+        <autodoc>LineScrollUp()</autodoc>
+      </method>
+      <method name="DeleteBackNotLine" type="" overloaded="no">
+        <autodoc>DeleteBackNotLine()</autodoc>
+      </method>

       <method name="HomeDisplay" type="" overloaded="no">
         <autodoc>HomeDisplay()</autodoc>
       </method>
       <method name="HomeDisplay" type="" overloaded="no">
         <autodoc>HomeDisplay()</autodoc>
       </method>


@@ -33532,6 +35759,24 @@ ControlPoint =      PyControlPoint
       <method name="LineEndDisplayExtend" type="" overloaded="no">
         <autodoc>LineEndDisplayExtend()</autodoc>
       </method>
       <method name="LineEndDisplayExtend" type="" overloaded="no">
         <autodoc>LineEndDisplayExtend()</autodoc>
       </method>

+      <method name="HomeWrap" type="" overloaded="no">
+        <autodoc>HomeWrap()</autodoc>
+      </method>
+      <method name="HomeWrapExtend" type="" overloaded="no">
+        <autodoc>HomeWrapExtend()</autodoc>
+      </method>
+      <method name="LineEndWrap" type="" overloaded="no">
+        <autodoc>LineEndWrap()</autodoc>
+      </method>
+      <method name="LineEndWrapExtend" type="" overloaded="no">
+        <autodoc>LineEndWrapExtend()</autodoc>
+      </method>
+      <method name="VCHomeWrap" type="" overloaded="no">
+        <autodoc>VCHomeWrap()</autodoc>
+      </method>
+      <method name="VCHomeWrapExtend" type="" overloaded="no">
+        <autodoc>VCHomeWrapExtend()</autodoc>
+      </method>

       <method name="LineCopy" type="" overloaded="no">
         <autodoc>LineCopy()</autodoc>
       </method>
       <method name="LineCopy" type="" overloaded="no">
         <autodoc>LineCopy()</autodoc>
       </method>


@@ -33795,6 +36040,24 @@ ControlPoint =      PyControlPoint
           <param name="underline" type="bool" default=""/>
         </paramlist>
       </method>
           <param name="underline" type="bool" default=""/>
         </paramlist>
       </method>

+      <method name="SetHotspotSingleLine" type="" overloaded="no">
+        <autodoc>SetHotspotSingleLine(bool singleLine)</autodoc>
+        <paramlist>
+          <param name="singleLine" type="bool" default=""/>
+        </paramlist>
+      </method>
+      <method name="ParaDown" type="" overloaded="no">
+        <autodoc>ParaDown()</autodoc>
+      </method>
+      <method name="ParaDownExtend" type="" overloaded="no">
+        <autodoc>ParaDownExtend()</autodoc>
+      </method>
+      <method name="ParaUp" type="" overloaded="no">
+        <autodoc>ParaUp()</autodoc>
+      </method>
+      <method name="ParaUpExtend" type="" overloaded="no">
+        <autodoc>ParaUpExtend()</autodoc>
+      </method>

       <method name="PositionBefore" type="int" overloaded="no">
         <autodoc>PositionBefore(int pos) -&gt; int</autodoc>
         <paramlist>
       <method name="PositionBefore" type="int" overloaded="no">
         <autodoc>PositionBefore(int pos) -&gt; int</autodoc>
         <paramlist>


@@ -33821,6 +36084,90 @@ ControlPoint =      PyControlPoint
           <param name="text" type="String" default=""/>
         </paramlist>
       </method>
           <param name="text" type="String" default=""/>
         </paramlist>
       </method>

+      <method name="SetSelectionMode" type="" overloaded="no">
+        <autodoc>SetSelectionMode(int mode)</autodoc>
+        <paramlist>
+          <param name="mode" type="int" default=""/>
+        </paramlist>
+      </method>
+      <method name="GetSelectionMode" type="int" overloaded="no">
+        <autodoc>GetSelectionMode() -&gt; int</autodoc>
+      </method>
+      <method name="GetLineSelStartPosition" type="int" overloaded="no">
+        <autodoc>GetLineSelStartPosition(int line) -&gt; int</autodoc>
+        <paramlist>
+          <param name="line" type="int" default=""/>
+        </paramlist>
+      </method>
+      <method name="GetLineSelEndPosition" type="int" overloaded="no">
+        <autodoc>GetLineSelEndPosition(int line) -&gt; int</autodoc>
+        <paramlist>
+          <param name="line" type="int" default=""/>
+        </paramlist>
+      </method>
+      <method name="LineDownRectExtend" type="" overloaded="no">
+        <autodoc>LineDownRectExtend()</autodoc>
+      </method>
+      <method name="LineUpRectExtend" type="" overloaded="no">
+        <autodoc>LineUpRectExtend()</autodoc>
+      </method>
+      <method name="CharLeftRectExtend" type="" overloaded="no">
+        <autodoc>CharLeftRectExtend()</autodoc>
+      </method>
+      <method name="CharRightRectExtend" type="" overloaded="no">
+        <autodoc>CharRightRectExtend()</autodoc>
+      </method>
+      <method name="HomeRectExtend" type="" overloaded="no">
+        <autodoc>HomeRectExtend()</autodoc>
+      </method>
+      <method name="VCHomeRectExtend" type="" overloaded="no">
+        <autodoc>VCHomeRectExtend()</autodoc>
+      </method>
+      <method name="LineEndRectExtend" type="" overloaded="no">
+        <autodoc>LineEndRectExtend()</autodoc>
+      </method>
+      <method name="PageUpRectExtend" type="" overloaded="no">
+        <autodoc>PageUpRectExtend()</autodoc>
+      </method>
+      <method name="PageDownRectExtend" type="" overloaded="no">
+        <autodoc>PageDownRectExtend()</autodoc>
+      </method>
+      <method name="StutteredPageUp" type="" overloaded="no">
+        <autodoc>StutteredPageUp()</autodoc>
+      </method>
+      <method name="StutteredPageUpExtend" type="" overloaded="no">
+        <autodoc>StutteredPageUpExtend()</autodoc>
+      </method>
+      <method name="StutteredPageDown" type="" overloaded="no">
+        <autodoc>StutteredPageDown()</autodoc>
+      </method>
+      <method name="StutteredPageDownExtend" type="" overloaded="no">
+        <autodoc>StutteredPageDownExtend()</autodoc>
+      </method>
+      <method name="WordLeftEnd" type="" overloaded="no">
+        <autodoc>WordLeftEnd()</autodoc>
+      </method>
+      <method name="WordLeftEndExtend" type="" overloaded="no">
+        <autodoc>WordLeftEndExtend()</autodoc>
+      </method>
+      <method name="WordRightEnd" type="" overloaded="no">
+        <autodoc>WordRightEnd()</autodoc>
+      </method>
+      <method name="WordRightEndExtend" type="" overloaded="no">
+        <autodoc>WordRightEndExtend()</autodoc>
+      </method>
+      <method name="SetWhitespaceChars" type="" overloaded="no">
+        <autodoc>SetWhitespaceChars(String characters)</autodoc>
+        <paramlist>
+          <param name="characters" type="String" default=""/>
+        </paramlist>
+      </method>
+      <method name="SetCharsDefault" type="" overloaded="no">
+        <autodoc>SetCharsDefault()</autodoc>
+      </method>
+      <method name="AutoCompGetCurrent" type="int" overloaded="no">
+        <autodoc>AutoCompGetCurrent() -&gt; int</autodoc>
+      </method>

       <method name="StartRecord" type="" overloaded="no">
         <autodoc>StartRecord()</autodoc>
       </method>
       <method name="StartRecord" type="" overloaded="no">
         <autodoc>StartRecord()</autodoc>
       </method>


@@ -33972,7 +36319,7 @@ ControlPoint =      PyControlPoint
         </paramlist>
       </method>
       <method name="DoDragOver" type="wxDragResult" overloaded="no">
         </paramlist>
       </method>
       <method name="DoDragOver" type="wxDragResult" overloaded="no">

-        <autodoc>DoDragOver(int x, int y, wxDragResult def) -&gt; wxDragResult</autodoc>
+        <autodoc>DoDragOver(int x, int y, int def) -&gt; int</autodoc>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -33987,6 +36334,15 @@ ControlPoint =      PyControlPoint
           <param name="data" type="String" default=""/>
         </paramlist>
       </method>
           <param name="data" type="String" default=""/>
         </paramlist>
       </method>

+      <method name="SetUseAntiAliasing" type="" overloaded="no">
+        <autodoc>SetUseAntiAliasing(bool useAA)</autodoc>
+        <paramlist>
+          <param name="useAA" type="bool" default=""/>
+        </paramlist>
+      </method>
+      <method name="GetUseAntiAliasing" type="bool" overloaded="no">
+        <autodoc>GetUseAntiAliasing() -&gt; bool</autodoc>
+      </method>

     </class>
     <class name="StyledTextEvent" oldname="wxStyledTextEvent" module="stc">
       <baseclass name="CommandEvent"/>
     </class>
     <class name="StyledTextEvent" oldname="wxStyledTextEvent" module="stc">
       <baseclass name="CommandEvent"/>


@@ -34115,7 +36471,7 @@ ControlPoint =      PyControlPoint
         </paramlist>
       </method>
       <method name="SetDragResult" type="" overloaded="no">
         </paramlist>
       </method>
       <method name="SetDragResult" type="" overloaded="no">

-        <autodoc>SetDragResult(wxDragResult val)</autodoc>
+        <autodoc>SetDragResult(int val)</autodoc>

         <paramlist>
           <param name="val" type="wxDragResult" default=""/>
         </paramlist>
         <paramlist>
           <param name="val" type="wxDragResult" default=""/>
         </paramlist>


@@ -34178,7 +36534,7 @@ ControlPoint =      PyControlPoint
         <autodoc>GetDragAllowMove() -&gt; bool</autodoc>
       </method>
       <method name="GetDragResult" type="wxDragResult" overloaded="no">
         <autodoc>GetDragAllowMove() -&gt; bool</autodoc>
       </method>
       <method name="GetDragResult" type="wxDragResult" overloaded="no">

-        <autodoc>GetDragResult() -&gt; wxDragResult</autodoc>
+        <autodoc>GetDragResult() -&gt; int</autodoc>

       </method>
       <method name="GetShift" type="bool" overloaded="no">
         <autodoc>GetShift() -&gt; bool</autodoc>
       </method>
       <method name="GetShift" type="bool" overloaded="no">
         <autodoc>GetShift() -&gt; bool</autodoc>


@@ -34277,7 +36633,7 @@ EVT_STC_CALLTIP_CLICK = wx.PyEventBinder( wxEVT_STC_CALLTIP_CLICK, 1 )
         <autodoc>ClearHandlers()</autodoc>
       </method>
       <staticmethod name="AddSubclassFactory" type="" overloaded="no">
         <autodoc>ClearHandlers()</autodoc>
       </method>
       <staticmethod name="AddSubclassFactory" type="" overloaded="no">

-        <autodoc>XmlResource.AddSubclassFactory(XmlSubclassFactory factory)</autodoc>
+        <autodoc>AddSubclassFactory(XmlSubclassFactory factory)</autodoc>

         <paramlist>
           <param name="factory" type="wxPyXmlSubclassFactory" default=""/>
         </paramlist>
         <paramlist>
           <param name="factory" type="wxPyXmlSubclassFactory" default=""/>
         </paramlist>


@@ -34391,7 +36747,7 @@ EVT_STC_CALLTIP_CLICK = wx.PyEventBinder( wxEVT_STC_CALLTIP_CLICK, 1 )
         </paramlist>
       </method>
       <staticmethod name="GetXRCID" type="int" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="GetXRCID" type="int" overloaded="no">

-        <autodoc>XmlResource.GetXRCID(String str_id) -&gt; int</autodoc>
+        <autodoc>GetXRCID(String str_id) -&gt; int</autodoc>

         <paramlist>
           <param name="str_id" type="String" default=""/>
         </paramlist>
         <paramlist>
           <param name="str_id" type="String" default=""/>
         </paramlist>


@@ -34409,10 +36765,10 @@ EVT_STC_CALLTIP_CLICK = wx.PyEventBinder( wxEVT_STC_CALLTIP_CLICK, 1 )
         </paramlist>
       </method>
       <staticmethod name="Get" type="XmlResource" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="Get" type="XmlResource" overloaded="no">

-        <autodoc>XmlResource.Get() -&gt; XmlResource</autodoc>
+        <autodoc>Get() -&gt; XmlResource</autodoc>

       </staticmethod>
       <staticmethod name="Set" type="XmlResource" overloaded="no">
       </staticmethod>
       <staticmethod name="Set" type="XmlResource" overloaded="no">

-        <autodoc>XmlResource.Set(XmlResource res) -&gt; XmlResource</autodoc>
+        <autodoc>Set(XmlResource res) -&gt; XmlResource</autodoc>

         <paramlist>
           <param name="res" type="XmlResource" default=""/>
         </paramlist>
         <paramlist>
           <param name="res" type="XmlResource" default=""/>
         </paramlist>


@@ -35305,6 +37661,7 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
     Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
     Validator validator=DefaultValidator, 
     String name=TreeListCtrlNameStr) -&gt; bool</autodoc>
     Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
     Validator validator=DefaultValidator, 
     String name=TreeListCtrlNameStr) -&gt; bool</autodoc>

+        <docstring>Do the 2nd phase and create the GUI control.</docstring>

         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>