applied patch 890642: wxRE_ADVANCED flag and docs

[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..50c344832c0b5fad21b560ce225a6042702ed644 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>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">
-        <autodoc>FileSystem.CleanUpHandlers()</autodoc>
+        <autodoc>CleanUpHandlers()</autodoc>
       </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>
@@ -998,7 +998,7 @@ def MemoryFSHandler_AddFile(filename, a, b=''):
         <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>
@@ -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>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=""/>
@@ -1267,13 +1267,13 @@ values.</docstring>
         </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">
-        <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"/>
@@ -1310,7 +1310,7 @@ values.</docstring>
         </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>
@@ -1506,25 +1506,25 @@ values.</docstring>
         </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">
-        <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">
-        <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">
-        <autodoc>Image.GetImageExtWildcard() -&gt; String</autodoc>
+        <autodoc>GetImageExtWildcard() -&gt; String</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">
-        <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">
-        <autodoc>UpdateUIEvent.GetUpdateInterval() -&gt; long</autodoc>
+        <autodoc>GetUpdateInterval() -&gt; long</autodoc>
       </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">
-        <autodoc>UpdateUIEvent.ResetUpdateTime()</autodoc>
+        <autodoc>ResetUpdateTime()</autodoc>
       </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">
-        <autodoc>UpdateUIEvent.GetMode() -&gt; int</autodoc>
+        <autodoc>GetMode() -&gt; int</autodoc>
       </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>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">
-        <autodoc>IdleEvent.GetMode() -&gt; int</autodoc>
+        <autodoc>GetMode() -&gt; int</autodoc>
       </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>
@@ -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>
+        <docstring>Create a new application object, starting the bootstrap process.</docstring>
       </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">
-        <autodoc>PyApp.GetMacSupportPCMenuShortcuts() -&gt; bool</autodoc>
+        <autodoc>GetMacSupportPCMenuShortcuts() -&gt; bool</autodoc>
       </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">
-        <autodoc>PyApp.GetMacPreferencesMenuItemId() -&gt; long</autodoc>
+        <autodoc>GetMacPreferencesMenuItemId() -&gt; long</autodoc>
       </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">
-        <autodoc>PyApp.GetMacHelpMenuTitleName() -&gt; String</autodoc>
+        <autodoc>GetMacHelpMenuTitleName() -&gt; String</autodoc>
       </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">
-        <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">
-        <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">
-        <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">
-        <autodoc>PyApp.SetMacHelpMenuTitleName(String val)</autodoc>
+        <autodoc>SetMacHelpMenuTitleName(String val)</autodoc>
         <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">
-        <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>
@@ -3697,16 +3698,16 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
         <autodoc>GetId() -&gt; int</autodoc>
       </method>
       <staticmethod name="NewControlId" type="int" overloaded="no">
-        <autodoc>Window.NewControlId() -&gt; int</autodoc>
+        <autodoc>NewControlId() -&gt; int</autodoc>
       </staticmethod>
       <staticmethod name="NextControlId" type="int" overloaded="no">
-        <autodoc>Window.NextControlId(int winid) -&gt; int</autodoc>
+        <autodoc>NextControlId(int winid) -&gt; int</autodoc>
         <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>
         <paramlist>
           <param name="winid" type="int" default=""/>
         </paramlist>
@@ -4026,7 +4027,7 @@ more or less independent of the screen window size.</docstring>
         <autodoc>SetFocusFromKbd()</autodoc>
       </method>
       <staticmethod name="FindFocus" type="Window" overloaded="no">
-        <autodoc>Window.FindFocus() -&gt; Window</autodoc>
+        <autodoc>FindFocus() -&gt; Window</autodoc>
       </staticmethod>
       <method name="AcceptsFocus" type="bool" overloaded="no">
         <autodoc>AcceptsFocus() -&gt; bool</autodoc>
@@ -4200,7 +4201,7 @@ more or less independent of the screen window size.</docstring>
         <autodoc>ReleaseMouse()</autodoc>
       </method>
       <staticmethod name="GetCapture" type="Window" overloaded="no">
-        <autodoc>Window.GetCapture() -&gt; Window</autodoc>
+        <autodoc>GetCapture() -&gt; Window</autodoc>
       </staticmethod>
       <method name="HasCapture" type="bool" overloaded="no">
         <autodoc>HasCapture() -&gt; bool</autodoc>
@@ -4642,10 +4643,10 @@ def DLG_SZE(win, size_width, height=None):
         </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">
-        <autodoc>Validator.SetBellOnError(int doIt=True)</autodoc>
+        <autodoc>SetBellOnError(int doIt=True)</autodoc>
         <paramlist>
           <param name="doIt" type="int" default="True"/>
         </paramlist>
@@ -4677,8 +4678,8 @@ def DLG_SZE(win, size_width, height=None):
           <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=""/>
@@ -4686,27 +4687,27 @@ def DLG_SZE(win, size_width, height=None):
           <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 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>
-      <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>
-      <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=""/>
@@ -4714,8 +4715,8 @@ def DLG_SZE(win, size_width, height=None):
           <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>
@@ -4723,16 +4724,16 @@ def DLG_SZE(win, size_width, height=None):
       <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>
-      <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, 
-    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=""/>
@@ -4741,14 +4742,14 @@ def DLG_SZE(win, size_width, height=None):
           <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>
-      <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=""/>
@@ -4756,8 +4757,8 @@ def DLG_SZE(win, size_width, height=None):
           <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=""/>
@@ -4765,8 +4766,8 @@ def DLG_SZE(win, size_width, height=None):
           <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=""/>
@@ -4775,14 +4776,14 @@ def DLG_SZE(win, size_width, height=None):
           <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>
-      <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=""/>
@@ -4790,27 +4791,27 @@ def DLG_SZE(win, size_width, height=None):
           <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 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>
-      <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>
-      <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=""/>
@@ -5211,7 +5212,7 @@ def DLG_SZE(win, size_width, height=None):
         <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>
@@ -5280,7 +5281,7 @@ def DLG_SZE(win, size_width, height=None):
         </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>
@@ -6828,6 +6829,11 @@ _core._wxPyFixStockObjects()
         <autodoc>Get() -&gt; PyObject</autodoc>
       </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">
@@ -6937,6 +6943,12 @@ _core._wxPyFixStockObjects()
       <method name="GetDashes" type="PyObject" overloaded="no">
         <autodoc>GetDashes() -&gt; PyObject</autodoc>
       </method>
+      <method name="__eq__" type="bool" overloaded="no">
+        <autodoc>__eq__(Pen pen) -&gt; bool</autodoc>
+        <paramlist>
+          <param name="pen" type="Pen" default=""/>
+        </paramlist>
+      </method>
       <method name="GetDashCount" type="int" overloaded="no">
         <autodoc>GetDashCount() -&gt; int</autodoc>
       </method>
@@ -7175,22 +7187,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">
-        <autodoc>__init__(Bitmap bitmap) -&gt; Mask</autodoc>
-        <docstring>Constructs a mask from a monochrome bitmap.</docstring>
-        <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>
+        <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=""/>
-          <param name="colour" type="Colour" default=""/>
+          <param name="colour" type="Colour" default="wxNullColour"/>
         </paramlist>
       </constructor>
     </class>
+    <pythoncode> MaskColour = Mask </pythoncode>
     <class name="Icon" oldname="wxIcon" module="gdi">
       <baseclass name="GDIObject"/>
       <constructor name="Icon" overloaded="no">
@@ -7752,10 +7758,10 @@ background.</docstring>
         <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">
-        <autodoc>FontMapper.Set(FontMapper mapper) -&gt; FontMapper</autodoc>
+        <autodoc>Set(FontMapper mapper) -&gt; FontMapper</autodoc>
         <paramlist>
           <param name="mapper" type="FontMapper" default=""/>
         </paramlist>
@@ -7768,22 +7774,22 @@ background.</docstring>
         </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">
-        <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">
-        <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">
-        <autodoc>FontMapper.GetEncodingDescription(int encoding) -&gt; String</autodoc>
+        <autodoc>GetEncodingDescription(int encoding) -&gt; String</autodoc>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>
@@ -7801,7 +7807,7 @@ background.</docstring>
         </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>
@@ -8003,10 +8009,10 @@ background.</docstring>
         <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">
-        <autodoc>Font.SetDefaultEncoding(int encoding)</autodoc>
+        <autodoc>SetDefaultEncoding(int encoding)</autodoc>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>
@@ -8089,13 +8095,13 @@ background.</docstring>
         </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">
-        <autodoc>Locale.GetSystemEncoding() -&gt; int</autodoc>
+        <autodoc>GetSystemEncoding() -&gt; int</autodoc>
       </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>
@@ -8113,7 +8119,7 @@ background.</docstring>
         <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>
@@ -8131,25 +8137,25 @@ background.</docstring>
         </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">
-        <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">
-        <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">
-        <autodoc>Locale.AddLanguage(LanguageInfo info)</autodoc>
+        <autodoc>AddLanguage(LanguageInfo info)</autodoc>
         <paramlist>
           <param name="info" type="LanguageInfo" default=""/>
         </paramlist>
@@ -8170,15 +8176,15 @@ background.</docstring>
     </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">
-      <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>
-        <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>
@@ -8208,20 +8214,20 @@ GetTranslation(String sz1, String sz2, size_t n) -&gt; String</autodoc>
         </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">
-        <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">
-        <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=""/>
@@ -8755,6 +8761,12 @@ Works for single as well as multi-line strings.</docstring>
           <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>
@@ -9079,18 +9091,27 @@ Works for single as well as multi-line strings.</docstring>
 </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>
+      <constructor name="BufferedDC" overloaded="yes">
+        <autodoc>__init__(DC dc, Bitmap buffer) -&gt; BufferedDC
+__init__(DC dc, Size area, int flags=BUFFER_DC_DEFAULT) -&gt; BufferedDC</autodoc>
+        <paramlist>
+          <param name="dc" type="DC" default=""/>
+          <param name="area" type="Size" default=""/>
+          <param name="flags" type="int" default="wxBUFFER_DC_DEFAULT"/>
+        </paramlist>
+      </constructor>
       <constructor name="BufferedDCInternalBuffer" overloaded="no">
-        <autodoc>BufferedDCInternalBuffer(DC dc, Size area) -&gt; BufferedDC</autodoc>
+        <autodoc>BufferedDCInternalBuffer(DC dc, Size area, int flags=BUFFER_DC_DEFAULT) -&gt; BufferedDC</autodoc>
         <paramlist>
           <param name="dc" type="DC" default=""/>
           <param name="area" type="Size" default=""/>
+          <param name="flags" type="int" default="wxBUFFER_DC_DEFAULT"/>
         </paramlist>
       </constructor>
       <method name="UnMask" type="" overloaded="no">
@@ -9099,11 +9120,18 @@ Works for single as well as multi-line strings.</docstring>
     </class>
     <class name="BufferedPaintDC" oldname="wxBufferedPaintDC" module="gdi">
       <baseclass name="BufferedDC"/>
-      <constructor name="BufferedPaintDC" overloaded="no">
-        <autodoc>__init__(Window window, Bitmap buffer=NullBitmap) -&gt; BufferedPaintDC</autodoc>
+      <constructor name="BufferedPaintDC" overloaded="yes">
         <paramlist>
           <param name="window" type="Window" default=""/>
-          <param name="buffer" type="Bitmap" default="wxNullBitmap"/>
+          <param name="buffer" type="Bitmap" default=""/>
+        </paramlist>
+      </constructor>
+      <constructor name="BufferedPaintDC" overloaded="yes">
+        <autodoc>__init__(Window window, Bitmap buffer) -&gt; BufferedPaintDC
+__init__(Window window, int flags=BUFFER_DC_DEFAULT) -&gt; BufferedPaintDC</autodoc>
+        <paramlist>
+          <param name="window" type="Window" default=""/>
+          <param name="flags" type="int" default="wxBUFFER_DC_DEFAULT"/>
         </paramlist>
       </constructor>
     </class>
@@ -9201,13 +9229,13 @@ Works for single as well as multi-line strings.</docstring>
         </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">
-        <autodoc>PostScriptDC.GetResolution() -&gt; int</autodoc>
+        <autodoc>GetResolution() -&gt; int</autodoc>
       </staticmethod>
     </class>
     <pythoncode>
@@ -9699,6 +9727,7 @@ Works for single as well as multi-line strings.</docstring>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
+    <pythoncode> NullColor = NullColour </pythoncode>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
@@ -10452,12 +10481,12 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
     <class name="SplitterWindow" oldname="wxSplitterWindow" module="windows">
       <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>
         <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"/>
@@ -10467,12 +10496,12 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
         <autodoc>PreSplitterWindow() -&gt; SplitterWindow</autodoc>
       </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>
         <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"/>
@@ -11593,15 +11622,15 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
     <class name="MultiChoiceDialog" oldname="wxMultiChoiceDialog" module="windows">
       <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, int choices=0, 
+    String choices_array, long style=CHOICEDLG_STYLE, 
     Point pos=DefaultPosition) -&gt; MultiChoiceDialog</autodoc>
         <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>
@@ -12491,6 +12520,15 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <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"/>
@@ -12865,7 +12903,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
         <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">
@@ -13404,18 +13442,22 @@ 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">
-        <autodoc>Button.GetDefaultSize() -&gt; Size</autodoc>
+        <autodoc>GetDefaultSize() -&gt; Size</autodoc>
       </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>
       <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=""/>
@@ -13580,7 +13622,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       <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, 
+    wxArrayString choices=wxPyEmptyStringArray, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ChoiceNameStr) -&gt; Choice</autodoc>
         <paramlist>
@@ -13588,8 +13630,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="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"/>
@@ -13600,7 +13641,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, 
-    int choices=0, String choices_array=None, 
+    wxArrayString choices=wxPyEmptyStringArray, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ChoiceNameStr) -&gt; bool</autodoc>
         <paramlist>
@@ -13608,8 +13649,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="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"/>
@@ -13653,7 +13693,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       <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, 
+    wxArrayString choices=wxPyEmptyStringArray, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ComboBoxNameStr) -&gt; ComboBox</autodoc>
         <paramlist>
@@ -13662,8 +13702,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
           <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"/>
@@ -13675,7 +13714,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       <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, 
+    wxArrayString choices=wxPyEmptyStringArray, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ComboBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
@@ -13684,8 +13723,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
           <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"/>
@@ -13914,7 +13952,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>StaticLine.GetDefaultSize() -&gt; int</autodoc>
+        <autodoc>GetDefaultSize() -&gt; int</autodoc>
       </staticmethod>
     </class>
     <pythoncode>
@@ -14013,7 +14051,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, 
-    int choices=0, String choices_array=None, 
+    wxArrayString choices=wxPyEmptyStringArray, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; ListBox</autodoc>
         <paramlist>
@@ -14021,8 +14059,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="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"/>
@@ -14033,7 +14070,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, 
-    int choices=0, String choices_array=None, 
+    wxArrayString choices=wxPyEmptyStringArray, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
@@ -14041,8 +14078,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="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"/>
@@ -14137,6 +14173,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="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>
 #---------------------------------------------------------------------------
@@ -14145,7 +14202,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, 
-    int choices=0, String choices_array=None, 
+    wxArrayString choices=wxPyEmptyStringArray, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; CheckListBox</autodoc>
         <paramlist>
@@ -14153,8 +14210,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="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"/>
@@ -14165,7 +14221,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, 
-    int choices=0, String choices_array=None, 
+    wxArrayString choices=wxPyEmptyStringArray, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
@@ -14173,8 +14229,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="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"/>
@@ -14226,6 +14281,9 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
           <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>
@@ -14333,7 +14391,7 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
         <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=""/>
@@ -14537,6 +14595,17 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
           <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>
@@ -14888,19 +14957,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">
-        <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=""/>
-          <param name="point" type="Point" default="wxDefaultPosition"/>
+          <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="majorDimension" type="int" default="0"/>
           <param name="style" type="long" default="wxRA_HORIZONTAL"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
@@ -14911,19 +14979,18 @@ EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
         <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=""/>
-          <param name="point" type="Point" default="wxDefaultPosition"/>
+          <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="majorDimension" type="int" default="0"/>
           <param name="style" type="long" default="wxRA_HORIZONTAL"/>
           <param name="validator" type="Validator" default="wxDefaultValidator"/>
@@ -15054,7 +15121,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, 
-    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>
@@ -15063,7 +15130,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="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"/>
@@ -15075,7 +15142,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, 
-    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>
@@ -15084,7 +15151,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="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"/>
@@ -15153,10 +15220,10 @@ EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
         <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=""/>
-          <param name="pos" type="int" default=""/>
+          <param name="pos" type="int" default="1"/>
         </paramlist>
       </method>
       <method name="GetTickFreq" type="int" overloaded="no">
@@ -15443,7 +15510,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>
-        <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=""/>
@@ -16852,7 +16919,7 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
           <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">
@@ -17244,10 +17311,10 @@ EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
         </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=""/>
-          <param name="cookie" type="wxTreeItemIdValue" default=""/>
+          <param name="cookie" type="" default=""/>
         </paramlist>
       </method>
       <method name="GetLastChild" type="TreeItemId" overloaded="no">
@@ -17380,11 +17447,24 @@ EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
       <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">
-        <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>
@@ -17802,13 +17882,13 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
     </class>
     <class name="HelpProvider" oldname="wxHelpProvider" module="controls">
       <staticmethod name="Set" type="HelpProvider" overloaded="no">
-        <autodoc>HelpProvider.Set(HelpProvider helpProvider) -&gt; HelpProvider</autodoc>
+        <autodoc>Set(HelpProvider helpProvider) -&gt; HelpProvider</autodoc>
         <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>
       </staticmethod>
       <method name="GetHelp" type="String" overloaded="no">
         <autodoc>GetHelp(Window window) -&gt; String</autodoc>
@@ -17969,34 +18049,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">
-        <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">
-        <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">
-        <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">
-        <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">
-        <autodoc>SystemSettings.GetScreenType() -&gt; int</autodoc>
+        <autodoc>GetScreenType() -&gt; int</autodoc>
       </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>
@@ -18008,33 +18088,33 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
         <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">
-        <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">
-        <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">
-        <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">
-        <autodoc>SystemOptions.HasOption(String name) -&gt; bool</autodoc>
+        <autodoc>HasOption(String name) -&gt; bool</autodoc>
         <paramlist>
           <param name="name" type="String" default=""/>
         </paramlist>
@@ -18423,13 +18503,13 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
         <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">
-        <autodoc>ToolTip.SetDelay(long milliseconds)</autodoc>
+        <autodoc>SetDelay(long milliseconds)</autodoc>
         <paramlist>
           <param name="milliseconds" type="long" default=""/>
         </paramlist>
@@ -18841,16 +18921,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>Log.IsEnabled() -&gt; bool</autodoc>
+        <autodoc>IsEnabled() -&gt; bool</autodoc>
       </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">
-        <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=""/>
@@ -18861,88 +18941,88 @@ __init__(wxTimer timer, int milli, bool oneShot=False) -&gt; TimerRunner</autodo
         <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">
-        <autodoc>Log.GetActiveTarget() -&gt; Log</autodoc>
+        <autodoc>GetActiveTarget() -&gt; Log</autodoc>
       </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">
-        <autodoc>Log.Suspend()</autodoc>
+        <autodoc>Suspend()</autodoc>
       </staticmethod>
       <staticmethod name="Resume" type="" overloaded="no">
-        <autodoc>Log.Resume()</autodoc>
+        <autodoc>Resume()</autodoc>
       </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">
-        <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">
-        <autodoc>Log.DontCreateOnDemand()</autodoc>
+        <autodoc>DontCreateOnDemand()</autodoc>
       </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">
-        <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">
-        <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">
-        <autodoc>Log.ClearTraceMasks()</autodoc>
+        <autodoc>ClearTraceMasks()</autodoc>
       </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">
-        <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">
-        <autodoc>Log.GetVerbose() -&gt; bool</autodoc>
+        <autodoc>GetVerbose() -&gt; bool</autodoc>
       </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">
-        <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">
-        <autodoc>Log.GetLogLevel() -&gt; wxLogLevel</autodoc>
+        <autodoc>GetLogLevel() -&gt; wxLogLevel</autodoc>
       </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">
-        <autodoc>Log.TimeStamp() -&gt; String</autodoc>
+        <autodoc>TimeStamp() -&gt; String</autodoc>
       </staticmethod>
       <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>
@@ -19161,20 +19241,20 @@ LogTrace(String mask, String msg)</autodoc>
         </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">
-        <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">
-        <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"/>
@@ -19508,33 +19588,59 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
     <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=""/>
-          <param name="isResource" type="bool" default="False"/>
+          <param name="isResource" type="bool" default="false"/>
         </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>
-          <param name="data" type="String" default=""/>
+          <param name="size" type="int" default=""/>
+          <param name="data" type="wxByte" default=""/>
         </paramlist>
       </constructor>
-      <destructor name="~wxWave" overloaded="no">
+      <destructor name="~wxSound" overloaded="no">
         <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">
-        <autodoc>Play(bool async=True, bool looped=False) -&gt; bool</autodoc>
+        <autodoc>Play(unsigned int flags=SOUND_ASYNC) -&gt; bool</autodoc>
         <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>
+      <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>
 #---------------------------------------------------------------------------
@@ -19670,7 +19776,7 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
         <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=""/>
@@ -19686,7 +19792,7 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
         <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=""/>
@@ -19764,18 +19870,18 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
         </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">
-        <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">
-        <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>
@@ -19783,7 +19889,7 @@ The provider is _not_ deleted.</docstring>
         </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>
@@ -19793,7 +19899,7 @@ wx.NullBitmap if no provider provides it.</docstring>
         </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>
@@ -19814,22 +19920,22 @@ wx.NullIcon if no provider provides it.</docstring>
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="Set" type="ConfigBase" overloaded="no">
-        <autodoc>ConfigBase.Set(ConfigBase pConfig) -&gt; ConfigBase</autodoc>
+        <autodoc>Set(ConfigBase pConfig) -&gt; ConfigBase</autodoc>
         <paramlist>
           <param name="pConfig" type="ConfigBase" default=""/>
         </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>
         <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>
       </staticmethod>
       <staticmethod name="DontCreateOnDemand" type="" overloaded="no">
-        <autodoc>ConfigBase.DontCreateOnDemand()</autodoc>
+        <autodoc>DontCreateOnDemand()</autodoc>
       </staticmethod>
       <method name="SetPath" type="" overloaded="no">
         <autodoc>SetPath(String strPath)</autodoc>
@@ -20140,60 +20246,60 @@ wx.NullIcon if no provider provides it.</docstring>
         <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">
-        <autodoc>DateTime.GetCountry() -&gt; int</autodoc>
+        <autodoc>GetCountry() -&gt; int</autodoc>
       </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">
-        <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">
-        <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">
-        <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">
-        <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">
-        <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">
-        <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">
-        <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"/>
@@ -20201,14 +20307,14 @@ wx.NullIcon if no provider provides it.</docstring>
         </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">
-        <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"/>
@@ -20223,34 +20329,34 @@ wx.NullIcon if no provider provides it.</docstring>
         </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">
-        <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">
-        <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">
-        <autodoc>DateTime.Now() -&gt; DateTime</autodoc>
+        <autodoc>Now() -&gt; DateTime</autodoc>
       </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">
-        <autodoc>DateTime.Today() -&gt; DateTime</autodoc>
+        <autodoc>Today() -&gt; DateTime</autodoc>
       </staticmethod>
       <method name="SetToCurrent" type="DateTime" overloaded="no">
         <autodoc>SetToCurrent() -&gt; DateTime</autodoc>
@@ -20744,7 +20850,7 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
         </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"/>
@@ -20803,49 +20909,49 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
         <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">
-        <autodoc>TimeSpan.Second() -&gt; TimeSpan</autodoc>
+        <autodoc>Second() -&gt; TimeSpan</autodoc>
       </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">
-        <autodoc>TimeSpan.Minute() -&gt; TimeSpan</autodoc>
+        <autodoc>Minute() -&gt; TimeSpan</autodoc>
       </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">
-        <autodoc>TimeSpan.Hour() -&gt; TimeSpan</autodoc>
+        <autodoc>Hour() -&gt; TimeSpan</autodoc>
       </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">
-        <autodoc>TimeSpan.Day() -&gt; TimeSpan</autodoc>
+        <autodoc>Day() -&gt; TimeSpan</autodoc>
       </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">
-        <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>
@@ -21018,40 +21124,40 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
         <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">
-        <autodoc>DateSpan.Day() -&gt; DateSpan</autodoc>
+        <autodoc>Day() -&gt; DateSpan</autodoc>
       </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">
-        <autodoc>DateSpan.Week() -&gt; DateSpan</autodoc>
+        <autodoc>Week() -&gt; DateSpan</autodoc>
       </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">
-        <autodoc>DateSpan.Month() -&gt; DateSpan</autodoc>
+        <autodoc>Month() -&gt; DateSpan</autodoc>
       </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">
-        <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>
@@ -21759,25 +21865,21 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
     <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">
-        <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>
+        <docstring>Create a CalendarDateAttr.</docstring>
         <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>
-      <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>
@@ -21885,12 +21987,106 @@ 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">
+      <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">
-        <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>
+        <docstring>Create and show a calendar control.</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>
         <paramlist>
           <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
@@ -21903,12 +22099,60 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </constructor>
       <constructor name="PreCalendarCtrl" overloaded="no">
         <autodoc>PreCalendarCtrl() -&gt; CalendarCtrl</autodoc>
+        <docstring>Precreate a CalendarCtrl for 2-phase creation.</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>
       </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>
+        <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=""/>
@@ -21921,33 +22165,40 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </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>
+        <docstring>Gets the currently selected date.</docstring>
       </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>
-      <method name="GetLowerDateLimit" type="DateTime" overloaded="no">
-        <autodoc>GetLowerDateLimit() -&gt; DateTime</autodoc>
-      </method>
       <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>
+      <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>
+        <docstring>get the range in which selection can occur</docstring>
       </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"/>
@@ -21955,24 +22206,33 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </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>
+        <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>
+        <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>
+        <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=""/>
@@ -21980,12 +22240,15 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </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>
+        <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>
+        <docstring>highlight colour is used for the currently selected date</docstring>
         <paramlist>
           <param name="colFg" type="Colour" default=""/>
           <param name="colBg" type="Colour" default=""/>
@@ -21993,12 +22256,15 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </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>
+        <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>
+        <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=""/>
@@ -22006,18 +22272,24 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </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>
+        <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>
+        <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>
+        <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=""/>
@@ -22025,41 +22297,39 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </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>
+        <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>
-      <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=""/>
-          <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>
+        <docstring>get the currently shown control for month</docstring>
       </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>
@@ -25405,11 +25675,26 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
         </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>
+      <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>
@@ -25554,13 +25839,13 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
         </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">
-        <autodoc>HtmlPrintout.CleanUpStatics()</autodoc>
+        <autodoc>CleanUpStatics()</autodoc>
       </staticmethod>
     </class>
     <class name="HtmlEasyPrinting" oldname="wxHtmlEasyPrinting" module="html">
@@ -26142,7 +26427,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         </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=""/>
@@ -26304,8 +26589,8 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <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>
@@ -32198,6 +32483,7 @@ ControlPoint =      PyControlPoint
   </module>
   <module name="stc">
     <import name="core"/>
+    <import name="misc"/>
     <pythoncode> wx = core </pythoncode>
     <class name="StyledTextCtrl" oldname="wxStyledTextCtrl" module="stc">
       <baseclass name="Control"/>
@@ -33795,6 +34081,12 @@ ControlPoint =      PyControlPoint
           <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="PositionBefore" type="int" overloaded="no">
         <autodoc>PositionBefore(int pos) -&gt; int</autodoc>
         <paramlist>
@@ -33821,6 +34113,39 @@ ControlPoint =      PyControlPoint
           <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="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>
@@ -33972,7 +34297,7 @@ ControlPoint =      PyControlPoint
         </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=""/>
@@ -33987,6 +34312,15 @@ ControlPoint =      PyControlPoint
           <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"/>
@@ -34115,7 +34449,7 @@ ControlPoint =      PyControlPoint
         </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>
@@ -34178,7 +34512,7 @@ ControlPoint =      PyControlPoint
         <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>
@@ -34277,7 +34611,7 @@ EVT_STC_CALLTIP_CLICK = wx.PyEventBinder( wxEVT_STC_CALLTIP_CLICK, 1 )
         <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>
@@ -34391,7 +34725,7 @@ EVT_STC_CALLTIP_CLICK = wx.PyEventBinder( wxEVT_STC_CALLTIP_CLICK, 1 )
         </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>
@@ -34409,10 +34743,10 @@ EVT_STC_CALLTIP_CLICK = wx.PyEventBinder( wxEVT_STC_CALLTIP_CLICK, 1 )
         </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">
-        <autodoc>XmlResource.Set(XmlResource res) -&gt; XmlResource</autodoc>
+        <autodoc>Set(XmlResource res) -&gt; XmlResource</autodoc>
         <paramlist>
           <param name="res" type="XmlResource" default=""/>
         </paramlist>