From e811c8cebb5c274e50971a6a8ee66fb3ab053eb9 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 19 Nov 2003 06:36:16 +0000
Subject: [PATCH] reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/contrib/gizmos/gizmos.py             |  778 ++-
 wxPython/contrib/gizmos/gizmos_wrap.cpp       |  117 +-
 wxPython/contrib/glcanvas/gtk/glcanvas.py     |   83 +-
 .../contrib/glcanvas/gtk/glcanvas_wrap.cpp    |   20 +-
 wxPython/contrib/ogl/ogl.py                   | 4261 +++++++++---
 wxPython/contrib/ogl/ogl_wrap.cpp             |  210 +-
 wxPython/contrib/stc/stc.py                   | 1931 ++++--
 wxPython/contrib/stc/stc_wrap.cpp             |  144 +-
 wxPython/contrib/xrc/xrc.py                   |  596 +-
 wxPython/contrib/xrc/xrc_wrap.cpp             |  278 +-
 wxPython/src/gtk/calendar.py                  |  259 +-
 wxPython/src/gtk/calendar_wrap.cpp            |   22 +-
 wxPython/src/gtk/controls.py                  | 3755 ++++++++---
 wxPython/src/gtk/controls_wrap.cpp            | 1887 ++++--
 wxPython/src/gtk/core.py                      | 5748 +++++++++++++----
 wxPython/src/gtk/core_wrap.cpp                | 1245 ++--
 wxPython/src/gtk/gdi.py                       | 2357 +++++--
 wxPython/src/gtk/gdi_wrap.cpp                 | 1641 ++---
 wxPython/src/gtk/grid.py                      | 2151 ++++--
 wxPython/src/gtk/grid_wrap.cpp                |  216 +-
 wxPython/src/gtk/html.py                      | 1411 +++-
 wxPython/src/gtk/html_wrap.cpp                |  413 +-
 wxPython/src/gtk/misc.py                      | 3830 ++++++++---
 wxPython/src/gtk/misc_wrap.cpp                |  750 +--
 wxPython/src/gtk/windows.py                   | 3188 +++++++--
 wxPython/src/gtk/windows_wrap.cpp             |  510 +-
 wxPython/src/gtk/wizard.py                    |  257 +-
 wxPython/src/gtk/wizard_wrap.cpp              |   20 +-
 wxPython/wxPython/controls.py                 |    5 +
 wxPython/wxPython/core.py                     |    1 +
 wxPython/wxPython/gdi.py                      |    5 -
 31 files changed, 28078 insertions(+), 10011 deletions(-)

diff --git a/wxPython/contrib/gizmos/gizmos.py b/wxPython/contrib/gizmos/gizmos.py
index 822bebeb25..61d68a4af2 100644
--- a/wxPython/contrib/gizmos/gizmos.py
+++ b/wxPython/contrib/gizmos/gizmos.py
@@ -12,13 +12,15 @@ wxEVT_DYNAMIC_SASH_UNIFY = _gizmos.wxEVT_DYNAMIC_SASH_UNIFY
 DS_MANAGE_SCROLLBARS = _gizmos.DS_MANAGE_SCROLLBARS
 DS_DRAG_CORNER = _gizmos.DS_DRAG_CORNER
 class DynamicSashSplitEvent(core.CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDynamicSashSplitEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Object target) -> DynamicSashSplitEvent"""
         newobj = _gizmos.new_DynamicSashSplitEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDynamicSashSplitEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class DynamicSashSplitEventPtr(DynamicSashSplitEvent):
     def __init__(self, this):
@@ -28,13 +30,15 @@ class DynamicSashSplitEventPtr(DynamicSashSplitEvent):
 _gizmos.DynamicSashSplitEvent_swigregister(DynamicSashSplitEventPtr)
 
 class DynamicSashUnifyEvent(core.CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDynamicSashUnifyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Object target) -> DynamicSashUnifyEvent"""
         newobj = _gizmos.new_DynamicSashUnifyEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDynamicSashUnifyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class DynamicSashUnifyEventPtr(DynamicSashUnifyEvent):
     def __init__(self, this):
@@ -44,17 +48,33 @@ class DynamicSashUnifyEventPtr(DynamicSashUnifyEvent):
 _gizmos.DynamicSashUnifyEvent_swigregister(DynamicSashUnifyEventPtr)
 
 class DynamicSashWindow(core.Window):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDynamicSashWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=wxCLIP_CHILDREN|wxDS_MANAGE_SCROLLBARS|wxDS_DRAG_CORNER, 
+    wxString name=wxPyDynamicSashNameStr) -> DynamicSashWindow"""
         newobj = _gizmos.new_DynamicSashWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _gizmos.DynamicSashWindow_Create(*args, **kwargs)
-    def GetHScrollBar(*args, **kwargs): return _gizmos.DynamicSashWindow_GetHScrollBar(*args, **kwargs)
-    def GetVScrollBar(*args, **kwargs): return _gizmos.DynamicSashWindow_GetVScrollBar(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDynamicSashWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=wxCLIP_CHILDREN|wxDS_MANAGE_SCROLLBARS|wxDS_DRAG_CORNER, 
+    wxString name=wxPyDynamicSashNameStr) -> bool"""
+        return _gizmos.DynamicSashWindow_Create(*args, **kwargs)
+
+    def GetHScrollBar(*args, **kwargs):
+        """GetHScrollBar(Window child) -> ScrollBar"""
+        return _gizmos.DynamicSashWindow_GetHScrollBar(*args, **kwargs)
+
+    def GetVScrollBar(*args, **kwargs):
+        """GetVScrollBar(Window child) -> ScrollBar"""
+        return _gizmos.DynamicSashWindow_GetVScrollBar(*args, **kwargs)
+
 
 class DynamicSashWindowPtr(DynamicSashWindow):
     def __init__(self, this):
@@ -64,6 +84,7 @@ class DynamicSashWindowPtr(DynamicSashWindow):
 _gizmos.DynamicSashWindow_swigregister(DynamicSashWindowPtr)
 
 def PreDynamicSashWindow(*args, **kwargs):
+    """PreDynamicSashWindow() -> DynamicSashWindow"""
     val = _gizmos.new_PreDynamicSashWindow(*args, **kwargs)
     val.thisown = 1
     return val
@@ -75,22 +96,51 @@ EL_ALLOW_NEW = _gizmos.EL_ALLOW_NEW
 EL_ALLOW_EDIT = _gizmos.EL_ALLOW_EDIT
 EL_ALLOW_DELETE = _gizmos.EL_ALLOW_DELETE
 class EditableListBox(windows.Panel):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxEditableListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=wxEL_ALLOW_NEW|wxEL_ALLOW_EDIT|wxEL_ALLOW_DELETE, 
+    wxString name=wxPyEditableListBoxNameStr) -> EditableListBox"""
         newobj = _gizmos.new_EditableListBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def SetStrings(*args, **kwargs): return _gizmos.EditableListBox_SetStrings(*args, **kwargs)
-    def GetStrings(*args, **kwargs): return _gizmos.EditableListBox_GetStrings(*args, **kwargs)
-    def GetListCtrl(*args, **kwargs): return _gizmos.EditableListBox_GetListCtrl(*args, **kwargs)
-    def GetDelButton(*args, **kwargs): return _gizmos.EditableListBox_GetDelButton(*args, **kwargs)
-    def GetNewButton(*args, **kwargs): return _gizmos.EditableListBox_GetNewButton(*args, **kwargs)
-    def GetUpButton(*args, **kwargs): return _gizmos.EditableListBox_GetUpButton(*args, **kwargs)
-    def GetDownButton(*args, **kwargs): return _gizmos.EditableListBox_GetDownButton(*args, **kwargs)
-    def GetEditButton(*args, **kwargs): return _gizmos.EditableListBox_GetEditButton(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxEditableListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetStrings(*args, **kwargs):
+        """SetStrings(wxArrayString strings)"""
+        return _gizmos.EditableListBox_SetStrings(*args, **kwargs)
+
+    def GetStrings(*args, **kwargs):
+        """GetStrings() -> PyObject"""
+        return _gizmos.EditableListBox_GetStrings(*args, **kwargs)
+
+    def GetListCtrl(*args, **kwargs):
+        """GetListCtrl() -> wxListCtrl"""
+        return _gizmos.EditableListBox_GetListCtrl(*args, **kwargs)
+
+    def GetDelButton(*args, **kwargs):
+        """GetDelButton() -> BitmapButton"""
+        return _gizmos.EditableListBox_GetDelButton(*args, **kwargs)
+
+    def GetNewButton(*args, **kwargs):
+        """GetNewButton() -> BitmapButton"""
+        return _gizmos.EditableListBox_GetNewButton(*args, **kwargs)
+
+    def GetUpButton(*args, **kwargs):
+        """GetUpButton() -> BitmapButton"""
+        return _gizmos.EditableListBox_GetUpButton(*args, **kwargs)
+
+    def GetDownButton(*args, **kwargs):
+        """GetDownButton() -> BitmapButton"""
+        return _gizmos.EditableListBox_GetDownButton(*args, **kwargs)
+
+    def GetEditButton(*args, **kwargs):
+        """GetEditButton() -> BitmapButton"""
+        return _gizmos.EditableListBox_GetEditButton(*args, **kwargs)
+
 
 class EditableListBoxPtr(EditableListBox):
     def __init__(self, this):
@@ -100,20 +150,42 @@ class EditableListBoxPtr(EditableListBox):
 _gizmos.EditableListBox_swigregister(EditableListBoxPtr)
 
 class RemotelyScrolledTreeCtrl(controls.TreeCtrl):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxRemotelyScrolledTreeCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=TR_HAS_BUTTONS) -> RemotelyScrolledTreeCtrl"""
         newobj = _gizmos.new_RemotelyScrolledTreeCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def HideVScrollbar(*args, **kwargs): return _gizmos.RemotelyScrolledTreeCtrl_HideVScrollbar(*args, **kwargs)
-    def AdjustRemoteScrollbars(*args, **kwargs): return _gizmos.RemotelyScrolledTreeCtrl_AdjustRemoteScrollbars(*args, **kwargs)
-    def GetScrolledWindow(*args, **kwargs): return _gizmos.RemotelyScrolledTreeCtrl_GetScrolledWindow(*args, **kwargs)
-    def ScrollToLine(*args, **kwargs): return _gizmos.RemotelyScrolledTreeCtrl_ScrollToLine(*args, **kwargs)
-    def SetCompanionWindow(*args, **kwargs): return _gizmos.RemotelyScrolledTreeCtrl_SetCompanionWindow(*args, **kwargs)
-    def GetCompanionWindow(*args, **kwargs): return _gizmos.RemotelyScrolledTreeCtrl_GetCompanionWindow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxRemotelyScrolledTreeCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def HideVScrollbar(*args, **kwargs):
+        """HideVScrollbar()"""
+        return _gizmos.RemotelyScrolledTreeCtrl_HideVScrollbar(*args, **kwargs)
+
+    def AdjustRemoteScrollbars(*args, **kwargs):
+        """AdjustRemoteScrollbars()"""
+        return _gizmos.RemotelyScrolledTreeCtrl_AdjustRemoteScrollbars(*args, **kwargs)
+
+    def GetScrolledWindow(*args, **kwargs):
+        """GetScrolledWindow() -> ScrolledWindow"""
+        return _gizmos.RemotelyScrolledTreeCtrl_GetScrolledWindow(*args, **kwargs)
+
+    def ScrollToLine(*args, **kwargs):
+        """ScrollToLine(int posHoriz, int posVert)"""
+        return _gizmos.RemotelyScrolledTreeCtrl_ScrollToLine(*args, **kwargs)
+
+    def SetCompanionWindow(*args, **kwargs):
+        """SetCompanionWindow(Window companion)"""
+        return _gizmos.RemotelyScrolledTreeCtrl_SetCompanionWindow(*args, **kwargs)
+
+    def GetCompanionWindow(*args, **kwargs):
+        """GetCompanionWindow() -> Window"""
+        return _gizmos.RemotelyScrolledTreeCtrl_GetCompanionWindow(*args, **kwargs)
+
 
 class RemotelyScrolledTreeCtrlPtr(RemotelyScrolledTreeCtrl):
     def __init__(self, this):
@@ -123,17 +195,30 @@ class RemotelyScrolledTreeCtrlPtr(RemotelyScrolledTreeCtrl):
 _gizmos.RemotelyScrolledTreeCtrl_swigregister(RemotelyScrolledTreeCtrlPtr)
 
 class TreeCompanionWindow(core.Window):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyTreeCompanionWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0) -> TreeCompanionWindow"""
         newobj = _gizmos.new_TreeCompanionWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self);self._setCallbackInfo(self, TreeCompanionWindow)
-    def _setCallbackInfo(*args, **kwargs): return _gizmos.TreeCompanionWindow__setCallbackInfo(*args, **kwargs)
-    def GetTreeCtrl(*args, **kwargs): return _gizmos.TreeCompanionWindow_GetTreeCtrl(*args, **kwargs)
-    def SetTreeCtrl(*args, **kwargs): return _gizmos.TreeCompanionWindow_SetTreeCtrl(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTreeCompanionWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _gizmos.TreeCompanionWindow__setCallbackInfo(*args, **kwargs)
+
+    def GetTreeCtrl(*args, **kwargs):
+        """GetTreeCtrl() -> RemotelyScrolledTreeCtrl"""
+        return _gizmos.TreeCompanionWindow_GetTreeCtrl(*args, **kwargs)
+
+    def SetTreeCtrl(*args, **kwargs):
+        """SetTreeCtrl(RemotelyScrolledTreeCtrl treeCtrl)"""
+        return _gizmos.TreeCompanionWindow_SetTreeCtrl(*args, **kwargs)
+
 
 class TreeCompanionWindowPtr(TreeCompanionWindow):
     def __init__(self, this):
@@ -143,14 +228,18 @@ class TreeCompanionWindowPtr(TreeCompanionWindow):
 _gizmos.TreeCompanionWindow_swigregister(TreeCompanionWindowPtr)
 
 class ThinSplitterWindow(windows.SplitterWindow):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxThinSplitterWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=wxSP_3D|wxCLIP_CHILDREN) -> ThinSplitterWindow"""
         newobj = _gizmos.new_ThinSplitterWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxThinSplitterWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class ThinSplitterWindowPtr(ThinSplitterWindow):
     def __init__(self, this):
@@ -160,14 +249,18 @@ class ThinSplitterWindowPtr(ThinSplitterWindow):
 _gizmos.ThinSplitterWindow_swigregister(ThinSplitterWindowPtr)
 
 class SplitterScrolledWindow(windows.ScrolledWindow):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSplitterScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0) -> SplitterScrolledWindow"""
         newobj = _gizmos.new_SplitterScrolledWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSplitterScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class SplitterScrolledWindowPtr(SplitterScrolledWindow):
     def __init__(self, this):
@@ -182,21 +275,47 @@ LED_ALIGN_CENTER = _gizmos.LED_ALIGN_CENTER
 LED_ALIGN_MASK = _gizmos.LED_ALIGN_MASK
 LED_DRAW_FADED = _gizmos.LED_DRAW_FADED
 class LEDNumberCtrl(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxLEDNumberCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=wxLED_ALIGN_LEFT|wxLED_DRAW_FADED) -> LEDNumberCtrl"""
         newobj = _gizmos.new_LEDNumberCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _gizmos.LEDNumberCtrl_Create(*args, **kwargs)
-    def GetAlignment(*args, **kwargs): return _gizmos.LEDNumberCtrl_GetAlignment(*args, **kwargs)
-    def GetDrawFaded(*args, **kwargs): return _gizmos.LEDNumberCtrl_GetDrawFaded(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _gizmos.LEDNumberCtrl_GetValue(*args, **kwargs)
-    def SetAlignment(*args, **kwargs): return _gizmos.LEDNumberCtrl_SetAlignment(*args, **kwargs)
-    def SetDrawFaded(*args, **kwargs): return _gizmos.LEDNumberCtrl_SetDrawFaded(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _gizmos.LEDNumberCtrl_SetValue(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLEDNumberCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=wxLED_ALIGN_LEFT|wxLED_DRAW_FADED) -> bool"""
+        return _gizmos.LEDNumberCtrl_Create(*args, **kwargs)
+
+    def GetAlignment(*args, **kwargs):
+        """GetAlignment() -> wxLEDValueAlign"""
+        return _gizmos.LEDNumberCtrl_GetAlignment(*args, **kwargs)
+
+    def GetDrawFaded(*args, **kwargs):
+        """GetDrawFaded() -> bool"""
+        return _gizmos.LEDNumberCtrl_GetDrawFaded(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> wxString"""
+        return _gizmos.LEDNumberCtrl_GetValue(*args, **kwargs)
+
+    def SetAlignment(*args, **kwargs):
+        """SetAlignment(wxLEDValueAlign Alignment, bool Redraw=true)"""
+        return _gizmos.LEDNumberCtrl_SetAlignment(*args, **kwargs)
+
+    def SetDrawFaded(*args, **kwargs):
+        """SetDrawFaded(bool DrawFaded, bool Redraw=true)"""
+        return _gizmos.LEDNumberCtrl_SetDrawFaded(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(wxString Value, bool Redraw=true)"""
+        return _gizmos.LEDNumberCtrl_SetValue(*args, **kwargs)
+
 
 class LEDNumberCtrlPtr(LEDNumberCtrl):
     def __init__(self, this):
@@ -206,6 +325,7 @@ class LEDNumberCtrlPtr(LEDNumberCtrl):
 _gizmos.LEDNumberCtrl_swigregister(LEDNumberCtrlPtr)
 
 def PreLEDNumberCtrl(*args, **kwargs):
+    """PreLEDNumberCtrl() -> LEDNumberCtrl"""
     val = _gizmos.new_PreLEDNumberCtrl(*args, **kwargs)
     val.thisown = 1
     return val
@@ -215,23 +335,56 @@ TL_ALIGN_RIGHT = _gizmos.TL_ALIGN_RIGHT
 TL_ALIGN_CENTER = _gizmos.TL_ALIGN_CENTER
 TREE_HITTEST_ONITEMCOLUMN = _gizmos.TREE_HITTEST_ONITEMCOLUMN
 class TreeListColumnInfo(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTreeListColumnInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString text=wxPyEmptyString, int image=-1, size_t width=100, 
+    wxTreeListColumnAlign alignment=TL_ALIGN_LEFT) -> TreeListColumnInfo"""
         newobj = _gizmos.new_TreeListColumnInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetAlignment(*args, **kwargs): return _gizmos.TreeListColumnInfo_GetAlignment(*args, **kwargs)
-    def GetText(*args, **kwargs): return _gizmos.TreeListColumnInfo_GetText(*args, **kwargs)
-    def GetImage(*args, **kwargs): return _gizmos.TreeListColumnInfo_GetImage(*args, **kwargs)
-    def GetSelectedImage(*args, **kwargs): return _gizmos.TreeListColumnInfo_GetSelectedImage(*args, **kwargs)
-    def GetWidth(*args, **kwargs): return _gizmos.TreeListColumnInfo_GetWidth(*args, **kwargs)
-    def SetAlignment(*args, **kwargs): return _gizmos.TreeListColumnInfo_SetAlignment(*args, **kwargs)
-    def SetText(*args, **kwargs): return _gizmos.TreeListColumnInfo_SetText(*args, **kwargs)
-    def SetImage(*args, **kwargs): return _gizmos.TreeListColumnInfo_SetImage(*args, **kwargs)
-    def SetSelectedImage(*args, **kwargs): return _gizmos.TreeListColumnInfo_SetSelectedImage(*args, **kwargs)
-    def SetWidth(*args, **kwargs): return _gizmos.TreeListColumnInfo_SetWidth(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTreeListColumnInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetAlignment(*args, **kwargs):
+        """GetAlignment() -> wxTreeListColumnAlign"""
+        return _gizmos.TreeListColumnInfo_GetAlignment(*args, **kwargs)
+
+    def GetText(*args, **kwargs):
+        """GetText() -> wxString"""
+        return _gizmos.TreeListColumnInfo_GetText(*args, **kwargs)
+
+    def GetImage(*args, **kwargs):
+        """GetImage() -> int"""
+        return _gizmos.TreeListColumnInfo_GetImage(*args, **kwargs)
+
+    def GetSelectedImage(*args, **kwargs):
+        """GetSelectedImage() -> int"""
+        return _gizmos.TreeListColumnInfo_GetSelectedImage(*args, **kwargs)
+
+    def GetWidth(*args, **kwargs):
+        """GetWidth() -> size_t"""
+        return _gizmos.TreeListColumnInfo_GetWidth(*args, **kwargs)
+
+    def SetAlignment(*args, **kwargs):
+        """SetAlignment(wxTreeListColumnAlign alignment)"""
+        return _gizmos.TreeListColumnInfo_SetAlignment(*args, **kwargs)
+
+    def SetText(*args, **kwargs):
+        """SetText(wxString text)"""
+        return _gizmos.TreeListColumnInfo_SetText(*args, **kwargs)
+
+    def SetImage(*args, **kwargs):
+        """SetImage(int image)"""
+        return _gizmos.TreeListColumnInfo_SetImage(*args, **kwargs)
+
+    def SetSelectedImage(*args, **kwargs):
+        """SetSelectedImage(int image)"""
+        return _gizmos.TreeListColumnInfo_SetSelectedImage(*args, **kwargs)
+
+    def SetWidth(*args, **kwargs):
+        """SetWidth(size_t with)"""
+        return _gizmos.TreeListColumnInfo_SetWidth(*args, **kwargs)
+
 
 class TreeListColumnInfoPtr(TreeListColumnInfo):
     def __init__(self, this):
@@ -241,122 +394,430 @@ class TreeListColumnInfoPtr(TreeListColumnInfo):
 _gizmos.TreeListColumnInfo_swigregister(TreeListColumnInfoPtr)
 
 class TreeListCtrl(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyTreeListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPyTreeListCtrlNameStr) -> TreeListCtrl"""
         newobj = _gizmos.new_TreeListCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self);self._setCallbackInfo(self, TreeListCtrl)
-    def Create(*args, **kwargs): return _gizmos.TreeListCtrl_Create(*args, **kwargs)
-    def _setCallbackInfo(*args, **kwargs): return _gizmos.TreeListCtrl__setCallbackInfo(*args, **kwargs)
-    def GetCount(*args, **kwargs): return _gizmos.TreeListCtrl_GetCount(*args, **kwargs)
-    def GetIndent(*args, **kwargs): return _gizmos.TreeListCtrl_GetIndent(*args, **kwargs)
-    def SetIndent(*args, **kwargs): return _gizmos.TreeListCtrl_SetIndent(*args, **kwargs)
-    def GetSpacing(*args, **kwargs): return _gizmos.TreeListCtrl_GetSpacing(*args, **kwargs)
-    def SetSpacing(*args, **kwargs): return _gizmos.TreeListCtrl_SetSpacing(*args, **kwargs)
-    def GetLineSpacing(*args, **kwargs): return _gizmos.TreeListCtrl_GetLineSpacing(*args, **kwargs)
-    def SetLineSpacing(*args, **kwargs): return _gizmos.TreeListCtrl_SetLineSpacing(*args, **kwargs)
-    def GetImageList(*args, **kwargs): return _gizmos.TreeListCtrl_GetImageList(*args, **kwargs)
-    def GetStateImageList(*args, **kwargs): return _gizmos.TreeListCtrl_GetStateImageList(*args, **kwargs)
-    def GetButtonsImageList(*args, **kwargs): return _gizmos.TreeListCtrl_GetButtonsImageList(*args, **kwargs)
-    def SetImageList(*args, **kwargs): return _gizmos.TreeListCtrl_SetImageList(*args, **kwargs)
-    def SetStateImageList(*args, **kwargs): return _gizmos.TreeListCtrl_SetStateImageList(*args, **kwargs)
-    def SetButtonsImageList(*args, **kwargs): return _gizmos.TreeListCtrl_SetButtonsImageList(*args, **kwargs)
-    def AssignImageList(*args, **kwargs): 
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPyTreeListCtrlNameStr) -> bool"""
+        return _gizmos.TreeListCtrl_Create(*args, **kwargs)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _gizmos.TreeListCtrl__setCallbackInfo(*args, **kwargs)
+
+    def GetCount(*args, **kwargs):
+        """GetCount() -> size_t"""
+        return _gizmos.TreeListCtrl_GetCount(*args, **kwargs)
+
+    def GetIndent(*args, **kwargs):
+        """GetIndent() -> unsigned int"""
+        return _gizmos.TreeListCtrl_GetIndent(*args, **kwargs)
+
+    def SetIndent(*args, **kwargs):
+        """SetIndent(unsigned int indent)"""
+        return _gizmos.TreeListCtrl_SetIndent(*args, **kwargs)
+
+    def GetSpacing(*args, **kwargs):
+        """GetSpacing() -> unsigned int"""
+        return _gizmos.TreeListCtrl_GetSpacing(*args, **kwargs)
+
+    def SetSpacing(*args, **kwargs):
+        """SetSpacing(unsigned int spacing)"""
+        return _gizmos.TreeListCtrl_SetSpacing(*args, **kwargs)
+
+    def GetLineSpacing(*args, **kwargs):
+        """GetLineSpacing() -> unsigned int"""
+        return _gizmos.TreeListCtrl_GetLineSpacing(*args, **kwargs)
+
+    def SetLineSpacing(*args, **kwargs):
+        """SetLineSpacing(unsigned int spacing)"""
+        return _gizmos.TreeListCtrl_SetLineSpacing(*args, **kwargs)
+
+    def GetImageList(*args, **kwargs):
+        """GetImageList() -> wxImageList"""
+        return _gizmos.TreeListCtrl_GetImageList(*args, **kwargs)
+
+    def GetStateImageList(*args, **kwargs):
+        """GetStateImageList() -> wxImageList"""
+        return _gizmos.TreeListCtrl_GetStateImageList(*args, **kwargs)
+
+    def GetButtonsImageList(*args, **kwargs):
+        """GetButtonsImageList() -> wxImageList"""
+        return _gizmos.TreeListCtrl_GetButtonsImageList(*args, **kwargs)
+
+    def SetImageList(*args, **kwargs):
+        """SetImageList(wxImageList imageList)"""
+        return _gizmos.TreeListCtrl_SetImageList(*args, **kwargs)
+
+    def SetStateImageList(*args, **kwargs):
+        """SetStateImageList(wxImageList imageList)"""
+        return _gizmos.TreeListCtrl_SetStateImageList(*args, **kwargs)
+
+    def SetButtonsImageList(*args, **kwargs):
+        """SetButtonsImageList(wxImageList imageList)"""
+        return _gizmos.TreeListCtrl_SetButtonsImageList(*args, **kwargs)
+
+    def AssignImageList(*args, **kwargs):
+        """AssignImageList(wxImageList imageList)"""
         val = _gizmos.TreeListCtrl_AssignImageList(*args, **kwargs)
         args[1].thisown = 0
         return val
-    def AssignStateImageList(*args, **kwargs): 
+
+    def AssignStateImageList(*args, **kwargs):
+        """AssignStateImageList(wxImageList imageList)"""
         val = _gizmos.TreeListCtrl_AssignStateImageList(*args, **kwargs)
         args[1].thisown = 0
         return val
-    def AssignButtonsImageList(*args, **kwargs): 
+
+    def AssignButtonsImageList(*args, **kwargs):
+        """AssignButtonsImageList(wxImageList imageList)"""
         val = _gizmos.TreeListCtrl_AssignButtonsImageList(*args, **kwargs)
         args[1].thisown = 0
         return val
-    def AddColumn(*args, **kwargs): return _gizmos.TreeListCtrl_AddColumn(*args, **kwargs)
-    def AddColumnInfo(*args, **kwargs): return _gizmos.TreeListCtrl_AddColumnInfo(*args, **kwargs)
-    def InsertColumn(*args, **kwargs): return _gizmos.TreeListCtrl_InsertColumn(*args, **kwargs)
-    def InsertColumnInfo(*args, **kwargs): return _gizmos.TreeListCtrl_InsertColumnInfo(*args, **kwargs)
-    def RemoveColumn(*args, **kwargs): return _gizmos.TreeListCtrl_RemoveColumn(*args, **kwargs)
-    def GetColumnCount(*args, **kwargs): return _gizmos.TreeListCtrl_GetColumnCount(*args, **kwargs)
-    def SetColumnWidth(*args, **kwargs): return _gizmos.TreeListCtrl_SetColumnWidth(*args, **kwargs)
-    def GetColumnWidth(*args, **kwargs): return _gizmos.TreeListCtrl_GetColumnWidth(*args, **kwargs)
-    def SetMainColumn(*args, **kwargs): return _gizmos.TreeListCtrl_SetMainColumn(*args, **kwargs)
-    def GetMainColumn(*args, **kwargs): return _gizmos.TreeListCtrl_GetMainColumn(*args, **kwargs)
-    def SetColumnText(*args, **kwargs): return _gizmos.TreeListCtrl_SetColumnText(*args, **kwargs)
-    def GetColumnText(*args, **kwargs): return _gizmos.TreeListCtrl_GetColumnText(*args, **kwargs)
-    def SetColumn(*args, **kwargs): return _gizmos.TreeListCtrl_SetColumn(*args, **kwargs)
-    def GetColumn(*args, **kwargs): return _gizmos.TreeListCtrl_GetColumn(*args, **kwargs)
-    def SetColumnAlignment(*args, **kwargs): return _gizmos.TreeListCtrl_SetColumnAlignment(*args, **kwargs)
-    def GetColumnAlignment(*args, **kwargs): return _gizmos.TreeListCtrl_GetColumnAlignment(*args, **kwargs)
-    def SetColumnImage(*args, **kwargs): return _gizmos.TreeListCtrl_SetColumnImage(*args, **kwargs)
-    def GetColumnImage(*args, **kwargs): return _gizmos.TreeListCtrl_GetColumnImage(*args, **kwargs)
-    def GetItemText(*args, **kwargs): return _gizmos.TreeListCtrl_GetItemText(*args, **kwargs)
-    def GetItemImage(*args, **kwargs): return _gizmos.TreeListCtrl_GetItemImage(*args, **kwargs)
-    def SetItemText(*args, **kwargs): return _gizmos.TreeListCtrl_SetItemText(*args, **kwargs)
-    def SetItemImage(*args, **kwargs): return _gizmos.TreeListCtrl_SetItemImage(*args, **kwargs)
-    def GetItemData(*args, **kwargs): return _gizmos.TreeListCtrl_GetItemData(*args, **kwargs)
-    def SetItemData(*args, **kwargs): return _gizmos.TreeListCtrl_SetItemData(*args, **kwargs)
-    def GetItemPyData(*args, **kwargs): return _gizmos.TreeListCtrl_GetItemPyData(*args, **kwargs)
-    def SetItemPyData(*args, **kwargs): return _gizmos.TreeListCtrl_SetItemPyData(*args, **kwargs)
-    def SetItemHasChildren(*args, **kwargs): return _gizmos.TreeListCtrl_SetItemHasChildren(*args, **kwargs)
-    def SetItemBold(*args, **kwargs): return _gizmos.TreeListCtrl_SetItemBold(*args, **kwargs)
-    def SetItemTextColour(*args, **kwargs): return _gizmos.TreeListCtrl_SetItemTextColour(*args, **kwargs)
-    def SetItemBackgroundColour(*args, **kwargs): return _gizmos.TreeListCtrl_SetItemBackgroundColour(*args, **kwargs)
-    def SetItemFont(*args, **kwargs): return _gizmos.TreeListCtrl_SetItemFont(*args, **kwargs)
-    def GetItemBold(*args, **kwargs): return _gizmos.TreeListCtrl_GetItemBold(*args, **kwargs)
-    def GetItemTextColour(*args, **kwargs): return _gizmos.TreeListCtrl_GetItemTextColour(*args, **kwargs)
-    def GetItemBackgroundColour(*args, **kwargs): return _gizmos.TreeListCtrl_GetItemBackgroundColour(*args, **kwargs)
-    def GetItemFont(*args, **kwargs): return _gizmos.TreeListCtrl_GetItemFont(*args, **kwargs)
-    def IsVisible(*args, **kwargs): return _gizmos.TreeListCtrl_IsVisible(*args, **kwargs)
-    def ItemHasChildren(*args, **kwargs): return _gizmos.TreeListCtrl_ItemHasChildren(*args, **kwargs)
-    def IsExpanded(*args, **kwargs): return _gizmos.TreeListCtrl_IsExpanded(*args, **kwargs)
-    def IsSelected(*args, **kwargs): return _gizmos.TreeListCtrl_IsSelected(*args, **kwargs)
-    def IsBold(*args, **kwargs): return _gizmos.TreeListCtrl_IsBold(*args, **kwargs)
-    def GetChildrenCount(*args, **kwargs): return _gizmos.TreeListCtrl_GetChildrenCount(*args, **kwargs)
-    def GetRootItem(*args, **kwargs): return _gizmos.TreeListCtrl_GetRootItem(*args, **kwargs)
-    def GetSelection(*args, **kwargs): return _gizmos.TreeListCtrl_GetSelection(*args, **kwargs)
-    def GetSelections(*args, **kwargs): return _gizmos.TreeListCtrl_GetSelections(*args, **kwargs)
-    def GetItemParent(*args, **kwargs): return _gizmos.TreeListCtrl_GetItemParent(*args, **kwargs)
-    def GetFirstChild(*args, **kwargs): return _gizmos.TreeListCtrl_GetFirstChild(*args, **kwargs)
-    def GetNextChild(*args, **kwargs): return _gizmos.TreeListCtrl_GetNextChild(*args, **kwargs)
-    def GetLastChild(*args, **kwargs): return _gizmos.TreeListCtrl_GetLastChild(*args, **kwargs)
-    def GetNextSibling(*args, **kwargs): return _gizmos.TreeListCtrl_GetNextSibling(*args, **kwargs)
-    def GetPrevSibling(*args, **kwargs): return _gizmos.TreeListCtrl_GetPrevSibling(*args, **kwargs)
-    def GetFirstVisibleItem(*args, **kwargs): return _gizmos.TreeListCtrl_GetFirstVisibleItem(*args, **kwargs)
-    def GetNextVisible(*args, **kwargs): return _gizmos.TreeListCtrl_GetNextVisible(*args, **kwargs)
-    def GetPrevVisible(*args, **kwargs): return _gizmos.TreeListCtrl_GetPrevVisible(*args, **kwargs)
-    def GetNext(*args, **kwargs): return _gizmos.TreeListCtrl_GetNext(*args, **kwargs)
-    def AddRoot(*args, **kwargs): return _gizmos.TreeListCtrl_AddRoot(*args, **kwargs)
-    def PrependItem(*args, **kwargs): return _gizmos.TreeListCtrl_PrependItem(*args, **kwargs)
-    def InsertItem(*args, **kwargs): return _gizmos.TreeListCtrl_InsertItem(*args, **kwargs)
-    def InsertItemBefore(*args, **kwargs): return _gizmos.TreeListCtrl_InsertItemBefore(*args, **kwargs)
-    def AppendItem(*args, **kwargs): return _gizmos.TreeListCtrl_AppendItem(*args, **kwargs)
-    def Delete(*args, **kwargs): return _gizmos.TreeListCtrl_Delete(*args, **kwargs)
-    def DeleteChildren(*args, **kwargs): return _gizmos.TreeListCtrl_DeleteChildren(*args, **kwargs)
-    def DeleteAllItems(*args, **kwargs): return _gizmos.TreeListCtrl_DeleteAllItems(*args, **kwargs)
-    def Expand(*args, **kwargs): return _gizmos.TreeListCtrl_Expand(*args, **kwargs)
-    def ExpandAll(*args, **kwargs): return _gizmos.TreeListCtrl_ExpandAll(*args, **kwargs)
-    def Collapse(*args, **kwargs): return _gizmos.TreeListCtrl_Collapse(*args, **kwargs)
-    def CollapseAndReset(*args, **kwargs): return _gizmos.TreeListCtrl_CollapseAndReset(*args, **kwargs)
-    def Toggle(*args, **kwargs): return _gizmos.TreeListCtrl_Toggle(*args, **kwargs)
-    def Unselect(*args, **kwargs): return _gizmos.TreeListCtrl_Unselect(*args, **kwargs)
-    def UnselectAll(*args, **kwargs): return _gizmos.TreeListCtrl_UnselectAll(*args, **kwargs)
-    def SelectItem(*args, **kwargs): return _gizmos.TreeListCtrl_SelectItem(*args, **kwargs)
-    def EnsureVisible(*args, **kwargs): return _gizmos.TreeListCtrl_EnsureVisible(*args, **kwargs)
-    def ScrollTo(*args, **kwargs): return _gizmos.TreeListCtrl_ScrollTo(*args, **kwargs)
-    def HitTest(*args, **kwargs): return _gizmos.TreeListCtrl_HitTest(*args, **kwargs)
-    def GetBoundingRect(*args, **kwargs): return _gizmos.TreeListCtrl_GetBoundingRect(*args, **kwargs)
-    def EditLabel(*args, **kwargs): return _gizmos.TreeListCtrl_EditLabel(*args, **kwargs)
-    def Edit(*args, **kwargs): return _gizmos.TreeListCtrl_Edit(*args, **kwargs)
-    def SortChildren(*args, **kwargs): return _gizmos.TreeListCtrl_SortChildren(*args, **kwargs)
-    def GetItemSelectedImage(*args, **kwargs): return _gizmos.TreeListCtrl_GetItemSelectedImage(*args, **kwargs)
-    def SetItemSelectedImage(*args, **kwargs): return _gizmos.TreeListCtrl_SetItemSelectedImage(*args, **kwargs)
-    def GetHeaderWindow(*args, **kwargs): return _gizmos.TreeListCtrl_GetHeaderWindow(*args, **kwargs)
-    def GetMainWindow(*args, **kwargs): return _gizmos.TreeListCtrl_GetMainWindow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTreeListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def AddColumn(*args, **kwargs):
+        """AddColumn(wxString text)"""
+        return _gizmos.TreeListCtrl_AddColumn(*args, **kwargs)
+
+    def AddColumnInfo(*args, **kwargs):
+        """AddColumnInfo(TreeListColumnInfo col)"""
+        return _gizmos.TreeListCtrl_AddColumnInfo(*args, **kwargs)
+
+    def InsertColumn(*args, **kwargs):
+        """InsertColumn(size_t before, wxString text)"""
+        return _gizmos.TreeListCtrl_InsertColumn(*args, **kwargs)
+
+    def InsertColumnInfo(*args, **kwargs):
+        """InsertColumnInfo(size_t before, TreeListColumnInfo col)"""
+        return _gizmos.TreeListCtrl_InsertColumnInfo(*args, **kwargs)
+
+    def RemoveColumn(*args, **kwargs):
+        """RemoveColumn(size_t column)"""
+        return _gizmos.TreeListCtrl_RemoveColumn(*args, **kwargs)
+
+    def GetColumnCount(*args, **kwargs):
+        """GetColumnCount() -> size_t"""
+        return _gizmos.TreeListCtrl_GetColumnCount(*args, **kwargs)
+
+    def SetColumnWidth(*args, **kwargs):
+        """SetColumnWidth(size_t column, size_t width)"""
+        return _gizmos.TreeListCtrl_SetColumnWidth(*args, **kwargs)
+
+    def GetColumnWidth(*args, **kwargs):
+        """GetColumnWidth(size_t column) -> int"""
+        return _gizmos.TreeListCtrl_GetColumnWidth(*args, **kwargs)
+
+    def SetMainColumn(*args, **kwargs):
+        """SetMainColumn(size_t column)"""
+        return _gizmos.TreeListCtrl_SetMainColumn(*args, **kwargs)
+
+    def GetMainColumn(*args, **kwargs):
+        """GetMainColumn() -> size_t"""
+        return _gizmos.TreeListCtrl_GetMainColumn(*args, **kwargs)
+
+    def SetColumnText(*args, **kwargs):
+        """SetColumnText(size_t column, wxString text)"""
+        return _gizmos.TreeListCtrl_SetColumnText(*args, **kwargs)
+
+    def GetColumnText(*args, **kwargs):
+        """GetColumnText(size_t column) -> wxString"""
+        return _gizmos.TreeListCtrl_GetColumnText(*args, **kwargs)
+
+    def SetColumn(*args, **kwargs):
+        """SetColumn(size_t column, TreeListColumnInfo info)"""
+        return _gizmos.TreeListCtrl_SetColumn(*args, **kwargs)
+
+    def GetColumn(*args, **kwargs):
+        """GetColumn(size_t column) -> TreeListColumnInfo"""
+        return _gizmos.TreeListCtrl_GetColumn(*args, **kwargs)
+
+    def SetColumnAlignment(*args, **kwargs):
+        """SetColumnAlignment(size_t column, wxTreeListColumnAlign align)"""
+        return _gizmos.TreeListCtrl_SetColumnAlignment(*args, **kwargs)
+
+    def GetColumnAlignment(*args, **kwargs):
+        """GetColumnAlignment(size_t column) -> wxTreeListColumnAlign"""
+        return _gizmos.TreeListCtrl_GetColumnAlignment(*args, **kwargs)
+
+    def SetColumnImage(*args, **kwargs):
+        """SetColumnImage(size_t column, int image)"""
+        return _gizmos.TreeListCtrl_SetColumnImage(*args, **kwargs)
+
+    def GetColumnImage(*args, **kwargs):
+        """GetColumnImage(size_t column) -> int"""
+        return _gizmos.TreeListCtrl_GetColumnImage(*args, **kwargs)
+
+    def GetItemText(*args, **kwargs):
+        """GetItemText(TreeItemId item, int column=-1) -> wxString"""
+        return _gizmos.TreeListCtrl_GetItemText(*args, **kwargs)
+
+    def GetItemImage(*args, **kwargs):
+        """GetItemImage(TreeItemId item, int column=-1, wxTreeItemIcon which=TreeItemIcon_Normal) -> int"""
+        return _gizmos.TreeListCtrl_GetItemImage(*args, **kwargs)
+
+    def SetItemText(*args, **kwargs):
+        """SetItemText(TreeItemId item, wxString text, int column=-1)"""
+        return _gizmos.TreeListCtrl_SetItemText(*args, **kwargs)
+
+    def SetItemImage(*args, **kwargs):
+        """SetItemImage(TreeItemId item, int image, int column=-1, wxTreeItemIcon which=TreeItemIcon_Normal)"""
+        return _gizmos.TreeListCtrl_SetItemImage(*args, **kwargs)
+
+    def GetItemData(*args, **kwargs):
+        """GetItemData(TreeItemId item) -> TreeItemData"""
+        return _gizmos.TreeListCtrl_GetItemData(*args, **kwargs)
+
+    def SetItemData(*args, **kwargs):
+        """SetItemData(TreeItemId item, TreeItemData data)"""
+        return _gizmos.TreeListCtrl_SetItemData(*args, **kwargs)
+
+    def GetItemPyData(*args, **kwargs):
+        """GetItemPyData(TreeItemId item) -> PyObject"""
+        return _gizmos.TreeListCtrl_GetItemPyData(*args, **kwargs)
+
+    def SetItemPyData(*args, **kwargs):
+        """SetItemPyData(TreeItemId item, PyObject obj)"""
+        return _gizmos.TreeListCtrl_SetItemPyData(*args, **kwargs)
+
+    def SetItemHasChildren(*args, **kwargs):
+        """SetItemHasChildren(TreeItemId item, bool has=True)"""
+        return _gizmos.TreeListCtrl_SetItemHasChildren(*args, **kwargs)
+
+    def SetItemBold(*args, **kwargs):
+        """SetItemBold(TreeItemId item, bool bold=True)"""
+        return _gizmos.TreeListCtrl_SetItemBold(*args, **kwargs)
+
+    def SetItemTextColour(*args, **kwargs):
+        """SetItemTextColour(TreeItemId item, wxColour col)"""
+        return _gizmos.TreeListCtrl_SetItemTextColour(*args, **kwargs)
+
+    def SetItemBackgroundColour(*args, **kwargs):
+        """SetItemBackgroundColour(TreeItemId item, wxColour col)"""
+        return _gizmos.TreeListCtrl_SetItemBackgroundColour(*args, **kwargs)
+
+    def SetItemFont(*args, **kwargs):
+        """SetItemFont(TreeItemId item, wxFont font)"""
+        return _gizmos.TreeListCtrl_SetItemFont(*args, **kwargs)
+
+    def GetItemBold(*args, **kwargs):
+        """GetItemBold(TreeItemId item) -> bool"""
+        return _gizmos.TreeListCtrl_GetItemBold(*args, **kwargs)
+
+    def GetItemTextColour(*args, **kwargs):
+        """GetItemTextColour(TreeItemId item) -> wxColour"""
+        return _gizmos.TreeListCtrl_GetItemTextColour(*args, **kwargs)
+
+    def GetItemBackgroundColour(*args, **kwargs):
+        """GetItemBackgroundColour(TreeItemId item) -> wxColour"""
+        return _gizmos.TreeListCtrl_GetItemBackgroundColour(*args, **kwargs)
+
+    def GetItemFont(*args, **kwargs):
+        """GetItemFont(TreeItemId item) -> wxFont"""
+        return _gizmos.TreeListCtrl_GetItemFont(*args, **kwargs)
+
+    def IsVisible(*args, **kwargs):
+        """IsVisible(TreeItemId item) -> bool"""
+        return _gizmos.TreeListCtrl_IsVisible(*args, **kwargs)
+
+    def ItemHasChildren(*args, **kwargs):
+        """ItemHasChildren(TreeItemId item) -> bool"""
+        return _gizmos.TreeListCtrl_ItemHasChildren(*args, **kwargs)
+
+    def IsExpanded(*args, **kwargs):
+        """IsExpanded(TreeItemId item) -> bool"""
+        return _gizmos.TreeListCtrl_IsExpanded(*args, **kwargs)
+
+    def IsSelected(*args, **kwargs):
+        """IsSelected(TreeItemId item) -> bool"""
+        return _gizmos.TreeListCtrl_IsSelected(*args, **kwargs)
+
+    def IsBold(*args, **kwargs):
+        """IsBold(TreeItemId item) -> bool"""
+        return _gizmos.TreeListCtrl_IsBold(*args, **kwargs)
+
+    def GetChildrenCount(*args, **kwargs):
+        """GetChildrenCount(TreeItemId item, bool recursively=True) -> size_t"""
+        return _gizmos.TreeListCtrl_GetChildrenCount(*args, **kwargs)
+
+    def GetRootItem(*args, **kwargs):
+        """GetRootItem() -> TreeItemId"""
+        return _gizmos.TreeListCtrl_GetRootItem(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> TreeItemId"""
+        return _gizmos.TreeListCtrl_GetSelection(*args, **kwargs)
+
+    def GetSelections(*args, **kwargs):
+        """GetSelections() -> PyObject"""
+        return _gizmos.TreeListCtrl_GetSelections(*args, **kwargs)
+
+    def GetItemParent(*args, **kwargs):
+        """GetItemParent(TreeItemId item) -> TreeItemId"""
+        return _gizmos.TreeListCtrl_GetItemParent(*args, **kwargs)
+
+    def GetFirstChild(*args, **kwargs):
+        """GetFirstChild(TreeItemId item) -> PyObject"""
+        return _gizmos.TreeListCtrl_GetFirstChild(*args, **kwargs)
+
+    def GetNextChild(*args, **kwargs):
+        """GetNextChild(TreeItemId item, long cookie) -> PyObject"""
+        return _gizmos.TreeListCtrl_GetNextChild(*args, **kwargs)
+
+    def GetLastChild(*args, **kwargs):
+        """GetLastChild(TreeItemId item) -> TreeItemId"""
+        return _gizmos.TreeListCtrl_GetLastChild(*args, **kwargs)
+
+    def GetNextSibling(*args, **kwargs):
+        """GetNextSibling(TreeItemId item) -> TreeItemId"""
+        return _gizmos.TreeListCtrl_GetNextSibling(*args, **kwargs)
+
+    def GetPrevSibling(*args, **kwargs):
+        """GetPrevSibling(TreeItemId item) -> TreeItemId"""
+        return _gizmos.TreeListCtrl_GetPrevSibling(*args, **kwargs)
+
+    def GetFirstVisibleItem(*args, **kwargs):
+        """GetFirstVisibleItem() -> TreeItemId"""
+        return _gizmos.TreeListCtrl_GetFirstVisibleItem(*args, **kwargs)
+
+    def GetNextVisible(*args, **kwargs):
+        """GetNextVisible(TreeItemId item) -> TreeItemId"""
+        return _gizmos.TreeListCtrl_GetNextVisible(*args, **kwargs)
+
+    def GetPrevVisible(*args, **kwargs):
+        """GetPrevVisible(TreeItemId item) -> TreeItemId"""
+        return _gizmos.TreeListCtrl_GetPrevVisible(*args, **kwargs)
+
+    def GetNext(*args, **kwargs):
+        """GetNext(TreeItemId item) -> TreeItemId"""
+        return _gizmos.TreeListCtrl_GetNext(*args, **kwargs)
+
+    def AddRoot(*args, **kwargs):
+        """AddRoot(wxString text, int image=-1, int selectedImage=-1, 
+    TreeItemData data=None) -> TreeItemId"""
+        return _gizmos.TreeListCtrl_AddRoot(*args, **kwargs)
+
+    def PrependItem(*args, **kwargs):
+        """PrependItem(TreeItemId parent, wxString text, int image=-1, int selectedImage=-1, 
+    TreeItemData data=None) -> TreeItemId"""
+        return _gizmos.TreeListCtrl_PrependItem(*args, **kwargs)
+
+    def InsertItem(*args, **kwargs):
+        """InsertItem(TreeItemId parent, TreeItemId idPrevious, wxString text, 
+    int image=-1, int selectedImage=-1, TreeItemData data=None) -> TreeItemId"""
+        return _gizmos.TreeListCtrl_InsertItem(*args, **kwargs)
+
+    def InsertItemBefore(*args, **kwargs):
+        """InsertItemBefore(TreeItemId parent, size_t index, wxString text, int image=-1, 
+    int selectedImage=-1, TreeItemData data=None) -> TreeItemId"""
+        return _gizmos.TreeListCtrl_InsertItemBefore(*args, **kwargs)
+
+    def AppendItem(*args, **kwargs):
+        """AppendItem(TreeItemId parent, wxString text, int image=-1, int selectedImage=-1, 
+    TreeItemData data=None) -> TreeItemId"""
+        return _gizmos.TreeListCtrl_AppendItem(*args, **kwargs)
+
+    def Delete(*args, **kwargs):
+        """Delete(TreeItemId item)"""
+        return _gizmos.TreeListCtrl_Delete(*args, **kwargs)
+
+    def DeleteChildren(*args, **kwargs):
+        """DeleteChildren(TreeItemId item)"""
+        return _gizmos.TreeListCtrl_DeleteChildren(*args, **kwargs)
+
+    def DeleteAllItems(*args, **kwargs):
+        """DeleteAllItems()"""
+        return _gizmos.TreeListCtrl_DeleteAllItems(*args, **kwargs)
+
+    def Expand(*args, **kwargs):
+        """Expand(TreeItemId item)"""
+        return _gizmos.TreeListCtrl_Expand(*args, **kwargs)
+
+    def ExpandAll(*args, **kwargs):
+        """ExpandAll(TreeItemId item)"""
+        return _gizmos.TreeListCtrl_ExpandAll(*args, **kwargs)
+
+    def Collapse(*args, **kwargs):
+        """Collapse(TreeItemId item)"""
+        return _gizmos.TreeListCtrl_Collapse(*args, **kwargs)
+
+    def CollapseAndReset(*args, **kwargs):
+        """CollapseAndReset(TreeItemId item)"""
+        return _gizmos.TreeListCtrl_CollapseAndReset(*args, **kwargs)
+
+    def Toggle(*args, **kwargs):
+        """Toggle(TreeItemId item)"""
+        return _gizmos.TreeListCtrl_Toggle(*args, **kwargs)
+
+    def Unselect(*args, **kwargs):
+        """Unselect()"""
+        return _gizmos.TreeListCtrl_Unselect(*args, **kwargs)
+
+    def UnselectAll(*args, **kwargs):
+        """UnselectAll()"""
+        return _gizmos.TreeListCtrl_UnselectAll(*args, **kwargs)
+
+    def SelectItem(*args, **kwargs):
+        """SelectItem(TreeItemId item, bool unselect_others=True, bool extended_select=False)"""
+        return _gizmos.TreeListCtrl_SelectItem(*args, **kwargs)
+
+    def EnsureVisible(*args, **kwargs):
+        """EnsureVisible(TreeItemId item)"""
+        return _gizmos.TreeListCtrl_EnsureVisible(*args, **kwargs)
+
+    def ScrollTo(*args, **kwargs):
+        """ScrollTo(TreeItemId item)"""
+        return _gizmos.TreeListCtrl_ScrollTo(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """HitTest(Point point, int OUTPUT, int OUTPUT) -> TreeItemId"""
+        return _gizmos.TreeListCtrl_HitTest(*args, **kwargs)
+
+    def GetBoundingRect(*args, **kwargs):
+        """GetBoundingRect(TreeItemId item, bool textOnly=False) -> PyObject"""
+        return _gizmos.TreeListCtrl_GetBoundingRect(*args, **kwargs)
+
+    def EditLabel(*args, **kwargs):
+        """EditLabel(TreeItemId item)"""
+        return _gizmos.TreeListCtrl_EditLabel(*args, **kwargs)
+
+    def Edit(*args, **kwargs):
+        """Edit(TreeItemId item)"""
+        return _gizmos.TreeListCtrl_Edit(*args, **kwargs)
+
+    def SortChildren(*args, **kwargs):
+        """SortChildren(TreeItemId item)"""
+        return _gizmos.TreeListCtrl_SortChildren(*args, **kwargs)
+
+    def GetItemSelectedImage(*args, **kwargs):
+        """GetItemSelectedImage(TreeItemId item) -> int"""
+        return _gizmos.TreeListCtrl_GetItemSelectedImage(*args, **kwargs)
+
+    def SetItemSelectedImage(*args, **kwargs):
+        """SetItemSelectedImage(TreeItemId item, int image)"""
+        return _gizmos.TreeListCtrl_SetItemSelectedImage(*args, **kwargs)
+
+    def GetHeaderWindow(*args, **kwargs):
+        """GetHeaderWindow() -> Window"""
+        return _gizmos.TreeListCtrl_GetHeaderWindow(*args, **kwargs)
+
+    def GetMainWindow(*args, **kwargs):
+        """GetMainWindow() -> Window"""
+        return _gizmos.TreeListCtrl_GetMainWindow(*args, **kwargs)
+
 
 class TreeListCtrlPtr(TreeListCtrl):
     def __init__(self, this):
@@ -366,6 +827,7 @@ class TreeListCtrlPtr(TreeListCtrl):
 _gizmos.TreeListCtrl_swigregister(TreeListCtrlPtr)
 
 def PreTreeListCtrl(*args, **kwargs):
+    """PreTreeListCtrl() -> TreeListCtrl"""
     val = _gizmos.new_PreTreeListCtrl(*args, **kwargs)
     val.thisown = 1
     return val
diff --git a/wxPython/contrib/gizmos/gizmos_wrap.cpp b/wxPython/contrib/gizmos/gizmos_wrap.cpp
index 3f75360a2d..eed8bb869d 100644
--- a/wxPython/contrib/gizmos/gizmos_wrap.cpp
+++ b/wxPython/contrib/gizmos/gizmos_wrap.cpp
@@ -309,8 +309,8 @@ public:
         wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "DrawItem"))) {
             PyObject* dcobj = wxPyMake_wxObject(&dc);
-            PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), FALSE);
-            PyObject* recobj= wxPyConstructObject((void*)&rect, wxT("wxRect"), FALSE);
+            PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), False);
+            PyObject* recobj= wxPyConstructObject((void*)&rect, wxT("wxRect"), False);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", dcobj, idobj, recobj));
             Py_DECREF(dcobj);
             Py_DECREF(idobj);
@@ -415,7 +415,7 @@ PyObject *wxPyTreeListCtrl_GetSelections(wxPyTreeListCtrl *self){
             num = self->GetSelections(array);
             for (x=0; x < num; x++) {
                 wxTreeItemId *tii = new wxTreeItemId(array.Item(x));
-                PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), TRUE);
+                PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), True);
                 PyList_Append(rval, item);
             }
             wxPyEndBlockThreads();
@@ -550,7 +550,7 @@ static PyObject * DynamicSashUnifyEvent_swigregister(PyObject *self, PyObject *a
 static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -561,7 +561,7 @@ static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyO
     wxDynamicSashWindow *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -588,7 +588,7 @@ static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyO
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -639,7 +639,7 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxDynamicSashWindow *arg1 = (wxDynamicSashWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -650,7 +650,7 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args,
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -679,7 +679,7 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args,
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -770,7 +770,7 @@ static PyObject * DynamicSashWindow_swigregister(PyObject *self, PyObject *args)
 static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -780,10 +780,10 @@ static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObj
     wxString const &arg7_defvalue = wxPyEditableListBoxNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     wxEditableListBox *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -798,7 +798,7 @@ static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObj
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -816,7 +816,7 @@ static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObj
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -1097,7 +1097,7 @@ static PyObject * EditableListBox_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_RemotelyScrolledTreeCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -1304,7 +1304,7 @@ static PyObject * RemotelyScrolledTreeCtrl_swigregister(PyObject *self, PyObject
 static PyObject *_wrap_new_TreeCompanionWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) -1 ;
+    int arg2 = (int) -1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -1440,7 +1440,7 @@ static PyObject * TreeCompanionWindow_swigregister(PyObject *self, PyObject *arg
 static PyObject *_wrap_new_ThinSplitterWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) -1 ;
+    int arg2 = (int) -1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -1494,7 +1494,7 @@ static PyObject * ThinSplitterWindow_swigregister(PyObject *self, PyObject *args
 static PyObject *_wrap_new_SplitterScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) -1 ;
+    int arg2 = (int) -1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -1548,7 +1548,7 @@ static PyObject * SplitterScrolledWindow_swigregister(PyObject *self, PyObject *
 static PyObject *_wrap_new_LEDNumberCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) -1 ;
+    int arg2 = (int) -1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -1618,7 +1618,7 @@ static PyObject *_wrap_LEDNumberCtrl_Create(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxLEDNumberCtrl *arg1 = (wxLEDNumberCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 = (wxWindowID) -1 ;
+    int arg3 = (int) -1 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -1812,7 +1812,7 @@ static PyObject *_wrap_LEDNumberCtrl_SetValue(PyObject *self, PyObject *args, Py
     wxLEDNumberCtrl *arg1 = (wxLEDNumberCtrl *) 0 ;
     wxString *arg2 = 0 ;
     bool arg3 = (bool) true ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -1825,7 +1825,7 @@ static PyObject *_wrap_LEDNumberCtrl_SetValue(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         arg3 = PyInt_AsLong(obj2) ? true : false;
@@ -1868,7 +1868,7 @@ static PyObject *_wrap_new_TreeListColumnInfo(PyObject *self, PyObject *args, Py
     size_t arg3 = (size_t) 100 ;
     int arg4 = (int) wxTL_ALIGN_LEFT ;
     wxTreeListColumnInfo *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -1880,7 +1880,7 @@ static PyObject *_wrap_new_TreeListColumnInfo(PyObject *self, PyObject *args, Py
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     if (obj2) {
@@ -2069,7 +2069,7 @@ static PyObject *_wrap_TreeListColumnInfo_SetText(PyObject *self, PyObject *args
     PyObject *resultobj;
     wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2081,7 +2081,7 @@ static PyObject *_wrap_TreeListColumnInfo_SetText(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2193,7 +2193,7 @@ static PyObject * TreeListColumnInfo_swigregister(PyObject *self, PyObject *args
 static PyObject *_wrap_new_TreeListCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) -1 ;
+    int arg2 = (int) -1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -2206,7 +2206,7 @@ static PyObject *_wrap_new_TreeListCtrl(PyObject *self, PyObject *args, PyObject
     wxPyTreeListCtrl *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -2240,7 +2240,7 @@ static PyObject *_wrap_new_TreeListCtrl(PyObject *self, PyObject *args, PyObject
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -2291,7 +2291,7 @@ static PyObject *_wrap_TreeListCtrl_Create(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 = (wxWindowID) -1 ;
+    int arg3 = (int) -1 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -2304,7 +2304,7 @@ static PyObject *_wrap_TreeListCtrl_Create(PyObject *self, PyObject *args, PyObj
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -2340,7 +2340,7 @@ static PyObject *_wrap_TreeListCtrl_Create(PyObject *self, PyObject *args, PyObj
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -2826,7 +2826,7 @@ static PyObject *_wrap_TreeListCtrl_AddColumn(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2838,7 +2838,7 @@ static PyObject *_wrap_TreeListCtrl_AddColumn(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2897,7 +2897,7 @@ static PyObject *_wrap_TreeListCtrl_InsertColumn(PyObject *self, PyObject *args,
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -2912,7 +2912,7 @@ static PyObject *_wrap_TreeListCtrl_InsertColumn(PyObject *self, PyObject *args,
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3142,7 +3142,7 @@ static PyObject *_wrap_TreeListCtrl_SetColumnText(PyObject *self, PyObject *args
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3157,7 +3157,7 @@ static PyObject *_wrap_TreeListCtrl_SetColumnText(PyObject *self, PyObject *args
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3475,7 +3475,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemText(PyObject *self, PyObject *args,
     wxTreeItemId *arg2 = 0 ;
     wxString *arg3 = 0 ;
     int arg4 = (int) -1 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3492,7 +3492,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemText(PyObject *self, PyObject *args,
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3681,7 +3681,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemHasChildren(PyObject *self, PyObject
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3717,7 +3717,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemBold(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4154,7 +4154,7 @@ static PyObject *_wrap_TreeListCtrl_GetChildrenCount(PyObject *self, PyObject *a
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     size_t result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -4615,7 +4615,7 @@ static PyObject *_wrap_TreeListCtrl_AddRoot(PyObject *self, PyObject *args, PyOb
     int arg4 = (int) -1 ;
     wxPyTreeItemData *arg5 = (wxPyTreeItemData *) NULL ;
     wxTreeItemId result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj4 = 0 ;
@@ -4628,7 +4628,7 @@ static PyObject *_wrap_TreeListCtrl_AddRoot(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj4) {
         if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -4668,7 +4668,7 @@ static PyObject *_wrap_TreeListCtrl_PrependItem(PyObject *self, PyObject *args,
     int arg5 = (int) -1 ;
     wxPyTreeItemData *arg6 = (wxPyTreeItemData *) NULL ;
     wxTreeItemId result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4686,7 +4686,7 @@ static PyObject *_wrap_TreeListCtrl_PrependItem(PyObject *self, PyObject *args,
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj5) {
         if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -4727,7 +4727,7 @@ static PyObject *_wrap_TreeListCtrl_InsertItem(PyObject *self, PyObject *args, P
     int arg6 = (int) -1 ;
     wxPyTreeItemData *arg7 = (wxPyTreeItemData *) NULL ;
     wxTreeItemId result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4750,7 +4750,7 @@ static PyObject *_wrap_TreeListCtrl_InsertItem(PyObject *self, PyObject *args, P
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj6) {
         if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -4791,7 +4791,7 @@ static PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *self, PyObject *a
     int arg6 = (int) -1 ;
     wxPyTreeItemData *arg7 = (wxPyTreeItemData *) NULL ;
     wxTreeItemId result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4812,7 +4812,7 @@ static PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *self, PyObject *a
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj6) {
         if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -4852,7 +4852,7 @@ static PyObject *_wrap_TreeListCtrl_AppendItem(PyObject *self, PyObject *args, P
     int arg5 = (int) -1 ;
     wxPyTreeItemData *arg6 = (wxPyTreeItemData *) NULL ;
     wxTreeItemId result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4870,7 +4870,7 @@ static PyObject *_wrap_TreeListCtrl_AppendItem(PyObject *self, PyObject *args, P
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj5) {
         if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -5187,8 +5187,8 @@ static PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
-    bool arg4 = (bool) FALSE ;
+    bool arg3 = (bool) True ;
+    bool arg4 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -5339,7 +5339,7 @@ static PyObject *_wrap_TreeListCtrl_GetBoundingRect(PyObject *self, PyObject *ar
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     PyObject *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -6347,6 +6347,9 @@ static void *_p_wxPySizerTo_p_wxObject(void *x) {
 static void *_p_wxStaticBitmapTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *) ((wxStaticBitmap *) x));
 }
+static void *_p_wxGenericDragImageTo_p_wxObject(void *x) {
+    return (void *)((wxObject *)  ((wxGenericDragImage *) x));
+}
 static void *_p_wxComboBoxTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *) ((wxComboBox *) x));
 }
@@ -7191,7 +7194,7 @@ static void *_p_wxUpdateUIEventTo_p_wxCommandEvent(void *x) {
     return (void *)((wxCommandEvent *)  ((wxUpdateUIEvent *) x));
 }
 static swig_type_info _swigt__p_wxEditableListBox[] = {{"_p_wxEditableListBox", 0, "wxEditableListBox *", 0},{"_p_wxEditableListBox"},{0}};
-static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxObject},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxObject},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxObject},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxNotebook", _p_wxNotebookTo_p_wxObject},{"_p_wxListItem", _p_wxListItemTo_p_wxObject},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxObject},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxObject},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxObject},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxObject},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxObject"},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxTreeListColumnInfo", _p_wxTreeListColumnInfoTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxPyControl", _p_wxPyControlTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxContextHelp", _p_wxContextHelpTo_p_wxObject},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxObject},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject},{"_p_wxListEvent", _p_wxListEventTo_p_wxObject},{"_p_wxDynamicSashSplitEvent", _p_wxDynamicSashSplitEventTo_p_wxObject},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject},{"_p_wxGauge", _p_wxGaugeTo_p_wxObject},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject},{"_p_wxChoice", _p_wxChoiceTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxObject},{"_p_wxButton", _p_wxButtonTo_p_wxObject},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxObject},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject},{"_p_wxEditableListBox", _p_wxEditableListBoxTo_p_wxObject},{"_p_wxListBox", _p_wxListBoxTo_p_wxObject},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxObject},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject},{"_p_wxListbook", _p_wxListbookTo_p_wxObject},{"_p_wxFrame", _p_wxFrameTo_p_wxObject},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxObject},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject},{"_p_wxListView", _p_wxListViewTo_p_wxObject},{"_p_wxPyTreeListCtrl", _p_wxPyTreeListCtrlTo_p_wxObject},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxObject},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxObject},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxObject},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxObject},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject},{"_p_wxDialog", _p_wxDialogTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxDynamicSashUnifyEvent", _p_wxDynamicSashUnifyEventTo_p_wxObject},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxObject},{"_p_wxPyTreeCompanionWindow", _p_wxPyTreeCompanionWindowTo_p_wxObject},{"_p_wxDynamicSashWindow", _p_wxDynamicSashWindowTo_p_wxObject},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxObject},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxObject},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxObject},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxObject},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxObject},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject},{"_p_wxToolBarToolBase", _p_wxToolBarToolBaseTo_p_wxObject},{"_p_wxSlider", _p_wxSliderTo_p_wxObject},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxObject},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxObject},{"_p_wxPanel", _p_wxPanelTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxLEDNumberCtrl", _p_wxLEDNumberCtrlTo_p_wxObject},{"_p_wxToolBar", _p_wxToolBarTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{0}};
+static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxObject},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxGenericDragImage", _p_wxGenericDragImageTo_p_wxObject},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxObject},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxObject},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxNotebook", _p_wxNotebookTo_p_wxObject},{"_p_wxListItem", _p_wxListItemTo_p_wxObject},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxObject},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxObject},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxObject},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxObject},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxObject"},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxTreeListColumnInfo", _p_wxTreeListColumnInfoTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxPyControl", _p_wxPyControlTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxContextHelp", _p_wxContextHelpTo_p_wxObject},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxObject},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject},{"_p_wxListEvent", _p_wxListEventTo_p_wxObject},{"_p_wxDynamicSashSplitEvent", _p_wxDynamicSashSplitEventTo_p_wxObject},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject},{"_p_wxGauge", _p_wxGaugeTo_p_wxObject},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject},{"_p_wxChoice", _p_wxChoiceTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxObject},{"_p_wxButton", _p_wxButtonTo_p_wxObject},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxObject},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject},{"_p_wxEditableListBox", _p_wxEditableListBoxTo_p_wxObject},{"_p_wxListBox", _p_wxListBoxTo_p_wxObject},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxObject},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject},{"_p_wxListbook", _p_wxListbookTo_p_wxObject},{"_p_wxFrame", _p_wxFrameTo_p_wxObject},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxObject},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject},{"_p_wxListView", _p_wxListViewTo_p_wxObject},{"_p_wxPyTreeListCtrl", _p_wxPyTreeListCtrlTo_p_wxObject},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxObject},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxObject},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxObject},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxObject},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject},{"_p_wxDialog", _p_wxDialogTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxDynamicSashUnifyEvent", _p_wxDynamicSashUnifyEventTo_p_wxObject},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxObject},{"_p_wxPyTreeCompanionWindow", _p_wxPyTreeCompanionWindowTo_p_wxObject},{"_p_wxDynamicSashWindow", _p_wxDynamicSashWindowTo_p_wxObject},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxObject},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxObject},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxObject},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxObject},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxObject},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject},{"_p_wxToolBarToolBase", _p_wxToolBarToolBaseTo_p_wxObject},{"_p_wxSlider", _p_wxSliderTo_p_wxObject},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxObject},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxObject},{"_p_wxPanel", _p_wxPanelTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxLEDNumberCtrl", _p_wxLEDNumberCtrlTo_p_wxObject},{"_p_wxToolBar", _p_wxToolBarTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{0}};
 static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0},{"_p_wxColour"},{0}};
 static swig_type_info _swigt__p_wxPyTreeCtrl[] = {{"_p_wxPyTreeCtrl", 0, "wxPyTreeCtrl *", 0},{"_p_wxPyTreeCtrl"},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxPyTreeCtrl},{0}};
 static swig_type_info _swigt__p_wxRemotelyScrolledTreeCtrl[] = {{"_p_wxRemotelyScrolledTreeCtrl", 0, "wxRemotelyScrolledTreeCtrl *", 0},{"_p_wxRemotelyScrolledTreeCtrl"},{0}};
diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas.py b/wxPython/contrib/glcanvas/gtk/glcanvas.py
index e2bd6dbac1..7f0aad877b 100644
--- a/wxPython/contrib/glcanvas/gtk/glcanvas.py
+++ b/wxPython/contrib/glcanvas/gtk/glcanvas.py
@@ -6,25 +6,54 @@ import _glcanvas
 import core
 wx = core 
 class GLContext(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGLContext instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(bool isRGB, GLCanvas win, wxPalette palette=wxNullPalette, 
+    GLContext other=None) -> GLContext"""
         newobj = _glcanvas.new_GLContext(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_glcanvas.delete_GLContext):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetCurrent(*args, **kwargs): return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
-    def SetColour(*args, **kwargs): return _glcanvas.GLContext_SetColour(*args, **kwargs)
-    def SwapBuffers(*args, **kwargs): return _glcanvas.GLContext_SwapBuffers(*args, **kwargs)
-    def SetupPixelFormat(*args, **kwargs): return _glcanvas.GLContext_SetupPixelFormat(*args, **kwargs)
-    def SetupPalette(*args, **kwargs): return _glcanvas.GLContext_SetupPalette(*args, **kwargs)
-    def CreateDefaultPalette(*args, **kwargs): return _glcanvas.GLContext_CreateDefaultPalette(*args, **kwargs)
-    def GetPalette(*args, **kwargs): return _glcanvas.GLContext_GetPalette(*args, **kwargs)
-    def GetWindow(*args, **kwargs): return _glcanvas.GLContext_GetWindow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGLContext instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetCurrent(*args, **kwargs):
+        """SetCurrent()"""
+        return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
+
+    def SetColour(*args, **kwargs):
+        """SetColour(wxString colour)"""
+        return _glcanvas.GLContext_SetColour(*args, **kwargs)
+
+    def SwapBuffers(*args, **kwargs):
+        """SwapBuffers()"""
+        return _glcanvas.GLContext_SwapBuffers(*args, **kwargs)
+
+    def SetupPixelFormat(*args, **kwargs):
+        """SetupPixelFormat()"""
+        return _glcanvas.GLContext_SetupPixelFormat(*args, **kwargs)
+
+    def SetupPalette(*args, **kwargs):
+        """SetupPalette(wxPalette palette)"""
+        return _glcanvas.GLContext_SetupPalette(*args, **kwargs)
+
+    def CreateDefaultPalette(*args, **kwargs):
+        """CreateDefaultPalette() -> wxPalette"""
+        return _glcanvas.GLContext_CreateDefaultPalette(*args, **kwargs)
+
+    def GetPalette(*args, **kwargs):
+        """GetPalette() -> wxPalette"""
+        return _glcanvas.GLContext_GetPalette(*args, **kwargs)
+
+    def GetWindow(*args, **kwargs):
+        """GetWindow() -> Window"""
+        return _glcanvas.GLContext_GetWindow(*args, **kwargs)
+
 
 class GLContextPtr(GLContext):
     def __init__(self, this):
@@ -50,18 +79,36 @@ WX_GL_MIN_ACCUM_GREEN = _glcanvas.WX_GL_MIN_ACCUM_GREEN
 WX_GL_MIN_ACCUM_BLUE = _glcanvas.WX_GL_MIN_ACCUM_BLUE
 WX_GL_MIN_ACCUM_ALPHA = _glcanvas.WX_GL_MIN_ACCUM_ALPHA
 class GLCanvas(core.Window):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGLCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, wxString name=wxPyGLCanvasNameStr, 
+    int attribList=None, 
+    wxPalette palette=wxNullPalette) -> GLCanvas"""
         newobj = _glcanvas.new_GLCanvas(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def SetCurrent(*args, **kwargs): return _glcanvas.GLCanvas_SetCurrent(*args, **kwargs)
-    def SetColour(*args, **kwargs): return _glcanvas.GLCanvas_SetColour(*args, **kwargs)
-    def SwapBuffers(*args, **kwargs): return _glcanvas.GLCanvas_SwapBuffers(*args, **kwargs)
-    def GetContext(*args, **kwargs): return _glcanvas.GLCanvas_GetContext(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGLCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetCurrent(*args, **kwargs):
+        """SetCurrent()"""
+        return _glcanvas.GLCanvas_SetCurrent(*args, **kwargs)
+
+    def SetColour(*args, **kwargs):
+        """SetColour(wxString colour)"""
+        return _glcanvas.GLCanvas_SetColour(*args, **kwargs)
+
+    def SwapBuffers(*args, **kwargs):
+        """SwapBuffers()"""
+        return _glcanvas.GLCanvas_SwapBuffers(*args, **kwargs)
+
+    def GetContext(*args, **kwargs):
+        """GetContext() -> GLContext"""
+        return _glcanvas.GLCanvas_GetContext(*args, **kwargs)
+
 
 class GLCanvasPtr(GLCanvas):
     def __init__(self, this):
@@ -71,6 +118,10 @@ class GLCanvasPtr(GLCanvas):
 _glcanvas.GLCanvas_swigregister(GLCanvasPtr)
 
 def wxGLCanvasWithContext(*args, **kwargs):
+    """wxGLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, 
+    long style=0, wxString name=wxPyGLCanvasNameStr, 
+    int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas"""
     val = _glcanvas.new_wxGLCanvasWithContext(*args, **kwargs)
     val.thisown = 1
     val._setOORInfo(val)
diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp
index 26e3b978a7..00e67e4db0 100644
--- a/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp
+++ b/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp
@@ -347,7 +347,7 @@ static PyObject *_wrap_GLContext_SetColour(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxGLContext *arg1 = (wxGLContext *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -359,7 +359,7 @@ static PyObject *_wrap_GLContext_SetColour(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -552,7 +552,7 @@ static PyObject * GLContext_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) -1 ;
+    int arg2 = (int) -1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -566,7 +566,7 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw
     wxGLCanvas *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     int *temp7 ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
@@ -596,7 +596,7 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     if (obj6) {
@@ -651,7 +651,7 @@ static PyObject *_wrap_new_wxGLCanvasWithContext(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxGLContext *arg2 = (wxGLContext *) NULL ;
-    wxWindowID arg3 = (wxWindowID) -1 ;
+    int arg3 = (int) -1 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -665,7 +665,7 @@ static PyObject *_wrap_new_wxGLCanvasWithContext(PyObject *self, PyObject *args,
     wxGLCanvas *result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     int *temp8 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -699,7 +699,7 @@ static PyObject *_wrap_new_wxGLCanvasWithContext(PyObject *self, PyObject *args,
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     if (obj7) {
@@ -778,7 +778,7 @@ static PyObject *_wrap_GLCanvas_SetColour(PyObject *self, PyObject *args, PyObje
     PyObject *resultobj;
     wxGLCanvas *arg1 = (wxGLCanvas *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -790,7 +790,7 @@ static PyObject *_wrap_GLCanvas_SetColour(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
diff --git a/wxPython/contrib/ogl/ogl.py b/wxPython/contrib/ogl/ogl.py
index a63606915a..750f38a0df 100644
--- a/wxPython/contrib/ogl/ogl.py
+++ b/wxPython/contrib/ogl/ogl.py
@@ -9,41 +9,127 @@ wx = core
 #---------------------------------------------------------------------------
 
 class ShapeRegion(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxShapeRegion instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> ShapeRegion"""
         newobj = _ogl.new_ShapeRegion(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetText(*args, **kwargs): return _ogl.ShapeRegion_SetText(*args, **kwargs)
-    def SetFont(*args, **kwargs): return _ogl.ShapeRegion_SetFont(*args, **kwargs)
-    def SetMinSize(*args, **kwargs): return _ogl.ShapeRegion_SetMinSize(*args, **kwargs)
-    def SetSize(*args, **kwargs): return _ogl.ShapeRegion_SetSize(*args, **kwargs)
-    def SetPosition(*args, **kwargs): return _ogl.ShapeRegion_SetPosition(*args, **kwargs)
-    def SetProportions(*args, **kwargs): return _ogl.ShapeRegion_SetProportions(*args, **kwargs)
-    def SetFormatMode(*args, **kwargs): return _ogl.ShapeRegion_SetFormatMode(*args, **kwargs)
-    def SetName(*args, **kwargs): return _ogl.ShapeRegion_SetName(*args, **kwargs)
-    def SetColour(*args, **kwargs): return _ogl.ShapeRegion_SetColour(*args, **kwargs)
-    def GetText(*args, **kwargs): return _ogl.ShapeRegion_GetText(*args, **kwargs)
-    def GetFont(*args, **kwargs): return _ogl.ShapeRegion_GetFont(*args, **kwargs)
-    def GetMinSize(*args, **kwargs): return _ogl.ShapeRegion_GetMinSize(*args, **kwargs)
-    def GetProportion(*args, **kwargs): return _ogl.ShapeRegion_GetProportion(*args, **kwargs)
-    def GetSize(*args, **kwargs): return _ogl.ShapeRegion_GetSize(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _ogl.ShapeRegion_GetPosition(*args, **kwargs)
-    def GetFormatMode(*args, **kwargs): return _ogl.ShapeRegion_GetFormatMode(*args, **kwargs)
-    def GetName(*args, **kwargs): return _ogl.ShapeRegion_GetName(*args, **kwargs)
-    def GetColour(*args, **kwargs): return _ogl.ShapeRegion_GetColour(*args, **kwargs)
-    def GetActualColourObject(*args, **kwargs): return _ogl.ShapeRegion_GetActualColourObject(*args, **kwargs)
-    def GetFormattedText(*args, **kwargs): return _ogl.ShapeRegion_GetFormattedText(*args, **kwargs)
-    def GetPenColour(*args, **kwargs): return _ogl.ShapeRegion_GetPenColour(*args, **kwargs)
-    def GetPenStyle(*args, **kwargs): return _ogl.ShapeRegion_GetPenStyle(*args, **kwargs)
-    def SetPenStyle(*args, **kwargs): return _ogl.ShapeRegion_SetPenStyle(*args, **kwargs)
-    def SetPenColour(*args, **kwargs): return _ogl.ShapeRegion_SetPenColour(*args, **kwargs)
-    def GetActualPen(*args, **kwargs): return _ogl.ShapeRegion_GetActualPen(*args, **kwargs)
-    def GetWidth(*args, **kwargs): return _ogl.ShapeRegion_GetWidth(*args, **kwargs)
-    def GetHeight(*args, **kwargs): return _ogl.ShapeRegion_GetHeight(*args, **kwargs)
-    def ClearText(*args, **kwargs): return _ogl.ShapeRegion_ClearText(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxShapeRegion instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetText(*args, **kwargs):
+        """SetText(wxString s)"""
+        return _ogl.ShapeRegion_SetText(*args, **kwargs)
+
+    def SetFont(*args, **kwargs):
+        """SetFont(wxFont f)"""
+        return _ogl.ShapeRegion_SetFont(*args, **kwargs)
+
+    def SetMinSize(*args, **kwargs):
+        """SetMinSize(double w, double h)"""
+        return _ogl.ShapeRegion_SetMinSize(*args, **kwargs)
+
+    def SetSize(*args, **kwargs):
+        """SetSize(double w, double h)"""
+        return _ogl.ShapeRegion_SetSize(*args, **kwargs)
+
+    def SetPosition(*args, **kwargs):
+        """SetPosition(double x, double y)"""
+        return _ogl.ShapeRegion_SetPosition(*args, **kwargs)
+
+    def SetProportions(*args, **kwargs):
+        """SetProportions(double x, double y)"""
+        return _ogl.ShapeRegion_SetProportions(*args, **kwargs)
+
+    def SetFormatMode(*args, **kwargs):
+        """SetFormatMode(int mode)"""
+        return _ogl.ShapeRegion_SetFormatMode(*args, **kwargs)
+
+    def SetName(*args, **kwargs):
+        """SetName(wxString s)"""
+        return _ogl.ShapeRegion_SetName(*args, **kwargs)
+
+    def SetColour(*args, **kwargs):
+        """SetColour(wxString col)"""
+        return _ogl.ShapeRegion_SetColour(*args, **kwargs)
+
+    def GetText(*args, **kwargs):
+        """GetText() -> wxString"""
+        return _ogl.ShapeRegion_GetText(*args, **kwargs)
+
+    def GetFont(*args, **kwargs):
+        """GetFont() -> wxFont"""
+        return _ogl.ShapeRegion_GetFont(*args, **kwargs)
+
+    def GetMinSize(*args, **kwargs):
+        """GetMinSize(double OUTPUT, double OUTPUT)"""
+        return _ogl.ShapeRegion_GetMinSize(*args, **kwargs)
+
+    def GetProportion(*args, **kwargs):
+        """GetProportion(double OUTPUT, double OUTPUT)"""
+        return _ogl.ShapeRegion_GetProportion(*args, **kwargs)
+
+    def GetSize(*args, **kwargs):
+        """GetSize(double OUTPUT, double OUTPUT)"""
+        return _ogl.ShapeRegion_GetSize(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition(double OUTPUT, double OUTPUT)"""
+        return _ogl.ShapeRegion_GetPosition(*args, **kwargs)
+
+    def GetFormatMode(*args, **kwargs):
+        """GetFormatMode() -> int"""
+        return _ogl.ShapeRegion_GetFormatMode(*args, **kwargs)
+
+    def GetName(*args, **kwargs):
+        """GetName() -> wxString"""
+        return _ogl.ShapeRegion_GetName(*args, **kwargs)
+
+    def GetColour(*args, **kwargs):
+        """GetColour() -> wxString"""
+        return _ogl.ShapeRegion_GetColour(*args, **kwargs)
+
+    def GetActualColourObject(*args, **kwargs):
+        """GetActualColourObject() -> wxColour"""
+        return _ogl.ShapeRegion_GetActualColourObject(*args, **kwargs)
+
+    def GetFormattedText(*args, **kwargs):
+        """GetFormattedText() -> wxList"""
+        return _ogl.ShapeRegion_GetFormattedText(*args, **kwargs)
+
+    def GetPenColour(*args, **kwargs):
+        """GetPenColour() -> wxString"""
+        return _ogl.ShapeRegion_GetPenColour(*args, **kwargs)
+
+    def GetPenStyle(*args, **kwargs):
+        """GetPenStyle() -> int"""
+        return _ogl.ShapeRegion_GetPenStyle(*args, **kwargs)
+
+    def SetPenStyle(*args, **kwargs):
+        """SetPenStyle(int style)"""
+        return _ogl.ShapeRegion_SetPenStyle(*args, **kwargs)
+
+    def SetPenColour(*args, **kwargs):
+        """SetPenColour(wxString col)"""
+        return _ogl.ShapeRegion_SetPenColour(*args, **kwargs)
+
+    def GetActualPen(*args, **kwargs):
+        """GetActualPen() -> wxPen"""
+        return _ogl.ShapeRegion_GetActualPen(*args, **kwargs)
+
+    def GetWidth(*args, **kwargs):
+        """GetWidth() -> double"""
+        return _ogl.ShapeRegion_GetWidth(*args, **kwargs)
+
+    def GetHeight(*args, **kwargs):
+        """GetHeight() -> double"""
+        return _ogl.ShapeRegion_GetHeight(*args, **kwargs)
+
+    def ClearText(*args, **kwargs):
+        """ClearText()"""
+        return _ogl.ShapeRegion_ClearText(*args, **kwargs)
+
 
 class ShapeRegionPtr(ShapeRegion):
     def __init__(self, this):
@@ -53,54 +139,170 @@ class ShapeRegionPtr(ShapeRegion):
 _ogl.ShapeRegion_swigregister(ShapeRegionPtr)
 
 class PyShapeEvtHandler(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyShapeEvtHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(PyShapeEvtHandler prev=None, PyShape shape=None) -> PyShapeEvtHandler"""
         newobj = _ogl.new_PyShapeEvtHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORandCallbackInfo(PyShapeEvtHandler)
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyShapeEvtHandler__setCallbackInfo(*args, **kwargs)
-    def _setOORInfo(*args, **kwargs): return _ogl.PyShapeEvtHandler__setOORInfo(*args, **kwargs)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyShapeEvtHandler__setCallbackInfo(*args, **kwargs)
+
+    def _setOORInfo(*args, **kwargs):
+        """_setOORInfo(PyObject _self)"""
+        return _ogl.PyShapeEvtHandler__setOORInfo(*args, **kwargs)
+
     def _setOORandCallbackInfo(self, _class):
         self._setOORInfo(self)
         self._setCallbackInfo(self, _class)
 
-    def SetShape(*args, **kwargs): return _ogl.PyShapeEvtHandler_SetShape(*args, **kwargs)
-    def GetShape(*args, **kwargs): return _ogl.PyShapeEvtHandler_GetShape(*args, **kwargs)
-    def SetPreviousHandler(*args, **kwargs): return _ogl.PyShapeEvtHandler_SetPreviousHandler(*args, **kwargs)
-    def GetPreviousHandler(*args, **kwargs): return _ogl.PyShapeEvtHandler_GetPreviousHandler(*args, **kwargs)
-    def CreateNewCopy(*args, **kwargs): return _ogl.PyShapeEvtHandler_CreateNewCopy(*args, **kwargs)
-    def base_OnDelete(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDelete(*args, **kwargs)
-    def base_OnDraw(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDraw(*args, **kwargs)
-    def base_OnDrawContents(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDrawContents(*args, **kwargs)
-    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDrawBranches(*args, **kwargs)
-    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnMoveLinks(*args, **kwargs)
-    def base_OnErase(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnErase(*args, **kwargs)
-    def base_OnEraseContents(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnEraseContents(*args, **kwargs)
-    def base_OnHighlight(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnHighlight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnLeftClick(*args, **kwargs)
-    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnLeftDoubleClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnRightClick(*args, **kwargs)
-    def base_OnSize(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnSize(*args, **kwargs)
-    def base_OnMovePre(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnMovePre(*args, **kwargs)
-    def base_OnMovePost(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnMovePost(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDragLeft(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDragRight(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDrawOutline(*args, **kwargs)
-    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDrawControlPoints(*args, **kwargs)
-    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnEraseControlPoints(*args, **kwargs)
-    def base_OnMoveLink(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnMoveLink(*args, **kwargs)
-    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnSizingDragLeft(*args, **kwargs)
-    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnSizingBeginDragLeft(*args, **kwargs)
-    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnSizingEndDragLeft(*args, **kwargs)
-    def base_OnBeginSize(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnBeginSize(*args, **kwargs)
-    def base_OnEndSize(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnEndSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyShapeEvtHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetShape(*args, **kwargs):
+        """SetShape(PyShape sh)"""
+        return _ogl.PyShapeEvtHandler_SetShape(*args, **kwargs)
+
+    def GetShape(*args, **kwargs):
+        """GetShape() -> PyShape"""
+        return _ogl.PyShapeEvtHandler_GetShape(*args, **kwargs)
+
+    def SetPreviousHandler(*args, **kwargs):
+        """SetPreviousHandler(PyShapeEvtHandler handler)"""
+        return _ogl.PyShapeEvtHandler_SetPreviousHandler(*args, **kwargs)
+
+    def GetPreviousHandler(*args, **kwargs):
+        """GetPreviousHandler() -> PyShapeEvtHandler"""
+        return _ogl.PyShapeEvtHandler_GetPreviousHandler(*args, **kwargs)
+
+    def CreateNewCopy(*args, **kwargs):
+        """CreateNewCopy() -> PyShapeEvtHandler"""
+        return _ogl.PyShapeEvtHandler_CreateNewCopy(*args, **kwargs)
+
+    def base_OnDelete(*args, **kwargs):
+        """base_OnDelete()"""
+        return _ogl.PyShapeEvtHandler_base_OnDelete(*args, **kwargs)
+
+    def base_OnDraw(*args, **kwargs):
+        """base_OnDraw(wxDC dc)"""
+        return _ogl.PyShapeEvtHandler_base_OnDraw(*args, **kwargs)
+
+    def base_OnDrawContents(*args, **kwargs):
+        """base_OnDrawContents(wxDC dc)"""
+        return _ogl.PyShapeEvtHandler_base_OnDrawContents(*args, **kwargs)
+
+    def base_OnDrawBranches(*args, **kwargs):
+        """base_OnDrawBranches(wxDC dc, bool erase=False)"""
+        return _ogl.PyShapeEvtHandler_base_OnDrawBranches(*args, **kwargs)
+
+    def base_OnMoveLinks(*args, **kwargs):
+        """base_OnMoveLinks(wxDC dc)"""
+        return _ogl.PyShapeEvtHandler_base_OnMoveLinks(*args, **kwargs)
+
+    def base_OnErase(*args, **kwargs):
+        """base_OnErase(wxDC dc)"""
+        return _ogl.PyShapeEvtHandler_base_OnErase(*args, **kwargs)
+
+    def base_OnEraseContents(*args, **kwargs):
+        """base_OnEraseContents(wxDC dc)"""
+        return _ogl.PyShapeEvtHandler_base_OnEraseContents(*args, **kwargs)
+
+    def base_OnHighlight(*args, **kwargs):
+        """base_OnHighlight(wxDC dc)"""
+        return _ogl.PyShapeEvtHandler_base_OnHighlight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShapeEvtHandler_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnLeftDoubleClick(*args, **kwargs):
+        """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShapeEvtHandler_base_OnLeftDoubleClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShapeEvtHandler_base_OnRightClick(*args, **kwargs)
+
+    def base_OnSize(*args, **kwargs):
+        """base_OnSize(double x, double y)"""
+        return _ogl.PyShapeEvtHandler_base_OnSize(*args, **kwargs)
+
+    def base_OnMovePre(*args, **kwargs):
+        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True) -> bool"""
+        return _ogl.PyShapeEvtHandler_base_OnMovePre(*args, **kwargs)
+
+    def base_OnMovePost(*args, **kwargs):
+        """base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True)"""
+        return _ogl.PyShapeEvtHandler_base_OnMovePost(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShapeEvtHandler_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShapeEvtHandler_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShapeEvtHandler_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShapeEvtHandler_base_OnDragRight(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShapeEvtHandler_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShapeEvtHandler_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDrawOutline(*args, **kwargs):
+        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        return _ogl.PyShapeEvtHandler_base_OnDrawOutline(*args, **kwargs)
+
+    def base_OnDrawControlPoints(*args, **kwargs):
+        """base_OnDrawControlPoints(wxDC dc)"""
+        return _ogl.PyShapeEvtHandler_base_OnDrawControlPoints(*args, **kwargs)
+
+    def base_OnEraseControlPoints(*args, **kwargs):
+        """base_OnEraseControlPoints(wxDC dc)"""
+        return _ogl.PyShapeEvtHandler_base_OnEraseControlPoints(*args, **kwargs)
+
+    def base_OnMoveLink(*args, **kwargs):
+        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        return _ogl.PyShapeEvtHandler_base_OnMoveLink(*args, **kwargs)
+
+    def base_OnSizingDragLeft(*args, **kwargs):
+        """base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyShapeEvtHandler_base_OnSizingDragLeft(*args, **kwargs)
+
+    def base_OnSizingBeginDragLeft(*args, **kwargs):
+        """base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyShapeEvtHandler_base_OnSizingBeginDragLeft(*args, **kwargs)
+
+    def base_OnSizingEndDragLeft(*args, **kwargs):
+        """base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyShapeEvtHandler_base_OnSizingEndDragLeft(*args, **kwargs)
+
+    def base_OnBeginSize(*args, **kwargs):
+        """base_OnBeginSize(double w, double h)"""
+        return _ogl.PyShapeEvtHandler_base_OnBeginSize(*args, **kwargs)
+
+    def base_OnEndSize(*args, **kwargs):
+        """base_OnEndSize(double w, double h)"""
+        return _ogl.PyShapeEvtHandler_base_OnEndSize(*args, **kwargs)
+
 
 class PyShapeEvtHandlerPtr(PyShapeEvtHandler):
     def __init__(self, this):
@@ -110,71 +312,254 @@ class PyShapeEvtHandlerPtr(PyShapeEvtHandler):
 _ogl.PyShapeEvtHandler_swigregister(PyShapeEvtHandlerPtr)
 
 class PyShape(PyShapeEvtHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(PyShapeCanvas can=None) -> PyShape"""
         newobj = _ogl.new_PyShape(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORandCallbackInfo(PyShapeEvtHandler)
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyShape__setCallbackInfo(*args, **kwargs)
-    def GetBoundingBoxMax(*args, **kwargs): return _ogl.PyShape_GetBoundingBoxMax(*args, **kwargs)
-    def GetBoundingBoxMin(*args, **kwargs): return _ogl.PyShape_GetBoundingBoxMin(*args, **kwargs)
-    def GetPerimeterPoint(*args, **kwargs): return _ogl.PyShape_GetPerimeterPoint(*args, **kwargs)
-    def GetCanvas(*args, **kwargs): return _ogl.PyShape_GetCanvas(*args, **kwargs)
-    def SetCanvas(*args, **kwargs): return _ogl.PyShape_SetCanvas(*args, **kwargs)
-    def AddToCanvas(*args, **kwargs): return _ogl.PyShape_AddToCanvas(*args, **kwargs)
-    def InsertInCanvas(*args, **kwargs): return _ogl.PyShape_InsertInCanvas(*args, **kwargs)
-    def RemoveFromCanvas(*args, **kwargs): return _ogl.PyShape_RemoveFromCanvas(*args, **kwargs)
-    def GetX(*args, **kwargs): return _ogl.PyShape_GetX(*args, **kwargs)
-    def GetY(*args, **kwargs): return _ogl.PyShape_GetY(*args, **kwargs)
-    def SetX(*args, **kwargs): return _ogl.PyShape_SetX(*args, **kwargs)
-    def SetY(*args, **kwargs): return _ogl.PyShape_SetY(*args, **kwargs)
-    def GetParent(*args, **kwargs): return _ogl.PyShape_GetParent(*args, **kwargs)
-    def SetParent(*args, **kwargs): return _ogl.PyShape_SetParent(*args, **kwargs)
-    def GetTopAncestor(*args, **kwargs): return _ogl.PyShape_GetTopAncestor(*args, **kwargs)
-    def GetChildren(*args, **kwargs): return _ogl.PyShape_GetChildren(*args, **kwargs)
-    def Unlink(*args, **kwargs): return _ogl.PyShape_Unlink(*args, **kwargs)
-    def SetDrawHandles(*args, **kwargs): return _ogl.PyShape_SetDrawHandles(*args, **kwargs)
-    def GetDrawHandles(*args, **kwargs): return _ogl.PyShape_GetDrawHandles(*args, **kwargs)
-    def MakeControlPoints(*args, **kwargs): return _ogl.PyShape_MakeControlPoints(*args, **kwargs)
-    def DeleteControlPoints(*args, **kwargs): return _ogl.PyShape_DeleteControlPoints(*args, **kwargs)
-    def ResetControlPoints(*args, **kwargs): return _ogl.PyShape_ResetControlPoints(*args, **kwargs)
-    def GetEventHandler(*args, **kwargs): return _ogl.PyShape_GetEventHandler(*args, **kwargs)
-    def SetEventHandler(*args, **kwargs): return _ogl.PyShape_SetEventHandler(*args, **kwargs)
-    def MakeMandatoryControlPoints(*args, **kwargs): return _ogl.PyShape_MakeMandatoryControlPoints(*args, **kwargs)
-    def ResetMandatoryControlPoints(*args, **kwargs): return _ogl.PyShape_ResetMandatoryControlPoints(*args, **kwargs)
-    def Recompute(*args, **kwargs): return _ogl.PyShape_Recompute(*args, **kwargs)
-    def CalculateSize(*args, **kwargs): return _ogl.PyShape_CalculateSize(*args, **kwargs)
-    def Select(*args, **kwargs): return _ogl.PyShape_Select(*args, **kwargs)
-    def SetHighlight(*args, **kwargs): return _ogl.PyShape_SetHighlight(*args, **kwargs)
-    def IsHighlighted(*args, **kwargs): return _ogl.PyShape_IsHighlighted(*args, **kwargs)
-    def Selected(*args, **kwargs): return _ogl.PyShape_Selected(*args, **kwargs)
-    def AncestorSelected(*args, **kwargs): return _ogl.PyShape_AncestorSelected(*args, **kwargs)
-    def SetSensitivityFilter(*args, **kwargs): return _ogl.PyShape_SetSensitivityFilter(*args, **kwargs)
-    def GetSensitivityFilter(*args, **kwargs): return _ogl.PyShape_GetSensitivityFilter(*args, **kwargs)
-    def SetDraggable(*args, **kwargs): return _ogl.PyShape_SetDraggable(*args, **kwargs)
-    def SetFixedSize(*args, **kwargs): return _ogl.PyShape_SetFixedSize(*args, **kwargs)
-    def GetFixedSize(*args, **kwargs): return _ogl.PyShape_GetFixedSize(*args, **kwargs)
-    def GetFixedWidth(*args, **kwargs): return _ogl.PyShape_GetFixedWidth(*args, **kwargs)
-    def GetFixedHeight(*args, **kwargs): return _ogl.PyShape_GetFixedHeight(*args, **kwargs)
-    def SetSpaceAttachments(*args, **kwargs): return _ogl.PyShape_SetSpaceAttachments(*args, **kwargs)
-    def GetSpaceAttachments(*args, **kwargs): return _ogl.PyShape_GetSpaceAttachments(*args, **kwargs)
-    def SetShadowMode(*args, **kwargs): return _ogl.PyShape_SetShadowMode(*args, **kwargs)
-    def GetShadowMode(*args, **kwargs): return _ogl.PyShape_GetShadowMode(*args, **kwargs)
-    def HitTest(*args, **kwargs): return _ogl.PyShape_HitTest(*args, **kwargs)
-    def SetCentreResize(*args, **kwargs): return _ogl.PyShape_SetCentreResize(*args, **kwargs)
-    def GetCentreResize(*args, **kwargs): return _ogl.PyShape_GetCentreResize(*args, **kwargs)
-    def SetMaintainAspectRatio(*args, **kwargs): return _ogl.PyShape_SetMaintainAspectRatio(*args, **kwargs)
-    def GetMaintainAspectRatio(*args, **kwargs): return _ogl.PyShape_GetMaintainAspectRatio(*args, **kwargs)
-    def GetLines(*args, **kwargs): return _ogl.PyShape_GetLines(*args, **kwargs)
-    def SetDisableLabel(*args, **kwargs): return _ogl.PyShape_SetDisableLabel(*args, **kwargs)
-    def GetDisableLabel(*args, **kwargs): return _ogl.PyShape_GetDisableLabel(*args, **kwargs)
-    def SetAttachmentMode(*args, **kwargs): return _ogl.PyShape_SetAttachmentMode(*args, **kwargs)
-    def GetAttachmentMode(*args, **kwargs): return _ogl.PyShape_GetAttachmentMode(*args, **kwargs)
-    def SetId(*args, **kwargs): return _ogl.PyShape_SetId(*args, **kwargs)
-    def GetId(*args, **kwargs): return _ogl.PyShape_GetId(*args, **kwargs)
-    def SetPen(*args, **kwargs): return _ogl.PyShape_SetPen(*args, **kwargs)
-    def SetBrush(*args, **kwargs): return _ogl.PyShape_SetBrush(*args, **kwargs)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyShape__setCallbackInfo(*args, **kwargs)
+
+    def GetBoundingBoxMax(*args, **kwargs):
+        """GetBoundingBoxMax(double OUTPUT, double OUTPUT)"""
+        return _ogl.PyShape_GetBoundingBoxMax(*args, **kwargs)
+
+    def GetBoundingBoxMin(*args, **kwargs):
+        """GetBoundingBoxMin(double OUTPUT, double OUTPUT)"""
+        return _ogl.PyShape_GetBoundingBoxMin(*args, **kwargs)
+
+    def GetPerimeterPoint(*args, **kwargs):
+        """GetPerimeterPoint(double x1, double y1, double x2, double y2, double OUTPUT, 
+    double OUTPUT) -> bool"""
+        return _ogl.PyShape_GetPerimeterPoint(*args, **kwargs)
+
+    def GetCanvas(*args, **kwargs):
+        """GetCanvas() -> PyShapeCanvas"""
+        return _ogl.PyShape_GetCanvas(*args, **kwargs)
+
+    def SetCanvas(*args, **kwargs):
+        """SetCanvas(PyShapeCanvas the_canvas)"""
+        return _ogl.PyShape_SetCanvas(*args, **kwargs)
+
+    def AddToCanvas(*args, **kwargs):
+        """AddToCanvas(PyShapeCanvas the_canvas, PyShape addAfter=None)"""
+        return _ogl.PyShape_AddToCanvas(*args, **kwargs)
+
+    def InsertInCanvas(*args, **kwargs):
+        """InsertInCanvas(PyShapeCanvas the_canvas)"""
+        return _ogl.PyShape_InsertInCanvas(*args, **kwargs)
+
+    def RemoveFromCanvas(*args, **kwargs):
+        """RemoveFromCanvas(PyShapeCanvas the_canvas)"""
+        return _ogl.PyShape_RemoveFromCanvas(*args, **kwargs)
+
+    def GetX(*args, **kwargs):
+        """GetX() -> double"""
+        return _ogl.PyShape_GetX(*args, **kwargs)
+
+    def GetY(*args, **kwargs):
+        """GetY() -> double"""
+        return _ogl.PyShape_GetY(*args, **kwargs)
+
+    def SetX(*args, **kwargs):
+        """SetX(double x)"""
+        return _ogl.PyShape_SetX(*args, **kwargs)
+
+    def SetY(*args, **kwargs):
+        """SetY(double y)"""
+        return _ogl.PyShape_SetY(*args, **kwargs)
+
+    def GetParent(*args, **kwargs):
+        """GetParent() -> PyShape"""
+        return _ogl.PyShape_GetParent(*args, **kwargs)
+
+    def SetParent(*args, **kwargs):
+        """SetParent(PyShape p)"""
+        return _ogl.PyShape_SetParent(*args, **kwargs)
+
+    def GetTopAncestor(*args, **kwargs):
+        """GetTopAncestor() -> PyShape"""
+        return _ogl.PyShape_GetTopAncestor(*args, **kwargs)
+
+    def GetChildren(*args, **kwargs):
+        """GetChildren() -> PyObject"""
+        return _ogl.PyShape_GetChildren(*args, **kwargs)
+
+    def Unlink(*args, **kwargs):
+        """Unlink()"""
+        return _ogl.PyShape_Unlink(*args, **kwargs)
+
+    def SetDrawHandles(*args, **kwargs):
+        """SetDrawHandles(bool drawH)"""
+        return _ogl.PyShape_SetDrawHandles(*args, **kwargs)
+
+    def GetDrawHandles(*args, **kwargs):
+        """GetDrawHandles() -> bool"""
+        return _ogl.PyShape_GetDrawHandles(*args, **kwargs)
+
+    def MakeControlPoints(*args, **kwargs):
+        """MakeControlPoints()"""
+        return _ogl.PyShape_MakeControlPoints(*args, **kwargs)
+
+    def DeleteControlPoints(*args, **kwargs):
+        """DeleteControlPoints(wxDC dc=None)"""
+        return _ogl.PyShape_DeleteControlPoints(*args, **kwargs)
+
+    def ResetControlPoints(*args, **kwargs):
+        """ResetControlPoints()"""
+        return _ogl.PyShape_ResetControlPoints(*args, **kwargs)
+
+    def GetEventHandler(*args, **kwargs):
+        """GetEventHandler() -> PyShapeEvtHandler"""
+        return _ogl.PyShape_GetEventHandler(*args, **kwargs)
+
+    def SetEventHandler(*args, **kwargs):
+        """SetEventHandler(PyShapeEvtHandler handler)"""
+        return _ogl.PyShape_SetEventHandler(*args, **kwargs)
+
+    def MakeMandatoryControlPoints(*args, **kwargs):
+        """MakeMandatoryControlPoints()"""
+        return _ogl.PyShape_MakeMandatoryControlPoints(*args, **kwargs)
+
+    def ResetMandatoryControlPoints(*args, **kwargs):
+        """ResetMandatoryControlPoints()"""
+        return _ogl.PyShape_ResetMandatoryControlPoints(*args, **kwargs)
+
+    def Recompute(*args, **kwargs):
+        """Recompute() -> bool"""
+        return _ogl.PyShape_Recompute(*args, **kwargs)
+
+    def CalculateSize(*args, **kwargs):
+        """CalculateSize()"""
+        return _ogl.PyShape_CalculateSize(*args, **kwargs)
+
+    def Select(*args, **kwargs):
+        """Select(bool select=True, wxDC dc=None)"""
+        return _ogl.PyShape_Select(*args, **kwargs)
+
+    def SetHighlight(*args, **kwargs):
+        """SetHighlight(bool hi=True, bool recurse=False)"""
+        return _ogl.PyShape_SetHighlight(*args, **kwargs)
+
+    def IsHighlighted(*args, **kwargs):
+        """IsHighlighted() -> bool"""
+        return _ogl.PyShape_IsHighlighted(*args, **kwargs)
+
+    def Selected(*args, **kwargs):
+        """Selected() -> bool"""
+        return _ogl.PyShape_Selected(*args, **kwargs)
+
+    def AncestorSelected(*args, **kwargs):
+        """AncestorSelected() -> bool"""
+        return _ogl.PyShape_AncestorSelected(*args, **kwargs)
+
+    def SetSensitivityFilter(*args, **kwargs):
+        """SetSensitivityFilter(int sens=OP_ALL, bool recursive=False)"""
+        return _ogl.PyShape_SetSensitivityFilter(*args, **kwargs)
+
+    def GetSensitivityFilter(*args, **kwargs):
+        """GetSensitivityFilter() -> int"""
+        return _ogl.PyShape_GetSensitivityFilter(*args, **kwargs)
+
+    def SetDraggable(*args, **kwargs):
+        """SetDraggable(bool drag, bool recursive=False)"""
+        return _ogl.PyShape_SetDraggable(*args, **kwargs)
+
+    def SetFixedSize(*args, **kwargs):
+        """SetFixedSize(bool x, bool y)"""
+        return _ogl.PyShape_SetFixedSize(*args, **kwargs)
+
+    def GetFixedSize(*args, **kwargs):
+        """GetFixedSize(bool OUTPUT, bool OUTPUT)"""
+        return _ogl.PyShape_GetFixedSize(*args, **kwargs)
+
+    def GetFixedWidth(*args, **kwargs):
+        """GetFixedWidth() -> bool"""
+        return _ogl.PyShape_GetFixedWidth(*args, **kwargs)
+
+    def GetFixedHeight(*args, **kwargs):
+        """GetFixedHeight() -> bool"""
+        return _ogl.PyShape_GetFixedHeight(*args, **kwargs)
+
+    def SetSpaceAttachments(*args, **kwargs):
+        """SetSpaceAttachments(bool sp)"""
+        return _ogl.PyShape_SetSpaceAttachments(*args, **kwargs)
+
+    def GetSpaceAttachments(*args, **kwargs):
+        """GetSpaceAttachments() -> bool"""
+        return _ogl.PyShape_GetSpaceAttachments(*args, **kwargs)
+
+    def SetShadowMode(*args, **kwargs):
+        """SetShadowMode(int mode, bool redraw=False)"""
+        return _ogl.PyShape_SetShadowMode(*args, **kwargs)
+
+    def GetShadowMode(*args, **kwargs):
+        """GetShadowMode() -> int"""
+        return _ogl.PyShape_GetShadowMode(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """HitTest(double x, double y, int OUTPUT, double OUTPUT) -> bool"""
+        return _ogl.PyShape_HitTest(*args, **kwargs)
+
+    def SetCentreResize(*args, **kwargs):
+        """SetCentreResize(bool cr)"""
+        return _ogl.PyShape_SetCentreResize(*args, **kwargs)
+
+    def GetCentreResize(*args, **kwargs):
+        """GetCentreResize() -> bool"""
+        return _ogl.PyShape_GetCentreResize(*args, **kwargs)
+
+    def SetMaintainAspectRatio(*args, **kwargs):
+        """SetMaintainAspectRatio(bool ar)"""
+        return _ogl.PyShape_SetMaintainAspectRatio(*args, **kwargs)
+
+    def GetMaintainAspectRatio(*args, **kwargs):
+        """GetMaintainAspectRatio() -> bool"""
+        return _ogl.PyShape_GetMaintainAspectRatio(*args, **kwargs)
+
+    def GetLines(*args, **kwargs):
+        """GetLines() -> PyObject"""
+        return _ogl.PyShape_GetLines(*args, **kwargs)
+
+    def SetDisableLabel(*args, **kwargs):
+        """SetDisableLabel(bool flag)"""
+        return _ogl.PyShape_SetDisableLabel(*args, **kwargs)
+
+    def GetDisableLabel(*args, **kwargs):
+        """GetDisableLabel() -> bool"""
+        return _ogl.PyShape_GetDisableLabel(*args, **kwargs)
+
+    def SetAttachmentMode(*args, **kwargs):
+        """SetAttachmentMode(int mode)"""
+        return _ogl.PyShape_SetAttachmentMode(*args, **kwargs)
+
+    def GetAttachmentMode(*args, **kwargs):
+        """GetAttachmentMode() -> int"""
+        return _ogl.PyShape_GetAttachmentMode(*args, **kwargs)
+
+    def SetId(*args, **kwargs):
+        """SetId(long i)"""
+        return _ogl.PyShape_SetId(*args, **kwargs)
+
+    def GetId(*args, **kwargs):
+        """GetId() -> long"""
+        return _ogl.PyShape_GetId(*args, **kwargs)
+
+    def SetPen(*args, **kwargs):
+        """SetPen(wxPen pen)"""
+        return _ogl.PyShape_SetPen(*args, **kwargs)
+
+    def SetBrush(*args, **kwargs):
+        """SetBrush(wxBrush brush)"""
+        return _ogl.PyShape_SetBrush(*args, **kwargs)
+
     def SetClientData(self, data):
         self.clientData = data
     def GetClientData(self):
@@ -183,113 +568,436 @@ class PyShape(PyShapeEvtHandler):
         else:
             return None
 
-    def Show(*args, **kwargs): return _ogl.PyShape_Show(*args, **kwargs)
-    def IsShown(*args, **kwargs): return _ogl.PyShape_IsShown(*args, **kwargs)
-    def Move(*args, **kwargs): return _ogl.PyShape_Move(*args, **kwargs)
-    def Erase(*args, **kwargs): return _ogl.PyShape_Erase(*args, **kwargs)
-    def EraseContents(*args, **kwargs): return _ogl.PyShape_EraseContents(*args, **kwargs)
-    def Draw(*args, **kwargs): return _ogl.PyShape_Draw(*args, **kwargs)
-    def Flash(*args, **kwargs): return _ogl.PyShape_Flash(*args, **kwargs)
-    def MoveLinks(*args, **kwargs): return _ogl.PyShape_MoveLinks(*args, **kwargs)
-    def DrawContents(*args, **kwargs): return _ogl.PyShape_DrawContents(*args, **kwargs)
-    def SetSize(*args, **kwargs): return _ogl.PyShape_SetSize(*args, **kwargs)
-    def SetAttachmentSize(*args, **kwargs): return _ogl.PyShape_SetAttachmentSize(*args, **kwargs)
-    def Attach(*args, **kwargs): return _ogl.PyShape_Attach(*args, **kwargs)
-    def Detach(*args, **kwargs): return _ogl.PyShape_Detach(*args, **kwargs)
-    def Constrain(*args, **kwargs): return _ogl.PyShape_Constrain(*args, **kwargs)
-    def AddLine(*args, **kwargs): return _ogl.PyShape_AddLine(*args, **kwargs)
-    def GetLinePosition(*args, **kwargs): return _ogl.PyShape_GetLinePosition(*args, **kwargs)
-    def AddText(*args, **kwargs): return _ogl.PyShape_AddText(*args, **kwargs)
-    def GetPen(*args, **kwargs): return _ogl.PyShape_GetPen(*args, **kwargs)
-    def GetBrush(*args, **kwargs): return _ogl.PyShape_GetBrush(*args, **kwargs)
-    def SetDefaultRegionSize(*args, **kwargs): return _ogl.PyShape_SetDefaultRegionSize(*args, **kwargs)
-    def FormatText(*args, **kwargs): return _ogl.PyShape_FormatText(*args, **kwargs)
-    def SetFormatMode(*args, **kwargs): return _ogl.PyShape_SetFormatMode(*args, **kwargs)
-    def GetFormatMode(*args, **kwargs): return _ogl.PyShape_GetFormatMode(*args, **kwargs)
-    def SetFont(*args, **kwargs): return _ogl.PyShape_SetFont(*args, **kwargs)
-    def GetFont(*args, **kwargs): return _ogl.PyShape_GetFont(*args, **kwargs)
-    def SetTextColour(*args, **kwargs): return _ogl.PyShape_SetTextColour(*args, **kwargs)
-    def GetTextColour(*args, **kwargs): return _ogl.PyShape_GetTextColour(*args, **kwargs)
-    def GetNumberOfTextRegions(*args, **kwargs): return _ogl.PyShape_GetNumberOfTextRegions(*args, **kwargs)
-    def SetRegionName(*args, **kwargs): return _ogl.PyShape_SetRegionName(*args, **kwargs)
-    def GetRegionName(*args, **kwargs): return _ogl.PyShape_GetRegionName(*args, **kwargs)
-    def GetRegionId(*args, **kwargs): return _ogl.PyShape_GetRegionId(*args, **kwargs)
-    def NameRegions(*args, **kwargs): return _ogl.PyShape_NameRegions(*args, **kwargs)
-    def GetRegions(*args, **kwargs): return _ogl.PyShape_GetRegions(*args, **kwargs)
-    def AddRegion(*args, **kwargs): return _ogl.PyShape_AddRegion(*args, **kwargs)
-    def ClearRegions(*args, **kwargs): return _ogl.PyShape_ClearRegions(*args, **kwargs)
-    def AssignNewIds(*args, **kwargs): return _ogl.PyShape_AssignNewIds(*args, **kwargs)
-    def FindRegion(*args, **kwargs): return _ogl.PyShape_FindRegion(*args, **kwargs)
-    def FindRegionNames(*args, **kwargs): return _ogl.PyShape_FindRegionNames(*args, **kwargs)
-    def ClearText(*args, **kwargs): return _ogl.PyShape_ClearText(*args, **kwargs)
-    def RemoveLine(*args, **kwargs): return _ogl.PyShape_RemoveLine(*args, **kwargs)
-    def GetAttachmentPosition(*args, **kwargs): return _ogl.PyShape_GetAttachmentPosition(*args, **kwargs)
-    def GetNumberOfAttachments(*args, **kwargs): return _ogl.PyShape_GetNumberOfAttachments(*args, **kwargs)
-    def AttachmentIsValid(*args, **kwargs): return _ogl.PyShape_AttachmentIsValid(*args, **kwargs)
-    def GetAttachmentPositionEdge(*args, **kwargs): return _ogl.PyShape_GetAttachmentPositionEdge(*args, **kwargs)
-    def CalcSimpleAttachment(*args, **kwargs): return _ogl.PyShape_CalcSimpleAttachment(*args, **kwargs)
-    def AttachmentSortTest(*args, **kwargs): return _ogl.PyShape_AttachmentSortTest(*args, **kwargs)
-    def EraseLinks(*args, **kwargs): return _ogl.PyShape_EraseLinks(*args, **kwargs)
-    def DrawLinks(*args, **kwargs): return _ogl.PyShape_DrawLinks(*args, **kwargs)
-    def MoveLineToNewAttachment(*args, **kwargs): return _ogl.PyShape_MoveLineToNewAttachment(*args, **kwargs)
-    def ApplyAttachmentOrdering(*args, **kwargs): return _ogl.PyShape_ApplyAttachmentOrdering(*args, **kwargs)
-    def GetBranchingAttachmentRoot(*args, **kwargs): return _ogl.PyShape_GetBranchingAttachmentRoot(*args, **kwargs)
-    def GetBranchingAttachmentInfo(*args, **kwargs): return _ogl.PyShape_GetBranchingAttachmentInfo(*args, **kwargs)
-    def GetBranchingAttachmentPoint(*args, **kwargs): return _ogl.PyShape_GetBranchingAttachmentPoint(*args, **kwargs)
-    def GetAttachmentLineCount(*args, **kwargs): return _ogl.PyShape_GetAttachmentLineCount(*args, **kwargs)
-    def SetBranchNeckLength(*args, **kwargs): return _ogl.PyShape_SetBranchNeckLength(*args, **kwargs)
-    def GetBranchNeckLength(*args, **kwargs): return _ogl.PyShape_GetBranchNeckLength(*args, **kwargs)
-    def SetBranchStemLength(*args, **kwargs): return _ogl.PyShape_SetBranchStemLength(*args, **kwargs)
-    def GetBranchStemLength(*args, **kwargs): return _ogl.PyShape_GetBranchStemLength(*args, **kwargs)
-    def SetBranchSpacing(*args, **kwargs): return _ogl.PyShape_SetBranchSpacing(*args, **kwargs)
-    def GetBranchSpacing(*args, **kwargs): return _ogl.PyShape_GetBranchSpacing(*args, **kwargs)
-    def SetBranchStyle(*args, **kwargs): return _ogl.PyShape_SetBranchStyle(*args, **kwargs)
-    def GetBranchStyle(*args, **kwargs): return _ogl.PyShape_GetBranchStyle(*args, **kwargs)
-    def PhysicalToLogicalAttachment(*args, **kwargs): return _ogl.PyShape_PhysicalToLogicalAttachment(*args, **kwargs)
-    def LogicalToPhysicalAttachment(*args, **kwargs): return _ogl.PyShape_LogicalToPhysicalAttachment(*args, **kwargs)
-    def Draggable(*args, **kwargs): return _ogl.PyShape_Draggable(*args, **kwargs)
-    def HasDescendant(*args, **kwargs): return _ogl.PyShape_HasDescendant(*args, **kwargs)
-    def CreateNewCopy(*args, **kwargs): return _ogl.PyShape_CreateNewCopy(*args, **kwargs)
-    def Copy(*args, **kwargs): return _ogl.PyShape_Copy(*args, **kwargs)
-    def CopyWithHandler(*args, **kwargs): return _ogl.PyShape_CopyWithHandler(*args, **kwargs)
-    def Rotate(*args, **kwargs): return _ogl.PyShape_Rotate(*args, **kwargs)
-    def GetRotation(*args, **kwargs): return _ogl.PyShape_GetRotation(*args, **kwargs)
-    def ClearAttachments(*args, **kwargs): return _ogl.PyShape_ClearAttachments(*args, **kwargs)
-    def Recentre(*args, **kwargs): return _ogl.PyShape_Recentre(*args, **kwargs)
-    def ClearPointList(*args, **kwargs): return _ogl.PyShape_ClearPointList(*args, **kwargs)
-    def GetBackgroundPen(*args, **kwargs): return _ogl.PyShape_GetBackgroundPen(*args, **kwargs)
-    def GetBackgroundBrush(*args, **kwargs): return _ogl.PyShape_GetBackgroundBrush(*args, **kwargs)
-    def base_OnDelete(*args, **kwargs): return _ogl.PyShape_base_OnDelete(*args, **kwargs)
-    def base_OnDraw(*args, **kwargs): return _ogl.PyShape_base_OnDraw(*args, **kwargs)
-    def base_OnDrawContents(*args, **kwargs): return _ogl.PyShape_base_OnDrawContents(*args, **kwargs)
-    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyShape_base_OnDrawBranches(*args, **kwargs)
-    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyShape_base_OnMoveLinks(*args, **kwargs)
-    def base_OnErase(*args, **kwargs): return _ogl.PyShape_base_OnErase(*args, **kwargs)
-    def base_OnEraseContents(*args, **kwargs): return _ogl.PyShape_base_OnEraseContents(*args, **kwargs)
-    def base_OnHighlight(*args, **kwargs): return _ogl.PyShape_base_OnHighlight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyShape_base_OnLeftClick(*args, **kwargs)
-    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyShape_base_OnLeftDoubleClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyShape_base_OnRightClick(*args, **kwargs)
-    def base_OnSize(*args, **kwargs): return _ogl.PyShape_base_OnSize(*args, **kwargs)
-    def base_OnMovePre(*args, **kwargs): return _ogl.PyShape_base_OnMovePre(*args, **kwargs)
-    def base_OnMovePost(*args, **kwargs): return _ogl.PyShape_base_OnMovePost(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyShape_base_OnDragLeft(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyShape_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyShape_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyShape_base_OnDragRight(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyShape_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyShape_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyShape_base_OnDrawOutline(*args, **kwargs)
-    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyShape_base_OnDrawControlPoints(*args, **kwargs)
-    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyShape_base_OnEraseControlPoints(*args, **kwargs)
-    def base_OnMoveLink(*args, **kwargs): return _ogl.PyShape_base_OnMoveLink(*args, **kwargs)
-    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyShape_base_OnSizingDragLeft(*args, **kwargs)
-    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyShape_base_OnSizingBeginDragLeft(*args, **kwargs)
-    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyShape_base_OnSizingEndDragLeft(*args, **kwargs)
-    def base_OnBeginSize(*args, **kwargs): return _ogl.PyShape_base_OnBeginSize(*args, **kwargs)
-    def base_OnEndSize(*args, **kwargs): return _ogl.PyShape_base_OnEndSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Show(*args, **kwargs):
+        """Show(bool show)"""
+        return _ogl.PyShape_Show(*args, **kwargs)
+
+    def IsShown(*args, **kwargs):
+        """IsShown() -> bool"""
+        return _ogl.PyShape_IsShown(*args, **kwargs)
+
+    def Move(*args, **kwargs):
+        """Move(wxDC dc, double x1, double y1, bool display=True)"""
+        return _ogl.PyShape_Move(*args, **kwargs)
+
+    def Erase(*args, **kwargs):
+        """Erase(wxDC dc)"""
+        return _ogl.PyShape_Erase(*args, **kwargs)
+
+    def EraseContents(*args, **kwargs):
+        """EraseContents(wxDC dc)"""
+        return _ogl.PyShape_EraseContents(*args, **kwargs)
+
+    def Draw(*args, **kwargs):
+        """Draw(wxDC dc)"""
+        return _ogl.PyShape_Draw(*args, **kwargs)
+
+    def Flash(*args, **kwargs):
+        """Flash()"""
+        return _ogl.PyShape_Flash(*args, **kwargs)
+
+    def MoveLinks(*args, **kwargs):
+        """MoveLinks(wxDC dc)"""
+        return _ogl.PyShape_MoveLinks(*args, **kwargs)
+
+    def DrawContents(*args, **kwargs):
+        """DrawContents(wxDC dc)"""
+        return _ogl.PyShape_DrawContents(*args, **kwargs)
+
+    def SetSize(*args, **kwargs):
+        """SetSize(double x, double y, bool recursive=True)"""
+        return _ogl.PyShape_SetSize(*args, **kwargs)
+
+    def SetAttachmentSize(*args, **kwargs):
+        """SetAttachmentSize(double x, double y)"""
+        return _ogl.PyShape_SetAttachmentSize(*args, **kwargs)
+
+    def Attach(*args, **kwargs):
+        """Attach(PyShapeCanvas can)"""
+        return _ogl.PyShape_Attach(*args, **kwargs)
+
+    def Detach(*args, **kwargs):
+        """Detach()"""
+        return _ogl.PyShape_Detach(*args, **kwargs)
+
+    def Constrain(*args, **kwargs):
+        """Constrain() -> bool"""
+        return _ogl.PyShape_Constrain(*args, **kwargs)
+
+    def AddLine(*args, **kwargs):
+        """AddLine(PyLineShape line, PyShape other, int attachFrom=0, 
+    int attachTo=0, int positionFrom=-1, int positionTo=-1)"""
+        return _ogl.PyShape_AddLine(*args, **kwargs)
+
+    def GetLinePosition(*args, **kwargs):
+        """GetLinePosition(PyLineShape line) -> int"""
+        return _ogl.PyShape_GetLinePosition(*args, **kwargs)
+
+    def AddText(*args, **kwargs):
+        """AddText(wxString string)"""
+        return _ogl.PyShape_AddText(*args, **kwargs)
+
+    def GetPen(*args, **kwargs):
+        """GetPen() -> wxPen"""
+        return _ogl.PyShape_GetPen(*args, **kwargs)
+
+    def GetBrush(*args, **kwargs):
+        """GetBrush() -> wxBrush"""
+        return _ogl.PyShape_GetBrush(*args, **kwargs)
+
+    def SetDefaultRegionSize(*args, **kwargs):
+        """SetDefaultRegionSize()"""
+        return _ogl.PyShape_SetDefaultRegionSize(*args, **kwargs)
+
+    def FormatText(*args, **kwargs):
+        """FormatText(wxDC dc, wxString s, int regionId=0)"""
+        return _ogl.PyShape_FormatText(*args, **kwargs)
+
+    def SetFormatMode(*args, **kwargs):
+        """SetFormatMode(int mode, int regionId=0)"""
+        return _ogl.PyShape_SetFormatMode(*args, **kwargs)
+
+    def GetFormatMode(*args, **kwargs):
+        """GetFormatMode(int regionId=0) -> int"""
+        return _ogl.PyShape_GetFormatMode(*args, **kwargs)
+
+    def SetFont(*args, **kwargs):
+        """SetFont(wxFont font, int regionId=0)"""
+        return _ogl.PyShape_SetFont(*args, **kwargs)
+
+    def GetFont(*args, **kwargs):
+        """GetFont(int regionId=0) -> wxFont"""
+        return _ogl.PyShape_GetFont(*args, **kwargs)
+
+    def SetTextColour(*args, **kwargs):
+        """SetTextColour(wxString colour, int regionId=0)"""
+        return _ogl.PyShape_SetTextColour(*args, **kwargs)
+
+    def GetTextColour(*args, **kwargs):
+        """GetTextColour(int regionId=0) -> wxString"""
+        return _ogl.PyShape_GetTextColour(*args, **kwargs)
+
+    def GetNumberOfTextRegions(*args, **kwargs):
+        """GetNumberOfTextRegions() -> int"""
+        return _ogl.PyShape_GetNumberOfTextRegions(*args, **kwargs)
+
+    def SetRegionName(*args, **kwargs):
+        """SetRegionName(wxString name, int regionId=0)"""
+        return _ogl.PyShape_SetRegionName(*args, **kwargs)
+
+    def GetRegionName(*args, **kwargs):
+        """GetRegionName(int regionId) -> wxString"""
+        return _ogl.PyShape_GetRegionName(*args, **kwargs)
+
+    def GetRegionId(*args, **kwargs):
+        """GetRegionId(wxString name) -> int"""
+        return _ogl.PyShape_GetRegionId(*args, **kwargs)
+
+    def NameRegions(*args, **kwargs):
+        """NameRegions(wxString parentName="")"""
+        return _ogl.PyShape_NameRegions(*args, **kwargs)
+
+    def GetRegions(*args, **kwargs):
+        """GetRegions() -> PyObject"""
+        return _ogl.PyShape_GetRegions(*args, **kwargs)
+
+    def AddRegion(*args, **kwargs):
+        """AddRegion(ShapeRegion region)"""
+        return _ogl.PyShape_AddRegion(*args, **kwargs)
+
+    def ClearRegions(*args, **kwargs):
+        """ClearRegions()"""
+        return _ogl.PyShape_ClearRegions(*args, **kwargs)
+
+    def AssignNewIds(*args, **kwargs):
+        """AssignNewIds()"""
+        return _ogl.PyShape_AssignNewIds(*args, **kwargs)
+
+    def FindRegion(*args, **kwargs):
+        """FindRegion(wxString regionName, int OUTPUT) -> PyShape"""
+        return _ogl.PyShape_FindRegion(*args, **kwargs)
+
+    def FindRegionNames(*args, **kwargs):
+        """FindRegionNames(wxStringList list)"""
+        return _ogl.PyShape_FindRegionNames(*args, **kwargs)
+
+    def ClearText(*args, **kwargs):
+        """ClearText(int regionId=0)"""
+        return _ogl.PyShape_ClearText(*args, **kwargs)
+
+    def RemoveLine(*args, **kwargs):
+        """RemoveLine(PyLineShape line)"""
+        return _ogl.PyShape_RemoveLine(*args, **kwargs)
+
+    def GetAttachmentPosition(*args, **kwargs):
+        """GetAttachmentPosition(int attachment, double OUTPUT, double OUTPUT, int nth=0, 
+    int no_arcs=1, PyLineShape line=None) -> bool"""
+        return _ogl.PyShape_GetAttachmentPosition(*args, **kwargs)
+
+    def GetNumberOfAttachments(*args, **kwargs):
+        """GetNumberOfAttachments() -> int"""
+        return _ogl.PyShape_GetNumberOfAttachments(*args, **kwargs)
+
+    def AttachmentIsValid(*args, **kwargs):
+        """AttachmentIsValid(int attachment) -> bool"""
+        return _ogl.PyShape_AttachmentIsValid(*args, **kwargs)
+
+    def GetAttachmentPositionEdge(*args, **kwargs):
+        """GetAttachmentPositionEdge(int attachment, double OUTPUT, double OUTPUT, int nth=0, 
+    int no_arcs=1, PyLineShape line=None) -> bool"""
+        return _ogl.PyShape_GetAttachmentPositionEdge(*args, **kwargs)
+
+    def CalcSimpleAttachment(*args, **kwargs):
+        """CalcSimpleAttachment(RealPoint pt1, RealPoint pt2, int nth, int noArcs, 
+    PyLineShape line) -> RealPoint"""
+        return _ogl.PyShape_CalcSimpleAttachment(*args, **kwargs)
+
+    def AttachmentSortTest(*args, **kwargs):
+        """AttachmentSortTest(int attachmentPoint, RealPoint pt1, RealPoint pt2) -> bool"""
+        return _ogl.PyShape_AttachmentSortTest(*args, **kwargs)
+
+    def EraseLinks(*args, **kwargs):
+        """EraseLinks(wxDC dc, int attachment=-1, bool recurse=False)"""
+        return _ogl.PyShape_EraseLinks(*args, **kwargs)
+
+    def DrawLinks(*args, **kwargs):
+        """DrawLinks(wxDC dc, int attachment=-1, bool recurse=False)"""
+        return _ogl.PyShape_DrawLinks(*args, **kwargs)
+
+    def MoveLineToNewAttachment(*args, **kwargs):
+        """MoveLineToNewAttachment(wxDC dc, PyLineShape to_move, double x, double y) -> bool"""
+        return _ogl.PyShape_MoveLineToNewAttachment(*args, **kwargs)
+
+    def ApplyAttachmentOrdering(*args, **kwargs):
+        """ApplyAttachmentOrdering(PyObject linesToSort)"""
+        return _ogl.PyShape_ApplyAttachmentOrdering(*args, **kwargs)
+
+    def GetBranchingAttachmentRoot(*args, **kwargs):
+        """GetBranchingAttachmentRoot(int attachment) -> RealPoint"""
+        return _ogl.PyShape_GetBranchingAttachmentRoot(*args, **kwargs)
+
+    def GetBranchingAttachmentInfo(*args, **kwargs):
+        """GetBranchingAttachmentInfo(int attachment, RealPoint root, RealPoint neck, RealPoint shoulder1, 
+    RealPoint shoulder2) -> bool"""
+        return _ogl.PyShape_GetBranchingAttachmentInfo(*args, **kwargs)
+
+    def GetBranchingAttachmentPoint(*args, **kwargs):
+        """GetBranchingAttachmentPoint(int attachment, int n, RealPoint attachmentPoint, RealPoint stemPoint) -> bool"""
+        return _ogl.PyShape_GetBranchingAttachmentPoint(*args, **kwargs)
+
+    def GetAttachmentLineCount(*args, **kwargs):
+        """GetAttachmentLineCount(int attachment) -> int"""
+        return _ogl.PyShape_GetAttachmentLineCount(*args, **kwargs)
+
+    def SetBranchNeckLength(*args, **kwargs):
+        """SetBranchNeckLength(int len)"""
+        return _ogl.PyShape_SetBranchNeckLength(*args, **kwargs)
+
+    def GetBranchNeckLength(*args, **kwargs):
+        """GetBranchNeckLength() -> int"""
+        return _ogl.PyShape_GetBranchNeckLength(*args, **kwargs)
+
+    def SetBranchStemLength(*args, **kwargs):
+        """SetBranchStemLength(int len)"""
+        return _ogl.PyShape_SetBranchStemLength(*args, **kwargs)
+
+    def GetBranchStemLength(*args, **kwargs):
+        """GetBranchStemLength() -> int"""
+        return _ogl.PyShape_GetBranchStemLength(*args, **kwargs)
+
+    def SetBranchSpacing(*args, **kwargs):
+        """SetBranchSpacing(int len)"""
+        return _ogl.PyShape_SetBranchSpacing(*args, **kwargs)
+
+    def GetBranchSpacing(*args, **kwargs):
+        """GetBranchSpacing() -> int"""
+        return _ogl.PyShape_GetBranchSpacing(*args, **kwargs)
+
+    def SetBranchStyle(*args, **kwargs):
+        """SetBranchStyle(long style)"""
+        return _ogl.PyShape_SetBranchStyle(*args, **kwargs)
+
+    def GetBranchStyle(*args, **kwargs):
+        """GetBranchStyle() -> long"""
+        return _ogl.PyShape_GetBranchStyle(*args, **kwargs)
+
+    def PhysicalToLogicalAttachment(*args, **kwargs):
+        """PhysicalToLogicalAttachment(int physicalAttachment) -> int"""
+        return _ogl.PyShape_PhysicalToLogicalAttachment(*args, **kwargs)
+
+    def LogicalToPhysicalAttachment(*args, **kwargs):
+        """LogicalToPhysicalAttachment(int logicalAttachment) -> int"""
+        return _ogl.PyShape_LogicalToPhysicalAttachment(*args, **kwargs)
+
+    def Draggable(*args, **kwargs):
+        """Draggable() -> bool"""
+        return _ogl.PyShape_Draggable(*args, **kwargs)
+
+    def HasDescendant(*args, **kwargs):
+        """HasDescendant(PyShape image) -> bool"""
+        return _ogl.PyShape_HasDescendant(*args, **kwargs)
+
+    def CreateNewCopy(*args, **kwargs):
+        """CreateNewCopy(bool resetMapping=True, bool recompute=True) -> PyShape"""
+        return _ogl.PyShape_CreateNewCopy(*args, **kwargs)
+
+    def Copy(*args, **kwargs):
+        """Copy(PyShape copy)"""
+        return _ogl.PyShape_Copy(*args, **kwargs)
+
+    def CopyWithHandler(*args, **kwargs):
+        """CopyWithHandler(PyShape copy)"""
+        return _ogl.PyShape_CopyWithHandler(*args, **kwargs)
+
+    def Rotate(*args, **kwargs):
+        """Rotate(double x, double y, double theta)"""
+        return _ogl.PyShape_Rotate(*args, **kwargs)
+
+    def GetRotation(*args, **kwargs):
+        """GetRotation() -> double"""
+        return _ogl.PyShape_GetRotation(*args, **kwargs)
+
+    def ClearAttachments(*args, **kwargs):
+        """ClearAttachments()"""
+        return _ogl.PyShape_ClearAttachments(*args, **kwargs)
+
+    def Recentre(*args, **kwargs):
+        """Recentre(wxDC dc)"""
+        return _ogl.PyShape_Recentre(*args, **kwargs)
+
+    def ClearPointList(*args, **kwargs):
+        """ClearPointList(wxList list)"""
+        return _ogl.PyShape_ClearPointList(*args, **kwargs)
+
+    def GetBackgroundPen(*args, **kwargs):
+        """GetBackgroundPen() -> wxPen"""
+        return _ogl.PyShape_GetBackgroundPen(*args, **kwargs)
+
+    def GetBackgroundBrush(*args, **kwargs):
+        """GetBackgroundBrush() -> wxBrush"""
+        return _ogl.PyShape_GetBackgroundBrush(*args, **kwargs)
+
+    def base_OnDelete(*args, **kwargs):
+        """base_OnDelete()"""
+        return _ogl.PyShape_base_OnDelete(*args, **kwargs)
+
+    def base_OnDraw(*args, **kwargs):
+        """base_OnDraw(wxDC dc)"""
+        return _ogl.PyShape_base_OnDraw(*args, **kwargs)
+
+    def base_OnDrawContents(*args, **kwargs):
+        """base_OnDrawContents(wxDC dc)"""
+        return _ogl.PyShape_base_OnDrawContents(*args, **kwargs)
+
+    def base_OnDrawBranches(*args, **kwargs):
+        """base_OnDrawBranches(wxDC dc, bool erase=False)"""
+        return _ogl.PyShape_base_OnDrawBranches(*args, **kwargs)
+
+    def base_OnMoveLinks(*args, **kwargs):
+        """base_OnMoveLinks(wxDC dc)"""
+        return _ogl.PyShape_base_OnMoveLinks(*args, **kwargs)
+
+    def base_OnErase(*args, **kwargs):
+        """base_OnErase(wxDC dc)"""
+        return _ogl.PyShape_base_OnErase(*args, **kwargs)
+
+    def base_OnEraseContents(*args, **kwargs):
+        """base_OnEraseContents(wxDC dc)"""
+        return _ogl.PyShape_base_OnEraseContents(*args, **kwargs)
+
+    def base_OnHighlight(*args, **kwargs):
+        """base_OnHighlight(wxDC dc)"""
+        return _ogl.PyShape_base_OnHighlight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShape_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnLeftDoubleClick(*args, **kwargs):
+        """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShape_base_OnLeftDoubleClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShape_base_OnRightClick(*args, **kwargs)
+
+    def base_OnSize(*args, **kwargs):
+        """base_OnSize(double x, double y)"""
+        return _ogl.PyShape_base_OnSize(*args, **kwargs)
+
+    def base_OnMovePre(*args, **kwargs):
+        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True) -> bool"""
+        return _ogl.PyShape_base_OnMovePre(*args, **kwargs)
+
+    def base_OnMovePost(*args, **kwargs):
+        """base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True)"""
+        return _ogl.PyShape_base_OnMovePost(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShape_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShape_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShape_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShape_base_OnDragRight(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShape_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyShape_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDrawOutline(*args, **kwargs):
+        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        return _ogl.PyShape_base_OnDrawOutline(*args, **kwargs)
+
+    def base_OnDrawControlPoints(*args, **kwargs):
+        """base_OnDrawControlPoints(wxDC dc)"""
+        return _ogl.PyShape_base_OnDrawControlPoints(*args, **kwargs)
+
+    def base_OnEraseControlPoints(*args, **kwargs):
+        """base_OnEraseControlPoints(wxDC dc)"""
+        return _ogl.PyShape_base_OnEraseControlPoints(*args, **kwargs)
+
+    def base_OnMoveLink(*args, **kwargs):
+        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        return _ogl.PyShape_base_OnMoveLink(*args, **kwargs)
+
+    def base_OnSizingDragLeft(*args, **kwargs):
+        """base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyShape_base_OnSizingDragLeft(*args, **kwargs)
+
+    def base_OnSizingBeginDragLeft(*args, **kwargs):
+        """base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+
+    def base_OnSizingEndDragLeft(*args, **kwargs):
+        """base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyShape_base_OnSizingEndDragLeft(*args, **kwargs)
+
+    def base_OnBeginSize(*args, **kwargs):
+        """base_OnBeginSize(double w, double h)"""
+        return _ogl.PyShape_base_OnBeginSize(*args, **kwargs)
+
+    def base_OnEndSize(*args, **kwargs):
+        """base_OnEndSize(double w, double h)"""
+        return _ogl.PyShape_base_OnEndSize(*args, **kwargs)
+
 
 class PyShapePtr(PyShape):
     def __init__(self, this):
@@ -301,56 +1009,177 @@ _ogl.PyShape_swigregister(PyShapePtr)
 oglMETAFLAGS_OUTLINE = _ogl.oglMETAFLAGS_OUTLINE
 oglMETAFLAGS_ATTACHMENTS = _ogl.oglMETAFLAGS_ATTACHMENTS
 class PseudoMetaFile(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPseudoMetaFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PseudoMetaFile"""
         newobj = _ogl.new_PseudoMetaFile(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_ogl.delete_PseudoMetaFile):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Draw(*args, **kwargs): return _ogl.PseudoMetaFile_Draw(*args, **kwargs)
-    def Clear(*args, **kwargs): return _ogl.PseudoMetaFile_Clear(*args, **kwargs)
-    def Copy(*args, **kwargs): return _ogl.PseudoMetaFile_Copy(*args, **kwargs)
-    def Scale(*args, **kwargs): return _ogl.PseudoMetaFile_Scale(*args, **kwargs)
-    def ScaleTo(*args, **kwargs): return _ogl.PseudoMetaFile_ScaleTo(*args, **kwargs)
-    def Translate(*args, **kwargs): return _ogl.PseudoMetaFile_Translate(*args, **kwargs)
-    def Rotate(*args, **kwargs): return _ogl.PseudoMetaFile_Rotate(*args, **kwargs)
-    def LoadFromMetaFile(*args, **kwargs): return _ogl.PseudoMetaFile_LoadFromMetaFile(*args, **kwargs)
-    def GetBounds(*args, **kwargs): return _ogl.PseudoMetaFile_GetBounds(*args, **kwargs)
-    def CalculateSize(*args, **kwargs): return _ogl.PseudoMetaFile_CalculateSize(*args, **kwargs)
-    def SetRotateable(*args, **kwargs): return _ogl.PseudoMetaFile_SetRotateable(*args, **kwargs)
-    def GetRotateable(*args, **kwargs): return _ogl.PseudoMetaFile_GetRotateable(*args, **kwargs)
-    def SetSize(*args, **kwargs): return _ogl.PseudoMetaFile_SetSize(*args, **kwargs)
-    def SetFillBrush(*args, **kwargs): return _ogl.PseudoMetaFile_SetFillBrush(*args, **kwargs)
-    def GetFillBrush(*args, **kwargs): return _ogl.PseudoMetaFile_GetFillBrush(*args, **kwargs)
-    def SetOutlinePen(*args, **kwargs): return _ogl.PseudoMetaFile_SetOutlinePen(*args, **kwargs)
-    def GetOutlinePen(*args, **kwargs): return _ogl.PseudoMetaFile_GetOutlinePen(*args, **kwargs)
-    def SetOutlineOp(*args, **kwargs): return _ogl.PseudoMetaFile_SetOutlineOp(*args, **kwargs)
-    def GetOutlineOp(*args, **kwargs): return _ogl.PseudoMetaFile_GetOutlineOp(*args, **kwargs)
-    def IsValid(*args, **kwargs): return _ogl.PseudoMetaFile_IsValid(*args, **kwargs)
-    def DrawLine(*args, **kwargs): return _ogl.PseudoMetaFile_DrawLine(*args, **kwargs)
-    def DrawRectangle(*args, **kwargs): return _ogl.PseudoMetaFile_DrawRectangle(*args, **kwargs)
-    def DrawRoundedRectangle(*args, **kwargs): return _ogl.PseudoMetaFile_DrawRoundedRectangle(*args, **kwargs)
-    def DrawArc(*args, **kwargs): return _ogl.PseudoMetaFile_DrawArc(*args, **kwargs)
-    def DrawEllipticArc(*args, **kwargs): return _ogl.PseudoMetaFile_DrawEllipticArc(*args, **kwargs)
-    def DrawEllipse(*args, **kwargs): return _ogl.PseudoMetaFile_DrawEllipse(*args, **kwargs)
-    def DrawPoint(*args, **kwargs): return _ogl.PseudoMetaFile_DrawPoint(*args, **kwargs)
-    def DrawText(*args, **kwargs): return _ogl.PseudoMetaFile_DrawText(*args, **kwargs)
-    def DrawLines(*args, **kwargs): return _ogl.PseudoMetaFile_DrawLines(*args, **kwargs)
-    def DrawPolygon(*args, **kwargs): return _ogl.PseudoMetaFile_DrawPolygon(*args, **kwargs)
-    def DrawSpline(*args, **kwargs): return _ogl.PseudoMetaFile_DrawSpline(*args, **kwargs)
-    def SetClippingRect(*args, **kwargs): return _ogl.PseudoMetaFile_SetClippingRect(*args, **kwargs)
-    def DestroyClippingRect(*args, **kwargs): return _ogl.PseudoMetaFile_DestroyClippingRect(*args, **kwargs)
-    def SetPen(*args, **kwargs): return _ogl.PseudoMetaFile_SetPen(*args, **kwargs)
-    def SetBrush(*args, **kwargs): return _ogl.PseudoMetaFile_SetBrush(*args, **kwargs)
-    def SetFont(*args, **kwargs): return _ogl.PseudoMetaFile_SetFont(*args, **kwargs)
-    def SetTextColour(*args, **kwargs): return _ogl.PseudoMetaFile_SetTextColour(*args, **kwargs)
-    def SetBackgroundColour(*args, **kwargs): return _ogl.PseudoMetaFile_SetBackgroundColour(*args, **kwargs)
-    def SetBackgroundMode(*args, **kwargs): return _ogl.PseudoMetaFile_SetBackgroundMode(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPseudoMetaFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Draw(*args, **kwargs):
+        """Draw(wxDC dc, double xoffset, double yoffset)"""
+        return _ogl.PseudoMetaFile_Draw(*args, **kwargs)
+
+    def Clear(*args, **kwargs):
+        """Clear()"""
+        return _ogl.PseudoMetaFile_Clear(*args, **kwargs)
+
+    def Copy(*args, **kwargs):
+        """Copy(PseudoMetaFile copy)"""
+        return _ogl.PseudoMetaFile_Copy(*args, **kwargs)
+
+    def Scale(*args, **kwargs):
+        """Scale(double sx, double sy)"""
+        return _ogl.PseudoMetaFile_Scale(*args, **kwargs)
+
+    def ScaleTo(*args, **kwargs):
+        """ScaleTo(double w, double h)"""
+        return _ogl.PseudoMetaFile_ScaleTo(*args, **kwargs)
+
+    def Translate(*args, **kwargs):
+        """Translate(double x, double y)"""
+        return _ogl.PseudoMetaFile_Translate(*args, **kwargs)
+
+    def Rotate(*args, **kwargs):
+        """Rotate(double x, double y, double theta)"""
+        return _ogl.PseudoMetaFile_Rotate(*args, **kwargs)
+
+    def LoadFromMetaFile(*args, **kwargs):
+        """LoadFromMetaFile(wxString filename, double width, double height) -> bool"""
+        return _ogl.PseudoMetaFile_LoadFromMetaFile(*args, **kwargs)
+
+    def GetBounds(*args, **kwargs):
+        """GetBounds(double minX, double minY, double maxX, double maxY)"""
+        return _ogl.PseudoMetaFile_GetBounds(*args, **kwargs)
+
+    def CalculateSize(*args, **kwargs):
+        """CalculateSize(PyDrawnShape shape)"""
+        return _ogl.PseudoMetaFile_CalculateSize(*args, **kwargs)
+
+    def SetRotateable(*args, **kwargs):
+        """SetRotateable(bool rot)"""
+        return _ogl.PseudoMetaFile_SetRotateable(*args, **kwargs)
+
+    def GetRotateable(*args, **kwargs):
+        """GetRotateable() -> bool"""
+        return _ogl.PseudoMetaFile_GetRotateable(*args, **kwargs)
+
+    def SetSize(*args, **kwargs):
+        """SetSize(double w, double h)"""
+        return _ogl.PseudoMetaFile_SetSize(*args, **kwargs)
+
+    def SetFillBrush(*args, **kwargs):
+        """SetFillBrush(wxBrush brush)"""
+        return _ogl.PseudoMetaFile_SetFillBrush(*args, **kwargs)
+
+    def GetFillBrush(*args, **kwargs):
+        """GetFillBrush() -> wxBrush"""
+        return _ogl.PseudoMetaFile_GetFillBrush(*args, **kwargs)
+
+    def SetOutlinePen(*args, **kwargs):
+        """SetOutlinePen(wxPen pen)"""
+        return _ogl.PseudoMetaFile_SetOutlinePen(*args, **kwargs)
+
+    def GetOutlinePen(*args, **kwargs):
+        """GetOutlinePen() -> wxPen"""
+        return _ogl.PseudoMetaFile_GetOutlinePen(*args, **kwargs)
+
+    def SetOutlineOp(*args, **kwargs):
+        """SetOutlineOp(int op)"""
+        return _ogl.PseudoMetaFile_SetOutlineOp(*args, **kwargs)
+
+    def GetOutlineOp(*args, **kwargs):
+        """GetOutlineOp() -> int"""
+        return _ogl.PseudoMetaFile_GetOutlineOp(*args, **kwargs)
+
+    def IsValid(*args, **kwargs):
+        """IsValid() -> bool"""
+        return _ogl.PseudoMetaFile_IsValid(*args, **kwargs)
+
+    def DrawLine(*args, **kwargs):
+        """DrawLine(Point pt1, Point pt2)"""
+        return _ogl.PseudoMetaFile_DrawLine(*args, **kwargs)
+
+    def DrawRectangle(*args, **kwargs):
+        """DrawRectangle(Rect rect)"""
+        return _ogl.PseudoMetaFile_DrawRectangle(*args, **kwargs)
+
+    def DrawRoundedRectangle(*args, **kwargs):
+        """DrawRoundedRectangle(Rect rect, double radius)"""
+        return _ogl.PseudoMetaFile_DrawRoundedRectangle(*args, **kwargs)
+
+    def DrawArc(*args, **kwargs):
+        """DrawArc(Point centrePt, Point startPt, Point endPt)"""
+        return _ogl.PseudoMetaFile_DrawArc(*args, **kwargs)
+
+    def DrawEllipticArc(*args, **kwargs):
+        """DrawEllipticArc(Rect rect, double startAngle, double endAngle)"""
+        return _ogl.PseudoMetaFile_DrawEllipticArc(*args, **kwargs)
+
+    def DrawEllipse(*args, **kwargs):
+        """DrawEllipse(Rect rect)"""
+        return _ogl.PseudoMetaFile_DrawEllipse(*args, **kwargs)
+
+    def DrawPoint(*args, **kwargs):
+        """DrawPoint(Point pt)"""
+        return _ogl.PseudoMetaFile_DrawPoint(*args, **kwargs)
+
+    def DrawText(*args, **kwargs):
+        """DrawText(wxString text, Point pt)"""
+        return _ogl.PseudoMetaFile_DrawText(*args, **kwargs)
+
+    def DrawLines(*args, **kwargs):
+        """DrawLines(int PCOUNT, Point points)"""
+        return _ogl.PseudoMetaFile_DrawLines(*args, **kwargs)
+
+    def DrawPolygon(*args, **kwargs):
+        """DrawPolygon(int PCOUNT, Point points, int flags=0)"""
+        return _ogl.PseudoMetaFile_DrawPolygon(*args, **kwargs)
+
+    def DrawSpline(*args, **kwargs):
+        """DrawSpline(int PCOUNT, Point points)"""
+        return _ogl.PseudoMetaFile_DrawSpline(*args, **kwargs)
+
+    def SetClippingRect(*args, **kwargs):
+        """SetClippingRect(Rect rect)"""
+        return _ogl.PseudoMetaFile_SetClippingRect(*args, **kwargs)
+
+    def DestroyClippingRect(*args, **kwargs):
+        """DestroyClippingRect()"""
+        return _ogl.PseudoMetaFile_DestroyClippingRect(*args, **kwargs)
+
+    def SetPen(*args, **kwargs):
+        """SetPen(wxPen pen, bool isOutline=FALSE)"""
+        return _ogl.PseudoMetaFile_SetPen(*args, **kwargs)
+
+    def SetBrush(*args, **kwargs):
+        """SetBrush(wxBrush brush, bool isFill=FALSE)"""
+        return _ogl.PseudoMetaFile_SetBrush(*args, **kwargs)
+
+    def SetFont(*args, **kwargs):
+        """SetFont(wxFont font)"""
+        return _ogl.PseudoMetaFile_SetFont(*args, **kwargs)
+
+    def SetTextColour(*args, **kwargs):
+        """SetTextColour(wxColour colour)"""
+        return _ogl.PseudoMetaFile_SetTextColour(*args, **kwargs)
+
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(wxColour colour)"""
+        return _ogl.PseudoMetaFile_SetBackgroundColour(*args, **kwargs)
+
+    def SetBackgroundMode(*args, **kwargs):
+        """SetBackgroundMode(int mode)"""
+        return _ogl.PseudoMetaFile_SetBackgroundMode(*args, **kwargs)
+
 
 class PseudoMetaFilePtr(PseudoMetaFile):
     def __init__(self, this):
@@ -360,45 +1189,146 @@ class PseudoMetaFilePtr(PseudoMetaFile):
 _ogl.PseudoMetaFile_swigregister(PseudoMetaFilePtr)
 
 class PyRectangleShape(PyShape):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyRectangleShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(double width=0.0, double height=0.0) -> PyRectangleShape"""
         newobj = _ogl.new_PyRectangleShape(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORandCallbackInfo(PyRectangleShape)
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyRectangleShape__setCallbackInfo(*args, **kwargs)
-    def SetCornerRadius(*args, **kwargs): return _ogl.PyRectangleShape_SetCornerRadius(*args, **kwargs)
-    def base_OnDelete(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDelete(*args, **kwargs)
-    def base_OnDraw(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDraw(*args, **kwargs)
-    def base_OnDrawContents(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDrawContents(*args, **kwargs)
-    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDrawBranches(*args, **kwargs)
-    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyRectangleShape_base_OnMoveLinks(*args, **kwargs)
-    def base_OnErase(*args, **kwargs): return _ogl.PyRectangleShape_base_OnErase(*args, **kwargs)
-    def base_OnEraseContents(*args, **kwargs): return _ogl.PyRectangleShape_base_OnEraseContents(*args, **kwargs)
-    def base_OnHighlight(*args, **kwargs): return _ogl.PyRectangleShape_base_OnHighlight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyRectangleShape_base_OnLeftClick(*args, **kwargs)
-    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyRectangleShape_base_OnLeftDoubleClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyRectangleShape_base_OnRightClick(*args, **kwargs)
-    def base_OnSize(*args, **kwargs): return _ogl.PyRectangleShape_base_OnSize(*args, **kwargs)
-    def base_OnMovePre(*args, **kwargs): return _ogl.PyRectangleShape_base_OnMovePre(*args, **kwargs)
-    def base_OnMovePost(*args, **kwargs): return _ogl.PyRectangleShape_base_OnMovePost(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDragLeft(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyRectangleShape_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyRectangleShape_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDragRight(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyRectangleShape_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyRectangleShape_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDrawOutline(*args, **kwargs)
-    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDrawControlPoints(*args, **kwargs)
-    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyRectangleShape_base_OnEraseControlPoints(*args, **kwargs)
-    def base_OnMoveLink(*args, **kwargs): return _ogl.PyRectangleShape_base_OnMoveLink(*args, **kwargs)
-    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyRectangleShape_base_OnSizingDragLeft(*args, **kwargs)
-    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyRectangleShape_base_OnSizingBeginDragLeft(*args, **kwargs)
-    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyRectangleShape_base_OnSizingEndDragLeft(*args, **kwargs)
-    def base_OnBeginSize(*args, **kwargs): return _ogl.PyRectangleShape_base_OnBeginSize(*args, **kwargs)
-    def base_OnEndSize(*args, **kwargs): return _ogl.PyRectangleShape_base_OnEndSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyRectangleShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyRectangleShape__setCallbackInfo(*args, **kwargs)
+
+    def SetCornerRadius(*args, **kwargs):
+        """SetCornerRadius(double radius)"""
+        return _ogl.PyRectangleShape_SetCornerRadius(*args, **kwargs)
+
+    def base_OnDelete(*args, **kwargs):
+        """base_OnDelete()"""
+        return _ogl.PyRectangleShape_base_OnDelete(*args, **kwargs)
+
+    def base_OnDraw(*args, **kwargs):
+        """base_OnDraw(wxDC dc)"""
+        return _ogl.PyRectangleShape_base_OnDraw(*args, **kwargs)
+
+    def base_OnDrawContents(*args, **kwargs):
+        """base_OnDrawContents(wxDC dc)"""
+        return _ogl.PyRectangleShape_base_OnDrawContents(*args, **kwargs)
+
+    def base_OnDrawBranches(*args, **kwargs):
+        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        return _ogl.PyRectangleShape_base_OnDrawBranches(*args, **kwargs)
+
+    def base_OnMoveLinks(*args, **kwargs):
+        """base_OnMoveLinks(wxDC dc)"""
+        return _ogl.PyRectangleShape_base_OnMoveLinks(*args, **kwargs)
+
+    def base_OnErase(*args, **kwargs):
+        """base_OnErase(wxDC dc)"""
+        return _ogl.PyRectangleShape_base_OnErase(*args, **kwargs)
+
+    def base_OnEraseContents(*args, **kwargs):
+        """base_OnEraseContents(wxDC dc)"""
+        return _ogl.PyRectangleShape_base_OnEraseContents(*args, **kwargs)
+
+    def base_OnHighlight(*args, **kwargs):
+        """base_OnHighlight(wxDC dc)"""
+        return _ogl.PyRectangleShape_base_OnHighlight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyRectangleShape_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnLeftDoubleClick(*args, **kwargs):
+        """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyRectangleShape_base_OnLeftDoubleClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyRectangleShape_base_OnRightClick(*args, **kwargs)
+
+    def base_OnSize(*args, **kwargs):
+        """base_OnSize(double x, double y)"""
+        return _ogl.PyRectangleShape_base_OnSize(*args, **kwargs)
+
+    def base_OnMovePre(*args, **kwargs):
+        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True) -> bool"""
+        return _ogl.PyRectangleShape_base_OnMovePre(*args, **kwargs)
+
+    def base_OnMovePost(*args, **kwargs):
+        """base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True)"""
+        return _ogl.PyRectangleShape_base_OnMovePost(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyRectangleShape_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyRectangleShape_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyRectangleShape_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyRectangleShape_base_OnDragRight(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyRectangleShape_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyRectangleShape_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDrawOutline(*args, **kwargs):
+        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        return _ogl.PyRectangleShape_base_OnDrawOutline(*args, **kwargs)
+
+    def base_OnDrawControlPoints(*args, **kwargs):
+        """base_OnDrawControlPoints(wxDC dc)"""
+        return _ogl.PyRectangleShape_base_OnDrawControlPoints(*args, **kwargs)
+
+    def base_OnEraseControlPoints(*args, **kwargs):
+        """base_OnEraseControlPoints(wxDC dc)"""
+        return _ogl.PyRectangleShape_base_OnEraseControlPoints(*args, **kwargs)
+
+    def base_OnMoveLink(*args, **kwargs):
+        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        return _ogl.PyRectangleShape_base_OnMoveLink(*args, **kwargs)
+
+    def base_OnSizingDragLeft(*args, **kwargs):
+        """base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyRectangleShape_base_OnSizingDragLeft(*args, **kwargs)
+
+    def base_OnSizingBeginDragLeft(*args, **kwargs):
+        """base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyRectangleShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+
+    def base_OnSizingEndDragLeft(*args, **kwargs):
+        """base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyRectangleShape_base_OnSizingEndDragLeft(*args, **kwargs)
+
+    def base_OnBeginSize(*args, **kwargs):
+        """base_OnBeginSize(double w, double h)"""
+        return _ogl.PyRectangleShape_base_OnBeginSize(*args, **kwargs)
+
+    def base_OnEndSize(*args, **kwargs):
+        """base_OnEndSize(double w, double h)"""
+        return _ogl.PyRectangleShape_base_OnEndSize(*args, **kwargs)
+
 
 class PyRectangleShapePtr(PyRectangleShape):
     def __init__(self, this):
@@ -408,45 +1338,148 @@ class PyRectangleShapePtr(PyRectangleShape):
 _ogl.PyRectangleShape_swigregister(PyRectangleShapePtr)
 
 class PyControlPoint(PyRectangleShape):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyControlPoint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(PyShapeCanvas the_canvas=None, PyShape object=None, 
+    double size=0.0, double the_xoffset=0.0, double the_yoffset=0.0, 
+    int the_type=0) -> PyControlPoint"""
         newobj = _ogl.new_PyControlPoint(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORandCallbackInfo(PyControlPoint)
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyControlPoint__setCallbackInfo(*args, **kwargs)
-    def SetCornerRadius(*args, **kwargs): return _ogl.PyControlPoint_SetCornerRadius(*args, **kwargs)
-    def base_OnDelete(*args, **kwargs): return _ogl.PyControlPoint_base_OnDelete(*args, **kwargs)
-    def base_OnDraw(*args, **kwargs): return _ogl.PyControlPoint_base_OnDraw(*args, **kwargs)
-    def base_OnDrawContents(*args, **kwargs): return _ogl.PyControlPoint_base_OnDrawContents(*args, **kwargs)
-    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyControlPoint_base_OnDrawBranches(*args, **kwargs)
-    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyControlPoint_base_OnMoveLinks(*args, **kwargs)
-    def base_OnErase(*args, **kwargs): return _ogl.PyControlPoint_base_OnErase(*args, **kwargs)
-    def base_OnEraseContents(*args, **kwargs): return _ogl.PyControlPoint_base_OnEraseContents(*args, **kwargs)
-    def base_OnHighlight(*args, **kwargs): return _ogl.PyControlPoint_base_OnHighlight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyControlPoint_base_OnLeftClick(*args, **kwargs)
-    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyControlPoint_base_OnLeftDoubleClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyControlPoint_base_OnRightClick(*args, **kwargs)
-    def base_OnSize(*args, **kwargs): return _ogl.PyControlPoint_base_OnSize(*args, **kwargs)
-    def base_OnMovePre(*args, **kwargs): return _ogl.PyControlPoint_base_OnMovePre(*args, **kwargs)
-    def base_OnMovePost(*args, **kwargs): return _ogl.PyControlPoint_base_OnMovePost(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyControlPoint_base_OnDragLeft(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyControlPoint_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyControlPoint_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyControlPoint_base_OnDragRight(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyControlPoint_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyControlPoint_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyControlPoint_base_OnDrawOutline(*args, **kwargs)
-    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyControlPoint_base_OnDrawControlPoints(*args, **kwargs)
-    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyControlPoint_base_OnEraseControlPoints(*args, **kwargs)
-    def base_OnMoveLink(*args, **kwargs): return _ogl.PyControlPoint_base_OnMoveLink(*args, **kwargs)
-    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyControlPoint_base_OnSizingDragLeft(*args, **kwargs)
-    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyControlPoint_base_OnSizingBeginDragLeft(*args, **kwargs)
-    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyControlPoint_base_OnSizingEndDragLeft(*args, **kwargs)
-    def base_OnBeginSize(*args, **kwargs): return _ogl.PyControlPoint_base_OnBeginSize(*args, **kwargs)
-    def base_OnEndSize(*args, **kwargs): return _ogl.PyControlPoint_base_OnEndSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyControlPoint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyControlPoint__setCallbackInfo(*args, **kwargs)
+
+    def SetCornerRadius(*args, **kwargs):
+        """SetCornerRadius(double radius)"""
+        return _ogl.PyControlPoint_SetCornerRadius(*args, **kwargs)
+
+    def base_OnDelete(*args, **kwargs):
+        """base_OnDelete()"""
+        return _ogl.PyControlPoint_base_OnDelete(*args, **kwargs)
+
+    def base_OnDraw(*args, **kwargs):
+        """base_OnDraw(wxDC dc)"""
+        return _ogl.PyControlPoint_base_OnDraw(*args, **kwargs)
+
+    def base_OnDrawContents(*args, **kwargs):
+        """base_OnDrawContents(wxDC dc)"""
+        return _ogl.PyControlPoint_base_OnDrawContents(*args, **kwargs)
+
+    def base_OnDrawBranches(*args, **kwargs):
+        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        return _ogl.PyControlPoint_base_OnDrawBranches(*args, **kwargs)
+
+    def base_OnMoveLinks(*args, **kwargs):
+        """base_OnMoveLinks(wxDC dc)"""
+        return _ogl.PyControlPoint_base_OnMoveLinks(*args, **kwargs)
+
+    def base_OnErase(*args, **kwargs):
+        """base_OnErase(wxDC dc)"""
+        return _ogl.PyControlPoint_base_OnErase(*args, **kwargs)
+
+    def base_OnEraseContents(*args, **kwargs):
+        """base_OnEraseContents(wxDC dc)"""
+        return _ogl.PyControlPoint_base_OnEraseContents(*args, **kwargs)
+
+    def base_OnHighlight(*args, **kwargs):
+        """base_OnHighlight(wxDC dc)"""
+        return _ogl.PyControlPoint_base_OnHighlight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyControlPoint_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnLeftDoubleClick(*args, **kwargs):
+        """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyControlPoint_base_OnLeftDoubleClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyControlPoint_base_OnRightClick(*args, **kwargs)
+
+    def base_OnSize(*args, **kwargs):
+        """base_OnSize(double x, double y)"""
+        return _ogl.PyControlPoint_base_OnSize(*args, **kwargs)
+
+    def base_OnMovePre(*args, **kwargs):
+        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True) -> bool"""
+        return _ogl.PyControlPoint_base_OnMovePre(*args, **kwargs)
+
+    def base_OnMovePost(*args, **kwargs):
+        """base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True)"""
+        return _ogl.PyControlPoint_base_OnMovePost(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyControlPoint_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyControlPoint_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyControlPoint_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyControlPoint_base_OnDragRight(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyControlPoint_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyControlPoint_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDrawOutline(*args, **kwargs):
+        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        return _ogl.PyControlPoint_base_OnDrawOutline(*args, **kwargs)
+
+    def base_OnDrawControlPoints(*args, **kwargs):
+        """base_OnDrawControlPoints(wxDC dc)"""
+        return _ogl.PyControlPoint_base_OnDrawControlPoints(*args, **kwargs)
+
+    def base_OnEraseControlPoints(*args, **kwargs):
+        """base_OnEraseControlPoints(wxDC dc)"""
+        return _ogl.PyControlPoint_base_OnEraseControlPoints(*args, **kwargs)
+
+    def base_OnMoveLink(*args, **kwargs):
+        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        return _ogl.PyControlPoint_base_OnMoveLink(*args, **kwargs)
+
+    def base_OnSizingDragLeft(*args, **kwargs):
+        """base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyControlPoint_base_OnSizingDragLeft(*args, **kwargs)
+
+    def base_OnSizingBeginDragLeft(*args, **kwargs):
+        """base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyControlPoint_base_OnSizingBeginDragLeft(*args, **kwargs)
+
+    def base_OnSizingEndDragLeft(*args, **kwargs):
+        """base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyControlPoint_base_OnSizingEndDragLeft(*args, **kwargs)
+
+    def base_OnBeginSize(*args, **kwargs):
+        """base_OnBeginSize(double w, double h)"""
+        return _ogl.PyControlPoint_base_OnBeginSize(*args, **kwargs)
+
+    def base_OnEndSize(*args, **kwargs):
+        """base_OnEndSize(double w, double h)"""
+        return _ogl.PyControlPoint_base_OnEndSize(*args, **kwargs)
+
 
 class PyControlPointPtr(PyControlPoint):
     def __init__(self, this):
@@ -456,48 +1489,158 @@ class PyControlPointPtr(PyControlPoint):
 _ogl.PyControlPoint_swigregister(PyControlPointPtr)
 
 class PyBitmapShape(PyRectangleShape):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyBitmapShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PyBitmapShape"""
         newobj = _ogl.new_PyBitmapShape(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORandCallbackInfo(PyBitmapShape)
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyBitmapShape__setCallbackInfo(*args, **kwargs)
-    def GetBitmap(*args, **kwargs): return _ogl.PyBitmapShape_GetBitmap(*args, **kwargs)
-    def GetFilename(*args, **kwargs): return _ogl.PyBitmapShape_GetFilename(*args, **kwargs)
-    def SetBitmap(*args, **kwargs): return _ogl.PyBitmapShape_SetBitmap(*args, **kwargs)
-    def SetFilename(*args, **kwargs): return _ogl.PyBitmapShape_SetFilename(*args, **kwargs)
-    def base_OnDelete(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDelete(*args, **kwargs)
-    def base_OnDraw(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDraw(*args, **kwargs)
-    def base_OnDrawContents(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDrawContents(*args, **kwargs)
-    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDrawBranches(*args, **kwargs)
-    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyBitmapShape_base_OnMoveLinks(*args, **kwargs)
-    def base_OnErase(*args, **kwargs): return _ogl.PyBitmapShape_base_OnErase(*args, **kwargs)
-    def base_OnEraseContents(*args, **kwargs): return _ogl.PyBitmapShape_base_OnEraseContents(*args, **kwargs)
-    def base_OnHighlight(*args, **kwargs): return _ogl.PyBitmapShape_base_OnHighlight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyBitmapShape_base_OnLeftClick(*args, **kwargs)
-    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyBitmapShape_base_OnLeftDoubleClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyBitmapShape_base_OnRightClick(*args, **kwargs)
-    def base_OnSize(*args, **kwargs): return _ogl.PyBitmapShape_base_OnSize(*args, **kwargs)
-    def base_OnMovePre(*args, **kwargs): return _ogl.PyBitmapShape_base_OnMovePre(*args, **kwargs)
-    def base_OnMovePost(*args, **kwargs): return _ogl.PyBitmapShape_base_OnMovePost(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDragLeft(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyBitmapShape_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyBitmapShape_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDragRight(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyBitmapShape_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyBitmapShape_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDrawOutline(*args, **kwargs)
-    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDrawControlPoints(*args, **kwargs)
-    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyBitmapShape_base_OnEraseControlPoints(*args, **kwargs)
-    def base_OnMoveLink(*args, **kwargs): return _ogl.PyBitmapShape_base_OnMoveLink(*args, **kwargs)
-    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyBitmapShape_base_OnSizingDragLeft(*args, **kwargs)
-    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyBitmapShape_base_OnSizingBeginDragLeft(*args, **kwargs)
-    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyBitmapShape_base_OnSizingEndDragLeft(*args, **kwargs)
-    def base_OnBeginSize(*args, **kwargs): return _ogl.PyBitmapShape_base_OnBeginSize(*args, **kwargs)
-    def base_OnEndSize(*args, **kwargs): return _ogl.PyBitmapShape_base_OnEndSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyBitmapShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyBitmapShape__setCallbackInfo(*args, **kwargs)
+
+    def GetBitmap(*args, **kwargs):
+        """GetBitmap() -> wxBitmap"""
+        return _ogl.PyBitmapShape_GetBitmap(*args, **kwargs)
+
+    def GetFilename(*args, **kwargs):
+        """GetFilename() -> wxString"""
+        return _ogl.PyBitmapShape_GetFilename(*args, **kwargs)
+
+    def SetBitmap(*args, **kwargs):
+        """SetBitmap(wxBitmap bitmap)"""
+        return _ogl.PyBitmapShape_SetBitmap(*args, **kwargs)
+
+    def SetFilename(*args, **kwargs):
+        """SetFilename(wxString filename)"""
+        return _ogl.PyBitmapShape_SetFilename(*args, **kwargs)
+
+    def base_OnDelete(*args, **kwargs):
+        """base_OnDelete()"""
+        return _ogl.PyBitmapShape_base_OnDelete(*args, **kwargs)
+
+    def base_OnDraw(*args, **kwargs):
+        """base_OnDraw(wxDC dc)"""
+        return _ogl.PyBitmapShape_base_OnDraw(*args, **kwargs)
+
+    def base_OnDrawContents(*args, **kwargs):
+        """base_OnDrawContents(wxDC dc)"""
+        return _ogl.PyBitmapShape_base_OnDrawContents(*args, **kwargs)
+
+    def base_OnDrawBranches(*args, **kwargs):
+        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        return _ogl.PyBitmapShape_base_OnDrawBranches(*args, **kwargs)
+
+    def base_OnMoveLinks(*args, **kwargs):
+        """base_OnMoveLinks(wxDC dc)"""
+        return _ogl.PyBitmapShape_base_OnMoveLinks(*args, **kwargs)
+
+    def base_OnErase(*args, **kwargs):
+        """base_OnErase(wxDC dc)"""
+        return _ogl.PyBitmapShape_base_OnErase(*args, **kwargs)
+
+    def base_OnEraseContents(*args, **kwargs):
+        """base_OnEraseContents(wxDC dc)"""
+        return _ogl.PyBitmapShape_base_OnEraseContents(*args, **kwargs)
+
+    def base_OnHighlight(*args, **kwargs):
+        """base_OnHighlight(wxDC dc)"""
+        return _ogl.PyBitmapShape_base_OnHighlight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyBitmapShape_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnLeftDoubleClick(*args, **kwargs):
+        """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyBitmapShape_base_OnLeftDoubleClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyBitmapShape_base_OnRightClick(*args, **kwargs)
+
+    def base_OnSize(*args, **kwargs):
+        """base_OnSize(double x, double y)"""
+        return _ogl.PyBitmapShape_base_OnSize(*args, **kwargs)
+
+    def base_OnMovePre(*args, **kwargs):
+        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True) -> bool"""
+        return _ogl.PyBitmapShape_base_OnMovePre(*args, **kwargs)
+
+    def base_OnMovePost(*args, **kwargs):
+        """base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True)"""
+        return _ogl.PyBitmapShape_base_OnMovePost(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyBitmapShape_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyBitmapShape_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyBitmapShape_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyBitmapShape_base_OnDragRight(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyBitmapShape_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyBitmapShape_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDrawOutline(*args, **kwargs):
+        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        return _ogl.PyBitmapShape_base_OnDrawOutline(*args, **kwargs)
+
+    def base_OnDrawControlPoints(*args, **kwargs):
+        """base_OnDrawControlPoints(wxDC dc)"""
+        return _ogl.PyBitmapShape_base_OnDrawControlPoints(*args, **kwargs)
+
+    def base_OnEraseControlPoints(*args, **kwargs):
+        """base_OnEraseControlPoints(wxDC dc)"""
+        return _ogl.PyBitmapShape_base_OnEraseControlPoints(*args, **kwargs)
+
+    def base_OnMoveLink(*args, **kwargs):
+        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        return _ogl.PyBitmapShape_base_OnMoveLink(*args, **kwargs)
+
+    def base_OnSizingDragLeft(*args, **kwargs):
+        """base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyBitmapShape_base_OnSizingDragLeft(*args, **kwargs)
+
+    def base_OnSizingBeginDragLeft(*args, **kwargs):
+        """base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyBitmapShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+
+    def base_OnSizingEndDragLeft(*args, **kwargs):
+        """base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyBitmapShape_base_OnSizingEndDragLeft(*args, **kwargs)
+
+    def base_OnBeginSize(*args, **kwargs):
+        """base_OnBeginSize(double w, double h)"""
+        return _ogl.PyBitmapShape_base_OnBeginSize(*args, **kwargs)
+
+    def base_OnEndSize(*args, **kwargs):
+        """base_OnEndSize(double w, double h)"""
+        return _ogl.PyBitmapShape_base_OnEndSize(*args, **kwargs)
+
 
 class PyBitmapShapePtr(PyBitmapShape):
     def __init__(self, this):
@@ -507,72 +1650,254 @@ class PyBitmapShapePtr(PyBitmapShape):
 _ogl.PyBitmapShape_swigregister(PyBitmapShapePtr)
 
 class PyDrawnShape(PyRectangleShape):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyDrawnShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PyDrawnShape"""
         newobj = _ogl.new_PyDrawnShape(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORandCallbackInfo(PyDrawnShape)
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyDrawnShape__setCallbackInfo(*args, **kwargs)
-    def CalculateSize(*args, **kwargs): return _ogl.PyDrawnShape_CalculateSize(*args, **kwargs)
-    def DestroyClippingRect(*args, **kwargs): return _ogl.PyDrawnShape_DestroyClippingRect(*args, **kwargs)
-    def DrawArc(*args, **kwargs): return _ogl.PyDrawnShape_DrawArc(*args, **kwargs)
-    def DrawAtAngle(*args, **kwargs): return _ogl.PyDrawnShape_DrawAtAngle(*args, **kwargs)
-    def DrawEllipticArc(*args, **kwargs): return _ogl.PyDrawnShape_DrawEllipticArc(*args, **kwargs)
-    def DrawLine(*args, **kwargs): return _ogl.PyDrawnShape_DrawLine(*args, **kwargs)
-    def DrawLines(*args, **kwargs): return _ogl.PyDrawnShape_DrawLines(*args, **kwargs)
-    def DrawPoint(*args, **kwargs): return _ogl.PyDrawnShape_DrawPoint(*args, **kwargs)
-    def DrawPolygon(*args, **kwargs): return _ogl.PyDrawnShape_DrawPolygon(*args, **kwargs)
-    def DrawRectangle(*args, **kwargs): return _ogl.PyDrawnShape_DrawRectangle(*args, **kwargs)
-    def DrawRoundedRectangle(*args, **kwargs): return _ogl.PyDrawnShape_DrawRoundedRectangle(*args, **kwargs)
-    def DrawSpline(*args, **kwargs): return _ogl.PyDrawnShape_DrawSpline(*args, **kwargs)
-    def DrawText(*args, **kwargs): return _ogl.PyDrawnShape_DrawText(*args, **kwargs)
-    def GetAngle(*args, **kwargs): return _ogl.PyDrawnShape_GetAngle(*args, **kwargs)
-    def GetMetaFile(*args, **kwargs): return _ogl.PyDrawnShape_GetMetaFile(*args, **kwargs)
-    def GetRotation(*args, **kwargs): return _ogl.PyDrawnShape_GetRotation(*args, **kwargs)
-    def LoadFromMetaFile(*args, **kwargs): return _ogl.PyDrawnShape_LoadFromMetaFile(*args, **kwargs)
-    def Rotate(*args, **kwargs): return _ogl.PyDrawnShape_Rotate(*args, **kwargs)
-    def SetClippingRect(*args, **kwargs): return _ogl.PyDrawnShape_SetClippingRect(*args, **kwargs)
-    def SetDrawnBackgroundColour(*args, **kwargs): return _ogl.PyDrawnShape_SetDrawnBackgroundColour(*args, **kwargs)
-    def SetDrawnBackgroundMode(*args, **kwargs): return _ogl.PyDrawnShape_SetDrawnBackgroundMode(*args, **kwargs)
-    def SetDrawnBrush(*args, **kwargs): return _ogl.PyDrawnShape_SetDrawnBrush(*args, **kwargs)
-    def SetDrawnFont(*args, **kwargs): return _ogl.PyDrawnShape_SetDrawnFont(*args, **kwargs)
-    def SetDrawnPen(*args, **kwargs): return _ogl.PyDrawnShape_SetDrawnPen(*args, **kwargs)
-    def SetDrawnTextColour(*args, **kwargs): return _ogl.PyDrawnShape_SetDrawnTextColour(*args, **kwargs)
-    def Scale(*args, **kwargs): return _ogl.PyDrawnShape_Scale(*args, **kwargs)
-    def SetSaveToFile(*args, **kwargs): return _ogl.PyDrawnShape_SetSaveToFile(*args, **kwargs)
-    def Translate(*args, **kwargs): return _ogl.PyDrawnShape_Translate(*args, **kwargs)
-    def base_OnDelete(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDelete(*args, **kwargs)
-    def base_OnDraw(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDraw(*args, **kwargs)
-    def base_OnDrawContents(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDrawContents(*args, **kwargs)
-    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDrawBranches(*args, **kwargs)
-    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyDrawnShape_base_OnMoveLinks(*args, **kwargs)
-    def base_OnErase(*args, **kwargs): return _ogl.PyDrawnShape_base_OnErase(*args, **kwargs)
-    def base_OnEraseContents(*args, **kwargs): return _ogl.PyDrawnShape_base_OnEraseContents(*args, **kwargs)
-    def base_OnHighlight(*args, **kwargs): return _ogl.PyDrawnShape_base_OnHighlight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyDrawnShape_base_OnLeftClick(*args, **kwargs)
-    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyDrawnShape_base_OnLeftDoubleClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyDrawnShape_base_OnRightClick(*args, **kwargs)
-    def base_OnSize(*args, **kwargs): return _ogl.PyDrawnShape_base_OnSize(*args, **kwargs)
-    def base_OnMovePre(*args, **kwargs): return _ogl.PyDrawnShape_base_OnMovePre(*args, **kwargs)
-    def base_OnMovePost(*args, **kwargs): return _ogl.PyDrawnShape_base_OnMovePost(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDragLeft(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyDrawnShape_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyDrawnShape_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDragRight(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyDrawnShape_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyDrawnShape_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDrawOutline(*args, **kwargs)
-    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDrawControlPoints(*args, **kwargs)
-    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyDrawnShape_base_OnEraseControlPoints(*args, **kwargs)
-    def base_OnMoveLink(*args, **kwargs): return _ogl.PyDrawnShape_base_OnMoveLink(*args, **kwargs)
-    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyDrawnShape_base_OnSizingDragLeft(*args, **kwargs)
-    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyDrawnShape_base_OnSizingBeginDragLeft(*args, **kwargs)
-    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyDrawnShape_base_OnSizingEndDragLeft(*args, **kwargs)
-    def base_OnBeginSize(*args, **kwargs): return _ogl.PyDrawnShape_base_OnBeginSize(*args, **kwargs)
-    def base_OnEndSize(*args, **kwargs): return _ogl.PyDrawnShape_base_OnEndSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyDrawnShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyDrawnShape__setCallbackInfo(*args, **kwargs)
+
+    def CalculateSize(*args, **kwargs):
+        """CalculateSize()"""
+        return _ogl.PyDrawnShape_CalculateSize(*args, **kwargs)
+
+    def DestroyClippingRect(*args, **kwargs):
+        """DestroyClippingRect()"""
+        return _ogl.PyDrawnShape_DestroyClippingRect(*args, **kwargs)
+
+    def DrawArc(*args, **kwargs):
+        """DrawArc(Point centrePoint, Point startPoint, Point endPoint)"""
+        return _ogl.PyDrawnShape_DrawArc(*args, **kwargs)
+
+    def DrawAtAngle(*args, **kwargs):
+        """DrawAtAngle(int angle)"""
+        return _ogl.PyDrawnShape_DrawAtAngle(*args, **kwargs)
+
+    def DrawEllipticArc(*args, **kwargs):
+        """DrawEllipticArc(Rect rect, double startAngle, double endAngle)"""
+        return _ogl.PyDrawnShape_DrawEllipticArc(*args, **kwargs)
+
+    def DrawLine(*args, **kwargs):
+        """DrawLine(Point point1, Point point2)"""
+        return _ogl.PyDrawnShape_DrawLine(*args, **kwargs)
+
+    def DrawLines(*args, **kwargs):
+        """DrawLines(int PCOUNT, Point points)"""
+        return _ogl.PyDrawnShape_DrawLines(*args, **kwargs)
+
+    def DrawPoint(*args, **kwargs):
+        """DrawPoint(Point point)"""
+        return _ogl.PyDrawnShape_DrawPoint(*args, **kwargs)
+
+    def DrawPolygon(*args, **kwargs):
+        """DrawPolygon(int PCOUNT, Point points, int flags=0)"""
+        return _ogl.PyDrawnShape_DrawPolygon(*args, **kwargs)
+
+    def DrawRectangle(*args, **kwargs):
+        """DrawRectangle(Rect rect)"""
+        return _ogl.PyDrawnShape_DrawRectangle(*args, **kwargs)
+
+    def DrawRoundedRectangle(*args, **kwargs):
+        """DrawRoundedRectangle(Rect rect, double radius)"""
+        return _ogl.PyDrawnShape_DrawRoundedRectangle(*args, **kwargs)
+
+    def DrawSpline(*args, **kwargs):
+        """DrawSpline(int PCOUNT, Point points)"""
+        return _ogl.PyDrawnShape_DrawSpline(*args, **kwargs)
+
+    def DrawText(*args, **kwargs):
+        """DrawText(wxString text, Point point)"""
+        return _ogl.PyDrawnShape_DrawText(*args, **kwargs)
+
+    def GetAngle(*args, **kwargs):
+        """GetAngle() -> int"""
+        return _ogl.PyDrawnShape_GetAngle(*args, **kwargs)
+
+    def GetMetaFile(*args, **kwargs):
+        """GetMetaFile() -> PseudoMetaFile"""
+        return _ogl.PyDrawnShape_GetMetaFile(*args, **kwargs)
+
+    def GetRotation(*args, **kwargs):
+        """GetRotation() -> double"""
+        return _ogl.PyDrawnShape_GetRotation(*args, **kwargs)
+
+    def LoadFromMetaFile(*args, **kwargs):
+        """LoadFromMetaFile(wxString filename) -> bool"""
+        return _ogl.PyDrawnShape_LoadFromMetaFile(*args, **kwargs)
+
+    def Rotate(*args, **kwargs):
+        """Rotate(double x, double y, double theta)"""
+        return _ogl.PyDrawnShape_Rotate(*args, **kwargs)
+
+    def SetClippingRect(*args, **kwargs):
+        """SetClippingRect(Rect rect)"""
+        return _ogl.PyDrawnShape_SetClippingRect(*args, **kwargs)
+
+    def SetDrawnBackgroundColour(*args, **kwargs):
+        """SetDrawnBackgroundColour(wxColour colour)"""
+        return _ogl.PyDrawnShape_SetDrawnBackgroundColour(*args, **kwargs)
+
+    def SetDrawnBackgroundMode(*args, **kwargs):
+        """SetDrawnBackgroundMode(int mode)"""
+        return _ogl.PyDrawnShape_SetDrawnBackgroundMode(*args, **kwargs)
+
+    def SetDrawnBrush(*args, **kwargs):
+        """SetDrawnBrush(wxBrush pen, bool isOutline=FALSE)"""
+        return _ogl.PyDrawnShape_SetDrawnBrush(*args, **kwargs)
+
+    def SetDrawnFont(*args, **kwargs):
+        """SetDrawnFont(wxFont font)"""
+        return _ogl.PyDrawnShape_SetDrawnFont(*args, **kwargs)
+
+    def SetDrawnPen(*args, **kwargs):
+        """SetDrawnPen(wxPen pen, bool isOutline=FALSE)"""
+        return _ogl.PyDrawnShape_SetDrawnPen(*args, **kwargs)
+
+    def SetDrawnTextColour(*args, **kwargs):
+        """SetDrawnTextColour(wxColour colour)"""
+        return _ogl.PyDrawnShape_SetDrawnTextColour(*args, **kwargs)
+
+    def Scale(*args, **kwargs):
+        """Scale(double sx, double sy)"""
+        return _ogl.PyDrawnShape_Scale(*args, **kwargs)
+
+    def SetSaveToFile(*args, **kwargs):
+        """SetSaveToFile(bool save)"""
+        return _ogl.PyDrawnShape_SetSaveToFile(*args, **kwargs)
+
+    def Translate(*args, **kwargs):
+        """Translate(double x, double y)"""
+        return _ogl.PyDrawnShape_Translate(*args, **kwargs)
+
+    def base_OnDelete(*args, **kwargs):
+        """base_OnDelete()"""
+        return _ogl.PyDrawnShape_base_OnDelete(*args, **kwargs)
+
+    def base_OnDraw(*args, **kwargs):
+        """base_OnDraw(wxDC dc)"""
+        return _ogl.PyDrawnShape_base_OnDraw(*args, **kwargs)
+
+    def base_OnDrawContents(*args, **kwargs):
+        """base_OnDrawContents(wxDC dc)"""
+        return _ogl.PyDrawnShape_base_OnDrawContents(*args, **kwargs)
+
+    def base_OnDrawBranches(*args, **kwargs):
+        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        return _ogl.PyDrawnShape_base_OnDrawBranches(*args, **kwargs)
+
+    def base_OnMoveLinks(*args, **kwargs):
+        """base_OnMoveLinks(wxDC dc)"""
+        return _ogl.PyDrawnShape_base_OnMoveLinks(*args, **kwargs)
+
+    def base_OnErase(*args, **kwargs):
+        """base_OnErase(wxDC dc)"""
+        return _ogl.PyDrawnShape_base_OnErase(*args, **kwargs)
+
+    def base_OnEraseContents(*args, **kwargs):
+        """base_OnEraseContents(wxDC dc)"""
+        return _ogl.PyDrawnShape_base_OnEraseContents(*args, **kwargs)
+
+    def base_OnHighlight(*args, **kwargs):
+        """base_OnHighlight(wxDC dc)"""
+        return _ogl.PyDrawnShape_base_OnHighlight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDrawnShape_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnLeftDoubleClick(*args, **kwargs):
+        """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDrawnShape_base_OnLeftDoubleClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDrawnShape_base_OnRightClick(*args, **kwargs)
+
+    def base_OnSize(*args, **kwargs):
+        """base_OnSize(double x, double y)"""
+        return _ogl.PyDrawnShape_base_OnSize(*args, **kwargs)
+
+    def base_OnMovePre(*args, **kwargs):
+        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True) -> bool"""
+        return _ogl.PyDrawnShape_base_OnMovePre(*args, **kwargs)
+
+    def base_OnMovePost(*args, **kwargs):
+        """base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True)"""
+        return _ogl.PyDrawnShape_base_OnMovePost(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDrawnShape_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDrawnShape_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDrawnShape_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDrawnShape_base_OnDragRight(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDrawnShape_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDrawnShape_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDrawOutline(*args, **kwargs):
+        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        return _ogl.PyDrawnShape_base_OnDrawOutline(*args, **kwargs)
+
+    def base_OnDrawControlPoints(*args, **kwargs):
+        """base_OnDrawControlPoints(wxDC dc)"""
+        return _ogl.PyDrawnShape_base_OnDrawControlPoints(*args, **kwargs)
+
+    def base_OnEraseControlPoints(*args, **kwargs):
+        """base_OnEraseControlPoints(wxDC dc)"""
+        return _ogl.PyDrawnShape_base_OnEraseControlPoints(*args, **kwargs)
+
+    def base_OnMoveLink(*args, **kwargs):
+        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        return _ogl.PyDrawnShape_base_OnMoveLink(*args, **kwargs)
+
+    def base_OnSizingDragLeft(*args, **kwargs):
+        """base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyDrawnShape_base_OnSizingDragLeft(*args, **kwargs)
+
+    def base_OnSizingBeginDragLeft(*args, **kwargs):
+        """base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyDrawnShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+
+    def base_OnSizingEndDragLeft(*args, **kwargs):
+        """base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyDrawnShape_base_OnSizingEndDragLeft(*args, **kwargs)
+
+    def base_OnBeginSize(*args, **kwargs):
+        """base_OnBeginSize(double w, double h)"""
+        return _ogl.PyDrawnShape_base_OnBeginSize(*args, **kwargs)
+
+    def base_OnEndSize(*args, **kwargs):
+        """base_OnEndSize(double w, double h)"""
+        return _ogl.PyDrawnShape_base_OnEndSize(*args, **kwargs)
+
 
 class PyDrawnShapePtr(PyDrawnShape):
     def __init__(self, this):
@@ -582,16 +1907,27 @@ class PyDrawnShapePtr(PyDrawnShape):
 _ogl.PyDrawnShape_swigregister(PyDrawnShapePtr)
 
 class OGLConstraint(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxOGLConstraint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int type, PyShape constraining, PyObject constrained) -> OGLConstraint"""
         newobj = _ogl.new_OGLConstraint(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def Evaluate(*args, **kwargs): return _ogl.OGLConstraint_Evaluate(*args, **kwargs)
-    def SetSpacing(*args, **kwargs): return _ogl.OGLConstraint_SetSpacing(*args, **kwargs)
-    def Equals(*args, **kwargs): return _ogl.OGLConstraint_Equals(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxOGLConstraint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Evaluate(*args, **kwargs):
+        """Evaluate() -> bool"""
+        return _ogl.OGLConstraint_Evaluate(*args, **kwargs)
+
+    def SetSpacing(*args, **kwargs):
+        """SetSpacing(double x, double y)"""
+        return _ogl.OGLConstraint_SetSpacing(*args, **kwargs)
+
+    def Equals(*args, **kwargs):
+        """Equals(double a, double b) -> bool"""
+        return _ogl.OGLConstraint_Equals(*args, **kwargs)
+
 
 class OGLConstraintPtr(OGLConstraint):
     def __init__(self, this):
@@ -601,58 +1937,198 @@ class OGLConstraintPtr(OGLConstraint):
 _ogl.OGLConstraint_swigregister(OGLConstraintPtr)
 
 class PyCompositeShape(PyRectangleShape):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyCompositeShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PyCompositeShape"""
         newobj = _ogl.new_PyCompositeShape(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORandCallbackInfo(PyCompositeShape)
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyCompositeShape__setCallbackInfo(*args, **kwargs)
-    def AddChild(*args, **kwargs): return _ogl.PyCompositeShape_AddChild(*args, **kwargs)
-    def AddConstraint(*args, **kwargs): return _ogl.PyCompositeShape_AddConstraint(*args, **kwargs)
-    def AddConstrainedShapes(*args, **kwargs): return _ogl.PyCompositeShape_AddConstrainedShapes(*args, **kwargs)
-    def AddSimpleConstraint(*args, **kwargs): return _ogl.PyCompositeShape_AddSimpleConstraint(*args, **kwargs)
-    def CalculateSize(*args, **kwargs): return _ogl.PyCompositeShape_CalculateSize(*args, **kwargs)
-    def ContainsDivision(*args, **kwargs): return _ogl.PyCompositeShape_ContainsDivision(*args, **kwargs)
-    def DeleteConstraint(*args, **kwargs): return _ogl.PyCompositeShape_DeleteConstraint(*args, **kwargs)
-    def DeleteConstraintsInvolvingChild(*args, **kwargs): return _ogl.PyCompositeShape_DeleteConstraintsInvolvingChild(*args, **kwargs)
-    def FindContainerImage(*args, **kwargs): return _ogl.PyCompositeShape_FindContainerImage(*args, **kwargs)
-    def GetConstraints(*args, **kwargs): return _ogl.PyCompositeShape_GetConstraints(*args, **kwargs)
-    def GetDivisions(*args, **kwargs): return _ogl.PyCompositeShape_GetDivisions(*args, **kwargs)
-    def MakeContainer(*args, **kwargs): return _ogl.PyCompositeShape_MakeContainer(*args, **kwargs)
-    def Recompute(*args, **kwargs): return _ogl.PyCompositeShape_Recompute(*args, **kwargs)
-    def RemoveChild(*args, **kwargs): return _ogl.PyCompositeShape_RemoveChild(*args, **kwargs)
-    def base_OnDelete(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDelete(*args, **kwargs)
-    def base_OnDraw(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDraw(*args, **kwargs)
-    def base_OnDrawContents(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDrawContents(*args, **kwargs)
-    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDrawBranches(*args, **kwargs)
-    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyCompositeShape_base_OnMoveLinks(*args, **kwargs)
-    def base_OnErase(*args, **kwargs): return _ogl.PyCompositeShape_base_OnErase(*args, **kwargs)
-    def base_OnEraseContents(*args, **kwargs): return _ogl.PyCompositeShape_base_OnEraseContents(*args, **kwargs)
-    def base_OnHighlight(*args, **kwargs): return _ogl.PyCompositeShape_base_OnHighlight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyCompositeShape_base_OnLeftClick(*args, **kwargs)
-    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyCompositeShape_base_OnLeftDoubleClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyCompositeShape_base_OnRightClick(*args, **kwargs)
-    def base_OnSize(*args, **kwargs): return _ogl.PyCompositeShape_base_OnSize(*args, **kwargs)
-    def base_OnMovePre(*args, **kwargs): return _ogl.PyCompositeShape_base_OnMovePre(*args, **kwargs)
-    def base_OnMovePost(*args, **kwargs): return _ogl.PyCompositeShape_base_OnMovePost(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDragLeft(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyCompositeShape_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyCompositeShape_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDragRight(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyCompositeShape_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyCompositeShape_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDrawOutline(*args, **kwargs)
-    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDrawControlPoints(*args, **kwargs)
-    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyCompositeShape_base_OnEraseControlPoints(*args, **kwargs)
-    def base_OnMoveLink(*args, **kwargs): return _ogl.PyCompositeShape_base_OnMoveLink(*args, **kwargs)
-    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyCompositeShape_base_OnSizingDragLeft(*args, **kwargs)
-    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyCompositeShape_base_OnSizingBeginDragLeft(*args, **kwargs)
-    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyCompositeShape_base_OnSizingEndDragLeft(*args, **kwargs)
-    def base_OnBeginSize(*args, **kwargs): return _ogl.PyCompositeShape_base_OnBeginSize(*args, **kwargs)
-    def base_OnEndSize(*args, **kwargs): return _ogl.PyCompositeShape_base_OnEndSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyCompositeShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyCompositeShape__setCallbackInfo(*args, **kwargs)
+
+    def AddChild(*args, **kwargs):
+        """AddChild(PyShape child, PyShape addAfter=None)"""
+        return _ogl.PyCompositeShape_AddChild(*args, **kwargs)
+
+    def AddConstraint(*args, **kwargs):
+        """AddConstraint(OGLConstraint constraint) -> OGLConstraint"""
+        return _ogl.PyCompositeShape_AddConstraint(*args, **kwargs)
+
+    def AddConstrainedShapes(*args, **kwargs):
+        """AddConstrainedShapes(int type, PyShape constraining, PyObject constrained) -> OGLConstraint"""
+        return _ogl.PyCompositeShape_AddConstrainedShapes(*args, **kwargs)
+
+    def AddSimpleConstraint(*args, **kwargs):
+        """AddSimpleConstraint(int type, PyShape constraining, PyShape constrained) -> OGLConstraint"""
+        return _ogl.PyCompositeShape_AddSimpleConstraint(*args, **kwargs)
+
+    def CalculateSize(*args, **kwargs):
+        """CalculateSize()"""
+        return _ogl.PyCompositeShape_CalculateSize(*args, **kwargs)
+
+    def ContainsDivision(*args, **kwargs):
+        """ContainsDivision(PyDivisionShape division) -> bool"""
+        return _ogl.PyCompositeShape_ContainsDivision(*args, **kwargs)
+
+    def DeleteConstraint(*args, **kwargs):
+        """DeleteConstraint(OGLConstraint constraint)"""
+        return _ogl.PyCompositeShape_DeleteConstraint(*args, **kwargs)
+
+    def DeleteConstraintsInvolvingChild(*args, **kwargs):
+        """DeleteConstraintsInvolvingChild(PyShape child)"""
+        return _ogl.PyCompositeShape_DeleteConstraintsInvolvingChild(*args, **kwargs)
+
+    def FindContainerImage(*args, **kwargs):
+        """FindContainerImage() -> PyShape"""
+        return _ogl.PyCompositeShape_FindContainerImage(*args, **kwargs)
+
+    def GetConstraints(*args, **kwargs):
+        """GetConstraints() -> PyObject"""
+        return _ogl.PyCompositeShape_GetConstraints(*args, **kwargs)
+
+    def GetDivisions(*args, **kwargs):
+        """GetDivisions() -> PyObject"""
+        return _ogl.PyCompositeShape_GetDivisions(*args, **kwargs)
+
+    def MakeContainer(*args, **kwargs):
+        """MakeContainer()"""
+        return _ogl.PyCompositeShape_MakeContainer(*args, **kwargs)
+
+    def Recompute(*args, **kwargs):
+        """Recompute() -> bool"""
+        return _ogl.PyCompositeShape_Recompute(*args, **kwargs)
+
+    def RemoveChild(*args, **kwargs):
+        """RemoveChild(PyShape child)"""
+        return _ogl.PyCompositeShape_RemoveChild(*args, **kwargs)
+
+    def base_OnDelete(*args, **kwargs):
+        """base_OnDelete()"""
+        return _ogl.PyCompositeShape_base_OnDelete(*args, **kwargs)
+
+    def base_OnDraw(*args, **kwargs):
+        """base_OnDraw(wxDC dc)"""
+        return _ogl.PyCompositeShape_base_OnDraw(*args, **kwargs)
+
+    def base_OnDrawContents(*args, **kwargs):
+        """base_OnDrawContents(wxDC dc)"""
+        return _ogl.PyCompositeShape_base_OnDrawContents(*args, **kwargs)
+
+    def base_OnDrawBranches(*args, **kwargs):
+        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        return _ogl.PyCompositeShape_base_OnDrawBranches(*args, **kwargs)
+
+    def base_OnMoveLinks(*args, **kwargs):
+        """base_OnMoveLinks(wxDC dc)"""
+        return _ogl.PyCompositeShape_base_OnMoveLinks(*args, **kwargs)
+
+    def base_OnErase(*args, **kwargs):
+        """base_OnErase(wxDC dc)"""
+        return _ogl.PyCompositeShape_base_OnErase(*args, **kwargs)
+
+    def base_OnEraseContents(*args, **kwargs):
+        """base_OnEraseContents(wxDC dc)"""
+        return _ogl.PyCompositeShape_base_OnEraseContents(*args, **kwargs)
+
+    def base_OnHighlight(*args, **kwargs):
+        """base_OnHighlight(wxDC dc)"""
+        return _ogl.PyCompositeShape_base_OnHighlight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCompositeShape_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnLeftDoubleClick(*args, **kwargs):
+        """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCompositeShape_base_OnLeftDoubleClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCompositeShape_base_OnRightClick(*args, **kwargs)
+
+    def base_OnSize(*args, **kwargs):
+        """base_OnSize(double x, double y)"""
+        return _ogl.PyCompositeShape_base_OnSize(*args, **kwargs)
+
+    def base_OnMovePre(*args, **kwargs):
+        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True) -> bool"""
+        return _ogl.PyCompositeShape_base_OnMovePre(*args, **kwargs)
+
+    def base_OnMovePost(*args, **kwargs):
+        """base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True)"""
+        return _ogl.PyCompositeShape_base_OnMovePost(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCompositeShape_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCompositeShape_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCompositeShape_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCompositeShape_base_OnDragRight(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCompositeShape_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCompositeShape_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDrawOutline(*args, **kwargs):
+        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        return _ogl.PyCompositeShape_base_OnDrawOutline(*args, **kwargs)
+
+    def base_OnDrawControlPoints(*args, **kwargs):
+        """base_OnDrawControlPoints(wxDC dc)"""
+        return _ogl.PyCompositeShape_base_OnDrawControlPoints(*args, **kwargs)
+
+    def base_OnEraseControlPoints(*args, **kwargs):
+        """base_OnEraseControlPoints(wxDC dc)"""
+        return _ogl.PyCompositeShape_base_OnEraseControlPoints(*args, **kwargs)
+
+    def base_OnMoveLink(*args, **kwargs):
+        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        return _ogl.PyCompositeShape_base_OnMoveLink(*args, **kwargs)
+
+    def base_OnSizingDragLeft(*args, **kwargs):
+        """base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyCompositeShape_base_OnSizingDragLeft(*args, **kwargs)
+
+    def base_OnSizingBeginDragLeft(*args, **kwargs):
+        """base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyCompositeShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+
+    def base_OnSizingEndDragLeft(*args, **kwargs):
+        """base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyCompositeShape_base_OnSizingEndDragLeft(*args, **kwargs)
+
+    def base_OnBeginSize(*args, **kwargs):
+        """base_OnBeginSize(double w, double h)"""
+        return _ogl.PyCompositeShape_base_OnBeginSize(*args, **kwargs)
+
+    def base_OnEndSize(*args, **kwargs):
+        """base_OnEndSize(double w, double h)"""
+        return _ogl.PyCompositeShape_base_OnEndSize(*args, **kwargs)
+
 
 class PyCompositeShapePtr(PyCompositeShape):
     def __init__(self, this):
@@ -662,46 +2138,150 @@ class PyCompositeShapePtr(PyCompositeShape):
 _ogl.PyCompositeShape_swigregister(PyCompositeShapePtr)
 
 class PyDividedShape(PyRectangleShape):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyDividedShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(double width=0.0, double height=0.0) -> PyDividedShape"""
         newobj = _ogl.new_PyDividedShape(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORandCallbackInfo(PyDividedShape)
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyDividedShape__setCallbackInfo(*args, **kwargs)
-    def EditRegions(*args, **kwargs): return _ogl.PyDividedShape_EditRegions(*args, **kwargs)
-    def SetRegionSizes(*args, **kwargs): return _ogl.PyDividedShape_SetRegionSizes(*args, **kwargs)
-    def base_OnDelete(*args, **kwargs): return _ogl.PyDividedShape_base_OnDelete(*args, **kwargs)
-    def base_OnDraw(*args, **kwargs): return _ogl.PyDividedShape_base_OnDraw(*args, **kwargs)
-    def base_OnDrawContents(*args, **kwargs): return _ogl.PyDividedShape_base_OnDrawContents(*args, **kwargs)
-    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyDividedShape_base_OnDrawBranches(*args, **kwargs)
-    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyDividedShape_base_OnMoveLinks(*args, **kwargs)
-    def base_OnErase(*args, **kwargs): return _ogl.PyDividedShape_base_OnErase(*args, **kwargs)
-    def base_OnEraseContents(*args, **kwargs): return _ogl.PyDividedShape_base_OnEraseContents(*args, **kwargs)
-    def base_OnHighlight(*args, **kwargs): return _ogl.PyDividedShape_base_OnHighlight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyDividedShape_base_OnLeftClick(*args, **kwargs)
-    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyDividedShape_base_OnLeftDoubleClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyDividedShape_base_OnRightClick(*args, **kwargs)
-    def base_OnSize(*args, **kwargs): return _ogl.PyDividedShape_base_OnSize(*args, **kwargs)
-    def base_OnMovePre(*args, **kwargs): return _ogl.PyDividedShape_base_OnMovePre(*args, **kwargs)
-    def base_OnMovePost(*args, **kwargs): return _ogl.PyDividedShape_base_OnMovePost(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyDividedShape_base_OnDragLeft(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyDividedShape_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyDividedShape_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyDividedShape_base_OnDragRight(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyDividedShape_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyDividedShape_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyDividedShape_base_OnDrawOutline(*args, **kwargs)
-    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyDividedShape_base_OnDrawControlPoints(*args, **kwargs)
-    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyDividedShape_base_OnEraseControlPoints(*args, **kwargs)
-    def base_OnMoveLink(*args, **kwargs): return _ogl.PyDividedShape_base_OnMoveLink(*args, **kwargs)
-    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyDividedShape_base_OnSizingDragLeft(*args, **kwargs)
-    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyDividedShape_base_OnSizingBeginDragLeft(*args, **kwargs)
-    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyDividedShape_base_OnSizingEndDragLeft(*args, **kwargs)
-    def base_OnBeginSize(*args, **kwargs): return _ogl.PyDividedShape_base_OnBeginSize(*args, **kwargs)
-    def base_OnEndSize(*args, **kwargs): return _ogl.PyDividedShape_base_OnEndSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyDividedShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyDividedShape__setCallbackInfo(*args, **kwargs)
+
+    def EditRegions(*args, **kwargs):
+        """EditRegions()"""
+        return _ogl.PyDividedShape_EditRegions(*args, **kwargs)
+
+    def SetRegionSizes(*args, **kwargs):
+        """SetRegionSizes()"""
+        return _ogl.PyDividedShape_SetRegionSizes(*args, **kwargs)
+
+    def base_OnDelete(*args, **kwargs):
+        """base_OnDelete()"""
+        return _ogl.PyDividedShape_base_OnDelete(*args, **kwargs)
+
+    def base_OnDraw(*args, **kwargs):
+        """base_OnDraw(wxDC dc)"""
+        return _ogl.PyDividedShape_base_OnDraw(*args, **kwargs)
+
+    def base_OnDrawContents(*args, **kwargs):
+        """base_OnDrawContents(wxDC dc)"""
+        return _ogl.PyDividedShape_base_OnDrawContents(*args, **kwargs)
+
+    def base_OnDrawBranches(*args, **kwargs):
+        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        return _ogl.PyDividedShape_base_OnDrawBranches(*args, **kwargs)
+
+    def base_OnMoveLinks(*args, **kwargs):
+        """base_OnMoveLinks(wxDC dc)"""
+        return _ogl.PyDividedShape_base_OnMoveLinks(*args, **kwargs)
+
+    def base_OnErase(*args, **kwargs):
+        """base_OnErase(wxDC dc)"""
+        return _ogl.PyDividedShape_base_OnErase(*args, **kwargs)
+
+    def base_OnEraseContents(*args, **kwargs):
+        """base_OnEraseContents(wxDC dc)"""
+        return _ogl.PyDividedShape_base_OnEraseContents(*args, **kwargs)
+
+    def base_OnHighlight(*args, **kwargs):
+        """base_OnHighlight(wxDC dc)"""
+        return _ogl.PyDividedShape_base_OnHighlight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDividedShape_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnLeftDoubleClick(*args, **kwargs):
+        """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDividedShape_base_OnLeftDoubleClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDividedShape_base_OnRightClick(*args, **kwargs)
+
+    def base_OnSize(*args, **kwargs):
+        """base_OnSize(double x, double y)"""
+        return _ogl.PyDividedShape_base_OnSize(*args, **kwargs)
+
+    def base_OnMovePre(*args, **kwargs):
+        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True) -> bool"""
+        return _ogl.PyDividedShape_base_OnMovePre(*args, **kwargs)
+
+    def base_OnMovePost(*args, **kwargs):
+        """base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True)"""
+        return _ogl.PyDividedShape_base_OnMovePost(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDividedShape_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDividedShape_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDividedShape_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDividedShape_base_OnDragRight(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDividedShape_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDividedShape_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDrawOutline(*args, **kwargs):
+        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        return _ogl.PyDividedShape_base_OnDrawOutline(*args, **kwargs)
+
+    def base_OnDrawControlPoints(*args, **kwargs):
+        """base_OnDrawControlPoints(wxDC dc)"""
+        return _ogl.PyDividedShape_base_OnDrawControlPoints(*args, **kwargs)
+
+    def base_OnEraseControlPoints(*args, **kwargs):
+        """base_OnEraseControlPoints(wxDC dc)"""
+        return _ogl.PyDividedShape_base_OnEraseControlPoints(*args, **kwargs)
+
+    def base_OnMoveLink(*args, **kwargs):
+        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        return _ogl.PyDividedShape_base_OnMoveLink(*args, **kwargs)
+
+    def base_OnSizingDragLeft(*args, **kwargs):
+        """base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyDividedShape_base_OnSizingDragLeft(*args, **kwargs)
+
+    def base_OnSizingBeginDragLeft(*args, **kwargs):
+        """base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyDividedShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+
+    def base_OnSizingEndDragLeft(*args, **kwargs):
+        """base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyDividedShape_base_OnSizingEndDragLeft(*args, **kwargs)
+
+    def base_OnBeginSize(*args, **kwargs):
+        """base_OnBeginSize(double w, double h)"""
+        return _ogl.PyDividedShape_base_OnBeginSize(*args, **kwargs)
+
+    def base_OnEndSize(*args, **kwargs):
+        """base_OnEndSize(double w, double h)"""
+        return _ogl.PyDividedShape_base_OnEndSize(*args, **kwargs)
+
 
 class PyDividedShapePtr(PyDividedShape):
     def __init__(self, this):
@@ -711,69 +2291,242 @@ class PyDividedShapePtr(PyDividedShape):
 _ogl.PyDividedShape_swigregister(PyDividedShapePtr)
 
 class PyDivisionShape(PyCompositeShape):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyDivisionShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PyDivisionShape"""
         newobj = _ogl.new_PyDivisionShape(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORandCallbackInfo(PyDivisionShape)
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyDivisionShape__setCallbackInfo(*args, **kwargs)
-    def AdjustBottom(*args, **kwargs): return _ogl.PyDivisionShape_AdjustBottom(*args, **kwargs)
-    def AdjustLeft(*args, **kwargs): return _ogl.PyDivisionShape_AdjustLeft(*args, **kwargs)
-    def AdjustRight(*args, **kwargs): return _ogl.PyDivisionShape_AdjustRight(*args, **kwargs)
-    def AdjustTop(*args, **kwargs): return _ogl.PyDivisionShape_AdjustTop(*args, **kwargs)
-    def Divide(*args, **kwargs): return _ogl.PyDivisionShape_Divide(*args, **kwargs)
-    def EditEdge(*args, **kwargs): return _ogl.PyDivisionShape_EditEdge(*args, **kwargs)
-    def GetBottomSide(*args, **kwargs): return _ogl.PyDivisionShape_GetBottomSide(*args, **kwargs)
-    def GetHandleSide(*args, **kwargs): return _ogl.PyDivisionShape_GetHandleSide(*args, **kwargs)
-    def GetLeftSide(*args, **kwargs): return _ogl.PyDivisionShape_GetLeftSide(*args, **kwargs)
-    def GetLeftSideColour(*args, **kwargs): return _ogl.PyDivisionShape_GetLeftSideColour(*args, **kwargs)
-    def GetLeftSidePen(*args, **kwargs): return _ogl.PyDivisionShape_GetLeftSidePen(*args, **kwargs)
-    def GetRightSide(*args, **kwargs): return _ogl.PyDivisionShape_GetRightSide(*args, **kwargs)
-    def GetTopSide(*args, **kwargs): return _ogl.PyDivisionShape_GetTopSide(*args, **kwargs)
-    def GetTopSidePen(*args, **kwargs): return _ogl.PyDivisionShape_GetTopSidePen(*args, **kwargs)
-    def ResizeAdjoining(*args, **kwargs): return _ogl.PyDivisionShape_ResizeAdjoining(*args, **kwargs)
-    def PopupMenu(*args, **kwargs): return _ogl.PyDivisionShape_PopupMenu(*args, **kwargs)
-    def SetBottomSide(*args, **kwargs): return _ogl.PyDivisionShape_SetBottomSide(*args, **kwargs)
-    def SetHandleSide(*args, **kwargs): return _ogl.PyDivisionShape_SetHandleSide(*args, **kwargs)
-    def SetLeftSide(*args, **kwargs): return _ogl.PyDivisionShape_SetLeftSide(*args, **kwargs)
-    def SetLeftSideColour(*args, **kwargs): return _ogl.PyDivisionShape_SetLeftSideColour(*args, **kwargs)
-    def SetLeftSidePen(*args, **kwargs): return _ogl.PyDivisionShape_SetLeftSidePen(*args, **kwargs)
-    def SetRightSide(*args, **kwargs): return _ogl.PyDivisionShape_SetRightSide(*args, **kwargs)
-    def SetTopSide(*args, **kwargs): return _ogl.PyDivisionShape_SetTopSide(*args, **kwargs)
-    def SetTopSideColour(*args, **kwargs): return _ogl.PyDivisionShape_SetTopSideColour(*args, **kwargs)
-    def SetTopSidePen(*args, **kwargs): return _ogl.PyDivisionShape_SetTopSidePen(*args, **kwargs)
-    def base_OnDelete(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDelete(*args, **kwargs)
-    def base_OnDraw(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDraw(*args, **kwargs)
-    def base_OnDrawContents(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDrawContents(*args, **kwargs)
-    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDrawBranches(*args, **kwargs)
-    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyDivisionShape_base_OnMoveLinks(*args, **kwargs)
-    def base_OnErase(*args, **kwargs): return _ogl.PyDivisionShape_base_OnErase(*args, **kwargs)
-    def base_OnEraseContents(*args, **kwargs): return _ogl.PyDivisionShape_base_OnEraseContents(*args, **kwargs)
-    def base_OnHighlight(*args, **kwargs): return _ogl.PyDivisionShape_base_OnHighlight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyDivisionShape_base_OnLeftClick(*args, **kwargs)
-    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyDivisionShape_base_OnLeftDoubleClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyDivisionShape_base_OnRightClick(*args, **kwargs)
-    def base_OnSize(*args, **kwargs): return _ogl.PyDivisionShape_base_OnSize(*args, **kwargs)
-    def base_OnMovePre(*args, **kwargs): return _ogl.PyDivisionShape_base_OnMovePre(*args, **kwargs)
-    def base_OnMovePost(*args, **kwargs): return _ogl.PyDivisionShape_base_OnMovePost(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDragLeft(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyDivisionShape_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyDivisionShape_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDragRight(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyDivisionShape_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyDivisionShape_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDrawOutline(*args, **kwargs)
-    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDrawControlPoints(*args, **kwargs)
-    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyDivisionShape_base_OnEraseControlPoints(*args, **kwargs)
-    def base_OnMoveLink(*args, **kwargs): return _ogl.PyDivisionShape_base_OnMoveLink(*args, **kwargs)
-    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyDivisionShape_base_OnSizingDragLeft(*args, **kwargs)
-    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyDivisionShape_base_OnSizingBeginDragLeft(*args, **kwargs)
-    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyDivisionShape_base_OnSizingEndDragLeft(*args, **kwargs)
-    def base_OnBeginSize(*args, **kwargs): return _ogl.PyDivisionShape_base_OnBeginSize(*args, **kwargs)
-    def base_OnEndSize(*args, **kwargs): return _ogl.PyDivisionShape_base_OnEndSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyDivisionShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyDivisionShape__setCallbackInfo(*args, **kwargs)
+
+    def AdjustBottom(*args, **kwargs):
+        """AdjustBottom(double bottom, bool test)"""
+        return _ogl.PyDivisionShape_AdjustBottom(*args, **kwargs)
+
+    def AdjustLeft(*args, **kwargs):
+        """AdjustLeft(double left, bool test)"""
+        return _ogl.PyDivisionShape_AdjustLeft(*args, **kwargs)
+
+    def AdjustRight(*args, **kwargs):
+        """AdjustRight(double right, bool test)"""
+        return _ogl.PyDivisionShape_AdjustRight(*args, **kwargs)
+
+    def AdjustTop(*args, **kwargs):
+        """AdjustTop(double top, bool test)"""
+        return _ogl.PyDivisionShape_AdjustTop(*args, **kwargs)
+
+    def Divide(*args, **kwargs):
+        """Divide(int direction)"""
+        return _ogl.PyDivisionShape_Divide(*args, **kwargs)
+
+    def EditEdge(*args, **kwargs):
+        """EditEdge(int side)"""
+        return _ogl.PyDivisionShape_EditEdge(*args, **kwargs)
+
+    def GetBottomSide(*args, **kwargs):
+        """GetBottomSide() -> PyDivisionShape"""
+        return _ogl.PyDivisionShape_GetBottomSide(*args, **kwargs)
+
+    def GetHandleSide(*args, **kwargs):
+        """GetHandleSide() -> int"""
+        return _ogl.PyDivisionShape_GetHandleSide(*args, **kwargs)
+
+    def GetLeftSide(*args, **kwargs):
+        """GetLeftSide() -> PyDivisionShape"""
+        return _ogl.PyDivisionShape_GetLeftSide(*args, **kwargs)
+
+    def GetLeftSideColour(*args, **kwargs):
+        """GetLeftSideColour() -> wxString"""
+        return _ogl.PyDivisionShape_GetLeftSideColour(*args, **kwargs)
+
+    def GetLeftSidePen(*args, **kwargs):
+        """GetLeftSidePen() -> wxPen"""
+        return _ogl.PyDivisionShape_GetLeftSidePen(*args, **kwargs)
+
+    def GetRightSide(*args, **kwargs):
+        """GetRightSide() -> PyDivisionShape"""
+        return _ogl.PyDivisionShape_GetRightSide(*args, **kwargs)
+
+    def GetTopSide(*args, **kwargs):
+        """GetTopSide() -> PyDivisionShape"""
+        return _ogl.PyDivisionShape_GetTopSide(*args, **kwargs)
+
+    def GetTopSidePen(*args, **kwargs):
+        """GetTopSidePen() -> wxPen"""
+        return _ogl.PyDivisionShape_GetTopSidePen(*args, **kwargs)
+
+    def ResizeAdjoining(*args, **kwargs):
+        """ResizeAdjoining(int side, double newPos, bool test)"""
+        return _ogl.PyDivisionShape_ResizeAdjoining(*args, **kwargs)
+
+    def PopupMenu(*args, **kwargs):
+        """PopupMenu(double x, double y)"""
+        return _ogl.PyDivisionShape_PopupMenu(*args, **kwargs)
+
+    def SetBottomSide(*args, **kwargs):
+        """SetBottomSide(PyDivisionShape shape)"""
+        return _ogl.PyDivisionShape_SetBottomSide(*args, **kwargs)
+
+    def SetHandleSide(*args, **kwargs):
+        """SetHandleSide(int side)"""
+        return _ogl.PyDivisionShape_SetHandleSide(*args, **kwargs)
+
+    def SetLeftSide(*args, **kwargs):
+        """SetLeftSide(PyDivisionShape shape)"""
+        return _ogl.PyDivisionShape_SetLeftSide(*args, **kwargs)
+
+    def SetLeftSideColour(*args, **kwargs):
+        """SetLeftSideColour(wxString colour)"""
+        return _ogl.PyDivisionShape_SetLeftSideColour(*args, **kwargs)
+
+    def SetLeftSidePen(*args, **kwargs):
+        """SetLeftSidePen(wxPen pen)"""
+        return _ogl.PyDivisionShape_SetLeftSidePen(*args, **kwargs)
+
+    def SetRightSide(*args, **kwargs):
+        """SetRightSide(PyDivisionShape shape)"""
+        return _ogl.PyDivisionShape_SetRightSide(*args, **kwargs)
+
+    def SetTopSide(*args, **kwargs):
+        """SetTopSide(PyDivisionShape shape)"""
+        return _ogl.PyDivisionShape_SetTopSide(*args, **kwargs)
+
+    def SetTopSideColour(*args, **kwargs):
+        """SetTopSideColour(wxString colour)"""
+        return _ogl.PyDivisionShape_SetTopSideColour(*args, **kwargs)
+
+    def SetTopSidePen(*args, **kwargs):
+        """SetTopSidePen(wxPen pen)"""
+        return _ogl.PyDivisionShape_SetTopSidePen(*args, **kwargs)
+
+    def base_OnDelete(*args, **kwargs):
+        """base_OnDelete()"""
+        return _ogl.PyDivisionShape_base_OnDelete(*args, **kwargs)
+
+    def base_OnDraw(*args, **kwargs):
+        """base_OnDraw(wxDC dc)"""
+        return _ogl.PyDivisionShape_base_OnDraw(*args, **kwargs)
+
+    def base_OnDrawContents(*args, **kwargs):
+        """base_OnDrawContents(wxDC dc)"""
+        return _ogl.PyDivisionShape_base_OnDrawContents(*args, **kwargs)
+
+    def base_OnDrawBranches(*args, **kwargs):
+        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        return _ogl.PyDivisionShape_base_OnDrawBranches(*args, **kwargs)
+
+    def base_OnMoveLinks(*args, **kwargs):
+        """base_OnMoveLinks(wxDC dc)"""
+        return _ogl.PyDivisionShape_base_OnMoveLinks(*args, **kwargs)
+
+    def base_OnErase(*args, **kwargs):
+        """base_OnErase(wxDC dc)"""
+        return _ogl.PyDivisionShape_base_OnErase(*args, **kwargs)
+
+    def base_OnEraseContents(*args, **kwargs):
+        """base_OnEraseContents(wxDC dc)"""
+        return _ogl.PyDivisionShape_base_OnEraseContents(*args, **kwargs)
+
+    def base_OnHighlight(*args, **kwargs):
+        """base_OnHighlight(wxDC dc)"""
+        return _ogl.PyDivisionShape_base_OnHighlight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDivisionShape_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnLeftDoubleClick(*args, **kwargs):
+        """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDivisionShape_base_OnLeftDoubleClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDivisionShape_base_OnRightClick(*args, **kwargs)
+
+    def base_OnSize(*args, **kwargs):
+        """base_OnSize(double x, double y)"""
+        return _ogl.PyDivisionShape_base_OnSize(*args, **kwargs)
+
+    def base_OnMovePre(*args, **kwargs):
+        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True) -> bool"""
+        return _ogl.PyDivisionShape_base_OnMovePre(*args, **kwargs)
+
+    def base_OnMovePost(*args, **kwargs):
+        """base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True)"""
+        return _ogl.PyDivisionShape_base_OnMovePost(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDivisionShape_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDivisionShape_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDivisionShape_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDivisionShape_base_OnDragRight(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDivisionShape_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyDivisionShape_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDrawOutline(*args, **kwargs):
+        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        return _ogl.PyDivisionShape_base_OnDrawOutline(*args, **kwargs)
+
+    def base_OnDrawControlPoints(*args, **kwargs):
+        """base_OnDrawControlPoints(wxDC dc)"""
+        return _ogl.PyDivisionShape_base_OnDrawControlPoints(*args, **kwargs)
+
+    def base_OnEraseControlPoints(*args, **kwargs):
+        """base_OnEraseControlPoints(wxDC dc)"""
+        return _ogl.PyDivisionShape_base_OnEraseControlPoints(*args, **kwargs)
+
+    def base_OnMoveLink(*args, **kwargs):
+        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        return _ogl.PyDivisionShape_base_OnMoveLink(*args, **kwargs)
+
+    def base_OnSizingDragLeft(*args, **kwargs):
+        """base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyDivisionShape_base_OnSizingDragLeft(*args, **kwargs)
+
+    def base_OnSizingBeginDragLeft(*args, **kwargs):
+        """base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyDivisionShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+
+    def base_OnSizingEndDragLeft(*args, **kwargs):
+        """base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyDivisionShape_base_OnSizingEndDragLeft(*args, **kwargs)
+
+    def base_OnBeginSize(*args, **kwargs):
+        """base_OnBeginSize(double w, double h)"""
+        return _ogl.PyDivisionShape_base_OnBeginSize(*args, **kwargs)
+
+    def base_OnEndSize(*args, **kwargs):
+        """base_OnEndSize(double w, double h)"""
+        return _ogl.PyDivisionShape_base_OnEndSize(*args, **kwargs)
+
 
 class PyDivisionShapePtr(PyDivisionShape):
     def __init__(self, this):
@@ -783,43 +2536,138 @@ class PyDivisionShapePtr(PyDivisionShape):
 _ogl.PyDivisionShape_swigregister(PyDivisionShapePtr)
 
 class PyEllipseShape(PyShape):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyEllipseShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(double width=0.0, double height=0.0) -> PyEllipseShape"""
         newobj = _ogl.new_PyEllipseShape(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORandCallbackInfo(PyEllipseShape)
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyEllipseShape__setCallbackInfo(*args, **kwargs)
-    def base_OnDraw(*args, **kwargs): return _ogl.PyEllipseShape_base_OnDraw(*args, **kwargs)
-    def base_OnDrawContents(*args, **kwargs): return _ogl.PyEllipseShape_base_OnDrawContents(*args, **kwargs)
-    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyEllipseShape_base_OnDrawBranches(*args, **kwargs)
-    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyEllipseShape_base_OnMoveLinks(*args, **kwargs)
-    def base_OnErase(*args, **kwargs): return _ogl.PyEllipseShape_base_OnErase(*args, **kwargs)
-    def base_OnEraseContents(*args, **kwargs): return _ogl.PyEllipseShape_base_OnEraseContents(*args, **kwargs)
-    def base_OnHighlight(*args, **kwargs): return _ogl.PyEllipseShape_base_OnHighlight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyEllipseShape_base_OnLeftClick(*args, **kwargs)
-    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyEllipseShape_base_OnLeftDoubleClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyEllipseShape_base_OnRightClick(*args, **kwargs)
-    def base_OnSize(*args, **kwargs): return _ogl.PyEllipseShape_base_OnSize(*args, **kwargs)
-    def base_OnMovePre(*args, **kwargs): return _ogl.PyEllipseShape_base_OnMovePre(*args, **kwargs)
-    def base_OnMovePost(*args, **kwargs): return _ogl.PyEllipseShape_base_OnMovePost(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyEllipseShape_base_OnDragLeft(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyEllipseShape_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyEllipseShape_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyEllipseShape_base_OnDragRight(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyEllipseShape_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyEllipseShape_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyEllipseShape_base_OnDrawOutline(*args, **kwargs)
-    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyEllipseShape_base_OnDrawControlPoints(*args, **kwargs)
-    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyEllipseShape_base_OnEraseControlPoints(*args, **kwargs)
-    def base_OnMoveLink(*args, **kwargs): return _ogl.PyEllipseShape_base_OnMoveLink(*args, **kwargs)
-    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyEllipseShape_base_OnSizingDragLeft(*args, **kwargs)
-    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyEllipseShape_base_OnSizingBeginDragLeft(*args, **kwargs)
-    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyEllipseShape_base_OnSizingEndDragLeft(*args, **kwargs)
-    def base_OnBeginSize(*args, **kwargs): return _ogl.PyEllipseShape_base_OnBeginSize(*args, **kwargs)
-    def base_OnEndSize(*args, **kwargs): return _ogl.PyEllipseShape_base_OnEndSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyEllipseShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyEllipseShape__setCallbackInfo(*args, **kwargs)
+
+    def base_OnDraw(*args, **kwargs):
+        """base_OnDraw(wxDC dc)"""
+        return _ogl.PyEllipseShape_base_OnDraw(*args, **kwargs)
+
+    def base_OnDrawContents(*args, **kwargs):
+        """base_OnDrawContents(wxDC dc)"""
+        return _ogl.PyEllipseShape_base_OnDrawContents(*args, **kwargs)
+
+    def base_OnDrawBranches(*args, **kwargs):
+        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        return _ogl.PyEllipseShape_base_OnDrawBranches(*args, **kwargs)
+
+    def base_OnMoveLinks(*args, **kwargs):
+        """base_OnMoveLinks(wxDC dc)"""
+        return _ogl.PyEllipseShape_base_OnMoveLinks(*args, **kwargs)
+
+    def base_OnErase(*args, **kwargs):
+        """base_OnErase(wxDC dc)"""
+        return _ogl.PyEllipseShape_base_OnErase(*args, **kwargs)
+
+    def base_OnEraseContents(*args, **kwargs):
+        """base_OnEraseContents(wxDC dc)"""
+        return _ogl.PyEllipseShape_base_OnEraseContents(*args, **kwargs)
+
+    def base_OnHighlight(*args, **kwargs):
+        """base_OnHighlight(wxDC dc)"""
+        return _ogl.PyEllipseShape_base_OnHighlight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyEllipseShape_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnLeftDoubleClick(*args, **kwargs):
+        """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyEllipseShape_base_OnLeftDoubleClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyEllipseShape_base_OnRightClick(*args, **kwargs)
+
+    def base_OnSize(*args, **kwargs):
+        """base_OnSize(double x, double y)"""
+        return _ogl.PyEllipseShape_base_OnSize(*args, **kwargs)
+
+    def base_OnMovePre(*args, **kwargs):
+        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True) -> bool"""
+        return _ogl.PyEllipseShape_base_OnMovePre(*args, **kwargs)
+
+    def base_OnMovePost(*args, **kwargs):
+        """base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True)"""
+        return _ogl.PyEllipseShape_base_OnMovePost(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyEllipseShape_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyEllipseShape_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyEllipseShape_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyEllipseShape_base_OnDragRight(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyEllipseShape_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyEllipseShape_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDrawOutline(*args, **kwargs):
+        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        return _ogl.PyEllipseShape_base_OnDrawOutline(*args, **kwargs)
+
+    def base_OnDrawControlPoints(*args, **kwargs):
+        """base_OnDrawControlPoints(wxDC dc)"""
+        return _ogl.PyEllipseShape_base_OnDrawControlPoints(*args, **kwargs)
+
+    def base_OnEraseControlPoints(*args, **kwargs):
+        """base_OnEraseControlPoints(wxDC dc)"""
+        return _ogl.PyEllipseShape_base_OnEraseControlPoints(*args, **kwargs)
+
+    def base_OnMoveLink(*args, **kwargs):
+        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        return _ogl.PyEllipseShape_base_OnMoveLink(*args, **kwargs)
+
+    def base_OnSizingDragLeft(*args, **kwargs):
+        """base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyEllipseShape_base_OnSizingDragLeft(*args, **kwargs)
+
+    def base_OnSizingBeginDragLeft(*args, **kwargs):
+        """base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyEllipseShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+
+    def base_OnSizingEndDragLeft(*args, **kwargs):
+        """base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyEllipseShape_base_OnSizingEndDragLeft(*args, **kwargs)
+
+    def base_OnBeginSize(*args, **kwargs):
+        """base_OnBeginSize(double w, double h)"""
+        return _ogl.PyEllipseShape_base_OnBeginSize(*args, **kwargs)
+
+    def base_OnEndSize(*args, **kwargs):
+        """base_OnEndSize(double w, double h)"""
+        return _ogl.PyEllipseShape_base_OnEndSize(*args, **kwargs)
+
 
 class PyEllipseShapePtr(PyEllipseShape):
     def __init__(self, this):
@@ -829,43 +2677,138 @@ class PyEllipseShapePtr(PyEllipseShape):
 _ogl.PyEllipseShape_swigregister(PyEllipseShapePtr)
 
 class PyCircleShape(PyEllipseShape):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyCircleShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(double width=0.0) -> PyCircleShape"""
         newobj = _ogl.new_PyCircleShape(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORandCallbackInfo(PyCircleShape)
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyCircleShape__setCallbackInfo(*args, **kwargs)
-    def base_OnDraw(*args, **kwargs): return _ogl.PyCircleShape_base_OnDraw(*args, **kwargs)
-    def base_OnDrawContents(*args, **kwargs): return _ogl.PyCircleShape_base_OnDrawContents(*args, **kwargs)
-    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyCircleShape_base_OnDrawBranches(*args, **kwargs)
-    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyCircleShape_base_OnMoveLinks(*args, **kwargs)
-    def base_OnErase(*args, **kwargs): return _ogl.PyCircleShape_base_OnErase(*args, **kwargs)
-    def base_OnEraseContents(*args, **kwargs): return _ogl.PyCircleShape_base_OnEraseContents(*args, **kwargs)
-    def base_OnHighlight(*args, **kwargs): return _ogl.PyCircleShape_base_OnHighlight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyCircleShape_base_OnLeftClick(*args, **kwargs)
-    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyCircleShape_base_OnLeftDoubleClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyCircleShape_base_OnRightClick(*args, **kwargs)
-    def base_OnSize(*args, **kwargs): return _ogl.PyCircleShape_base_OnSize(*args, **kwargs)
-    def base_OnMovePre(*args, **kwargs): return _ogl.PyCircleShape_base_OnMovePre(*args, **kwargs)
-    def base_OnMovePost(*args, **kwargs): return _ogl.PyCircleShape_base_OnMovePost(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyCircleShape_base_OnDragLeft(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyCircleShape_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyCircleShape_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyCircleShape_base_OnDragRight(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyCircleShape_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyCircleShape_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyCircleShape_base_OnDrawOutline(*args, **kwargs)
-    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyCircleShape_base_OnDrawControlPoints(*args, **kwargs)
-    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyCircleShape_base_OnEraseControlPoints(*args, **kwargs)
-    def base_OnMoveLink(*args, **kwargs): return _ogl.PyCircleShape_base_OnMoveLink(*args, **kwargs)
-    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyCircleShape_base_OnSizingDragLeft(*args, **kwargs)
-    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyCircleShape_base_OnSizingBeginDragLeft(*args, **kwargs)
-    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyCircleShape_base_OnSizingEndDragLeft(*args, **kwargs)
-    def base_OnBeginSize(*args, **kwargs): return _ogl.PyCircleShape_base_OnBeginSize(*args, **kwargs)
-    def base_OnEndSize(*args, **kwargs): return _ogl.PyCircleShape_base_OnEndSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyCircleShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyCircleShape__setCallbackInfo(*args, **kwargs)
+
+    def base_OnDraw(*args, **kwargs):
+        """base_OnDraw(wxDC dc)"""
+        return _ogl.PyCircleShape_base_OnDraw(*args, **kwargs)
+
+    def base_OnDrawContents(*args, **kwargs):
+        """base_OnDrawContents(wxDC dc)"""
+        return _ogl.PyCircleShape_base_OnDrawContents(*args, **kwargs)
+
+    def base_OnDrawBranches(*args, **kwargs):
+        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        return _ogl.PyCircleShape_base_OnDrawBranches(*args, **kwargs)
+
+    def base_OnMoveLinks(*args, **kwargs):
+        """base_OnMoveLinks(wxDC dc)"""
+        return _ogl.PyCircleShape_base_OnMoveLinks(*args, **kwargs)
+
+    def base_OnErase(*args, **kwargs):
+        """base_OnErase(wxDC dc)"""
+        return _ogl.PyCircleShape_base_OnErase(*args, **kwargs)
+
+    def base_OnEraseContents(*args, **kwargs):
+        """base_OnEraseContents(wxDC dc)"""
+        return _ogl.PyCircleShape_base_OnEraseContents(*args, **kwargs)
+
+    def base_OnHighlight(*args, **kwargs):
+        """base_OnHighlight(wxDC dc)"""
+        return _ogl.PyCircleShape_base_OnHighlight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCircleShape_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnLeftDoubleClick(*args, **kwargs):
+        """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCircleShape_base_OnLeftDoubleClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCircleShape_base_OnRightClick(*args, **kwargs)
+
+    def base_OnSize(*args, **kwargs):
+        """base_OnSize(double x, double y)"""
+        return _ogl.PyCircleShape_base_OnSize(*args, **kwargs)
+
+    def base_OnMovePre(*args, **kwargs):
+        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True) -> bool"""
+        return _ogl.PyCircleShape_base_OnMovePre(*args, **kwargs)
+
+    def base_OnMovePost(*args, **kwargs):
+        """base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True)"""
+        return _ogl.PyCircleShape_base_OnMovePost(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCircleShape_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCircleShape_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCircleShape_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCircleShape_base_OnDragRight(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCircleShape_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyCircleShape_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDrawOutline(*args, **kwargs):
+        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        return _ogl.PyCircleShape_base_OnDrawOutline(*args, **kwargs)
+
+    def base_OnDrawControlPoints(*args, **kwargs):
+        """base_OnDrawControlPoints(wxDC dc)"""
+        return _ogl.PyCircleShape_base_OnDrawControlPoints(*args, **kwargs)
+
+    def base_OnEraseControlPoints(*args, **kwargs):
+        """base_OnEraseControlPoints(wxDC dc)"""
+        return _ogl.PyCircleShape_base_OnEraseControlPoints(*args, **kwargs)
+
+    def base_OnMoveLink(*args, **kwargs):
+        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        return _ogl.PyCircleShape_base_OnMoveLink(*args, **kwargs)
+
+    def base_OnSizingDragLeft(*args, **kwargs):
+        """base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyCircleShape_base_OnSizingDragLeft(*args, **kwargs)
+
+    def base_OnSizingBeginDragLeft(*args, **kwargs):
+        """base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyCircleShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+
+    def base_OnSizingEndDragLeft(*args, **kwargs):
+        """base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyCircleShape_base_OnSizingEndDragLeft(*args, **kwargs)
+
+    def base_OnBeginSize(*args, **kwargs):
+        """base_OnBeginSize(double w, double h)"""
+        return _ogl.PyCircleShape_base_OnBeginSize(*args, **kwargs)
+
+    def base_OnEndSize(*args, **kwargs):
+        """base_OnEndSize(double w, double h)"""
+        return _ogl.PyCircleShape_base_OnEndSize(*args, **kwargs)
+
 
 class PyCircleShapePtr(PyCircleShape):
     def __init__(self, this):
@@ -875,33 +2818,87 @@ class PyCircleShapePtr(PyCircleShape):
 _ogl.PyCircleShape_swigregister(PyCircleShapePtr)
 
 class ArrowHead(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxArrowHead instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int type=0, int end=0, double size=0.0, double dist=0.0, 
+    wxString name=wxPyEmptyString, PseudoMetaFile mf=None, 
+    long arrowId=-1) -> ArrowHead"""
         newobj = _ogl.new_ArrowHead(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_ogl.delete_ArrowHead):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def _GetType(*args, **kwargs): return _ogl.ArrowHead__GetType(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _ogl.ArrowHead_GetPosition(*args, **kwargs)
-    def SetPosition(*args, **kwargs): return _ogl.ArrowHead_SetPosition(*args, **kwargs)
-    def GetXOffset(*args, **kwargs): return _ogl.ArrowHead_GetXOffset(*args, **kwargs)
-    def GetYOffset(*args, **kwargs): return _ogl.ArrowHead_GetYOffset(*args, **kwargs)
-    def GetSpacing(*args, **kwargs): return _ogl.ArrowHead_GetSpacing(*args, **kwargs)
-    def GetSize(*args, **kwargs): return _ogl.ArrowHead_GetSize(*args, **kwargs)
-    def GetName(*args, **kwargs): return _ogl.ArrowHead_GetName(*args, **kwargs)
-    def SetXOffset(*args, **kwargs): return _ogl.ArrowHead_SetXOffset(*args, **kwargs)
-    def SetYOffset(*args, **kwargs): return _ogl.ArrowHead_SetYOffset(*args, **kwargs)
-    def GetMetaFile(*args, **kwargs): return _ogl.ArrowHead_GetMetaFile(*args, **kwargs)
-    def GetId(*args, **kwargs): return _ogl.ArrowHead_GetId(*args, **kwargs)
-    def GetArrowEnd(*args, **kwargs): return _ogl.ArrowHead_GetArrowEnd(*args, **kwargs)
-    def GetArrowSize(*args, **kwargs): return _ogl.ArrowHead_GetArrowSize(*args, **kwargs)
-    def SetSize(*args, **kwargs): return _ogl.ArrowHead_SetSize(*args, **kwargs)
-    def SetSpacing(*args, **kwargs): return _ogl.ArrowHead_SetSpacing(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxArrowHead instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _GetType(*args, **kwargs):
+        """_GetType() -> int"""
+        return _ogl.ArrowHead__GetType(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> int"""
+        return _ogl.ArrowHead_GetPosition(*args, **kwargs)
+
+    def SetPosition(*args, **kwargs):
+        """SetPosition(int pos)"""
+        return _ogl.ArrowHead_SetPosition(*args, **kwargs)
+
+    def GetXOffset(*args, **kwargs):
+        """GetXOffset() -> double"""
+        return _ogl.ArrowHead_GetXOffset(*args, **kwargs)
+
+    def GetYOffset(*args, **kwargs):
+        """GetYOffset() -> double"""
+        return _ogl.ArrowHead_GetYOffset(*args, **kwargs)
+
+    def GetSpacing(*args, **kwargs):
+        """GetSpacing() -> double"""
+        return _ogl.ArrowHead_GetSpacing(*args, **kwargs)
+
+    def GetSize(*args, **kwargs):
+        """GetSize() -> double"""
+        return _ogl.ArrowHead_GetSize(*args, **kwargs)
+
+    def GetName(*args, **kwargs):
+        """GetName() -> wxString"""
+        return _ogl.ArrowHead_GetName(*args, **kwargs)
+
+    def SetXOffset(*args, **kwargs):
+        """SetXOffset(double x)"""
+        return _ogl.ArrowHead_SetXOffset(*args, **kwargs)
+
+    def SetYOffset(*args, **kwargs):
+        """SetYOffset(double y)"""
+        return _ogl.ArrowHead_SetYOffset(*args, **kwargs)
+
+    def GetMetaFile(*args, **kwargs):
+        """GetMetaFile() -> PseudoMetaFile"""
+        return _ogl.ArrowHead_GetMetaFile(*args, **kwargs)
+
+    def GetId(*args, **kwargs):
+        """GetId() -> long"""
+        return _ogl.ArrowHead_GetId(*args, **kwargs)
+
+    def GetArrowEnd(*args, **kwargs):
+        """GetArrowEnd() -> int"""
+        return _ogl.ArrowHead_GetArrowEnd(*args, **kwargs)
+
+    def GetArrowSize(*args, **kwargs):
+        """GetArrowSize() -> double"""
+        return _ogl.ArrowHead_GetArrowSize(*args, **kwargs)
+
+    def SetSize(*args, **kwargs):
+        """SetSize(double size)"""
+        return _ogl.ArrowHead_SetSize(*args, **kwargs)
+
+    def SetSpacing(*args, **kwargs):
+        """SetSpacing(double sp)"""
+        return _ogl.ArrowHead_SetSpacing(*args, **kwargs)
+
 
 class ArrowHeadPtr(ArrowHead):
     def __init__(self, this):
@@ -911,83 +2908,300 @@ class ArrowHeadPtr(ArrowHead):
 _ogl.ArrowHead_swigregister(ArrowHeadPtr)
 
 class PyLineShape(PyShape):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyLineShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PyLineShape"""
         newobj = _ogl.new_PyLineShape(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORandCallbackInfo(PyLineShape)
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyLineShape__setCallbackInfo(*args, **kwargs)
-    def AddArrow(*args, **kwargs): return _ogl.PyLineShape_AddArrow(*args, **kwargs)
-    def AddArrowOrdered(*args, **kwargs): return _ogl.PyLineShape_AddArrowOrdered(*args, **kwargs)
-    def ClearArrow(*args, **kwargs): return _ogl.PyLineShape_ClearArrow(*args, **kwargs)
-    def ClearArrowsAtPosition(*args, **kwargs): return _ogl.PyLineShape_ClearArrowsAtPosition(*args, **kwargs)
-    def DrawArrow(*args, **kwargs): return _ogl.PyLineShape_DrawArrow(*args, **kwargs)
-    def DeleteArrowHeadId(*args, **kwargs): return _ogl.PyLineShape_DeleteArrowHeadId(*args, **kwargs)
-    def DeleteArrowHead(*args, **kwargs): return _ogl.PyLineShape_DeleteArrowHead(*args, **kwargs)
-    def DeleteLineControlPoint(*args, **kwargs): return _ogl.PyLineShape_DeleteLineControlPoint(*args, **kwargs)
-    def DrawArrows(*args, **kwargs): return _ogl.PyLineShape_DrawArrows(*args, **kwargs)
-    def DrawRegion(*args, **kwargs): return _ogl.PyLineShape_DrawRegion(*args, **kwargs)
-    def EraseRegion(*args, **kwargs): return _ogl.PyLineShape_EraseRegion(*args, **kwargs)
-    def FindArrowHeadId(*args, **kwargs): return _ogl.PyLineShape_FindArrowHeadId(*args, **kwargs)
-    def FindArrowHead(*args, **kwargs): return _ogl.PyLineShape_FindArrowHead(*args, **kwargs)
-    def FindLineEndPoints(*args, **kwargs): return _ogl.PyLineShape_FindLineEndPoints(*args, **kwargs)
-    def FindLinePosition(*args, **kwargs): return _ogl.PyLineShape_FindLinePosition(*args, **kwargs)
-    def FindMinimumWidth(*args, **kwargs): return _ogl.PyLineShape_FindMinimumWidth(*args, **kwargs)
-    def FindNth(*args, **kwargs): return _ogl.PyLineShape_FindNth(*args, **kwargs)
-    def GetAttachmentFrom(*args, **kwargs): return _ogl.PyLineShape_GetAttachmentFrom(*args, **kwargs)
-    def GetAttachmentTo(*args, **kwargs): return _ogl.PyLineShape_GetAttachmentTo(*args, **kwargs)
-    def GetEnds(*args, **kwargs): return _ogl.PyLineShape_GetEnds(*args, **kwargs)
-    def GetFrom(*args, **kwargs): return _ogl.PyLineShape_GetFrom(*args, **kwargs)
-    def GetLabelPosition(*args, **kwargs): return _ogl.PyLineShape_GetLabelPosition(*args, **kwargs)
-    def GetNextControlPoint(*args, **kwargs): return _ogl.PyLineShape_GetNextControlPoint(*args, **kwargs)
-    def GetTo(*args, **kwargs): return _ogl.PyLineShape_GetTo(*args, **kwargs)
-    def Initialise(*args, **kwargs): return _ogl.PyLineShape_Initialise(*args, **kwargs)
-    def InsertLineControlPoint(*args, **kwargs): return _ogl.PyLineShape_InsertLineControlPoint(*args, **kwargs)
-    def IsEnd(*args, **kwargs): return _ogl.PyLineShape_IsEnd(*args, **kwargs)
-    def IsSpline(*args, **kwargs): return _ogl.PyLineShape_IsSpline(*args, **kwargs)
-    def MakeLineControlPoints(*args, **kwargs): return _ogl.PyLineShape_MakeLineControlPoints(*args, **kwargs)
-    def GetLineControlPoints(*args, **kwargs): return _ogl.PyLineShape_GetLineControlPoints(*args, **kwargs)
-    def SetAttachmentFrom(*args, **kwargs): return _ogl.PyLineShape_SetAttachmentFrom(*args, **kwargs)
-    def SetAttachments(*args, **kwargs): return _ogl.PyLineShape_SetAttachments(*args, **kwargs)
-    def SetAttachmentTo(*args, **kwargs): return _ogl.PyLineShape_SetAttachmentTo(*args, **kwargs)
-    def SetEnds(*args, **kwargs): return _ogl.PyLineShape_SetEnds(*args, **kwargs)
-    def SetFrom(*args, **kwargs): return _ogl.PyLineShape_SetFrom(*args, **kwargs)
-    def SetIgnoreOffsets(*args, **kwargs): return _ogl.PyLineShape_SetIgnoreOffsets(*args, **kwargs)
-    def SetSpline(*args, **kwargs): return _ogl.PyLineShape_SetSpline(*args, **kwargs)
-    def SetTo(*args, **kwargs): return _ogl.PyLineShape_SetTo(*args, **kwargs)
-    def Straighten(*args, **kwargs): return _ogl.PyLineShape_Straighten(*args, **kwargs)
-    def Unlink(*args, **kwargs): return _ogl.PyLineShape_Unlink(*args, **kwargs)
-    def base_OnDraw(*args, **kwargs): return _ogl.PyLineShape_base_OnDraw(*args, **kwargs)
-    def base_OnDrawContents(*args, **kwargs): return _ogl.PyLineShape_base_OnDrawContents(*args, **kwargs)
-    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyLineShape_base_OnDrawBranches(*args, **kwargs)
-    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyLineShape_base_OnMoveLinks(*args, **kwargs)
-    def base_OnErase(*args, **kwargs): return _ogl.PyLineShape_base_OnErase(*args, **kwargs)
-    def base_OnEraseContents(*args, **kwargs): return _ogl.PyLineShape_base_OnEraseContents(*args, **kwargs)
-    def base_OnHighlight(*args, **kwargs): return _ogl.PyLineShape_base_OnHighlight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyLineShape_base_OnLeftClick(*args, **kwargs)
-    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyLineShape_base_OnLeftDoubleClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyLineShape_base_OnRightClick(*args, **kwargs)
-    def base_OnSize(*args, **kwargs): return _ogl.PyLineShape_base_OnSize(*args, **kwargs)
-    def base_OnMovePre(*args, **kwargs): return _ogl.PyLineShape_base_OnMovePre(*args, **kwargs)
-    def base_OnMovePost(*args, **kwargs): return _ogl.PyLineShape_base_OnMovePost(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyLineShape_base_OnDragLeft(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyLineShape_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyLineShape_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyLineShape_base_OnDragRight(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyLineShape_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyLineShape_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyLineShape_base_OnDrawOutline(*args, **kwargs)
-    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyLineShape_base_OnDrawControlPoints(*args, **kwargs)
-    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyLineShape_base_OnEraseControlPoints(*args, **kwargs)
-    def base_OnMoveLink(*args, **kwargs): return _ogl.PyLineShape_base_OnMoveLink(*args, **kwargs)
-    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyLineShape_base_OnSizingDragLeft(*args, **kwargs)
-    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyLineShape_base_OnSizingBeginDragLeft(*args, **kwargs)
-    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyLineShape_base_OnSizingEndDragLeft(*args, **kwargs)
-    def base_OnBeginSize(*args, **kwargs): return _ogl.PyLineShape_base_OnBeginSize(*args, **kwargs)
-    def base_OnEndSize(*args, **kwargs): return _ogl.PyLineShape_base_OnEndSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyLineShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyLineShape__setCallbackInfo(*args, **kwargs)
+
+    def AddArrow(*args, **kwargs):
+        """AddArrow(int type, int end=ARROW_POSITION_END, double arrowSize=10.0, 
+    double xOffset=0.0, wxString name=wxPyEmptyString, 
+    PseudoMetaFile mf=None, long arrowId=-1)"""
+        return _ogl.PyLineShape_AddArrow(*args, **kwargs)
+
+    def AddArrowOrdered(*args, **kwargs):
+        """AddArrowOrdered(ArrowHead arrow, PyObject referenceList, int end)"""
+        return _ogl.PyLineShape_AddArrowOrdered(*args, **kwargs)
+
+    def ClearArrow(*args, **kwargs):
+        """ClearArrow(wxString name) -> bool"""
+        return _ogl.PyLineShape_ClearArrow(*args, **kwargs)
+
+    def ClearArrowsAtPosition(*args, **kwargs):
+        """ClearArrowsAtPosition(int position=-1)"""
+        return _ogl.PyLineShape_ClearArrowsAtPosition(*args, **kwargs)
+
+    def DrawArrow(*args, **kwargs):
+        """DrawArrow(wxDC dc, ArrowHead arrow, double xOffset, bool proportionalOffset)"""
+        return _ogl.PyLineShape_DrawArrow(*args, **kwargs)
+
+    def DeleteArrowHeadId(*args, **kwargs):
+        """DeleteArrowHeadId(long arrowId) -> bool"""
+        return _ogl.PyLineShape_DeleteArrowHeadId(*args, **kwargs)
+
+    def DeleteArrowHead(*args, **kwargs):
+        """DeleteArrowHead(int position, wxString name) -> bool"""
+        return _ogl.PyLineShape_DeleteArrowHead(*args, **kwargs)
+
+    def DeleteLineControlPoint(*args, **kwargs):
+        """DeleteLineControlPoint() -> bool"""
+        return _ogl.PyLineShape_DeleteLineControlPoint(*args, **kwargs)
+
+    def DrawArrows(*args, **kwargs):
+        """DrawArrows(wxDC dc)"""
+        return _ogl.PyLineShape_DrawArrows(*args, **kwargs)
+
+    def DrawRegion(*args, **kwargs):
+        """DrawRegion(wxDC dc, ShapeRegion region, double x, double y)"""
+        return _ogl.PyLineShape_DrawRegion(*args, **kwargs)
+
+    def EraseRegion(*args, **kwargs):
+        """EraseRegion(wxDC dc, ShapeRegion region, double x, double y)"""
+        return _ogl.PyLineShape_EraseRegion(*args, **kwargs)
+
+    def FindArrowHeadId(*args, **kwargs):
+        """FindArrowHeadId(long arrowId) -> ArrowHead"""
+        return _ogl.PyLineShape_FindArrowHeadId(*args, **kwargs)
+
+    def FindArrowHead(*args, **kwargs):
+        """FindArrowHead(int position, wxString name) -> ArrowHead"""
+        return _ogl.PyLineShape_FindArrowHead(*args, **kwargs)
+
+    def FindLineEndPoints(*args, **kwargs):
+        """FindLineEndPoints(double OUTPUT, double OUTPUT, double OUTPUT, double OUTPUT)"""
+        return _ogl.PyLineShape_FindLineEndPoints(*args, **kwargs)
+
+    def FindLinePosition(*args, **kwargs):
+        """FindLinePosition(double x, double y) -> int"""
+        return _ogl.PyLineShape_FindLinePosition(*args, **kwargs)
+
+    def FindMinimumWidth(*args, **kwargs):
+        """FindMinimumWidth() -> double"""
+        return _ogl.PyLineShape_FindMinimumWidth(*args, **kwargs)
+
+    def FindNth(*args, **kwargs):
+        """FindNth(PyShape image, int OUTPUT, int OUTPUT, bool incoming)"""
+        return _ogl.PyLineShape_FindNth(*args, **kwargs)
+
+    def GetAttachmentFrom(*args, **kwargs):
+        """GetAttachmentFrom() -> int"""
+        return _ogl.PyLineShape_GetAttachmentFrom(*args, **kwargs)
+
+    def GetAttachmentTo(*args, **kwargs):
+        """GetAttachmentTo() -> int"""
+        return _ogl.PyLineShape_GetAttachmentTo(*args, **kwargs)
+
+    def GetEnds(*args, **kwargs):
+        """GetEnds(double OUTPUT, double OUTPUT, double OUTPUT, double OUTPUT)"""
+        return _ogl.PyLineShape_GetEnds(*args, **kwargs)
+
+    def GetFrom(*args, **kwargs):
+        """GetFrom() -> PyShape"""
+        return _ogl.PyLineShape_GetFrom(*args, **kwargs)
+
+    def GetLabelPosition(*args, **kwargs):
+        """GetLabelPosition(int position, double OUTPUT, double OUTPUT)"""
+        return _ogl.PyLineShape_GetLabelPosition(*args, **kwargs)
+
+    def GetNextControlPoint(*args, **kwargs):
+        """GetNextControlPoint(PyShape shape) -> RealPoint"""
+        return _ogl.PyLineShape_GetNextControlPoint(*args, **kwargs)
+
+    def GetTo(*args, **kwargs):
+        """GetTo() -> PyShape"""
+        return _ogl.PyLineShape_GetTo(*args, **kwargs)
+
+    def Initialise(*args, **kwargs):
+        """Initialise()"""
+        return _ogl.PyLineShape_Initialise(*args, **kwargs)
+
+    def InsertLineControlPoint(*args, **kwargs):
+        """InsertLineControlPoint(wxDC dc)"""
+        return _ogl.PyLineShape_InsertLineControlPoint(*args, **kwargs)
+
+    def IsEnd(*args, **kwargs):
+        """IsEnd(PyShape shape) -> bool"""
+        return _ogl.PyLineShape_IsEnd(*args, **kwargs)
+
+    def IsSpline(*args, **kwargs):
+        """IsSpline() -> bool"""
+        return _ogl.PyLineShape_IsSpline(*args, **kwargs)
+
+    def MakeLineControlPoints(*args, **kwargs):
+        """MakeLineControlPoints(int n)"""
+        return _ogl.PyLineShape_MakeLineControlPoints(*args, **kwargs)
+
+    def GetLineControlPoints(*args, **kwargs):
+        """GetLineControlPoints() -> PyObject"""
+        return _ogl.PyLineShape_GetLineControlPoints(*args, **kwargs)
+
+    def SetAttachmentFrom(*args, **kwargs):
+        """SetAttachmentFrom(int fromAttach)"""
+        return _ogl.PyLineShape_SetAttachmentFrom(*args, **kwargs)
+
+    def SetAttachments(*args, **kwargs):
+        """SetAttachments(int fromAttach, int toAttach)"""
+        return _ogl.PyLineShape_SetAttachments(*args, **kwargs)
+
+    def SetAttachmentTo(*args, **kwargs):
+        """SetAttachmentTo(int toAttach)"""
+        return _ogl.PyLineShape_SetAttachmentTo(*args, **kwargs)
+
+    def SetEnds(*args, **kwargs):
+        """SetEnds(double x1, double y1, double x2, double y2)"""
+        return _ogl.PyLineShape_SetEnds(*args, **kwargs)
+
+    def SetFrom(*args, **kwargs):
+        """SetFrom(PyShape object)"""
+        return _ogl.PyLineShape_SetFrom(*args, **kwargs)
+
+    def SetIgnoreOffsets(*args, **kwargs):
+        """SetIgnoreOffsets(bool ignore)"""
+        return _ogl.PyLineShape_SetIgnoreOffsets(*args, **kwargs)
+
+    def SetSpline(*args, **kwargs):
+        """SetSpline(bool spline)"""
+        return _ogl.PyLineShape_SetSpline(*args, **kwargs)
+
+    def SetTo(*args, **kwargs):
+        """SetTo(PyShape object)"""
+        return _ogl.PyLineShape_SetTo(*args, **kwargs)
+
+    def Straighten(*args, **kwargs):
+        """Straighten(wxDC dc=None)"""
+        return _ogl.PyLineShape_Straighten(*args, **kwargs)
+
+    def Unlink(*args, **kwargs):
+        """Unlink()"""
+        return _ogl.PyLineShape_Unlink(*args, **kwargs)
+
+    def base_OnDraw(*args, **kwargs):
+        """base_OnDraw(wxDC dc)"""
+        return _ogl.PyLineShape_base_OnDraw(*args, **kwargs)
+
+    def base_OnDrawContents(*args, **kwargs):
+        """base_OnDrawContents(wxDC dc)"""
+        return _ogl.PyLineShape_base_OnDrawContents(*args, **kwargs)
+
+    def base_OnDrawBranches(*args, **kwargs):
+        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        return _ogl.PyLineShape_base_OnDrawBranches(*args, **kwargs)
+
+    def base_OnMoveLinks(*args, **kwargs):
+        """base_OnMoveLinks(wxDC dc)"""
+        return _ogl.PyLineShape_base_OnMoveLinks(*args, **kwargs)
+
+    def base_OnErase(*args, **kwargs):
+        """base_OnErase(wxDC dc)"""
+        return _ogl.PyLineShape_base_OnErase(*args, **kwargs)
+
+    def base_OnEraseContents(*args, **kwargs):
+        """base_OnEraseContents(wxDC dc)"""
+        return _ogl.PyLineShape_base_OnEraseContents(*args, **kwargs)
+
+    def base_OnHighlight(*args, **kwargs):
+        """base_OnHighlight(wxDC dc)"""
+        return _ogl.PyLineShape_base_OnHighlight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyLineShape_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnLeftDoubleClick(*args, **kwargs):
+        """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyLineShape_base_OnLeftDoubleClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyLineShape_base_OnRightClick(*args, **kwargs)
+
+    def base_OnSize(*args, **kwargs):
+        """base_OnSize(double x, double y)"""
+        return _ogl.PyLineShape_base_OnSize(*args, **kwargs)
+
+    def base_OnMovePre(*args, **kwargs):
+        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True) -> bool"""
+        return _ogl.PyLineShape_base_OnMovePre(*args, **kwargs)
+
+    def base_OnMovePost(*args, **kwargs):
+        """base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True)"""
+        return _ogl.PyLineShape_base_OnMovePost(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyLineShape_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyLineShape_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyLineShape_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyLineShape_base_OnDragRight(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyLineShape_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyLineShape_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDrawOutline(*args, **kwargs):
+        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        return _ogl.PyLineShape_base_OnDrawOutline(*args, **kwargs)
+
+    def base_OnDrawControlPoints(*args, **kwargs):
+        """base_OnDrawControlPoints(wxDC dc)"""
+        return _ogl.PyLineShape_base_OnDrawControlPoints(*args, **kwargs)
+
+    def base_OnEraseControlPoints(*args, **kwargs):
+        """base_OnEraseControlPoints(wxDC dc)"""
+        return _ogl.PyLineShape_base_OnEraseControlPoints(*args, **kwargs)
+
+    def base_OnMoveLink(*args, **kwargs):
+        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        return _ogl.PyLineShape_base_OnMoveLink(*args, **kwargs)
+
+    def base_OnSizingDragLeft(*args, **kwargs):
+        """base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyLineShape_base_OnSizingDragLeft(*args, **kwargs)
+
+    def base_OnSizingBeginDragLeft(*args, **kwargs):
+        """base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyLineShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+
+    def base_OnSizingEndDragLeft(*args, **kwargs):
+        """base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyLineShape_base_OnSizingEndDragLeft(*args, **kwargs)
+
+    def base_OnBeginSize(*args, **kwargs):
+        """base_OnBeginSize(double w, double h)"""
+        return _ogl.PyLineShape_base_OnBeginSize(*args, **kwargs)
+
+    def base_OnEndSize(*args, **kwargs):
+        """base_OnEndSize(double w, double h)"""
+        return _ogl.PyLineShape_base_OnEndSize(*args, **kwargs)
+
 
 class PyLineShapePtr(PyLineShape):
     def __init__(self, this):
@@ -997,49 +3211,162 @@ class PyLineShapePtr(PyLineShape):
 _ogl.PyLineShape_swigregister(PyLineShapePtr)
 
 class PyPolygonShape(PyShape):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyPolygonShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PyPolygonShape"""
         newobj = _ogl.new_PyPolygonShape(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORandCallbackInfo(PyPolygonShape)
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyPolygonShape__setCallbackInfo(*args, **kwargs)
-    def Create(*args, **kwargs): return _ogl.PyPolygonShape_Create(*args, **kwargs)
-    def AddPolygonPoint(*args, **kwargs): return _ogl.PyPolygonShape_AddPolygonPoint(*args, **kwargs)
-    def CalculatePolygonCentre(*args, **kwargs): return _ogl.PyPolygonShape_CalculatePolygonCentre(*args, **kwargs)
-    def DeletePolygonPoint(*args, **kwargs): return _ogl.PyPolygonShape_DeletePolygonPoint(*args, **kwargs)
-    def GetPoints(*args, **kwargs): return _ogl.PyPolygonShape_GetPoints(*args, **kwargs)
-    def UpdateOriginalPoints(*args, **kwargs): return _ogl.PyPolygonShape_UpdateOriginalPoints(*args, **kwargs)
-    def base_OnDraw(*args, **kwargs): return _ogl.PyPolygonShape_base_OnDraw(*args, **kwargs)
-    def base_OnDrawContents(*args, **kwargs): return _ogl.PyPolygonShape_base_OnDrawContents(*args, **kwargs)
-    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyPolygonShape_base_OnDrawBranches(*args, **kwargs)
-    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyPolygonShape_base_OnMoveLinks(*args, **kwargs)
-    def base_OnErase(*args, **kwargs): return _ogl.PyPolygonShape_base_OnErase(*args, **kwargs)
-    def base_OnEraseContents(*args, **kwargs): return _ogl.PyPolygonShape_base_OnEraseContents(*args, **kwargs)
-    def base_OnHighlight(*args, **kwargs): return _ogl.PyPolygonShape_base_OnHighlight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyPolygonShape_base_OnLeftClick(*args, **kwargs)
-    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyPolygonShape_base_OnLeftDoubleClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyPolygonShape_base_OnRightClick(*args, **kwargs)
-    def base_OnSize(*args, **kwargs): return _ogl.PyPolygonShape_base_OnSize(*args, **kwargs)
-    def base_OnMovePre(*args, **kwargs): return _ogl.PyPolygonShape_base_OnMovePre(*args, **kwargs)
-    def base_OnMovePost(*args, **kwargs): return _ogl.PyPolygonShape_base_OnMovePost(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyPolygonShape_base_OnDragLeft(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyPolygonShape_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyPolygonShape_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyPolygonShape_base_OnDragRight(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyPolygonShape_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyPolygonShape_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyPolygonShape_base_OnDrawOutline(*args, **kwargs)
-    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyPolygonShape_base_OnDrawControlPoints(*args, **kwargs)
-    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyPolygonShape_base_OnEraseControlPoints(*args, **kwargs)
-    def base_OnMoveLink(*args, **kwargs): return _ogl.PyPolygonShape_base_OnMoveLink(*args, **kwargs)
-    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyPolygonShape_base_OnSizingDragLeft(*args, **kwargs)
-    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyPolygonShape_base_OnSizingBeginDragLeft(*args, **kwargs)
-    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyPolygonShape_base_OnSizingEndDragLeft(*args, **kwargs)
-    def base_OnBeginSize(*args, **kwargs): return _ogl.PyPolygonShape_base_OnBeginSize(*args, **kwargs)
-    def base_OnEndSize(*args, **kwargs): return _ogl.PyPolygonShape_base_OnEndSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyPolygonShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyPolygonShape__setCallbackInfo(*args, **kwargs)
+
+    def Create(*args, **kwargs):
+        """Create(PyObject points) -> PyObject"""
+        return _ogl.PyPolygonShape_Create(*args, **kwargs)
+
+    def AddPolygonPoint(*args, **kwargs):
+        """AddPolygonPoint(int pos=0)"""
+        return _ogl.PyPolygonShape_AddPolygonPoint(*args, **kwargs)
+
+    def CalculatePolygonCentre(*args, **kwargs):
+        """CalculatePolygonCentre()"""
+        return _ogl.PyPolygonShape_CalculatePolygonCentre(*args, **kwargs)
+
+    def DeletePolygonPoint(*args, **kwargs):
+        """DeletePolygonPoint(int pos=0)"""
+        return _ogl.PyPolygonShape_DeletePolygonPoint(*args, **kwargs)
+
+    def GetPoints(*args, **kwargs):
+        """GetPoints() -> PyObject"""
+        return _ogl.PyPolygonShape_GetPoints(*args, **kwargs)
+
+    def UpdateOriginalPoints(*args, **kwargs):
+        """UpdateOriginalPoints()"""
+        return _ogl.PyPolygonShape_UpdateOriginalPoints(*args, **kwargs)
+
+    def base_OnDraw(*args, **kwargs):
+        """base_OnDraw(wxDC dc)"""
+        return _ogl.PyPolygonShape_base_OnDraw(*args, **kwargs)
+
+    def base_OnDrawContents(*args, **kwargs):
+        """base_OnDrawContents(wxDC dc)"""
+        return _ogl.PyPolygonShape_base_OnDrawContents(*args, **kwargs)
+
+    def base_OnDrawBranches(*args, **kwargs):
+        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        return _ogl.PyPolygonShape_base_OnDrawBranches(*args, **kwargs)
+
+    def base_OnMoveLinks(*args, **kwargs):
+        """base_OnMoveLinks(wxDC dc)"""
+        return _ogl.PyPolygonShape_base_OnMoveLinks(*args, **kwargs)
+
+    def base_OnErase(*args, **kwargs):
+        """base_OnErase(wxDC dc)"""
+        return _ogl.PyPolygonShape_base_OnErase(*args, **kwargs)
+
+    def base_OnEraseContents(*args, **kwargs):
+        """base_OnEraseContents(wxDC dc)"""
+        return _ogl.PyPolygonShape_base_OnEraseContents(*args, **kwargs)
+
+    def base_OnHighlight(*args, **kwargs):
+        """base_OnHighlight(wxDC dc)"""
+        return _ogl.PyPolygonShape_base_OnHighlight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyPolygonShape_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnLeftDoubleClick(*args, **kwargs):
+        """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyPolygonShape_base_OnLeftDoubleClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyPolygonShape_base_OnRightClick(*args, **kwargs)
+
+    def base_OnSize(*args, **kwargs):
+        """base_OnSize(double x, double y)"""
+        return _ogl.PyPolygonShape_base_OnSize(*args, **kwargs)
+
+    def base_OnMovePre(*args, **kwargs):
+        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True) -> bool"""
+        return _ogl.PyPolygonShape_base_OnMovePre(*args, **kwargs)
+
+    def base_OnMovePost(*args, **kwargs):
+        """base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True)"""
+        return _ogl.PyPolygonShape_base_OnMovePost(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyPolygonShape_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyPolygonShape_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyPolygonShape_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyPolygonShape_base_OnDragRight(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyPolygonShape_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyPolygonShape_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDrawOutline(*args, **kwargs):
+        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        return _ogl.PyPolygonShape_base_OnDrawOutline(*args, **kwargs)
+
+    def base_OnDrawControlPoints(*args, **kwargs):
+        """base_OnDrawControlPoints(wxDC dc)"""
+        return _ogl.PyPolygonShape_base_OnDrawControlPoints(*args, **kwargs)
+
+    def base_OnEraseControlPoints(*args, **kwargs):
+        """base_OnEraseControlPoints(wxDC dc)"""
+        return _ogl.PyPolygonShape_base_OnEraseControlPoints(*args, **kwargs)
+
+    def base_OnMoveLink(*args, **kwargs):
+        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        return _ogl.PyPolygonShape_base_OnMoveLink(*args, **kwargs)
+
+    def base_OnSizingDragLeft(*args, **kwargs):
+        """base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyPolygonShape_base_OnSizingDragLeft(*args, **kwargs)
+
+    def base_OnSizingBeginDragLeft(*args, **kwargs):
+        """base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyPolygonShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+
+    def base_OnSizingEndDragLeft(*args, **kwargs):
+        """base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyPolygonShape_base_OnSizingEndDragLeft(*args, **kwargs)
+
+    def base_OnBeginSize(*args, **kwargs):
+        """base_OnBeginSize(double w, double h)"""
+        return _ogl.PyPolygonShape_base_OnBeginSize(*args, **kwargs)
+
+    def base_OnEndSize(*args, **kwargs):
+        """base_OnEndSize(double w, double h)"""
+        return _ogl.PyPolygonShape_base_OnEndSize(*args, **kwargs)
+
 
 class PyPolygonShapePtr(PyPolygonShape):
     def __init__(self, this):
@@ -1049,44 +3376,142 @@ class PyPolygonShapePtr(PyPolygonShape):
 _ogl.PyPolygonShape_swigregister(PyPolygonShapePtr)
 
 class PyTextShape(PyRectangleShape):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyTextShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(double width=0.0, double height=0.0) -> PyTextShape"""
         newobj = _ogl.new_PyTextShape(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORandCallbackInfo(PyTextShape)
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyTextShape__setCallbackInfo(*args, **kwargs)
-    def base_OnDelete(*args, **kwargs): return _ogl.PyTextShape_base_OnDelete(*args, **kwargs)
-    def base_OnDraw(*args, **kwargs): return _ogl.PyTextShape_base_OnDraw(*args, **kwargs)
-    def base_OnDrawContents(*args, **kwargs): return _ogl.PyTextShape_base_OnDrawContents(*args, **kwargs)
-    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyTextShape_base_OnDrawBranches(*args, **kwargs)
-    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyTextShape_base_OnMoveLinks(*args, **kwargs)
-    def base_OnErase(*args, **kwargs): return _ogl.PyTextShape_base_OnErase(*args, **kwargs)
-    def base_OnEraseContents(*args, **kwargs): return _ogl.PyTextShape_base_OnEraseContents(*args, **kwargs)
-    def base_OnHighlight(*args, **kwargs): return _ogl.PyTextShape_base_OnHighlight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyTextShape_base_OnLeftClick(*args, **kwargs)
-    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyTextShape_base_OnLeftDoubleClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyTextShape_base_OnRightClick(*args, **kwargs)
-    def base_OnSize(*args, **kwargs): return _ogl.PyTextShape_base_OnSize(*args, **kwargs)
-    def base_OnMovePre(*args, **kwargs): return _ogl.PyTextShape_base_OnMovePre(*args, **kwargs)
-    def base_OnMovePost(*args, **kwargs): return _ogl.PyTextShape_base_OnMovePost(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyTextShape_base_OnDragLeft(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyTextShape_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyTextShape_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyTextShape_base_OnDragRight(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyTextShape_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyTextShape_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyTextShape_base_OnDrawOutline(*args, **kwargs)
-    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyTextShape_base_OnDrawControlPoints(*args, **kwargs)
-    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyTextShape_base_OnEraseControlPoints(*args, **kwargs)
-    def base_OnMoveLink(*args, **kwargs): return _ogl.PyTextShape_base_OnMoveLink(*args, **kwargs)
-    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyTextShape_base_OnSizingDragLeft(*args, **kwargs)
-    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyTextShape_base_OnSizingBeginDragLeft(*args, **kwargs)
-    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyTextShape_base_OnSizingEndDragLeft(*args, **kwargs)
-    def base_OnBeginSize(*args, **kwargs): return _ogl.PyTextShape_base_OnBeginSize(*args, **kwargs)
-    def base_OnEndSize(*args, **kwargs): return _ogl.PyTextShape_base_OnEndSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTextShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyTextShape__setCallbackInfo(*args, **kwargs)
+
+    def base_OnDelete(*args, **kwargs):
+        """base_OnDelete()"""
+        return _ogl.PyTextShape_base_OnDelete(*args, **kwargs)
+
+    def base_OnDraw(*args, **kwargs):
+        """base_OnDraw(wxDC dc)"""
+        return _ogl.PyTextShape_base_OnDraw(*args, **kwargs)
+
+    def base_OnDrawContents(*args, **kwargs):
+        """base_OnDrawContents(wxDC dc)"""
+        return _ogl.PyTextShape_base_OnDrawContents(*args, **kwargs)
+
+    def base_OnDrawBranches(*args, **kwargs):
+        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        return _ogl.PyTextShape_base_OnDrawBranches(*args, **kwargs)
+
+    def base_OnMoveLinks(*args, **kwargs):
+        """base_OnMoveLinks(wxDC dc)"""
+        return _ogl.PyTextShape_base_OnMoveLinks(*args, **kwargs)
+
+    def base_OnErase(*args, **kwargs):
+        """base_OnErase(wxDC dc)"""
+        return _ogl.PyTextShape_base_OnErase(*args, **kwargs)
+
+    def base_OnEraseContents(*args, **kwargs):
+        """base_OnEraseContents(wxDC dc)"""
+        return _ogl.PyTextShape_base_OnEraseContents(*args, **kwargs)
+
+    def base_OnHighlight(*args, **kwargs):
+        """base_OnHighlight(wxDC dc)"""
+        return _ogl.PyTextShape_base_OnHighlight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyTextShape_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnLeftDoubleClick(*args, **kwargs):
+        """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyTextShape_base_OnLeftDoubleClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyTextShape_base_OnRightClick(*args, **kwargs)
+
+    def base_OnSize(*args, **kwargs):
+        """base_OnSize(double x, double y)"""
+        return _ogl.PyTextShape_base_OnSize(*args, **kwargs)
+
+    def base_OnMovePre(*args, **kwargs):
+        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True) -> bool"""
+        return _ogl.PyTextShape_base_OnMovePre(*args, **kwargs)
+
+    def base_OnMovePost(*args, **kwargs):
+        """base_OnMovePost(wxDC dc, double x, double y, double old_x, double old_y, 
+    bool display=True)"""
+        return _ogl.PyTextShape_base_OnMovePost(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyTextShape_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyTextShape_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyTextShape_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyTextShape_base_OnDragRight(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyTextShape_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)"""
+        return _ogl.PyTextShape_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDrawOutline(*args, **kwargs):
+        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        return _ogl.PyTextShape_base_OnDrawOutline(*args, **kwargs)
+
+    def base_OnDrawControlPoints(*args, **kwargs):
+        """base_OnDrawControlPoints(wxDC dc)"""
+        return _ogl.PyTextShape_base_OnDrawControlPoints(*args, **kwargs)
+
+    def base_OnEraseControlPoints(*args, **kwargs):
+        """base_OnEraseControlPoints(wxDC dc)"""
+        return _ogl.PyTextShape_base_OnEraseControlPoints(*args, **kwargs)
+
+    def base_OnMoveLink(*args, **kwargs):
+        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        return _ogl.PyTextShape_base_OnMoveLink(*args, **kwargs)
+
+    def base_OnSizingDragLeft(*args, **kwargs):
+        """base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyTextShape_base_OnSizingDragLeft(*args, **kwargs)
+
+    def base_OnSizingBeginDragLeft(*args, **kwargs):
+        """base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyTextShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+
+    def base_OnSizingEndDragLeft(*args, **kwargs):
+        """base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+    int attachment=0)"""
+        return _ogl.PyTextShape_base_OnSizingEndDragLeft(*args, **kwargs)
+
+    def base_OnBeginSize(*args, **kwargs):
+        """base_OnBeginSize(double w, double h)"""
+        return _ogl.PyTextShape_base_OnBeginSize(*args, **kwargs)
+
+    def base_OnEndSize(*args, **kwargs):
+        """base_OnEndSize(double w, double h)"""
+        return _ogl.PyTextShape_base_OnEndSize(*args, **kwargs)
+
 
 class PyTextShapePtr(PyTextShape):
     def __init__(self, this):
@@ -1096,37 +3521,111 @@ class PyTextShapePtr(PyTextShape):
 _ogl.PyTextShape_swigregister(PyTextShapePtr)
 
 class Diagram(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDiagram instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> Diagram"""
         newobj = _ogl.new_Diagram(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def AddShape(*args, **kwargs): return _ogl.Diagram_AddShape(*args, **kwargs)
-    def Clear(*args, **kwargs): return _ogl.Diagram_Clear(*args, **kwargs)
-    def DeleteAllShapes(*args, **kwargs): return _ogl.Diagram_DeleteAllShapes(*args, **kwargs)
-    def DrawOutline(*args, **kwargs): return _ogl.Diagram_DrawOutline(*args, **kwargs)
-    def FindShape(*args, **kwargs): return _ogl.Diagram_FindShape(*args, **kwargs)
-    def GetCanvas(*args, **kwargs): return _ogl.Diagram_GetCanvas(*args, **kwargs)
-    def GetCount(*args, **kwargs): return _ogl.Diagram_GetCount(*args, **kwargs)
-    def GetGridSpacing(*args, **kwargs): return _ogl.Diagram_GetGridSpacing(*args, **kwargs)
-    def GetMouseTolerance(*args, **kwargs): return _ogl.Diagram_GetMouseTolerance(*args, **kwargs)
-    def GetShapeList(*args, **kwargs): return _ogl.Diagram_GetShapeList(*args, **kwargs)
-    def GetQuickEditMode(*args, **kwargs): return _ogl.Diagram_GetQuickEditMode(*args, **kwargs)
-    def GetSnapToGrid(*args, **kwargs): return _ogl.Diagram_GetSnapToGrid(*args, **kwargs)
-    def InsertShape(*args, **kwargs): return _ogl.Diagram_InsertShape(*args, **kwargs)
-    def RecentreAll(*args, **kwargs): return _ogl.Diagram_RecentreAll(*args, **kwargs)
-    def Redraw(*args, **kwargs): return _ogl.Diagram_Redraw(*args, **kwargs)
-    def RemoveAllShapes(*args, **kwargs): return _ogl.Diagram_RemoveAllShapes(*args, **kwargs)
-    def RemoveShape(*args, **kwargs): return _ogl.Diagram_RemoveShape(*args, **kwargs)
-    def SetCanvas(*args, **kwargs): return _ogl.Diagram_SetCanvas(*args, **kwargs)
-    def SetGridSpacing(*args, **kwargs): return _ogl.Diagram_SetGridSpacing(*args, **kwargs)
-    def SetMouseTolerance(*args, **kwargs): return _ogl.Diagram_SetMouseTolerance(*args, **kwargs)
-    def SetQuickEditMode(*args, **kwargs): return _ogl.Diagram_SetQuickEditMode(*args, **kwargs)
-    def SetSnapToGrid(*args, **kwargs): return _ogl.Diagram_SetSnapToGrid(*args, **kwargs)
-    def ShowAll(*args, **kwargs): return _ogl.Diagram_ShowAll(*args, **kwargs)
-    def Snap(*args, **kwargs): return _ogl.Diagram_Snap(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDiagram instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def AddShape(*args, **kwargs):
+        """AddShape(PyShape shape, PyShape addAfter=None)"""
+        return _ogl.Diagram_AddShape(*args, **kwargs)
+
+    def Clear(*args, **kwargs):
+        """Clear(wxDC dc)"""
+        return _ogl.Diagram_Clear(*args, **kwargs)
+
+    def DeleteAllShapes(*args, **kwargs):
+        """DeleteAllShapes()"""
+        return _ogl.Diagram_DeleteAllShapes(*args, **kwargs)
+
+    def DrawOutline(*args, **kwargs):
+        """DrawOutline(wxDC dc, double x1, double y1, double x2, double y2)"""
+        return _ogl.Diagram_DrawOutline(*args, **kwargs)
+
+    def FindShape(*args, **kwargs):
+        """FindShape(long id) -> PyShape"""
+        return _ogl.Diagram_FindShape(*args, **kwargs)
+
+    def GetCanvas(*args, **kwargs):
+        """GetCanvas() -> PyShapeCanvas"""
+        return _ogl.Diagram_GetCanvas(*args, **kwargs)
+
+    def GetCount(*args, **kwargs):
+        """GetCount() -> int"""
+        return _ogl.Diagram_GetCount(*args, **kwargs)
+
+    def GetGridSpacing(*args, **kwargs):
+        """GetGridSpacing() -> double"""
+        return _ogl.Diagram_GetGridSpacing(*args, **kwargs)
+
+    def GetMouseTolerance(*args, **kwargs):
+        """GetMouseTolerance() -> int"""
+        return _ogl.Diagram_GetMouseTolerance(*args, **kwargs)
+
+    def GetShapeList(*args, **kwargs):
+        """GetShapeList() -> PyObject"""
+        return _ogl.Diagram_GetShapeList(*args, **kwargs)
+
+    def GetQuickEditMode(*args, **kwargs):
+        """GetQuickEditMode() -> bool"""
+        return _ogl.Diagram_GetQuickEditMode(*args, **kwargs)
+
+    def GetSnapToGrid(*args, **kwargs):
+        """GetSnapToGrid() -> bool"""
+        return _ogl.Diagram_GetSnapToGrid(*args, **kwargs)
+
+    def InsertShape(*args, **kwargs):
+        """InsertShape(PyShape shape)"""
+        return _ogl.Diagram_InsertShape(*args, **kwargs)
+
+    def RecentreAll(*args, **kwargs):
+        """RecentreAll(wxDC dc)"""
+        return _ogl.Diagram_RecentreAll(*args, **kwargs)
+
+    def Redraw(*args, **kwargs):
+        """Redraw(wxDC dc)"""
+        return _ogl.Diagram_Redraw(*args, **kwargs)
+
+    def RemoveAllShapes(*args, **kwargs):
+        """RemoveAllShapes()"""
+        return _ogl.Diagram_RemoveAllShapes(*args, **kwargs)
+
+    def RemoveShape(*args, **kwargs):
+        """RemoveShape(PyShape shape)"""
+        return _ogl.Diagram_RemoveShape(*args, **kwargs)
+
+    def SetCanvas(*args, **kwargs):
+        """SetCanvas(PyShapeCanvas canvas)"""
+        return _ogl.Diagram_SetCanvas(*args, **kwargs)
+
+    def SetGridSpacing(*args, **kwargs):
+        """SetGridSpacing(double spacing)"""
+        return _ogl.Diagram_SetGridSpacing(*args, **kwargs)
+
+    def SetMouseTolerance(*args, **kwargs):
+        """SetMouseTolerance(int tolerance)"""
+        return _ogl.Diagram_SetMouseTolerance(*args, **kwargs)
+
+    def SetQuickEditMode(*args, **kwargs):
+        """SetQuickEditMode(bool mode)"""
+        return _ogl.Diagram_SetQuickEditMode(*args, **kwargs)
+
+    def SetSnapToGrid(*args, **kwargs):
+        """SetSnapToGrid(bool snap)"""
+        return _ogl.Diagram_SetSnapToGrid(*args, **kwargs)
+
+    def ShowAll(*args, **kwargs):
+        """ShowAll(bool show)"""
+        return _ogl.Diagram_ShowAll(*args, **kwargs)
+
+    def Snap(*args, **kwargs):
+        """Snap(double INOUT, double INOUT)"""
+        return _ogl.Diagram_Snap(*args, **kwargs)
+
 
 class DiagramPtr(Diagram):
     def __init__(self, this):
@@ -1136,39 +3635,101 @@ class DiagramPtr(Diagram):
 _ogl.Diagram_swigregister(DiagramPtr)
 
 class PyShapeCanvas(windows.ScrolledWindow):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyShapeCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent=None, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=BORDER, 
+    wxString name=wxPyShapeCanvasNameStr) -> PyShapeCanvas"""
         newobj = _ogl.new_PyShapeCanvas(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def _setCallbackInfo(*args, **kwargs): return _ogl.PyShapeCanvas__setCallbackInfo(*args, **kwargs)
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _ogl.PyShapeCanvas__setCallbackInfo(*args, **kwargs)
+
     def _setOORandCallbackInfo(self, _class):
         self._setOORInfo(self)
         self._setCallbackInfo(self, _class)
 
-    def AddShape(*args, **kwargs): return _ogl.PyShapeCanvas_AddShape(*args, **kwargs)
-    def FindShape(*args, **kwargs): return _ogl.PyShapeCanvas_FindShape(*args, **kwargs)
-    def FindFirstSensitiveShape(*args, **kwargs): return _ogl.PyShapeCanvas_FindFirstSensitiveShape(*args, **kwargs)
-    def GetDiagram(*args, **kwargs): return _ogl.PyShapeCanvas_GetDiagram(*args, **kwargs)
-    def GetQuickEditMode(*args, **kwargs): return _ogl.PyShapeCanvas_GetQuickEditMode(*args, **kwargs)
-    def InsertShape(*args, **kwargs): return _ogl.PyShapeCanvas_InsertShape(*args, **kwargs)
-    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnBeginDragLeft(*args, **kwargs)
-    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnBeginDragRight(*args, **kwargs)
-    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnEndDragLeft(*args, **kwargs)
-    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnEndDragRight(*args, **kwargs)
-    def base_OnDragLeft(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnDragLeft(*args, **kwargs)
-    def base_OnDragRight(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnDragRight(*args, **kwargs)
-    def base_OnLeftClick(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnLeftClick(*args, **kwargs)
-    def base_OnRightClick(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnRightClick(*args, **kwargs)
-    def Redraw(*args, **kwargs): return _ogl.PyShapeCanvas_Redraw(*args, **kwargs)
-    def RemoveShape(*args, **kwargs): return _ogl.PyShapeCanvas_RemoveShape(*args, **kwargs)
-    def SetDiagram(*args, **kwargs): return _ogl.PyShapeCanvas_SetDiagram(*args, **kwargs)
-    def Snap(*args, **kwargs): return _ogl.PyShapeCanvas_Snap(*args, **kwargs)
+    def AddShape(*args, **kwargs):
+        """AddShape(PyShape shape, PyShape addAfter=None)"""
+        return _ogl.PyShapeCanvas_AddShape(*args, **kwargs)
+
+    def FindShape(*args, **kwargs):
+        """FindShape(double x1, double y, int OUTPUT, wxClassInfo info=None, 
+    PyShape notImage=None) -> PyShape"""
+        return _ogl.PyShapeCanvas_FindShape(*args, **kwargs)
+
+    def FindFirstSensitiveShape(*args, **kwargs):
+        """FindFirstSensitiveShape(double x1, double y, int OUTPUT, int op) -> PyShape"""
+        return _ogl.PyShapeCanvas_FindFirstSensitiveShape(*args, **kwargs)
+
+    def GetDiagram(*args, **kwargs):
+        """GetDiagram() -> Diagram"""
+        return _ogl.PyShapeCanvas_GetDiagram(*args, **kwargs)
+
+    def GetQuickEditMode(*args, **kwargs):
+        """GetQuickEditMode() -> bool"""
+        return _ogl.PyShapeCanvas_GetQuickEditMode(*args, **kwargs)
+
+    def InsertShape(*args, **kwargs):
+        """InsertShape(PyShape shape)"""
+        return _ogl.PyShapeCanvas_InsertShape(*args, **kwargs)
+
+    def base_OnBeginDragLeft(*args, **kwargs):
+        """base_OnBeginDragLeft(double x, double y, int keys=0)"""
+        return _ogl.PyShapeCanvas_base_OnBeginDragLeft(*args, **kwargs)
+
+    def base_OnBeginDragRight(*args, **kwargs):
+        """base_OnBeginDragRight(double x, double y, int keys=0)"""
+        return _ogl.PyShapeCanvas_base_OnBeginDragRight(*args, **kwargs)
+
+    def base_OnEndDragLeft(*args, **kwargs):
+        """base_OnEndDragLeft(double x, double y, int keys=0)"""
+        return _ogl.PyShapeCanvas_base_OnEndDragLeft(*args, **kwargs)
+
+    def base_OnEndDragRight(*args, **kwargs):
+        """base_OnEndDragRight(double x, double y, int keys=0)"""
+        return _ogl.PyShapeCanvas_base_OnEndDragRight(*args, **kwargs)
+
+    def base_OnDragLeft(*args, **kwargs):
+        """base_OnDragLeft(bool draw, double x, double y, int keys=0)"""
+        return _ogl.PyShapeCanvas_base_OnDragLeft(*args, **kwargs)
+
+    def base_OnDragRight(*args, **kwargs):
+        """base_OnDragRight(bool draw, double x, double y, int keys=0)"""
+        return _ogl.PyShapeCanvas_base_OnDragRight(*args, **kwargs)
+
+    def base_OnLeftClick(*args, **kwargs):
+        """base_OnLeftClick(double x, double y, int keys=0)"""
+        return _ogl.PyShapeCanvas_base_OnLeftClick(*args, **kwargs)
+
+    def base_OnRightClick(*args, **kwargs):
+        """base_OnRightClick(double x, double y, int keys=0)"""
+        return _ogl.PyShapeCanvas_base_OnRightClick(*args, **kwargs)
+
+    def Redraw(*args, **kwargs):
+        """Redraw(wxDC dc)"""
+        return _ogl.PyShapeCanvas_Redraw(*args, **kwargs)
+
+    def RemoveShape(*args, **kwargs):
+        """RemoveShape(PyShape shape)"""
+        return _ogl.PyShapeCanvas_RemoveShape(*args, **kwargs)
+
+    def SetDiagram(*args, **kwargs):
+        """SetDiagram(Diagram diagram)"""
+        return _ogl.PyShapeCanvas_SetDiagram(*args, **kwargs)
+
+    def Snap(*args, **kwargs):
+        """Snap(double INOUT, double INOUT)"""
+        return _ogl.PyShapeCanvas_Snap(*args, **kwargs)
+
     def GetShapeList(self):
         return self.GetDiagram().GetShapeList()
 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyShapeCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class PyShapeCanvasPtr(PyShapeCanvas):
     def __init__(self, this):
@@ -1257,7 +3818,11 @@ DIVISION_SIDE_TOP = _ogl.DIVISION_SIDE_TOP
 DIVISION_SIDE_RIGHT = _ogl.DIVISION_SIDE_RIGHT
 DIVISION_SIDE_BOTTOM = _ogl.DIVISION_SIDE_BOTTOM
 
-OGLInitialize = _ogl.OGLInitialize
+def OGLInitialize(*args, **kwargs):
+    """OGLInitialize()"""
+    return _ogl.OGLInitialize(*args, **kwargs)
 
-OGLCleanUp = _ogl.OGLCleanUp
+def OGLCleanUp(*args, **kwargs):
+    """OGLCleanUp()"""
+    return _ogl.OGLCleanUp(*args, **kwargs)
 
diff --git a/wxPython/contrib/ogl/ogl_wrap.cpp b/wxPython/contrib/ogl/ogl_wrap.cpp
index 91d962e82c..561df2d002 100644
--- a/wxPython/contrib/ogl/ogl_wrap.cpp
+++ b/wxPython/contrib/ogl/ogl_wrap.cpp
@@ -655,7 +655,7 @@ static PyObject *_wrap_ShapeRegion_SetText(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -667,7 +667,7 @@ static PyObject *_wrap_ShapeRegion_SetText(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -872,7 +872,7 @@ static PyObject *_wrap_ShapeRegion_SetName(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -884,7 +884,7 @@ static PyObject *_wrap_ShapeRegion_SetName(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -912,7 +912,7 @@ static PyObject *_wrap_ShapeRegion_SetColour(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -924,7 +924,7 @@ static PyObject *_wrap_ShapeRegion_SetColour(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1381,7 +1381,7 @@ static PyObject *_wrap_ShapeRegion_SetPenColour(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1393,7 +1393,7 @@ static PyObject *_wrap_ShapeRegion_SetPenColour(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1837,7 +1837,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *self, PyO
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -2107,7 +2107,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -2148,7 +2148,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *self, PyObjec
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -2454,7 +2454,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *self, PyObjec
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3474,7 +3474,7 @@ static PyObject *_wrap_PyShape_CalculateSize(PyObject *self, PyObject *args, PyO
 static PyObject *_wrap_PyShape_Select(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     wxDC *arg3 = (wxDC *) NULL ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -3509,8 +3509,8 @@ static PyObject *_wrap_PyShape_Select(PyObject *self, PyObject *args, PyObject *
 static PyObject *_wrap_PyShape_SetHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
-    bool arg2 = (bool) TRUE ;
-    bool arg3 = (bool) FALSE ;
+    bool arg2 = (bool) True ;
+    bool arg3 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3621,7 +3621,7 @@ static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *self, PyObject *ar
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) OP_ALL ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -3677,7 +3677,7 @@ static PyObject *_wrap_PyShape_SetDraggable(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3884,7 +3884,7 @@ static PyObject *_wrap_PyShape_SetShadowMode(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -4406,7 +4406,7 @@ static PyObject *_wrap_PyShape_Move(PyObject *self, PyObject *args, PyObject *kw
     wxDC *arg2 = 0 ;
     double arg3 ;
     double arg4 ;
-    bool arg5 = (bool) TRUE ;
+    bool arg5 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj4 = 0 ;
@@ -4617,7 +4617,7 @@ static PyObject *_wrap_PyShape_SetSize(PyObject *self, PyObject *args, PyObject
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
     double arg3 ;
-    bool arg4 = (bool) TRUE ;
+    bool arg4 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -4812,7 +4812,7 @@ static PyObject *_wrap_PyShape_AddText(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4824,7 +4824,7 @@ static PyObject *_wrap_PyShape_AddText(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4928,7 +4928,7 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObje
     wxDC *arg2 = 0 ;
     wxString *arg3 = 0 ;
     int arg4 = (int) 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4945,7 +4945,7 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObje
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5101,7 +5101,7 @@ static PyObject *_wrap_PyShape_SetTextColour(PyObject *self, PyObject *args, PyO
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 = (int) 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5113,7 +5113,7 @@ static PyObject *_wrap_PyShape_SetTextColour(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5199,7 +5199,7 @@ static PyObject *_wrap_PyShape_SetRegionName(PyObject *self, PyObject *args, PyO
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 = (int) 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5211,7 +5211,7 @@ static PyObject *_wrap_PyShape_SetRegionName(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5272,7 +5272,7 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObj
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5284,7 +5284,7 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5313,7 +5313,7 @@ static PyObject *_wrap_PyShape_NameRegions(PyObject *self, PyObject *args, PyObj
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString const &arg2_defvalue = "" ;
     wxString *arg2 = (wxString *) &arg2_defvalue ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5326,7 +5326,7 @@ static PyObject *_wrap_PyShape_NameRegions(PyObject *self, PyObject *args, PyObj
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     {
@@ -5457,7 +5457,7 @@ static PyObject *_wrap_PyShape_FindRegion(PyObject *self, PyObject *args, PyObje
     wxString *arg2 = 0 ;
     int *arg3 = (int *) 0 ;
     wxPyShape *result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     int temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -5471,7 +5471,7 @@ static PyObject *_wrap_PyShape_FindRegion(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5821,7 +5821,7 @@ static PyObject *_wrap_PyShape_EraseLinks(PyObject *self, PyObject *args, PyObje
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
     int arg3 = (int) -1 ;
-    bool arg4 = (bool) FALSE ;
+    bool arg4 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -5858,7 +5858,7 @@ static PyObject *_wrap_PyShape_DrawLinks(PyObject *self, PyObject *args, PyObjec
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
     int arg3 = (int) -1 ;
-    bool arg4 = (bool) FALSE ;
+    bool arg4 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -6412,8 +6412,8 @@ static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyO
 static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
-    bool arg2 = (bool) TRUE ;
-    bool arg3 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
+    bool arg3 = (bool) True ;
     wxPyShape *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -6790,7 +6790,7 @@ static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *self, PyObject *arg
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -7060,7 +7060,7 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -7101,7 +7101,7 @@ static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *self, PyObject *args, P
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -7407,7 +7407,7 @@ static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -7841,7 +7841,7 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject
     double *arg3 = (double *) 0 ;
     double *arg4 = (double *) 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -7855,7 +7855,7 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_double,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -8480,7 +8480,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawText(PyObject *self, PyObject *args, P
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxString *arg2 = 0 ;
     wxPoint *arg3 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     wxPoint temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -8494,7 +8494,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawText(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = &temp3;
@@ -9339,7 +9339,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -9380,7 +9380,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *self, PyObject
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -9686,7 +9686,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *self, PyObject
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -10323,7 +10323,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -10364,7 +10364,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *self, PyObject *
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -10670,7 +10670,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *self, PyObject *
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11003,7 +11003,7 @@ static PyObject *_wrap_PyBitmapShape_SetFilename(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -11015,7 +11015,7 @@ static PyObject *_wrap_PyBitmapShape_SetFilename(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11397,7 +11397,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -11438,7 +11438,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *self, PyObject *a
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -11744,7 +11744,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *self, PyObject *a
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -12357,7 +12357,7 @@ static PyObject *_wrap_PyDrawnShape_DrawText(PyObject *self, PyObject *args, PyO
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxString *arg2 = 0 ;
     wxPoint *arg3 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     wxPoint temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -12371,7 +12371,7 @@ static PyObject *_wrap_PyDrawnShape_DrawText(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = &temp3;
@@ -12482,7 +12482,7 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *a
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -12494,7 +12494,7 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *a
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13247,7 +13247,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -13288,7 +13288,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *self, PyObject *ar
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -13594,7 +13594,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *self, PyObject *ar
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -14697,7 +14697,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -14738,7 +14738,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *self, PyObject
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -15044,7 +15044,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *self, PyObject
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -15692,7 +15692,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -15733,7 +15733,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *self, PyObject *
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -16039,7 +16039,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *self, PyObject *
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -16800,7 +16800,7 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSideColour(PyObject *self, PyObjec
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -16812,7 +16812,7 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSideColour(PyObject *self, PyObjec
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16938,7 +16938,7 @@ static PyObject *_wrap_PyDivisionShape_SetTopSideColour(PyObject *self, PyObject
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -16950,7 +16950,7 @@ static PyObject *_wrap_PyDivisionShape_SetTopSideColour(PyObject *self, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17376,7 +17376,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject *
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -17417,7 +17417,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *self, PyObject
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -17723,7 +17723,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *self, PyObject
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -18299,7 +18299,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -18340,7 +18340,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *self, PyObject *
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -18646,7 +18646,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *self, PyObject *
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -19221,7 +19221,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -19262,7 +19262,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *self, PyObject *a
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -19568,7 +19568,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *self, PyObject *a
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -19767,7 +19767,7 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k
     wxPseudoMetaFile *arg6 = (wxPseudoMetaFile *) NULL ;
     long arg7 = (long) -1 ;
     wxArrowHead *result;
-    bool temp5 = false ;
+    bool temp5 = False ;
     PyObject * obj4 = 0 ;
     PyObject * obj5 = 0 ;
     char *kwnames[] = {
@@ -19779,7 +19779,7 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k
         {
             arg5 = wxString_in_helper(obj4);
             if (arg5 == NULL) SWIG_fail;
-            temp5 = true;
+            temp5 = True;
         }
     }
     if (obj5) {
@@ -20311,7 +20311,7 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb
     wxString *arg6 = (wxString *) &arg6_defvalue ;
     wxPseudoMetaFile *arg7 = (wxPseudoMetaFile *) NULL ;
     long arg8 = (long) -1 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj5 = 0 ;
     PyObject * obj6 = 0 ;
@@ -20325,7 +20325,7 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     if (obj6) {
@@ -20389,7 +20389,7 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, Py
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -20401,7 +20401,7 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20520,7 +20520,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg
     int arg2 ;
     wxString *arg3 = 0 ;
     bool result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -20532,7 +20532,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20715,7 +20715,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *self, PyObject *args,
     int arg2 ;
     wxString *arg3 = 0 ;
     wxArrowHead *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -20727,7 +20727,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *self, PyObject *args,
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21880,7 +21880,7 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -21921,7 +21921,7 @@ static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *self, PyObject *arg
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -22227,7 +22227,7 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *self, PyObject *arg
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -22952,7 +22952,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -22993,7 +22993,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *self, PyObject *
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -23299,7 +23299,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *self, PyObject *
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -23899,7 +23899,7 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -23940,7 +23940,7 @@ static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *self, PyObject *arg
     double arg4 ;
     double arg5 ;
     double arg6 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -24246,7 +24246,7 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *self, PyObject *arg
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -25140,7 +25140,7 @@ static PyObject * Diagram_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
-    wxWindowID arg2 = (wxWindowID) -1 ;
+    int arg2 = (int) -1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -25151,7 +25151,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec
     wxPyShapeCanvas *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -25180,7 +25180,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
diff --git a/wxPython/contrib/stc/stc.py b/wxPython/contrib/stc/stc.py
index 4bcc770220..01a270e4a4 100644
--- a/wxPython/contrib/stc/stc.py
+++ b/wxPython/contrib/stc/stc.py
@@ -778,352 +778,1374 @@ STC_CMD_PARADOWNEXTEND = _stc.STC_CMD_PARADOWNEXTEND
 STC_CMD_PARAUP = _stc.STC_CMD_PARAUP
 STC_CMD_PARAUPEXTEND = _stc.STC_CMD_PARAUPEXTEND
 class StyledTextCtrl(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxStyledTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, wxString name=wxPySTCNameStr) -> StyledTextCtrl"""
         newobj = _stc.new_StyledTextCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _stc.StyledTextCtrl_Create(*args, **kwargs)
-    def AddText(*args, **kwargs): return _stc.StyledTextCtrl_AddText(*args, **kwargs)
-    def AddStyledText(*args, **kwargs): return _stc.StyledTextCtrl_AddStyledText(*args, **kwargs)
-    def InsertText(*args, **kwargs): return _stc.StyledTextCtrl_InsertText(*args, **kwargs)
-    def ClearAll(*args, **kwargs): return _stc.StyledTextCtrl_ClearAll(*args, **kwargs)
-    def ClearDocumentStyle(*args, **kwargs): return _stc.StyledTextCtrl_ClearDocumentStyle(*args, **kwargs)
-    def GetLength(*args, **kwargs): return _stc.StyledTextCtrl_GetLength(*args, **kwargs)
-    def GetCharAt(*args, **kwargs): return _stc.StyledTextCtrl_GetCharAt(*args, **kwargs)
-    def GetCurrentPos(*args, **kwargs): return _stc.StyledTextCtrl_GetCurrentPos(*args, **kwargs)
-    def GetAnchor(*args, **kwargs): return _stc.StyledTextCtrl_GetAnchor(*args, **kwargs)
-    def GetStyleAt(*args, **kwargs): return _stc.StyledTextCtrl_GetStyleAt(*args, **kwargs)
-    def Redo(*args, **kwargs): return _stc.StyledTextCtrl_Redo(*args, **kwargs)
-    def SetUndoCollection(*args, **kwargs): return _stc.StyledTextCtrl_SetUndoCollection(*args, **kwargs)
-    def SelectAll(*args, **kwargs): return _stc.StyledTextCtrl_SelectAll(*args, **kwargs)
-    def SetSavePoint(*args, **kwargs): return _stc.StyledTextCtrl_SetSavePoint(*args, **kwargs)
-    def GetStyledText(*args, **kwargs): return _stc.StyledTextCtrl_GetStyledText(*args, **kwargs)
-    def CanRedo(*args, **kwargs): return _stc.StyledTextCtrl_CanRedo(*args, **kwargs)
-    def MarkerLineFromHandle(*args, **kwargs): return _stc.StyledTextCtrl_MarkerLineFromHandle(*args, **kwargs)
-    def MarkerDeleteHandle(*args, **kwargs): return _stc.StyledTextCtrl_MarkerDeleteHandle(*args, **kwargs)
-    def GetUndoCollection(*args, **kwargs): return _stc.StyledTextCtrl_GetUndoCollection(*args, **kwargs)
-    def GetViewWhiteSpace(*args, **kwargs): return _stc.StyledTextCtrl_GetViewWhiteSpace(*args, **kwargs)
-    def SetViewWhiteSpace(*args, **kwargs): return _stc.StyledTextCtrl_SetViewWhiteSpace(*args, **kwargs)
-    def PositionFromPoint(*args, **kwargs): return _stc.StyledTextCtrl_PositionFromPoint(*args, **kwargs)
-    def PositionFromPointClose(*args, **kwargs): return _stc.StyledTextCtrl_PositionFromPointClose(*args, **kwargs)
-    def GotoLine(*args, **kwargs): return _stc.StyledTextCtrl_GotoLine(*args, **kwargs)
-    def GotoPos(*args, **kwargs): return _stc.StyledTextCtrl_GotoPos(*args, **kwargs)
-    def SetAnchor(*args, **kwargs): return _stc.StyledTextCtrl_SetAnchor(*args, **kwargs)
-    def GetCurLine(*args, **kwargs): return _stc.StyledTextCtrl_GetCurLine(*args, **kwargs)
-    def GetEndStyled(*args, **kwargs): return _stc.StyledTextCtrl_GetEndStyled(*args, **kwargs)
-    def ConvertEOLs(*args, **kwargs): return _stc.StyledTextCtrl_ConvertEOLs(*args, **kwargs)
-    def GetEOLMode(*args, **kwargs): return _stc.StyledTextCtrl_GetEOLMode(*args, **kwargs)
-    def SetEOLMode(*args, **kwargs): return _stc.StyledTextCtrl_SetEOLMode(*args, **kwargs)
-    def StartStyling(*args, **kwargs): return _stc.StyledTextCtrl_StartStyling(*args, **kwargs)
-    def SetStyling(*args, **kwargs): return _stc.StyledTextCtrl_SetStyling(*args, **kwargs)
-    def GetBufferedDraw(*args, **kwargs): return _stc.StyledTextCtrl_GetBufferedDraw(*args, **kwargs)
-    def SetBufferedDraw(*args, **kwargs): return _stc.StyledTextCtrl_SetBufferedDraw(*args, **kwargs)
-    def SetTabWidth(*args, **kwargs): return _stc.StyledTextCtrl_SetTabWidth(*args, **kwargs)
-    def GetTabWidth(*args, **kwargs): return _stc.StyledTextCtrl_GetTabWidth(*args, **kwargs)
-    def SetCodePage(*args, **kwargs): return _stc.StyledTextCtrl_SetCodePage(*args, **kwargs)
-    def MarkerDefine(*args, **kwargs): return _stc.StyledTextCtrl_MarkerDefine(*args, **kwargs)
-    def MarkerSetForeground(*args, **kwargs): return _stc.StyledTextCtrl_MarkerSetForeground(*args, **kwargs)
-    def MarkerSetBackground(*args, **kwargs): return _stc.StyledTextCtrl_MarkerSetBackground(*args, **kwargs)
-    def MarkerAdd(*args, **kwargs): return _stc.StyledTextCtrl_MarkerAdd(*args, **kwargs)
-    def MarkerDelete(*args, **kwargs): return _stc.StyledTextCtrl_MarkerDelete(*args, **kwargs)
-    def MarkerDeleteAll(*args, **kwargs): return _stc.StyledTextCtrl_MarkerDeleteAll(*args, **kwargs)
-    def MarkerGet(*args, **kwargs): return _stc.StyledTextCtrl_MarkerGet(*args, **kwargs)
-    def MarkerNext(*args, **kwargs): return _stc.StyledTextCtrl_MarkerNext(*args, **kwargs)
-    def MarkerPrevious(*args, **kwargs): return _stc.StyledTextCtrl_MarkerPrevious(*args, **kwargs)
-    def MarkerDefineBitmap(*args, **kwargs): return _stc.StyledTextCtrl_MarkerDefineBitmap(*args, **kwargs)
-    def SetMarginType(*args, **kwargs): return _stc.StyledTextCtrl_SetMarginType(*args, **kwargs)
-    def GetMarginType(*args, **kwargs): return _stc.StyledTextCtrl_GetMarginType(*args, **kwargs)
-    def SetMarginWidth(*args, **kwargs): return _stc.StyledTextCtrl_SetMarginWidth(*args, **kwargs)
-    def GetMarginWidth(*args, **kwargs): return _stc.StyledTextCtrl_GetMarginWidth(*args, **kwargs)
-    def SetMarginMask(*args, **kwargs): return _stc.StyledTextCtrl_SetMarginMask(*args, **kwargs)
-    def GetMarginMask(*args, **kwargs): return _stc.StyledTextCtrl_GetMarginMask(*args, **kwargs)
-    def SetMarginSensitive(*args, **kwargs): return _stc.StyledTextCtrl_SetMarginSensitive(*args, **kwargs)
-    def GetMarginSensitive(*args, **kwargs): return _stc.StyledTextCtrl_GetMarginSensitive(*args, **kwargs)
-    def StyleClearAll(*args, **kwargs): return _stc.StyledTextCtrl_StyleClearAll(*args, **kwargs)
-    def StyleSetForeground(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetForeground(*args, **kwargs)
-    def StyleSetBackground(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetBackground(*args, **kwargs)
-    def StyleSetBold(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetBold(*args, **kwargs)
-    def StyleSetItalic(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetItalic(*args, **kwargs)
-    def StyleSetSize(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetSize(*args, **kwargs)
-    def StyleSetFaceName(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetFaceName(*args, **kwargs)
-    def StyleSetEOLFilled(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetEOLFilled(*args, **kwargs)
-    def StyleResetDefault(*args, **kwargs): return _stc.StyledTextCtrl_StyleResetDefault(*args, **kwargs)
-    def StyleSetUnderline(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetUnderline(*args, **kwargs)
-    def StyleSetCase(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetCase(*args, **kwargs)
-    def StyleSetCharacterSet(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetCharacterSet(*args, **kwargs)
-    def StyleSetHotSpot(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetHotSpot(*args, **kwargs)
-    def SetSelForeground(*args, **kwargs): return _stc.StyledTextCtrl_SetSelForeground(*args, **kwargs)
-    def SetSelBackground(*args, **kwargs): return _stc.StyledTextCtrl_SetSelBackground(*args, **kwargs)
-    def SetCaretForeground(*args, **kwargs): return _stc.StyledTextCtrl_SetCaretForeground(*args, **kwargs)
-    def CmdKeyAssign(*args, **kwargs): return _stc.StyledTextCtrl_CmdKeyAssign(*args, **kwargs)
-    def CmdKeyClear(*args, **kwargs): return _stc.StyledTextCtrl_CmdKeyClear(*args, **kwargs)
-    def CmdKeyClearAll(*args, **kwargs): return _stc.StyledTextCtrl_CmdKeyClearAll(*args, **kwargs)
-    def SetStyleBytes(*args, **kwargs): return _stc.StyledTextCtrl_SetStyleBytes(*args, **kwargs)
-    def StyleSetVisible(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetVisible(*args, **kwargs)
-    def GetCaretPeriod(*args, **kwargs): return _stc.StyledTextCtrl_GetCaretPeriod(*args, **kwargs)
-    def SetCaretPeriod(*args, **kwargs): return _stc.StyledTextCtrl_SetCaretPeriod(*args, **kwargs)
-    def SetWordChars(*args, **kwargs): return _stc.StyledTextCtrl_SetWordChars(*args, **kwargs)
-    def BeginUndoAction(*args, **kwargs): return _stc.StyledTextCtrl_BeginUndoAction(*args, **kwargs)
-    def EndUndoAction(*args, **kwargs): return _stc.StyledTextCtrl_EndUndoAction(*args, **kwargs)
-    def IndicatorSetStyle(*args, **kwargs): return _stc.StyledTextCtrl_IndicatorSetStyle(*args, **kwargs)
-    def IndicatorGetStyle(*args, **kwargs): return _stc.StyledTextCtrl_IndicatorGetStyle(*args, **kwargs)
-    def IndicatorSetForeground(*args, **kwargs): return _stc.StyledTextCtrl_IndicatorSetForeground(*args, **kwargs)
-    def IndicatorGetForeground(*args, **kwargs): return _stc.StyledTextCtrl_IndicatorGetForeground(*args, **kwargs)
-    def SetWhitespaceForeground(*args, **kwargs): return _stc.StyledTextCtrl_SetWhitespaceForeground(*args, **kwargs)
-    def SetWhitespaceBackground(*args, **kwargs): return _stc.StyledTextCtrl_SetWhitespaceBackground(*args, **kwargs)
-    def SetStyleBits(*args, **kwargs): return _stc.StyledTextCtrl_SetStyleBits(*args, **kwargs)
-    def GetStyleBits(*args, **kwargs): return _stc.StyledTextCtrl_GetStyleBits(*args, **kwargs)
-    def SetLineState(*args, **kwargs): return _stc.StyledTextCtrl_SetLineState(*args, **kwargs)
-    def GetLineState(*args, **kwargs): return _stc.StyledTextCtrl_GetLineState(*args, **kwargs)
-    def GetMaxLineState(*args, **kwargs): return _stc.StyledTextCtrl_GetMaxLineState(*args, **kwargs)
-    def GetCaretLineVisible(*args, **kwargs): return _stc.StyledTextCtrl_GetCaretLineVisible(*args, **kwargs)
-    def SetCaretLineVisible(*args, **kwargs): return _stc.StyledTextCtrl_SetCaretLineVisible(*args, **kwargs)
-    def GetCaretLineBack(*args, **kwargs): return _stc.StyledTextCtrl_GetCaretLineBack(*args, **kwargs)
-    def SetCaretLineBack(*args, **kwargs): return _stc.StyledTextCtrl_SetCaretLineBack(*args, **kwargs)
-    def StyleSetChangeable(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetChangeable(*args, **kwargs)
-    def AutoCompShow(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompShow(*args, **kwargs)
-    def AutoCompCancel(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompCancel(*args, **kwargs)
-    def AutoCompActive(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompActive(*args, **kwargs)
-    def AutoCompPosStart(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompPosStart(*args, **kwargs)
-    def AutoCompComplete(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompComplete(*args, **kwargs)
-    def AutoCompStops(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompStops(*args, **kwargs)
-    def AutoCompSetSeparator(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompSetSeparator(*args, **kwargs)
-    def AutoCompGetSeparator(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompGetSeparator(*args, **kwargs)
-    def AutoCompSelect(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompSelect(*args, **kwargs)
-    def AutoCompSetCancelAtStart(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompSetCancelAtStart(*args, **kwargs)
-    def AutoCompGetCancelAtStart(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompGetCancelAtStart(*args, **kwargs)
-    def AutoCompSetFillUps(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompSetFillUps(*args, **kwargs)
-    def AutoCompSetChooseSingle(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompSetChooseSingle(*args, **kwargs)
-    def AutoCompGetChooseSingle(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompGetChooseSingle(*args, **kwargs)
-    def AutoCompSetIgnoreCase(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompSetIgnoreCase(*args, **kwargs)
-    def AutoCompGetIgnoreCase(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompGetIgnoreCase(*args, **kwargs)
-    def UserListShow(*args, **kwargs): return _stc.StyledTextCtrl_UserListShow(*args, **kwargs)
-    def AutoCompSetAutoHide(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompSetAutoHide(*args, **kwargs)
-    def AutoCompGetAutoHide(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompGetAutoHide(*args, **kwargs)
-    def AutoCompSetDropRestOfWord(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompSetDropRestOfWord(*args, **kwargs)
-    def AutoCompGetDropRestOfWord(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompGetDropRestOfWord(*args, **kwargs)
-    def RegisterImage(*args, **kwargs): return _stc.StyledTextCtrl_RegisterImage(*args, **kwargs)
-    def ClearRegisteredImages(*args, **kwargs): return _stc.StyledTextCtrl_ClearRegisteredImages(*args, **kwargs)
-    def AutoCompGetTypeSeparator(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompGetTypeSeparator(*args, **kwargs)
-    def AutoCompSetTypeSeparator(*args, **kwargs): return _stc.StyledTextCtrl_AutoCompSetTypeSeparator(*args, **kwargs)
-    def SetIndent(*args, **kwargs): return _stc.StyledTextCtrl_SetIndent(*args, **kwargs)
-    def GetIndent(*args, **kwargs): return _stc.StyledTextCtrl_GetIndent(*args, **kwargs)
-    def SetUseTabs(*args, **kwargs): return _stc.StyledTextCtrl_SetUseTabs(*args, **kwargs)
-    def GetUseTabs(*args, **kwargs): return _stc.StyledTextCtrl_GetUseTabs(*args, **kwargs)
-    def SetLineIndentation(*args, **kwargs): return _stc.StyledTextCtrl_SetLineIndentation(*args, **kwargs)
-    def GetLineIndentation(*args, **kwargs): return _stc.StyledTextCtrl_GetLineIndentation(*args, **kwargs)
-    def GetLineIndentPosition(*args, **kwargs): return _stc.StyledTextCtrl_GetLineIndentPosition(*args, **kwargs)
-    def GetColumn(*args, **kwargs): return _stc.StyledTextCtrl_GetColumn(*args, **kwargs)
-    def SetUseHorizontalScrollBar(*args, **kwargs): return _stc.StyledTextCtrl_SetUseHorizontalScrollBar(*args, **kwargs)
-    def GetUseHorizontalScrollBar(*args, **kwargs): return _stc.StyledTextCtrl_GetUseHorizontalScrollBar(*args, **kwargs)
-    def SetIndentationGuides(*args, **kwargs): return _stc.StyledTextCtrl_SetIndentationGuides(*args, **kwargs)
-    def GetIndentationGuides(*args, **kwargs): return _stc.StyledTextCtrl_GetIndentationGuides(*args, **kwargs)
-    def SetHighlightGuide(*args, **kwargs): return _stc.StyledTextCtrl_SetHighlightGuide(*args, **kwargs)
-    def GetHighlightGuide(*args, **kwargs): return _stc.StyledTextCtrl_GetHighlightGuide(*args, **kwargs)
-    def GetLineEndPosition(*args, **kwargs): return _stc.StyledTextCtrl_GetLineEndPosition(*args, **kwargs)
-    def GetCodePage(*args, **kwargs): return _stc.StyledTextCtrl_GetCodePage(*args, **kwargs)
-    def GetCaretForeground(*args, **kwargs): return _stc.StyledTextCtrl_GetCaretForeground(*args, **kwargs)
-    def GetReadOnly(*args, **kwargs): return _stc.StyledTextCtrl_GetReadOnly(*args, **kwargs)
-    def SetCurrentPos(*args, **kwargs): return _stc.StyledTextCtrl_SetCurrentPos(*args, **kwargs)
-    def SetSelectionStart(*args, **kwargs): return _stc.StyledTextCtrl_SetSelectionStart(*args, **kwargs)
-    def GetSelectionStart(*args, **kwargs): return _stc.StyledTextCtrl_GetSelectionStart(*args, **kwargs)
-    def SetSelectionEnd(*args, **kwargs): return _stc.StyledTextCtrl_SetSelectionEnd(*args, **kwargs)
-    def GetSelectionEnd(*args, **kwargs): return _stc.StyledTextCtrl_GetSelectionEnd(*args, **kwargs)
-    def SetPrintMagnification(*args, **kwargs): return _stc.StyledTextCtrl_SetPrintMagnification(*args, **kwargs)
-    def GetPrintMagnification(*args, **kwargs): return _stc.StyledTextCtrl_GetPrintMagnification(*args, **kwargs)
-    def SetPrintColourMode(*args, **kwargs): return _stc.StyledTextCtrl_SetPrintColourMode(*args, **kwargs)
-    def GetPrintColourMode(*args, **kwargs): return _stc.StyledTextCtrl_GetPrintColourMode(*args, **kwargs)
-    def FindText(*args, **kwargs): return _stc.StyledTextCtrl_FindText(*args, **kwargs)
-    def FormatRange(*args, **kwargs): return _stc.StyledTextCtrl_FormatRange(*args, **kwargs)
-    def GetFirstVisibleLine(*args, **kwargs): return _stc.StyledTextCtrl_GetFirstVisibleLine(*args, **kwargs)
-    def GetLine(*args, **kwargs): return _stc.StyledTextCtrl_GetLine(*args, **kwargs)
-    def GetLineCount(*args, **kwargs): return _stc.StyledTextCtrl_GetLineCount(*args, **kwargs)
-    def SetMarginLeft(*args, **kwargs): return _stc.StyledTextCtrl_SetMarginLeft(*args, **kwargs)
-    def GetMarginLeft(*args, **kwargs): return _stc.StyledTextCtrl_GetMarginLeft(*args, **kwargs)
-    def SetMarginRight(*args, **kwargs): return _stc.StyledTextCtrl_SetMarginRight(*args, **kwargs)
-    def GetMarginRight(*args, **kwargs): return _stc.StyledTextCtrl_GetMarginRight(*args, **kwargs)
-    def GetModify(*args, **kwargs): return _stc.StyledTextCtrl_GetModify(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _stc.StyledTextCtrl_SetSelection(*args, **kwargs)
-    def GetSelectedText(*args, **kwargs): return _stc.StyledTextCtrl_GetSelectedText(*args, **kwargs)
-    def GetTextRange(*args, **kwargs): return _stc.StyledTextCtrl_GetTextRange(*args, **kwargs)
-    def HideSelection(*args, **kwargs): return _stc.StyledTextCtrl_HideSelection(*args, **kwargs)
-    def LineFromPosition(*args, **kwargs): return _stc.StyledTextCtrl_LineFromPosition(*args, **kwargs)
-    def PositionFromLine(*args, **kwargs): return _stc.StyledTextCtrl_PositionFromLine(*args, **kwargs)
-    def LineScroll(*args, **kwargs): return _stc.StyledTextCtrl_LineScroll(*args, **kwargs)
-    def EnsureCaretVisible(*args, **kwargs): return _stc.StyledTextCtrl_EnsureCaretVisible(*args, **kwargs)
-    def ReplaceSelection(*args, **kwargs): return _stc.StyledTextCtrl_ReplaceSelection(*args, **kwargs)
-    def SetReadOnly(*args, **kwargs): return _stc.StyledTextCtrl_SetReadOnly(*args, **kwargs)
-    def CanPaste(*args, **kwargs): return _stc.StyledTextCtrl_CanPaste(*args, **kwargs)
-    def CanUndo(*args, **kwargs): return _stc.StyledTextCtrl_CanUndo(*args, **kwargs)
-    def EmptyUndoBuffer(*args, **kwargs): return _stc.StyledTextCtrl_EmptyUndoBuffer(*args, **kwargs)
-    def Undo(*args, **kwargs): return _stc.StyledTextCtrl_Undo(*args, **kwargs)
-    def Cut(*args, **kwargs): return _stc.StyledTextCtrl_Cut(*args, **kwargs)
-    def Copy(*args, **kwargs): return _stc.StyledTextCtrl_Copy(*args, **kwargs)
-    def Paste(*args, **kwargs): return _stc.StyledTextCtrl_Paste(*args, **kwargs)
-    def Clear(*args, **kwargs): return _stc.StyledTextCtrl_Clear(*args, **kwargs)
-    def SetText(*args, **kwargs): return _stc.StyledTextCtrl_SetText(*args, **kwargs)
-    def GetText(*args, **kwargs): return _stc.StyledTextCtrl_GetText(*args, **kwargs)
-    def GetTextLength(*args, **kwargs): return _stc.StyledTextCtrl_GetTextLength(*args, **kwargs)
-    def SetOvertype(*args, **kwargs): return _stc.StyledTextCtrl_SetOvertype(*args, **kwargs)
-    def GetOvertype(*args, **kwargs): return _stc.StyledTextCtrl_GetOvertype(*args, **kwargs)
-    def SetCaretWidth(*args, **kwargs): return _stc.StyledTextCtrl_SetCaretWidth(*args, **kwargs)
-    def GetCaretWidth(*args, **kwargs): return _stc.StyledTextCtrl_GetCaretWidth(*args, **kwargs)
-    def SetTargetStart(*args, **kwargs): return _stc.StyledTextCtrl_SetTargetStart(*args, **kwargs)
-    def GetTargetStart(*args, **kwargs): return _stc.StyledTextCtrl_GetTargetStart(*args, **kwargs)
-    def SetTargetEnd(*args, **kwargs): return _stc.StyledTextCtrl_SetTargetEnd(*args, **kwargs)
-    def GetTargetEnd(*args, **kwargs): return _stc.StyledTextCtrl_GetTargetEnd(*args, **kwargs)
-    def ReplaceTarget(*args, **kwargs): return _stc.StyledTextCtrl_ReplaceTarget(*args, **kwargs)
-    def ReplaceTargetRE(*args, **kwargs): return _stc.StyledTextCtrl_ReplaceTargetRE(*args, **kwargs)
-    def SearchInTarget(*args, **kwargs): return _stc.StyledTextCtrl_SearchInTarget(*args, **kwargs)
-    def SetSearchFlags(*args, **kwargs): return _stc.StyledTextCtrl_SetSearchFlags(*args, **kwargs)
-    def GetSearchFlags(*args, **kwargs): return _stc.StyledTextCtrl_GetSearchFlags(*args, **kwargs)
-    def CallTipShow(*args, **kwargs): return _stc.StyledTextCtrl_CallTipShow(*args, **kwargs)
-    def CallTipCancel(*args, **kwargs): return _stc.StyledTextCtrl_CallTipCancel(*args, **kwargs)
-    def CallTipActive(*args, **kwargs): return _stc.StyledTextCtrl_CallTipActive(*args, **kwargs)
-    def CallTipPosAtStart(*args, **kwargs): return _stc.StyledTextCtrl_CallTipPosAtStart(*args, **kwargs)
-    def CallTipSetHighlight(*args, **kwargs): return _stc.StyledTextCtrl_CallTipSetHighlight(*args, **kwargs)
-    def CallTipSetBackground(*args, **kwargs): return _stc.StyledTextCtrl_CallTipSetBackground(*args, **kwargs)
-    def CallTipSetForeground(*args, **kwargs): return _stc.StyledTextCtrl_CallTipSetForeground(*args, **kwargs)
-    def CallTipSetForegroundHighlight(*args, **kwargs): return _stc.StyledTextCtrl_CallTipSetForegroundHighlight(*args, **kwargs)
-    def VisibleFromDocLine(*args, **kwargs): return _stc.StyledTextCtrl_VisibleFromDocLine(*args, **kwargs)
-    def DocLineFromVisible(*args, **kwargs): return _stc.StyledTextCtrl_DocLineFromVisible(*args, **kwargs)
-    def SetFoldLevel(*args, **kwargs): return _stc.StyledTextCtrl_SetFoldLevel(*args, **kwargs)
-    def GetFoldLevel(*args, **kwargs): return _stc.StyledTextCtrl_GetFoldLevel(*args, **kwargs)
-    def GetLastChild(*args, **kwargs): return _stc.StyledTextCtrl_GetLastChild(*args, **kwargs)
-    def GetFoldParent(*args, **kwargs): return _stc.StyledTextCtrl_GetFoldParent(*args, **kwargs)
-    def ShowLines(*args, **kwargs): return _stc.StyledTextCtrl_ShowLines(*args, **kwargs)
-    def HideLines(*args, **kwargs): return _stc.StyledTextCtrl_HideLines(*args, **kwargs)
-    def GetLineVisible(*args, **kwargs): return _stc.StyledTextCtrl_GetLineVisible(*args, **kwargs)
-    def SetFoldExpanded(*args, **kwargs): return _stc.StyledTextCtrl_SetFoldExpanded(*args, **kwargs)
-    def GetFoldExpanded(*args, **kwargs): return _stc.StyledTextCtrl_GetFoldExpanded(*args, **kwargs)
-    def ToggleFold(*args, **kwargs): return _stc.StyledTextCtrl_ToggleFold(*args, **kwargs)
-    def EnsureVisible(*args, **kwargs): return _stc.StyledTextCtrl_EnsureVisible(*args, **kwargs)
-    def SetFoldFlags(*args, **kwargs): return _stc.StyledTextCtrl_SetFoldFlags(*args, **kwargs)
-    def EnsureVisibleEnforcePolicy(*args, **kwargs): return _stc.StyledTextCtrl_EnsureVisibleEnforcePolicy(*args, **kwargs)
-    def SetTabIndents(*args, **kwargs): return _stc.StyledTextCtrl_SetTabIndents(*args, **kwargs)
-    def GetTabIndents(*args, **kwargs): return _stc.StyledTextCtrl_GetTabIndents(*args, **kwargs)
-    def SetBackSpaceUnIndents(*args, **kwargs): return _stc.StyledTextCtrl_SetBackSpaceUnIndents(*args, **kwargs)
-    def GetBackSpaceUnIndents(*args, **kwargs): return _stc.StyledTextCtrl_GetBackSpaceUnIndents(*args, **kwargs)
-    def SetMouseDwellTime(*args, **kwargs): return _stc.StyledTextCtrl_SetMouseDwellTime(*args, **kwargs)
-    def GetMouseDwellTime(*args, **kwargs): return _stc.StyledTextCtrl_GetMouseDwellTime(*args, **kwargs)
-    def WordStartPosition(*args, **kwargs): return _stc.StyledTextCtrl_WordStartPosition(*args, **kwargs)
-    def WordEndPosition(*args, **kwargs): return _stc.StyledTextCtrl_WordEndPosition(*args, **kwargs)
-    def SetWrapMode(*args, **kwargs): return _stc.StyledTextCtrl_SetWrapMode(*args, **kwargs)
-    def GetWrapMode(*args, **kwargs): return _stc.StyledTextCtrl_GetWrapMode(*args, **kwargs)
-    def SetLayoutCache(*args, **kwargs): return _stc.StyledTextCtrl_SetLayoutCache(*args, **kwargs)
-    def GetLayoutCache(*args, **kwargs): return _stc.StyledTextCtrl_GetLayoutCache(*args, **kwargs)
-    def SetScrollWidth(*args, **kwargs): return _stc.StyledTextCtrl_SetScrollWidth(*args, **kwargs)
-    def GetScrollWidth(*args, **kwargs): return _stc.StyledTextCtrl_GetScrollWidth(*args, **kwargs)
-    def TextWidth(*args, **kwargs): return _stc.StyledTextCtrl_TextWidth(*args, **kwargs)
-    def SetEndAtLastLine(*args, **kwargs): return _stc.StyledTextCtrl_SetEndAtLastLine(*args, **kwargs)
-    def GetEndAtLastLine(*args, **kwargs): return _stc.StyledTextCtrl_GetEndAtLastLine(*args, **kwargs)
-    def TextHeight(*args, **kwargs): return _stc.StyledTextCtrl_TextHeight(*args, **kwargs)
-    def SetUseVerticalScrollBar(*args, **kwargs): return _stc.StyledTextCtrl_SetUseVerticalScrollBar(*args, **kwargs)
-    def GetUseVerticalScrollBar(*args, **kwargs): return _stc.StyledTextCtrl_GetUseVerticalScrollBar(*args, **kwargs)
-    def AppendText(*args, **kwargs): return _stc.StyledTextCtrl_AppendText(*args, **kwargs)
-    def GetTwoPhaseDraw(*args, **kwargs): return _stc.StyledTextCtrl_GetTwoPhaseDraw(*args, **kwargs)
-    def SetTwoPhaseDraw(*args, **kwargs): return _stc.StyledTextCtrl_SetTwoPhaseDraw(*args, **kwargs)
-    def TargetFromSelection(*args, **kwargs): return _stc.StyledTextCtrl_TargetFromSelection(*args, **kwargs)
-    def LinesJoin(*args, **kwargs): return _stc.StyledTextCtrl_LinesJoin(*args, **kwargs)
-    def LinesSplit(*args, **kwargs): return _stc.StyledTextCtrl_LinesSplit(*args, **kwargs)
-    def SetFoldMarginColour(*args, **kwargs): return _stc.StyledTextCtrl_SetFoldMarginColour(*args, **kwargs)
-    def SetFoldMarginHiColour(*args, **kwargs): return _stc.StyledTextCtrl_SetFoldMarginHiColour(*args, **kwargs)
-    def LineDuplicate(*args, **kwargs): return _stc.StyledTextCtrl_LineDuplicate(*args, **kwargs)
-    def HomeDisplay(*args, **kwargs): return _stc.StyledTextCtrl_HomeDisplay(*args, **kwargs)
-    def HomeDisplayExtend(*args, **kwargs): return _stc.StyledTextCtrl_HomeDisplayExtend(*args, **kwargs)
-    def LineEndDisplay(*args, **kwargs): return _stc.StyledTextCtrl_LineEndDisplay(*args, **kwargs)
-    def LineEndDisplayExtend(*args, **kwargs): return _stc.StyledTextCtrl_LineEndDisplayExtend(*args, **kwargs)
-    def LineCopy(*args, **kwargs): return _stc.StyledTextCtrl_LineCopy(*args, **kwargs)
-    def MoveCaretInsideView(*args, **kwargs): return _stc.StyledTextCtrl_MoveCaretInsideView(*args, **kwargs)
-    def LineLength(*args, **kwargs): return _stc.StyledTextCtrl_LineLength(*args, **kwargs)
-    def BraceHighlight(*args, **kwargs): return _stc.StyledTextCtrl_BraceHighlight(*args, **kwargs)
-    def BraceBadLight(*args, **kwargs): return _stc.StyledTextCtrl_BraceBadLight(*args, **kwargs)
-    def BraceMatch(*args, **kwargs): return _stc.StyledTextCtrl_BraceMatch(*args, **kwargs)
-    def GetViewEOL(*args, **kwargs): return _stc.StyledTextCtrl_GetViewEOL(*args, **kwargs)
-    def SetViewEOL(*args, **kwargs): return _stc.StyledTextCtrl_SetViewEOL(*args, **kwargs)
-    def GetDocPointer(*args, **kwargs): return _stc.StyledTextCtrl_GetDocPointer(*args, **kwargs)
-    def SetDocPointer(*args, **kwargs): return _stc.StyledTextCtrl_SetDocPointer(*args, **kwargs)
-    def SetModEventMask(*args, **kwargs): return _stc.StyledTextCtrl_SetModEventMask(*args, **kwargs)
-    def GetEdgeColumn(*args, **kwargs): return _stc.StyledTextCtrl_GetEdgeColumn(*args, **kwargs)
-    def SetEdgeColumn(*args, **kwargs): return _stc.StyledTextCtrl_SetEdgeColumn(*args, **kwargs)
-    def GetEdgeMode(*args, **kwargs): return _stc.StyledTextCtrl_GetEdgeMode(*args, **kwargs)
-    def SetEdgeMode(*args, **kwargs): return _stc.StyledTextCtrl_SetEdgeMode(*args, **kwargs)
-    def GetEdgeColour(*args, **kwargs): return _stc.StyledTextCtrl_GetEdgeColour(*args, **kwargs)
-    def SetEdgeColour(*args, **kwargs): return _stc.StyledTextCtrl_SetEdgeColour(*args, **kwargs)
-    def SearchAnchor(*args, **kwargs): return _stc.StyledTextCtrl_SearchAnchor(*args, **kwargs)
-    def SearchNext(*args, **kwargs): return _stc.StyledTextCtrl_SearchNext(*args, **kwargs)
-    def SearchPrev(*args, **kwargs): return _stc.StyledTextCtrl_SearchPrev(*args, **kwargs)
-    def LinesOnScreen(*args, **kwargs): return _stc.StyledTextCtrl_LinesOnScreen(*args, **kwargs)
-    def UsePopUp(*args, **kwargs): return _stc.StyledTextCtrl_UsePopUp(*args, **kwargs)
-    def SelectionIsRectangle(*args, **kwargs): return _stc.StyledTextCtrl_SelectionIsRectangle(*args, **kwargs)
-    def SetZoom(*args, **kwargs): return _stc.StyledTextCtrl_SetZoom(*args, **kwargs)
-    def GetZoom(*args, **kwargs): return _stc.StyledTextCtrl_GetZoom(*args, **kwargs)
-    def CreateDocument(*args, **kwargs): return _stc.StyledTextCtrl_CreateDocument(*args, **kwargs)
-    def AddRefDocument(*args, **kwargs): return _stc.StyledTextCtrl_AddRefDocument(*args, **kwargs)
-    def ReleaseDocument(*args, **kwargs): return _stc.StyledTextCtrl_ReleaseDocument(*args, **kwargs)
-    def GetModEventMask(*args, **kwargs): return _stc.StyledTextCtrl_GetModEventMask(*args, **kwargs)
-    def SetSTCFocus(*args, **kwargs): return _stc.StyledTextCtrl_SetSTCFocus(*args, **kwargs)
-    def GetSTCFocus(*args, **kwargs): return _stc.StyledTextCtrl_GetSTCFocus(*args, **kwargs)
-    def SetStatus(*args, **kwargs): return _stc.StyledTextCtrl_SetStatus(*args, **kwargs)
-    def GetStatus(*args, **kwargs): return _stc.StyledTextCtrl_GetStatus(*args, **kwargs)
-    def SetMouseDownCaptures(*args, **kwargs): return _stc.StyledTextCtrl_SetMouseDownCaptures(*args, **kwargs)
-    def GetMouseDownCaptures(*args, **kwargs): return _stc.StyledTextCtrl_GetMouseDownCaptures(*args, **kwargs)
-    def SetSTCCursor(*args, **kwargs): return _stc.StyledTextCtrl_SetSTCCursor(*args, **kwargs)
-    def GetSTCCursor(*args, **kwargs): return _stc.StyledTextCtrl_GetSTCCursor(*args, **kwargs)
-    def SetControlCharSymbol(*args, **kwargs): return _stc.StyledTextCtrl_SetControlCharSymbol(*args, **kwargs)
-    def GetControlCharSymbol(*args, **kwargs): return _stc.StyledTextCtrl_GetControlCharSymbol(*args, **kwargs)
-    def WordPartLeft(*args, **kwargs): return _stc.StyledTextCtrl_WordPartLeft(*args, **kwargs)
-    def WordPartLeftExtend(*args, **kwargs): return _stc.StyledTextCtrl_WordPartLeftExtend(*args, **kwargs)
-    def WordPartRight(*args, **kwargs): return _stc.StyledTextCtrl_WordPartRight(*args, **kwargs)
-    def WordPartRightExtend(*args, **kwargs): return _stc.StyledTextCtrl_WordPartRightExtend(*args, **kwargs)
-    def SetVisiblePolicy(*args, **kwargs): return _stc.StyledTextCtrl_SetVisiblePolicy(*args, **kwargs)
-    def DelLineLeft(*args, **kwargs): return _stc.StyledTextCtrl_DelLineLeft(*args, **kwargs)
-    def DelLineRight(*args, **kwargs): return _stc.StyledTextCtrl_DelLineRight(*args, **kwargs)
-    def SetXOffset(*args, **kwargs): return _stc.StyledTextCtrl_SetXOffset(*args, **kwargs)
-    def GetXOffset(*args, **kwargs): return _stc.StyledTextCtrl_GetXOffset(*args, **kwargs)
-    def ChooseCaretX(*args, **kwargs): return _stc.StyledTextCtrl_ChooseCaretX(*args, **kwargs)
-    def SetXCaretPolicy(*args, **kwargs): return _stc.StyledTextCtrl_SetXCaretPolicy(*args, **kwargs)
-    def SetYCaretPolicy(*args, **kwargs): return _stc.StyledTextCtrl_SetYCaretPolicy(*args, **kwargs)
-    def SetPrintWrapMode(*args, **kwargs): return _stc.StyledTextCtrl_SetPrintWrapMode(*args, **kwargs)
-    def GetPrintWrapMode(*args, **kwargs): return _stc.StyledTextCtrl_GetPrintWrapMode(*args, **kwargs)
-    def SetHotspotActiveForeground(*args, **kwargs): return _stc.StyledTextCtrl_SetHotspotActiveForeground(*args, **kwargs)
-    def SetHotspotActiveBackground(*args, **kwargs): return _stc.StyledTextCtrl_SetHotspotActiveBackground(*args, **kwargs)
-    def SetHotspotActiveUnderline(*args, **kwargs): return _stc.StyledTextCtrl_SetHotspotActiveUnderline(*args, **kwargs)
-    def PositionBefore(*args, **kwargs): return _stc.StyledTextCtrl_PositionBefore(*args, **kwargs)
-    def PositionAfter(*args, **kwargs): return _stc.StyledTextCtrl_PositionAfter(*args, **kwargs)
-    def CopyRange(*args, **kwargs): return _stc.StyledTextCtrl_CopyRange(*args, **kwargs)
-    def CopyText(*args, **kwargs): return _stc.StyledTextCtrl_CopyText(*args, **kwargs)
-    def StartRecord(*args, **kwargs): return _stc.StyledTextCtrl_StartRecord(*args, **kwargs)
-    def StopRecord(*args, **kwargs): return _stc.StyledTextCtrl_StopRecord(*args, **kwargs)
-    def SetLexer(*args, **kwargs): return _stc.StyledTextCtrl_SetLexer(*args, **kwargs)
-    def GetLexer(*args, **kwargs): return _stc.StyledTextCtrl_GetLexer(*args, **kwargs)
-    def Colourise(*args, **kwargs): return _stc.StyledTextCtrl_Colourise(*args, **kwargs)
-    def SetProperty(*args, **kwargs): return _stc.StyledTextCtrl_SetProperty(*args, **kwargs)
-    def SetKeyWords(*args, **kwargs): return _stc.StyledTextCtrl_SetKeyWords(*args, **kwargs)
-    def SetLexerLanguage(*args, **kwargs): return _stc.StyledTextCtrl_SetLexerLanguage(*args, **kwargs)
-    def GetCurrentLine(*args, **kwargs): return _stc.StyledTextCtrl_GetCurrentLine(*args, **kwargs)
-    def StyleSetSpec(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetSpec(*args, **kwargs)
-    def StyleSetFont(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetFont(*args, **kwargs)
-    def StyleSetFontAttr(*args, **kwargs): return _stc.StyledTextCtrl_StyleSetFontAttr(*args, **kwargs)
-    def CmdKeyExecute(*args, **kwargs): return _stc.StyledTextCtrl_CmdKeyExecute(*args, **kwargs)
-    def SetMargins(*args, **kwargs): return _stc.StyledTextCtrl_SetMargins(*args, **kwargs)
-    def GetSelection(*args, **kwargs): return _stc.StyledTextCtrl_GetSelection(*args, **kwargs)
-    def PointFromPosition(*args, **kwargs): return _stc.StyledTextCtrl_PointFromPosition(*args, **kwargs)
-    def ScrollToLine(*args, **kwargs): return _stc.StyledTextCtrl_ScrollToLine(*args, **kwargs)
-    def ScrollToColumn(*args, **kwargs): return _stc.StyledTextCtrl_ScrollToColumn(*args, **kwargs)
-    def SendMsg(*args, **kwargs): return _stc.StyledTextCtrl_SendMsg(*args, **kwargs)
-    def SetVScrollBar(*args, **kwargs): return _stc.StyledTextCtrl_SetVScrollBar(*args, **kwargs)
-    def SetHScrollBar(*args, **kwargs): return _stc.StyledTextCtrl_SetHScrollBar(*args, **kwargs)
-    def GetLastKeydownProcessed(*args, **kwargs): return _stc.StyledTextCtrl_GetLastKeydownProcessed(*args, **kwargs)
-    def SetLastKeydownProcessed(*args, **kwargs): return _stc.StyledTextCtrl_SetLastKeydownProcessed(*args, **kwargs)
-    def SaveFile(*args, **kwargs): return _stc.StyledTextCtrl_SaveFile(*args, **kwargs)
-    def LoadFile(*args, **kwargs): return _stc.StyledTextCtrl_LoadFile(*args, **kwargs)
-    def DoDragOver(*args, **kwargs): return _stc.StyledTextCtrl_DoDragOver(*args, **kwargs)
-    def DoDropText(*args, **kwargs): return _stc.StyledTextCtrl_DoDropText(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStyledTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, wxString name=wxSTCNameStr)"""
+        return _stc.StyledTextCtrl_Create(*args, **kwargs)
+
+    def AddText(*args, **kwargs):
+        """AddText(wxString text)"""
+        return _stc.StyledTextCtrl_AddText(*args, **kwargs)
+
+    def AddStyledText(*args, **kwargs):
+        """AddStyledText(wxMemoryBuffer data)"""
+        return _stc.StyledTextCtrl_AddStyledText(*args, **kwargs)
+
+    def InsertText(*args, **kwargs):
+        """InsertText(int pos, wxString text)"""
+        return _stc.StyledTextCtrl_InsertText(*args, **kwargs)
+
+    def ClearAll(*args, **kwargs):
+        """ClearAll()"""
+        return _stc.StyledTextCtrl_ClearAll(*args, **kwargs)
+
+    def ClearDocumentStyle(*args, **kwargs):
+        """ClearDocumentStyle()"""
+        return _stc.StyledTextCtrl_ClearDocumentStyle(*args, **kwargs)
+
+    def GetLength(*args, **kwargs):
+        """GetLength() -> int"""
+        return _stc.StyledTextCtrl_GetLength(*args, **kwargs)
+
+    def GetCharAt(*args, **kwargs):
+        """GetCharAt(int pos) -> int"""
+        return _stc.StyledTextCtrl_GetCharAt(*args, **kwargs)
+
+    def GetCurrentPos(*args, **kwargs):
+        """GetCurrentPos() -> int"""
+        return _stc.StyledTextCtrl_GetCurrentPos(*args, **kwargs)
+
+    def GetAnchor(*args, **kwargs):
+        """GetAnchor() -> int"""
+        return _stc.StyledTextCtrl_GetAnchor(*args, **kwargs)
+
+    def GetStyleAt(*args, **kwargs):
+        """GetStyleAt(int pos) -> int"""
+        return _stc.StyledTextCtrl_GetStyleAt(*args, **kwargs)
+
+    def Redo(*args, **kwargs):
+        """Redo()"""
+        return _stc.StyledTextCtrl_Redo(*args, **kwargs)
+
+    def SetUndoCollection(*args, **kwargs):
+        """SetUndoCollection(bool collectUndo)"""
+        return _stc.StyledTextCtrl_SetUndoCollection(*args, **kwargs)
+
+    def SelectAll(*args, **kwargs):
+        """SelectAll()"""
+        return _stc.StyledTextCtrl_SelectAll(*args, **kwargs)
+
+    def SetSavePoint(*args, **kwargs):
+        """SetSavePoint()"""
+        return _stc.StyledTextCtrl_SetSavePoint(*args, **kwargs)
+
+    def GetStyledText(*args, **kwargs):
+        """GetStyledText(int startPos, int endPos) -> wxMemoryBuffer"""
+        return _stc.StyledTextCtrl_GetStyledText(*args, **kwargs)
+
+    def CanRedo(*args, **kwargs):
+        """CanRedo() -> bool"""
+        return _stc.StyledTextCtrl_CanRedo(*args, **kwargs)
+
+    def MarkerLineFromHandle(*args, **kwargs):
+        """MarkerLineFromHandle(int handle) -> int"""
+        return _stc.StyledTextCtrl_MarkerLineFromHandle(*args, **kwargs)
+
+    def MarkerDeleteHandle(*args, **kwargs):
+        """MarkerDeleteHandle(int handle)"""
+        return _stc.StyledTextCtrl_MarkerDeleteHandle(*args, **kwargs)
+
+    def GetUndoCollection(*args, **kwargs):
+        """GetUndoCollection() -> bool"""
+        return _stc.StyledTextCtrl_GetUndoCollection(*args, **kwargs)
+
+    def GetViewWhiteSpace(*args, **kwargs):
+        """GetViewWhiteSpace() -> int"""
+        return _stc.StyledTextCtrl_GetViewWhiteSpace(*args, **kwargs)
+
+    def SetViewWhiteSpace(*args, **kwargs):
+        """SetViewWhiteSpace(int viewWS)"""
+        return _stc.StyledTextCtrl_SetViewWhiteSpace(*args, **kwargs)
+
+    def PositionFromPoint(*args, **kwargs):
+        """PositionFromPoint(Point pt) -> int"""
+        return _stc.StyledTextCtrl_PositionFromPoint(*args, **kwargs)
+
+    def PositionFromPointClose(*args, **kwargs):
+        """PositionFromPointClose(int x, int y) -> int"""
+        return _stc.StyledTextCtrl_PositionFromPointClose(*args, **kwargs)
+
+    def GotoLine(*args, **kwargs):
+        """GotoLine(int line)"""
+        return _stc.StyledTextCtrl_GotoLine(*args, **kwargs)
+
+    def GotoPos(*args, **kwargs):
+        """GotoPos(int pos)"""
+        return _stc.StyledTextCtrl_GotoPos(*args, **kwargs)
+
+    def SetAnchor(*args, **kwargs):
+        """SetAnchor(int posAnchor)"""
+        return _stc.StyledTextCtrl_SetAnchor(*args, **kwargs)
+
+    def GetCurLine(*args, **kwargs):
+        """GetCurLine(int OUTPUT) -> wxString"""
+        return _stc.StyledTextCtrl_GetCurLine(*args, **kwargs)
+
+    def GetEndStyled(*args, **kwargs):
+        """GetEndStyled() -> int"""
+        return _stc.StyledTextCtrl_GetEndStyled(*args, **kwargs)
+
+    def ConvertEOLs(*args, **kwargs):
+        """ConvertEOLs(int eolMode)"""
+        return _stc.StyledTextCtrl_ConvertEOLs(*args, **kwargs)
+
+    def GetEOLMode(*args, **kwargs):
+        """GetEOLMode() -> int"""
+        return _stc.StyledTextCtrl_GetEOLMode(*args, **kwargs)
+
+    def SetEOLMode(*args, **kwargs):
+        """SetEOLMode(int eolMode)"""
+        return _stc.StyledTextCtrl_SetEOLMode(*args, **kwargs)
+
+    def StartStyling(*args, **kwargs):
+        """StartStyling(int pos, int mask)"""
+        return _stc.StyledTextCtrl_StartStyling(*args, **kwargs)
+
+    def SetStyling(*args, **kwargs):
+        """SetStyling(int length, int style)"""
+        return _stc.StyledTextCtrl_SetStyling(*args, **kwargs)
+
+    def GetBufferedDraw(*args, **kwargs):
+        """GetBufferedDraw() -> bool"""
+        return _stc.StyledTextCtrl_GetBufferedDraw(*args, **kwargs)
+
+    def SetBufferedDraw(*args, **kwargs):
+        """SetBufferedDraw(bool buffered)"""
+        return _stc.StyledTextCtrl_SetBufferedDraw(*args, **kwargs)
+
+    def SetTabWidth(*args, **kwargs):
+        """SetTabWidth(int tabWidth)"""
+        return _stc.StyledTextCtrl_SetTabWidth(*args, **kwargs)
+
+    def GetTabWidth(*args, **kwargs):
+        """GetTabWidth() -> int"""
+        return _stc.StyledTextCtrl_GetTabWidth(*args, **kwargs)
+
+    def SetCodePage(*args, **kwargs):
+        """SetCodePage(int codePage)"""
+        return _stc.StyledTextCtrl_SetCodePage(*args, **kwargs)
+
+    def MarkerDefine(*args, **kwargs):
+        """MarkerDefine(int markerNumber, int markerSymbol, wxColour foreground=wxNullColour, 
+    wxColour background=wxNullColour)"""
+        return _stc.StyledTextCtrl_MarkerDefine(*args, **kwargs)
+
+    def MarkerSetForeground(*args, **kwargs):
+        """MarkerSetForeground(int markerNumber, wxColour fore)"""
+        return _stc.StyledTextCtrl_MarkerSetForeground(*args, **kwargs)
+
+    def MarkerSetBackground(*args, **kwargs):
+        """MarkerSetBackground(int markerNumber, wxColour back)"""
+        return _stc.StyledTextCtrl_MarkerSetBackground(*args, **kwargs)
+
+    def MarkerAdd(*args, **kwargs):
+        """MarkerAdd(int line, int markerNumber) -> int"""
+        return _stc.StyledTextCtrl_MarkerAdd(*args, **kwargs)
+
+    def MarkerDelete(*args, **kwargs):
+        """MarkerDelete(int line, int markerNumber)"""
+        return _stc.StyledTextCtrl_MarkerDelete(*args, **kwargs)
+
+    def MarkerDeleteAll(*args, **kwargs):
+        """MarkerDeleteAll(int markerNumber)"""
+        return _stc.StyledTextCtrl_MarkerDeleteAll(*args, **kwargs)
+
+    def MarkerGet(*args, **kwargs):
+        """MarkerGet(int line) -> int"""
+        return _stc.StyledTextCtrl_MarkerGet(*args, **kwargs)
+
+    def MarkerNext(*args, **kwargs):
+        """MarkerNext(int lineStart, int markerMask) -> int"""
+        return _stc.StyledTextCtrl_MarkerNext(*args, **kwargs)
+
+    def MarkerPrevious(*args, **kwargs):
+        """MarkerPrevious(int lineStart, int markerMask) -> int"""
+        return _stc.StyledTextCtrl_MarkerPrevious(*args, **kwargs)
+
+    def MarkerDefineBitmap(*args, **kwargs):
+        """MarkerDefineBitmap(int markerNumber, wxBitmap bmp)"""
+        return _stc.StyledTextCtrl_MarkerDefineBitmap(*args, **kwargs)
+
+    def SetMarginType(*args, **kwargs):
+        """SetMarginType(int margin, int marginType)"""
+        return _stc.StyledTextCtrl_SetMarginType(*args, **kwargs)
+
+    def GetMarginType(*args, **kwargs):
+        """GetMarginType(int margin) -> int"""
+        return _stc.StyledTextCtrl_GetMarginType(*args, **kwargs)
+
+    def SetMarginWidth(*args, **kwargs):
+        """SetMarginWidth(int margin, int pixelWidth)"""
+        return _stc.StyledTextCtrl_SetMarginWidth(*args, **kwargs)
+
+    def GetMarginWidth(*args, **kwargs):
+        """GetMarginWidth(int margin) -> int"""
+        return _stc.StyledTextCtrl_GetMarginWidth(*args, **kwargs)
+
+    def SetMarginMask(*args, **kwargs):
+        """SetMarginMask(int margin, int mask)"""
+        return _stc.StyledTextCtrl_SetMarginMask(*args, **kwargs)
+
+    def GetMarginMask(*args, **kwargs):
+        """GetMarginMask(int margin) -> int"""
+        return _stc.StyledTextCtrl_GetMarginMask(*args, **kwargs)
+
+    def SetMarginSensitive(*args, **kwargs):
+        """SetMarginSensitive(int margin, bool sensitive)"""
+        return _stc.StyledTextCtrl_SetMarginSensitive(*args, **kwargs)
+
+    def GetMarginSensitive(*args, **kwargs):
+        """GetMarginSensitive(int margin) -> bool"""
+        return _stc.StyledTextCtrl_GetMarginSensitive(*args, **kwargs)
+
+    def StyleClearAll(*args, **kwargs):
+        """StyleClearAll()"""
+        return _stc.StyledTextCtrl_StyleClearAll(*args, **kwargs)
+
+    def StyleSetForeground(*args, **kwargs):
+        """StyleSetForeground(int style, wxColour fore)"""
+        return _stc.StyledTextCtrl_StyleSetForeground(*args, **kwargs)
+
+    def StyleSetBackground(*args, **kwargs):
+        """StyleSetBackground(int style, wxColour back)"""
+        return _stc.StyledTextCtrl_StyleSetBackground(*args, **kwargs)
+
+    def StyleSetBold(*args, **kwargs):
+        """StyleSetBold(int style, bool bold)"""
+        return _stc.StyledTextCtrl_StyleSetBold(*args, **kwargs)
+
+    def StyleSetItalic(*args, **kwargs):
+        """StyleSetItalic(int style, bool italic)"""
+        return _stc.StyledTextCtrl_StyleSetItalic(*args, **kwargs)
+
+    def StyleSetSize(*args, **kwargs):
+        """StyleSetSize(int style, int sizePoints)"""
+        return _stc.StyledTextCtrl_StyleSetSize(*args, **kwargs)
+
+    def StyleSetFaceName(*args, **kwargs):
+        """StyleSetFaceName(int style, wxString fontName)"""
+        return _stc.StyledTextCtrl_StyleSetFaceName(*args, **kwargs)
+
+    def StyleSetEOLFilled(*args, **kwargs):
+        """StyleSetEOLFilled(int style, bool filled)"""
+        return _stc.StyledTextCtrl_StyleSetEOLFilled(*args, **kwargs)
+
+    def StyleResetDefault(*args, **kwargs):
+        """StyleResetDefault()"""
+        return _stc.StyledTextCtrl_StyleResetDefault(*args, **kwargs)
+
+    def StyleSetUnderline(*args, **kwargs):
+        """StyleSetUnderline(int style, bool underline)"""
+        return _stc.StyledTextCtrl_StyleSetUnderline(*args, **kwargs)
+
+    def StyleSetCase(*args, **kwargs):
+        """StyleSetCase(int style, int caseForce)"""
+        return _stc.StyledTextCtrl_StyleSetCase(*args, **kwargs)
+
+    def StyleSetCharacterSet(*args, **kwargs):
+        """StyleSetCharacterSet(int style, int characterSet)"""
+        return _stc.StyledTextCtrl_StyleSetCharacterSet(*args, **kwargs)
+
+    def StyleSetHotSpot(*args, **kwargs):
+        """StyleSetHotSpot(int style, bool hotspot)"""
+        return _stc.StyledTextCtrl_StyleSetHotSpot(*args, **kwargs)
+
+    def SetSelForeground(*args, **kwargs):
+        """SetSelForeground(bool useSetting, wxColour fore)"""
+        return _stc.StyledTextCtrl_SetSelForeground(*args, **kwargs)
+
+    def SetSelBackground(*args, **kwargs):
+        """SetSelBackground(bool useSetting, wxColour back)"""
+        return _stc.StyledTextCtrl_SetSelBackground(*args, **kwargs)
+
+    def SetCaretForeground(*args, **kwargs):
+        """SetCaretForeground(wxColour fore)"""
+        return _stc.StyledTextCtrl_SetCaretForeground(*args, **kwargs)
+
+    def CmdKeyAssign(*args, **kwargs):
+        """CmdKeyAssign(int key, int modifiers, int cmd)"""
+        return _stc.StyledTextCtrl_CmdKeyAssign(*args, **kwargs)
+
+    def CmdKeyClear(*args, **kwargs):
+        """CmdKeyClear(int key, int modifiers)"""
+        return _stc.StyledTextCtrl_CmdKeyClear(*args, **kwargs)
+
+    def CmdKeyClearAll(*args, **kwargs):
+        """CmdKeyClearAll()"""
+        return _stc.StyledTextCtrl_CmdKeyClearAll(*args, **kwargs)
+
+    def SetStyleBytes(*args, **kwargs):
+        """SetStyleBytes(int length, char styleBytes)"""
+        return _stc.StyledTextCtrl_SetStyleBytes(*args, **kwargs)
+
+    def StyleSetVisible(*args, **kwargs):
+        """StyleSetVisible(int style, bool visible)"""
+        return _stc.StyledTextCtrl_StyleSetVisible(*args, **kwargs)
+
+    def GetCaretPeriod(*args, **kwargs):
+        """GetCaretPeriod() -> int"""
+        return _stc.StyledTextCtrl_GetCaretPeriod(*args, **kwargs)
+
+    def SetCaretPeriod(*args, **kwargs):
+        """SetCaretPeriod(int periodMilliseconds)"""
+        return _stc.StyledTextCtrl_SetCaretPeriod(*args, **kwargs)
+
+    def SetWordChars(*args, **kwargs):
+        """SetWordChars(wxString characters)"""
+        return _stc.StyledTextCtrl_SetWordChars(*args, **kwargs)
+
+    def BeginUndoAction(*args, **kwargs):
+        """BeginUndoAction()"""
+        return _stc.StyledTextCtrl_BeginUndoAction(*args, **kwargs)
+
+    def EndUndoAction(*args, **kwargs):
+        """EndUndoAction()"""
+        return _stc.StyledTextCtrl_EndUndoAction(*args, **kwargs)
+
+    def IndicatorSetStyle(*args, **kwargs):
+        """IndicatorSetStyle(int indic, int style)"""
+        return _stc.StyledTextCtrl_IndicatorSetStyle(*args, **kwargs)
+
+    def IndicatorGetStyle(*args, **kwargs):
+        """IndicatorGetStyle(int indic) -> int"""
+        return _stc.StyledTextCtrl_IndicatorGetStyle(*args, **kwargs)
+
+    def IndicatorSetForeground(*args, **kwargs):
+        """IndicatorSetForeground(int indic, wxColour fore)"""
+        return _stc.StyledTextCtrl_IndicatorSetForeground(*args, **kwargs)
+
+    def IndicatorGetForeground(*args, **kwargs):
+        """IndicatorGetForeground(int indic) -> wxColour"""
+        return _stc.StyledTextCtrl_IndicatorGetForeground(*args, **kwargs)
+
+    def SetWhitespaceForeground(*args, **kwargs):
+        """SetWhitespaceForeground(bool useSetting, wxColour fore)"""
+        return _stc.StyledTextCtrl_SetWhitespaceForeground(*args, **kwargs)
+
+    def SetWhitespaceBackground(*args, **kwargs):
+        """SetWhitespaceBackground(bool useSetting, wxColour back)"""
+        return _stc.StyledTextCtrl_SetWhitespaceBackground(*args, **kwargs)
+
+    def SetStyleBits(*args, **kwargs):
+        """SetStyleBits(int bits)"""
+        return _stc.StyledTextCtrl_SetStyleBits(*args, **kwargs)
+
+    def GetStyleBits(*args, **kwargs):
+        """GetStyleBits() -> int"""
+        return _stc.StyledTextCtrl_GetStyleBits(*args, **kwargs)
+
+    def SetLineState(*args, **kwargs):
+        """SetLineState(int line, int state)"""
+        return _stc.StyledTextCtrl_SetLineState(*args, **kwargs)
+
+    def GetLineState(*args, **kwargs):
+        """GetLineState(int line) -> int"""
+        return _stc.StyledTextCtrl_GetLineState(*args, **kwargs)
+
+    def GetMaxLineState(*args, **kwargs):
+        """GetMaxLineState() -> int"""
+        return _stc.StyledTextCtrl_GetMaxLineState(*args, **kwargs)
+
+    def GetCaretLineVisible(*args, **kwargs):
+        """GetCaretLineVisible() -> bool"""
+        return _stc.StyledTextCtrl_GetCaretLineVisible(*args, **kwargs)
+
+    def SetCaretLineVisible(*args, **kwargs):
+        """SetCaretLineVisible(bool show)"""
+        return _stc.StyledTextCtrl_SetCaretLineVisible(*args, **kwargs)
+
+    def GetCaretLineBack(*args, **kwargs):
+        """GetCaretLineBack() -> wxColour"""
+        return _stc.StyledTextCtrl_GetCaretLineBack(*args, **kwargs)
+
+    def SetCaretLineBack(*args, **kwargs):
+        """SetCaretLineBack(wxColour back)"""
+        return _stc.StyledTextCtrl_SetCaretLineBack(*args, **kwargs)
+
+    def StyleSetChangeable(*args, **kwargs):
+        """StyleSetChangeable(int style, bool changeable)"""
+        return _stc.StyledTextCtrl_StyleSetChangeable(*args, **kwargs)
+
+    def AutoCompShow(*args, **kwargs):
+        """AutoCompShow(int lenEntered, wxString itemList)"""
+        return _stc.StyledTextCtrl_AutoCompShow(*args, **kwargs)
+
+    def AutoCompCancel(*args, **kwargs):
+        """AutoCompCancel()"""
+        return _stc.StyledTextCtrl_AutoCompCancel(*args, **kwargs)
+
+    def AutoCompActive(*args, **kwargs):
+        """AutoCompActive() -> bool"""
+        return _stc.StyledTextCtrl_AutoCompActive(*args, **kwargs)
+
+    def AutoCompPosStart(*args, **kwargs):
+        """AutoCompPosStart() -> int"""
+        return _stc.StyledTextCtrl_AutoCompPosStart(*args, **kwargs)
+
+    def AutoCompComplete(*args, **kwargs):
+        """AutoCompComplete()"""
+        return _stc.StyledTextCtrl_AutoCompComplete(*args, **kwargs)
+
+    def AutoCompStops(*args, **kwargs):
+        """AutoCompStops(wxString characterSet)"""
+        return _stc.StyledTextCtrl_AutoCompStops(*args, **kwargs)
+
+    def AutoCompSetSeparator(*args, **kwargs):
+        """AutoCompSetSeparator(int separatorCharacter)"""
+        return _stc.StyledTextCtrl_AutoCompSetSeparator(*args, **kwargs)
+
+    def AutoCompGetSeparator(*args, **kwargs):
+        """AutoCompGetSeparator() -> int"""
+        return _stc.StyledTextCtrl_AutoCompGetSeparator(*args, **kwargs)
+
+    def AutoCompSelect(*args, **kwargs):
+        """AutoCompSelect(wxString text)"""
+        return _stc.StyledTextCtrl_AutoCompSelect(*args, **kwargs)
+
+    def AutoCompSetCancelAtStart(*args, **kwargs):
+        """AutoCompSetCancelAtStart(bool cancel)"""
+        return _stc.StyledTextCtrl_AutoCompSetCancelAtStart(*args, **kwargs)
+
+    def AutoCompGetCancelAtStart(*args, **kwargs):
+        """AutoCompGetCancelAtStart() -> bool"""
+        return _stc.StyledTextCtrl_AutoCompGetCancelAtStart(*args, **kwargs)
+
+    def AutoCompSetFillUps(*args, **kwargs):
+        """AutoCompSetFillUps(wxString characterSet)"""
+        return _stc.StyledTextCtrl_AutoCompSetFillUps(*args, **kwargs)
+
+    def AutoCompSetChooseSingle(*args, **kwargs):
+        """AutoCompSetChooseSingle(bool chooseSingle)"""
+        return _stc.StyledTextCtrl_AutoCompSetChooseSingle(*args, **kwargs)
+
+    def AutoCompGetChooseSingle(*args, **kwargs):
+        """AutoCompGetChooseSingle() -> bool"""
+        return _stc.StyledTextCtrl_AutoCompGetChooseSingle(*args, **kwargs)
+
+    def AutoCompSetIgnoreCase(*args, **kwargs):
+        """AutoCompSetIgnoreCase(bool ignoreCase)"""
+        return _stc.StyledTextCtrl_AutoCompSetIgnoreCase(*args, **kwargs)
+
+    def AutoCompGetIgnoreCase(*args, **kwargs):
+        """AutoCompGetIgnoreCase() -> bool"""
+        return _stc.StyledTextCtrl_AutoCompGetIgnoreCase(*args, **kwargs)
+
+    def UserListShow(*args, **kwargs):
+        """UserListShow(int listType, wxString itemList)"""
+        return _stc.StyledTextCtrl_UserListShow(*args, **kwargs)
+
+    def AutoCompSetAutoHide(*args, **kwargs):
+        """AutoCompSetAutoHide(bool autoHide)"""
+        return _stc.StyledTextCtrl_AutoCompSetAutoHide(*args, **kwargs)
+
+    def AutoCompGetAutoHide(*args, **kwargs):
+        """AutoCompGetAutoHide() -> bool"""
+        return _stc.StyledTextCtrl_AutoCompGetAutoHide(*args, **kwargs)
+
+    def AutoCompSetDropRestOfWord(*args, **kwargs):
+        """AutoCompSetDropRestOfWord(bool dropRestOfWord)"""
+        return _stc.StyledTextCtrl_AutoCompSetDropRestOfWord(*args, **kwargs)
+
+    def AutoCompGetDropRestOfWord(*args, **kwargs):
+        """AutoCompGetDropRestOfWord() -> bool"""
+        return _stc.StyledTextCtrl_AutoCompGetDropRestOfWord(*args, **kwargs)
+
+    def RegisterImage(*args, **kwargs):
+        """RegisterImage(int type, wxBitmap bmp)"""
+        return _stc.StyledTextCtrl_RegisterImage(*args, **kwargs)
+
+    def ClearRegisteredImages(*args, **kwargs):
+        """ClearRegisteredImages()"""
+        return _stc.StyledTextCtrl_ClearRegisteredImages(*args, **kwargs)
+
+    def AutoCompGetTypeSeparator(*args, **kwargs):
+        """AutoCompGetTypeSeparator() -> int"""
+        return _stc.StyledTextCtrl_AutoCompGetTypeSeparator(*args, **kwargs)
+
+    def AutoCompSetTypeSeparator(*args, **kwargs):
+        """AutoCompSetTypeSeparator(int separatorCharacter)"""
+        return _stc.StyledTextCtrl_AutoCompSetTypeSeparator(*args, **kwargs)
+
+    def SetIndent(*args, **kwargs):
+        """SetIndent(int indentSize)"""
+        return _stc.StyledTextCtrl_SetIndent(*args, **kwargs)
+
+    def GetIndent(*args, **kwargs):
+        """GetIndent() -> int"""
+        return _stc.StyledTextCtrl_GetIndent(*args, **kwargs)
+
+    def SetUseTabs(*args, **kwargs):
+        """SetUseTabs(bool useTabs)"""
+        return _stc.StyledTextCtrl_SetUseTabs(*args, **kwargs)
+
+    def GetUseTabs(*args, **kwargs):
+        """GetUseTabs() -> bool"""
+        return _stc.StyledTextCtrl_GetUseTabs(*args, **kwargs)
+
+    def SetLineIndentation(*args, **kwargs):
+        """SetLineIndentation(int line, int indentSize)"""
+        return _stc.StyledTextCtrl_SetLineIndentation(*args, **kwargs)
+
+    def GetLineIndentation(*args, **kwargs):
+        """GetLineIndentation(int line) -> int"""
+        return _stc.StyledTextCtrl_GetLineIndentation(*args, **kwargs)
+
+    def GetLineIndentPosition(*args, **kwargs):
+        """GetLineIndentPosition(int line) -> int"""
+        return _stc.StyledTextCtrl_GetLineIndentPosition(*args, **kwargs)
+
+    def GetColumn(*args, **kwargs):
+        """GetColumn(int pos) -> int"""
+        return _stc.StyledTextCtrl_GetColumn(*args, **kwargs)
+
+    def SetUseHorizontalScrollBar(*args, **kwargs):
+        """SetUseHorizontalScrollBar(bool show)"""
+        return _stc.StyledTextCtrl_SetUseHorizontalScrollBar(*args, **kwargs)
+
+    def GetUseHorizontalScrollBar(*args, **kwargs):
+        """GetUseHorizontalScrollBar() -> bool"""
+        return _stc.StyledTextCtrl_GetUseHorizontalScrollBar(*args, **kwargs)
+
+    def SetIndentationGuides(*args, **kwargs):
+        """SetIndentationGuides(bool show)"""
+        return _stc.StyledTextCtrl_SetIndentationGuides(*args, **kwargs)
+
+    def GetIndentationGuides(*args, **kwargs):
+        """GetIndentationGuides() -> bool"""
+        return _stc.StyledTextCtrl_GetIndentationGuides(*args, **kwargs)
+
+    def SetHighlightGuide(*args, **kwargs):
+        """SetHighlightGuide(int column)"""
+        return _stc.StyledTextCtrl_SetHighlightGuide(*args, **kwargs)
+
+    def GetHighlightGuide(*args, **kwargs):
+        """GetHighlightGuide() -> int"""
+        return _stc.StyledTextCtrl_GetHighlightGuide(*args, **kwargs)
+
+    def GetLineEndPosition(*args, **kwargs):
+        """GetLineEndPosition(int line) -> int"""
+        return _stc.StyledTextCtrl_GetLineEndPosition(*args, **kwargs)
+
+    def GetCodePage(*args, **kwargs):
+        """GetCodePage() -> int"""
+        return _stc.StyledTextCtrl_GetCodePage(*args, **kwargs)
+
+    def GetCaretForeground(*args, **kwargs):
+        """GetCaretForeground() -> wxColour"""
+        return _stc.StyledTextCtrl_GetCaretForeground(*args, **kwargs)
+
+    def GetReadOnly(*args, **kwargs):
+        """GetReadOnly() -> bool"""
+        return _stc.StyledTextCtrl_GetReadOnly(*args, **kwargs)
+
+    def SetCurrentPos(*args, **kwargs):
+        """SetCurrentPos(int pos)"""
+        return _stc.StyledTextCtrl_SetCurrentPos(*args, **kwargs)
+
+    def SetSelectionStart(*args, **kwargs):
+        """SetSelectionStart(int pos)"""
+        return _stc.StyledTextCtrl_SetSelectionStart(*args, **kwargs)
+
+    def GetSelectionStart(*args, **kwargs):
+        """GetSelectionStart() -> int"""
+        return _stc.StyledTextCtrl_GetSelectionStart(*args, **kwargs)
+
+    def SetSelectionEnd(*args, **kwargs):
+        """SetSelectionEnd(int pos)"""
+        return _stc.StyledTextCtrl_SetSelectionEnd(*args, **kwargs)
+
+    def GetSelectionEnd(*args, **kwargs):
+        """GetSelectionEnd() -> int"""
+        return _stc.StyledTextCtrl_GetSelectionEnd(*args, **kwargs)
+
+    def SetPrintMagnification(*args, **kwargs):
+        """SetPrintMagnification(int magnification)"""
+        return _stc.StyledTextCtrl_SetPrintMagnification(*args, **kwargs)
+
+    def GetPrintMagnification(*args, **kwargs):
+        """GetPrintMagnification() -> int"""
+        return _stc.StyledTextCtrl_GetPrintMagnification(*args, **kwargs)
+
+    def SetPrintColourMode(*args, **kwargs):
+        """SetPrintColourMode(int mode)"""
+        return _stc.StyledTextCtrl_SetPrintColourMode(*args, **kwargs)
+
+    def GetPrintColourMode(*args, **kwargs):
+        """GetPrintColourMode() -> int"""
+        return _stc.StyledTextCtrl_GetPrintColourMode(*args, **kwargs)
+
+    def FindText(*args, **kwargs):
+        """FindText(int minPos, int maxPos, wxString text, int flags=0) -> int"""
+        return _stc.StyledTextCtrl_FindText(*args, **kwargs)
+
+    def FormatRange(*args, **kwargs):
+        """FormatRange(bool doDraw, int startPos, int endPos, wxDC draw, wxDC target, 
+    Rect renderRect, Rect pageRect) -> int"""
+        return _stc.StyledTextCtrl_FormatRange(*args, **kwargs)
+
+    def GetFirstVisibleLine(*args, **kwargs):
+        """GetFirstVisibleLine() -> int"""
+        return _stc.StyledTextCtrl_GetFirstVisibleLine(*args, **kwargs)
+
+    def GetLine(*args, **kwargs):
+        """GetLine(int line) -> wxString"""
+        return _stc.StyledTextCtrl_GetLine(*args, **kwargs)
+
+    def GetLineCount(*args, **kwargs):
+        """GetLineCount() -> int"""
+        return _stc.StyledTextCtrl_GetLineCount(*args, **kwargs)
+
+    def SetMarginLeft(*args, **kwargs):
+        """SetMarginLeft(int pixelWidth)"""
+        return _stc.StyledTextCtrl_SetMarginLeft(*args, **kwargs)
+
+    def GetMarginLeft(*args, **kwargs):
+        """GetMarginLeft() -> int"""
+        return _stc.StyledTextCtrl_GetMarginLeft(*args, **kwargs)
+
+    def SetMarginRight(*args, **kwargs):
+        """SetMarginRight(int pixelWidth)"""
+        return _stc.StyledTextCtrl_SetMarginRight(*args, **kwargs)
+
+    def GetMarginRight(*args, **kwargs):
+        """GetMarginRight() -> int"""
+        return _stc.StyledTextCtrl_GetMarginRight(*args, **kwargs)
+
+    def GetModify(*args, **kwargs):
+        """GetModify() -> bool"""
+        return _stc.StyledTextCtrl_GetModify(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(int start, int end)"""
+        return _stc.StyledTextCtrl_SetSelection(*args, **kwargs)
+
+    def GetSelectedText(*args, **kwargs):
+        """GetSelectedText() -> wxString"""
+        return _stc.StyledTextCtrl_GetSelectedText(*args, **kwargs)
+
+    def GetTextRange(*args, **kwargs):
+        """GetTextRange(int startPos, int endPos) -> wxString"""
+        return _stc.StyledTextCtrl_GetTextRange(*args, **kwargs)
+
+    def HideSelection(*args, **kwargs):
+        """HideSelection(bool normal)"""
+        return _stc.StyledTextCtrl_HideSelection(*args, **kwargs)
+
+    def LineFromPosition(*args, **kwargs):
+        """LineFromPosition(int pos) -> int"""
+        return _stc.StyledTextCtrl_LineFromPosition(*args, **kwargs)
+
+    def PositionFromLine(*args, **kwargs):
+        """PositionFromLine(int line) -> int"""
+        return _stc.StyledTextCtrl_PositionFromLine(*args, **kwargs)
+
+    def LineScroll(*args, **kwargs):
+        """LineScroll(int columns, int lines)"""
+        return _stc.StyledTextCtrl_LineScroll(*args, **kwargs)
+
+    def EnsureCaretVisible(*args, **kwargs):
+        """EnsureCaretVisible()"""
+        return _stc.StyledTextCtrl_EnsureCaretVisible(*args, **kwargs)
+
+    def ReplaceSelection(*args, **kwargs):
+        """ReplaceSelection(wxString text)"""
+        return _stc.StyledTextCtrl_ReplaceSelection(*args, **kwargs)
+
+    def SetReadOnly(*args, **kwargs):
+        """SetReadOnly(bool readOnly)"""
+        return _stc.StyledTextCtrl_SetReadOnly(*args, **kwargs)
+
+    def CanPaste(*args, **kwargs):
+        """CanPaste() -> bool"""
+        return _stc.StyledTextCtrl_CanPaste(*args, **kwargs)
+
+    def CanUndo(*args, **kwargs):
+        """CanUndo() -> bool"""
+        return _stc.StyledTextCtrl_CanUndo(*args, **kwargs)
+
+    def EmptyUndoBuffer(*args, **kwargs):
+        """EmptyUndoBuffer()"""
+        return _stc.StyledTextCtrl_EmptyUndoBuffer(*args, **kwargs)
+
+    def Undo(*args, **kwargs):
+        """Undo()"""
+        return _stc.StyledTextCtrl_Undo(*args, **kwargs)
+
+    def Cut(*args, **kwargs):
+        """Cut()"""
+        return _stc.StyledTextCtrl_Cut(*args, **kwargs)
+
+    def Copy(*args, **kwargs):
+        """Copy()"""
+        return _stc.StyledTextCtrl_Copy(*args, **kwargs)
+
+    def Paste(*args, **kwargs):
+        """Paste()"""
+        return _stc.StyledTextCtrl_Paste(*args, **kwargs)
+
+    def Clear(*args, **kwargs):
+        """Clear()"""
+        return _stc.StyledTextCtrl_Clear(*args, **kwargs)
+
+    def SetText(*args, **kwargs):
+        """SetText(wxString text)"""
+        return _stc.StyledTextCtrl_SetText(*args, **kwargs)
+
+    def GetText(*args, **kwargs):
+        """GetText() -> wxString"""
+        return _stc.StyledTextCtrl_GetText(*args, **kwargs)
+
+    def GetTextLength(*args, **kwargs):
+        """GetTextLength() -> int"""
+        return _stc.StyledTextCtrl_GetTextLength(*args, **kwargs)
+
+    def SetOvertype(*args, **kwargs):
+        """SetOvertype(bool overtype)"""
+        return _stc.StyledTextCtrl_SetOvertype(*args, **kwargs)
+
+    def GetOvertype(*args, **kwargs):
+        """GetOvertype() -> bool"""
+        return _stc.StyledTextCtrl_GetOvertype(*args, **kwargs)
+
+    def SetCaretWidth(*args, **kwargs):
+        """SetCaretWidth(int pixelWidth)"""
+        return _stc.StyledTextCtrl_SetCaretWidth(*args, **kwargs)
+
+    def GetCaretWidth(*args, **kwargs):
+        """GetCaretWidth() -> int"""
+        return _stc.StyledTextCtrl_GetCaretWidth(*args, **kwargs)
+
+    def SetTargetStart(*args, **kwargs):
+        """SetTargetStart(int pos)"""
+        return _stc.StyledTextCtrl_SetTargetStart(*args, **kwargs)
+
+    def GetTargetStart(*args, **kwargs):
+        """GetTargetStart() -> int"""
+        return _stc.StyledTextCtrl_GetTargetStart(*args, **kwargs)
+
+    def SetTargetEnd(*args, **kwargs):
+        """SetTargetEnd(int pos)"""
+        return _stc.StyledTextCtrl_SetTargetEnd(*args, **kwargs)
+
+    def GetTargetEnd(*args, **kwargs):
+        """GetTargetEnd() -> int"""
+        return _stc.StyledTextCtrl_GetTargetEnd(*args, **kwargs)
+
+    def ReplaceTarget(*args, **kwargs):
+        """ReplaceTarget(wxString text) -> int"""
+        return _stc.StyledTextCtrl_ReplaceTarget(*args, **kwargs)
+
+    def ReplaceTargetRE(*args, **kwargs):
+        """ReplaceTargetRE(wxString text) -> int"""
+        return _stc.StyledTextCtrl_ReplaceTargetRE(*args, **kwargs)
+
+    def SearchInTarget(*args, **kwargs):
+        """SearchInTarget(wxString text) -> int"""
+        return _stc.StyledTextCtrl_SearchInTarget(*args, **kwargs)
+
+    def SetSearchFlags(*args, **kwargs):
+        """SetSearchFlags(int flags)"""
+        return _stc.StyledTextCtrl_SetSearchFlags(*args, **kwargs)
+
+    def GetSearchFlags(*args, **kwargs):
+        """GetSearchFlags() -> int"""
+        return _stc.StyledTextCtrl_GetSearchFlags(*args, **kwargs)
+
+    def CallTipShow(*args, **kwargs):
+        """CallTipShow(int pos, wxString definition)"""
+        return _stc.StyledTextCtrl_CallTipShow(*args, **kwargs)
+
+    def CallTipCancel(*args, **kwargs):
+        """CallTipCancel()"""
+        return _stc.StyledTextCtrl_CallTipCancel(*args, **kwargs)
+
+    def CallTipActive(*args, **kwargs):
+        """CallTipActive() -> bool"""
+        return _stc.StyledTextCtrl_CallTipActive(*args, **kwargs)
+
+    def CallTipPosAtStart(*args, **kwargs):
+        """CallTipPosAtStart() -> int"""
+        return _stc.StyledTextCtrl_CallTipPosAtStart(*args, **kwargs)
+
+    def CallTipSetHighlight(*args, **kwargs):
+        """CallTipSetHighlight(int start, int end)"""
+        return _stc.StyledTextCtrl_CallTipSetHighlight(*args, **kwargs)
+
+    def CallTipSetBackground(*args, **kwargs):
+        """CallTipSetBackground(wxColour back)"""
+        return _stc.StyledTextCtrl_CallTipSetBackground(*args, **kwargs)
+
+    def CallTipSetForeground(*args, **kwargs):
+        """CallTipSetForeground(wxColour fore)"""
+        return _stc.StyledTextCtrl_CallTipSetForeground(*args, **kwargs)
+
+    def CallTipSetForegroundHighlight(*args, **kwargs):
+        """CallTipSetForegroundHighlight(wxColour fore)"""
+        return _stc.StyledTextCtrl_CallTipSetForegroundHighlight(*args, **kwargs)
+
+    def VisibleFromDocLine(*args, **kwargs):
+        """VisibleFromDocLine(int line) -> int"""
+        return _stc.StyledTextCtrl_VisibleFromDocLine(*args, **kwargs)
+
+    def DocLineFromVisible(*args, **kwargs):
+        """DocLineFromVisible(int lineDisplay) -> int"""
+        return _stc.StyledTextCtrl_DocLineFromVisible(*args, **kwargs)
+
+    def SetFoldLevel(*args, **kwargs):
+        """SetFoldLevel(int line, int level)"""
+        return _stc.StyledTextCtrl_SetFoldLevel(*args, **kwargs)
+
+    def GetFoldLevel(*args, **kwargs):
+        """GetFoldLevel(int line) -> int"""
+        return _stc.StyledTextCtrl_GetFoldLevel(*args, **kwargs)
+
+    def GetLastChild(*args, **kwargs):
+        """GetLastChild(int line, int level) -> int"""
+        return _stc.StyledTextCtrl_GetLastChild(*args, **kwargs)
+
+    def GetFoldParent(*args, **kwargs):
+        """GetFoldParent(int line) -> int"""
+        return _stc.StyledTextCtrl_GetFoldParent(*args, **kwargs)
+
+    def ShowLines(*args, **kwargs):
+        """ShowLines(int lineStart, int lineEnd)"""
+        return _stc.StyledTextCtrl_ShowLines(*args, **kwargs)
+
+    def HideLines(*args, **kwargs):
+        """HideLines(int lineStart, int lineEnd)"""
+        return _stc.StyledTextCtrl_HideLines(*args, **kwargs)
+
+    def GetLineVisible(*args, **kwargs):
+        """GetLineVisible(int line) -> bool"""
+        return _stc.StyledTextCtrl_GetLineVisible(*args, **kwargs)
+
+    def SetFoldExpanded(*args, **kwargs):
+        """SetFoldExpanded(int line, bool expanded)"""
+        return _stc.StyledTextCtrl_SetFoldExpanded(*args, **kwargs)
+
+    def GetFoldExpanded(*args, **kwargs):
+        """GetFoldExpanded(int line) -> bool"""
+        return _stc.StyledTextCtrl_GetFoldExpanded(*args, **kwargs)
+
+    def ToggleFold(*args, **kwargs):
+        """ToggleFold(int line)"""
+        return _stc.StyledTextCtrl_ToggleFold(*args, **kwargs)
+
+    def EnsureVisible(*args, **kwargs):
+        """EnsureVisible(int line)"""
+        return _stc.StyledTextCtrl_EnsureVisible(*args, **kwargs)
+
+    def SetFoldFlags(*args, **kwargs):
+        """SetFoldFlags(int flags)"""
+        return _stc.StyledTextCtrl_SetFoldFlags(*args, **kwargs)
+
+    def EnsureVisibleEnforcePolicy(*args, **kwargs):
+        """EnsureVisibleEnforcePolicy(int line)"""
+        return _stc.StyledTextCtrl_EnsureVisibleEnforcePolicy(*args, **kwargs)
+
+    def SetTabIndents(*args, **kwargs):
+        """SetTabIndents(bool tabIndents)"""
+        return _stc.StyledTextCtrl_SetTabIndents(*args, **kwargs)
+
+    def GetTabIndents(*args, **kwargs):
+        """GetTabIndents() -> bool"""
+        return _stc.StyledTextCtrl_GetTabIndents(*args, **kwargs)
+
+    def SetBackSpaceUnIndents(*args, **kwargs):
+        """SetBackSpaceUnIndents(bool bsUnIndents)"""
+        return _stc.StyledTextCtrl_SetBackSpaceUnIndents(*args, **kwargs)
+
+    def GetBackSpaceUnIndents(*args, **kwargs):
+        """GetBackSpaceUnIndents() -> bool"""
+        return _stc.StyledTextCtrl_GetBackSpaceUnIndents(*args, **kwargs)
+
+    def SetMouseDwellTime(*args, **kwargs):
+        """SetMouseDwellTime(int periodMilliseconds)"""
+        return _stc.StyledTextCtrl_SetMouseDwellTime(*args, **kwargs)
+
+    def GetMouseDwellTime(*args, **kwargs):
+        """GetMouseDwellTime() -> int"""
+        return _stc.StyledTextCtrl_GetMouseDwellTime(*args, **kwargs)
+
+    def WordStartPosition(*args, **kwargs):
+        """WordStartPosition(int pos, bool onlyWordCharacters) -> int"""
+        return _stc.StyledTextCtrl_WordStartPosition(*args, **kwargs)
+
+    def WordEndPosition(*args, **kwargs):
+        """WordEndPosition(int pos, bool onlyWordCharacters) -> int"""
+        return _stc.StyledTextCtrl_WordEndPosition(*args, **kwargs)
+
+    def SetWrapMode(*args, **kwargs):
+        """SetWrapMode(int mode)"""
+        return _stc.StyledTextCtrl_SetWrapMode(*args, **kwargs)
+
+    def GetWrapMode(*args, **kwargs):
+        """GetWrapMode() -> int"""
+        return _stc.StyledTextCtrl_GetWrapMode(*args, **kwargs)
+
+    def SetLayoutCache(*args, **kwargs):
+        """SetLayoutCache(int mode)"""
+        return _stc.StyledTextCtrl_SetLayoutCache(*args, **kwargs)
+
+    def GetLayoutCache(*args, **kwargs):
+        """GetLayoutCache() -> int"""
+        return _stc.StyledTextCtrl_GetLayoutCache(*args, **kwargs)
+
+    def SetScrollWidth(*args, **kwargs):
+        """SetScrollWidth(int pixelWidth)"""
+        return _stc.StyledTextCtrl_SetScrollWidth(*args, **kwargs)
+
+    def GetScrollWidth(*args, **kwargs):
+        """GetScrollWidth() -> int"""
+        return _stc.StyledTextCtrl_GetScrollWidth(*args, **kwargs)
+
+    def TextWidth(*args, **kwargs):
+        """TextWidth(int style, wxString text) -> int"""
+        return _stc.StyledTextCtrl_TextWidth(*args, **kwargs)
+
+    def SetEndAtLastLine(*args, **kwargs):
+        """SetEndAtLastLine(bool endAtLastLine)"""
+        return _stc.StyledTextCtrl_SetEndAtLastLine(*args, **kwargs)
+
+    def GetEndAtLastLine(*args, **kwargs):
+        """GetEndAtLastLine() -> int"""
+        return _stc.StyledTextCtrl_GetEndAtLastLine(*args, **kwargs)
+
+    def TextHeight(*args, **kwargs):
+        """TextHeight(int line) -> int"""
+        return _stc.StyledTextCtrl_TextHeight(*args, **kwargs)
+
+    def SetUseVerticalScrollBar(*args, **kwargs):
+        """SetUseVerticalScrollBar(bool show)"""
+        return _stc.StyledTextCtrl_SetUseVerticalScrollBar(*args, **kwargs)
+
+    def GetUseVerticalScrollBar(*args, **kwargs):
+        """GetUseVerticalScrollBar() -> bool"""
+        return _stc.StyledTextCtrl_GetUseVerticalScrollBar(*args, **kwargs)
+
+    def AppendText(*args, **kwargs):
+        """AppendText(int length, wxString text)"""
+        return _stc.StyledTextCtrl_AppendText(*args, **kwargs)
+
+    def GetTwoPhaseDraw(*args, **kwargs):
+        """GetTwoPhaseDraw() -> bool"""
+        return _stc.StyledTextCtrl_GetTwoPhaseDraw(*args, **kwargs)
+
+    def SetTwoPhaseDraw(*args, **kwargs):
+        """SetTwoPhaseDraw(bool twoPhase)"""
+        return _stc.StyledTextCtrl_SetTwoPhaseDraw(*args, **kwargs)
+
+    def TargetFromSelection(*args, **kwargs):
+        """TargetFromSelection()"""
+        return _stc.StyledTextCtrl_TargetFromSelection(*args, **kwargs)
+
+    def LinesJoin(*args, **kwargs):
+        """LinesJoin()"""
+        return _stc.StyledTextCtrl_LinesJoin(*args, **kwargs)
+
+    def LinesSplit(*args, **kwargs):
+        """LinesSplit(int pixelWidth)"""
+        return _stc.StyledTextCtrl_LinesSplit(*args, **kwargs)
+
+    def SetFoldMarginColour(*args, **kwargs):
+        """SetFoldMarginColour(bool useSetting, wxColour back)"""
+        return _stc.StyledTextCtrl_SetFoldMarginColour(*args, **kwargs)
+
+    def SetFoldMarginHiColour(*args, **kwargs):
+        """SetFoldMarginHiColour(bool useSetting, wxColour fore)"""
+        return _stc.StyledTextCtrl_SetFoldMarginHiColour(*args, **kwargs)
+
+    def LineDuplicate(*args, **kwargs):
+        """LineDuplicate()"""
+        return _stc.StyledTextCtrl_LineDuplicate(*args, **kwargs)
+
+    def HomeDisplay(*args, **kwargs):
+        """HomeDisplay()"""
+        return _stc.StyledTextCtrl_HomeDisplay(*args, **kwargs)
+
+    def HomeDisplayExtend(*args, **kwargs):
+        """HomeDisplayExtend()"""
+        return _stc.StyledTextCtrl_HomeDisplayExtend(*args, **kwargs)
+
+    def LineEndDisplay(*args, **kwargs):
+        """LineEndDisplay()"""
+        return _stc.StyledTextCtrl_LineEndDisplay(*args, **kwargs)
+
+    def LineEndDisplayExtend(*args, **kwargs):
+        """LineEndDisplayExtend()"""
+        return _stc.StyledTextCtrl_LineEndDisplayExtend(*args, **kwargs)
+
+    def LineCopy(*args, **kwargs):
+        """LineCopy()"""
+        return _stc.StyledTextCtrl_LineCopy(*args, **kwargs)
+
+    def MoveCaretInsideView(*args, **kwargs):
+        """MoveCaretInsideView()"""
+        return _stc.StyledTextCtrl_MoveCaretInsideView(*args, **kwargs)
+
+    def LineLength(*args, **kwargs):
+        """LineLength(int line) -> int"""
+        return _stc.StyledTextCtrl_LineLength(*args, **kwargs)
+
+    def BraceHighlight(*args, **kwargs):
+        """BraceHighlight(int pos1, int pos2)"""
+        return _stc.StyledTextCtrl_BraceHighlight(*args, **kwargs)
+
+    def BraceBadLight(*args, **kwargs):
+        """BraceBadLight(int pos)"""
+        return _stc.StyledTextCtrl_BraceBadLight(*args, **kwargs)
+
+    def BraceMatch(*args, **kwargs):
+        """BraceMatch(int pos) -> int"""
+        return _stc.StyledTextCtrl_BraceMatch(*args, **kwargs)
+
+    def GetViewEOL(*args, **kwargs):
+        """GetViewEOL() -> bool"""
+        return _stc.StyledTextCtrl_GetViewEOL(*args, **kwargs)
+
+    def SetViewEOL(*args, **kwargs):
+        """SetViewEOL(bool visible)"""
+        return _stc.StyledTextCtrl_SetViewEOL(*args, **kwargs)
+
+    def GetDocPointer(*args, **kwargs):
+        """GetDocPointer() -> void"""
+        return _stc.StyledTextCtrl_GetDocPointer(*args, **kwargs)
+
+    def SetDocPointer(*args, **kwargs):
+        """SetDocPointer(void docPointer)"""
+        return _stc.StyledTextCtrl_SetDocPointer(*args, **kwargs)
+
+    def SetModEventMask(*args, **kwargs):
+        """SetModEventMask(int mask)"""
+        return _stc.StyledTextCtrl_SetModEventMask(*args, **kwargs)
+
+    def GetEdgeColumn(*args, **kwargs):
+        """GetEdgeColumn() -> int"""
+        return _stc.StyledTextCtrl_GetEdgeColumn(*args, **kwargs)
+
+    def SetEdgeColumn(*args, **kwargs):
+        """SetEdgeColumn(int column)"""
+        return _stc.StyledTextCtrl_SetEdgeColumn(*args, **kwargs)
+
+    def GetEdgeMode(*args, **kwargs):
+        """GetEdgeMode() -> int"""
+        return _stc.StyledTextCtrl_GetEdgeMode(*args, **kwargs)
+
+    def SetEdgeMode(*args, **kwargs):
+        """SetEdgeMode(int mode)"""
+        return _stc.StyledTextCtrl_SetEdgeMode(*args, **kwargs)
+
+    def GetEdgeColour(*args, **kwargs):
+        """GetEdgeColour() -> wxColour"""
+        return _stc.StyledTextCtrl_GetEdgeColour(*args, **kwargs)
+
+    def SetEdgeColour(*args, **kwargs):
+        """SetEdgeColour(wxColour edgeColour)"""
+        return _stc.StyledTextCtrl_SetEdgeColour(*args, **kwargs)
+
+    def SearchAnchor(*args, **kwargs):
+        """SearchAnchor()"""
+        return _stc.StyledTextCtrl_SearchAnchor(*args, **kwargs)
+
+    def SearchNext(*args, **kwargs):
+        """SearchNext(int flags, wxString text) -> int"""
+        return _stc.StyledTextCtrl_SearchNext(*args, **kwargs)
+
+    def SearchPrev(*args, **kwargs):
+        """SearchPrev(int flags, wxString text) -> int"""
+        return _stc.StyledTextCtrl_SearchPrev(*args, **kwargs)
+
+    def LinesOnScreen(*args, **kwargs):
+        """LinesOnScreen() -> int"""
+        return _stc.StyledTextCtrl_LinesOnScreen(*args, **kwargs)
+
+    def UsePopUp(*args, **kwargs):
+        """UsePopUp(bool allowPopUp)"""
+        return _stc.StyledTextCtrl_UsePopUp(*args, **kwargs)
+
+    def SelectionIsRectangle(*args, **kwargs):
+        """SelectionIsRectangle() -> bool"""
+        return _stc.StyledTextCtrl_SelectionIsRectangle(*args, **kwargs)
+
+    def SetZoom(*args, **kwargs):
+        """SetZoom(int zoom)"""
+        return _stc.StyledTextCtrl_SetZoom(*args, **kwargs)
+
+    def GetZoom(*args, **kwargs):
+        """GetZoom() -> int"""
+        return _stc.StyledTextCtrl_GetZoom(*args, **kwargs)
+
+    def CreateDocument(*args, **kwargs):
+        """CreateDocument() -> void"""
+        return _stc.StyledTextCtrl_CreateDocument(*args, **kwargs)
+
+    def AddRefDocument(*args, **kwargs):
+        """AddRefDocument(void docPointer)"""
+        return _stc.StyledTextCtrl_AddRefDocument(*args, **kwargs)
+
+    def ReleaseDocument(*args, **kwargs):
+        """ReleaseDocument(void docPointer)"""
+        return _stc.StyledTextCtrl_ReleaseDocument(*args, **kwargs)
+
+    def GetModEventMask(*args, **kwargs):
+        """GetModEventMask() -> int"""
+        return _stc.StyledTextCtrl_GetModEventMask(*args, **kwargs)
+
+    def SetSTCFocus(*args, **kwargs):
+        """SetSTCFocus(bool focus)"""
+        return _stc.StyledTextCtrl_SetSTCFocus(*args, **kwargs)
+
+    def GetSTCFocus(*args, **kwargs):
+        """GetSTCFocus() -> bool"""
+        return _stc.StyledTextCtrl_GetSTCFocus(*args, **kwargs)
+
+    def SetStatus(*args, **kwargs):
+        """SetStatus(int statusCode)"""
+        return _stc.StyledTextCtrl_SetStatus(*args, **kwargs)
+
+    def GetStatus(*args, **kwargs):
+        """GetStatus() -> int"""
+        return _stc.StyledTextCtrl_GetStatus(*args, **kwargs)
+
+    def SetMouseDownCaptures(*args, **kwargs):
+        """SetMouseDownCaptures(bool captures)"""
+        return _stc.StyledTextCtrl_SetMouseDownCaptures(*args, **kwargs)
+
+    def GetMouseDownCaptures(*args, **kwargs):
+        """GetMouseDownCaptures() -> bool"""
+        return _stc.StyledTextCtrl_GetMouseDownCaptures(*args, **kwargs)
+
+    def SetSTCCursor(*args, **kwargs):
+        """SetSTCCursor(int cursorType)"""
+        return _stc.StyledTextCtrl_SetSTCCursor(*args, **kwargs)
+
+    def GetSTCCursor(*args, **kwargs):
+        """GetSTCCursor() -> int"""
+        return _stc.StyledTextCtrl_GetSTCCursor(*args, **kwargs)
+
+    def SetControlCharSymbol(*args, **kwargs):
+        """SetControlCharSymbol(int symbol)"""
+        return _stc.StyledTextCtrl_SetControlCharSymbol(*args, **kwargs)
+
+    def GetControlCharSymbol(*args, **kwargs):
+        """GetControlCharSymbol() -> int"""
+        return _stc.StyledTextCtrl_GetControlCharSymbol(*args, **kwargs)
+
+    def WordPartLeft(*args, **kwargs):
+        """WordPartLeft()"""
+        return _stc.StyledTextCtrl_WordPartLeft(*args, **kwargs)
+
+    def WordPartLeftExtend(*args, **kwargs):
+        """WordPartLeftExtend()"""
+        return _stc.StyledTextCtrl_WordPartLeftExtend(*args, **kwargs)
+
+    def WordPartRight(*args, **kwargs):
+        """WordPartRight()"""
+        return _stc.StyledTextCtrl_WordPartRight(*args, **kwargs)
+
+    def WordPartRightExtend(*args, **kwargs):
+        """WordPartRightExtend()"""
+        return _stc.StyledTextCtrl_WordPartRightExtend(*args, **kwargs)
+
+    def SetVisiblePolicy(*args, **kwargs):
+        """SetVisiblePolicy(int visiblePolicy, int visibleSlop)"""
+        return _stc.StyledTextCtrl_SetVisiblePolicy(*args, **kwargs)
+
+    def DelLineLeft(*args, **kwargs):
+        """DelLineLeft()"""
+        return _stc.StyledTextCtrl_DelLineLeft(*args, **kwargs)
+
+    def DelLineRight(*args, **kwargs):
+        """DelLineRight()"""
+        return _stc.StyledTextCtrl_DelLineRight(*args, **kwargs)
+
+    def SetXOffset(*args, **kwargs):
+        """SetXOffset(int newOffset)"""
+        return _stc.StyledTextCtrl_SetXOffset(*args, **kwargs)
+
+    def GetXOffset(*args, **kwargs):
+        """GetXOffset() -> int"""
+        return _stc.StyledTextCtrl_GetXOffset(*args, **kwargs)
+
+    def ChooseCaretX(*args, **kwargs):
+        """ChooseCaretX()"""
+        return _stc.StyledTextCtrl_ChooseCaretX(*args, **kwargs)
+
+    def SetXCaretPolicy(*args, **kwargs):
+        """SetXCaretPolicy(int caretPolicy, int caretSlop)"""
+        return _stc.StyledTextCtrl_SetXCaretPolicy(*args, **kwargs)
+
+    def SetYCaretPolicy(*args, **kwargs):
+        """SetYCaretPolicy(int caretPolicy, int caretSlop)"""
+        return _stc.StyledTextCtrl_SetYCaretPolicy(*args, **kwargs)
+
+    def SetPrintWrapMode(*args, **kwargs):
+        """SetPrintWrapMode(int mode)"""
+        return _stc.StyledTextCtrl_SetPrintWrapMode(*args, **kwargs)
+
+    def GetPrintWrapMode(*args, **kwargs):
+        """GetPrintWrapMode() -> int"""
+        return _stc.StyledTextCtrl_GetPrintWrapMode(*args, **kwargs)
+
+    def SetHotspotActiveForeground(*args, **kwargs):
+        """SetHotspotActiveForeground(bool useSetting, wxColour fore)"""
+        return _stc.StyledTextCtrl_SetHotspotActiveForeground(*args, **kwargs)
+
+    def SetHotspotActiveBackground(*args, **kwargs):
+        """SetHotspotActiveBackground(bool useSetting, wxColour back)"""
+        return _stc.StyledTextCtrl_SetHotspotActiveBackground(*args, **kwargs)
+
+    def SetHotspotActiveUnderline(*args, **kwargs):
+        """SetHotspotActiveUnderline(bool underline)"""
+        return _stc.StyledTextCtrl_SetHotspotActiveUnderline(*args, **kwargs)
+
+    def PositionBefore(*args, **kwargs):
+        """PositionBefore(int pos) -> int"""
+        return _stc.StyledTextCtrl_PositionBefore(*args, **kwargs)
+
+    def PositionAfter(*args, **kwargs):
+        """PositionAfter(int pos) -> int"""
+        return _stc.StyledTextCtrl_PositionAfter(*args, **kwargs)
+
+    def CopyRange(*args, **kwargs):
+        """CopyRange(int start, int end)"""
+        return _stc.StyledTextCtrl_CopyRange(*args, **kwargs)
+
+    def CopyText(*args, **kwargs):
+        """CopyText(int length, wxString text)"""
+        return _stc.StyledTextCtrl_CopyText(*args, **kwargs)
+
+    def StartRecord(*args, **kwargs):
+        """StartRecord()"""
+        return _stc.StyledTextCtrl_StartRecord(*args, **kwargs)
+
+    def StopRecord(*args, **kwargs):
+        """StopRecord()"""
+        return _stc.StyledTextCtrl_StopRecord(*args, **kwargs)
+
+    def SetLexer(*args, **kwargs):
+        """SetLexer(int lexer)"""
+        return _stc.StyledTextCtrl_SetLexer(*args, **kwargs)
+
+    def GetLexer(*args, **kwargs):
+        """GetLexer() -> int"""
+        return _stc.StyledTextCtrl_GetLexer(*args, **kwargs)
+
+    def Colourise(*args, **kwargs):
+        """Colourise(int start, int end)"""
+        return _stc.StyledTextCtrl_Colourise(*args, **kwargs)
+
+    def SetProperty(*args, **kwargs):
+        """SetProperty(wxString key, wxString value)"""
+        return _stc.StyledTextCtrl_SetProperty(*args, **kwargs)
+
+    def SetKeyWords(*args, **kwargs):
+        """SetKeyWords(int keywordSet, wxString keyWords)"""
+        return _stc.StyledTextCtrl_SetKeyWords(*args, **kwargs)
+
+    def SetLexerLanguage(*args, **kwargs):
+        """SetLexerLanguage(wxString language)"""
+        return _stc.StyledTextCtrl_SetLexerLanguage(*args, **kwargs)
+
+    def GetCurrentLine(*args, **kwargs):
+        """GetCurrentLine() -> int"""
+        return _stc.StyledTextCtrl_GetCurrentLine(*args, **kwargs)
+
+    def StyleSetSpec(*args, **kwargs):
+        """StyleSetSpec(int styleNum, wxString spec)"""
+        return _stc.StyledTextCtrl_StyleSetSpec(*args, **kwargs)
+
+    def StyleSetFont(*args, **kwargs):
+        """StyleSetFont(int styleNum, wxFont font)"""
+        return _stc.StyledTextCtrl_StyleSetFont(*args, **kwargs)
+
+    def StyleSetFontAttr(*args, **kwargs):
+        """StyleSetFontAttr(int styleNum, int size, wxString faceName, bool bold, 
+    bool italic, bool underline)"""
+        return _stc.StyledTextCtrl_StyleSetFontAttr(*args, **kwargs)
+
+    def CmdKeyExecute(*args, **kwargs):
+        """CmdKeyExecute(int cmd)"""
+        return _stc.StyledTextCtrl_CmdKeyExecute(*args, **kwargs)
+
+    def SetMargins(*args, **kwargs):
+        """SetMargins(int left, int right)"""
+        return _stc.StyledTextCtrl_SetMargins(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """GetSelection(int OUTPUT, int OUTPUT)"""
+        return _stc.StyledTextCtrl_GetSelection(*args, **kwargs)
+
+    def PointFromPosition(*args, **kwargs):
+        """PointFromPosition(int pos) -> Point"""
+        return _stc.StyledTextCtrl_PointFromPosition(*args, **kwargs)
+
+    def ScrollToLine(*args, **kwargs):
+        """ScrollToLine(int line)"""
+        return _stc.StyledTextCtrl_ScrollToLine(*args, **kwargs)
+
+    def ScrollToColumn(*args, **kwargs):
+        """ScrollToColumn(int column)"""
+        return _stc.StyledTextCtrl_ScrollToColumn(*args, **kwargs)
+
+    def SendMsg(*args, **kwargs):
+        """SendMsg(int msg, long wp=0, long lp=0) -> long"""
+        return _stc.StyledTextCtrl_SendMsg(*args, **kwargs)
+
+    def SetVScrollBar(*args, **kwargs):
+        """SetVScrollBar(wxScrollBar bar)"""
+        return _stc.StyledTextCtrl_SetVScrollBar(*args, **kwargs)
+
+    def SetHScrollBar(*args, **kwargs):
+        """SetHScrollBar(wxScrollBar bar)"""
+        return _stc.StyledTextCtrl_SetHScrollBar(*args, **kwargs)
+
+    def GetLastKeydownProcessed(*args, **kwargs):
+        """GetLastKeydownProcessed() -> bool"""
+        return _stc.StyledTextCtrl_GetLastKeydownProcessed(*args, **kwargs)
+
+    def SetLastKeydownProcessed(*args, **kwargs):
+        """SetLastKeydownProcessed(bool val)"""
+        return _stc.StyledTextCtrl_SetLastKeydownProcessed(*args, **kwargs)
+
+    def SaveFile(*args, **kwargs):
+        """SaveFile(wxString filename) -> bool"""
+        return _stc.StyledTextCtrl_SaveFile(*args, **kwargs)
+
+    def LoadFile(*args, **kwargs):
+        """LoadFile(wxString filename) -> bool"""
+        return _stc.StyledTextCtrl_LoadFile(*args, **kwargs)
+
+    def DoDragOver(*args, **kwargs):
+        """DoDragOver(int x, int y, wxDragResult def) -> wxDragResult"""
+        return _stc.StyledTextCtrl_DoDragOver(*args, **kwargs)
+
+    def DoDropText(*args, **kwargs):
+        """DoDropText(long x, long y, wxString data) -> bool"""
+        return _stc.StyledTextCtrl_DoDropText(*args, **kwargs)
+
 
 class StyledTextCtrlPtr(StyledTextCtrl):
     def __init__(self, this):
@@ -1133,66 +2155,203 @@ class StyledTextCtrlPtr(StyledTextCtrl):
 _stc.StyledTextCtrl_swigregister(StyledTextCtrlPtr)
 
 def PreStyledTextCtrl(*args, **kwargs):
+    """PreStyledTextCtrl() -> StyledTextCtrl"""
     val = _stc.new_PreStyledTextCtrl(*args, **kwargs)
     val.thisown = 1
     return val
 
 class StyledTextEvent(core.CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxStyledTextEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType commandType=0, int id=0) -> StyledTextEvent"""
         newobj = _stc.new_StyledTextEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_stc.delete_StyledTextEvent):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetPosition(*args, **kwargs): return _stc.StyledTextEvent_SetPosition(*args, **kwargs)
-    def SetKey(*args, **kwargs): return _stc.StyledTextEvent_SetKey(*args, **kwargs)
-    def SetModifiers(*args, **kwargs): return _stc.StyledTextEvent_SetModifiers(*args, **kwargs)
-    def SetModificationType(*args, **kwargs): return _stc.StyledTextEvent_SetModificationType(*args, **kwargs)
-    def SetText(*args, **kwargs): return _stc.StyledTextEvent_SetText(*args, **kwargs)
-    def SetLength(*args, **kwargs): return _stc.StyledTextEvent_SetLength(*args, **kwargs)
-    def SetLinesAdded(*args, **kwargs): return _stc.StyledTextEvent_SetLinesAdded(*args, **kwargs)
-    def SetLine(*args, **kwargs): return _stc.StyledTextEvent_SetLine(*args, **kwargs)
-    def SetFoldLevelNow(*args, **kwargs): return _stc.StyledTextEvent_SetFoldLevelNow(*args, **kwargs)
-    def SetFoldLevelPrev(*args, **kwargs): return _stc.StyledTextEvent_SetFoldLevelPrev(*args, **kwargs)
-    def SetMargin(*args, **kwargs): return _stc.StyledTextEvent_SetMargin(*args, **kwargs)
-    def SetMessage(*args, **kwargs): return _stc.StyledTextEvent_SetMessage(*args, **kwargs)
-    def SetWParam(*args, **kwargs): return _stc.StyledTextEvent_SetWParam(*args, **kwargs)
-    def SetLParam(*args, **kwargs): return _stc.StyledTextEvent_SetLParam(*args, **kwargs)
-    def SetListType(*args, **kwargs): return _stc.StyledTextEvent_SetListType(*args, **kwargs)
-    def SetX(*args, **kwargs): return _stc.StyledTextEvent_SetX(*args, **kwargs)
-    def SetY(*args, **kwargs): return _stc.StyledTextEvent_SetY(*args, **kwargs)
-    def SetDragText(*args, **kwargs): return _stc.StyledTextEvent_SetDragText(*args, **kwargs)
-    def SetDragAllowMove(*args, **kwargs): return _stc.StyledTextEvent_SetDragAllowMove(*args, **kwargs)
-    def SetDragResult(*args, **kwargs): return _stc.StyledTextEvent_SetDragResult(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _stc.StyledTextEvent_GetPosition(*args, **kwargs)
-    def GetKey(*args, **kwargs): return _stc.StyledTextEvent_GetKey(*args, **kwargs)
-    def GetModifiers(*args, **kwargs): return _stc.StyledTextEvent_GetModifiers(*args, **kwargs)
-    def GetModificationType(*args, **kwargs): return _stc.StyledTextEvent_GetModificationType(*args, **kwargs)
-    def GetText(*args, **kwargs): return _stc.StyledTextEvent_GetText(*args, **kwargs)
-    def GetLength(*args, **kwargs): return _stc.StyledTextEvent_GetLength(*args, **kwargs)
-    def GetLinesAdded(*args, **kwargs): return _stc.StyledTextEvent_GetLinesAdded(*args, **kwargs)
-    def GetLine(*args, **kwargs): return _stc.StyledTextEvent_GetLine(*args, **kwargs)
-    def GetFoldLevelNow(*args, **kwargs): return _stc.StyledTextEvent_GetFoldLevelNow(*args, **kwargs)
-    def GetFoldLevelPrev(*args, **kwargs): return _stc.StyledTextEvent_GetFoldLevelPrev(*args, **kwargs)
-    def GetMargin(*args, **kwargs): return _stc.StyledTextEvent_GetMargin(*args, **kwargs)
-    def GetMessage(*args, **kwargs): return _stc.StyledTextEvent_GetMessage(*args, **kwargs)
-    def GetWParam(*args, **kwargs): return _stc.StyledTextEvent_GetWParam(*args, **kwargs)
-    def GetLParam(*args, **kwargs): return _stc.StyledTextEvent_GetLParam(*args, **kwargs)
-    def GetListType(*args, **kwargs): return _stc.StyledTextEvent_GetListType(*args, **kwargs)
-    def GetX(*args, **kwargs): return _stc.StyledTextEvent_GetX(*args, **kwargs)
-    def GetY(*args, **kwargs): return _stc.StyledTextEvent_GetY(*args, **kwargs)
-    def GetDragText(*args, **kwargs): return _stc.StyledTextEvent_GetDragText(*args, **kwargs)
-    def GetDragAllowMove(*args, **kwargs): return _stc.StyledTextEvent_GetDragAllowMove(*args, **kwargs)
-    def GetDragResult(*args, **kwargs): return _stc.StyledTextEvent_GetDragResult(*args, **kwargs)
-    def GetShift(*args, **kwargs): return _stc.StyledTextEvent_GetShift(*args, **kwargs)
-    def GetControl(*args, **kwargs): return _stc.StyledTextEvent_GetControl(*args, **kwargs)
-    def GetAlt(*args, **kwargs): return _stc.StyledTextEvent_GetAlt(*args, **kwargs)
-    def Clone(*args, **kwargs): return _stc.StyledTextEvent_Clone(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStyledTextEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetPosition(*args, **kwargs):
+        """SetPosition(int pos)"""
+        return _stc.StyledTextEvent_SetPosition(*args, **kwargs)
+
+    def SetKey(*args, **kwargs):
+        """SetKey(int k)"""
+        return _stc.StyledTextEvent_SetKey(*args, **kwargs)
+
+    def SetModifiers(*args, **kwargs):
+        """SetModifiers(int m)"""
+        return _stc.StyledTextEvent_SetModifiers(*args, **kwargs)
+
+    def SetModificationType(*args, **kwargs):
+        """SetModificationType(int t)"""
+        return _stc.StyledTextEvent_SetModificationType(*args, **kwargs)
+
+    def SetText(*args, **kwargs):
+        """SetText(wxString t)"""
+        return _stc.StyledTextEvent_SetText(*args, **kwargs)
+
+    def SetLength(*args, **kwargs):
+        """SetLength(int len)"""
+        return _stc.StyledTextEvent_SetLength(*args, **kwargs)
+
+    def SetLinesAdded(*args, **kwargs):
+        """SetLinesAdded(int num)"""
+        return _stc.StyledTextEvent_SetLinesAdded(*args, **kwargs)
+
+    def SetLine(*args, **kwargs):
+        """SetLine(int val)"""
+        return _stc.StyledTextEvent_SetLine(*args, **kwargs)
+
+    def SetFoldLevelNow(*args, **kwargs):
+        """SetFoldLevelNow(int val)"""
+        return _stc.StyledTextEvent_SetFoldLevelNow(*args, **kwargs)
+
+    def SetFoldLevelPrev(*args, **kwargs):
+        """SetFoldLevelPrev(int val)"""
+        return _stc.StyledTextEvent_SetFoldLevelPrev(*args, **kwargs)
+
+    def SetMargin(*args, **kwargs):
+        """SetMargin(int val)"""
+        return _stc.StyledTextEvent_SetMargin(*args, **kwargs)
+
+    def SetMessage(*args, **kwargs):
+        """SetMessage(int val)"""
+        return _stc.StyledTextEvent_SetMessage(*args, **kwargs)
+
+    def SetWParam(*args, **kwargs):
+        """SetWParam(int val)"""
+        return _stc.StyledTextEvent_SetWParam(*args, **kwargs)
+
+    def SetLParam(*args, **kwargs):
+        """SetLParam(int val)"""
+        return _stc.StyledTextEvent_SetLParam(*args, **kwargs)
+
+    def SetListType(*args, **kwargs):
+        """SetListType(int val)"""
+        return _stc.StyledTextEvent_SetListType(*args, **kwargs)
+
+    def SetX(*args, **kwargs):
+        """SetX(int val)"""
+        return _stc.StyledTextEvent_SetX(*args, **kwargs)
+
+    def SetY(*args, **kwargs):
+        """SetY(int val)"""
+        return _stc.StyledTextEvent_SetY(*args, **kwargs)
+
+    def SetDragText(*args, **kwargs):
+        """SetDragText(wxString val)"""
+        return _stc.StyledTextEvent_SetDragText(*args, **kwargs)
+
+    def SetDragAllowMove(*args, **kwargs):
+        """SetDragAllowMove(bool val)"""
+        return _stc.StyledTextEvent_SetDragAllowMove(*args, **kwargs)
+
+    def SetDragResult(*args, **kwargs):
+        """SetDragResult(wxDragResult val)"""
+        return _stc.StyledTextEvent_SetDragResult(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> int"""
+        return _stc.StyledTextEvent_GetPosition(*args, **kwargs)
+
+    def GetKey(*args, **kwargs):
+        """GetKey() -> int"""
+        return _stc.StyledTextEvent_GetKey(*args, **kwargs)
+
+    def GetModifiers(*args, **kwargs):
+        """GetModifiers() -> int"""
+        return _stc.StyledTextEvent_GetModifiers(*args, **kwargs)
+
+    def GetModificationType(*args, **kwargs):
+        """GetModificationType() -> int"""
+        return _stc.StyledTextEvent_GetModificationType(*args, **kwargs)
+
+    def GetText(*args, **kwargs):
+        """GetText() -> wxString"""
+        return _stc.StyledTextEvent_GetText(*args, **kwargs)
+
+    def GetLength(*args, **kwargs):
+        """GetLength() -> int"""
+        return _stc.StyledTextEvent_GetLength(*args, **kwargs)
+
+    def GetLinesAdded(*args, **kwargs):
+        """GetLinesAdded() -> int"""
+        return _stc.StyledTextEvent_GetLinesAdded(*args, **kwargs)
+
+    def GetLine(*args, **kwargs):
+        """GetLine() -> int"""
+        return _stc.StyledTextEvent_GetLine(*args, **kwargs)
+
+    def GetFoldLevelNow(*args, **kwargs):
+        """GetFoldLevelNow() -> int"""
+        return _stc.StyledTextEvent_GetFoldLevelNow(*args, **kwargs)
+
+    def GetFoldLevelPrev(*args, **kwargs):
+        """GetFoldLevelPrev() -> int"""
+        return _stc.StyledTextEvent_GetFoldLevelPrev(*args, **kwargs)
+
+    def GetMargin(*args, **kwargs):
+        """GetMargin() -> int"""
+        return _stc.StyledTextEvent_GetMargin(*args, **kwargs)
+
+    def GetMessage(*args, **kwargs):
+        """GetMessage() -> int"""
+        return _stc.StyledTextEvent_GetMessage(*args, **kwargs)
+
+    def GetWParam(*args, **kwargs):
+        """GetWParam() -> int"""
+        return _stc.StyledTextEvent_GetWParam(*args, **kwargs)
+
+    def GetLParam(*args, **kwargs):
+        """GetLParam() -> int"""
+        return _stc.StyledTextEvent_GetLParam(*args, **kwargs)
+
+    def GetListType(*args, **kwargs):
+        """GetListType() -> int"""
+        return _stc.StyledTextEvent_GetListType(*args, **kwargs)
+
+    def GetX(*args, **kwargs):
+        """GetX() -> int"""
+        return _stc.StyledTextEvent_GetX(*args, **kwargs)
+
+    def GetY(*args, **kwargs):
+        """GetY() -> int"""
+        return _stc.StyledTextEvent_GetY(*args, **kwargs)
+
+    def GetDragText(*args, **kwargs):
+        """GetDragText() -> wxString"""
+        return _stc.StyledTextEvent_GetDragText(*args, **kwargs)
+
+    def GetDragAllowMove(*args, **kwargs):
+        """GetDragAllowMove() -> bool"""
+        return _stc.StyledTextEvent_GetDragAllowMove(*args, **kwargs)
+
+    def GetDragResult(*args, **kwargs):
+        """GetDragResult() -> wxDragResult"""
+        return _stc.StyledTextEvent_GetDragResult(*args, **kwargs)
+
+    def GetShift(*args, **kwargs):
+        """GetShift() -> bool"""
+        return _stc.StyledTextEvent_GetShift(*args, **kwargs)
+
+    def GetControl(*args, **kwargs):
+        """GetControl() -> bool"""
+        return _stc.StyledTextEvent_GetControl(*args, **kwargs)
+
+    def GetAlt(*args, **kwargs):
+        """GetAlt() -> bool"""
+        return _stc.StyledTextEvent_GetAlt(*args, **kwargs)
+
+    def Clone(*args, **kwargs):
+        """Clone() -> Event"""
+        return _stc.StyledTextEvent_Clone(*args, **kwargs)
+
 
 class StyledTextEventPtr(StyledTextEvent):
     def __init__(self, this):
diff --git a/wxPython/contrib/stc/stc_wrap.cpp b/wxPython/contrib/stc/stc_wrap.cpp
index 2f9e300cb9..a9a8965206 100644
--- a/wxPython/contrib/stc/stc_wrap.cpp
+++ b/wxPython/contrib/stc/stc_wrap.cpp
@@ -292,7 +292,7 @@ extern "C" {
 static PyObject *_wrap_new_StyledTextCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -303,7 +303,7 @@ static PyObject *_wrap_new_StyledTextCtrl(PyObject *self, PyObject *args, PyObje
     wxStyledTextCtrl *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -330,7 +330,7 @@ static PyObject *_wrap_new_StyledTextCtrl(PyObject *self, PyObject *args, PyObje
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -381,7 +381,7 @@ static PyObject *_wrap_StyledTextCtrl_Create(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -391,7 +391,7 @@ static PyObject *_wrap_StyledTextCtrl_Create(PyObject *self, PyObject *args, PyO
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -420,7 +420,7 @@ static PyObject *_wrap_StyledTextCtrl_Create(PyObject *self, PyObject *args, PyO
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -449,7 +449,7 @@ static PyObject *_wrap_StyledTextCtrl_AddText(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -461,7 +461,7 @@ static PyObject *_wrap_StyledTextCtrl_AddText(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -520,7 +520,7 @@ static PyObject *_wrap_StyledTextCtrl_InsertText(PyObject *self, PyObject *args,
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -532,7 +532,7 @@ static PyObject *_wrap_StyledTextCtrl_InsertText(PyObject *self, PyObject *args,
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2150,7 +2150,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetFaceName(PyObject *self, PyObject
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -2162,7 +2162,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetFaceName(PyObject *self, PyObject
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2636,7 +2636,7 @@ static PyObject *_wrap_StyledTextCtrl_SetWordChars(PyObject *self, PyObject *arg
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2648,7 +2648,7 @@ static PyObject *_wrap_StyledTextCtrl_SetWordChars(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3178,7 +3178,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompShow(PyObject *self, PyObject *arg
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -3190,7 +3190,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompShow(PyObject *self, PyObject *arg
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3316,7 +3316,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompStops(PyObject *self, PyObject *ar
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3328,7 +3328,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompStops(PyObject *self, PyObject *ar
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3406,7 +3406,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSelect(PyObject *self, PyObject *a
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3418,7 +3418,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSelect(PyObject *self, PyObject *a
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3499,7 +3499,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetFillUps(PyObject *self, PyObjec
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3511,7 +3511,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetFillUps(PyObject *self, PyObjec
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3646,7 +3646,7 @@ static PyObject *_wrap_StyledTextCtrl_UserListShow(PyObject *self, PyObject *arg
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -3658,7 +3658,7 @@ static PyObject *_wrap_StyledTextCtrl_UserListShow(PyObject *self, PyObject *arg
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4594,7 +4594,7 @@ static PyObject *_wrap_StyledTextCtrl_FindText(PyObject *self, PyObject *args, P
     wxString *arg4 = 0 ;
     int arg5 = (int) 0 ;
     int result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -4606,7 +4606,7 @@ static PyObject *_wrap_StyledTextCtrl_FindText(PyObject *self, PyObject *args, P
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5108,7 +5108,7 @@ static PyObject *_wrap_StyledTextCtrl_ReplaceSelection(PyObject *self, PyObject
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5120,7 +5120,7 @@ static PyObject *_wrap_StyledTextCtrl_ReplaceSelection(PyObject *self, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5370,7 +5370,7 @@ static PyObject *_wrap_StyledTextCtrl_SetText(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5382,7 +5382,7 @@ static PyObject *_wrap_StyledTextCtrl_SetText(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5670,7 +5670,7 @@ static PyObject *_wrap_StyledTextCtrl_ReplaceTarget(PyObject *self, PyObject *ar
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5682,7 +5682,7 @@ static PyObject *_wrap_StyledTextCtrl_ReplaceTarget(PyObject *self, PyObject *ar
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5711,7 +5711,7 @@ static PyObject *_wrap_StyledTextCtrl_ReplaceTargetRE(PyObject *self, PyObject *
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5723,7 +5723,7 @@ static PyObject *_wrap_StyledTextCtrl_ReplaceTargetRE(PyObject *self, PyObject *
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5752,7 +5752,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchInTarget(PyObject *self, PyObject *a
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5764,7 +5764,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchInTarget(PyObject *self, PyObject *a
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5843,7 +5843,7 @@ static PyObject *_wrap_StyledTextCtrl_CallTipShow(PyObject *self, PyObject *args
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -5855,7 +5855,7 @@ static PyObject *_wrap_StyledTextCtrl_CallTipShow(PyObject *self, PyObject *args
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6834,7 +6834,7 @@ static PyObject *_wrap_StyledTextCtrl_TextWidth(PyObject *self, PyObject *args,
     int arg2 ;
     wxString *arg3 = 0 ;
     int result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -6846,7 +6846,7 @@ static PyObject *_wrap_StyledTextCtrl_TextWidth(PyObject *self, PyObject *args,
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7007,7 +7007,7 @@ static PyObject *_wrap_StyledTextCtrl_AppendText(PyObject *self, PyObject *args,
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -7019,7 +7019,7 @@ static PyObject *_wrap_StyledTextCtrl_AppendText(PyObject *self, PyObject *args,
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7830,7 +7830,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchNext(PyObject *self, PyObject *args,
     int arg2 ;
     wxString *arg3 = 0 ;
     int result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -7842,7 +7842,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchNext(PyObject *self, PyObject *args,
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7872,7 +7872,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchPrev(PyObject *self, PyObject *args,
     int arg2 ;
     wxString *arg3 = 0 ;
     int result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -7884,7 +7884,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchPrev(PyObject *self, PyObject *args,
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8923,7 +8923,7 @@ static PyObject *_wrap_StyledTextCtrl_CopyText(PyObject *self, PyObject *args, P
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -8935,7 +8935,7 @@ static PyObject *_wrap_StyledTextCtrl_CopyText(PyObject *self, PyObject *args, P
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9088,8 +9088,8 @@ static PyObject *_wrap_StyledTextCtrl_SetProperty(PyObject *self, PyObject *args
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
     wxString *arg3 = 0 ;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -9102,12 +9102,12 @@ static PyObject *_wrap_StyledTextCtrl_SetProperty(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9144,7 +9144,7 @@ static PyObject *_wrap_StyledTextCtrl_SetKeyWords(PyObject *self, PyObject *args
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -9156,7 +9156,7 @@ static PyObject *_wrap_StyledTextCtrl_SetKeyWords(PyObject *self, PyObject *args
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9184,7 +9184,7 @@ static PyObject *_wrap_StyledTextCtrl_SetLexerLanguage(PyObject *self, PyObject
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9196,7 +9196,7 @@ static PyObject *_wrap_StyledTextCtrl_SetLexerLanguage(PyObject *self, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9250,7 +9250,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetSpec(PyObject *self, PyObject *arg
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -9262,7 +9262,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetSpec(PyObject *self, PyObject *arg
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9326,7 +9326,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetFontAttr(PyObject *self, PyObject
     bool arg5 ;
     bool arg6 ;
     bool arg7 ;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     PyObject * obj4 = 0 ;
@@ -9341,7 +9341,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetFontAttr(PyObject *self, PyObject
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     arg5 = PyInt_AsLong(obj4) ? true : false;
     if (PyErr_Occurred()) SWIG_fail;
@@ -9680,7 +9680,7 @@ static PyObject *_wrap_StyledTextCtrl_SaveFile(PyObject *self, PyObject *args, P
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9692,7 +9692,7 @@ static PyObject *_wrap_StyledTextCtrl_SaveFile(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9721,7 +9721,7 @@ static PyObject *_wrap_StyledTextCtrl_LoadFile(PyObject *self, PyObject *args, P
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9733,7 +9733,7 @@ static PyObject *_wrap_StyledTextCtrl_LoadFile(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9760,8 +9760,8 @@ static PyObject *_wrap_StyledTextCtrl_LoadFile(PyObject *self, PyObject *args, P
 static PyObject *_wrap_StyledTextCtrl_DoDragOver(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     wxDragResult arg4 ;
     wxDragResult result;
     wxDragResult *argp4 ;
@@ -9800,7 +9800,7 @@ static PyObject *_wrap_StyledTextCtrl_DoDropText(PyObject *self, PyObject *args,
     long arg3 ;
     wxString *arg4 = 0 ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -9812,7 +9812,7 @@ static PyObject *_wrap_StyledTextCtrl_DoDropText(PyObject *self, PyObject *args,
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9995,7 +9995,7 @@ static PyObject *_wrap_StyledTextEvent_SetText(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10007,7 +10007,7 @@ static PyObject *_wrap_StyledTextEvent_SetText(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10335,7 +10335,7 @@ static PyObject *_wrap_StyledTextEvent_SetDragText(PyObject *self, PyObject *arg
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10347,7 +10347,7 @@ static PyObject *_wrap_StyledTextEvent_SetDragText(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
diff --git a/wxPython/contrib/xrc/xrc.py b/wxPython/contrib/xrc/xrc.py
index 02719281a1..f90358fa29 100644
--- a/wxPython/contrib/xrc/xrc.py
+++ b/wxPython/contrib/xrc/xrc.py
@@ -14,47 +14,143 @@ WX_XMLRES_CURRENT_VERSION_REVISION = _xrc.WX_XMLRES_CURRENT_VERSION_REVISION
 XRC_USE_LOCALE = _xrc.XRC_USE_LOCALE
 XRC_NO_SUBCLASSING = _xrc.XRC_NO_SUBCLASSING
 class XmlResource(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxXmlResource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString filemask, int flags=XRC_USE_LOCALE) -> XmlResource"""
         newobj = _xrc.new_XmlResource(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self.InitAllHandlers()
+
     def __del__(self, destroy=_xrc.delete_XmlResource):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Load(*args, **kwargs): return _xrc.XmlResource_Load(*args, **kwargs)
-    def LoadFromString(*args, **kwargs): return _xrc.XmlResource_LoadFromString(*args, **kwargs)
-    def InitAllHandlers(*args, **kwargs): return _xrc.XmlResource_InitAllHandlers(*args, **kwargs)
-    def AddHandler(*args, **kwargs): return _xrc.XmlResource_AddHandler(*args, **kwargs)
-    def InsertHandler(*args, **kwargs): return _xrc.XmlResource_InsertHandler(*args, **kwargs)
-    def ClearHandlers(*args, **kwargs): return _xrc.XmlResource_ClearHandlers(*args, **kwargs)
-    AddSubclassFactory = staticmethod(_xrc.XmlResource_AddSubclassFactory)
-    def LoadMenu(*args, **kwargs): return _xrc.XmlResource_LoadMenu(*args, **kwargs)
-    def LoadMenuBar(*args, **kwargs): return _xrc.XmlResource_LoadMenuBar(*args, **kwargs)
-    def LoadMenuBarOnFrame(*args, **kwargs): return _xrc.XmlResource_LoadMenuBarOnFrame(*args, **kwargs)
-    def LoadToolBar(*args, **kwargs): return _xrc.XmlResource_LoadToolBar(*args, **kwargs)
-    def LoadDialog(*args, **kwargs): return _xrc.XmlResource_LoadDialog(*args, **kwargs)
-    def LoadOnDialog(*args, **kwargs): return _xrc.XmlResource_LoadOnDialog(*args, **kwargs)
-    def LoadPanel(*args, **kwargs): return _xrc.XmlResource_LoadPanel(*args, **kwargs)
-    def LoadOnPanel(*args, **kwargs): return _xrc.XmlResource_LoadOnPanel(*args, **kwargs)
-    def LoadFrame(*args, **kwargs): return _xrc.XmlResource_LoadFrame(*args, **kwargs)
-    def LoadOnFrame(*args, **kwargs): return _xrc.XmlResource_LoadOnFrame(*args, **kwargs)
-    def LoadObject(*args, **kwargs): return _xrc.XmlResource_LoadObject(*args, **kwargs)
-    def LoadOnObject(*args, **kwargs): return _xrc.XmlResource_LoadOnObject(*args, **kwargs)
-    def LoadBitmap(*args, **kwargs): return _xrc.XmlResource_LoadBitmap(*args, **kwargs)
-    def LoadIcon(*args, **kwargs): return _xrc.XmlResource_LoadIcon(*args, **kwargs)
-    def AttachUnknownControl(*args, **kwargs): return _xrc.XmlResource_AttachUnknownControl(*args, **kwargs)
-    GetXRCID = staticmethod(_xrc.XmlResource_GetXRCID)
-    def GetVersion(*args, **kwargs): return _xrc.XmlResource_GetVersion(*args, **kwargs)
-    def CompareVersion(*args, **kwargs): return _xrc.XmlResource_CompareVersion(*args, **kwargs)
-    Get = staticmethod(_xrc.XmlResource_Get)
-    Set = staticmethod(_xrc.XmlResource_Set)
-    def GetFlags(*args, **kwargs): return _xrc.XmlResource_GetFlags(*args, **kwargs)
-    def SetFlags(*args, **kwargs): return _xrc.XmlResource_SetFlags(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxXmlResource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Load(*args, **kwargs):
+        """Load(wxString filemask) -> bool"""
+        return _xrc.XmlResource_Load(*args, **kwargs)
+
+    def LoadFromString(*args, **kwargs):
+        """LoadFromString(wxString data) -> bool"""
+        return _xrc.XmlResource_LoadFromString(*args, **kwargs)
+
+    def InitAllHandlers(*args, **kwargs):
+        """InitAllHandlers()"""
+        return _xrc.XmlResource_InitAllHandlers(*args, **kwargs)
+
+    def AddHandler(*args, **kwargs):
+        """AddHandler(XmlResourceHandler handler)"""
+        return _xrc.XmlResource_AddHandler(*args, **kwargs)
+
+    def InsertHandler(*args, **kwargs):
+        """InsertHandler(XmlResourceHandler handler)"""
+        return _xrc.XmlResource_InsertHandler(*args, **kwargs)
+
+    def ClearHandlers(*args, **kwargs):
+        """ClearHandlers()"""
+        return _xrc.XmlResource_ClearHandlers(*args, **kwargs)
+
+    def AddSubclassFactory(*args, **kwargs):
+        """XmlResource.AddSubclassFactory(XmlSubclassFactory factory)"""
+        return _xrc.XmlResource_AddSubclassFactory(*args, **kwargs)
+
+    AddSubclassFactory = staticmethod(AddSubclassFactory)
+    def LoadMenu(*args, **kwargs):
+        """LoadMenu(wxString name) -> Menu"""
+        return _xrc.XmlResource_LoadMenu(*args, **kwargs)
+
+    def LoadMenuBar(*args, **kwargs):
+        """LoadMenuBar(wxString name) -> MenuBar"""
+        return _xrc.XmlResource_LoadMenuBar(*args, **kwargs)
+
+    def LoadMenuBarOnFrame(*args, **kwargs):
+        """LoadMenuBarOnFrame(Window parent, wxString name) -> MenuBar"""
+        return _xrc.XmlResource_LoadMenuBarOnFrame(*args, **kwargs)
+
+    def LoadToolBar(*args, **kwargs):
+        """LoadToolBar(Window parent, wxString name) -> wxToolBar"""
+        return _xrc.XmlResource_LoadToolBar(*args, **kwargs)
+
+    def LoadDialog(*args, **kwargs):
+        """LoadDialog(Window parent, wxString name) -> wxDialog"""
+        return _xrc.XmlResource_LoadDialog(*args, **kwargs)
+
+    def LoadOnDialog(*args, **kwargs):
+        """LoadOnDialog(wxDialog dlg, Window parent, wxString name) -> bool"""
+        return _xrc.XmlResource_LoadOnDialog(*args, **kwargs)
+
+    def LoadPanel(*args, **kwargs):
+        """LoadPanel(Window parent, wxString name) -> wxPanel"""
+        return _xrc.XmlResource_LoadPanel(*args, **kwargs)
+
+    def LoadOnPanel(*args, **kwargs):
+        """LoadOnPanel(wxPanel panel, Window parent, wxString name) -> bool"""
+        return _xrc.XmlResource_LoadOnPanel(*args, **kwargs)
+
+    def LoadFrame(*args, **kwargs):
+        """LoadFrame(Window parent, wxString name) -> wxFrame"""
+        return _xrc.XmlResource_LoadFrame(*args, **kwargs)
+
+    def LoadOnFrame(*args, **kwargs):
+        """LoadOnFrame(wxFrame frame, Window parent, wxString name) -> bool"""
+        return _xrc.XmlResource_LoadOnFrame(*args, **kwargs)
+
+    def LoadObject(*args, **kwargs):
+        """LoadObject(Window parent, wxString name, wxString classname) -> Object"""
+        return _xrc.XmlResource_LoadObject(*args, **kwargs)
+
+    def LoadOnObject(*args, **kwargs):
+        """LoadOnObject(Object instance, Window parent, wxString name, wxString classname) -> bool"""
+        return _xrc.XmlResource_LoadOnObject(*args, **kwargs)
+
+    def LoadBitmap(*args, **kwargs):
+        """LoadBitmap(wxString name) -> wxBitmap"""
+        return _xrc.XmlResource_LoadBitmap(*args, **kwargs)
+
+    def LoadIcon(*args, **kwargs):
+        """LoadIcon(wxString name) -> wxIcon"""
+        return _xrc.XmlResource_LoadIcon(*args, **kwargs)
+
+    def AttachUnknownControl(*args, **kwargs):
+        """AttachUnknownControl(wxString name, Window control, Window parent=None) -> bool"""
+        return _xrc.XmlResource_AttachUnknownControl(*args, **kwargs)
+
+    def GetXRCID(*args, **kwargs):
+        """XmlResource.GetXRCID(wxString str_id) -> int"""
+        return _xrc.XmlResource_GetXRCID(*args, **kwargs)
+
+    GetXRCID = staticmethod(GetXRCID)
+    def GetVersion(*args, **kwargs):
+        """GetVersion() -> long"""
+        return _xrc.XmlResource_GetVersion(*args, **kwargs)
+
+    def CompareVersion(*args, **kwargs):
+        """CompareVersion(int major, int minor, int release, int revision) -> int"""
+        return _xrc.XmlResource_CompareVersion(*args, **kwargs)
+
+    def Get(*args, **kwargs):
+        """XmlResource.Get() -> XmlResource"""
+        return _xrc.XmlResource_Get(*args, **kwargs)
+
+    Get = staticmethod(Get)
+    def Set(*args, **kwargs):
+        """XmlResource.Set(XmlResource res) -> XmlResource"""
+        return _xrc.XmlResource_Set(*args, **kwargs)
+
+    Set = staticmethod(Set)
+    def GetFlags(*args, **kwargs):
+        """GetFlags() -> int"""
+        return _xrc.XmlResource_GetFlags(*args, **kwargs)
+
+    def SetFlags(*args, **kwargs):
+        """SetFlags(int flags)"""
+        return _xrc.XmlResource_SetFlags(*args, **kwargs)
+
 
 class XmlResourcePtr(XmlResource):
     def __init__(self, this):
@@ -64,21 +160,30 @@ class XmlResourcePtr(XmlResource):
 _xrc.XmlResource_swigregister(XmlResourcePtr)
 
 def EmptyXmlResource(*args, **kwargs):
+    """EmptyXmlResource(int flags=XRC_USE_LOCALE) -> XmlResource"""
     val = _xrc.new_EmptyXmlResource(*args, **kwargs)
     val.thisown = 1
     val.InitAllHandlers()
     return val
 
-XmlResource_AddSubclassFactory = _xrc.XmlResource_AddSubclassFactory
+def XmlResource_AddSubclassFactory(*args, **kwargs):
+    """XmlResource_AddSubclassFactory(XmlSubclassFactory factory)"""
+    return _xrc.XmlResource_AddSubclassFactory(*args, **kwargs)
 
-XmlResource_GetXRCID = _xrc.XmlResource_GetXRCID
+def XmlResource_GetXRCID(*args, **kwargs):
+    """XmlResource_GetXRCID(wxString str_id) -> int"""
+    return _xrc.XmlResource_GetXRCID(*args, **kwargs)
 
-XmlResource_Get = _xrc.XmlResource_Get
+def XmlResource_Get(*args, **kwargs):
+    """XmlResource_Get() -> XmlResource"""
+    return _xrc.XmlResource_Get(*args, **kwargs)
 
-XmlResource_Set = _xrc.XmlResource_Set
+def XmlResource_Set(*args, **kwargs):
+    """XmlResource_Set(XmlResource res) -> XmlResource"""
+    return _xrc.XmlResource_Set(*args, **kwargs)
 
 def XRCID(str_id):
-    return wxXmlResource_GetXRCID(str_id)
+    return XmlResource_GetXRCID(str_id)
 
 def XRCCTRL(window, str_id, *ignoreargs):
     return window.FindWindowById(XRCID(str_id))
@@ -86,15 +191,21 @@ def XRCCTRL(window, str_id, *ignoreargs):
 #---------------------------------------------------------------------------
 
 class XmlSubclassFactory(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyXmlSubclassFactory instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> XmlSubclassFactory"""
         newobj = _xrc.new_XmlSubclassFactory(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, XmlSubclassFactory)
-    def _setCallbackInfo(*args, **kwargs): return _xrc.XmlSubclassFactory__setCallbackInfo(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyXmlSubclassFactory instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _xrc.XmlSubclassFactory__setCallbackInfo(*args, **kwargs)
+
 
 class XmlSubclassFactoryPtr(XmlSubclassFactory):
     def __init__(self, this):
@@ -119,19 +230,40 @@ XML_DOCUMENT_FRAG_NODE = _xrc.XML_DOCUMENT_FRAG_NODE
 XML_NOTATION_NODE = _xrc.XML_NOTATION_NODE
 XML_HTML_DOCUMENT_NODE = _xrc.XML_HTML_DOCUMENT_NODE
 class XmlProperty(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxXmlProperty instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString name=wxPyEmptyString, wxString value=wxPyEmptyString, 
+    XmlProperty next=None) -> XmlProperty"""
         newobj = _xrc.new_XmlProperty(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetName(*args, **kwargs): return _xrc.XmlProperty_GetName(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _xrc.XmlProperty_GetValue(*args, **kwargs)
-    def GetNext(*args, **kwargs): return _xrc.XmlProperty_GetNext(*args, **kwargs)
-    def SetName(*args, **kwargs): return _xrc.XmlProperty_SetName(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _xrc.XmlProperty_SetValue(*args, **kwargs)
-    def SetNext(*args, **kwargs): return _xrc.XmlProperty_SetNext(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxXmlProperty instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetName(*args, **kwargs):
+        """GetName() -> wxString"""
+        return _xrc.XmlProperty_GetName(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> wxString"""
+        return _xrc.XmlProperty_GetValue(*args, **kwargs)
+
+    def GetNext(*args, **kwargs):
+        """GetNext() -> XmlProperty"""
+        return _xrc.XmlProperty_GetNext(*args, **kwargs)
+
+    def SetName(*args, **kwargs):
+        """SetName(wxString name)"""
+        return _xrc.XmlProperty_SetName(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(wxString value)"""
+        return _xrc.XmlProperty_SetValue(*args, **kwargs)
+
+    def SetNext(*args, **kwargs):
+        """SetNext(XmlProperty next)"""
+        return _xrc.XmlProperty_SetNext(*args, **kwargs)
+
 
 class XmlPropertyPtr(XmlProperty):
     def __init__(self, this):
@@ -141,39 +273,111 @@ class XmlPropertyPtr(XmlProperty):
 _xrc.XmlProperty_swigregister(XmlPropertyPtr)
 
 class XmlNode(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxXmlNode instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(XmlNode parent=None, wxXmlNodeType type=0, wxString name=wxPyEmptyString, 
+    wxString content=wxPyEmptyString, 
+    XmlProperty props=None, XmlNode next=None) -> XmlNode"""
         newobj = _xrc.new_XmlNode(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_xrc.delete_XmlNode):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def AddChild(*args, **kwargs): return _xrc.XmlNode_AddChild(*args, **kwargs)
-    def InsertChild(*args, **kwargs): return _xrc.XmlNode_InsertChild(*args, **kwargs)
-    def RemoveChild(*args, **kwargs): return _xrc.XmlNode_RemoveChild(*args, **kwargs)
-    def AddProperty(*args, **kwargs): return _xrc.XmlNode_AddProperty(*args, **kwargs)
-    def AddPropertyName(*args, **kwargs): return _xrc.XmlNode_AddPropertyName(*args, **kwargs)
-    def DeleteProperty(*args, **kwargs): return _xrc.XmlNode_DeleteProperty(*args, **kwargs)
-    def GetType(*args, **kwargs): return _xrc.XmlNode_GetType(*args, **kwargs)
-    def GetName(*args, **kwargs): return _xrc.XmlNode_GetName(*args, **kwargs)
-    def GetContent(*args, **kwargs): return _xrc.XmlNode_GetContent(*args, **kwargs)
-    def GetParent(*args, **kwargs): return _xrc.XmlNode_GetParent(*args, **kwargs)
-    def GetNext(*args, **kwargs): return _xrc.XmlNode_GetNext(*args, **kwargs)
-    def GetChildren(*args, **kwargs): return _xrc.XmlNode_GetChildren(*args, **kwargs)
-    def GetProperties(*args, **kwargs): return _xrc.XmlNode_GetProperties(*args, **kwargs)
-    def GetPropVal(*args, **kwargs): return _xrc.XmlNode_GetPropVal(*args, **kwargs)
-    def HasProp(*args, **kwargs): return _xrc.XmlNode_HasProp(*args, **kwargs)
-    def SetType(*args, **kwargs): return _xrc.XmlNode_SetType(*args, **kwargs)
-    def SetName(*args, **kwargs): return _xrc.XmlNode_SetName(*args, **kwargs)
-    def SetContent(*args, **kwargs): return _xrc.XmlNode_SetContent(*args, **kwargs)
-    def SetParent(*args, **kwargs): return _xrc.XmlNode_SetParent(*args, **kwargs)
-    def SetNext(*args, **kwargs): return _xrc.XmlNode_SetNext(*args, **kwargs)
-    def SetChildren(*args, **kwargs): return _xrc.XmlNode_SetChildren(*args, **kwargs)
-    def SetProperties(*args, **kwargs): return _xrc.XmlNode_SetProperties(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxXmlNode instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def AddChild(*args, **kwargs):
+        """AddChild(XmlNode child)"""
+        return _xrc.XmlNode_AddChild(*args, **kwargs)
+
+    def InsertChild(*args, **kwargs):
+        """InsertChild(XmlNode child, XmlNode before_node)"""
+        return _xrc.XmlNode_InsertChild(*args, **kwargs)
+
+    def RemoveChild(*args, **kwargs):
+        """RemoveChild(XmlNode child) -> bool"""
+        return _xrc.XmlNode_RemoveChild(*args, **kwargs)
+
+    def AddProperty(*args, **kwargs):
+        """AddProperty(XmlProperty prop)"""
+        return _xrc.XmlNode_AddProperty(*args, **kwargs)
+
+    def AddPropertyName(*args, **kwargs):
+        """AddPropertyName(wxString name, wxString value)"""
+        return _xrc.XmlNode_AddPropertyName(*args, **kwargs)
+
+    def DeleteProperty(*args, **kwargs):
+        """DeleteProperty(wxString name) -> bool"""
+        return _xrc.XmlNode_DeleteProperty(*args, **kwargs)
+
+    def GetType(*args, **kwargs):
+        """GetType() -> wxXmlNodeType"""
+        return _xrc.XmlNode_GetType(*args, **kwargs)
+
+    def GetName(*args, **kwargs):
+        """GetName() -> wxString"""
+        return _xrc.XmlNode_GetName(*args, **kwargs)
+
+    def GetContent(*args, **kwargs):
+        """GetContent() -> wxString"""
+        return _xrc.XmlNode_GetContent(*args, **kwargs)
+
+    def GetParent(*args, **kwargs):
+        """GetParent() -> XmlNode"""
+        return _xrc.XmlNode_GetParent(*args, **kwargs)
+
+    def GetNext(*args, **kwargs):
+        """GetNext() -> XmlNode"""
+        return _xrc.XmlNode_GetNext(*args, **kwargs)
+
+    def GetChildren(*args, **kwargs):
+        """GetChildren() -> XmlNode"""
+        return _xrc.XmlNode_GetChildren(*args, **kwargs)
+
+    def GetProperties(*args, **kwargs):
+        """GetProperties() -> XmlProperty"""
+        return _xrc.XmlNode_GetProperties(*args, **kwargs)
+
+    def GetPropVal(*args, **kwargs):
+        """GetPropVal(wxString propName, wxString defaultVal) -> wxString"""
+        return _xrc.XmlNode_GetPropVal(*args, **kwargs)
+
+    def HasProp(*args, **kwargs):
+        """HasProp(wxString propName) -> bool"""
+        return _xrc.XmlNode_HasProp(*args, **kwargs)
+
+    def SetType(*args, **kwargs):
+        """SetType(wxXmlNodeType type)"""
+        return _xrc.XmlNode_SetType(*args, **kwargs)
+
+    def SetName(*args, **kwargs):
+        """SetName(wxString name)"""
+        return _xrc.XmlNode_SetName(*args, **kwargs)
+
+    def SetContent(*args, **kwargs):
+        """SetContent(wxString con)"""
+        return _xrc.XmlNode_SetContent(*args, **kwargs)
+
+    def SetParent(*args, **kwargs):
+        """SetParent(XmlNode parent)"""
+        return _xrc.XmlNode_SetParent(*args, **kwargs)
+
+    def SetNext(*args, **kwargs):
+        """SetNext(XmlNode next)"""
+        return _xrc.XmlNode_SetNext(*args, **kwargs)
+
+    def SetChildren(*args, **kwargs):
+        """SetChildren(XmlNode child)"""
+        return _xrc.XmlNode_SetChildren(*args, **kwargs)
+
+    def SetProperties(*args, **kwargs):
+        """SetProperties(XmlProperty prop)"""
+        return _xrc.XmlNode_SetProperties(*args, **kwargs)
+
 
 class XmlNodePtr(XmlNode):
     def __init__(self, this):
@@ -183,33 +387,71 @@ class XmlNodePtr(XmlNode):
 _xrc.XmlNode_swigregister(XmlNodePtr)
 
 def XmlNodeEasy(*args, **kwargs):
+    """XmlNodeEasy(wxXmlNodeType type, wxString name, wxString content=wxPyEmptyString) -> XmlNode"""
     val = _xrc.new_XmlNodeEasy(*args, **kwargs)
     val.thisown = 1
     return val
 
 class XmlDocument(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxXmlDocument instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString filename, wxString encoding=wxPyUTF8String) -> XmlDocument"""
         newobj = _xrc.new_XmlDocument(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_xrc.delete_XmlDocument):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Load(*args, **kwargs): return _xrc.XmlDocument_Load(*args, **kwargs)
-    def LoadFromStream(*args, **kwargs): return _xrc.XmlDocument_LoadFromStream(*args, **kwargs)
-    def Save(*args, **kwargs): return _xrc.XmlDocument_Save(*args, **kwargs)
-    def SaveToStream(*args, **kwargs): return _xrc.XmlDocument_SaveToStream(*args, **kwargs)
-    def IsOk(*args, **kwargs): return _xrc.XmlDocument_IsOk(*args, **kwargs)
-    def GetRoot(*args, **kwargs): return _xrc.XmlDocument_GetRoot(*args, **kwargs)
-    def GetVersion(*args, **kwargs): return _xrc.XmlDocument_GetVersion(*args, **kwargs)
-    def GetFileEncoding(*args, **kwargs): return _xrc.XmlDocument_GetFileEncoding(*args, **kwargs)
-    def SetRoot(*args, **kwargs): return _xrc.XmlDocument_SetRoot(*args, **kwargs)
-    def SetVersion(*args, **kwargs): return _xrc.XmlDocument_SetVersion(*args, **kwargs)
-    def SetFileEncoding(*args, **kwargs): return _xrc.XmlDocument_SetFileEncoding(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxXmlDocument instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Load(*args, **kwargs):
+        """Load(wxString filename, wxString encoding=wxPyUTF8String) -> bool"""
+        return _xrc.XmlDocument_Load(*args, **kwargs)
+
+    def LoadFromStream(*args, **kwargs):
+        """LoadFromStream(wxInputStream stream, wxString encoding=wxPyUTF8String) -> bool"""
+        return _xrc.XmlDocument_LoadFromStream(*args, **kwargs)
+
+    def Save(*args, **kwargs):
+        """Save(wxString filename) -> bool"""
+        return _xrc.XmlDocument_Save(*args, **kwargs)
+
+    def SaveToStream(*args, **kwargs):
+        """SaveToStream(OutputStream stream) -> bool"""
+        return _xrc.XmlDocument_SaveToStream(*args, **kwargs)
+
+    def IsOk(*args, **kwargs):
+        """IsOk() -> bool"""
+        return _xrc.XmlDocument_IsOk(*args, **kwargs)
+
+    def GetRoot(*args, **kwargs):
+        """GetRoot() -> XmlNode"""
+        return _xrc.XmlDocument_GetRoot(*args, **kwargs)
+
+    def GetVersion(*args, **kwargs):
+        """GetVersion() -> wxString"""
+        return _xrc.XmlDocument_GetVersion(*args, **kwargs)
+
+    def GetFileEncoding(*args, **kwargs):
+        """GetFileEncoding() -> wxString"""
+        return _xrc.XmlDocument_GetFileEncoding(*args, **kwargs)
+
+    def SetRoot(*args, **kwargs):
+        """SetRoot(XmlNode node)"""
+        return _xrc.XmlDocument_SetRoot(*args, **kwargs)
+
+    def SetVersion(*args, **kwargs):
+        """SetVersion(wxString version)"""
+        return _xrc.XmlDocument_SetVersion(*args, **kwargs)
+
+    def SetFileEncoding(*args, **kwargs):
+        """SetFileEncoding(wxString encoding)"""
+        return _xrc.XmlDocument_SetFileEncoding(*args, **kwargs)
+
 
 class XmlDocumentPtr(XmlDocument):
     def __init__(self, this):
@@ -219,11 +461,13 @@ class XmlDocumentPtr(XmlDocument):
 _xrc.XmlDocument_swigregister(XmlDocumentPtr)
 
 def XmlDocumentFromStream(*args, **kwargs):
+    """XmlDocumentFromStream(wxInputStream stream, wxString encoding=wxPyUTF8String) -> XmlDocument"""
     val = _xrc.new_XmlDocumentFromStream(*args, **kwargs)
     val.thisown = 1
     return val
 
 def EmptyXmlDocument(*args, **kwargs):
+    """EmptyXmlDocument() -> XmlDocument"""
     val = _xrc.new_EmptyXmlDocument(*args, **kwargs)
     val.thisown = 1
     return val
@@ -231,49 +475,159 @@ def EmptyXmlDocument(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class XmlResourceHandler(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyXmlResourceHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> XmlResourceHandler"""
         newobj = _xrc.new_XmlResourceHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, XmlResourceHandler)
-    def _setCallbackInfo(*args, **kwargs): return _xrc.XmlResourceHandler__setCallbackInfo(*args, **kwargs)
-    def CreateResource(*args, **kwargs): return _xrc.XmlResourceHandler_CreateResource(*args, **kwargs)
-    def SetParentResource(*args, **kwargs): return _xrc.XmlResourceHandler_SetParentResource(*args, **kwargs)
-    def GetResource(*args, **kwargs): return _xrc.XmlResourceHandler_GetResource(*args, **kwargs)
-    def GetNode(*args, **kwargs): return _xrc.XmlResourceHandler_GetNode(*args, **kwargs)
-    def GetClass(*args, **kwargs): return _xrc.XmlResourceHandler_GetClass(*args, **kwargs)
-    def GetParent(*args, **kwargs): return _xrc.XmlResourceHandler_GetParent(*args, **kwargs)
-    def GetInstance(*args, **kwargs): return _xrc.XmlResourceHandler_GetInstance(*args, **kwargs)
-    def GetParentAsWindow(*args, **kwargs): return _xrc.XmlResourceHandler_GetParentAsWindow(*args, **kwargs)
-    def GetInstanceAsWindow(*args, **kwargs): return _xrc.XmlResourceHandler_GetInstanceAsWindow(*args, **kwargs)
-    def IsOfClass(*args, **kwargs): return _xrc.XmlResourceHandler_IsOfClass(*args, **kwargs)
-    def GetNodeContent(*args, **kwargs): return _xrc.XmlResourceHandler_GetNodeContent(*args, **kwargs)
-    def HasParam(*args, **kwargs): return _xrc.XmlResourceHandler_HasParam(*args, **kwargs)
-    def GetParamNode(*args, **kwargs): return _xrc.XmlResourceHandler_GetParamNode(*args, **kwargs)
-    def GetParamValue(*args, **kwargs): return _xrc.XmlResourceHandler_GetParamValue(*args, **kwargs)
-    def AddStyle(*args, **kwargs): return _xrc.XmlResourceHandler_AddStyle(*args, **kwargs)
-    def AddWindowStyles(*args, **kwargs): return _xrc.XmlResourceHandler_AddWindowStyles(*args, **kwargs)
-    def GetStyle(*args, **kwargs): return _xrc.XmlResourceHandler_GetStyle(*args, **kwargs)
-    def GetText(*args, **kwargs): return _xrc.XmlResourceHandler_GetText(*args, **kwargs)
-    def GetID(*args, **kwargs): return _xrc.XmlResourceHandler_GetID(*args, **kwargs)
-    def GetName(*args, **kwargs): return _xrc.XmlResourceHandler_GetName(*args, **kwargs)
-    def GetBool(*args, **kwargs): return _xrc.XmlResourceHandler_GetBool(*args, **kwargs)
-    def GetLong(*args, **kwargs): return _xrc.XmlResourceHandler_GetLong(*args, **kwargs)
-    def GetColour(*args, **kwargs): return _xrc.XmlResourceHandler_GetColour(*args, **kwargs)
-    def GetSize(*args, **kwargs): return _xrc.XmlResourceHandler_GetSize(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _xrc.XmlResourceHandler_GetPosition(*args, **kwargs)
-    def GetDimension(*args, **kwargs): return _xrc.XmlResourceHandler_GetDimension(*args, **kwargs)
-    def GetBitmap(*args, **kwargs): return _xrc.XmlResourceHandler_GetBitmap(*args, **kwargs)
-    def GetIcon(*args, **kwargs): return _xrc.XmlResourceHandler_GetIcon(*args, **kwargs)
-    def GetFont(*args, **kwargs): return _xrc.XmlResourceHandler_GetFont(*args, **kwargs)
-    def SetupWindow(*args, **kwargs): return _xrc.XmlResourceHandler_SetupWindow(*args, **kwargs)
-    def CreateChildren(*args, **kwargs): return _xrc.XmlResourceHandler_CreateChildren(*args, **kwargs)
-    def CreateChildrenPrivately(*args, **kwargs): return _xrc.XmlResourceHandler_CreateChildrenPrivately(*args, **kwargs)
-    def CreateResFromNode(*args, **kwargs): return _xrc.XmlResourceHandler_CreateResFromNode(*args, **kwargs)
-    def GetCurFileSystem(*args, **kwargs): return _xrc.XmlResourceHandler_GetCurFileSystem(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyXmlResourceHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _xrc.XmlResourceHandler__setCallbackInfo(*args, **kwargs)
+
+    def CreateResource(*args, **kwargs):
+        """CreateResource(XmlNode node, Object parent, Object instance) -> Object"""
+        return _xrc.XmlResourceHandler_CreateResource(*args, **kwargs)
+
+    def SetParentResource(*args, **kwargs):
+        """SetParentResource(XmlResource res)"""
+        return _xrc.XmlResourceHandler_SetParentResource(*args, **kwargs)
+
+    def GetResource(*args, **kwargs):
+        """GetResource() -> XmlResource"""
+        return _xrc.XmlResourceHandler_GetResource(*args, **kwargs)
+
+    def GetNode(*args, **kwargs):
+        """GetNode() -> XmlNode"""
+        return _xrc.XmlResourceHandler_GetNode(*args, **kwargs)
+
+    def GetClass(*args, **kwargs):
+        """GetClass() -> wxString"""
+        return _xrc.XmlResourceHandler_GetClass(*args, **kwargs)
+
+    def GetParent(*args, **kwargs):
+        """GetParent() -> Object"""
+        return _xrc.XmlResourceHandler_GetParent(*args, **kwargs)
+
+    def GetInstance(*args, **kwargs):
+        """GetInstance() -> Object"""
+        return _xrc.XmlResourceHandler_GetInstance(*args, **kwargs)
+
+    def GetParentAsWindow(*args, **kwargs):
+        """GetParentAsWindow() -> Window"""
+        return _xrc.XmlResourceHandler_GetParentAsWindow(*args, **kwargs)
+
+    def GetInstanceAsWindow(*args, **kwargs):
+        """GetInstanceAsWindow() -> Window"""
+        return _xrc.XmlResourceHandler_GetInstanceAsWindow(*args, **kwargs)
+
+    def IsOfClass(*args, **kwargs):
+        """IsOfClass(XmlNode node, wxString classname) -> bool"""
+        return _xrc.XmlResourceHandler_IsOfClass(*args, **kwargs)
+
+    def GetNodeContent(*args, **kwargs):
+        """GetNodeContent(XmlNode node) -> wxString"""
+        return _xrc.XmlResourceHandler_GetNodeContent(*args, **kwargs)
+
+    def HasParam(*args, **kwargs):
+        """HasParam(wxString param) -> bool"""
+        return _xrc.XmlResourceHandler_HasParam(*args, **kwargs)
+
+    def GetParamNode(*args, **kwargs):
+        """GetParamNode(wxString param) -> XmlNode"""
+        return _xrc.XmlResourceHandler_GetParamNode(*args, **kwargs)
+
+    def GetParamValue(*args, **kwargs):
+        """GetParamValue(wxString param) -> wxString"""
+        return _xrc.XmlResourceHandler_GetParamValue(*args, **kwargs)
+
+    def AddStyle(*args, **kwargs):
+        """AddStyle(wxString name, int value)"""
+        return _xrc.XmlResourceHandler_AddStyle(*args, **kwargs)
+
+    def AddWindowStyles(*args, **kwargs):
+        """AddWindowStyles()"""
+        return _xrc.XmlResourceHandler_AddWindowStyles(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle(wxString param=wxPyStyleString, int defaults=0) -> int"""
+        return _xrc.XmlResourceHandler_GetStyle(*args, **kwargs)
+
+    def GetText(*args, **kwargs):
+        """GetText(wxString param, bool translate=True) -> wxString"""
+        return _xrc.XmlResourceHandler_GetText(*args, **kwargs)
+
+    def GetID(*args, **kwargs):
+        """GetID() -> int"""
+        return _xrc.XmlResourceHandler_GetID(*args, **kwargs)
+
+    def GetName(*args, **kwargs):
+        """GetName() -> wxString"""
+        return _xrc.XmlResourceHandler_GetName(*args, **kwargs)
+
+    def GetBool(*args, **kwargs):
+        """GetBool(wxString param, bool defaultv=False) -> bool"""
+        return _xrc.XmlResourceHandler_GetBool(*args, **kwargs)
+
+    def GetLong(*args, **kwargs):
+        """GetLong(wxString param, long defaultv=0) -> long"""
+        return _xrc.XmlResourceHandler_GetLong(*args, **kwargs)
+
+    def GetColour(*args, **kwargs):
+        """GetColour(wxString param) -> wxColour"""
+        return _xrc.XmlResourceHandler_GetColour(*args, **kwargs)
+
+    def GetSize(*args, **kwargs):
+        """GetSize(wxString param=wxPySizeString) -> Size"""
+        return _xrc.XmlResourceHandler_GetSize(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition(wxString param=wxPyPosString) -> Point"""
+        return _xrc.XmlResourceHandler_GetPosition(*args, **kwargs)
+
+    def GetDimension(*args, **kwargs):
+        """GetDimension(wxString param, int defaultv=0) -> int"""
+        return _xrc.XmlResourceHandler_GetDimension(*args, **kwargs)
+
+    def GetBitmap(*args, **kwargs):
+        """GetBitmap(wxString param=wxPyBitmapString, wxArtClient defaultArtClient=wxART_OTHER, 
+    Size size=DefaultSize) -> wxBitmap"""
+        return _xrc.XmlResourceHandler_GetBitmap(*args, **kwargs)
+
+    def GetIcon(*args, **kwargs):
+        """GetIcon(wxString param=wxPyIconString, wxArtClient defaultArtClient=wxART_OTHER, 
+    Size size=DefaultSize) -> wxIcon"""
+        return _xrc.XmlResourceHandler_GetIcon(*args, **kwargs)
+
+    def GetFont(*args, **kwargs):
+        """GetFont(wxString param=wxPyFontString) -> wxFont"""
+        return _xrc.XmlResourceHandler_GetFont(*args, **kwargs)
+
+    def SetupWindow(*args, **kwargs):
+        """SetupWindow(Window wnd)"""
+        return _xrc.XmlResourceHandler_SetupWindow(*args, **kwargs)
+
+    def CreateChildren(*args, **kwargs):
+        """CreateChildren(Object parent, bool this_hnd_only=False)"""
+        return _xrc.XmlResourceHandler_CreateChildren(*args, **kwargs)
+
+    def CreateChildrenPrivately(*args, **kwargs):
+        """CreateChildrenPrivately(Object parent, XmlNode rootnode=None)"""
+        return _xrc.XmlResourceHandler_CreateChildrenPrivately(*args, **kwargs)
+
+    def CreateResFromNode(*args, **kwargs):
+        """CreateResFromNode(XmlNode node, Object parent, Object instance=None) -> Object"""
+        return _xrc.XmlResourceHandler_CreateResFromNode(*args, **kwargs)
+
+    def GetCurFileSystem(*args, **kwargs):
+        """GetCurFileSystem() -> FileSystem"""
+        return _xrc.XmlResourceHandler_GetCurFileSystem(*args, **kwargs)
+
 
 class XmlResourceHandlerPtr(XmlResourceHandler):
     def __init__(self, this):
diff --git a/wxPython/contrib/xrc/xrc_wrap.cpp b/wxPython/contrib/xrc/xrc_wrap.cpp
index 10a917d9ca..034162a2a5 100644
--- a/wxPython/contrib/xrc/xrc_wrap.cpp
+++ b/wxPython/contrib/xrc/xrc_wrap.cpp
@@ -358,7 +358,7 @@ public:
     int GetStyle(const wxString& param = wxT("style"), int defaults = 0)
         { return wxXmlResourceHandler::GetStyle(param, defaults); }
 
-    wxString GetText(const wxString& param, bool translate = TRUE)
+    wxString GetText(const wxString& param, bool translate = True)
         { return wxXmlResourceHandler::GetText(param, translate); }
 
     int GetID()
@@ -367,7 +367,7 @@ public:
     wxString GetName()
         { return wxXmlResourceHandler::GetName(); }
 
-    bool GetBool(const wxString& param, bool defaultv = FALSE)
+    bool GetBool(const wxString& param, bool defaultv = False)
         { return wxXmlResourceHandler::GetBool(param, defaultv); }
 
     long GetLong( const wxString& param, long defaultv = 0 )
@@ -401,7 +401,7 @@ public:
     void SetupWindow(wxWindow *wnd)
         { wxXmlResourceHandler::SetupWindow(wnd); }
 
-    void CreateChildren(wxObject *parent, bool this_hnd_only = FALSE)
+    void CreateChildren(wxObject *parent, bool this_hnd_only = False)
         { wxXmlResourceHandler::CreateChildren(parent, this_hnd_only); }
 
     void CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL)
@@ -430,7 +430,7 @@ static PyObject *_wrap_new_XmlResource(PyObject *self, PyObject *args, PyObject
     wxString *arg1 = 0 ;
     int arg2 = (int) wxXRC_USE_LOCALE ;
     wxXmlResource *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "filemask",(char *) "flags", NULL 
@@ -440,7 +440,7 @@ static PyObject *_wrap_new_XmlResource(PyObject *self, PyObject *args, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -516,7 +516,7 @@ static PyObject *_wrap_XmlResource_Load(PyObject *self, PyObject *args, PyObject
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -528,7 +528,7 @@ static PyObject *_wrap_XmlResource_Load(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -557,7 +557,7 @@ static PyObject *_wrap_XmlResource_LoadFromString(PyObject *self, PyObject *args
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -569,7 +569,7 @@ static PyObject *_wrap_XmlResource_LoadFromString(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -724,7 +724,7 @@ static PyObject *_wrap_XmlResource_LoadMenu(PyObject *self, PyObject *args, PyOb
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxString *arg2 = 0 ;
     wxMenu *result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -736,7 +736,7 @@ static PyObject *_wrap_XmlResource_LoadMenu(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -767,7 +767,7 @@ static PyObject *_wrap_XmlResource_LoadMenuBar(PyObject *self, PyObject *args, P
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxString *arg2 = 0 ;
     wxMenuBar *result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -779,7 +779,7 @@ static PyObject *_wrap_XmlResource_LoadMenuBar(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -811,7 +811,7 @@ static PyObject *_wrap_XmlResource_LoadMenuBarOnFrame(PyObject *self, PyObject *
     wxWindow *arg2 = (wxWindow *) 0 ;
     wxString *arg3 = 0 ;
     wxMenuBar *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -825,7 +825,7 @@ static PyObject *_wrap_XmlResource_LoadMenuBarOnFrame(PyObject *self, PyObject *
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -857,7 +857,7 @@ static PyObject *_wrap_XmlResource_LoadToolBar(PyObject *self, PyObject *args, P
     wxWindow *arg2 = (wxWindow *) 0 ;
     wxString *arg3 = 0 ;
     wxToolBar *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -871,7 +871,7 @@ static PyObject *_wrap_XmlResource_LoadToolBar(PyObject *self, PyObject *args, P
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -903,7 +903,7 @@ static PyObject *_wrap_XmlResource_LoadDialog(PyObject *self, PyObject *args, Py
     wxWindow *arg2 = (wxWindow *) 0 ;
     wxString *arg3 = 0 ;
     wxDialog *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -917,7 +917,7 @@ static PyObject *_wrap_XmlResource_LoadDialog(PyObject *self, PyObject *args, Py
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -948,7 +948,7 @@ static PyObject *_wrap_XmlResource_LoadOnDialog(PyObject *self, PyObject *args,
     wxWindow *arg3 = (wxWindow *) 0 ;
     wxString *arg4 = 0 ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -964,7 +964,7 @@ static PyObject *_wrap_XmlResource_LoadOnDialog(PyObject *self, PyObject *args,
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -994,7 +994,7 @@ static PyObject *_wrap_XmlResource_LoadPanel(PyObject *self, PyObject *args, PyO
     wxWindow *arg2 = (wxWindow *) 0 ;
     wxString *arg3 = 0 ;
     wxPanel *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -1008,7 +1008,7 @@ static PyObject *_wrap_XmlResource_LoadPanel(PyObject *self, PyObject *args, PyO
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1039,7 +1039,7 @@ static PyObject *_wrap_XmlResource_LoadOnPanel(PyObject *self, PyObject *args, P
     wxWindow *arg3 = (wxWindow *) 0 ;
     wxString *arg4 = 0 ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -1055,7 +1055,7 @@ static PyObject *_wrap_XmlResource_LoadOnPanel(PyObject *self, PyObject *args, P
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1085,7 +1085,7 @@ static PyObject *_wrap_XmlResource_LoadFrame(PyObject *self, PyObject *args, PyO
     wxWindow *arg2 = (wxWindow *) 0 ;
     wxString *arg3 = 0 ;
     wxFrame *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -1099,7 +1099,7 @@ static PyObject *_wrap_XmlResource_LoadFrame(PyObject *self, PyObject *args, PyO
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1132,7 +1132,7 @@ static PyObject *_wrap_XmlResource_LoadOnFrame(PyObject *self, PyObject *args, P
     wxWindow *arg3 = (wxWindow *) 0 ;
     wxString *arg4 = 0 ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -1148,7 +1148,7 @@ static PyObject *_wrap_XmlResource_LoadOnFrame(PyObject *self, PyObject *args, P
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1179,8 +1179,8 @@ static PyObject *_wrap_XmlResource_LoadObject(PyObject *self, PyObject *args, Py
     wxString *arg3 = 0 ;
     wxString *arg4 = 0 ;
     wxObject *result;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -1195,12 +1195,12 @@ static PyObject *_wrap_XmlResource_LoadObject(PyObject *self, PyObject *args, Py
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1242,8 +1242,8 @@ static PyObject *_wrap_XmlResource_LoadOnObject(PyObject *self, PyObject *args,
     wxString *arg4 = 0 ;
     wxString *arg5 = 0 ;
     bool result;
-    bool temp4 = false ;
-    bool temp5 = false ;
+    bool temp4 = False ;
+    bool temp5 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -1260,12 +1260,12 @@ static PyObject *_wrap_XmlResource_LoadOnObject(PyObject *self, PyObject *args,
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         arg5 = wxString_in_helper(obj4);
         if (arg5 == NULL) SWIG_fail;
-        temp5 = true;
+        temp5 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1302,7 +1302,7 @@ static PyObject *_wrap_XmlResource_LoadBitmap(PyObject *self, PyObject *args, Py
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxString *arg2 = 0 ;
     wxBitmap result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1314,7 +1314,7 @@ static PyObject *_wrap_XmlResource_LoadBitmap(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1347,7 +1347,7 @@ static PyObject *_wrap_XmlResource_LoadIcon(PyObject *self, PyObject *args, PyOb
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxString *arg2 = 0 ;
     wxIcon result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1359,7 +1359,7 @@ static PyObject *_wrap_XmlResource_LoadIcon(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1394,7 +1394,7 @@ static PyObject *_wrap_XmlResource_AttachUnknownControl(PyObject *self, PyObject
     wxWindow *arg3 = (wxWindow *) 0 ;
     wxWindow *arg4 = (wxWindow *) NULL ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -1408,7 +1408,7 @@ static PyObject *_wrap_XmlResource_AttachUnknownControl(PyObject *self, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (obj3) {
@@ -1440,7 +1440,7 @@ static PyObject *_wrap_XmlResource_GetXRCID(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     int result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "str_id", NULL 
@@ -1450,7 +1450,7 @@ static PyObject *_wrap_XmlResource_GetXRCID(PyObject *self, PyObject *args, PyOb
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1699,8 +1699,8 @@ static PyObject *_wrap_new_XmlProperty(PyObject *self, PyObject *args, PyObject
     wxString *arg2 = (wxString *) &arg2_defvalue ;
     wxXmlProperty *arg3 = (wxXmlProperty *) NULL ;
     wxXmlProperty *result;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -1713,14 +1713,14 @@ static PyObject *_wrap_new_XmlProperty(PyObject *self, PyObject *args, PyObject
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj2) {
@@ -1847,7 +1847,7 @@ static PyObject *_wrap_XmlProperty_SetName(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxXmlProperty *arg1 = (wxXmlProperty *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1859,7 +1859,7 @@ static PyObject *_wrap_XmlProperty_SetName(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1887,7 +1887,7 @@ static PyObject *_wrap_XmlProperty_SetValue(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxXmlProperty *arg1 = (wxXmlProperty *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1899,7 +1899,7 @@ static PyObject *_wrap_XmlProperty_SetValue(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1968,8 +1968,8 @@ static PyObject *_wrap_new_XmlNode(PyObject *self, PyObject *args, PyObject *kwa
     wxXmlProperty *arg5 = (wxXmlProperty *) NULL ;
     wxXmlNode *arg6 = (wxXmlNode *) NULL ;
     wxXmlNode *result;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -1987,14 +1987,14 @@ static PyObject *_wrap_new_XmlNode(PyObject *self, PyObject *args, PyObject *kwa
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     if (obj4) {
@@ -2064,8 +2064,8 @@ static PyObject *_wrap_new_XmlNodeEasy(PyObject *self, PyObject *args, PyObject
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxXmlNode *result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -2076,13 +2076,13 @@ static PyObject *_wrap_new_XmlNodeEasy(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -2232,8 +2232,8 @@ static PyObject *_wrap_XmlNode_AddPropertyName(PyObject *self, PyObject *args, P
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxString *arg2 = 0 ;
     wxString *arg3 = 0 ;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -2246,12 +2246,12 @@ static PyObject *_wrap_XmlNode_AddPropertyName(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2288,7 +2288,7 @@ static PyObject *_wrap_XmlNode_DeleteProperty(PyObject *self, PyObject *args, Py
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2300,7 +2300,7 @@ static PyObject *_wrap_XmlNode_DeleteProperty(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2517,8 +2517,8 @@ static PyObject *_wrap_XmlNode_GetPropVal(PyObject *self, PyObject *args, PyObje
     wxString *arg2 = 0 ;
     wxString *arg3 = 0 ;
     wxString result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -2531,12 +2531,12 @@ static PyObject *_wrap_XmlNode_GetPropVal(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2579,7 +2579,7 @@ static PyObject *_wrap_XmlNode_HasProp(PyObject *self, PyObject *args, PyObject
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2591,7 +2591,7 @@ static PyObject *_wrap_XmlNode_HasProp(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2644,7 +2644,7 @@ static PyObject *_wrap_XmlNode_SetName(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2656,7 +2656,7 @@ static PyObject *_wrap_XmlNode_SetName(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2684,7 +2684,7 @@ static PyObject *_wrap_XmlNode_SetContent(PyObject *self, PyObject *args, PyObje
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2696,7 +2696,7 @@ static PyObject *_wrap_XmlNode_SetContent(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2841,8 +2841,8 @@ static PyObject *_wrap_new_XmlDocument(PyObject *self, PyObject *args, PyObject
     wxString const &arg2_defvalue = wxPyUTF8String ;
     wxString *arg2 = (wxString *) &arg2_defvalue ;
     wxXmlDocument *result;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2853,13 +2853,13 @@ static PyObject *_wrap_new_XmlDocument(PyObject *self, PyObject *args, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     {
@@ -2900,7 +2900,7 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *self, PyObject *args,
     wxXmlDocument *result;
     wxPyInputStream *temp1 ;
     bool created1 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2911,22 +2911,22 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *self, PyObject *args,
     {
         if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) {
             arg1 = temp1->m_wxis;
-            created1 = false;
+            created1 = False;
         } else {
             PyErr_Clear();  // clear the failure of the wxPyConvert above
-            arg1 = wxPyCBInputStream_create(obj0, false);
+            arg1 = wxPyCBInputStream_create(obj0, False);
             if (arg1 == NULL) {
                 PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object.");
                 SWIG_fail;
             }
-            created1 = true;
+            created1 = True;
         }
     }
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     {
@@ -3012,8 +3012,8 @@ static PyObject *_wrap_XmlDocument_Load(PyObject *self, PyObject *args, PyObject
     wxString const &arg3_defvalue = wxPyUTF8String ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     bool result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3026,13 +3026,13 @@ static PyObject *_wrap_XmlDocument_Load(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -3074,7 +3074,7 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *self, PyObject *args
     bool result;
     wxPyInputStream *temp2 ;
     bool created2 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3087,22 +3087,22 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *self, PyObject *args
     {
         if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) {
             arg2 = temp2->m_wxis;
-            created2 = false;
+            created2 = False;
         } else {
             PyErr_Clear();  // clear the failure of the wxPyConvert above
-            arg2 = wxPyCBInputStream_create(obj1, false);
+            arg2 = wxPyCBInputStream_create(obj1, False);
             if (arg2 == NULL) {
                 PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object.");
                 SWIG_fail;
             }
-            created2 = true;
+            created2 = True;
         }
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -3140,7 +3140,7 @@ static PyObject *_wrap_XmlDocument_Save(PyObject *self, PyObject *args, PyObject
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3152,7 +3152,7 @@ static PyObject *_wrap_XmlDocument_Save(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3350,7 +3350,7 @@ static PyObject *_wrap_XmlDocument_SetVersion(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3362,7 +3362,7 @@ static PyObject *_wrap_XmlDocument_SetVersion(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3390,7 +3390,7 @@ static PyObject *_wrap_XmlDocument_SetFileEncoding(PyObject *self, PyObject *arg
     PyObject *resultobj;
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3402,7 +3402,7 @@ static PyObject *_wrap_XmlDocument_SetFileEncoding(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3743,7 +3743,7 @@ static PyObject *_wrap_XmlResourceHandler_IsOfClass(PyObject *self, PyObject *ar
     wxXmlNode *arg2 = (wxXmlNode *) 0 ;
     wxString *arg3 = 0 ;
     bool result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3757,7 +3757,7 @@ static PyObject *_wrap_XmlResourceHandler_IsOfClass(PyObject *self, PyObject *ar
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3820,7 +3820,7 @@ static PyObject *_wrap_XmlResourceHandler_HasParam(PyObject *self, PyObject *arg
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3832,7 +3832,7 @@ static PyObject *_wrap_XmlResourceHandler_HasParam(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3861,7 +3861,7 @@ static PyObject *_wrap_XmlResourceHandler_GetParamNode(PyObject *self, PyObject
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
     wxXmlNode *result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3873,7 +3873,7 @@ static PyObject *_wrap_XmlResourceHandler_GetParamNode(PyObject *self, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3902,7 +3902,7 @@ static PyObject *_wrap_XmlResourceHandler_GetParamValue(PyObject *self, PyObject
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3914,7 +3914,7 @@ static PyObject *_wrap_XmlResourceHandler_GetParamValue(PyObject *self, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3949,7 +3949,7 @@ static PyObject *_wrap_XmlResourceHandler_AddStyle(PyObject *self, PyObject *arg
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3961,7 +3961,7 @@ static PyObject *_wrap_XmlResourceHandler_AddStyle(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4016,7 +4016,7 @@ static PyObject *_wrap_XmlResourceHandler_GetStyle(PyObject *self, PyObject *arg
     wxString *arg2 = (wxString *) &arg2_defvalue ;
     int arg3 = (int) 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4029,7 +4029,7 @@ static PyObject *_wrap_XmlResourceHandler_GetStyle(PyObject *self, PyObject *arg
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     {
@@ -4058,9 +4058,9 @@ static PyObject *_wrap_XmlResourceHandler_GetText(PyObject *self, PyObject *args
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4073,7 +4073,7 @@ static PyObject *_wrap_XmlResourceHandler_GetText(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         arg3 = PyInt_AsLong(obj2) ? true : false;
@@ -4167,9 +4167,9 @@ static PyObject *_wrap_XmlResourceHandler_GetBool(PyObject *self, PyObject *args
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4182,7 +4182,7 @@ static PyObject *_wrap_XmlResourceHandler_GetBool(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         arg3 = PyInt_AsLong(obj2) ? true : false;
@@ -4216,7 +4216,7 @@ static PyObject *_wrap_XmlResourceHandler_GetLong(PyObject *self, PyObject *args
     wxString *arg2 = 0 ;
     long arg3 = (long) 0 ;
     long result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4228,7 +4228,7 @@ static PyObject *_wrap_XmlResourceHandler_GetLong(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4257,7 +4257,7 @@ static PyObject *_wrap_XmlResourceHandler_GetColour(PyObject *self, PyObject *ar
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
     wxColour result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4269,7 +4269,7 @@ static PyObject *_wrap_XmlResourceHandler_GetColour(PyObject *self, PyObject *ar
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4303,7 +4303,7 @@ static PyObject *_wrap_XmlResourceHandler_GetSize(PyObject *self, PyObject *args
     wxString const &arg2_defvalue = wxPySizeString ;
     wxString *arg2 = (wxString *) &arg2_defvalue ;
     wxSize result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4316,7 +4316,7 @@ static PyObject *_wrap_XmlResourceHandler_GetSize(PyObject *self, PyObject *args
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     {
@@ -4351,7 +4351,7 @@ static PyObject *_wrap_XmlResourceHandler_GetPosition(PyObject *self, PyObject *
     wxString const &arg2_defvalue = wxPyPosString ;
     wxString *arg2 = (wxString *) &arg2_defvalue ;
     wxPoint result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4364,7 +4364,7 @@ static PyObject *_wrap_XmlResourceHandler_GetPosition(PyObject *self, PyObject *
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     {
@@ -4397,9 +4397,9 @@ static PyObject *_wrap_XmlResourceHandler_GetDimension(PyObject *self, PyObject
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
-    wxCoord arg3 = (wxCoord) 0 ;
-    wxCoord result;
-    bool temp2 = false ;
+    int arg3 = (int) 0 ;
+    int result;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4411,11 +4411,11 @@ static PyObject *_wrap_XmlResourceHandler_GetDimension(PyObject *self, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)(arg1)->GetDimension((wxString const &)*arg2,arg3);
+        result = (int)(arg1)->GetDimension((wxString const &)*arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -4444,7 +4444,7 @@ static PyObject *_wrap_XmlResourceHandler_GetBitmap(PyObject *self, PyObject *ar
     wxArtClient *arg3 = (wxArtClient *) &arg3_defvalue ;
     wxSize arg4 = (wxSize) wxDefaultSize ;
     wxBitmap result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     wxSize *argp4 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -4460,7 +4460,7 @@ static PyObject *_wrap_XmlResourceHandler_GetBitmap(PyObject *self, PyObject *ar
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj2) {
@@ -4508,7 +4508,7 @@ static PyObject *_wrap_XmlResourceHandler_GetIcon(PyObject *self, PyObject *args
     wxArtClient *arg3 = (wxArtClient *) &arg3_defvalue ;
     wxSize arg4 = (wxSize) wxDefaultSize ;
     wxIcon result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     wxSize *argp4 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -4524,7 +4524,7 @@ static PyObject *_wrap_XmlResourceHandler_GetIcon(PyObject *self, PyObject *args
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj2) {
@@ -4569,7 +4569,7 @@ static PyObject *_wrap_XmlResourceHandler_GetFont(PyObject *self, PyObject *args
     wxString const &arg2_defvalue = wxPyFontString ;
     wxString *arg2 = (wxString *) &arg2_defvalue ;
     wxFont result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4582,7 +4582,7 @@ static PyObject *_wrap_XmlResourceHandler_GetFont(PyObject *self, PyObject *args
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     {
@@ -4642,7 +4642,7 @@ static PyObject *_wrap_XmlResourceHandler_CreateChildren(PyObject *self, PyObjec
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxObject *arg2 = (wxObject *) 0 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
diff --git a/wxPython/src/gtk/calendar.py b/wxPython/src/gtk/calendar.py
index 412bd12d80..e027f1cd59 100644
--- a/wxPython/src/gtk/calendar.py
+++ b/wxPython/src/gtk/calendar.py
@@ -23,30 +23,85 @@ CAL_BORDER_NONE = _calendar.CAL_BORDER_NONE
 CAL_BORDER_SQUARE = _calendar.CAL_BORDER_SQUARE
 CAL_BORDER_ROUND = _calendar.CAL_BORDER_ROUND
 class CalendarDateAttr(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCalendarDateAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxColour colText, wxColour colBack=wxNullColour, wxColour colBorder=wxNullColour, 
+    wxFont font=wxNullFont, 
+    wxCalendarDateBorder border=CAL_BORDER_NONE) -> CalendarDateAttr"""
         newobj = _calendar.new_CalendarDateAttr(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetTextColour(*args, **kwargs): return _calendar.CalendarDateAttr_SetTextColour(*args, **kwargs)
-    def SetBackgroundColour(*args, **kwargs): return _calendar.CalendarDateAttr_SetBackgroundColour(*args, **kwargs)
-    def SetBorderColour(*args, **kwargs): return _calendar.CalendarDateAttr_SetBorderColour(*args, **kwargs)
-    def SetFont(*args, **kwargs): return _calendar.CalendarDateAttr_SetFont(*args, **kwargs)
-    def SetBorder(*args, **kwargs): return _calendar.CalendarDateAttr_SetBorder(*args, **kwargs)
-    def SetHoliday(*args, **kwargs): return _calendar.CalendarDateAttr_SetHoliday(*args, **kwargs)
-    def HasTextColour(*args, **kwargs): return _calendar.CalendarDateAttr_HasTextColour(*args, **kwargs)
-    def HasBackgroundColour(*args, **kwargs): return _calendar.CalendarDateAttr_HasBackgroundColour(*args, **kwargs)
-    def HasBorderColour(*args, **kwargs): return _calendar.CalendarDateAttr_HasBorderColour(*args, **kwargs)
-    def HasFont(*args, **kwargs): return _calendar.CalendarDateAttr_HasFont(*args, **kwargs)
-    def HasBorder(*args, **kwargs): return _calendar.CalendarDateAttr_HasBorder(*args, **kwargs)
-    def IsHoliday(*args, **kwargs): return _calendar.CalendarDateAttr_IsHoliday(*args, **kwargs)
-    def GetTextColour(*args, **kwargs): return _calendar.CalendarDateAttr_GetTextColour(*args, **kwargs)
-    def GetBackgroundColour(*args, **kwargs): return _calendar.CalendarDateAttr_GetBackgroundColour(*args, **kwargs)
-    def GetBorderColour(*args, **kwargs): return _calendar.CalendarDateAttr_GetBorderColour(*args, **kwargs)
-    def GetFont(*args, **kwargs): return _calendar.CalendarDateAttr_GetFont(*args, **kwargs)
-    def GetBorder(*args, **kwargs): return _calendar.CalendarDateAttr_GetBorder(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCalendarDateAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetTextColour(*args, **kwargs):
+        """SetTextColour(wxColour colText)"""
+        return _calendar.CalendarDateAttr_SetTextColour(*args, **kwargs)
+
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(wxColour colBack)"""
+        return _calendar.CalendarDateAttr_SetBackgroundColour(*args, **kwargs)
+
+    def SetBorderColour(*args, **kwargs):
+        """SetBorderColour(wxColour col)"""
+        return _calendar.CalendarDateAttr_SetBorderColour(*args, **kwargs)
+
+    def SetFont(*args, **kwargs):
+        """SetFont(wxFont font)"""
+        return _calendar.CalendarDateAttr_SetFont(*args, **kwargs)
+
+    def SetBorder(*args, **kwargs):
+        """SetBorder(wxCalendarDateBorder border)"""
+        return _calendar.CalendarDateAttr_SetBorder(*args, **kwargs)
+
+    def SetHoliday(*args, **kwargs):
+        """SetHoliday(bool holiday)"""
+        return _calendar.CalendarDateAttr_SetHoliday(*args, **kwargs)
+
+    def HasTextColour(*args, **kwargs):
+        """HasTextColour() -> bool"""
+        return _calendar.CalendarDateAttr_HasTextColour(*args, **kwargs)
+
+    def HasBackgroundColour(*args, **kwargs):
+        """HasBackgroundColour() -> bool"""
+        return _calendar.CalendarDateAttr_HasBackgroundColour(*args, **kwargs)
+
+    def HasBorderColour(*args, **kwargs):
+        """HasBorderColour() -> bool"""
+        return _calendar.CalendarDateAttr_HasBorderColour(*args, **kwargs)
+
+    def HasFont(*args, **kwargs):
+        """HasFont() -> bool"""
+        return _calendar.CalendarDateAttr_HasFont(*args, **kwargs)
+
+    def HasBorder(*args, **kwargs):
+        """HasBorder() -> bool"""
+        return _calendar.CalendarDateAttr_HasBorder(*args, **kwargs)
+
+    def IsHoliday(*args, **kwargs):
+        """IsHoliday() -> bool"""
+        return _calendar.CalendarDateAttr_IsHoliday(*args, **kwargs)
+
+    def GetTextColour(*args, **kwargs):
+        """GetTextColour() -> wxColour"""
+        return _calendar.CalendarDateAttr_GetTextColour(*args, **kwargs)
+
+    def GetBackgroundColour(*args, **kwargs):
+        """GetBackgroundColour() -> wxColour"""
+        return _calendar.CalendarDateAttr_GetBackgroundColour(*args, **kwargs)
+
+    def GetBorderColour(*args, **kwargs):
+        """GetBorderColour() -> wxColour"""
+        return _calendar.CalendarDateAttr_GetBorderColour(*args, **kwargs)
+
+    def GetFont(*args, **kwargs):
+        """GetFont() -> wxFont"""
+        return _calendar.CalendarDateAttr_GetFont(*args, **kwargs)
+
+    def GetBorder(*args, **kwargs):
+        """GetBorder() -> wxCalendarDateBorder"""
+        return _calendar.CalendarDateAttr_GetBorder(*args, **kwargs)
+
 
 class CalendarDateAttrPtr(CalendarDateAttr):
     def __init__(self, this):
@@ -56,20 +111,29 @@ class CalendarDateAttrPtr(CalendarDateAttr):
 _calendar.CalendarDateAttr_swigregister(CalendarDateAttrPtr)
 
 def CalendarDateAttrBorder(*args, **kwargs):
+    """CalendarDateAttrBorder(wxCalendarDateBorder border, wxColour colBorder=wxNullColour) -> CalendarDateAttr"""
     val = _calendar.new_CalendarDateAttrBorder(*args, **kwargs)
     val.thisown = 1
     return val
 
 class CalendarEvent(core.CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCalendarEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(CalendarCtrl cal, wxEventType type) -> CalendarEvent"""
         newobj = _calendar.new_CalendarEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetDate(*args, **kwargs): return _calendar.CalendarEvent_GetDate(*args, **kwargs)
-    def GetWeekDay(*args, **kwargs): return _calendar.CalendarEvent_GetWeekDay(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCalendarEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetDate(*args, **kwargs):
+        """GetDate() -> DateTime"""
+        return _calendar.CalendarEvent_GetDate(*args, **kwargs)
+
+    def GetWeekDay(*args, **kwargs):
+        """GetWeekDay() -> wxDateTime::WeekDay"""
+        return _calendar.CalendarEvent_GetWeekDay(*args, **kwargs)
+
 
 class CalendarEventPtr(CalendarEvent):
     def __init__(self, this):
@@ -92,41 +156,131 @@ EVT_CALENDAR_YEAR =            wx.PyEventBinder( wxEVT_CALENDAR_YEAR_CHANGED, 1)
 EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED, 1)
 
 class CalendarCtrl(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCalendarCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, DateTime date=wxDefaultDateTime, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
+    wxString name=wxPyCalendarNameStr) -> CalendarCtrl"""
         newobj = _calendar.new_CalendarCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _calendar.CalendarCtrl_Create(*args, **kwargs)
-    def SetDate(*args, **kwargs): return _calendar.CalendarCtrl_SetDate(*args, **kwargs)
-    def GetDate(*args, **kwargs): return _calendar.CalendarCtrl_GetDate(*args, **kwargs)
-    def SetLowerDateLimit(*args, **kwargs): return _calendar.CalendarCtrl_SetLowerDateLimit(*args, **kwargs)
-    def GetLowerDateLimit(*args, **kwargs): return _calendar.CalendarCtrl_GetLowerDateLimit(*args, **kwargs)
-    def SetUpperDateLimit(*args, **kwargs): return _calendar.CalendarCtrl_SetUpperDateLimit(*args, **kwargs)
-    def GetUpperDateLimit(*args, **kwargs): return _calendar.CalendarCtrl_GetUpperDateLimit(*args, **kwargs)
-    def SetDateRange(*args, **kwargs): return _calendar.CalendarCtrl_SetDateRange(*args, **kwargs)
-    def EnableYearChange(*args, **kwargs): return _calendar.CalendarCtrl_EnableYearChange(*args, **kwargs)
-    def EnableMonthChange(*args, **kwargs): return _calendar.CalendarCtrl_EnableMonthChange(*args, **kwargs)
-    def EnableHolidayDisplay(*args, **kwargs): return _calendar.CalendarCtrl_EnableHolidayDisplay(*args, **kwargs)
-    def SetHeaderColours(*args, **kwargs): return _calendar.CalendarCtrl_SetHeaderColours(*args, **kwargs)
-    def GetHeaderColourFg(*args, **kwargs): return _calendar.CalendarCtrl_GetHeaderColourFg(*args, **kwargs)
-    def GetHeaderColourBg(*args, **kwargs): return _calendar.CalendarCtrl_GetHeaderColourBg(*args, **kwargs)
-    def SetHighlightColours(*args, **kwargs): return _calendar.CalendarCtrl_SetHighlightColours(*args, **kwargs)
-    def GetHighlightColourFg(*args, **kwargs): return _calendar.CalendarCtrl_GetHighlightColourFg(*args, **kwargs)
-    def GetHighlightColourBg(*args, **kwargs): return _calendar.CalendarCtrl_GetHighlightColourBg(*args, **kwargs)
-    def SetHolidayColours(*args, **kwargs): return _calendar.CalendarCtrl_SetHolidayColours(*args, **kwargs)
-    def GetHolidayColourFg(*args, **kwargs): return _calendar.CalendarCtrl_GetHolidayColourFg(*args, **kwargs)
-    def GetHolidayColourBg(*args, **kwargs): return _calendar.CalendarCtrl_GetHolidayColourBg(*args, **kwargs)
-    def GetAttr(*args, **kwargs): return _calendar.CalendarCtrl_GetAttr(*args, **kwargs)
-    def SetAttr(*args, **kwargs): return _calendar.CalendarCtrl_SetAttr(*args, **kwargs)
-    def SetHoliday(*args, **kwargs): return _calendar.CalendarCtrl_SetHoliday(*args, **kwargs)
-    def ResetAttr(*args, **kwargs): return _calendar.CalendarCtrl_ResetAttr(*args, **kwargs)
-    def HitTest(*args, **kwargs): return _calendar.CalendarCtrl_HitTest(*args, **kwargs)
-    def Enable(*args, **kwargs): return _calendar.CalendarCtrl_Enable(*args, **kwargs)
-    def Show(*args, **kwargs): return _calendar.CalendarCtrl_Show(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCalendarCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, DateTime date=wxDefaultDateTime, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
+    wxString name=wxPyCalendarNameStr) -> bool"""
+        return _calendar.CalendarCtrl_Create(*args, **kwargs)
+
+    def SetDate(*args, **kwargs):
+        """SetDate(DateTime date)"""
+        return _calendar.CalendarCtrl_SetDate(*args, **kwargs)
+
+    def GetDate(*args, **kwargs):
+        """GetDate() -> DateTime"""
+        return _calendar.CalendarCtrl_GetDate(*args, **kwargs)
+
+    def SetLowerDateLimit(*args, **kwargs):
+        """SetLowerDateLimit(DateTime date=wxDefaultDateTime) -> bool"""
+        return _calendar.CalendarCtrl_SetLowerDateLimit(*args, **kwargs)
+
+    def GetLowerDateLimit(*args, **kwargs):
+        """GetLowerDateLimit() -> DateTime"""
+        return _calendar.CalendarCtrl_GetLowerDateLimit(*args, **kwargs)
+
+    def SetUpperDateLimit(*args, **kwargs):
+        """SetUpperDateLimit(DateTime date=wxDefaultDateTime) -> bool"""
+        return _calendar.CalendarCtrl_SetUpperDateLimit(*args, **kwargs)
+
+    def GetUpperDateLimit(*args, **kwargs):
+        """GetUpperDateLimit() -> DateTime"""
+        return _calendar.CalendarCtrl_GetUpperDateLimit(*args, **kwargs)
+
+    def SetDateRange(*args, **kwargs):
+        """SetDateRange(DateTime lowerdate=wxDefaultDateTime, DateTime upperdate=wxDefaultDateTime) -> bool"""
+        return _calendar.CalendarCtrl_SetDateRange(*args, **kwargs)
+
+    def EnableYearChange(*args, **kwargs):
+        """EnableYearChange(bool enable=True)"""
+        return _calendar.CalendarCtrl_EnableYearChange(*args, **kwargs)
+
+    def EnableMonthChange(*args, **kwargs):
+        """EnableMonthChange(bool enable=True)"""
+        return _calendar.CalendarCtrl_EnableMonthChange(*args, **kwargs)
+
+    def EnableHolidayDisplay(*args, **kwargs):
+        """EnableHolidayDisplay(bool display=True)"""
+        return _calendar.CalendarCtrl_EnableHolidayDisplay(*args, **kwargs)
+
+    def SetHeaderColours(*args, **kwargs):
+        """SetHeaderColours(wxColour colFg, wxColour colBg)"""
+        return _calendar.CalendarCtrl_SetHeaderColours(*args, **kwargs)
+
+    def GetHeaderColourFg(*args, **kwargs):
+        """GetHeaderColourFg() -> wxColour"""
+        return _calendar.CalendarCtrl_GetHeaderColourFg(*args, **kwargs)
+
+    def GetHeaderColourBg(*args, **kwargs):
+        """GetHeaderColourBg() -> wxColour"""
+        return _calendar.CalendarCtrl_GetHeaderColourBg(*args, **kwargs)
+
+    def SetHighlightColours(*args, **kwargs):
+        """SetHighlightColours(wxColour colFg, wxColour colBg)"""
+        return _calendar.CalendarCtrl_SetHighlightColours(*args, **kwargs)
+
+    def GetHighlightColourFg(*args, **kwargs):
+        """GetHighlightColourFg() -> wxColour"""
+        return _calendar.CalendarCtrl_GetHighlightColourFg(*args, **kwargs)
+
+    def GetHighlightColourBg(*args, **kwargs):
+        """GetHighlightColourBg() -> wxColour"""
+        return _calendar.CalendarCtrl_GetHighlightColourBg(*args, **kwargs)
+
+    def SetHolidayColours(*args, **kwargs):
+        """SetHolidayColours(wxColour colFg, wxColour colBg)"""
+        return _calendar.CalendarCtrl_SetHolidayColours(*args, **kwargs)
+
+    def GetHolidayColourFg(*args, **kwargs):
+        """GetHolidayColourFg() -> wxColour"""
+        return _calendar.CalendarCtrl_GetHolidayColourFg(*args, **kwargs)
+
+    def GetHolidayColourBg(*args, **kwargs):
+        """GetHolidayColourBg() -> wxColour"""
+        return _calendar.CalendarCtrl_GetHolidayColourBg(*args, **kwargs)
+
+    def GetAttr(*args, **kwargs):
+        """GetAttr(size_t day) -> CalendarDateAttr"""
+        return _calendar.CalendarCtrl_GetAttr(*args, **kwargs)
+
+    def SetAttr(*args, **kwargs):
+        """SetAttr(size_t day, CalendarDateAttr attr)"""
+        return _calendar.CalendarCtrl_SetAttr(*args, **kwargs)
+
+    def SetHoliday(*args, **kwargs):
+        """SetHoliday(size_t day)"""
+        return _calendar.CalendarCtrl_SetHoliday(*args, **kwargs)
+
+    def ResetAttr(*args, **kwargs):
+        """ResetAttr(size_t day)"""
+        return _calendar.CalendarCtrl_ResetAttr(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """HitTest(Point pos, DateTime date=None, wxDateTime::WeekDay wd=None) -> wxCalendarHitTestResult"""
+        return _calendar.CalendarCtrl_HitTest(*args, **kwargs)
+
+    def Enable(*args, **kwargs):
+        """Enable(bool enable=True) -> bool"""
+        return _calendar.CalendarCtrl_Enable(*args, **kwargs)
+
+    def Show(*args, **kwargs):
+        """Show(bool show=True) -> bool"""
+        return _calendar.CalendarCtrl_Show(*args, **kwargs)
+
 
 class CalendarCtrlPtr(CalendarCtrl):
     def __init__(self, this):
@@ -136,6 +290,7 @@ class CalendarCtrlPtr(CalendarCtrl):
 _calendar.CalendarCtrl_swigregister(CalendarCtrlPtr)
 
 def PreCalendarCtrl(*args, **kwargs):
+    """PreCalendarCtrl() -> CalendarCtrl"""
     val = _calendar.new_PreCalendarCtrl(*args, **kwargs)
     val.thisown = 1
     return val
diff --git a/wxPython/src/gtk/calendar_wrap.cpp b/wxPython/src/gtk/calendar_wrap.cpp
index 6e293f162a..3b7dfe281d 100644
--- a/wxPython/src/gtk/calendar_wrap.cpp
+++ b/wxPython/src/gtk/calendar_wrap.cpp
@@ -913,7 +913,7 @@ static PyObject * CalendarEvent_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxDateTime const &arg3_defvalue = wxDefaultDateTime ;
     wxDateTime *arg3 = (wxDateTime *) &arg3_defvalue ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
@@ -926,7 +926,7 @@ static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject
     wxCalendarCtrl *result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -960,7 +960,7 @@ static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -1011,7 +1011,7 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxDateTime const &arg4_defvalue = wxDefaultDateTime ;
     wxDateTime *arg4 = (wxDateTime *) &arg4_defvalue ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
@@ -1024,7 +1024,7 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj
     bool result;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -1060,7 +1060,7 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -1313,7 +1313,7 @@ static PyObject *_wrap_CalendarCtrl_SetDateRange(PyObject *self, PyObject *args,
 static PyObject *_wrap_CalendarCtrl_EnableYearChange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1343,7 +1343,7 @@ static PyObject *_wrap_CalendarCtrl_EnableYearChange(PyObject *self, PyObject *a
 static PyObject *_wrap_CalendarCtrl_EnableMonthChange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1373,7 +1373,7 @@ static PyObject *_wrap_CalendarCtrl_EnableMonthChange(PyObject *self, PyObject *
 static PyObject *_wrap_CalendarCtrl_EnableHolidayDisplay(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1849,7 +1849,7 @@ static PyObject *_wrap_CalendarCtrl_HitTest(PyObject *self, PyObject *args, PyOb
 static PyObject *_wrap_CalendarCtrl_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -1880,7 +1880,7 @@ static PyObject *_wrap_CalendarCtrl_Enable(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_CalendarCtrl_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
diff --git a/wxPython/src/gtk/controls.py b/wxPython/src/gtk/controls.py
index bc571f4dec..674264bbf5 100644
--- a/wxPython/src/gtk/controls.py
+++ b/wxPython/src/gtk/controls.py
@@ -14,17 +14,36 @@ BU_BOTTOM = _controls.BU_BOTTOM
 BU_EXACTFIT = _controls.BU_EXACTFIT
 BU_AUTODRAW = _controls.BU_AUTODRAW
 class Button(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPyButtonNameStr) -> Button"""
         newobj = _controls.new_Button(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.Button_Create(*args, **kwargs)
-    def SetDefault(*args, **kwargs): return _controls.Button_SetDefault(*args, **kwargs)
-    GetDefaultSize = staticmethod(_controls.Button_GetDefaultSize)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPyButtonNameStr) -> bool"""
+        return _controls.Button_Create(*args, **kwargs)
+
+    def SetDefault(*args, **kwargs):
+        """SetDefault()"""
+        return _controls.Button_SetDefault(*args, **kwargs)
+
+    def GetDefaultSize(*args, **kwargs):
+        """Button.GetDefaultSize() -> Size"""
+        return _controls.Button_GetDefaultSize(*args, **kwargs)
+
+    GetDefaultSize = staticmethod(GetDefaultSize)
 
 class ButtonPtr(Button):
     def __init__(self, this):
@@ -34,33 +53,81 @@ class ButtonPtr(Button):
 _controls.Button_swigregister(ButtonPtr)
 
 def PreButton(*args, **kwargs):
+    """PreButton() -> Button"""
     val = _controls.new_PreButton(*args, **kwargs)
     val.thisown = 1
     return val
 
-Button_GetDefaultSize = _controls.Button_GetDefaultSize
+def Button_GetDefaultSize(*args, **kwargs):
+    """Button_GetDefaultSize() -> Size"""
+    return _controls.Button_GetDefaultSize(*args, **kwargs)
 
 class BitmapButton(Button):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBitmapButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxBitmap bitmap, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=BU_AUTODRAW, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPyButtonNameStr) -> BitmapButton"""
         newobj = _controls.new_BitmapButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.BitmapButton_Create(*args, **kwargs)
-    def GetBitmapLabel(*args, **kwargs): return _controls.BitmapButton_GetBitmapLabel(*args, **kwargs)
-    def GetBitmapDisabled(*args, **kwargs): return _controls.BitmapButton_GetBitmapDisabled(*args, **kwargs)
-    def GetBitmapFocus(*args, **kwargs): return _controls.BitmapButton_GetBitmapFocus(*args, **kwargs)
-    def GetBitmapSelected(*args, **kwargs): return _controls.BitmapButton_GetBitmapSelected(*args, **kwargs)
-    def SetBitmapDisabled(*args, **kwargs): return _controls.BitmapButton_SetBitmapDisabled(*args, **kwargs)
-    def SetBitmapFocus(*args, **kwargs): return _controls.BitmapButton_SetBitmapFocus(*args, **kwargs)
-    def SetBitmapSelected(*args, **kwargs): return _controls.BitmapButton_SetBitmapSelected(*args, **kwargs)
-    def SetBitmapLabel(*args, **kwargs): return _controls.BitmapButton_SetBitmapLabel(*args, **kwargs)
-    def SetMargins(*args, **kwargs): return _controls.BitmapButton_SetMargins(*args, **kwargs)
-    def GetMarginX(*args, **kwargs): return _controls.BitmapButton_GetMarginX(*args, **kwargs)
-    def GetMarginY(*args, **kwargs): return _controls.BitmapButton_GetMarginY(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBitmapButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxBitmap bitmap, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=BU_AUTODRAW, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPyButtonNameStr) -> bool"""
+        return _controls.BitmapButton_Create(*args, **kwargs)
+
+    def GetBitmapLabel(*args, **kwargs):
+        """GetBitmapLabel() -> wxBitmap"""
+        return _controls.BitmapButton_GetBitmapLabel(*args, **kwargs)
+
+    def GetBitmapDisabled(*args, **kwargs):
+        """GetBitmapDisabled() -> wxBitmap"""
+        return _controls.BitmapButton_GetBitmapDisabled(*args, **kwargs)
+
+    def GetBitmapFocus(*args, **kwargs):
+        """GetBitmapFocus() -> wxBitmap"""
+        return _controls.BitmapButton_GetBitmapFocus(*args, **kwargs)
+
+    def GetBitmapSelected(*args, **kwargs):
+        """GetBitmapSelected() -> wxBitmap"""
+        return _controls.BitmapButton_GetBitmapSelected(*args, **kwargs)
+
+    def SetBitmapDisabled(*args, **kwargs):
+        """SetBitmapDisabled(wxBitmap bitmap)"""
+        return _controls.BitmapButton_SetBitmapDisabled(*args, **kwargs)
+
+    def SetBitmapFocus(*args, **kwargs):
+        """SetBitmapFocus(wxBitmap bitmap)"""
+        return _controls.BitmapButton_SetBitmapFocus(*args, **kwargs)
+
+    def SetBitmapSelected(*args, **kwargs):
+        """SetBitmapSelected(wxBitmap bitmap)"""
+        return _controls.BitmapButton_SetBitmapSelected(*args, **kwargs)
+
+    def SetBitmapLabel(*args, **kwargs):
+        """SetBitmapLabel(wxBitmap bitmap)"""
+        return _controls.BitmapButton_SetBitmapLabel(*args, **kwargs)
+
+    def SetMargins(*args, **kwargs):
+        """SetMargins(int x, int y)"""
+        return _controls.BitmapButton_SetMargins(*args, **kwargs)
+
+    def GetMarginX(*args, **kwargs):
+        """GetMarginX() -> int"""
+        return _controls.BitmapButton_GetMarginX(*args, **kwargs)
+
+    def GetMarginY(*args, **kwargs):
+        """GetMarginY() -> int"""
+        return _controls.BitmapButton_GetMarginY(*args, **kwargs)
+
 
 class BitmapButtonPtr(BitmapButton):
     def __init__(self, this):
@@ -70,6 +137,7 @@ class BitmapButtonPtr(BitmapButton):
 _controls.BitmapButton_swigregister(BitmapButtonPtr)
 
 def PreBitmapButton(*args, **kwargs):
+    """PreBitmapButton() -> BitmapButton"""
     val = _controls.new_PreBitmapButton(*args, **kwargs)
     val.thisown = 1
     return val
@@ -83,22 +151,55 @@ CHK_UNCHECKED = _controls.CHK_UNCHECKED
 CHK_CHECKED = _controls.CHK_CHECKED
 CHK_UNDETERMINED = _controls.CHK_UNDETERMINED
 class CheckBox(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCheckBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPyCheckBoxNameStr) -> CheckBox"""
         newobj = _controls.new_CheckBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.CheckBox_Create(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.CheckBox_GetValue(*args, **kwargs)
-    def IsChecked(*args, **kwargs): return _controls.CheckBox_IsChecked(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.CheckBox_SetValue(*args, **kwargs)
-    def Get3StateValue(*args, **kwargs): return _controls.CheckBox_Get3StateValue(*args, **kwargs)
-    def Set3StateValue(*args, **kwargs): return _controls.CheckBox_Set3StateValue(*args, **kwargs)
-    def Is3State(*args, **kwargs): return _controls.CheckBox_Is3State(*args, **kwargs)
-    def Is3rdStateAllowedForUser(*args, **kwargs): return _controls.CheckBox_Is3rdStateAllowedForUser(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCheckBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPyCheckBoxNameStr) -> bool"""
+        return _controls.CheckBox_Create(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> bool"""
+        return _controls.CheckBox_GetValue(*args, **kwargs)
+
+    def IsChecked(*args, **kwargs):
+        """IsChecked() -> bool"""
+        return _controls.CheckBox_IsChecked(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(bool state)"""
+        return _controls.CheckBox_SetValue(*args, **kwargs)
+
+    def Get3StateValue(*args, **kwargs):
+        """Get3StateValue() -> wxCheckBoxState"""
+        return _controls.CheckBox_Get3StateValue(*args, **kwargs)
+
+    def Set3StateValue(*args, **kwargs):
+        """Set3StateValue(wxCheckBoxState state)"""
+        return _controls.CheckBox_Set3StateValue(*args, **kwargs)
+
+    def Is3State(*args, **kwargs):
+        """Is3State() -> bool"""
+        return _controls.CheckBox_Is3State(*args, **kwargs)
+
+    def Is3rdStateAllowedForUser(*args, **kwargs):
+        """Is3rdStateAllowedForUser() -> bool"""
+        return _controls.CheckBox_Is3rdStateAllowedForUser(*args, **kwargs)
+
 
 class CheckBoxPtr(CheckBox):
     def __init__(self, this):
@@ -108,6 +209,7 @@ class CheckBoxPtr(CheckBox):
 _controls.CheckBox_swigregister(CheckBoxPtr)
 
 def PreCheckBox(*args, **kwargs):
+    """PreCheckBox() -> CheckBox"""
     val = _controls.new_PreCheckBox(*args, **kwargs)
     val.thisown = 1
     return val
@@ -115,20 +217,47 @@ def PreCheckBox(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class Choice(core.ControlWithItems):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxChoice instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    int choices=0, wxString choices_array=None, 
+    long style=0, Validator validator=DefaultValidator, 
+    wxString name=wxPyChoiceNameStr) -> Choice"""
         newobj = _controls.new_Choice(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.Choice_Create(*args, **kwargs)
-    def GetColumns(*args, **kwargs): return _controls.Choice_GetColumns(*args, **kwargs)
-    def SetColumns(*args, **kwargs): return _controls.Choice_SetColumns(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.Choice_SetSelection(*args, **kwargs)
-    def SetStringSelection(*args, **kwargs): return _controls.Choice_SetStringSelection(*args, **kwargs)
-    def SetString(*args, **kwargs): return _controls.Choice_SetString(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxChoice instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    int choices=0, wxString choices_array=None, 
+    long style=0, Validator validator=DefaultValidator, 
+    wxString name=wxPyChoiceNameStr) -> bool"""
+        return _controls.Choice_Create(*args, **kwargs)
+
+    def GetColumns(*args, **kwargs):
+        """GetColumns() -> int"""
+        return _controls.Choice_GetColumns(*args, **kwargs)
+
+    def SetColumns(*args, **kwargs):
+        """SetColumns(int n=1)"""
+        return _controls.Choice_SetColumns(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(int n)"""
+        return _controls.Choice_SetSelection(*args, **kwargs)
+
+    def SetStringSelection(*args, **kwargs):
+        """SetStringSelection(wxString string)"""
+        return _controls.Choice_SetStringSelection(*args, **kwargs)
+
+    def SetString(*args, **kwargs):
+        """SetString(int n, wxString s)"""
+        return _controls.Choice_SetString(*args, **kwargs)
+
 
 class ChoicePtr(Choice):
     def __init__(self, this):
@@ -138,6 +267,7 @@ class ChoicePtr(Choice):
 _controls.Choice_swigregister(ChoicePtr)
 
 def PreChoice(*args, **kwargs):
+    """PreChoice() -> Choice"""
     val = _controls.new_PreChoice(*args, **kwargs)
     val.thisown = 1
     return val
@@ -145,28 +275,81 @@ def PreChoice(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class ComboBox(core.Control,core.ItemContainer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxComboBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxString value=wxPyEmptyString, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 
+    int choices=0, wxString choices_array=None, 
+    long style=0, Validator validator=DefaultValidator, 
+    wxString name=wxPyComboBoxNameStr) -> ComboBox"""
         newobj = _controls.new_ComboBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.ComboBox_Create(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.ComboBox_GetValue(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.ComboBox_SetValue(*args, **kwargs)
-    def Copy(*args, **kwargs): return _controls.ComboBox_Copy(*args, **kwargs)
-    def Cut(*args, **kwargs): return _controls.ComboBox_Cut(*args, **kwargs)
-    def Paste(*args, **kwargs): return _controls.ComboBox_Paste(*args, **kwargs)
-    def SetInsertionPoint(*args, **kwargs): return _controls.ComboBox_SetInsertionPoint(*args, **kwargs)
-    def GetInsertionPoint(*args, **kwargs): return _controls.ComboBox_GetInsertionPoint(*args, **kwargs)
-    def GetLastPosition(*args, **kwargs): return _controls.ComboBox_GetLastPosition(*args, **kwargs)
-    def Replace(*args, **kwargs): return _controls.ComboBox_Replace(*args, **kwargs)
-    def SetMark(*args, **kwargs): return _controls.ComboBox_SetMark(*args, **kwargs)
-    def SetEditable(*args, **kwargs): return _controls.ComboBox_SetEditable(*args, **kwargs)
-    def SetInsertionPointEnd(*args, **kwargs): return _controls.ComboBox_SetInsertionPointEnd(*args, **kwargs)
-    def Remove(*args, **kwargs): return _controls.ComboBox_Remove(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxComboBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxString value=wxPyEmptyString, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 
+    int choices=0, wxString choices_array=None, 
+    long style=0, Validator validator=DefaultValidator, 
+    wxString name=wxPyComboBoxNameStr) -> bool"""
+        return _controls.ComboBox_Create(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> wxString"""
+        return _controls.ComboBox_GetValue(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(wxString value)"""
+        return _controls.ComboBox_SetValue(*args, **kwargs)
+
+    def Copy(*args, **kwargs):
+        """Copy()"""
+        return _controls.ComboBox_Copy(*args, **kwargs)
+
+    def Cut(*args, **kwargs):
+        """Cut()"""
+        return _controls.ComboBox_Cut(*args, **kwargs)
+
+    def Paste(*args, **kwargs):
+        """Paste()"""
+        return _controls.ComboBox_Paste(*args, **kwargs)
+
+    def SetInsertionPoint(*args, **kwargs):
+        """SetInsertionPoint(long pos)"""
+        return _controls.ComboBox_SetInsertionPoint(*args, **kwargs)
+
+    def GetInsertionPoint(*args, **kwargs):
+        """GetInsertionPoint() -> long"""
+        return _controls.ComboBox_GetInsertionPoint(*args, **kwargs)
+
+    def GetLastPosition(*args, **kwargs):
+        """GetLastPosition() -> long"""
+        return _controls.ComboBox_GetLastPosition(*args, **kwargs)
+
+    def Replace(*args, **kwargs):
+        """Replace(long from, long to, wxString value)"""
+        return _controls.ComboBox_Replace(*args, **kwargs)
+
+    def SetMark(*args, **kwargs):
+        """SetMark(long from, long to)"""
+        return _controls.ComboBox_SetMark(*args, **kwargs)
+
+    def SetEditable(*args, **kwargs):
+        """SetEditable(bool editable)"""
+        return _controls.ComboBox_SetEditable(*args, **kwargs)
+
+    def SetInsertionPointEnd(*args, **kwargs):
+        """SetInsertionPointEnd()"""
+        return _controls.ComboBox_SetInsertionPointEnd(*args, **kwargs)
+
+    def Remove(*args, **kwargs):
+        """Remove(long from, long to)"""
+        return _controls.ComboBox_Remove(*args, **kwargs)
+
 
 class ComboBoxPtr(ComboBox):
     def __init__(self, this):
@@ -176,6 +359,7 @@ class ComboBoxPtr(ComboBox):
 _controls.ComboBox_swigregister(ComboBoxPtr)
 
 def PreComboBox(*args, **kwargs):
+    """PreComboBox() -> ComboBox"""
     val = _controls.new_PreComboBox(*args, **kwargs)
     val.thisown = 1
     return val
@@ -187,24 +371,63 @@ GA_VERTICAL = _controls.GA_VERTICAL
 GA_SMOOTH = _controls.GA_SMOOTH
 GA_PROGRESSBAR = _controls.GA_PROGRESSBAR
 class Gauge(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGauge instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, int range, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=GA_HORIZONTAL, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPyGaugeNameStr) -> Gauge"""
         newobj = _controls.new_Gauge(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.Gauge_Create(*args, **kwargs)
-    def SetRange(*args, **kwargs): return _controls.Gauge_SetRange(*args, **kwargs)
-    def GetRange(*args, **kwargs): return _controls.Gauge_GetRange(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.Gauge_SetValue(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.Gauge_GetValue(*args, **kwargs)
-    def IsVertical(*args, **kwargs): return _controls.Gauge_IsVertical(*args, **kwargs)
-    def SetShadowWidth(*args, **kwargs): return _controls.Gauge_SetShadowWidth(*args, **kwargs)
-    def GetShadowWidth(*args, **kwargs): return _controls.Gauge_GetShadowWidth(*args, **kwargs)
-    def SetBezelFace(*args, **kwargs): return _controls.Gauge_SetBezelFace(*args, **kwargs)
-    def GetBezelFace(*args, **kwargs): return _controls.Gauge_GetBezelFace(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGauge instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, int range, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=GA_HORIZONTAL, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPyGaugeNameStr) -> bool"""
+        return _controls.Gauge_Create(*args, **kwargs)
+
+    def SetRange(*args, **kwargs):
+        """SetRange(int range)"""
+        return _controls.Gauge_SetRange(*args, **kwargs)
+
+    def GetRange(*args, **kwargs):
+        """GetRange() -> int"""
+        return _controls.Gauge_GetRange(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(int pos)"""
+        return _controls.Gauge_SetValue(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> int"""
+        return _controls.Gauge_GetValue(*args, **kwargs)
+
+    def IsVertical(*args, **kwargs):
+        """IsVertical() -> bool"""
+        return _controls.Gauge_IsVertical(*args, **kwargs)
+
+    def SetShadowWidth(*args, **kwargs):
+        """SetShadowWidth(int w)"""
+        return _controls.Gauge_SetShadowWidth(*args, **kwargs)
+
+    def GetShadowWidth(*args, **kwargs):
+        """GetShadowWidth() -> int"""
+        return _controls.Gauge_GetShadowWidth(*args, **kwargs)
+
+    def SetBezelFace(*args, **kwargs):
+        """SetBezelFace(int w)"""
+        return _controls.Gauge_SetBezelFace(*args, **kwargs)
+
+    def GetBezelFace(*args, **kwargs):
+        """GetBezelFace() -> int"""
+        return _controls.Gauge_GetBezelFace(*args, **kwargs)
+
 
 class GaugePtr(Gauge):
     def __init__(self, this):
@@ -214,6 +437,7 @@ class GaugePtr(Gauge):
 _controls.Gauge_swigregister(GaugePtr)
 
 def PreGauge(*args, **kwargs):
+    """PreGauge() -> Gauge"""
     val = _controls.new_PreGauge(*args, **kwargs)
     val.thisown = 1
     return val
@@ -221,15 +445,25 @@ def PreGauge(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class StaticBox(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxStaticBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    wxString name=wxPyStaticBoxNameStr) -> StaticBox"""
         newobj = _controls.new_StaticBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.StaticBox_Create(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStaticBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    wxString name=wxPyStaticBoxNameStr) -> bool"""
+        return _controls.StaticBox_Create(*args, **kwargs)
+
 
 class StaticBoxPtr(StaticBox):
     def __init__(self, this):
@@ -239,6 +473,7 @@ class StaticBoxPtr(StaticBox):
 _controls.StaticBox_swigregister(StaticBoxPtr)
 
 def PreStaticBox(*args, **kwargs):
+    """PreStaticBox() -> StaticBox"""
     val = _controls.new_PreStaticBox(*args, **kwargs)
     val.thisown = 1
     return val
@@ -246,17 +481,34 @@ def PreStaticBox(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class StaticLine(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxStaticLine instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=LI_HORIZONTAL, 
+    wxString name=wxPyStaticTextNameStr) -> StaticLine"""
         newobj = _controls.new_StaticLine(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.StaticLine_Create(*args, **kwargs)
-    def IsVertical(*args, **kwargs): return _controls.StaticLine_IsVertical(*args, **kwargs)
-    GetDefaultSize = staticmethod(_controls.StaticLine_GetDefaultSize)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStaticLine instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=LI_HORIZONTAL, 
+    wxString name=wxPyStaticTextNameStr) -> bool"""
+        return _controls.StaticLine_Create(*args, **kwargs)
+
+    def IsVertical(*args, **kwargs):
+        """IsVertical() -> bool"""
+        return _controls.StaticLine_IsVertical(*args, **kwargs)
+
+    def GetDefaultSize(*args, **kwargs):
+        """StaticLine.GetDefaultSize() -> int"""
+        return _controls.StaticLine_GetDefaultSize(*args, **kwargs)
+
+    GetDefaultSize = staticmethod(GetDefaultSize)
 
 class StaticLinePtr(StaticLine):
     def __init__(self, this):
@@ -266,24 +518,37 @@ class StaticLinePtr(StaticLine):
 _controls.StaticLine_swigregister(StaticLinePtr)
 
 def PreStaticLine(*args, **kwargs):
+    """PreStaticLine() -> StaticLine"""
     val = _controls.new_PreStaticLine(*args, **kwargs)
     val.thisown = 1
     return val
 
-StaticLine_GetDefaultSize = _controls.StaticLine_GetDefaultSize
+def StaticLine_GetDefaultSize(*args, **kwargs):
+    """StaticLine_GetDefaultSize() -> int"""
+    return _controls.StaticLine_GetDefaultSize(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class StaticText(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxStaticText instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    wxString name=wxPyStaticTextNameStr) -> StaticText"""
         newobj = _controls.new_StaticText(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.StaticText_Create(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStaticText instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    wxString name=wxPyStaticTextNameStr) -> bool"""
+        return _controls.StaticText_Create(*args, **kwargs)
+
 
 class StaticTextPtr(StaticText):
     def __init__(self, this):
@@ -293,6 +558,7 @@ class StaticTextPtr(StaticText):
 _controls.StaticText_swigregister(StaticTextPtr)
 
 def PreStaticText(*args, **kwargs):
+    """PreStaticText() -> StaticText"""
     val = _controls.new_PreStaticText(*args, **kwargs)
     val.thisown = 1
     return val
@@ -300,17 +566,35 @@ def PreStaticText(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class StaticBitmap(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxStaticBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxBitmap bitmap, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    wxString name=wxPyStaticBitmapNameStr) -> StaticBitmap"""
         newobj = _controls.new_StaticBitmap(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def Create(*args, **kwargs): return _controls.StaticBitmap_Create(*args, **kwargs)
-    def GetBitmap(*args, **kwargs): return _controls.StaticBitmap_GetBitmap(*args, **kwargs)
-    def SetBitmap(*args, **kwargs): return _controls.StaticBitmap_SetBitmap(*args, **kwargs)
-    def SetIcon(*args, **kwargs): return _controls.StaticBitmap_SetIcon(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStaticBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxBitmap bitmap, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    wxString name=wxPyStaticBitmapNameStr) -> bool"""
+        return _controls.StaticBitmap_Create(*args, **kwargs)
+
+    def GetBitmap(*args, **kwargs):
+        """GetBitmap() -> wxBitmap"""
+        return _controls.StaticBitmap_GetBitmap(*args, **kwargs)
+
+    def SetBitmap(*args, **kwargs):
+        """SetBitmap(wxBitmap bitmap)"""
+        return _controls.StaticBitmap_SetBitmap(*args, **kwargs)
+
+    def SetIcon(*args, **kwargs):
+        """SetIcon(wxIcon icon)"""
+        return _controls.StaticBitmap_SetIcon(*args, **kwargs)
+
 
 class StaticBitmapPtr(StaticBitmap):
     def __init__(self, this):
@@ -320,6 +604,7 @@ class StaticBitmapPtr(StaticBitmap):
 _controls.StaticBitmap_swigregister(StaticBitmapPtr)
 
 def PreStaticBitmap(*args, **kwargs):
+    """PreStaticBitmap() -> StaticBitmap"""
     val = _controls.new_PreStaticBitmap(*args, **kwargs)
     val.thisown = 1
     return val
@@ -327,30 +612,87 @@ def PreStaticBitmap(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class ListBox(core.ControlWithItems):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    int choices=0, wxString choices_array=None, 
+    long style=0, Validator validator=DefaultValidator, 
+    wxString name=wxPyListBoxNameStr) -> ListBox"""
         newobj = _controls.new_ListBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.ListBox_Create(*args, **kwargs)
-    def Insert(*args, **kwargs): return _controls.ListBox_Insert(*args, **kwargs)
-    def InsertItems(*args, **kwargs): return _controls.ListBox_InsertItems(*args, **kwargs)
-    def Set(*args, **kwargs): return _controls.ListBox_Set(*args, **kwargs)
-    def IsSelected(*args, **kwargs): return _controls.ListBox_IsSelected(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.ListBox_SetSelection(*args, **kwargs)
-    def Select(*args, **kwargs): return _controls.ListBox_Select(*args, **kwargs)
-    def Deselect(*args, **kwargs): return _controls.ListBox_Deselect(*args, **kwargs)
-    def DeselectAll(*args, **kwargs): return _controls.ListBox_DeselectAll(*args, **kwargs)
-    def SetStringSelection(*args, **kwargs): return _controls.ListBox_SetStringSelection(*args, **kwargs)
-    def GetSelections(*args, **kwargs): return _controls.ListBox_GetSelections(*args, **kwargs)
-    def SetFirstItem(*args, **kwargs): return _controls.ListBox_SetFirstItem(*args, **kwargs)
-    def SetFirstItemStr(*args, **kwargs): return _controls.ListBox_SetFirstItemStr(*args, **kwargs)
-    def EnsureVisible(*args, **kwargs): return _controls.ListBox_EnsureVisible(*args, **kwargs)
-    def AppendAndEnsureVisible(*args, **kwargs): return _controls.ListBox_AppendAndEnsureVisible(*args, **kwargs)
-    def IsSorted(*args, **kwargs): return _controls.ListBox_IsSorted(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    int choices=0, wxString choices_array=None, 
+    long style=0, Validator validator=DefaultValidator, 
+    wxString name=wxPyListBoxNameStr) -> bool"""
+        return _controls.ListBox_Create(*args, **kwargs)
+
+    def Insert(*args, **kwargs):
+        """Insert(wxString item, int pos, PyObject clientData=None)"""
+        return _controls.ListBox_Insert(*args, **kwargs)
+
+    def InsertItems(*args, **kwargs):
+        """InsertItems(wxArrayString items, int pos)"""
+        return _controls.ListBox_InsertItems(*args, **kwargs)
+
+    def Set(*args, **kwargs):
+        """Set(wxArrayString items)"""
+        return _controls.ListBox_Set(*args, **kwargs)
+
+    def IsSelected(*args, **kwargs):
+        """IsSelected(int n) -> bool"""
+        return _controls.ListBox_IsSelected(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(int n, bool select=True)"""
+        return _controls.ListBox_SetSelection(*args, **kwargs)
+
+    def Select(*args, **kwargs):
+        """Select(int n)"""
+        return _controls.ListBox_Select(*args, **kwargs)
+
+    def Deselect(*args, **kwargs):
+        """Deselect(int n)"""
+        return _controls.ListBox_Deselect(*args, **kwargs)
+
+    def DeselectAll(*args, **kwargs):
+        """DeselectAll(int itemToLeaveSelected=-1)"""
+        return _controls.ListBox_DeselectAll(*args, **kwargs)
+
+    def SetStringSelection(*args, **kwargs):
+        """SetStringSelection(wxString s, bool select=True) -> bool"""
+        return _controls.ListBox_SetStringSelection(*args, **kwargs)
+
+    def GetSelections(*args, **kwargs):
+        """GetSelections() -> PyObject"""
+        return _controls.ListBox_GetSelections(*args, **kwargs)
+
+    def SetFirstItem(*args, **kwargs):
+        """SetFirstItem(int n)"""
+        return _controls.ListBox_SetFirstItem(*args, **kwargs)
+
+    def SetFirstItemStr(*args, **kwargs):
+        """SetFirstItemStr(wxString s)"""
+        return _controls.ListBox_SetFirstItemStr(*args, **kwargs)
+
+    def EnsureVisible(*args, **kwargs):
+        """EnsureVisible(int n)"""
+        return _controls.ListBox_EnsureVisible(*args, **kwargs)
+
+    def AppendAndEnsureVisible(*args, **kwargs):
+        """AppendAndEnsureVisible(wxString s)"""
+        return _controls.ListBox_AppendAndEnsureVisible(*args, **kwargs)
+
+    def IsSorted(*args, **kwargs):
+        """IsSorted() -> bool"""
+        return _controls.ListBox_IsSorted(*args, **kwargs)
+
 
 class ListBoxPtr(ListBox):
     def __init__(self, this):
@@ -360,6 +702,7 @@ class ListBoxPtr(ListBox):
 _controls.ListBox_swigregister(ListBoxPtr)
 
 def PreListBox(*args, **kwargs):
+    """PreListBox() -> ListBox"""
     val = _controls.new_PreListBox(*args, **kwargs)
     val.thisown = 1
     return val
@@ -367,19 +710,45 @@ def PreListBox(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class CheckListBox(ListBox):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCheckListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    int choices=0, wxString choices_array=None, 
+    long style=0, Validator validator=DefaultValidator, 
+    wxString name=wxPyListBoxNameStr) -> CheckListBox"""
         newobj = _controls.new_CheckListBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def Create(*args, **kwargs): return _controls.CheckListBox_Create(*args, **kwargs)
-    def IsChecked(*args, **kwargs): return _controls.CheckListBox_IsChecked(*args, **kwargs)
-    def Check(*args, **kwargs): return _controls.CheckListBox_Check(*args, **kwargs)
-    def GetItemHeight(*args, **kwargs): return _controls.CheckListBox_GetItemHeight(*args, **kwargs)
-    def HitTest(*args, **kwargs): return _controls.CheckListBox_HitTest(*args, **kwargs)
-    def HitTestXY(*args, **kwargs): return _controls.CheckListBox_HitTestXY(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCheckListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    int choices=0, wxString choices_array=None, 
+    long style=0, Validator validator=DefaultValidator, 
+    wxString name=wxPyListBoxNameStr) -> bool"""
+        return _controls.CheckListBox_Create(*args, **kwargs)
+
+    def IsChecked(*args, **kwargs):
+        """IsChecked(int index) -> bool"""
+        return _controls.CheckListBox_IsChecked(*args, **kwargs)
+
+    def Check(*args, **kwargs):
+        """Check(int index, int check=True)"""
+        return _controls.CheckListBox_Check(*args, **kwargs)
+
+    def GetItemHeight(*args, **kwargs):
+        """GetItemHeight() -> int"""
+        return _controls.CheckListBox_GetItemHeight(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """HitTest(Point pt) -> int"""
+        return _controls.CheckListBox_HitTest(*args, **kwargs)
+
+    def HitTestXY(*args, **kwargs):
+        """HitTestXY(int x, int y) -> int"""
+        return _controls.CheckListBox_HitTestXY(*args, **kwargs)
+
 
 class CheckListBoxPtr(CheckListBox):
     def __init__(self, this):
@@ -389,6 +758,7 @@ class CheckListBoxPtr(CheckListBox):
 _controls.CheckListBox_swigregister(CheckListBoxPtr)
 
 def PreCheckListBox(*args, **kwargs):
+    """PreCheckListBox() -> CheckListBox"""
     val = _controls.new_PreCheckListBox(*args, **kwargs)
     val.thisown = 1
     return val
@@ -432,40 +802,126 @@ TEXT_ATTR_LEFT_INDENT = _controls.TEXT_ATTR_LEFT_INDENT
 TEXT_ATTR_RIGHT_INDENT = _controls.TEXT_ATTR_RIGHT_INDENT
 TEXT_ATTR_TABS = _controls.TEXT_ATTR_TABS
 class TextAttr(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTextAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args):
+        """__init__() -> TextAttr
+__init__(wxColour colText, wxColour colBack=wxNullColour, wxFont font=wxNullFont, 
+    wxTextAttrAlignment alignment=TEXT_ALIGNMENT_DEFAULT) -> TextAttr"""
         newobj = _controls.new_TextAttr(*args)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def Init(*args, **kwargs): return _controls.TextAttr_Init(*args, **kwargs)
-    def SetTextColour(*args, **kwargs): return _controls.TextAttr_SetTextColour(*args, **kwargs)
-    def SetBackgroundColour(*args, **kwargs): return _controls.TextAttr_SetBackgroundColour(*args, **kwargs)
-    def SetFont(*args, **kwargs): return _controls.TextAttr_SetFont(*args, **kwargs)
-    def SetAlignment(*args, **kwargs): return _controls.TextAttr_SetAlignment(*args, **kwargs)
-    def SetTabs(*args, **kwargs): return _controls.TextAttr_SetTabs(*args, **kwargs)
-    def SetLeftIndent(*args, **kwargs): return _controls.TextAttr_SetLeftIndent(*args, **kwargs)
-    def SetRightIndent(*args, **kwargs): return _controls.TextAttr_SetRightIndent(*args, **kwargs)
-    def SetFlags(*args, **kwargs): return _controls.TextAttr_SetFlags(*args, **kwargs)
-    def HasTextColour(*args, **kwargs): return _controls.TextAttr_HasTextColour(*args, **kwargs)
-    def HasBackgroundColour(*args, **kwargs): return _controls.TextAttr_HasBackgroundColour(*args, **kwargs)
-    def HasFont(*args, **kwargs): return _controls.TextAttr_HasFont(*args, **kwargs)
-    def HasAlignment(*args, **kwargs): return _controls.TextAttr_HasAlignment(*args, **kwargs)
-    def HasTabs(*args, **kwargs): return _controls.TextAttr_HasTabs(*args, **kwargs)
-    def HasLeftIndent(*args, **kwargs): return _controls.TextAttr_HasLeftIndent(*args, **kwargs)
-    def HasRightIndent(*args, **kwargs): return _controls.TextAttr_HasRightIndent(*args, **kwargs)
-    def HasFlag(*args, **kwargs): return _controls.TextAttr_HasFlag(*args, **kwargs)
-    def GetTextColour(*args, **kwargs): return _controls.TextAttr_GetTextColour(*args, **kwargs)
-    def GetBackgroundColour(*args, **kwargs): return _controls.TextAttr_GetBackgroundColour(*args, **kwargs)
-    def GetFont(*args, **kwargs): return _controls.TextAttr_GetFont(*args, **kwargs)
-    def GetAlignment(*args, **kwargs): return _controls.TextAttr_GetAlignment(*args, **kwargs)
-    def GetTabs(*args, **kwargs): return _controls.TextAttr_GetTabs(*args, **kwargs)
-    def GetLeftIndent(*args, **kwargs): return _controls.TextAttr_GetLeftIndent(*args, **kwargs)
-    def GetRightIndent(*args, **kwargs): return _controls.TextAttr_GetRightIndent(*args, **kwargs)
-    def GetFlags(*args, **kwargs): return _controls.TextAttr_GetFlags(*args, **kwargs)
-    def IsDefault(*args, **kwargs): return _controls.TextAttr_IsDefault(*args, **kwargs)
-    Combine = staticmethod(_controls.TextAttr_Combine)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTextAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Init(*args, **kwargs):
+        """Init()"""
+        return _controls.TextAttr_Init(*args, **kwargs)
+
+    def SetTextColour(*args, **kwargs):
+        """SetTextColour(wxColour colText)"""
+        return _controls.TextAttr_SetTextColour(*args, **kwargs)
+
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(wxColour colBack)"""
+        return _controls.TextAttr_SetBackgroundColour(*args, **kwargs)
+
+    def SetFont(*args, **kwargs):
+        """SetFont(wxFont font, long flags=TEXT_ATTR_FONT)"""
+        return _controls.TextAttr_SetFont(*args, **kwargs)
+
+    def SetAlignment(*args, **kwargs):
+        """SetAlignment(wxTextAttrAlignment alignment)"""
+        return _controls.TextAttr_SetAlignment(*args, **kwargs)
+
+    def SetTabs(*args, **kwargs):
+        """SetTabs(wxArrayInt tabs)"""
+        return _controls.TextAttr_SetTabs(*args, **kwargs)
+
+    def SetLeftIndent(*args, **kwargs):
+        """SetLeftIndent(int indent)"""
+        return _controls.TextAttr_SetLeftIndent(*args, **kwargs)
+
+    def SetRightIndent(*args, **kwargs):
+        """SetRightIndent(int indent)"""
+        return _controls.TextAttr_SetRightIndent(*args, **kwargs)
+
+    def SetFlags(*args, **kwargs):
+        """SetFlags(long flags)"""
+        return _controls.TextAttr_SetFlags(*args, **kwargs)
+
+    def HasTextColour(*args, **kwargs):
+        """HasTextColour() -> bool"""
+        return _controls.TextAttr_HasTextColour(*args, **kwargs)
+
+    def HasBackgroundColour(*args, **kwargs):
+        """HasBackgroundColour() -> bool"""
+        return _controls.TextAttr_HasBackgroundColour(*args, **kwargs)
+
+    def HasFont(*args, **kwargs):
+        """HasFont() -> bool"""
+        return _controls.TextAttr_HasFont(*args, **kwargs)
+
+    def HasAlignment(*args, **kwargs):
+        """HasAlignment() -> bool"""
+        return _controls.TextAttr_HasAlignment(*args, **kwargs)
+
+    def HasTabs(*args, **kwargs):
+        """HasTabs() -> bool"""
+        return _controls.TextAttr_HasTabs(*args, **kwargs)
+
+    def HasLeftIndent(*args, **kwargs):
+        """HasLeftIndent() -> bool"""
+        return _controls.TextAttr_HasLeftIndent(*args, **kwargs)
+
+    def HasRightIndent(*args, **kwargs):
+        """HasRightIndent() -> bool"""
+        return _controls.TextAttr_HasRightIndent(*args, **kwargs)
+
+    def HasFlag(*args, **kwargs):
+        """HasFlag(long flag) -> bool"""
+        return _controls.TextAttr_HasFlag(*args, **kwargs)
+
+    def GetTextColour(*args, **kwargs):
+        """GetTextColour() -> wxColour"""
+        return _controls.TextAttr_GetTextColour(*args, **kwargs)
+
+    def GetBackgroundColour(*args, **kwargs):
+        """GetBackgroundColour() -> wxColour"""
+        return _controls.TextAttr_GetBackgroundColour(*args, **kwargs)
+
+    def GetFont(*args, **kwargs):
+        """GetFont() -> wxFont"""
+        return _controls.TextAttr_GetFont(*args, **kwargs)
+
+    def GetAlignment(*args, **kwargs):
+        """GetAlignment() -> wxTextAttrAlignment"""
+        return _controls.TextAttr_GetAlignment(*args, **kwargs)
+
+    def GetTabs(*args, **kwargs):
+        """GetTabs() -> wxArrayInt"""
+        return _controls.TextAttr_GetTabs(*args, **kwargs)
+
+    def GetLeftIndent(*args, **kwargs):
+        """GetLeftIndent() -> long"""
+        return _controls.TextAttr_GetLeftIndent(*args, **kwargs)
+
+    def GetRightIndent(*args, **kwargs):
+        """GetRightIndent() -> long"""
+        return _controls.TextAttr_GetRightIndent(*args, **kwargs)
+
+    def GetFlags(*args, **kwargs):
+        """GetFlags() -> long"""
+        return _controls.TextAttr_GetFlags(*args, **kwargs)
+
+    def IsDefault(*args, **kwargs):
+        """IsDefault() -> bool"""
+        return _controls.TextAttr_IsDefault(*args, **kwargs)
+
+    def Combine(*args, **kwargs):
+        """TextAttr.Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -> TextAttr"""
+        return _controls.TextAttr_Combine(*args, **kwargs)
+
+    Combine = staticmethod(Combine)
 
 class TextAttrPtr(TextAttr):
     def __init__(self, this):
@@ -474,67 +930,228 @@ class TextAttrPtr(TextAttr):
         self.__class__ = TextAttr
 _controls.TextAttr_swigregister(TextAttrPtr)
 
-TextAttr_Combine = _controls.TextAttr_Combine
+def TextAttr_Combine(*args, **kwargs):
+    """TextAttr_Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -> TextAttr"""
+    return _controls.TextAttr_Combine(*args, **kwargs)
 
 class TextCtrl(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxString value=wxPyEmptyString, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, Validator validator=DefaultValidator, 
+    wxString name=wxPyTextCtrlNameStr) -> TextCtrl"""
         newobj = _controls.new_TextCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.TextCtrl_Create(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.TextCtrl_GetValue(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.TextCtrl_SetValue(*args, **kwargs)
-    def GetRange(*args, **kwargs): return _controls.TextCtrl_GetRange(*args, **kwargs)
-    def GetLineLength(*args, **kwargs): return _controls.TextCtrl_GetLineLength(*args, **kwargs)
-    def GetLineText(*args, **kwargs): return _controls.TextCtrl_GetLineText(*args, **kwargs)
-    def GetNumberOfLines(*args, **kwargs): return _controls.TextCtrl_GetNumberOfLines(*args, **kwargs)
-    def IsModified(*args, **kwargs): return _controls.TextCtrl_IsModified(*args, **kwargs)
-    def IsEditable(*args, **kwargs): return _controls.TextCtrl_IsEditable(*args, **kwargs)
-    def IsSingleLine(*args, **kwargs): return _controls.TextCtrl_IsSingleLine(*args, **kwargs)
-    def IsMultiLine(*args, **kwargs): return _controls.TextCtrl_IsMultiLine(*args, **kwargs)
-    def GetSelection(*args, **kwargs): return _controls.TextCtrl_GetSelection(*args, **kwargs)
-    def GetStringSelection(*args, **kwargs): return _controls.TextCtrl_GetStringSelection(*args, **kwargs)
-    def Clear(*args, **kwargs): return _controls.TextCtrl_Clear(*args, **kwargs)
-    def Replace(*args, **kwargs): return _controls.TextCtrl_Replace(*args, **kwargs)
-    def Remove(*args, **kwargs): return _controls.TextCtrl_Remove(*args, **kwargs)
-    def LoadFile(*args, **kwargs): return _controls.TextCtrl_LoadFile(*args, **kwargs)
-    def SaveFile(*args, **kwargs): return _controls.TextCtrl_SaveFile(*args, **kwargs)
-    def MarkDirty(*args, **kwargs): return _controls.TextCtrl_MarkDirty(*args, **kwargs)
-    def DiscardEdits(*args, **kwargs): return _controls.TextCtrl_DiscardEdits(*args, **kwargs)
-    def SetMaxLength(*args, **kwargs): return _controls.TextCtrl_SetMaxLength(*args, **kwargs)
-    def WriteText(*args, **kwargs): return _controls.TextCtrl_WriteText(*args, **kwargs)
-    def AppendText(*args, **kwargs): return _controls.TextCtrl_AppendText(*args, **kwargs)
-    def EmulateKeyPress(*args, **kwargs): return _controls.TextCtrl_EmulateKeyPress(*args, **kwargs)
-    def SetStyle(*args, **kwargs): return _controls.TextCtrl_SetStyle(*args, **kwargs)
-    def GetStyle(*args, **kwargs): return _controls.TextCtrl_GetStyle(*args, **kwargs)
-    def SetDefaultStyle(*args, **kwargs): return _controls.TextCtrl_SetDefaultStyle(*args, **kwargs)
-    def GetDefaultStyle(*args, **kwargs): return _controls.TextCtrl_GetDefaultStyle(*args, **kwargs)
-    def XYToPosition(*args, **kwargs): return _controls.TextCtrl_XYToPosition(*args, **kwargs)
-    def PositionToXY(*args, **kwargs): return _controls.TextCtrl_PositionToXY(*args, **kwargs)
-    def ShowPosition(*args, **kwargs): return _controls.TextCtrl_ShowPosition(*args, **kwargs)
-    def Copy(*args, **kwargs): return _controls.TextCtrl_Copy(*args, **kwargs)
-    def Cut(*args, **kwargs): return _controls.TextCtrl_Cut(*args, **kwargs)
-    def Paste(*args, **kwargs): return _controls.TextCtrl_Paste(*args, **kwargs)
-    def CanCopy(*args, **kwargs): return _controls.TextCtrl_CanCopy(*args, **kwargs)
-    def CanCut(*args, **kwargs): return _controls.TextCtrl_CanCut(*args, **kwargs)
-    def CanPaste(*args, **kwargs): return _controls.TextCtrl_CanPaste(*args, **kwargs)
-    def Undo(*args, **kwargs): return _controls.TextCtrl_Undo(*args, **kwargs)
-    def Redo(*args, **kwargs): return _controls.TextCtrl_Redo(*args, **kwargs)
-    def CanUndo(*args, **kwargs): return _controls.TextCtrl_CanUndo(*args, **kwargs)
-    def CanRedo(*args, **kwargs): return _controls.TextCtrl_CanRedo(*args, **kwargs)
-    def SetInsertionPoint(*args, **kwargs): return _controls.TextCtrl_SetInsertionPoint(*args, **kwargs)
-    def SetInsertionPointEnd(*args, **kwargs): return _controls.TextCtrl_SetInsertionPointEnd(*args, **kwargs)
-    def GetInsertionPoint(*args, **kwargs): return _controls.TextCtrl_GetInsertionPoint(*args, **kwargs)
-    def GetLastPosition(*args, **kwargs): return _controls.TextCtrl_GetLastPosition(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.TextCtrl_SetSelection(*args, **kwargs)
-    def SelectAll(*args, **kwargs): return _controls.TextCtrl_SelectAll(*args, **kwargs)
-    def SetEditable(*args, **kwargs): return _controls.TextCtrl_SetEditable(*args, **kwargs)
-    def write(*args, **kwargs): return _controls.TextCtrl_write(*args, **kwargs)
-    def GetString(*args, **kwargs): return _controls.TextCtrl_GetString(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxString value=wxPyEmptyString, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, Validator validator=DefaultValidator, 
+    wxString name=wxPyTextCtrlNameStr) -> bool"""
+        return _controls.TextCtrl_Create(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> wxString"""
+        return _controls.TextCtrl_GetValue(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(wxString value)"""
+        return _controls.TextCtrl_SetValue(*args, **kwargs)
+
+    def GetRange(*args, **kwargs):
+        """GetRange(long from, long to) -> wxString"""
+        return _controls.TextCtrl_GetRange(*args, **kwargs)
+
+    def GetLineLength(*args, **kwargs):
+        """GetLineLength(long lineNo) -> int"""
+        return _controls.TextCtrl_GetLineLength(*args, **kwargs)
+
+    def GetLineText(*args, **kwargs):
+        """GetLineText(long lineNo) -> wxString"""
+        return _controls.TextCtrl_GetLineText(*args, **kwargs)
+
+    def GetNumberOfLines(*args, **kwargs):
+        """GetNumberOfLines() -> int"""
+        return _controls.TextCtrl_GetNumberOfLines(*args, **kwargs)
+
+    def IsModified(*args, **kwargs):
+        """IsModified() -> bool"""
+        return _controls.TextCtrl_IsModified(*args, **kwargs)
+
+    def IsEditable(*args, **kwargs):
+        """IsEditable() -> bool"""
+        return _controls.TextCtrl_IsEditable(*args, **kwargs)
+
+    def IsSingleLine(*args, **kwargs):
+        """IsSingleLine() -> bool"""
+        return _controls.TextCtrl_IsSingleLine(*args, **kwargs)
+
+    def IsMultiLine(*args, **kwargs):
+        """IsMultiLine() -> bool"""
+        return _controls.TextCtrl_IsMultiLine(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """GetSelection(long OUTPUT, long OUTPUT)"""
+        return _controls.TextCtrl_GetSelection(*args, **kwargs)
+
+    def GetStringSelection(*args, **kwargs):
+        """GetStringSelection() -> wxString"""
+        return _controls.TextCtrl_GetStringSelection(*args, **kwargs)
+
+    def Clear(*args, **kwargs):
+        """Clear()"""
+        return _controls.TextCtrl_Clear(*args, **kwargs)
+
+    def Replace(*args, **kwargs):
+        """Replace(long from, long to, wxString value)"""
+        return _controls.TextCtrl_Replace(*args, **kwargs)
+
+    def Remove(*args, **kwargs):
+        """Remove(long from, long to)"""
+        return _controls.TextCtrl_Remove(*args, **kwargs)
+
+    def LoadFile(*args, **kwargs):
+        """LoadFile(wxString file) -> bool"""
+        return _controls.TextCtrl_LoadFile(*args, **kwargs)
+
+    def SaveFile(*args, **kwargs):
+        """SaveFile(wxString file=wxPyEmptyString) -> bool"""
+        return _controls.TextCtrl_SaveFile(*args, **kwargs)
+
+    def MarkDirty(*args, **kwargs):
+        """MarkDirty()"""
+        return _controls.TextCtrl_MarkDirty(*args, **kwargs)
+
+    def DiscardEdits(*args, **kwargs):
+        """DiscardEdits()"""
+        return _controls.TextCtrl_DiscardEdits(*args, **kwargs)
+
+    def SetMaxLength(*args, **kwargs):
+        """SetMaxLength(unsigned long len)"""
+        return _controls.TextCtrl_SetMaxLength(*args, **kwargs)
+
+    def WriteText(*args, **kwargs):
+        """WriteText(wxString text)"""
+        return _controls.TextCtrl_WriteText(*args, **kwargs)
+
+    def AppendText(*args, **kwargs):
+        """AppendText(wxString text)"""
+        return _controls.TextCtrl_AppendText(*args, **kwargs)
+
+    def EmulateKeyPress(*args, **kwargs):
+        """EmulateKeyPress(KeyEvent event) -> bool"""
+        return _controls.TextCtrl_EmulateKeyPress(*args, **kwargs)
+
+    def SetStyle(*args, **kwargs):
+        """SetStyle(long start, long end, TextAttr style) -> bool"""
+        return _controls.TextCtrl_SetStyle(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle(long position, TextAttr style) -> bool"""
+        return _controls.TextCtrl_GetStyle(*args, **kwargs)
+
+    def SetDefaultStyle(*args, **kwargs):
+        """SetDefaultStyle(TextAttr style) -> bool"""
+        return _controls.TextCtrl_SetDefaultStyle(*args, **kwargs)
+
+    def GetDefaultStyle(*args, **kwargs):
+        """GetDefaultStyle() -> TextAttr"""
+        return _controls.TextCtrl_GetDefaultStyle(*args, **kwargs)
+
+    def XYToPosition(*args, **kwargs):
+        """XYToPosition(long x, long y) -> long"""
+        return _controls.TextCtrl_XYToPosition(*args, **kwargs)
+
+    def PositionToXY(*args, **kwargs):
+        """PositionToXY(long pos, long OUTPUT, long OUTPUT)"""
+        return _controls.TextCtrl_PositionToXY(*args, **kwargs)
+
+    def ShowPosition(*args, **kwargs):
+        """ShowPosition(long pos)"""
+        return _controls.TextCtrl_ShowPosition(*args, **kwargs)
+
+    def Copy(*args, **kwargs):
+        """Copy()"""
+        return _controls.TextCtrl_Copy(*args, **kwargs)
+
+    def Cut(*args, **kwargs):
+        """Cut()"""
+        return _controls.TextCtrl_Cut(*args, **kwargs)
+
+    def Paste(*args, **kwargs):
+        """Paste()"""
+        return _controls.TextCtrl_Paste(*args, **kwargs)
+
+    def CanCopy(*args, **kwargs):
+        """CanCopy() -> bool"""
+        return _controls.TextCtrl_CanCopy(*args, **kwargs)
+
+    def CanCut(*args, **kwargs):
+        """CanCut() -> bool"""
+        return _controls.TextCtrl_CanCut(*args, **kwargs)
+
+    def CanPaste(*args, **kwargs):
+        """CanPaste() -> bool"""
+        return _controls.TextCtrl_CanPaste(*args, **kwargs)
+
+    def Undo(*args, **kwargs):
+        """Undo()"""
+        return _controls.TextCtrl_Undo(*args, **kwargs)
+
+    def Redo(*args, **kwargs):
+        """Redo()"""
+        return _controls.TextCtrl_Redo(*args, **kwargs)
+
+    def CanUndo(*args, **kwargs):
+        """CanUndo() -> bool"""
+        return _controls.TextCtrl_CanUndo(*args, **kwargs)
+
+    def CanRedo(*args, **kwargs):
+        """CanRedo() -> bool"""
+        return _controls.TextCtrl_CanRedo(*args, **kwargs)
+
+    def SetInsertionPoint(*args, **kwargs):
+        """SetInsertionPoint(long pos)"""
+        return _controls.TextCtrl_SetInsertionPoint(*args, **kwargs)
+
+    def SetInsertionPointEnd(*args, **kwargs):
+        """SetInsertionPointEnd()"""
+        return _controls.TextCtrl_SetInsertionPointEnd(*args, **kwargs)
+
+    def GetInsertionPoint(*args, **kwargs):
+        """GetInsertionPoint() -> long"""
+        return _controls.TextCtrl_GetInsertionPoint(*args, **kwargs)
+
+    def GetLastPosition(*args, **kwargs):
+        """GetLastPosition() -> long"""
+        return _controls.TextCtrl_GetLastPosition(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(long from, long to)"""
+        return _controls.TextCtrl_SetSelection(*args, **kwargs)
+
+    def SelectAll(*args, **kwargs):
+        """SelectAll()"""
+        return _controls.TextCtrl_SelectAll(*args, **kwargs)
+
+    def SetEditable(*args, **kwargs):
+        """SetEditable(bool editable)"""
+        return _controls.TextCtrl_SetEditable(*args, **kwargs)
+
+    def write(*args, **kwargs):
+        """write(wxString text)"""
+        return _controls.TextCtrl_write(*args, **kwargs)
+
+    def GetString(*args, **kwargs):
+        """GetString(long from, long to) -> wxString"""
+        return _controls.TextCtrl_GetString(*args, **kwargs)
+
 
 class TextCtrlPtr(TextCtrl):
     def __init__(self, this):
@@ -544,6 +1161,7 @@ class TextCtrlPtr(TextCtrl):
 _controls.TextCtrl_swigregister(TextCtrlPtr)
 
 def PreTextCtrl(*args, **kwargs):
+    """PreTextCtrl() -> TextCtrl"""
     val = _controls.new_PreTextCtrl(*args, **kwargs)
     val.thisown = 1
     return val
@@ -553,16 +1171,27 @@ wxEVT_COMMAND_TEXT_ENTER = _controls.wxEVT_COMMAND_TEXT_ENTER
 wxEVT_COMMAND_TEXT_URL = _controls.wxEVT_COMMAND_TEXT_URL
 wxEVT_COMMAND_TEXT_MAXLEN = _controls.wxEVT_COMMAND_TEXT_MAXLEN
 class TextUrlEvent(core.CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTextUrlEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int winid, MouseEvent evtMouse, long start, long end) -> TextUrlEvent"""
         newobj = _controls.new_TextUrlEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetMouseEvent(*args, **kwargs): return _controls.TextUrlEvent_GetMouseEvent(*args, **kwargs)
-    def GetURLStart(*args, **kwargs): return _controls.TextUrlEvent_GetURLStart(*args, **kwargs)
-    def GetURLEnd(*args, **kwargs): return _controls.TextUrlEvent_GetURLEnd(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTextUrlEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetMouseEvent(*args, **kwargs):
+        """GetMouseEvent() -> MouseEvent"""
+        return _controls.TextUrlEvent_GetMouseEvent(*args, **kwargs)
+
+    def GetURLStart(*args, **kwargs):
+        """GetURLStart() -> long"""
+        return _controls.TextUrlEvent_GetURLStart(*args, **kwargs)
+
+    def GetURLEnd(*args, **kwargs):
+        """GetURLEnd() -> long"""
+        return _controls.TextUrlEvent_GetURLEnd(*args, **kwargs)
+
 
 class TextUrlEventPtr(TextUrlEvent):
     def __init__(self, this):
@@ -579,23 +1208,55 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
 #---------------------------------------------------------------------------
 
 class ScrollBar(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxScrollBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=SB_HORIZONTAL, 
+    Validator validator=DefaultValidator, wxString name=wxPyScrollBarNameStr) -> ScrollBar"""
         newobj = _controls.new_ScrollBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.ScrollBar_Create(*args, **kwargs)
-    def GetThumbPosition(*args, **kwargs): return _controls.ScrollBar_GetThumbPosition(*args, **kwargs)
-    def GetThumbSize(*args, **kwargs): return _controls.ScrollBar_GetThumbSize(*args, **kwargs)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=SB_HORIZONTAL, 
+    Validator validator=DefaultValidator, wxString name=wxPyScrollBarNameStr) -> bool"""
+        return _controls.ScrollBar_Create(*args, **kwargs)
+
+    def GetThumbPosition(*args, **kwargs):
+        """GetThumbPosition() -> int"""
+        return _controls.ScrollBar_GetThumbPosition(*args, **kwargs)
+
+    def GetThumbSize(*args, **kwargs):
+        """GetThumbSize() -> int"""
+        return _controls.ScrollBar_GetThumbSize(*args, **kwargs)
+
     GetThumbLength = GetThumbSize 
-    def GetPageSize(*args, **kwargs): return _controls.ScrollBar_GetPageSize(*args, **kwargs)
-    def GetRange(*args, **kwargs): return _controls.ScrollBar_GetRange(*args, **kwargs)
-    def IsVertical(*args, **kwargs): return _controls.ScrollBar_IsVertical(*args, **kwargs)
-    def SetThumbPosition(*args, **kwargs): return _controls.ScrollBar_SetThumbPosition(*args, **kwargs)
-    def SetScrollbar(*args, **kwargs): return _controls.ScrollBar_SetScrollbar(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxScrollBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetPageSize(*args, **kwargs):
+        """GetPageSize() -> int"""
+        return _controls.ScrollBar_GetPageSize(*args, **kwargs)
+
+    def GetRange(*args, **kwargs):
+        """GetRange() -> int"""
+        return _controls.ScrollBar_GetRange(*args, **kwargs)
+
+    def IsVertical(*args, **kwargs):
+        """IsVertical() -> bool"""
+        return _controls.ScrollBar_IsVertical(*args, **kwargs)
+
+    def SetThumbPosition(*args, **kwargs):
+        """SetThumbPosition(int viewStart)"""
+        return _controls.ScrollBar_SetThumbPosition(*args, **kwargs)
+
+    def SetScrollbar(*args, **kwargs):
+        """SetScrollbar(int position, int thumbSize, int range, int pageSize, 
+    bool refresh=True)"""
+        return _controls.ScrollBar_SetScrollbar(*args, **kwargs)
+
 
 class ScrollBarPtr(ScrollBar):
     def __init__(self, this):
@@ -605,6 +1266,7 @@ class ScrollBarPtr(ScrollBar):
 _controls.ScrollBar_swigregister(ScrollBarPtr)
 
 def PreScrollBar(*args, **kwargs):
+    """PreScrollBar() -> ScrollBar"""
     val = _controls.new_PreScrollBar(*args, **kwargs)
     val.thisown = 1
     return val
@@ -616,53 +1278,121 @@ SP_VERTICAL = _controls.SP_VERTICAL
 SP_ARROW_KEYS = _controls.SP_ARROW_KEYS
 SP_WRAP = _controls.SP_WRAP
 class SpinButton(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSpinButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=SP_HORIZONTAL, 
+    wxString name=wxPySPIN_BUTTON_NAME) -> SpinButton"""
         newobj = _controls.new_SpinButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.SpinButton_Create(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.SpinButton_GetValue(*args, **kwargs)
-    def GetMin(*args, **kwargs): return _controls.SpinButton_GetMin(*args, **kwargs)
-    def GetMax(*args, **kwargs): return _controls.SpinButton_GetMax(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.SpinButton_SetValue(*args, **kwargs)
-    def SetMin(*args, **kwargs): return _controls.SpinButton_SetMin(*args, **kwargs)
-    def SetMax(*args, **kwargs): return _controls.SpinButton_SetMax(*args, **kwargs)
-    def SetRange(*args, **kwargs): return _controls.SpinButton_SetRange(*args, **kwargs)
-    def IsVertical(*args, **kwargs): return _controls.SpinButton_IsVertical(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSpinButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
-class SpinButtonPtr(SpinButton):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=SP_HORIZONTAL, 
+    wxString name=wxPySPIN_BUTTON_NAME) -> bool"""
+        return _controls.SpinButton_Create(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> int"""
+        return _controls.SpinButton_GetValue(*args, **kwargs)
+
+    def GetMin(*args, **kwargs):
+        """GetMin() -> int"""
+        return _controls.SpinButton_GetMin(*args, **kwargs)
+
+    def GetMax(*args, **kwargs):
+        """GetMax() -> int"""
+        return _controls.SpinButton_GetMax(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(int val)"""
+        return _controls.SpinButton_SetValue(*args, **kwargs)
+
+    def SetMin(*args, **kwargs):
+        """SetMin(int minVal)"""
+        return _controls.SpinButton_SetMin(*args, **kwargs)
+
+    def SetMax(*args, **kwargs):
+        """SetMax(int maxVal)"""
+        return _controls.SpinButton_SetMax(*args, **kwargs)
+
+    def SetRange(*args, **kwargs):
+        """SetRange(int minVal, int maxVal)"""
+        return _controls.SpinButton_SetRange(*args, **kwargs)
+
+    def IsVertical(*args, **kwargs):
+        """IsVertical() -> bool"""
+        return _controls.SpinButton_IsVertical(*args, **kwargs)
+
+
+class SpinButtonPtr(SpinButton):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = SpinButton
 _controls.SpinButton_swigregister(SpinButtonPtr)
 
 def PreSpinButton(*args, **kwargs):
+    """PreSpinButton() -> SpinButton"""
     val = _controls.new_PreSpinButton(*args, **kwargs)
     val.thisown = 1
     return val
 
 class SpinCtrl(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSpinCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, wxString value=wxPyEmptyString, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=SP_ARROW_KEYS, int min=0, 
+    int max=100, int initial=0, wxString name=wxPySpinCtrlNameStr) -> SpinCtrl"""
         newobj = _controls.new_SpinCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.SpinCtrl_Create(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.SpinCtrl_GetValue(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.SpinCtrl_SetValue(*args, **kwargs)
-    def SetValueString(*args, **kwargs): return _controls.SpinCtrl_SetValueString(*args, **kwargs)
-    def SetRange(*args, **kwargs): return _controls.SpinCtrl_SetRange(*args, **kwargs)
-    def GetMin(*args, **kwargs): return _controls.SpinCtrl_GetMin(*args, **kwargs)
-    def GetMax(*args, **kwargs): return _controls.SpinCtrl_GetMax(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.SpinCtrl_SetSelection(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSpinCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=-1, wxString value=wxPyEmptyString, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=SP_ARROW_KEYS, int min=0, 
+    int max=100, int initial=0, wxString name=wxPySpinCtrlNameStr) -> bool"""
+        return _controls.SpinCtrl_Create(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> int"""
+        return _controls.SpinCtrl_GetValue(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(int value)"""
+        return _controls.SpinCtrl_SetValue(*args, **kwargs)
+
+    def SetValueString(*args, **kwargs):
+        """SetValueString(wxString text)"""
+        return _controls.SpinCtrl_SetValueString(*args, **kwargs)
+
+    def SetRange(*args, **kwargs):
+        """SetRange(int minVal, int maxVal)"""
+        return _controls.SpinCtrl_SetRange(*args, **kwargs)
+
+    def GetMin(*args, **kwargs):
+        """GetMin() -> int"""
+        return _controls.SpinCtrl_GetMin(*args, **kwargs)
+
+    def GetMax(*args, **kwargs):
+        """GetMax() -> int"""
+        return _controls.SpinCtrl_GetMax(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(long from, long to)"""
+        return _controls.SpinCtrl_SetSelection(*args, **kwargs)
+
 
 class SpinCtrlPtr(SpinCtrl):
     def __init__(self, this):
@@ -672,6 +1402,7 @@ class SpinCtrlPtr(SpinCtrl):
 _controls.SpinCtrl_swigregister(SpinCtrlPtr)
 
 def PreSpinCtrl(*args, **kwargs):
+    """PreSpinCtrl() -> SpinCtrl"""
     val = _controls.new_PreSpinCtrl(*args, **kwargs)
     val.thisown = 1
     return val
@@ -682,30 +1413,83 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
 #---------------------------------------------------------------------------
 
 class RadioBox(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxRadioBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxString label, Point point=DefaultPosition, 
+    Size size=DefaultSize, int choices=0, 
+    wxString choices_array=None, int majorDimension=0, 
+    long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 
+    wxString name=wxPyRadioBoxNameStr) -> RadioBox"""
         newobj = _controls.new_RadioBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.RadioBox_Create(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.RadioBox_SetSelection(*args, **kwargs)
-    def GetSelection(*args, **kwargs): return _controls.RadioBox_GetSelection(*args, **kwargs)
-    def GetStringSelection(*args, **kwargs): return _controls.RadioBox_GetStringSelection(*args, **kwargs)
-    def SetStringSelection(*args, **kwargs): return _controls.RadioBox_SetStringSelection(*args, **kwargs)
-    def GetCount(*args, **kwargs): return _controls.RadioBox_GetCount(*args, **kwargs)
-    def FindString(*args, **kwargs): return _controls.RadioBox_FindString(*args, **kwargs)
-    def GetString(*args, **kwargs): return _controls.RadioBox_GetString(*args, **kwargs)
-    def SetString(*args, **kwargs): return _controls.RadioBox_SetString(*args, **kwargs)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxString label, Point point=DefaultPosition, 
+    Size size=DefaultSize, int choices=0, 
+    wxString choices_array=None, int majorDimension=0, 
+    long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 
+    wxString name=wxPyRadioBoxNameStr) -> bool"""
+        return _controls.RadioBox_Create(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(int n)"""
+        return _controls.RadioBox_SetSelection(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> int"""
+        return _controls.RadioBox_GetSelection(*args, **kwargs)
+
+    def GetStringSelection(*args, **kwargs):
+        """GetStringSelection() -> wxString"""
+        return _controls.RadioBox_GetStringSelection(*args, **kwargs)
+
+    def SetStringSelection(*args, **kwargs):
+        """SetStringSelection(wxString s) -> bool"""
+        return _controls.RadioBox_SetStringSelection(*args, **kwargs)
+
+    def GetCount(*args, **kwargs):
+        """GetCount() -> int"""
+        return _controls.RadioBox_GetCount(*args, **kwargs)
+
+    def FindString(*args, **kwargs):
+        """FindString(wxString s) -> int"""
+        return _controls.RadioBox_FindString(*args, **kwargs)
+
+    def GetString(*args, **kwargs):
+        """GetString(int n) -> wxString"""
+        return _controls.RadioBox_GetString(*args, **kwargs)
+
+    def SetString(*args, **kwargs):
+        """SetString(int n, wxString label)"""
+        return _controls.RadioBox_SetString(*args, **kwargs)
+
     GetItemLabel = GetString 
     SetItemLabel = SetString 
-    def EnableItem(*args, **kwargs): return _controls.RadioBox_EnableItem(*args, **kwargs)
-    def ShowItem(*args, **kwargs): return _controls.RadioBox_ShowItem(*args, **kwargs)
-    def GetColumnCount(*args, **kwargs): return _controls.RadioBox_GetColumnCount(*args, **kwargs)
-    def GetRowCount(*args, **kwargs): return _controls.RadioBox_GetRowCount(*args, **kwargs)
-    def GetNextItem(*args, **kwargs): return _controls.RadioBox_GetNextItem(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxRadioBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def EnableItem(*args, **kwargs):
+        """EnableItem(int n, bool enable=True)"""
+        return _controls.RadioBox_EnableItem(*args, **kwargs)
+
+    def ShowItem(*args, **kwargs):
+        """ShowItem(int n, bool show=True)"""
+        return _controls.RadioBox_ShowItem(*args, **kwargs)
+
+    def GetColumnCount(*args, **kwargs):
+        """GetColumnCount() -> int"""
+        return _controls.RadioBox_GetColumnCount(*args, **kwargs)
+
+    def GetRowCount(*args, **kwargs):
+        """GetRowCount() -> int"""
+        return _controls.RadioBox_GetRowCount(*args, **kwargs)
+
+    def GetNextItem(*args, **kwargs):
+        """GetNextItem(int item, wxDirection dir, long style) -> int"""
+        return _controls.RadioBox_GetNextItem(*args, **kwargs)
+
 
 class RadioBoxPtr(RadioBox):
     def __init__(self, this):
@@ -715,6 +1499,7 @@ class RadioBoxPtr(RadioBox):
 _controls.RadioBox_swigregister(RadioBoxPtr)
 
 def PreRadioBox(*args, **kwargs):
+    """PreRadioBox() -> RadioBox"""
     val = _controls.new_PreRadioBox(*args, **kwargs)
     val.thisown = 1
     return val
@@ -722,17 +1507,35 @@ def PreRadioBox(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class RadioButton(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxRadioButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPyRadioButtonNameStr) -> RadioButton"""
         newobj = _controls.new_RadioButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.RadioButton_Create(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.RadioButton_GetValue(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.RadioButton_SetValue(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxRadioButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPyRadioButtonNameStr) -> bool"""
+        return _controls.RadioButton_Create(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> bool"""
+        return _controls.RadioButton_GetValue(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(bool value)"""
+        return _controls.RadioButton_SetValue(*args, **kwargs)
+
 
 class RadioButtonPtr(RadioButton):
     def __init__(self, this):
@@ -742,6 +1545,7 @@ class RadioButtonPtr(RadioButton):
 _controls.RadioButton_swigregister(RadioButtonPtr)
 
 def PreRadioButton(*args, **kwargs):
+    """PreRadioButton() -> RadioButton"""
     val = _controls.new_PreRadioButton(*args, **kwargs)
     val.thisown = 1
     return val
@@ -749,36 +1553,111 @@ def PreRadioButton(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class Slider(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSlider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, int value, int minValue, int maxValue, 
+    Point point=DefaultPosition, Size size=DefaultSize, 
+    long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 
+    wxString name=wxPySliderNameStr) -> Slider"""
         newobj = _controls.new_Slider(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.Slider_Create(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.Slider_GetValue(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.Slider_SetValue(*args, **kwargs)
-    def SetRange(*args, **kwargs): return _controls.Slider_SetRange(*args, **kwargs)
-    def GetMin(*args, **kwargs): return _controls.Slider_GetMin(*args, **kwargs)
-    def GetMax(*args, **kwargs): return _controls.Slider_GetMax(*args, **kwargs)
-    def SetMin(*args, **kwargs): return _controls.Slider_SetMin(*args, **kwargs)
-    def SetMax(*args, **kwargs): return _controls.Slider_SetMax(*args, **kwargs)
-    def SetLineSize(*args, **kwargs): return _controls.Slider_SetLineSize(*args, **kwargs)
-    def SetPageSize(*args, **kwargs): return _controls.Slider_SetPageSize(*args, **kwargs)
-    def GetLineSize(*args, **kwargs): return _controls.Slider_GetLineSize(*args, **kwargs)
-    def GetPageSize(*args, **kwargs): return _controls.Slider_GetPageSize(*args, **kwargs)
-    def SetThumbLength(*args, **kwargs): return _controls.Slider_SetThumbLength(*args, **kwargs)
-    def GetThumbLength(*args, **kwargs): return _controls.Slider_GetThumbLength(*args, **kwargs)
-    def SetTickFreq(*args, **kwargs): return _controls.Slider_SetTickFreq(*args, **kwargs)
-    def GetTickFreq(*args, **kwargs): return _controls.Slider_GetTickFreq(*args, **kwargs)
-    def ClearTicks(*args, **kwargs): return _controls.Slider_ClearTicks(*args, **kwargs)
-    def SetTick(*args, **kwargs): return _controls.Slider_SetTick(*args, **kwargs)
-    def ClearSel(*args, **kwargs): return _controls.Slider_ClearSel(*args, **kwargs)
-    def GetSelEnd(*args, **kwargs): return _controls.Slider_GetSelEnd(*args, **kwargs)
-    def GetSelStart(*args, **kwargs): return _controls.Slider_GetSelStart(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.Slider_SetSelection(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSlider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, int value, int minValue, int maxValue, 
+    Point point=DefaultPosition, Size size=DefaultSize, 
+    long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 
+    wxString name=wxPySliderNameStr) -> bool"""
+        return _controls.Slider_Create(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> int"""
+        return _controls.Slider_GetValue(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(int value)"""
+        return _controls.Slider_SetValue(*args, **kwargs)
+
+    def SetRange(*args, **kwargs):
+        """SetRange(int minValue, int maxValue)"""
+        return _controls.Slider_SetRange(*args, **kwargs)
+
+    def GetMin(*args, **kwargs):
+        """GetMin() -> int"""
+        return _controls.Slider_GetMin(*args, **kwargs)
+
+    def GetMax(*args, **kwargs):
+        """GetMax() -> int"""
+        return _controls.Slider_GetMax(*args, **kwargs)
+
+    def SetMin(*args, **kwargs):
+        """SetMin(int minValue)"""
+        return _controls.Slider_SetMin(*args, **kwargs)
+
+    def SetMax(*args, **kwargs):
+        """SetMax(int maxValue)"""
+        return _controls.Slider_SetMax(*args, **kwargs)
+
+    def SetLineSize(*args, **kwargs):
+        """SetLineSize(int lineSize)"""
+        return _controls.Slider_SetLineSize(*args, **kwargs)
+
+    def SetPageSize(*args, **kwargs):
+        """SetPageSize(int pageSize)"""
+        return _controls.Slider_SetPageSize(*args, **kwargs)
+
+    def GetLineSize(*args, **kwargs):
+        """GetLineSize() -> int"""
+        return _controls.Slider_GetLineSize(*args, **kwargs)
+
+    def GetPageSize(*args, **kwargs):
+        """GetPageSize() -> int"""
+        return _controls.Slider_GetPageSize(*args, **kwargs)
+
+    def SetThumbLength(*args, **kwargs):
+        """SetThumbLength(int lenPixels)"""
+        return _controls.Slider_SetThumbLength(*args, **kwargs)
+
+    def GetThumbLength(*args, **kwargs):
+        """GetThumbLength() -> int"""
+        return _controls.Slider_GetThumbLength(*args, **kwargs)
+
+    def SetTickFreq(*args, **kwargs):
+        """SetTickFreq(int n, int pos)"""
+        return _controls.Slider_SetTickFreq(*args, **kwargs)
+
+    def GetTickFreq(*args, **kwargs):
+        """GetTickFreq() -> int"""
+        return _controls.Slider_GetTickFreq(*args, **kwargs)
+
+    def ClearTicks(*args, **kwargs):
+        """ClearTicks()"""
+        return _controls.Slider_ClearTicks(*args, **kwargs)
+
+    def SetTick(*args, **kwargs):
+        """SetTick(int tickPos)"""
+        return _controls.Slider_SetTick(*args, **kwargs)
+
+    def ClearSel(*args, **kwargs):
+        """ClearSel()"""
+        return _controls.Slider_ClearSel(*args, **kwargs)
+
+    def GetSelEnd(*args, **kwargs):
+        """GetSelEnd() -> int"""
+        return _controls.Slider_GetSelEnd(*args, **kwargs)
+
+    def GetSelStart(*args, **kwargs):
+        """GetSelStart() -> int"""
+        return _controls.Slider_GetSelStart(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(int min, int max)"""
+        return _controls.Slider_SetSelection(*args, **kwargs)
+
 
 class SliderPtr(Slider):
     def __init__(self, this):
@@ -788,6 +1667,7 @@ class SliderPtr(Slider):
 _controls.Slider_swigregister(SliderPtr)
 
 def PreSlider(*args, **kwargs):
+    """PreSlider() -> Slider"""
     val = _controls.new_PreSlider(*args, **kwargs)
     val.thisown = 1
     return val
@@ -798,18 +1678,39 @@ wxEVT_COMMAND_TOGGLEBUTTON_CLICKED = _controls.wxEVT_COMMAND_TOGGLEBUTTON_CLICKE
 EVT_TOGGLEBUTTON = wx.PyEventBinder( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 1)
 
 class ToggleButton(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxToggleButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPyToggleButtonNameStr) -> ToggleButton"""
         newobj = _controls.new_ToggleButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.ToggleButton_Create(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.ToggleButton_SetValue(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.ToggleButton_GetValue(*args, **kwargs)
-    def SetLabel(*args, **kwargs): return _controls.ToggleButton_SetLabel(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxToggleButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxString label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPyToggleButtonNameStr) -> bool"""
+        return _controls.ToggleButton_Create(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(bool value)"""
+        return _controls.ToggleButton_SetValue(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> bool"""
+        return _controls.ToggleButton_GetValue(*args, **kwargs)
+
+    def SetLabel(*args, **kwargs):
+        """SetLabel(wxString label)"""
+        return _controls.ToggleButton_SetLabel(*args, **kwargs)
+
 
 class ToggleButtonPtr(ToggleButton):
     def __init__(self, this):
@@ -819,6 +1720,7 @@ class ToggleButtonPtr(ToggleButton):
 _controls.ToggleButton_swigregister(ToggleButtonPtr)
 
 def PreToggleButton(*args, **kwargs):
+    """PreToggleButton() -> ToggleButton"""
     val = _controls.new_PreToggleButton(*args, **kwargs)
     val.thisown = 1
     return val
@@ -826,31 +1728,89 @@ def PreToggleButton(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class BookCtrl(core.Control):
-    def GetPageCount(*args, **kwargs): return _controls.BookCtrl_GetPageCount(*args, **kwargs)
-    def GetPage(*args, **kwargs): return _controls.BookCtrl_GetPage(*args, **kwargs)
-    def GetSelection(*args, **kwargs): return _controls.BookCtrl_GetSelection(*args, **kwargs)
-    def SetPageText(*args, **kwargs): return _controls.BookCtrl_SetPageText(*args, **kwargs)
-    def GetPageText(*args, **kwargs): return _controls.BookCtrl_GetPageText(*args, **kwargs)
-    def SetImageList(*args, **kwargs): return _controls.BookCtrl_SetImageList(*args, **kwargs)
-    def AssignImageList(*args, **kwargs): 
-        val = _controls.BookCtrl_AssignImageList(*args, **kwargs)
-        args[1].thisown = 0
-        return val
-    def GetImageList(*args, **kwargs): return _controls.BookCtrl_GetImageList(*args, **kwargs)
-    def GetPageImage(*args, **kwargs): return _controls.BookCtrl_GetPageImage(*args, **kwargs)
-    def SetPageImage(*args, **kwargs): return _controls.BookCtrl_SetPageImage(*args, **kwargs)
-    def SetPageSize(*args, **kwargs): return _controls.BookCtrl_SetPageSize(*args, **kwargs)
-    def CalcSizeFromPage(*args, **kwargs): return _controls.BookCtrl_CalcSizeFromPage(*args, **kwargs)
-    def DeletePage(*args, **kwargs): return _controls.BookCtrl_DeletePage(*args, **kwargs)
-    def RemovePage(*args, **kwargs): return _controls.BookCtrl_RemovePage(*args, **kwargs)
-    def DeleteAllPages(*args, **kwargs): return _controls.BookCtrl_DeleteAllPages(*args, **kwargs)
-    def AddPage(*args, **kwargs): return _controls.BookCtrl_AddPage(*args, **kwargs)
-    def InsertPage(*args, **kwargs): return _controls.BookCtrl_InsertPage(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.BookCtrl_SetSelection(*args, **kwargs)
-    def AdvanceSelection(*args, **kwargs): return _controls.BookCtrl_AdvanceSelection(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBookCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetPageCount(*args, **kwargs):
+        """GetPageCount() -> size_t"""
+        return _controls.BookCtrl_GetPageCount(*args, **kwargs)
+
+    def GetPage(*args, **kwargs):
+        """GetPage(size_t n) -> Window"""
+        return _controls.BookCtrl_GetPage(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> int"""
+        return _controls.BookCtrl_GetSelection(*args, **kwargs)
+
+    def SetPageText(*args, **kwargs):
+        """SetPageText(size_t n, wxString strText) -> bool"""
+        return _controls.BookCtrl_SetPageText(*args, **kwargs)
+
+    def GetPageText(*args, **kwargs):
+        """GetPageText(size_t n) -> wxString"""
+        return _controls.BookCtrl_GetPageText(*args, **kwargs)
+
+    def SetImageList(*args, **kwargs):
+        """SetImageList(wxImageList imageList)"""
+        return _controls.BookCtrl_SetImageList(*args, **kwargs)
+
+    def AssignImageList(*args, **kwargs):
+        """AssignImageList(wxImageList imageList)"""
+        val = _controls.BookCtrl_AssignImageList(*args, **kwargs)
+        args[1].thisown = 0
+        return val
+
+    def GetImageList(*args, **kwargs):
+        """GetImageList() -> wxImageList"""
+        return _controls.BookCtrl_GetImageList(*args, **kwargs)
+
+    def GetPageImage(*args, **kwargs):
+        """GetPageImage(size_t n) -> int"""
+        return _controls.BookCtrl_GetPageImage(*args, **kwargs)
+
+    def SetPageImage(*args, **kwargs):
+        """SetPageImage(size_t n, int imageId) -> bool"""
+        return _controls.BookCtrl_SetPageImage(*args, **kwargs)
+
+    def SetPageSize(*args, **kwargs):
+        """SetPageSize(Size size)"""
+        return _controls.BookCtrl_SetPageSize(*args, **kwargs)
+
+    def CalcSizeFromPage(*args, **kwargs):
+        """CalcSizeFromPage(Size sizePage) -> Size"""
+        return _controls.BookCtrl_CalcSizeFromPage(*args, **kwargs)
+
+    def DeletePage(*args, **kwargs):
+        """DeletePage(size_t n) -> bool"""
+        return _controls.BookCtrl_DeletePage(*args, **kwargs)
+
+    def RemovePage(*args, **kwargs):
+        """RemovePage(size_t n) -> bool"""
+        return _controls.BookCtrl_RemovePage(*args, **kwargs)
+
+    def DeleteAllPages(*args, **kwargs):
+        """DeleteAllPages() -> bool"""
+        return _controls.BookCtrl_DeleteAllPages(*args, **kwargs)
+
+    def AddPage(*args, **kwargs):
+        """AddPage(Window page, wxString text, bool select=False, int imageId=-1) -> bool"""
+        return _controls.BookCtrl_AddPage(*args, **kwargs)
+
+    def InsertPage(*args, **kwargs):
+        """InsertPage(size_t n, Window page, wxString text, bool select=False, 
+    int imageId=-1) -> bool"""
+        return _controls.BookCtrl_InsertPage(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(size_t n) -> int"""
+        return _controls.BookCtrl_SetSelection(*args, **kwargs)
+
+    def AdvanceSelection(*args, **kwargs):
+        """AdvanceSelection(bool forward=True)"""
+        return _controls.BookCtrl_AdvanceSelection(*args, **kwargs)
+
 
 class BookCtrlPtr(BookCtrl):
     def __init__(self, this):
@@ -860,17 +1820,32 @@ class BookCtrlPtr(BookCtrl):
 _controls.BookCtrl_swigregister(BookCtrlPtr)
 
 class BookCtrlEvent(core.NotifyEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBookCtrlEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
+    int nOldSel=-1) -> BookCtrlEvent"""
         newobj = _controls.new_BookCtrlEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetSelection(*args, **kwargs): return _controls.BookCtrlEvent_GetSelection(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.BookCtrlEvent_SetSelection(*args, **kwargs)
-    def GetOldSelection(*args, **kwargs): return _controls.BookCtrlEvent_GetOldSelection(*args, **kwargs)
-    def SetOldSelection(*args, **kwargs): return _controls.BookCtrlEvent_SetOldSelection(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBookCtrlEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> int"""
+        return _controls.BookCtrlEvent_GetSelection(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(int nSel)"""
+        return _controls.BookCtrlEvent_SetSelection(*args, **kwargs)
+
+    def GetOldSelection(*args, **kwargs):
+        """GetOldSelection() -> int"""
+        return _controls.BookCtrlEvent_GetOldSelection(*args, **kwargs)
+
+    def SetOldSelection(*args, **kwargs):
+        """SetOldSelection(int nOldSel)"""
+        return _controls.BookCtrlEvent_SetOldSelection(*args, **kwargs)
+
 
 class BookCtrlEventPtr(BookCtrlEvent):
     def __init__(self, this):
@@ -892,20 +1867,43 @@ NB_HITTEST_ONICON = _controls.NB_HITTEST_ONICON
 NB_HITTEST_ONLABEL = _controls.NB_HITTEST_ONLABEL
 NB_HITTEST_ONITEM = _controls.NB_HITTEST_ONITEM
 class Notebook(BookCtrl):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxNotebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, wxString name=wxPyNOTEBOOK_NAME) -> Notebook"""
         newobj = _controls.new_Notebook(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.Notebook_Create(*args, **kwargs)
-    def GetRowCount(*args, **kwargs): return _controls.Notebook_GetRowCount(*args, **kwargs)
-    def SetPadding(*args, **kwargs): return _controls.Notebook_SetPadding(*args, **kwargs)
-    def SetTabSize(*args, **kwargs): return _controls.Notebook_SetTabSize(*args, **kwargs)
-    def HitTest(*args, **kwargs): return _controls.Notebook_HitTest(*args, **kwargs)
-    def CalcSizeFromPage(*args, **kwargs): return _controls.Notebook_CalcSizeFromPage(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxNotebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, wxString name=wxPyNOTEBOOK_NAME) -> bool"""
+        return _controls.Notebook_Create(*args, **kwargs)
+
+    def GetRowCount(*args, **kwargs):
+        """GetRowCount() -> int"""
+        return _controls.Notebook_GetRowCount(*args, **kwargs)
+
+    def SetPadding(*args, **kwargs):
+        """SetPadding(Size padding)"""
+        return _controls.Notebook_SetPadding(*args, **kwargs)
+
+    def SetTabSize(*args, **kwargs):
+        """SetTabSize(Size sz)"""
+        return _controls.Notebook_SetTabSize(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """HitTest(Point pt, long OUTPUT) -> int"""
+        return _controls.Notebook_HitTest(*args, **kwargs)
+
+    def CalcSizeFromPage(*args, **kwargs):
+        """CalcSizeFromPage(Size sizePage) -> Size"""
+        return _controls.Notebook_CalcSizeFromPage(*args, **kwargs)
+
 
 class NotebookPtr(Notebook):
     def __init__(self, this):
@@ -915,18 +1913,22 @@ class NotebookPtr(Notebook):
 _controls.Notebook_swigregister(NotebookPtr)
 
 def PreNotebook(*args, **kwargs):
+    """PreNotebook() -> Notebook"""
     val = _controls.new_PreNotebook(*args, **kwargs)
     val.thisown = 1
     return val
 
 class NotebookEvent(BookCtrlEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxNotebookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
+    int nOldSel=-1) -> NotebookEvent"""
         newobj = _controls.new_NotebookEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxNotebookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class NotebookEventPtr(NotebookEvent):
     def __init__(self, this):
@@ -980,16 +1982,27 @@ LB_LEFT = _controls.LB_LEFT
 LB_RIGHT = _controls.LB_RIGHT
 LB_ALIGN_MASK = _controls.LB_ALIGN_MASK
 class Listbook(BookCtrl):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxListbook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, wxString name=wxPyEmptyString) -> Listbook"""
         newobj = _controls.new_Listbook(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.Listbook_Create(*args, **kwargs)
-    def IsVertical(*args, **kwargs): return _controls.Listbook_IsVertical(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxListbook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, wxString name=wxPyEmptyString) -> bool"""
+        return _controls.Listbook_Create(*args, **kwargs)
+
+    def IsVertical(*args, **kwargs):
+        """IsVertical() -> bool"""
+        return _controls.Listbook_IsVertical(*args, **kwargs)
+
 
 class ListbookPtr(Listbook):
     def __init__(self, this):
@@ -999,18 +2012,22 @@ class ListbookPtr(Listbook):
 _controls.Listbook_swigregister(ListbookPtr)
 
 def PreListbook(*args, **kwargs):
+    """PreListbook() -> Listbook"""
     val = _controls.new_PreListbook(*args, **kwargs)
     val.thisown = 1
     return val
 
 class ListbookEvent(BookCtrlEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxListbookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
+    int nOldSel=-1) -> ListbookEvent"""
         newobj = _controls.new_ListbookEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxListbookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class ListbookEventPtr(ListbookEvent):
     def __init__(self, this):
@@ -1027,17 +2044,29 @@ EVT_LISTBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_LISTBOOK_PAGE_CHANG
 #---------------------------------------------------------------------------
 
 class BookCtrlSizer(core.Sizer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBookCtrlSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(BookCtrl nb) -> BookCtrlSizer"""
         newobj = _controls.new_BookCtrlSizer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def RecalcSizes(*args, **kwargs): return _controls.BookCtrlSizer_RecalcSizes(*args, **kwargs)
-    def CalcMin(*args, **kwargs): return _controls.BookCtrlSizer_CalcMin(*args, **kwargs)
-    def GetControl(*args, **kwargs): return _controls.BookCtrlSizer_GetControl(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBookCtrlSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def RecalcSizes(*args, **kwargs):
+        """RecalcSizes()"""
+        return _controls.BookCtrlSizer_RecalcSizes(*args, **kwargs)
+
+    def CalcMin(*args, **kwargs):
+        """CalcMin() -> Size"""
+        return _controls.BookCtrlSizer_CalcMin(*args, **kwargs)
+
+    def GetControl(*args, **kwargs):
+        """GetControl() -> BookCtrl"""
+        return _controls.BookCtrlSizer_GetControl(*args, **kwargs)
+
 
 class BookCtrlSizerPtr(BookCtrlSizer):
     def __init__(self, this):
@@ -1047,17 +2076,29 @@ class BookCtrlSizerPtr(BookCtrlSizer):
 _controls.BookCtrlSizer_swigregister(BookCtrlSizerPtr)
 
 class NotebookSizer(core.Sizer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxNotebookSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Notebook nb) -> NotebookSizer"""
         newobj = _controls.new_NotebookSizer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def RecalcSizes(*args, **kwargs): return _controls.NotebookSizer_RecalcSizes(*args, **kwargs)
-    def CalcMin(*args, **kwargs): return _controls.NotebookSizer_CalcMin(*args, **kwargs)
-    def GetNotebook(*args, **kwargs): return _controls.NotebookSizer_GetNotebook(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxNotebookSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def RecalcSizes(*args, **kwargs):
+        """RecalcSizes()"""
+        return _controls.NotebookSizer_RecalcSizes(*args, **kwargs)
+
+    def CalcMin(*args, **kwargs):
+        """CalcMin() -> Size"""
+        return _controls.NotebookSizer_CalcMin(*args, **kwargs)
+
+    def GetNotebook(*args, **kwargs):
+        """GetNotebook() -> Notebook"""
+        return _controls.NotebookSizer_GetNotebook(*args, **kwargs)
+
 
 class NotebookSizerPtr(NotebookSizer):
     def __init__(self, this):
@@ -1083,43 +2124,131 @@ TB_NOALIGN = _controls.TB_NOALIGN
 TB_HORZ_LAYOUT = _controls.TB_HORZ_LAYOUT
 TB_HORZ_TEXT = _controls.TB_HORZ_TEXT
 class ToolBarToolBase(core.Object):
-    def GetId(*args, **kwargs): return _controls.ToolBarToolBase_GetId(*args, **kwargs)
-    def GetControl(*args, **kwargs): return _controls.ToolBarToolBase_GetControl(*args, **kwargs)
-    def GetToolBar(*args, **kwargs): return _controls.ToolBarToolBase_GetToolBar(*args, **kwargs)
-    def IsButton(*args, **kwargs): return _controls.ToolBarToolBase_IsButton(*args, **kwargs)
-    def IsControl(*args, **kwargs): return _controls.ToolBarToolBase_IsControl(*args, **kwargs)
-    def IsSeparator(*args, **kwargs): return _controls.ToolBarToolBase_IsSeparator(*args, **kwargs)
-    def GetStyle(*args, **kwargs): return _controls.ToolBarToolBase_GetStyle(*args, **kwargs)
-    def GetKind(*args, **kwargs): return _controls.ToolBarToolBase_GetKind(*args, **kwargs)
-    def IsEnabled(*args, **kwargs): return _controls.ToolBarToolBase_IsEnabled(*args, **kwargs)
-    def IsToggled(*args, **kwargs): return _controls.ToolBarToolBase_IsToggled(*args, **kwargs)
-    def CanBeToggled(*args, **kwargs): return _controls.ToolBarToolBase_CanBeToggled(*args, **kwargs)
-    def GetNormalBitmap(*args, **kwargs): return _controls.ToolBarToolBase_GetNormalBitmap(*args, **kwargs)
-    def GetDisabledBitmap(*args, **kwargs): return _controls.ToolBarToolBase_GetDisabledBitmap(*args, **kwargs)
-    def GetBitmap(*args, **kwargs): return _controls.ToolBarToolBase_GetBitmap(*args, **kwargs)
-    def GetLabel(*args, **kwargs): return _controls.ToolBarToolBase_GetLabel(*args, **kwargs)
-    def GetShortHelp(*args, **kwargs): return _controls.ToolBarToolBase_GetShortHelp(*args, **kwargs)
-    def GetLongHelp(*args, **kwargs): return _controls.ToolBarToolBase_GetLongHelp(*args, **kwargs)
-    def Enable(*args, **kwargs): return _controls.ToolBarToolBase_Enable(*args, **kwargs)
-    def Toggle(*args, **kwargs): return _controls.ToolBarToolBase_Toggle(*args, **kwargs)
-    def SetToggle(*args, **kwargs): return _controls.ToolBarToolBase_SetToggle(*args, **kwargs)
-    def SetShortHelp(*args, **kwargs): return _controls.ToolBarToolBase_SetShortHelp(*args, **kwargs)
-    def SetLongHelp(*args, **kwargs): return _controls.ToolBarToolBase_SetLongHelp(*args, **kwargs)
-    def SetNormalBitmap(*args, **kwargs): return _controls.ToolBarToolBase_SetNormalBitmap(*args, **kwargs)
-    def SetDisabledBitmap(*args, **kwargs): return _controls.ToolBarToolBase_SetDisabledBitmap(*args, **kwargs)
-    def SetLabel(*args, **kwargs): return _controls.ToolBarToolBase_SetLabel(*args, **kwargs)
-    def Detach(*args, **kwargs): return _controls.ToolBarToolBase_Detach(*args, **kwargs)
-    def Attach(*args, **kwargs): return _controls.ToolBarToolBase_Attach(*args, **kwargs)
-    def GetClientData(*args, **kwargs): return _controls.ToolBarToolBase_GetClientData(*args, **kwargs)
-    def SetClientData(*args, **kwargs): return _controls.ToolBarToolBase_SetClientData(*args, **kwargs)
+    """"""
+    def __init__(self): raise RuntimeError, "No constructor defined"
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxToolBarToolBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetId(*args, **kwargs):
+        """GetId() -> int"""
+        return _controls.ToolBarToolBase_GetId(*args, **kwargs)
+
+    def GetControl(*args, **kwargs):
+        """GetControl() -> Control"""
+        return _controls.ToolBarToolBase_GetControl(*args, **kwargs)
+
+    def GetToolBar(*args, **kwargs):
+        """GetToolBar() -> ToolBarBase"""
+        return _controls.ToolBarToolBase_GetToolBar(*args, **kwargs)
+
+    def IsButton(*args, **kwargs):
+        """IsButton() -> int"""
+        return _controls.ToolBarToolBase_IsButton(*args, **kwargs)
+
+    def IsControl(*args, **kwargs):
+        """IsControl() -> int"""
+        return _controls.ToolBarToolBase_IsControl(*args, **kwargs)
+
+    def IsSeparator(*args, **kwargs):
+        """IsSeparator() -> int"""
+        return _controls.ToolBarToolBase_IsSeparator(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle() -> int"""
+        return _controls.ToolBarToolBase_GetStyle(*args, **kwargs)
+
+    def GetKind(*args, **kwargs):
+        """GetKind() -> wxItemKind"""
+        return _controls.ToolBarToolBase_GetKind(*args, **kwargs)
+
+    def IsEnabled(*args, **kwargs):
+        """IsEnabled() -> bool"""
+        return _controls.ToolBarToolBase_IsEnabled(*args, **kwargs)
+
+    def IsToggled(*args, **kwargs):
+        """IsToggled() -> bool"""
+        return _controls.ToolBarToolBase_IsToggled(*args, **kwargs)
+
+    def CanBeToggled(*args, **kwargs):
+        """CanBeToggled() -> bool"""
+        return _controls.ToolBarToolBase_CanBeToggled(*args, **kwargs)
+
+    def GetNormalBitmap(*args, **kwargs):
+        """GetNormalBitmap() -> wxBitmap"""
+        return _controls.ToolBarToolBase_GetNormalBitmap(*args, **kwargs)
+
+    def GetDisabledBitmap(*args, **kwargs):
+        """GetDisabledBitmap() -> wxBitmap"""
+        return _controls.ToolBarToolBase_GetDisabledBitmap(*args, **kwargs)
+
+    def GetBitmap(*args, **kwargs):
+        """GetBitmap() -> wxBitmap"""
+        return _controls.ToolBarToolBase_GetBitmap(*args, **kwargs)
+
+    def GetLabel(*args, **kwargs):
+        """GetLabel() -> wxString"""
+        return _controls.ToolBarToolBase_GetLabel(*args, **kwargs)
+
+    def GetShortHelp(*args, **kwargs):
+        """GetShortHelp() -> wxString"""
+        return _controls.ToolBarToolBase_GetShortHelp(*args, **kwargs)
+
+    def GetLongHelp(*args, **kwargs):
+        """GetLongHelp() -> wxString"""
+        return _controls.ToolBarToolBase_GetLongHelp(*args, **kwargs)
+
+    def Enable(*args, **kwargs):
+        """Enable(bool enable) -> bool"""
+        return _controls.ToolBarToolBase_Enable(*args, **kwargs)
+
+    def Toggle(*args, **kwargs):
+        """Toggle()"""
+        return _controls.ToolBarToolBase_Toggle(*args, **kwargs)
+
+    def SetToggle(*args, **kwargs):
+        """SetToggle(bool toggle) -> bool"""
+        return _controls.ToolBarToolBase_SetToggle(*args, **kwargs)
+
+    def SetShortHelp(*args, **kwargs):
+        """SetShortHelp(wxString help) -> bool"""
+        return _controls.ToolBarToolBase_SetShortHelp(*args, **kwargs)
+
+    def SetLongHelp(*args, **kwargs):
+        """SetLongHelp(wxString help) -> bool"""
+        return _controls.ToolBarToolBase_SetLongHelp(*args, **kwargs)
+
+    def SetNormalBitmap(*args, **kwargs):
+        """SetNormalBitmap(wxBitmap bmp)"""
+        return _controls.ToolBarToolBase_SetNormalBitmap(*args, **kwargs)
+
+    def SetDisabledBitmap(*args, **kwargs):
+        """SetDisabledBitmap(wxBitmap bmp)"""
+        return _controls.ToolBarToolBase_SetDisabledBitmap(*args, **kwargs)
+
+    def SetLabel(*args, **kwargs):
+        """SetLabel(wxString label)"""
+        return _controls.ToolBarToolBase_SetLabel(*args, **kwargs)
+
+    def Detach(*args, **kwargs):
+        """Detach()"""
+        return _controls.ToolBarToolBase_Detach(*args, **kwargs)
+
+    def Attach(*args, **kwargs):
+        """Attach(ToolBarBase tbar)"""
+        return _controls.ToolBarToolBase_Attach(*args, **kwargs)
+
+    def GetClientData(*args, **kwargs):
+        """GetClientData() -> PyObject"""
+        return _controls.ToolBarToolBase_GetClientData(*args, **kwargs)
+
+    def SetClientData(*args, **kwargs):
+        """SetClientData(PyObject clientData)"""
+        return _controls.ToolBarToolBase_SetClientData(*args, **kwargs)
+
     GetBitmap1 = GetNormalBitmap
     GetBitmap2 = GetDisabledBitmap
     SetBitmap1 = SetNormalBitmap
     SetBitmap2 = SetDisabledBitmap
 
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxToolBarToolBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class ToolBarToolBasePtr(ToolBarToolBase):
     def __init__(self, this):
@@ -1129,8 +2258,25 @@ class ToolBarToolBasePtr(ToolBarToolBase):
 _controls.ToolBarToolBase_swigregister(ToolBarToolBasePtr)
 
 class ToolBarBase(core.Control):
-    def DoAddTool(*args, **kwargs): return _controls.ToolBarBase_DoAddTool(*args, **kwargs)
-    def DoInsertTool(*args, **kwargs): return _controls.ToolBarBase_DoInsertTool(*args, **kwargs)
+    """"""
+    def __init__(self): raise RuntimeError, "No constructor defined"
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxToolBarBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def DoAddTool(*args, **kwargs):
+        """DoAddTool(int id, wxString label, wxBitmap bitmap, wxBitmap bmpDisabled=wxNullBitmap, 
+    wxItemKind kind=ITEM_NORMAL, 
+    wxString shortHelp=wxPyEmptyString, 
+    wxString longHelp=wxPyEmptyString, PyObject clientData=None) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_DoAddTool(*args, **kwargs)
+
+    def DoInsertTool(*args, **kwargs):
+        """DoInsertTool(size_t pos, int id, wxString label, wxBitmap bitmap, 
+    wxBitmap bmpDisabled=wxNullBitmap, wxItemKind kind=ITEM_NORMAL, 
+    wxString shortHelp=wxPyEmptyString, 
+    wxString longHelp=wxPyEmptyString, 
+    PyObject clientData=None) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_DoInsertTool(*args, **kwargs)
+
     # These match the original Add methods for this class, kept for
     # backwards compatibility with versions < 2.3.3.
 
@@ -1254,48 +2400,162 @@ class ToolBarBase(core.Control):
         return self.DoAddTool(id, '', bitmap, bmpDisabled, wx.ITEM_RADIO,
                               shortHelp, longHelp, clientData)
 
-    def AddControl(*args, **kwargs): return _controls.ToolBarBase_AddControl(*args, **kwargs)
-    def InsertControl(*args, **kwargs): return _controls.ToolBarBase_InsertControl(*args, **kwargs)
-    def FindControl(*args, **kwargs): return _controls.ToolBarBase_FindControl(*args, **kwargs)
-    def AddSeparator(*args, **kwargs): return _controls.ToolBarBase_AddSeparator(*args, **kwargs)
-    def InsertSeparator(*args, **kwargs): return _controls.ToolBarBase_InsertSeparator(*args, **kwargs)
-    def RemoveTool(*args, **kwargs): return _controls.ToolBarBase_RemoveTool(*args, **kwargs)
-    def DeleteToolByPos(*args, **kwargs): return _controls.ToolBarBase_DeleteToolByPos(*args, **kwargs)
-    def DeleteTool(*args, **kwargs): return _controls.ToolBarBase_DeleteTool(*args, **kwargs)
-    def ClearTools(*args, **kwargs): return _controls.ToolBarBase_ClearTools(*args, **kwargs)
-    def Realize(*args, **kwargs): return _controls.ToolBarBase_Realize(*args, **kwargs)
-    def EnableTool(*args, **kwargs): return _controls.ToolBarBase_EnableTool(*args, **kwargs)
-    def ToggleTool(*args, **kwargs): return _controls.ToolBarBase_ToggleTool(*args, **kwargs)
-    def SetToggle(*args, **kwargs): return _controls.ToolBarBase_SetToggle(*args, **kwargs)
-    def GetToolClientData(*args, **kwargs): return _controls.ToolBarBase_GetToolClientData(*args, **kwargs)
-    def SetToolClientData(*args, **kwargs): return _controls.ToolBarBase_SetToolClientData(*args, **kwargs)
-    def GetToolPos(*args, **kwargs): return _controls.ToolBarBase_GetToolPos(*args, **kwargs)
-    def GetToolState(*args, **kwargs): return _controls.ToolBarBase_GetToolState(*args, **kwargs)
-    def GetToolEnabled(*args, **kwargs): return _controls.ToolBarBase_GetToolEnabled(*args, **kwargs)
-    def SetToolShortHelp(*args, **kwargs): return _controls.ToolBarBase_SetToolShortHelp(*args, **kwargs)
-    def GetToolShortHelp(*args, **kwargs): return _controls.ToolBarBase_GetToolShortHelp(*args, **kwargs)
-    def SetToolLongHelp(*args, **kwargs): return _controls.ToolBarBase_SetToolLongHelp(*args, **kwargs)
-    def GetToolLongHelp(*args, **kwargs): return _controls.ToolBarBase_GetToolLongHelp(*args, **kwargs)
-    def SetMarginsXY(*args, **kwargs): return _controls.ToolBarBase_SetMarginsXY(*args, **kwargs)
-    def SetMargins(*args, **kwargs): return _controls.ToolBarBase_SetMargins(*args, **kwargs)
-    def SetToolPacking(*args, **kwargs): return _controls.ToolBarBase_SetToolPacking(*args, **kwargs)
-    def SetToolSeparation(*args, **kwargs): return _controls.ToolBarBase_SetToolSeparation(*args, **kwargs)
-    def GetToolMargins(*args, **kwargs): return _controls.ToolBarBase_GetToolMargins(*args, **kwargs)
-    def GetMargins(*args, **kwargs): return _controls.ToolBarBase_GetMargins(*args, **kwargs)
-    def GetToolPacking(*args, **kwargs): return _controls.ToolBarBase_GetToolPacking(*args, **kwargs)
-    def GetToolSeparation(*args, **kwargs): return _controls.ToolBarBase_GetToolSeparation(*args, **kwargs)
-    def SetRows(*args, **kwargs): return _controls.ToolBarBase_SetRows(*args, **kwargs)
-    def SetMaxRowsCols(*args, **kwargs): return _controls.ToolBarBase_SetMaxRowsCols(*args, **kwargs)
-    def GetMaxRows(*args, **kwargs): return _controls.ToolBarBase_GetMaxRows(*args, **kwargs)
-    def GetMaxCols(*args, **kwargs): return _controls.ToolBarBase_GetMaxCols(*args, **kwargs)
-    def SetToolBitmapSize(*args, **kwargs): return _controls.ToolBarBase_SetToolBitmapSize(*args, **kwargs)
-    def GetToolBitmapSize(*args, **kwargs): return _controls.ToolBarBase_GetToolBitmapSize(*args, **kwargs)
-    def GetToolSize(*args, **kwargs): return _controls.ToolBarBase_GetToolSize(*args, **kwargs)
-    def FindToolForPosition(*args, **kwargs): return _controls.ToolBarBase_FindToolForPosition(*args, **kwargs)
-    def IsVertical(*args, **kwargs): return _controls.ToolBarBase_IsVertical(*args, **kwargs)
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxToolBarBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def AddControl(*args, **kwargs):
+        """AddControl(Control control) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_AddControl(*args, **kwargs)
+
+    def InsertControl(*args, **kwargs):
+        """InsertControl(size_t pos, Control control) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_InsertControl(*args, **kwargs)
+
+    def FindControl(*args, **kwargs):
+        """FindControl(int id) -> Control"""
+        return _controls.ToolBarBase_FindControl(*args, **kwargs)
+
+    def AddSeparator(*args, **kwargs):
+        """AddSeparator() -> ToolBarToolBase"""
+        return _controls.ToolBarBase_AddSeparator(*args, **kwargs)
+
+    def InsertSeparator(*args, **kwargs):
+        """InsertSeparator(size_t pos) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_InsertSeparator(*args, **kwargs)
+
+    def RemoveTool(*args, **kwargs):
+        """RemoveTool(int id) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_RemoveTool(*args, **kwargs)
+
+    def DeleteToolByPos(*args, **kwargs):
+        """DeleteToolByPos(size_t pos) -> bool"""
+        return _controls.ToolBarBase_DeleteToolByPos(*args, **kwargs)
+
+    def DeleteTool(*args, **kwargs):
+        """DeleteTool(int id) -> bool"""
+        return _controls.ToolBarBase_DeleteTool(*args, **kwargs)
+
+    def ClearTools(*args, **kwargs):
+        """ClearTools()"""
+        return _controls.ToolBarBase_ClearTools(*args, **kwargs)
+
+    def Realize(*args, **kwargs):
+        """Realize() -> bool"""
+        return _controls.ToolBarBase_Realize(*args, **kwargs)
+
+    def EnableTool(*args, **kwargs):
+        """EnableTool(int id, bool enable)"""
+        return _controls.ToolBarBase_EnableTool(*args, **kwargs)
+
+    def ToggleTool(*args, **kwargs):
+        """ToggleTool(int id, bool toggle)"""
+        return _controls.ToolBarBase_ToggleTool(*args, **kwargs)
+
+    def SetToggle(*args, **kwargs):
+        """SetToggle(int id, bool toggle)"""
+        return _controls.ToolBarBase_SetToggle(*args, **kwargs)
+
+    def GetToolClientData(*args, **kwargs):
+        """GetToolClientData(int id) -> PyObject"""
+        return _controls.ToolBarBase_GetToolClientData(*args, **kwargs)
+
+    def SetToolClientData(*args, **kwargs):
+        """SetToolClientData(int id, PyObject clientData)"""
+        return _controls.ToolBarBase_SetToolClientData(*args, **kwargs)
+
+    def GetToolPos(*args, **kwargs):
+        """GetToolPos(int id) -> int"""
+        return _controls.ToolBarBase_GetToolPos(*args, **kwargs)
+
+    def GetToolState(*args, **kwargs):
+        """GetToolState(int id) -> bool"""
+        return _controls.ToolBarBase_GetToolState(*args, **kwargs)
+
+    def GetToolEnabled(*args, **kwargs):
+        """GetToolEnabled(int id) -> bool"""
+        return _controls.ToolBarBase_GetToolEnabled(*args, **kwargs)
+
+    def SetToolShortHelp(*args, **kwargs):
+        """SetToolShortHelp(int id, wxString helpString)"""
+        return _controls.ToolBarBase_SetToolShortHelp(*args, **kwargs)
+
+    def GetToolShortHelp(*args, **kwargs):
+        """GetToolShortHelp(int id) -> wxString"""
+        return _controls.ToolBarBase_GetToolShortHelp(*args, **kwargs)
+
+    def SetToolLongHelp(*args, **kwargs):
+        """SetToolLongHelp(int id, wxString helpString)"""
+        return _controls.ToolBarBase_SetToolLongHelp(*args, **kwargs)
+
+    def GetToolLongHelp(*args, **kwargs):
+        """GetToolLongHelp(int id) -> wxString"""
+        return _controls.ToolBarBase_GetToolLongHelp(*args, **kwargs)
+
+    def SetMarginsXY(*args, **kwargs):
+        """SetMarginsXY(int x, int y)"""
+        return _controls.ToolBarBase_SetMarginsXY(*args, **kwargs)
+
+    def SetMargins(*args, **kwargs):
+        """SetMargins(Size size)"""
+        return _controls.ToolBarBase_SetMargins(*args, **kwargs)
+
+    def SetToolPacking(*args, **kwargs):
+        """SetToolPacking(int packing)"""
+        return _controls.ToolBarBase_SetToolPacking(*args, **kwargs)
+
+    def SetToolSeparation(*args, **kwargs):
+        """SetToolSeparation(int separation)"""
+        return _controls.ToolBarBase_SetToolSeparation(*args, **kwargs)
+
+    def GetToolMargins(*args, **kwargs):
+        """GetToolMargins() -> Size"""
+        return _controls.ToolBarBase_GetToolMargins(*args, **kwargs)
+
+    def GetMargins(*args, **kwargs):
+        """GetMargins() -> Size"""
+        return _controls.ToolBarBase_GetMargins(*args, **kwargs)
+
+    def GetToolPacking(*args, **kwargs):
+        """GetToolPacking() -> int"""
+        return _controls.ToolBarBase_GetToolPacking(*args, **kwargs)
+
+    def GetToolSeparation(*args, **kwargs):
+        """GetToolSeparation() -> int"""
+        return _controls.ToolBarBase_GetToolSeparation(*args, **kwargs)
+
+    def SetRows(*args, **kwargs):
+        """SetRows(int nRows)"""
+        return _controls.ToolBarBase_SetRows(*args, **kwargs)
+
+    def SetMaxRowsCols(*args, **kwargs):
+        """SetMaxRowsCols(int rows, int cols)"""
+        return _controls.ToolBarBase_SetMaxRowsCols(*args, **kwargs)
+
+    def GetMaxRows(*args, **kwargs):
+        """GetMaxRows() -> int"""
+        return _controls.ToolBarBase_GetMaxRows(*args, **kwargs)
+
+    def GetMaxCols(*args, **kwargs):
+        """GetMaxCols() -> int"""
+        return _controls.ToolBarBase_GetMaxCols(*args, **kwargs)
+
+    def SetToolBitmapSize(*args, **kwargs):
+        """SetToolBitmapSize(Size size)"""
+        return _controls.ToolBarBase_SetToolBitmapSize(*args, **kwargs)
+
+    def GetToolBitmapSize(*args, **kwargs):
+        """GetToolBitmapSize() -> Size"""
+        return _controls.ToolBarBase_GetToolBitmapSize(*args, **kwargs)
+
+    def GetToolSize(*args, **kwargs):
+        """GetToolSize() -> Size"""
+        return _controls.ToolBarBase_GetToolSize(*args, **kwargs)
+
+    def FindToolForPosition(*args, **kwargs):
+        """FindToolForPosition(int x, int y) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_FindToolForPosition(*args, **kwargs)
+
+    def IsVertical(*args, **kwargs):
+        """IsVertical() -> bool"""
+        return _controls.ToolBarBase_IsVertical(*args, **kwargs)
+
 
 class ToolBarBasePtr(ToolBarBase):
     def __init__(self, this):
@@ -1305,16 +2565,29 @@ class ToolBarBasePtr(ToolBarBase):
 _controls.ToolBarBase_swigregister(ToolBarBasePtr)
 
 class ToolBar(ToolBarBase):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxToolBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=wxNO_BORDER|wxTB_HORIZONTAL, 
+    wxString name=wxPyToolBarNameStr) -> ToolBar"""
         newobj = _controls.new_ToolBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.ToolBar_Create(*args, **kwargs)
-    def FindToolForPosition(*args, **kwargs): return _controls.ToolBar_FindToolForPosition(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxToolBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=wxNO_BORDER|wxTB_HORIZONTAL, 
+    wxString name=wxPyToolBarNameStr) -> bool"""
+        return _controls.ToolBar_Create(*args, **kwargs)
+
+    def FindToolForPosition(*args, **kwargs):
+        """FindToolForPosition(int x, int y) -> ToolBarToolBase"""
+        return _controls.ToolBar_FindToolForPosition(*args, **kwargs)
+
 
 class ToolBarPtr(ToolBar):
     def __init__(self, this):
@@ -1324,6 +2597,7 @@ class ToolBarPtr(ToolBar):
 _controls.ToolBar_swigregister(ToolBarPtr)
 
 def PreToolBar(*args, **kwargs):
+    """PreToolBar() -> ToolBar"""
     val = _controls.new_PreToolBar(*args, **kwargs)
     val.thisown = 1
     return val
@@ -1401,23 +2675,56 @@ LIST_FIND_RIGHT = _controls.LIST_FIND_RIGHT
 #---------------------------------------------------------------------------
 
 class ListItemAttr(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxListItemAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxColour colText=wxNullColour, wxColour colBack=wxNullColour, 
+    wxFont font=wxNullFont) -> ListItemAttr"""
         newobj = _controls.new_ListItemAttr(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetTextColour(*args, **kwargs): return _controls.ListItemAttr_SetTextColour(*args, **kwargs)
-    def SetBackgroundColour(*args, **kwargs): return _controls.ListItemAttr_SetBackgroundColour(*args, **kwargs)
-    def SetFont(*args, **kwargs): return _controls.ListItemAttr_SetFont(*args, **kwargs)
-    def HasTextColour(*args, **kwargs): return _controls.ListItemAttr_HasTextColour(*args, **kwargs)
-    def HasBackgroundColour(*args, **kwargs): return _controls.ListItemAttr_HasBackgroundColour(*args, **kwargs)
-    def HasFont(*args, **kwargs): return _controls.ListItemAttr_HasFont(*args, **kwargs)
-    def GetTextColour(*args, **kwargs): return _controls.ListItemAttr_GetTextColour(*args, **kwargs)
-    def GetBackgroundColour(*args, **kwargs): return _controls.ListItemAttr_GetBackgroundColour(*args, **kwargs)
-    def GetFont(*args, **kwargs): return _controls.ListItemAttr_GetFont(*args, **kwargs)
-    def Destroy(*args, **kwargs): return _controls.ListItemAttr_Destroy(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxListItemAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetTextColour(*args, **kwargs):
+        """SetTextColour(wxColour colText)"""
+        return _controls.ListItemAttr_SetTextColour(*args, **kwargs)
+
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(wxColour colBack)"""
+        return _controls.ListItemAttr_SetBackgroundColour(*args, **kwargs)
+
+    def SetFont(*args, **kwargs):
+        """SetFont(wxFont font)"""
+        return _controls.ListItemAttr_SetFont(*args, **kwargs)
+
+    def HasTextColour(*args, **kwargs):
+        """HasTextColour() -> bool"""
+        return _controls.ListItemAttr_HasTextColour(*args, **kwargs)
+
+    def HasBackgroundColour(*args, **kwargs):
+        """HasBackgroundColour() -> bool"""
+        return _controls.ListItemAttr_HasBackgroundColour(*args, **kwargs)
+
+    def HasFont(*args, **kwargs):
+        """HasFont() -> bool"""
+        return _controls.ListItemAttr_HasFont(*args, **kwargs)
+
+    def GetTextColour(*args, **kwargs):
+        """GetTextColour() -> wxColour"""
+        return _controls.ListItemAttr_GetTextColour(*args, **kwargs)
+
+    def GetBackgroundColour(*args, **kwargs):
+        """GetBackgroundColour() -> wxColour"""
+        return _controls.ListItemAttr_GetBackgroundColour(*args, **kwargs)
+
+    def GetFont(*args, **kwargs):
+        """GetFont() -> wxFont"""
+        return _controls.ListItemAttr_GetFont(*args, **kwargs)
+
+    def Destroy(*args, **kwargs):
+        """Destroy()"""
+        return _controls.ListItemAttr_Destroy(*args, **kwargs)
+
 
 class ListItemAttrPtr(ListItemAttr):
     def __init__(self, this):
@@ -1429,44 +2736,137 @@ _controls.ListItemAttr_swigregister(ListItemAttrPtr)
 #---------------------------------------------------------------------------
 
 class ListItem(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxListItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> ListItem"""
         newobj = _controls.new_ListItem(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_controls.delete_ListItem):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Clear(*args, **kwargs): return _controls.ListItem_Clear(*args, **kwargs)
-    def ClearAttributes(*args, **kwargs): return _controls.ListItem_ClearAttributes(*args, **kwargs)
-    def SetMask(*args, **kwargs): return _controls.ListItem_SetMask(*args, **kwargs)
-    def SetId(*args, **kwargs): return _controls.ListItem_SetId(*args, **kwargs)
-    def SetColumn(*args, **kwargs): return _controls.ListItem_SetColumn(*args, **kwargs)
-    def SetState(*args, **kwargs): return _controls.ListItem_SetState(*args, **kwargs)
-    def SetStateMask(*args, **kwargs): return _controls.ListItem_SetStateMask(*args, **kwargs)
-    def SetText(*args, **kwargs): return _controls.ListItem_SetText(*args, **kwargs)
-    def SetImage(*args, **kwargs): return _controls.ListItem_SetImage(*args, **kwargs)
-    def SetData(*args, **kwargs): return _controls.ListItem_SetData(*args, **kwargs)
-    def SetWidth(*args, **kwargs): return _controls.ListItem_SetWidth(*args, **kwargs)
-    def SetAlign(*args, **kwargs): return _controls.ListItem_SetAlign(*args, **kwargs)
-    def SetTextColour(*args, **kwargs): return _controls.ListItem_SetTextColour(*args, **kwargs)
-    def SetBackgroundColour(*args, **kwargs): return _controls.ListItem_SetBackgroundColour(*args, **kwargs)
-    def SetFont(*args, **kwargs): return _controls.ListItem_SetFont(*args, **kwargs)
-    def GetMask(*args, **kwargs): return _controls.ListItem_GetMask(*args, **kwargs)
-    def GetId(*args, **kwargs): return _controls.ListItem_GetId(*args, **kwargs)
-    def GetColumn(*args, **kwargs): return _controls.ListItem_GetColumn(*args, **kwargs)
-    def GetState(*args, **kwargs): return _controls.ListItem_GetState(*args, **kwargs)
-    def GetText(*args, **kwargs): return _controls.ListItem_GetText(*args, **kwargs)
-    def GetImage(*args, **kwargs): return _controls.ListItem_GetImage(*args, **kwargs)
-    def GetData(*args, **kwargs): return _controls.ListItem_GetData(*args, **kwargs)
-    def GetWidth(*args, **kwargs): return _controls.ListItem_GetWidth(*args, **kwargs)
-    def GetAlign(*args, **kwargs): return _controls.ListItem_GetAlign(*args, **kwargs)
-    def GetAttributes(*args, **kwargs): return _controls.ListItem_GetAttributes(*args, **kwargs)
-    def HasAttributes(*args, **kwargs): return _controls.ListItem_HasAttributes(*args, **kwargs)
-    def GetTextColour(*args, **kwargs): return _controls.ListItem_GetTextColour(*args, **kwargs)
-    def GetBackgroundColour(*args, **kwargs): return _controls.ListItem_GetBackgroundColour(*args, **kwargs)
-    def GetFont(*args, **kwargs): return _controls.ListItem_GetFont(*args, **kwargs)
+
+    def Clear(*args, **kwargs):
+        """Clear()"""
+        return _controls.ListItem_Clear(*args, **kwargs)
+
+    def ClearAttributes(*args, **kwargs):
+        """ClearAttributes()"""
+        return _controls.ListItem_ClearAttributes(*args, **kwargs)
+
+    def SetMask(*args, **kwargs):
+        """SetMask(long mask)"""
+        return _controls.ListItem_SetMask(*args, **kwargs)
+
+    def SetId(*args, **kwargs):
+        """SetId(long id)"""
+        return _controls.ListItem_SetId(*args, **kwargs)
+
+    def SetColumn(*args, **kwargs):
+        """SetColumn(int col)"""
+        return _controls.ListItem_SetColumn(*args, **kwargs)
+
+    def SetState(*args, **kwargs):
+        """SetState(long state)"""
+        return _controls.ListItem_SetState(*args, **kwargs)
+
+    def SetStateMask(*args, **kwargs):
+        """SetStateMask(long stateMask)"""
+        return _controls.ListItem_SetStateMask(*args, **kwargs)
+
+    def SetText(*args, **kwargs):
+        """SetText(wxString text)"""
+        return _controls.ListItem_SetText(*args, **kwargs)
+
+    def SetImage(*args, **kwargs):
+        """SetImage(int image)"""
+        return _controls.ListItem_SetImage(*args, **kwargs)
+
+    def SetData(*args, **kwargs):
+        """SetData(long data)"""
+        return _controls.ListItem_SetData(*args, **kwargs)
+
+    def SetWidth(*args, **kwargs):
+        """SetWidth(int width)"""
+        return _controls.ListItem_SetWidth(*args, **kwargs)
+
+    def SetAlign(*args, **kwargs):
+        """SetAlign(wxListColumnFormat align)"""
+        return _controls.ListItem_SetAlign(*args, **kwargs)
+
+    def SetTextColour(*args, **kwargs):
+        """SetTextColour(wxColour colText)"""
+        return _controls.ListItem_SetTextColour(*args, **kwargs)
+
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(wxColour colBack)"""
+        return _controls.ListItem_SetBackgroundColour(*args, **kwargs)
+
+    def SetFont(*args, **kwargs):
+        """SetFont(wxFont font)"""
+        return _controls.ListItem_SetFont(*args, **kwargs)
+
+    def GetMask(*args, **kwargs):
+        """GetMask() -> long"""
+        return _controls.ListItem_GetMask(*args, **kwargs)
+
+    def GetId(*args, **kwargs):
+        """GetId() -> long"""
+        return _controls.ListItem_GetId(*args, **kwargs)
+
+    def GetColumn(*args, **kwargs):
+        """GetColumn() -> int"""
+        return _controls.ListItem_GetColumn(*args, **kwargs)
+
+    def GetState(*args, **kwargs):
+        """GetState() -> long"""
+        return _controls.ListItem_GetState(*args, **kwargs)
+
+    def GetText(*args, **kwargs):
+        """GetText() -> wxString"""
+        return _controls.ListItem_GetText(*args, **kwargs)
+
+    def GetImage(*args, **kwargs):
+        """GetImage() -> int"""
+        return _controls.ListItem_GetImage(*args, **kwargs)
+
+    def GetData(*args, **kwargs):
+        """GetData() -> long"""
+        return _controls.ListItem_GetData(*args, **kwargs)
+
+    def GetWidth(*args, **kwargs):
+        """GetWidth() -> int"""
+        return _controls.ListItem_GetWidth(*args, **kwargs)
+
+    def GetAlign(*args, **kwargs):
+        """GetAlign() -> wxListColumnFormat"""
+        return _controls.ListItem_GetAlign(*args, **kwargs)
+
+    def GetAttributes(*args, **kwargs):
+        """GetAttributes() -> ListItemAttr"""
+        return _controls.ListItem_GetAttributes(*args, **kwargs)
+
+    def HasAttributes(*args, **kwargs):
+        """HasAttributes() -> bool"""
+        return _controls.ListItem_HasAttributes(*args, **kwargs)
+
+    def GetTextColour(*args, **kwargs):
+        """GetTextColour() -> wxColour"""
+        return _controls.ListItem_GetTextColour(*args, **kwargs)
+
+    def GetBackgroundColour(*args, **kwargs):
+        """GetBackgroundColour() -> wxColour"""
+        return _controls.ListItem_GetBackgroundColour(*args, **kwargs)
+
+    def GetFont(*args, **kwargs):
+        """GetFont() -> wxFont"""
+        return _controls.ListItem_GetFont(*args, **kwargs)
+
     m_mask = property(_controls.ListItem_m_mask_get, _controls.ListItem_m_mask_set)
     m_itemId = property(_controls.ListItem_m_itemId_get, _controls.ListItem_m_itemId_set)
     m_col = property(_controls.ListItem_m_col_get, _controls.ListItem_m_col_set)
@@ -1477,8 +2877,6 @@ class ListItem(core.Object):
     m_data = property(_controls.ListItem_m_data_get, _controls.ListItem_m_data_set)
     m_format = property(_controls.ListItem_m_format_get, _controls.ListItem_m_format_set)
     m_width = property(_controls.ListItem_m_width_get, _controls.ListItem_m_width_set)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxListItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class ListItemPtr(ListItem):
     def __init__(self, this):
@@ -1490,7 +2888,11 @@ _controls.ListItem_swigregister(ListItemPtr)
 #---------------------------------------------------------------------------
 
 class ListEvent(core.NotifyEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxListEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType commandType=wxEVT_NULL, int id=0) -> ListEvent"""
         newobj = _controls.new_ListEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
@@ -1501,24 +2903,64 @@ class ListEvent(core.NotifyEvent):
     m_col = property(_controls.ListEvent_m_col_get, _controls.ListEvent_m_col_set)
     m_pointDrag = property(_controls.ListEvent_m_pointDrag_get, _controls.ListEvent_m_pointDrag_set)
     m_item = property(_controls.ListEvent_m_item_get)
-    def GetKeyCode(*args, **kwargs): return _controls.ListEvent_GetKeyCode(*args, **kwargs)
+    def GetKeyCode(*args, **kwargs):
+        """GetKeyCode() -> int"""
+        return _controls.ListEvent_GetKeyCode(*args, **kwargs)
+
     GetCode = GetKeyCode 
-    def GetIndex(*args, **kwargs): return _controls.ListEvent_GetIndex(*args, **kwargs)
-    def GetColumn(*args, **kwargs): return _controls.ListEvent_GetColumn(*args, **kwargs)
-    def GetPoint(*args, **kwargs): return _controls.ListEvent_GetPoint(*args, **kwargs)
+    def GetIndex(*args, **kwargs):
+        """GetIndex() -> long"""
+        return _controls.ListEvent_GetIndex(*args, **kwargs)
+
+    def GetColumn(*args, **kwargs):
+        """GetColumn() -> int"""
+        return _controls.ListEvent_GetColumn(*args, **kwargs)
+
+    def GetPoint(*args, **kwargs):
+        """GetPoint() -> Point"""
+        return _controls.ListEvent_GetPoint(*args, **kwargs)
+
     GetPostiion = GetPoint 
-    def GetLabel(*args, **kwargs): return _controls.ListEvent_GetLabel(*args, **kwargs)
-    def GetText(*args, **kwargs): return _controls.ListEvent_GetText(*args, **kwargs)
-    def GetImage(*args, **kwargs): return _controls.ListEvent_GetImage(*args, **kwargs)
-    def GetData(*args, **kwargs): return _controls.ListEvent_GetData(*args, **kwargs)
-    def GetMask(*args, **kwargs): return _controls.ListEvent_GetMask(*args, **kwargs)
-    def GetItem(*args, **kwargs): return _controls.ListEvent_GetItem(*args, **kwargs)
-    def GetCacheFrom(*args, **kwargs): return _controls.ListEvent_GetCacheFrom(*args, **kwargs)
-    def GetCacheTo(*args, **kwargs): return _controls.ListEvent_GetCacheTo(*args, **kwargs)
-    def IsEditCancelled(*args, **kwargs): return _controls.ListEvent_IsEditCancelled(*args, **kwargs)
-    def SetEditCanceled(*args, **kwargs): return _controls.ListEvent_SetEditCanceled(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxListEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetLabel(*args, **kwargs):
+        """GetLabel() -> wxString"""
+        return _controls.ListEvent_GetLabel(*args, **kwargs)
+
+    def GetText(*args, **kwargs):
+        """GetText() -> wxString"""
+        return _controls.ListEvent_GetText(*args, **kwargs)
+
+    def GetImage(*args, **kwargs):
+        """GetImage() -> int"""
+        return _controls.ListEvent_GetImage(*args, **kwargs)
+
+    def GetData(*args, **kwargs):
+        """GetData() -> long"""
+        return _controls.ListEvent_GetData(*args, **kwargs)
+
+    def GetMask(*args, **kwargs):
+        """GetMask() -> long"""
+        return _controls.ListEvent_GetMask(*args, **kwargs)
+
+    def GetItem(*args, **kwargs):
+        """GetItem() -> ListItem"""
+        return _controls.ListEvent_GetItem(*args, **kwargs)
+
+    def GetCacheFrom(*args, **kwargs):
+        """GetCacheFrom() -> long"""
+        return _controls.ListEvent_GetCacheFrom(*args, **kwargs)
+
+    def GetCacheTo(*args, **kwargs):
+        """GetCacheTo() -> long"""
+        return _controls.ListEvent_GetCacheTo(*args, **kwargs)
+
+    def IsEditCancelled(*args, **kwargs):
+        """IsEditCancelled() -> bool"""
+        return _controls.ListEvent_IsEditCancelled(*args, **kwargs)
+
+    def SetEditCanceled(*args, **kwargs):
+        """SetEditCanceled(bool editCancelled)"""
+        return _controls.ListEvent_SetEditCanceled(*args, **kwargs)
+
 
 class ListEventPtr(ListEvent):
     def __init__(self, this):
@@ -1575,101 +3017,300 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
 #---------------------------------------------------------------------------
 
 class ListCtrl(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=LC_ICON, 
+    Validator validator=DefaultValidator, wxString name=wxPyListCtrlNameStr) -> ListCtrl"""
         newobj = _controls.new_ListCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self);self._setCallbackInfo(self, ListCtrl)
-    def Create(*args, **kwargs): return _controls.ListCtrl_Create(*args, **kwargs)
-    def _setCallbackInfo(*args, **kwargs): return _controls.ListCtrl__setCallbackInfo(*args, **kwargs)
-    def SetForegroundColour(*args, **kwargs): return _controls.ListCtrl_SetForegroundColour(*args, **kwargs)
-    def SetBackgroundColour(*args, **kwargs): return _controls.ListCtrl_SetBackgroundColour(*args, **kwargs)
-    def GetColumn(*args, **kwargs): 
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=LC_ICON, 
+    Validator validator=DefaultValidator, wxString name=wxPyListCtrlNameStr) -> bool"""
+        return _controls.ListCtrl_Create(*args, **kwargs)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _controls.ListCtrl__setCallbackInfo(*args, **kwargs)
+
+    def SetForegroundColour(*args, **kwargs):
+        """SetForegroundColour(wxColour col) -> bool"""
+        return _controls.ListCtrl_SetForegroundColour(*args, **kwargs)
+
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(wxColour col) -> bool"""
+        return _controls.ListCtrl_SetBackgroundColour(*args, **kwargs)
+
+    def GetColumn(*args, **kwargs):
+        """GetColumn(int col) -> ListItem"""
         val = _controls.ListCtrl_GetColumn(*args, **kwargs)
         if val is not None: val.thisown = 1
         return val
-    def SetColumn(*args, **kwargs): return _controls.ListCtrl_SetColumn(*args, **kwargs)
-    def GetColumnWidth(*args, **kwargs): return _controls.ListCtrl_GetColumnWidth(*args, **kwargs)
-    def SetColumnWidth(*args, **kwargs): return _controls.ListCtrl_SetColumnWidth(*args, **kwargs)
-    def GetCountPerPage(*args, **kwargs): return _controls.ListCtrl_GetCountPerPage(*args, **kwargs)
-    def GetViewRect(*args, **kwargs): return _controls.ListCtrl_GetViewRect(*args, **kwargs)
-    def GetItem(*args, **kwargs): 
+
+    def SetColumn(*args, **kwargs):
+        """SetColumn(int col, ListItem item) -> bool"""
+        return _controls.ListCtrl_SetColumn(*args, **kwargs)
+
+    def GetColumnWidth(*args, **kwargs):
+        """GetColumnWidth(int col) -> int"""
+        return _controls.ListCtrl_GetColumnWidth(*args, **kwargs)
+
+    def SetColumnWidth(*args, **kwargs):
+        """SetColumnWidth(int col, int width) -> bool"""
+        return _controls.ListCtrl_SetColumnWidth(*args, **kwargs)
+
+    def GetCountPerPage(*args, **kwargs):
+        """GetCountPerPage() -> int"""
+        return _controls.ListCtrl_GetCountPerPage(*args, **kwargs)
+
+    def GetViewRect(*args, **kwargs):
+        """GetViewRect() -> Rect"""
+        return _controls.ListCtrl_GetViewRect(*args, **kwargs)
+
+    def GetItem(*args, **kwargs):
+        """GetItem(long itemId, int col=0) -> ListItem"""
         val = _controls.ListCtrl_GetItem(*args, **kwargs)
         if val is not None: val.thisown = 1
         return val
-    def SetItem(*args, **kwargs): return _controls.ListCtrl_SetItem(*args, **kwargs)
-    def SetStringItem(*args, **kwargs): return _controls.ListCtrl_SetStringItem(*args, **kwargs)
-    def GetItemState(*args, **kwargs): return _controls.ListCtrl_GetItemState(*args, **kwargs)
-    def SetItemState(*args, **kwargs): return _controls.ListCtrl_SetItemState(*args, **kwargs)
-    def SetItemImage(*args, **kwargs): return _controls.ListCtrl_SetItemImage(*args, **kwargs)
-    def GetItemText(*args, **kwargs): return _controls.ListCtrl_GetItemText(*args, **kwargs)
-    def SetItemText(*args, **kwargs): return _controls.ListCtrl_SetItemText(*args, **kwargs)
-    def GetItemData(*args, **kwargs): return _controls.ListCtrl_GetItemData(*args, **kwargs)
-    def SetItemData(*args, **kwargs): return _controls.ListCtrl_SetItemData(*args, **kwargs)
-    def GetItemPosition(*args, **kwargs): return _controls.ListCtrl_GetItemPosition(*args, **kwargs)
-    def GetItemRect(*args, **kwargs): return _controls.ListCtrl_GetItemRect(*args, **kwargs)
-    def SetItemPosition(*args, **kwargs): return _controls.ListCtrl_SetItemPosition(*args, **kwargs)
-    def GetItemCount(*args, **kwargs): return _controls.ListCtrl_GetItemCount(*args, **kwargs)
-    def GetColumnCount(*args, **kwargs): return _controls.ListCtrl_GetColumnCount(*args, **kwargs)
-    def GetItemSpacing(*args, **kwargs): return _controls.ListCtrl_GetItemSpacing(*args, **kwargs)
-    def SetItemSpacing(*args, **kwargs): return _controls.ListCtrl_SetItemSpacing(*args, **kwargs)
-    def GetSelectedItemCount(*args, **kwargs): return _controls.ListCtrl_GetSelectedItemCount(*args, **kwargs)
-    def GetTextColour(*args, **kwargs): return _controls.ListCtrl_GetTextColour(*args, **kwargs)
-    def SetTextColour(*args, **kwargs): return _controls.ListCtrl_SetTextColour(*args, **kwargs)
-    def GetTopItem(*args, **kwargs): return _controls.ListCtrl_GetTopItem(*args, **kwargs)
-    def SetSingleStyle(*args, **kwargs): return _controls.ListCtrl_SetSingleStyle(*args, **kwargs)
-    def SetWindowStyleFlag(*args, **kwargs): return _controls.ListCtrl_SetWindowStyleFlag(*args, **kwargs)
-    def GetNextItem(*args, **kwargs): return _controls.ListCtrl_GetNextItem(*args, **kwargs)
-    def GetImageList(*args, **kwargs): return _controls.ListCtrl_GetImageList(*args, **kwargs)
-    def SetImageList(*args, **kwargs): return _controls.ListCtrl_SetImageList(*args, **kwargs)
-    def AssignImageList(*args, **kwargs): 
+
+    def SetItem(*args, **kwargs):
+        """SetItem(ListItem info) -> bool"""
+        return _controls.ListCtrl_SetItem(*args, **kwargs)
+
+    def SetStringItem(*args, **kwargs):
+        """SetStringItem(long index, int col, wxString label, int imageId=-1) -> long"""
+        return _controls.ListCtrl_SetStringItem(*args, **kwargs)
+
+    def GetItemState(*args, **kwargs):
+        """GetItemState(long item, long stateMask) -> int"""
+        return _controls.ListCtrl_GetItemState(*args, **kwargs)
+
+    def SetItemState(*args, **kwargs):
+        """SetItemState(long item, long state, long stateMask) -> bool"""
+        return _controls.ListCtrl_SetItemState(*args, **kwargs)
+
+    def SetItemImage(*args, **kwargs):
+        """SetItemImage(long item, int image, int selImage) -> bool"""
+        return _controls.ListCtrl_SetItemImage(*args, **kwargs)
+
+    def GetItemText(*args, **kwargs):
+        """GetItemText(long item) -> wxString"""
+        return _controls.ListCtrl_GetItemText(*args, **kwargs)
+
+    def SetItemText(*args, **kwargs):
+        """SetItemText(long item, wxString str)"""
+        return _controls.ListCtrl_SetItemText(*args, **kwargs)
+
+    def GetItemData(*args, **kwargs):
+        """GetItemData(long item) -> long"""
+        return _controls.ListCtrl_GetItemData(*args, **kwargs)
+
+    def SetItemData(*args, **kwargs):
+        """SetItemData(long item, long data) -> bool"""
+        return _controls.ListCtrl_SetItemData(*args, **kwargs)
+
+    def GetItemPosition(*args, **kwargs):
+        """GetItemPosition(long item) -> Point"""
+        return _controls.ListCtrl_GetItemPosition(*args, **kwargs)
+
+    def GetItemRect(*args, **kwargs):
+        """GetItemRect(long item, int code=LIST_RECT_BOUNDS) -> Rect"""
+        return _controls.ListCtrl_GetItemRect(*args, **kwargs)
+
+    def SetItemPosition(*args, **kwargs):
+        """SetItemPosition(long item, Point pos) -> bool"""
+        return _controls.ListCtrl_SetItemPosition(*args, **kwargs)
+
+    def GetItemCount(*args, **kwargs):
+        """GetItemCount() -> int"""
+        return _controls.ListCtrl_GetItemCount(*args, **kwargs)
+
+    def GetColumnCount(*args, **kwargs):
+        """GetColumnCount() -> int"""
+        return _controls.ListCtrl_GetColumnCount(*args, **kwargs)
+
+    def GetItemSpacing(*args, **kwargs):
+        """GetItemSpacing() -> Size"""
+        return _controls.ListCtrl_GetItemSpacing(*args, **kwargs)
+
+    def SetItemSpacing(*args, **kwargs):
+        """SetItemSpacing(int spacing, bool isSmall=False)"""
+        return _controls.ListCtrl_SetItemSpacing(*args, **kwargs)
+
+    def GetSelectedItemCount(*args, **kwargs):
+        """GetSelectedItemCount() -> int"""
+        return _controls.ListCtrl_GetSelectedItemCount(*args, **kwargs)
+
+    def GetTextColour(*args, **kwargs):
+        """GetTextColour() -> wxColour"""
+        return _controls.ListCtrl_GetTextColour(*args, **kwargs)
+
+    def SetTextColour(*args, **kwargs):
+        """SetTextColour(wxColour col)"""
+        return _controls.ListCtrl_SetTextColour(*args, **kwargs)
+
+    def GetTopItem(*args, **kwargs):
+        """GetTopItem() -> long"""
+        return _controls.ListCtrl_GetTopItem(*args, **kwargs)
+
+    def SetSingleStyle(*args, **kwargs):
+        """SetSingleStyle(long style, bool add=True)"""
+        return _controls.ListCtrl_SetSingleStyle(*args, **kwargs)
+
+    def SetWindowStyleFlag(*args, **kwargs):
+        """SetWindowStyleFlag(long style)"""
+        return _controls.ListCtrl_SetWindowStyleFlag(*args, **kwargs)
+
+    def GetNextItem(*args, **kwargs):
+        """GetNextItem(long item, int geometry=LIST_NEXT_ALL, int state=LIST_STATE_DONTCARE) -> long"""
+        return _controls.ListCtrl_GetNextItem(*args, **kwargs)
+
+    def GetImageList(*args, **kwargs):
+        """GetImageList(int which) -> wxImageList"""
+        return _controls.ListCtrl_GetImageList(*args, **kwargs)
+
+    def SetImageList(*args, **kwargs):
+        """SetImageList(wxImageList imageList, int which)"""
+        return _controls.ListCtrl_SetImageList(*args, **kwargs)
+
+    def AssignImageList(*args, **kwargs):
+        """AssignImageList(wxImageList imageList, int which)"""
         val = _controls.ListCtrl_AssignImageList(*args, **kwargs)
         args[1].thisown = 0
         return val
-    def IsVirtual(*args, **kwargs): return _controls.ListCtrl_IsVirtual(*args, **kwargs)
-    def RefreshItem(*args, **kwargs): return _controls.ListCtrl_RefreshItem(*args, **kwargs)
-    def RefreshItems(*args, **kwargs): return _controls.ListCtrl_RefreshItems(*args, **kwargs)
-    def Arrange(*args, **kwargs): return _controls.ListCtrl_Arrange(*args, **kwargs)
-    def DeleteItem(*args, **kwargs): return _controls.ListCtrl_DeleteItem(*args, **kwargs)
-    def DeleteAllItems(*args, **kwargs): return _controls.ListCtrl_DeleteAllItems(*args, **kwargs)
-    def DeleteColumn(*args, **kwargs): return _controls.ListCtrl_DeleteColumn(*args, **kwargs)
-    def DeleteAllColumns(*args, **kwargs): return _controls.ListCtrl_DeleteAllColumns(*args, **kwargs)
-    def ClearAll(*args, **kwargs): return _controls.ListCtrl_ClearAll(*args, **kwargs)
-    def EditLabel(*args, **kwargs): return _controls.ListCtrl_EditLabel(*args, **kwargs)
-    def EnsureVisible(*args, **kwargs): return _controls.ListCtrl_EnsureVisible(*args, **kwargs)
-    def FindItem(*args, **kwargs): return _controls.ListCtrl_FindItem(*args, **kwargs)
-    def FindItemData(*args, **kwargs): return _controls.ListCtrl_FindItemData(*args, **kwargs)
-    def FindItemAtPos(*args, **kwargs): return _controls.ListCtrl_FindItemAtPos(*args, **kwargs)
-    def HitTest(*args, **kwargs): return _controls.ListCtrl_HitTest(*args, **kwargs)
-    def InsertItem(*args, **kwargs): return _controls.ListCtrl_InsertItem(*args, **kwargs)
-    def InsertStringItem(*args, **kwargs): return _controls.ListCtrl_InsertStringItem(*args, **kwargs)
-    def InsertImageItem(*args, **kwargs): return _controls.ListCtrl_InsertImageItem(*args, **kwargs)
-    def InsertImageStringItem(*args, **kwargs): return _controls.ListCtrl_InsertImageStringItem(*args, **kwargs)
-    def InsertColumnInfo(*args, **kwargs): return _controls.ListCtrl_InsertColumnInfo(*args, **kwargs)
-    def InsertColumn(*args, **kwargs): return _controls.ListCtrl_InsertColumn(*args, **kwargs)
-    def SetItemCount(*args, **kwargs): return _controls.ListCtrl_SetItemCount(*args, **kwargs)
-    def ScrollList(*args, **kwargs): return _controls.ListCtrl_ScrollList(*args, **kwargs)
-    def SetItemTextColour(*args, **kwargs): return _controls.ListCtrl_SetItemTextColour(*args, **kwargs)
-    def GetItemTextColour(*args, **kwargs): return _controls.ListCtrl_GetItemTextColour(*args, **kwargs)
-    def SetItemBackgroundColour(*args, **kwargs): return _controls.ListCtrl_SetItemBackgroundColour(*args, **kwargs)
-    def GetItemBackgroundColour(*args, **kwargs): return _controls.ListCtrl_GetItemBackgroundColour(*args, **kwargs)
+
+    def IsVirtual(*args, **kwargs):
+        """IsVirtual() -> bool"""
+        return _controls.ListCtrl_IsVirtual(*args, **kwargs)
+
+    def RefreshItem(*args, **kwargs):
+        """RefreshItem(long item)"""
+        return _controls.ListCtrl_RefreshItem(*args, **kwargs)
+
+    def RefreshItems(*args, **kwargs):
+        """RefreshItems(long itemFrom, long itemTo)"""
+        return _controls.ListCtrl_RefreshItems(*args, **kwargs)
+
+    def Arrange(*args, **kwargs):
+        """Arrange(int flag=LIST_ALIGN_DEFAULT) -> bool"""
+        return _controls.ListCtrl_Arrange(*args, **kwargs)
+
+    def DeleteItem(*args, **kwargs):
+        """DeleteItem(long item) -> bool"""
+        return _controls.ListCtrl_DeleteItem(*args, **kwargs)
+
+    def DeleteAllItems(*args, **kwargs):
+        """DeleteAllItems() -> bool"""
+        return _controls.ListCtrl_DeleteAllItems(*args, **kwargs)
+
+    def DeleteColumn(*args, **kwargs):
+        """DeleteColumn(int col) -> bool"""
+        return _controls.ListCtrl_DeleteColumn(*args, **kwargs)
+
+    def DeleteAllColumns(*args, **kwargs):
+        """DeleteAllColumns() -> bool"""
+        return _controls.ListCtrl_DeleteAllColumns(*args, **kwargs)
+
+    def ClearAll(*args, **kwargs):
+        """ClearAll()"""
+        return _controls.ListCtrl_ClearAll(*args, **kwargs)
+
+    def EditLabel(*args, **kwargs):
+        """EditLabel(long item)"""
+        return _controls.ListCtrl_EditLabel(*args, **kwargs)
+
+    def EnsureVisible(*args, **kwargs):
+        """EnsureVisible(long item) -> bool"""
+        return _controls.ListCtrl_EnsureVisible(*args, **kwargs)
+
+    def FindItem(*args, **kwargs):
+        """FindItem(long start, wxString str, bool partial=False) -> long"""
+        return _controls.ListCtrl_FindItem(*args, **kwargs)
+
+    def FindItemData(*args, **kwargs):
+        """FindItemData(long start, long data) -> long"""
+        return _controls.ListCtrl_FindItemData(*args, **kwargs)
+
+    def FindItemAtPos(*args, **kwargs):
+        """FindItemAtPos(long start, Point pt, int direction) -> long"""
+        return _controls.ListCtrl_FindItemAtPos(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """HitTest(Point point, int OUTPUT) -> long"""
+        return _controls.ListCtrl_HitTest(*args, **kwargs)
+
+    def InsertItem(*args, **kwargs):
+        """InsertItem(ListItem info) -> long"""
+        return _controls.ListCtrl_InsertItem(*args, **kwargs)
+
+    def InsertStringItem(*args, **kwargs):
+        """InsertStringItem(long index, wxString label) -> long"""
+        return _controls.ListCtrl_InsertStringItem(*args, **kwargs)
+
+    def InsertImageItem(*args, **kwargs):
+        """InsertImageItem(long index, int imageIndex) -> long"""
+        return _controls.ListCtrl_InsertImageItem(*args, **kwargs)
+
+    def InsertImageStringItem(*args, **kwargs):
+        """InsertImageStringItem(long index, wxString label, int imageIndex) -> long"""
+        return _controls.ListCtrl_InsertImageStringItem(*args, **kwargs)
+
+    def InsertColumnInfo(*args, **kwargs):
+        """InsertColumnInfo(long col, ListItem info) -> long"""
+        return _controls.ListCtrl_InsertColumnInfo(*args, **kwargs)
+
+    def InsertColumn(*args, **kwargs):
+        """InsertColumn(long col, wxString heading, int format=LIST_FORMAT_LEFT, 
+    int width=-1) -> long"""
+        return _controls.ListCtrl_InsertColumn(*args, **kwargs)
+
+    def SetItemCount(*args, **kwargs):
+        """SetItemCount(long count)"""
+        return _controls.ListCtrl_SetItemCount(*args, **kwargs)
+
+    def ScrollList(*args, **kwargs):
+        """ScrollList(int dx, int dy) -> bool"""
+        return _controls.ListCtrl_ScrollList(*args, **kwargs)
+
+    def SetItemTextColour(*args, **kwargs):
+        """SetItemTextColour(long item, wxColour col)"""
+        return _controls.ListCtrl_SetItemTextColour(*args, **kwargs)
+
+    def GetItemTextColour(*args, **kwargs):
+        """GetItemTextColour(long item) -> wxColour"""
+        return _controls.ListCtrl_GetItemTextColour(*args, **kwargs)
+
+    def SetItemBackgroundColour(*args, **kwargs):
+        """SetItemBackgroundColour(long item, wxColour col)"""
+        return _controls.ListCtrl_SetItemBackgroundColour(*args, **kwargs)
+
+    def GetItemBackgroundColour(*args, **kwargs):
+        """GetItemBackgroundColour(long item) -> wxColour"""
+        return _controls.ListCtrl_GetItemBackgroundColour(*args, **kwargs)
+
     #
     # Some helpers...
     def Select(self, idx, on=1):
         '''[de]select an item'''
-        if on: state = wxLIST_STATE_SELECTED
+        if on: state = wx.LIST_STATE_SELECTED
         else: state = 0
-        self.SetItemState(idx, state, wxLIST_STATE_SELECTED)
+        self.SetItemState(idx, state, wx.LIST_STATE_SELECTED)
 
     def Focus(self, idx):
         '''Focus and show the given item'''
-        self.SetItemState(idx, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED)
+        self.SetItemState(idx, wx.LIST_STATE_FOCUSED, wx.LIST_STATE_FOCUSED)
         self.EnsureVisible(idx)
 
     def GetFocusedItem(self):
         '''get the currently focused item or -1 if none'''
-        return self.GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED)
+        return self.GetNextItem(-1, wx.LIST_NEXT_ALL, wx.LIST_STATE_FOCUSED)
 
     def GetFirstSelected(self, *args):
         '''return first selected item, or -1 when none'''
@@ -1677,22 +3318,22 @@ class ListCtrl(core.Control):
 
     def GetNextSelected(self, item):
         '''return subsequent selected items, or -1 when no more'''
-        return self.GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)
+        return self.GetNextItem(item, wx.LIST_NEXT_ALL, wx.LIST_STATE_SELECTED)
 
     def IsSelected(self, idx):
-        '''return TRUE if the item is selected'''
-        return self.GetItemState(idx, wxLIST_STATE_SELECTED) != 0
+        '''return True if the item is selected'''
+        return self.GetItemState(idx, wx.LIST_STATE_SELECTED) != 0
 
     def SetColumnImage(self, col, image):
         item = self.GetColumn(col)
-        
-        item.SetMask( wxLIST_MASK_STATE |
-                      wxLIST_MASK_TEXT  |
-                      wxLIST_MASK_IMAGE |
-                      wxLIST_MASK_DATA  |
-                      wxLIST_SET_ITEM   |
-                      wxLIST_MASK_WIDTH |
-                      wxLIST_MASK_FORMAT )
+        # preserve all other attributes too
+        item.SetMask( wx.LIST_MASK_STATE |
+                      wx.LIST_MASK_TEXT  |
+                      wx.LIST_MASK_IMAGE |
+                      wx.LIST_MASK_DATA  |
+                      wx.LIST_SET_ITEM   |
+                      wx.LIST_MASK_WIDTH |
+                      wx.LIST_MASK_FORMAT )
         item.SetImage(image)
         self.SetColumn(col, item)
 
@@ -1703,7 +3344,7 @@ class ListCtrl(core.Control):
         '''Append an item to the list control.  The entry parameter should be a
            sequence with an item for each column'''
         if len(entry):
-            if wx.wxUSE_UNICODE:
+            if wx.USE_UNICODE:
                 cvtfunc = unicode
             else:
                 cvtfunc = str
@@ -1713,10 +3354,14 @@ class ListCtrl(core.Control):
                 self.SetStringItem(pos, i, cvtfunc(entry[i]))
             return pos
 
-    def SortItems(*args, **kwargs): return _controls.ListCtrl_SortItems(*args, **kwargs)
-    def GetMainWindow(*args, **kwargs): return _controls.ListCtrl_GetMainWindow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SortItems(*args, **kwargs):
+        """SortItems(PyObject func) -> bool"""
+        return _controls.ListCtrl_SortItems(*args, **kwargs)
+
+    def GetMainWindow(*args, **kwargs):
+        """GetMainWindow() -> Window"""
+        return _controls.ListCtrl_GetMainWindow(*args, **kwargs)
+
 
 class ListCtrlPtr(ListCtrl):
     def __init__(self, this):
@@ -1726,6 +3371,7 @@ class ListCtrlPtr(ListCtrl):
 _controls.ListCtrl_swigregister(ListCtrlPtr)
 
 def PreListCtrl(*args, **kwargs):
+    """PreListCtrl() -> ListCtrl"""
     val = _controls.new_PreListCtrl(*args, **kwargs)
     val.thisown = 1
     return val
@@ -1733,23 +3379,57 @@ def PreListCtrl(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class ListView(ListCtrl):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxListView instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=LC_REPORT, 
+    Validator validator=DefaultValidator, wxString name=wxPyListCtrlNameStr) -> ListView"""
         newobj = _controls.new_ListView(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.ListView_Create(*args, **kwargs)
-    def Select(*args, **kwargs): return _controls.ListView_Select(*args, **kwargs)
-    def Focus(*args, **kwargs): return _controls.ListView_Focus(*args, **kwargs)
-    def GetFocusedItem(*args, **kwargs): return _controls.ListView_GetFocusedItem(*args, **kwargs)
-    def GetNextSelected(*args, **kwargs): return _controls.ListView_GetNextSelected(*args, **kwargs)
-    def GetFirstSelected(*args, **kwargs): return _controls.ListView_GetFirstSelected(*args, **kwargs)
-    def IsSelected(*args, **kwargs): return _controls.ListView_IsSelected(*args, **kwargs)
-    def SetColumnImage(*args, **kwargs): return _controls.ListView_SetColumnImage(*args, **kwargs)
-    def ClearColumnImage(*args, **kwargs): return _controls.ListView_ClearColumnImage(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxListView instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=LC_REPORT, 
+    Validator validator=DefaultValidator, wxString name=wxPyListCtrlNameStr) -> bool"""
+        return _controls.ListView_Create(*args, **kwargs)
+
+    def Select(*args, **kwargs):
+        """Select(long n, bool on=True)"""
+        return _controls.ListView_Select(*args, **kwargs)
+
+    def Focus(*args, **kwargs):
+        """Focus(long index)"""
+        return _controls.ListView_Focus(*args, **kwargs)
+
+    def GetFocusedItem(*args, **kwargs):
+        """GetFocusedItem() -> long"""
+        return _controls.ListView_GetFocusedItem(*args, **kwargs)
+
+    def GetNextSelected(*args, **kwargs):
+        """GetNextSelected(long item) -> long"""
+        return _controls.ListView_GetNextSelected(*args, **kwargs)
+
+    def GetFirstSelected(*args, **kwargs):
+        """GetFirstSelected() -> long"""
+        return _controls.ListView_GetFirstSelected(*args, **kwargs)
+
+    def IsSelected(*args, **kwargs):
+        """IsSelected(long index) -> bool"""
+        return _controls.ListView_IsSelected(*args, **kwargs)
+
+    def SetColumnImage(*args, **kwargs):
+        """SetColumnImage(int col, int image)"""
+        return _controls.ListView_SetColumnImage(*args, **kwargs)
+
+    def ClearColumnImage(*args, **kwargs):
+        """ClearColumnImage(int col)"""
+        return _controls.ListView_ClearColumnImage(*args, **kwargs)
+
 
 class ListViewPtr(ListView):
     def __init__(self, this):
@@ -1759,6 +3439,7 @@ class ListViewPtr(ListView):
 _controls.ListView_swigregister(ListViewPtr)
 
 def PreListView(*args, **kwargs):
+    """PreListView() -> ListView"""
     val = _controls.new_PreListView(*args, **kwargs)
     val.thisown = 1
     return val
@@ -1803,23 +3484,36 @@ TREE_HITTEST_ONITEM = _controls.TREE_HITTEST_ONITEM
 #---------------------------------------------------------------------------
 
 class TreeItemId(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTreeItemId instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> TreeItemId"""
         newobj = _controls.new_TreeItemId(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_controls.delete_TreeItemId):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def IsOk(*args, **kwargs): return _controls.TreeItemId_IsOk(*args, **kwargs)
-    def __eq__(*args, **kwargs): return _controls.TreeItemId___eq__(*args, **kwargs)
-    def __ne__(*args, **kwargs): return _controls.TreeItemId___ne__(*args, **kwargs)
+
+    def IsOk(*args, **kwargs):
+        """IsOk() -> bool"""
+        return _controls.TreeItemId_IsOk(*args, **kwargs)
+
+    def __eq__(*args, **kwargs):
+        """__eq__(TreeItemId other) -> bool"""
+        return _controls.TreeItemId___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(TreeItemId other) -> bool"""
+        return _controls.TreeItemId___ne__(*args, **kwargs)
+
     m_pItem = property(_controls.TreeItemId_m_pItem_get, _controls.TreeItemId_m_pItem_set)
     Ok = IsOk
     def __nonzero__(self): return self.IsOk() 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTreeItemId instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class TreeItemIdPtr(TreeItemId):
     def __init__(self, this):
@@ -1829,18 +3523,35 @@ class TreeItemIdPtr(TreeItemId):
 _controls.TreeItemId_swigregister(TreeItemIdPtr)
 
 class TreeItemData(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyTreeItemData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(PyObject obj=None) -> TreeItemData"""
         newobj = _controls.new_TreeItemData(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetData(*args, **kwargs): return _controls.TreeItemData_GetData(*args, **kwargs)
-    def SetData(*args, **kwargs): return _controls.TreeItemData_SetData(*args, **kwargs)
-    def GetId(*args, **kwargs): return _controls.TreeItemData_GetId(*args, **kwargs)
-    def SetId(*args, **kwargs): return _controls.TreeItemData_SetId(*args, **kwargs)
-    def Destroy(*args, **kwargs): return _controls.TreeItemData_Destroy(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTreeItemData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetData(*args, **kwargs):
+        """GetData() -> PyObject"""
+        return _controls.TreeItemData_GetData(*args, **kwargs)
+
+    def SetData(*args, **kwargs):
+        """SetData(PyObject obj)"""
+        return _controls.TreeItemData_SetData(*args, **kwargs)
+
+    def GetId(*args, **kwargs):
+        """GetId() -> TreeItemId"""
+        return _controls.TreeItemData_GetId(*args, **kwargs)
+
+    def SetId(*args, **kwargs):
+        """SetId(TreeItemId id)"""
+        return _controls.TreeItemData_SetId(*args, **kwargs)
+
+    def Destroy(*args, **kwargs):
+        """Destroy()"""
+        return _controls.TreeItemData_Destroy(*args, **kwargs)
+
 
 class TreeItemDataPtr(TreeItemData):
     def __init__(self, this):
@@ -1892,26 +3603,67 @@ EVT_TREE_STATE_IMAGE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_STATE_IMAGE_CLI
 
 
 class TreeEvent(core.NotifyEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTreeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType commandType=wxEVT_NULL, int id=0) -> TreeEvent"""
         newobj = _controls.new_TreeEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetItem(*args, **kwargs): return _controls.TreeEvent_GetItem(*args, **kwargs)
-    def SetItem(*args, **kwargs): return _controls.TreeEvent_SetItem(*args, **kwargs)
-    def GetOldItem(*args, **kwargs): return _controls.TreeEvent_GetOldItem(*args, **kwargs)
-    def SetOldItem(*args, **kwargs): return _controls.TreeEvent_SetOldItem(*args, **kwargs)
-    def GetPoint(*args, **kwargs): return _controls.TreeEvent_GetPoint(*args, **kwargs)
-    def SetPoint(*args, **kwargs): return _controls.TreeEvent_SetPoint(*args, **kwargs)
-    def GetKeyEvent(*args, **kwargs): return _controls.TreeEvent_GetKeyEvent(*args, **kwargs)
-    def GetKeyCode(*args, **kwargs): return _controls.TreeEvent_GetKeyCode(*args, **kwargs)
-    def SetKeyEvent(*args, **kwargs): return _controls.TreeEvent_SetKeyEvent(*args, **kwargs)
-    def GetLabel(*args, **kwargs): return _controls.TreeEvent_GetLabel(*args, **kwargs)
-    def SetLabel(*args, **kwargs): return _controls.TreeEvent_SetLabel(*args, **kwargs)
-    def IsEditCancelled(*args, **kwargs): return _controls.TreeEvent_IsEditCancelled(*args, **kwargs)
-    def SetEditCanceled(*args, **kwargs): return _controls.TreeEvent_SetEditCanceled(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTreeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetItem(*args, **kwargs):
+        """GetItem() -> TreeItemId"""
+        return _controls.TreeEvent_GetItem(*args, **kwargs)
+
+    def SetItem(*args, **kwargs):
+        """SetItem(TreeItemId item)"""
+        return _controls.TreeEvent_SetItem(*args, **kwargs)
+
+    def GetOldItem(*args, **kwargs):
+        """GetOldItem() -> TreeItemId"""
+        return _controls.TreeEvent_GetOldItem(*args, **kwargs)
+
+    def SetOldItem(*args, **kwargs):
+        """SetOldItem(TreeItemId item)"""
+        return _controls.TreeEvent_SetOldItem(*args, **kwargs)
+
+    def GetPoint(*args, **kwargs):
+        """GetPoint() -> Point"""
+        return _controls.TreeEvent_GetPoint(*args, **kwargs)
+
+    def SetPoint(*args, **kwargs):
+        """SetPoint(Point pt)"""
+        return _controls.TreeEvent_SetPoint(*args, **kwargs)
+
+    def GetKeyEvent(*args, **kwargs):
+        """GetKeyEvent() -> KeyEvent"""
+        return _controls.TreeEvent_GetKeyEvent(*args, **kwargs)
+
+    def GetKeyCode(*args, **kwargs):
+        """GetKeyCode() -> int"""
+        return _controls.TreeEvent_GetKeyCode(*args, **kwargs)
+
+    def SetKeyEvent(*args, **kwargs):
+        """SetKeyEvent(KeyEvent evt)"""
+        return _controls.TreeEvent_SetKeyEvent(*args, **kwargs)
+
+    def GetLabel(*args, **kwargs):
+        """GetLabel() -> wxString"""
+        return _controls.TreeEvent_GetLabel(*args, **kwargs)
+
+    def SetLabel(*args, **kwargs):
+        """SetLabel(wxString label)"""
+        return _controls.TreeEvent_SetLabel(*args, **kwargs)
+
+    def IsEditCancelled(*args, **kwargs):
+        """IsEditCancelled() -> bool"""
+        return _controls.TreeEvent_IsEditCancelled(*args, **kwargs)
+
+    def SetEditCanceled(*args, **kwargs):
+        """SetEditCanceled(bool editCancelled)"""
+        return _controls.TreeEvent_SetEditCanceled(*args, **kwargs)
+
 
 class TreeEventPtr(TreeEvent):
     def __init__(self, this):
@@ -1923,91 +3675,310 @@ _controls.TreeEvent_swigregister(TreeEventPtr)
 #---------------------------------------------------------------------------
 
 class TreeCtrl(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyTreeCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPy_TreeCtrlNameStr) -> TreeCtrl"""
         newobj = _controls.new_TreeCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self);self._setCallbackInfo(self, TreeCtrl)
-    def Create(*args, **kwargs): return _controls.TreeCtrl_Create(*args, **kwargs)
-    def _setCallbackInfo(*args, **kwargs): return _controls.TreeCtrl__setCallbackInfo(*args, **kwargs)
-    def GetCount(*args, **kwargs): return _controls.TreeCtrl_GetCount(*args, **kwargs)
-    def GetIndent(*args, **kwargs): return _controls.TreeCtrl_GetIndent(*args, **kwargs)
-    def SetIndent(*args, **kwargs): return _controls.TreeCtrl_SetIndent(*args, **kwargs)
-    def GetSpacing(*args, **kwargs): return _controls.TreeCtrl_GetSpacing(*args, **kwargs)
-    def SetSpacing(*args, **kwargs): return _controls.TreeCtrl_SetSpacing(*args, **kwargs)
-    def GetImageList(*args, **kwargs): return _controls.TreeCtrl_GetImageList(*args, **kwargs)
-    def GetStateImageList(*args, **kwargs): return _controls.TreeCtrl_GetStateImageList(*args, **kwargs)
-    def SetImageList(*args, **kwargs): return _controls.TreeCtrl_SetImageList(*args, **kwargs)
-    def SetStateImageList(*args, **kwargs): return _controls.TreeCtrl_SetStateImageList(*args, **kwargs)
-    def AssignImageList(*args, **kwargs): 
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
+    Validator validator=DefaultValidator, 
+    wxString name=wxPy_TreeCtrlNameStr) -> bool"""
+        return _controls.TreeCtrl_Create(*args, **kwargs)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _controls.TreeCtrl__setCallbackInfo(*args, **kwargs)
+
+    def GetCount(*args, **kwargs):
+        """GetCount() -> size_t"""
+        return _controls.TreeCtrl_GetCount(*args, **kwargs)
+
+    def GetIndent(*args, **kwargs):
+        """GetIndent() -> unsigned int"""
+        return _controls.TreeCtrl_GetIndent(*args, **kwargs)
+
+    def SetIndent(*args, **kwargs):
+        """SetIndent(unsigned int indent)"""
+        return _controls.TreeCtrl_SetIndent(*args, **kwargs)
+
+    def GetSpacing(*args, **kwargs):
+        """GetSpacing() -> unsigned int"""
+        return _controls.TreeCtrl_GetSpacing(*args, **kwargs)
+
+    def SetSpacing(*args, **kwargs):
+        """SetSpacing(unsigned int spacing)"""
+        return _controls.TreeCtrl_SetSpacing(*args, **kwargs)
+
+    def GetImageList(*args, **kwargs):
+        """GetImageList() -> wxImageList"""
+        return _controls.TreeCtrl_GetImageList(*args, **kwargs)
+
+    def GetStateImageList(*args, **kwargs):
+        """GetStateImageList() -> wxImageList"""
+        return _controls.TreeCtrl_GetStateImageList(*args, **kwargs)
+
+    def SetImageList(*args, **kwargs):
+        """SetImageList(wxImageList imageList)"""
+        return _controls.TreeCtrl_SetImageList(*args, **kwargs)
+
+    def SetStateImageList(*args, **kwargs):
+        """SetStateImageList(wxImageList imageList)"""
+        return _controls.TreeCtrl_SetStateImageList(*args, **kwargs)
+
+    def AssignImageList(*args, **kwargs):
+        """AssignImageList(wxImageList imageList)"""
         val = _controls.TreeCtrl_AssignImageList(*args, **kwargs)
         args[1].thisown = 0
         return val
-    def AssignStateImageList(*args, **kwargs): 
+
+    def AssignStateImageList(*args, **kwargs):
+        """AssignStateImageList(wxImageList imageList)"""
         val = _controls.TreeCtrl_AssignStateImageList(*args, **kwargs)
         args[1].thisown = 0
         return val
-    def GetItemText(*args, **kwargs): return _controls.TreeCtrl_GetItemText(*args, **kwargs)
-    def GetItemImage(*args, **kwargs): return _controls.TreeCtrl_GetItemImage(*args, **kwargs)
-    def GetItemData(*args, **kwargs): return _controls.TreeCtrl_GetItemData(*args, **kwargs)
-    def GetItemPyData(*args, **kwargs): return _controls.TreeCtrl_GetItemPyData(*args, **kwargs)
+
+    def GetItemText(*args, **kwargs):
+        """GetItemText(TreeItemId item) -> wxString"""
+        return _controls.TreeCtrl_GetItemText(*args, **kwargs)
+
+    def GetItemImage(*args, **kwargs):
+        """GetItemImage(TreeItemId item, wxTreeItemIcon which=TreeItemIcon_Normal) -> int"""
+        return _controls.TreeCtrl_GetItemImage(*args, **kwargs)
+
+    def GetItemData(*args, **kwargs):
+        """GetItemData(TreeItemId item) -> TreeItemData"""
+        return _controls.TreeCtrl_GetItemData(*args, **kwargs)
+
+    def GetItemPyData(*args, **kwargs):
+        """GetItemPyData(TreeItemId item) -> PyObject"""
+        return _controls.TreeCtrl_GetItemPyData(*args, **kwargs)
+
     GetPyData = GetItemPyData 
-    def GetItemTextColour(*args, **kwargs): return _controls.TreeCtrl_GetItemTextColour(*args, **kwargs)
-    def GetItemBackgroundColour(*args, **kwargs): return _controls.TreeCtrl_GetItemBackgroundColour(*args, **kwargs)
-    def GetItemFont(*args, **kwargs): return _controls.TreeCtrl_GetItemFont(*args, **kwargs)
-    def SetItemText(*args, **kwargs): return _controls.TreeCtrl_SetItemText(*args, **kwargs)
-    def SetItemImage(*args, **kwargs): return _controls.TreeCtrl_SetItemImage(*args, **kwargs)
-    def SetItemData(*args, **kwargs): return _controls.TreeCtrl_SetItemData(*args, **kwargs)
-    def SetItemPyData(*args, **kwargs): return _controls.TreeCtrl_SetItemPyData(*args, **kwargs)
+    def GetItemTextColour(*args, **kwargs):
+        """GetItemTextColour(TreeItemId item) -> wxColour"""
+        return _controls.TreeCtrl_GetItemTextColour(*args, **kwargs)
+
+    def GetItemBackgroundColour(*args, **kwargs):
+        """GetItemBackgroundColour(TreeItemId item) -> wxColour"""
+        return _controls.TreeCtrl_GetItemBackgroundColour(*args, **kwargs)
+
+    def GetItemFont(*args, **kwargs):
+        """GetItemFont(TreeItemId item) -> wxFont"""
+        return _controls.TreeCtrl_GetItemFont(*args, **kwargs)
+
+    def SetItemText(*args, **kwargs):
+        """SetItemText(TreeItemId item, wxString text)"""
+        return _controls.TreeCtrl_SetItemText(*args, **kwargs)
+
+    def SetItemImage(*args, **kwargs):
+        """SetItemImage(TreeItemId item, int image, wxTreeItemIcon which=TreeItemIcon_Normal)"""
+        return _controls.TreeCtrl_SetItemImage(*args, **kwargs)
+
+    def SetItemData(*args, **kwargs):
+        """SetItemData(TreeItemId item, TreeItemData data)"""
+        return _controls.TreeCtrl_SetItemData(*args, **kwargs)
+
+    def SetItemPyData(*args, **kwargs):
+        """SetItemPyData(TreeItemId item, PyObject obj)"""
+        return _controls.TreeCtrl_SetItemPyData(*args, **kwargs)
+
     SetPyData = SetItemPyData 
-    def SetItemHasChildren(*args, **kwargs): return _controls.TreeCtrl_SetItemHasChildren(*args, **kwargs)
-    def SetItemBold(*args, **kwargs): return _controls.TreeCtrl_SetItemBold(*args, **kwargs)
-    def SetItemTextColour(*args, **kwargs): return _controls.TreeCtrl_SetItemTextColour(*args, **kwargs)
-    def SetItemBackgroundColour(*args, **kwargs): return _controls.TreeCtrl_SetItemBackgroundColour(*args, **kwargs)
-    def SetItemFont(*args, **kwargs): return _controls.TreeCtrl_SetItemFont(*args, **kwargs)
-    def IsVisible(*args, **kwargs): return _controls.TreeCtrl_IsVisible(*args, **kwargs)
-    def ItemHasChildren(*args, **kwargs): return _controls.TreeCtrl_ItemHasChildren(*args, **kwargs)
-    def IsExpanded(*args, **kwargs): return _controls.TreeCtrl_IsExpanded(*args, **kwargs)
-    def IsSelected(*args, **kwargs): return _controls.TreeCtrl_IsSelected(*args, **kwargs)
-    def IsBold(*args, **kwargs): return _controls.TreeCtrl_IsBold(*args, **kwargs)
-    def GetChildrenCount(*args, **kwargs): return _controls.TreeCtrl_GetChildrenCount(*args, **kwargs)
-    def GetRootItem(*args, **kwargs): return _controls.TreeCtrl_GetRootItem(*args, **kwargs)
-    def GetSelection(*args, **kwargs): return _controls.TreeCtrl_GetSelection(*args, **kwargs)
-    def GetSelections(*args, **kwargs): return _controls.TreeCtrl_GetSelections(*args, **kwargs)
-    def GetItemParent(*args, **kwargs): return _controls.TreeCtrl_GetItemParent(*args, **kwargs)
-    def GetFirstChild(*args, **kwargs): return _controls.TreeCtrl_GetFirstChild(*args, **kwargs)
-    def GetNextChild(*args, **kwargs): return _controls.TreeCtrl_GetNextChild(*args, **kwargs)
-    def GetLastChild(*args, **kwargs): return _controls.TreeCtrl_GetLastChild(*args, **kwargs)
-    def GetNextSibling(*args, **kwargs): return _controls.TreeCtrl_GetNextSibling(*args, **kwargs)
-    def GetPrevSibling(*args, **kwargs): return _controls.TreeCtrl_GetPrevSibling(*args, **kwargs)
-    def GetFirstVisibleItem(*args, **kwargs): return _controls.TreeCtrl_GetFirstVisibleItem(*args, **kwargs)
-    def GetNextVisible(*args, **kwargs): return _controls.TreeCtrl_GetNextVisible(*args, **kwargs)
-    def GetPrevVisible(*args, **kwargs): return _controls.TreeCtrl_GetPrevVisible(*args, **kwargs)
-    def AddRoot(*args, **kwargs): return _controls.TreeCtrl_AddRoot(*args, **kwargs)
-    def PrependItem(*args, **kwargs): return _controls.TreeCtrl_PrependItem(*args, **kwargs)
-    def InsertItem(*args, **kwargs): return _controls.TreeCtrl_InsertItem(*args, **kwargs)
-    def InsertItemBefore(*args, **kwargs): return _controls.TreeCtrl_InsertItemBefore(*args, **kwargs)
-    def AppendItem(*args, **kwargs): return _controls.TreeCtrl_AppendItem(*args, **kwargs)
-    def Delete(*args, **kwargs): return _controls.TreeCtrl_Delete(*args, **kwargs)
-    def DeleteChildren(*args, **kwargs): return _controls.TreeCtrl_DeleteChildren(*args, **kwargs)
-    def DeleteAllItems(*args, **kwargs): return _controls.TreeCtrl_DeleteAllItems(*args, **kwargs)
-    def Expand(*args, **kwargs): return _controls.TreeCtrl_Expand(*args, **kwargs)
-    def Collapse(*args, **kwargs): return _controls.TreeCtrl_Collapse(*args, **kwargs)
-    def CollapseAndReset(*args, **kwargs): return _controls.TreeCtrl_CollapseAndReset(*args, **kwargs)
-    def Toggle(*args, **kwargs): return _controls.TreeCtrl_Toggle(*args, **kwargs)
-    def Unselect(*args, **kwargs): return _controls.TreeCtrl_Unselect(*args, **kwargs)
-    def UnselectAll(*args, **kwargs): return _controls.TreeCtrl_UnselectAll(*args, **kwargs)
-    def SelectItem(*args, **kwargs): return _controls.TreeCtrl_SelectItem(*args, **kwargs)
-    def EnsureVisible(*args, **kwargs): return _controls.TreeCtrl_EnsureVisible(*args, **kwargs)
-    def ScrollTo(*args, **kwargs): return _controls.TreeCtrl_ScrollTo(*args, **kwargs)
-    def EditLabel(*args, **kwargs): return _controls.TreeCtrl_EditLabel(*args, **kwargs)
-    def GetEditControl(*args, **kwargs): return _controls.TreeCtrl_GetEditControl(*args, **kwargs)
-    def SortChildren(*args, **kwargs): return _controls.TreeCtrl_SortChildren(*args, **kwargs)
-    def HitTest(*args, **kwargs): return _controls.TreeCtrl_HitTest(*args, **kwargs)
-    def GetBoundingRect(*args, **kwargs): return _controls.TreeCtrl_GetBoundingRect(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTreeCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetItemHasChildren(*args, **kwargs):
+        """SetItemHasChildren(TreeItemId item, bool has=True)"""
+        return _controls.TreeCtrl_SetItemHasChildren(*args, **kwargs)
+
+    def SetItemBold(*args, **kwargs):
+        """SetItemBold(TreeItemId item, bool bold=True)"""
+        return _controls.TreeCtrl_SetItemBold(*args, **kwargs)
+
+    def SetItemTextColour(*args, **kwargs):
+        """SetItemTextColour(TreeItemId item, wxColour col)"""
+        return _controls.TreeCtrl_SetItemTextColour(*args, **kwargs)
+
+    def SetItemBackgroundColour(*args, **kwargs):
+        """SetItemBackgroundColour(TreeItemId item, wxColour col)"""
+        return _controls.TreeCtrl_SetItemBackgroundColour(*args, **kwargs)
+
+    def SetItemFont(*args, **kwargs):
+        """SetItemFont(TreeItemId item, wxFont font)"""
+        return _controls.TreeCtrl_SetItemFont(*args, **kwargs)
+
+    def IsVisible(*args, **kwargs):
+        """IsVisible(TreeItemId item) -> bool"""
+        return _controls.TreeCtrl_IsVisible(*args, **kwargs)
+
+    def ItemHasChildren(*args, **kwargs):
+        """ItemHasChildren(TreeItemId item) -> bool"""
+        return _controls.TreeCtrl_ItemHasChildren(*args, **kwargs)
+
+    def IsExpanded(*args, **kwargs):
+        """IsExpanded(TreeItemId item) -> bool"""
+        return _controls.TreeCtrl_IsExpanded(*args, **kwargs)
+
+    def IsSelected(*args, **kwargs):
+        """IsSelected(TreeItemId item) -> bool"""
+        return _controls.TreeCtrl_IsSelected(*args, **kwargs)
+
+    def IsBold(*args, **kwargs):
+        """IsBold(TreeItemId item) -> bool"""
+        return _controls.TreeCtrl_IsBold(*args, **kwargs)
+
+    def GetChildrenCount(*args, **kwargs):
+        """GetChildrenCount(TreeItemId item, bool recursively=True) -> size_t"""
+        return _controls.TreeCtrl_GetChildrenCount(*args, **kwargs)
+
+    def GetRootItem(*args, **kwargs):
+        """GetRootItem() -> TreeItemId"""
+        return _controls.TreeCtrl_GetRootItem(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> TreeItemId"""
+        return _controls.TreeCtrl_GetSelection(*args, **kwargs)
+
+    def GetSelections(*args, **kwargs):
+        """GetSelections() -> PyObject"""
+        return _controls.TreeCtrl_GetSelections(*args, **kwargs)
+
+    def GetItemParent(*args, **kwargs):
+        """GetItemParent(TreeItemId item) -> TreeItemId"""
+        return _controls.TreeCtrl_GetItemParent(*args, **kwargs)
+
+    def GetFirstChild(*args, **kwargs):
+        """GetFirstChild(TreeItemId item) -> PyObject"""
+        return _controls.TreeCtrl_GetFirstChild(*args, **kwargs)
+
+    def GetNextChild(*args, **kwargs):
+        """GetNextChild(TreeItemId item, wxTreeItemIdValue cookie) -> PyObject"""
+        return _controls.TreeCtrl_GetNextChild(*args, **kwargs)
+
+    def GetLastChild(*args, **kwargs):
+        """GetLastChild(TreeItemId item) -> TreeItemId"""
+        return _controls.TreeCtrl_GetLastChild(*args, **kwargs)
+
+    def GetNextSibling(*args, **kwargs):
+        """GetNextSibling(TreeItemId item) -> TreeItemId"""
+        return _controls.TreeCtrl_GetNextSibling(*args, **kwargs)
+
+    def GetPrevSibling(*args, **kwargs):
+        """GetPrevSibling(TreeItemId item) -> TreeItemId"""
+        return _controls.TreeCtrl_GetPrevSibling(*args, **kwargs)
+
+    def GetFirstVisibleItem(*args, **kwargs):
+        """GetFirstVisibleItem() -> TreeItemId"""
+        return _controls.TreeCtrl_GetFirstVisibleItem(*args, **kwargs)
+
+    def GetNextVisible(*args, **kwargs):
+        """GetNextVisible(TreeItemId item) -> TreeItemId"""
+        return _controls.TreeCtrl_GetNextVisible(*args, **kwargs)
+
+    def GetPrevVisible(*args, **kwargs):
+        """GetPrevVisible(TreeItemId item) -> TreeItemId"""
+        return _controls.TreeCtrl_GetPrevVisible(*args, **kwargs)
+
+    def AddRoot(*args, **kwargs):
+        """AddRoot(wxString text, int image=-1, int selectedImage=-1, 
+    TreeItemData data=None) -> TreeItemId"""
+        return _controls.TreeCtrl_AddRoot(*args, **kwargs)
+
+    def PrependItem(*args, **kwargs):
+        """PrependItem(TreeItemId parent, wxString text, int image=-1, int selectedImage=-1, 
+    TreeItemData data=None) -> TreeItemId"""
+        return _controls.TreeCtrl_PrependItem(*args, **kwargs)
+
+    def InsertItem(*args, **kwargs):
+        """InsertItem(TreeItemId parent, TreeItemId idPrevious, wxString text, 
+    int image=-1, int selectedImage=-1, TreeItemData data=None) -> TreeItemId"""
+        return _controls.TreeCtrl_InsertItem(*args, **kwargs)
+
+    def InsertItemBefore(*args, **kwargs):
+        """InsertItemBefore(TreeItemId parent, size_t index, wxString text, int image=-1, 
+    int selectedImage=-1, TreeItemData data=None) -> TreeItemId"""
+        return _controls.TreeCtrl_InsertItemBefore(*args, **kwargs)
+
+    def AppendItem(*args, **kwargs):
+        """AppendItem(TreeItemId parent, wxString text, int image=-1, int selectedImage=-1, 
+    TreeItemData data=None) -> TreeItemId"""
+        return _controls.TreeCtrl_AppendItem(*args, **kwargs)
+
+    def Delete(*args, **kwargs):
+        """Delete(TreeItemId item)"""
+        return _controls.TreeCtrl_Delete(*args, **kwargs)
+
+    def DeleteChildren(*args, **kwargs):
+        """DeleteChildren(TreeItemId item)"""
+        return _controls.TreeCtrl_DeleteChildren(*args, **kwargs)
+
+    def DeleteAllItems(*args, **kwargs):
+        """DeleteAllItems()"""
+        return _controls.TreeCtrl_DeleteAllItems(*args, **kwargs)
+
+    def Expand(*args, **kwargs):
+        """Expand(TreeItemId item)"""
+        return _controls.TreeCtrl_Expand(*args, **kwargs)
+
+    def Collapse(*args, **kwargs):
+        """Collapse(TreeItemId item)"""
+        return _controls.TreeCtrl_Collapse(*args, **kwargs)
+
+    def CollapseAndReset(*args, **kwargs):
+        """CollapseAndReset(TreeItemId item)"""
+        return _controls.TreeCtrl_CollapseAndReset(*args, **kwargs)
+
+    def Toggle(*args, **kwargs):
+        """Toggle(TreeItemId item)"""
+        return _controls.TreeCtrl_Toggle(*args, **kwargs)
+
+    def Unselect(*args, **kwargs):
+        """Unselect()"""
+        return _controls.TreeCtrl_Unselect(*args, **kwargs)
+
+    def UnselectAll(*args, **kwargs):
+        """UnselectAll()"""
+        return _controls.TreeCtrl_UnselectAll(*args, **kwargs)
+
+    def SelectItem(*args, **kwargs):
+        """SelectItem(TreeItemId item)"""
+        return _controls.TreeCtrl_SelectItem(*args, **kwargs)
+
+    def EnsureVisible(*args, **kwargs):
+        """EnsureVisible(TreeItemId item)"""
+        return _controls.TreeCtrl_EnsureVisible(*args, **kwargs)
+
+    def ScrollTo(*args, **kwargs):
+        """ScrollTo(TreeItemId item)"""
+        return _controls.TreeCtrl_ScrollTo(*args, **kwargs)
+
+    def EditLabel(*args, **kwargs):
+        """EditLabel(TreeItemId item)"""
+        return _controls.TreeCtrl_EditLabel(*args, **kwargs)
+
+    def GetEditControl(*args, **kwargs):
+        """GetEditControl() -> TextCtrl"""
+        return _controls.TreeCtrl_GetEditControl(*args, **kwargs)
+
+    def SortChildren(*args, **kwargs):
+        """SortChildren(TreeItemId item)"""
+        return _controls.TreeCtrl_SortChildren(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """HitTest(Point point, int OUTPUT) -> TreeItemId"""
+        return _controls.TreeCtrl_HitTest(*args, **kwargs)
+
+    def GetBoundingRect(*args, **kwargs):
+        """GetBoundingRect(TreeItemId item, bool textOnly=False) -> PyObject"""
+        return _controls.TreeCtrl_GetBoundingRect(*args, **kwargs)
+
 
 class TreeCtrlPtr(TreeCtrl):
     def __init__(self, this):
@@ -2017,6 +3988,7 @@ class TreeCtrlPtr(TreeCtrl):
 _controls.TreeCtrl_swigregister(TreeCtrlPtr)
 
 def PreTreeCtrl(*args, **kwargs):
+    """PreTreeCtrl() -> TreeCtrl"""
     val = _controls.new_PreTreeCtrl(*args, **kwargs)
     val.thisown = 1
     return val
@@ -2029,33 +4001,101 @@ DIRCTRL_SHOW_FILTERS = _controls.DIRCTRL_SHOW_FILTERS
 DIRCTRL_3D_INTERNAL = _controls.DIRCTRL_3D_INTERNAL
 DIRCTRL_EDIT_LABELS = _controls.DIRCTRL_EDIT_LABELS
 class GenericDirCtrl(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGenericDirCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, wxString dir=wxPyDirDialogDefaultFolderStr, 
+    Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, 
+    wxString filter=wxPyEmptyString, 
+    int defaultFilter=0, wxString name=wxPy_TreeCtrlNameStr) -> GenericDirCtrl"""
         newobj = _controls.new_GenericDirCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.GenericDirCtrl_Create(*args, **kwargs)
-    def ExpandPath(*args, **kwargs): return _controls.GenericDirCtrl_ExpandPath(*args, **kwargs)
-    def GetDefaultPath(*args, **kwargs): return _controls.GenericDirCtrl_GetDefaultPath(*args, **kwargs)
-    def SetDefaultPath(*args, **kwargs): return _controls.GenericDirCtrl_SetDefaultPath(*args, **kwargs)
-    def GetPath(*args, **kwargs): return _controls.GenericDirCtrl_GetPath(*args, **kwargs)
-    def GetFilePath(*args, **kwargs): return _controls.GenericDirCtrl_GetFilePath(*args, **kwargs)
-    def SetPath(*args, **kwargs): return _controls.GenericDirCtrl_SetPath(*args, **kwargs)
-    def ShowHidden(*args, **kwargs): return _controls.GenericDirCtrl_ShowHidden(*args, **kwargs)
-    def GetShowHidden(*args, **kwargs): return _controls.GenericDirCtrl_GetShowHidden(*args, **kwargs)
-    def GetFilter(*args, **kwargs): return _controls.GenericDirCtrl_GetFilter(*args, **kwargs)
-    def SetFilter(*args, **kwargs): return _controls.GenericDirCtrl_SetFilter(*args, **kwargs)
-    def GetFilterIndex(*args, **kwargs): return _controls.GenericDirCtrl_GetFilterIndex(*args, **kwargs)
-    def SetFilterIndex(*args, **kwargs): return _controls.GenericDirCtrl_SetFilterIndex(*args, **kwargs)
-    def GetRootId(*args, **kwargs): return _controls.GenericDirCtrl_GetRootId(*args, **kwargs)
-    def GetTreeCtrl(*args, **kwargs): return _controls.GenericDirCtrl_GetTreeCtrl(*args, **kwargs)
-    def GetFilterListCtrl(*args, **kwargs): return _controls.GenericDirCtrl_GetFilterListCtrl(*args, **kwargs)
-    def FindChild(*args, **kwargs): return _controls.GenericDirCtrl_FindChild(*args, **kwargs)
-    def DoResize(*args, **kwargs): return _controls.GenericDirCtrl_DoResize(*args, **kwargs)
-    def ReCreateTree(*args, **kwargs): return _controls.GenericDirCtrl_ReCreateTree(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGenericDirCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=-1, wxString dir=wxPyDirDialogDefaultFolderStr, 
+    Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, 
+    wxString filter=wxPyEmptyString, 
+    int defaultFilter=0, wxString name=wxPy_TreeCtrlNameStr) -> bool"""
+        return _controls.GenericDirCtrl_Create(*args, **kwargs)
+
+    def ExpandPath(*args, **kwargs):
+        """ExpandPath(wxString path) -> bool"""
+        return _controls.GenericDirCtrl_ExpandPath(*args, **kwargs)
+
+    def GetDefaultPath(*args, **kwargs):
+        """GetDefaultPath() -> wxString"""
+        return _controls.GenericDirCtrl_GetDefaultPath(*args, **kwargs)
+
+    def SetDefaultPath(*args, **kwargs):
+        """SetDefaultPath(wxString path)"""
+        return _controls.GenericDirCtrl_SetDefaultPath(*args, **kwargs)
+
+    def GetPath(*args, **kwargs):
+        """GetPath() -> wxString"""
+        return _controls.GenericDirCtrl_GetPath(*args, **kwargs)
+
+    def GetFilePath(*args, **kwargs):
+        """GetFilePath() -> wxString"""
+        return _controls.GenericDirCtrl_GetFilePath(*args, **kwargs)
+
+    def SetPath(*args, **kwargs):
+        """SetPath(wxString path)"""
+        return _controls.GenericDirCtrl_SetPath(*args, **kwargs)
+
+    def ShowHidden(*args, **kwargs):
+        """ShowHidden(bool show)"""
+        return _controls.GenericDirCtrl_ShowHidden(*args, **kwargs)
+
+    def GetShowHidden(*args, **kwargs):
+        """GetShowHidden() -> bool"""
+        return _controls.GenericDirCtrl_GetShowHidden(*args, **kwargs)
+
+    def GetFilter(*args, **kwargs):
+        """GetFilter() -> wxString"""
+        return _controls.GenericDirCtrl_GetFilter(*args, **kwargs)
+
+    def SetFilter(*args, **kwargs):
+        """SetFilter(wxString filter)"""
+        return _controls.GenericDirCtrl_SetFilter(*args, **kwargs)
+
+    def GetFilterIndex(*args, **kwargs):
+        """GetFilterIndex() -> int"""
+        return _controls.GenericDirCtrl_GetFilterIndex(*args, **kwargs)
+
+    def SetFilterIndex(*args, **kwargs):
+        """SetFilterIndex(int n)"""
+        return _controls.GenericDirCtrl_SetFilterIndex(*args, **kwargs)
+
+    def GetRootId(*args, **kwargs):
+        """GetRootId() -> TreeItemId"""
+        return _controls.GenericDirCtrl_GetRootId(*args, **kwargs)
+
+    def GetTreeCtrl(*args, **kwargs):
+        """GetTreeCtrl() -> wxTreeCtrl"""
+        return _controls.GenericDirCtrl_GetTreeCtrl(*args, **kwargs)
+
+    def GetFilterListCtrl(*args, **kwargs):
+        """GetFilterListCtrl() -> DirFilterListCtrl"""
+        return _controls.GenericDirCtrl_GetFilterListCtrl(*args, **kwargs)
+
+    def FindChild(*args, **kwargs):
+        """FindChild(TreeItemId parentId, wxString path, bool OUTPUT) -> TreeItemId"""
+        return _controls.GenericDirCtrl_FindChild(*args, **kwargs)
+
+    def DoResize(*args, **kwargs):
+        """DoResize()"""
+        return _controls.GenericDirCtrl_DoResize(*args, **kwargs)
+
+    def ReCreateTree(*args, **kwargs):
+        """ReCreateTree()"""
+        return _controls.GenericDirCtrl_ReCreateTree(*args, **kwargs)
+
 
 class GenericDirCtrlPtr(GenericDirCtrl):
     def __init__(self, this):
@@ -2065,21 +4105,33 @@ class GenericDirCtrlPtr(GenericDirCtrl):
 _controls.GenericDirCtrl_swigregister(GenericDirCtrlPtr)
 
 def PreGenericDirCtrl(*args, **kwargs):
+    """PreGenericDirCtrl() -> GenericDirCtrl"""
     val = _controls.new_PreGenericDirCtrl(*args, **kwargs)
     val.thisown = 1
     return val
 
 class DirFilterListCtrl(Choice):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDirFilterListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(GenericDirCtrl parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0) -> DirFilterListCtrl"""
         newobj = _controls.new_DirFilterListCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _controls.DirFilterListCtrl_Create(*args, **kwargs)
-    def FillFilterList(*args, **kwargs): return _controls.DirFilterListCtrl_FillFilterList(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDirFilterListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(GenericDirCtrl parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0) -> bool"""
+        return _controls.DirFilterListCtrl_Create(*args, **kwargs)
+
+    def FillFilterList(*args, **kwargs):
+        """FillFilterList(wxString filter, int defaultFilter)"""
+        return _controls.DirFilterListCtrl_FillFilterList(*args, **kwargs)
+
 
 class DirFilterListCtrlPtr(DirFilterListCtrl):
     def __init__(self, this):
@@ -2089,6 +4141,7 @@ class DirFilterListCtrlPtr(DirFilterListCtrl):
 _controls.DirFilterListCtrl_swigregister(DirFilterListCtrlPtr)
 
 def PreDirFilterListCtrl(*args, **kwargs):
+    """PreDirFilterListCtrl() -> DirFilterListCtrl"""
     val = _controls.new_PreDirFilterListCtrl(*args, **kwargs)
     val.thisown = 1
     return val
@@ -2096,33 +4149,95 @@ def PreDirFilterListCtrl(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class PyControl(core.Control):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyControl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, Validator validator=DefaultValidator, 
+    wxString name=wxPyControlNameStr) -> PyControl"""
         newobj = _controls.new_PyControl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self); self._setCallbackInfo(self, PyControl)
-    def _setCallbackInfo(*args, **kwargs): return _controls.PyControl__setCallbackInfo(*args, **kwargs)
-    def base_DoMoveWindow(*args, **kwargs): return _controls.PyControl_base_DoMoveWindow(*args, **kwargs)
-    def base_DoSetSize(*args, **kwargs): return _controls.PyControl_base_DoSetSize(*args, **kwargs)
-    def base_DoSetClientSize(*args, **kwargs): return _controls.PyControl_base_DoSetClientSize(*args, **kwargs)
-    def base_DoSetVirtualSize(*args, **kwargs): return _controls.PyControl_base_DoSetVirtualSize(*args, **kwargs)
-    def base_DoGetSize(*args, **kwargs): return _controls.PyControl_base_DoGetSize(*args, **kwargs)
-    def base_DoGetClientSize(*args, **kwargs): return _controls.PyControl_base_DoGetClientSize(*args, **kwargs)
-    def base_DoGetPosition(*args, **kwargs): return _controls.PyControl_base_DoGetPosition(*args, **kwargs)
-    def base_DoGetVirtualSize(*args, **kwargs): return _controls.PyControl_base_DoGetVirtualSize(*args, **kwargs)
-    def base_DoGetBestSize(*args, **kwargs): return _controls.PyControl_base_DoGetBestSize(*args, **kwargs)
-    def base_InitDialog(*args, **kwargs): return _controls.PyControl_base_InitDialog(*args, **kwargs)
-    def base_TransferDataToWindow(*args, **kwargs): return _controls.PyControl_base_TransferDataToWindow(*args, **kwargs)
-    def base_TransferDataFromWindow(*args, **kwargs): return _controls.PyControl_base_TransferDataFromWindow(*args, **kwargs)
-    def base_Validate(*args, **kwargs): return _controls.PyControl_base_Validate(*args, **kwargs)
-    def base_AcceptsFocus(*args, **kwargs): return _controls.PyControl_base_AcceptsFocus(*args, **kwargs)
-    def base_AcceptsFocusFromKeyboard(*args, **kwargs): return _controls.PyControl_base_AcceptsFocusFromKeyboard(*args, **kwargs)
-    def base_GetMaxSize(*args, **kwargs): return _controls.PyControl_base_GetMaxSize(*args, **kwargs)
-    def base_AddChild(*args, **kwargs): return _controls.PyControl_base_AddChild(*args, **kwargs)
-    def base_RemoveChild(*args, **kwargs): return _controls.PyControl_base_RemoveChild(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyControl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _controls.PyControl__setCallbackInfo(*args, **kwargs)
+
+    def base_DoMoveWindow(*args, **kwargs):
+        """base_DoMoveWindow(int x, int y, int width, int height)"""
+        return _controls.PyControl_base_DoMoveWindow(*args, **kwargs)
+
+    def base_DoSetSize(*args, **kwargs):
+        """base_DoSetSize(int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
+        return _controls.PyControl_base_DoSetSize(*args, **kwargs)
+
+    def base_DoSetClientSize(*args, **kwargs):
+        """base_DoSetClientSize(int width, int height)"""
+        return _controls.PyControl_base_DoSetClientSize(*args, **kwargs)
+
+    def base_DoSetVirtualSize(*args, **kwargs):
+        """base_DoSetVirtualSize(int x, int y)"""
+        return _controls.PyControl_base_DoSetVirtualSize(*args, **kwargs)
+
+    def base_DoGetSize(*args, **kwargs):
+        """base_DoGetSize(int OUTPUT, int OUTPUT)"""
+        return _controls.PyControl_base_DoGetSize(*args, **kwargs)
+
+    def base_DoGetClientSize(*args, **kwargs):
+        """base_DoGetClientSize(int OUTPUT, int OUTPUT)"""
+        return _controls.PyControl_base_DoGetClientSize(*args, **kwargs)
+
+    def base_DoGetPosition(*args, **kwargs):
+        """base_DoGetPosition(int OUTPUT, int OUTPUT)"""
+        return _controls.PyControl_base_DoGetPosition(*args, **kwargs)
+
+    def base_DoGetVirtualSize(*args, **kwargs):
+        """base_DoGetVirtualSize() -> Size"""
+        return _controls.PyControl_base_DoGetVirtualSize(*args, **kwargs)
+
+    def base_DoGetBestSize(*args, **kwargs):
+        """base_DoGetBestSize() -> Size"""
+        return _controls.PyControl_base_DoGetBestSize(*args, **kwargs)
+
+    def base_InitDialog(*args, **kwargs):
+        """base_InitDialog()"""
+        return _controls.PyControl_base_InitDialog(*args, **kwargs)
+
+    def base_TransferDataToWindow(*args, **kwargs):
+        """base_TransferDataToWindow() -> bool"""
+        return _controls.PyControl_base_TransferDataToWindow(*args, **kwargs)
+
+    def base_TransferDataFromWindow(*args, **kwargs):
+        """base_TransferDataFromWindow() -> bool"""
+        return _controls.PyControl_base_TransferDataFromWindow(*args, **kwargs)
+
+    def base_Validate(*args, **kwargs):
+        """base_Validate() -> bool"""
+        return _controls.PyControl_base_Validate(*args, **kwargs)
+
+    def base_AcceptsFocus(*args, **kwargs):
+        """base_AcceptsFocus() -> bool"""
+        return _controls.PyControl_base_AcceptsFocus(*args, **kwargs)
+
+    def base_AcceptsFocusFromKeyboard(*args, **kwargs):
+        """base_AcceptsFocusFromKeyboard() -> bool"""
+        return _controls.PyControl_base_AcceptsFocusFromKeyboard(*args, **kwargs)
+
+    def base_GetMaxSize(*args, **kwargs):
+        """base_GetMaxSize() -> Size"""
+        return _controls.PyControl_base_GetMaxSize(*args, **kwargs)
+
+    def base_AddChild(*args, **kwargs):
+        """base_AddChild(Window child)"""
+        return _controls.PyControl_base_AddChild(*args, **kwargs)
+
+    def base_RemoveChild(*args, **kwargs):
+        """base_RemoveChild(Window child)"""
+        return _controls.PyControl_base_RemoveChild(*args, **kwargs)
+
 
 class PyControlPtr(PyControl):
     def __init__(self, this):
@@ -2143,19 +4258,39 @@ EVT_DETAILED_HELP = wx.PyEventBinder( wxEVT_DETAILED_HELP, 1)
 EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 
 class HelpEvent(core.CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHelpEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> HelpEvent"""
         newobj = _controls.new_HelpEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetPosition(*args, **kwargs): return _controls.HelpEvent_GetPosition(*args, **kwargs)
-    def SetPosition(*args, **kwargs): return _controls.HelpEvent_SetPosition(*args, **kwargs)
-    def GetLink(*args, **kwargs): return _controls.HelpEvent_GetLink(*args, **kwargs)
-    def SetLink(*args, **kwargs): return _controls.HelpEvent_SetLink(*args, **kwargs)
-    def GetTarget(*args, **kwargs): return _controls.HelpEvent_GetTarget(*args, **kwargs)
-    def SetTarget(*args, **kwargs): return _controls.HelpEvent_SetTarget(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHelpEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point"""
+        return _controls.HelpEvent_GetPosition(*args, **kwargs)
+
+    def SetPosition(*args, **kwargs):
+        """SetPosition(Point pos)"""
+        return _controls.HelpEvent_SetPosition(*args, **kwargs)
+
+    def GetLink(*args, **kwargs):
+        """GetLink() -> wxString"""
+        return _controls.HelpEvent_GetLink(*args, **kwargs)
+
+    def SetLink(*args, **kwargs):
+        """SetLink(wxString link)"""
+        return _controls.HelpEvent_SetLink(*args, **kwargs)
+
+    def GetTarget(*args, **kwargs):
+        """GetTarget() -> wxString"""
+        return _controls.HelpEvent_GetTarget(*args, **kwargs)
+
+    def SetTarget(*args, **kwargs):
+        """SetTarget(wxString target)"""
+        return _controls.HelpEvent_SetTarget(*args, **kwargs)
+
 
 class HelpEventPtr(HelpEvent):
     def __init__(self, this):
@@ -2165,19 +4300,29 @@ class HelpEventPtr(HelpEvent):
 _controls.HelpEvent_swigregister(HelpEventPtr)
 
 class ContextHelp(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxContextHelp instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window window=None, bool doNow=True) -> ContextHelp"""
         newobj = _controls.new_ContextHelp(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_controls.delete_ContextHelp):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def BeginContextHelp(*args, **kwargs): return _controls.ContextHelp_BeginContextHelp(*args, **kwargs)
-    def EndContextHelp(*args, **kwargs): return _controls.ContextHelp_EndContextHelp(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxContextHelp instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def BeginContextHelp(*args, **kwargs):
+        """BeginContextHelp(Window window=None) -> bool"""
+        return _controls.ContextHelp_BeginContextHelp(*args, **kwargs)
+
+    def EndContextHelp(*args, **kwargs):
+        """EndContextHelp() -> bool"""
+        return _controls.ContextHelp_EndContextHelp(*args, **kwargs)
+
 
 class ContextHelpPtr(ContextHelp):
     def __init__(self, this):
@@ -2187,14 +4332,18 @@ class ContextHelpPtr(ContextHelp):
 _controls.ContextHelp_swigregister(ContextHelpPtr)
 
 class ContextHelpButton(BitmapButton):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxContextHelpButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=ID_CONTEXT_HELP, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=BU_AUTODRAW) -> ContextHelpButton"""
         newobj = _controls.new_ContextHelpButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxContextHelpButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class ContextHelpButtonPtr(ContextHelpButton):
     def __init__(self, this):
@@ -2204,16 +4353,40 @@ class ContextHelpButtonPtr(ContextHelpButton):
 _controls.ContextHelpButton_swigregister(ContextHelpButtonPtr)
 
 class HelpProvider(object):
-    Set = staticmethod(_controls.HelpProvider_Set)
-    Get = staticmethod(_controls.HelpProvider_Get)
-    def GetHelp(*args, **kwargs): return _controls.HelpProvider_GetHelp(*args, **kwargs)
-    def ShowHelp(*args, **kwargs): return _controls.HelpProvider_ShowHelp(*args, **kwargs)
-    def AddHelp(*args, **kwargs): return _controls.HelpProvider_AddHelp(*args, **kwargs)
-    def AddHelpById(*args, **kwargs): return _controls.HelpProvider_AddHelpById(*args, **kwargs)
-    def Destroy(*args, **kwargs): return _controls.HelpProvider_Destroy(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHelpProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Set(*args, **kwargs):
+        """HelpProvider.Set(HelpProvider helpProvider) -> HelpProvider"""
+        return _controls.HelpProvider_Set(*args, **kwargs)
+
+    Set = staticmethod(Set)
+    def Get(*args, **kwargs):
+        """HelpProvider.Get() -> HelpProvider"""
+        return _controls.HelpProvider_Get(*args, **kwargs)
+
+    Get = staticmethod(Get)
+    def GetHelp(*args, **kwargs):
+        """GetHelp(Window window) -> wxString"""
+        return _controls.HelpProvider_GetHelp(*args, **kwargs)
+
+    def ShowHelp(*args, **kwargs):
+        """ShowHelp(Window window) -> bool"""
+        return _controls.HelpProvider_ShowHelp(*args, **kwargs)
+
+    def AddHelp(*args, **kwargs):
+        """AddHelp(Window window, wxString text)"""
+        return _controls.HelpProvider_AddHelp(*args, **kwargs)
+
+    def AddHelpById(*args, **kwargs):
+        """AddHelpById(int id, wxString text)"""
+        return _controls.HelpProvider_AddHelpById(*args, **kwargs)
+
+    def Destroy(*args, **kwargs):
+        """Destroy()"""
+        return _controls.HelpProvider_Destroy(*args, **kwargs)
+
 
 class HelpProviderPtr(HelpProvider):
     def __init__(self, this):
@@ -2222,18 +4395,24 @@ class HelpProviderPtr(HelpProvider):
         self.__class__ = HelpProvider
 _controls.HelpProvider_swigregister(HelpProviderPtr)
 
-HelpProvider_Set = _controls.HelpProvider_Set
+def HelpProvider_Set(*args, **kwargs):
+    """HelpProvider_Set(HelpProvider helpProvider) -> HelpProvider"""
+    return _controls.HelpProvider_Set(*args, **kwargs)
 
-HelpProvider_Get = _controls.HelpProvider_Get
+def HelpProvider_Get(*args, **kwargs):
+    """HelpProvider_Get() -> HelpProvider"""
+    return _controls.HelpProvider_Get(*args, **kwargs)
 
 class SimpleHelpProvider(HelpProvider):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSimpleHelpProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> SimpleHelpProvider"""
         newobj = _controls.new_SimpleHelpProvider(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSimpleHelpProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class SimpleHelpProviderPtr(SimpleHelpProvider):
     def __init__(self, this):
@@ -2242,4 +4421,100 @@ class SimpleHelpProviderPtr(SimpleHelpProvider):
         self.__class__ = SimpleHelpProvider
 _controls.SimpleHelpProvider_swigregister(SimpleHelpProviderPtr)
 
+#---------------------------------------------------------------------------
+
+class DragImage(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGenericDragImage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(wxBitmap image, wxCursor cursor=wxNullCursor) -> DragImage"""
+        newobj = _controls.new_DragImage(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def __del__(self, destroy=_controls.delete_DragImage):
+        """__del__()"""
+        try:
+            if self.thisown: destroy(self)
+        except: pass
+
+    def SetBackingBitmap(*args, **kwargs):
+        """SetBackingBitmap(wxBitmap bitmap)"""
+        return _controls.DragImage_SetBackingBitmap(*args, **kwargs)
+
+    def BeginDrag(*args, **kwargs):
+        """BeginDrag(Point hotspot, Window window, bool fullScreen=False, 
+    Rect rect=None) -> bool"""
+        return _controls.DragImage_BeginDrag(*args, **kwargs)
+
+    def BeginDragBounded(*args, **kwargs):
+        """BeginDragBounded(Point hotspot, Window window, Window boundingWindow) -> bool"""
+        return _controls.DragImage_BeginDragBounded(*args, **kwargs)
+
+    def EndDrag(*args, **kwargs):
+        """EndDrag() -> bool"""
+        return _controls.DragImage_EndDrag(*args, **kwargs)
+
+    def Move(*args, **kwargs):
+        """Move(Point pt) -> bool"""
+        return _controls.DragImage_Move(*args, **kwargs)
+
+    def Show(*args, **kwargs):
+        """Show() -> bool"""
+        return _controls.DragImage_Show(*args, **kwargs)
+
+    def Hide(*args, **kwargs):
+        """Hide() -> bool"""
+        return _controls.DragImage_Hide(*args, **kwargs)
+
+    def GetImageRect(*args, **kwargs):
+        """GetImageRect(Point pos) -> Rect"""
+        return _controls.DragImage_GetImageRect(*args, **kwargs)
+
+    def DoDrawImage(*args, **kwargs):
+        """DoDrawImage(wxDC dc, Point pos) -> bool"""
+        return _controls.DragImage_DoDrawImage(*args, **kwargs)
+
+    def UpdateBackingFromWindow(*args, **kwargs):
+        """UpdateBackingFromWindow(wxDC windowDC, wxMemoryDC destDC, Rect sourceRect, 
+    Rect destRect) -> bool"""
+        return _controls.DragImage_UpdateBackingFromWindow(*args, **kwargs)
+
+    def RedrawImage(*args, **kwargs):
+        """RedrawImage(Point oldPos, Point newPos, bool eraseOld, bool drawNew) -> bool"""
+        return _controls.DragImage_RedrawImage(*args, **kwargs)
+
+
+class DragImagePtr(DragImage):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = DragImage
+_controls.DragImage_swigregister(DragImagePtr)
+
+def DragIcon(*args, **kwargs):
+    """DragIcon(wxIcon image, wxCursor cursor=wxNullCursor) -> DragImage"""
+    val = _controls.new_DragIcon(*args, **kwargs)
+    val.thisown = 1
+    return val
+
+def DragString(*args, **kwargs):
+    """DragString(wxString str, wxCursor cursor=wxNullCursor) -> DragImage"""
+    val = _controls.new_DragString(*args, **kwargs)
+    val.thisown = 1
+    return val
+
+def DragTreeItem(*args, **kwargs):
+    """DragTreeItem(TreeCtrl treeCtrl, TreeItemId id) -> DragImage"""
+    val = _controls.new_DragTreeItem(*args, **kwargs)
+    val.thisown = 1
+    return val
+
+def DragListItem(*args, **kwargs):
+    """DragListItem(ListCtrl listCtrl, long id) -> DragImage"""
+    val = _controls.new_DragListItem(*args, **kwargs)
+    val.thisown = 1
+    return val
+
 
diff --git a/wxPython/src/gtk/controls_wrap.cpp b/wxPython/src/gtk/controls_wrap.cpp
index 0216c7f477..5a03da4150 100644
--- a/wxPython/src/gtk/controls_wrap.cpp
+++ b/wxPython/src/gtk/controls_wrap.cpp
@@ -244,63 +244,67 @@ SWIGEXPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #define  SWIGTYPE_p_wxToggleButton swig_types[20] 
 #define  SWIGTYPE_p_wxRadioButton swig_types[21] 
 #define  SWIGTYPE_p_wxChoice swig_types[22] 
-#define  SWIGTYPE_p_wxListItemAttr swig_types[23] 
-#define  SWIGTYPE_p_int swig_types[24] 
-#define  SWIGTYPE_p_wxSize swig_types[25] 
-#define  SWIGTYPE_p_wxListView swig_types[26] 
-#define  SWIGTYPE_p_wxIcon swig_types[27] 
-#define  SWIGTYPE_p_wxTextCtrl swig_types[28] 
-#define  SWIGTYPE_p_wxNotebook swig_types[29] 
-#define  SWIGTYPE_p_wxNotifyEvent swig_types[30] 
-#define  SWIGTYPE_p_wxArrayString swig_types[31] 
-#define  SWIGTYPE_p_wxListbook swig_types[32] 
-#define  SWIGTYPE_p_wxStaticBitmap swig_types[33] 
-#define  SWIGTYPE_p_wxSlider swig_types[34] 
-#define  SWIGTYPE_p_wxStaticBox swig_types[35] 
-#define  SWIGTYPE_p_wxArrayInt swig_types[36] 
-#define  SWIGTYPE_p_wxContextHelp swig_types[37] 
-#define  SWIGTYPE_p_long swig_types[38] 
-#define  SWIGTYPE_p_wxEvtHandler swig_types[39] 
-#define  SWIGTYPE_p_wxListEvent swig_types[40] 
-#define  SWIGTYPE_p_wxListBox swig_types[41] 
-#define  SWIGTYPE_p_wxCheckListBox swig_types[42] 
-#define  SWIGTYPE_p_wxBookCtrl swig_types[43] 
-#define  SWIGTYPE_p_wxSpinButton swig_types[44] 
-#define  SWIGTYPE_p_wxButton swig_types[45] 
-#define  SWIGTYPE_p_wxBitmapButton swig_types[46] 
-#define  SWIGTYPE_p_wxRect swig_types[47] 
-#define  SWIGTYPE_p_wxContextHelpButton swig_types[48] 
-#define  SWIGTYPE_p_wxRadioBox swig_types[49] 
-#define  SWIGTYPE_p_wxScrollBar swig_types[50] 
-#define  SWIGTYPE_p_wxTreeItemId swig_types[51] 
-#define  SWIGTYPE_p_wxComboBox swig_types[52] 
-#define  SWIGTYPE_p_wxHelpEvent swig_types[53] 
-#define  SWIGTYPE_p_wxListItem swig_types[54] 
-#define  SWIGTYPE_p_wxNotebookSizer swig_types[55] 
-#define  SWIGTYPE_p_wxSpinCtrl swig_types[56] 
-#define  SWIGTYPE_p_wxImageList swig_types[57] 
-#define  SWIGTYPE_p_wxHelpProvider swig_types[58] 
-#define  SWIGTYPE_p_wxTextAttr swig_types[59] 
-#define  SWIGTYPE_p_wxSimpleHelpProvider swig_types[60] 
-#define  SWIGTYPE_p_wxPoint swig_types[61] 
-#define  SWIGTYPE_p_wxListbookEvent swig_types[62] 
-#define  SWIGTYPE_p_wxNotebookEvent swig_types[63] 
-#define  SWIGTYPE_p_wxObject swig_types[64] 
-#define  SWIGTYPE_p_wxKeyEvent swig_types[65] 
-#define  SWIGTYPE_p_wxWindow swig_types[66] 
-#define  SWIGTYPE_p_wxString swig_types[67] 
-#define  SWIGTYPE_p_wxBitmap swig_types[68] 
-#define  SWIGTYPE_p_wxTreeEvent swig_types[69] 
-#define  SWIGTYPE_p_wxMouseEvent swig_types[70] 
-#define  SWIGTYPE_p_wxCommandEvent swig_types[71] 
-#define  SWIGTYPE_p_wxStaticText swig_types[72] 
-#define  SWIGTYPE_p_wxControlWithItems swig_types[73] 
-#define  SWIGTYPE_p_wxToolBarToolBase swig_types[74] 
-#define  SWIGTYPE_p_wxColour swig_types[75] 
-#define  SWIGTYPE_p_wxToolBar swig_types[76] 
-#define  SWIGTYPE_p_wxBookCtrlSizer swig_types[77] 
-#define  SWIGTYPE_p_wxValidator swig_types[78] 
-static swig_type_info *swig_types[80];
+#define  SWIGTYPE_p_wxMemoryDC swig_types[23] 
+#define  SWIGTYPE_p_wxListItemAttr swig_types[24] 
+#define  SWIGTYPE_p_int swig_types[25] 
+#define  SWIGTYPE_p_wxSize swig_types[26] 
+#define  SWIGTYPE_p_wxDC swig_types[27] 
+#define  SWIGTYPE_p_wxListView swig_types[28] 
+#define  SWIGTYPE_p_wxIcon swig_types[29] 
+#define  SWIGTYPE_p_wxTextCtrl swig_types[30] 
+#define  SWIGTYPE_p_wxNotebook swig_types[31] 
+#define  SWIGTYPE_p_wxNotifyEvent swig_types[32] 
+#define  SWIGTYPE_p_wxArrayString swig_types[33] 
+#define  SWIGTYPE_p_wxListbook swig_types[34] 
+#define  SWIGTYPE_p_wxStaticBitmap swig_types[35] 
+#define  SWIGTYPE_p_wxSlider swig_types[36] 
+#define  SWIGTYPE_p_wxStaticBox swig_types[37] 
+#define  SWIGTYPE_p_wxArrayInt swig_types[38] 
+#define  SWIGTYPE_p_wxContextHelp swig_types[39] 
+#define  SWIGTYPE_p_long swig_types[40] 
+#define  SWIGTYPE_p_wxEvtHandler swig_types[41] 
+#define  SWIGTYPE_p_wxListEvent swig_types[42] 
+#define  SWIGTYPE_p_wxListBox swig_types[43] 
+#define  SWIGTYPE_p_wxCheckListBox swig_types[44] 
+#define  SWIGTYPE_p_wxBookCtrl swig_types[45] 
+#define  SWIGTYPE_p_wxSpinButton swig_types[46] 
+#define  SWIGTYPE_p_wxButton swig_types[47] 
+#define  SWIGTYPE_p_wxBitmapButton swig_types[48] 
+#define  SWIGTYPE_p_wxRect swig_types[49] 
+#define  SWIGTYPE_p_wxContextHelpButton swig_types[50] 
+#define  SWIGTYPE_p_wxRadioBox swig_types[51] 
+#define  SWIGTYPE_p_wxScrollBar swig_types[52] 
+#define  SWIGTYPE_p_wxTreeItemId swig_types[53] 
+#define  SWIGTYPE_p_wxComboBox swig_types[54] 
+#define  SWIGTYPE_p_wxHelpEvent swig_types[55] 
+#define  SWIGTYPE_p_wxListItem swig_types[56] 
+#define  SWIGTYPE_p_wxNotebookSizer swig_types[57] 
+#define  SWIGTYPE_p_wxGenericDragImage swig_types[58] 
+#define  SWIGTYPE_p_wxSpinCtrl swig_types[59] 
+#define  SWIGTYPE_p_wxImageList swig_types[60] 
+#define  SWIGTYPE_p_wxHelpProvider swig_types[61] 
+#define  SWIGTYPE_p_wxTextAttr swig_types[62] 
+#define  SWIGTYPE_p_wxSimpleHelpProvider swig_types[63] 
+#define  SWIGTYPE_p_wxPoint swig_types[64] 
+#define  SWIGTYPE_p_wxListbookEvent swig_types[65] 
+#define  SWIGTYPE_p_wxNotebookEvent swig_types[66] 
+#define  SWIGTYPE_p_wxObject swig_types[67] 
+#define  SWIGTYPE_p_wxCursor swig_types[68] 
+#define  SWIGTYPE_p_wxKeyEvent swig_types[69] 
+#define  SWIGTYPE_p_wxWindow swig_types[70] 
+#define  SWIGTYPE_p_wxString swig_types[71] 
+#define  SWIGTYPE_p_wxBitmap swig_types[72] 
+#define  SWIGTYPE_p_wxTreeEvent swig_types[73] 
+#define  SWIGTYPE_p_wxMouseEvent swig_types[74] 
+#define  SWIGTYPE_p_wxCommandEvent swig_types[75] 
+#define  SWIGTYPE_p_wxStaticText swig_types[76] 
+#define  SWIGTYPE_p_wxControlWithItems swig_types[77] 
+#define  SWIGTYPE_p_wxToolBarToolBase swig_types[78] 
+#define  SWIGTYPE_p_wxColour swig_types[79] 
+#define  SWIGTYPE_p_wxToolBar swig_types[80] 
+#define  SWIGTYPE_p_wxBookCtrlSizer swig_types[81] 
+#define  SWIGTYPE_p_wxValidator swig_types[82] 
+static swig_type_info *swig_types[84];
 
 /* -------- TYPES TABLE (END) -------- */
 
@@ -583,7 +587,7 @@ wxRect wxPyListCtrl_GetItemRect(wxPyListCtrl *self,long item,int code){
         }
 bool wxPyListCtrl_SortItems(wxPyListCtrl *self,PyObject *func){
             if (!PyCallable_Check(func))
-                return FALSE;
+                return False;
             return self->SortItems((wxListCtrlCompare)wxPyListCtrl_SortItems, (long)func);
         }
 wxWindow *wxPyListCtrl_GetMainWindow(wxPyListCtrl *self){
@@ -601,11 +605,11 @@ wxWindow *wxPyListCtrl_GetMainWindow(wxPyListCtrl *self){
     DECLARE_DEF_STRING(_TreeCtrlNameStr);
 
 bool wxTreeItemId_operator_ee___(wxTreeItemId *self,wxTreeItemId const *other){
-            if (!other) return false;
+            if (!other) return False;
             return *self == *other;
         }
 bool wxTreeItemId_operator_Ne___(wxTreeItemId *self,wxTreeItemId const *other){
-            if (!other) return true;
+            if (!other) return True;
             return *self != *other;
         }
 void wxPyTreeItemData_Destroy(wxPyTreeItemData *self){ delete self; }
@@ -638,8 +642,8 @@ public:
         bool found;
         wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "OnCompareItems"))) {
-            PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), false);
-            PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), false);
+            PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), False);
+            PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), False);
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)",o1,o2));
             Py_DECREF(o1);
             Py_DECREF(o2);
@@ -694,7 +698,7 @@ PyObject *wxPyTreeCtrl_GetSelections(wxPyTreeCtrl *self){
             num = self->GetSelections(array);
             for (x=0; x < num; x++) {
                 wxTreeItemId *tii = new wxTreeItemId(array.Item(x));
-                PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), true);
+                PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), True);
                 PyList_Append(rval, item);
             }
             wxPyEndBlockThreads();
@@ -705,8 +709,8 @@ PyObject *wxPyTreeCtrl_GetFirstChild(wxPyTreeCtrl *self,wxTreeItemId const &item
             wxTreeItemId ritem = self->GetFirstChild(item, cookie);
             wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(2);
-            PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), true));
-            PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(cookie, wxT("wxTreeItemIdValue"), true));
+            PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), True));
+            PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(cookie, wxT("wxTreeItemIdValue"), True));
             wxPyEndBlockThreads();
             return tup;
         }
@@ -714,8 +718,8 @@ PyObject *wxPyTreeCtrl_GetNextChild(wxPyTreeCtrl *self,wxTreeItemId const &item,
             wxTreeItemId ritem = self->GetNextChild(item, cookie);
             wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(2);
-            PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), true));
-            PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(cookie, wxT("wxTreeItemIdValue"), true));
+            PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), True));
+            PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(cookie, wxT("wxTreeItemIdValue"), True));
             wxPyEndBlockThreads();
             return tup;
         }
@@ -724,7 +728,7 @@ PyObject *wxPyTreeCtrl_GetBoundingRect(wxPyTreeCtrl *self,wxTreeItemId const &it
             if (self->GetBoundingRect(item, rect, textOnly)) {
                 wxPyBeginBlockThreads();
                 wxRect* r = new wxRect(rect);
-                PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), true);
+                PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), True);
                 wxPyEndBlockThreads();
                 return val;
             }
@@ -806,13 +810,16 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyControl, wxControl, RemoveChild);
 
 
 void wxHelpProvider_Destroy(wxHelpProvider *self){ delete self; }
+
+#include <wx/generic/dragimgg.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -824,10 +831,10 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar
     wxString const &arg8_defvalue = wxPyButtonNameStr ;
     wxString *arg8 = (wxString *) &arg8_defvalue ;
     wxButton *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -843,7 +850,7 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -867,7 +874,7 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -930,7 +937,7 @@ static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxButton *arg1 = (wxButton *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxString *arg4 = 0 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -942,10 +949,10 @@ static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *k
     wxString const &arg9_defvalue = wxPyButtonNameStr ;
     wxString *arg9 = (wxString *) &arg9_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp9 = false ;
+    bool temp9 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -963,7 +970,7 @@ static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *k
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
@@ -987,7 +994,7 @@ static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *k
         {
             arg9 = wxString_in_helper(obj8);
             if (arg9 == NULL) SWIG_fail;
-            temp9 = true;
+            temp9 = True;
         }
     }
     {
@@ -1080,7 +1087,7 @@ static PyObject * Button_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxBitmap *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -1094,7 +1101,7 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject
     wxBitmapButton *result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -1133,7 +1140,7 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -1188,7 +1195,7 @@ static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxBitmapButton *arg1 = (wxBitmapButton *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxBitmap *arg4 = 0 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -1202,7 +1209,7 @@ static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObj
     bool result;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp9 = false ;
+    bool temp9 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -1243,7 +1250,7 @@ static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObj
         {
             arg9 = wxString_in_helper(obj8);
             if (arg9 == NULL) SWIG_fail;
-            temp9 = true;
+            temp9 = True;
         }
     }
     {
@@ -1590,7 +1597,7 @@ static PyObject * BitmapButton_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_CheckBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -1602,10 +1609,10 @@ static PyObject *_wrap_new_CheckBox(PyObject *self, PyObject *args, PyObject *kw
     wxString const &arg8_defvalue = wxPyCheckBoxNameStr ;
     wxString *arg8 = (wxString *) &arg8_defvalue ;
     wxCheckBox *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -1621,7 +1628,7 @@ static PyObject *_wrap_new_CheckBox(PyObject *self, PyObject *args, PyObject *kw
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -1645,7 +1652,7 @@ static PyObject *_wrap_new_CheckBox(PyObject *self, PyObject *args, PyObject *kw
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -1704,7 +1711,7 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxCheckBox *arg1 = (wxCheckBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxString *arg4 = 0 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -1716,10 +1723,10 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject
     wxString const &arg9_defvalue = wxPyCheckBoxNameStr ;
     wxString *arg9 = (wxString *) &arg9_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp9 = false ;
+    bool temp9 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -1737,7 +1744,7 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
@@ -1761,7 +1768,7 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject
         {
             arg9 = wxString_in_helper(obj8);
             if (arg9 == NULL) SWIG_fail;
-            temp9 = true;
+            temp9 = True;
         }
     }
     {
@@ -1982,7 +1989,7 @@ static PyObject * CheckBox_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -1997,7 +2004,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar
     wxChoice *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -2039,7 +2046,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar
         {
             arg9 = wxString_in_helper(obj7);
             if (arg9 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -2096,7 +2103,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxChoice *arg1 = (wxChoice *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -2111,7 +2118,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp9 = false ;
+    bool temp9 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -2155,7 +2162,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k
         {
             arg10 = wxString_in_helper(obj8);
             if (arg10 == NULL) SWIG_fail;
-            temp9 = true;
+            temp9 = True;
         }
     }
     {
@@ -2265,7 +2272,7 @@ static PyObject *_wrap_Choice_SetStringSelection(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxChoice *arg1 = (wxChoice *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2277,7 +2284,7 @@ static PyObject *_wrap_Choice_SetStringSelection(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2306,7 +2313,7 @@ static PyObject *_wrap_Choice_SetString(PyObject *self, PyObject *args, PyObject
     wxChoice *arg1 = (wxChoice *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -2318,7 +2325,7 @@ static PyObject *_wrap_Choice_SetString(PyObject *self, PyObject *args, PyObject
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2352,7 +2359,7 @@ static PyObject * Choice_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
@@ -2367,10 +2374,10 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw
     wxString const &arg10_defvalue = wxPyComboBoxNameStr ;
     wxString *arg10 = (wxString *) &arg10_defvalue ;
     wxComboBox *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp9 = false ;
+    bool temp9 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -2388,7 +2395,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
@@ -2420,7 +2427,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw
         {
             arg10 = wxString_in_helper(obj8);
             if (arg10 == NULL) SWIG_fail;
-            temp9 = true;
+            temp9 = True;
         }
     }
     {
@@ -2485,7 +2492,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
@@ -2500,10 +2507,10 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
     wxString const &arg11_defvalue = wxPyComboBoxNameStr ;
     wxString *arg11 = (wxString *) &arg11_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp10 = false ;
+    bool temp10 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -2523,7 +2530,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     if (obj4) {
@@ -2555,7 +2562,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
         {
             arg11 = wxString_in_helper(obj9);
             if (arg11 == NULL) SWIG_fail;
-            temp10 = true;
+            temp10 = True;
         }
     }
     {
@@ -2629,7 +2636,7 @@ static PyObject *_wrap_ComboBox_SetValue(PyObject *self, PyObject *args, PyObjec
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2641,7 +2648,7 @@ static PyObject *_wrap_ComboBox_SetValue(PyObject *self, PyObject *args, PyObjec
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2818,7 +2825,7 @@ static PyObject *_wrap_ComboBox_Replace(PyObject *self, PyObject *args, PyObject
     long arg2 ;
     long arg3 ;
     wxString *arg4 = 0 ;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -2830,7 +2837,7 @@ static PyObject *_wrap_ComboBox_Replace(PyObject *self, PyObject *args, PyObject
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2968,7 +2975,7 @@ static PyObject * ComboBox_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_Gauge(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -2982,7 +2989,7 @@ static PyObject *_wrap_new_Gauge(PyObject *self, PyObject *args, PyObject *kwarg
     wxGauge *result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     PyObject * obj4 = 0 ;
@@ -3016,7 +3023,7 @@ static PyObject *_wrap_new_Gauge(PyObject *self, PyObject *args, PyObject *kwarg
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -3067,7 +3074,7 @@ static PyObject *_wrap_Gauge_Create(PyObject *self, PyObject *args, PyObject *kw
     PyObject *resultobj;
     wxGauge *arg1 = (wxGauge *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     int arg4 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -3081,7 +3088,7 @@ static PyObject *_wrap_Gauge_Create(PyObject *self, PyObject *args, PyObject *kw
     bool result;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp9 = false ;
+    bool temp9 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj4 = 0 ;
@@ -3117,7 +3124,7 @@ static PyObject *_wrap_Gauge_Create(PyObject *self, PyObject *args, PyObject *kw
         {
             arg9 = wxString_in_helper(obj8);
             if (arg9 == NULL) SWIG_fail;
-            temp9 = true;
+            temp9 = True;
         }
     }
     {
@@ -3377,7 +3384,7 @@ static PyObject * Gauge_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -3387,10 +3394,10 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k
     wxString const &arg7_defvalue = wxPyStaticBoxNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     wxStaticBox *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -3405,7 +3412,7 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -3423,7 +3430,7 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -3486,7 +3493,7 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxStaticBox *arg1 = (wxStaticBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxString *arg4 = 0 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -3496,10 +3503,10 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject
     wxString const &arg8_defvalue = wxPyStaticBoxNameStr ;
     wxString *arg8 = (wxString *) &arg8_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -3516,7 +3523,7 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
@@ -3534,7 +3541,7 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -3577,7 +3584,7 @@ static PyObject * StaticBox_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_StaticLine(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -3588,7 +3595,7 @@ static PyObject *_wrap_new_StaticLine(PyObject *self, PyObject *args, PyObject *
     wxStaticLine *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -3615,7 +3622,7 @@ static PyObject *_wrap_new_StaticLine(PyObject *self, PyObject *args, PyObject *
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -3666,7 +3673,7 @@ static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObjec
     PyObject *resultobj;
     wxStaticLine *arg1 = (wxStaticLine *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -3677,7 +3684,7 @@ static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObjec
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -3706,7 +3713,7 @@ static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObjec
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -3788,7 +3795,7 @@ static PyObject * StaticLine_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_StaticText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -3798,10 +3805,10 @@ static PyObject *_wrap_new_StaticText(PyObject *self, PyObject *args, PyObject *
     wxString const &arg7_defvalue = wxPyStaticTextNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     wxStaticText *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -3816,7 +3823,7 @@ static PyObject *_wrap_new_StaticText(PyObject *self, PyObject *args, PyObject *
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -3834,7 +3841,7 @@ static PyObject *_wrap_new_StaticText(PyObject *self, PyObject *args, PyObject *
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -3893,7 +3900,7 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec
     PyObject *resultobj;
     wxStaticText *arg1 = (wxStaticText *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxString *arg4 = 0 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -3903,10 +3910,10 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec
     wxString const &arg8_defvalue = wxPyStaticTextNameStr ;
     wxString *arg8 = (wxString *) &arg8_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -3923,7 +3930,7 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
@@ -3941,7 +3948,7 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -3984,7 +3991,7 @@ static PyObject * StaticText_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_StaticBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxBitmap *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -3996,7 +4003,7 @@ static PyObject *_wrap_new_StaticBitmap(PyObject *self, PyObject *args, PyObject
     wxStaticBitmap *result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -4028,7 +4035,7 @@ static PyObject *_wrap_new_StaticBitmap(PyObject *self, PyObject *args, PyObject
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -4079,7 +4086,7 @@ static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxStaticBitmap *arg1 = (wxStaticBitmap *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxBitmap *arg4 = 0 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -4091,7 +4098,7 @@ static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObj
     bool result;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -4125,7 +4132,7 @@ static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObj
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -4249,7 +4256,7 @@ static PyObject * StaticBitmap_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -4264,7 +4271,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa
     wxListBox *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -4306,7 +4313,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa
         {
             arg9 = wxString_in_helper(obj7);
             if (arg9 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -4363,7 +4370,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -4378,7 +4385,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp9 = false ;
+    bool temp9 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -4422,7 +4429,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *
         {
             arg10 = wxString_in_helper(obj8);
             if (arg10 == NULL) SWIG_fail;
-            temp9 = true;
+            temp9 = True;
         }
     }
     {
@@ -4459,7 +4466,7 @@ static PyObject *_wrap_ListBox_Insert(PyObject *self, PyObject *args, PyObject *
     wxString *arg2 = 0 ;
     int arg3 ;
     PyObject *arg4 = (PyObject *) NULL ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -4472,7 +4479,7 @@ static PyObject *_wrap_ListBox_Insert(PyObject *self, PyObject *args, PyObject *
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj3) {
         arg4 = obj3;
@@ -4632,7 +4639,7 @@ static PyObject *_wrap_ListBox_SetSelection(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     int arg2 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -4738,9 +4745,9 @@ static PyObject *_wrap_ListBox_SetStringSelection(PyObject *self, PyObject *args
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     wxString *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4753,7 +4760,7 @@ static PyObject *_wrap_ListBox_SetStringSelection(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         arg3 = PyInt_AsLong(obj2) ? true : false;
@@ -4835,7 +4842,7 @@ static PyObject *_wrap_ListBox_SetFirstItemStr(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4847,7 +4854,7 @@ static PyObject *_wrap_ListBox_SetFirstItemStr(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4900,7 +4907,7 @@ static PyObject *_wrap_ListBox_AppendAndEnsureVisible(PyObject *self, PyObject *
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4912,7 +4919,7 @@ static PyObject *_wrap_ListBox_AppendAndEnsureVisible(PyObject *self, PyObject *
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4971,7 +4978,7 @@ static PyObject * ListBox_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -4986,7 +4993,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject
     wxCheckListBox *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -5028,7 +5035,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject
         {
             arg9 = wxString_in_helper(obj7);
             if (arg9 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -5085,7 +5092,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxCheckListBox *arg1 = (wxCheckListBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -5100,7 +5107,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp9 = false ;
+    bool temp9 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -5144,7 +5151,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj
         {
             arg10 = wxString_in_helper(obj8);
             if (arg10 == NULL) SWIG_fail;
-            temp9 = true;
+            temp9 = True;
         }
     }
     {
@@ -5205,7 +5212,7 @@ static PyObject *_wrap_CheckListBox_Check(PyObject *self, PyObject *args, PyObje
     PyObject *resultobj;
     wxCheckListBox *arg1 = (wxCheckListBox *) 0 ;
     int arg2 ;
-    int arg3 = (int) TRUE ;
+    int arg3 = (int) True ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "index",(char *) "check", NULL 
@@ -5287,8 +5294,8 @@ static PyObject *_wrap_CheckListBox_HitTest(PyObject *self, PyObject *args, PyOb
 static PyObject *_wrap_CheckListBox_HitTestXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckListBox *arg1 = (wxCheckListBox *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -6201,7 +6208,7 @@ static PyObject * TextAttr_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
@@ -6214,10 +6221,10 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw
     wxString const &arg8_defvalue = wxPyTextCtrlNameStr ;
     wxString *arg8 = (wxString *) &arg8_defvalue ;
     wxTextCtrl *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -6234,7 +6241,7 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
@@ -6259,7 +6266,7 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -6322,7 +6329,7 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
@@ -6335,10 +6342,10 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject
     wxString const &arg9_defvalue = wxPyTextCtrlNameStr ;
     wxString *arg9 = (wxString *) &arg9_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp9 = false ;
+    bool temp9 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -6357,7 +6364,7 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     if (obj4) {
@@ -6382,7 +6389,7 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject
         {
             arg9 = wxString_in_helper(obj8);
             if (arg9 == NULL) SWIG_fail;
-            temp9 = true;
+            temp9 = True;
         }
     }
     {
@@ -6450,7 +6457,7 @@ static PyObject *_wrap_TextCtrl_SetValue(PyObject *self, PyObject *args, PyObjec
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6462,7 +6469,7 @@ static PyObject *_wrap_TextCtrl_SetValue(PyObject *self, PyObject *args, PyObjec
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6801,7 +6808,7 @@ static PyObject *_wrap_TextCtrl_Replace(PyObject *self, PyObject *args, PyObject
     long arg2 ;
     long arg3 ;
     wxString *arg4 = 0 ;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -6813,7 +6820,7 @@ static PyObject *_wrap_TextCtrl_Replace(PyObject *self, PyObject *args, PyObject
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6868,7 +6875,7 @@ static PyObject *_wrap_TextCtrl_LoadFile(PyObject *self, PyObject *args, PyObjec
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6880,7 +6887,7 @@ static PyObject *_wrap_TextCtrl_LoadFile(PyObject *self, PyObject *args, PyObjec
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6910,7 +6917,7 @@ static PyObject *_wrap_TextCtrl_SaveFile(PyObject *self, PyObject *args, PyObjec
     wxString const &arg2_defvalue = wxPyEmptyString ;
     wxString *arg2 = (wxString *) &arg2_defvalue ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6923,7 +6930,7 @@ static PyObject *_wrap_TextCtrl_SaveFile(PyObject *self, PyObject *args, PyObjec
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     {
@@ -7028,7 +7035,7 @@ static PyObject *_wrap_TextCtrl_WriteText(PyObject *self, PyObject *args, PyObje
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7040,7 +7047,7 @@ static PyObject *_wrap_TextCtrl_WriteText(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7068,7 +7075,7 @@ static PyObject *_wrap_TextCtrl_AppendText(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7080,7 +7087,7 @@ static PyObject *_wrap_TextCtrl_AppendText(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7776,7 +7783,7 @@ static PyObject *_wrap_TextCtrl_write(PyObject *self, PyObject *args, PyObject *
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7788,7 +7795,7 @@ static PyObject *_wrap_TextCtrl_write(PyObject *self, PyObject *args, PyObject *
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7971,7 +7978,7 @@ static PyObject * TextUrlEvent_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_ScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) -1 ;
+    int arg2 = (int) -1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -7984,7 +7991,7 @@ static PyObject *_wrap_new_ScrollBar(PyObject *self, PyObject *args, PyObject *k
     wxScrollBar *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -8018,7 +8025,7 @@ static PyObject *_wrap_new_ScrollBar(PyObject *self, PyObject *args, PyObject *k
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -8069,7 +8076,7 @@ static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxScrollBar *arg1 = (wxScrollBar *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 = (wxWindowID) -1 ;
+    int arg3 = (int) -1 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -8082,7 +8089,7 @@ static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -8118,7 +8125,7 @@ static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -8300,7 +8307,7 @@ static PyObject *_wrap_ScrollBar_SetScrollbar(PyObject *self, PyObject *args, Py
     int arg3 ;
     int arg4 ;
     int arg5 ;
-    bool arg6 = (bool) TRUE ;
+    bool arg6 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj5 = 0 ;
     char *kwnames[] = {
@@ -8337,7 +8344,7 @@ static PyObject * ScrollBar_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_SpinButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) -1 ;
+    int arg2 = (int) -1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -8348,7 +8355,7 @@ static PyObject *_wrap_new_SpinButton(PyObject *self, PyObject *args, PyObject *
     wxSpinButton *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -8375,7 +8382,7 @@ static PyObject *_wrap_new_SpinButton(PyObject *self, PyObject *args, PyObject *
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -8426,7 +8433,7 @@ static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObjec
     PyObject *resultobj;
     wxSpinButton *arg1 = (wxSpinButton *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 = (wxWindowID) -1 ;
+    int arg3 = (int) -1 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -8437,7 +8444,7 @@ static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObjec
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -8466,7 +8473,7 @@ static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObjec
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -8702,7 +8709,7 @@ static PyObject * SpinButton_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_SpinCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) -1 ;
+    int arg2 = (int) -1 ;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
@@ -8716,10 +8723,10 @@ static PyObject *_wrap_new_SpinCtrl(PyObject *self, PyObject *args, PyObject *kw
     wxString const &arg10_defvalue = wxPySpinCtrlNameStr ;
     wxString *arg10 = (wxString *) &arg10_defvalue ;
     wxSpinCtrl *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp10 = false ;
+    bool temp10 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -8735,7 +8742,7 @@ static PyObject *_wrap_new_SpinCtrl(PyObject *self, PyObject *args, PyObject *kw
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
@@ -8754,7 +8761,7 @@ static PyObject *_wrap_new_SpinCtrl(PyObject *self, PyObject *args, PyObject *kw
         {
             arg10 = wxString_in_helper(obj9);
             if (arg10 == NULL) SWIG_fail;
-            temp10 = true;
+            temp10 = True;
         }
     }
     {
@@ -8813,7 +8820,7 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxSpinCtrl *arg1 = (wxSpinCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 = (wxWindowID) -1 ;
+    int arg3 = (int) -1 ;
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
@@ -8827,10 +8834,10 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject
     wxString const &arg11_defvalue = wxPySpinCtrlNameStr ;
     wxString *arg11 = (wxString *) &arg11_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp11 = false ;
+    bool temp11 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -8848,7 +8855,7 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     if (obj4) {
@@ -8867,7 +8874,7 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject
         {
             arg11 = wxString_in_helper(obj10);
             if (arg11 == NULL) SWIG_fail;
-            temp11 = true;
+            temp11 = True;
         }
     }
     {
@@ -8954,7 +8961,7 @@ static PyObject *_wrap_SpinCtrl_SetValueString(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxSpinCtrl *arg1 = (wxSpinCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8966,7 +8973,7 @@ static PyObject *_wrap_SpinCtrl_SetValueString(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9102,7 +9109,7 @@ static PyObject * SpinCtrl_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -9117,10 +9124,10 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw
     wxString const &arg11_defvalue = wxPyRadioBoxNameStr ;
     wxString *arg11 = (wxString *) &arg11_defvalue ;
     wxRadioBox *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp10 = false ;
+    bool temp10 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -9137,7 +9144,7 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -9168,7 +9175,7 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw
         {
             arg11 = wxString_in_helper(obj9);
             if (arg11 == NULL) SWIG_fail;
-            temp10 = true;
+            temp10 = True;
         }
     }
     {
@@ -9233,7 +9240,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxString *arg4 = 0 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -9248,10 +9255,10 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
     wxString const &arg12_defvalue = wxPyRadioBoxNameStr ;
     wxString *arg12 = (wxString *) &arg12_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp11 = false ;
+    bool temp11 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -9270,7 +9277,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
@@ -9301,7 +9308,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
         {
             arg12 = wxString_in_helper(obj10);
             if (arg12 == NULL) SWIG_fail;
-            temp11 = true;
+            temp11 = True;
         }
     }
     {
@@ -9426,7 +9433,7 @@ static PyObject *_wrap_RadioBox_SetStringSelection(PyObject *self, PyObject *arg
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9438,7 +9445,7 @@ static PyObject *_wrap_RadioBox_SetStringSelection(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9492,7 +9499,7 @@ static PyObject *_wrap_RadioBox_FindString(PyObject *self, PyObject *args, PyObj
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9504,7 +9511,7 @@ static PyObject *_wrap_RadioBox_FindString(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9565,7 +9572,7 @@ static PyObject *_wrap_RadioBox_SetString(PyObject *self, PyObject *args, PyObje
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -9577,7 +9584,7 @@ static PyObject *_wrap_RadioBox_SetString(PyObject *self, PyObject *args, PyObje
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9605,7 +9612,7 @@ static PyObject *_wrap_RadioBox_EnableItem(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     int arg2 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -9636,7 +9643,7 @@ static PyObject *_wrap_RadioBox_ShowItem(PyObject *self, PyObject *args, PyObjec
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     int arg2 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -9751,7 +9758,7 @@ static PyObject * RadioBox_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_RadioButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -9763,10 +9770,10 @@ static PyObject *_wrap_new_RadioButton(PyObject *self, PyObject *args, PyObject
     wxString const &arg8_defvalue = wxPyRadioButtonNameStr ;
     wxString *arg8 = (wxString *) &arg8_defvalue ;
     wxRadioButton *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -9782,7 +9789,7 @@ static PyObject *_wrap_new_RadioButton(PyObject *self, PyObject *args, PyObject
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -9806,7 +9813,7 @@ static PyObject *_wrap_new_RadioButton(PyObject *self, PyObject *args, PyObject
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -9865,7 +9872,7 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje
     PyObject *resultobj;
     wxRadioButton *arg1 = (wxRadioButton *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxString *arg4 = 0 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -9877,10 +9884,10 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje
     wxString const &arg9_defvalue = wxPyRadioButtonNameStr ;
     wxString *arg9 = (wxString *) &arg9_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp9 = false ;
+    bool temp9 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -9898,7 +9905,7 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
@@ -9922,7 +9929,7 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje
         {
             arg9 = wxString_in_helper(obj8);
             if (arg9 == NULL) SWIG_fail;
-            temp9 = true;
+            temp9 = True;
         }
     }
     {
@@ -10018,7 +10025,7 @@ static PyObject * RadioButton_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_Slider(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     int arg3 ;
     int arg4 ;
     int arg5 ;
@@ -10034,7 +10041,7 @@ static PyObject *_wrap_new_Slider(PyObject *self, PyObject *args, PyObject *kwar
     wxSlider *result;
     wxPoint temp6 ;
     wxSize temp7 ;
-    bool temp10 = false ;
+    bool temp10 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj5 = 0 ;
     PyObject * obj6 = 0 ;
@@ -10068,7 +10075,7 @@ static PyObject *_wrap_new_Slider(PyObject *self, PyObject *args, PyObject *kwar
         {
             arg10 = wxString_in_helper(obj9);
             if (arg10 == NULL) SWIG_fail;
-            temp10 = true;
+            temp10 = True;
         }
     }
     {
@@ -10119,7 +10126,7 @@ static PyObject *_wrap_Slider_Create(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     int arg4 ;
     int arg5 ;
     int arg6 ;
@@ -10135,7 +10142,7 @@ static PyObject *_wrap_Slider_Create(PyObject *self, PyObject *args, PyObject *k
     bool result;
     wxPoint temp7 ;
     wxSize temp8 ;
-    bool temp11 = false ;
+    bool temp11 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj6 = 0 ;
@@ -10171,7 +10178,7 @@ static PyObject *_wrap_Slider_Create(PyObject *self, PyObject *args, PyObject *k
         {
             arg11 = wxString_in_helper(obj10);
             if (arg11 == NULL) SWIG_fail;
-            temp11 = true;
+            temp11 = True;
         }
     }
     {
@@ -10732,7 +10739,7 @@ static PyObject * Slider_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_ToggleButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -10744,10 +10751,10 @@ static PyObject *_wrap_new_ToggleButton(PyObject *self, PyObject *args, PyObject
     wxString const &arg8_defvalue = wxPyToggleButtonNameStr ;
     wxString *arg8 = (wxString *) &arg8_defvalue ;
     wxToggleButton *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -10763,7 +10770,7 @@ static PyObject *_wrap_new_ToggleButton(PyObject *self, PyObject *args, PyObject
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -10787,7 +10794,7 @@ static PyObject *_wrap_new_ToggleButton(PyObject *self, PyObject *args, PyObject
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -10846,7 +10853,7 @@ static PyObject *_wrap_ToggleButton_Create(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxToggleButton *arg1 = (wxToggleButton *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxString *arg4 = 0 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -10858,10 +10865,10 @@ static PyObject *_wrap_ToggleButton_Create(PyObject *self, PyObject *args, PyObj
     wxString const &arg9_defvalue = wxPyToggleButtonNameStr ;
     wxString *arg9 = (wxString *) &arg9_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp9 = false ;
+    bool temp9 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -10879,7 +10886,7 @@ static PyObject *_wrap_ToggleButton_Create(PyObject *self, PyObject *args, PyObj
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
@@ -10903,7 +10910,7 @@ static PyObject *_wrap_ToggleButton_Create(PyObject *self, PyObject *args, PyObj
         {
             arg9 = wxString_in_helper(obj8);
             if (arg9 == NULL) SWIG_fail;
-            temp9 = true;
+            temp9 = True;
         }
     }
     {
@@ -10993,7 +11000,7 @@ static PyObject *_wrap_ToggleButton_SetLabel(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxToggleButton *arg1 = (wxToggleButton *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -11005,7 +11012,7 @@ static PyObject *_wrap_ToggleButton_SetLabel(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11123,7 +11130,7 @@ static PyObject *_wrap_BookCtrl_SetPageText(PyObject *self, PyObject *args, PyOb
     size_t arg2 ;
     wxString *arg3 = 0 ;
     bool result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11138,7 +11145,7 @@ static PyObject *_wrap_BookCtrl_SetPageText(PyObject *self, PyObject *args, PyOb
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11492,10 +11499,10 @@ static PyObject *_wrap_BookCtrl_AddPage(PyObject *self, PyObject *args, PyObject
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
     wxString *arg3 = 0 ;
-    bool arg4 = (bool) false ;
+    bool arg4 = (bool) False ;
     int arg5 = (int) -1 ;
     bool result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11510,7 +11517,7 @@ static PyObject *_wrap_BookCtrl_AddPage(PyObject *self, PyObject *args, PyObject
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         arg4 = PyInt_AsLong(obj3) ? true : false;
@@ -11544,10 +11551,10 @@ static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObj
     size_t arg2 ;
     wxWindow *arg3 = (wxWindow *) 0 ;
     wxString *arg4 = 0 ;
-    bool arg5 = (bool) false ;
+    bool arg5 = (bool) False ;
     int arg6 = (int) -1 ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11565,7 +11572,7 @@ static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObj
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         arg5 = PyInt_AsLong(obj4) ? true : false;
@@ -11625,7 +11632,7 @@ static PyObject *_wrap_BookCtrl_SetSelection(PyObject *self, PyObject *args, PyO
 static PyObject *_wrap_BookCtrl_AdvanceSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
-    bool arg2 = (bool) true ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -11795,7 +11802,7 @@ static PyObject * BookCtrlEvent_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -11806,7 +11813,7 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw
     wxNotebook *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -11833,7 +11840,7 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -11888,7 +11895,7 @@ static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxNotebook *arg1 = (wxNotebook *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -11899,7 +11906,7 @@ static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -11928,7 +11935,7 @@ static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -12158,7 +12165,7 @@ static PyObject * NotebookEvent_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_Listbook(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -12169,7 +12176,7 @@ static PyObject *_wrap_new_Listbook(PyObject *self, PyObject *args, PyObject *kw
     wxListbook *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -12196,7 +12203,7 @@ static PyObject *_wrap_new_Listbook(PyObject *self, PyObject *args, PyObject *kw
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -12247,7 +12254,7 @@ static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxListbook *arg1 = (wxListbook *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -12258,7 +12265,7 @@ static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -12287,7 +12294,7 @@ static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -13143,7 +13150,7 @@ static PyObject *_wrap_ToolBarToolBase_SetShortHelp(PyObject *self, PyObject *ar
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -13155,7 +13162,7 @@ static PyObject *_wrap_ToolBarToolBase_SetShortHelp(PyObject *self, PyObject *ar
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13184,7 +13191,7 @@ static PyObject *_wrap_ToolBarToolBase_SetLongHelp(PyObject *self, PyObject *arg
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -13196,7 +13203,7 @@ static PyObject *_wrap_ToolBarToolBase_SetLongHelp(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13284,7 +13291,7 @@ static PyObject *_wrap_ToolBarToolBase_SetLabel(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -13296,7 +13303,7 @@ static PyObject *_wrap_ToolBarToolBase_SetLabel(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13445,9 +13452,9 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *self, PyObject *args, PyO
     wxString *arg8 = (wxString *) &arg8_defvalue ;
     PyObject *arg9 = (PyObject *) NULL ;
     wxToolBarToolBase *result;
-    bool temp3 = false ;
-    bool temp7 = false ;
-    bool temp8 = false ;
+    bool temp3 = False ;
+    bool temp7 = False ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -13464,7 +13471,7 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *self, PyObject *args, PyO
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (arg4 == NULL) {
@@ -13480,14 +13487,14 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *self, PyObject *args, PyO
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     if (obj7) {
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     if (obj8) {
@@ -13549,9 +13556,9 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *self, PyObject *args,
     wxString *arg9 = (wxString *) &arg9_defvalue ;
     PyObject *arg10 = (PyObject *) NULL ;
     wxToolBarToolBase *result;
-    bool temp4 = false ;
-    bool temp8 = false ;
-    bool temp9 = false ;
+    bool temp4 = False ;
+    bool temp8 = False ;
+    bool temp9 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -13571,7 +13578,7 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *self, PyObject *args,
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (arg5 == NULL) {
@@ -13587,14 +13594,14 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *self, PyObject *args,
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     if (obj8) {
         {
             arg9 = wxString_in_helper(obj8);
             if (arg9 == NULL) SWIG_fail;
-            temp9 = true;
+            temp9 = True;
         }
     }
     if (obj9) {
@@ -14146,7 +14153,7 @@ static PyObject *_wrap_ToolBarBase_SetToolShortHelp(PyObject *self, PyObject *ar
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -14158,7 +14165,7 @@ static PyObject *_wrap_ToolBarBase_SetToolShortHelp(PyObject *self, PyObject *ar
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14219,7 +14226,7 @@ static PyObject *_wrap_ToolBarBase_SetToolLongHelp(PyObject *self, PyObject *arg
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -14231,7 +14238,7 @@ static PyObject *_wrap_ToolBarBase_SetToolLongHelp(PyObject *self, PyObject *arg
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14695,8 +14702,8 @@ static PyObject *_wrap_ToolBarBase_GetToolSize(PyObject *self, PyObject *args, P
 static PyObject *_wrap_ToolBarBase_FindToolForPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     wxToolBarToolBase *result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -14756,7 +14763,7 @@ static PyObject * ToolBarBase_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -14767,7 +14774,7 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa
     wxToolBar *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -14794,7 +14801,7 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -14849,7 +14856,7 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject *
     PyObject *resultobj;
     wxToolBar *arg1 = (wxToolBar *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -14860,7 +14867,7 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject *
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -14889,7 +14896,7 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject *
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -14917,8 +14924,8 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject *
 static PyObject *_wrap_ToolBar_FindToolForPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBar *arg1 = (wxToolBar *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     wxToolBarToolBase *result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -15511,7 +15518,7 @@ static PyObject *_wrap_ListItem_SetText(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -15523,7 +15530,7 @@ static PyObject *_wrap_ListItem_SetText(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16308,7 +16315,6 @@ static PyObject *_wrap_ListItem_m_text_set(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     wxString arg2 ;
-    wxString *argp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -16317,8 +16323,12 @@ static PyObject *_wrap_ListItem_m_text_set(PyObject *self, PyObject *args, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_text_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListItem,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
+    {
+        wxString* sptr = wxString_in_helper(obj1);
+        if (sptr == NULL) SWIG_fail;
+        arg2 = *sptr;
+        delete sptr;
+    }
     if (arg1) (arg1)->m_text = arg2;
     
     Py_INCREF(Py_None); resultobj = Py_None;
@@ -17145,7 +17155,7 @@ static PyObject * ListEvent_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_ListCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) -1 ;
+    int arg2 = (int) -1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -17158,7 +17168,7 @@ static PyObject *_wrap_new_ListCtrl(PyObject *self, PyObject *args, PyObject *kw
     wxPyListCtrl *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -17192,7 +17202,7 @@ static PyObject *_wrap_new_ListCtrl(PyObject *self, PyObject *args, PyObject *kw
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -17243,7 +17253,7 @@ static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 = (wxWindowID) -1 ;
+    int arg3 = (int) -1 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -17256,7 +17266,7 @@ static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -17292,7 +17302,7 @@ static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -17646,7 +17656,7 @@ static PyObject *_wrap_ListCtrl_SetStringItem(PyObject *self, PyObject *args, Py
     wxString *arg4 = 0 ;
     int arg5 = (int) -1 ;
     long result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -17658,7 +17668,7 @@ static PyObject *_wrap_ListCtrl_SetStringItem(PyObject *self, PyObject *args, Py
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17802,7 +17812,7 @@ static PyObject *_wrap_ListCtrl_SetItemText(PyObject *self, PyObject *args, PyOb
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -17814,7 +17824,7 @@ static PyObject *_wrap_ListCtrl_SetItemText(PyObject *self, PyObject *args, PyOb
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18068,7 +18078,7 @@ static PyObject *_wrap_ListCtrl_SetItemSpacing(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     int arg2 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -18209,7 +18219,7 @@ static PyObject *_wrap_ListCtrl_SetSingleStyle(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -18657,9 +18667,9 @@ static PyObject *_wrap_ListCtrl_FindItem(PyObject *self, PyObject *args, PyObjec
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
     wxString *arg3 = 0 ;
-    bool arg4 = (bool) FALSE ;
+    bool arg4 = (bool) False ;
     long result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -18672,7 +18682,7 @@ static PyObject *_wrap_ListCtrl_FindItem(PyObject *self, PyObject *args, PyObjec
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         arg4 = PyInt_AsLong(obj3) ? true : false;
@@ -18837,7 +18847,7 @@ static PyObject *_wrap_ListCtrl_InsertStringItem(PyObject *self, PyObject *args,
     long arg2 ;
     wxString *arg3 = 0 ;
     long result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -18849,7 +18859,7 @@ static PyObject *_wrap_ListCtrl_InsertStringItem(PyObject *self, PyObject *args,
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18907,7 +18917,7 @@ static PyObject *_wrap_ListCtrl_InsertImageStringItem(PyObject *self, PyObject *
     wxString *arg3 = 0 ;
     int arg4 ;
     long result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -18919,7 +18929,7 @@ static PyObject *_wrap_ListCtrl_InsertImageStringItem(PyObject *self, PyObject *
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18983,7 +18993,7 @@ static PyObject *_wrap_ListCtrl_InsertColumn(PyObject *self, PyObject *args, PyO
     int arg4 = (int) wxLIST_FORMAT_LEFT ;
     int arg5 = (int) -1 ;
     long result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -18995,7 +19005,7 @@ static PyObject *_wrap_ListCtrl_InsertColumn(PyObject *self, PyObject *args, PyO
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19260,7 +19270,7 @@ static PyObject * ListCtrl_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_ListView(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) -1 ;
+    int arg2 = (int) -1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -19273,7 +19283,7 @@ static PyObject *_wrap_new_ListView(PyObject *self, PyObject *args, PyObject *kw
     wxListView *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -19307,7 +19317,7 @@ static PyObject *_wrap_new_ListView(PyObject *self, PyObject *args, PyObject *kw
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -19358,7 +19368,7 @@ static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxListView *arg1 = (wxListView *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 = (wxWindowID) -1 ;
+    int arg3 = (int) -1 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -19371,7 +19381,7 @@ static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -19407,7 +19417,7 @@ static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -19436,7 +19446,7 @@ static PyObject *_wrap_ListView_Select(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxListView *arg1 = (wxListView *) 0 ;
     long arg2 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -20309,7 +20319,7 @@ static PyObject *_wrap_TreeEvent_SetLabel(PyObject *self, PyObject *args, PyObje
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -20321,7 +20331,7 @@ static PyObject *_wrap_TreeEvent_SetLabel(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20408,7 +20418,7 @@ static PyObject * TreeEvent_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) -1 ;
+    int arg2 = (int) -1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -20421,7 +20431,7 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw
     wxPyTreeCtrl *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -20455,7 +20465,7 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -20506,7 +20516,7 @@ static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 = (wxWindowID) -1 ;
+    int arg3 = (int) -1 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -20519,7 +20529,7 @@ static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -20555,7 +20565,7 @@ static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -21144,7 +21154,7 @@ static PyObject *_wrap_TreeCtrl_SetItemText(PyObject *self, PyObject *args, PyOb
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -21161,7 +21171,7 @@ static PyObject *_wrap_TreeCtrl_SetItemText(PyObject *self, PyObject *args, PyOb
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21287,7 +21297,7 @@ static PyObject *_wrap_TreeCtrl_SetItemHasChildren(PyObject *self, PyObject *arg
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -21323,7 +21333,7 @@ static PyObject *_wrap_TreeCtrl_SetItemBold(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -21624,7 +21634,7 @@ static PyObject *_wrap_TreeCtrl_GetChildrenCount(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     size_t result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -22055,7 +22065,7 @@ static PyObject *_wrap_TreeCtrl_AddRoot(PyObject *self, PyObject *args, PyObject
     int arg4 = (int) -1 ;
     wxPyTreeItemData *arg5 = (wxPyTreeItemData *) NULL ;
     wxTreeItemId result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj4 = 0 ;
@@ -22068,7 +22078,7 @@ static PyObject *_wrap_TreeCtrl_AddRoot(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj4) {
         if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -22108,7 +22118,7 @@ static PyObject *_wrap_TreeCtrl_PrependItem(PyObject *self, PyObject *args, PyOb
     int arg5 = (int) -1 ;
     wxPyTreeItemData *arg6 = (wxPyTreeItemData *) NULL ;
     wxTreeItemId result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -22126,7 +22136,7 @@ static PyObject *_wrap_TreeCtrl_PrependItem(PyObject *self, PyObject *args, PyOb
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj5) {
         if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -22167,7 +22177,7 @@ static PyObject *_wrap_TreeCtrl_InsertItem(PyObject *self, PyObject *args, PyObj
     int arg6 = (int) -1 ;
     wxPyTreeItemData *arg7 = (wxPyTreeItemData *) NULL ;
     wxTreeItemId result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -22190,7 +22200,7 @@ static PyObject *_wrap_TreeCtrl_InsertItem(PyObject *self, PyObject *args, PyObj
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj6) {
         if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -22231,7 +22241,7 @@ static PyObject *_wrap_TreeCtrl_InsertItemBefore(PyObject *self, PyObject *args,
     int arg6 = (int) -1 ;
     wxPyTreeItemData *arg7 = (wxPyTreeItemData *) NULL ;
     wxTreeItemId result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -22252,7 +22262,7 @@ static PyObject *_wrap_TreeCtrl_InsertItemBefore(PyObject *self, PyObject *args,
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj6) {
         if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -22292,7 +22302,7 @@ static PyObject *_wrap_TreeCtrl_AppendItem(PyObject *self, PyObject *args, PyObj
     int arg5 = (int) -1 ;
     wxPyTreeItemData *arg6 = (wxPyTreeItemData *) NULL ;
     wxTreeItemId result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -22310,7 +22320,7 @@ static PyObject *_wrap_TreeCtrl_AppendItem(PyObject *self, PyObject *args, PyObj
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj5) {
         if ((SWIG_ConvertPtr(obj5,(void **) &arg6, SWIGTYPE_p_wxPyTreeItemData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -22817,7 +22827,7 @@ static PyObject *_wrap_TreeCtrl_GetBoundingRect(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     PyObject *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -22860,7 +22870,7 @@ static PyObject * TreeCtrl_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) (wxWindowID)-1 ;
+    int arg2 = (int) (int)-1 ;
     wxString const &arg3_defvalue = wxPyDirDialogDefaultFolderStr ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
@@ -22874,11 +22884,11 @@ static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObje
     wxString const &arg9_defvalue = wxPy_TreeCtrlNameStr ;
     wxString *arg9 = (wxString *) &arg9_defvalue ;
     wxGenericDirCtrl *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
-    bool temp9 = false ;
+    bool temp7 = False ;
+    bool temp9 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -22895,7 +22905,7 @@ static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObje
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
@@ -22914,14 +22924,14 @@ static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObje
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     if (obj8) {
         {
             arg9 = wxString_in_helper(obj8);
             if (arg9 == NULL) SWIG_fail;
-            temp9 = true;
+            temp9 = True;
         }
     }
     {
@@ -22988,7 +22998,7 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 = (wxWindowID) (wxWindowID)-1 ;
+    int arg3 = (int) (int)-1 ;
     wxString const &arg4_defvalue = wxPyDirDialogDefaultFolderStr ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
@@ -23002,11 +23012,11 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO
     wxString const &arg10_defvalue = wxPy_TreeCtrlNameStr ;
     wxString *arg10 = (wxString *) &arg10_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp8 = false ;
-    bool temp10 = false ;
+    bool temp8 = False ;
+    bool temp10 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -23025,7 +23035,7 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     if (obj4) {
@@ -23044,14 +23054,14 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     if (obj9) {
         {
             arg10 = wxString_in_helper(obj9);
             if (arg10 == NULL) SWIG_fail;
-            temp10 = true;
+            temp10 = True;
         }
     }
     {
@@ -23097,7 +23107,7 @@ static PyObject *_wrap_GenericDirCtrl_ExpandPath(PyObject *self, PyObject *args,
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -23109,7 +23119,7 @@ static PyObject *_wrap_GenericDirCtrl_ExpandPath(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23168,7 +23178,7 @@ static PyObject *_wrap_GenericDirCtrl_SetDefaultPath(PyObject *self, PyObject *a
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -23180,7 +23190,7 @@ static PyObject *_wrap_GenericDirCtrl_SetDefaultPath(PyObject *self, PyObject *a
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23270,7 +23280,7 @@ static PyObject *_wrap_GenericDirCtrl_SetPath(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -23282,7 +23292,7 @@ static PyObject *_wrap_GenericDirCtrl_SetPath(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23394,7 +23404,7 @@ static PyObject *_wrap_GenericDirCtrl_SetFilter(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -23406,7 +23416,7 @@ static PyObject *_wrap_GenericDirCtrl_SetFilter(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23569,7 +23579,7 @@ static PyObject *_wrap_GenericDirCtrl_FindChild(PyObject *self, PyObject *args,
     bool *arg4 = 0 ;
     wxTreeItemId result;
     wxTreeItemId *argp2 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     bool temp4 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -23586,7 +23596,7 @@ static PyObject *_wrap_GenericDirCtrl_FindChild(PyObject *self, PyObject *args,
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23676,7 +23686,7 @@ static PyObject * GenericDirCtrl_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_DirFilterListCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
-    wxWindowID arg2 = (wxWindowID) (wxWindowID)-1 ;
+    int arg2 = (int) (int)-1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -23746,7 +23756,7 @@ static PyObject *_wrap_DirFilterListCtrl_Create(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxDirFilterListCtrl *arg1 = (wxDirFilterListCtrl *) 0 ;
     wxGenericDirCtrl *arg2 = (wxGenericDirCtrl *) 0 ;
-    wxWindowID arg3 = (wxWindowID) (wxWindowID)-1 ;
+    int arg3 = (int) (int)-1 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -23797,7 +23807,7 @@ static PyObject *_wrap_DirFilterListCtrl_FillFilterList(PyObject *self, PyObject
     wxDirFilterListCtrl *arg1 = (wxDirFilterListCtrl *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -23809,7 +23819,7 @@ static PyObject *_wrap_DirFilterListCtrl_FillFilterList(PyObject *self, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23843,7 +23853,7 @@ static PyObject * DirFilterListCtrl_swigregister(PyObject *self, PyObject *args)
 static PyObject *_wrap_new_PyControl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -23856,7 +23866,7 @@ static PyObject *_wrap_new_PyControl(PyObject *self, PyObject *args, PyObject *k
     wxPyControl *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -23890,7 +23900,7 @@ static PyObject *_wrap_new_PyControl(PyObject *self, PyObject *args, PyObject *k
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -24468,7 +24478,7 @@ static PyObject * PyControl_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_HelpEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
-    wxWindowID arg2 = (wxWindowID) 0 ;
+    int arg2 = (int) 0 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxHelpEvent *result;
@@ -24590,7 +24600,7 @@ static PyObject *_wrap_HelpEvent_SetLink(PyObject *self, PyObject *args, PyObjec
     PyObject *resultobj;
     wxHelpEvent *arg1 = (wxHelpEvent *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -24602,7 +24612,7 @@ static PyObject *_wrap_HelpEvent_SetLink(PyObject *self, PyObject *args, PyObjec
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24658,7 +24668,7 @@ static PyObject *_wrap_HelpEvent_SetTarget(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxHelpEvent *arg1 = (wxHelpEvent *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -24670,7 +24680,7 @@ static PyObject *_wrap_HelpEvent_SetTarget(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24704,7 +24714,7 @@ static PyObject * HelpEvent_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_ContextHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     wxContextHelp *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -24823,7 +24833,7 @@ static PyObject * ContextHelp_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_ContextHelpButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) wxID_CONTEXT_HELP ;
+    int arg2 = (int) wxID_CONTEXT_HELP ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -24988,7 +24998,7 @@ static PyObject *_wrap_HelpProvider_AddHelp(PyObject *self, PyObject *args, PyOb
     wxHelpProvider *arg1 = (wxHelpProvider *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -25002,7 +25012,7 @@ static PyObject *_wrap_HelpProvider_AddHelp(PyObject *self, PyObject *args, PyOb
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25029,9 +25039,9 @@ static PyObject *_wrap_HelpProvider_AddHelp(PyObject *self, PyObject *args, PyOb
 static PyObject *_wrap_HelpProvider_AddHelpById(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpProvider *arg1 = (wxHelpProvider *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -25043,7 +25053,7 @@ static PyObject *_wrap_HelpProvider_AddHelpById(PyObject *self, PyObject *args,
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25127,196 +25137,801 @@ static PyObject * SimpleHelpProvider_swigregister(PyObject *self, PyObject *args
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyMethodDef SwigMethods[] = {
-	 { (char *)"new_Button", (PyCFunction) _wrap_new_Button, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_PreButton", (PyCFunction) _wrap_new_PreButton, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Button_Create", (PyCFunction) _wrap_Button_Create, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Button_SetDefault", (PyCFunction) _wrap_Button_SetDefault, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Button_GetDefaultSize", (PyCFunction) _wrap_Button_GetDefaultSize, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Button_swigregister", Button_swigregister, METH_VARARGS },
-	 { (char *)"new_BitmapButton", (PyCFunction) _wrap_new_BitmapButton, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_PreBitmapButton", (PyCFunction) _wrap_new_PreBitmapButton, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"BitmapButton_Create", (PyCFunction) _wrap_BitmapButton_Create, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"BitmapButton_GetBitmapLabel", (PyCFunction) _wrap_BitmapButton_GetBitmapLabel, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"BitmapButton_GetBitmapDisabled", (PyCFunction) _wrap_BitmapButton_GetBitmapDisabled, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"BitmapButton_GetBitmapFocus", (PyCFunction) _wrap_BitmapButton_GetBitmapFocus, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"BitmapButton_GetBitmapSelected", (PyCFunction) _wrap_BitmapButton_GetBitmapSelected, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"BitmapButton_SetBitmapDisabled", (PyCFunction) _wrap_BitmapButton_SetBitmapDisabled, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"BitmapButton_SetBitmapFocus", (PyCFunction) _wrap_BitmapButton_SetBitmapFocus, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"BitmapButton_SetBitmapSelected", (PyCFunction) _wrap_BitmapButton_SetBitmapSelected, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"BitmapButton_SetBitmapLabel", (PyCFunction) _wrap_BitmapButton_SetBitmapLabel, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"BitmapButton_SetMargins", (PyCFunction) _wrap_BitmapButton_SetMargins, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"BitmapButton_GetMarginX", (PyCFunction) _wrap_BitmapButton_GetMarginX, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"BitmapButton_GetMarginY", (PyCFunction) _wrap_BitmapButton_GetMarginY, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"BitmapButton_swigregister", BitmapButton_swigregister, METH_VARARGS },
-	 { (char *)"new_CheckBox", (PyCFunction) _wrap_new_CheckBox, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_PreCheckBox", (PyCFunction) _wrap_new_PreCheckBox, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckBox_Create", (PyCFunction) _wrap_CheckBox_Create, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckBox_GetValue", (PyCFunction) _wrap_CheckBox_GetValue, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckBox_IsChecked", (PyCFunction) _wrap_CheckBox_IsChecked, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckBox_SetValue", (PyCFunction) _wrap_CheckBox_SetValue, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckBox_Get3StateValue", (PyCFunction) _wrap_CheckBox_Get3StateValue, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckBox_Set3StateValue", (PyCFunction) _wrap_CheckBox_Set3StateValue, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckBox_Is3State", (PyCFunction) _wrap_CheckBox_Is3State, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckBox_Is3rdStateAllowedForUser", (PyCFunction) _wrap_CheckBox_Is3rdStateAllowedForUser, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckBox_swigregister", CheckBox_swigregister, METH_VARARGS },
-	 { (char *)"new_Choice", (PyCFunction) _wrap_new_Choice, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_PreChoice", (PyCFunction) _wrap_new_PreChoice, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Choice_Create", (PyCFunction) _wrap_Choice_Create, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Choice_GetColumns", (PyCFunction) _wrap_Choice_GetColumns, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Choice_SetColumns", (PyCFunction) _wrap_Choice_SetColumns, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Choice_SetSelection", (PyCFunction) _wrap_Choice_SetSelection, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Choice_SetStringSelection", (PyCFunction) _wrap_Choice_SetStringSelection, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Choice_SetString", (PyCFunction) _wrap_Choice_SetString, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Choice_swigregister", Choice_swigregister, METH_VARARGS },
-	 { (char *)"new_ComboBox", (PyCFunction) _wrap_new_ComboBox, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_PreComboBox", (PyCFunction) _wrap_new_PreComboBox, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_Create", (PyCFunction) _wrap_ComboBox_Create, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_GetValue", (PyCFunction) _wrap_ComboBox_GetValue, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_SetValue", (PyCFunction) _wrap_ComboBox_SetValue, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_Copy", (PyCFunction) _wrap_ComboBox_Copy, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_Cut", (PyCFunction) _wrap_ComboBox_Cut, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_Paste", (PyCFunction) _wrap_ComboBox_Paste, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_SetInsertionPoint", (PyCFunction) _wrap_ComboBox_SetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_GetInsertionPoint", (PyCFunction) _wrap_ComboBox_GetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_GetLastPosition", (PyCFunction) _wrap_ComboBox_GetLastPosition, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_Replace", (PyCFunction) _wrap_ComboBox_Replace, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_SetMark", (PyCFunction) _wrap_ComboBox_SetMark, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_SetEditable", (PyCFunction) _wrap_ComboBox_SetEditable, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_SetInsertionPointEnd", (PyCFunction) _wrap_ComboBox_SetInsertionPointEnd, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_Remove", (PyCFunction) _wrap_ComboBox_Remove, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ComboBox_swigregister", ComboBox_swigregister, METH_VARARGS },
-	 { (char *)"new_Gauge", (PyCFunction) _wrap_new_Gauge, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_PreGauge", (PyCFunction) _wrap_new_PreGauge, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Gauge_Create", (PyCFunction) _wrap_Gauge_Create, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Gauge_SetRange", (PyCFunction) _wrap_Gauge_SetRange, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Gauge_GetRange", (PyCFunction) _wrap_Gauge_GetRange, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Gauge_SetValue", (PyCFunction) _wrap_Gauge_SetValue, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Gauge_GetValue", (PyCFunction) _wrap_Gauge_GetValue, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Gauge_IsVertical", (PyCFunction) _wrap_Gauge_IsVertical, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Gauge_SetShadowWidth", (PyCFunction) _wrap_Gauge_SetShadowWidth, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Gauge_GetShadowWidth", (PyCFunction) _wrap_Gauge_GetShadowWidth, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Gauge_SetBezelFace", (PyCFunction) _wrap_Gauge_SetBezelFace, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Gauge_GetBezelFace", (PyCFunction) _wrap_Gauge_GetBezelFace, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Gauge_swigregister", Gauge_swigregister, METH_VARARGS },
-	 { (char *)"new_StaticBox", (PyCFunction) _wrap_new_StaticBox, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_PreStaticBox", (PyCFunction) _wrap_new_PreStaticBox, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"StaticBox_Create", (PyCFunction) _wrap_StaticBox_Create, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"StaticBox_swigregister", StaticBox_swigregister, METH_VARARGS },
-	 { (char *)"new_StaticLine", (PyCFunction) _wrap_new_StaticLine, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_PreStaticLine", (PyCFunction) _wrap_new_PreStaticLine, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"StaticLine_Create", (PyCFunction) _wrap_StaticLine_Create, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"StaticLine_IsVertical", (PyCFunction) _wrap_StaticLine_IsVertical, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"StaticLine_GetDefaultSize", (PyCFunction) _wrap_StaticLine_GetDefaultSize, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"StaticLine_swigregister", StaticLine_swigregister, METH_VARARGS },
-	 { (char *)"new_StaticText", (PyCFunction) _wrap_new_StaticText, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_PreStaticText", (PyCFunction) _wrap_new_PreStaticText, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"StaticText_Create", (PyCFunction) _wrap_StaticText_Create, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"StaticText_swigregister", StaticText_swigregister, METH_VARARGS },
-	 { (char *)"new_StaticBitmap", (PyCFunction) _wrap_new_StaticBitmap, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_PreStaticBitmap", (PyCFunction) _wrap_new_PreStaticBitmap, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"StaticBitmap_Create", (PyCFunction) _wrap_StaticBitmap_Create, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"StaticBitmap_GetBitmap", (PyCFunction) _wrap_StaticBitmap_GetBitmap, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"StaticBitmap_SetBitmap", (PyCFunction) _wrap_StaticBitmap_SetBitmap, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"StaticBitmap_SetIcon", (PyCFunction) _wrap_StaticBitmap_SetIcon, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"StaticBitmap_swigregister", StaticBitmap_swigregister, METH_VARARGS },
-	 { (char *)"new_ListBox", (PyCFunction) _wrap_new_ListBox, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_PreListBox", (PyCFunction) _wrap_new_PreListBox, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_Create", (PyCFunction) _wrap_ListBox_Create, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_Insert", (PyCFunction) _wrap_ListBox_Insert, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_InsertItems", (PyCFunction) _wrap_ListBox_InsertItems, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_Set", (PyCFunction) _wrap_ListBox_Set, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_IsSelected", (PyCFunction) _wrap_ListBox_IsSelected, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_SetSelection", (PyCFunction) _wrap_ListBox_SetSelection, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_Select", (PyCFunction) _wrap_ListBox_Select, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_Deselect", (PyCFunction) _wrap_ListBox_Deselect, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_DeselectAll", (PyCFunction) _wrap_ListBox_DeselectAll, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_SetStringSelection", (PyCFunction) _wrap_ListBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_GetSelections", (PyCFunction) _wrap_ListBox_GetSelections, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_SetFirstItem", (PyCFunction) _wrap_ListBox_SetFirstItem, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_SetFirstItemStr", (PyCFunction) _wrap_ListBox_SetFirstItemStr, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_EnsureVisible", (PyCFunction) _wrap_ListBox_EnsureVisible, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_AppendAndEnsureVisible", (PyCFunction) _wrap_ListBox_AppendAndEnsureVisible, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_IsSorted", (PyCFunction) _wrap_ListBox_IsSorted, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"ListBox_swigregister", ListBox_swigregister, METH_VARARGS },
-	 { (char *)"new_CheckListBox", (PyCFunction) _wrap_new_CheckListBox, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_PreCheckListBox", (PyCFunction) _wrap_new_PreCheckListBox, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckListBox_Create", (PyCFunction) _wrap_CheckListBox_Create, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckListBox_IsChecked", (PyCFunction) _wrap_CheckListBox_IsChecked, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckListBox_Check", (PyCFunction) _wrap_CheckListBox_Check, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckListBox_GetItemHeight", (PyCFunction) _wrap_CheckListBox_GetItemHeight, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckListBox_HitTest", (PyCFunction) _wrap_CheckListBox_HitTest, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckListBox_HitTestXY", (PyCFunction) _wrap_CheckListBox_HitTestXY, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"CheckListBox_swigregister", CheckListBox_swigregister, METH_VARARGS },
-	 { (char *)"new_TextAttr", _wrap_new_TextAttr, METH_VARARGS },
-	 { (char *)"TextAttr_Init", (PyCFunction) _wrap_TextAttr_Init, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_SetTextColour", (PyCFunction) _wrap_TextAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_SetBackgroundColour", (PyCFunction) _wrap_TextAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_SetFont", (PyCFunction) _wrap_TextAttr_SetFont, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_SetAlignment", (PyCFunction) _wrap_TextAttr_SetAlignment, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_SetTabs", (PyCFunction) _wrap_TextAttr_SetTabs, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_SetLeftIndent", (PyCFunction) _wrap_TextAttr_SetLeftIndent, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_SetRightIndent", (PyCFunction) _wrap_TextAttr_SetRightIndent, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_SetFlags", (PyCFunction) _wrap_TextAttr_SetFlags, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_HasTextColour", (PyCFunction) _wrap_TextAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_HasBackgroundColour", (PyCFunction) _wrap_TextAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_HasFont", (PyCFunction) _wrap_TextAttr_HasFont, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_HasAlignment", (PyCFunction) _wrap_TextAttr_HasAlignment, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_HasTabs", (PyCFunction) _wrap_TextAttr_HasTabs, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_HasLeftIndent", (PyCFunction) _wrap_TextAttr_HasLeftIndent, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_HasRightIndent", (PyCFunction) _wrap_TextAttr_HasRightIndent, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_HasFlag", (PyCFunction) _wrap_TextAttr_HasFlag, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_GetTextColour", (PyCFunction) _wrap_TextAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_GetBackgroundColour", (PyCFunction) _wrap_TextAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_GetFont", (PyCFunction) _wrap_TextAttr_GetFont, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_GetAlignment", (PyCFunction) _wrap_TextAttr_GetAlignment, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_GetTabs", (PyCFunction) _wrap_TextAttr_GetTabs, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_GetLeftIndent", (PyCFunction) _wrap_TextAttr_GetLeftIndent, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_GetRightIndent", (PyCFunction) _wrap_TextAttr_GetRightIndent, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_GetFlags", (PyCFunction) _wrap_TextAttr_GetFlags, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_IsDefault", (PyCFunction) _wrap_TextAttr_IsDefault, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_Combine", (PyCFunction) _wrap_TextAttr_Combine, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextAttr_swigregister", TextAttr_swigregister, METH_VARARGS },
-	 { (char *)"new_TextCtrl", (PyCFunction) _wrap_new_TextCtrl, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_PreTextCtrl", (PyCFunction) _wrap_new_PreTextCtrl, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_Create", (PyCFunction) _wrap_TextCtrl_Create, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_GetValue", (PyCFunction) _wrap_TextCtrl_GetValue, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_SetValue", (PyCFunction) _wrap_TextCtrl_SetValue, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_GetRange", (PyCFunction) _wrap_TextCtrl_GetRange, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_GetLineLength", (PyCFunction) _wrap_TextCtrl_GetLineLength, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_GetLineText", (PyCFunction) _wrap_TextCtrl_GetLineText, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_GetNumberOfLines", (PyCFunction) _wrap_TextCtrl_GetNumberOfLines, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_IsModified", (PyCFunction) _wrap_TextCtrl_IsModified, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_IsEditable", (PyCFunction) _wrap_TextCtrl_IsEditable, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_IsSingleLine", (PyCFunction) _wrap_TextCtrl_IsSingleLine, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_IsMultiLine", (PyCFunction) _wrap_TextCtrl_IsMultiLine, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_GetSelection", (PyCFunction) _wrap_TextCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_GetStringSelection", (PyCFunction) _wrap_TextCtrl_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_Clear", (PyCFunction) _wrap_TextCtrl_Clear, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_Replace", (PyCFunction) _wrap_TextCtrl_Replace, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_Remove", (PyCFunction) _wrap_TextCtrl_Remove, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_LoadFile", (PyCFunction) _wrap_TextCtrl_LoadFile, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_SaveFile", (PyCFunction) _wrap_TextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_MarkDirty", (PyCFunction) _wrap_TextCtrl_MarkDirty, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_DiscardEdits", (PyCFunction) _wrap_TextCtrl_DiscardEdits, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_SetMaxLength", (PyCFunction) _wrap_TextCtrl_SetMaxLength, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_WriteText", (PyCFunction) _wrap_TextCtrl_WriteText, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_AppendText", (PyCFunction) _wrap_TextCtrl_AppendText, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_EmulateKeyPress", (PyCFunction) _wrap_TextCtrl_EmulateKeyPress, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_SetStyle", (PyCFunction) _wrap_TextCtrl_SetStyle, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_GetStyle", (PyCFunction) _wrap_TextCtrl_GetStyle, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_SetDefaultStyle", (PyCFunction) _wrap_TextCtrl_SetDefaultStyle, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_GetDefaultStyle", (PyCFunction) _wrap_TextCtrl_GetDefaultStyle, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_XYToPosition", (PyCFunction) _wrap_TextCtrl_XYToPosition, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_PositionToXY", (PyCFunction) _wrap_TextCtrl_PositionToXY, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_ShowPosition", (PyCFunction) _wrap_TextCtrl_ShowPosition, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_Copy", (PyCFunction) _wrap_TextCtrl_Copy, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_Cut", (PyCFunction) _wrap_TextCtrl_Cut, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_Paste", (PyCFunction) _wrap_TextCtrl_Paste, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_CanCopy", (PyCFunction) _wrap_TextCtrl_CanCopy, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_CanCut", (PyCFunction) _wrap_TextCtrl_CanCut, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_CanPaste", (PyCFunction) _wrap_TextCtrl_CanPaste, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"TextCtrl_Undo", (PyCFunction) _wrap_TextCtrl_Undo, METH_VARARGS | METH_KEYWORDS },
+static PyObject *_wrap_new_DragImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxBitmap *arg1 = 0 ;
+    wxCursor const &arg2_defvalue = wxNullCursor ;
+    wxCursor *arg2 = (wxCursor *) &arg2_defvalue ;
+    wxGenericDragImage *result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "image",(char *) "cursor", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_DragImage",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (arg1 == NULL) {
+        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    }
+    if (obj1) {
+        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if (arg2 == NULL) {
+            PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        }
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (wxGenericDragImage *)new wxGenericDragImage((wxBitmap const &)*arg1,(wxCursor const &)*arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_new_DragIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxIcon *arg1 = 0 ;
+    wxCursor const &arg2_defvalue = wxNullCursor ;
+    wxCursor *arg2 = (wxCursor *) &arg2_defvalue ;
+    wxGenericDragImage *result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "image",(char *) "cursor", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_DragIcon",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (arg1 == NULL) {
+        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    }
+    if (obj1) {
+        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if (arg2 == NULL) {
+            PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        }
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (wxGenericDragImage *)new wxGenericDragImage((wxIcon const &)*arg1,(wxCursor const &)*arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_new_DragString(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxString *arg1 = 0 ;
+    wxCursor const &arg2_defvalue = wxNullCursor ;
+    wxCursor *arg2 = (wxCursor *) &arg2_defvalue ;
+    wxGenericDragImage *result;
+    bool temp1 = False ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "str",(char *) "cursor", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_DragString",kwnames,&obj0,&obj1)) goto fail;
+    {
+        arg1 = wxString_in_helper(obj0);
+        if (arg1 == NULL) SWIG_fail;
+        temp1 = True;
+    }
+    if (obj1) {
+        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+        if (arg2 == NULL) {
+            PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+        }
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (wxGenericDragImage *)new wxGenericDragImage((wxString const &)*arg1,(wxCursor const &)*arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
+    {
+        if (temp1)
+        delete arg1;
+    }
+    return resultobj;
+    fail:
+    {
+        if (temp1)
+        delete arg1;
+    }
+    return NULL;
+}
+
+
+static PyObject *_wrap_new_DragTreeItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyTreeCtrl *arg1 = 0 ;
+    wxTreeItemId *arg2 = 0 ;
+    wxGenericDragImage *result;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "treeCtrl",(char *) "id", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_DragTreeItem",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (arg1 == NULL) {
+        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    }
+    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (arg2 == NULL) {
+        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (wxGenericDragImage *)new wxGenericDragImage((wxPyTreeCtrl const &)*arg1,*arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_new_DragListItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxPyListCtrl *arg1 = 0 ;
+    long arg2 ;
+    wxGenericDragImage *result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "listCtrl",(char *) "id", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:new_DragListItem",kwnames,&obj0,&arg2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (arg1 == NULL) {
+        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (wxGenericDragImage *)new wxGenericDragImage((wxPyListCtrl const &)*arg1,arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_delete_DragImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_DragImage",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        delete arg1;
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_DragImage_SetBackingBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
+    wxBitmap *arg2 = (wxBitmap *) 0 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "bitmap", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DragImage_SetBackingBitmap",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->SetBackingBitmap(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_DragImage_BeginDrag(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
+    wxPoint *arg2 = 0 ;
+    wxWindow *arg3 = (wxWindow *) 0 ;
+    bool arg4 = (bool) False ;
+    wxRect *arg5 = (wxRect *) NULL ;
+    bool result;
+    wxPoint temp2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "hotspot",(char *) "window",(char *) "fullScreen",(char *) "rect", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:DragImage_BeginDrag",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = &temp2;
+        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+    }
+    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (obj3) {
+        arg4 = PyInt_AsLong(obj3) ? true : false;
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    if (obj4) {
+        if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)(arg1)->BeginDrag((wxPoint const &)*arg2,arg3,arg4,arg5);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = PyInt_FromLong((long)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_DragImage_BeginDragBounded(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
+    wxPoint *arg2 = 0 ;
+    wxWindow *arg3 = (wxWindow *) 0 ;
+    wxWindow *arg4 = (wxWindow *) 0 ;
+    bool result;
+    wxPoint temp2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "hotspot",(char *) "window",(char *) "boundingWindow", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DragImage_BeginDragBounded",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = &temp2;
+        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+    }
+    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)(arg1)->BeginDrag((wxPoint const &)*arg2,arg3,arg4);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = PyInt_FromLong((long)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_DragImage_EndDrag(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DragImage_EndDrag",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)(arg1)->EndDrag();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = PyInt_FromLong((long)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_DragImage_Move(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
+    wxPoint *arg2 = 0 ;
+    bool result;
+    wxPoint temp2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "pt", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DragImage_Move",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = &temp2;
+        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)(arg1)->Move((wxPoint const &)*arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = PyInt_FromLong((long)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_DragImage_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DragImage_Show",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)(arg1)->Show();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = PyInt_FromLong((long)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_DragImage_Hide(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
+    bool result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DragImage_Hide",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)(arg1)->Hide();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = PyInt_FromLong((long)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_DragImage_GetImageRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
+    wxPoint *arg2 = 0 ;
+    wxRect result;
+    wxPoint temp2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "pos", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DragImage_GetImageRect",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = &temp2;
+        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = ((wxGenericDragImage const *)arg1)->GetImageRect((wxPoint const &)*arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        wxRect * resultptr;
+        resultptr = new wxRect((wxRect &) result);
+        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1);
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_DragImage_DoDrawImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
+    wxDC *arg2 = 0 ;
+    wxPoint *arg3 = 0 ;
+    bool result;
+    wxPoint temp3 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "dc",(char *) "pos", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DragImage_DoDrawImage",kwnames,&obj0,&obj1,&obj2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (arg2 == NULL) {
+        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    }
+    {
+        arg3 = &temp3;
+        if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)((wxGenericDragImage const *)arg1)->DoDrawImage(*arg2,(wxPoint const &)*arg3);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = PyInt_FromLong((long)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_DragImage_UpdateBackingFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
+    wxDC *arg2 = 0 ;
+    wxMemoryDC *arg3 = 0 ;
+    wxRect *arg4 = 0 ;
+    wxRect *arg5 = 0 ;
+    bool result;
+    wxRect temp4 ;
+    wxRect temp5 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "windowDC",(char *) "destDC",(char *) "sourceRect",(char *) "destRect", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DragImage_UpdateBackingFromWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (arg2 == NULL) {
+        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    }
+    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMemoryDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if (arg3 == NULL) {
+        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
+    }
+    {
+        arg4 = &temp4;
+        if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
+    }
+    {
+        arg5 = &temp5;
+        if ( ! wxRect_helper(obj4, &arg5)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)((wxGenericDragImage const *)arg1)->UpdateBackingFromWindow(*arg2,*arg3,(wxRect const &)*arg4,(wxRect const &)*arg5);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = PyInt_FromLong((long)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
+    wxPoint *arg2 = 0 ;
+    wxPoint *arg3 = 0 ;
+    bool arg4 ;
+    bool arg5 ;
+    bool result;
+    wxPoint temp2 ;
+    wxPoint temp3 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    PyObject * obj2 = 0 ;
+    PyObject * obj3 = 0 ;
+    PyObject * obj4 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "oldPos",(char *) "newPos",(char *) "eraseOld",(char *) "drawNew", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DragImage_RedrawImage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = &temp2;
+        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+    }
+    {
+        arg3 = &temp3;
+        if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
+    }
+    arg4 = PyInt_AsLong(obj3) ? true : false;
+    if (PyErr_Occurred()) SWIG_fail;
+    arg5 = PyInt_AsLong(obj4) ? true : false;
+    if (PyErr_Occurred()) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (bool)(arg1)->RedrawImage((wxPoint const &)*arg2,(wxPoint const &)*arg3,arg4,arg5);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = PyInt_FromLong((long)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject * DragImage_swigregister(PyObject *self, PyObject *args) {
+    PyObject *obj;
+    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
+    SWIG_TypeClientData(SWIGTYPE_p_wxGenericDragImage, obj);
+    Py_INCREF(obj);
+    return Py_BuildValue((char *)"");
+}
+static PyMethodDef SwigMethods[] = {
+	 { (char *)"new_Button", (PyCFunction) _wrap_new_Button, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_PreButton", (PyCFunction) _wrap_new_PreButton, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Button_Create", (PyCFunction) _wrap_Button_Create, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Button_SetDefault", (PyCFunction) _wrap_Button_SetDefault, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Button_GetDefaultSize", (PyCFunction) _wrap_Button_GetDefaultSize, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Button_swigregister", Button_swigregister, METH_VARARGS },
+	 { (char *)"new_BitmapButton", (PyCFunction) _wrap_new_BitmapButton, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_PreBitmapButton", (PyCFunction) _wrap_new_PreBitmapButton, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"BitmapButton_Create", (PyCFunction) _wrap_BitmapButton_Create, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"BitmapButton_GetBitmapLabel", (PyCFunction) _wrap_BitmapButton_GetBitmapLabel, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"BitmapButton_GetBitmapDisabled", (PyCFunction) _wrap_BitmapButton_GetBitmapDisabled, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"BitmapButton_GetBitmapFocus", (PyCFunction) _wrap_BitmapButton_GetBitmapFocus, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"BitmapButton_GetBitmapSelected", (PyCFunction) _wrap_BitmapButton_GetBitmapSelected, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"BitmapButton_SetBitmapDisabled", (PyCFunction) _wrap_BitmapButton_SetBitmapDisabled, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"BitmapButton_SetBitmapFocus", (PyCFunction) _wrap_BitmapButton_SetBitmapFocus, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"BitmapButton_SetBitmapSelected", (PyCFunction) _wrap_BitmapButton_SetBitmapSelected, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"BitmapButton_SetBitmapLabel", (PyCFunction) _wrap_BitmapButton_SetBitmapLabel, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"BitmapButton_SetMargins", (PyCFunction) _wrap_BitmapButton_SetMargins, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"BitmapButton_GetMarginX", (PyCFunction) _wrap_BitmapButton_GetMarginX, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"BitmapButton_GetMarginY", (PyCFunction) _wrap_BitmapButton_GetMarginY, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"BitmapButton_swigregister", BitmapButton_swigregister, METH_VARARGS },
+	 { (char *)"new_CheckBox", (PyCFunction) _wrap_new_CheckBox, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_PreCheckBox", (PyCFunction) _wrap_new_PreCheckBox, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckBox_Create", (PyCFunction) _wrap_CheckBox_Create, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckBox_GetValue", (PyCFunction) _wrap_CheckBox_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckBox_IsChecked", (PyCFunction) _wrap_CheckBox_IsChecked, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckBox_SetValue", (PyCFunction) _wrap_CheckBox_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckBox_Get3StateValue", (PyCFunction) _wrap_CheckBox_Get3StateValue, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckBox_Set3StateValue", (PyCFunction) _wrap_CheckBox_Set3StateValue, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckBox_Is3State", (PyCFunction) _wrap_CheckBox_Is3State, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckBox_Is3rdStateAllowedForUser", (PyCFunction) _wrap_CheckBox_Is3rdStateAllowedForUser, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckBox_swigregister", CheckBox_swigregister, METH_VARARGS },
+	 { (char *)"new_Choice", (PyCFunction) _wrap_new_Choice, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_PreChoice", (PyCFunction) _wrap_new_PreChoice, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Choice_Create", (PyCFunction) _wrap_Choice_Create, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Choice_GetColumns", (PyCFunction) _wrap_Choice_GetColumns, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Choice_SetColumns", (PyCFunction) _wrap_Choice_SetColumns, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Choice_SetSelection", (PyCFunction) _wrap_Choice_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Choice_SetStringSelection", (PyCFunction) _wrap_Choice_SetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Choice_SetString", (PyCFunction) _wrap_Choice_SetString, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Choice_swigregister", Choice_swigregister, METH_VARARGS },
+	 { (char *)"new_ComboBox", (PyCFunction) _wrap_new_ComboBox, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_PreComboBox", (PyCFunction) _wrap_new_PreComboBox, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_Create", (PyCFunction) _wrap_ComboBox_Create, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_GetValue", (PyCFunction) _wrap_ComboBox_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_SetValue", (PyCFunction) _wrap_ComboBox_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_Copy", (PyCFunction) _wrap_ComboBox_Copy, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_Cut", (PyCFunction) _wrap_ComboBox_Cut, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_Paste", (PyCFunction) _wrap_ComboBox_Paste, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_SetInsertionPoint", (PyCFunction) _wrap_ComboBox_SetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_GetInsertionPoint", (PyCFunction) _wrap_ComboBox_GetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_GetLastPosition", (PyCFunction) _wrap_ComboBox_GetLastPosition, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_Replace", (PyCFunction) _wrap_ComboBox_Replace, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_SetMark", (PyCFunction) _wrap_ComboBox_SetMark, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_SetEditable", (PyCFunction) _wrap_ComboBox_SetEditable, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_SetInsertionPointEnd", (PyCFunction) _wrap_ComboBox_SetInsertionPointEnd, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_Remove", (PyCFunction) _wrap_ComboBox_Remove, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ComboBox_swigregister", ComboBox_swigregister, METH_VARARGS },
+	 { (char *)"new_Gauge", (PyCFunction) _wrap_new_Gauge, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_PreGauge", (PyCFunction) _wrap_new_PreGauge, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Gauge_Create", (PyCFunction) _wrap_Gauge_Create, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Gauge_SetRange", (PyCFunction) _wrap_Gauge_SetRange, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Gauge_GetRange", (PyCFunction) _wrap_Gauge_GetRange, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Gauge_SetValue", (PyCFunction) _wrap_Gauge_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Gauge_GetValue", (PyCFunction) _wrap_Gauge_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Gauge_IsVertical", (PyCFunction) _wrap_Gauge_IsVertical, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Gauge_SetShadowWidth", (PyCFunction) _wrap_Gauge_SetShadowWidth, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Gauge_GetShadowWidth", (PyCFunction) _wrap_Gauge_GetShadowWidth, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Gauge_SetBezelFace", (PyCFunction) _wrap_Gauge_SetBezelFace, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Gauge_GetBezelFace", (PyCFunction) _wrap_Gauge_GetBezelFace, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Gauge_swigregister", Gauge_swigregister, METH_VARARGS },
+	 { (char *)"new_StaticBox", (PyCFunction) _wrap_new_StaticBox, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_PreStaticBox", (PyCFunction) _wrap_new_PreStaticBox, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"StaticBox_Create", (PyCFunction) _wrap_StaticBox_Create, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"StaticBox_swigregister", StaticBox_swigregister, METH_VARARGS },
+	 { (char *)"new_StaticLine", (PyCFunction) _wrap_new_StaticLine, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_PreStaticLine", (PyCFunction) _wrap_new_PreStaticLine, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"StaticLine_Create", (PyCFunction) _wrap_StaticLine_Create, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"StaticLine_IsVertical", (PyCFunction) _wrap_StaticLine_IsVertical, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"StaticLine_GetDefaultSize", (PyCFunction) _wrap_StaticLine_GetDefaultSize, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"StaticLine_swigregister", StaticLine_swigregister, METH_VARARGS },
+	 { (char *)"new_StaticText", (PyCFunction) _wrap_new_StaticText, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_PreStaticText", (PyCFunction) _wrap_new_PreStaticText, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"StaticText_Create", (PyCFunction) _wrap_StaticText_Create, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"StaticText_swigregister", StaticText_swigregister, METH_VARARGS },
+	 { (char *)"new_StaticBitmap", (PyCFunction) _wrap_new_StaticBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_PreStaticBitmap", (PyCFunction) _wrap_new_PreStaticBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"StaticBitmap_Create", (PyCFunction) _wrap_StaticBitmap_Create, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"StaticBitmap_GetBitmap", (PyCFunction) _wrap_StaticBitmap_GetBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"StaticBitmap_SetBitmap", (PyCFunction) _wrap_StaticBitmap_SetBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"StaticBitmap_SetIcon", (PyCFunction) _wrap_StaticBitmap_SetIcon, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"StaticBitmap_swigregister", StaticBitmap_swigregister, METH_VARARGS },
+	 { (char *)"new_ListBox", (PyCFunction) _wrap_new_ListBox, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_PreListBox", (PyCFunction) _wrap_new_PreListBox, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_Create", (PyCFunction) _wrap_ListBox_Create, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_Insert", (PyCFunction) _wrap_ListBox_Insert, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_InsertItems", (PyCFunction) _wrap_ListBox_InsertItems, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_Set", (PyCFunction) _wrap_ListBox_Set, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_IsSelected", (PyCFunction) _wrap_ListBox_IsSelected, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_SetSelection", (PyCFunction) _wrap_ListBox_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_Select", (PyCFunction) _wrap_ListBox_Select, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_Deselect", (PyCFunction) _wrap_ListBox_Deselect, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_DeselectAll", (PyCFunction) _wrap_ListBox_DeselectAll, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_SetStringSelection", (PyCFunction) _wrap_ListBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_GetSelections", (PyCFunction) _wrap_ListBox_GetSelections, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_SetFirstItem", (PyCFunction) _wrap_ListBox_SetFirstItem, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_SetFirstItemStr", (PyCFunction) _wrap_ListBox_SetFirstItemStr, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_EnsureVisible", (PyCFunction) _wrap_ListBox_EnsureVisible, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_AppendAndEnsureVisible", (PyCFunction) _wrap_ListBox_AppendAndEnsureVisible, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_IsSorted", (PyCFunction) _wrap_ListBox_IsSorted, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"ListBox_swigregister", ListBox_swigregister, METH_VARARGS },
+	 { (char *)"new_CheckListBox", (PyCFunction) _wrap_new_CheckListBox, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_PreCheckListBox", (PyCFunction) _wrap_new_PreCheckListBox, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckListBox_Create", (PyCFunction) _wrap_CheckListBox_Create, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckListBox_IsChecked", (PyCFunction) _wrap_CheckListBox_IsChecked, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckListBox_Check", (PyCFunction) _wrap_CheckListBox_Check, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckListBox_GetItemHeight", (PyCFunction) _wrap_CheckListBox_GetItemHeight, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckListBox_HitTest", (PyCFunction) _wrap_CheckListBox_HitTest, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckListBox_HitTestXY", (PyCFunction) _wrap_CheckListBox_HitTestXY, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"CheckListBox_swigregister", CheckListBox_swigregister, METH_VARARGS },
+	 { (char *)"new_TextAttr", _wrap_new_TextAttr, METH_VARARGS },
+	 { (char *)"TextAttr_Init", (PyCFunction) _wrap_TextAttr_Init, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_SetTextColour", (PyCFunction) _wrap_TextAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_SetBackgroundColour", (PyCFunction) _wrap_TextAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_SetFont", (PyCFunction) _wrap_TextAttr_SetFont, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_SetAlignment", (PyCFunction) _wrap_TextAttr_SetAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_SetTabs", (PyCFunction) _wrap_TextAttr_SetTabs, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_SetLeftIndent", (PyCFunction) _wrap_TextAttr_SetLeftIndent, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_SetRightIndent", (PyCFunction) _wrap_TextAttr_SetRightIndent, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_SetFlags", (PyCFunction) _wrap_TextAttr_SetFlags, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_HasTextColour", (PyCFunction) _wrap_TextAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_HasBackgroundColour", (PyCFunction) _wrap_TextAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_HasFont", (PyCFunction) _wrap_TextAttr_HasFont, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_HasAlignment", (PyCFunction) _wrap_TextAttr_HasAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_HasTabs", (PyCFunction) _wrap_TextAttr_HasTabs, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_HasLeftIndent", (PyCFunction) _wrap_TextAttr_HasLeftIndent, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_HasRightIndent", (PyCFunction) _wrap_TextAttr_HasRightIndent, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_HasFlag", (PyCFunction) _wrap_TextAttr_HasFlag, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_GetTextColour", (PyCFunction) _wrap_TextAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_GetBackgroundColour", (PyCFunction) _wrap_TextAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_GetFont", (PyCFunction) _wrap_TextAttr_GetFont, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_GetAlignment", (PyCFunction) _wrap_TextAttr_GetAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_GetTabs", (PyCFunction) _wrap_TextAttr_GetTabs, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_GetLeftIndent", (PyCFunction) _wrap_TextAttr_GetLeftIndent, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_GetRightIndent", (PyCFunction) _wrap_TextAttr_GetRightIndent, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_GetFlags", (PyCFunction) _wrap_TextAttr_GetFlags, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_IsDefault", (PyCFunction) _wrap_TextAttr_IsDefault, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_Combine", (PyCFunction) _wrap_TextAttr_Combine, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextAttr_swigregister", TextAttr_swigregister, METH_VARARGS },
+	 { (char *)"new_TextCtrl", (PyCFunction) _wrap_new_TextCtrl, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_PreTextCtrl", (PyCFunction) _wrap_new_PreTextCtrl, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_Create", (PyCFunction) _wrap_TextCtrl_Create, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_GetValue", (PyCFunction) _wrap_TextCtrl_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_SetValue", (PyCFunction) _wrap_TextCtrl_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_GetRange", (PyCFunction) _wrap_TextCtrl_GetRange, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_GetLineLength", (PyCFunction) _wrap_TextCtrl_GetLineLength, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_GetLineText", (PyCFunction) _wrap_TextCtrl_GetLineText, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_GetNumberOfLines", (PyCFunction) _wrap_TextCtrl_GetNumberOfLines, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_IsModified", (PyCFunction) _wrap_TextCtrl_IsModified, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_IsEditable", (PyCFunction) _wrap_TextCtrl_IsEditable, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_IsSingleLine", (PyCFunction) _wrap_TextCtrl_IsSingleLine, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_IsMultiLine", (PyCFunction) _wrap_TextCtrl_IsMultiLine, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_GetSelection", (PyCFunction) _wrap_TextCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_GetStringSelection", (PyCFunction) _wrap_TextCtrl_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_Clear", (PyCFunction) _wrap_TextCtrl_Clear, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_Replace", (PyCFunction) _wrap_TextCtrl_Replace, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_Remove", (PyCFunction) _wrap_TextCtrl_Remove, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_LoadFile", (PyCFunction) _wrap_TextCtrl_LoadFile, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_SaveFile", (PyCFunction) _wrap_TextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_MarkDirty", (PyCFunction) _wrap_TextCtrl_MarkDirty, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_DiscardEdits", (PyCFunction) _wrap_TextCtrl_DiscardEdits, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_SetMaxLength", (PyCFunction) _wrap_TextCtrl_SetMaxLength, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_WriteText", (PyCFunction) _wrap_TextCtrl_WriteText, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_AppendText", (PyCFunction) _wrap_TextCtrl_AppendText, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_EmulateKeyPress", (PyCFunction) _wrap_TextCtrl_EmulateKeyPress, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_SetStyle", (PyCFunction) _wrap_TextCtrl_SetStyle, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_GetStyle", (PyCFunction) _wrap_TextCtrl_GetStyle, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_SetDefaultStyle", (PyCFunction) _wrap_TextCtrl_SetDefaultStyle, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_GetDefaultStyle", (PyCFunction) _wrap_TextCtrl_GetDefaultStyle, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_XYToPosition", (PyCFunction) _wrap_TextCtrl_XYToPosition, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_PositionToXY", (PyCFunction) _wrap_TextCtrl_PositionToXY, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_ShowPosition", (PyCFunction) _wrap_TextCtrl_ShowPosition, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_Copy", (PyCFunction) _wrap_TextCtrl_Copy, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_Cut", (PyCFunction) _wrap_TextCtrl_Cut, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_Paste", (PyCFunction) _wrap_TextCtrl_Paste, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_CanCopy", (PyCFunction) _wrap_TextCtrl_CanCopy, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_CanCut", (PyCFunction) _wrap_TextCtrl_CanCut, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_CanPaste", (PyCFunction) _wrap_TextCtrl_CanPaste, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"TextCtrl_Undo", (PyCFunction) _wrap_TextCtrl_Undo, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"TextCtrl_Redo", (PyCFunction) _wrap_TextCtrl_Redo, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"TextCtrl_CanUndo", (PyCFunction) _wrap_TextCtrl_CanUndo, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"TextCtrl_CanRedo", (PyCFunction) _wrap_TextCtrl_CanRedo, METH_VARARGS | METH_KEYWORDS },
@@ -25902,6 +26517,24 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"HelpProvider_swigregister", HelpProvider_swigregister, METH_VARARGS },
 	 { (char *)"new_SimpleHelpProvider", (PyCFunction) _wrap_new_SimpleHelpProvider, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"SimpleHelpProvider_swigregister", SimpleHelpProvider_swigregister, METH_VARARGS },
+	 { (char *)"new_DragImage", (PyCFunction) _wrap_new_DragImage, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_DragIcon", (PyCFunction) _wrap_new_DragIcon, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_DragString", (PyCFunction) _wrap_new_DragString, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_DragTreeItem", (PyCFunction) _wrap_new_DragTreeItem, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"new_DragListItem", (PyCFunction) _wrap_new_DragListItem, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"delete_DragImage", (PyCFunction) _wrap_delete_DragImage, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"DragImage_SetBackingBitmap", (PyCFunction) _wrap_DragImage_SetBackingBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"DragImage_BeginDrag", (PyCFunction) _wrap_DragImage_BeginDrag, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"DragImage_BeginDragBounded", (PyCFunction) _wrap_DragImage_BeginDragBounded, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"DragImage_EndDrag", (PyCFunction) _wrap_DragImage_EndDrag, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"DragImage_Move", (PyCFunction) _wrap_DragImage_Move, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"DragImage_Show", (PyCFunction) _wrap_DragImage_Show, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"DragImage_Hide", (PyCFunction) _wrap_DragImage_Hide, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"DragImage_GetImageRect", (PyCFunction) _wrap_DragImage_GetImageRect, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"DragImage_DoDrawImage", (PyCFunction) _wrap_DragImage_DoDrawImage, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"DragImage_UpdateBackingFromWindow", (PyCFunction) _wrap_DragImage_UpdateBackingFromWindow, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"DragImage_RedrawImage", (PyCFunction) _wrap_DragImage_RedrawImage, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"DragImage_swigregister", DragImage_swigregister, METH_VARARGS },
 	 { NULL, NULL }
 };
 
@@ -26607,6 +27240,9 @@ static void *_p_wxNotebookSizerTo_p_wxObject(void *x) {
 static void *_p_wxScrollWinEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxScrollWinEvent *) x));
 }
+static void *_p_wxGenericDragImageTo_p_wxObject(void *x) {
+    return (void *)((wxObject *)  ((wxGenericDragImage *) x));
+}
 static void *_p_wxSpinCtrlTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *) ((wxSpinCtrl *) x));
 }
@@ -26882,9 +27518,11 @@ static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p
 static swig_type_info _swigt__p_wxToggleButton[] = {{"_p_wxToggleButton", 0, "wxToggleButton *", 0},{"_p_wxToggleButton"},{0}};
 static swig_type_info _swigt__p_wxRadioButton[] = {{"_p_wxRadioButton", 0, "wxRadioButton *", 0},{"_p_wxRadioButton"},{0}};
 static swig_type_info _swigt__p_wxChoice[] = {{"_p_wxChoice", 0, "wxChoice *", 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxChoice},{"_p_wxChoice"},{0}};
+static swig_type_info _swigt__p_wxMemoryDC[] = {{"_p_wxMemoryDC", 0, "wxMemoryDC *", 0},{"_p_wxMemoryDC"},{0}};
 static swig_type_info _swigt__p_wxListItemAttr[] = {{"_p_wxListItemAttr", 0, "wxListItemAttr *", 0},{"_p_wxListItemAttr"},{0}};
 static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_int"},{0}};
 static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0},{"_p_wxSize"},{0}};
+static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxDC"},{0}};
 static swig_type_info _swigt__p_wxListView[] = {{"_p_wxListView", 0, "wxListView *", 0},{"_p_wxListView"},{0}};
 static swig_type_info _swigt__p_wxIcon[] = {{"_p_wxIcon", 0, "wxIcon *", 0},{"_p_wxIcon"},{0}};
 static swig_type_info _swigt__p_wxTextCtrl[] = {{"_p_wxTextCtrl", 0, "wxTextCtrl *", 0},{"_p_wxTextCtrl"},{0}};
@@ -26915,6 +27553,7 @@ static swig_type_info _swigt__p_wxComboBox[] = {{"_p_wxComboBox", 0, "wxComboBox
 static swig_type_info _swigt__p_wxHelpEvent[] = {{"_p_wxHelpEvent", 0, "wxHelpEvent *", 0},{"_p_wxHelpEvent"},{0}};
 static swig_type_info _swigt__p_wxListItem[] = {{"_p_wxListItem", 0, "wxListItem *", 0},{"_p_wxListItem"},{0}};
 static swig_type_info _swigt__p_wxNotebookSizer[] = {{"_p_wxNotebookSizer", 0, "wxNotebookSizer *", 0},{"_p_wxNotebookSizer"},{0}};
+static swig_type_info _swigt__p_wxGenericDragImage[] = {{"_p_wxGenericDragImage", 0, "wxGenericDragImage *", 0},{"_p_wxGenericDragImage"},{0}};
 static swig_type_info _swigt__p_wxSpinCtrl[] = {{"_p_wxSpinCtrl", 0, "wxSpinCtrl *", 0},{"_p_wxSpinCtrl"},{0}};
 static swig_type_info _swigt__p_wxImageList[] = {{"_p_wxImageList", 0, "wxImageList *", 0},{"_p_wxImageList"},{0}};
 static swig_type_info _swigt__p_wxHelpProvider[] = {{"_p_wxHelpProvider", 0, "wxHelpProvider *", 0},{"_p_wxHelpProvider"},{"_p_wxSimpleHelpProvider", _p_wxSimpleHelpProviderTo_p_wxHelpProvider},{0}};
@@ -26923,7 +27562,8 @@ static swig_type_info _swigt__p_wxSimpleHelpProvider[] = {{"_p_wxSimpleHelpProvi
 static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{"_p_wxPoint"},{0}};
 static swig_type_info _swigt__p_wxListbookEvent[] = {{"_p_wxListbookEvent", 0, "wxListbookEvent *", 0},{"_p_wxListbookEvent"},{0}};
 static swig_type_info _swigt__p_wxNotebookEvent[] = {{"_p_wxNotebookEvent", 0, "wxNotebookEvent *", 0},{"_p_wxNotebookEvent"},{0}};
-static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxObject},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxObject},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxObject},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxObject},{"_p_wxPyControl", _p_wxPyControlTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxObject},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxObject},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxObject},{"_p_wxGauge", _p_wxGaugeTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxChoice", _p_wxChoiceTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxListView", _p_wxListViewTo_p_wxObject},{"_p_wxNotebook", _p_wxNotebookTo_p_wxObject},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxListbook", _p_wxListbookTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxObject},{"_p_wxSlider", _p_wxSliderTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxContextHelp", _p_wxContextHelpTo_p_wxObject},{"_p_wxListEvent", _p_wxListEventTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxListBox", _p_wxListBoxTo_p_wxObject},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxObject},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxObject},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxObject},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxObject},{"_p_wxButton", _p_wxButtonTo_p_wxObject},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxObject},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxObject},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxObject},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxObject},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxObject},{"_p_wxListItem", _p_wxListItemTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxObject},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxObject},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxToolBarToolBase", _p_wxToolBarToolBaseTo_p_wxObject},{"_p_wxToolBar", _p_wxToolBarTo_p_wxObject},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{0}};
+static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxObject},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxObject},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxObject},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxObject},{"_p_wxPyControl", _p_wxPyControlTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxObject},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxObject},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxObject},{"_p_wxGauge", _p_wxGaugeTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxChoice", _p_wxChoiceTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxListView", _p_wxListViewTo_p_wxObject},{"_p_wxNotebook", _p_wxNotebookTo_p_wxObject},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxListbook", _p_wxListbookTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxObject},{"_p_wxSlider", _p_wxSliderTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxContextHelp", _p_wxContextHelpTo_p_wxObject},{"_p_wxListEvent", _p_wxListEventTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxListBox", _p_wxListBoxTo_p_wxObject},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxObject},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxObject},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxObject},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxObject},{"_p_wxButton", _p_wxButtonTo_p_wxObject},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxObject},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxObject},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxObject},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxObject},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxObject},{"_p_wxListItem", _p_wxListItemTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxGenericDragImage", _p_wxGenericDragImageTo_p_wxObject},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxObject},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxObject},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxToolBarToolBase", _p_wxToolBarToolBaseTo_p_wxObject},{"_p_wxToolBar", _p_wxToolBarTo_p_wxObject},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{0}};
+static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0},{"_p_wxCursor"},{0}};
 static swig_type_info _swigt__p_wxKeyEvent[] = {{"_p_wxKeyEvent", 0, "wxKeyEvent *", 0},{"_p_wxKeyEvent"},{0}};
 static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxToolBar", _p_wxToolBarTo_p_wxWindow},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxWindow},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxPyControl", _p_wxPyControlTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxWindow},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxWindow},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxWindow},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxWindow},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxWindow},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxGauge", _p_wxGaugeTo_p_wxWindow},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxWindow},{"_p_wxListbook", _p_wxListbookTo_p_wxWindow},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxWindow},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxWindow},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxWindow},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxWindow},{"_p_wxListBox", _p_wxListBoxTo_p_wxWindow},{"_p_wxChoice", _p_wxChoiceTo_p_wxWindow},{"_p_wxListView", _p_wxListViewTo_p_wxWindow},{"_p_wxNotebook", _p_wxNotebookTo_p_wxWindow},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxWindow},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxWindow},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxWindow},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxWindow},{"_p_wxSlider", _p_wxSliderTo_p_wxWindow},{"_p_wxButton", _p_wxButtonTo_p_wxWindow},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxWindow},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxWindow},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxWindow},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxWindow},{0}};
 static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}};
@@ -26963,9 +27603,11 @@ _swigt__p_wxFont,
 _swigt__p_wxToggleButton, 
 _swigt__p_wxRadioButton, 
 _swigt__p_wxChoice, 
+_swigt__p_wxMemoryDC, 
 _swigt__p_wxListItemAttr, 
 _swigt__p_int, 
 _swigt__p_wxSize, 
+_swigt__p_wxDC, 
 _swigt__p_wxListView, 
 _swigt__p_wxIcon, 
 _swigt__p_wxTextCtrl, 
@@ -26996,6 +27638,7 @@ _swigt__p_wxComboBox,
 _swigt__p_wxHelpEvent, 
 _swigt__p_wxListItem, 
 _swigt__p_wxNotebookSizer, 
+_swigt__p_wxGenericDragImage, 
 _swigt__p_wxSpinCtrl, 
 _swigt__p_wxImageList, 
 _swigt__p_wxHelpProvider, 
@@ -27005,6 +27648,7 @@ _swigt__p_wxPoint,
 _swigt__p_wxListbookEvent, 
 _swigt__p_wxNotebookEvent, 
 _swigt__p_wxObject, 
+_swigt__p_wxCursor, 
 _swigt__p_wxKeyEvent, 
 _swigt__p_wxWindow, 
 _swigt__p_wxString, 
@@ -27363,5 +28007,8 @@ SWIGEXPORT(void) SWIG_init(void) {
     
     PyDict_SetItemString(d, "wxEVT_HELP", PyInt_FromLong(wxEVT_HELP));
     PyDict_SetItemString(d, "wxEVT_DETAILED_HELP", PyInt_FromLong(wxEVT_DETAILED_HELP));
+    
+    wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
+    
 }
 
diff --git a/wxPython/src/gtk/core.py b/wxPython/src/gtk/core.py
index c020eefde3..fd202377d4 100644
--- a/wxPython/src/gtk/core.py
+++ b/wxPython/src/gtk/core.py
@@ -552,11 +552,23 @@ UPDATE_UI_FROMIDLE = _core.UPDATE_UI_FROMIDLE
 #---------------------------------------------------------------------------
 
 class Object(object):
-    def GetClassName(*args, **kwargs): return _core.Object_GetClassName(*args, **kwargs)
-    def Destroy(*args, **kwargs): return _core.Object_Destroy(*args, **kwargs)
+    """The base class for most wx objects, although in wxPython not
+much functionality is needed nor exposed."""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetClassName(*args, **kwargs):
+        """GetClassName() -> wxString
+
+Returns the class name of the C++ object using wxRTTI."""
+        return _core.Object_GetClassName(*args, **kwargs)
+
+    def Destroy(*args, **kwargs):
+        """Destroy()
+
+Deletes the C++ object this Python object is a proxy for."""
+        return _core.Object_Destroy(*args, **kwargs)
+
 
 class ObjectPtr(Object):
     def __init__(self, this):
@@ -636,42 +648,106 @@ CURSOR_MAX = _core.CURSOR_MAX
 #---------------------------------------------------------------------------
 
 class Size(object):
+    """wx.Size is a useful data structure used to represent the size of something.
+It simply contians integer width and height proprtites.  In most places in
+wxPython where a wx.Size is expected a (width,height) tuple can be used
+instead."""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSize instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     width = property(_core.Size_width_get, _core.Size_width_set)
     height = property(_core.Size_height_get, _core.Size_height_set)
     def __init__(self, *args, **kwargs):
+        """__init__(int w=0, int h=0) -> Size
+
+Creates a size object."""
         newobj = _core.new_Size(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_core.delete_Size):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __eq__(*args, **kwargs): return _core.Size___eq__(*args, **kwargs)
-    def __ne__(*args, **kwargs): return _core.Size___ne__(*args, **kwargs)
-    def __add__(*args, **kwargs): return _core.Size___add__(*args, **kwargs)
-    def __sub__(*args, **kwargs): return _core.Size___sub__(*args, **kwargs)
-    def IncTo(*args, **kwargs): return _core.Size_IncTo(*args, **kwargs)
-    def DecTo(*args, **kwargs): return _core.Size_DecTo(*args, **kwargs)
-    def Set(*args, **kwargs): return _core.Size_Set(*args, **kwargs)
-    def SetWidth(*args, **kwargs): return _core.Size_SetWidth(*args, **kwargs)
-    def SetHeight(*args, **kwargs): return _core.Size_SetHeight(*args, **kwargs)
-    def GetWidth(*args, **kwargs): return _core.Size_GetWidth(*args, **kwargs)
-    def GetHeight(*args, **kwargs): return _core.Size_GetHeight(*args, **kwargs)
-    def GetX(*args, **kwargs): return _core.Size_GetX(*args, **kwargs)
-    def GetY(*args, **kwargs): return _core.Size_GetY(*args, **kwargs)
-    def asTuple(*args, **kwargs): return _core.Size_asTuple(*args, **kwargs)
-    def __str__(self):                   return str(self.asTuple())
-    def __repr__(self):                  return 'wxSize'+str(self.asTuple())
-    def __len__(self):                   return len(self.asTuple())
-    def __getitem__(self, index):        return self.asTuple()[index]
+
+    def __eq__(*args, **kwargs):
+        """__eq__(Size sz) -> bool
+
+Test for equality of wx.Size objects."""
+        return _core.Size___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(Size sz) -> bool
+
+Test for inequality."""
+        return _core.Size___ne__(*args, **kwargs)
+
+    def __add__(*args, **kwargs):
+        """__add__(Size sz) -> Size
+
+Add sz's proprties to this and return the result."""
+        return _core.Size___add__(*args, **kwargs)
+
+    def __sub__(*args, **kwargs):
+        """__sub__(Size sz) -> Size
+
+Subtract sz's properties from this and return the result."""
+        return _core.Size___sub__(*args, **kwargs)
+
+    def IncTo(*args, **kwargs):
+        """IncTo(Size sz)
+
+Increments this object so that both of its dimensions are not less
+than the corresponding dimensions of the size."""
+        return _core.Size_IncTo(*args, **kwargs)
+
+    def DecTo(*args, **kwargs):
+        """DecTo(Size sz)
+
+Decrements this object so that both of its dimensions are not greater
+than the corresponding dimensions of the size."""
+        return _core.Size_DecTo(*args, **kwargs)
+
+    def Set(*args, **kwargs):
+        """Set(int w, int h)
+
+Set both width and height."""
+        return _core.Size_Set(*args, **kwargs)
+
+    def SetWidth(*args, **kwargs):
+        """SetWidth(int w)"""
+        return _core.Size_SetWidth(*args, **kwargs)
+
+    def SetHeight(*args, **kwargs):
+        """SetHeight(int h)"""
+        return _core.Size_SetHeight(*args, **kwargs)
+
+    def GetWidth(*args, **kwargs):
+        """GetWidth() -> int"""
+        return _core.Size_GetWidth(*args, **kwargs)
+
+    def GetHeight(*args, **kwargs):
+        """GetHeight() -> int"""
+        return _core.Size_GetHeight(*args, **kwargs)
+
+    def Get(*args, **kwargs):
+        """Get() -> (width,height)
+
+Returns the width and height properties as a tuple."""
+        return _core.Size_Get(*args, **kwargs)
+
+    asTuple = Get
+    def __str__(self):                   return str(self.Get())
+    def __repr__(self):                  return 'wx.Size'+str(self.Get())
+    def __len__(self):                   return len(self.Get())
+    def __getitem__(self, index):        return self.Get()[index]
     def __setitem__(self, index, val):
         if index == 0: self.width = val
         elif index == 1: self.height = val
         else: raise IndexError
-    def __nonzero__(self):               return self.asTuple() != (0,0)
+    def __nonzero__(self):               return self.Get() != (0,0)
     def __getinitargs__(self):           return ()
-    def __getstate__(self):              return self.asTuple()
+    def __getstate__(self):              return self.Get()
     def __setstate__(self, state):       self.Set(*state)
 
 
@@ -685,34 +761,75 @@ _core.Size_swigregister(SizePtr)
 #---------------------------------------------------------------------------
 
 class RealPoint(object):
+    """A data structure for representing a point or position with floating point x
+and y properties.  In wxPython most places that expect a wx.RealPoint can also
+accept a (x,y) tuple."""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxRealPoint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     x = property(_core.RealPoint_x_get, _core.RealPoint_x_set)
     y = property(_core.RealPoint_y_get, _core.RealPoint_y_set)
     def __init__(self, *args, **kwargs):
+        """__init__(double x=0.0, double y=0.0) -> RealPoint
+
+Create a wx.RealPoint object"""
         newobj = _core.new_RealPoint(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_core.delete_RealPoint):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __add__(*args, **kwargs): return _core.RealPoint___add__(*args, **kwargs)
-    def __sub__(*args, **kwargs): return _core.RealPoint___sub__(*args, **kwargs)
-    def __eq__(*args, **kwargs): return _core.RealPoint___eq__(*args, **kwargs)
-    def __ne__(*args, **kwargs): return _core.RealPoint___ne__(*args, **kwargs)
-    def Set(*args, **kwargs): return _core.RealPoint_Set(*args, **kwargs)
-    def asTuple(*args, **kwargs): return _core.RealPoint_asTuple(*args, **kwargs)
-    def __str__(self):                   return str(self.asTuple())
-    def __repr__(self):                  return 'wxRealPoint'+str(self.asTuple())
-    def __len__(self):                   return len(self.asTuple())
-    def __getitem__(self, index):        return self.asTuple()[index]
+
+    def __eq__(*args, **kwargs):
+        """__eq__(RealPoint pt) -> bool
+
+Test for equality of wx.RealPoint objects."""
+        return _core.RealPoint___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(RealPoint pt) -> bool
+
+Test for inequality of wx.RealPoint objects."""
+        return _core.RealPoint___ne__(*args, **kwargs)
+
+    def __add__(*args, **kwargs):
+        """__add__(RealPoint pt) -> RealPoint
+
+Add pt's proprties to this and return the result."""
+        return _core.RealPoint___add__(*args, **kwargs)
+
+    def __sub__(*args, **kwargs):
+        """__sub__(RealPoint pt) -> RealPoint
+
+Subtract pt's proprties from this and return the result"""
+        return _core.RealPoint___sub__(*args, **kwargs)
+
+    def Set(*args, **kwargs):
+        """Set(double x, double y)
+
+Set both the x and y properties"""
+        return _core.RealPoint_Set(*args, **kwargs)
+
+    def Get(*args, **kwargs):
+        """Get() -> (x,y)
+
+Return the x and y properties as a tuple. """
+        return _core.RealPoint_Get(*args, **kwargs)
+
+    asTuple = Get
+    def __str__(self):                   return str(self.Get())
+    def __repr__(self):                  return 'wx.RealPoint'+str(self.Get())
+    def __len__(self):                   return len(self.Get())
+    def __getitem__(self, index):        return self.Get()[index]
     def __setitem__(self, index, val):
-        if index == 0: self.width = val
-        elif index == 1: self.height = val
+        if index == 0: self.x = val
+        elif index == 1: self.y = val
         else: raise IndexError
-    def __nonzero__(self):               return self.asTuple() != (0.0, 0.0)
+    def __nonzero__(self):               return self.Get() != (0.0, 0.0)
     def __getinitargs__(self):           return ()
-    def __getstate__(self):              return self.asTuple()
+    def __getstate__(self):              return self.Get()
     def __setstate__(self, state):       self.Set(*state)
 
 
@@ -726,36 +843,87 @@ _core.RealPoint_swigregister(RealPointPtr)
 #---------------------------------------------------------------------------
 
 class Point(object):
+    """A data structure for representing a point or position with integer x and y
+properties.  Most places in wxPython that expect a wx.Point can also accept a
+(x,y) tuple."""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPoint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     x = property(_core.Point_x_get, _core.Point_x_set)
     y = property(_core.Point_y_get, _core.Point_y_set)
     def __init__(self, *args, **kwargs):
+        """__init__(int x=0, int y=0) -> Point
+
+Create a wx.Point object"""
         newobj = _core.new_Point(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_core.delete_Point):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __eq__(*args, **kwargs): return _core.Point___eq__(*args, **kwargs)
-    def __ne__(*args, **kwargs): return _core.Point___ne__(*args, **kwargs)
-    def __add__(*args, **kwargs): return _core.Point___add__(*args, **kwargs)
-    def __sub__(*args, **kwargs): return _core.Point___sub__(*args, **kwargs)
-    def __iadd__(*args, **kwargs): return _core.Point___iadd__(*args, **kwargs)
-    def __isub__(*args, **kwargs): return _core.Point___isub__(*args, **kwargs)
-    def Set(*args, **kwargs): return _core.Point_Set(*args, **kwargs)
-    def asTuple(*args, **kwargs): return _core.Point_asTuple(*args, **kwargs)
-    def __str__(self):                   return str(self.asTuple())
-    def __repr__(self):                  return 'wxPoint'+str(self.asTuple())
-    def __len__(self):                   return len(self.asTuple())
-    def __getitem__(self, index):        return self.asTuple()[index]
+
+    def __eq__(*args, **kwargs):
+        """__eq__(Point pt) -> bool
+
+Test for equality of wx.Point objects."""
+        return _core.Point___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(Point pt) -> bool
+
+Test for inequality of wx.Point objects."""
+        return _core.Point___ne__(*args, **kwargs)
+
+    def __add__(*args, **kwargs):
+        """__add__(Point pt) -> Point
+
+Add pt's proprties to this and return the result."""
+        return _core.Point___add__(*args, **kwargs)
+
+    def __sub__(*args, **kwargs):
+        """__sub__(Point pt) -> Point
+
+Subtract pt's proprties from this and return the result"""
+        return _core.Point___sub__(*args, **kwargs)
+
+    def __iadd__(*args, **kwargs):
+        """__iadd__(Point pt) -> Point
+
+Add pt to this object."""
+        return _core.Point___iadd__(*args, **kwargs)
+
+    def __isub__(*args, **kwargs):
+        """__isub__(Point pt) -> Point
+
+Subtract pt from this object."""
+        return _core.Point___isub__(*args, **kwargs)
+
+    def Set(*args, **kwargs):
+        """Set(long x, long y)
+
+Set both the x and y properties"""
+        return _core.Point_Set(*args, **kwargs)
+
+    def Get(*args, **kwargs):
+        """Get() -> (x,y)
+
+Return the x and y properties as a tuple. """
+        return _core.Point_Get(*args, **kwargs)
+
+    asTuple = Get
+    def __str__(self):                   return str(self.Get())
+    def __repr__(self):                  return 'wx.Point'+str(self.Get())
+    def __len__(self):                   return len(self.Get())
+    def __getitem__(self, index):        return self.Get()[index]
     def __setitem__(self, index, val):
         if index == 0: self.x = val
         elif index == 1: self.y = val
         else: raise IndexError
-    def __nonzero__(self):               return self.asTuple() != (0,0)
+    def __nonzero__(self):               return self.Get() != (0,0)
     def __getinitargs__(self):           return ()
-    def __getstate__(self):              return self.asTuple()
+    def __getstate__(self):              return self.Get()
     def __setstate__(self, state):       self.Set(*state)
 
 
@@ -769,66 +937,219 @@ _core.Point_swigregister(PointPtr)
 #---------------------------------------------------------------------------
 
 class Rect(object):
+    """A class for representing and manipulating rectangles.  It has x, y, width and
+height properties.  In wxPython most palces that expect a wx.Rect can also
+accept a (x,y,width,height) tuple."""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxRect instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int x=0, int y=0, int width=0, int height=0) -> Rect
+
+Create a new Rect object."""
         newobj = _core.new_Rect(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_core.delete_Rect):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetX(*args, **kwargs): return _core.Rect_GetX(*args, **kwargs)
-    def SetX(*args, **kwargs): return _core.Rect_SetX(*args, **kwargs)
-    def GetY(*args, **kwargs): return _core.Rect_GetY(*args, **kwargs)
-    def SetY(*args, **kwargs): return _core.Rect_SetY(*args, **kwargs)
-    def GetWidth(*args, **kwargs): return _core.Rect_GetWidth(*args, **kwargs)
-    def SetWidth(*args, **kwargs): return _core.Rect_SetWidth(*args, **kwargs)
-    def GetHeight(*args, **kwargs): return _core.Rect_GetHeight(*args, **kwargs)
-    def SetHeight(*args, **kwargs): return _core.Rect_SetHeight(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _core.Rect_GetPosition(*args, **kwargs)
-    def SetPosition(*args, **kwargs): return _core.Rect_SetPosition(*args, **kwargs)
-    def GetSize(*args, **kwargs): return _core.Rect_GetSize(*args, **kwargs)
-    def SetSize(*args, **kwargs): return _core.Rect_SetSize(*args, **kwargs)
-    def GetLeft(*args, **kwargs): return _core.Rect_GetLeft(*args, **kwargs)
-    def GetTop(*args, **kwargs): return _core.Rect_GetTop(*args, **kwargs)
-    def GetBottom(*args, **kwargs): return _core.Rect_GetBottom(*args, **kwargs)
-    def GetRight(*args, **kwargs): return _core.Rect_GetRight(*args, **kwargs)
-    def SetLeft(*args, **kwargs): return _core.Rect_SetLeft(*args, **kwargs)
-    def SetRight(*args, **kwargs): return _core.Rect_SetRight(*args, **kwargs)
-    def SetTop(*args, **kwargs): return _core.Rect_SetTop(*args, **kwargs)
-    def SetBottom(*args, **kwargs): return _core.Rect_SetBottom(*args, **kwargs)
-    def Inflate(*args, **kwargs): return _core.Rect_Inflate(*args, **kwargs)
-    def Deflate(*args, **kwargs): return _core.Rect_Deflate(*args, **kwargs)
-    def OffsetXY(*args, **kwargs): return _core.Rect_OffsetXY(*args, **kwargs)
-    def Offset(*args, **kwargs): return _core.Rect_Offset(*args, **kwargs)
-    def Intersect(*args, **kwargs): return _core.Rect_Intersect(*args, **kwargs)
-    def __add__(*args, **kwargs): return _core.Rect___add__(*args, **kwargs)
-    def __iadd__(*args, **kwargs): return _core.Rect___iadd__(*args, **kwargs)
-    def __eq__(*args, **kwargs): return _core.Rect___eq__(*args, **kwargs)
-    def __ne__(*args, **kwargs): return _core.Rect___ne__(*args, **kwargs)
-    def InsideXY(*args, **kwargs): return _core.Rect_InsideXY(*args, **kwargs)
-    def Inside(*args, **kwargs): return _core.Rect_Inside(*args, **kwargs)
-    def Intersects(*args, **kwargs): return _core.Rect_Intersects(*args, **kwargs)
+
+    def GetX(*args, **kwargs):
+        """GetX() -> int"""
+        return _core.Rect_GetX(*args, **kwargs)
+
+    def SetX(*args, **kwargs):
+        """SetX(int x)"""
+        return _core.Rect_SetX(*args, **kwargs)
+
+    def GetY(*args, **kwargs):
+        """GetY() -> int"""
+        return _core.Rect_GetY(*args, **kwargs)
+
+    def SetY(*args, **kwargs):
+        """SetY(int y)"""
+        return _core.Rect_SetY(*args, **kwargs)
+
+    def GetWidth(*args, **kwargs):
+        """GetWidth() -> int"""
+        return _core.Rect_GetWidth(*args, **kwargs)
+
+    def SetWidth(*args, **kwargs):
+        """SetWidth(int w)"""
+        return _core.Rect_SetWidth(*args, **kwargs)
+
+    def GetHeight(*args, **kwargs):
+        """GetHeight() -> int"""
+        return _core.Rect_GetHeight(*args, **kwargs)
+
+    def SetHeight(*args, **kwargs):
+        """SetHeight(int h)"""
+        return _core.Rect_SetHeight(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point"""
+        return _core.Rect_GetPosition(*args, **kwargs)
+
+    def SetPosition(*args, **kwargs):
+        """SetPosition(Point p)"""
+        return _core.Rect_SetPosition(*args, **kwargs)
+
+    def GetSize(*args, **kwargs):
+        """GetSize() -> Size"""
+        return _core.Rect_GetSize(*args, **kwargs)
+
+    def SetSize(*args, **kwargs):
+        """SetSize(Size s)"""
+        return _core.Rect_SetSize(*args, **kwargs)
+
+    def GetLeft(*args, **kwargs):
+        """GetLeft() -> int"""
+        return _core.Rect_GetLeft(*args, **kwargs)
+
+    def GetTop(*args, **kwargs):
+        """GetTop() -> int"""
+        return _core.Rect_GetTop(*args, **kwargs)
+
+    def GetBottom(*args, **kwargs):
+        """GetBottom() -> int"""
+        return _core.Rect_GetBottom(*args, **kwargs)
+
+    def GetRight(*args, **kwargs):
+        """GetRight() -> int"""
+        return _core.Rect_GetRight(*args, **kwargs)
+
+    def SetLeft(*args, **kwargs):
+        """SetLeft(int left)"""
+        return _core.Rect_SetLeft(*args, **kwargs)
+
+    def SetRight(*args, **kwargs):
+        """SetRight(int right)"""
+        return _core.Rect_SetRight(*args, **kwargs)
+
+    def SetTop(*args, **kwargs):
+        """SetTop(int top)"""
+        return _core.Rect_SetTop(*args, **kwargs)
+
+    def SetBottom(*args, **kwargs):
+        """SetBottom(int bottom)"""
+        return _core.Rect_SetBottom(*args, **kwargs)
+
+    position = property(GetPosition, SetPosition)
+    size = property(GetSize, SetSize)
+    left = property(GetLeft, SetLeft)
+    right = property(GetRight, SetRight)
+    top = property(GetTop, SetTop)
+    bottom = property(GetBottom, SetBottom)
+
+    def Inflate(*args, **kwargs):
+        """Inflate(int dx, int dy) -> Rect
+
+Increase the rectangle size by dx in x direction and dy in y direction. Both
+(or one of) parameters may be negative to decrease the rectangle size."""
+        return _core.Rect_Inflate(*args, **kwargs)
+
+    def Deflate(*args, **kwargs):
+        """Deflate(int dx, int dy) -> Rect
+
+Decrease the rectangle size by dx in x direction and dy in y direction. Both
+(or one of) parameters may be negative to increase the rectngle size. This
+method is the opposite of Inflate."""
+        return _core.Rect_Deflate(*args, **kwargs)
+
+    def OffsetXY(*args, **kwargs):
+        """OffsetXY(int dx, int dy)
+
+Moves the rectangle by the specified offset. If dx is positive, the rectangle
+is moved to the right, if dy is positive, it is moved to the bottom, otherwise
+it is moved to the left or top respectively."""
+        return _core.Rect_OffsetXY(*args, **kwargs)
+
+    def Offset(*args, **kwargs):
+        """Offset(Point pt)
+
+Same as OffsetXY but uses dx,dy from Point"""
+        return _core.Rect_Offset(*args, **kwargs)
+
+    def Intersect(*args, **kwargs):
+        """Intersect(Rect rect) -> Rect
+
+Return the intersectsion of this rectangle and rect."""
+        return _core.Rect_Intersect(*args, **kwargs)
+
+    def __add__(*args, **kwargs):
+        """__add__(Rect rect) -> Rect
+
+Add the properties of rect to this rectangle and return the result."""
+        return _core.Rect___add__(*args, **kwargs)
+
+    def __iadd__(*args, **kwargs):
+        """__iadd__(Rect rect) -> Rect
+
+Add the properties of rect to this rectangle, updating this rectangle."""
+        return _core.Rect___iadd__(*args, **kwargs)
+
+    def __eq__(*args, **kwargs):
+        """__eq__(Rect rect) -> bool
+
+Test for equality."""
+        return _core.Rect___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(Rect rect) -> bool
+
+Test for inequality."""
+        return _core.Rect___ne__(*args, **kwargs)
+
+    def InsideXY(*args, **kwargs):
+        """InsideXY(int x, int y) -> bool
+
+Return True if the point is (not strcitly) inside the rect."""
+        return _core.Rect_InsideXY(*args, **kwargs)
+
+    def Inside(*args, **kwargs):
+        """Inside(Point pt) -> bool
+
+Return True if the point is (not strcitly) inside the rect."""
+        return _core.Rect_Inside(*args, **kwargs)
+
+    def Intersects(*args, **kwargs):
+        """Intersects(Rect rect) -> bool
+
+Returns True if the rectangles have a non empty intersection."""
+        return _core.Rect_Intersects(*args, **kwargs)
+
     x = property(_core.Rect_x_get, _core.Rect_x_set)
     y = property(_core.Rect_y_get, _core.Rect_y_set)
     width = property(_core.Rect_width_get, _core.Rect_width_set)
     height = property(_core.Rect_height_get, _core.Rect_height_set)
-    def Set(*args, **kwargs): return _core.Rect_Set(*args, **kwargs)
-    def asTuple(*args, **kwargs): return _core.Rect_asTuple(*args, **kwargs)
-    def __str__(self):                   return str(self.asTuple())
-    def __repr__(self):                  return 'wxRect'+str(self.asTuple())
-    def __len__(self):                   return len(self.asTuple())
-    def __getitem__(self, index):        return self.asTuple()[index]
+    def Set(*args, **kwargs):
+        """Set(int x=0, int y=0, int width=0, int height=0)
+
+Set all rectangle properties."""
+        return _core.Rect_Set(*args, **kwargs)
+
+    def Get(*args, **kwargs):
+        """Get() -> (x,y,width,height)
+
+Return the rectangle properties as a tuple."""
+        return _core.Rect_Get(*args, **kwargs)
+
+    asTuple = Get
+    def __str__(self):                   return str(self.Get())
+    def __repr__(self):                  return 'wx.Rect'+str(self.Get())
+    def __len__(self):                   return len(self.Get())
+    def __getitem__(self, index):        return self.Get()[index]
     def __setitem__(self, index, val):
         if index == 0: self.x = val
         elif index == 1: self.y = val
         elif index == 2: self.width = val
         elif index == 3: self.height = val
         else: raise IndexError
-    def __nonzero__(self):               return self.asTuple() != (0,0,0,0)
+    def __nonzero__(self):               return self.Get() != (0,0,0,0)
     def __getinitargs__(self):           return ()
-    def __getstate__(self):              return self.asTuple()
+    def __getstate__(self):              return self.Get()
     def __setstate__(self, state):       self.Set(*state)
 
 
@@ -840,65 +1161,149 @@ class RectPtr(Rect):
 _core.Rect_swigregister(RectPtr)
 
 def RectPP(*args, **kwargs):
+    """RectPP(Point topLeft, Point bottomRight) -> Rect
+
+Create a new Rect object from Points representing two corners."""
     val = _core.new_RectPP(*args, **kwargs)
     val.thisown = 1
     return val
 
 def RectPS(*args, **kwargs):
+    """RectPS(Point pos, Size size) -> Rect
+
+Create a new Rect from a position and size."""
     val = _core.new_RectPS(*args, **kwargs)
     val.thisown = 1
     return val
 
 
-IntersectRect = _core.IntersectRect
+def IntersectRect(*args, **kwargs):
+    """IntersectRect(Rect r1, Rect r2) -> Rect
+
+Calculate and return the intersection of r1 and r2."""
+    return _core.IntersectRect(*args, **kwargs)
 #---------------------------------------------------------------------------
 
 class Point2D(object):
+    """wx.Point2Ds represent a point or a vector in a 2d coordinate system with floating point values."""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPoint2D instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(double x=0.0, double y=0.0) -> Point2D
+
+Create a w.Point2D object."""
         newobj = _core.new_Point2D(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetFloor(*args, **kwargs): return _core.Point2D_GetFloor(*args, **kwargs)
-    def GetRounded(*args, **kwargs): return _core.Point2D_GetRounded(*args, **kwargs)
-    def GetVectorLength(*args, **kwargs): return _core.Point2D_GetVectorLength(*args, **kwargs)
-    def GetVectorAngle(*args, **kwargs): return _core.Point2D_GetVectorAngle(*args, **kwargs)
-    def SetVectorLength(*args, **kwargs): return _core.Point2D_SetVectorLength(*args, **kwargs)
-    def SetVectorAngle(*args, **kwargs): return _core.Point2D_SetVectorAngle(*args, **kwargs)
+    def GetFloor(*args, **kwargs):
+        """GetFloor() -> (x,y)
+
+Convert to integer"""
+        return _core.Point2D_GetFloor(*args, **kwargs)
+
+    def GetRounded(*args, **kwargs):
+        """GetRounded() -> (x,y)
+
+Convert to integer"""
+        return _core.Point2D_GetRounded(*args, **kwargs)
+
+    def GetVectorLength(*args, **kwargs):
+        """GetVectorLength() -> double"""
+        return _core.Point2D_GetVectorLength(*args, **kwargs)
+
+    def GetVectorAngle(*args, **kwargs):
+        """GetVectorAngle() -> double"""
+        return _core.Point2D_GetVectorAngle(*args, **kwargs)
+
+    def SetVectorLength(*args, **kwargs):
+        """SetVectorLength(double length)"""
+        return _core.Point2D_SetVectorLength(*args, **kwargs)
+
+    def SetVectorAngle(*args, **kwargs):
+        """SetVectorAngle(double degrees)"""
+        return _core.Point2D_SetVectorAngle(*args, **kwargs)
+
     def SetPolarCoordinates(self, angle, length):
         self.SetVectorLength(length)
         self.SetVectorAngle(angle)
     def Normalize(self):
         self.SetVectorLength(1.0)
 
-    def GetDistance(*args, **kwargs): return _core.Point2D_GetDistance(*args, **kwargs)
-    def GetDistanceSquare(*args, **kwargs): return _core.Point2D_GetDistanceSquare(*args, **kwargs)
-    def GetDotProduct(*args, **kwargs): return _core.Point2D_GetDotProduct(*args, **kwargs)
-    def GetCrossProduct(*args, **kwargs): return _core.Point2D_GetCrossProduct(*args, **kwargs)
-    def __neg__(*args, **kwargs): return _core.Point2D___neg__(*args, **kwargs)
-    def __iadd__(*args, **kwargs): return _core.Point2D___iadd__(*args, **kwargs)
-    def __isub__(*args, **kwargs): return _core.Point2D___isub__(*args, **kwargs)
-    def __imul__(*args, **kwargs): return _core.Point2D___imul__(*args, **kwargs)
-    def __idiv__(*args, **kwargs): return _core.Point2D___idiv__(*args, **kwargs)
-    def __eq__(*args, **kwargs): return _core.Point2D___eq__(*args, **kwargs)
-    def __ne__(*args, **kwargs): return _core.Point2D___ne__(*args, **kwargs)
-    m_x = property(_core.Point2D_m_x_get, _core.Point2D_m_x_set)
-    m_y = property(_core.Point2D_m_y_get, _core.Point2D_m_y_set)
+    def GetDistance(*args, **kwargs):
+        """GetDistance(Point2D pt) -> double"""
+        return _core.Point2D_GetDistance(*args, **kwargs)
+
+    def GetDistanceSquare(*args, **kwargs):
+        """GetDistanceSquare(Point2D pt) -> double"""
+        return _core.Point2D_GetDistanceSquare(*args, **kwargs)
+
+    def GetDotProduct(*args, **kwargs):
+        """GetDotProduct(Point2D vec) -> double"""
+        return _core.Point2D_GetDotProduct(*args, **kwargs)
+
+    def GetCrossProduct(*args, **kwargs):
+        """GetCrossProduct(Point2D vec) -> double"""
+        return _core.Point2D_GetCrossProduct(*args, **kwargs)
+
+    def __neg__(*args, **kwargs):
+        """__neg__() -> Point2D
+
+the reflection of this point"""
+        return _core.Point2D___neg__(*args, **kwargs)
+
+    def __iadd__(*args, **kwargs):
+        """__iadd__(Point2D pt) -> Point2D"""
+        return _core.Point2D___iadd__(*args, **kwargs)
+
+    def __isub__(*args, **kwargs):
+        """__isub__(Point2D pt) -> Point2D"""
+        return _core.Point2D___isub__(*args, **kwargs)
+
+    def __imul__(*args, **kwargs):
+        """__imul__(Point2D pt) -> Point2D"""
+        return _core.Point2D___imul__(*args, **kwargs)
+
+    def __idiv__(*args, **kwargs):
+        """__idiv__(Point2D pt) -> Point2D"""
+        return _core.Point2D___idiv__(*args, **kwargs)
+
+    def __eq__(*args, **kwargs):
+        """__eq__(Point2D pt) -> bool
+
+Test for equality"""
+        return _core.Point2D___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(Point2D pt) -> bool
+
+Test for inequality"""
+        return _core.Point2D___ne__(*args, **kwargs)
+
     x = property(_core.Point2D_x_get, _core.Point2D_x_set)
     y = property(_core.Point2D_y_get, _core.Point2D_y_set)
-    def Set(*args, **kwargs): return _core.Point2D_Set(*args, **kwargs)
-    def asTuple(*args, **kwargs): return _core.Point2D_asTuple(*args, **kwargs)
-    def __str__(self):                   return str(self.asTuple())
-    def __repr__(self):                  return 'wxPoint2D'+str(self.asTuple())
-    def __len__(self):                   return len(self.asTuple())
-    def __getitem__(self, index):        return self.asTuple()[index]
+    def Set(*args, **kwargs):
+        """Set(double x=0, double y=0)"""
+        return _core.Point2D_Set(*args, **kwargs)
+
+    def Get(*args, **kwargs):
+        """Get() -> (x,y)
+
+Return x and y properties as a tuple."""
+        return _core.Point2D_Get(*args, **kwargs)
+
+    asTuple = Get
+    def __str__(self):                   return str(self.Get())
+    def __repr__(self):                  return 'wx.Point2D'+str(self.Get())
+    def __len__(self):                   return len(self.Get())
+    def __getitem__(self, index):        return self.Get()[index]
     def __setitem__(self, index, val):
-        if index == 0: self.m_x = val
-        elif index == 1: self.m_yt = val
+        if index == 0: self.x = val
+        elif index == 1: self.y = val
         else: raise IndexError
-    def __nonzero__(self):               return self.asTuple() != (0.0, 0.0)
+    def __nonzero__(self):               return self.Get() != (0.0, 0.0)
     def __getinitargs__(self):           return ()
-    def __getstate__(self):              return self.asTuple()
+    def __getstate__(self):              return self.Get()
     def __setstate__(self, state):       self.Set(*state)
 
 
@@ -911,11 +1316,17 @@ class Point2DPtr(Point2D):
 _core.Point2D_swigregister(Point2DPtr)
 
 def Point2DCopy(*args, **kwargs):
+    """Point2DCopy(Point2D pt) -> Point2D
+
+Create a w.Point2D object."""
     val = _core.new_Point2DCopy(*args, **kwargs)
     val.thisown = 1
     return val
 
 def Point2DFromPoint(*args, **kwargs):
+    """Point2DFromPoint(Point pt) -> Point2D
+
+Create a w.Point2D object."""
     val = _core.new_Point2DFromPoint(*args, **kwargs)
     val.thisown = 1
     return val
@@ -926,29 +1337,79 @@ FromStart = _core.FromStart
 FromCurrent = _core.FromCurrent
 FromEnd = _core.FromEnd
 class InputStream(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyInputStream instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(PyObject p) -> InputStream"""
         newobj = _core.new_InputStream(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def close(*args, **kwargs): return _core.InputStream_close(*args, **kwargs)
-    def flush(*args, **kwargs): return _core.InputStream_flush(*args, **kwargs)
-    def eof(*args, **kwargs): return _core.InputStream_eof(*args, **kwargs)
-    def read(*args, **kwargs): return _core.InputStream_read(*args, **kwargs)
-    def readline(*args, **kwargs): return _core.InputStream_readline(*args, **kwargs)
-    def readlines(*args, **kwargs): return _core.InputStream_readlines(*args, **kwargs)
-    def seek(*args, **kwargs): return _core.InputStream_seek(*args, **kwargs)
-    def tell(*args, **kwargs): return _core.InputStream_tell(*args, **kwargs)
-    def Peek(*args, **kwargs): return _core.InputStream_Peek(*args, **kwargs)
-    def GetC(*args, **kwargs): return _core.InputStream_GetC(*args, **kwargs)
-    def LastRead(*args, **kwargs): return _core.InputStream_LastRead(*args, **kwargs)
-    def CanRead(*args, **kwargs): return _core.InputStream_CanRead(*args, **kwargs)
-    def Eof(*args, **kwargs): return _core.InputStream_Eof(*args, **kwargs)
-    def Ungetch(*args, **kwargs): return _core.InputStream_Ungetch(*args, **kwargs)
-    def SeekI(*args, **kwargs): return _core.InputStream_SeekI(*args, **kwargs)
-    def TellI(*args, **kwargs): return _core.InputStream_TellI(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyInputStream instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def close(*args, **kwargs):
+        """close()"""
+        return _core.InputStream_close(*args, **kwargs)
+
+    def flush(*args, **kwargs):
+        """flush()"""
+        return _core.InputStream_flush(*args, **kwargs)
+
+    def eof(*args, **kwargs):
+        """eof() -> bool"""
+        return _core.InputStream_eof(*args, **kwargs)
+
+    def read(*args, **kwargs):
+        """read(int size=-1) -> PyObject"""
+        return _core.InputStream_read(*args, **kwargs)
+
+    def readline(*args, **kwargs):
+        """readline(int size=-1) -> PyObject"""
+        return _core.InputStream_readline(*args, **kwargs)
+
+    def readlines(*args, **kwargs):
+        """readlines(int sizehint=-1) -> PyObject"""
+        return _core.InputStream_readlines(*args, **kwargs)
+
+    def seek(*args, **kwargs):
+        """seek(int offset, int whence=0)"""
+        return _core.InputStream_seek(*args, **kwargs)
+
+    def tell(*args, **kwargs):
+        """tell() -> int"""
+        return _core.InputStream_tell(*args, **kwargs)
+
+    def Peek(*args, **kwargs):
+        """Peek() -> char"""
+        return _core.InputStream_Peek(*args, **kwargs)
+
+    def GetC(*args, **kwargs):
+        """GetC() -> char"""
+        return _core.InputStream_GetC(*args, **kwargs)
+
+    def LastRead(*args, **kwargs):
+        """LastRead() -> size_t"""
+        return _core.InputStream_LastRead(*args, **kwargs)
+
+    def CanRead(*args, **kwargs):
+        """CanRead() -> bool"""
+        return _core.InputStream_CanRead(*args, **kwargs)
+
+    def Eof(*args, **kwargs):
+        """Eof() -> bool"""
+        return _core.InputStream_Eof(*args, **kwargs)
+
+    def Ungetch(*args, **kwargs):
+        """Ungetch(char c) -> bool"""
+        return _core.InputStream_Ungetch(*args, **kwargs)
+
+    def SeekI(*args, **kwargs):
+        """SeekI(long pos, wxSeekMode mode=FromStart) -> long"""
+        return _core.InputStream_SeekI(*args, **kwargs)
+
+    def TellI(*args, **kwargs):
+        """TellI() -> long"""
+        return _core.InputStream_TellI(*args, **kwargs)
+
 
 class InputStreamPtr(InputStream):
     def __init__(self, this):
@@ -961,10 +1422,14 @@ DefaultPosition = cvar.DefaultPosition
 DefaultSize = cvar.DefaultSize
 
 class OutputStream(object):
-    def write(*args, **kwargs): return _core.OutputStream_write(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxOutputStream instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def write(*args, **kwargs):
+        """write(PyObject obj)"""
+        return _core.OutputStream_write(*args, **kwargs)
+
 
 class OutputStreamPtr(OutputStream):
     def __init__(self, this):
@@ -976,22 +1441,42 @@ _core.OutputStream_swigregister(OutputStreamPtr)
 #---------------------------------------------------------------------------
 
 class FSFile(Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFSFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxInputStream stream, wxString loc, wxString mimetype, 
+    wxString anchor, wxDateTime modif) -> FSFile"""
         newobj = _core.new_FSFile(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_core.delete_FSFile):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetStream(*args, **kwargs): return _core.FSFile_GetStream(*args, **kwargs)
-    def GetMimeType(*args, **kwargs): return _core.FSFile_GetMimeType(*args, **kwargs)
-    def GetLocation(*args, **kwargs): return _core.FSFile_GetLocation(*args, **kwargs)
-    def GetAnchor(*args, **kwargs): return _core.FSFile_GetAnchor(*args, **kwargs)
-    def GetModificationTime(*args, **kwargs): return _core.FSFile_GetModificationTime(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFSFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetStream(*args, **kwargs):
+        """GetStream() -> wxInputStream"""
+        return _core.FSFile_GetStream(*args, **kwargs)
+
+    def GetMimeType(*args, **kwargs):
+        """GetMimeType() -> wxString"""
+        return _core.FSFile_GetMimeType(*args, **kwargs)
+
+    def GetLocation(*args, **kwargs):
+        """GetLocation() -> wxString"""
+        return _core.FSFile_GetLocation(*args, **kwargs)
+
+    def GetAnchor(*args, **kwargs):
+        """GetAnchor() -> wxString"""
+        return _core.FSFile_GetAnchor(*args, **kwargs)
+
+    def GetModificationTime(*args, **kwargs):
+        """GetModificationTime() -> wxDateTime"""
+        return _core.FSFile_GetModificationTime(*args, **kwargs)
+
 
 class FSFilePtr(FSFile):
     def __init__(self, this):
@@ -1001,6 +1486,7 @@ class FSFilePtr(FSFile):
 _core.FSFile_swigregister(FSFilePtr)
 
 class CPPFileSystemHandler(object):
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxFileSystemHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -1013,24 +1499,57 @@ class CPPFileSystemHandlerPtr(CPPFileSystemHandler):
 _core.CPPFileSystemHandler_swigregister(CPPFileSystemHandlerPtr)
 
 class FileSystemHandler(CPPFileSystemHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyFileSystemHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> FileSystemHandler"""
         newobj = _core.new_FileSystemHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, FileSystemHandler)
-    def _setCallbackInfo(*args, **kwargs): return _core.FileSystemHandler__setCallbackInfo(*args, **kwargs)
-    def CanOpen(*args, **kwargs): return _core.FileSystemHandler_CanOpen(*args, **kwargs)
-    def OpenFile(*args, **kwargs): return _core.FileSystemHandler_OpenFile(*args, **kwargs)
-    def FindFirst(*args, **kwargs): return _core.FileSystemHandler_FindFirst(*args, **kwargs)
-    def FindNext(*args, **kwargs): return _core.FileSystemHandler_FindNext(*args, **kwargs)
-    def GetProtocol(*args, **kwargs): return _core.FileSystemHandler_GetProtocol(*args, **kwargs)
-    def GetLeftLocation(*args, **kwargs): return _core.FileSystemHandler_GetLeftLocation(*args, **kwargs)
-    def GetAnchor(*args, **kwargs): return _core.FileSystemHandler_GetAnchor(*args, **kwargs)
-    def GetRightLocation(*args, **kwargs): return _core.FileSystemHandler_GetRightLocation(*args, **kwargs)
-    def GetMimeTypeFromExt(*args, **kwargs): return _core.FileSystemHandler_GetMimeTypeFromExt(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyFileSystemHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _core.FileSystemHandler__setCallbackInfo(*args, **kwargs)
+
+    def CanOpen(*args, **kwargs):
+        """CanOpen(wxString location) -> bool"""
+        return _core.FileSystemHandler_CanOpen(*args, **kwargs)
+
+    def OpenFile(*args, **kwargs):
+        """OpenFile(FileSystem fs, wxString location) -> FSFile"""
+        return _core.FileSystemHandler_OpenFile(*args, **kwargs)
+
+    def FindFirst(*args, **kwargs):
+        """FindFirst(wxString spec, int flags=0) -> wxString"""
+        return _core.FileSystemHandler_FindFirst(*args, **kwargs)
+
+    def FindNext(*args, **kwargs):
+        """FindNext() -> wxString"""
+        return _core.FileSystemHandler_FindNext(*args, **kwargs)
+
+    def GetProtocol(*args, **kwargs):
+        """GetProtocol(wxString location) -> wxString"""
+        return _core.FileSystemHandler_GetProtocol(*args, **kwargs)
+
+    def GetLeftLocation(*args, **kwargs):
+        """GetLeftLocation(wxString location) -> wxString"""
+        return _core.FileSystemHandler_GetLeftLocation(*args, **kwargs)
+
+    def GetAnchor(*args, **kwargs):
+        """GetAnchor(wxString location) -> wxString"""
+        return _core.FileSystemHandler_GetAnchor(*args, **kwargs)
+
+    def GetRightLocation(*args, **kwargs):
+        """GetRightLocation(wxString location) -> wxString"""
+        return _core.FileSystemHandler_GetRightLocation(*args, **kwargs)
+
+    def GetMimeTypeFromExt(*args, **kwargs):
+        """GetMimeTypeFromExt(wxString location) -> wxString"""
+        return _core.FileSystemHandler_GetMimeTypeFromExt(*args, **kwargs)
+
 
 class FileSystemHandlerPtr(FileSystemHandler):
     def __init__(self, this):
@@ -1040,25 +1559,56 @@ class FileSystemHandlerPtr(FileSystemHandler):
 _core.FileSystemHandler_swigregister(FileSystemHandlerPtr)
 
 class FileSystem(Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFileSystem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> FileSystem"""
         newobj = _core.new_FileSystem(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_core.delete_FileSystem):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def ChangePathTo(*args, **kwargs): return _core.FileSystem_ChangePathTo(*args, **kwargs)
-    def GetPath(*args, **kwargs): return _core.FileSystem_GetPath(*args, **kwargs)
-    def OpenFile(*args, **kwargs): return _core.FileSystem_OpenFile(*args, **kwargs)
-    def FindFirst(*args, **kwargs): return _core.FileSystem_FindFirst(*args, **kwargs)
-    def FindNext(*args, **kwargs): return _core.FileSystem_FindNext(*args, **kwargs)
-    AddHandler = staticmethod(_core.FileSystem_AddHandler)
-    CleanUpHandlers = staticmethod(_core.FileSystem_CleanUpHandlers)
-    FileNameToURL = staticmethod(_core.FileSystem_FileNameToURL)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFileSystem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def ChangePathTo(*args, **kwargs):
+        """ChangePathTo(wxString location, bool is_dir=False)"""
+        return _core.FileSystem_ChangePathTo(*args, **kwargs)
+
+    def GetPath(*args, **kwargs):
+        """GetPath() -> wxString"""
+        return _core.FileSystem_GetPath(*args, **kwargs)
+
+    def OpenFile(*args, **kwargs):
+        """OpenFile(wxString location) -> FSFile"""
+        return _core.FileSystem_OpenFile(*args, **kwargs)
+
+    def FindFirst(*args, **kwargs):
+        """FindFirst(wxString spec, int flags=0) -> wxString"""
+        return _core.FileSystem_FindFirst(*args, **kwargs)
+
+    def FindNext(*args, **kwargs):
+        """FindNext() -> wxString"""
+        return _core.FileSystem_FindNext(*args, **kwargs)
+
+    def AddHandler(*args, **kwargs):
+        """FileSystem.AddHandler(CPPFileSystemHandler handler)"""
+        return _core.FileSystem_AddHandler(*args, **kwargs)
+
+    AddHandler = staticmethod(AddHandler)
+    def CleanUpHandlers(*args, **kwargs):
+        """FileSystem.CleanUpHandlers()"""
+        return _core.FileSystem_CleanUpHandlers(*args, **kwargs)
+
+    CleanUpHandlers = staticmethod(CleanUpHandlers)
+    def FileNameToURL(*args, **kwargs):
+        """FileSystem.FileNameToURL(wxString filename) -> wxString"""
+        return _core.FileSystem_FileNameToURL(*args, **kwargs)
+
+    FileNameToURL = staticmethod(FileNameToURL)
 
 class FileSystemPtr(FileSystem):
     def __init__(self, this):
@@ -1067,24 +1617,40 @@ class FileSystemPtr(FileSystem):
         self.__class__ = FileSystem
 _core.FileSystem_swigregister(FileSystemPtr)
 
-FileSystem_AddHandler = _core.FileSystem_AddHandler
+def FileSystem_AddHandler(*args, **kwargs):
+    """FileSystem_AddHandler(CPPFileSystemHandler handler)"""
+    return _core.FileSystem_AddHandler(*args, **kwargs)
 
-FileSystem_CleanUpHandlers = _core.FileSystem_CleanUpHandlers
+def FileSystem_CleanUpHandlers(*args, **kwargs):
+    """FileSystem_CleanUpHandlers()"""
+    return _core.FileSystem_CleanUpHandlers(*args, **kwargs)
 
-FileSystem_FileNameToURL = _core.FileSystem_FileNameToURL
+def FileSystem_FileNameToURL(*args, **kwargs):
+    """FileSystem_FileNameToURL(wxString filename) -> wxString"""
+    return _core.FileSystem_FileNameToURL(*args, **kwargs)
 
 
-FileSystem_URLToFileName = _core.FileSystem_URLToFileName
+def FileSystem_URLToFileName(*args, **kwargs):
+    """FileSystem_URLToFileName(wxString url) -> wxString"""
+    return _core.FileSystem_URLToFileName(*args, **kwargs)
 class InternetFSHandler(CPPFileSystemHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxInternetFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> InternetFSHandler"""
         newobj = _core.new_InternetFSHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def CanOpen(*args, **kwargs): return _core.InternetFSHandler_CanOpen(*args, **kwargs)
-    def OpenFile(*args, **kwargs): return _core.InternetFSHandler_OpenFile(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxInternetFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def CanOpen(*args, **kwargs):
+        """CanOpen(wxString location) -> bool"""
+        return _core.InternetFSHandler_CanOpen(*args, **kwargs)
+
+    def OpenFile(*args, **kwargs):
+        """OpenFile(FileSystem fs, wxString location) -> FSFile"""
+        return _core.InternetFSHandler_OpenFile(*args, **kwargs)
+
 
 class InternetFSHandlerPtr(InternetFSHandler):
     def __init__(self, this):
@@ -1094,17 +1660,31 @@ class InternetFSHandlerPtr(InternetFSHandler):
 _core.InternetFSHandler_swigregister(InternetFSHandlerPtr)
 
 class ZipFSHandler(CPPFileSystemHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxZipFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> ZipFSHandler"""
         newobj = _core.new_ZipFSHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def CanOpen(*args, **kwargs): return _core.ZipFSHandler_CanOpen(*args, **kwargs)
-    def OpenFile(*args, **kwargs): return _core.ZipFSHandler_OpenFile(*args, **kwargs)
-    def FindFirst(*args, **kwargs): return _core.ZipFSHandler_FindFirst(*args, **kwargs)
-    def FindNext(*args, **kwargs): return _core.ZipFSHandler_FindNext(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxZipFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def CanOpen(*args, **kwargs):
+        """CanOpen(wxString location) -> bool"""
+        return _core.ZipFSHandler_CanOpen(*args, **kwargs)
+
+    def OpenFile(*args, **kwargs):
+        """OpenFile(FileSystem fs, wxString location) -> FSFile"""
+        return _core.ZipFSHandler_OpenFile(*args, **kwargs)
+
+    def FindFirst(*args, **kwargs):
+        """FindFirst(wxString spec, int flags=0) -> wxString"""
+        return _core.ZipFSHandler_FindFirst(*args, **kwargs)
+
+    def FindNext(*args, **kwargs):
+        """FindNext() -> wxString"""
+        return _core.ZipFSHandler_FindNext(*args, **kwargs)
+
 
 class ZipFSHandlerPtr(ZipFSHandler):
     def __init__(self, this):
@@ -1114,11 +1694,17 @@ class ZipFSHandlerPtr(ZipFSHandler):
 _core.ZipFSHandler_swigregister(ZipFSHandlerPtr)
 
 
-__wxMemoryFSHandler_AddFile_wxImage = _core.__wxMemoryFSHandler_AddFile_wxImage
+def __wxMemoryFSHandler_AddFile_wxImage(*args, **kwargs):
+    """__wxMemoryFSHandler_AddFile_wxImage(wxString filename, Image image, long type)"""
+    return _core.__wxMemoryFSHandler_AddFile_wxImage(*args, **kwargs)
 
-__wxMemoryFSHandler_AddFile_wxBitmap = _core.__wxMemoryFSHandler_AddFile_wxBitmap
+def __wxMemoryFSHandler_AddFile_wxBitmap(*args, **kwargs):
+    """__wxMemoryFSHandler_AddFile_wxBitmap(wxString filename, wxBitmap bitmap, long type)"""
+    return _core.__wxMemoryFSHandler_AddFile_wxBitmap(*args, **kwargs)
 
-__wxMemoryFSHandler_AddFile_Data = _core.__wxMemoryFSHandler_AddFile_Data
+def __wxMemoryFSHandler_AddFile_Data(*args, **kwargs):
+    """__wxMemoryFSHandler_AddFile_Data(wxString filename, PyObject data)"""
+    return _core.__wxMemoryFSHandler_AddFile_Data(*args, **kwargs)
 def MemoryFSHandler_AddFile(filename, a, b=''):
     if isinstance(a, wx.Image):
         __wxMemoryFSHandler_AddFile_wxImage(filename, a, b)
@@ -1129,19 +1715,37 @@ def MemoryFSHandler_AddFile(filename, a, b=''):
     else: raise TypeError, 'wx.Image, wx.Bitmap or string expected'
 
 class MemoryFSHandler(CPPFileSystemHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMemoryFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> MemoryFSHandler"""
         newobj = _core.new_MemoryFSHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    RemoveFile = staticmethod(_core.MemoryFSHandler_RemoveFile)
+    def RemoveFile(*args, **kwargs):
+        """MemoryFSHandler.RemoveFile(wxString filename)"""
+        return _core.MemoryFSHandler_RemoveFile(*args, **kwargs)
+
+    RemoveFile = staticmethod(RemoveFile)
     AddFile = staticmethod(MemoryFSHandler_AddFile) 
-    def CanOpen(*args, **kwargs): return _core.MemoryFSHandler_CanOpen(*args, **kwargs)
-    def OpenFile(*args, **kwargs): return _core.MemoryFSHandler_OpenFile(*args, **kwargs)
-    def FindFirst(*args, **kwargs): return _core.MemoryFSHandler_FindFirst(*args, **kwargs)
-    def FindNext(*args, **kwargs): return _core.MemoryFSHandler_FindNext(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMemoryFSHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def CanOpen(*args, **kwargs):
+        """CanOpen(wxString location) -> bool"""
+        return _core.MemoryFSHandler_CanOpen(*args, **kwargs)
+
+    def OpenFile(*args, **kwargs):
+        """OpenFile(FileSystem fs, wxString location) -> FSFile"""
+        return _core.MemoryFSHandler_OpenFile(*args, **kwargs)
+
+    def FindFirst(*args, **kwargs):
+        """FindFirst(wxString spec, int flags=0) -> wxString"""
+        return _core.MemoryFSHandler_FindFirst(*args, **kwargs)
+
+    def FindNext(*args, **kwargs):
+        """FindNext() -> wxString"""
+        return _core.MemoryFSHandler_FindNext(*args, **kwargs)
+
 
 class MemoryFSHandlerPtr(MemoryFSHandler):
     def __init__(self, this):
@@ -1150,23 +1754,53 @@ class MemoryFSHandlerPtr(MemoryFSHandler):
         self.__class__ = MemoryFSHandler
 _core.MemoryFSHandler_swigregister(MemoryFSHandlerPtr)
 
-MemoryFSHandler_RemoveFile = _core.MemoryFSHandler_RemoveFile
+def MemoryFSHandler_RemoveFile(*args, **kwargs):
+    """MemoryFSHandler_RemoveFile(wxString filename)"""
+    return _core.MemoryFSHandler_RemoveFile(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class ImageHandler(Object):
-    def GetName(*args, **kwargs): return _core.ImageHandler_GetName(*args, **kwargs)
-    def GetExtension(*args, **kwargs): return _core.ImageHandler_GetExtension(*args, **kwargs)
-    def GetType(*args, **kwargs): return _core.ImageHandler_GetType(*args, **kwargs)
-    def GetMimeType(*args, **kwargs): return _core.ImageHandler_GetMimeType(*args, **kwargs)
-    def CanRead(*args, **kwargs): return _core.ImageHandler_CanRead(*args, **kwargs)
-    def SetName(*args, **kwargs): return _core.ImageHandler_SetName(*args, **kwargs)
-    def SetExtension(*args, **kwargs): return _core.ImageHandler_SetExtension(*args, **kwargs)
-    def SetType(*args, **kwargs): return _core.ImageHandler_SetType(*args, **kwargs)
-    def SetMimeType(*args, **kwargs): return _core.ImageHandler_SetMimeType(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxImageHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetName(*args, **kwargs):
+        """GetName() -> wxString"""
+        return _core.ImageHandler_GetName(*args, **kwargs)
+
+    def GetExtension(*args, **kwargs):
+        """GetExtension() -> wxString"""
+        return _core.ImageHandler_GetExtension(*args, **kwargs)
+
+    def GetType(*args, **kwargs):
+        """GetType() -> long"""
+        return _core.ImageHandler_GetType(*args, **kwargs)
+
+    def GetMimeType(*args, **kwargs):
+        """GetMimeType() -> wxString"""
+        return _core.ImageHandler_GetMimeType(*args, **kwargs)
+
+    def CanRead(*args, **kwargs):
+        """CanRead(wxString name) -> bool"""
+        return _core.ImageHandler_CanRead(*args, **kwargs)
+
+    def SetName(*args, **kwargs):
+        """SetName(wxString name)"""
+        return _core.ImageHandler_SetName(*args, **kwargs)
+
+    def SetExtension(*args, **kwargs):
+        """SetExtension(wxString extension)"""
+        return _core.ImageHandler_SetExtension(*args, **kwargs)
+
+    def SetType(*args, **kwargs):
+        """SetType(long type)"""
+        return _core.ImageHandler_SetType(*args, **kwargs)
+
+    def SetMimeType(*args, **kwargs):
+        """SetMimeType(wxString mimetype)"""
+        return _core.ImageHandler_SetMimeType(*args, **kwargs)
+
 
 class ImageHandlerPtr(ImageHandler):
     def __init__(self, this):
@@ -1176,15 +1810,30 @@ class ImageHandlerPtr(ImageHandler):
 _core.ImageHandler_swigregister(ImageHandlerPtr)
 
 class ImageHistogram(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxImageHistogram instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> ImageHistogram"""
         newobj = _core.new_ImageHistogram(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    MakeKey = staticmethod(_core.ImageHistogram_MakeKey)
-    def FindFirstUnusedColour(*args, **kwargs): return _core.ImageHistogram_FindFirstUnusedColour(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxImageHistogram instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def MakeKey(*args, **kwargs):
+        """ImageHistogram.MakeKey(unsigned char r, unsigned char g, unsigned char b) -> unsigned long
+
+Get the key in the histogram for the given RGB values"""
+        return _core.ImageHistogram_MakeKey(*args, **kwargs)
+
+    MakeKey = staticmethod(MakeKey)
+    def FindFirstUnusedColour(*args, **kwargs):
+        """FindFirstUnusedColour(int startR=1, int startG=0, int startB=0) -> (success, r, g, b)
+
+Find first colour that is not used in the image and has higher RGB values than
+startR, startG, startB.  Returns a tuple consisting of a success flag and rgb
+values."""
+        return _core.ImageHistogram_FindFirstUnusedColour(*args, **kwargs)
+
 
 class ImageHistogramPtr(ImageHistogram):
     def __init__(self, this):
@@ -1193,82 +1842,288 @@ class ImageHistogramPtr(ImageHistogram):
         self.__class__ = ImageHistogram
 _core.ImageHistogram_swigregister(ImageHistogramPtr)
 
-ImageHistogram_MakeKey = _core.ImageHistogram_MakeKey
+def ImageHistogram_MakeKey(*args, **kwargs):
+    """ImageHistogram_MakeKey(unsigned char r, unsigned char g, unsigned char b) -> unsigned long
+
+Get the key in the histogram for the given RGB values"""
+    return _core.ImageHistogram_MakeKey(*args, **kwargs)
 
 class Image(Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxImage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString name, long type=BITMAP_TYPE_ANY, int index=-1) -> Image"""
         newobj = _core.new_Image(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_core.delete_Image):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Create(*args, **kwargs): return _core.Image_Create(*args, **kwargs)
-    def Destroy(*args, **kwargs): return _core.Image_Destroy(*args, **kwargs)
-    def Scale(*args, **kwargs): return _core.Image_Scale(*args, **kwargs)
-    def ShrinkBy(*args, **kwargs): return _core.Image_ShrinkBy(*args, **kwargs)
-    def Rescale(*args, **kwargs): return _core.Image_Rescale(*args, **kwargs)
-    def SetRGB(*args, **kwargs): return _core.Image_SetRGB(*args, **kwargs)
-    def GetRed(*args, **kwargs): return _core.Image_GetRed(*args, **kwargs)
-    def GetGreen(*args, **kwargs): return _core.Image_GetGreen(*args, **kwargs)
-    def GetBlue(*args, **kwargs): return _core.Image_GetBlue(*args, **kwargs)
-    def SetAlpha(*args, **kwargs): return _core.Image_SetAlpha(*args, **kwargs)
-    def GetAlpha(*args, **kwargs): return _core.Image_GetAlpha(*args, **kwargs)
-    def HasAlpha(*args, **kwargs): return _core.Image_HasAlpha(*args, **kwargs)
-    def FindFirstUnusedColour(*args, **kwargs): return _core.Image_FindFirstUnusedColour(*args, **kwargs)
-    def SetMaskFromImage(*args, **kwargs): return _core.Image_SetMaskFromImage(*args, **kwargs)
-    CanRead = staticmethod(_core.Image_CanRead)
-    GetImageCount = staticmethod(_core.Image_GetImageCount)
-    def LoadFile(*args, **kwargs): return _core.Image_LoadFile(*args, **kwargs)
-    def LoadMimeFile(*args, **kwargs): return _core.Image_LoadMimeFile(*args, **kwargs)
-    def SaveFile(*args, **kwargs): return _core.Image_SaveFile(*args, **kwargs)
-    def SaveMimeFile(*args, **kwargs): return _core.Image_SaveMimeFile(*args, **kwargs)
-    CanReadStream = staticmethod(_core.Image_CanReadStream)
-    def LoadStream(*args, **kwargs): return _core.Image_LoadStream(*args, **kwargs)
-    def LoadMimeStream(*args, **kwargs): return _core.Image_LoadMimeStream(*args, **kwargs)
-    def Ok(*args, **kwargs): return _core.Image_Ok(*args, **kwargs)
-    def GetWidth(*args, **kwargs): return _core.Image_GetWidth(*args, **kwargs)
-    def GetHeight(*args, **kwargs): return _core.Image_GetHeight(*args, **kwargs)
-    def GetSubImage(*args, **kwargs): return _core.Image_GetSubImage(*args, **kwargs)
-    def Copy(*args, **kwargs): return _core.Image_Copy(*args, **kwargs)
-    def Paste(*args, **kwargs): return _core.Image_Paste(*args, **kwargs)
-    def GetData(*args, **kwargs): return _core.Image_GetData(*args, **kwargs)
-    def SetData(*args, **kwargs): return _core.Image_SetData(*args, **kwargs)
-    def GetDataBuffer(*args, **kwargs): return _core.Image_GetDataBuffer(*args, **kwargs)
-    def SetDataBuffer(*args, **kwargs): return _core.Image_SetDataBuffer(*args, **kwargs)
-    def GetAlphaData(*args, **kwargs): return _core.Image_GetAlphaData(*args, **kwargs)
-    def SetAlphaData(*args, **kwargs): return _core.Image_SetAlphaData(*args, **kwargs)
-    def GetAlphaBuffer(*args, **kwargs): return _core.Image_GetAlphaBuffer(*args, **kwargs)
-    def SetAlphaBuffer(*args, **kwargs): return _core.Image_SetAlphaBuffer(*args, **kwargs)
-    def SetMaskColour(*args, **kwargs): return _core.Image_SetMaskColour(*args, **kwargs)
-    def GetMaskRed(*args, **kwargs): return _core.Image_GetMaskRed(*args, **kwargs)
-    def GetMaskGreen(*args, **kwargs): return _core.Image_GetMaskGreen(*args, **kwargs)
-    def GetMaskBlue(*args, **kwargs): return _core.Image_GetMaskBlue(*args, **kwargs)
-    def SetMask(*args, **kwargs): return _core.Image_SetMask(*args, **kwargs)
-    def HasMask(*args, **kwargs): return _core.Image_HasMask(*args, **kwargs)
-    def Rotate(*args, **kwargs): return _core.Image_Rotate(*args, **kwargs)
-    def Rotate90(*args, **kwargs): return _core.Image_Rotate90(*args, **kwargs)
-    def Mirror(*args, **kwargs): return _core.Image_Mirror(*args, **kwargs)
-    def Replace(*args, **kwargs): return _core.Image_Replace(*args, **kwargs)
-    def ConvertToMono(*args, **kwargs): return _core.Image_ConvertToMono(*args, **kwargs)
-    def SetOption(*args, **kwargs): return _core.Image_SetOption(*args, **kwargs)
-    def SetOptionInt(*args, **kwargs): return _core.Image_SetOptionInt(*args, **kwargs)
-    def GetOption(*args, **kwargs): return _core.Image_GetOption(*args, **kwargs)
-    def GetOptionInt(*args, **kwargs): return _core.Image_GetOptionInt(*args, **kwargs)
-    def HasOption(*args, **kwargs): return _core.Image_HasOption(*args, **kwargs)
-    def CountColours(*args, **kwargs): return _core.Image_CountColours(*args, **kwargs)
-    def ComputeHistogram(*args, **kwargs): return _core.Image_ComputeHistogram(*args, **kwargs)
-    AddHandler = staticmethod(_core.Image_AddHandler)
-    InsertHandler = staticmethod(_core.Image_InsertHandler)
-    RemoveHandler = staticmethod(_core.Image_RemoveHandler)
-    GetImageExtWildcard = staticmethod(_core.Image_GetImageExtWildcard)
-    def ConvertToBitmap(*args, **kwargs): return _core.Image_ConvertToBitmap(*args, **kwargs)
-    def ConvertToMonoBitmap(*args, **kwargs): return _core.Image_ConvertToMonoBitmap(*args, **kwargs)
-    def __nonzero__(self): return self.Ok() 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxImage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(int width, int height)"""
+        return _core.Image_Create(*args, **kwargs)
+
+    def Destroy(*args, **kwargs):
+        """Destroy()
+
+Deletes the C++ object this Python object is a proxy for."""
+        return _core.Image_Destroy(*args, **kwargs)
+
+    def Scale(*args, **kwargs):
+        """Scale(int width, int height) -> Image"""
+        return _core.Image_Scale(*args, **kwargs)
+
+    def ShrinkBy(*args, **kwargs):
+        """ShrinkBy(int xFactor, int yFactor) -> Image"""
+        return _core.Image_ShrinkBy(*args, **kwargs)
+
+    def Rescale(*args, **kwargs):
+        """Rescale(int width, int height) -> Image"""
+        return _core.Image_Rescale(*args, **kwargs)
+
+    def SetRGB(*args, **kwargs):
+        """SetRGB(int x, int y, unsigned char r, unsigned char g, unsigned char b)"""
+        return _core.Image_SetRGB(*args, **kwargs)
+
+    def GetRed(*args, **kwargs):
+        """GetRed(int x, int y) -> unsigned char"""
+        return _core.Image_GetRed(*args, **kwargs)
+
+    def GetGreen(*args, **kwargs):
+        """GetGreen(int x, int y) -> unsigned char"""
+        return _core.Image_GetGreen(*args, **kwargs)
+
+    def GetBlue(*args, **kwargs):
+        """GetBlue(int x, int y) -> unsigned char"""
+        return _core.Image_GetBlue(*args, **kwargs)
+
+    def SetAlpha(*args, **kwargs):
+        """SetAlpha(int x, int y, unsigned char alpha)"""
+        return _core.Image_SetAlpha(*args, **kwargs)
+
+    def GetAlpha(*args, **kwargs):
+        """GetAlpha(int x, int y) -> unsigned char"""
+        return _core.Image_GetAlpha(*args, **kwargs)
+
+    def HasAlpha(*args, **kwargs):
+        """HasAlpha() -> bool"""
+        return _core.Image_HasAlpha(*args, **kwargs)
+
+    def FindFirstUnusedColour(*args, **kwargs):
+        """FindFirstUnusedColour(int startR=1, int startG=0, int startB=0) -> (success, r, g, b)
+
+Find first colour that is not used in the image and has higher RGB values than
+startR, startG, startB.  Returns a tuple consisting of a success flag and rgb
+values."""
+        return _core.Image_FindFirstUnusedColour(*args, **kwargs)
+
+    def SetMaskFromImage(*args, **kwargs):
+        """SetMaskFromImage(Image mask, byte mr, byte mg, byte mb) -> bool"""
+        return _core.Image_SetMaskFromImage(*args, **kwargs)
+
+    def CanRead(*args, **kwargs):
+        """Image.CanRead(wxString name) -> bool"""
+        return _core.Image_CanRead(*args, **kwargs)
+
+    CanRead = staticmethod(CanRead)
+    def GetImageCount(*args, **kwargs):
+        """Image.GetImageCount(wxString name, long type=BITMAP_TYPE_ANY) -> int"""
+        return _core.Image_GetImageCount(*args, **kwargs)
+
+    GetImageCount = staticmethod(GetImageCount)
+    def LoadFile(*args, **kwargs):
+        """LoadFile(wxString name, long type=BITMAP_TYPE_ANY, int index=-1) -> bool"""
+        return _core.Image_LoadFile(*args, **kwargs)
+
+    def LoadMimeFile(*args, **kwargs):
+        """LoadMimeFile(wxString name, wxString mimetype, int index=-1) -> bool"""
+        return _core.Image_LoadMimeFile(*args, **kwargs)
+
+    def SaveFile(*args, **kwargs):
+        """SaveFile(wxString name, int type) -> bool"""
+        return _core.Image_SaveFile(*args, **kwargs)
+
+    def SaveMimeFile(*args, **kwargs):
+        """SaveMimeFile(wxString name, wxString mimetype) -> bool"""
+        return _core.Image_SaveMimeFile(*args, **kwargs)
+
+    def CanReadStream(*args, **kwargs):
+        """Image.CanReadStream(wxInputStream stream) -> bool"""
+        return _core.Image_CanReadStream(*args, **kwargs)
+
+    CanReadStream = staticmethod(CanReadStream)
+    def LoadStream(*args, **kwargs):
+        """LoadStream(wxInputStream stream, long type=BITMAP_TYPE_ANY, int index=-1) -> bool"""
+        return _core.Image_LoadStream(*args, **kwargs)
+
+    def LoadMimeStream(*args, **kwargs):
+        """LoadMimeStream(wxInputStream stream, wxString mimetype, int index=-1) -> bool"""
+        return _core.Image_LoadMimeStream(*args, **kwargs)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _core.Image_Ok(*args, **kwargs)
+
+    def GetWidth(*args, **kwargs):
+        """GetWidth() -> int"""
+        return _core.Image_GetWidth(*args, **kwargs)
+
+    def GetHeight(*args, **kwargs):
+        """GetHeight() -> int"""
+        return _core.Image_GetHeight(*args, **kwargs)
+
+    def GetSubImage(*args, **kwargs):
+        """GetSubImage(Rect rect) -> Image"""
+        return _core.Image_GetSubImage(*args, **kwargs)
+
+    def Copy(*args, **kwargs):
+        """Copy() -> Image"""
+        return _core.Image_Copy(*args, **kwargs)
+
+    def Paste(*args, **kwargs):
+        """Paste(Image image, int x, int y)"""
+        return _core.Image_Paste(*args, **kwargs)
+
+    def GetData(*args, **kwargs):
+        """GetData() -> PyObject"""
+        return _core.Image_GetData(*args, **kwargs)
+
+    def SetData(*args, **kwargs):
+        """SetData(PyObject data)"""
+        return _core.Image_SetData(*args, **kwargs)
+
+    def GetDataBuffer(*args, **kwargs):
+        """GetDataBuffer() -> PyObject"""
+        return _core.Image_GetDataBuffer(*args, **kwargs)
+
+    def SetDataBuffer(*args, **kwargs):
+        """SetDataBuffer(PyObject data)"""
+        return _core.Image_SetDataBuffer(*args, **kwargs)
+
+    def GetAlphaData(*args, **kwargs):
+        """GetAlphaData() -> PyObject"""
+        return _core.Image_GetAlphaData(*args, **kwargs)
+
+    def SetAlphaData(*args, **kwargs):
+        """SetAlphaData(PyObject data)"""
+        return _core.Image_SetAlphaData(*args, **kwargs)
+
+    def GetAlphaBuffer(*args, **kwargs):
+        """GetAlphaBuffer() -> PyObject"""
+        return _core.Image_GetAlphaBuffer(*args, **kwargs)
+
+    def SetAlphaBuffer(*args, **kwargs):
+        """SetAlphaBuffer(PyObject data)"""
+        return _core.Image_SetAlphaBuffer(*args, **kwargs)
+
+    def SetMaskColour(*args, **kwargs):
+        """SetMaskColour(unsigned char r, unsigned char g, unsigned char b)"""
+        return _core.Image_SetMaskColour(*args, **kwargs)
+
+    def GetMaskRed(*args, **kwargs):
+        """GetMaskRed() -> unsigned char"""
+        return _core.Image_GetMaskRed(*args, **kwargs)
+
+    def GetMaskGreen(*args, **kwargs):
+        """GetMaskGreen() -> unsigned char"""
+        return _core.Image_GetMaskGreen(*args, **kwargs)
+
+    def GetMaskBlue(*args, **kwargs):
+        """GetMaskBlue() -> unsigned char"""
+        return _core.Image_GetMaskBlue(*args, **kwargs)
+
+    def SetMask(*args, **kwargs):
+        """SetMask(bool mask=True)"""
+        return _core.Image_SetMask(*args, **kwargs)
+
+    def HasMask(*args, **kwargs):
+        """HasMask() -> bool"""
+        return _core.Image_HasMask(*args, **kwargs)
+
+    def Rotate(*args, **kwargs):
+        """Rotate(double angle, Point centre_of_rotation, bool interpolating=True, 
+    Point offset_after_rotation=None) -> Image"""
+        return _core.Image_Rotate(*args, **kwargs)
+
+    def Rotate90(*args, **kwargs):
+        """Rotate90(bool clockwise=True) -> Image"""
+        return _core.Image_Rotate90(*args, **kwargs)
+
+    def Mirror(*args, **kwargs):
+        """Mirror(bool horizontally=True) -> Image"""
+        return _core.Image_Mirror(*args, **kwargs)
+
+    def Replace(*args, **kwargs):
+        """Replace(unsigned char r1, unsigned char g1, unsigned char b1, 
+    unsigned char r2, unsigned char g2, unsigned char b2)"""
+        return _core.Image_Replace(*args, **kwargs)
+
+    def ConvertToMono(*args, **kwargs):
+        """ConvertToMono(unsigned char r, unsigned char g, unsigned char b) -> Image"""
+        return _core.Image_ConvertToMono(*args, **kwargs)
+
+    def SetOption(*args, **kwargs):
+        """SetOption(wxString name, wxString value)"""
+        return _core.Image_SetOption(*args, **kwargs)
+
+    def SetOptionInt(*args, **kwargs):
+        """SetOptionInt(wxString name, int value)"""
+        return _core.Image_SetOptionInt(*args, **kwargs)
+
+    def GetOption(*args, **kwargs):
+        """GetOption(wxString name) -> wxString"""
+        return _core.Image_GetOption(*args, **kwargs)
+
+    def GetOptionInt(*args, **kwargs):
+        """GetOptionInt(wxString name) -> int"""
+        return _core.Image_GetOptionInt(*args, **kwargs)
+
+    def HasOption(*args, **kwargs):
+        """HasOption(wxString name) -> bool"""
+        return _core.Image_HasOption(*args, **kwargs)
+
+    def CountColours(*args, **kwargs):
+        """CountColours(unsigned long stopafter=(unsigned long) -1) -> unsigned long"""
+        return _core.Image_CountColours(*args, **kwargs)
+
+    def ComputeHistogram(*args, **kwargs):
+        """ComputeHistogram(ImageHistogram h) -> unsigned long"""
+        return _core.Image_ComputeHistogram(*args, **kwargs)
+
+    def AddHandler(*args, **kwargs):
+        """Image.AddHandler(ImageHandler handler)"""
+        return _core.Image_AddHandler(*args, **kwargs)
+
+    AddHandler = staticmethod(AddHandler)
+    def InsertHandler(*args, **kwargs):
+        """Image.InsertHandler(ImageHandler handler)"""
+        return _core.Image_InsertHandler(*args, **kwargs)
+
+    InsertHandler = staticmethod(InsertHandler)
+    def RemoveHandler(*args, **kwargs):
+        """Image.RemoveHandler(wxString name) -> bool"""
+        return _core.Image_RemoveHandler(*args, **kwargs)
+
+    RemoveHandler = staticmethod(RemoveHandler)
+    def GetImageExtWildcard(*args, **kwargs):
+        """Image.GetImageExtWildcard() -> wxString"""
+        return _core.Image_GetImageExtWildcard(*args, **kwargs)
+
+    GetImageExtWildcard = staticmethod(GetImageExtWildcard)
+    def ConvertToBitmap(*args, **kwargs):
+        """ConvertToBitmap() -> wxBitmap"""
+        return _core.Image_ConvertToBitmap(*args, **kwargs)
+
+    def ConvertToMonoBitmap(*args, **kwargs):
+        """ConvertToMonoBitmap(unsigned char red, unsigned char green, unsigned char blue) -> wxBitmap"""
+        return _core.Image_ConvertToMonoBitmap(*args, **kwargs)
+
+    def __nonzero__(self): return self.Ok() 
 
 class ImagePtr(Image):
     def __init__(self, this):
@@ -1278,51 +2133,73 @@ class ImagePtr(Image):
 _core.Image_swigregister(ImagePtr)
 
 def ImageFromMime(*args, **kwargs):
+    """ImageFromMime(wxString name, wxString mimetype, int index=-1) -> Image"""
     val = _core.new_ImageFromMime(*args, **kwargs)
     val.thisown = 1
     return val
 
 def ImageFromStream(*args, **kwargs):
+    """ImageFromStream(wxInputStream stream, long type=BITMAP_TYPE_ANY, int index=-1) -> Image"""
     val = _core.new_ImageFromStream(*args, **kwargs)
     val.thisown = 1
     return val
 
 def ImageFromStreamMime(*args, **kwargs):
+    """ImageFromStreamMime(wxInputStream stream, wxString mimetype, int index=-1) -> Image"""
     val = _core.new_ImageFromStreamMime(*args, **kwargs)
     val.thisown = 1
     return val
 
 def EmptyImage(*args, **kwargs):
+    """EmptyImage(int width=0, int height=0, bool clear=True) -> Image"""
     val = _core.new_EmptyImage(*args, **kwargs)
     val.thisown = 1
     return val
 
 def ImageFromBitmap(*args, **kwargs):
+    """ImageFromBitmap(wxBitmap bitmap) -> Image"""
     val = _core.new_ImageFromBitmap(*args, **kwargs)
     val.thisown = 1
     return val
 
 def ImageFromData(*args, **kwargs):
+    """ImageFromData(int width, int height, unsigned char data) -> Image"""
     val = _core.new_ImageFromData(*args, **kwargs)
     val.thisown = 1
     return val
 
-Image_CanRead = _core.Image_CanRead
+def Image_CanRead(*args, **kwargs):
+    """Image_CanRead(wxString name) -> bool"""
+    return _core.Image_CanRead(*args, **kwargs)
 
-Image_GetImageCount = _core.Image_GetImageCount
+def Image_GetImageCount(*args, **kwargs):
+    """Image_GetImageCount(wxString name, long type=BITMAP_TYPE_ANY) -> int"""
+    return _core.Image_GetImageCount(*args, **kwargs)
 
-Image_CanReadStream = _core.Image_CanReadStream
+def Image_CanReadStream(*args, **kwargs):
+    """Image_CanReadStream(wxInputStream stream) -> bool"""
+    return _core.Image_CanReadStream(*args, **kwargs)
 
-Image_AddHandler = _core.Image_AddHandler
+def Image_AddHandler(*args, **kwargs):
+    """Image_AddHandler(ImageHandler handler)"""
+    return _core.Image_AddHandler(*args, **kwargs)
 
-Image_InsertHandler = _core.Image_InsertHandler
+def Image_InsertHandler(*args, **kwargs):
+    """Image_InsertHandler(ImageHandler handler)"""
+    return _core.Image_InsertHandler(*args, **kwargs)
 
-Image_RemoveHandler = _core.Image_RemoveHandler
+def Image_RemoveHandler(*args, **kwargs):
+    """Image_RemoveHandler(wxString name) -> bool"""
+    return _core.Image_RemoveHandler(*args, **kwargs)
 
-Image_GetImageExtWildcard = _core.Image_GetImageExtWildcard
+def Image_GetImageExtWildcard(*args, **kwargs):
+    """Image_GetImageExtWildcard() -> wxString"""
+    return _core.Image_GetImageExtWildcard(*args, **kwargs)
 
 
-InitAllImageHandlers = _core.InitAllImageHandlers
+def InitAllImageHandlers(*args, **kwargs):
+    """InitAllImageHandlers()"""
+    return _core.InitAllImageHandlers(*args, **kwargs)
 IMAGE_RESOLUTION_INCHES = _core.IMAGE_RESOLUTION_INCHES
 IMAGE_RESOLUTION_CM = _core.IMAGE_RESOLUTION_CM
 BMP_24BPP = _core.BMP_24BPP
@@ -1335,13 +2212,15 @@ BMP_4BPP = _core.BMP_4BPP
 BMP_1BPP = _core.BMP_1BPP
 BMP_1BPP_BW = _core.BMP_1BPP_BW
 class BMPHandler(ImageHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBMPHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> BMPHandler"""
         newobj = _core.new_BMPHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBMPHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class BMPHandlerPtr(BMPHandler):
     def __init__(self, this):
@@ -1357,13 +2236,15 @@ IMAGE_OPTION_RESOLUTION = cvar.IMAGE_OPTION_RESOLUTION
 IMAGE_OPTION_RESOLUTIONUNIT = cvar.IMAGE_OPTION_RESOLUTIONUNIT
 
 class ICOHandler(BMPHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxICOHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> ICOHandler"""
         newobj = _core.new_ICOHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxICOHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class ICOHandlerPtr(ICOHandler):
     def __init__(self, this):
@@ -1373,13 +2254,15 @@ class ICOHandlerPtr(ICOHandler):
 _core.ICOHandler_swigregister(ICOHandlerPtr)
 
 class CURHandler(ICOHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCURHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> CURHandler"""
         newobj = _core.new_CURHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCURHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class CURHandlerPtr(CURHandler):
     def __init__(self, this):
@@ -1389,13 +2272,15 @@ class CURHandlerPtr(CURHandler):
 _core.CURHandler_swigregister(CURHandlerPtr)
 
 class ANIHandler(CURHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxANIHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> ANIHandler"""
         newobj = _core.new_ANIHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxANIHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class ANIHandlerPtr(ANIHandler):
     def __init__(self, this):
@@ -1405,13 +2290,15 @@ class ANIHandlerPtr(ANIHandler):
 _core.ANIHandler_swigregister(ANIHandlerPtr)
 
 class PNGHandler(ImageHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPNGHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PNGHandler"""
         newobj = _core.new_PNGHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPNGHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class PNGHandlerPtr(PNGHandler):
     def __init__(self, this):
@@ -1421,13 +2308,15 @@ class PNGHandlerPtr(PNGHandler):
 _core.PNGHandler_swigregister(PNGHandlerPtr)
 
 class GIFHandler(ImageHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGIFHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> GIFHandler"""
         newobj = _core.new_GIFHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGIFHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class GIFHandlerPtr(GIFHandler):
     def __init__(self, this):
@@ -1437,13 +2326,15 @@ class GIFHandlerPtr(GIFHandler):
 _core.GIFHandler_swigregister(GIFHandlerPtr)
 
 class PCXHandler(ImageHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPCXHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PCXHandler"""
         newobj = _core.new_PCXHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPCXHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class PCXHandlerPtr(PCXHandler):
     def __init__(self, this):
@@ -1453,13 +2344,15 @@ class PCXHandlerPtr(PCXHandler):
 _core.PCXHandler_swigregister(PCXHandlerPtr)
 
 class JPEGHandler(ImageHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxJPEGHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> JPEGHandler"""
         newobj = _core.new_JPEGHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxJPEGHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class JPEGHandlerPtr(JPEGHandler):
     def __init__(self, this):
@@ -1469,13 +2362,15 @@ class JPEGHandlerPtr(JPEGHandler):
 _core.JPEGHandler_swigregister(JPEGHandlerPtr)
 
 class PNMHandler(ImageHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPNMHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PNMHandler"""
         newobj = _core.new_PNMHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPNMHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class PNMHandlerPtr(PNMHandler):
     def __init__(self, this):
@@ -1485,13 +2380,15 @@ class PNMHandlerPtr(PNMHandler):
 _core.PNMHandler_swigregister(PNMHandlerPtr)
 
 class XPMHandler(ImageHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxXPMHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> XPMHandler"""
         newobj = _core.new_XPMHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxXPMHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class XPMHandlerPtr(XPMHandler):
     def __init__(self, this):
@@ -1501,13 +2398,15 @@ class XPMHandlerPtr(XPMHandler):
 _core.XPMHandler_swigregister(XPMHandlerPtr)
 
 class TIFFHandler(ImageHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTIFFHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> TIFFHandler"""
         newobj = _core.new_TIFFHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTIFFHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class TIFFHandlerPtr(TIFFHandler):
     def __init__(self, this):
@@ -1519,23 +2418,63 @@ _core.TIFFHandler_swigregister(TIFFHandlerPtr)
 #---------------------------------------------------------------------------
 
 class EvtHandler(Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxEvtHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> EvtHandler"""
         newobj = _core.new_EvtHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetNextHandler(*args, **kwargs): return _core.EvtHandler_GetNextHandler(*args, **kwargs)
-    def GetPreviousHandler(*args, **kwargs): return _core.EvtHandler_GetPreviousHandler(*args, **kwargs)
-    def SetNextHandler(*args, **kwargs): return _core.EvtHandler_SetNextHandler(*args, **kwargs)
-    def SetPreviousHandler(*args, **kwargs): return _core.EvtHandler_SetPreviousHandler(*args, **kwargs)
-    def GetEvtHandlerEnabled(*args, **kwargs): return _core.EvtHandler_GetEvtHandlerEnabled(*args, **kwargs)
-    def SetEvtHandlerEnabled(*args, **kwargs): return _core.EvtHandler_SetEvtHandlerEnabled(*args, **kwargs)
-    def ProcessEvent(*args, **kwargs): return _core.EvtHandler_ProcessEvent(*args, **kwargs)
-    def AddPendingEvent(*args, **kwargs): return _core.EvtHandler_AddPendingEvent(*args, **kwargs)
-    def ProcessPendingEvents(*args, **kwargs): return _core.EvtHandler_ProcessPendingEvents(*args, **kwargs)
-    def Connect(*args, **kwargs): return _core.EvtHandler_Connect(*args, **kwargs)
-    def Disconnect(*args, **kwargs): return _core.EvtHandler_Disconnect(*args, **kwargs)
-    def _setOORInfo(*args, **kwargs): return _core.EvtHandler__setOORInfo(*args, **kwargs)
+    def GetNextHandler(*args, **kwargs):
+        """GetNextHandler() -> EvtHandler"""
+        return _core.EvtHandler_GetNextHandler(*args, **kwargs)
+
+    def GetPreviousHandler(*args, **kwargs):
+        """GetPreviousHandler() -> EvtHandler"""
+        return _core.EvtHandler_GetPreviousHandler(*args, **kwargs)
+
+    def SetNextHandler(*args, **kwargs):
+        """SetNextHandler(EvtHandler handler)"""
+        return _core.EvtHandler_SetNextHandler(*args, **kwargs)
+
+    def SetPreviousHandler(*args, **kwargs):
+        """SetPreviousHandler(EvtHandler handler)"""
+        return _core.EvtHandler_SetPreviousHandler(*args, **kwargs)
+
+    def GetEvtHandlerEnabled(*args, **kwargs):
+        """GetEvtHandlerEnabled() -> bool"""
+        return _core.EvtHandler_GetEvtHandlerEnabled(*args, **kwargs)
+
+    def SetEvtHandlerEnabled(*args, **kwargs):
+        """SetEvtHandlerEnabled(bool enabled)"""
+        return _core.EvtHandler_SetEvtHandlerEnabled(*args, **kwargs)
+
+    def ProcessEvent(*args, **kwargs):
+        """ProcessEvent(Event event) -> bool"""
+        return _core.EvtHandler_ProcessEvent(*args, **kwargs)
+
+    def AddPendingEvent(*args, **kwargs):
+        """AddPendingEvent(Event event)"""
+        return _core.EvtHandler_AddPendingEvent(*args, **kwargs)
+
+    def ProcessPendingEvents(*args, **kwargs):
+        """ProcessPendingEvents()"""
+        return _core.EvtHandler_ProcessPendingEvents(*args, **kwargs)
+
+    def Connect(*args, **kwargs):
+        """Connect(int id, int lastId, int eventType, PyObject func)"""
+        return _core.EvtHandler_Connect(*args, **kwargs)
+
+    def Disconnect(*args, **kwargs):
+        """Disconnect(int id, int lastId=-1, wxEventType eventType=wxEVT_NULL) -> bool"""
+        return _core.EvtHandler_Disconnect(*args, **kwargs)
+
+    def _setOORInfo(*args, **kwargs):
+        """_setOORInfo(PyObject _self)"""
+        return _core.EvtHandler__setOORInfo(*args, **kwargs)
+
     def Bind(self, event, handler, source=None, id=wx.ID_ANY, id2=wx.ID_ANY):
         """
         Bind an event to an event handler.
@@ -1562,8 +2501,6 @@ class EvtHandler(Object):
         event.Bind(self, id, id2, handler)              
 
 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxEvtHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class EvtHandlerPtr(EvtHandler):
     def __init__(self, this):
@@ -1636,7 +2573,9 @@ def EVT_COMMAND_RANGE(win, id1, id2, cmd, func):
 EVENT_PROPAGATE_NONE = _core.EVENT_PROPAGATE_NONE
 EVENT_PROPAGATE_MAX = _core.EVENT_PROPAGATE_MAX
 
-NewEventType = _core.NewEventType
+def NewEventType(*args, **kwargs):
+    """NewEventType() -> wxEventType"""
+    return _core.NewEventType(*args, **kwargs)
 wxEVT_NULL = _core.wxEVT_NULL
 wxEVT_FIRST = _core.wxEVT_FIRST
 wxEVT_USER_FIRST = _core.wxEVT_USER_FIRST
@@ -1934,28 +2873,76 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 
 class Event(Object):
+    """"""
+    def __init__(self): raise RuntimeError, "No constructor defined"
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __del__(self, destroy=_core.delete_Event):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetEventType(*args, **kwargs): return _core.Event_SetEventType(*args, **kwargs)
-    def GetEventType(*args, **kwargs): return _core.Event_GetEventType(*args, **kwargs)
-    def GetEventObject(*args, **kwargs): return _core.Event_GetEventObject(*args, **kwargs)
-    def SetEventObject(*args, **kwargs): return _core.Event_SetEventObject(*args, **kwargs)
-    def GetTimestamp(*args, **kwargs): return _core.Event_GetTimestamp(*args, **kwargs)
-    def SetTimestamp(*args, **kwargs): return _core.Event_SetTimestamp(*args, **kwargs)
-    def GetId(*args, **kwargs): return _core.Event_GetId(*args, **kwargs)
-    def SetId(*args, **kwargs): return _core.Event_SetId(*args, **kwargs)
-    def IsCommandEvent(*args, **kwargs): return _core.Event_IsCommandEvent(*args, **kwargs)
-    def Skip(*args, **kwargs): return _core.Event_Skip(*args, **kwargs)
-    def GetSkipped(*args, **kwargs): return _core.Event_GetSkipped(*args, **kwargs)
-    def ShouldPropagate(*args, **kwargs): return _core.Event_ShouldPropagate(*args, **kwargs)
-    def StopPropagation(*args, **kwargs): return _core.Event_StopPropagation(*args, **kwargs)
-    def ResumePropagation(*args, **kwargs): return _core.Event_ResumePropagation(*args, **kwargs)
-    def Clone(*args, **kwargs): return _core.Event_Clone(*args, **kwargs)
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetEventType(*args, **kwargs):
+        """SetEventType(wxEventType typ)"""
+        return _core.Event_SetEventType(*args, **kwargs)
+
+    def GetEventType(*args, **kwargs):
+        """GetEventType() -> wxEventType"""
+        return _core.Event_GetEventType(*args, **kwargs)
+
+    def GetEventObject(*args, **kwargs):
+        """GetEventObject() -> Object"""
+        return _core.Event_GetEventObject(*args, **kwargs)
+
+    def SetEventObject(*args, **kwargs):
+        """SetEventObject(Object obj)"""
+        return _core.Event_SetEventObject(*args, **kwargs)
+
+    def GetTimestamp(*args, **kwargs):
+        """GetTimestamp() -> long"""
+        return _core.Event_GetTimestamp(*args, **kwargs)
+
+    def SetTimestamp(*args, **kwargs):
+        """SetTimestamp(long ts=0)"""
+        return _core.Event_SetTimestamp(*args, **kwargs)
+
+    def GetId(*args, **kwargs):
+        """GetId() -> int"""
+        return _core.Event_GetId(*args, **kwargs)
+
+    def SetId(*args, **kwargs):
+        """SetId(int Id)"""
+        return _core.Event_SetId(*args, **kwargs)
+
+    def IsCommandEvent(*args, **kwargs):
+        """IsCommandEvent() -> bool"""
+        return _core.Event_IsCommandEvent(*args, **kwargs)
+
+    def Skip(*args, **kwargs):
+        """Skip(bool skip=True)"""
+        return _core.Event_Skip(*args, **kwargs)
+
+    def GetSkipped(*args, **kwargs):
+        """GetSkipped() -> bool"""
+        return _core.Event_GetSkipped(*args, **kwargs)
+
+    def ShouldPropagate(*args, **kwargs):
+        """ShouldPropagate() -> bool"""
+        return _core.Event_ShouldPropagate(*args, **kwargs)
+
+    def StopPropagation(*args, **kwargs):
+        """StopPropagation() -> int"""
+        return _core.Event_StopPropagation(*args, **kwargs)
+
+    def ResumePropagation(*args, **kwargs):
+        """ResumePropagation(int propagationLevel)"""
+        return _core.Event_ResumePropagation(*args, **kwargs)
+
+    def Clone(*args, **kwargs):
+        """Clone() -> Event"""
+        return _core.Event_Clone(*args, **kwargs)
+
 
 class EventPtr(Event):
     def __init__(self, this):
@@ -1967,17 +2954,21 @@ _core.Event_swigregister(EventPtr)
 #---------------------------------------------------------------------------
 
 class PropagationDisabler(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPropagationDisabler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Event event) -> PropagationDisabler"""
         newobj = _core.new_PropagationDisabler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_core.delete_PropagationDisabler):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPropagationDisabler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class PropagationDisablerPtr(PropagationDisabler):
     def __init__(self, this):
@@ -1987,17 +2978,21 @@ class PropagationDisablerPtr(PropagationDisabler):
 _core.PropagationDisabler_swigregister(PropagationDisablerPtr)
 
 class PropagateOnce(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPropagateOnce instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Event event) -> PropagateOnce"""
         newobj = _core.new_PropagateOnce(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_core.delete_PropagateOnce):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPropagateOnce instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class PropagateOncePtr(PropagateOnce):
     def __init__(self, this):
@@ -2009,23 +3004,55 @@ _core.PropagateOnce_swigregister(PropagateOncePtr)
 #---------------------------------------------------------------------------
 
 class CommandEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCommandEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType commandType=wxEVT_NULL, int winid=0) -> CommandEvent"""
         newobj = _core.new_CommandEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetSelection(*args, **kwargs): return _core.CommandEvent_GetSelection(*args, **kwargs)
-    def SetString(*args, **kwargs): return _core.CommandEvent_SetString(*args, **kwargs)
-    def GetString(*args, **kwargs): return _core.CommandEvent_GetString(*args, **kwargs)
-    def IsChecked(*args, **kwargs): return _core.CommandEvent_IsChecked(*args, **kwargs)
-    def IsSelection(*args, **kwargs): return _core.CommandEvent_IsSelection(*args, **kwargs)
-    def SetExtraLong(*args, **kwargs): return _core.CommandEvent_SetExtraLong(*args, **kwargs)
-    def GetExtraLong(*args, **kwargs): return _core.CommandEvent_GetExtraLong(*args, **kwargs)
-    def SetInt(*args, **kwargs): return _core.CommandEvent_SetInt(*args, **kwargs)
-    def GetInt(*args, **kwargs): return _core.CommandEvent_GetInt(*args, **kwargs)
-    def Clone(*args, **kwargs): return _core.CommandEvent_Clone(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCommandEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> int"""
+        return _core.CommandEvent_GetSelection(*args, **kwargs)
+
+    def SetString(*args, **kwargs):
+        """SetString(wxString s)"""
+        return _core.CommandEvent_SetString(*args, **kwargs)
+
+    def GetString(*args, **kwargs):
+        """GetString() -> wxString"""
+        return _core.CommandEvent_GetString(*args, **kwargs)
+
+    def IsChecked(*args, **kwargs):
+        """IsChecked() -> bool"""
+        return _core.CommandEvent_IsChecked(*args, **kwargs)
+
+    def IsSelection(*args, **kwargs):
+        """IsSelection() -> bool"""
+        return _core.CommandEvent_IsSelection(*args, **kwargs)
+
+    def SetExtraLong(*args, **kwargs):
+        """SetExtraLong(long extraLong)"""
+        return _core.CommandEvent_SetExtraLong(*args, **kwargs)
+
+    def GetExtraLong(*args, **kwargs):
+        """GetExtraLong() -> long"""
+        return _core.CommandEvent_GetExtraLong(*args, **kwargs)
+
+    def SetInt(*args, **kwargs):
+        """SetInt(int i)"""
+        return _core.CommandEvent_SetInt(*args, **kwargs)
+
+    def GetInt(*args, **kwargs):
+        """GetInt() -> long"""
+        return _core.CommandEvent_GetInt(*args, **kwargs)
+
+    def Clone(*args, **kwargs):
+        """Clone() -> Event"""
+        return _core.CommandEvent_Clone(*args, **kwargs)
+
 
 class CommandEventPtr(CommandEvent):
     def __init__(self, this):
@@ -2037,16 +3064,27 @@ _core.CommandEvent_swigregister(CommandEventPtr)
 #---------------------------------------------------------------------------
 
 class NotifyEvent(CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxNotifyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType commandType=wxEVT_NULL, int winid=0) -> NotifyEvent"""
         newobj = _core.new_NotifyEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def Veto(*args, **kwargs): return _core.NotifyEvent_Veto(*args, **kwargs)
-    def Allow(*args, **kwargs): return _core.NotifyEvent_Allow(*args, **kwargs)
-    def IsAllowed(*args, **kwargs): return _core.NotifyEvent_IsAllowed(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxNotifyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Veto(*args, **kwargs):
+        """Veto()"""
+        return _core.NotifyEvent_Veto(*args, **kwargs)
+
+    def Allow(*args, **kwargs):
+        """Allow()"""
+        return _core.NotifyEvent_Allow(*args, **kwargs)
+
+    def IsAllowed(*args, **kwargs):
+        """IsAllowed() -> bool"""
+        return _core.NotifyEvent_IsAllowed(*args, **kwargs)
+
 
 class NotifyEventPtr(NotifyEvent):
     def __init__(self, this):
@@ -2058,17 +3096,32 @@ _core.NotifyEvent_swigregister(NotifyEventPtr)
 #---------------------------------------------------------------------------
 
 class ScrollEvent(CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxScrollEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType commandType=wxEVT_NULL, int winid=0, int pos=0, 
+    int orient=0) -> ScrollEvent"""
         newobj = _core.new_ScrollEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetOrientation(*args, **kwargs): return _core.ScrollEvent_GetOrientation(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _core.ScrollEvent_GetPosition(*args, **kwargs)
-    def SetOrientation(*args, **kwargs): return _core.ScrollEvent_SetOrientation(*args, **kwargs)
-    def SetPosition(*args, **kwargs): return _core.ScrollEvent_SetPosition(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxScrollEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetOrientation(*args, **kwargs):
+        """GetOrientation() -> int"""
+        return _core.ScrollEvent_GetOrientation(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> int"""
+        return _core.ScrollEvent_GetPosition(*args, **kwargs)
+
+    def SetOrientation(*args, **kwargs):
+        """SetOrientation(int orient)"""
+        return _core.ScrollEvent_SetOrientation(*args, **kwargs)
+
+    def SetPosition(*args, **kwargs):
+        """SetPosition(int pos)"""
+        return _core.ScrollEvent_SetPosition(*args, **kwargs)
+
 
 class ScrollEventPtr(ScrollEvent):
     def __init__(self, this):
@@ -2080,17 +3133,31 @@ _core.ScrollEvent_swigregister(ScrollEventPtr)
 #---------------------------------------------------------------------------
 
 class ScrollWinEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxScrollWinEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType commandType=wxEVT_NULL, int pos=0, int orient=0) -> ScrollWinEvent"""
         newobj = _core.new_ScrollWinEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetOrientation(*args, **kwargs): return _core.ScrollWinEvent_GetOrientation(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _core.ScrollWinEvent_GetPosition(*args, **kwargs)
-    def SetOrientation(*args, **kwargs): return _core.ScrollWinEvent_SetOrientation(*args, **kwargs)
-    def SetPosition(*args, **kwargs): return _core.ScrollWinEvent_SetPosition(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxScrollWinEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetOrientation(*args, **kwargs):
+        """GetOrientation() -> int"""
+        return _core.ScrollWinEvent_GetOrientation(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> int"""
+        return _core.ScrollWinEvent_GetPosition(*args, **kwargs)
+
+    def SetOrientation(*args, **kwargs):
+        """SetOrientation(int orient)"""
+        return _core.ScrollWinEvent_SetOrientation(*args, **kwargs)
+
+    def SetPosition(*args, **kwargs):
+        """SetPosition(int pos)"""
+        return _core.ScrollWinEvent_SetPosition(*args, **kwargs)
+
 
 class ScrollWinEventPtr(ScrollWinEvent):
     def __init__(self, this):
@@ -2107,47 +3174,163 @@ MOUSE_BTN_LEFT = _core.MOUSE_BTN_LEFT
 MOUSE_BTN_MIDDLE = _core.MOUSE_BTN_MIDDLE
 MOUSE_BTN_RIGHT = _core.MOUSE_BTN_RIGHT
 class MouseEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMouseEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType mouseType=wxEVT_NULL) -> MouseEvent"""
         newobj = _core.new_MouseEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def IsButton(*args, **kwargs): return _core.MouseEvent_IsButton(*args, **kwargs)
-    def ButtonDown(*args, **kwargs): return _core.MouseEvent_ButtonDown(*args, **kwargs)
-    def ButtonDClick(*args, **kwargs): return _core.MouseEvent_ButtonDClick(*args, **kwargs)
-    def ButtonUp(*args, **kwargs): return _core.MouseEvent_ButtonUp(*args, **kwargs)
-    def Button(*args, **kwargs): return _core.MouseEvent_Button(*args, **kwargs)
-    def ButtonIsDown(*args, **kwargs): return _core.MouseEvent_ButtonIsDown(*args, **kwargs)
-    def GetButton(*args, **kwargs): return _core.MouseEvent_GetButton(*args, **kwargs)
-    def ControlDown(*args, **kwargs): return _core.MouseEvent_ControlDown(*args, **kwargs)
-    def MetaDown(*args, **kwargs): return _core.MouseEvent_MetaDown(*args, **kwargs)
-    def AltDown(*args, **kwargs): return _core.MouseEvent_AltDown(*args, **kwargs)
-    def ShiftDown(*args, **kwargs): return _core.MouseEvent_ShiftDown(*args, **kwargs)
-    def LeftDown(*args, **kwargs): return _core.MouseEvent_LeftDown(*args, **kwargs)
-    def MiddleDown(*args, **kwargs): return _core.MouseEvent_MiddleDown(*args, **kwargs)
-    def RightDown(*args, **kwargs): return _core.MouseEvent_RightDown(*args, **kwargs)
-    def LeftUp(*args, **kwargs): return _core.MouseEvent_LeftUp(*args, **kwargs)
-    def MiddleUp(*args, **kwargs): return _core.MouseEvent_MiddleUp(*args, **kwargs)
-    def RightUp(*args, **kwargs): return _core.MouseEvent_RightUp(*args, **kwargs)
-    def LeftDClick(*args, **kwargs): return _core.MouseEvent_LeftDClick(*args, **kwargs)
-    def MiddleDClick(*args, **kwargs): return _core.MouseEvent_MiddleDClick(*args, **kwargs)
-    def RightDClick(*args, **kwargs): return _core.MouseEvent_RightDClick(*args, **kwargs)
-    def LeftIsDown(*args, **kwargs): return _core.MouseEvent_LeftIsDown(*args, **kwargs)
-    def MiddleIsDown(*args, **kwargs): return _core.MouseEvent_MiddleIsDown(*args, **kwargs)
-    def RightIsDown(*args, **kwargs): return _core.MouseEvent_RightIsDown(*args, **kwargs)
-    def Dragging(*args, **kwargs): return _core.MouseEvent_Dragging(*args, **kwargs)
-    def Moving(*args, **kwargs): return _core.MouseEvent_Moving(*args, **kwargs)
-    def Entering(*args, **kwargs): return _core.MouseEvent_Entering(*args, **kwargs)
-    def Leaving(*args, **kwargs): return _core.MouseEvent_Leaving(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _core.MouseEvent_GetPosition(*args, **kwargs)
-    def GetPositionTuple(*args, **kwargs): return _core.MouseEvent_GetPositionTuple(*args, **kwargs)
-    def GetLogicalPosition(*args, **kwargs): return _core.MouseEvent_GetLogicalPosition(*args, **kwargs)
-    def GetX(*args, **kwargs): return _core.MouseEvent_GetX(*args, **kwargs)
-    def GetY(*args, **kwargs): return _core.MouseEvent_GetY(*args, **kwargs)
-    def GetWheelRotation(*args, **kwargs): return _core.MouseEvent_GetWheelRotation(*args, **kwargs)
-    def GetWheelDelta(*args, **kwargs): return _core.MouseEvent_GetWheelDelta(*args, **kwargs)
-    def GetLinesPerAction(*args, **kwargs): return _core.MouseEvent_GetLinesPerAction(*args, **kwargs)
-    def IsPageScroll(*args, **kwargs): return _core.MouseEvent_IsPageScroll(*args, **kwargs)
+    def IsButton(*args, **kwargs):
+        """IsButton() -> bool"""
+        return _core.MouseEvent_IsButton(*args, **kwargs)
+
+    def ButtonDown(*args, **kwargs):
+        """ButtonDown(int but=MOUSE_BTN_ANY) -> bool"""
+        return _core.MouseEvent_ButtonDown(*args, **kwargs)
+
+    def ButtonDClick(*args, **kwargs):
+        """ButtonDClick(int but=MOUSE_BTN_ANY) -> bool"""
+        return _core.MouseEvent_ButtonDClick(*args, **kwargs)
+
+    def ButtonUp(*args, **kwargs):
+        """ButtonUp(int but=MOUSE_BTN_ANY) -> bool"""
+        return _core.MouseEvent_ButtonUp(*args, **kwargs)
+
+    def Button(*args, **kwargs):
+        """Button(int but) -> bool"""
+        return _core.MouseEvent_Button(*args, **kwargs)
+
+    def ButtonIsDown(*args, **kwargs):
+        """ButtonIsDown(int but) -> bool"""
+        return _core.MouseEvent_ButtonIsDown(*args, **kwargs)
+
+    def GetButton(*args, **kwargs):
+        """GetButton() -> int"""
+        return _core.MouseEvent_GetButton(*args, **kwargs)
+
+    def ControlDown(*args, **kwargs):
+        """ControlDown() -> bool"""
+        return _core.MouseEvent_ControlDown(*args, **kwargs)
+
+    def MetaDown(*args, **kwargs):
+        """MetaDown() -> bool"""
+        return _core.MouseEvent_MetaDown(*args, **kwargs)
+
+    def AltDown(*args, **kwargs):
+        """AltDown() -> bool"""
+        return _core.MouseEvent_AltDown(*args, **kwargs)
+
+    def ShiftDown(*args, **kwargs):
+        """ShiftDown() -> bool"""
+        return _core.MouseEvent_ShiftDown(*args, **kwargs)
+
+    def LeftDown(*args, **kwargs):
+        """LeftDown() -> bool"""
+        return _core.MouseEvent_LeftDown(*args, **kwargs)
+
+    def MiddleDown(*args, **kwargs):
+        """MiddleDown() -> bool"""
+        return _core.MouseEvent_MiddleDown(*args, **kwargs)
+
+    def RightDown(*args, **kwargs):
+        """RightDown() -> bool"""
+        return _core.MouseEvent_RightDown(*args, **kwargs)
+
+    def LeftUp(*args, **kwargs):
+        """LeftUp() -> bool"""
+        return _core.MouseEvent_LeftUp(*args, **kwargs)
+
+    def MiddleUp(*args, **kwargs):
+        """MiddleUp() -> bool"""
+        return _core.MouseEvent_MiddleUp(*args, **kwargs)
+
+    def RightUp(*args, **kwargs):
+        """RightUp() -> bool"""
+        return _core.MouseEvent_RightUp(*args, **kwargs)
+
+    def LeftDClick(*args, **kwargs):
+        """LeftDClick() -> bool"""
+        return _core.MouseEvent_LeftDClick(*args, **kwargs)
+
+    def MiddleDClick(*args, **kwargs):
+        """MiddleDClick() -> bool"""
+        return _core.MouseEvent_MiddleDClick(*args, **kwargs)
+
+    def RightDClick(*args, **kwargs):
+        """RightDClick() -> bool"""
+        return _core.MouseEvent_RightDClick(*args, **kwargs)
+
+    def LeftIsDown(*args, **kwargs):
+        """LeftIsDown() -> bool"""
+        return _core.MouseEvent_LeftIsDown(*args, **kwargs)
+
+    def MiddleIsDown(*args, **kwargs):
+        """MiddleIsDown() -> bool"""
+        return _core.MouseEvent_MiddleIsDown(*args, **kwargs)
+
+    def RightIsDown(*args, **kwargs):
+        """RightIsDown() -> bool"""
+        return _core.MouseEvent_RightIsDown(*args, **kwargs)
+
+    def Dragging(*args, **kwargs):
+        """Dragging() -> bool"""
+        return _core.MouseEvent_Dragging(*args, **kwargs)
+
+    def Moving(*args, **kwargs):
+        """Moving() -> bool"""
+        return _core.MouseEvent_Moving(*args, **kwargs)
+
+    def Entering(*args, **kwargs):
+        """Entering() -> bool"""
+        return _core.MouseEvent_Entering(*args, **kwargs)
+
+    def Leaving(*args, **kwargs):
+        """Leaving() -> bool"""
+        return _core.MouseEvent_Leaving(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point
+
+Returns the position of the mouse in window coordinates when the event happened."""
+        return _core.MouseEvent_GetPosition(*args, **kwargs)
+
+    def GetPositionTuple(*args, **kwargs):
+        """GetPositionTuple() -> (x,y)
+
+Returns the position of the mouse in window coordinates when the event happened."""
+        return _core.MouseEvent_GetPositionTuple(*args, **kwargs)
+
+    def GetLogicalPosition(*args, **kwargs):
+        """GetLogicalPosition(wxDC dc) -> Point"""
+        return _core.MouseEvent_GetLogicalPosition(*args, **kwargs)
+
+    def GetX(*args, **kwargs):
+        """GetX() -> int"""
+        return _core.MouseEvent_GetX(*args, **kwargs)
+
+    def GetY(*args, **kwargs):
+        """GetY() -> int"""
+        return _core.MouseEvent_GetY(*args, **kwargs)
+
+    def GetWheelRotation(*args, **kwargs):
+        """GetWheelRotation() -> int"""
+        return _core.MouseEvent_GetWheelRotation(*args, **kwargs)
+
+    def GetWheelDelta(*args, **kwargs):
+        """GetWheelDelta() -> int"""
+        return _core.MouseEvent_GetWheelDelta(*args, **kwargs)
+
+    def GetLinesPerAction(*args, **kwargs):
+        """GetLinesPerAction() -> int"""
+        return _core.MouseEvent_GetLinesPerAction(*args, **kwargs)
+
+    def IsPageScroll(*args, **kwargs):
+        """IsPageScroll() -> bool"""
+        return _core.MouseEvent_IsPageScroll(*args, **kwargs)
+
     m_x = property(_core.MouseEvent_m_x_get, _core.MouseEvent_m_x_set)
     m_y = property(_core.MouseEvent_m_y_get, _core.MouseEvent_m_y_set)
     m_leftDown = property(_core.MouseEvent_m_leftDown_get, _core.MouseEvent_m_leftDown_set)
@@ -2160,8 +3343,6 @@ class MouseEvent(Event):
     m_wheelRotation = property(_core.MouseEvent_m_wheelRotation_get, _core.MouseEvent_m_wheelRotation_set)
     m_wheelDelta = property(_core.MouseEvent_m_wheelDelta_get, _core.MouseEvent_m_wheelDelta_set)
     m_linesPerAction = property(_core.MouseEvent_m_linesPerAction_get, _core.MouseEvent_m_linesPerAction_set)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMouseEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class MouseEventPtr(MouseEvent):
     def __init__(self, this):
@@ -2173,18 +3354,35 @@ _core.MouseEvent_swigregister(MouseEventPtr)
 #---------------------------------------------------------------------------
 
 class SetCursorEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSetCursorEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int x=0, int y=0) -> SetCursorEvent"""
         newobj = _core.new_SetCursorEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetX(*args, **kwargs): return _core.SetCursorEvent_GetX(*args, **kwargs)
-    def GetY(*args, **kwargs): return _core.SetCursorEvent_GetY(*args, **kwargs)
-    def SetCursor(*args, **kwargs): return _core.SetCursorEvent_SetCursor(*args, **kwargs)
-    def GetCursor(*args, **kwargs): return _core.SetCursorEvent_GetCursor(*args, **kwargs)
-    def HasCursor(*args, **kwargs): return _core.SetCursorEvent_HasCursor(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSetCursorEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetX(*args, **kwargs):
+        """GetX() -> int"""
+        return _core.SetCursorEvent_GetX(*args, **kwargs)
+
+    def GetY(*args, **kwargs):
+        """GetY() -> int"""
+        return _core.SetCursorEvent_GetY(*args, **kwargs)
+
+    def SetCursor(*args, **kwargs):
+        """SetCursor(wxCursor cursor)"""
+        return _core.SetCursorEvent_SetCursor(*args, **kwargs)
+
+    def GetCursor(*args, **kwargs):
+        """GetCursor() -> wxCursor"""
+        return _core.SetCursorEvent_GetCursor(*args, **kwargs)
+
+    def HasCursor(*args, **kwargs):
+        """HasCursor() -> bool"""
+        return _core.SetCursorEvent_HasCursor(*args, **kwargs)
+
 
 class SetCursorEventPtr(SetCursorEvent):
     def __init__(self, this):
@@ -2196,25 +3394,72 @@ _core.SetCursorEvent_swigregister(SetCursorEventPtr)
 #---------------------------------------------------------------------------
 
 class KeyEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxKeyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType keyType=wxEVT_NULL) -> KeyEvent"""
         newobj = _core.new_KeyEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def ControlDown(*args, **kwargs): return _core.KeyEvent_ControlDown(*args, **kwargs)
-    def MetaDown(*args, **kwargs): return _core.KeyEvent_MetaDown(*args, **kwargs)
-    def AltDown(*args, **kwargs): return _core.KeyEvent_AltDown(*args, **kwargs)
-    def ShiftDown(*args, **kwargs): return _core.KeyEvent_ShiftDown(*args, **kwargs)
-    def HasModifiers(*args, **kwargs): return _core.KeyEvent_HasModifiers(*args, **kwargs)
-    def GetKeyCode(*args, **kwargs): return _core.KeyEvent_GetKeyCode(*args, **kwargs)
+    def ControlDown(*args, **kwargs):
+        """ControlDown() -> bool"""
+        return _core.KeyEvent_ControlDown(*args, **kwargs)
+
+    def MetaDown(*args, **kwargs):
+        """MetaDown() -> bool"""
+        return _core.KeyEvent_MetaDown(*args, **kwargs)
+
+    def AltDown(*args, **kwargs):
+        """AltDown() -> bool"""
+        return _core.KeyEvent_AltDown(*args, **kwargs)
+
+    def ShiftDown(*args, **kwargs):
+        """ShiftDown() -> bool"""
+        return _core.KeyEvent_ShiftDown(*args, **kwargs)
+
+    def HasModifiers(*args, **kwargs):
+        """HasModifiers() -> bool"""
+        return _core.KeyEvent_HasModifiers(*args, **kwargs)
+
+    def GetKeyCode(*args, **kwargs):
+        """GetKeyCode() -> int"""
+        return _core.KeyEvent_GetKeyCode(*args, **kwargs)
+
     KeyCode = GetKeyCode 
-    def GetUniChar(*args, **kwargs): return _core.KeyEvent_GetUniChar(*args, **kwargs)
-    def GetRawKeyCode(*args, **kwargs): return _core.KeyEvent_GetRawKeyCode(*args, **kwargs)
-    def GetRawKeyFlags(*args, **kwargs): return _core.KeyEvent_GetRawKeyFlags(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _core.KeyEvent_GetPosition(*args, **kwargs)
-    def GetPositionTuple(*args, **kwargs): return _core.KeyEvent_GetPositionTuple(*args, **kwargs)
-    def GetX(*args, **kwargs): return _core.KeyEvent_GetX(*args, **kwargs)
-    def GetY(*args, **kwargs): return _core.KeyEvent_GetY(*args, **kwargs)
+    def GetUniChar(*args, **kwargs):
+        """GetUniChar() -> int"""
+        return _core.KeyEvent_GetUniChar(*args, **kwargs)
+
+    def GetRawKeyCode(*args, **kwargs):
+        """GetRawKeyCode() -> unsigned int"""
+        return _core.KeyEvent_GetRawKeyCode(*args, **kwargs)
+
+    def GetRawKeyFlags(*args, **kwargs):
+        """GetRawKeyFlags() -> unsigned int"""
+        return _core.KeyEvent_GetRawKeyFlags(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point
+
+Find the position of the event."""
+        return _core.KeyEvent_GetPosition(*args, **kwargs)
+
+    def GetPositionTuple(*args, **kwargs):
+        """GetPositionTuple() -> (x,y)
+
+Find the position of the event."""
+        return _core.KeyEvent_GetPositionTuple(*args, **kwargs)
+
+    def GetX(*args, **kwargs):
+        """GetX() -> int"""
+        return _core.KeyEvent_GetX(*args, **kwargs)
+
+    def GetY(*args, **kwargs):
+        """GetY() -> int"""
+        return _core.KeyEvent_GetY(*args, **kwargs)
+
     m_x = property(_core.KeyEvent_m_x_get, _core.KeyEvent_m_x_set)
     m_y = property(_core.KeyEvent_m_y_get, _core.KeyEvent_m_y_set)
     m_keyCode = property(_core.KeyEvent_m_keyCode_get, _core.KeyEvent_m_keyCode_set)
@@ -2225,8 +3470,6 @@ class KeyEvent(Event):
     m_scanCode = property(_core.KeyEvent_m_scanCode_get, _core.KeyEvent_m_scanCode_set)
     m_rawCode = property(_core.KeyEvent_m_rawCode_get, _core.KeyEvent_m_rawCode_set)
     m_rawFlags = property(_core.KeyEvent_m_rawFlags_get, _core.KeyEvent_m_rawFlags_set)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxKeyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class KeyEventPtr(KeyEvent):
     def __init__(self, this):
@@ -2238,19 +3481,33 @@ _core.KeyEvent_swigregister(KeyEventPtr)
 #---------------------------------------------------------------------------
 
 class SizeEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Size sz=DefaultSize, int winid=0) -> SizeEvent"""
         newobj = _core.new_SizeEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetSize(*args, **kwargs): return _core.SizeEvent_GetSize(*args, **kwargs)
-    def GetRect(*args, **kwargs): return _core.SizeEvent_GetRect(*args, **kwargs)
-    def SetRect(*args, **kwargs): return _core.SizeEvent_SetRect(*args, **kwargs)
-    def SetSize(*args, **kwargs): return _core.SizeEvent_SetSize(*args, **kwargs)
+    def GetSize(*args, **kwargs):
+        """GetSize() -> Size"""
+        return _core.SizeEvent_GetSize(*args, **kwargs)
+
+    def GetRect(*args, **kwargs):
+        """GetRect() -> Rect"""
+        return _core.SizeEvent_GetRect(*args, **kwargs)
+
+    def SetRect(*args, **kwargs):
+        """SetRect(Rect rect)"""
+        return _core.SizeEvent_SetRect(*args, **kwargs)
+
+    def SetSize(*args, **kwargs):
+        """SetSize(Size size)"""
+        return _core.SizeEvent_SetSize(*args, **kwargs)
+
     m_size = property(_core.SizeEvent_m_size_get, _core.SizeEvent_m_size_set)
     m_rect = property(_core.SizeEvent_m_rect_get, _core.SizeEvent_m_rect_set)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class SizeEventPtr(SizeEvent):
     def __init__(self, this):
@@ -2262,19 +3519,33 @@ _core.SizeEvent_swigregister(SizeEventPtr)
 #---------------------------------------------------------------------------
 
 class MoveEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMoveEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Point pos=DefaultPosition, int winid=0) -> MoveEvent"""
         newobj = _core.new_MoveEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetPosition(*args, **kwargs): return _core.MoveEvent_GetPosition(*args, **kwargs)
-    def GetRect(*args, **kwargs): return _core.MoveEvent_GetRect(*args, **kwargs)
-    def SetRect(*args, **kwargs): return _core.MoveEvent_SetRect(*args, **kwargs)
-    def SetPosition(*args, **kwargs): return _core.MoveEvent_SetPosition(*args, **kwargs)
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point"""
+        return _core.MoveEvent_GetPosition(*args, **kwargs)
+
+    def GetRect(*args, **kwargs):
+        """GetRect() -> Rect"""
+        return _core.MoveEvent_GetRect(*args, **kwargs)
+
+    def SetRect(*args, **kwargs):
+        """SetRect(Rect rect)"""
+        return _core.MoveEvent_SetRect(*args, **kwargs)
+
+    def SetPosition(*args, **kwargs):
+        """SetPosition(Point pos)"""
+        return _core.MoveEvent_SetPosition(*args, **kwargs)
+
     m_pos = property(_core.MoveEvent_m_pos_get, _core.MoveEvent_m_pos_set)
     m_rect = property(_core.MoveEvent_m_rect_get, _core.MoveEvent_m_rect_set)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMoveEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class MoveEventPtr(MoveEvent):
     def __init__(self, this):
@@ -2286,13 +3557,15 @@ _core.MoveEvent_swigregister(MoveEventPtr)
 #---------------------------------------------------------------------------
 
 class PaintEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPaintEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int Id=0) -> PaintEvent"""
         newobj = _core.new_PaintEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPaintEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class PaintEventPtr(PaintEvent):
     def __init__(self, this):
@@ -2302,13 +3575,15 @@ class PaintEventPtr(PaintEvent):
 _core.PaintEvent_swigregister(PaintEventPtr)
 
 class NcPaintEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxNcPaintEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int winid=0) -> NcPaintEvent"""
         newobj = _core.new_NcPaintEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxNcPaintEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class NcPaintEventPtr(NcPaintEvent):
     def __init__(self, this):
@@ -2320,14 +3595,19 @@ _core.NcPaintEvent_swigregister(NcPaintEventPtr)
 #---------------------------------------------------------------------------
 
 class EraseEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxEraseEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int Id=0, wxDC dc=(wxDC *) NULL) -> EraseEvent"""
         newobj = _core.new_EraseEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetDC(*args, **kwargs): return _core.EraseEvent_GetDC(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxEraseEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetDC(*args, **kwargs):
+        """GetDC() -> wxDC"""
+        return _core.EraseEvent_GetDC(*args, **kwargs)
+
 
 class EraseEventPtr(EraseEvent):
     def __init__(self, this):
@@ -2339,15 +3619,23 @@ _core.EraseEvent_swigregister(EraseEventPtr)
 #---------------------------------------------------------------------------
 
 class FocusEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFocusEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType type=wxEVT_NULL, int winid=0) -> FocusEvent"""
         newobj = _core.new_FocusEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetWindow(*args, **kwargs): return _core.FocusEvent_GetWindow(*args, **kwargs)
-    def SetWindow(*args, **kwargs): return _core.FocusEvent_SetWindow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFocusEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetWindow(*args, **kwargs):
+        """GetWindow() -> Window"""
+        return _core.FocusEvent_GetWindow(*args, **kwargs)
+
+    def SetWindow(*args, **kwargs):
+        """SetWindow(Window win)"""
+        return _core.FocusEvent_SetWindow(*args, **kwargs)
+
 
 class FocusEventPtr(FocusEvent):
     def __init__(self, this):
@@ -2359,14 +3647,19 @@ _core.FocusEvent_swigregister(FocusEventPtr)
 #---------------------------------------------------------------------------
 
 class ChildFocusEvent(CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxChildFocusEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window win=None) -> ChildFocusEvent"""
         newobj = _core.new_ChildFocusEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetWindow(*args, **kwargs): return _core.ChildFocusEvent_GetWindow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxChildFocusEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetWindow(*args, **kwargs):
+        """GetWindow() -> Window"""
+        return _core.ChildFocusEvent_GetWindow(*args, **kwargs)
+
 
 class ChildFocusEventPtr(ChildFocusEvent):
     def __init__(self, this):
@@ -2378,14 +3671,19 @@ _core.ChildFocusEvent_swigregister(ChildFocusEventPtr)
 #---------------------------------------------------------------------------
 
 class ActivateEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxActivateEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType type=wxEVT_NULL, bool active=True, int Id=0) -> ActivateEvent"""
         newobj = _core.new_ActivateEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetActive(*args, **kwargs): return _core.ActivateEvent_GetActive(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxActivateEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetActive(*args, **kwargs):
+        """GetActive() -> bool"""
+        return _core.ActivateEvent_GetActive(*args, **kwargs)
+
 
 class ActivateEventPtr(ActivateEvent):
     def __init__(self, this):
@@ -2397,13 +3695,15 @@ _core.ActivateEvent_swigregister(ActivateEventPtr)
 #---------------------------------------------------------------------------
 
 class InitDialogEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxInitDialogEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int Id=0) -> InitDialogEvent"""
         newobj = _core.new_InitDialogEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxInitDialogEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class InitDialogEventPtr(InitDialogEvent):
     def __init__(self, this):
@@ -2415,16 +3715,27 @@ _core.InitDialogEvent_swigregister(InitDialogEventPtr)
 #---------------------------------------------------------------------------
 
 class MenuEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMenuEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType type=wxEVT_NULL, int winid=0, Menu menu=None) -> MenuEvent"""
         newobj = _core.new_MenuEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetMenuId(*args, **kwargs): return _core.MenuEvent_GetMenuId(*args, **kwargs)
-    def IsPopup(*args, **kwargs): return _core.MenuEvent_IsPopup(*args, **kwargs)
-    def GetMenu(*args, **kwargs): return _core.MenuEvent_GetMenu(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMenuEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetMenuId(*args, **kwargs):
+        """GetMenuId() -> int"""
+        return _core.MenuEvent_GetMenuId(*args, **kwargs)
+
+    def IsPopup(*args, **kwargs):
+        """IsPopup() -> bool"""
+        return _core.MenuEvent_IsPopup(*args, **kwargs)
+
+    def GetMenu(*args, **kwargs):
+        """GetMenu() -> Menu"""
+        return _core.MenuEvent_GetMenu(*args, **kwargs)
+
 
 class MenuEventPtr(MenuEvent):
     def __init__(self, this):
@@ -2436,19 +3747,39 @@ _core.MenuEvent_swigregister(MenuEventPtr)
 #---------------------------------------------------------------------------
 
 class CloseEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCloseEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType type=wxEVT_NULL, int winid=0) -> CloseEvent"""
         newobj = _core.new_CloseEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetLoggingOff(*args, **kwargs): return _core.CloseEvent_SetLoggingOff(*args, **kwargs)
-    def GetLoggingOff(*args, **kwargs): return _core.CloseEvent_GetLoggingOff(*args, **kwargs)
-    def Veto(*args, **kwargs): return _core.CloseEvent_Veto(*args, **kwargs)
-    def SetCanVeto(*args, **kwargs): return _core.CloseEvent_SetCanVeto(*args, **kwargs)
-    def CanVeto(*args, **kwargs): return _core.CloseEvent_CanVeto(*args, **kwargs)
-    def GetVeto(*args, **kwargs): return _core.CloseEvent_GetVeto(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCloseEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetLoggingOff(*args, **kwargs):
+        """SetLoggingOff(bool logOff)"""
+        return _core.CloseEvent_SetLoggingOff(*args, **kwargs)
+
+    def GetLoggingOff(*args, **kwargs):
+        """GetLoggingOff() -> bool"""
+        return _core.CloseEvent_GetLoggingOff(*args, **kwargs)
+
+    def Veto(*args, **kwargs):
+        """Veto(bool veto=True)"""
+        return _core.CloseEvent_Veto(*args, **kwargs)
+
+    def SetCanVeto(*args, **kwargs):
+        """SetCanVeto(bool canVeto)"""
+        return _core.CloseEvent_SetCanVeto(*args, **kwargs)
+
+    def CanVeto(*args, **kwargs):
+        """CanVeto() -> bool"""
+        return _core.CloseEvent_CanVeto(*args, **kwargs)
+
+    def GetVeto(*args, **kwargs):
+        """GetVeto() -> bool"""
+        return _core.CloseEvent_GetVeto(*args, **kwargs)
+
 
 class CloseEventPtr(CloseEvent):
     def __init__(self, this):
@@ -2460,15 +3791,23 @@ _core.CloseEvent_swigregister(CloseEventPtr)
 #---------------------------------------------------------------------------
 
 class ShowEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxShowEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int winid=0, bool show=False) -> ShowEvent"""
         newobj = _core.new_ShowEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetShow(*args, **kwargs): return _core.ShowEvent_SetShow(*args, **kwargs)
-    def GetShow(*args, **kwargs): return _core.ShowEvent_GetShow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxShowEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetShow(*args, **kwargs):
+        """SetShow(bool show)"""
+        return _core.ShowEvent_SetShow(*args, **kwargs)
+
+    def GetShow(*args, **kwargs):
+        """GetShow() -> bool"""
+        return _core.ShowEvent_GetShow(*args, **kwargs)
+
 
 class ShowEventPtr(ShowEvent):
     def __init__(self, this):
@@ -2480,14 +3819,19 @@ _core.ShowEvent_swigregister(ShowEventPtr)
 #---------------------------------------------------------------------------
 
 class IconizeEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxIconizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int id=0, bool iconized=True) -> IconizeEvent"""
         newobj = _core.new_IconizeEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def Iconized(*args, **kwargs): return _core.IconizeEvent_Iconized(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxIconizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Iconized(*args, **kwargs):
+        """Iconized() -> bool"""
+        return _core.IconizeEvent_Iconized(*args, **kwargs)
+
 
 class IconizeEventPtr(IconizeEvent):
     def __init__(self, this):
@@ -2499,13 +3843,15 @@ _core.IconizeEvent_swigregister(IconizeEventPtr)
 #---------------------------------------------------------------------------
 
 class MaximizeEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMaximizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int id=0) -> MaximizeEvent"""
         newobj = _core.new_MaximizeEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMaximizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class MaximizeEventPtr(MaximizeEvent):
     def __init__(self, this):
@@ -2517,12 +3863,22 @@ _core.MaximizeEvent_swigregister(MaximizeEventPtr)
 #---------------------------------------------------------------------------
 
 class DropFilesEvent(Event):
-    def GetPosition(*args, **kwargs): return _core.DropFilesEvent_GetPosition(*args, **kwargs)
-    def GetNumberOfFiles(*args, **kwargs): return _core.DropFilesEvent_GetNumberOfFiles(*args, **kwargs)
-    def GetFiles(*args, **kwargs): return _core.DropFilesEvent_GetFiles(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxDropFilesEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point"""
+        return _core.DropFilesEvent_GetPosition(*args, **kwargs)
+
+    def GetNumberOfFiles(*args, **kwargs):
+        """GetNumberOfFiles() -> int"""
+        return _core.DropFilesEvent_GetNumberOfFiles(*args, **kwargs)
+
+    def GetFiles(*args, **kwargs):
+        """GetFiles() -> PyObject"""
+        return _core.DropFilesEvent_GetFiles(*args, **kwargs)
+
 
 class DropFilesEventPtr(DropFilesEvent):
     def __init__(self, this):
@@ -2536,28 +3892,81 @@ _core.DropFilesEvent_swigregister(DropFilesEventPtr)
 UPDATE_UI_PROCESS_ALL = _core.UPDATE_UI_PROCESS_ALL
 UPDATE_UI_PROCESS_SPECIFIED = _core.UPDATE_UI_PROCESS_SPECIFIED
 class UpdateUIEvent(CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxUpdateUIEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int commandId=0) -> UpdateUIEvent"""
         newobj = _core.new_UpdateUIEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetChecked(*args, **kwargs): return _core.UpdateUIEvent_GetChecked(*args, **kwargs)
-    def GetEnabled(*args, **kwargs): return _core.UpdateUIEvent_GetEnabled(*args, **kwargs)
-    def GetText(*args, **kwargs): return _core.UpdateUIEvent_GetText(*args, **kwargs)
-    def GetSetText(*args, **kwargs): return _core.UpdateUIEvent_GetSetText(*args, **kwargs)
-    def GetSetChecked(*args, **kwargs): return _core.UpdateUIEvent_GetSetChecked(*args, **kwargs)
-    def GetSetEnabled(*args, **kwargs): return _core.UpdateUIEvent_GetSetEnabled(*args, **kwargs)
-    def Check(*args, **kwargs): return _core.UpdateUIEvent_Check(*args, **kwargs)
-    def Enable(*args, **kwargs): return _core.UpdateUIEvent_Enable(*args, **kwargs)
-    def SetText(*args, **kwargs): return _core.UpdateUIEvent_SetText(*args, **kwargs)
-    SetUpdateInterval = staticmethod(_core.UpdateUIEvent_SetUpdateInterval)
-    GetUpdateInterval = staticmethod(_core.UpdateUIEvent_GetUpdateInterval)
-    CanUpdate = staticmethod(_core.UpdateUIEvent_CanUpdate)
-    ResetUpdateTime = staticmethod(_core.UpdateUIEvent_ResetUpdateTime)
-    SetMode = staticmethod(_core.UpdateUIEvent_SetMode)
-    GetMode = staticmethod(_core.UpdateUIEvent_GetMode)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxUpdateUIEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetChecked(*args, **kwargs):
+        """GetChecked() -> bool"""
+        return _core.UpdateUIEvent_GetChecked(*args, **kwargs)
+
+    def GetEnabled(*args, **kwargs):
+        """GetEnabled() -> bool"""
+        return _core.UpdateUIEvent_GetEnabled(*args, **kwargs)
+
+    def GetText(*args, **kwargs):
+        """GetText() -> wxString"""
+        return _core.UpdateUIEvent_GetText(*args, **kwargs)
+
+    def GetSetText(*args, **kwargs):
+        """GetSetText() -> bool"""
+        return _core.UpdateUIEvent_GetSetText(*args, **kwargs)
+
+    def GetSetChecked(*args, **kwargs):
+        """GetSetChecked() -> bool"""
+        return _core.UpdateUIEvent_GetSetChecked(*args, **kwargs)
+
+    def GetSetEnabled(*args, **kwargs):
+        """GetSetEnabled() -> bool"""
+        return _core.UpdateUIEvent_GetSetEnabled(*args, **kwargs)
+
+    def Check(*args, **kwargs):
+        """Check(bool check)"""
+        return _core.UpdateUIEvent_Check(*args, **kwargs)
+
+    def Enable(*args, **kwargs):
+        """Enable(bool enable)"""
+        return _core.UpdateUIEvent_Enable(*args, **kwargs)
+
+    def SetText(*args, **kwargs):
+        """SetText(wxString text)"""
+        return _core.UpdateUIEvent_SetText(*args, **kwargs)
+
+    def SetUpdateInterval(*args, **kwargs):
+        """UpdateUIEvent.SetUpdateInterval(long updateInterval)"""
+        return _core.UpdateUIEvent_SetUpdateInterval(*args, **kwargs)
+
+    SetUpdateInterval = staticmethod(SetUpdateInterval)
+    def GetUpdateInterval(*args, **kwargs):
+        """UpdateUIEvent.GetUpdateInterval() -> long"""
+        return _core.UpdateUIEvent_GetUpdateInterval(*args, **kwargs)
+
+    GetUpdateInterval = staticmethod(GetUpdateInterval)
+    def CanUpdate(*args, **kwargs):
+        """UpdateUIEvent.CanUpdate(Window win) -> bool"""
+        return _core.UpdateUIEvent_CanUpdate(*args, **kwargs)
+
+    CanUpdate = staticmethod(CanUpdate)
+    def ResetUpdateTime(*args, **kwargs):
+        """UpdateUIEvent.ResetUpdateTime()"""
+        return _core.UpdateUIEvent_ResetUpdateTime(*args, **kwargs)
+
+    ResetUpdateTime = staticmethod(ResetUpdateTime)
+    def SetMode(*args, **kwargs):
+        """UpdateUIEvent.SetMode(wxUpdateUIMode mode)"""
+        return _core.UpdateUIEvent_SetMode(*args, **kwargs)
+
+    SetMode = staticmethod(SetMode)
+    def GetMode(*args, **kwargs):
+        """UpdateUIEvent.GetMode() -> wxUpdateUIMode"""
+        return _core.UpdateUIEvent_GetMode(*args, **kwargs)
+
+    GetMode = staticmethod(GetMode)
 
 class UpdateUIEventPtr(UpdateUIEvent):
     def __init__(self, this):
@@ -2566,28 +3975,42 @@ class UpdateUIEventPtr(UpdateUIEvent):
         self.__class__ = UpdateUIEvent
 _core.UpdateUIEvent_swigregister(UpdateUIEventPtr)
 
-UpdateUIEvent_SetUpdateInterval = _core.UpdateUIEvent_SetUpdateInterval
+def UpdateUIEvent_SetUpdateInterval(*args, **kwargs):
+    """UpdateUIEvent_SetUpdateInterval(long updateInterval)"""
+    return _core.UpdateUIEvent_SetUpdateInterval(*args, **kwargs)
 
-UpdateUIEvent_GetUpdateInterval = _core.UpdateUIEvent_GetUpdateInterval
+def UpdateUIEvent_GetUpdateInterval(*args, **kwargs):
+    """UpdateUIEvent_GetUpdateInterval() -> long"""
+    return _core.UpdateUIEvent_GetUpdateInterval(*args, **kwargs)
 
-UpdateUIEvent_CanUpdate = _core.UpdateUIEvent_CanUpdate
+def UpdateUIEvent_CanUpdate(*args, **kwargs):
+    """UpdateUIEvent_CanUpdate(Window win) -> bool"""
+    return _core.UpdateUIEvent_CanUpdate(*args, **kwargs)
 
-UpdateUIEvent_ResetUpdateTime = _core.UpdateUIEvent_ResetUpdateTime
+def UpdateUIEvent_ResetUpdateTime(*args, **kwargs):
+    """UpdateUIEvent_ResetUpdateTime()"""
+    return _core.UpdateUIEvent_ResetUpdateTime(*args, **kwargs)
 
-UpdateUIEvent_SetMode = _core.UpdateUIEvent_SetMode
+def UpdateUIEvent_SetMode(*args, **kwargs):
+    """UpdateUIEvent_SetMode(wxUpdateUIMode mode)"""
+    return _core.UpdateUIEvent_SetMode(*args, **kwargs)
 
-UpdateUIEvent_GetMode = _core.UpdateUIEvent_GetMode
+def UpdateUIEvent_GetMode(*args, **kwargs):
+    """UpdateUIEvent_GetMode() -> wxUpdateUIMode"""
+    return _core.UpdateUIEvent_GetMode(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class SysColourChangedEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSysColourChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> SysColourChangedEvent"""
         newobj = _core.new_SysColourChangedEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSysColourChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class SysColourChangedEventPtr(SysColourChangedEvent):
     def __init__(self, this):
@@ -2599,14 +4022,19 @@ _core.SysColourChangedEvent_swigregister(SysColourChangedEventPtr)
 #---------------------------------------------------------------------------
 
 class MouseCaptureChangedEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMouseCaptureChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int winid=0, Window gainedCapture=None) -> MouseCaptureChangedEvent"""
         newobj = _core.new_MouseCaptureChangedEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetCapturedWindow(*args, **kwargs): return _core.MouseCaptureChangedEvent_GetCapturedWindow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMouseCaptureChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetCapturedWindow(*args, **kwargs):
+        """GetCapturedWindow() -> Window"""
+        return _core.MouseCaptureChangedEvent_GetCapturedWindow(*args, **kwargs)
+
 
 class MouseCaptureChangedEventPtr(MouseCaptureChangedEvent):
     def __init__(self, this):
@@ -2618,13 +4046,15 @@ _core.MouseCaptureChangedEvent_swigregister(MouseCaptureChangedEventPtr)
 #---------------------------------------------------------------------------
 
 class DisplayChangedEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDisplayChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> DisplayChangedEvent"""
         newobj = _core.new_DisplayChangedEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDisplayChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class DisplayChangedEventPtr(DisplayChangedEvent):
     def __init__(self, this):
@@ -2636,15 +4066,23 @@ _core.DisplayChangedEvent_swigregister(DisplayChangedEventPtr)
 #---------------------------------------------------------------------------
 
 class PaletteChangedEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPaletteChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int id=0) -> PaletteChangedEvent"""
         newobj = _core.new_PaletteChangedEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetChangedWindow(*args, **kwargs): return _core.PaletteChangedEvent_SetChangedWindow(*args, **kwargs)
-    def GetChangedWindow(*args, **kwargs): return _core.PaletteChangedEvent_GetChangedWindow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPaletteChangedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetChangedWindow(*args, **kwargs):
+        """SetChangedWindow(Window win)"""
+        return _core.PaletteChangedEvent_SetChangedWindow(*args, **kwargs)
+
+    def GetChangedWindow(*args, **kwargs):
+        """GetChangedWindow() -> Window"""
+        return _core.PaletteChangedEvent_GetChangedWindow(*args, **kwargs)
+
 
 class PaletteChangedEventPtr(PaletteChangedEvent):
     def __init__(self, this):
@@ -2656,15 +4094,23 @@ _core.PaletteChangedEvent_swigregister(PaletteChangedEventPtr)
 #---------------------------------------------------------------------------
 
 class QueryNewPaletteEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxQueryNewPaletteEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int winid=0) -> QueryNewPaletteEvent"""
         newobj = _core.new_QueryNewPaletteEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetPaletteRealized(*args, **kwargs): return _core.QueryNewPaletteEvent_SetPaletteRealized(*args, **kwargs)
-    def GetPaletteRealized(*args, **kwargs): return _core.QueryNewPaletteEvent_GetPaletteRealized(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxQueryNewPaletteEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetPaletteRealized(*args, **kwargs):
+        """SetPaletteRealized(bool realized)"""
+        return _core.QueryNewPaletteEvent_SetPaletteRealized(*args, **kwargs)
+
+    def GetPaletteRealized(*args, **kwargs):
+        """GetPaletteRealized() -> bool"""
+        return _core.QueryNewPaletteEvent_GetPaletteRealized(*args, **kwargs)
+
 
 class QueryNewPaletteEventPtr(QueryNewPaletteEvent):
     def __init__(self, this):
@@ -2676,19 +4122,39 @@ _core.QueryNewPaletteEvent_swigregister(QueryNewPaletteEventPtr)
 #---------------------------------------------------------------------------
 
 class NavigationKeyEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxNavigationKeyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> NavigationKeyEvent"""
         newobj = _core.new_NavigationKeyEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetDirection(*args, **kwargs): return _core.NavigationKeyEvent_GetDirection(*args, **kwargs)
-    def SetDirection(*args, **kwargs): return _core.NavigationKeyEvent_SetDirection(*args, **kwargs)
-    def IsWindowChange(*args, **kwargs): return _core.NavigationKeyEvent_IsWindowChange(*args, **kwargs)
-    def SetWindowChange(*args, **kwargs): return _core.NavigationKeyEvent_SetWindowChange(*args, **kwargs)
-    def GetCurrentFocus(*args, **kwargs): return _core.NavigationKeyEvent_GetCurrentFocus(*args, **kwargs)
-    def SetCurrentFocus(*args, **kwargs): return _core.NavigationKeyEvent_SetCurrentFocus(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxNavigationKeyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetDirection(*args, **kwargs):
+        """GetDirection() -> bool"""
+        return _core.NavigationKeyEvent_GetDirection(*args, **kwargs)
+
+    def SetDirection(*args, **kwargs):
+        """SetDirection(bool bForward)"""
+        return _core.NavigationKeyEvent_SetDirection(*args, **kwargs)
+
+    def IsWindowChange(*args, **kwargs):
+        """IsWindowChange() -> bool"""
+        return _core.NavigationKeyEvent_IsWindowChange(*args, **kwargs)
+
+    def SetWindowChange(*args, **kwargs):
+        """SetWindowChange(bool bIs)"""
+        return _core.NavigationKeyEvent_SetWindowChange(*args, **kwargs)
+
+    def GetCurrentFocus(*args, **kwargs):
+        """GetCurrentFocus() -> Window"""
+        return _core.NavigationKeyEvent_GetCurrentFocus(*args, **kwargs)
+
+    def SetCurrentFocus(*args, **kwargs):
+        """SetCurrentFocus(Window win)"""
+        return _core.NavigationKeyEvent_SetCurrentFocus(*args, **kwargs)
+
 
 class NavigationKeyEventPtr(NavigationKeyEvent):
     def __init__(self, this):
@@ -2700,14 +4166,19 @@ _core.NavigationKeyEvent_swigregister(NavigationKeyEventPtr)
 #---------------------------------------------------------------------------
 
 class WindowCreateEvent(CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxWindowCreateEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window win=None) -> WindowCreateEvent"""
         newobj = _core.new_WindowCreateEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetWindow(*args, **kwargs): return _core.WindowCreateEvent_GetWindow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWindowCreateEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetWindow(*args, **kwargs):
+        """GetWindow() -> Window"""
+        return _core.WindowCreateEvent_GetWindow(*args, **kwargs)
+
 
 class WindowCreateEventPtr(WindowCreateEvent):
     def __init__(self, this):
@@ -2717,14 +4188,19 @@ class WindowCreateEventPtr(WindowCreateEvent):
 _core.WindowCreateEvent_swigregister(WindowCreateEventPtr)
 
 class WindowDestroyEvent(CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxWindowDestroyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window win=None) -> WindowDestroyEvent"""
         newobj = _core.new_WindowDestroyEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetWindow(*args, **kwargs): return _core.WindowDestroyEvent_GetWindow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWindowDestroyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetWindow(*args, **kwargs):
+        """GetWindow() -> Window"""
+        return _core.WindowDestroyEvent_GetWindow(*args, **kwargs)
+
 
 class WindowDestroyEventPtr(WindowDestroyEvent):
     def __init__(self, this):
@@ -2736,15 +4212,23 @@ _core.WindowDestroyEvent_swigregister(WindowDestroyEventPtr)
 #---------------------------------------------------------------------------
 
 class ContextMenuEvent(CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxContextMenuEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> ContextMenuEvent"""
         newobj = _core.new_ContextMenuEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetPosition(*args, **kwargs): return _core.ContextMenuEvent_GetPosition(*args, **kwargs)
-    def SetPosition(*args, **kwargs): return _core.ContextMenuEvent_SetPosition(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxContextMenuEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point"""
+        return _core.ContextMenuEvent_GetPosition(*args, **kwargs)
+
+    def SetPosition(*args, **kwargs):
+        """SetPosition(Point pos)"""
+        return _core.ContextMenuEvent_SetPosition(*args, **kwargs)
+
 
 class ContextMenuEventPtr(ContextMenuEvent):
     def __init__(self, this):
@@ -2758,18 +4242,38 @@ _core.ContextMenuEvent_swigregister(ContextMenuEventPtr)
 IDLE_PROCESS_ALL = _core.IDLE_PROCESS_ALL
 IDLE_PROCESS_SPECIFIED = _core.IDLE_PROCESS_SPECIFIED
 class IdleEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxIdleEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> IdleEvent"""
         newobj = _core.new_IdleEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def RequestMore(*args, **kwargs): return _core.IdleEvent_RequestMore(*args, **kwargs)
-    def MoreRequested(*args, **kwargs): return _core.IdleEvent_MoreRequested(*args, **kwargs)
-    SetMode = staticmethod(_core.IdleEvent_SetMode)
-    GetMode = staticmethod(_core.IdleEvent_GetMode)
-    CanSend = staticmethod(_core.IdleEvent_CanSend)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxIdleEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def RequestMore(*args, **kwargs):
+        """RequestMore(bool needMore=True)"""
+        return _core.IdleEvent_RequestMore(*args, **kwargs)
+
+    def MoreRequested(*args, **kwargs):
+        """MoreRequested() -> bool"""
+        return _core.IdleEvent_MoreRequested(*args, **kwargs)
+
+    def SetMode(*args, **kwargs):
+        """IdleEvent.SetMode(wxIdleMode mode)"""
+        return _core.IdleEvent_SetMode(*args, **kwargs)
+
+    SetMode = staticmethod(SetMode)
+    def GetMode(*args, **kwargs):
+        """IdleEvent.GetMode() -> wxIdleMode"""
+        return _core.IdleEvent_GetMode(*args, **kwargs)
+
+    GetMode = staticmethod(GetMode)
+    def CanSend(*args, **kwargs):
+        """IdleEvent.CanSend(Window win) -> bool"""
+        return _core.IdleEvent_CanSend(*args, **kwargs)
+
+    CanSend = staticmethod(CanSend)
 
 class IdleEventPtr(IdleEvent):
     def __init__(self, this):
@@ -2778,29 +4282,46 @@ class IdleEventPtr(IdleEvent):
         self.__class__ = IdleEvent
 _core.IdleEvent_swigregister(IdleEventPtr)
 
-IdleEvent_SetMode = _core.IdleEvent_SetMode
+def IdleEvent_SetMode(*args, **kwargs):
+    """IdleEvent_SetMode(wxIdleMode mode)"""
+    return _core.IdleEvent_SetMode(*args, **kwargs)
 
-IdleEvent_GetMode = _core.IdleEvent_GetMode
+def IdleEvent_GetMode(*args, **kwargs):
+    """IdleEvent_GetMode() -> wxIdleMode"""
+    return _core.IdleEvent_GetMode(*args, **kwargs)
 
-IdleEvent_CanSend = _core.IdleEvent_CanSend
+def IdleEvent_CanSend(*args, **kwargs):
+    """IdleEvent_CanSend(Window win) -> bool"""
+    return _core.IdleEvent_CanSend(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class PyEvent(Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int winid=0, wxEventType commandType=wxEVT_NULL) -> PyEvent"""
         newobj = _core.new_PyEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self.SetSelf(self)
+
     def __del__(self, destroy=_core.delete_PyEvent):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetSelf(*args, **kwargs): return _core.PyEvent_SetSelf(*args, **kwargs)
-    def GetSelf(*args, **kwargs): return _core.PyEvent_GetSelf(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetSelf(*args, **kwargs):
+        """SetSelf(PyObject self)"""
+        return _core.PyEvent_SetSelf(*args, **kwargs)
+
+    def GetSelf(*args, **kwargs):
+        """GetSelf() -> PyObject"""
+        return _core.PyEvent_GetSelf(*args, **kwargs)
+
 
 class PyEventPtr(PyEvent):
     def __init__(self, this):
@@ -2810,20 +4331,31 @@ class PyEventPtr(PyEvent):
 _core.PyEvent_swigregister(PyEventPtr)
 
 class PyCommandEvent(CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyCommandEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType commandType=wxEVT_NULL, int id=0) -> PyCommandEvent"""
         newobj = _core.new_PyCommandEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self.SetSelf(self)
+
     def __del__(self, destroy=_core.delete_PyCommandEvent):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetSelf(*args, **kwargs): return _core.PyCommandEvent_SetSelf(*args, **kwargs)
-    def GetSelf(*args, **kwargs): return _core.PyCommandEvent_GetSelf(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyCommandEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetSelf(*args, **kwargs):
+        """SetSelf(PyObject self)"""
+        return _core.PyCommandEvent_SetSelf(*args, **kwargs)
+
+    def GetSelf(*args, **kwargs):
+        """GetSelf() -> PyObject"""
+        return _core.PyCommandEvent_GetSelf(*args, **kwargs)
+
 
 class PyCommandEventPtr(PyCommandEvent):
     def __init__(self, this):
@@ -2841,61 +4373,205 @@ PYAPP_ASSERT_LOG = _core.PYAPP_ASSERT_LOG
 PRINT_WINDOWS = _core.PRINT_WINDOWS
 PRINT_POSTSCRIPT = _core.PRINT_POSTSCRIPT
 class PyApp(EvtHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyApp instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PyApp"""
         newobj = _core.new_PyApp(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, PyApp)
         self._setOORInfo(self)
+
     def __del__(self, destroy=_core.delete_PyApp):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def _setCallbackInfo(*args, **kwargs): return _core.PyApp__setCallbackInfo(*args, **kwargs)
-    def GetAppName(*args, **kwargs): return _core.PyApp_GetAppName(*args, **kwargs)
-    def SetAppName(*args, **kwargs): return _core.PyApp_SetAppName(*args, **kwargs)
-    def GetClassName(*args, **kwargs): return _core.PyApp_GetClassName(*args, **kwargs)
-    def SetClassName(*args, **kwargs): return _core.PyApp_SetClassName(*args, **kwargs)
-    def GetVendorName(*args, **kwargs): return _core.PyApp_GetVendorName(*args, **kwargs)
-    def SetVendorName(*args, **kwargs): return _core.PyApp_SetVendorName(*args, **kwargs)
-    def GetTraits(*args, **kwargs): return _core.PyApp_GetTraits(*args, **kwargs)
-    def ProcessPendingEvents(*args, **kwargs): return _core.PyApp_ProcessPendingEvents(*args, **kwargs)
-    def Yield(*args, **kwargs): return _core.PyApp_Yield(*args, **kwargs)
-    def WakeUpIdle(*args, **kwargs): return _core.PyApp_WakeUpIdle(*args, **kwargs)
-    def MainLoop(*args, **kwargs): return _core.PyApp_MainLoop(*args, **kwargs)
-    def Exit(*args, **kwargs): return _core.PyApp_Exit(*args, **kwargs)
-    def ExitMainLoop(*args, **kwargs): return _core.PyApp_ExitMainLoop(*args, **kwargs)
-    def Pending(*args, **kwargs): return _core.PyApp_Pending(*args, **kwargs)
-    def Dispatch(*args, **kwargs): return _core.PyApp_Dispatch(*args, **kwargs)
-    def ProcessIdle(*args, **kwargs): return _core.PyApp_ProcessIdle(*args, **kwargs)
-    def SendIdleEvents(*args, **kwargs): return _core.PyApp_SendIdleEvents(*args, **kwargs)
-    def OnIdle(*args, **kwargs): return _core.PyApp_OnIdle(*args, **kwargs)
-    def IsActive(*args, **kwargs): return _core.PyApp_IsActive(*args, **kwargs)
-    def SetTopWindow(*args, **kwargs): return _core.PyApp_SetTopWindow(*args, **kwargs)
-    def GetTopWindow(*args, **kwargs): return _core.PyApp_GetTopWindow(*args, **kwargs)
-    def SetExitOnFrameDelete(*args, **kwargs): return _core.PyApp_SetExitOnFrameDelete(*args, **kwargs)
-    def GetExitOnFrameDelete(*args, **kwargs): return _core.PyApp_GetExitOnFrameDelete(*args, **kwargs)
-    def SetUseBestVisual(*args, **kwargs): return _core.PyApp_SetUseBestVisual(*args, **kwargs)
-    def GetUseBestVisual(*args, **kwargs): return _core.PyApp_GetUseBestVisual(*args, **kwargs)
-    def SetPrintMode(*args, **kwargs): return _core.PyApp_SetPrintMode(*args, **kwargs)
-    def GetPrintMode(*args, **kwargs): return _core.PyApp_GetPrintMode(*args, **kwargs)
-    def GetAssertMode(*args, **kwargs): return _core.PyApp_GetAssertMode(*args, **kwargs)
-    def SetAssertMode(*args, **kwargs): return _core.PyApp_SetAssertMode(*args, **kwargs)
-    GetMacSupportPCMenuShortcuts = staticmethod(_core.PyApp_GetMacSupportPCMenuShortcuts)
-    GetMacAboutMenuItemId = staticmethod(_core.PyApp_GetMacAboutMenuItemId)
-    GetMacPreferencesMenuItemId = staticmethod(_core.PyApp_GetMacPreferencesMenuItemId)
-    GetMacExitMenuItemId = staticmethod(_core.PyApp_GetMacExitMenuItemId)
-    GetMacHelpMenuTitleName = staticmethod(_core.PyApp_GetMacHelpMenuTitleName)
-    SetMacSupportPCMenuShortcuts = staticmethod(_core.PyApp_SetMacSupportPCMenuShortcuts)
-    SetMacAboutMenuItemId = staticmethod(_core.PyApp_SetMacAboutMenuItemId)
-    SetMacPreferencesMenuItemId = staticmethod(_core.PyApp_SetMacPreferencesMenuItemId)
-    SetMacExitMenuItemId = staticmethod(_core.PyApp_SetMacExitMenuItemId)
-    SetMacHelpMenuTitleName = staticmethod(_core.PyApp_SetMacHelpMenuTitleName)
-    def _BootstrapApp(*args, **kwargs): return _core.PyApp__BootstrapApp(*args, **kwargs)
-    GetComCtl32Version = staticmethod(_core.PyApp_GetComCtl32Version)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyApp instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _core.PyApp__setCallbackInfo(*args, **kwargs)
+
+    def GetAppName(*args, **kwargs):
+        """GetAppName() -> wxString"""
+        return _core.PyApp_GetAppName(*args, **kwargs)
+
+    def SetAppName(*args, **kwargs):
+        """SetAppName(wxString name)"""
+        return _core.PyApp_SetAppName(*args, **kwargs)
+
+    def GetClassName(*args, **kwargs):
+        """GetClassName() -> wxString
+
+Returns the class name of the C++ object using wxRTTI."""
+        return _core.PyApp_GetClassName(*args, **kwargs)
+
+    def SetClassName(*args, **kwargs):
+        """SetClassName(wxString name)"""
+        return _core.PyApp_SetClassName(*args, **kwargs)
+
+    def GetVendorName(*args, **kwargs):
+        """GetVendorName() -> wxString"""
+        return _core.PyApp_GetVendorName(*args, **kwargs)
+
+    def SetVendorName(*args, **kwargs):
+        """SetVendorName(wxString name)"""
+        return _core.PyApp_SetVendorName(*args, **kwargs)
+
+    def GetTraits(*args, **kwargs):
+        """GetTraits() -> wxAppTraits"""
+        return _core.PyApp_GetTraits(*args, **kwargs)
+
+    def ProcessPendingEvents(*args, **kwargs):
+        """ProcessPendingEvents()"""
+        return _core.PyApp_ProcessPendingEvents(*args, **kwargs)
+
+    def Yield(*args, **kwargs):
+        """Yield(bool onlyIfNeeded=False) -> bool"""
+        return _core.PyApp_Yield(*args, **kwargs)
+
+    def WakeUpIdle(*args, **kwargs):
+        """WakeUpIdle()"""
+        return _core.PyApp_WakeUpIdle(*args, **kwargs)
+
+    def MainLoop(*args, **kwargs):
+        """MainLoop() -> int"""
+        return _core.PyApp_MainLoop(*args, **kwargs)
+
+    def Exit(*args, **kwargs):
+        """Exit()"""
+        return _core.PyApp_Exit(*args, **kwargs)
+
+    def ExitMainLoop(*args, **kwargs):
+        """ExitMainLoop()"""
+        return _core.PyApp_ExitMainLoop(*args, **kwargs)
+
+    def Pending(*args, **kwargs):
+        """Pending() -> bool"""
+        return _core.PyApp_Pending(*args, **kwargs)
+
+    def Dispatch(*args, **kwargs):
+        """Dispatch() -> bool"""
+        return _core.PyApp_Dispatch(*args, **kwargs)
+
+    def ProcessIdle(*args, **kwargs):
+        """ProcessIdle() -> bool"""
+        return _core.PyApp_ProcessIdle(*args, **kwargs)
+
+    def SendIdleEvents(*args, **kwargs):
+        """SendIdleEvents(Window win, IdleEvent event) -> bool"""
+        return _core.PyApp_SendIdleEvents(*args, **kwargs)
+
+    def OnIdle(*args, **kwargs):
+        """OnIdle(IdleEvent event)"""
+        return _core.PyApp_OnIdle(*args, **kwargs)
+
+    def IsActive(*args, **kwargs):
+        """IsActive() -> bool"""
+        return _core.PyApp_IsActive(*args, **kwargs)
+
+    def SetTopWindow(*args, **kwargs):
+        """SetTopWindow(Window win)"""
+        return _core.PyApp_SetTopWindow(*args, **kwargs)
+
+    def GetTopWindow(*args, **kwargs):
+        """GetTopWindow() -> Window"""
+        return _core.PyApp_GetTopWindow(*args, **kwargs)
+
+    def SetExitOnFrameDelete(*args, **kwargs):
+        """SetExitOnFrameDelete(bool flag)"""
+        return _core.PyApp_SetExitOnFrameDelete(*args, **kwargs)
+
+    def GetExitOnFrameDelete(*args, **kwargs):
+        """GetExitOnFrameDelete() -> bool"""
+        return _core.PyApp_GetExitOnFrameDelete(*args, **kwargs)
+
+    def SetUseBestVisual(*args, **kwargs):
+        """SetUseBestVisual(bool flag)"""
+        return _core.PyApp_SetUseBestVisual(*args, **kwargs)
+
+    def GetUseBestVisual(*args, **kwargs):
+        """GetUseBestVisual() -> bool"""
+        return _core.PyApp_GetUseBestVisual(*args, **kwargs)
+
+    def SetPrintMode(*args, **kwargs):
+        """SetPrintMode(int mode)"""
+        return _core.PyApp_SetPrintMode(*args, **kwargs)
+
+    def GetPrintMode(*args, **kwargs):
+        """GetPrintMode() -> int"""
+        return _core.PyApp_GetPrintMode(*args, **kwargs)
+
+    def GetAssertMode(*args, **kwargs):
+        """GetAssertMode() -> int"""
+        return _core.PyApp_GetAssertMode(*args, **kwargs)
+
+    def SetAssertMode(*args, **kwargs):
+        """SetAssertMode(int mode)"""
+        return _core.PyApp_SetAssertMode(*args, **kwargs)
+
+    def GetMacSupportPCMenuShortcuts(*args, **kwargs):
+        """PyApp.GetMacSupportPCMenuShortcuts() -> bool"""
+        return _core.PyApp_GetMacSupportPCMenuShortcuts(*args, **kwargs)
+
+    GetMacSupportPCMenuShortcuts = staticmethod(GetMacSupportPCMenuShortcuts)
+    def GetMacAboutMenuItemId(*args, **kwargs):
+        """PyApp.GetMacAboutMenuItemId() -> long"""
+        return _core.PyApp_GetMacAboutMenuItemId(*args, **kwargs)
+
+    GetMacAboutMenuItemId = staticmethod(GetMacAboutMenuItemId)
+    def GetMacPreferencesMenuItemId(*args, **kwargs):
+        """PyApp.GetMacPreferencesMenuItemId() -> long"""
+        return _core.PyApp_GetMacPreferencesMenuItemId(*args, **kwargs)
+
+    GetMacPreferencesMenuItemId = staticmethod(GetMacPreferencesMenuItemId)
+    def GetMacExitMenuItemId(*args, **kwargs):
+        """PyApp.GetMacExitMenuItemId() -> long"""
+        return _core.PyApp_GetMacExitMenuItemId(*args, **kwargs)
+
+    GetMacExitMenuItemId = staticmethod(GetMacExitMenuItemId)
+    def GetMacHelpMenuTitleName(*args, **kwargs):
+        """PyApp.GetMacHelpMenuTitleName() -> wxString"""
+        return _core.PyApp_GetMacHelpMenuTitleName(*args, **kwargs)
+
+    GetMacHelpMenuTitleName = staticmethod(GetMacHelpMenuTitleName)
+    def SetMacSupportPCMenuShortcuts(*args, **kwargs):
+        """PyApp.SetMacSupportPCMenuShortcuts(bool val)"""
+        return _core.PyApp_SetMacSupportPCMenuShortcuts(*args, **kwargs)
+
+    SetMacSupportPCMenuShortcuts = staticmethod(SetMacSupportPCMenuShortcuts)
+    def SetMacAboutMenuItemId(*args, **kwargs):
+        """PyApp.SetMacAboutMenuItemId(long val)"""
+        return _core.PyApp_SetMacAboutMenuItemId(*args, **kwargs)
+
+    SetMacAboutMenuItemId = staticmethod(SetMacAboutMenuItemId)
+    def SetMacPreferencesMenuItemId(*args, **kwargs):
+        """PyApp.SetMacPreferencesMenuItemId(long val)"""
+        return _core.PyApp_SetMacPreferencesMenuItemId(*args, **kwargs)
+
+    SetMacPreferencesMenuItemId = staticmethod(SetMacPreferencesMenuItemId)
+    def SetMacExitMenuItemId(*args, **kwargs):
+        """PyApp.SetMacExitMenuItemId(long val)"""
+        return _core.PyApp_SetMacExitMenuItemId(*args, **kwargs)
+
+    SetMacExitMenuItemId = staticmethod(SetMacExitMenuItemId)
+    def SetMacHelpMenuTitleName(*args, **kwargs):
+        """PyApp.SetMacHelpMenuTitleName(wxString val)"""
+        return _core.PyApp_SetMacHelpMenuTitleName(*args, **kwargs)
+
+    SetMacHelpMenuTitleName = staticmethod(SetMacHelpMenuTitleName)
+    def _BootstrapApp(*args, **kwargs):
+        """_BootstrapApp()"""
+        return _core.PyApp__BootstrapApp(*args, **kwargs)
+
+    def GetComCtl32Version(*args, **kwargs):
+        """PyApp.GetComCtl32Version() -> int"""
+        return _core.PyApp_GetComCtl32Version(*args, **kwargs)
+
+    GetComCtl32Version = staticmethod(GetComCtl32Version)
 
 class PyAppPtr(PyApp):
     def __init__(self, this):
@@ -2904,46 +4580,84 @@ class PyAppPtr(PyApp):
         self.__class__ = PyApp
 _core.PyApp_swigregister(PyAppPtr)
 
-PyApp_GetMacSupportPCMenuShortcuts = _core.PyApp_GetMacSupportPCMenuShortcuts
+def PyApp_GetMacSupportPCMenuShortcuts(*args, **kwargs):
+    """PyApp_GetMacSupportPCMenuShortcuts() -> bool"""
+    return _core.PyApp_GetMacSupportPCMenuShortcuts(*args, **kwargs)
 
-PyApp_GetMacAboutMenuItemId = _core.PyApp_GetMacAboutMenuItemId
+def PyApp_GetMacAboutMenuItemId(*args, **kwargs):
+    """PyApp_GetMacAboutMenuItemId() -> long"""
+    return _core.PyApp_GetMacAboutMenuItemId(*args, **kwargs)
 
-PyApp_GetMacPreferencesMenuItemId = _core.PyApp_GetMacPreferencesMenuItemId
+def PyApp_GetMacPreferencesMenuItemId(*args, **kwargs):
+    """PyApp_GetMacPreferencesMenuItemId() -> long"""
+    return _core.PyApp_GetMacPreferencesMenuItemId(*args, **kwargs)
 
-PyApp_GetMacExitMenuItemId = _core.PyApp_GetMacExitMenuItemId
+def PyApp_GetMacExitMenuItemId(*args, **kwargs):
+    """PyApp_GetMacExitMenuItemId() -> long"""
+    return _core.PyApp_GetMacExitMenuItemId(*args, **kwargs)
 
-PyApp_GetMacHelpMenuTitleName = _core.PyApp_GetMacHelpMenuTitleName
+def PyApp_GetMacHelpMenuTitleName(*args, **kwargs):
+    """PyApp_GetMacHelpMenuTitleName() -> wxString"""
+    return _core.PyApp_GetMacHelpMenuTitleName(*args, **kwargs)
 
-PyApp_SetMacSupportPCMenuShortcuts = _core.PyApp_SetMacSupportPCMenuShortcuts
+def PyApp_SetMacSupportPCMenuShortcuts(*args, **kwargs):
+    """PyApp_SetMacSupportPCMenuShortcuts(bool val)"""
+    return _core.PyApp_SetMacSupportPCMenuShortcuts(*args, **kwargs)
 
-PyApp_SetMacAboutMenuItemId = _core.PyApp_SetMacAboutMenuItemId
+def PyApp_SetMacAboutMenuItemId(*args, **kwargs):
+    """PyApp_SetMacAboutMenuItemId(long val)"""
+    return _core.PyApp_SetMacAboutMenuItemId(*args, **kwargs)
 
-PyApp_SetMacPreferencesMenuItemId = _core.PyApp_SetMacPreferencesMenuItemId
+def PyApp_SetMacPreferencesMenuItemId(*args, **kwargs):
+    """PyApp_SetMacPreferencesMenuItemId(long val)"""
+    return _core.PyApp_SetMacPreferencesMenuItemId(*args, **kwargs)
 
-PyApp_SetMacExitMenuItemId = _core.PyApp_SetMacExitMenuItemId
+def PyApp_SetMacExitMenuItemId(*args, **kwargs):
+    """PyApp_SetMacExitMenuItemId(long val)"""
+    return _core.PyApp_SetMacExitMenuItemId(*args, **kwargs)
 
-PyApp_SetMacHelpMenuTitleName = _core.PyApp_SetMacHelpMenuTitleName
+def PyApp_SetMacHelpMenuTitleName(*args, **kwargs):
+    """PyApp_SetMacHelpMenuTitleName(wxString val)"""
+    return _core.PyApp_SetMacHelpMenuTitleName(*args, **kwargs)
 
-PyApp_GetComCtl32Version = _core.PyApp_GetComCtl32Version
+def PyApp_GetComCtl32Version(*args, **kwargs):
+    """PyApp_GetComCtl32Version() -> int"""
+    return _core.PyApp_GetComCtl32Version(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 
-Exit = _core.Exit
+def Exit(*args, **kwargs):
+    """Exit()"""
+    return _core.Exit(*args, **kwargs)
 
-Yield = _core.Yield
+def Yield(*args, **kwargs):
+    """Yield() -> bool"""
+    return _core.Yield(*args, **kwargs)
 
-YieldIfNeeded = _core.YieldIfNeeded
+def YieldIfNeeded(*args, **kwargs):
+    """YieldIfNeeded() -> bool"""
+    return _core.YieldIfNeeded(*args, **kwargs)
 
-SafeYield = _core.SafeYield
+def SafeYield(*args, **kwargs):
+    """SafeYield(Window win=None, bool onlyIfNeeded=False) -> bool"""
+    return _core.SafeYield(*args, **kwargs)
 
-WakeUpIdle = _core.WakeUpIdle
+def WakeUpIdle(*args, **kwargs):
+    """WakeUpIdle()"""
+    return _core.WakeUpIdle(*args, **kwargs)
 
-PostEvent = _core.PostEvent
+def PostEvent(*args, **kwargs):
+    """PostEvent(EvtHandler dest, Event event)"""
+    return _core.PostEvent(*args, **kwargs)
 
-App_CleanUp = _core.App_CleanUp
+def App_CleanUp(*args, **kwargs):
+    """App_CleanUp()"""
+    return _core.App_CleanUp(*args, **kwargs)
 
-GetApp = _core.GetApp
+def GetApp(*args, **kwargs):
+    """GetApp() -> PyApp"""
+    return _core.GetApp(*args, **kwargs)
 #----------------------------------------------------------------------
 
 class PyOnDemandOutputWindow:
@@ -3130,372 +4844,1200 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
 #---------------------------------------------------------------------------
 
 class Window(EvtHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, wxString name=PanelNameStr) -> Window"""
         newobj = _core.new_Window(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _core.Window_Create(*args, **kwargs)
-    def Close(*args, **kwargs): return _core.Window_Close(*args, **kwargs)
-    def Destroy(*args, **kwargs): return _core.Window_Destroy(*args, **kwargs)
-    def DestroyChildren(*args, **kwargs): return _core.Window_DestroyChildren(*args, **kwargs)
-    def IsBeingDeleted(*args, **kwargs): return _core.Window_IsBeingDeleted(*args, **kwargs)
-    def SetTitle(*args, **kwargs): return _core.Window_SetTitle(*args, **kwargs)
-    def GetTitle(*args, **kwargs): return _core.Window_GetTitle(*args, **kwargs)
-    def SetLabel(*args, **kwargs): return _core.Window_SetLabel(*args, **kwargs)
-    def GetLabel(*args, **kwargs): return _core.Window_GetLabel(*args, **kwargs)
-    def SetName(*args, **kwargs): return _core.Window_SetName(*args, **kwargs)
-    def GetName(*args, **kwargs): return _core.Window_GetName(*args, **kwargs)
-    def SetId(*args, **kwargs): return _core.Window_SetId(*args, **kwargs)
-    def GetId(*args, **kwargs): return _core.Window_GetId(*args, **kwargs)
-    NewControlId = staticmethod(_core.Window_NewControlId)
-    NextControlId = staticmethod(_core.Window_NextControlId)
-    PrevControlId = staticmethod(_core.Window_PrevControlId)
-    def SetSize(*args, **kwargs): return _core.Window_SetSize(*args, **kwargs)
-    def SetDimensions(*args, **kwargs): return _core.Window_SetDimensions(*args, **kwargs)
-    def SetRect(*args, **kwargs): return _core.Window_SetRect(*args, **kwargs)
-    def SetSizeWH(*args, **kwargs): return _core.Window_SetSizeWH(*args, **kwargs)
-    def Move(*args, **kwargs): return _core.Window_Move(*args, **kwargs)
-    SetPosition = Move 
-    def MoveXY(*args, **kwargs): return _core.Window_MoveXY(*args, **kwargs)
-    def Raise(*args, **kwargs): return _core.Window_Raise(*args, **kwargs)
-    def Lower(*args, **kwargs): return _core.Window_Lower(*args, **kwargs)
-    def SetClientSize(*args, **kwargs): return _core.Window_SetClientSize(*args, **kwargs)
-    def SetClientSizeWH(*args, **kwargs): return _core.Window_SetClientSizeWH(*args, **kwargs)
-    def SetClientRect(*args, **kwargs): return _core.Window_SetClientRect(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _core.Window_GetPosition(*args, **kwargs)
-    def GetPositionTuple(*args, **kwargs): return _core.Window_GetPositionTuple(*args, **kwargs)
-    def GetSize(*args, **kwargs): return _core.Window_GetSize(*args, **kwargs)
-    def GetSizeTuple(*args, **kwargs): return _core.Window_GetSizeTuple(*args, **kwargs)
-    def GetRect(*args, **kwargs): return _core.Window_GetRect(*args, **kwargs)
-    def GetClientSize(*args, **kwargs): return _core.Window_GetClientSize(*args, **kwargs)
-    def GetClientSizeTuple(*args, **kwargs): return _core.Window_GetClientSizeTuple(*args, **kwargs)
-    def GetClientAreaOrigin(*args, **kwargs): return _core.Window_GetClientAreaOrigin(*args, **kwargs)
-    def GetClientRect(*args, **kwargs): return _core.Window_GetClientRect(*args, **kwargs)
-    def GetBestSize(*args, **kwargs): return _core.Window_GetBestSize(*args, **kwargs)
-    def GetBestSizeTuple(*args, **kwargs): return _core.Window_GetBestSizeTuple(*args, **kwargs)
-    def GetAdjustedBestSize(*args, **kwargs): return _core.Window_GetAdjustedBestSize(*args, **kwargs)
-    def Center(*args, **kwargs): return _core.Window_Center(*args, **kwargs)
-    Centre = Center 
-    def CenterOnScreen(*args, **kwargs): return _core.Window_CenterOnScreen(*args, **kwargs)
-    CentreOnScreen = CenterOnScreen 
-    def CenterOnParent(*args, **kwargs): return _core.Window_CenterOnParent(*args, **kwargs)
-    CentreOnParent = CenterOnParent 
-    def Fit(*args, **kwargs): return _core.Window_Fit(*args, **kwargs)
-    def FitInside(*args, **kwargs): return _core.Window_FitInside(*args, **kwargs)
-    def SetSizeHints(*args, **kwargs): return _core.Window_SetSizeHints(*args, **kwargs)
-    def SetVirtualSizeHints(*args, **kwargs): return _core.Window_SetVirtualSizeHints(*args, **kwargs)
-    def GetMinWidth(*args, **kwargs): return _core.Window_GetMinWidth(*args, **kwargs)
-    def GetMinHeight(*args, **kwargs): return _core.Window_GetMinHeight(*args, **kwargs)
-    def GetMaxWidth(*args, **kwargs): return _core.Window_GetMaxWidth(*args, **kwargs)
-    def GetMaxHeight(*args, **kwargs): return _core.Window_GetMaxHeight(*args, **kwargs)
-    def GetMaxSize(*args, **kwargs): return _core.Window_GetMaxSize(*args, **kwargs)
-    def SetVirtualSize(*args, **kwargs): return _core.Window_SetVirtualSize(*args, **kwargs)
-    def SetVirtualSizeWH(*args, **kwargs): return _core.Window_SetVirtualSizeWH(*args, **kwargs)
-    def GetVirtualSize(*args, **kwargs): return _core.Window_GetVirtualSize(*args, **kwargs)
-    def GetVirtualSizeTuple(*args, **kwargs): return _core.Window_GetVirtualSizeTuple(*args, **kwargs)
-    def GetBestVirtualSize(*args, **kwargs): return _core.Window_GetBestVirtualSize(*args, **kwargs)
-    def Show(*args, **kwargs): return _core.Window_Show(*args, **kwargs)
-    def Hide(*args, **kwargs): return _core.Window_Hide(*args, **kwargs)
-    def Enable(*args, **kwargs): return _core.Window_Enable(*args, **kwargs)
-    def Disable(*args, **kwargs): return _core.Window_Disable(*args, **kwargs)
-    def IsShown(*args, **kwargs): return _core.Window_IsShown(*args, **kwargs)
-    def IsEnabled(*args, **kwargs): return _core.Window_IsEnabled(*args, **kwargs)
-    def SetWindowStyleFlag(*args, **kwargs): return _core.Window_SetWindowStyleFlag(*args, **kwargs)
-    def GetWindowStyleFlag(*args, **kwargs): return _core.Window_GetWindowStyleFlag(*args, **kwargs)
-    def SetWindowStyle(*args, **kwargs): return _core.Window_SetWindowStyle(*args, **kwargs)
-    def GetWindowStyle(*args, **kwargs): return _core.Window_GetWindowStyle(*args, **kwargs)
-    def HasFlag(*args, **kwargs): return _core.Window_HasFlag(*args, **kwargs)
-    def IsRetained(*args, **kwargs): return _core.Window_IsRetained(*args, **kwargs)
-    def SetExtraStyle(*args, **kwargs): return _core.Window_SetExtraStyle(*args, **kwargs)
-    def GetExtraStyle(*args, **kwargs): return _core.Window_GetExtraStyle(*args, **kwargs)
-    def MakeModal(*args, **kwargs): return _core.Window_MakeModal(*args, **kwargs)
-    def SetThemeEnabled(*args, **kwargs): return _core.Window_SetThemeEnabled(*args, **kwargs)
-    def GetThemeEnabled(*args, **kwargs): return _core.Window_GetThemeEnabled(*args, **kwargs)
-    def ShouldInheritColours(*args, **kwargs): return _core.Window_ShouldInheritColours(*args, **kwargs)
-    def SetFocus(*args, **kwargs): return _core.Window_SetFocus(*args, **kwargs)
-    def SetFocusFromKbd(*args, **kwargs): return _core.Window_SetFocusFromKbd(*args, **kwargs)
-    FindFocus = staticmethod(_core.Window_FindFocus)
-    def AcceptsFocus(*args, **kwargs): return _core.Window_AcceptsFocus(*args, **kwargs)
-    def AcceptsFocusFromKeyboard(*args, **kwargs): return _core.Window_AcceptsFocusFromKeyboard(*args, **kwargs)
-    def GetDefaultItem(*args, **kwargs): return _core.Window_GetDefaultItem(*args, **kwargs)
-    def SetDefaultItem(*args, **kwargs): return _core.Window_SetDefaultItem(*args, **kwargs)
-    def SetTmpDefaultItem(*args, **kwargs): return _core.Window_SetTmpDefaultItem(*args, **kwargs)
-    def GetChildren(*args, **kwargs): return _core.Window_GetChildren(*args, **kwargs)
-    def GetParent(*args, **kwargs): return _core.Window_GetParent(*args, **kwargs)
-    def GetGrandParent(*args, **kwargs): return _core.Window_GetGrandParent(*args, **kwargs)
-    def IsTopLevel(*args, **kwargs): return _core.Window_IsTopLevel(*args, **kwargs)
-    def Reparent(*args, **kwargs): return _core.Window_Reparent(*args, **kwargs)
-    def AddChild(*args, **kwargs): return _core.Window_AddChild(*args, **kwargs)
-    def RemoveChild(*args, **kwargs): return _core.Window_RemoveChild(*args, **kwargs)
-    def FindWindowById(*args, **kwargs): return _core.Window_FindWindowById(*args, **kwargs)
-    def FindWindowByName(*args, **kwargs): return _core.Window_FindWindowByName(*args, **kwargs)
-    def GetEventHandler(*args, **kwargs): return _core.Window_GetEventHandler(*args, **kwargs)
-    def SetEventHandler(*args, **kwargs): return _core.Window_SetEventHandler(*args, **kwargs)
-    def PushEventHandler(*args, **kwargs): return _core.Window_PushEventHandler(*args, **kwargs)
-    def PopEventHandler(*args, **kwargs): return _core.Window_PopEventHandler(*args, **kwargs)
-    def RemoveEventHandler(*args, **kwargs): return _core.Window_RemoveEventHandler(*args, **kwargs)
-    def SetValidator(*args, **kwargs): return _core.Window_SetValidator(*args, **kwargs)
-    def GetValidator(*args, **kwargs): return _core.Window_GetValidator(*args, **kwargs)
-    def SetAcceleratorTable(*args, **kwargs): return _core.Window_SetAcceleratorTable(*args, **kwargs)
-    def GetAcceleratorTable(*args, **kwargs): return _core.Window_GetAcceleratorTable(*args, **kwargs)
-    def RegisterHotKey(*args, **kwargs): return _core.Window_RegisterHotKey(*args, **kwargs)
-    def UnregisterHotKey(*args, **kwargs): return _core.Window_UnregisterHotKey(*args, **kwargs)
-    def ConvertDialogPointToPixels(*args, **kwargs): return _core.Window_ConvertDialogPointToPixels(*args, **kwargs)
-    def ConvertDialogSizeToPixels(*args, **kwargs): return _core.Window_ConvertDialogSizeToPixels(*args, **kwargs)
-    def DLG_PNT(*args, **kwargs): return _core.Window_DLG_PNT(*args, **kwargs)
-    def DLG_SZE(*args, **kwargs): return _core.Window_DLG_SZE(*args, **kwargs)
-    def ConvertPixelPointToDialog(*args, **kwargs): return _core.Window_ConvertPixelPointToDialog(*args, **kwargs)
-    def ConvertPixelSizeToDialog(*args, **kwargs): return _core.Window_ConvertPixelSizeToDialog(*args, **kwargs)
-    def WarpPointer(*args, **kwargs): return _core.Window_WarpPointer(*args, **kwargs)
-    def CaptureMouse(*args, **kwargs): return _core.Window_CaptureMouse(*args, **kwargs)
-    def ReleaseMouse(*args, **kwargs): return _core.Window_ReleaseMouse(*args, **kwargs)
-    GetCapture = staticmethod(_core.Window_GetCapture)
-    def HasCapture(*args, **kwargs): return _core.Window_HasCapture(*args, **kwargs)
-    def Refresh(*args, **kwargs): return _core.Window_Refresh(*args, **kwargs)
-    def RefreshRect(*args, **kwargs): return _core.Window_RefreshRect(*args, **kwargs)
-    def Update(*args, **kwargs): return _core.Window_Update(*args, **kwargs)
-    def ClearBackground(*args, **kwargs): return _core.Window_ClearBackground(*args, **kwargs)
-    def Freeze(*args, **kwargs): return _core.Window_Freeze(*args, **kwargs)
-    def Thaw(*args, **kwargs): return _core.Window_Thaw(*args, **kwargs)
-    def PrepareDC(*args, **kwargs): return _core.Window_PrepareDC(*args, **kwargs)
-    def GetUpdateRegion(*args, **kwargs): return _core.Window_GetUpdateRegion(*args, **kwargs)
-    def GetUpdateClientRect(*args, **kwargs): return _core.Window_GetUpdateClientRect(*args, **kwargs)
-    def IsExposed(*args, **kwargs): return _core.Window_IsExposed(*args, **kwargs)
-    def IsExposedPoint(*args, **kwargs): return _core.Window_IsExposedPoint(*args, **kwargs)
-    def isExposedRect(*args, **kwargs): return _core.Window_isExposedRect(*args, **kwargs)
-    def SetBackgroundColour(*args, **kwargs): return _core.Window_SetBackgroundColour(*args, **kwargs)
-    def SetForegroundColour(*args, **kwargs): return _core.Window_SetForegroundColour(*args, **kwargs)
-    def GetBackgroundColour(*args, **kwargs): return _core.Window_GetBackgroundColour(*args, **kwargs)
-    def GetForegroundColour(*args, **kwargs): return _core.Window_GetForegroundColour(*args, **kwargs)
-    def SetCursor(*args, **kwargs): return _core.Window_SetCursor(*args, **kwargs)
-    def GetCursor(*args, **kwargs): return _core.Window_GetCursor(*args, **kwargs)
-    def SetFont(*args, **kwargs): return _core.Window_SetFont(*args, **kwargs)
-    def GetFont(*args, **kwargs): return _core.Window_GetFont(*args, **kwargs)
-    def SetCaret(*args, **kwargs): return _core.Window_SetCaret(*args, **kwargs)
-    def GetCaret(*args, **kwargs): return _core.Window_GetCaret(*args, **kwargs)
-    def GetCharHeight(*args, **kwargs): return _core.Window_GetCharHeight(*args, **kwargs)
-    def GetCharWidth(*args, **kwargs): return _core.Window_GetCharWidth(*args, **kwargs)
-    def GetTextExtent(*args, **kwargs): return _core.Window_GetTextExtent(*args, **kwargs)
-    def GetFullTextExtent(*args, **kwargs): return _core.Window_GetFullTextExtent(*args, **kwargs)
-    def ClientToScreenXY(*args, **kwargs): return _core.Window_ClientToScreenXY(*args, **kwargs)
-    def ScreenToClientXY(*args, **kwargs): return _core.Window_ScreenToClientXY(*args, **kwargs)
-    def ClientToScreen(*args, **kwargs): return _core.Window_ClientToScreen(*args, **kwargs)
-    def ScreenToClient(*args, **kwargs): return _core.Window_ScreenToClient(*args, **kwargs)
-    def HitTestXY(*args, **kwargs): return _core.Window_HitTestXY(*args, **kwargs)
-    def HitTest(*args, **kwargs): return _core.Window_HitTest(*args, **kwargs)
-    def GetBorderFlags(*args, **kwargs): return _core.Window_GetBorderFlags(*args, **kwargs)
-    def GetBorder(*args, **kwargs): return _core.Window_GetBorder(*args, **kwargs)
-    def UpdateWindowUI(*args, **kwargs): return _core.Window_UpdateWindowUI(*args, **kwargs)
-    def PopupMenuXY(*args, **kwargs): return _core.Window_PopupMenuXY(*args, **kwargs)
-    def PopupMenu(*args, **kwargs): return _core.Window_PopupMenu(*args, **kwargs)
-    def GetHandle(*args, **kwargs): return _core.Window_GetHandle(*args, **kwargs)
-    def HasScrollbar(*args, **kwargs): return _core.Window_HasScrollbar(*args, **kwargs)
-    def SetScrollbar(*args, **kwargs): return _core.Window_SetScrollbar(*args, **kwargs)
-    def SetScrollPos(*args, **kwargs): return _core.Window_SetScrollPos(*args, **kwargs)
-    def GetScrollPos(*args, **kwargs): return _core.Window_GetScrollPos(*args, **kwargs)
-    def GetScrollThumb(*args, **kwargs): return _core.Window_GetScrollThumb(*args, **kwargs)
-    def GetScrollRange(*args, **kwargs): return _core.Window_GetScrollRange(*args, **kwargs)
-    def ScrollWindow(*args, **kwargs): return _core.Window_ScrollWindow(*args, **kwargs)
-    def ScrollLines(*args, **kwargs): return _core.Window_ScrollLines(*args, **kwargs)
-    def ScrollPages(*args, **kwargs): return _core.Window_ScrollPages(*args, **kwargs)
-    def LineUp(*args, **kwargs): return _core.Window_LineUp(*args, **kwargs)
-    def LineDown(*args, **kwargs): return _core.Window_LineDown(*args, **kwargs)
-    def PageUp(*args, **kwargs): return _core.Window_PageUp(*args, **kwargs)
-    def PageDown(*args, **kwargs): return _core.Window_PageDown(*args, **kwargs)
-    def SetHelpText(*args, **kwargs): return _core.Window_SetHelpText(*args, **kwargs)
-    def SetHelpTextForId(*args, **kwargs): return _core.Window_SetHelpTextForId(*args, **kwargs)
-    def GetHelpText(*args, **kwargs): return _core.Window_GetHelpText(*args, **kwargs)
-    def SetToolTipString(*args, **kwargs): return _core.Window_SetToolTipString(*args, **kwargs)
-    def SetToolTip(*args, **kwargs): return _core.Window_SetToolTip(*args, **kwargs)
-    def GetToolTip(*args, **kwargs): return _core.Window_GetToolTip(*args, **kwargs)
-    def SetDropTarget(*args, **kwargs): 
-        val = _core.Window_SetDropTarget(*args, **kwargs)
-        args[1].thisown = 0
-        return val
-    def GetDropTarget(*args, **kwargs): return _core.Window_GetDropTarget(*args, **kwargs)
-    def SetConstraints(*args, **kwargs): return _core.Window_SetConstraints(*args, **kwargs)
-    def GetConstraints(*args, **kwargs): return _core.Window_GetConstraints(*args, **kwargs)
-    def SetAutoLayout(*args, **kwargs): return _core.Window_SetAutoLayout(*args, **kwargs)
-    def GetAutoLayout(*args, **kwargs): return _core.Window_GetAutoLayout(*args, **kwargs)
-    def Layout(*args, **kwargs): return _core.Window_Layout(*args, **kwargs)
-    def SetSizer(*args, **kwargs): return _core.Window_SetSizer(*args, **kwargs)
-    def SetSizerAndFit(*args, **kwargs): return _core.Window_SetSizerAndFit(*args, **kwargs)
-    def GetSizer(*args, **kwargs): return _core.Window_GetSizer(*args, **kwargs)
-    def SetContainingSizer(*args, **kwargs): return _core.Window_SetContainingSizer(*args, **kwargs)
-    def GetContainingSizer(*args, **kwargs): return _core.Window_GetContainingSizer(*args, **kwargs)
-    def PostCreate(self, pre):
-        """Phase 3 of the 2-phase create <wink!>
-           Call this method after precreating the window with the 2-phase create method."""
-        self.this = pre.this
-        self.thisown = pre.thisown
-        pre.thisown = 0
-        if hasattr(self, '_setOORInfo'):
-            self._setOORInfo(self)
-        if hasattr(self, '_setCallbackInfo'):
-            self._setCallbackInfo(self, self.__class__)
 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, wxString name=PanelNameStr) -> bool"""
+        return _core.Window_Create(*args, **kwargs)
 
-class WindowPtr(Window):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Window
-_core.Window_swigregister(WindowPtr)
+    def Close(*args, **kwargs):
+        """Close(bool force=False) -> bool"""
+        return _core.Window_Close(*args, **kwargs)
 
-def PreWindow(*args, **kwargs):
-    val = _core.new_PreWindow(*args, **kwargs)
-    val.thisown = 1
-    return val
+    def Destroy(*args, **kwargs):
+        """Destroy() -> bool
 
-Window_NewControlId = _core.Window_NewControlId
+Deletes the C++ object this Python object is a proxy for."""
+        return _core.Window_Destroy(*args, **kwargs)
 
-Window_NextControlId = _core.Window_NextControlId
+    def DestroyChildren(*args, **kwargs):
+        """DestroyChildren() -> bool"""
+        return _core.Window_DestroyChildren(*args, **kwargs)
 
-Window_PrevControlId = _core.Window_PrevControlId
+    def IsBeingDeleted(*args, **kwargs):
+        """IsBeingDeleted() -> bool"""
+        return _core.Window_IsBeingDeleted(*args, **kwargs)
 
-Window_FindFocus = _core.Window_FindFocus
+    def SetTitle(*args, **kwargs):
+        """SetTitle(wxString title)"""
+        return _core.Window_SetTitle(*args, **kwargs)
 
-Window_GetCapture = _core.Window_GetCapture
+    def GetTitle(*args, **kwargs):
+        """GetTitle() -> wxString"""
+        return _core.Window_GetTitle(*args, **kwargs)
 
-def DLG_PNT(win, point_or_x, y=None):
-    if y is None:
-        return win.ConvertDialogPointToPixels(point_or_x)
-    else:
-        return win.ConvertDialogPointToPixels(wxPoint(point_or_x, y))
+    def SetLabel(*args, **kwargs):
+        """SetLabel(wxString label)"""
+        return _core.Window_SetLabel(*args, **kwargs)
 
-def DLG_SZE(win, size_width, height=None):
-    if height is None:
-        return win.ConvertDialogSizeToPixels(size_width)
-    else:
-        return win.ConvertDialogSizeToPixels(wxSize(size_width, height))
+    def GetLabel(*args, **kwargs):
+        """GetLabel() -> wxString"""
+        return _core.Window_GetLabel(*args, **kwargs)
 
+    def SetName(*args, **kwargs):
+        """SetName(wxString name)"""
+        return _core.Window_SetName(*args, **kwargs)
 
-FindWindowById = _core.FindWindowById
+    def GetName(*args, **kwargs):
+        """GetName() -> wxString"""
+        return _core.Window_GetName(*args, **kwargs)
 
-FindWindowByName = _core.FindWindowByName
+    def SetId(*args, **kwargs):
+        """SetId(int winid)"""
+        return _core.Window_SetId(*args, **kwargs)
 
-FindWindowByLabel = _core.FindWindowByLabel
+    def GetId(*args, **kwargs):
+        """GetId() -> int"""
+        return _core.Window_GetId(*args, **kwargs)
 
-Window_FromHWND = _core.Window_FromHWND
-#---------------------------------------------------------------------------
+    def NewControlId(*args, **kwargs):
+        """Window.NewControlId() -> int"""
+        return _core.Window_NewControlId(*args, **kwargs)
 
-class Validator(EvtHandler):
-    def __init__(self, *args, **kwargs):
-        newobj = _core.new_Validator(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-        self._setOORInfo(self)
-    def Clone(*args, **kwargs): return _core.Validator_Clone(*args, **kwargs)
-    def Validate(*args, **kwargs): return _core.Validator_Validate(*args, **kwargs)
-    def TransferToWindow(*args, **kwargs): return _core.Validator_TransferToWindow(*args, **kwargs)
-    def TransferFromWindow(*args, **kwargs): return _core.Validator_TransferFromWindow(*args, **kwargs)
-    def GetWindow(*args, **kwargs): return _core.Validator_GetWindow(*args, **kwargs)
-    def SetWindow(*args, **kwargs): return _core.Validator_SetWindow(*args, **kwargs)
-    IsSilent = staticmethod(_core.Validator_IsSilent)
-    SetBellOnError = staticmethod(_core.Validator_SetBellOnError)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxValidator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    NewControlId = staticmethod(NewControlId)
+    def NextControlId(*args, **kwargs):
+        """Window.NextControlId(int winid) -> int"""
+        return _core.Window_NextControlId(*args, **kwargs)
 
-class ValidatorPtr(Validator):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Validator
-_core.Validator_swigregister(ValidatorPtr)
+    NextControlId = staticmethod(NextControlId)
+    def PrevControlId(*args, **kwargs):
+        """Window.PrevControlId(int winid) -> int"""
+        return _core.Window_PrevControlId(*args, **kwargs)
 
-Validator_IsSilent = _core.Validator_IsSilent
+    PrevControlId = staticmethod(PrevControlId)
+    def SetSize(*args, **kwargs):
+        """SetSize(Size size)"""
+        return _core.Window_SetSize(*args, **kwargs)
 
-Validator_SetBellOnError = _core.Validator_SetBellOnError
+    def SetDimensions(*args, **kwargs):
+        """SetDimensions(int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
+        return _core.Window_SetDimensions(*args, **kwargs)
 
-class PyValidator(Validator):
-    def __init__(self, *args, **kwargs):
-        newobj = _core.new_PyValidator(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-        
-        self._setCallbackInfo(self, PyValidator, 1)
-        self._setOORInfo(self)
-    def _setCallbackInfo(*args, **kwargs): return _core.PyValidator__setCallbackInfo(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyValidator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetRect(*args, **kwargs):
+        """SetRect(Rect rect, int sizeFlags=SIZE_AUTO)"""
+        return _core.Window_SetRect(*args, **kwargs)
 
-class PyValidatorPtr(PyValidator):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PyValidator
-_core.PyValidator_swigregister(PyValidatorPtr)
+    def SetSizeWH(*args, **kwargs):
+        """SetSizeWH(int width, int height)"""
+        return _core.Window_SetSizeWH(*args, **kwargs)
 
-#---------------------------------------------------------------------------
+    def Move(*args, **kwargs):
+        """Move(Point pt, int flags=SIZE_USE_EXISTING)"""
+        return _core.Window_Move(*args, **kwargs)
 
-class Menu(EvtHandler):
-    def __init__(self, *args, **kwargs):
-        newobj = _core.new_Menu(*args, **kwargs)
+    SetPosition = Move 
+    def MoveXY(*args, **kwargs):
+        """MoveXY(int x, int y, int flags=SIZE_USE_EXISTING)"""
+        return _core.Window_MoveXY(*args, **kwargs)
+
+    def Raise(*args, **kwargs):
+        """Raise()"""
+        return _core.Window_Raise(*args, **kwargs)
+
+    def Lower(*args, **kwargs):
+        """Lower()"""
+        return _core.Window_Lower(*args, **kwargs)
+
+    def SetClientSize(*args, **kwargs):
+        """SetClientSize(Size size)"""
+        return _core.Window_SetClientSize(*args, **kwargs)
+
+    def SetClientSizeWH(*args, **kwargs):
+        """SetClientSizeWH(int width, int height)"""
+        return _core.Window_SetClientSizeWH(*args, **kwargs)
+
+    def SetClientRect(*args, **kwargs):
+        """SetClientRect(Rect rect)"""
+        return _core.Window_SetClientRect(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point
+
+Get the window's position."""
+        return _core.Window_GetPosition(*args, **kwargs)
+
+    def GetPositionTuple(*args, **kwargs):
+        """GetPositionTuple() -> (x,y)
+
+Get the window's position."""
+        return _core.Window_GetPositionTuple(*args, **kwargs)
+
+    def GetSize(*args, **kwargs):
+        """GetSize() -> Size
+
+Get the window size."""
+        return _core.Window_GetSize(*args, **kwargs)
+
+    def GetSizeTuple(*args, **kwargs):
+        """GetSizeTuple() -> (width, height)
+
+Get the window size."""
+        return _core.Window_GetSizeTuple(*args, **kwargs)
+
+    def GetRect(*args, **kwargs):
+        """GetRect() -> Rect"""
+        return _core.Window_GetRect(*args, **kwargs)
+
+    def GetClientSize(*args, **kwargs):
+        """GetClientSize() -> Size
+
+Get the window's client size."""
+        return _core.Window_GetClientSize(*args, **kwargs)
+
+    def GetClientSizeTuple(*args, **kwargs):
+        """GetClientSizeTuple() -> (width, height)
+
+Get the window's client size."""
+        return _core.Window_GetClientSizeTuple(*args, **kwargs)
+
+    def GetClientAreaOrigin(*args, **kwargs):
+        """GetClientAreaOrigin() -> Point"""
+        return _core.Window_GetClientAreaOrigin(*args, **kwargs)
+
+    def GetClientRect(*args, **kwargs):
+        """GetClientRect() -> Rect"""
+        return _core.Window_GetClientRect(*args, **kwargs)
+
+    def GetBestSize(*args, **kwargs):
+        """GetBestSize() -> Size
+
+Get the size best suited for the window (in fact, minimal acceptable size
+using which it will still look "nice")"""
+        return _core.Window_GetBestSize(*args, **kwargs)
+
+    def GetBestSizeTuple(*args, **kwargs):
+        """GetBestSizeTuple() -> (width, height)
+
+Get the size best suited for the window (in fact, minimal acceptable size
+using which it will still look "nice")"""
+        return _core.Window_GetBestSizeTuple(*args, **kwargs)
+
+    def GetAdjustedBestSize(*args, **kwargs):
+        """GetAdjustedBestSize() -> Size"""
+        return _core.Window_GetAdjustedBestSize(*args, **kwargs)
+
+    def Center(*args, **kwargs):
+        """Center(int direction=BOTH)"""
+        return _core.Window_Center(*args, **kwargs)
+
+    Centre = Center 
+    def CenterOnScreen(*args, **kwargs):
+        """CenterOnScreen(int dir=BOTH)"""
+        return _core.Window_CenterOnScreen(*args, **kwargs)
+
+    CentreOnScreen = CenterOnScreen 
+    def CenterOnParent(*args, **kwargs):
+        """CenterOnParent(int dir=BOTH)"""
+        return _core.Window_CenterOnParent(*args, **kwargs)
+
+    CentreOnParent = CenterOnParent 
+    def Fit(*args, **kwargs):
+        """Fit()"""
+        return _core.Window_Fit(*args, **kwargs)
+
+    def FitInside(*args, **kwargs):
+        """FitInside()"""
+        return _core.Window_FitInside(*args, **kwargs)
+
+    def SetSizeHints(*args, **kwargs):
+        """SetSizeHints(int minW, int minH, int maxW=-1, int maxH=-1, int incW=-1, 
+    int incH=-1)"""
+        return _core.Window_SetSizeHints(*args, **kwargs)
+
+    def SetVirtualSizeHints(*args, **kwargs):
+        """SetVirtualSizeHints(int minW, int minH, int maxW=-1, int maxH=-1)"""
+        return _core.Window_SetVirtualSizeHints(*args, **kwargs)
+
+    def GetMinWidth(*args, **kwargs):
+        """GetMinWidth() -> int"""
+        return _core.Window_GetMinWidth(*args, **kwargs)
+
+    def GetMinHeight(*args, **kwargs):
+        """GetMinHeight() -> int"""
+        return _core.Window_GetMinHeight(*args, **kwargs)
+
+    def GetMaxWidth(*args, **kwargs):
+        """GetMaxWidth() -> int"""
+        return _core.Window_GetMaxWidth(*args, **kwargs)
+
+    def GetMaxHeight(*args, **kwargs):
+        """GetMaxHeight() -> int"""
+        return _core.Window_GetMaxHeight(*args, **kwargs)
+
+    def GetMaxSize(*args, **kwargs):
+        """GetMaxSize() -> Size"""
+        return _core.Window_GetMaxSize(*args, **kwargs)
+
+    def SetVirtualSize(*args, **kwargs):
+        """SetVirtualSize(Size size)
+
+Set the the virtual size of a window.  For most windows this is just the
+client area of the window, but for some like scrolled windows it is more or
+less independent of the screen window size."""
+        return _core.Window_SetVirtualSize(*args, **kwargs)
+
+    def SetVirtualSizeWH(*args, **kwargs):
+        """SetVirtualSizeWH(int w, int h)
+
+Set the the virtual size of a window.  For most windows this is just the
+client area of the window, but for some like scrolled windows it is more or
+less independent of the screen window size."""
+        return _core.Window_SetVirtualSizeWH(*args, **kwargs)
+
+    def GetVirtualSize(*args, **kwargs):
+        """GetVirtualSize() -> Size
+
+Get the the virtual size of the window.  For most windows this is just
+the client area of the window, but for some like scrolled windows it is
+more or less independent of the screen window size."""
+        return _core.Window_GetVirtualSize(*args, **kwargs)
+
+    def GetVirtualSizeTuple(*args, **kwargs):
+        """GetVirtualSizeTuple() -> (width, height)
+
+Get the the virtual size of the window.  For most windows this is just
+the client area of the window, but for some like scrolled windows it is
+more or less independent of the screen window size."""
+        return _core.Window_GetVirtualSizeTuple(*args, **kwargs)
+
+    def GetBestVirtualSize(*args, **kwargs):
+        """GetBestVirtualSize() -> Size"""
+        return _core.Window_GetBestVirtualSize(*args, **kwargs)
+
+    def Show(*args, **kwargs):
+        """Show(bool show=True) -> bool"""
+        return _core.Window_Show(*args, **kwargs)
+
+    def Hide(*args, **kwargs):
+        """Hide() -> bool"""
+        return _core.Window_Hide(*args, **kwargs)
+
+    def Enable(*args, **kwargs):
+        """Enable(bool enable=True) -> bool"""
+        return _core.Window_Enable(*args, **kwargs)
+
+    def Disable(*args, **kwargs):
+        """Disable() -> bool"""
+        return _core.Window_Disable(*args, **kwargs)
+
+    def IsShown(*args, **kwargs):
+        """IsShown() -> bool"""
+        return _core.Window_IsShown(*args, **kwargs)
+
+    def IsEnabled(*args, **kwargs):
+        """IsEnabled() -> bool"""
+        return _core.Window_IsEnabled(*args, **kwargs)
+
+    def SetWindowStyleFlag(*args, **kwargs):
+        """SetWindowStyleFlag(long style)"""
+        return _core.Window_SetWindowStyleFlag(*args, **kwargs)
+
+    def GetWindowStyleFlag(*args, **kwargs):
+        """GetWindowStyleFlag() -> long"""
+        return _core.Window_GetWindowStyleFlag(*args, **kwargs)
+
+    def SetWindowStyle(*args, **kwargs):
+        """SetWindowStyle(long style)"""
+        return _core.Window_SetWindowStyle(*args, **kwargs)
+
+    def GetWindowStyle(*args, **kwargs):
+        """GetWindowStyle() -> long"""
+        return _core.Window_GetWindowStyle(*args, **kwargs)
+
+    def HasFlag(*args, **kwargs):
+        """HasFlag(int flag) -> bool"""
+        return _core.Window_HasFlag(*args, **kwargs)
+
+    def IsRetained(*args, **kwargs):
+        """IsRetained() -> bool"""
+        return _core.Window_IsRetained(*args, **kwargs)
+
+    def SetExtraStyle(*args, **kwargs):
+        """SetExtraStyle(long exStyle)"""
+        return _core.Window_SetExtraStyle(*args, **kwargs)
+
+    def GetExtraStyle(*args, **kwargs):
+        """GetExtraStyle() -> long"""
+        return _core.Window_GetExtraStyle(*args, **kwargs)
+
+    def MakeModal(*args, **kwargs):
+        """MakeModal(bool modal=True)"""
+        return _core.Window_MakeModal(*args, **kwargs)
+
+    def SetThemeEnabled(*args, **kwargs):
+        """SetThemeEnabled(bool enableTheme)"""
+        return _core.Window_SetThemeEnabled(*args, **kwargs)
+
+    def GetThemeEnabled(*args, **kwargs):
+        """GetThemeEnabled() -> bool"""
+        return _core.Window_GetThemeEnabled(*args, **kwargs)
+
+    def ShouldInheritColours(*args, **kwargs):
+        """ShouldInheritColours() -> bool"""
+        return _core.Window_ShouldInheritColours(*args, **kwargs)
+
+    def SetFocus(*args, **kwargs):
+        """SetFocus()"""
+        return _core.Window_SetFocus(*args, **kwargs)
+
+    def SetFocusFromKbd(*args, **kwargs):
+        """SetFocusFromKbd()"""
+        return _core.Window_SetFocusFromKbd(*args, **kwargs)
+
+    def FindFocus(*args, **kwargs):
+        """Window.FindFocus() -> Window"""
+        return _core.Window_FindFocus(*args, **kwargs)
+
+    FindFocus = staticmethod(FindFocus)
+    def AcceptsFocus(*args, **kwargs):
+        """AcceptsFocus() -> bool"""
+        return _core.Window_AcceptsFocus(*args, **kwargs)
+
+    def AcceptsFocusFromKeyboard(*args, **kwargs):
+        """AcceptsFocusFromKeyboard() -> bool"""
+        return _core.Window_AcceptsFocusFromKeyboard(*args, **kwargs)
+
+    def GetDefaultItem(*args, **kwargs):
+        """GetDefaultItem() -> Window"""
+        return _core.Window_GetDefaultItem(*args, **kwargs)
+
+    def SetDefaultItem(*args, **kwargs):
+        """SetDefaultItem(Window child) -> Window"""
+        return _core.Window_SetDefaultItem(*args, **kwargs)
+
+    def SetTmpDefaultItem(*args, **kwargs):
+        """SetTmpDefaultItem(Window win)"""
+        return _core.Window_SetTmpDefaultItem(*args, **kwargs)
+
+    def GetChildren(*args, **kwargs):
+        """GetChildren() -> PyObject"""
+        return _core.Window_GetChildren(*args, **kwargs)
+
+    def GetParent(*args, **kwargs):
+        """GetParent() -> Window"""
+        return _core.Window_GetParent(*args, **kwargs)
+
+    def GetGrandParent(*args, **kwargs):
+        """GetGrandParent() -> Window"""
+        return _core.Window_GetGrandParent(*args, **kwargs)
+
+    def IsTopLevel(*args, **kwargs):
+        """IsTopLevel() -> bool"""
+        return _core.Window_IsTopLevel(*args, **kwargs)
+
+    def Reparent(*args, **kwargs):
+        """Reparent(Window newParent) -> bool"""
+        return _core.Window_Reparent(*args, **kwargs)
+
+    def AddChild(*args, **kwargs):
+        """AddChild(Window child)"""
+        return _core.Window_AddChild(*args, **kwargs)
+
+    def RemoveChild(*args, **kwargs):
+        """RemoveChild(Window child)"""
+        return _core.Window_RemoveChild(*args, **kwargs)
+
+    def FindWindowById(*args, **kwargs):
+        """FindWindowById(long winid) -> Window"""
+        return _core.Window_FindWindowById(*args, **kwargs)
+
+    def FindWindowByName(*args, **kwargs):
+        """FindWindowByName(wxString name) -> Window"""
+        return _core.Window_FindWindowByName(*args, **kwargs)
+
+    def GetEventHandler(*args, **kwargs):
+        """GetEventHandler() -> EvtHandler"""
+        return _core.Window_GetEventHandler(*args, **kwargs)
+
+    def SetEventHandler(*args, **kwargs):
+        """SetEventHandler(EvtHandler handler)"""
+        return _core.Window_SetEventHandler(*args, **kwargs)
+
+    def PushEventHandler(*args, **kwargs):
+        """PushEventHandler(EvtHandler handler)"""
+        return _core.Window_PushEventHandler(*args, **kwargs)
+
+    def PopEventHandler(*args, **kwargs):
+        """PopEventHandler(bool deleteHandler=False) -> EvtHandler"""
+        return _core.Window_PopEventHandler(*args, **kwargs)
+
+    def RemoveEventHandler(*args, **kwargs):
+        """RemoveEventHandler(EvtHandler handler) -> bool"""
+        return _core.Window_RemoveEventHandler(*args, **kwargs)
+
+    def SetValidator(*args, **kwargs):
+        """SetValidator(Validator validator)"""
+        return _core.Window_SetValidator(*args, **kwargs)
+
+    def GetValidator(*args, **kwargs):
+        """GetValidator() -> Validator"""
+        return _core.Window_GetValidator(*args, **kwargs)
+
+    def SetAcceleratorTable(*args, **kwargs):
+        """SetAcceleratorTable(wxAcceleratorTable accel)"""
+        return _core.Window_SetAcceleratorTable(*args, **kwargs)
+
+    def GetAcceleratorTable(*args, **kwargs):
+        """GetAcceleratorTable() -> wxAcceleratorTable"""
+        return _core.Window_GetAcceleratorTable(*args, **kwargs)
+
+    def RegisterHotKey(*args, **kwargs):
+        """RegisterHotKey(int hotkeyId, int modifiers, int keycode) -> bool"""
+        return _core.Window_RegisterHotKey(*args, **kwargs)
+
+    def UnregisterHotKey(*args, **kwargs):
+        """UnregisterHotKey(int hotkeyId) -> bool"""
+        return _core.Window_UnregisterHotKey(*args, **kwargs)
+
+    def ConvertDialogPointToPixels(*args, **kwargs):
+        """ConvertDialogPointToPixels(Point pt) -> Point"""
+        return _core.Window_ConvertDialogPointToPixels(*args, **kwargs)
+
+    def ConvertDialogSizeToPixels(*args, **kwargs):
+        """ConvertDialogSizeToPixels(Size sz) -> Size"""
+        return _core.Window_ConvertDialogSizeToPixels(*args, **kwargs)
+
+    def DLG_PNT(*args, **kwargs):
+        """DLG_PNT(Point pt) -> Point"""
+        return _core.Window_DLG_PNT(*args, **kwargs)
+
+    def DLG_SZE(*args, **kwargs):
+        """DLG_SZE(Size sz) -> Size"""
+        return _core.Window_DLG_SZE(*args, **kwargs)
+
+    def ConvertPixelPointToDialog(*args, **kwargs):
+        """ConvertPixelPointToDialog(Point pt) -> Point"""
+        return _core.Window_ConvertPixelPointToDialog(*args, **kwargs)
+
+    def ConvertPixelSizeToDialog(*args, **kwargs):
+        """ConvertPixelSizeToDialog(Size sz) -> Size"""
+        return _core.Window_ConvertPixelSizeToDialog(*args, **kwargs)
+
+    def WarpPointer(*args, **kwargs):
+        """WarpPointer(int x, int y)"""
+        return _core.Window_WarpPointer(*args, **kwargs)
+
+    def CaptureMouse(*args, **kwargs):
+        """CaptureMouse()"""
+        return _core.Window_CaptureMouse(*args, **kwargs)
+
+    def ReleaseMouse(*args, **kwargs):
+        """ReleaseMouse()"""
+        return _core.Window_ReleaseMouse(*args, **kwargs)
+
+    def GetCapture(*args, **kwargs):
+        """Window.GetCapture() -> Window"""
+        return _core.Window_GetCapture(*args, **kwargs)
+
+    GetCapture = staticmethod(GetCapture)
+    def HasCapture(*args, **kwargs):
+        """HasCapture() -> bool"""
+        return _core.Window_HasCapture(*args, **kwargs)
+
+    def Refresh(*args, **kwargs):
+        """Refresh(bool eraseBackground=True, Rect rect=None)"""
+        return _core.Window_Refresh(*args, **kwargs)
+
+    def RefreshRect(*args, **kwargs):
+        """RefreshRect(Rect rect)"""
+        return _core.Window_RefreshRect(*args, **kwargs)
+
+    def Update(*args, **kwargs):
+        """Update()"""
+        return _core.Window_Update(*args, **kwargs)
+
+    def ClearBackground(*args, **kwargs):
+        """ClearBackground()"""
+        return _core.Window_ClearBackground(*args, **kwargs)
+
+    def Freeze(*args, **kwargs):
+        """Freeze()"""
+        return _core.Window_Freeze(*args, **kwargs)
+
+    def Thaw(*args, **kwargs):
+        """Thaw()"""
+        return _core.Window_Thaw(*args, **kwargs)
+
+    def PrepareDC(*args, **kwargs):
+        """PrepareDC(wxDC dc)"""
+        return _core.Window_PrepareDC(*args, **kwargs)
+
+    def GetUpdateRegion(*args, **kwargs):
+        """GetUpdateRegion() -> wxRegion"""
+        return _core.Window_GetUpdateRegion(*args, **kwargs)
+
+    def GetUpdateClientRect(*args, **kwargs):
+        """GetUpdateClientRect() -> Rect"""
+        return _core.Window_GetUpdateClientRect(*args, **kwargs)
+
+    def IsExposed(*args, **kwargs):
+        """IsExposed(int x, int y, int w=1, int h=1) -> bool"""
+        return _core.Window_IsExposed(*args, **kwargs)
+
+    def IsExposedPoint(*args, **kwargs):
+        """IsExposedPoint(Point pt) -> bool"""
+        return _core.Window_IsExposedPoint(*args, **kwargs)
+
+    def isExposedRect(*args, **kwargs):
+        """isExposedRect(Rect rect) -> bool"""
+        return _core.Window_isExposedRect(*args, **kwargs)
+
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(wxColour colour) -> bool"""
+        return _core.Window_SetBackgroundColour(*args, **kwargs)
+
+    def SetForegroundColour(*args, **kwargs):
+        """SetForegroundColour(wxColour colour) -> bool"""
+        return _core.Window_SetForegroundColour(*args, **kwargs)
+
+    def GetBackgroundColour(*args, **kwargs):
+        """GetBackgroundColour() -> wxColour"""
+        return _core.Window_GetBackgroundColour(*args, **kwargs)
+
+    def GetForegroundColour(*args, **kwargs):
+        """GetForegroundColour() -> wxColour"""
+        return _core.Window_GetForegroundColour(*args, **kwargs)
+
+    def SetCursor(*args, **kwargs):
+        """SetCursor(wxCursor cursor) -> bool"""
+        return _core.Window_SetCursor(*args, **kwargs)
+
+    def GetCursor(*args, **kwargs):
+        """GetCursor() -> wxCursor"""
+        return _core.Window_GetCursor(*args, **kwargs)
+
+    def SetFont(*args, **kwargs):
+        """SetFont(wxFont font) -> bool"""
+        return _core.Window_SetFont(*args, **kwargs)
+
+    def GetFont(*args, **kwargs):
+        """GetFont() -> wxFont"""
+        return _core.Window_GetFont(*args, **kwargs)
+
+    def SetCaret(*args, **kwargs):
+        """SetCaret(wxCaret caret)"""
+        return _core.Window_SetCaret(*args, **kwargs)
+
+    def GetCaret(*args, **kwargs):
+        """GetCaret() -> wxCaret"""
+        return _core.Window_GetCaret(*args, **kwargs)
+
+    def GetCharHeight(*args, **kwargs):
+        """GetCharHeight() -> int"""
+        return _core.Window_GetCharHeight(*args, **kwargs)
+
+    def GetCharWidth(*args, **kwargs):
+        """GetCharWidth() -> int"""
+        return _core.Window_GetCharWidth(*args, **kwargs)
+
+    def GetTextExtent(*args, **kwargs):
+        """GetTextExtent(wxString string) -> (width, height)
+
+Get the width and height of the text using the current font."""
+        return _core.Window_GetTextExtent(*args, **kwargs)
+
+    def GetFullTextExtent(*args, **kwargs):
+        """GetFullTextExtent(wxString string, Font font=None) ->
+   (width, height, descent, externalLeading)
+
+Get the width, height, decent and leading of the text using the current or specified font."""
+        return _core.Window_GetFullTextExtent(*args, **kwargs)
+
+    def ClientToScreenXY(*args, **kwargs):
+        """ClientToScreenXY(int x, int y)"""
+        return _core.Window_ClientToScreenXY(*args, **kwargs)
+
+    def ScreenToClientXY(*args, **kwargs):
+        """ScreenToClientXY(int x, int y)"""
+        return _core.Window_ScreenToClientXY(*args, **kwargs)
+
+    def ClientToScreen(*args, **kwargs):
+        """ClientToScreen(Point pt) -> Point"""
+        return _core.Window_ClientToScreen(*args, **kwargs)
+
+    def ScreenToClient(*args, **kwargs):
+        """ScreenToClient(Point pt) -> Point"""
+        return _core.Window_ScreenToClient(*args, **kwargs)
+
+    def HitTestXY(*args, **kwargs):
+        """HitTestXY(int x, int y) -> wxHitTest"""
+        return _core.Window_HitTestXY(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """HitTest(Point pt) -> wxHitTest"""
+        return _core.Window_HitTest(*args, **kwargs)
+
+    def GetBorderFlags(*args, **kwargs):
+        """GetBorderFlags(long flags) -> wxBorder"""
+        return _core.Window_GetBorderFlags(*args, **kwargs)
+
+    def GetBorder(*args, **kwargs):
+        """GetBorder() -> wxBorder"""
+        return _core.Window_GetBorder(*args, **kwargs)
+
+    def UpdateWindowUI(*args, **kwargs):
+        """UpdateWindowUI(long flags=UPDATE_UI_NONE)"""
+        return _core.Window_UpdateWindowUI(*args, **kwargs)
+
+    def PopupMenuXY(*args, **kwargs):
+        """PopupMenuXY(Menu menu, int x, int y) -> bool"""
+        return _core.Window_PopupMenuXY(*args, **kwargs)
+
+    def PopupMenu(*args, **kwargs):
+        """PopupMenu(Menu menu, Point pos) -> bool"""
+        return _core.Window_PopupMenu(*args, **kwargs)
+
+    def GetHandle(*args, **kwargs):
+        """GetHandle() -> long"""
+        return _core.Window_GetHandle(*args, **kwargs)
+
+    def HasScrollbar(*args, **kwargs):
+        """HasScrollbar(int orient) -> bool"""
+        return _core.Window_HasScrollbar(*args, **kwargs)
+
+    def SetScrollbar(*args, **kwargs):
+        """SetScrollbar(int orient, int pos, int thumbvisible, int range, bool refresh=True)"""
+        return _core.Window_SetScrollbar(*args, **kwargs)
+
+    def SetScrollPos(*args, **kwargs):
+        """SetScrollPos(int orient, int pos, bool refresh=True)"""
+        return _core.Window_SetScrollPos(*args, **kwargs)
+
+    def GetScrollPos(*args, **kwargs):
+        """GetScrollPos(int orient) -> int"""
+        return _core.Window_GetScrollPos(*args, **kwargs)
+
+    def GetScrollThumb(*args, **kwargs):
+        """GetScrollThumb(int orient) -> int"""
+        return _core.Window_GetScrollThumb(*args, **kwargs)
+
+    def GetScrollRange(*args, **kwargs):
+        """GetScrollRange(int orient) -> int"""
+        return _core.Window_GetScrollRange(*args, **kwargs)
+
+    def ScrollWindow(*args, **kwargs):
+        """ScrollWindow(int dx, int dy, Rect rect=None)"""
+        return _core.Window_ScrollWindow(*args, **kwargs)
+
+    def ScrollLines(*args, **kwargs):
+        """ScrollLines(int lines) -> bool"""
+        return _core.Window_ScrollLines(*args, **kwargs)
+
+    def ScrollPages(*args, **kwargs):
+        """ScrollPages(int pages) -> bool"""
+        return _core.Window_ScrollPages(*args, **kwargs)
+
+    def LineUp(*args, **kwargs):
+        """LineUp() -> bool"""
+        return _core.Window_LineUp(*args, **kwargs)
+
+    def LineDown(*args, **kwargs):
+        """LineDown() -> bool"""
+        return _core.Window_LineDown(*args, **kwargs)
+
+    def PageUp(*args, **kwargs):
+        """PageUp() -> bool"""
+        return _core.Window_PageUp(*args, **kwargs)
+
+    def PageDown(*args, **kwargs):
+        """PageDown() -> bool"""
+        return _core.Window_PageDown(*args, **kwargs)
+
+    def SetHelpText(*args, **kwargs):
+        """SetHelpText(wxString text)"""
+        return _core.Window_SetHelpText(*args, **kwargs)
+
+    def SetHelpTextForId(*args, **kwargs):
+        """SetHelpTextForId(wxString text)"""
+        return _core.Window_SetHelpTextForId(*args, **kwargs)
+
+    def GetHelpText(*args, **kwargs):
+        """GetHelpText() -> wxString"""
+        return _core.Window_GetHelpText(*args, **kwargs)
+
+    def SetToolTipString(*args, **kwargs):
+        """SetToolTipString(wxString tip)"""
+        return _core.Window_SetToolTipString(*args, **kwargs)
+
+    def SetToolTip(*args, **kwargs):
+        """SetToolTip(wxToolTip tip)"""
+        return _core.Window_SetToolTip(*args, **kwargs)
+
+    def GetToolTip(*args, **kwargs):
+        """GetToolTip() -> wxToolTip"""
+        return _core.Window_GetToolTip(*args, **kwargs)
+
+    def SetDropTarget(*args, **kwargs):
+        """SetDropTarget(wxDropTarget dropTarget)"""
+        val = _core.Window_SetDropTarget(*args, **kwargs)
+        args[1].thisown = 0
+        return val
+
+    def GetDropTarget(*args, **kwargs):
+        """GetDropTarget() -> wxDropTarget"""
+        return _core.Window_GetDropTarget(*args, **kwargs)
+
+    def SetConstraints(*args, **kwargs):
+        """SetConstraints(LayoutConstraints constraints)"""
+        return _core.Window_SetConstraints(*args, **kwargs)
+
+    def GetConstraints(*args, **kwargs):
+        """GetConstraints() -> LayoutConstraints"""
+        return _core.Window_GetConstraints(*args, **kwargs)
+
+    def SetAutoLayout(*args, **kwargs):
+        """SetAutoLayout(bool autoLayout)"""
+        return _core.Window_SetAutoLayout(*args, **kwargs)
+
+    def GetAutoLayout(*args, **kwargs):
+        """GetAutoLayout() -> bool"""
+        return _core.Window_GetAutoLayout(*args, **kwargs)
+
+    def Layout(*args, **kwargs):
+        """Layout() -> bool"""
+        return _core.Window_Layout(*args, **kwargs)
+
+    def SetSizer(*args, **kwargs):
+        """SetSizer(Sizer sizer, bool deleteOld=True)"""
+        return _core.Window_SetSizer(*args, **kwargs)
+
+    def SetSizerAndFit(*args, **kwargs):
+        """SetSizerAndFit(Sizer sizer, bool deleteOld=True)"""
+        return _core.Window_SetSizerAndFit(*args, **kwargs)
+
+    def GetSizer(*args, **kwargs):
+        """GetSizer() -> Sizer"""
+        return _core.Window_GetSizer(*args, **kwargs)
+
+    def SetContainingSizer(*args, **kwargs):
+        """SetContainingSizer(Sizer sizer)"""
+        return _core.Window_SetContainingSizer(*args, **kwargs)
+
+    def GetContainingSizer(*args, **kwargs):
+        """GetContainingSizer() -> Sizer"""
+        return _core.Window_GetContainingSizer(*args, **kwargs)
+
+    def PostCreate(self, pre):
+        """Phase 3 of the 2-phase create <wink!>
+           Call this method after precreating the window with the 2-phase create method."""
+        self.this = pre.this
+        self.thisown = pre.thisown
+        pre.thisown = 0
+        if hasattr(self, '_setOORInfo'):
+            self._setOORInfo(self)
+        if hasattr(self, '_setCallbackInfo'):
+            self._setCallbackInfo(self, self.__class__)
+
+
+class WindowPtr(Window):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = Window
+_core.Window_swigregister(WindowPtr)
+PanelNameStr = cvar.PanelNameStr
+
+def PreWindow(*args, **kwargs):
+    """PreWindow() -> Window"""
+    val = _core.new_PreWindow(*args, **kwargs)
+    val.thisown = 1
+    return val
+
+def Window_NewControlId(*args, **kwargs):
+    """Window_NewControlId() -> int"""
+    return _core.Window_NewControlId(*args, **kwargs)
+
+def Window_NextControlId(*args, **kwargs):
+    """Window_NextControlId(int winid) -> int"""
+    return _core.Window_NextControlId(*args, **kwargs)
+
+def Window_PrevControlId(*args, **kwargs):
+    """Window_PrevControlId(int winid) -> int"""
+    return _core.Window_PrevControlId(*args, **kwargs)
+
+def Window_FindFocus(*args, **kwargs):
+    """Window_FindFocus() -> Window"""
+    return _core.Window_FindFocus(*args, **kwargs)
+
+def Window_GetCapture(*args, **kwargs):
+    """Window_GetCapture() -> Window"""
+    return _core.Window_GetCapture(*args, **kwargs)
+
+def DLG_PNT(win, point_or_x, y=None):
+    if y is None:
+        return win.ConvertDialogPointToPixels(point_or_x)
+    else:
+        return win.ConvertDialogPointToPixels(wxPoint(point_or_x, y))
+
+def DLG_SZE(win, size_width, height=None):
+    if height is None:
+        return win.ConvertDialogSizeToPixels(size_width)
+    else:
+        return win.ConvertDialogSizeToPixels(wxSize(size_width, height))
+
+
+def FindWindowById(*args, **kwargs):
+    """FindWindowById(long id, Window parent=None) -> Window"""
+    return _core.FindWindowById(*args, **kwargs)
+
+def FindWindowByName(*args, **kwargs):
+    """FindWindowByName(wxString name, Window parent=None) -> Window"""
+    return _core.FindWindowByName(*args, **kwargs)
+
+def FindWindowByLabel(*args, **kwargs):
+    """FindWindowByLabel(wxString label, Window parent=None) -> Window"""
+    return _core.FindWindowByLabel(*args, **kwargs)
+
+def Window_FromHWND(*args, **kwargs):
+    """Window_FromHWND(unsigned long hWnd) -> Window"""
+    return _core.Window_FromHWND(*args, **kwargs)
+#---------------------------------------------------------------------------
+
+class Validator(EvtHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxValidator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__() -> Validator"""
+        newobj = _core.new_Validator(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Append(*args, **kwargs): return _core.Menu_Append(*args, **kwargs)
-    def AppendSeparator(*args, **kwargs): return _core.Menu_AppendSeparator(*args, **kwargs)
-    def AppendCheckItem(*args, **kwargs): return _core.Menu_AppendCheckItem(*args, **kwargs)
-    def AppendRadioItem(*args, **kwargs): return _core.Menu_AppendRadioItem(*args, **kwargs)
-    def AppendMenu(*args, **kwargs): return _core.Menu_AppendMenu(*args, **kwargs)
-    def AppendItem(*args, **kwargs): return _core.Menu_AppendItem(*args, **kwargs)
-    def Break(*args, **kwargs): return _core.Menu_Break(*args, **kwargs)
-    def InsertItem(*args, **kwargs): return _core.Menu_InsertItem(*args, **kwargs)
-    def Insert(*args, **kwargs): return _core.Menu_Insert(*args, **kwargs)
-    def InsertSeparator(*args, **kwargs): return _core.Menu_InsertSeparator(*args, **kwargs)
-    def InsertCheckItem(*args, **kwargs): return _core.Menu_InsertCheckItem(*args, **kwargs)
-    def InsertRadioItem(*args, **kwargs): return _core.Menu_InsertRadioItem(*args, **kwargs)
-    def InsertMenu(*args, **kwargs): return _core.Menu_InsertMenu(*args, **kwargs)
-    def PrependItem(*args, **kwargs): return _core.Menu_PrependItem(*args, **kwargs)
-    def Prepend(*args, **kwargs): return _core.Menu_Prepend(*args, **kwargs)
-    def PrependSeparator(*args, **kwargs): return _core.Menu_PrependSeparator(*args, **kwargs)
-    def PrependCheckItem(*args, **kwargs): return _core.Menu_PrependCheckItem(*args, **kwargs)
-    def PrependRadioItem(*args, **kwargs): return _core.Menu_PrependRadioItem(*args, **kwargs)
-    def PrependMenu(*args, **kwargs): return _core.Menu_PrependMenu(*args, **kwargs)
-    def Remove(*args, **kwargs): return _core.Menu_Remove(*args, **kwargs)
-    def RemoveItem(*args, **kwargs): return _core.Menu_RemoveItem(*args, **kwargs)
-    def Delete(*args, **kwargs): return _core.Menu_Delete(*args, **kwargs)
-    def DeleteItem(*args, **kwargs): return _core.Menu_DeleteItem(*args, **kwargs)
-    def Destroy(*args, **kwargs): return _core.Menu_Destroy(*args, **kwargs)
-    def DestroyId(*args, **kwargs): return _core.Menu_DestroyId(*args, **kwargs)
-    def DestroyItem(*args, **kwargs): return _core.Menu_DestroyItem(*args, **kwargs)
-    def GetMenuItemCount(*args, **kwargs): return _core.Menu_GetMenuItemCount(*args, **kwargs)
-    def GetMenuItems(*args, **kwargs): return _core.Menu_GetMenuItems(*args, **kwargs)
-    def FindItem(*args, **kwargs): return _core.Menu_FindItem(*args, **kwargs)
-    def FindItemById(*args, **kwargs): return _core.Menu_FindItemById(*args, **kwargs)
-    def FindItemByPosition(*args, **kwargs): return _core.Menu_FindItemByPosition(*args, **kwargs)
-    def Enable(*args, **kwargs): return _core.Menu_Enable(*args, **kwargs)
-    def IsEnabled(*args, **kwargs): return _core.Menu_IsEnabled(*args, **kwargs)
-    def Check(*args, **kwargs): return _core.Menu_Check(*args, **kwargs)
-    def IsChecked(*args, **kwargs): return _core.Menu_IsChecked(*args, **kwargs)
-    def SetLabel(*args, **kwargs): return _core.Menu_SetLabel(*args, **kwargs)
-    def GetLabel(*args, **kwargs): return _core.Menu_GetLabel(*args, **kwargs)
-    def SetHelpString(*args, **kwargs): return _core.Menu_SetHelpString(*args, **kwargs)
-    def GetHelpString(*args, **kwargs): return _core.Menu_GetHelpString(*args, **kwargs)
-    def SetTitle(*args, **kwargs): return _core.Menu_SetTitle(*args, **kwargs)
-    def GetTitle(*args, **kwargs): return _core.Menu_GetTitle(*args, **kwargs)
-    def SetEventHandler(*args, **kwargs): return _core.Menu_SetEventHandler(*args, **kwargs)
-    def GetEventHandler(*args, **kwargs): return _core.Menu_GetEventHandler(*args, **kwargs)
-    def SetInvokingWindow(*args, **kwargs): return _core.Menu_SetInvokingWindow(*args, **kwargs)
-    def GetInvokingWindow(*args, **kwargs): return _core.Menu_GetInvokingWindow(*args, **kwargs)
-    def GetStyle(*args, **kwargs): return _core.Menu_GetStyle(*args, **kwargs)
-    def UpdateUI(*args, **kwargs): return _core.Menu_UpdateUI(*args, **kwargs)
-    def GetMenuBar(*args, **kwargs): return _core.Menu_GetMenuBar(*args, **kwargs)
-    def Attach(*args, **kwargs): return _core.Menu_Attach(*args, **kwargs)
-    def Detach(*args, **kwargs): return _core.Menu_Detach(*args, **kwargs)
-    def IsAttached(*args, **kwargs): return _core.Menu_IsAttached(*args, **kwargs)
-    def SetParent(*args, **kwargs): return _core.Menu_SetParent(*args, **kwargs)
-    def GetParent(*args, **kwargs): return _core.Menu_GetParent(*args, **kwargs)
+
+    def Clone(*args, **kwargs):
+        """Clone() -> Validator"""
+        return _core.Validator_Clone(*args, **kwargs)
+
+    def Validate(*args, **kwargs):
+        """Validate(Window parent) -> bool"""
+        return _core.Validator_Validate(*args, **kwargs)
+
+    def TransferToWindow(*args, **kwargs):
+        """TransferToWindow() -> bool"""
+        return _core.Validator_TransferToWindow(*args, **kwargs)
+
+    def TransferFromWindow(*args, **kwargs):
+        """TransferFromWindow() -> bool"""
+        return _core.Validator_TransferFromWindow(*args, **kwargs)
+
+    def GetWindow(*args, **kwargs):
+        """GetWindow() -> Window"""
+        return _core.Validator_GetWindow(*args, **kwargs)
+
+    def SetWindow(*args, **kwargs):
+        """SetWindow(Window window)"""
+        return _core.Validator_SetWindow(*args, **kwargs)
+
+    def IsSilent(*args, **kwargs):
+        """Validator.IsSilent() -> bool"""
+        return _core.Validator_IsSilent(*args, **kwargs)
+
+    IsSilent = staticmethod(IsSilent)
+    def SetBellOnError(*args, **kwargs):
+        """Validator.SetBellOnError(int doIt=True)"""
+        return _core.Validator_SetBellOnError(*args, **kwargs)
+
+    SetBellOnError = staticmethod(SetBellOnError)
+
+class ValidatorPtr(Validator):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = Validator
+_core.Validator_swigregister(ValidatorPtr)
+
+def Validator_IsSilent(*args, **kwargs):
+    """Validator_IsSilent() -> bool"""
+    return _core.Validator_IsSilent(*args, **kwargs)
+
+def Validator_SetBellOnError(*args, **kwargs):
+    """Validator_SetBellOnError(int doIt=True)"""
+    return _core.Validator_SetBellOnError(*args, **kwargs)
+
+class PyValidator(Validator):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyValidator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__() -> PyValidator"""
+        newobj = _core.new_PyValidator(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        
+        self._setCallbackInfo(self, PyValidator, 1)
+        self._setOORInfo(self)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class, int incref=True)"""
+        return _core.PyValidator__setCallbackInfo(*args, **kwargs)
+
+
+class PyValidatorPtr(PyValidator):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyValidator
+_core.PyValidator_swigregister(PyValidatorPtr)
+
+#---------------------------------------------------------------------------
+
+class Menu(EvtHandler):
+    """"""
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMenu instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(wxString title=wxPyEmptyString, long style=0) -> Menu"""
+        newobj = _core.new_Menu(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORInfo(self)
+
+    def Append(*args, **kwargs):
+        """Append(int itemid, wxString text, wxString help=wxPyEmptyString, 
+    wxItemKind kind=ITEM_NORMAL)"""
+        return _core.Menu_Append(*args, **kwargs)
+
+    def AppendSeparator(*args, **kwargs):
+        """AppendSeparator()"""
+        return _core.Menu_AppendSeparator(*args, **kwargs)
+
+    def AppendCheckItem(*args, **kwargs):
+        """AppendCheckItem(int itemid, wxString text, wxString help=wxPyEmptyString)"""
+        return _core.Menu_AppendCheckItem(*args, **kwargs)
+
+    def AppendRadioItem(*args, **kwargs):
+        """AppendRadioItem(int itemid, wxString text, wxString help=wxPyEmptyString)"""
+        return _core.Menu_AppendRadioItem(*args, **kwargs)
+
+    def AppendMenu(*args, **kwargs):
+        """AppendMenu(int itemid, wxString text, Menu submenu, wxString help=wxPyEmptyString)"""
+        return _core.Menu_AppendMenu(*args, **kwargs)
+
+    def AppendItem(*args, **kwargs):
+        """AppendItem(MenuItem item)"""
+        return _core.Menu_AppendItem(*args, **kwargs)
+
+    def Break(*args, **kwargs):
+        """Break()"""
+        return _core.Menu_Break(*args, **kwargs)
+
+    def InsertItem(*args, **kwargs):
+        """InsertItem(size_t pos, MenuItem item) -> bool"""
+        return _core.Menu_InsertItem(*args, **kwargs)
+
+    def Insert(*args, **kwargs):
+        """Insert(size_t pos, int itemid, wxString text, wxString help=wxPyEmptyString, 
+    wxItemKind kind=ITEM_NORMAL)"""
+        return _core.Menu_Insert(*args, **kwargs)
+
+    def InsertSeparator(*args, **kwargs):
+        """InsertSeparator(size_t pos)"""
+        return _core.Menu_InsertSeparator(*args, **kwargs)
+
+    def InsertCheckItem(*args, **kwargs):
+        """InsertCheckItem(size_t pos, int itemid, wxString text, wxString help=wxPyEmptyString)"""
+        return _core.Menu_InsertCheckItem(*args, **kwargs)
+
+    def InsertRadioItem(*args, **kwargs):
+        """InsertRadioItem(size_t pos, int itemid, wxString text, wxString help=wxPyEmptyString)"""
+        return _core.Menu_InsertRadioItem(*args, **kwargs)
+
+    def InsertMenu(*args, **kwargs):
+        """InsertMenu(size_t pos, int itemid, wxString text, Menu submenu, 
+    wxString help=wxPyEmptyString)"""
+        return _core.Menu_InsertMenu(*args, **kwargs)
+
+    def PrependItem(*args, **kwargs):
+        """PrependItem(MenuItem item)"""
+        return _core.Menu_PrependItem(*args, **kwargs)
+
+    def Prepend(*args, **kwargs):
+        """Prepend(int itemid, wxString text, wxString help=wxPyEmptyString, 
+    wxItemKind kind=ITEM_NORMAL)"""
+        return _core.Menu_Prepend(*args, **kwargs)
+
+    def PrependSeparator(*args, **kwargs):
+        """PrependSeparator()"""
+        return _core.Menu_PrependSeparator(*args, **kwargs)
+
+    def PrependCheckItem(*args, **kwargs):
+        """PrependCheckItem(int itemid, wxString text, wxString help=wxPyEmptyString)"""
+        return _core.Menu_PrependCheckItem(*args, **kwargs)
+
+    def PrependRadioItem(*args, **kwargs):
+        """PrependRadioItem(int itemid, wxString text, wxString help=wxPyEmptyString)"""
+        return _core.Menu_PrependRadioItem(*args, **kwargs)
+
+    def PrependMenu(*args, **kwargs):
+        """PrependMenu(int itemid, wxString text, Menu submenu, wxString help=wxPyEmptyString)"""
+        return _core.Menu_PrependMenu(*args, **kwargs)
+
+    def Remove(*args, **kwargs):
+        """Remove(int itemid) -> MenuItem"""
+        return _core.Menu_Remove(*args, **kwargs)
+
+    def RemoveItem(*args, **kwargs):
+        """RemoveItem(MenuItem item) -> MenuItem"""
+        return _core.Menu_RemoveItem(*args, **kwargs)
+
+    def Delete(*args, **kwargs):
+        """Delete(int itemid) -> bool"""
+        return _core.Menu_Delete(*args, **kwargs)
+
+    def DeleteItem(*args, **kwargs):
+        """DeleteItem(MenuItem item) -> bool"""
+        return _core.Menu_DeleteItem(*args, **kwargs)
+
+    def Destroy(*args, **kwargs):
+        """Destroy()
+
+Deletes the C++ object this Python object is a proxy for."""
+        return _core.Menu_Destroy(*args, **kwargs)
+
+    def DestroyId(*args, **kwargs):
+        """DestroyId(int itemid) -> bool
+
+Deletes the C++ object this Python object is a proxy for."""
+        return _core.Menu_DestroyId(*args, **kwargs)
+
+    def DestroyItem(*args, **kwargs):
+        """DestroyItem(MenuItem item) -> bool
+
+Deletes the C++ object this Python object is a proxy for."""
+        return _core.Menu_DestroyItem(*args, **kwargs)
+
+    def GetMenuItemCount(*args, **kwargs):
+        """GetMenuItemCount() -> size_t"""
+        return _core.Menu_GetMenuItemCount(*args, **kwargs)
+
+    def GetMenuItems(*args, **kwargs):
+        """GetMenuItems() -> PyObject"""
+        return _core.Menu_GetMenuItems(*args, **kwargs)
+
+    def FindItem(*args, **kwargs):
+        """FindItem(wxString item) -> int"""
+        return _core.Menu_FindItem(*args, **kwargs)
+
+    def FindItemById(*args, **kwargs):
+        """FindItemById(int itemid) -> MenuItem"""
+        return _core.Menu_FindItemById(*args, **kwargs)
+
+    def FindItemByPosition(*args, **kwargs):
+        """FindItemByPosition(size_t position) -> MenuItem"""
+        return _core.Menu_FindItemByPosition(*args, **kwargs)
+
+    def Enable(*args, **kwargs):
+        """Enable(int itemid, bool enable)"""
+        return _core.Menu_Enable(*args, **kwargs)
+
+    def IsEnabled(*args, **kwargs):
+        """IsEnabled(int itemid) -> bool"""
+        return _core.Menu_IsEnabled(*args, **kwargs)
+
+    def Check(*args, **kwargs):
+        """Check(int itemid, bool check)"""
+        return _core.Menu_Check(*args, **kwargs)
+
+    def IsChecked(*args, **kwargs):
+        """IsChecked(int itemid) -> bool"""
+        return _core.Menu_IsChecked(*args, **kwargs)
+
+    def SetLabel(*args, **kwargs):
+        """SetLabel(int itemid, wxString label)"""
+        return _core.Menu_SetLabel(*args, **kwargs)
+
+    def GetLabel(*args, **kwargs):
+        """GetLabel(int itemid) -> wxString"""
+        return _core.Menu_GetLabel(*args, **kwargs)
+
+    def SetHelpString(*args, **kwargs):
+        """SetHelpString(int itemid, wxString helpString)"""
+        return _core.Menu_SetHelpString(*args, **kwargs)
+
+    def GetHelpString(*args, **kwargs):
+        """GetHelpString(int itemid) -> wxString"""
+        return _core.Menu_GetHelpString(*args, **kwargs)
+
+    def SetTitle(*args, **kwargs):
+        """SetTitle(wxString title)"""
+        return _core.Menu_SetTitle(*args, **kwargs)
+
+    def GetTitle(*args, **kwargs):
+        """GetTitle() -> wxString"""
+        return _core.Menu_GetTitle(*args, **kwargs)
+
+    def SetEventHandler(*args, **kwargs):
+        """SetEventHandler(EvtHandler handler)"""
+        return _core.Menu_SetEventHandler(*args, **kwargs)
+
+    def GetEventHandler(*args, **kwargs):
+        """GetEventHandler() -> EvtHandler"""
+        return _core.Menu_GetEventHandler(*args, **kwargs)
+
+    def SetInvokingWindow(*args, **kwargs):
+        """SetInvokingWindow(Window win)"""
+        return _core.Menu_SetInvokingWindow(*args, **kwargs)
+
+    def GetInvokingWindow(*args, **kwargs):
+        """GetInvokingWindow() -> Window"""
+        return _core.Menu_GetInvokingWindow(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle() -> long"""
+        return _core.Menu_GetStyle(*args, **kwargs)
+
+    def UpdateUI(*args, **kwargs):
+        """UpdateUI(EvtHandler source=None)"""
+        return _core.Menu_UpdateUI(*args, **kwargs)
+
+    def GetMenuBar(*args, **kwargs):
+        """GetMenuBar() -> MenuBar"""
+        return _core.Menu_GetMenuBar(*args, **kwargs)
+
+    def Attach(*args, **kwargs):
+        """Attach(wxMenuBarBase menubar)"""
+        return _core.Menu_Attach(*args, **kwargs)
+
+    def Detach(*args, **kwargs):
+        """Detach()"""
+        return _core.Menu_Detach(*args, **kwargs)
+
+    def IsAttached(*args, **kwargs):
+        """IsAttached() -> bool"""
+        return _core.Menu_IsAttached(*args, **kwargs)
+
+    def SetParent(*args, **kwargs):
+        """SetParent(Menu parent)"""
+        return _core.Menu_SetParent(*args, **kwargs)
+
+    def GetParent(*args, **kwargs):
+        """GetParent() -> Menu"""
+        return _core.Menu_GetParent(*args, **kwargs)
+
 
 class MenuPtr(Menu):
     def __init__(self, this):
@@ -3508,39 +6050,117 @@ DefaultValidator = cvar.DefaultValidator
 #---------------------------------------------------------------------------
 
 class MenuBar(Window):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMenuBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(long style=0) -> MenuBar"""
         newobj = _core.new_MenuBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Append(*args, **kwargs): return _core.MenuBar_Append(*args, **kwargs)
-    def Insert(*args, **kwargs): return _core.MenuBar_Insert(*args, **kwargs)
-    def GetMenuCount(*args, **kwargs): return _core.MenuBar_GetMenuCount(*args, **kwargs)
-    def GetMenu(*args, **kwargs): return _core.MenuBar_GetMenu(*args, **kwargs)
-    def Replace(*args, **kwargs): return _core.MenuBar_Replace(*args, **kwargs)
-    def Remove(*args, **kwargs): return _core.MenuBar_Remove(*args, **kwargs)
-    def EnableTop(*args, **kwargs): return _core.MenuBar_EnableTop(*args, **kwargs)
-    def IsEnabledTop(*args, **kwargs): return _core.MenuBar_IsEnabledTop(*args, **kwargs)
-    def SetLabelTop(*args, **kwargs): return _core.MenuBar_SetLabelTop(*args, **kwargs)
-    def GetLabelTop(*args, **kwargs): return _core.MenuBar_GetLabelTop(*args, **kwargs)
-    def FindMenuItem(*args, **kwargs): return _core.MenuBar_FindMenuItem(*args, **kwargs)
-    def FindItemById(*args, **kwargs): return _core.MenuBar_FindItemById(*args, **kwargs)
-    def FindMenu(*args, **kwargs): return _core.MenuBar_FindMenu(*args, **kwargs)
-    def Enable(*args, **kwargs): return _core.MenuBar_Enable(*args, **kwargs)
-    def Check(*args, **kwargs): return _core.MenuBar_Check(*args, **kwargs)
-    def IsChecked(*args, **kwargs): return _core.MenuBar_IsChecked(*args, **kwargs)
-    def IsEnabled(*args, **kwargs): return _core.MenuBar_IsEnabled(*args, **kwargs)
-    def SetLabel(*args, **kwargs): return _core.MenuBar_SetLabel(*args, **kwargs)
-    def GetLabel(*args, **kwargs): return _core.MenuBar_GetLabel(*args, **kwargs)
-    def SetHelpString(*args, **kwargs): return _core.MenuBar_SetHelpString(*args, **kwargs)
-    def GetHelpString(*args, **kwargs): return _core.MenuBar_GetHelpString(*args, **kwargs)
-    def GetFrame(*args, **kwargs): return _core.MenuBar_GetFrame(*args, **kwargs)
-    def IsAttached(*args, **kwargs): return _core.MenuBar_IsAttached(*args, **kwargs)
-    def Attach(*args, **kwargs): return _core.MenuBar_Attach(*args, **kwargs)
-    def Detach(*args, **kwargs): return _core.MenuBar_Detach(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMenuBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Append(*args, **kwargs):
+        """Append(Menu menu, wxString title) -> bool"""
+        return _core.MenuBar_Append(*args, **kwargs)
+
+    def Insert(*args, **kwargs):
+        """Insert(size_t pos, Menu menu, wxString title) -> bool"""
+        return _core.MenuBar_Insert(*args, **kwargs)
+
+    def GetMenuCount(*args, **kwargs):
+        """GetMenuCount() -> size_t"""
+        return _core.MenuBar_GetMenuCount(*args, **kwargs)
+
+    def GetMenu(*args, **kwargs):
+        """GetMenu(size_t pos) -> Menu"""
+        return _core.MenuBar_GetMenu(*args, **kwargs)
+
+    def Replace(*args, **kwargs):
+        """Replace(size_t pos, Menu menu, wxString title) -> Menu"""
+        return _core.MenuBar_Replace(*args, **kwargs)
+
+    def Remove(*args, **kwargs):
+        """Remove(size_t pos) -> Menu"""
+        return _core.MenuBar_Remove(*args, **kwargs)
+
+    def EnableTop(*args, **kwargs):
+        """EnableTop(size_t pos, bool enable)"""
+        return _core.MenuBar_EnableTop(*args, **kwargs)
+
+    def IsEnabledTop(*args, **kwargs):
+        """IsEnabledTop(size_t pos) -> bool"""
+        return _core.MenuBar_IsEnabledTop(*args, **kwargs)
+
+    def SetLabelTop(*args, **kwargs):
+        """SetLabelTop(size_t pos, wxString label)"""
+        return _core.MenuBar_SetLabelTop(*args, **kwargs)
+
+    def GetLabelTop(*args, **kwargs):
+        """GetLabelTop(size_t pos) -> wxString"""
+        return _core.MenuBar_GetLabelTop(*args, **kwargs)
+
+    def FindMenuItem(*args, **kwargs):
+        """FindMenuItem(wxString menu, wxString item) -> int"""
+        return _core.MenuBar_FindMenuItem(*args, **kwargs)
+
+    def FindItemById(*args, **kwargs):
+        """FindItemById(int itemid) -> MenuItem"""
+        return _core.MenuBar_FindItemById(*args, **kwargs)
+
+    def FindMenu(*args, **kwargs):
+        """FindMenu(wxString title) -> int"""
+        return _core.MenuBar_FindMenu(*args, **kwargs)
+
+    def Enable(*args, **kwargs):
+        """Enable(int itemid, bool enable)"""
+        return _core.MenuBar_Enable(*args, **kwargs)
+
+    def Check(*args, **kwargs):
+        """Check(int itemid, bool check)"""
+        return _core.MenuBar_Check(*args, **kwargs)
+
+    def IsChecked(*args, **kwargs):
+        """IsChecked(int itemid) -> bool"""
+        return _core.MenuBar_IsChecked(*args, **kwargs)
+
+    def IsEnabled(*args, **kwargs):
+        """IsEnabled(int itemid) -> bool"""
+        return _core.MenuBar_IsEnabled(*args, **kwargs)
+
+    def SetLabel(*args, **kwargs):
+        """SetLabel(int itemid, wxString label)"""
+        return _core.MenuBar_SetLabel(*args, **kwargs)
+
+    def GetLabel(*args, **kwargs):
+        """GetLabel(int itemid) -> wxString"""
+        return _core.MenuBar_GetLabel(*args, **kwargs)
+
+    def SetHelpString(*args, **kwargs):
+        """SetHelpString(int itemid, wxString helpString)"""
+        return _core.MenuBar_SetHelpString(*args, **kwargs)
+
+    def GetHelpString(*args, **kwargs):
+        """GetHelpString(int itemid) -> wxString"""
+        return _core.MenuBar_GetHelpString(*args, **kwargs)
+
+    def GetFrame(*args, **kwargs):
+        """GetFrame() -> wxFrame"""
+        return _core.MenuBar_GetFrame(*args, **kwargs)
+
+    def IsAttached(*args, **kwargs):
+        """IsAttached() -> bool"""
+        return _core.MenuBar_IsAttached(*args, **kwargs)
+
+    def Attach(*args, **kwargs):
+        """Attach(wxFrame frame)"""
+        return _core.MenuBar_Attach(*args, **kwargs)
+
+    def Detach(*args, **kwargs):
+        """Detach()"""
+        return _core.MenuBar_Detach(*args, **kwargs)
+
 
 class MenuBarPtr(MenuBar):
     def __init__(self, this):
@@ -3552,40 +6172,127 @@ _core.MenuBar_swigregister(MenuBarPtr)
 #---------------------------------------------------------------------------
 
 class MenuItem(Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMenuItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Menu parentMenu=None, int id=ID_SEPARATOR, wxString text=wxPyEmptyString, 
+    wxString help=wxPyEmptyString, 
+    wxItemKind kind=ITEM_NORMAL, Menu subMenu=None) -> MenuItem"""
         newobj = _core.new_MenuItem(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetMenu(*args, **kwargs): return _core.MenuItem_GetMenu(*args, **kwargs)
-    def SetMenu(*args, **kwargs): return _core.MenuItem_SetMenu(*args, **kwargs)
-    def SetId(*args, **kwargs): return _core.MenuItem_SetId(*args, **kwargs)
-    def GetId(*args, **kwargs): return _core.MenuItem_GetId(*args, **kwargs)
-    def IsSeparator(*args, **kwargs): return _core.MenuItem_IsSeparator(*args, **kwargs)
-    def SetText(*args, **kwargs): return _core.MenuItem_SetText(*args, **kwargs)
-    def GetLabel(*args, **kwargs): return _core.MenuItem_GetLabel(*args, **kwargs)
-    def GetText(*args, **kwargs): return _core.MenuItem_GetText(*args, **kwargs)
-    GetLabelFromText = staticmethod(_core.MenuItem_GetLabelFromText)
-    def GetKind(*args, **kwargs): return _core.MenuItem_GetKind(*args, **kwargs)
-    def SetCheckable(*args, **kwargs): return _core.MenuItem_SetCheckable(*args, **kwargs)
-    def IsCheckable(*args, **kwargs): return _core.MenuItem_IsCheckable(*args, **kwargs)
-    def IsSubMenu(*args, **kwargs): return _core.MenuItem_IsSubMenu(*args, **kwargs)
-    def SetSubMenu(*args, **kwargs): return _core.MenuItem_SetSubMenu(*args, **kwargs)
-    def GetSubMenu(*args, **kwargs): return _core.MenuItem_GetSubMenu(*args, **kwargs)
-    def Enable(*args, **kwargs): return _core.MenuItem_Enable(*args, **kwargs)
-    def IsEnabled(*args, **kwargs): return _core.MenuItem_IsEnabled(*args, **kwargs)
-    def Check(*args, **kwargs): return _core.MenuItem_Check(*args, **kwargs)
-    def IsChecked(*args, **kwargs): return _core.MenuItem_IsChecked(*args, **kwargs)
-    def Toggle(*args, **kwargs): return _core.MenuItem_Toggle(*args, **kwargs)
-    def SetHelp(*args, **kwargs): return _core.MenuItem_SetHelp(*args, **kwargs)
-    def GetHelp(*args, **kwargs): return _core.MenuItem_GetHelp(*args, **kwargs)
-    def GetAccel(*args, **kwargs): return _core.MenuItem_GetAccel(*args, **kwargs)
-    def SetAccel(*args, **kwargs): return _core.MenuItem_SetAccel(*args, **kwargs)
-    GetDefaultMarginWidth = staticmethod(_core.MenuItem_GetDefaultMarginWidth)
-    def SetBitmap(*args, **kwargs): return _core.MenuItem_SetBitmap(*args, **kwargs)
-    def GetBitmap(*args, **kwargs): return _core.MenuItem_GetBitmap(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMenuItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetMenu(*args, **kwargs):
+        """GetMenu() -> Menu"""
+        return _core.MenuItem_GetMenu(*args, **kwargs)
+
+    def SetMenu(*args, **kwargs):
+        """SetMenu(Menu menu)"""
+        return _core.MenuItem_SetMenu(*args, **kwargs)
+
+    def SetId(*args, **kwargs):
+        """SetId(int itemid)"""
+        return _core.MenuItem_SetId(*args, **kwargs)
+
+    def GetId(*args, **kwargs):
+        """GetId() -> int"""
+        return _core.MenuItem_GetId(*args, **kwargs)
+
+    def IsSeparator(*args, **kwargs):
+        """IsSeparator() -> bool"""
+        return _core.MenuItem_IsSeparator(*args, **kwargs)
+
+    def SetText(*args, **kwargs):
+        """SetText(wxString str)"""
+        return _core.MenuItem_SetText(*args, **kwargs)
+
+    def GetLabel(*args, **kwargs):
+        """GetLabel() -> wxString"""
+        return _core.MenuItem_GetLabel(*args, **kwargs)
+
+    def GetText(*args, **kwargs):
+        """GetText() -> wxString"""
+        return _core.MenuItem_GetText(*args, **kwargs)
+
+    def GetLabelFromText(*args, **kwargs):
+        """MenuItem.GetLabelFromText(wxString text) -> wxString"""
+        return _core.MenuItem_GetLabelFromText(*args, **kwargs)
+
+    GetLabelFromText = staticmethod(GetLabelFromText)
+    def GetKind(*args, **kwargs):
+        """GetKind() -> wxItemKind"""
+        return _core.MenuItem_GetKind(*args, **kwargs)
+
+    def SetCheckable(*args, **kwargs):
+        """SetCheckable(bool checkable)"""
+        return _core.MenuItem_SetCheckable(*args, **kwargs)
+
+    def IsCheckable(*args, **kwargs):
+        """IsCheckable() -> bool"""
+        return _core.MenuItem_IsCheckable(*args, **kwargs)
+
+    def IsSubMenu(*args, **kwargs):
+        """IsSubMenu() -> bool"""
+        return _core.MenuItem_IsSubMenu(*args, **kwargs)
+
+    def SetSubMenu(*args, **kwargs):
+        """SetSubMenu(Menu menu)"""
+        return _core.MenuItem_SetSubMenu(*args, **kwargs)
+
+    def GetSubMenu(*args, **kwargs):
+        """GetSubMenu() -> Menu"""
+        return _core.MenuItem_GetSubMenu(*args, **kwargs)
+
+    def Enable(*args, **kwargs):
+        """Enable(bool enable=True)"""
+        return _core.MenuItem_Enable(*args, **kwargs)
+
+    def IsEnabled(*args, **kwargs):
+        """IsEnabled() -> bool"""
+        return _core.MenuItem_IsEnabled(*args, **kwargs)
+
+    def Check(*args, **kwargs):
+        """Check(bool check=True)"""
+        return _core.MenuItem_Check(*args, **kwargs)
+
+    def IsChecked(*args, **kwargs):
+        """IsChecked() -> bool"""
+        return _core.MenuItem_IsChecked(*args, **kwargs)
+
+    def Toggle(*args, **kwargs):
+        """Toggle()"""
+        return _core.MenuItem_Toggle(*args, **kwargs)
+
+    def SetHelp(*args, **kwargs):
+        """SetHelp(wxString str)"""
+        return _core.MenuItem_SetHelp(*args, **kwargs)
+
+    def GetHelp(*args, **kwargs):
+        """GetHelp() -> wxString"""
+        return _core.MenuItem_GetHelp(*args, **kwargs)
+
+    def GetAccel(*args, **kwargs):
+        """GetAccel() -> wxAcceleratorEntry"""
+        return _core.MenuItem_GetAccel(*args, **kwargs)
+
+    def SetAccel(*args, **kwargs):
+        """SetAccel(wxAcceleratorEntry accel)"""
+        return _core.MenuItem_SetAccel(*args, **kwargs)
+
+    def GetDefaultMarginWidth(*args, **kwargs):
+        """MenuItem.GetDefaultMarginWidth() -> int"""
+        return _core.MenuItem_GetDefaultMarginWidth(*args, **kwargs)
+
+    GetDefaultMarginWidth = staticmethod(GetDefaultMarginWidth)
+    def SetBitmap(*args, **kwargs):
+        """SetBitmap(wxBitmap bitmap)"""
+        return _core.MenuItem_SetBitmap(*args, **kwargs)
+
+    def GetBitmap(*args, **kwargs):
+        """GetBitmap() -> wxBitmap"""
+        return _core.MenuItem_GetBitmap(*args, **kwargs)
+
 
 class MenuItemPtr(MenuItem):
     def __init__(self, this):
@@ -3594,25 +6301,48 @@ class MenuItemPtr(MenuItem):
         self.__class__ = MenuItem
 _core.MenuItem_swigregister(MenuItemPtr)
 
-MenuItem_GetLabelFromText = _core.MenuItem_GetLabelFromText
+def MenuItem_GetLabelFromText(*args, **kwargs):
+    """MenuItem_GetLabelFromText(wxString text) -> wxString"""
+    return _core.MenuItem_GetLabelFromText(*args, **kwargs)
 
-MenuItem_GetDefaultMarginWidth = _core.MenuItem_GetDefaultMarginWidth
+def MenuItem_GetDefaultMarginWidth(*args, **kwargs):
+    """MenuItem_GetDefaultMarginWidth() -> int"""
+    return _core.MenuItem_GetDefaultMarginWidth(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class Control(Window):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxControl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, Validator validator=DefaultValidator, 
+    wxString name=wxPyControlNameStr) -> Control"""
         newobj = _core.new_Control(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _core.Control_Create(*args, **kwargs)
-    def Command(*args, **kwargs): return _core.Control_Command(*args, **kwargs)
-    def GetLabel(*args, **kwargs): return _core.Control_GetLabel(*args, **kwargs)
-    def SetLabel(*args, **kwargs): return _core.Control_SetLabel(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxControl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, Validator validator=DefaultValidator, 
+    wxString name=wxPyControlNameStr) -> bool"""
+        return _core.Control_Create(*args, **kwargs)
+
+    def Command(*args, **kwargs):
+        """Command(CommandEvent event)"""
+        return _core.Control_Command(*args, **kwargs)
+
+    def GetLabel(*args, **kwargs):
+        """GetLabel() -> wxString"""
+        return _core.Control_GetLabel(*args, **kwargs)
+
+    def SetLabel(*args, **kwargs):
+        """SetLabel(wxString label)"""
+        return _core.Control_SetLabel(*args, **kwargs)
+
 
 class ControlPtr(Control):
     def __init__(self, this):
@@ -3622,6 +6352,7 @@ class ControlPtr(Control):
 _core.Control_swigregister(ControlPtr)
 
 def PreControl(*args, **kwargs):
+    """PreControl() -> Control"""
     val = _core.new_PreControl(*args, **kwargs)
     val.thisown = 1
     return val
@@ -3629,25 +6360,74 @@ def PreControl(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class ItemContainer(object):
-    def Append(*args, **kwargs): return _core.ItemContainer_Append(*args, **kwargs)
-    def AppendItems(*args, **kwargs): return _core.ItemContainer_AppendItems(*args, **kwargs)
-    def Insert(*args, **kwargs): return _core.ItemContainer_Insert(*args, **kwargs)
-    def Clear(*args, **kwargs): return _core.ItemContainer_Clear(*args, **kwargs)
-    def Delete(*args, **kwargs): return _core.ItemContainer_Delete(*args, **kwargs)
-    def GetCount(*args, **kwargs): return _core.ItemContainer_GetCount(*args, **kwargs)
-    def IsEmpty(*args, **kwargs): return _core.ItemContainer_IsEmpty(*args, **kwargs)
-    def GetString(*args, **kwargs): return _core.ItemContainer_GetString(*args, **kwargs)
-    def GetStrings(*args, **kwargs): return _core.ItemContainer_GetStrings(*args, **kwargs)
-    def SetString(*args, **kwargs): return _core.ItemContainer_SetString(*args, **kwargs)
-    def FindString(*args, **kwargs): return _core.ItemContainer_FindString(*args, **kwargs)
-    def Select(*args, **kwargs): return _core.ItemContainer_Select(*args, **kwargs)
-    def GetSelection(*args, **kwargs): return _core.ItemContainer_GetSelection(*args, **kwargs)
-    def GetStringSelection(*args, **kwargs): return _core.ItemContainer_GetStringSelection(*args, **kwargs)
-    def GetClientData(*args, **kwargs): return _core.ItemContainer_GetClientData(*args, **kwargs)
-    def SetClientData(*args, **kwargs): return _core.ItemContainer_SetClientData(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxItemContainer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Append(*args, **kwargs):
+        """Append(wxString item, PyObject clientData=None) -> int"""
+        return _core.ItemContainer_Append(*args, **kwargs)
+
+    def AppendItems(*args, **kwargs):
+        """AppendItems(wxArrayString strings)"""
+        return _core.ItemContainer_AppendItems(*args, **kwargs)
+
+    def Insert(*args, **kwargs):
+        """Insert(wxString item, int pos, PyObject clientData=None) -> int"""
+        return _core.ItemContainer_Insert(*args, **kwargs)
+
+    def Clear(*args, **kwargs):
+        """Clear()"""
+        return _core.ItemContainer_Clear(*args, **kwargs)
+
+    def Delete(*args, **kwargs):
+        """Delete(int n)"""
+        return _core.ItemContainer_Delete(*args, **kwargs)
+
+    def GetCount(*args, **kwargs):
+        """GetCount() -> int"""
+        return _core.ItemContainer_GetCount(*args, **kwargs)
+
+    def IsEmpty(*args, **kwargs):
+        """IsEmpty() -> bool"""
+        return _core.ItemContainer_IsEmpty(*args, **kwargs)
+
+    def GetString(*args, **kwargs):
+        """GetString(int n) -> wxString"""
+        return _core.ItemContainer_GetString(*args, **kwargs)
+
+    def GetStrings(*args, **kwargs):
+        """GetStrings() -> wxArrayString"""
+        return _core.ItemContainer_GetStrings(*args, **kwargs)
+
+    def SetString(*args, **kwargs):
+        """SetString(int n, wxString s)"""
+        return _core.ItemContainer_SetString(*args, **kwargs)
+
+    def FindString(*args, **kwargs):
+        """FindString(wxString s) -> int"""
+        return _core.ItemContainer_FindString(*args, **kwargs)
+
+    def Select(*args, **kwargs):
+        """Select(int n)"""
+        return _core.ItemContainer_Select(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> int"""
+        return _core.ItemContainer_GetSelection(*args, **kwargs)
+
+    def GetStringSelection(*args, **kwargs):
+        """GetStringSelection() -> wxString"""
+        return _core.ItemContainer_GetStringSelection(*args, **kwargs)
+
+    def GetClientData(*args, **kwargs):
+        """GetClientData(int n) -> PyObject"""
+        return _core.ItemContainer_GetClientData(*args, **kwargs)
+
+    def SetClientData(*args, **kwargs):
+        """SetClientData(int n, PyObject clientData)"""
+        return _core.ItemContainer_SetClientData(*args, **kwargs)
+
 
 class ItemContainerPtr(ItemContainer):
     def __init__(self, this):
@@ -3659,6 +6439,7 @@ _core.ItemContainer_swigregister(ItemContainerPtr)
 #---------------------------------------------------------------------------
 
 class ControlWithItems(Control,ItemContainer):
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxControlWithItems instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -3673,43 +6454,135 @@ _core.ControlWithItems_swigregister(ControlWithItemsPtr)
 #---------------------------------------------------------------------------
 
 class SizerItem(Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSizerItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> SizerItem"""
         newobj = _core.new_SizerItem(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def DeleteWindows(*args, **kwargs): return _core.SizerItem_DeleteWindows(*args, **kwargs)
-    def DetachSizer(*args, **kwargs): return _core.SizerItem_DetachSizer(*args, **kwargs)
-    def GetSize(*args, **kwargs): return _core.SizerItem_GetSize(*args, **kwargs)
-    def CalcMin(*args, **kwargs): return _core.SizerItem_CalcMin(*args, **kwargs)
-    def SetDimension(*args, **kwargs): return _core.SizerItem_SetDimension(*args, **kwargs)
-    def GetMinSize(*args, **kwargs): return _core.SizerItem_GetMinSize(*args, **kwargs)
-    def SetInitSize(*args, **kwargs): return _core.SizerItem_SetInitSize(*args, **kwargs)
-    def SetRatioWH(*args, **kwargs): return _core.SizerItem_SetRatioWH(*args, **kwargs)
-    def SetRatioSize(*args, **kwargs): return _core.SizerItem_SetRatioSize(*args, **kwargs)
-    def SetRatio(*args, **kwargs): return _core.SizerItem_SetRatio(*args, **kwargs)
-    def GetRatio(*args, **kwargs): return _core.SizerItem_GetRatio(*args, **kwargs)
-    def IsWindow(*args, **kwargs): return _core.SizerItem_IsWindow(*args, **kwargs)
-    def IsSizer(*args, **kwargs): return _core.SizerItem_IsSizer(*args, **kwargs)
-    def IsSpacer(*args, **kwargs): return _core.SizerItem_IsSpacer(*args, **kwargs)
-    def SetProportion(*args, **kwargs): return _core.SizerItem_SetProportion(*args, **kwargs)
-    def GetProportion(*args, **kwargs): return _core.SizerItem_GetProportion(*args, **kwargs)
-    def SetFlag(*args, **kwargs): return _core.SizerItem_SetFlag(*args, **kwargs)
-    def GetFlag(*args, **kwargs): return _core.SizerItem_GetFlag(*args, **kwargs)
-    def SetBorder(*args, **kwargs): return _core.SizerItem_SetBorder(*args, **kwargs)
-    def GetBorder(*args, **kwargs): return _core.SizerItem_GetBorder(*args, **kwargs)
-    def GetWindow(*args, **kwargs): return _core.SizerItem_GetWindow(*args, **kwargs)
-    def SetWindow(*args, **kwargs): return _core.SizerItem_SetWindow(*args, **kwargs)
-    def GetSizer(*args, **kwargs): return _core.SizerItem_GetSizer(*args, **kwargs)
-    def SetSizer(*args, **kwargs): return _core.SizerItem_SetSizer(*args, **kwargs)
-    def GetSpacer(*args, **kwargs): return _core.SizerItem_GetSpacer(*args, **kwargs)
-    def SetSpacer(*args, **kwargs): return _core.SizerItem_SetSpacer(*args, **kwargs)
-    def Show(*args, **kwargs): return _core.SizerItem_Show(*args, **kwargs)
-    def IsShown(*args, **kwargs): return _core.SizerItem_IsShown(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _core.SizerItem_GetPosition(*args, **kwargs)
-    def GetUserData(*args, **kwargs): return _core.SizerItem_GetUserData(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSizerItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def DeleteWindows(*args, **kwargs):
+        """DeleteWindows()"""
+        return _core.SizerItem_DeleteWindows(*args, **kwargs)
+
+    def DetachSizer(*args, **kwargs):
+        """DetachSizer()"""
+        return _core.SizerItem_DetachSizer(*args, **kwargs)
+
+    def GetSize(*args, **kwargs):
+        """GetSize() -> Size"""
+        return _core.SizerItem_GetSize(*args, **kwargs)
+
+    def CalcMin(*args, **kwargs):
+        """CalcMin() -> Size"""
+        return _core.SizerItem_CalcMin(*args, **kwargs)
+
+    def SetDimension(*args, **kwargs):
+        """SetDimension(Point pos, Size size)"""
+        return _core.SizerItem_SetDimension(*args, **kwargs)
+
+    def GetMinSize(*args, **kwargs):
+        """GetMinSize() -> Size"""
+        return _core.SizerItem_GetMinSize(*args, **kwargs)
+
+    def SetInitSize(*args, **kwargs):
+        """SetInitSize(int x, int y)"""
+        return _core.SizerItem_SetInitSize(*args, **kwargs)
+
+    def SetRatioWH(*args, **kwargs):
+        """SetRatioWH(int width, int height)"""
+        return _core.SizerItem_SetRatioWH(*args, **kwargs)
+
+    def SetRatioSize(*args, **kwargs):
+        """SetRatioSize(Size size)"""
+        return _core.SizerItem_SetRatioSize(*args, **kwargs)
+
+    def SetRatio(*args, **kwargs):
+        """SetRatio(float ratio)"""
+        return _core.SizerItem_SetRatio(*args, **kwargs)
+
+    def GetRatio(*args, **kwargs):
+        """GetRatio() -> float"""
+        return _core.SizerItem_GetRatio(*args, **kwargs)
+
+    def IsWindow(*args, **kwargs):
+        """IsWindow() -> bool"""
+        return _core.SizerItem_IsWindow(*args, **kwargs)
+
+    def IsSizer(*args, **kwargs):
+        """IsSizer() -> bool"""
+        return _core.SizerItem_IsSizer(*args, **kwargs)
+
+    def IsSpacer(*args, **kwargs):
+        """IsSpacer() -> bool"""
+        return _core.SizerItem_IsSpacer(*args, **kwargs)
+
+    def SetProportion(*args, **kwargs):
+        """SetProportion(int proportion)"""
+        return _core.SizerItem_SetProportion(*args, **kwargs)
+
+    def GetProportion(*args, **kwargs):
+        """GetProportion() -> int"""
+        return _core.SizerItem_GetProportion(*args, **kwargs)
+
+    def SetFlag(*args, **kwargs):
+        """SetFlag(int flag)"""
+        return _core.SizerItem_SetFlag(*args, **kwargs)
+
+    def GetFlag(*args, **kwargs):
+        """GetFlag() -> int"""
+        return _core.SizerItem_GetFlag(*args, **kwargs)
+
+    def SetBorder(*args, **kwargs):
+        """SetBorder(int border)"""
+        return _core.SizerItem_SetBorder(*args, **kwargs)
+
+    def GetBorder(*args, **kwargs):
+        """GetBorder() -> int"""
+        return _core.SizerItem_GetBorder(*args, **kwargs)
+
+    def GetWindow(*args, **kwargs):
+        """GetWindow() -> Window"""
+        return _core.SizerItem_GetWindow(*args, **kwargs)
+
+    def SetWindow(*args, **kwargs):
+        """SetWindow(Window window)"""
+        return _core.SizerItem_SetWindow(*args, **kwargs)
+
+    def GetSizer(*args, **kwargs):
+        """GetSizer() -> Sizer"""
+        return _core.SizerItem_GetSizer(*args, **kwargs)
+
+    def SetSizer(*args, **kwargs):
+        """SetSizer(Sizer sizer)"""
+        return _core.SizerItem_SetSizer(*args, **kwargs)
+
+    def GetSpacer(*args, **kwargs):
+        """GetSpacer() -> Size"""
+        return _core.SizerItem_GetSpacer(*args, **kwargs)
+
+    def SetSpacer(*args, **kwargs):
+        """SetSpacer(Size size)"""
+        return _core.SizerItem_SetSpacer(*args, **kwargs)
+
+    def Show(*args, **kwargs):
+        """Show(bool show)"""
+        return _core.SizerItem_Show(*args, **kwargs)
+
+    def IsShown(*args, **kwargs):
+        """IsShown() -> bool"""
+        return _core.SizerItem_IsShown(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point"""
+        return _core.SizerItem_GetPosition(*args, **kwargs)
+
+    def GetUserData(*args, **kwargs):
+        """GetUserData() -> PyObject"""
+        return _core.SizerItem_GetUserData(*args, **kwargs)
+
 
 class SizerItemPtr(SizerItem):
     def __init__(self, this):
@@ -3719,33 +6592,73 @@ class SizerItemPtr(SizerItem):
 _core.SizerItem_swigregister(SizerItemPtr)
 
 def SizerItemSpacer(*args, **kwargs):
+    """SizerItemSpacer(int width, int height, int proportion, int flag, int border, 
+    Object userData) -> SizerItem"""
     val = _core.new_SizerItemSpacer(*args, **kwargs)
     val.thisown = 1
     return val
 
 def SizerItemWindow(*args, **kwargs):
+    """SizerItemWindow(Window window, int proportion, int flag, int border, 
+    Object userData) -> SizerItem"""
     val = _core.new_SizerItemWindow(*args, **kwargs)
     val.thisown = 1
     return val
 
 def SizerItemSizer(*args, **kwargs):
+    """SizerItemSizer(Sizer sizer, int proportion, int flag, int border, 
+    Object userData) -> SizerItem"""
     val = _core.new_SizerItemSizer(*args, **kwargs)
     val.thisown = 1
     return val
 
 class Sizer(Object):
-    def _setOORInfo(*args, **kwargs): return _core.Sizer__setOORInfo(*args, **kwargs)
-    def Add(*args, **kwargs): return _core.Sizer_Add(*args, **kwargs)
-    def Insert(*args, **kwargs): return _core.Sizer_Insert(*args, **kwargs)
-    def Prepend(*args, **kwargs): return _core.Sizer_Prepend(*args, **kwargs)
-    def Remove(*args, **kwargs): return _core.Sizer_Remove(*args, **kwargs)
-    def _SetItemMinSize(*args, **kwargs): return _core.Sizer__SetItemMinSize(*args, **kwargs)
-    def AddItem(*args, **kwargs): return _core.Sizer_AddItem(*args, **kwargs)
-    def InsertItem(*args, **kwargs): return _core.Sizer_InsertItem(*args, **kwargs)
-    def PrependItem(*args, **kwargs): return _core.Sizer_PrependItem(*args, **kwargs)
+    """"""
+    def __init__(self): raise RuntimeError, "No constructor defined"
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def _setOORInfo(*args, **kwargs):
+        """_setOORInfo(PyObject _self)"""
+        return _core.Sizer__setOORInfo(*args, **kwargs)
+
+    def Add(*args, **kwargs):
+        """Add(PyObject item, int proportion=0, int flag=0, int border=0, 
+    PyObject userData=None)"""
+        return _core.Sizer_Add(*args, **kwargs)
+
+    def Insert(*args, **kwargs):
+        """Insert(int before, PyObject item, int proportion=0, int flag=0, 
+    int border=0, PyObject userData=None)"""
+        return _core.Sizer_Insert(*args, **kwargs)
+
+    def Prepend(*args, **kwargs):
+        """Prepend(PyObject item, int proportion=0, int flag=0, int border=0, 
+    PyObject userData=None)"""
+        return _core.Sizer_Prepend(*args, **kwargs)
+
+    def Remove(*args, **kwargs):
+        """Remove(PyObject item) -> bool"""
+        return _core.Sizer_Remove(*args, **kwargs)
+
+    def _SetItemMinSize(*args, **kwargs):
+        """_SetItemMinSize(PyObject item, Size size)"""
+        return _core.Sizer__SetItemMinSize(*args, **kwargs)
+
+    def AddItem(*args, **kwargs):
+        """AddItem(SizerItem item)"""
+        return _core.Sizer_AddItem(*args, **kwargs)
+
+    def InsertItem(*args, **kwargs):
+        """InsertItem(size_t index, SizerItem item)"""
+        return _core.Sizer_InsertItem(*args, **kwargs)
+
+    def PrependItem(*args, **kwargs):
+        """PrependItem(SizerItem item)"""
+        return _core.Sizer_PrependItem(*args, **kwargs)
+
     def AddMany(self, widgets):
         for childinfo in widgets:
-            if type(childinfo) != type(()):
+            if type(childinfo) != type(()) or (len(childinfo) == 2 and type(childinfo[0]) == type(1)):
                 childinfo = (childinfo, )
             self.Add(*childinfo)
 
@@ -3762,11 +6675,26 @@ class Sizer(Object):
         else:
             return self._SetItemMinSize(item, args[0])
 
-    def SetDimension(*args, **kwargs): return _core.Sizer_SetDimension(*args, **kwargs)
-    def SetMinSize(*args, **kwargs): return _core.Sizer_SetMinSize(*args, **kwargs)
-    def GetSize(*args, **kwargs): return _core.Sizer_GetSize(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _core.Sizer_GetPosition(*args, **kwargs)
-    def GetMinSize(*args, **kwargs): return _core.Sizer_GetMinSize(*args, **kwargs)
+    def SetDimension(*args, **kwargs):
+        """SetDimension(int x, int y, int width, int height)"""
+        return _core.Sizer_SetDimension(*args, **kwargs)
+
+    def SetMinSize(*args, **kwargs):
+        """SetMinSize(Size size)"""
+        return _core.Sizer_SetMinSize(*args, **kwargs)
+
+    def GetSize(*args, **kwargs):
+        """GetSize() -> Size"""
+        return _core.Sizer_GetSize(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point"""
+        return _core.Sizer_GetPosition(*args, **kwargs)
+
+    def GetMinSize(*args, **kwargs):
+        """GetMinSize() -> Size"""
+        return _core.Sizer_GetMinSize(*args, **kwargs)
+
     def GetSizeTuple(self):
         return self.GetSize().asTuple()
     def GetPositionTuple(self):
@@ -3774,23 +6702,62 @@ class Sizer(Object):
     def GetMinSizeTuple(self):
         return self.GetMinSize().asTuple()
 
-    def RecalcSizes(*args, **kwargs): return _core.Sizer_RecalcSizes(*args, **kwargs)
-    def CalcMin(*args, **kwargs): return _core.Sizer_CalcMin(*args, **kwargs)
-    def Layout(*args, **kwargs): return _core.Sizer_Layout(*args, **kwargs)
-    def Fit(*args, **kwargs): return _core.Sizer_Fit(*args, **kwargs)
-    def FitInside(*args, **kwargs): return _core.Sizer_FitInside(*args, **kwargs)
-    def SetSizeHints(*args, **kwargs): return _core.Sizer_SetSizeHints(*args, **kwargs)
-    def SetVirtualSizeHints(*args, **kwargs): return _core.Sizer_SetVirtualSizeHints(*args, **kwargs)
-    def Clear(*args, **kwargs): return _core.Sizer_Clear(*args, **kwargs)
-    def DeleteWindows(*args, **kwargs): return _core.Sizer_DeleteWindows(*args, **kwargs)
-    def GetChildren(*args, **kwargs): return _core.Sizer_GetChildren(*args, **kwargs)
-    def Show(*args, **kwargs): return _core.Sizer_Show(*args, **kwargs)
-    def Hide(*args, **kwargs): return _core.Sizer_Hide(*args, **kwargs)
-    def IsShown(*args, **kwargs): return _core.Sizer_IsShown(*args, **kwargs)
-    def ShowItems(*args, **kwargs): return _core.Sizer_ShowItems(*args, **kwargs)
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def RecalcSizes(*args, **kwargs):
+        """RecalcSizes()"""
+        return _core.Sizer_RecalcSizes(*args, **kwargs)
+
+    def CalcMin(*args, **kwargs):
+        """CalcMin() -> Size"""
+        return _core.Sizer_CalcMin(*args, **kwargs)
+
+    def Layout(*args, **kwargs):
+        """Layout()"""
+        return _core.Sizer_Layout(*args, **kwargs)
+
+    def Fit(*args, **kwargs):
+        """Fit(Window window) -> Size"""
+        return _core.Sizer_Fit(*args, **kwargs)
+
+    def FitInside(*args, **kwargs):
+        """FitInside(Window window)"""
+        return _core.Sizer_FitInside(*args, **kwargs)
+
+    def SetSizeHints(*args, **kwargs):
+        """SetSizeHints(Window window)"""
+        return _core.Sizer_SetSizeHints(*args, **kwargs)
+
+    def SetVirtualSizeHints(*args, **kwargs):
+        """SetVirtualSizeHints(Window window)"""
+        return _core.Sizer_SetVirtualSizeHints(*args, **kwargs)
+
+    def Clear(*args, **kwargs):
+        """Clear(bool delete_windows=False)"""
+        return _core.Sizer_Clear(*args, **kwargs)
+
+    def DeleteWindows(*args, **kwargs):
+        """DeleteWindows()"""
+        return _core.Sizer_DeleteWindows(*args, **kwargs)
+
+    def GetChildren(*args, **kwargs):
+        """GetChildren() -> PyObject"""
+        return _core.Sizer_GetChildren(*args, **kwargs)
+
+    def Show(*args, **kwargs):
+        """Show(PyObject item, bool show=True)"""
+        return _core.Sizer_Show(*args, **kwargs)
+
+    def Hide(*args, **kwargs):
+        """Hide(PyObject item)"""
+        return _core.Sizer_Hide(*args, **kwargs)
+
+    def IsShown(*args, **kwargs):
+        """IsShown(PyObject item) -> bool"""
+        return _core.Sizer_IsShown(*args, **kwargs)
+
+    def ShowItems(*args, **kwargs):
+        """ShowItems(bool show)"""
+        return _core.Sizer_ShowItems(*args, **kwargs)
+
 
 class SizerPtr(Sizer):
     def __init__(self, this):
@@ -3800,15 +6767,21 @@ class SizerPtr(Sizer):
 _core.Sizer_swigregister(SizerPtr)
 
 class PySizer(Sizer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPySizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PySizer"""
         newobj = _core.new_PySizer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, PySizer);self._setOORInfo(self)
-    def _setCallbackInfo(*args, **kwargs): return _core.PySizer__setCallbackInfo(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPySizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _core.PySizer__setCallbackInfo(*args, **kwargs)
+
 
 class PySizerPtr(PySizer):
     def __init__(self, this):
@@ -3820,18 +6793,33 @@ _core.PySizer_swigregister(PySizerPtr)
 #---------------------------------------------------------------------------
 
 class BoxSizer(Sizer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBoxSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int orient=HORIZONTAL) -> BoxSizer"""
         newobj = _core.new_BoxSizer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetOrientation(*args, **kwargs): return _core.BoxSizer_GetOrientation(*args, **kwargs)
-    def SetOrientation(*args, **kwargs): return _core.BoxSizer_SetOrientation(*args, **kwargs)
-    def RecalcSizes(*args, **kwargs): return _core.BoxSizer_RecalcSizes(*args, **kwargs)
-    def CalcMin(*args, **kwargs): return _core.BoxSizer_CalcMin(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBoxSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetOrientation(*args, **kwargs):
+        """GetOrientation() -> int"""
+        return _core.BoxSizer_GetOrientation(*args, **kwargs)
+
+    def SetOrientation(*args, **kwargs):
+        """SetOrientation(int orient)"""
+        return _core.BoxSizer_SetOrientation(*args, **kwargs)
+
+    def RecalcSizes(*args, **kwargs):
+        """RecalcSizes()"""
+        return _core.BoxSizer_RecalcSizes(*args, **kwargs)
+
+    def CalcMin(*args, **kwargs):
+        """CalcMin() -> Size"""
+        return _core.BoxSizer_CalcMin(*args, **kwargs)
+
 
 class BoxSizerPtr(BoxSizer):
     def __init__(self, this):
@@ -3843,17 +6831,29 @@ _core.BoxSizer_swigregister(BoxSizerPtr)
 #---------------------------------------------------------------------------
 
 class StaticBoxSizer(BoxSizer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxStaticBoxSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxStaticBox box, int orient=HORIZONTAL) -> StaticBoxSizer"""
         newobj = _core.new_StaticBoxSizer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetStaticBox(*args, **kwargs): return _core.StaticBoxSizer_GetStaticBox(*args, **kwargs)
-    def RecalcSizes(*args, **kwargs): return _core.StaticBoxSizer_RecalcSizes(*args, **kwargs)
-    def CalcMin(*args, **kwargs): return _core.StaticBoxSizer_CalcMin(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStaticBoxSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetStaticBox(*args, **kwargs):
+        """GetStaticBox() -> wxStaticBox"""
+        return _core.StaticBoxSizer_GetStaticBox(*args, **kwargs)
+
+    def RecalcSizes(*args, **kwargs):
+        """RecalcSizes()"""
+        return _core.StaticBoxSizer_RecalcSizes(*args, **kwargs)
+
+    def CalcMin(*args, **kwargs):
+        """CalcMin() -> Size"""
+        return _core.StaticBoxSizer_CalcMin(*args, **kwargs)
+
 
 class StaticBoxSizerPtr(StaticBoxSizer):
     def __init__(self, this):
@@ -3865,24 +6865,57 @@ _core.StaticBoxSizer_swigregister(StaticBoxSizerPtr)
 #---------------------------------------------------------------------------
 
 class GridSizer(Sizer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int rows=1, int cols=0, int vgap=0, int hgap=0) -> GridSizer"""
         newobj = _core.new_GridSizer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def RecalcSizes(*args, **kwargs): return _core.GridSizer_RecalcSizes(*args, **kwargs)
-    def CalcMin(*args, **kwargs): return _core.GridSizer_CalcMin(*args, **kwargs)
-    def SetCols(*args, **kwargs): return _core.GridSizer_SetCols(*args, **kwargs)
-    def SetRows(*args, **kwargs): return _core.GridSizer_SetRows(*args, **kwargs)
-    def SetVGap(*args, **kwargs): return _core.GridSizer_SetVGap(*args, **kwargs)
-    def SetHGap(*args, **kwargs): return _core.GridSizer_SetHGap(*args, **kwargs)
-    def GetCols(*args, **kwargs): return _core.GridSizer_GetCols(*args, **kwargs)
-    def GetRows(*args, **kwargs): return _core.GridSizer_GetRows(*args, **kwargs)
-    def GetVGap(*args, **kwargs): return _core.GridSizer_GetVGap(*args, **kwargs)
-    def GetHGap(*args, **kwargs): return _core.GridSizer_GetHGap(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def RecalcSizes(*args, **kwargs):
+        """RecalcSizes()"""
+        return _core.GridSizer_RecalcSizes(*args, **kwargs)
+
+    def CalcMin(*args, **kwargs):
+        """CalcMin() -> Size"""
+        return _core.GridSizer_CalcMin(*args, **kwargs)
+
+    def SetCols(*args, **kwargs):
+        """SetCols(int cols)"""
+        return _core.GridSizer_SetCols(*args, **kwargs)
+
+    def SetRows(*args, **kwargs):
+        """SetRows(int rows)"""
+        return _core.GridSizer_SetRows(*args, **kwargs)
+
+    def SetVGap(*args, **kwargs):
+        """SetVGap(int gap)"""
+        return _core.GridSizer_SetVGap(*args, **kwargs)
+
+    def SetHGap(*args, **kwargs):
+        """SetHGap(int gap)"""
+        return _core.GridSizer_SetHGap(*args, **kwargs)
+
+    def GetCols(*args, **kwargs):
+        """GetCols() -> int"""
+        return _core.GridSizer_GetCols(*args, **kwargs)
+
+    def GetRows(*args, **kwargs):
+        """GetRows() -> int"""
+        return _core.GridSizer_GetRows(*args, **kwargs)
+
+    def GetVGap(*args, **kwargs):
+        """GetVGap() -> int"""
+        return _core.GridSizer_GetVGap(*args, **kwargs)
+
+    def GetHGap(*args, **kwargs):
+        """GetHGap() -> int"""
+        return _core.GridSizer_GetHGap(*args, **kwargs)
+
 
 class GridSizerPtr(GridSizer):
     def __init__(self, this):
@@ -3897,24 +6930,65 @@ FLEX_GROWMODE_NONE = _core.FLEX_GROWMODE_NONE
 FLEX_GROWMODE_SPECIFIED = _core.FLEX_GROWMODE_SPECIFIED
 FLEX_GROWMODE_ALL = _core.FLEX_GROWMODE_ALL
 class FlexGridSizer(GridSizer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFlexGridSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int rows=1, int cols=0, int vgap=0, int hgap=0) -> FlexGridSizer"""
         newobj = _core.new_FlexGridSizer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def RecalcSizes(*args, **kwargs): return _core.FlexGridSizer_RecalcSizes(*args, **kwargs)
-    def CalcMin(*args, **kwargs): return _core.FlexGridSizer_CalcMin(*args, **kwargs)
-    def AddGrowableRow(*args, **kwargs): return _core.FlexGridSizer_AddGrowableRow(*args, **kwargs)
-    def RemoveGrowableRow(*args, **kwargs): return _core.FlexGridSizer_RemoveGrowableRow(*args, **kwargs)
-    def AddGrowableCol(*args, **kwargs): return _core.FlexGridSizer_AddGrowableCol(*args, **kwargs)
-    def RemoveGrowableCol(*args, **kwargs): return _core.FlexGridSizer_RemoveGrowableCol(*args, **kwargs)
-    def SetFlexibleDirection(*args, **kwargs): return _core.FlexGridSizer_SetFlexibleDirection(*args, **kwargs)
-    def GetFlexibleDirection(*args, **kwargs): return _core.FlexGridSizer_GetFlexibleDirection(*args, **kwargs)
-    def SetNonFlexibleGrowMode(*args, **kwargs): return _core.FlexGridSizer_SetNonFlexibleGrowMode(*args, **kwargs)
-    def GetNonFlexibleGrowMode(*args, **kwargs): return _core.FlexGridSizer_GetNonFlexibleGrowMode(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFlexGridSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def RecalcSizes(*args, **kwargs):
+        """RecalcSizes()"""
+        return _core.FlexGridSizer_RecalcSizes(*args, **kwargs)
+
+    def CalcMin(*args, **kwargs):
+        """CalcMin() -> Size"""
+        return _core.FlexGridSizer_CalcMin(*args, **kwargs)
+
+    def AddGrowableRow(*args, **kwargs):
+        """AddGrowableRow(size_t idx, int proportion=0)"""
+        return _core.FlexGridSizer_AddGrowableRow(*args, **kwargs)
+
+    def RemoveGrowableRow(*args, **kwargs):
+        """RemoveGrowableRow(size_t idx)"""
+        return _core.FlexGridSizer_RemoveGrowableRow(*args, **kwargs)
+
+    def AddGrowableCol(*args, **kwargs):
+        """AddGrowableCol(size_t idx, int proportion=0)"""
+        return _core.FlexGridSizer_AddGrowableCol(*args, **kwargs)
+
+    def RemoveGrowableCol(*args, **kwargs):
+        """RemoveGrowableCol(size_t idx)"""
+        return _core.FlexGridSizer_RemoveGrowableCol(*args, **kwargs)
+
+    def SetFlexibleDirection(*args, **kwargs):
+        """SetFlexibleDirection(int direction)"""
+        return _core.FlexGridSizer_SetFlexibleDirection(*args, **kwargs)
+
+    def GetFlexibleDirection(*args, **kwargs):
+        """GetFlexibleDirection() -> int"""
+        return _core.FlexGridSizer_GetFlexibleDirection(*args, **kwargs)
+
+    def SetNonFlexibleGrowMode(*args, **kwargs):
+        """SetNonFlexibleGrowMode(wxFlexSizerGrowMode mode)"""
+        return _core.FlexGridSizer_SetNonFlexibleGrowMode(*args, **kwargs)
+
+    def GetNonFlexibleGrowMode(*args, **kwargs):
+        """GetNonFlexibleGrowMode() -> wxFlexSizerGrowMode"""
+        return _core.FlexGridSizer_GetNonFlexibleGrowMode(*args, **kwargs)
+
+    def GetRowHeights(*args, **kwargs):
+        """GetRowHeights() -> wxArrayInt"""
+        return _core.FlexGridSizer_GetRowHeights(*args, **kwargs)
+
+    def GetColWidths(*args, **kwargs):
+        """GetColWidths() -> wxArrayInt"""
+        return _core.FlexGridSizer_GetColWidths(*args, **kwargs)
+
 
 class FlexGridSizerPtr(FlexGridSizer):
     def __init__(self, this):
@@ -3926,29 +7000,59 @@ _core.FlexGridSizer_swigregister(FlexGridSizerPtr)
 #---------------------------------------------------------------------------
 
 class GBPosition(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGBPosition instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int row=0, int col=0) -> GBPosition"""
         newobj = _core.new_GBPosition(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetRow(*args, **kwargs): return _core.GBPosition_GetRow(*args, **kwargs)
-    def GetCol(*args, **kwargs): return _core.GBPosition_GetCol(*args, **kwargs)
-    def SetRow(*args, **kwargs): return _core.GBPosition_SetRow(*args, **kwargs)
-    def SetCol(*args, **kwargs): return _core.GBPosition_SetCol(*args, **kwargs)
-    def __eq__(*args, **kwargs): return _core.GBPosition___eq__(*args, **kwargs)
-    def __ne__(*args, **kwargs): return _core.GBPosition___ne__(*args, **kwargs)
-    def asTuple(*args, **kwargs): return _core.GBPosition_asTuple(*args, **kwargs)
-    def __str__(self):                   return str(self.asTuple())
-    def __repr__(self):                  return 'wxGBPosition'+str(self.asTuple())
-    def __len__(self):                   return len(self.asTuple())
-    def __getitem__(self, index):        return self.asTuple()[index]
+    def GetRow(*args, **kwargs):
+        """GetRow() -> int"""
+        return _core.GBPosition_GetRow(*args, **kwargs)
+
+    def GetCol(*args, **kwargs):
+        """GetCol() -> int"""
+        return _core.GBPosition_GetCol(*args, **kwargs)
+
+    def SetRow(*args, **kwargs):
+        """SetRow(int row)"""
+        return _core.GBPosition_SetRow(*args, **kwargs)
+
+    def SetCol(*args, **kwargs):
+        """SetCol(int col)"""
+        return _core.GBPosition_SetCol(*args, **kwargs)
+
+    def __eq__(*args, **kwargs):
+        """__eq__(GBPosition p) -> bool"""
+        return _core.GBPosition___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(GBPosition p) -> bool"""
+        return _core.GBPosition___ne__(*args, **kwargs)
+
+    def Set(*args, **kwargs):
+        """Set(int row=0, int col=0)"""
+        return _core.GBPosition_Set(*args, **kwargs)
+
+    def Get(*args, **kwargs):
+        """Get() -> PyObject"""
+        return _core.GBPosition_Get(*args, **kwargs)
+
+    asTuple = Get
+    def __str__(self):                   return str(self.Get())
+    def __repr__(self):                  return 'wx.GBPosition'+str(self.Get())
+    def __len__(self):                   return len(self.Get())
+    def __getitem__(self, index):        return self.Get()[index]
     def __setitem__(self, index, val):
         if index == 0: self.SetRow(val)
         elif index == 1: self.SetCol(val)
         else: raise IndexError
-    def __nonzero__(self):               return self.asTuple() != (0,0)
+    def __nonzero__(self):               return self.Get() != (0,0)
     def __getinitargs__(self):           return ()
-    def __getstate__(self):              return self.asTuple()
+    def __getstate__(self):              return self.Get()
     def __setstate__(self, state):       self.Set(*state)
 
     row = property(GetRow, SetRow)
@@ -3963,29 +7067,59 @@ class GBPositionPtr(GBPosition):
 _core.GBPosition_swigregister(GBPositionPtr)
 
 class GBSpan(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGBSpan instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int rowspan=1, int colspan=1) -> GBSpan"""
         newobj = _core.new_GBSpan(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetRowspan(*args, **kwargs): return _core.GBSpan_GetRowspan(*args, **kwargs)
-    def GetColspan(*args, **kwargs): return _core.GBSpan_GetColspan(*args, **kwargs)
-    def SetRowspan(*args, **kwargs): return _core.GBSpan_SetRowspan(*args, **kwargs)
-    def SetColspan(*args, **kwargs): return _core.GBSpan_SetColspan(*args, **kwargs)
-    def __eq__(*args, **kwargs): return _core.GBSpan___eq__(*args, **kwargs)
-    def __ne__(*args, **kwargs): return _core.GBSpan___ne__(*args, **kwargs)
-    def asTuple(*args, **kwargs): return _core.GBSpan_asTuple(*args, **kwargs)
-    def __str__(self):                   return str(self.asTuple())
-    def __repr__(self):                  return 'wxGBSpan'+str(self.asTuple())
-    def __len__(self):                   return len(self.asTuple())
-    def __getitem__(self, index):        return self.asTuple()[index]
+    def GetRowspan(*args, **kwargs):
+        """GetRowspan() -> int"""
+        return _core.GBSpan_GetRowspan(*args, **kwargs)
+
+    def GetColspan(*args, **kwargs):
+        """GetColspan() -> int"""
+        return _core.GBSpan_GetColspan(*args, **kwargs)
+
+    def SetRowspan(*args, **kwargs):
+        """SetRowspan(int rowspan)"""
+        return _core.GBSpan_SetRowspan(*args, **kwargs)
+
+    def SetColspan(*args, **kwargs):
+        """SetColspan(int colspan)"""
+        return _core.GBSpan_SetColspan(*args, **kwargs)
+
+    def __eq__(*args, **kwargs):
+        """__eq__(GBSpan o) -> bool"""
+        return _core.GBSpan___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(GBSpan o) -> bool"""
+        return _core.GBSpan___ne__(*args, **kwargs)
+
+    def Set(*args, **kwargs):
+        """Set(int rowspan=1, int colspan=1)"""
+        return _core.GBSpan_Set(*args, **kwargs)
+
+    def Get(*args, **kwargs):
+        """Get() -> PyObject"""
+        return _core.GBSpan_Get(*args, **kwargs)
+
+    asTuple = Get
+    def __str__(self):                   return str(self.Get())
+    def __repr__(self):                  return 'wx.GBSpan'+str(self.Get())
+    def __len__(self):                   return len(self.Get())
+    def __getitem__(self, index):        return self.Get()[index]
     def __setitem__(self, index, val):
         if index == 0: self.SetRowspan(val)
         elif index == 1: self.SetColspan(val)
         else: raise IndexError
-    def __nonzero__(self):               return self.asTuple() != (0,0)
+    def __nonzero__(self):               return self.Get() != (0,0)
     def __getinitargs__(self):           return ()
-    def __getstate__(self):              return self.asTuple()
+    def __getstate__(self):              return self.Get()
     def __setstate__(self, state):       self.Set(*state)
 
     rowspan = property(GetRowspan, SetRowspan)
@@ -4000,23 +7134,50 @@ class GBSpanPtr(GBSpan):
 _core.GBSpan_swigregister(GBSpanPtr)
 
 class GBSizerItem(SizerItem):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGBSizerItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> GBSizerItem"""
         newobj = _core.new_GBSizerItem(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetPos(*args, **kwargs): return _core.GBSizerItem_GetPos(*args, **kwargs)
-    def GetPosTuple(self): return self.GetPos().asTuple() 
-    def GetSpan(*args, **kwargs): return _core.GBSizerItem_GetSpan(*args, **kwargs)
-    def GetSpanTuple(self): return self.GetSpan().asTuple() 
-    def SetPos(*args, **kwargs): return _core.GBSizerItem_SetPos(*args, **kwargs)
-    def SetSpan(*args, **kwargs): return _core.GBSizerItem_SetSpan(*args, **kwargs)
-    def Intersects(*args): return _core.GBSizerItem_Intersects(*args)
-    def GetEndPos(*args, **kwargs): return _core.GBSizerItem_GetEndPos(*args, **kwargs)
-    def GetGBSizer(*args, **kwargs): return _core.GBSizerItem_GetGBSizer(*args, **kwargs)
-    def SetGBSizer(*args, **kwargs): return _core.GBSizerItem_SetGBSizer(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGBSizerItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetPos(*args, **kwargs):
+        """GetPos() -> GBPosition"""
+        return _core.GBSizerItem_GetPos(*args, **kwargs)
+
+    def GetPosTuple(self): return self.GetPos().Get() 
+    def GetSpan(*args, **kwargs):
+        """GetSpan() -> GBSpan"""
+        return _core.GBSizerItem_GetSpan(*args, **kwargs)
+
+    def GetSpanTuple(self): return self.GetSpan().Get() 
+    def SetPos(*args, **kwargs):
+        """SetPos(GBPosition pos) -> bool"""
+        return _core.GBSizerItem_SetPos(*args, **kwargs)
+
+    def SetSpan(*args, **kwargs):
+        """SetSpan(GBSpan span) -> bool"""
+        return _core.GBSizerItem_SetSpan(*args, **kwargs)
+
+    def Intersects(*args):
+        """Intersects(GBSizerItem other) -> bool
+Intersects(GBPosition pos, GBSpan span) -> bool"""
+        return _core.GBSizerItem_Intersects(*args)
+
+    def GetEndPos(*args, **kwargs):
+        """GetEndPos(int row, int col)"""
+        return _core.GBSizerItem_GetEndPos(*args, **kwargs)
+
+    def GetGBSizer(*args, **kwargs):
+        """GetGBSizer() -> GridBagSizer"""
+        return _core.GBSizerItem_GetGBSizer(*args, **kwargs)
+
+    def SetGBSizer(*args, **kwargs):
+        """SetGBSizer(GridBagSizer sizer)"""
+        return _core.GBSizerItem_SetGBSizer(*args, **kwargs)
+
 
 class GBSizerItemPtr(GBSizerItem):
     def __init__(self, this):
@@ -4027,42 +7188,107 @@ _core.GBSizerItem_swigregister(GBSizerItemPtr)
 DefaultSpan = cvar.DefaultSpan
 
 def GBSizerItemWindow(*args, **kwargs):
+    """GBSizerItemWindow(Window window, GBPosition pos, GBSpan span, int flag, 
+    int border, Object userData) -> GBSizerItem"""
     val = _core.new_GBSizerItemWindow(*args, **kwargs)
     val.thisown = 1
     return val
 
 def GBSizerItemSizer(*args, **kwargs):
+    """GBSizerItemSizer(Sizer sizer, GBPosition pos, GBSpan span, int flag, 
+    int border, Object userData) -> GBSizerItem"""
     val = _core.new_GBSizerItemSizer(*args, **kwargs)
     val.thisown = 1
     return val
 
 def GBSizerItemSpacer(*args, **kwargs):
+    """GBSizerItemSpacer(int width, int height, GBPosition pos, GBSpan span, 
+    int flag, int border, Object userData) -> GBSizerItem"""
     val = _core.new_GBSizerItemSpacer(*args, **kwargs)
     val.thisown = 1
     return val
 
 class GridBagSizer(FlexGridSizer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridBagSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int vgap=0, int hgap=0) -> GridBagSizer"""
         newobj = _core.new_GridBagSizer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def Add(*args, **kwargs): return _core.GridBagSizer_Add(*args, **kwargs)
-    def AddItem(*args, **kwargs): return _core.GridBagSizer_AddItem(*args, **kwargs)
-    def GetEmptyCellSize(*args, **kwargs): return _core.GridBagSizer_GetEmptyCellSize(*args, **kwargs)
-    def SetEmptyCellSize(*args, **kwargs): return _core.GridBagSizer_SetEmptyCellSize(*args, **kwargs)
-    def GetItemPosition(*args): return _core.GridBagSizer_GetItemPosition(*args)
-    def SetItemPosition(*args): return _core.GridBagSizer_SetItemPosition(*args)
-    def GetItemSpan(*args): return _core.GridBagSizer_GetItemSpan(*args)
-    def SetItemSpan(*args): return _core.GridBagSizer_SetItemSpan(*args)
-    def FindItem(*args): return _core.GridBagSizer_FindItem(*args)
-    def FindItemAtPosition(*args, **kwargs): return _core.GridBagSizer_FindItemAtPosition(*args, **kwargs)
-    def FindItemWithData(*args, **kwargs): return _core.GridBagSizer_FindItemWithData(*args, **kwargs)
-    def RecalcSizes(*args, **kwargs): return _core.GridBagSizer_RecalcSizes(*args, **kwargs)
-    def CalcMin(*args, **kwargs): return _core.GridBagSizer_CalcMin(*args, **kwargs)
-    def CheckForIntersection(*args): return _core.GridBagSizer_CheckForIntersection(*args)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridBagSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Add(*args, **kwargs):
+        """Add(PyObject item, GBPosition pos, GBSpan span=DefaultSpan, 
+    int flag=0, int border=0, PyObject userData=None) -> bool"""
+        return _core.GridBagSizer_Add(*args, **kwargs)
+
+    def AddItem(*args, **kwargs):
+        """AddItem(GBSizerItem item) -> bool"""
+        return _core.GridBagSizer_AddItem(*args, **kwargs)
+
+    def GetEmptyCellSize(*args, **kwargs):
+        """GetEmptyCellSize() -> Size"""
+        return _core.GridBagSizer_GetEmptyCellSize(*args, **kwargs)
+
+    def SetEmptyCellSize(*args, **kwargs):
+        """SetEmptyCellSize(Size sz)"""
+        return _core.GridBagSizer_SetEmptyCellSize(*args, **kwargs)
+
+    def GetItemPosition(*args):
+        """GetItemPosition(Window window) -> GBPosition
+GetItemPosition(Sizer sizer) -> GBPosition
+GetItemPosition(size_t index) -> GBPosition"""
+        return _core.GridBagSizer_GetItemPosition(*args)
+
+    def SetItemPosition(*args):
+        """SetItemPosition(Window window, GBPosition pos) -> bool
+SetItemPosition(Sizer sizer, GBPosition pos) -> bool
+SetItemPosition(size_t index, GBPosition pos) -> bool"""
+        return _core.GridBagSizer_SetItemPosition(*args)
+
+    def GetItemSpan(*args):
+        """GetItemSpan(Window window) -> GBSpan
+GetItemSpan(Sizer sizer) -> GBSpan
+GetItemSpan(size_t index) -> GBSpan"""
+        return _core.GridBagSizer_GetItemSpan(*args)
+
+    def SetItemSpan(*args):
+        """SetItemSpan(Window window, GBSpan span) -> bool
+SetItemSpan(Sizer sizer, GBSpan span) -> bool
+SetItemSpan(size_t index, GBSpan span) -> bool"""
+        return _core.GridBagSizer_SetItemSpan(*args)
+
+    def FindItem(*args):
+        """FindItem(Window window) -> GBSizerItem
+FindItem(Sizer sizer) -> GBSizerItem"""
+        return _core.GridBagSizer_FindItem(*args)
+
+    def FindItemAtPosition(*args, **kwargs):
+        """FindItemAtPosition(GBPosition pos) -> GBSizerItem"""
+        return _core.GridBagSizer_FindItemAtPosition(*args, **kwargs)
+
+    def FindItemAtPoint(*args, **kwargs):
+        """FindItemAtPoint(Point pt) -> GBSizerItem"""
+        return _core.GridBagSizer_FindItemAtPoint(*args, **kwargs)
+
+    def FindItemWithData(*args, **kwargs):
+        """FindItemWithData(Object userData) -> GBSizerItem"""
+        return _core.GridBagSizer_FindItemWithData(*args, **kwargs)
+
+    def RecalcSizes(*args, **kwargs):
+        """RecalcSizes()"""
+        return _core.GridBagSizer_RecalcSizes(*args, **kwargs)
+
+    def CalcMin(*args, **kwargs):
+        """CalcMin() -> Size"""
+        return _core.GridBagSizer_CalcMin(*args, **kwargs)
+
+    def CheckForIntersection(*args):
+        """CheckForIntersection(GBSizerItem item, GBSizerItem excludeItem=None) -> bool
+CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None) -> bool"""
+        return _core.GridBagSizer_CheckForIntersection(*args)
+
 
 class GridBagSizerPtr(GridBagSizer):
     def __init__(self, this):
@@ -4093,35 +7319,115 @@ RightOf = _core.RightOf
 SameAs = _core.SameAs
 Absolute = _core.Absolute
 class IndividualLayoutConstraint(Object):
-    def Set(*args, **kwargs): return _core.IndividualLayoutConstraint_Set(*args, **kwargs)
-    def LeftOf(*args, **kwargs): return _core.IndividualLayoutConstraint_LeftOf(*args, **kwargs)
-    def RightOf(*args, **kwargs): return _core.IndividualLayoutConstraint_RightOf(*args, **kwargs)
-    def Above(*args, **kwargs): return _core.IndividualLayoutConstraint_Above(*args, **kwargs)
-    def Below(*args, **kwargs): return _core.IndividualLayoutConstraint_Below(*args, **kwargs)
-    def SameAs(*args, **kwargs): return _core.IndividualLayoutConstraint_SameAs(*args, **kwargs)
-    def PercentOf(*args, **kwargs): return _core.IndividualLayoutConstraint_PercentOf(*args, **kwargs)
-    def Absolute(*args, **kwargs): return _core.IndividualLayoutConstraint_Absolute(*args, **kwargs)
-    def Unconstrained(*args, **kwargs): return _core.IndividualLayoutConstraint_Unconstrained(*args, **kwargs)
-    def AsIs(*args, **kwargs): return _core.IndividualLayoutConstraint_AsIs(*args, **kwargs)
-    def GetOtherWindow(*args, **kwargs): return _core.IndividualLayoutConstraint_GetOtherWindow(*args, **kwargs)
-    def GetMyEdge(*args, **kwargs): return _core.IndividualLayoutConstraint_GetMyEdge(*args, **kwargs)
-    def SetEdge(*args, **kwargs): return _core.IndividualLayoutConstraint_SetEdge(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _core.IndividualLayoutConstraint_SetValue(*args, **kwargs)
-    def GetMargin(*args, **kwargs): return _core.IndividualLayoutConstraint_GetMargin(*args, **kwargs)
-    def SetMargin(*args, **kwargs): return _core.IndividualLayoutConstraint_SetMargin(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _core.IndividualLayoutConstraint_GetValue(*args, **kwargs)
-    def GetPercent(*args, **kwargs): return _core.IndividualLayoutConstraint_GetPercent(*args, **kwargs)
-    def GetOtherEdge(*args, **kwargs): return _core.IndividualLayoutConstraint_GetOtherEdge(*args, **kwargs)
-    def GetDone(*args, **kwargs): return _core.IndividualLayoutConstraint_GetDone(*args, **kwargs)
-    def SetDone(*args, **kwargs): return _core.IndividualLayoutConstraint_SetDone(*args, **kwargs)
-    def GetRelationship(*args, **kwargs): return _core.IndividualLayoutConstraint_GetRelationship(*args, **kwargs)
-    def SetRelationship(*args, **kwargs): return _core.IndividualLayoutConstraint_SetRelationship(*args, **kwargs)
-    def ResetIfWin(*args, **kwargs): return _core.IndividualLayoutConstraint_ResetIfWin(*args, **kwargs)
-    def SatisfyConstraint(*args, **kwargs): return _core.IndividualLayoutConstraint_SatisfyConstraint(*args, **kwargs)
-    def GetEdge(*args, **kwargs): return _core.IndividualLayoutConstraint_GetEdge(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxIndividualLayoutConstraint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Set(*args, **kwargs):
+        """Set(wxRelationship rel, Window otherW, wxEdge otherE, int val=0, 
+    int marg=wxLAYOUT_DEFAULT_MARGIN)"""
+        return _core.IndividualLayoutConstraint_Set(*args, **kwargs)
+
+    def LeftOf(*args, **kwargs):
+        """LeftOf(Window sibling, int marg=0)"""
+        return _core.IndividualLayoutConstraint_LeftOf(*args, **kwargs)
+
+    def RightOf(*args, **kwargs):
+        """RightOf(Window sibling, int marg=0)"""
+        return _core.IndividualLayoutConstraint_RightOf(*args, **kwargs)
+
+    def Above(*args, **kwargs):
+        """Above(Window sibling, int marg=0)"""
+        return _core.IndividualLayoutConstraint_Above(*args, **kwargs)
+
+    def Below(*args, **kwargs):
+        """Below(Window sibling, int marg=0)"""
+        return _core.IndividualLayoutConstraint_Below(*args, **kwargs)
+
+    def SameAs(*args, **kwargs):
+        """SameAs(Window otherW, wxEdge edge, int marg=0)"""
+        return _core.IndividualLayoutConstraint_SameAs(*args, **kwargs)
+
+    def PercentOf(*args, **kwargs):
+        """PercentOf(Window otherW, wxEdge wh, int per)"""
+        return _core.IndividualLayoutConstraint_PercentOf(*args, **kwargs)
+
+    def Absolute(*args, **kwargs):
+        """Absolute(int val)"""
+        return _core.IndividualLayoutConstraint_Absolute(*args, **kwargs)
+
+    def Unconstrained(*args, **kwargs):
+        """Unconstrained()"""
+        return _core.IndividualLayoutConstraint_Unconstrained(*args, **kwargs)
+
+    def AsIs(*args, **kwargs):
+        """AsIs()"""
+        return _core.IndividualLayoutConstraint_AsIs(*args, **kwargs)
+
+    def GetOtherWindow(*args, **kwargs):
+        """GetOtherWindow() -> Window"""
+        return _core.IndividualLayoutConstraint_GetOtherWindow(*args, **kwargs)
+
+    def GetMyEdge(*args, **kwargs):
+        """GetMyEdge() -> wxEdge"""
+        return _core.IndividualLayoutConstraint_GetMyEdge(*args, **kwargs)
+
+    def SetEdge(*args, **kwargs):
+        """SetEdge(wxEdge which)"""
+        return _core.IndividualLayoutConstraint_SetEdge(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(int v)"""
+        return _core.IndividualLayoutConstraint_SetValue(*args, **kwargs)
+
+    def GetMargin(*args, **kwargs):
+        """GetMargin() -> int"""
+        return _core.IndividualLayoutConstraint_GetMargin(*args, **kwargs)
+
+    def SetMargin(*args, **kwargs):
+        """SetMargin(int m)"""
+        return _core.IndividualLayoutConstraint_SetMargin(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> int"""
+        return _core.IndividualLayoutConstraint_GetValue(*args, **kwargs)
+
+    def GetPercent(*args, **kwargs):
+        """GetPercent() -> int"""
+        return _core.IndividualLayoutConstraint_GetPercent(*args, **kwargs)
+
+    def GetOtherEdge(*args, **kwargs):
+        """GetOtherEdge() -> int"""
+        return _core.IndividualLayoutConstraint_GetOtherEdge(*args, **kwargs)
+
+    def GetDone(*args, **kwargs):
+        """GetDone() -> bool"""
+        return _core.IndividualLayoutConstraint_GetDone(*args, **kwargs)
+
+    def SetDone(*args, **kwargs):
+        """SetDone(bool d)"""
+        return _core.IndividualLayoutConstraint_SetDone(*args, **kwargs)
+
+    def GetRelationship(*args, **kwargs):
+        """GetRelationship() -> wxRelationship"""
+        return _core.IndividualLayoutConstraint_GetRelationship(*args, **kwargs)
+
+    def SetRelationship(*args, **kwargs):
+        """SetRelationship(wxRelationship r)"""
+        return _core.IndividualLayoutConstraint_SetRelationship(*args, **kwargs)
+
+    def ResetIfWin(*args, **kwargs):
+        """ResetIfWin(Window otherW) -> bool"""
+        return _core.IndividualLayoutConstraint_ResetIfWin(*args, **kwargs)
+
+    def SatisfyConstraint(*args, **kwargs):
+        """SatisfyConstraint(LayoutConstraints constraints, Window win) -> bool"""
+        return _core.IndividualLayoutConstraint_SatisfyConstraint(*args, **kwargs)
+
+    def GetEdge(*args, **kwargs):
+        """GetEdge(wxEdge which, Window thisWin, Window other) -> int"""
+        return _core.IndividualLayoutConstraint_GetEdge(*args, **kwargs)
+
 
 class IndividualLayoutConstraintPtr(IndividualLayoutConstraint):
     def __init__(self, this):
@@ -4131,6 +7437,9 @@ class IndividualLayoutConstraintPtr(IndividualLayoutConstraint):
 _core.IndividualLayoutConstraint_swigregister(IndividualLayoutConstraintPtr)
 
 class LayoutConstraints(Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxLayoutConstraints instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     left = property(_core.LayoutConstraints_left_get)
     top = property(_core.LayoutConstraints_top_get)
     right = property(_core.LayoutConstraints_right_get)
@@ -4140,14 +7449,19 @@ class LayoutConstraints(Object):
     centreX = property(_core.LayoutConstraints_centreX_get)
     centreY = property(_core.LayoutConstraints_centreY_get)
     def __init__(self, *args, **kwargs):
+        """__init__() -> LayoutConstraints"""
         newobj = _core.new_LayoutConstraints(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SatisfyConstraints(*args, **kwargs): return _core.LayoutConstraints_SatisfyConstraints(*args, **kwargs)
-    def AreSatisfied(*args, **kwargs): return _core.LayoutConstraints_AreSatisfied(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLayoutConstraints instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SatisfyConstraints(*args, **kwargs):
+        """SatisfyConstraints(Window win, int OUTPUT) -> bool"""
+        return _core.LayoutConstraints_SatisfyConstraints(*args, **kwargs)
+
+    def AreSatisfied(*args, **kwargs):
+        """AreSatisfied() -> bool"""
+        return _core.LayoutConstraints_AreSatisfied(*args, **kwargs)
+
 
 class LayoutConstraintsPtr(LayoutConstraints):
     def __init__(self, this):
diff --git a/wxPython/src/gtk/core_wrap.cpp b/wxPython/src/gtk/core_wrap.cpp
index d5c2cc172e..c09b1941fb 100644
--- a/wxPython/src/gtk/core_wrap.cpp
+++ b/wxPython/src/gtk/core_wrap.cpp
@@ -425,12 +425,12 @@ PyObject* wxPyConstructObject(void* ptr,
 // Extract a pointer to the wrapped C++ object from a Python proxy object.
 // Ensures that the proxy object is of the specified (or derived) type.  If
 // not able to perform the conversion then a Python exception is set and the
-// error should be handled properly in the caller.  Returns true on success.
+// error should be handled properly in the caller.  Returns True on success.
 bool wxPyConvertSwigPtr(PyObject* obj, void **ptr,
                         const wxChar* className) {
 
     swig_type_info* swigType = wxPyFindSwigType(className);
-    wxCHECK_MSG(swigType != NULL, false, wxT("Unknown type in wxPyConvertSwigPtr"));
+    wxCHECK_MSG(swigType != NULL, False, wxT("Unknown type in wxPyConvertSwigPtr"));
 
     return SWIG_Python_ConvertPtr(obj, ptr, swigType, SWIG_POINTER_EXCEPTION) != -1;
 }
@@ -550,7 +550,7 @@ static wxPyCoreAPI API = {
 
 
     DECLARE_DEF_STRING(EmptyString);
-    DECLARE_DEF_STRING(PanelNameStr);
+//    DECLARE_DEF_STRING(PanelNameStr);
 
 
 #if ! wxUSE_HOTKEY
@@ -576,7 +576,7 @@ void wxObject_Destroy(wxObject *self){
 #define wxCURSOR_COPY_ARROW wxCURSOR_ARROW
 #endif
 
-PyObject *wxSize_asTuple(wxSize *self){
+PyObject *wxSize_Get(wxSize *self){
             wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
@@ -588,7 +588,7 @@ void wxRealPoint_Set(wxRealPoint *self,double x,double y){
             self->x = x;
             self->y = y;
         }
-PyObject *wxRealPoint_asTuple(wxRealPoint *self){
+PyObject *wxRealPoint_Get(wxRealPoint *self){
             wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->x));
@@ -600,7 +600,7 @@ void wxPoint_Set(wxPoint *self,long x,long y){
             self->x = x;
             self->y = y;
         }
-PyObject *wxPoint_asTuple(wxPoint *self){
+PyObject *wxPoint_Get(wxPoint *self){
             wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
@@ -614,7 +614,7 @@ void wxRect_Set(wxRect *self,int x,int y,int width,int height){
             self->width = width;
             self->height = height;
         }
-PyObject *wxRect_asTuple(wxRect *self){
+PyObject *wxRect_Get(wxRect *self){
             wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(4);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
@@ -637,7 +637,7 @@ PyObject *wxRect_asTuple(wxRect *self){
         if (dest != wxRect(0,0,0,0)) {
             wxPyBeginBlockThreads();
             wxRect* newRect = new wxRect(dest);
-            obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), true);
+            obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), True);
             wxPyEndBlockThreads();
             return obj;
         }
@@ -676,7 +676,7 @@ void wxPoint2D_Set(wxPoint2D *self,double x,double y){
             self->m_x = x;
             self->m_y = y;
         }
-PyObject *wxPoint2D_asTuple(wxPoint2D *self){
+PyObject *wxPoint2D_Get(wxPoint2D *self){
             wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->m_x));
@@ -795,7 +795,7 @@ wxImage *new_wxImage(int width,int height,unsigned char *data){
                 return NULL;
             }
             memcpy(copy, data, width*height*3);
-            return new wxImage(width, height, copy, FALSE);
+            return new wxImage(width, height, copy, False);
         }
 PyObject *wxImage_GetData(wxImage *self){
             unsigned char* data = self->GetData();
@@ -985,6 +985,7 @@ int PyApp_GetComCtl32Version(){ PyErr_SetNone(PyExc_NotImplementedError); return
 
 
 
+ static const wxString wxPyPanelNameStr(wxPanelNameStr); 
 PyObject *wxWindow_GetChildren(wxWindow *self){
             wxWindowList& list = self->GetChildren();
             return wxPy_ConvertList(&list);
@@ -993,14 +994,14 @@ bool wxWindow_RegisterHotKey(wxWindow *self,int hotkeyId,int modifiers,int keyco
         
 
 
-            return FALSE;
+            return False;
         
         }
 bool wxWindow_UnregisterHotKey(wxWindow *self,int hotkeyId){
         
 
 
-            return FALSE;
+            return False;
         
         }
 long wxWindow_GetHandle(wxWindow *self){
@@ -1095,8 +1096,8 @@ PyObject *wxSizerItem_GetUserData(wxSizerItem *self){
 
 struct wxPySizerItemInfo {
     wxPySizerItemInfo()
-        : window(NULL), sizer(NULL), gotSize(false),
-          size(wxDefaultSize), gotPos(false), pos(-1)
+        : window(NULL), sizer(NULL), gotSize(False),
+          size(wxDefaultSize), gotPos(False), pos(-1)
     {}
     
     wxWindow* window;
@@ -1127,13 +1128,13 @@ static wxPySizerItemInfo wxPySizerItemTypeHelper(PyObject* item, bool checkSize,
             // try wxSize or (w,h)
             if ( checkSize && wxSize_helper(item, &sizePtr)) {
                 info.size = *sizePtr;
-                info.gotSize = true;
+                info.gotSize = True;
             }
 
             // or a single int
             if (checkIdx && PyInt_Check(item)) {
                 info.pos = PyInt_AsLong(item);
-                info.gotPos = true;
+                info.gotPos = True;
             }
         }
     }
@@ -1161,7 +1162,7 @@ void wxSizer_Add(wxSizer *self,PyObject *item,int proportion,int flag,int border
             
             wxPyUserData* data = NULL;
             wxPyBeginBlockThreads();
-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False);
             if ( userData && (info.window || info.sizer || info.gotSize) )
                 data = new wxPyUserData(userData);
             wxPyEndBlockThreads();
@@ -1179,7 +1180,7 @@ void wxSizer_Insert(wxSizer *self,int before,PyObject *item,int proportion,int f
 
             wxPyUserData* data = NULL;
             wxPyBeginBlockThreads();
-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False);
             if ( userData && (info.window || info.sizer || info.gotSize) )
                 data = new wxPyUserData(userData);
             wxPyEndBlockThreads();
@@ -1197,7 +1198,7 @@ void wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion,int flag,int bo
 
             wxPyUserData* data = NULL;
             wxPyBeginBlockThreads();
-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False);
             if ( userData && (info.window || info.sizer || info.gotSize) )
                 data = new wxPyUserData(userData);
             wxPyEndBlockThreads();
@@ -1213,7 +1214,7 @@ void wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion,int flag,int bo
         }
 bool wxSizer_Remove(wxSizer *self,PyObject *item){
             wxPyBeginBlockThreads();
-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, True);
             wxPyEndBlockThreads();
             if ( info.window )
                 return self->Remove(info.window);
@@ -1222,11 +1223,11 @@ bool wxSizer_Remove(wxSizer *self,PyObject *item){
             else if ( info.gotPos )
                 return self->Remove(info.pos);
             else 
-                return FALSE;
+                return False;
         }
-void wxSizer__SetItemMinSize(wxSizer *self,PyObject *item,wxSize size){
+void wxSizer__SetItemMinSize(wxSizer *self,PyObject *item,wxSize const &size){
             wxPyBeginBlockThreads();
-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, True);
             wxPyEndBlockThreads();
             if ( info.window )
                 self->SetItemMinSize(info.window, size);
@@ -1240,27 +1241,27 @@ PyObject *wxSizer_GetChildren(wxSizer *self){
             return wxPy_ConvertList(&list);
         }
 void wxSizer_Show(wxSizer *self,PyObject *item,bool show){
-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, false);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False);
             if ( info.window )
                 self->Show(info.window, show);
             else if ( info.sizer )
                 self->Show(info.sizer, show);
         }
 void wxSizer_Hide(wxSizer *self,PyObject *item){
-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, false);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False);
             if ( info.window )
                 self->Hide(info.window);
             else if ( info.sizer )
                 self->Hide(info.sizer);
         }
 bool wxSizer_IsShown(wxSizer *self,PyObject *item){
-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, false);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False);
             if ( info.window ) 
                 return self->IsShown(info.window);
             else if ( info.sizer ) 
                 return self->IsShown(info.sizer);
             else
-                return false;
+                return False;
         }
 
 // See pyclasses.h    
@@ -1282,7 +1283,11 @@ bool wxGBSpan_helper(PyObject* source, wxGBSpan** obj)
 }
 
 
-PyObject *wxGBPosition_asTuple(wxGBPosition *self){
+void wxGBPosition_Set(wxGBPosition *self,int row,int col){
+            self->SetRow(row);
+            self->SetCol(col);
+        }
+PyObject *wxGBPosition_Get(wxGBPosition *self){
             wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
@@ -1290,7 +1295,11 @@ PyObject *wxGBPosition_asTuple(wxGBPosition *self){
             wxPyEndBlockThreads();
             return tup;
         }
-PyObject *wxGBSpan_asTuple(wxGBSpan *self){
+void wxGBSpan_Set(wxGBSpan *self,int rowspan,int colspan){
+            self->SetRowspan(rowspan);
+            self->SetColspan(colspan);
+        }
+PyObject *wxGBSpan_Get(wxGBSpan *self){
             wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRowspan()));
@@ -1302,7 +1311,7 @@ bool wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const &
 
             wxPyUserData* data = NULL;
             wxPyBeginBlockThreads();
-            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, True, False);
             if ( userData && (info.window || info.sizer || info.gotSize) )
                 data = new wxPyUserData(userData);
             wxPyEndBlockThreads();
@@ -1315,7 +1324,7 @@ bool wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const &
             else if (info.gotSize)
                 return self->Add(info.size.GetWidth(), info.size.GetHeight(),
                                  pos, span, flag, border, data);
-            return false;
+            return False;
         }
 
 
@@ -1532,7 +1541,7 @@ static PyObject *_wrap_Size___eq__(PyObject *self, PyObject *args, PyObject *kwa
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxSize const *)arg1)->operator ==((wxSize const &)*arg2);
+        result = (bool)(arg1)->operator ==((wxSize const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -1564,7 +1573,7 @@ static PyObject *_wrap_Size___ne__(PyObject *self, PyObject *args, PyObject *kwa
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxSize const *)arg1)->operator !=((wxSize const &)*arg2);
+        result = (bool)(arg1)->operator !=((wxSize const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -1717,7 +1726,7 @@ static PyObject *_wrap_Size_Set(PyObject *self, PyObject *args, PyObject *kwargs
     int arg3 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "xx",(char *) "yy", NULL 
+        (char *) "self",(char *) "w",(char *) "h", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oii:Size_Set",kwnames,&obj0,&arg2,&arg3)) goto fail;
@@ -1836,57 +1845,7 @@ static PyObject *_wrap_Size_GetHeight(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Size_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxSize *arg1 = (wxSize *) 0 ;
-    int result;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_GetX",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (int)((wxSize const *)arg1)->GetX();
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = PyInt_FromLong((long)result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_Size_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxSize *arg1 = (wxSize *) 0 ;
-    int result;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_GetY",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (int)((wxSize const *)arg1)->GetY();
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = PyInt_FromLong((long)result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_Size_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     PyObject *result;
@@ -1895,11 +1854,11 @@ static PyObject *_wrap_Size_asTuple(PyObject *self, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_asTuple",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Size_Get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (PyObject *)wxSize_asTuple(arg1);
+        result = (PyObject *)wxSize_Get(arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -2046,11 +2005,11 @@ static PyObject *_wrap_delete_RealPoint(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_RealPoint___add__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     wxRealPoint *arg2 = 0 ;
-    wxRealPoint result;
+    bool result;
     wxRealPoint temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -2058,7 +2017,7 @@ static PyObject *_wrap_RealPoint___add__(PyObject *self, PyObject *args, PyObjec
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___add__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___eq__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         arg2 = &temp2;
@@ -2066,27 +2025,23 @@ static PyObject *_wrap_RealPoint___add__(PyObject *self, PyObject *args, PyObjec
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxRealPoint const *)arg1)->operator +((wxRealPoint const &)*arg2);
+        result = (bool)(arg1)->operator ==((wxRealPoint const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    {
-        wxRealPoint * resultptr;
-        resultptr = new wxRealPoint((wxRealPoint &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1);
-    }
+    resultobj = PyInt_FromLong((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RealPoint___sub__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     wxRealPoint *arg2 = 0 ;
-    wxRealPoint result;
+    bool result;
     wxRealPoint temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -2094,7 +2049,7 @@ static PyObject *_wrap_RealPoint___sub__(PyObject *self, PyObject *args, PyObjec
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___sub__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___ne__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         arg2 = &temp2;
@@ -2102,27 +2057,23 @@ static PyObject *_wrap_RealPoint___sub__(PyObject *self, PyObject *args, PyObjec
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxRealPoint const *)arg1)->operator -((wxRealPoint const &)*arg2);
+        result = (bool)(arg1)->operator !=((wxRealPoint const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    {
-        wxRealPoint * resultptr;
-        resultptr = new wxRealPoint((wxRealPoint &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1);
-    }
+    resultobj = PyInt_FromLong((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint___add__(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     wxRealPoint *arg2 = 0 ;
-    bool result;
+    wxRealPoint result;
     wxRealPoint temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -2130,7 +2081,7 @@ static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___eq__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___add__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         arg2 = &temp2;
@@ -2138,23 +2089,27 @@ static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxRealPoint const *)arg1)->operator ==((wxRealPoint const &)*arg2);
+        result = (arg1)->operator +((wxRealPoint const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        wxRealPoint * resultptr;
+        resultptr = new wxRealPoint((wxRealPoint &) result);
+        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint___sub__(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     wxRealPoint *arg2 = 0 ;
-    bool result;
+    wxRealPoint result;
     wxRealPoint temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -2162,7 +2117,7 @@ static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject
         (char *) "self",(char *) "pt", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___ne__",kwnames,&obj0,&obj1)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___sub__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         arg2 = &temp2;
@@ -2170,12 +2125,16 @@ static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxRealPoint const *)arg1)->operator !=((wxRealPoint const &)*arg2);
+        result = (arg1)->operator -((wxRealPoint const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = PyInt_FromLong((long)result);
+    {
+        wxRealPoint * resultptr;
+        resultptr = new wxRealPoint((wxRealPoint &) result);
+        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRealPoint, 1);
+    }
     return resultobj;
     fail:
     return NULL;
@@ -2208,7 +2167,7 @@ static PyObject *_wrap_RealPoint_Set(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_RealPoint_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     PyObject *result;
@@ -2217,11 +2176,11 @@ static PyObject *_wrap_RealPoint_asTuple(PyObject *self, PyObject *args, PyObjec
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RealPoint_asTuple",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RealPoint_Get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRealPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (PyObject *)wxRealPoint_asTuple(arg1);
+        result = (PyObject *)wxRealPoint_Get(arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -2377,7 +2336,7 @@ static PyObject *_wrap_Point___eq__(PyObject *self, PyObject *args, PyObject *kw
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "p", NULL 
+        (char *) "self",(char *) "pt", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___eq__",kwnames,&obj0,&obj1)) goto fail;
@@ -2388,7 +2347,7 @@ static PyObject *_wrap_Point___eq__(PyObject *self, PyObject *args, PyObject *kw
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxPoint const *)arg1)->operator ==((wxPoint const &)*arg2);
+        result = (bool)(arg1)->operator ==((wxPoint const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -2409,7 +2368,7 @@ static PyObject *_wrap_Point___ne__(PyObject *self, PyObject *args, PyObject *kw
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "p", NULL 
+        (char *) "self",(char *) "pt", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___ne__",kwnames,&obj0,&obj1)) goto fail;
@@ -2420,7 +2379,7 @@ static PyObject *_wrap_Point___ne__(PyObject *self, PyObject *args, PyObject *kw
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxPoint const *)arg1)->operator !=((wxPoint const &)*arg2);
+        result = (bool)(arg1)->operator !=((wxPoint const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -2441,7 +2400,7 @@ static PyObject *_wrap_Point___add__(PyObject *self, PyObject *args, PyObject *k
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "p", NULL 
+        (char *) "self",(char *) "pt", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___add__",kwnames,&obj0,&obj1)) goto fail;
@@ -2452,7 +2411,7 @@ static PyObject *_wrap_Point___add__(PyObject *self, PyObject *args, PyObject *k
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxPoint const *)arg1)->operator +((wxPoint const &)*arg2);
+        result = (arg1)->operator +((wxPoint const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -2477,7 +2436,7 @@ static PyObject *_wrap_Point___sub__(PyObject *self, PyObject *args, PyObject *k
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "p", NULL 
+        (char *) "self",(char *) "pt", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___sub__",kwnames,&obj0,&obj1)) goto fail;
@@ -2488,7 +2447,7 @@ static PyObject *_wrap_Point___sub__(PyObject *self, PyObject *args, PyObject *k
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxPoint const *)arg1)->operator -((wxPoint const &)*arg2);
+        result = (arg1)->operator -((wxPoint const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -2513,7 +2472,7 @@ static PyObject *_wrap_Point___iadd__(PyObject *self, PyObject *args, PyObject *
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "p", NULL 
+        (char *) "self",(char *) "pt", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___iadd__",kwnames,&obj0,&obj1)) goto fail;
@@ -2548,7 +2507,7 @@ static PyObject *_wrap_Point___isub__(PyObject *self, PyObject *args, PyObject *
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "self",(char *) "p", NULL 
+        (char *) "self",(char *) "pt", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___isub__",kwnames,&obj0,&obj1)) goto fail;
@@ -2600,7 +2559,7 @@ static PyObject *_wrap_Point_Set(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_Point_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     PyObject *result;
@@ -2609,11 +2568,11 @@ static PyObject *_wrap_Point_asTuple(PyObject *self, PyObject *args, PyObject *k
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point_asTuple",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point_Get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (PyObject *)wxPoint_asTuple(arg1);
+        result = (PyObject *)wxPoint_Get(arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -3277,8 +3236,8 @@ static PyObject *_wrap_Rect_SetBottom(PyObject *self, PyObject *args, PyObject *
 static PyObject *_wrap_Rect_Inflate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     wxRect *result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -3307,8 +3266,8 @@ static PyObject *_wrap_Rect_Inflate(PyObject *self, PyObject *args, PyObject *kw
 static PyObject *_wrap_Rect_Deflate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     wxRect *result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -3337,8 +3296,8 @@ static PyObject *_wrap_Rect_Deflate(PyObject *self, PyObject *args, PyObject *kw
 static PyObject *_wrap_Rect_OffsetXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "dx",(char *) "dy", NULL 
@@ -3840,7 +3799,7 @@ static PyObject *_wrap_Rect_Set(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_Rect_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     PyObject *result;
@@ -3849,11 +3808,11 @@ static PyObject *_wrap_Rect_asTuple(PyObject *self, PyObject *args, PyObject *kw
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_asTuple",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Rect_Get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (PyObject *)wxRect_asTuple(arg1);
+        result = (PyObject *)wxRect_Get(arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -4519,86 +4478,6 @@ static PyObject *_wrap_Point2D___ne__(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Point2D_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxPoint2D *arg1 = (wxPoint2D *) 0 ;
-    double arg2 ;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "m_x", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_m_x_set",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg1) (arg1)->m_x = arg2;
-    
-    Py_INCREF(Py_None); resultobj = Py_None;
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_Point2D_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxPoint2D *arg1 = (wxPoint2D *) 0 ;
-    double result;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_m_x_get",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    result = (double) ((arg1)->m_x);
-    
-    resultobj = PyFloat_FromDouble(result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_Point2D_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxPoint2D *arg1 = (wxPoint2D *) 0 ;
-    double arg2 ;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "m_y", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Od:Point2D_m_y_set",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg1) (arg1)->m_y = arg2;
-    
-    Py_INCREF(Py_None); resultobj = Py_None;
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_Point2D_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxPoint2D *arg1 = (wxPoint2D *) 0 ;
-    double result;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_m_y_get",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    result = (double) ((arg1)->m_y);
-    
-    resultobj = PyFloat_FromDouble(result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
 static PyObject *_wrap_Point2D_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
@@ -4705,7 +4584,7 @@ static PyObject *_wrap_Point2D_Set(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Point2D_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     PyObject *result;
@@ -4714,11 +4593,11 @@ static PyObject *_wrap_Point2D_asTuple(PyObject *self, PyObject *args, PyObject
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_asTuple",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_Get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPoint2D,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (PyObject *)wxPoint2D_asTuple(arg1);
+        result = (PyObject *)wxPoint2D_Get(arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -5246,9 +5125,9 @@ static PyObject *_wrap_new_FSFile(PyObject *self, PyObject *args, PyObject *kwar
     wxFSFile *result;
     wxPyInputStream *temp1 ;
     bool created1 ;
-    bool temp2 = false ;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     wxDateTime *argp5 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -5263,31 +5142,31 @@ static PyObject *_wrap_new_FSFile(PyObject *self, PyObject *args, PyObject *kwar
     {
         if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) {
             arg1 = temp1->m_wxis;
-            created1 = false;
+            created1 = False;
         } else {
             PyErr_Clear();  // clear the failure of the wxPyConvert above
-            arg1 = wxPyCBInputStream_create(obj0, false);
+            arg1 = wxPyCBInputStream_create(obj0, False);
             if (arg1 == NULL) {
                 PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object.");
                 SWIG_fail;
             }
-            created1 = true;
+            created1 = True;
         }
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if ((SWIG_ConvertPtr(obj4,(void **) &argp5, SWIGTYPE_p_wxDateTime,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
     arg5 = *argp5; 
@@ -5387,7 +5266,7 @@ static PyObject *_wrap_FSFile_GetStream(PyObject *self, PyObject *args, PyObject
         if (result) {
             _ptr = new wxPyInputStream(result);
         }
-        resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), true);
+        resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), True);
     }
     return resultobj;
     fail:
@@ -5579,7 +5458,7 @@ static PyObject *_wrap_FileSystemHandler_CanOpen(PyObject *self, PyObject *args,
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5591,7 +5470,7 @@ static PyObject *_wrap_FileSystemHandler_CanOpen(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5621,7 +5500,7 @@ static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *self, PyObject *args
     wxFileSystem *arg2 = 0 ;
     wxString *arg3 = 0 ;
     wxFSFile *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -5638,7 +5517,7 @@ static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *self, PyObject *args
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5670,7 +5549,7 @@ static PyObject *_wrap_FileSystemHandler_FindFirst(PyObject *self, PyObject *arg
     wxString *arg2 = 0 ;
     int arg3 = (int) 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5682,7 +5561,7 @@ static PyObject *_wrap_FileSystemHandler_FindFirst(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5748,7 +5627,7 @@ static PyObject *_wrap_FileSystemHandler_GetProtocol(PyObject *self, PyObject *a
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxString *arg2 = 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5760,7 +5639,7 @@ static PyObject *_wrap_FileSystemHandler_GetProtocol(PyObject *self, PyObject *a
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5795,7 +5674,7 @@ static PyObject *_wrap_FileSystemHandler_GetLeftLocation(PyObject *self, PyObjec
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxString *arg2 = 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5807,7 +5686,7 @@ static PyObject *_wrap_FileSystemHandler_GetLeftLocation(PyObject *self, PyObjec
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5842,7 +5721,7 @@ static PyObject *_wrap_FileSystemHandler_GetAnchor(PyObject *self, PyObject *arg
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxString *arg2 = 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5854,7 +5733,7 @@ static PyObject *_wrap_FileSystemHandler_GetAnchor(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5889,7 +5768,7 @@ static PyObject *_wrap_FileSystemHandler_GetRightLocation(PyObject *self, PyObje
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxString *arg2 = 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5901,7 +5780,7 @@ static PyObject *_wrap_FileSystemHandler_GetRightLocation(PyObject *self, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5936,7 +5815,7 @@ static PyObject *_wrap_FileSystemHandler_GetMimeTypeFromExt(PyObject *self, PyOb
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxString *arg2 = 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5948,7 +5827,7 @@ static PyObject *_wrap_FileSystemHandler_GetMimeTypeFromExt(PyObject *self, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6037,8 +5916,8 @@ static PyObject *_wrap_FileSystem_ChangePathTo(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxFileSystem *arg1 = (wxFileSystem *) 0 ;
     wxString *arg2 = 0 ;
-    bool arg3 = (bool) FALSE ;
-    bool temp2 = false ;
+    bool arg3 = (bool) False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6051,7 +5930,7 @@ static PyObject *_wrap_FileSystem_ChangePathTo(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         arg3 = PyInt_AsLong(obj2) ? true : false;
@@ -6115,7 +5994,7 @@ static PyObject *_wrap_FileSystem_OpenFile(PyObject *self, PyObject *args, PyObj
     wxFileSystem *arg1 = (wxFileSystem *) 0 ;
     wxString *arg2 = 0 ;
     wxFSFile *result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6127,7 +6006,7 @@ static PyObject *_wrap_FileSystem_OpenFile(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6159,7 +6038,7 @@ static PyObject *_wrap_FileSystem_FindFirst(PyObject *self, PyObject *args, PyOb
     wxString *arg2 = 0 ;
     int arg3 = (int) 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6171,7 +6050,7 @@ static PyObject *_wrap_FileSystem_FindFirst(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6281,7 +6160,7 @@ static PyObject *_wrap_FileSystem_FileNameToURL(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "filename", NULL 
@@ -6291,7 +6170,7 @@ static PyObject *_wrap_FileSystem_FileNameToURL(PyObject *self, PyObject *args,
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6332,7 +6211,7 @@ static PyObject *_wrap_FileSystem_URLToFileName(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "url", NULL 
@@ -6342,7 +6221,7 @@ static PyObject *_wrap_FileSystem_URLToFileName(PyObject *self, PyObject *args,
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6399,7 +6278,7 @@ static PyObject *_wrap_InternetFSHandler_CanOpen(PyObject *self, PyObject *args,
     wxInternetFSHandler *arg1 = (wxInternetFSHandler *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6411,7 +6290,7 @@ static PyObject *_wrap_InternetFSHandler_CanOpen(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6441,7 +6320,7 @@ static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *self, PyObject *args
     wxFileSystem *arg2 = 0 ;
     wxString *arg3 = 0 ;
     wxFSFile *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6458,7 +6337,7 @@ static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *self, PyObject *args
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6518,7 +6397,7 @@ static PyObject *_wrap_ZipFSHandler_CanOpen(PyObject *self, PyObject *args, PyOb
     wxZipFSHandler *arg1 = (wxZipFSHandler *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6530,7 +6409,7 @@ static PyObject *_wrap_ZipFSHandler_CanOpen(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6560,7 +6439,7 @@ static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *self, PyObject *args, PyO
     wxFileSystem *arg2 = 0 ;
     wxString *arg3 = 0 ;
     wxFSFile *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6577,7 +6456,7 @@ static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *self, PyObject *args, PyO
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6609,7 +6488,7 @@ static PyObject *_wrap_ZipFSHandler_FindFirst(PyObject *self, PyObject *args, Py
     wxString *arg2 = 0 ;
     int arg3 = (int) 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6621,7 +6500,7 @@ static PyObject *_wrap_ZipFSHandler_FindFirst(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6694,7 +6573,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObj
     wxString *arg1 = 0 ;
     wxImage *arg2 = 0 ;
     long arg3 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6705,7 +6584,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObj
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (arg2 == NULL) {
@@ -6738,7 +6617,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxBitmap(PyObject *self, PyOb
     wxString *arg1 = 0 ;
     wxBitmap *arg2 = 0 ;
     long arg3 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6749,7 +6628,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxBitmap(PyObject *self, PyOb
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (arg2 == NULL) {
@@ -6781,7 +6660,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_Data(PyObject *self, PyObject
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6792,7 +6671,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_Data(PyObject *self, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     arg2 = obj1;
     {
@@ -6842,7 +6721,7 @@ static PyObject *_wrap_new_MemoryFSHandler(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_MemoryFSHandler_RemoveFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "filename", NULL 
@@ -6852,7 +6731,7 @@ static PyObject *_wrap_MemoryFSHandler_RemoveFile(PyObject *self, PyObject *args
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6881,7 +6760,7 @@ static PyObject *_wrap_MemoryFSHandler_CanOpen(PyObject *self, PyObject *args, P
     wxMemoryFSHandler *arg1 = (wxMemoryFSHandler *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6893,7 +6772,7 @@ static PyObject *_wrap_MemoryFSHandler_CanOpen(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6923,7 +6802,7 @@ static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *self, PyObject *args,
     wxFileSystem *arg2 = 0 ;
     wxString *arg3 = 0 ;
     wxFSFile *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6940,7 +6819,7 @@ static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *self, PyObject *args,
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6972,7 +6851,7 @@ static PyObject *_wrap_MemoryFSHandler_FindFirst(PyObject *self, PyObject *args,
     wxString *arg2 = 0 ;
     int arg3 = (int) 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6984,7 +6863,7 @@ static PyObject *_wrap_MemoryFSHandler_FindFirst(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7175,7 +7054,7 @@ static PyObject *_wrap_ImageHandler_CanRead(PyObject *self, PyObject *args, PyOb
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7187,7 +7066,7 @@ static PyObject *_wrap_ImageHandler_CanRead(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7215,7 +7094,7 @@ static PyObject *_wrap_ImageHandler_SetName(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7227,7 +7106,7 @@ static PyObject *_wrap_ImageHandler_SetName(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7255,7 +7134,7 @@ static PyObject *_wrap_ImageHandler_SetExtension(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7267,7 +7146,7 @@ static PyObject *_wrap_ImageHandler_SetExtension(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7320,7 +7199,7 @@ static PyObject *_wrap_ImageHandler_SetMimeType(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7332,7 +7211,7 @@ static PyObject *_wrap_ImageHandler_SetMimeType(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7496,7 +7375,7 @@ static PyObject *_wrap_new_Image(PyObject *self, PyObject *args, PyObject *kwarg
     long arg2 = (long) wxBITMAP_TYPE_ANY ;
     int arg3 = (int) -1 ;
     wxImage *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "name",(char *) "type",(char *) "index", NULL 
@@ -7506,7 +7385,7 @@ static PyObject *_wrap_new_Image(PyObject *self, PyObject *args, PyObject *kwarg
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7560,8 +7439,8 @@ static PyObject *_wrap_new_ImageFromMime(PyObject *self, PyObject *args, PyObjec
     wxString *arg2 = 0 ;
     int arg3 = (int) -1 ;
     wxImage *result;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7572,12 +7451,12 @@ static PyObject *_wrap_new_ImageFromMime(PyObject *self, PyObject *args, PyObjec
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7626,15 +7505,15 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *self, PyObject *args, PyObj
     {
         if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) {
             arg1 = temp1->m_wxis;
-            created1 = false;
+            created1 = False;
         } else {
             PyErr_Clear();  // clear the failure of the wxPyConvert above
-            arg1 = wxPyCBInputStream_create(obj0, false);
+            arg1 = wxPyCBInputStream_create(obj0, False);
             if (arg1 == NULL) {
                 PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object.");
                 SWIG_fail;
             }
-            created1 = true;
+            created1 = True;
         }
     }
     {
@@ -7667,7 +7546,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, P
     wxImage *result;
     wxPyInputStream *temp1 ;
     bool created1 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7678,21 +7557,21 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, P
     {
         if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) {
             arg1 = temp1->m_wxis;
-            created1 = false;
+            created1 = False;
         } else {
             PyErr_Clear();  // clear the failure of the wxPyConvert above
-            arg1 = wxPyCBInputStream_create(obj0, false);
+            arg1 = wxPyCBInputStream_create(obj0, False);
             if (arg1 == NULL) {
                 PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object.");
                 SWIG_fail;
             }
-            created1 = true;
+            created1 = True;
         }
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7728,7 +7607,7 @@ static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args, PyObject *
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     wxImage *result;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -8263,7 +8142,7 @@ static PyObject *_wrap_Image_CanRead(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "name", NULL 
@@ -8273,7 +8152,7 @@ static PyObject *_wrap_Image_CanRead(PyObject *self, PyObject *args, PyObject *k
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8302,7 +8181,7 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *self, PyObject *args, PyObj
     wxString *arg1 = 0 ;
     long arg2 = (long) wxBITMAP_TYPE_ANY ;
     int result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "name",(char *) "type", NULL 
@@ -8312,7 +8191,7 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *self, PyObject *args, PyObj
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8343,7 +8222,7 @@ static PyObject *_wrap_Image_LoadFile(PyObject *self, PyObject *args, PyObject *
     long arg3 = (long) wxBITMAP_TYPE_ANY ;
     int arg4 = (int) -1 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8355,7 +8234,7 @@ static PyObject *_wrap_Image_LoadFile(PyObject *self, PyObject *args, PyObject *
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8386,8 +8265,8 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje
     wxString *arg3 = 0 ;
     int arg4 = (int) -1 ;
     bool result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -8400,12 +8279,12 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8443,7 +8322,7 @@ static PyObject *_wrap_Image_SaveFile(PyObject *self, PyObject *args, PyObject *
     wxString *arg2 = 0 ;
     int arg3 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8455,7 +8334,7 @@ static PyObject *_wrap_Image_SaveFile(PyObject *self, PyObject *args, PyObject *
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8485,8 +8364,8 @@ static PyObject *_wrap_Image_SaveMimeFile(PyObject *self, PyObject *args, PyObje
     wxString *arg2 = 0 ;
     wxString *arg3 = 0 ;
     bool result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -8499,12 +8378,12 @@ static PyObject *_wrap_Image_SaveMimeFile(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8551,15 +8430,15 @@ static PyObject *_wrap_Image_CanReadStream(PyObject *self, PyObject *args, PyObj
     {
         if (wxPyConvertSwigPtr(obj0, (void **)&temp1, wxT("wxPyInputStream"))) {
             arg1 = temp1->m_wxis;
-            created1 = false;
+            created1 = False;
         } else {
             PyErr_Clear();  // clear the failure of the wxPyConvert above
-            arg1 = wxPyCBInputStream_create(obj0, false);
+            arg1 = wxPyCBInputStream_create(obj0, False);
             if (arg1 == NULL) {
                 PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object.");
                 SWIG_fail;
             }
-            created1 = true;
+            created1 = True;
         }
     }
     {
@@ -8604,15 +8483,15 @@ static PyObject *_wrap_Image_LoadStream(PyObject *self, PyObject *args, PyObject
     {
         if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) {
             arg2 = temp2->m_wxis;
-            created2 = false;
+            created2 = False;
         } else {
             PyErr_Clear();  // clear the failure of the wxPyConvert above
-            arg2 = wxPyCBInputStream_create(obj1, false);
+            arg2 = wxPyCBInputStream_create(obj1, False);
             if (arg2 == NULL) {
                 PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object.");
                 SWIG_fail;
             }
-            created2 = true;
+            created2 = True;
         }
     }
     {
@@ -8646,7 +8525,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb
     bool result;
     wxPyInputStream *temp2 ;
     bool created2 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -8659,21 +8538,21 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb
     {
         if (wxPyConvertSwigPtr(obj1, (void **)&temp2, wxT("wxPyInputStream"))) {
             arg2 = temp2->m_wxis;
-            created2 = false;
+            created2 = False;
         } else {
             PyErr_Clear();  // clear the failure of the wxPyConvert above
-            arg2 = wxPyCBInputStream_create(obj1, false);
+            arg2 = wxPyCBInputStream_create(obj1, False);
             if (arg2 == NULL) {
                 PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object.");
                 SWIG_fail;
             }
-            created2 = true;
+            created2 = True;
         }
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9199,7 +9078,7 @@ static PyObject *_wrap_Image_GetMaskBlue(PyObject *self, PyObject *args, PyObjec
 static PyObject *_wrap_Image_SetMask(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9256,7 +9135,7 @@ static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kw
     wxImage *arg1 = (wxImage *) 0 ;
     double arg2 ;
     wxPoint *arg3 = 0 ;
-    bool arg4 = (bool) TRUE ;
+    bool arg4 = (bool) True ;
     wxPoint *arg5 = (wxPoint *) NULL ;
     SwigValueWrapper< wxImage > result;
     wxPoint temp3 ;
@@ -9302,7 +9181,7 @@ static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kw
 static PyObject *_wrap_Image_Rotate90(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     SwigValueWrapper< wxImage > result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -9337,7 +9216,7 @@ static PyObject *_wrap_Image_Rotate90(PyObject *self, PyObject *args, PyObject *
 static PyObject *_wrap_Image_Mirror(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     SwigValueWrapper< wxImage > result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -9463,8 +9342,8 @@ static PyObject *_wrap_Image_SetOption(PyObject *self, PyObject *args, PyObject
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
     wxString *arg3 = 0 ;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -9477,12 +9356,12 @@ static PyObject *_wrap_Image_SetOption(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9519,7 +9398,7 @@ static PyObject *_wrap_Image_SetOptionInt(PyObject *self, PyObject *args, PyObje
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9531,7 +9410,7 @@ static PyObject *_wrap_Image_SetOptionInt(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9560,7 +9439,7 @@ static PyObject *_wrap_Image_GetOption(PyObject *self, PyObject *args, PyObject
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9572,7 +9451,7 @@ static PyObject *_wrap_Image_GetOption(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9607,7 +9486,7 @@ static PyObject *_wrap_Image_GetOptionInt(PyObject *self, PyObject *args, PyObje
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9619,7 +9498,7 @@ static PyObject *_wrap_Image_GetOptionInt(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9648,7 +9527,7 @@ static PyObject *_wrap_Image_HasOption(PyObject *self, PyObject *args, PyObject
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9660,7 +9539,7 @@ static PyObject *_wrap_Image_HasOption(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9798,7 +9677,7 @@ static PyObject *_wrap_Image_RemoveHandler(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "name", NULL 
@@ -9808,7 +9687,7 @@ static PyObject *_wrap_Image_RemoveHandler(PyObject *self, PyObject *args, PyObj
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11031,7 +10910,7 @@ static PyObject *_wrap_Event_IsCommandEvent(PyObject *self, PyObject *args, PyOb
 static PyObject *_wrap_Event_Skip(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -11361,7 +11240,7 @@ static PyObject *_wrap_CommandEvent_SetString(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -11373,7 +11252,7 @@ static PyObject *_wrap_CommandEvent_SetString(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12789,7 +12668,7 @@ static PyObject *_wrap_MouseEvent_GetLogicalPosition(PyObject *self, PyObject *a
 static PyObject *_wrap_MouseEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -12799,7 +12678,7 @@ static PyObject *_wrap_MouseEvent_GetX(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxMouseEvent const *)arg1)->GetX();
+        result = (int)((wxMouseEvent const *)arg1)->GetX();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -12814,7 +12693,7 @@ static PyObject *_wrap_MouseEvent_GetX(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_MouseEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -12824,7 +12703,7 @@ static PyObject *_wrap_MouseEvent_GetY(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxMouseEvent const *)arg1)->GetY();
+        result = (int)((wxMouseEvent const *)arg1)->GetY();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -12939,7 +12818,7 @@ static PyObject *_wrap_MouseEvent_IsPageScroll(PyObject *self, PyObject *args, P
 static PyObject *_wrap_MouseEvent_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
-    wxCoord arg2 ;
+    int arg2 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "m_x", NULL 
@@ -12959,7 +12838,7 @@ static PyObject *_wrap_MouseEvent_m_x_set(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_MouseEvent_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -12967,7 +12846,7 @@ static PyObject *_wrap_MouseEvent_m_x_get(PyObject *self, PyObject *args, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_x_get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    result = (wxCoord) ((arg1)->m_x);
+    result = (int) ((arg1)->m_x);
     
     resultobj = PyInt_FromLong((long)result);
     return resultobj;
@@ -12979,7 +12858,7 @@ static PyObject *_wrap_MouseEvent_m_x_get(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_MouseEvent_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
-    wxCoord arg2 ;
+    int arg2 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "m_y", NULL 
@@ -12999,7 +12878,7 @@ static PyObject *_wrap_MouseEvent_m_y_set(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_MouseEvent_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -13007,7 +12886,7 @@ static PyObject *_wrap_MouseEvent_m_y_get(PyObject *self, PyObject *args, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_m_y_get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    result = (wxCoord) ((arg1)->m_y);
+    result = (int) ((arg1)->m_y);
     
     resultobj = PyInt_FromLong((long)result);
     return resultobj;
@@ -13446,8 +13325,8 @@ static PyObject * MouseEvent_swigregister(PyObject *self, PyObject *args) {
 }
 static PyObject *_wrap_new_SetCursorEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    wxCoord arg1 = (wxCoord) 0 ;
-    wxCoord arg2 = (wxCoord) 0 ;
+    int arg1 = (int) 0 ;
+    int arg2 = (int) 0 ;
     wxSetCursorEvent *result;
     char *kwnames[] = {
         (char *) "x",(char *) "y", NULL 
@@ -13471,7 +13350,7 @@ static PyObject *_wrap_new_SetCursorEvent(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_SetCursorEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -13481,7 +13360,7 @@ static PyObject *_wrap_SetCursorEvent_GetX(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSetCursorEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxSetCursorEvent const *)arg1)->GetX();
+        result = (int)((wxSetCursorEvent const *)arg1)->GetX();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -13496,7 +13375,7 @@ static PyObject *_wrap_SetCursorEvent_GetX(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_SetCursorEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -13506,7 +13385,7 @@ static PyObject *_wrap_SetCursorEvent_GetY(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSetCursorEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxSetCursorEvent const *)arg1)->GetY();
+        result = (int)((wxSetCursorEvent const *)arg1)->GetY();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -13809,7 +13688,7 @@ static PyObject *_wrap_KeyEvent_GetUniChar(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_KeyEvent_GetRawKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
-    wxUint32 result;
+    unsigned int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -13819,7 +13698,7 @@ static PyObject *_wrap_KeyEvent_GetRawKeyCode(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxUint32)((wxKeyEvent const *)arg1)->GetRawKeyCode();
+        result = (unsigned int)((wxKeyEvent const *)arg1)->GetRawKeyCode();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -13834,7 +13713,7 @@ static PyObject *_wrap_KeyEvent_GetRawKeyCode(PyObject *self, PyObject *args, Py
 static PyObject *_wrap_KeyEvent_GetRawKeyFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
-    wxUint32 result;
+    unsigned int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -13844,7 +13723,7 @@ static PyObject *_wrap_KeyEvent_GetRawKeyFlags(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxUint32)((wxKeyEvent const *)arg1)->GetRawKeyFlags();
+        result = (unsigned int)((wxKeyEvent const *)arg1)->GetRawKeyFlags();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -13926,7 +13805,7 @@ static PyObject *_wrap_KeyEvent_GetPositionTuple(PyObject *self, PyObject *args,
 static PyObject *_wrap_KeyEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -13936,7 +13815,7 @@ static PyObject *_wrap_KeyEvent_GetX(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxKeyEvent const *)arg1)->GetX();
+        result = (int)((wxKeyEvent const *)arg1)->GetX();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -13951,7 +13830,7 @@ static PyObject *_wrap_KeyEvent_GetX(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_KeyEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -13961,7 +13840,7 @@ static PyObject *_wrap_KeyEvent_GetY(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxKeyEvent const *)arg1)->GetY();
+        result = (int)((wxKeyEvent const *)arg1)->GetY();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -13976,7 +13855,7 @@ static PyObject *_wrap_KeyEvent_GetY(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_KeyEvent_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
-    wxCoord arg2 ;
+    int arg2 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "m_x", NULL 
@@ -13996,7 +13875,7 @@ static PyObject *_wrap_KeyEvent_m_x_set(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_KeyEvent_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -14004,7 +13883,7 @@ static PyObject *_wrap_KeyEvent_m_x_get(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_x_get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    result = (wxCoord) ((arg1)->m_x);
+    result = (int) ((arg1)->m_x);
     
     resultobj = PyInt_FromLong((long)result);
     return resultobj;
@@ -14016,7 +13895,7 @@ static PyObject *_wrap_KeyEvent_m_x_get(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_KeyEvent_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
-    wxCoord arg2 ;
+    int arg2 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "m_y", NULL 
@@ -14036,7 +13915,7 @@ static PyObject *_wrap_KeyEvent_m_y_set(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_KeyEvent_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -14044,7 +13923,7 @@ static PyObject *_wrap_KeyEvent_m_y_get(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_y_get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    result = (wxCoord) ((arg1)->m_y);
+    result = (int) ((arg1)->m_y);
     
     resultobj = PyInt_FromLong((long)result);
     return resultobj;
@@ -14311,7 +14190,7 @@ static PyObject *_wrap_KeyEvent_m_scanCode_get(PyObject *self, PyObject *args, P
 static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
-    wxUint32 arg2 ;
+    unsigned int arg2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -14320,7 +14199,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *self, PyObject *args, Py
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_rawCode_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = (wxUint32) PyInt_AsLong(obj1);
+    arg2 = (unsigned int) PyInt_AsLong(obj1);
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_rawCode = arg2;
     
@@ -14334,7 +14213,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *self, PyObject *args, Py
 static PyObject *_wrap_KeyEvent_m_rawCode_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
-    wxUint32 result;
+    unsigned int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -14342,7 +14221,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_get(PyObject *self, PyObject *args, Py
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_rawCode_get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    result = (wxUint32) ((arg1)->m_rawCode);
+    result = (unsigned int) ((arg1)->m_rawCode);
     
     resultobj = PyInt_FromLong((long)result);
     return resultobj;
@@ -14354,7 +14233,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_get(PyObject *self, PyObject *args, Py
 static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
-    wxUint32 arg2 ;
+    unsigned int arg2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -14363,7 +14242,7 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *self, PyObject *args, P
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_rawFlags_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    arg2 = (wxUint32) PyInt_AsLong(obj1);
+    arg2 = (unsigned int) PyInt_AsLong(obj1);
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_rawFlags = arg2;
     
@@ -14377,7 +14256,7 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *self, PyObject *args, P
 static PyObject *_wrap_KeyEvent_m_rawFlags_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
-    wxUint32 result;
+    unsigned int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -14385,7 +14264,7 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_get(PyObject *self, PyObject *args, P
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_m_rawFlags_get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    result = (wxUint32) ((arg1)->m_rawFlags);
+    result = (unsigned int) ((arg1)->m_rawFlags);
     
     resultobj = PyInt_FromLong((long)result);
     return resultobj;
@@ -15152,7 +15031,7 @@ static PyObject * ChildFocusEvent_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_ActivateEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     int arg3 = (int) 0 ;
     wxActivateEvent *result;
     PyObject * obj1 = 0 ;
@@ -15434,7 +15313,7 @@ static PyObject *_wrap_CloseEvent_GetLoggingOff(PyObject *self, PyObject *args,
 static PyObject *_wrap_CloseEvent_Veto(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCloseEvent *arg1 = (wxCloseEvent *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -15549,7 +15428,7 @@ static PyObject * CloseEvent_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_ShowEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
-    bool arg2 = (bool) FALSE ;
+    bool arg2 = (bool) False ;
     wxShowEvent *result;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -15638,7 +15517,7 @@ static PyObject * ShowEvent_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_IconizeEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     wxIconizeEvent *result;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -15814,7 +15693,7 @@ static PyObject * DropFilesEvent_swigregister(PyObject *self, PyObject *args) {
 }
 static PyObject *_wrap_new_UpdateUIEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    wxWindowID arg1 = (wxWindowID) 0 ;
+    int arg1 = (int) 0 ;
     wxUpdateUIEvent *result;
     char *kwnames[] = {
         (char *) "commandId", NULL 
@@ -16051,7 +15930,7 @@ static PyObject *_wrap_UpdateUIEvent_SetText(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -16063,7 +15942,7 @@ static PyObject *_wrap_UpdateUIEvent_SetText(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16259,7 +16138,7 @@ static PyObject * SysColourChangedEvent_swigregister(PyObject *self, PyObject *a
 }
 static PyObject *_wrap_new_MouseCaptureChangedEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    wxWindowID arg1 = (wxWindowID) 0 ;
+    int arg1 = (int) 0 ;
     wxWindow *arg2 = (wxWindow *) NULL ;
     wxMouseCaptureChangedEvent *result;
     PyObject * obj1 = 0 ;
@@ -16350,7 +16229,7 @@ static PyObject * DisplayChangedEvent_swigregister(PyObject *self, PyObject *arg
 }
 static PyObject *_wrap_new_PaletteChangedEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    wxWindowID arg1 = (wxWindowID) 0 ;
+    int arg1 = (int) 0 ;
     wxPaletteChangedEvent *result;
     char *kwnames[] = {
         (char *) "id", NULL 
@@ -16434,7 +16313,7 @@ static PyObject * PaletteChangedEvent_swigregister(PyObject *self, PyObject *arg
 }
 static PyObject *_wrap_new_QueryNewPaletteEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    wxWindowID arg1 = (wxWindowID) 0 ;
+    int arg1 = (int) 0 ;
     wxQueryNewPaletteEvent *result;
     char *kwnames[] = {
         (char *) "winid", NULL 
@@ -16829,7 +16708,7 @@ static PyObject * WindowDestroyEvent_swigregister(PyObject *self, PyObject *args
 static PyObject *_wrap_new_ContextMenuEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
-    wxWindowID arg2 = (wxWindowID) 0 ;
+    int arg2 = (int) 0 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxContextMenuEvent *result;
@@ -16951,7 +16830,7 @@ static PyObject *_wrap_new_IdleEvent(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_IdleEvent_RequestMore(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIdleEvent *arg1 = (wxIdleEvent *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -17406,7 +17285,7 @@ static PyObject *_wrap_PyApp_SetAppName(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -17418,7 +17297,7 @@ static PyObject *_wrap_PyApp_SetAppName(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17477,7 +17356,7 @@ static PyObject *_wrap_PyApp_SetClassName(PyObject *self, PyObject *args, PyObje
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -17489,7 +17368,7 @@ static PyObject *_wrap_PyApp_SetClassName(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17545,7 +17424,7 @@ static PyObject *_wrap_PyApp_SetVendorName(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -17557,7 +17436,7 @@ static PyObject *_wrap_PyApp_SetVendorName(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17633,7 +17512,7 @@ static PyObject *_wrap_PyApp_ProcessPendingEvents(PyObject *self, PyObject *args
 static PyObject *_wrap_PyApp_Yield(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
-    bool arg2 = (bool) false ;
+    bool arg2 = (bool) False ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -18392,7 +18271,7 @@ static PyObject *_wrap_PyApp_SetMacExitMenuItemId(PyObject *self, PyObject *args
 static PyObject *_wrap_PyApp_SetMacHelpMenuTitleName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "val", NULL 
@@ -18402,7 +18281,7 @@ static PyObject *_wrap_PyApp_SetMacHelpMenuTitleName(PyObject *self, PyObject *a
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18547,7 +18426,7 @@ static PyObject *_wrap_YieldIfNeeded(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_SafeYield(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
-    bool arg2 = (bool) FALSE ;
+    bool arg2 = (bool) False ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -18673,10 +18552,30 @@ static PyObject *_wrap_GetApp(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 
+static int _wrap_PanelNameStr_set(PyObject *_val) {
+    PyErr_SetString(PyExc_TypeError,"Variable PanelNameStr is read-only.");
+    return 1;
+}
+
+
+static PyObject *_wrap_PanelNameStr_get() {
+    PyObject *pyobj;
+    
+    {
+#if wxUSE_UNICODE
+        pyobj = PyUnicode_FromWideChar((&wxPyPanelNameStr)->c_str(), (&wxPyPanelNameStr)->Len());
+#else
+        pyobj = PyString_FromStringAndSize((&wxPyPanelNameStr)->c_str(), (&wxPyPanelNameStr)->Len());
+#endif
+    }
+    return pyobj;
+}
+
+
 static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -18687,7 +18586,7 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar
     wxWindow *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -18714,7 +18613,7 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -18769,7 +18668,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -18780,7 +18679,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -18809,7 +18708,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -18837,7 +18736,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_Window_Close(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    bool arg2 = (bool) FALSE ;
+    bool arg2 = (bool) False ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -18944,7 +18843,7 @@ static PyObject *_wrap_Window_SetTitle(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -18956,7 +18855,7 @@ static PyObject *_wrap_Window_SetTitle(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19015,7 +18914,7 @@ static PyObject *_wrap_Window_SetLabel(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -19027,7 +18926,7 @@ static PyObject *_wrap_Window_SetLabel(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19086,7 +18985,7 @@ static PyObject *_wrap_Window_SetName(PyObject *self, PyObject *args, PyObject *
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -19098,7 +18997,7 @@ static PyObject *_wrap_Window_SetName(PyObject *self, PyObject *args, PyObject *
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19156,7 +19055,7 @@ static PyObject *_wrap_Window_GetName(PyObject *self, PyObject *args, PyObject *
 static PyObject *_wrap_Window_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "winid", NULL 
@@ -19181,7 +19080,7 @@ static PyObject *_wrap_Window_SetId(PyObject *self, PyObject *args, PyObject *kw
 static PyObject *_wrap_Window_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -19191,7 +19090,7 @@ static PyObject *_wrap_Window_GetId(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxWindowID)((wxWindow const *)arg1)->GetId();
+        result = (int)((wxWindow const *)arg1)->GetId();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19597,7 +19496,7 @@ static PyObject *_wrap_Window_GetPosition(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxWindow const *)arg1)->GetPosition();
+        result = (arg1)->GetPosition();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -19631,7 +19530,7 @@ static PyObject *_wrap_Window_GetPositionTuple(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        ((wxWindow const *)arg1)->GetPosition(arg2,arg3);
+        (arg1)->GetPosition(arg2,arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -20434,7 +20333,7 @@ static PyObject *_wrap_Window_GetBestVirtualSize(PyObject *self, PyObject *args,
 static PyObject *_wrap_Window_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -20490,7 +20389,7 @@ static PyObject *_wrap_Window_Hide(PyObject *self, PyObject *args, PyObject *kwa
 static PyObject *_wrap_Window_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -20797,7 +20696,7 @@ static PyObject *_wrap_Window_GetExtraStyle(PyObject *self, PyObject *args, PyOb
 static PyObject *_wrap_Window_MakeModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -21327,7 +21226,7 @@ static PyObject *_wrap_Window_FindWindowByName(PyObject *self, PyObject *args, P
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
     wxWindow *result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -21339,7 +21238,7 @@ static PyObject *_wrap_Window_FindWindowByName(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21449,7 +21348,7 @@ static PyObject *_wrap_Window_PushEventHandler(PyObject *self, PyObject *args, P
 static PyObject *_wrap_Window_PopEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    bool arg2 = (bool) FALSE ;
+    bool arg2 = (bool) False ;
     wxEvtHandler *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -22015,7 +21914,7 @@ static PyObject *_wrap_Window_HasCapture(PyObject *self, PyObject *args, PyObjec
 static PyObject *_wrap_Window_Refresh(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     wxRect *arg3 = (wxRect *) NULL ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -22702,7 +22601,7 @@ static PyObject *_wrap_Window_GetTextExtent(PyObject *self, PyObject *args, PyOb
     wxString *arg2 = 0 ;
     int *arg3 = (int *) 0 ;
     int *arg4 = (int *) 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     int temp3 ;
     int temp4 ;
     PyObject * obj0 = 0 ;
@@ -22718,7 +22617,7 @@ static PyObject *_wrap_Window_GetTextExtent(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22759,7 +22658,7 @@ static PyObject *_wrap_Window_GetFullTextExtent(PyObject *self, PyObject *args,
     int *arg5 = (int *) 0 ;
     int *arg6 = (int *) 0 ;
     wxFont *arg7 = (wxFont *) NULL ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     int temp3 ;
     int temp4 ;
     int temp5 ;
@@ -22780,7 +22679,7 @@ static PyObject *_wrap_Window_GetFullTextExtent(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         if ((SWIG_ConvertPtr(obj2,(void **) &arg7, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -22994,8 +22893,8 @@ static PyObject *_wrap_Window_ScreenToClient(PyObject *self, PyObject *args, PyO
 static PyObject *_wrap_Window_HitTestXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -23249,7 +23148,7 @@ static PyObject *_wrap_Window_SetScrollbar(PyObject *self, PyObject *args, PyObj
     int arg3 ;
     int arg4 ;
     int arg5 ;
-    bool arg6 = (bool) TRUE ;
+    bool arg6 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj5 = 0 ;
     char *kwnames[] = {
@@ -23281,7 +23180,7 @@ static PyObject *_wrap_Window_SetScrollPos(PyObject *self, PyObject *args, PyObj
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
     int arg3 ;
-    bool arg4 = (bool) TRUE ;
+    bool arg4 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -23573,7 +23472,7 @@ static PyObject *_wrap_Window_SetHelpText(PyObject *self, PyObject *args, PyObje
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -23585,7 +23484,7 @@ static PyObject *_wrap_Window_SetHelpText(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23613,7 +23512,7 @@ static PyObject *_wrap_Window_SetHelpTextForId(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -23625,7 +23524,7 @@ static PyObject *_wrap_Window_SetHelpTextForId(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23684,7 +23583,7 @@ static PyObject *_wrap_Window_SetToolTipString(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -23696,7 +23595,7 @@ static PyObject *_wrap_Window_SetToolTipString(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23960,7 +23859,7 @@ static PyObject *_wrap_Window_SetSizer(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -23993,7 +23892,7 @@ static PyObject *_wrap_Window_SetSizerAndFit(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -24145,7 +24044,7 @@ static PyObject *_wrap_FindWindowByName(PyObject *self, PyObject *args, PyObject
     wxString *arg1 = 0 ;
     wxWindow *arg2 = (wxWindow *) NULL ;
     wxWindow *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -24156,7 +24055,7 @@ static PyObject *_wrap_FindWindowByName(PyObject *self, PyObject *args, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if (obj1) {
         if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -24190,7 +24089,7 @@ static PyObject *_wrap_FindWindowByLabel(PyObject *self, PyObject *args, PyObjec
     wxString *arg1 = 0 ;
     wxWindow *arg2 = (wxWindow *) NULL ;
     wxWindow *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -24201,7 +24100,7 @@ static PyObject *_wrap_FindWindowByLabel(PyObject *self, PyObject *args, PyObjec
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if (obj1) {
         if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -24465,7 +24364,7 @@ static PyObject *_wrap_Validator_IsSilent(PyObject *self, PyObject *args, PyObje
 
 static PyObject *_wrap_Validator_SetBellOnError(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    int arg1 = (int) TRUE ;
+    int arg1 = (int) True ;
     char *kwnames[] = {
         (char *) "doIt", NULL 
     };
@@ -24519,7 +24418,7 @@ static PyObject *_wrap_PyValidator__setCallbackInfo(PyObject *self, PyObject *ar
     wxPyValidator *arg1 = (wxPyValidator *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
     PyObject *arg3 = (PyObject *) 0 ;
-    int arg4 = (int) TRUE ;
+    int arg4 = (int) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -24572,7 +24471,7 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs
     wxString *arg1 = (wxString *) &arg1_defvalue ;
     long arg2 = (long) 0 ;
     wxMenu *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "title",(char *) "style", NULL 
@@ -24583,7 +24482,7 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     {
@@ -24618,8 +24517,8 @@ static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwa
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     int arg5 = (int) wxITEM_NORMAL ;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -24632,13 +24531,13 @@ static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwa
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     {
@@ -24702,8 +24601,8 @@ static PyObject *_wrap_Menu_AppendCheckItem(PyObject *self, PyObject *args, PyOb
     wxString *arg3 = 0 ;
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -24716,13 +24615,13 @@ static PyObject *_wrap_Menu_AppendCheckItem(PyObject *self, PyObject *args, PyOb
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     {
@@ -24762,8 +24661,8 @@ static PyObject *_wrap_Menu_AppendRadioItem(PyObject *self, PyObject *args, PyOb
     wxString *arg3 = 0 ;
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -24776,13 +24675,13 @@ static PyObject *_wrap_Menu_AppendRadioItem(PyObject *self, PyObject *args, PyOb
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     {
@@ -24823,8 +24722,8 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *self, PyObject *args, PyObject
     wxMenu *arg4 = (wxMenu *) 0 ;
     wxString const &arg5_defvalue = wxPyEmptyString ;
     wxString *arg5 = (wxString *) &arg5_defvalue ;
-    bool temp3 = false ;
-    bool temp5 = false ;
+    bool temp3 = False ;
+    bool temp5 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -24838,14 +24737,14 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *self, PyObject *args, PyObject
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (obj4) {
         {
             arg5 = wxString_in_helper(obj4);
             if (arg5 == NULL) SWIG_fail;
-            temp5 = true;
+            temp5 = True;
         }
     }
     {
@@ -24970,8 +24869,8 @@ static PyObject *_wrap_Menu_Insert(PyObject *self, PyObject *args, PyObject *kwa
     wxString const &arg5_defvalue = wxPyEmptyString ;
     wxString *arg5 = (wxString *) &arg5_defvalue ;
     int arg6 = (int) wxITEM_NORMAL ;
-    bool temp4 = false ;
-    bool temp5 = false ;
+    bool temp4 = False ;
+    bool temp5 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -24987,13 +24886,13 @@ static PyObject *_wrap_Menu_Insert(PyObject *self, PyObject *args, PyObject *kwa
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
             arg5 = wxString_in_helper(obj4);
             if (arg5 == NULL) SWIG_fail;
-            temp5 = true;
+            temp5 = True;
         }
     }
     {
@@ -25062,8 +24961,8 @@ static PyObject *_wrap_Menu_InsertCheckItem(PyObject *self, PyObject *args, PyOb
     wxString *arg4 = 0 ;
     wxString const &arg5_defvalue = wxPyEmptyString ;
     wxString *arg5 = (wxString *) &arg5_defvalue ;
-    bool temp4 = false ;
-    bool temp5 = false ;
+    bool temp4 = False ;
+    bool temp5 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -25079,13 +24978,13 @@ static PyObject *_wrap_Menu_InsertCheckItem(PyObject *self, PyObject *args, PyOb
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
             arg5 = wxString_in_helper(obj4);
             if (arg5 == NULL) SWIG_fail;
-            temp5 = true;
+            temp5 = True;
         }
     }
     {
@@ -25126,8 +25025,8 @@ static PyObject *_wrap_Menu_InsertRadioItem(PyObject *self, PyObject *args, PyOb
     wxString *arg4 = 0 ;
     wxString const &arg5_defvalue = wxPyEmptyString ;
     wxString *arg5 = (wxString *) &arg5_defvalue ;
-    bool temp4 = false ;
-    bool temp5 = false ;
+    bool temp4 = False ;
+    bool temp5 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -25143,13 +25042,13 @@ static PyObject *_wrap_Menu_InsertRadioItem(PyObject *self, PyObject *args, PyOb
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
             arg5 = wxString_in_helper(obj4);
             if (arg5 == NULL) SWIG_fail;
-            temp5 = true;
+            temp5 = True;
         }
     }
     {
@@ -25191,8 +25090,8 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *self, PyObject *args, PyObject
     wxMenu *arg5 = (wxMenu *) 0 ;
     wxString const &arg6_defvalue = wxPyEmptyString ;
     wxString *arg6 = (wxString *) &arg6_defvalue ;
-    bool temp4 = false ;
-    bool temp6 = false ;
+    bool temp4 = False ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -25209,14 +25108,14 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *self, PyObject *args, PyObject
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (obj5) {
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -25284,8 +25183,8 @@ static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kw
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     int arg5 = (int) wxITEM_NORMAL ;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -25298,13 +25197,13 @@ static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kw
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     {
@@ -25368,8 +25267,8 @@ static PyObject *_wrap_Menu_PrependCheckItem(PyObject *self, PyObject *args, PyO
     wxString *arg3 = 0 ;
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -25382,13 +25281,13 @@ static PyObject *_wrap_Menu_PrependCheckItem(PyObject *self, PyObject *args, PyO
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     {
@@ -25428,8 +25327,8 @@ static PyObject *_wrap_Menu_PrependRadioItem(PyObject *self, PyObject *args, PyO
     wxString *arg3 = 0 ;
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -25442,13 +25341,13 @@ static PyObject *_wrap_Menu_PrependRadioItem(PyObject *self, PyObject *args, PyO
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     {
@@ -25489,8 +25388,8 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *self, PyObject *args, PyObject
     wxMenu *arg4 = (wxMenu *) 0 ;
     wxString const &arg5_defvalue = wxPyEmptyString ;
     wxString *arg5 = (wxString *) &arg5_defvalue ;
-    bool temp3 = false ;
-    bool temp5 = false ;
+    bool temp3 = False ;
+    bool temp5 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -25504,14 +25403,14 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *self, PyObject *args, PyObject
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxMenu,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (obj4) {
         {
             arg5 = wxString_in_helper(obj4);
             if (arg5 == NULL) SWIG_fail;
-            temp5 = true;
+            temp5 = True;
         }
     }
     {
@@ -25789,7 +25688,7 @@ static PyObject *_wrap_Menu_FindItem(PyObject *self, PyObject *args, PyObject *k
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -25801,7 +25700,7 @@ static PyObject *_wrap_Menu_FindItem(PyObject *self, PyObject *args, PyObject *k
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25999,7 +25898,7 @@ static PyObject *_wrap_Menu_SetLabel(PyObject *self, PyObject *args, PyObject *k
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -26011,7 +25910,7 @@ static PyObject *_wrap_Menu_SetLabel(PyObject *self, PyObject *args, PyObject *k
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26072,7 +25971,7 @@ static PyObject *_wrap_Menu_SetHelpString(PyObject *self, PyObject *args, PyObje
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -26084,7 +25983,7 @@ static PyObject *_wrap_Menu_SetHelpString(PyObject *self, PyObject *args, PyObje
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26144,7 +26043,7 @@ static PyObject *_wrap_Menu_SetTitle(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -26156,7 +26055,7 @@ static PyObject *_wrap_Menu_SetTitle(PyObject *self, PyObject *args, PyObject *k
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26568,7 +26467,7 @@ static PyObject *_wrap_MenuBar_Append(PyObject *self, PyObject *args, PyObject *
     wxMenu *arg2 = (wxMenu *) 0 ;
     wxString *arg3 = 0 ;
     bool result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -26582,7 +26481,7 @@ static PyObject *_wrap_MenuBar_Append(PyObject *self, PyObject *args, PyObject *
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26613,7 +26512,7 @@ static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject *
     wxMenu *arg3 = (wxMenu *) 0 ;
     wxString *arg4 = 0 ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -26630,7 +26529,7 @@ static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject *
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26717,7 +26616,7 @@ static PyObject *_wrap_MenuBar_Replace(PyObject *self, PyObject *args, PyObject
     wxMenu *arg3 = (wxMenu *) 0 ;
     wxString *arg4 = 0 ;
     wxMenu *result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -26734,7 +26633,7 @@ static PyObject *_wrap_MenuBar_Replace(PyObject *self, PyObject *args, PyObject
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26857,7 +26756,7 @@ static PyObject *_wrap_MenuBar_SetLabelTop(PyObject *self, PyObject *args, PyObj
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -26872,7 +26771,7 @@ static PyObject *_wrap_MenuBar_SetLabelTop(PyObject *self, PyObject *args, PyObj
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26937,8 +26836,8 @@ static PyObject *_wrap_MenuBar_FindMenuItem(PyObject *self, PyObject *args, PyOb
     wxString *arg2 = 0 ;
     wxString *arg3 = 0 ;
     int result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -26951,12 +26850,12 @@ static PyObject *_wrap_MenuBar_FindMenuItem(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27021,7 +26920,7 @@ static PyObject *_wrap_MenuBar_FindMenu(PyObject *self, PyObject *args, PyObject
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -27033,7 +26932,7 @@ static PyObject *_wrap_MenuBar_FindMenu(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27172,7 +27071,7 @@ static PyObject *_wrap_MenuBar_SetLabel(PyObject *self, PyObject *args, PyObject
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -27184,7 +27083,7 @@ static PyObject *_wrap_MenuBar_SetLabel(PyObject *self, PyObject *args, PyObject
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27245,7 +27144,7 @@ static PyObject *_wrap_MenuBar_SetHelpString(PyObject *self, PyObject *args, PyO
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -27257,7 +27156,7 @@ static PyObject *_wrap_MenuBar_SetHelpString(PyObject *self, PyObject *args, PyO
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27434,8 +27333,8 @@ static PyObject *_wrap_new_MenuItem(PyObject *self, PyObject *args, PyObject *kw
     int arg5 = (int) wxITEM_NORMAL ;
     wxMenu *arg6 = (wxMenu *) NULL ;
     wxMenuItem *result;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -27452,14 +27351,14 @@ static PyObject *_wrap_new_MenuItem(PyObject *self, PyObject *args, PyObject *kw
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     if (obj5) {
@@ -27630,7 +27529,7 @@ static PyObject *_wrap_MenuItem_SetText(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -27642,7 +27541,7 @@ static PyObject *_wrap_MenuItem_SetText(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27729,7 +27628,7 @@ static PyObject *_wrap_MenuItem_GetLabelFromText(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "text", NULL 
@@ -27739,7 +27638,7 @@ static PyObject *_wrap_MenuItem_GetLabelFromText(PyObject *self, PyObject *args,
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27929,7 +27828,7 @@ static PyObject *_wrap_MenuItem_GetSubMenu(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_MenuItem_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -27984,7 +27883,7 @@ static PyObject *_wrap_MenuItem_IsEnabled(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_MenuItem_Check(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -28064,7 +27963,7 @@ static PyObject *_wrap_MenuItem_SetHelp(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -28076,7 +27975,7 @@ static PyObject *_wrap_MenuItem_SetHelp(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28270,7 +28169,7 @@ static PyObject * MenuItem_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -28283,7 +28182,7 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa
     wxControl *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -28317,7 +28216,7 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -28372,7 +28271,7 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject *
     PyObject *resultobj;
     wxControl *arg1 = (wxControl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -28385,7 +28284,7 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject *
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -28421,7 +28320,7 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject *
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -28511,7 +28410,7 @@ static PyObject *_wrap_Control_SetLabel(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxControl *arg1 = (wxControl *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -28523,7 +28422,7 @@ static PyObject *_wrap_Control_SetLabel(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28560,7 +28459,7 @@ static PyObject *_wrap_ItemContainer_Append(PyObject *self, PyObject *args, PyOb
     wxString *arg2 = 0 ;
     PyObject *arg3 = (PyObject *) NULL ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -28573,7 +28472,7 @@ static PyObject *_wrap_ItemContainer_Append(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         arg3 = obj2;
@@ -28658,7 +28557,7 @@ static PyObject *_wrap_ItemContainer_Insert(PyObject *self, PyObject *args, PyOb
     int arg3 ;
     PyObject *arg4 = (PyObject *) NULL ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -28671,7 +28570,7 @@ static PyObject *_wrap_ItemContainer_Insert(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj3) {
         arg4 = obj3;
@@ -28861,7 +28760,7 @@ static PyObject *_wrap_ItemContainer_SetString(PyObject *self, PyObject *args, P
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -28873,7 +28772,7 @@ static PyObject *_wrap_ItemContainer_SetString(PyObject *self, PyObject *args, P
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28902,7 +28801,7 @@ static PyObject *_wrap_ItemContainer_FindString(PyObject *self, PyObject *args,
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -28914,7 +28813,7 @@ static PyObject *_wrap_ItemContainer_FindString(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30172,8 +30071,8 @@ static PyObject *_wrap_Sizer__SetItemMinSize(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
-    wxSize arg3 ;
-    wxSize *argp3 ;
+    wxSize *arg3 = 0 ;
+    wxSize temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -30184,11 +30083,13 @@ static PyObject *_wrap_Sizer__SetItemMinSize(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer__SetItemMinSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     arg2 = obj1;
-    if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg3 = *argp3; 
+    {
+        arg3 = &temp3;
+        if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail;
+    }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        wxSizer__SetItemMinSize(arg1,arg2,arg3);
+        wxSizer__SetItemMinSize(arg1,arg2,(wxSize const &)*arg3);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -30622,7 +30523,7 @@ static PyObject *_wrap_Sizer_SetVirtualSizeHints(PyObject *self, PyObject *args,
 static PyObject *_wrap_Sizer_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
-    bool arg2 = (bool) FALSE ;
+    bool arg2 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -30702,7 +30603,7 @@ static PyObject *_wrap_Sizer_Show(PyObject *self, PyObject *args, PyObject *kwar
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -31705,6 +31606,78 @@ static PyObject *_wrap_FlexGridSizer_GetNonFlexibleGrowMode(PyObject *self, PyOb
 }
 
 
+static PyObject *_wrap_FlexGridSizer_GetRowHeights(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
+    wxArrayInt *result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FlexGridSizer_GetRowHeights",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        {
+            wxArrayInt const &_result_ref = ((wxFlexGridSizer const *)arg1)->GetRowHeights();
+            result = (wxArrayInt *) &_result_ref;
+        }
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = PyList_New(0);
+        size_t idx;
+        for (idx = 0; idx < result->GetCount(); idx += 1) {
+            PyObject* val = PyInt_FromLong( result->Item(idx) );
+            PyList_Append(resultobj, val);
+            Py_DECREF(val);
+        }
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_FlexGridSizer_GetColWidths(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
+    wxArrayInt *result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FlexGridSizer_GetColWidths",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFlexGridSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        {
+            wxArrayInt const &_result_ref = ((wxFlexGridSizer const *)arg1)->GetColWidths();
+            result = (wxArrayInt *) &_result_ref;
+        }
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        resultobj = PyList_New(0);
+        size_t idx;
+        for (idx = 0; idx < result->GetCount(); idx += 1) {
+            PyObject* val = PyInt_FromLong( result->Item(idx) );
+            PyList_Append(resultobj, val);
+            Py_DECREF(val);
+        }
+    }
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject * FlexGridSizer_swigregister(PyObject *self, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
@@ -31900,7 +31873,33 @@ static PyObject *_wrap_GBPosition___ne__(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_GBPosition_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGBPosition *arg1 = (wxGBPosition *) 0 ;
+    int arg2 = (int) 0 ;
+    int arg3 = (int) 0 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "row",(char *) "col", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:GBPosition_Set",kwnames,&obj0,&arg2,&arg3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        wxGBPosition_Set(arg1,arg2,arg3);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_GBPosition_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     PyObject *result;
@@ -31909,11 +31908,11 @@ static PyObject *_wrap_GBPosition_asTuple(PyObject *self, PyObject *args, PyObje
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBPosition_asTuple",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBPosition_Get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBPosition,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (PyObject *)wxGBPosition_asTuple(arg1);
+        result = (PyObject *)wxGBPosition_Get(arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -32120,7 +32119,33 @@ static PyObject *_wrap_GBSpan___ne__(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_GBSpan_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGBSpan *arg1 = (wxGBSpan *) 0 ;
+    int arg2 = (int) 1 ;
+    int arg3 = (int) 1 ;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "rowspan",(char *) "colspan", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|ii:GBSpan_Set",kwnames,&obj0,&arg2,&arg3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        wxGBSpan_Set(arg1,arg2,arg3);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_GBSpan_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     PyObject *result;
@@ -32129,11 +32154,11 @@ static PyObject *_wrap_GBSpan_asTuple(PyObject *self, PyObject *args, PyObject *
         (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSpan_asTuple",kwnames,&obj0)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GBSpan_Get",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGBSpan,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (PyObject *)wxGBSpan_asTuple(arg1);
+        result = (PyObject *)wxGBSpan_Get(arg1);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -33727,6 +33752,38 @@ static PyObject *_wrap_GridBagSizer_FindItemAtPosition(PyObject *self, PyObject
 }
 
 
+static PyObject *_wrap_GridBagSizer_FindItemAtPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
+    wxPoint *arg2 = 0 ;
+    wxGBSizerItem *result;
+    wxPoint temp2 ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "pt", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridBagSizer_FindItemAtPoint",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridBagSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg2 = &temp2;
+        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (wxGBSizerItem *)(arg1)->FindItemAtPoint((wxPoint const &)*arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGBSizerItem, 0);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_GridBagSizer_FindItemWithData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
@@ -34953,9 +35010,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Size_SetHeight", (PyCFunction) _wrap_Size_SetHeight, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Size_GetWidth", (PyCFunction) _wrap_Size_GetWidth, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Size_GetHeight", (PyCFunction) _wrap_Size_GetHeight, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Size_GetX", (PyCFunction) _wrap_Size_GetX, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Size_GetY", (PyCFunction) _wrap_Size_GetY, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Size_asTuple", (PyCFunction) _wrap_Size_asTuple, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Size_Get", (PyCFunction) _wrap_Size_Get, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Size_swigregister", Size_swigregister, METH_VARARGS },
 	 { (char *)"RealPoint_x_set", (PyCFunction) _wrap_RealPoint_x_set, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"RealPoint_x_get", (PyCFunction) _wrap_RealPoint_x_get, METH_VARARGS | METH_KEYWORDS },
@@ -34963,12 +35018,12 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"RealPoint_y_get", (PyCFunction) _wrap_RealPoint_y_get, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"new_RealPoint", (PyCFunction) _wrap_new_RealPoint, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"delete_RealPoint", (PyCFunction) _wrap_delete_RealPoint, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"RealPoint___add__", (PyCFunction) _wrap_RealPoint___add__, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"RealPoint___sub__", (PyCFunction) _wrap_RealPoint___sub__, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"RealPoint___eq__", (PyCFunction) _wrap_RealPoint___eq__, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"RealPoint___ne__", (PyCFunction) _wrap_RealPoint___ne__, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"RealPoint___add__", (PyCFunction) _wrap_RealPoint___add__, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"RealPoint___sub__", (PyCFunction) _wrap_RealPoint___sub__, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"RealPoint_Set", (PyCFunction) _wrap_RealPoint_Set, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"RealPoint_asTuple", (PyCFunction) _wrap_RealPoint_asTuple, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"RealPoint_Get", (PyCFunction) _wrap_RealPoint_Get, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"RealPoint_swigregister", RealPoint_swigregister, METH_VARARGS },
 	 { (char *)"Point_x_set", (PyCFunction) _wrap_Point_x_set, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Point_x_get", (PyCFunction) _wrap_Point_x_get, METH_VARARGS | METH_KEYWORDS },
@@ -34983,7 +35038,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Point___iadd__", (PyCFunction) _wrap_Point___iadd__, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Point___isub__", (PyCFunction) _wrap_Point___isub__, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Point_Set", (PyCFunction) _wrap_Point_Set, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Point_asTuple", (PyCFunction) _wrap_Point_asTuple, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Point_Get", (PyCFunction) _wrap_Point_Get, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Point_swigregister", Point_swigregister, METH_VARARGS },
 	 { (char *)"new_Rect", (PyCFunction) _wrap_new_Rect, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"new_RectPP", (PyCFunction) _wrap_new_RectPP, METH_VARARGS | METH_KEYWORDS },
@@ -35030,7 +35085,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Rect_height_set", (PyCFunction) _wrap_Rect_height_set, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Rect_height_get", (PyCFunction) _wrap_Rect_height_get, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Rect_Set", (PyCFunction) _wrap_Rect_Set, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Rect_asTuple", (PyCFunction) _wrap_Rect_asTuple, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Rect_Get", (PyCFunction) _wrap_Rect_Get, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Rect_swigregister", Rect_swigregister, METH_VARARGS },
 	 { (char *)"IntersectRect", (PyCFunction) _wrap_IntersectRect, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"new_Point2D", (PyCFunction) _wrap_new_Point2D, METH_VARARGS | METH_KEYWORDS },
@@ -35053,16 +35108,12 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Point2D___idiv__", (PyCFunction) _wrap_Point2D___idiv__, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Point2D___eq__", (PyCFunction) _wrap_Point2D___eq__, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Point2D___ne__", (PyCFunction) _wrap_Point2D___ne__, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Point2D_m_x_set", (PyCFunction) _wrap_Point2D_m_x_set, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Point2D_m_x_get", (PyCFunction) _wrap_Point2D_m_x_get, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Point2D_m_y_set", (PyCFunction) _wrap_Point2D_m_y_set, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Point2D_m_y_get", (PyCFunction) _wrap_Point2D_m_y_get, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Point2D_x_set", (PyCFunction) _wrap_Point2D_x_set, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Point2D_x_get", (PyCFunction) _wrap_Point2D_x_get, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Point2D_y_set", (PyCFunction) _wrap_Point2D_y_set, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Point2D_y_get", (PyCFunction) _wrap_Point2D_y_get, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Point2D_Set", (PyCFunction) _wrap_Point2D_Set, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"Point2D_asTuple", (PyCFunction) _wrap_Point2D_asTuple, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"Point2D_Get", (PyCFunction) _wrap_Point2D_Get, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Point2D_swigregister", Point2D_swigregister, METH_VARARGS },
 	 { (char *)"new_InputStream", (PyCFunction) _wrap_new_InputStream, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"InputStream_close", (PyCFunction) _wrap_InputStream_close, METH_VARARGS | METH_KEYWORDS },
@@ -36039,6 +36090,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FlexGridSizer_GetFlexibleDirection", (PyCFunction) _wrap_FlexGridSizer_GetFlexibleDirection, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"FlexGridSizer_SetNonFlexibleGrowMode", (PyCFunction) _wrap_FlexGridSizer_SetNonFlexibleGrowMode, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"FlexGridSizer_GetNonFlexibleGrowMode", (PyCFunction) _wrap_FlexGridSizer_GetNonFlexibleGrowMode, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"FlexGridSizer_GetRowHeights", (PyCFunction) _wrap_FlexGridSizer_GetRowHeights, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"FlexGridSizer_GetColWidths", (PyCFunction) _wrap_FlexGridSizer_GetColWidths, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"FlexGridSizer_swigregister", FlexGridSizer_swigregister, METH_VARARGS },
 	 { (char *)"new_GBPosition", (PyCFunction) _wrap_new_GBPosition, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"GBPosition_GetRow", (PyCFunction) _wrap_GBPosition_GetRow, METH_VARARGS | METH_KEYWORDS },
@@ -36047,7 +36100,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"GBPosition_SetCol", (PyCFunction) _wrap_GBPosition_SetCol, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"GBPosition___eq__", (PyCFunction) _wrap_GBPosition___eq__, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"GBPosition___ne__", (PyCFunction) _wrap_GBPosition___ne__, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"GBPosition_asTuple", (PyCFunction) _wrap_GBPosition_asTuple, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"GBPosition_Set", (PyCFunction) _wrap_GBPosition_Set, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"GBPosition_Get", (PyCFunction) _wrap_GBPosition_Get, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"GBPosition_swigregister", GBPosition_swigregister, METH_VARARGS },
 	 { (char *)"new_GBSpan", (PyCFunction) _wrap_new_GBSpan, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"GBSpan_GetRowspan", (PyCFunction) _wrap_GBSpan_GetRowspan, METH_VARARGS | METH_KEYWORDS },
@@ -36056,7 +36110,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"GBSpan_SetColspan", (PyCFunction) _wrap_GBSpan_SetColspan, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"GBSpan___eq__", (PyCFunction) _wrap_GBSpan___eq__, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"GBSpan___ne__", (PyCFunction) _wrap_GBSpan___ne__, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"GBSpan_asTuple", (PyCFunction) _wrap_GBSpan_asTuple, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"GBSpan_Set", (PyCFunction) _wrap_GBSpan_Set, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"GBSpan_Get", (PyCFunction) _wrap_GBSpan_Get, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"GBSpan_swigregister", GBSpan_swigregister, METH_VARARGS },
 	 { (char *)"new_GBSizerItem", (PyCFunction) _wrap_new_GBSizerItem, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"new_GBSizerItemWindow", (PyCFunction) _wrap_new_GBSizerItemWindow, METH_VARARGS | METH_KEYWORDS },
@@ -36082,6 +36137,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"GridBagSizer_SetItemSpan", _wrap_GridBagSizer_SetItemSpan, METH_VARARGS },
 	 { (char *)"GridBagSizer_FindItem", _wrap_GridBagSizer_FindItem, METH_VARARGS },
 	 { (char *)"GridBagSizer_FindItemAtPosition", (PyCFunction) _wrap_GridBagSizer_FindItemAtPosition, METH_VARARGS | METH_KEYWORDS },
+	 { (char *)"GridBagSizer_FindItemAtPoint", (PyCFunction) _wrap_GridBagSizer_FindItemAtPoint, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"GridBagSizer_FindItemWithData", (PyCFunction) _wrap_GridBagSizer_FindItemWithData, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"GridBagSizer_RecalcSizes", (PyCFunction) _wrap_GridBagSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"GridBagSizer_CalcMin", (PyCFunction) _wrap_GridBagSizer_CalcMin, METH_VARARGS | METH_KEYWORDS },
@@ -37784,6 +37840,7 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyDict_SetItemString(d, "wxEVT_COMMAND_SET_FOCUS", PyInt_FromLong(wxEVT_COMMAND_SET_FOCUS));
     PyDict_SetItemString(d, "wxEVT_COMMAND_KILL_FOCUS", PyInt_FromLong(wxEVT_COMMAND_KILL_FOCUS));
     PyDict_SetItemString(d, "wxEVT_COMMAND_ENTER", PyInt_FromLong(wxEVT_COMMAND_ENTER));
+    SWIG_addvarlink(SWIG_globals,(char*)"PanelNameStr",_wrap_PanelNameStr_get, _wrap_PanelNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"DefaultValidator",_wrap_DefaultValidator_get, _wrap_DefaultValidator_set);
     SWIG_addvarlink(SWIG_globals,(char*)"DefaultSpan",_wrap_DefaultSpan_get, _wrap_DefaultSpan_set);
     
diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py
index 6526c49944..aad2e7559a 100644
--- a/wxPython/src/gtk/gdi.py
+++ b/wxPython/src/gtk/gdi.py
@@ -8,20 +8,33 @@ wx = core
 #---------------------------------------------------------------------------
 
 class GDIObject(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGDIObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> GDIObject"""
         newobj = _gdi.new_GDIObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_GDIObject):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetVisible(*args, **kwargs): return _gdi.GDIObject_GetVisible(*args, **kwargs)
-    def SetVisible(*args, **kwargs): return _gdi.GDIObject_SetVisible(*args, **kwargs)
-    def IsNull(*args, **kwargs): return _gdi.GDIObject_IsNull(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGDIObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetVisible(*args, **kwargs):
+        """GetVisible() -> bool"""
+        return _gdi.GDIObject_GetVisible(*args, **kwargs)
+
+    def SetVisible(*args, **kwargs):
+        """SetVisible(bool visible)"""
+        return _gdi.GDIObject_SetVisible(*args, **kwargs)
+
+    def IsNull(*args, **kwargs):
+        """IsNull() -> bool"""
+        return _gdi.GDIObject_IsNull(*args, **kwargs)
+
 
 class GDIObjectPtr(GDIObject):
     def __init__(self, this):
@@ -33,24 +46,57 @@ _gdi.GDIObject_swigregister(GDIObjectPtr)
 #---------------------------------------------------------------------------
 
 class Colour(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxColour instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(unsigned char red=0, unsigned char green=0, unsigned char blue=0) -> Colour"""
         newobj = _gdi.new_Colour(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_Colour):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Red(*args, **kwargs): return _gdi.Colour_Red(*args, **kwargs)
-    def Green(*args, **kwargs): return _gdi.Colour_Green(*args, **kwargs)
-    def Blue(*args, **kwargs): return _gdi.Colour_Blue(*args, **kwargs)
-    def Ok(*args, **kwargs): return _gdi.Colour_Ok(*args, **kwargs)
-    def Set(*args, **kwargs): return _gdi.Colour_Set(*args, **kwargs)
-    def SetRBG(*args, **kwargs): return _gdi.Colour_SetRBG(*args, **kwargs)
-    def __eq__(*args, **kwargs): return _gdi.Colour___eq__(*args, **kwargs)
-    def __ne__(*args, **kwargs): return _gdi.Colour___ne__(*args, **kwargs)
-    def Get(*args, **kwargs): return _gdi.Colour_Get(*args, **kwargs)
+
+    def Red(*args, **kwargs):
+        """Red() -> unsigned char"""
+        return _gdi.Colour_Red(*args, **kwargs)
+
+    def Green(*args, **kwargs):
+        """Green() -> unsigned char"""
+        return _gdi.Colour_Green(*args, **kwargs)
+
+    def Blue(*args, **kwargs):
+        """Blue() -> unsigned char"""
+        return _gdi.Colour_Blue(*args, **kwargs)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _gdi.Colour_Ok(*args, **kwargs)
+
+    def Set(*args, **kwargs):
+        """Set(unsigned char red, unsigned char green, unsigned char blue)"""
+        return _gdi.Colour_Set(*args, **kwargs)
+
+    def SetRBG(*args, **kwargs):
+        """SetRBG(unsigned long colRGB)"""
+        return _gdi.Colour_SetRBG(*args, **kwargs)
+
+    def __eq__(*args, **kwargs):
+        """__eq__(Colour colour) -> bool"""
+        return _gdi.Colour___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(Colour colour) -> bool"""
+        return _gdi.Colour___ne__(*args, **kwargs)
+
+    def Get(*args, **kwargs):
+        """Get() -> PyObject"""
+        return _gdi.Colour_Get(*args, **kwargs)
+
     asTuple = Get
     def __str__(self):                  return str(self.asTuple())
     def __repr__(self):                 return 'wxColour' + str(self.asTuple())
@@ -68,30 +114,45 @@ class ColourPtr(Colour):
 _gdi.Colour_swigregister(ColourPtr)
 
 def NamedColour(*args, **kwargs):
+    """NamedColour(wxString colorName) -> Colour"""
     val = _gdi.new_NamedColour(*args, **kwargs)
     val.thisown = 1
     return val
 
 def ColourRGB(*args, **kwargs):
+    """ColourRGB(unsigned long colRGB) -> Colour"""
     val = _gdi.new_ColourRGB(*args, **kwargs)
     val.thisown = 1
     return val
 
 class Palette(GDIObject):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPalette instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int n, unsigned char red, unsigned char green, unsigned char blue) -> Palette"""
         newobj = _gdi.new_Palette(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_Palette):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetPixel(*args, **kwargs): return _gdi.Palette_GetPixel(*args, **kwargs)
-    def GetRGB(*args, **kwargs): return _gdi.Palette_GetRGB(*args, **kwargs)
-    def Ok(*args, **kwargs): return _gdi.Palette_Ok(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPalette instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetPixel(*args, **kwargs):
+        """GetPixel(byte red, byte green, byte blue) -> int"""
+        return _gdi.Palette_GetPixel(*args, **kwargs)
+
+    def GetRGB(*args, **kwargs):
+        """GetRGB(int pixel, byte OUTPUT, byte OUTPUT, byte OUTPUT) -> bool"""
+        return _gdi.Palette_GetRGB(*args, **kwargs)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _gdi.Palette_Ok(*args, **kwargs)
+
 
 class PalettePtr(Palette):
     def __init__(self, this):
@@ -103,31 +164,74 @@ _gdi.Palette_swigregister(PalettePtr)
 #---------------------------------------------------------------------------
 
 class Pen(GDIObject):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Colour colour, int width=1, int style=SOLID) -> Pen"""
         newobj = _gdi.new_Pen(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_Pen):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetCap(*args, **kwargs): return _gdi.Pen_GetCap(*args, **kwargs)
-    def GetColour(*args, **kwargs): return _gdi.Pen_GetColour(*args, **kwargs)
-    def GetJoin(*args, **kwargs): return _gdi.Pen_GetJoin(*args, **kwargs)
-    def GetStyle(*args, **kwargs): return _gdi.Pen_GetStyle(*args, **kwargs)
-    def GetWidth(*args, **kwargs): return _gdi.Pen_GetWidth(*args, **kwargs)
-    def Ok(*args, **kwargs): return _gdi.Pen_Ok(*args, **kwargs)
-    def SetCap(*args, **kwargs): return _gdi.Pen_SetCap(*args, **kwargs)
-    def SetColour(*args, **kwargs): return _gdi.Pen_SetColour(*args, **kwargs)
-    def SetJoin(*args, **kwargs): return _gdi.Pen_SetJoin(*args, **kwargs)
-    def SetStyle(*args, **kwargs): return _gdi.Pen_SetStyle(*args, **kwargs)
-    def SetWidth(*args, **kwargs): return _gdi.Pen_SetWidth(*args, **kwargs)
-    def SetDashes(*args, **kwargs): return _gdi.Pen_SetDashes(*args, **kwargs)
-    def GetDashes(*args, **kwargs): return _gdi.Pen_GetDashes(*args, **kwargs)
+
+    def GetCap(*args, **kwargs):
+        """GetCap() -> int"""
+        return _gdi.Pen_GetCap(*args, **kwargs)
+
+    def GetColour(*args, **kwargs):
+        """GetColour() -> Colour"""
+        return _gdi.Pen_GetColour(*args, **kwargs)
+
+    def GetJoin(*args, **kwargs):
+        """GetJoin() -> int"""
+        return _gdi.Pen_GetJoin(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle() -> int"""
+        return _gdi.Pen_GetStyle(*args, **kwargs)
+
+    def GetWidth(*args, **kwargs):
+        """GetWidth() -> int"""
+        return _gdi.Pen_GetWidth(*args, **kwargs)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _gdi.Pen_Ok(*args, **kwargs)
+
+    def SetCap(*args, **kwargs):
+        """SetCap(int cap_style)"""
+        return _gdi.Pen_SetCap(*args, **kwargs)
+
+    def SetColour(*args, **kwargs):
+        """SetColour(Colour colour)"""
+        return _gdi.Pen_SetColour(*args, **kwargs)
+
+    def SetJoin(*args, **kwargs):
+        """SetJoin(int join_style)"""
+        return _gdi.Pen_SetJoin(*args, **kwargs)
+
+    def SetStyle(*args, **kwargs):
+        """SetStyle(int style)"""
+        return _gdi.Pen_SetStyle(*args, **kwargs)
+
+    def SetWidth(*args, **kwargs):
+        """SetWidth(int width)"""
+        return _gdi.Pen_SetWidth(*args, **kwargs)
+
+    def SetDashes(*args, **kwargs):
+        """SetDashes(int dashes, wxDash dashes_array)"""
+        return _gdi.Pen_SetDashes(*args, **kwargs)
+
+    def GetDashes(*args, **kwargs):
+        """GetDashes() -> PyObject"""
+        return _gdi.Pen_GetDashes(*args, **kwargs)
+
     def __nonzero__(self): return self.Ok() 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class PenPtr(Pen):
     def __init__(self, this):
@@ -137,18 +241,25 @@ class PenPtr(Pen):
 _gdi.Pen_swigregister(PenPtr)
 
 class PyPen(Pen):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyPen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Colour colour, int width=1, int style=SOLID) -> PyPen"""
         newobj = _gdi.new_PyPen(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_PyPen):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetDashes(*args, **kwargs): return _gdi.PyPen_SetDashes(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyPen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetDashes(*args, **kwargs):
+        """SetDashes(int dashes, wxDash dashes_array)"""
+        return _gdi.PyPen_SetDashes(*args, **kwargs)
+
 
 class PyPenPtr(PyPen):
     def __init__(self, this):
@@ -161,25 +272,50 @@ Pen = PyPen
 #---------------------------------------------------------------------------
 
 class Brush(GDIObject):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBrush instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Colour colour, int style=SOLID) -> Brush"""
         newobj = _gdi.new_Brush(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_Brush):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetColour(*args, **kwargs): return _gdi.Brush_SetColour(*args, **kwargs)
-    def SetStyle(*args, **kwargs): return _gdi.Brush_SetStyle(*args, **kwargs)
-    def SetStipple(*args, **kwargs): return _gdi.Brush_SetStipple(*args, **kwargs)
-    def GetColour(*args, **kwargs): return _gdi.Brush_GetColour(*args, **kwargs)
-    def GetStyle(*args, **kwargs): return _gdi.Brush_GetStyle(*args, **kwargs)
-    def GetStipple(*args, **kwargs): return _gdi.Brush_GetStipple(*args, **kwargs)
-    def Ok(*args, **kwargs): return _gdi.Brush_Ok(*args, **kwargs)
+
+    def SetColour(*args, **kwargs):
+        """SetColour(Colour col)"""
+        return _gdi.Brush_SetColour(*args, **kwargs)
+
+    def SetStyle(*args, **kwargs):
+        """SetStyle(int style)"""
+        return _gdi.Brush_SetStyle(*args, **kwargs)
+
+    def SetStipple(*args, **kwargs):
+        """SetStipple(Bitmap stipple)"""
+        return _gdi.Brush_SetStipple(*args, **kwargs)
+
+    def GetColour(*args, **kwargs):
+        """GetColour() -> Colour"""
+        return _gdi.Brush_GetColour(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle() -> int"""
+        return _gdi.Brush_GetStyle(*args, **kwargs)
+
+    def GetStipple(*args, **kwargs):
+        """GetStipple() -> Bitmap"""
+        return _gdi.Brush_GetStipple(*args, **kwargs)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _gdi.Brush_Ok(*args, **kwargs)
+
     def __nonzero__(self): return self.Ok() 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBrush instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class BrushPtr(Brush):
     def __init__(self, this):
@@ -189,33 +325,82 @@ class BrushPtr(Brush):
 _gdi.Brush_swigregister(BrushPtr)
 
 class Bitmap(GDIObject):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString name, wxBitmapType type=BITMAP_TYPE_ANY) -> Bitmap"""
         newobj = _gdi.new_Bitmap(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_Bitmap):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Ok(*args, **kwargs): return _gdi.Bitmap_Ok(*args, **kwargs)
-    def GetWidth(*args, **kwargs): return _gdi.Bitmap_GetWidth(*args, **kwargs)
-    def GetHeight(*args, **kwargs): return _gdi.Bitmap_GetHeight(*args, **kwargs)
-    def GetDepth(*args, **kwargs): return _gdi.Bitmap_GetDepth(*args, **kwargs)
-    def ConvertToImage(*args, **kwargs): return _gdi.Bitmap_ConvertToImage(*args, **kwargs)
-    def GetMask(*args, **kwargs): return _gdi.Bitmap_GetMask(*args, **kwargs)
-    def SetMask(*args, **kwargs): return _gdi.Bitmap_SetMask(*args, **kwargs)
-    def SetMaskColour(*args, **kwargs): return _gdi.Bitmap_SetMaskColour(*args, **kwargs)
-    def GetSubBitmap(*args, **kwargs): return _gdi.Bitmap_GetSubBitmap(*args, **kwargs)
-    def SaveFile(*args, **kwargs): return _gdi.Bitmap_SaveFile(*args, **kwargs)
-    def LoadFile(*args, **kwargs): return _gdi.Bitmap_LoadFile(*args, **kwargs)
-    def CopyFromIcon(*args, **kwargs): return _gdi.Bitmap_CopyFromIcon(*args, **kwargs)
-    def SetHeight(*args, **kwargs): return _gdi.Bitmap_SetHeight(*args, **kwargs)
-    def SetWidth(*args, **kwargs): return _gdi.Bitmap_SetWidth(*args, **kwargs)
-    def SetDepth(*args, **kwargs): return _gdi.Bitmap_SetDepth(*args, **kwargs)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _gdi.Bitmap_Ok(*args, **kwargs)
+
+    def GetWidth(*args, **kwargs):
+        """GetWidth() -> int"""
+        return _gdi.Bitmap_GetWidth(*args, **kwargs)
+
+    def GetHeight(*args, **kwargs):
+        """GetHeight() -> int"""
+        return _gdi.Bitmap_GetHeight(*args, **kwargs)
+
+    def GetDepth(*args, **kwargs):
+        """GetDepth() -> int"""
+        return _gdi.Bitmap_GetDepth(*args, **kwargs)
+
+    def ConvertToImage(*args, **kwargs):
+        """ConvertToImage() -> Image"""
+        return _gdi.Bitmap_ConvertToImage(*args, **kwargs)
+
+    def GetMask(*args, **kwargs):
+        """GetMask() -> Mask"""
+        return _gdi.Bitmap_GetMask(*args, **kwargs)
+
+    def SetMask(*args, **kwargs):
+        """SetMask(Mask mask)"""
+        return _gdi.Bitmap_SetMask(*args, **kwargs)
+
+    def SetMaskColour(*args, **kwargs):
+        """SetMaskColour(Colour colour)"""
+        return _gdi.Bitmap_SetMaskColour(*args, **kwargs)
+
+    def GetSubBitmap(*args, **kwargs):
+        """GetSubBitmap(Rect rect) -> Bitmap"""
+        return _gdi.Bitmap_GetSubBitmap(*args, **kwargs)
+
+    def SaveFile(*args, **kwargs):
+        """SaveFile(wxString name, wxBitmapType type, Palette palette=(wxPalette *) NULL) -> bool"""
+        return _gdi.Bitmap_SaveFile(*args, **kwargs)
+
+    def LoadFile(*args, **kwargs):
+        """LoadFile(wxString name, wxBitmapType type) -> bool"""
+        return _gdi.Bitmap_LoadFile(*args, **kwargs)
+
+    def CopyFromIcon(*args, **kwargs):
+        """CopyFromIcon(Icon icon) -> bool"""
+        return _gdi.Bitmap_CopyFromIcon(*args, **kwargs)
+
+    def SetHeight(*args, **kwargs):
+        """SetHeight(int height)"""
+        return _gdi.Bitmap_SetHeight(*args, **kwargs)
+
+    def SetWidth(*args, **kwargs):
+        """SetWidth(int width)"""
+        return _gdi.Bitmap_SetWidth(*args, **kwargs)
+
+    def SetDepth(*args, **kwargs):
+        """SetDepth(int depth)"""
+        return _gdi.Bitmap_SetDepth(*args, **kwargs)
+
     def __nonzero__(self): return self.Ok() 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class BitmapPtr(Bitmap):
     def __init__(self, this):
@@ -225,38 +410,45 @@ class BitmapPtr(Bitmap):
 _gdi.Bitmap_swigregister(BitmapPtr)
 
 def EmptyBitmap(*args, **kwargs):
+    """EmptyBitmap(int width, int height, int depth=-1) -> Bitmap"""
     val = _gdi.new_EmptyBitmap(*args, **kwargs)
     val.thisown = 1
     return val
 
 def BitmapFromIcon(*args, **kwargs):
+    """BitmapFromIcon(Icon icon) -> Bitmap"""
     val = _gdi.new_BitmapFromIcon(*args, **kwargs)
     val.thisown = 1
     return val
 
 def BitmapFromImage(*args, **kwargs):
+    """BitmapFromImage(Image image, int depth=-1) -> Bitmap"""
     val = _gdi.new_BitmapFromImage(*args, **kwargs)
     val.thisown = 1
     return val
 
 def BitmapFromXPMData(*args, **kwargs):
+    """BitmapFromXPMData(PyObject listOfStrings) -> Bitmap"""
     val = _gdi.new_BitmapFromXPMData(*args, **kwargs)
     val.thisown = 1
     return val
 
 def BitmapFromBits(*args, **kwargs):
+    """BitmapFromBits(PyObject bits, int width, int height, int depth=1) -> Bitmap"""
     val = _gdi.new_BitmapFromBits(*args, **kwargs)
     val.thisown = 1
     return val
 
 class Mask(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMask instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Bitmap bitmap) -> Mask"""
         newobj = _gdi.new_Mask(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMask instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class MaskPtr(Mask):
     def __init__(self, this):
@@ -266,32 +458,64 @@ class MaskPtr(Mask):
 _gdi.Mask_swigregister(MaskPtr)
 
 def MaskColour(*args, **kwargs):
+    """MaskColour(Bitmap bitmap, Colour colour) -> Mask"""
     val = _gdi.new_MaskColour(*args, **kwargs)
     val.thisown = 1
     return val
 
 class Icon(GDIObject):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString name, long flags, int desiredWidth=-1, int desiredHeight=-1) -> Icon"""
         newobj = _gdi.new_Icon(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_Icon):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def LoadFile(*args, **kwargs): return _gdi.Icon_LoadFile(*args, **kwargs)
-    def Ok(*args, **kwargs): return _gdi.Icon_Ok(*args, **kwargs)
-    def GetWidth(*args, **kwargs): return _gdi.Icon_GetWidth(*args, **kwargs)
-    def GetHeight(*args, **kwargs): return _gdi.Icon_GetHeight(*args, **kwargs)
-    def GetDepth(*args, **kwargs): return _gdi.Icon_GetDepth(*args, **kwargs)
-    def SetWidth(*args, **kwargs): return _gdi.Icon_SetWidth(*args, **kwargs)
-    def SetHeight(*args, **kwargs): return _gdi.Icon_SetHeight(*args, **kwargs)
-    def SetDepth(*args, **kwargs): return _gdi.Icon_SetDepth(*args, **kwargs)
-    def CopyFromBitmap(*args, **kwargs): return _gdi.Icon_CopyFromBitmap(*args, **kwargs)
+
+    def LoadFile(*args, **kwargs):
+        """LoadFile(wxString name, long flags) -> bool"""
+        return _gdi.Icon_LoadFile(*args, **kwargs)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _gdi.Icon_Ok(*args, **kwargs)
+
+    def GetWidth(*args, **kwargs):
+        """GetWidth() -> int"""
+        return _gdi.Icon_GetWidth(*args, **kwargs)
+
+    def GetHeight(*args, **kwargs):
+        """GetHeight() -> int"""
+        return _gdi.Icon_GetHeight(*args, **kwargs)
+
+    def GetDepth(*args, **kwargs):
+        """GetDepth() -> int"""
+        return _gdi.Icon_GetDepth(*args, **kwargs)
+
+    def SetWidth(*args, **kwargs):
+        """SetWidth(int w)"""
+        return _gdi.Icon_SetWidth(*args, **kwargs)
+
+    def SetHeight(*args, **kwargs):
+        """SetHeight(int h)"""
+        return _gdi.Icon_SetHeight(*args, **kwargs)
+
+    def SetDepth(*args, **kwargs):
+        """SetDepth(int d)"""
+        return _gdi.Icon_SetDepth(*args, **kwargs)
+
+    def CopyFromBitmap(*args, **kwargs):
+        """CopyFromBitmap(Bitmap bmp)"""
+        return _gdi.Icon_CopyFromBitmap(*args, **kwargs)
+
     def __nonzero__(self): return self.Ok() 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class IconPtr(Icon):
     def __init__(self, this):
@@ -301,43 +525,66 @@ class IconPtr(Icon):
 _gdi.Icon_swigregister(IconPtr)
 
 def EmptyIcon(*args, **kwargs):
+    """EmptyIcon() -> Icon"""
     val = _gdi.new_EmptyIcon(*args, **kwargs)
     val.thisown = 1
     return val
 
 def IconFromLocation(*args, **kwargs):
+    """IconFromLocation(IconLocation loc) -> Icon"""
     val = _gdi.new_IconFromLocation(*args, **kwargs)
     val.thisown = 1
     return val
 
 def IconFromBitmap(*args, **kwargs):
+    """IconFromBitmap(Bitmap bmp) -> Icon"""
     val = _gdi.new_IconFromBitmap(*args, **kwargs)
     val.thisown = 1
     return val
 
 def IconFromXPMData(*args, **kwargs):
+    """IconFromXPMData(PyObject listOfStrings) -> Icon"""
     val = _gdi.new_IconFromXPMData(*args, **kwargs)
     val.thisown = 1
     return val
 
 class IconLocation(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxIconLocation instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString filename=&wxPyEmptyString, int num=0) -> IconLocation"""
         newobj = _gdi.new_IconLocation(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_IconLocation):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def IsOk(*args, **kwargs): return _gdi.IconLocation_IsOk(*args, **kwargs)
+
+    def IsOk(*args, **kwargs):
+        """IsOk() -> bool"""
+        return _gdi.IconLocation_IsOk(*args, **kwargs)
+
     def __nonzero__(self): return self.Ok() 
-    def SetFileName(*args, **kwargs): return _gdi.IconLocation_SetFileName(*args, **kwargs)
-    def GetFileName(*args, **kwargs): return _gdi.IconLocation_GetFileName(*args, **kwargs)
-    def SetIndex(*args, **kwargs): return _gdi.IconLocation_SetIndex(*args, **kwargs)
-    def GetIndex(*args, **kwargs): return _gdi.IconLocation_GetIndex(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxIconLocation instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetFileName(*args, **kwargs):
+        """SetFileName(wxString filename)"""
+        return _gdi.IconLocation_SetFileName(*args, **kwargs)
+
+    def GetFileName(*args, **kwargs):
+        """GetFileName() -> wxString"""
+        return _gdi.IconLocation_GetFileName(*args, **kwargs)
+
+    def SetIndex(*args, **kwargs):
+        """SetIndex(int num)"""
+        return _gdi.IconLocation_SetIndex(*args, **kwargs)
+
+    def GetIndex(*args, **kwargs):
+        """GetIndex() -> int"""
+        return _gdi.IconLocation_GetIndex(*args, **kwargs)
+
 
 class IconLocationPtr(IconLocation):
     def __init__(self, this):
@@ -347,20 +594,33 @@ class IconLocationPtr(IconLocation):
 _gdi.IconLocation_swigregister(IconLocationPtr)
 
 class IconBundle(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxIconBundle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> IconBundle"""
         newobj = _gdi.new_IconBundle(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_IconBundle):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def AddIcon(*args, **kwargs): return _gdi.IconBundle_AddIcon(*args, **kwargs)
-    def AddIconFromFile(*args, **kwargs): return _gdi.IconBundle_AddIconFromFile(*args, **kwargs)
-    def GetIcon(*args, **kwargs): return _gdi.IconBundle_GetIcon(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxIconBundle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def AddIcon(*args, **kwargs):
+        """AddIcon(Icon icon)"""
+        return _gdi.IconBundle_AddIcon(*args, **kwargs)
+
+    def AddIconFromFile(*args, **kwargs):
+        """AddIconFromFile(wxString file, long type)"""
+        return _gdi.IconBundle_AddIconFromFile(*args, **kwargs)
+
+    def GetIcon(*args, **kwargs):
+        """GetIcon(Size size) -> Icon"""
+        return _gdi.IconBundle_GetIcon(*args, **kwargs)
+
 
 class IconBundlePtr(IconBundle):
     def __init__(self, this):
@@ -370,29 +630,38 @@ class IconBundlePtr(IconBundle):
 _gdi.IconBundle_swigregister(IconBundlePtr)
 
 def IconBundleFromFile(*args, **kwargs):
+    """IconBundleFromFile(wxString file, long type) -> IconBundle"""
     val = _gdi.new_IconBundleFromFile(*args, **kwargs)
     val.thisown = 1
     return val
 
 def IconBundleFromIcon(*args, **kwargs):
+    """IconBundleFromIcon(Icon icon) -> IconBundle"""
     val = _gdi.new_IconBundleFromIcon(*args, **kwargs)
     val.thisown = 1
     return val
 
 class Cursor(GDIObject):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString cursorName, long flags, int hotSpotX=0, int hotSpotY=0) -> Cursor"""
         newobj = _gdi.new_Cursor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_Cursor):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Ok(*args, **kwargs): return _gdi.Cursor_Ok(*args, **kwargs)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _gdi.Cursor_Ok(*args, **kwargs)
+
     def __nonzero__(self): return self.Ok() 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class CursorPtr(Cursor):
     def __init__(self, this):
@@ -402,16 +671,20 @@ class CursorPtr(Cursor):
 _gdi.Cursor_swigregister(CursorPtr)
 
 def StockCursor(*args, **kwargs):
+    """StockCursor(int id) -> Cursor"""
     val = _gdi.new_StockCursor(*args, **kwargs)
     val.thisown = 1
     return val
 
 def CursorFromImage(*args, **kwargs):
+    """CursorFromImage(Image image) -> Cursor"""
     val = _gdi.new_CursorFromImage(*args, **kwargs)
     val.thisown = 1
     return val
 
 def CursorFromBits(*args, **kwargs):
+    """CursorFromBits(PyObject bits, int width, int height, int hotSpotX=-1, 
+    int hotSpotY=-1, PyObject maskBits=0) -> Cursor"""
     val = _gdi.new_CursorFromBits(*args, **kwargs)
     val.thisown = 1
     return val
@@ -422,39 +695,109 @@ OutRegion = _gdi.OutRegion
 PartRegion = _gdi.PartRegion
 InRegion = _gdi.InRegion
 class Region(GDIObject):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxRegion instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int x=0, int y=0, int width=0, int height=0) -> Region"""
         newobj = _gdi.new_Region(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_Region):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Clear(*args, **kwargs): return _gdi.Region_Clear(*args, **kwargs)
-    def Offset(*args, **kwargs): return _gdi.Region_Offset(*args, **kwargs)
-    def Contains(*args, **kwargs): return _gdi.Region_Contains(*args, **kwargs)
-    def ContainsPoint(*args, **kwargs): return _gdi.Region_ContainsPoint(*args, **kwargs)
-    def ContainsRect(*args, **kwargs): return _gdi.Region_ContainsRect(*args, **kwargs)
-    def ContainsRectDim(*args, **kwargs): return _gdi.Region_ContainsRectDim(*args, **kwargs)
-    def GetBox(*args, **kwargs): return _gdi.Region_GetBox(*args, **kwargs)
-    def Intersect(*args, **kwargs): return _gdi.Region_Intersect(*args, **kwargs)
-    def IntersectRect(*args, **kwargs): return _gdi.Region_IntersectRect(*args, **kwargs)
-    def IntersectRegion(*args, **kwargs): return _gdi.Region_IntersectRegion(*args, **kwargs)
-    def IsEmpty(*args, **kwargs): return _gdi.Region_IsEmpty(*args, **kwargs)
-    def Union(*args, **kwargs): return _gdi.Region_Union(*args, **kwargs)
-    def UnionRect(*args, **kwargs): return _gdi.Region_UnionRect(*args, **kwargs)
-    def UnionRegion(*args, **kwargs): return _gdi.Region_UnionRegion(*args, **kwargs)
-    def Subtract(*args, **kwargs): return _gdi.Region_Subtract(*args, **kwargs)
-    def SubtractRect(*args, **kwargs): return _gdi.Region_SubtractRect(*args, **kwargs)
-    def SubtractRegion(*args, **kwargs): return _gdi.Region_SubtractRegion(*args, **kwargs)
-    def Xor(*args, **kwargs): return _gdi.Region_Xor(*args, **kwargs)
-    def XorRect(*args, **kwargs): return _gdi.Region_XorRect(*args, **kwargs)
-    def XorRegion(*args, **kwargs): return _gdi.Region_XorRegion(*args, **kwargs)
-    def ConvertToBitmap(*args, **kwargs): return _gdi.Region_ConvertToBitmap(*args, **kwargs)
-    def UnionBitmap(*args, **kwargs): return _gdi.Region_UnionBitmap(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxRegion instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Clear(*args, **kwargs):
+        """Clear()"""
+        return _gdi.Region_Clear(*args, **kwargs)
+
+    def Offset(*args, **kwargs):
+        """Offset(int x, int y) -> bool"""
+        return _gdi.Region_Offset(*args, **kwargs)
+
+    def Contains(*args, **kwargs):
+        """Contains(int x, int y) -> wxRegionContain"""
+        return _gdi.Region_Contains(*args, **kwargs)
+
+    def ContainsPoint(*args, **kwargs):
+        """ContainsPoint(Point pt) -> wxRegionContain"""
+        return _gdi.Region_ContainsPoint(*args, **kwargs)
+
+    def ContainsRect(*args, **kwargs):
+        """ContainsRect(Rect rect) -> wxRegionContain"""
+        return _gdi.Region_ContainsRect(*args, **kwargs)
+
+    def ContainsRectDim(*args, **kwargs):
+        """ContainsRectDim(int x, int y, int w, int h) -> wxRegionContain"""
+        return _gdi.Region_ContainsRectDim(*args, **kwargs)
+
+    def GetBox(*args, **kwargs):
+        """GetBox() -> Rect"""
+        return _gdi.Region_GetBox(*args, **kwargs)
+
+    def Intersect(*args, **kwargs):
+        """Intersect(int x, int y, int width, int height) -> bool"""
+        return _gdi.Region_Intersect(*args, **kwargs)
+
+    def IntersectRect(*args, **kwargs):
+        """IntersectRect(Rect rect) -> bool"""
+        return _gdi.Region_IntersectRect(*args, **kwargs)
+
+    def IntersectRegion(*args, **kwargs):
+        """IntersectRegion(Region region) -> bool"""
+        return _gdi.Region_IntersectRegion(*args, **kwargs)
+
+    def IsEmpty(*args, **kwargs):
+        """IsEmpty() -> bool"""
+        return _gdi.Region_IsEmpty(*args, **kwargs)
+
+    def Union(*args, **kwargs):
+        """Union(int x, int y, int width, int height) -> bool"""
+        return _gdi.Region_Union(*args, **kwargs)
+
+    def UnionRect(*args, **kwargs):
+        """UnionRect(Rect rect) -> bool"""
+        return _gdi.Region_UnionRect(*args, **kwargs)
+
+    def UnionRegion(*args, **kwargs):
+        """UnionRegion(Region region) -> bool"""
+        return _gdi.Region_UnionRegion(*args, **kwargs)
+
+    def Subtract(*args, **kwargs):
+        """Subtract(int x, int y, int width, int height) -> bool"""
+        return _gdi.Region_Subtract(*args, **kwargs)
+
+    def SubtractRect(*args, **kwargs):
+        """SubtractRect(Rect rect) -> bool"""
+        return _gdi.Region_SubtractRect(*args, **kwargs)
+
+    def SubtractRegion(*args, **kwargs):
+        """SubtractRegion(Region region) -> bool"""
+        return _gdi.Region_SubtractRegion(*args, **kwargs)
+
+    def Xor(*args, **kwargs):
+        """Xor(int x, int y, int width, int height) -> bool"""
+        return _gdi.Region_Xor(*args, **kwargs)
+
+    def XorRect(*args, **kwargs):
+        """XorRect(Rect rect) -> bool"""
+        return _gdi.Region_XorRect(*args, **kwargs)
+
+    def XorRegion(*args, **kwargs):
+        """XorRegion(Region region) -> bool"""
+        return _gdi.Region_XorRegion(*args, **kwargs)
+
+    def ConvertToBitmap(*args, **kwargs):
+        """ConvertToBitmap() -> Bitmap"""
+        return _gdi.Region_ConvertToBitmap(*args, **kwargs)
+
+    def UnionBitmap(*args, **kwargs):
+        """UnionBitmap(Bitmap bmp, Colour transColour=NullColour, int tolerance=0) -> bool"""
+        return _gdi.Region_UnionBitmap(*args, **kwargs)
+
 
 class RegionPtr(Region):
     def __init__(self, this):
@@ -464,38 +807,77 @@ class RegionPtr(Region):
 _gdi.Region_swigregister(RegionPtr)
 
 def RegionFromBitmap(*args, **kwargs):
+    """RegionFromBitmap(Bitmap bmp, Colour transColour=NullColour, int tolerance=0) -> Region"""
     val = _gdi.new_RegionFromBitmap(*args, **kwargs)
     val.thisown = 1
     return val
 
 def RegionFromPoints(*args, **kwargs):
+    """RegionFromPoints(int points, Point points_array, int fillStyle=WINDING_RULE) -> Region"""
     val = _gdi.new_RegionFromPoints(*args, **kwargs)
     val.thisown = 1
     return val
 
 class RegionIterator(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxRegionIterator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Region region) -> RegionIterator"""
         newobj = _gdi.new_RegionIterator(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_RegionIterator):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetX(*args, **kwargs): return _gdi.RegionIterator_GetX(*args, **kwargs)
-    def GetY(*args, **kwargs): return _gdi.RegionIterator_GetY(*args, **kwargs)
-    def GetW(*args, **kwargs): return _gdi.RegionIterator_GetW(*args, **kwargs)
-    def GetWidth(*args, **kwargs): return _gdi.RegionIterator_GetWidth(*args, **kwargs)
-    def GetH(*args, **kwargs): return _gdi.RegionIterator_GetH(*args, **kwargs)
-    def GetHeight(*args, **kwargs): return _gdi.RegionIterator_GetHeight(*args, **kwargs)
-    def GetRect(*args, **kwargs): return _gdi.RegionIterator_GetRect(*args, **kwargs)
-    def HaveRects(*args, **kwargs): return _gdi.RegionIterator_HaveRects(*args, **kwargs)
-    def Reset(*args, **kwargs): return _gdi.RegionIterator_Reset(*args, **kwargs)
-    def Next(*args, **kwargs): return _gdi.RegionIterator_Next(*args, **kwargs)
-    def __nonzero__(*args, **kwargs): return _gdi.RegionIterator___nonzero__(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxRegionIterator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetX(*args, **kwargs):
+        """GetX() -> int"""
+        return _gdi.RegionIterator_GetX(*args, **kwargs)
+
+    def GetY(*args, **kwargs):
+        """GetY() -> int"""
+        return _gdi.RegionIterator_GetY(*args, **kwargs)
+
+    def GetW(*args, **kwargs):
+        """GetW() -> int"""
+        return _gdi.RegionIterator_GetW(*args, **kwargs)
+
+    def GetWidth(*args, **kwargs):
+        """GetWidth() -> int"""
+        return _gdi.RegionIterator_GetWidth(*args, **kwargs)
+
+    def GetH(*args, **kwargs):
+        """GetH() -> int"""
+        return _gdi.RegionIterator_GetH(*args, **kwargs)
+
+    def GetHeight(*args, **kwargs):
+        """GetHeight() -> int"""
+        return _gdi.RegionIterator_GetHeight(*args, **kwargs)
+
+    def GetRect(*args, **kwargs):
+        """GetRect() -> Rect"""
+        return _gdi.RegionIterator_GetRect(*args, **kwargs)
+
+    def HaveRects(*args, **kwargs):
+        """HaveRects() -> bool"""
+        return _gdi.RegionIterator_HaveRects(*args, **kwargs)
+
+    def Reset(*args, **kwargs):
+        """Reset()"""
+        return _gdi.RegionIterator_Reset(*args, **kwargs)
+
+    def Next(*args, **kwargs):
+        """Next()"""
+        return _gdi.RegionIterator_Next(*args, **kwargs)
+
+    def __nonzero__(*args, **kwargs):
+        """__nonzero__() -> bool"""
+        return _gdi.RegionIterator___nonzero__(*args, **kwargs)
+
 
 class RegionIteratorPtr(RegionIterator):
     def __init__(self, this):
@@ -590,38 +972,105 @@ FONTENCODING_SHIFT_JIS = _gdi.FONTENCODING_SHIFT_JIS
 #---------------------------------------------------------------------------
 
 class NativeFontInfo(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxNativeFontInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> NativeFontInfo"""
         newobj = _gdi.new_NativeFontInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_NativeFontInfo):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Init(*args, **kwargs): return _gdi.NativeFontInfo_Init(*args, **kwargs)
-    def InitFromFont(*args, **kwargs): return _gdi.NativeFontInfo_InitFromFont(*args, **kwargs)
-    def GetPointSize(*args, **kwargs): return _gdi.NativeFontInfo_GetPointSize(*args, **kwargs)
-    def GetStyle(*args, **kwargs): return _gdi.NativeFontInfo_GetStyle(*args, **kwargs)
-    def GetWeight(*args, **kwargs): return _gdi.NativeFontInfo_GetWeight(*args, **kwargs)
-    def GetUnderlined(*args, **kwargs): return _gdi.NativeFontInfo_GetUnderlined(*args, **kwargs)
-    def GetFaceName(*args, **kwargs): return _gdi.NativeFontInfo_GetFaceName(*args, **kwargs)
-    def GetFamily(*args, **kwargs): return _gdi.NativeFontInfo_GetFamily(*args, **kwargs)
-    def GetEncoding(*args, **kwargs): return _gdi.NativeFontInfo_GetEncoding(*args, **kwargs)
-    def SetPointSize(*args, **kwargs): return _gdi.NativeFontInfo_SetPointSize(*args, **kwargs)
-    def SetStyle(*args, **kwargs): return _gdi.NativeFontInfo_SetStyle(*args, **kwargs)
-    def SetWeight(*args, **kwargs): return _gdi.NativeFontInfo_SetWeight(*args, **kwargs)
-    def SetUnderlined(*args, **kwargs): return _gdi.NativeFontInfo_SetUnderlined(*args, **kwargs)
-    def SetFaceName(*args, **kwargs): return _gdi.NativeFontInfo_SetFaceName(*args, **kwargs)
-    def SetFamily(*args, **kwargs): return _gdi.NativeFontInfo_SetFamily(*args, **kwargs)
-    def SetEncoding(*args, **kwargs): return _gdi.NativeFontInfo_SetEncoding(*args, **kwargs)
-    def FromString(*args, **kwargs): return _gdi.NativeFontInfo_FromString(*args, **kwargs)
-    def ToString(*args, **kwargs): return _gdi.NativeFontInfo_ToString(*args, **kwargs)
-    def __str__(*args, **kwargs): return _gdi.NativeFontInfo___str__(*args, **kwargs)
-    def FromUserString(*args, **kwargs): return _gdi.NativeFontInfo_FromUserString(*args, **kwargs)
-    def ToUserString(*args, **kwargs): return _gdi.NativeFontInfo_ToUserString(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxNativeFontInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Init(*args, **kwargs):
+        """Init()"""
+        return _gdi.NativeFontInfo_Init(*args, **kwargs)
+
+    def InitFromFont(*args, **kwargs):
+        """InitFromFont(Font font)"""
+        return _gdi.NativeFontInfo_InitFromFont(*args, **kwargs)
+
+    def GetPointSize(*args, **kwargs):
+        """GetPointSize() -> int"""
+        return _gdi.NativeFontInfo_GetPointSize(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle() -> wxFontStyle"""
+        return _gdi.NativeFontInfo_GetStyle(*args, **kwargs)
+
+    def GetWeight(*args, **kwargs):
+        """GetWeight() -> wxFontWeight"""
+        return _gdi.NativeFontInfo_GetWeight(*args, **kwargs)
+
+    def GetUnderlined(*args, **kwargs):
+        """GetUnderlined() -> bool"""
+        return _gdi.NativeFontInfo_GetUnderlined(*args, **kwargs)
+
+    def GetFaceName(*args, **kwargs):
+        """GetFaceName() -> wxString"""
+        return _gdi.NativeFontInfo_GetFaceName(*args, **kwargs)
+
+    def GetFamily(*args, **kwargs):
+        """GetFamily() -> wxFontFamily"""
+        return _gdi.NativeFontInfo_GetFamily(*args, **kwargs)
+
+    def GetEncoding(*args, **kwargs):
+        """GetEncoding() -> wxFontEncoding"""
+        return _gdi.NativeFontInfo_GetEncoding(*args, **kwargs)
+
+    def SetPointSize(*args, **kwargs):
+        """SetPointSize(int pointsize)"""
+        return _gdi.NativeFontInfo_SetPointSize(*args, **kwargs)
+
+    def SetStyle(*args, **kwargs):
+        """SetStyle(wxFontStyle style)"""
+        return _gdi.NativeFontInfo_SetStyle(*args, **kwargs)
+
+    def SetWeight(*args, **kwargs):
+        """SetWeight(wxFontWeight weight)"""
+        return _gdi.NativeFontInfo_SetWeight(*args, **kwargs)
+
+    def SetUnderlined(*args, **kwargs):
+        """SetUnderlined(bool underlined)"""
+        return _gdi.NativeFontInfo_SetUnderlined(*args, **kwargs)
+
+    def SetFaceName(*args, **kwargs):
+        """SetFaceName(wxString facename)"""
+        return _gdi.NativeFontInfo_SetFaceName(*args, **kwargs)
+
+    def SetFamily(*args, **kwargs):
+        """SetFamily(wxFontFamily family)"""
+        return _gdi.NativeFontInfo_SetFamily(*args, **kwargs)
+
+    def SetEncoding(*args, **kwargs):
+        """SetEncoding(wxFontEncoding encoding)"""
+        return _gdi.NativeFontInfo_SetEncoding(*args, **kwargs)
+
+    def FromString(*args, **kwargs):
+        """FromString(wxString s) -> bool"""
+        return _gdi.NativeFontInfo_FromString(*args, **kwargs)
+
+    def ToString(*args, **kwargs):
+        """ToString() -> wxString"""
+        return _gdi.NativeFontInfo_ToString(*args, **kwargs)
+
+    def __str__(*args, **kwargs):
+        """__str__() -> wxString"""
+        return _gdi.NativeFontInfo___str__(*args, **kwargs)
+
+    def FromUserString(*args, **kwargs):
+        """FromUserString(wxString s) -> bool"""
+        return _gdi.NativeFontInfo_FromUserString(*args, **kwargs)
+
+    def ToUserString(*args, **kwargs):
+        """ToUserString() -> wxString"""
+        return _gdi.NativeFontInfo_ToUserString(*args, **kwargs)
+
 
 class NativeFontInfoPtr(NativeFontInfo):
     def __init__(self, this):
@@ -631,21 +1080,31 @@ class NativeFontInfoPtr(NativeFontInfo):
 _gdi.NativeFontInfo_swigregister(NativeFontInfoPtr)
 
 class NativeEncodingInfo(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxNativeEncodingInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     facename = property(_gdi.NativeEncodingInfo_facename_get, _gdi.NativeEncodingInfo_facename_set)
     encoding = property(_gdi.NativeEncodingInfo_encoding_get, _gdi.NativeEncodingInfo_encoding_set)
     def __init__(self, *args, **kwargs):
+        """__init__() -> NativeEncodingInfo"""
         newobj = _gdi.new_NativeEncodingInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_NativeEncodingInfo):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def FromString(*args, **kwargs): return _gdi.NativeEncodingInfo_FromString(*args, **kwargs)
-    def ToString(*args, **kwargs): return _gdi.NativeEncodingInfo_ToString(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxNativeEncodingInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def FromString(*args, **kwargs):
+        """FromString(wxString s) -> bool"""
+        return _gdi.NativeEncodingInfo_FromString(*args, **kwargs)
+
+    def ToString(*args, **kwargs):
+        """ToString() -> wxString"""
+        return _gdi.NativeEncodingInfo_ToString(*args, **kwargs)
+
 
 class NativeEncodingInfoPtr(NativeEncodingInfo):
     def __init__(self, this):
@@ -655,37 +1114,95 @@ class NativeEncodingInfoPtr(NativeEncodingInfo):
 _gdi.NativeEncodingInfo_swigregister(NativeEncodingInfoPtr)
 
 
-GetNativeFontEncoding = _gdi.GetNativeFontEncoding
+def GetNativeFontEncoding(*args, **kwargs):
+    """GetNativeFontEncoding(wxFontEncoding encoding) -> NativeEncodingInfo"""
+    return _gdi.GetNativeFontEncoding(*args, **kwargs)
 
-TestFontEncoding = _gdi.TestFontEncoding
+def TestFontEncoding(*args, **kwargs):
+    """TestFontEncoding(NativeEncodingInfo info) -> bool"""
+    return _gdi.TestFontEncoding(*args, **kwargs)
 #---------------------------------------------------------------------------
 
 class FontMapper(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFontMapper instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> FontMapper"""
         newobj = _gdi.new_FontMapper(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_FontMapper):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    Get = staticmethod(_gdi.FontMapper_Get)
-    Set = staticmethod(_gdi.FontMapper_Set)
-    def CharsetToEncoding(*args, **kwargs): return _gdi.FontMapper_CharsetToEncoding(*args, **kwargs)
-    GetSupportedEncodingsCount = staticmethod(_gdi.FontMapper_GetSupportedEncodingsCount)
-    GetEncoding = staticmethod(_gdi.FontMapper_GetEncoding)
-    GetEncodingName = staticmethod(_gdi.FontMapper_GetEncodingName)
-    GetEncodingDescription = staticmethod(_gdi.FontMapper_GetEncodingDescription)
-    def SetConfig(*args, **kwargs): return _gdi.FontMapper_SetConfig(*args, **kwargs)
-    def SetConfigPath(*args, **kwargs): return _gdi.FontMapper_SetConfigPath(*args, **kwargs)
-    GetDefaultConfigPath = staticmethod(_gdi.FontMapper_GetDefaultConfigPath)
-    def GetAltForEncoding(*args, **kwargs): return _gdi.FontMapper_GetAltForEncoding(*args, **kwargs)
-    def IsEncodingAvailable(*args, **kwargs): return _gdi.FontMapper_IsEncodingAvailable(*args, **kwargs)
-    def SetDialogParent(*args, **kwargs): return _gdi.FontMapper_SetDialogParent(*args, **kwargs)
-    def SetDialogTitle(*args, **kwargs): return _gdi.FontMapper_SetDialogTitle(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFontMapper instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Get(*args, **kwargs):
+        """FontMapper.Get() -> FontMapper"""
+        return _gdi.FontMapper_Get(*args, **kwargs)
+
+    Get = staticmethod(Get)
+    def Set(*args, **kwargs):
+        """FontMapper.Set(FontMapper mapper) -> FontMapper"""
+        return _gdi.FontMapper_Set(*args, **kwargs)
+
+    Set = staticmethod(Set)
+    def CharsetToEncoding(*args, **kwargs):
+        """CharsetToEncoding(wxString charset, bool interactive=True) -> wxFontEncoding"""
+        return _gdi.FontMapper_CharsetToEncoding(*args, **kwargs)
+
+    def GetSupportedEncodingsCount(*args, **kwargs):
+        """FontMapper.GetSupportedEncodingsCount() -> size_t"""
+        return _gdi.FontMapper_GetSupportedEncodingsCount(*args, **kwargs)
+
+    GetSupportedEncodingsCount = staticmethod(GetSupportedEncodingsCount)
+    def GetEncoding(*args, **kwargs):
+        """FontMapper.GetEncoding(size_t n) -> wxFontEncoding"""
+        return _gdi.FontMapper_GetEncoding(*args, **kwargs)
+
+    GetEncoding = staticmethod(GetEncoding)
+    def GetEncodingName(*args, **kwargs):
+        """FontMapper.GetEncodingName(wxFontEncoding encoding) -> wxString"""
+        return _gdi.FontMapper_GetEncodingName(*args, **kwargs)
+
+    GetEncodingName = staticmethod(GetEncodingName)
+    def GetEncodingDescription(*args, **kwargs):
+        """FontMapper.GetEncodingDescription(wxFontEncoding encoding) -> wxString"""
+        return _gdi.FontMapper_GetEncodingDescription(*args, **kwargs)
+
+    GetEncodingDescription = staticmethod(GetEncodingDescription)
+    def SetConfig(*args, **kwargs):
+        """SetConfig(wxConfigBase config)"""
+        return _gdi.FontMapper_SetConfig(*args, **kwargs)
+
+    def SetConfigPath(*args, **kwargs):
+        """SetConfigPath(wxString prefix)"""
+        return _gdi.FontMapper_SetConfigPath(*args, **kwargs)
+
+    def GetDefaultConfigPath(*args, **kwargs):
+        """FontMapper.GetDefaultConfigPath() -> wxString"""
+        return _gdi.FontMapper_GetDefaultConfigPath(*args, **kwargs)
+
+    GetDefaultConfigPath = staticmethod(GetDefaultConfigPath)
+    def GetAltForEncoding(*args, **kwargs):
+        """GetAltForEncoding(wxFontEncoding encoding, wxString facename=wxPyEmptyString, 
+    bool interactive=True) -> PyObject"""
+        return _gdi.FontMapper_GetAltForEncoding(*args, **kwargs)
+
+    def IsEncodingAvailable(*args, **kwargs):
+        """IsEncodingAvailable(wxFontEncoding encoding, wxString facename=wxPyEmptyString) -> bool"""
+        return _gdi.FontMapper_IsEncodingAvailable(*args, **kwargs)
+
+    def SetDialogParent(*args, **kwargs):
+        """SetDialogParent(Window parent)"""
+        return _gdi.FontMapper_SetDialogParent(*args, **kwargs)
+
+    def SetDialogTitle(*args, **kwargs):
+        """SetDialogTitle(wxString title)"""
+        return _gdi.FontMapper_SetDialogTitle(*args, **kwargs)
+
 
 class FontMapperPtr(FontMapper):
     def __init__(self, this):
@@ -694,66 +1211,181 @@ class FontMapperPtr(FontMapper):
         self.__class__ = FontMapper
 _gdi.FontMapper_swigregister(FontMapperPtr)
 
-FontMapper_Get = _gdi.FontMapper_Get
+def FontMapper_Get(*args, **kwargs):
+    """FontMapper_Get() -> FontMapper"""
+    return _gdi.FontMapper_Get(*args, **kwargs)
 
-FontMapper_Set = _gdi.FontMapper_Set
+def FontMapper_Set(*args, **kwargs):
+    """FontMapper_Set(FontMapper mapper) -> FontMapper"""
+    return _gdi.FontMapper_Set(*args, **kwargs)
 
-FontMapper_GetSupportedEncodingsCount = _gdi.FontMapper_GetSupportedEncodingsCount
+def FontMapper_GetSupportedEncodingsCount(*args, **kwargs):
+    """FontMapper_GetSupportedEncodingsCount() -> size_t"""
+    return _gdi.FontMapper_GetSupportedEncodingsCount(*args, **kwargs)
 
-FontMapper_GetEncoding = _gdi.FontMapper_GetEncoding
+def FontMapper_GetEncoding(*args, **kwargs):
+    """FontMapper_GetEncoding(size_t n) -> wxFontEncoding"""
+    return _gdi.FontMapper_GetEncoding(*args, **kwargs)
 
-FontMapper_GetEncodingName = _gdi.FontMapper_GetEncodingName
+def FontMapper_GetEncodingName(*args, **kwargs):
+    """FontMapper_GetEncodingName(wxFontEncoding encoding) -> wxString"""
+    return _gdi.FontMapper_GetEncodingName(*args, **kwargs)
 
-FontMapper_GetEncodingDescription = _gdi.FontMapper_GetEncodingDescription
+def FontMapper_GetEncodingDescription(*args, **kwargs):
+    """FontMapper_GetEncodingDescription(wxFontEncoding encoding) -> wxString"""
+    return _gdi.FontMapper_GetEncodingDescription(*args, **kwargs)
 
-FontMapper_GetDefaultConfigPath = _gdi.FontMapper_GetDefaultConfigPath
+def FontMapper_GetDefaultConfigPath(*args, **kwargs):
+    """FontMapper_GetDefaultConfigPath() -> wxString"""
+    return _gdi.FontMapper_GetDefaultConfigPath(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class Font(GDIObject):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFont instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int pointSize, int family, int style, int weight, bool underline=False, 
+    wxString face=wxPyEmptyString, 
+    wxFontEncoding encoding=FONTENCODING_DEFAULT) -> Font"""
         newobj = _gdi.new_Font(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_Font):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Ok(*args, **kwargs): return _gdi.Font_Ok(*args, **kwargs)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _gdi.Font_Ok(*args, **kwargs)
+
     def __nonzero__(self): return self.Ok() 
-    def __eq__(*args, **kwargs): return _gdi.Font___eq__(*args, **kwargs)
-    def __ne__(*args, **kwargs): return _gdi.Font___ne__(*args, **kwargs)
-    def GetPointSize(*args, **kwargs): return _gdi.Font_GetPointSize(*args, **kwargs)
-    def GetFamily(*args, **kwargs): return _gdi.Font_GetFamily(*args, **kwargs)
-    def GetStyle(*args, **kwargs): return _gdi.Font_GetStyle(*args, **kwargs)
-    def GetWeight(*args, **kwargs): return _gdi.Font_GetWeight(*args, **kwargs)
-    def GetUnderlined(*args, **kwargs): return _gdi.Font_GetUnderlined(*args, **kwargs)
-    def GetFaceName(*args, **kwargs): return _gdi.Font_GetFaceName(*args, **kwargs)
-    def GetEncoding(*args, **kwargs): return _gdi.Font_GetEncoding(*args, **kwargs)
-    def GetNativeFontInfo(*args, **kwargs): return _gdi.Font_GetNativeFontInfo(*args, **kwargs)
-    def IsFixedWidth(*args, **kwargs): return _gdi.Font_IsFixedWidth(*args, **kwargs)
-    def GetNativeFontInfoDesc(*args, **kwargs): return _gdi.Font_GetNativeFontInfoDesc(*args, **kwargs)
-    def GetNativeFontInfoUserDesc(*args, **kwargs): return _gdi.Font_GetNativeFontInfoUserDesc(*args, **kwargs)
-    def SetPointSize(*args, **kwargs): return _gdi.Font_SetPointSize(*args, **kwargs)
-    def SetFamily(*args, **kwargs): return _gdi.Font_SetFamily(*args, **kwargs)
-    def SetStyle(*args, **kwargs): return _gdi.Font_SetStyle(*args, **kwargs)
-    def SetWeight(*args, **kwargs): return _gdi.Font_SetWeight(*args, **kwargs)
-    def SetFaceName(*args, **kwargs): return _gdi.Font_SetFaceName(*args, **kwargs)
-    def SetUnderlined(*args, **kwargs): return _gdi.Font_SetUnderlined(*args, **kwargs)
-    def SetEncoding(*args, **kwargs): return _gdi.Font_SetEncoding(*args, **kwargs)
-    def SetNativeFontInfo(*args, **kwargs): return _gdi.Font_SetNativeFontInfo(*args, **kwargs)
-    def SetNativeFontInfoFromString(*args, **kwargs): return _gdi.Font_SetNativeFontInfoFromString(*args, **kwargs)
-    def SetNativeFontInfoUserDesc(*args, **kwargs): return _gdi.Font_SetNativeFontInfoUserDesc(*args, **kwargs)
-    def GetFamilyString(*args, **kwargs): return _gdi.Font_GetFamilyString(*args, **kwargs)
-    def GetStyleString(*args, **kwargs): return _gdi.Font_GetStyleString(*args, **kwargs)
-    def GetWeightString(*args, **kwargs): return _gdi.Font_GetWeightString(*args, **kwargs)
-    def SetNoAntiAliasing(*args, **kwargs): return _gdi.Font_SetNoAntiAliasing(*args, **kwargs)
-    def GetNoAntiAliasing(*args, **kwargs): return _gdi.Font_GetNoAntiAliasing(*args, **kwargs)
-    GetDefaultEncoding = staticmethod(_gdi.Font_GetDefaultEncoding)
-    SetDefaultEncoding = staticmethod(_gdi.Font_SetDefaultEncoding)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFont instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __eq__(*args, **kwargs):
+        """__eq__(Font font) -> bool"""
+        return _gdi.Font___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(Font font) -> bool"""
+        return _gdi.Font___ne__(*args, **kwargs)
+
+    def GetPointSize(*args, **kwargs):
+        """GetPointSize() -> int"""
+        return _gdi.Font_GetPointSize(*args, **kwargs)
+
+    def GetFamily(*args, **kwargs):
+        """GetFamily() -> int"""
+        return _gdi.Font_GetFamily(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle() -> int"""
+        return _gdi.Font_GetStyle(*args, **kwargs)
+
+    def GetWeight(*args, **kwargs):
+        """GetWeight() -> int"""
+        return _gdi.Font_GetWeight(*args, **kwargs)
+
+    def GetUnderlined(*args, **kwargs):
+        """GetUnderlined() -> bool"""
+        return _gdi.Font_GetUnderlined(*args, **kwargs)
+
+    def GetFaceName(*args, **kwargs):
+        """GetFaceName() -> wxString"""
+        return _gdi.Font_GetFaceName(*args, **kwargs)
+
+    def GetEncoding(*args, **kwargs):
+        """GetEncoding() -> wxFontEncoding"""
+        return _gdi.Font_GetEncoding(*args, **kwargs)
+
+    def GetNativeFontInfo(*args, **kwargs):
+        """GetNativeFontInfo() -> NativeFontInfo"""
+        return _gdi.Font_GetNativeFontInfo(*args, **kwargs)
+
+    def IsFixedWidth(*args, **kwargs):
+        """IsFixedWidth() -> bool"""
+        return _gdi.Font_IsFixedWidth(*args, **kwargs)
+
+    def GetNativeFontInfoDesc(*args, **kwargs):
+        """GetNativeFontInfoDesc() -> wxString"""
+        return _gdi.Font_GetNativeFontInfoDesc(*args, **kwargs)
+
+    def GetNativeFontInfoUserDesc(*args, **kwargs):
+        """GetNativeFontInfoUserDesc() -> wxString"""
+        return _gdi.Font_GetNativeFontInfoUserDesc(*args, **kwargs)
+
+    def SetPointSize(*args, **kwargs):
+        """SetPointSize(int pointSize)"""
+        return _gdi.Font_SetPointSize(*args, **kwargs)
+
+    def SetFamily(*args, **kwargs):
+        """SetFamily(int family)"""
+        return _gdi.Font_SetFamily(*args, **kwargs)
+
+    def SetStyle(*args, **kwargs):
+        """SetStyle(int style)"""
+        return _gdi.Font_SetStyle(*args, **kwargs)
+
+    def SetWeight(*args, **kwargs):
+        """SetWeight(int weight)"""
+        return _gdi.Font_SetWeight(*args, **kwargs)
+
+    def SetFaceName(*args, **kwargs):
+        """SetFaceName(wxString faceName)"""
+        return _gdi.Font_SetFaceName(*args, **kwargs)
+
+    def SetUnderlined(*args, **kwargs):
+        """SetUnderlined(bool underlined)"""
+        return _gdi.Font_SetUnderlined(*args, **kwargs)
+
+    def SetEncoding(*args, **kwargs):
+        """SetEncoding(wxFontEncoding encoding)"""
+        return _gdi.Font_SetEncoding(*args, **kwargs)
+
+    def SetNativeFontInfo(*args, **kwargs):
+        """SetNativeFontInfo(NativeFontInfo info)"""
+        return _gdi.Font_SetNativeFontInfo(*args, **kwargs)
+
+    def SetNativeFontInfoFromString(*args, **kwargs):
+        """SetNativeFontInfoFromString(wxString info)"""
+        return _gdi.Font_SetNativeFontInfoFromString(*args, **kwargs)
+
+    def SetNativeFontInfoUserDesc(*args, **kwargs):
+        """SetNativeFontInfoUserDesc(wxString info)"""
+        return _gdi.Font_SetNativeFontInfoUserDesc(*args, **kwargs)
+
+    def GetFamilyString(*args, **kwargs):
+        """GetFamilyString() -> wxString"""
+        return _gdi.Font_GetFamilyString(*args, **kwargs)
+
+    def GetStyleString(*args, **kwargs):
+        """GetStyleString() -> wxString"""
+        return _gdi.Font_GetStyleString(*args, **kwargs)
+
+    def GetWeightString(*args, **kwargs):
+        """GetWeightString() -> wxString"""
+        return _gdi.Font_GetWeightString(*args, **kwargs)
+
+    def SetNoAntiAliasing(*args, **kwargs):
+        """SetNoAntiAliasing(bool no=True)"""
+        return _gdi.Font_SetNoAntiAliasing(*args, **kwargs)
+
+    def GetNoAntiAliasing(*args, **kwargs):
+        """GetNoAntiAliasing() -> bool"""
+        return _gdi.Font_GetNoAntiAliasing(*args, **kwargs)
+
+    def GetDefaultEncoding(*args, **kwargs):
+        """Font.GetDefaultEncoding() -> wxFontEncoding"""
+        return _gdi.Font_GetDefaultEncoding(*args, **kwargs)
+
+    GetDefaultEncoding = staticmethod(GetDefaultEncoding)
+    def SetDefaultEncoding(*args, **kwargs):
+        """Font.SetDefaultEncoding(wxFontEncoding encoding)"""
+        return _gdi.Font_SetDefaultEncoding(*args, **kwargs)
+
+    SetDefaultEncoding = staticmethod(SetDefaultEncoding)
 
 class FontPtr(Font):
     def __init__(self, this):
@@ -763,44 +1395,72 @@ class FontPtr(Font):
 _gdi.Font_swigregister(FontPtr)
 
 def FontFromNativeInfo(*args, **kwargs):
+    """FontFromNativeInfo(NativeFontInfo info) -> Font"""
     val = _gdi.new_FontFromNativeInfo(*args, **kwargs)
     val.thisown = 1
     return val
 
 def FontFromNativeInfoString(*args, **kwargs):
+    """FontFromNativeInfoString(wxString info) -> Font"""
     val = _gdi.new_FontFromNativeInfoString(*args, **kwargs)
     val.thisown = 1
     return val
 
 def Font2(*args, **kwargs):
+    """Font2(int pointSize, wxFontFamily family, int flags=FONTFLAG_DEFAULT, 
+    wxString face=wxPyEmptyString, wxFontEncoding encoding=FONTENCODING_DEFAULT) -> Font"""
     val = _gdi.new_Font2(*args, **kwargs)
     val.thisown = 1
     return val
 
-Font_GetDefaultEncoding = _gdi.Font_GetDefaultEncoding
+def Font_GetDefaultEncoding(*args, **kwargs):
+    """Font_GetDefaultEncoding() -> wxFontEncoding"""
+    return _gdi.Font_GetDefaultEncoding(*args, **kwargs)
 
-Font_SetDefaultEncoding = _gdi.Font_SetDefaultEncoding
+def Font_SetDefaultEncoding(*args, **kwargs):
+    """Font_SetDefaultEncoding(wxFontEncoding encoding)"""
+    return _gdi.Font_SetDefaultEncoding(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class FontEnumerator(object):
-    def __init__(self, *args, **kwargs):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyFontEnumerator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__() -> FontEnumerator"""
         newobj = _gdi.new_FontEnumerator(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, FontEnumerator, 0)
+
     def __del__(self, destroy=_gdi.delete_FontEnumerator):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def _setCallbackInfo(*args, **kwargs): return _gdi.FontEnumerator__setCallbackInfo(*args, **kwargs)
-    def EnumerateFacenames(*args, **kwargs): return _gdi.FontEnumerator_EnumerateFacenames(*args, **kwargs)
-    def EnumerateEncodings(*args, **kwargs): return _gdi.FontEnumerator_EnumerateEncodings(*args, **kwargs)
-    def GetEncodings(*args, **kwargs): return _gdi.FontEnumerator_GetEncodings(*args, **kwargs)
-    def GetFacenames(*args, **kwargs): return _gdi.FontEnumerator_GetFacenames(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyFontEnumerator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class, bool incref)"""
+        return _gdi.FontEnumerator__setCallbackInfo(*args, **kwargs)
+
+    def EnumerateFacenames(*args, **kwargs):
+        """EnumerateFacenames(wxFontEncoding encoding=FONTENCODING_SYSTEM, bool fixedWidthOnly=False) -> bool"""
+        return _gdi.FontEnumerator_EnumerateFacenames(*args, **kwargs)
+
+    def EnumerateEncodings(*args, **kwargs):
+        """EnumerateEncodings(wxString facename=wxPyEmptyString) -> bool"""
+        return _gdi.FontEnumerator_EnumerateEncodings(*args, **kwargs)
+
+    def GetEncodings(*args, **kwargs):
+        """GetEncodings() -> PyObject"""
+        return _gdi.FontEnumerator_GetEncodings(*args, **kwargs)
+
+    def GetFacenames(*args, **kwargs):
+        """GetFacenames() -> PyObject"""
+        return _gdi.FontEnumerator_GetFacenames(*args, **kwargs)
+
 
 class FontEnumeratorPtr(FontEnumerator):
     def __init__(self, this):
@@ -1043,12 +1703,13 @@ LANGUAGE_ZHUANG = _gdi.LANGUAGE_ZHUANG
 LANGUAGE_ZULU = _gdi.LANGUAGE_ZULU
 LANGUAGE_USER_DEFINED = _gdi.LANGUAGE_USER_DEFINED
 class LanguageInfo(object):
-    Language = property(_gdi.LanguageInfo_Language_get, _gdi.LanguageInfo_Language_set)
-    CanonicalName = property(_gdi.LanguageInfo_CanonicalName_get, _gdi.LanguageInfo_CanonicalName_set)
-    Description = property(_gdi.LanguageInfo_Description_get, _gdi.LanguageInfo_Description_set)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxLanguageInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    Language = property(_gdi.LanguageInfo_Language_get, _gdi.LanguageInfo_Language_set)
+    CanonicalName = property(_gdi.LanguageInfo_CanonicalName_get, _gdi.LanguageInfo_CanonicalName_set)
+    Description = property(_gdi.LanguageInfo_Description_get, _gdi.LanguageInfo_Description_set)
 
 class LanguageInfoPtr(LanguageInfo):
     def __init__(self, this):
@@ -1066,17 +1727,31 @@ LOCALE_DECIMAL_POINT = _gdi.LOCALE_DECIMAL_POINT
 LOCALE_LOAD_DEFAULT = _gdi.LOCALE_LOAD_DEFAULT
 LOCALE_CONV_ENCODING = _gdi.LOCALE_CONV_ENCODING
 class Locale(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxLocale instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int language=LANGUAGE_DEFAULT, int flags=wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING) -> Locale"""
         newobj = _gdi.new_Locale(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_Locale):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Init1(*args, **kwargs): return _gdi.Locale_Init1(*args, **kwargs)
-    def Init2(*args, **kwargs): return _gdi.Locale_Init2(*args, **kwargs)
+
+    def Init1(*args, **kwargs):
+        """Init1(wxString szName, wxString szShort=wxPyEmptyString, 
+    wxString szLocale=wxPyEmptyString, bool bLoadDefault=True, 
+    bool bConvertEncoding=False) -> bool"""
+        return _gdi.Locale_Init1(*args, **kwargs)
+
+    def Init2(*args, **kwargs):
+        """Init2(int language=LANGUAGE_DEFAULT, int flags=wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING) -> bool"""
+        return _gdi.Locale_Init2(*args, **kwargs)
+
     def Init(self, *_args, **_kwargs):
         if type(_args[0]) in [type(''), type(u'')]:
             val = self.Init1(*_args, **_kwargs)
@@ -1084,26 +1759,83 @@ class Locale(object):
             val = self.Init2(*_args, **_kwargs)
         return val
 
-    GetSystemLanguage = staticmethod(_gdi.Locale_GetSystemLanguage)
-    GetSystemEncoding = staticmethod(_gdi.Locale_GetSystemEncoding)
-    GetSystemEncodingName = staticmethod(_gdi.Locale_GetSystemEncodingName)
-    def IsOk(*args, **kwargs): return _gdi.Locale_IsOk(*args, **kwargs)
+    def GetSystemLanguage(*args, **kwargs):
+        """Locale.GetSystemLanguage() -> int"""
+        return _gdi.Locale_GetSystemLanguage(*args, **kwargs)
+
+    GetSystemLanguage = staticmethod(GetSystemLanguage)
+    def GetSystemEncoding(*args, **kwargs):
+        """Locale.GetSystemEncoding() -> wxFontEncoding"""
+        return _gdi.Locale_GetSystemEncoding(*args, **kwargs)
+
+    GetSystemEncoding = staticmethod(GetSystemEncoding)
+    def GetSystemEncodingName(*args, **kwargs):
+        """Locale.GetSystemEncodingName() -> wxString"""
+        return _gdi.Locale_GetSystemEncodingName(*args, **kwargs)
+
+    GetSystemEncodingName = staticmethod(GetSystemEncodingName)
+    def IsOk(*args, **kwargs):
+        """IsOk() -> bool"""
+        return _gdi.Locale_IsOk(*args, **kwargs)
+
     def __nonzero__(self): return self.IsOk() 
-    def GetLocale(*args, **kwargs): return _gdi.Locale_GetLocale(*args, **kwargs)
-    def GetLanguage(*args, **kwargs): return _gdi.Locale_GetLanguage(*args, **kwargs)
-    def GetSysName(*args, **kwargs): return _gdi.Locale_GetSysName(*args, **kwargs)
-    def GetCanonicalName(*args, **kwargs): return _gdi.Locale_GetCanonicalName(*args, **kwargs)
-    AddCatalogLookupPathPrefix = staticmethod(_gdi.Locale_AddCatalogLookupPathPrefix)
-    def AddCatalog(*args, **kwargs): return _gdi.Locale_AddCatalog(*args, **kwargs)
-    def IsLoaded(*args, **kwargs): return _gdi.Locale_IsLoaded(*args, **kwargs)
-    GetLanguageInfo = staticmethod(_gdi.Locale_GetLanguageInfo)
-    GetLanguageName = staticmethod(_gdi.Locale_GetLanguageName)
-    FindLanguageInfo = staticmethod(_gdi.Locale_FindLanguageInfo)
-    AddLanguage = staticmethod(_gdi.Locale_AddLanguage)
-    def GetString(*args, **kwargs): return _gdi.Locale_GetString(*args, **kwargs)
-    def GetName(*args, **kwargs): return _gdi.Locale_GetName(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLocale instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetLocale(*args, **kwargs):
+        """GetLocale() -> wxString"""
+        return _gdi.Locale_GetLocale(*args, **kwargs)
+
+    def GetLanguage(*args, **kwargs):
+        """GetLanguage() -> int"""
+        return _gdi.Locale_GetLanguage(*args, **kwargs)
+
+    def GetSysName(*args, **kwargs):
+        """GetSysName() -> wxString"""
+        return _gdi.Locale_GetSysName(*args, **kwargs)
+
+    def GetCanonicalName(*args, **kwargs):
+        """GetCanonicalName() -> wxString"""
+        return _gdi.Locale_GetCanonicalName(*args, **kwargs)
+
+    def AddCatalogLookupPathPrefix(*args, **kwargs):
+        """Locale.AddCatalogLookupPathPrefix(wxString prefix)"""
+        return _gdi.Locale_AddCatalogLookupPathPrefix(*args, **kwargs)
+
+    AddCatalogLookupPathPrefix = staticmethod(AddCatalogLookupPathPrefix)
+    def AddCatalog(*args, **kwargs):
+        """AddCatalog(wxString szDomain) -> bool"""
+        return _gdi.Locale_AddCatalog(*args, **kwargs)
+
+    def IsLoaded(*args, **kwargs):
+        """IsLoaded(wxString szDomain) -> bool"""
+        return _gdi.Locale_IsLoaded(*args, **kwargs)
+
+    def GetLanguageInfo(*args, **kwargs):
+        """Locale.GetLanguageInfo(int lang) -> LanguageInfo"""
+        return _gdi.Locale_GetLanguageInfo(*args, **kwargs)
+
+    GetLanguageInfo = staticmethod(GetLanguageInfo)
+    def GetLanguageName(*args, **kwargs):
+        """Locale.GetLanguageName(int lang) -> wxString"""
+        return _gdi.Locale_GetLanguageName(*args, **kwargs)
+
+    GetLanguageName = staticmethod(GetLanguageName)
+    def FindLanguageInfo(*args, **kwargs):
+        """Locale.FindLanguageInfo(wxString locale) -> LanguageInfo"""
+        return _gdi.Locale_FindLanguageInfo(*args, **kwargs)
+
+    FindLanguageInfo = staticmethod(FindLanguageInfo)
+    def AddLanguage(*args, **kwargs):
+        """Locale.AddLanguage(LanguageInfo info)"""
+        return _gdi.Locale_AddLanguage(*args, **kwargs)
+
+    AddLanguage = staticmethod(AddLanguage)
+    def GetString(*args, **kwargs):
+        """GetString(wxString szOrigString, wxString szDomain=wxPyEmptyString) -> wxString"""
+        return _gdi.Locale_GetString(*args, **kwargs)
+
+    def GetName(*args, **kwargs):
+        """GetName() -> wxString"""
+        return _gdi.Locale_GetName(*args, **kwargs)
+
 
 class LocalePtr(Locale):
     def __init__(self, this):
@@ -1112,24 +1844,42 @@ class LocalePtr(Locale):
         self.__class__ = Locale
 _gdi.Locale_swigregister(LocalePtr)
 
-Locale_GetSystemLanguage = _gdi.Locale_GetSystemLanguage
+def Locale_GetSystemLanguage(*args, **kwargs):
+    """Locale_GetSystemLanguage() -> int"""
+    return _gdi.Locale_GetSystemLanguage(*args, **kwargs)
 
-Locale_GetSystemEncoding = _gdi.Locale_GetSystemEncoding
+def Locale_GetSystemEncoding(*args, **kwargs):
+    """Locale_GetSystemEncoding() -> wxFontEncoding"""
+    return _gdi.Locale_GetSystemEncoding(*args, **kwargs)
 
-Locale_GetSystemEncodingName = _gdi.Locale_GetSystemEncodingName
+def Locale_GetSystemEncodingName(*args, **kwargs):
+    """Locale_GetSystemEncodingName() -> wxString"""
+    return _gdi.Locale_GetSystemEncodingName(*args, **kwargs)
 
-Locale_AddCatalogLookupPathPrefix = _gdi.Locale_AddCatalogLookupPathPrefix
+def Locale_AddCatalogLookupPathPrefix(*args, **kwargs):
+    """Locale_AddCatalogLookupPathPrefix(wxString prefix)"""
+    return _gdi.Locale_AddCatalogLookupPathPrefix(*args, **kwargs)
 
-Locale_GetLanguageInfo = _gdi.Locale_GetLanguageInfo
+def Locale_GetLanguageInfo(*args, **kwargs):
+    """Locale_GetLanguageInfo(int lang) -> LanguageInfo"""
+    return _gdi.Locale_GetLanguageInfo(*args, **kwargs)
 
-Locale_GetLanguageName = _gdi.Locale_GetLanguageName
+def Locale_GetLanguageName(*args, **kwargs):
+    """Locale_GetLanguageName(int lang) -> wxString"""
+    return _gdi.Locale_GetLanguageName(*args, **kwargs)
 
-Locale_FindLanguageInfo = _gdi.Locale_FindLanguageInfo
+def Locale_FindLanguageInfo(*args, **kwargs):
+    """Locale_FindLanguageInfo(wxString locale) -> LanguageInfo"""
+    return _gdi.Locale_FindLanguageInfo(*args, **kwargs)
 
-Locale_AddLanguage = _gdi.Locale_AddLanguage
+def Locale_AddLanguage(*args, **kwargs):
+    """Locale_AddLanguage(LanguageInfo info)"""
+    return _gdi.Locale_AddLanguage(*args, **kwargs)
 
 
-GetLocale = _gdi.GetLocale
+def GetLocale(*args, **kwargs):
+    """GetLocale() -> Locale"""
+    return _gdi.GetLocale(*args, **kwargs)
 #---------------------------------------------------------------------------
 
 CONVERT_STRICT = _gdi.CONVERT_STRICT
@@ -1140,23 +1890,46 @@ PLATFORM_WINDOWS = _gdi.PLATFORM_WINDOWS
 PLATFORM_OS2 = _gdi.PLATFORM_OS2
 PLATFORM_MAC = _gdi.PLATFORM_MAC
 class EncodingConverter(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxEncodingConverter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> EncodingConverter"""
         newobj = _gdi.new_EncodingConverter(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_EncodingConverter):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Init(*args, **kwargs): return _gdi.EncodingConverter_Init(*args, **kwargs)
-    def Convert(*args, **kwargs): return _gdi.EncodingConverter_Convert(*args, **kwargs)
-    GetPlatformEquivalents = staticmethod(_gdi.EncodingConverter_GetPlatformEquivalents)
-    GetAllEquivalents = staticmethod(_gdi.EncodingConverter_GetAllEquivalents)
-    CanConvert = staticmethod(_gdi.EncodingConverter_CanConvert)
+
+    def Init(*args, **kwargs):
+        """Init(wxFontEncoding input_enc, wxFontEncoding output_enc, 
+    int method=CONVERT_STRICT) -> bool"""
+        return _gdi.EncodingConverter_Init(*args, **kwargs)
+
+    def Convert(*args, **kwargs):
+        """Convert(wxString input) -> wxString"""
+        return _gdi.EncodingConverter_Convert(*args, **kwargs)
+
+    def GetPlatformEquivalents(*args, **kwargs):
+        """EncodingConverter.GetPlatformEquivalents(wxFontEncoding enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray"""
+        return _gdi.EncodingConverter_GetPlatformEquivalents(*args, **kwargs)
+
+    GetPlatformEquivalents = staticmethod(GetPlatformEquivalents)
+    def GetAllEquivalents(*args, **kwargs):
+        """EncodingConverter.GetAllEquivalents(wxFontEncoding enc) -> wxFontEncodingArray"""
+        return _gdi.EncodingConverter_GetAllEquivalents(*args, **kwargs)
+
+    GetAllEquivalents = staticmethod(GetAllEquivalents)
+    def CanConvert(*args, **kwargs):
+        """EncodingConverter.CanConvert(wxFontEncoding encIn, wxFontEncoding encOut) -> bool"""
+        return _gdi.EncodingConverter_CanConvert(*args, **kwargs)
+
+    CanConvert = staticmethod(CanConvert)
     def __nonzero__(self): return self.IsOk() 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxEncodingConverter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class EncodingConverterPtr(EncodingConverter):
     def __init__(self, this):
@@ -1165,13 +1938,22 @@ class EncodingConverterPtr(EncodingConverter):
         self.__class__ = EncodingConverter
 _gdi.EncodingConverter_swigregister(EncodingConverterPtr)
 
-GetTranslation = _gdi.GetTranslation
+def GetTranslation(*args):
+    """GetTranslation(wxString sz) -> wxString
+GetTranslation(wxString sz1, wxString sz2, size_t n) -> wxString"""
+    return _gdi.GetTranslation(*args)
 
-EncodingConverter_GetPlatformEquivalents = _gdi.EncodingConverter_GetPlatformEquivalents
+def EncodingConverter_GetPlatformEquivalents(*args, **kwargs):
+    """EncodingConverter_GetPlatformEquivalents(wxFontEncoding enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray"""
+    return _gdi.EncodingConverter_GetPlatformEquivalents(*args, **kwargs)
 
-EncodingConverter_GetAllEquivalents = _gdi.EncodingConverter_GetAllEquivalents
+def EncodingConverter_GetAllEquivalents(*args, **kwargs):
+    """EncodingConverter_GetAllEquivalents(wxFontEncoding enc) -> wxFontEncodingArray"""
+    return _gdi.EncodingConverter_GetAllEquivalents(*args, **kwargs)
 
-EncodingConverter_CanConvert = _gdi.EncodingConverter_CanConvert
+def EncodingConverter_CanConvert(*args, **kwargs):
+    """EncodingConverter_CanConvert(wxFontEncoding encIn, wxFontEncoding encOut) -> bool"""
+    return _gdi.EncodingConverter_CanConvert(*args, **kwargs)
 
 #----------------------------------------------------------------------------
 # wxGTK sets the locale when initialized.  Doing this at the Python
@@ -1196,133 +1978,514 @@ if wx.Platform == "__WXMSW__":
 #---------------------------------------------------------------------------
 
 class DC(core.Object):
+    """"""
+    def __init__(self): raise RuntimeError, "No constructor defined"
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __del__(self, destroy=_gdi.delete_DC):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def BeginDrawing(*args, **kwargs): return _gdi.DC_BeginDrawing(*args, **kwargs)
-    def EndDrawing(*args, **kwargs): return _gdi.DC_EndDrawing(*args, **kwargs)
-    def FloodFillXY(*args, **kwargs): return _gdi.DC_FloodFillXY(*args, **kwargs)
-    def FloodFill(*args, **kwargs): return _gdi.DC_FloodFill(*args, **kwargs)
-    def GetPixelXY(*args, **kwargs): return _gdi.DC_GetPixelXY(*args, **kwargs)
-    def GetPixel(*args, **kwargs): return _gdi.DC_GetPixel(*args, **kwargs)
-    def DrawLineXY(*args, **kwargs): return _gdi.DC_DrawLineXY(*args, **kwargs)
-    def DrawLine(*args, **kwargs): return _gdi.DC_DrawLine(*args, **kwargs)
-    def CrossHairXY(*args, **kwargs): return _gdi.DC_CrossHairXY(*args, **kwargs)
-    def CrossHair(*args, **kwargs): return _gdi.DC_CrossHair(*args, **kwargs)
-    def DrawArcXY(*args, **kwargs): return _gdi.DC_DrawArcXY(*args, **kwargs)
-    def DrawArc(*args, **kwargs): return _gdi.DC_DrawArc(*args, **kwargs)
-    def DrawCheckMarkXY(*args, **kwargs): return _gdi.DC_DrawCheckMarkXY(*args, **kwargs)
-    def DrawCheckMark(*args, **kwargs): return _gdi.DC_DrawCheckMark(*args, **kwargs)
-    def DrawEllipticArcXY(*args, **kwargs): return _gdi.DC_DrawEllipticArcXY(*args, **kwargs)
-    def DrawEllipticArc(*args, **kwargs): return _gdi.DC_DrawEllipticArc(*args, **kwargs)
-    def DrawPointXY(*args, **kwargs): return _gdi.DC_DrawPointXY(*args, **kwargs)
-    def DrawPoint(*args, **kwargs): return _gdi.DC_DrawPoint(*args, **kwargs)
-    def DrawRectangleXY(*args, **kwargs): return _gdi.DC_DrawRectangleXY(*args, **kwargs)
-    def DrawRectangle(*args, **kwargs): return _gdi.DC_DrawRectangle(*args, **kwargs)
-    def DrawRectangleRect(*args, **kwargs): return _gdi.DC_DrawRectangleRect(*args, **kwargs)
-    def DrawRoundedRectangleXY(*args, **kwargs): return _gdi.DC_DrawRoundedRectangleXY(*args, **kwargs)
-    def DrawRoundedRectangle(*args, **kwargs): return _gdi.DC_DrawRoundedRectangle(*args, **kwargs)
-    def DrawRoundedRectangleRect(*args, **kwargs): return _gdi.DC_DrawRoundedRectangleRect(*args, **kwargs)
-    def DrawCircleXY(*args, **kwargs): return _gdi.DC_DrawCircleXY(*args, **kwargs)
-    def DrawCircle(*args, **kwargs): return _gdi.DC_DrawCircle(*args, **kwargs)
-    def DrawEllipseXY(*args, **kwargs): return _gdi.DC_DrawEllipseXY(*args, **kwargs)
-    def DrawEllipse(*args, **kwargs): return _gdi.DC_DrawEllipse(*args, **kwargs)
-    def DrawEllipseRect(*args, **kwargs): return _gdi.DC_DrawEllipseRect(*args, **kwargs)
-    def DrawIconXY(*args, **kwargs): return _gdi.DC_DrawIconXY(*args, **kwargs)
-    def DrawIcon(*args, **kwargs): return _gdi.DC_DrawIcon(*args, **kwargs)
-    def DrawBitmapXY(*args, **kwargs): return _gdi.DC_DrawBitmapXY(*args, **kwargs)
-    def DrawBitmap(*args, **kwargs): return _gdi.DC_DrawBitmap(*args, **kwargs)
-    def DrawTextXY(*args, **kwargs): return _gdi.DC_DrawTextXY(*args, **kwargs)
-    def DrawText(*args, **kwargs): return _gdi.DC_DrawText(*args, **kwargs)
-    def DrawRotatedTextXY(*args, **kwargs): return _gdi.DC_DrawRotatedTextXY(*args, **kwargs)
-    def DrawRotatedText(*args, **kwargs): return _gdi.DC_DrawRotatedText(*args, **kwargs)
-    def BlitXY(*args, **kwargs): return _gdi.DC_BlitXY(*args, **kwargs)
-    def Blit(*args, **kwargs): return _gdi.DC_Blit(*args, **kwargs)
-    def DrawLines(*args, **kwargs): return _gdi.DC_DrawLines(*args, **kwargs)
-    def DrawPolygon(*args, **kwargs): return _gdi.DC_DrawPolygon(*args, **kwargs)
-    def DrawLabel(*args, **kwargs): return _gdi.DC_DrawLabel(*args, **kwargs)
-    def DrawImageLabel(*args, **kwargs): return _gdi.DC_DrawImageLabel(*args, **kwargs)
-    def DrawSpline(*args, **kwargs): return _gdi.DC_DrawSpline(*args, **kwargs)
-    def Clear(*args, **kwargs): return _gdi.DC_Clear(*args, **kwargs)
-    def StartDoc(*args, **kwargs): return _gdi.DC_StartDoc(*args, **kwargs)
-    def EndDoc(*args, **kwargs): return _gdi.DC_EndDoc(*args, **kwargs)
-    def StartPage(*args, **kwargs): return _gdi.DC_StartPage(*args, **kwargs)
-    def EndPage(*args, **kwargs): return _gdi.DC_EndPage(*args, **kwargs)
-    def SetFont(*args, **kwargs): return _gdi.DC_SetFont(*args, **kwargs)
-    def SetPen(*args, **kwargs): return _gdi.DC_SetPen(*args, **kwargs)
-    def SetBrush(*args, **kwargs): return _gdi.DC_SetBrush(*args, **kwargs)
-    def SetBackground(*args, **kwargs): return _gdi.DC_SetBackground(*args, **kwargs)
-    def SetBackgroundMode(*args, **kwargs): return _gdi.DC_SetBackgroundMode(*args, **kwargs)
-    def SetPalette(*args, **kwargs): return _gdi.DC_SetPalette(*args, **kwargs)
-    def SetClippingRegion(*args, **kwargs): return _gdi.DC_SetClippingRegion(*args, **kwargs)
-    def SetClippingRect(*args, **kwargs): return _gdi.DC_SetClippingRect(*args, **kwargs)
-    def SetClippingRegionAsRegion(*args, **kwargs): return _gdi.DC_SetClippingRegionAsRegion(*args, **kwargs)
-    def DestroyClippingRegion(*args, **kwargs): return _gdi.DC_DestroyClippingRegion(*args, **kwargs)
-    def GetClippingBox(*args, **kwargs): return _gdi.DC_GetClippingBox(*args, **kwargs)
-    def GetClippingRect(*args, **kwargs): return _gdi.DC_GetClippingRect(*args, **kwargs)
-    def GetCharHeight(*args, **kwargs): return _gdi.DC_GetCharHeight(*args, **kwargs)
-    def GetCharWidth(*args, **kwargs): return _gdi.DC_GetCharWidth(*args, **kwargs)
-    def GetTextExtent(*args, **kwargs): return _gdi.DC_GetTextExtent(*args, **kwargs)
-    def GetFullTextExtent(*args, **kwargs): return _gdi.DC_GetFullTextExtent(*args, **kwargs)
-    def GetMultiLineTextExtent(*args, **kwargs): return _gdi.DC_GetMultiLineTextExtent(*args, **kwargs)
-    def GetSizeTuple(*args, **kwargs): return _gdi.DC_GetSizeTuple(*args, **kwargs)
-    def GetSize(*args, **kwargs): return _gdi.DC_GetSize(*args, **kwargs)
-    def GetSizeMMWH(*args, **kwargs): return _gdi.DC_GetSizeMMWH(*args, **kwargs)
-    def GetSizeMM(*args, **kwargs): return _gdi.DC_GetSizeMM(*args, **kwargs)
-    def DeviceToLogicalX(*args, **kwargs): return _gdi.DC_DeviceToLogicalX(*args, **kwargs)
-    def DeviceToLogicalY(*args, **kwargs): return _gdi.DC_DeviceToLogicalY(*args, **kwargs)
-    def DeviceToLogicalXRel(*args, **kwargs): return _gdi.DC_DeviceToLogicalXRel(*args, **kwargs)
-    def DeviceToLogicalYRel(*args, **kwargs): return _gdi.DC_DeviceToLogicalYRel(*args, **kwargs)
-    def LogicalToDeviceX(*args, **kwargs): return _gdi.DC_LogicalToDeviceX(*args, **kwargs)
-    def LogicalToDeviceY(*args, **kwargs): return _gdi.DC_LogicalToDeviceY(*args, **kwargs)
-    def LogicalToDeviceXRel(*args, **kwargs): return _gdi.DC_LogicalToDeviceXRel(*args, **kwargs)
-    def LogicalToDeviceYRel(*args, **kwargs): return _gdi.DC_LogicalToDeviceYRel(*args, **kwargs)
-    def CanDrawBitmap(*args, **kwargs): return _gdi.DC_CanDrawBitmap(*args, **kwargs)
-    def CanGetTextExtent(*args, **kwargs): return _gdi.DC_CanGetTextExtent(*args, **kwargs)
-    def GetDepth(*args, **kwargs): return _gdi.DC_GetDepth(*args, **kwargs)
-    def GetPPI(*args, **kwargs): return _gdi.DC_GetPPI(*args, **kwargs)
-    def Ok(*args, **kwargs): return _gdi.DC_Ok(*args, **kwargs)
-    def GetBackgroundMode(*args, **kwargs): return _gdi.DC_GetBackgroundMode(*args, **kwargs)
-    def GetBackground(*args, **kwargs): return _gdi.DC_GetBackground(*args, **kwargs)
-    def GetBrush(*args, **kwargs): return _gdi.DC_GetBrush(*args, **kwargs)
-    def GetFont(*args, **kwargs): return _gdi.DC_GetFont(*args, **kwargs)
-    def GetPen(*args, **kwargs): return _gdi.DC_GetPen(*args, **kwargs)
-    def GetTextBackground(*args, **kwargs): return _gdi.DC_GetTextBackground(*args, **kwargs)
-    def GetTextForeground(*args, **kwargs): return _gdi.DC_GetTextForeground(*args, **kwargs)
-    def SetTextForeground(*args, **kwargs): return _gdi.DC_SetTextForeground(*args, **kwargs)
-    def SetTextBackground(*args, **kwargs): return _gdi.DC_SetTextBackground(*args, **kwargs)
-    def GetMapMode(*args, **kwargs): return _gdi.DC_GetMapMode(*args, **kwargs)
-    def SetMapMode(*args, **kwargs): return _gdi.DC_SetMapMode(*args, **kwargs)
-    def GetUserScale(*args, **kwargs): return _gdi.DC_GetUserScale(*args, **kwargs)
-    def SetUserScale(*args, **kwargs): return _gdi.DC_SetUserScale(*args, **kwargs)
-    def GetLogicalScale(*args, **kwargs): return _gdi.DC_GetLogicalScale(*args, **kwargs)
-    def SetLogicalScale(*args, **kwargs): return _gdi.DC_SetLogicalScale(*args, **kwargs)
-    def GetLogicalOriginTuple(*args, **kwargs): return _gdi.DC_GetLogicalOriginTuple(*args, **kwargs)
-    def GetLogicalOrigin(*args, **kwargs): return _gdi.DC_GetLogicalOrigin(*args, **kwargs)
-    def SetLogicalOrigin(*args, **kwargs): return _gdi.DC_SetLogicalOrigin(*args, **kwargs)
-    def GetDeviceOriginTuple(*args, **kwargs): return _gdi.DC_GetDeviceOriginTuple(*args, **kwargs)
-    def GetDeviceOrigin(*args, **kwargs): return _gdi.DC_GetDeviceOrigin(*args, **kwargs)
-    def SetDeviceOrigin(*args, **kwargs): return _gdi.DC_SetDeviceOrigin(*args, **kwargs)
-    def SetAxisOrientation(*args, **kwargs): return _gdi.DC_SetAxisOrientation(*args, **kwargs)
-    def GetLogicalFunction(*args, **kwargs): return _gdi.DC_GetLogicalFunction(*args, **kwargs)
-    def SetLogicalFunction(*args, **kwargs): return _gdi.DC_SetLogicalFunction(*args, **kwargs)
-    def SetOptimization(*args, **kwargs): return _gdi.DC_SetOptimization(*args, **kwargs)
-    def GetOptimization(*args, **kwargs): return _gdi.DC_GetOptimization(*args, **kwargs)
-    def CalcBoundingBox(*args, **kwargs): return _gdi.DC_CalcBoundingBox(*args, **kwargs)
-    def ResetBoundingBox(*args, **kwargs): return _gdi.DC_ResetBoundingBox(*args, **kwargs)
-    def MinX(*args, **kwargs): return _gdi.DC_MinX(*args, **kwargs)
-    def MaxX(*args, **kwargs): return _gdi.DC_MaxX(*args, **kwargs)
-    def MinY(*args, **kwargs): return _gdi.DC_MinY(*args, **kwargs)
-    def MaxY(*args, **kwargs): return _gdi.DC_MaxY(*args, **kwargs)
-    def GetBoundingBox(*args, **kwargs): return _gdi.DC_GetBoundingBox(*args, **kwargs)
+
+    def BeginDrawing(*args, **kwargs):
+        """BeginDrawing()"""
+        return _gdi.DC_BeginDrawing(*args, **kwargs)
+
+    def EndDrawing(*args, **kwargs):
+        """EndDrawing()"""
+        return _gdi.DC_EndDrawing(*args, **kwargs)
+
+    def FloodFillXY(*args, **kwargs):
+        """FloodFillXY(int x, int y, Colour col, int style=FLOOD_SURFACE) -> bool"""
+        return _gdi.DC_FloodFillXY(*args, **kwargs)
+
+    def FloodFill(*args, **kwargs):
+        """FloodFill(Point pt, Colour col, int style=FLOOD_SURFACE) -> bool"""
+        return _gdi.DC_FloodFill(*args, **kwargs)
+
+    def GetPixelXY(*args, **kwargs):
+        """GetPixelXY(int x, int y) -> Colour"""
+        return _gdi.DC_GetPixelXY(*args, **kwargs)
+
+    def GetPixel(*args, **kwargs):
+        """GetPixel(Point pt) -> Colour"""
+        return _gdi.DC_GetPixel(*args, **kwargs)
+
+    def DrawLineXY(*args, **kwargs):
+        """DrawLineXY(int x1, int y1, int x2, int y2)"""
+        return _gdi.DC_DrawLineXY(*args, **kwargs)
+
+    def DrawLine(*args, **kwargs):
+        """DrawLine(Point pt1, Point pt2)"""
+        return _gdi.DC_DrawLine(*args, **kwargs)
+
+    def CrossHairXY(*args, **kwargs):
+        """CrossHairXY(int x, int y)"""
+        return _gdi.DC_CrossHairXY(*args, **kwargs)
+
+    def CrossHair(*args, **kwargs):
+        """CrossHair(Point pt)"""
+        return _gdi.DC_CrossHair(*args, **kwargs)
+
+    def DrawArcXY(*args, **kwargs):
+        """DrawArcXY(int x1, int y1, int x2, int y2, int xc, int yc)"""
+        return _gdi.DC_DrawArcXY(*args, **kwargs)
+
+    def DrawArc(*args, **kwargs):
+        """DrawArc(Point pt1, Point pt2, Point centre)"""
+        return _gdi.DC_DrawArc(*args, **kwargs)
+
+    def DrawCheckMarkXY(*args, **kwargs):
+        """DrawCheckMarkXY(int x, int y, int width, int height)"""
+        return _gdi.DC_DrawCheckMarkXY(*args, **kwargs)
+
+    def DrawCheckMark(*args, **kwargs):
+        """DrawCheckMark(Rect rect)"""
+        return _gdi.DC_DrawCheckMark(*args, **kwargs)
+
+    def DrawEllipticArcXY(*args, **kwargs):
+        """DrawEllipticArcXY(int x, int y, int w, int h, double sa, double ea)"""
+        return _gdi.DC_DrawEllipticArcXY(*args, **kwargs)
+
+    def DrawEllipticArc(*args, **kwargs):
+        """DrawEllipticArc(Point pt, Size sz, double sa, double ea)"""
+        return _gdi.DC_DrawEllipticArc(*args, **kwargs)
+
+    def DrawPointXY(*args, **kwargs):
+        """DrawPointXY(int x, int y)"""
+        return _gdi.DC_DrawPointXY(*args, **kwargs)
+
+    def DrawPoint(*args, **kwargs):
+        """DrawPoint(Point pt)"""
+        return _gdi.DC_DrawPoint(*args, **kwargs)
+
+    def DrawRectangleXY(*args, **kwargs):
+        """DrawRectangleXY(int x, int y, int width, int height)"""
+        return _gdi.DC_DrawRectangleXY(*args, **kwargs)
+
+    def DrawRectangle(*args, **kwargs):
+        """DrawRectangle(Point pt, Size sz)"""
+        return _gdi.DC_DrawRectangle(*args, **kwargs)
+
+    def DrawRectangleRect(*args, **kwargs):
+        """DrawRectangleRect(Rect rect)"""
+        return _gdi.DC_DrawRectangleRect(*args, **kwargs)
+
+    def DrawRoundedRectangleXY(*args, **kwargs):
+        """DrawRoundedRectangleXY(int x, int y, int width, int height, double radius)"""
+        return _gdi.DC_DrawRoundedRectangleXY(*args, **kwargs)
+
+    def DrawRoundedRectangle(*args, **kwargs):
+        """DrawRoundedRectangle(Point pt, Size sz, double radius)"""
+        return _gdi.DC_DrawRoundedRectangle(*args, **kwargs)
+
+    def DrawRoundedRectangleRect(*args, **kwargs):
+        """DrawRoundedRectangleRect(Rect r, double radius)"""
+        return _gdi.DC_DrawRoundedRectangleRect(*args, **kwargs)
+
+    def DrawCircleXY(*args, **kwargs):
+        """DrawCircleXY(int x, int y, int radius)"""
+        return _gdi.DC_DrawCircleXY(*args, **kwargs)
+
+    def DrawCircle(*args, **kwargs):
+        """DrawCircle(Point pt, int radius)"""
+        return _gdi.DC_DrawCircle(*args, **kwargs)
+
+    def DrawEllipseXY(*args, **kwargs):
+        """DrawEllipseXY(int x, int y, int width, int height)"""
+        return _gdi.DC_DrawEllipseXY(*args, **kwargs)
+
+    def DrawEllipse(*args, **kwargs):
+        """DrawEllipse(Point pt, Size sz)"""
+        return _gdi.DC_DrawEllipse(*args, **kwargs)
+
+    def DrawEllipseRect(*args, **kwargs):
+        """DrawEllipseRect(Rect rect)"""
+        return _gdi.DC_DrawEllipseRect(*args, **kwargs)
+
+    def DrawIconXY(*args, **kwargs):
+        """DrawIconXY(Icon icon, int x, int y)"""
+        return _gdi.DC_DrawIconXY(*args, **kwargs)
+
+    def DrawIcon(*args, **kwargs):
+        """DrawIcon(Icon icon, Point pt)"""
+        return _gdi.DC_DrawIcon(*args, **kwargs)
+
+    def DrawBitmapXY(*args, **kwargs):
+        """DrawBitmapXY(Bitmap bmp, int x, int y, bool useMask=False)"""
+        return _gdi.DC_DrawBitmapXY(*args, **kwargs)
+
+    def DrawBitmap(*args, **kwargs):
+        """DrawBitmap(Bitmap bmp, Point pt, bool useMask=False)"""
+        return _gdi.DC_DrawBitmap(*args, **kwargs)
+
+    def DrawTextXY(*args, **kwargs):
+        """DrawTextXY(wxString text, int x, int y)"""
+        return _gdi.DC_DrawTextXY(*args, **kwargs)
+
+    def DrawText(*args, **kwargs):
+        """DrawText(wxString text, Point pt)"""
+        return _gdi.DC_DrawText(*args, **kwargs)
+
+    def DrawRotatedTextXY(*args, **kwargs):
+        """DrawRotatedTextXY(wxString text, int x, int y, double angle)"""
+        return _gdi.DC_DrawRotatedTextXY(*args, **kwargs)
+
+    def DrawRotatedText(*args, **kwargs):
+        """DrawRotatedText(wxString text, Point pt, double angle)"""
+        return _gdi.DC_DrawRotatedText(*args, **kwargs)
+
+    def BlitXY(*args, **kwargs):
+        """BlitXY(int xdest, int ydest, int width, int height, DC source, 
+    int xsrc, int ysrc, int rop=COPY, bool useMask=False, 
+    int xsrcMask=-1, int ysrcMask=-1) -> bool"""
+        return _gdi.DC_BlitXY(*args, **kwargs)
+
+    def Blit(*args, **kwargs):
+        """Blit(Point destPt, Size sz, DC source, Point srcPt, int rop=COPY, 
+    bool useMask=False, Point srcPtMask=DefaultPosition) -> bool"""
+        return _gdi.DC_Blit(*args, **kwargs)
+
+    def DrawLines(*args, **kwargs):
+        """DrawLines(int points, Point points_array, int xoffset=0, int yoffset=0)"""
+        return _gdi.DC_DrawLines(*args, **kwargs)
+
+    def DrawPolygon(*args, **kwargs):
+        """DrawPolygon(int points, Point points_array, int xoffset=0, int yoffset=0, 
+    int fillStyle=ODDEVEN_RULE)"""
+        return _gdi.DC_DrawPolygon(*args, **kwargs)
+
+    def DrawLabel(*args, **kwargs):
+        """DrawLabel(wxString text, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, 
+    int indexAccel=-1)"""
+        return _gdi.DC_DrawLabel(*args, **kwargs)
+
+    def DrawImageLabel(*args, **kwargs):
+        """DrawImageLabel(wxString text, Bitmap image, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, 
+    int indexAccel=-1) -> Rect"""
+        return _gdi.DC_DrawImageLabel(*args, **kwargs)
+
+    def DrawSpline(*args, **kwargs):
+        """DrawSpline(int points, Point points_array)"""
+        return _gdi.DC_DrawSpline(*args, **kwargs)
+
+    def Clear(*args, **kwargs):
+        """Clear()"""
+        return _gdi.DC_Clear(*args, **kwargs)
+
+    def StartDoc(*args, **kwargs):
+        """StartDoc(wxString message) -> bool"""
+        return _gdi.DC_StartDoc(*args, **kwargs)
+
+    def EndDoc(*args, **kwargs):
+        """EndDoc()"""
+        return _gdi.DC_EndDoc(*args, **kwargs)
+
+    def StartPage(*args, **kwargs):
+        """StartPage()"""
+        return _gdi.DC_StartPage(*args, **kwargs)
+
+    def EndPage(*args, **kwargs):
+        """EndPage()"""
+        return _gdi.DC_EndPage(*args, **kwargs)
+
+    def SetFont(*args, **kwargs):
+        """SetFont(Font font)"""
+        return _gdi.DC_SetFont(*args, **kwargs)
+
+    def SetPen(*args, **kwargs):
+        """SetPen(Pen pen)"""
+        return _gdi.DC_SetPen(*args, **kwargs)
+
+    def SetBrush(*args, **kwargs):
+        """SetBrush(Brush brush)"""
+        return _gdi.DC_SetBrush(*args, **kwargs)
+
+    def SetBackground(*args, **kwargs):
+        """SetBackground(Brush brush)"""
+        return _gdi.DC_SetBackground(*args, **kwargs)
+
+    def SetBackgroundMode(*args, **kwargs):
+        """SetBackgroundMode(int mode)"""
+        return _gdi.DC_SetBackgroundMode(*args, **kwargs)
+
+    def SetPalette(*args, **kwargs):
+        """SetPalette(Palette palette)"""
+        return _gdi.DC_SetPalette(*args, **kwargs)
+
+    def SetClippingRegion(*args, **kwargs):
+        """SetClippingRegion(int x, int y, int width, int height)"""
+        return _gdi.DC_SetClippingRegion(*args, **kwargs)
+
+    def SetClippingRect(*args, **kwargs):
+        """SetClippingRect(Rect rect)"""
+        return _gdi.DC_SetClippingRect(*args, **kwargs)
+
+    def SetClippingRegionAsRegion(*args, **kwargs):
+        """SetClippingRegionAsRegion(Region region)"""
+        return _gdi.DC_SetClippingRegionAsRegion(*args, **kwargs)
+
+    def DestroyClippingRegion(*args, **kwargs):
+        """DestroyClippingRegion()"""
+        return _gdi.DC_DestroyClippingRegion(*args, **kwargs)
+
+    def GetClippingBox(*args, **kwargs):
+        """GetClippingBox(int OUTPUT, int OUTPUT, int OUTPUT, int OUTPUT)"""
+        return _gdi.DC_GetClippingBox(*args, **kwargs)
+
+    def GetClippingRect(*args, **kwargs):
+        """GetClippingRect() -> Rect"""
+        return _gdi.DC_GetClippingRect(*args, **kwargs)
+
+    def GetCharHeight(*args, **kwargs):
+        """GetCharHeight() -> int"""
+        return _gdi.DC_GetCharHeight(*args, **kwargs)
+
+    def GetCharWidth(*args, **kwargs):
+        """GetCharWidth() -> int"""
+        return _gdi.DC_GetCharWidth(*args, **kwargs)
+
+    def GetTextExtent(*args, **kwargs):
+        """GetTextExtent(wxString string, int OUTPUT, int OUTPUT)"""
+        return _gdi.DC_GetTextExtent(*args, **kwargs)
+
+    def GetFullTextExtent(*args, **kwargs):
+        """GetFullTextExtent(wxString string, int OUTPUT, int OUTPUT, int OUTPUT, 
+    int OUTPUT, Font font=None)"""
+        return _gdi.DC_GetFullTextExtent(*args, **kwargs)
+
+    def GetMultiLineTextExtent(*args, **kwargs):
+        """GetMultiLineTextExtent(wxString text, int OUTPUT, int OUTPUT, int OUTPUT, 
+    Font font=None)"""
+        return _gdi.DC_GetMultiLineTextExtent(*args, **kwargs)
+
+    def GetSizeTuple(*args, **kwargs):
+        """GetSizeTuple(int OUTPUT, int OUTPUT)"""
+        return _gdi.DC_GetSizeTuple(*args, **kwargs)
+
+    def GetSize(*args, **kwargs):
+        """GetSize() -> Size"""
+        return _gdi.DC_GetSize(*args, **kwargs)
+
+    def GetSizeMMWH(*args, **kwargs):
+        """GetSizeMMWH(int OUTPUT, int OUTPUT)"""
+        return _gdi.DC_GetSizeMMWH(*args, **kwargs)
+
+    def GetSizeMM(*args, **kwargs):
+        """GetSizeMM() -> Size"""
+        return _gdi.DC_GetSizeMM(*args, **kwargs)
+
+    def DeviceToLogicalX(*args, **kwargs):
+        """DeviceToLogicalX(int x) -> int"""
+        return _gdi.DC_DeviceToLogicalX(*args, **kwargs)
+
+    def DeviceToLogicalY(*args, **kwargs):
+        """DeviceToLogicalY(int y) -> int"""
+        return _gdi.DC_DeviceToLogicalY(*args, **kwargs)
+
+    def DeviceToLogicalXRel(*args, **kwargs):
+        """DeviceToLogicalXRel(int x) -> int"""
+        return _gdi.DC_DeviceToLogicalXRel(*args, **kwargs)
+
+    def DeviceToLogicalYRel(*args, **kwargs):
+        """DeviceToLogicalYRel(int y) -> int"""
+        return _gdi.DC_DeviceToLogicalYRel(*args, **kwargs)
+
+    def LogicalToDeviceX(*args, **kwargs):
+        """LogicalToDeviceX(int x) -> int"""
+        return _gdi.DC_LogicalToDeviceX(*args, **kwargs)
+
+    def LogicalToDeviceY(*args, **kwargs):
+        """LogicalToDeviceY(int y) -> int"""
+        return _gdi.DC_LogicalToDeviceY(*args, **kwargs)
+
+    def LogicalToDeviceXRel(*args, **kwargs):
+        """LogicalToDeviceXRel(int x) -> int"""
+        return _gdi.DC_LogicalToDeviceXRel(*args, **kwargs)
+
+    def LogicalToDeviceYRel(*args, **kwargs):
+        """LogicalToDeviceYRel(int y) -> int"""
+        return _gdi.DC_LogicalToDeviceYRel(*args, **kwargs)
+
+    def CanDrawBitmap(*args, **kwargs):
+        """CanDrawBitmap() -> bool"""
+        return _gdi.DC_CanDrawBitmap(*args, **kwargs)
+
+    def CanGetTextExtent(*args, **kwargs):
+        """CanGetTextExtent() -> bool"""
+        return _gdi.DC_CanGetTextExtent(*args, **kwargs)
+
+    def GetDepth(*args, **kwargs):
+        """GetDepth() -> int"""
+        return _gdi.DC_GetDepth(*args, **kwargs)
+
+    def GetPPI(*args, **kwargs):
+        """GetPPI() -> Size"""
+        return _gdi.DC_GetPPI(*args, **kwargs)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _gdi.DC_Ok(*args, **kwargs)
+
+    def GetBackgroundMode(*args, **kwargs):
+        """GetBackgroundMode() -> int"""
+        return _gdi.DC_GetBackgroundMode(*args, **kwargs)
+
+    def GetBackground(*args, **kwargs):
+        """GetBackground() -> Brush"""
+        return _gdi.DC_GetBackground(*args, **kwargs)
+
+    def GetBrush(*args, **kwargs):
+        """GetBrush() -> Brush"""
+        return _gdi.DC_GetBrush(*args, **kwargs)
+
+    def GetFont(*args, **kwargs):
+        """GetFont() -> Font"""
+        return _gdi.DC_GetFont(*args, **kwargs)
+
+    def GetPen(*args, **kwargs):
+        """GetPen() -> Pen"""
+        return _gdi.DC_GetPen(*args, **kwargs)
+
+    def GetTextBackground(*args, **kwargs):
+        """GetTextBackground() -> Colour"""
+        return _gdi.DC_GetTextBackground(*args, **kwargs)
+
+    def GetTextForeground(*args, **kwargs):
+        """GetTextForeground() -> Colour"""
+        return _gdi.DC_GetTextForeground(*args, **kwargs)
+
+    def SetTextForeground(*args, **kwargs):
+        """SetTextForeground(Colour colour)"""
+        return _gdi.DC_SetTextForeground(*args, **kwargs)
+
+    def SetTextBackground(*args, **kwargs):
+        """SetTextBackground(Colour colour)"""
+        return _gdi.DC_SetTextBackground(*args, **kwargs)
+
+    def GetMapMode(*args, **kwargs):
+        """GetMapMode() -> int"""
+        return _gdi.DC_GetMapMode(*args, **kwargs)
+
+    def SetMapMode(*args, **kwargs):
+        """SetMapMode(int mode)"""
+        return _gdi.DC_SetMapMode(*args, **kwargs)
+
+    def GetUserScale(*args, **kwargs):
+        """GetUserScale(double OUTPUT, double OUTPUT)"""
+        return _gdi.DC_GetUserScale(*args, **kwargs)
+
+    def SetUserScale(*args, **kwargs):
+        """SetUserScale(double x, double y)"""
+        return _gdi.DC_SetUserScale(*args, **kwargs)
+
+    def GetLogicalScale(*args, **kwargs):
+        """GetLogicalScale(double OUTPUT, double OUTPUT)"""
+        return _gdi.DC_GetLogicalScale(*args, **kwargs)
+
+    def SetLogicalScale(*args, **kwargs):
+        """SetLogicalScale(double x, double y)"""
+        return _gdi.DC_SetLogicalScale(*args, **kwargs)
+
+    def GetLogicalOriginTuple(*args, **kwargs):
+        """GetLogicalOriginTuple(int OUTPUT, int OUTPUT)"""
+        return _gdi.DC_GetLogicalOriginTuple(*args, **kwargs)
+
+    def GetLogicalOrigin(*args, **kwargs):
+        """GetLogicalOrigin() -> Point"""
+        return _gdi.DC_GetLogicalOrigin(*args, **kwargs)
+
+    def SetLogicalOrigin(*args, **kwargs):
+        """SetLogicalOrigin(int x, int y)"""
+        return _gdi.DC_SetLogicalOrigin(*args, **kwargs)
+
+    def GetDeviceOriginTuple(*args, **kwargs):
+        """GetDeviceOriginTuple(int OUTPUT, int OUTPUT)"""
+        return _gdi.DC_GetDeviceOriginTuple(*args, **kwargs)
+
+    def GetDeviceOrigin(*args, **kwargs):
+        """GetDeviceOrigin() -> Point"""
+        return _gdi.DC_GetDeviceOrigin(*args, **kwargs)
+
+    def SetDeviceOrigin(*args, **kwargs):
+        """SetDeviceOrigin(int x, int y)"""
+        return _gdi.DC_SetDeviceOrigin(*args, **kwargs)
+
+    def SetAxisOrientation(*args, **kwargs):
+        """SetAxisOrientation(bool xLeftRight, bool yBottomUp)"""
+        return _gdi.DC_SetAxisOrientation(*args, **kwargs)
+
+    def GetLogicalFunction(*args, **kwargs):
+        """GetLogicalFunction() -> int"""
+        return _gdi.DC_GetLogicalFunction(*args, **kwargs)
+
+    def SetLogicalFunction(*args, **kwargs):
+        """SetLogicalFunction(int function)"""
+        return _gdi.DC_SetLogicalFunction(*args, **kwargs)
+
+    def SetOptimization(*args, **kwargs):
+        """SetOptimization(bool opt)"""
+        return _gdi.DC_SetOptimization(*args, **kwargs)
+
+    def GetOptimization(*args, **kwargs):
+        """GetOptimization() -> bool"""
+        return _gdi.DC_GetOptimization(*args, **kwargs)
+
+    def CalcBoundingBox(*args, **kwargs):
+        """CalcBoundingBox(int x, int y)"""
+        return _gdi.DC_CalcBoundingBox(*args, **kwargs)
+
+    def ResetBoundingBox(*args, **kwargs):
+        """ResetBoundingBox()"""
+        return _gdi.DC_ResetBoundingBox(*args, **kwargs)
+
+    def MinX(*args, **kwargs):
+        """MinX() -> int"""
+        return _gdi.DC_MinX(*args, **kwargs)
+
+    def MaxX(*args, **kwargs):
+        """MaxX() -> int"""
+        return _gdi.DC_MaxX(*args, **kwargs)
+
+    def MinY(*args, **kwargs):
+        """MinY() -> int"""
+        return _gdi.DC_MinY(*args, **kwargs)
+
+    def MaxY(*args, **kwargs):
+        """MaxY() -> int"""
+        return _gdi.DC_MaxY(*args, **kwargs)
+
+    def GetBoundingBox(*args, **kwargs):
+        """GetBoundingBox(int OUTPUT, int OUTPUT, int OUTPUT, int OUTPUT)"""
+        return _gdi.DC_GetBoundingBox(*args, **kwargs)
+
     def __nonzero__(self): return self.Ok() 
-    def _DrawPointList(*args, **kwargs): return _gdi.DC__DrawPointList(*args, **kwargs)
-    def _DrawLineList(*args, **kwargs): return _gdi.DC__DrawLineList(*args, **kwargs)
-    def _DrawRectangleList(*args, **kwargs): return _gdi.DC__DrawRectangleList(*args, **kwargs)
-    def _DrawEllipseList(*args, **kwargs): return _gdi.DC__DrawEllipseList(*args, **kwargs)
-    def _DrawPolygonList(*args, **kwargs): return _gdi.DC__DrawPolygonList(*args, **kwargs)
-    def _DrawTextList(*args, **kwargs): return _gdi.DC__DrawTextList(*args, **kwargs)
+    def _DrawPointList(*args, **kwargs):
+        """_DrawPointList(PyObject pyCoords, PyObject pyPens, PyObject pyBrushes) -> PyObject"""
+        return _gdi.DC__DrawPointList(*args, **kwargs)
+
+    def _DrawLineList(*args, **kwargs):
+        """_DrawLineList(PyObject pyCoords, PyObject pyPens, PyObject pyBrushes) -> PyObject"""
+        return _gdi.DC__DrawLineList(*args, **kwargs)
+
+    def _DrawRectangleList(*args, **kwargs):
+        """_DrawRectangleList(PyObject pyCoords, PyObject pyPens, PyObject pyBrushes) -> PyObject"""
+        return _gdi.DC__DrawRectangleList(*args, **kwargs)
+
+    def _DrawEllipseList(*args, **kwargs):
+        """_DrawEllipseList(PyObject pyCoords, PyObject pyPens, PyObject pyBrushes) -> PyObject"""
+        return _gdi.DC__DrawEllipseList(*args, **kwargs)
+
+    def _DrawPolygonList(*args, **kwargs):
+        """_DrawPolygonList(PyObject pyCoords, PyObject pyPens, PyObject pyBrushes) -> PyObject"""
+        return _gdi.DC__DrawPolygonList(*args, **kwargs)
+
+    def _DrawTextList(*args, **kwargs):
+        """_DrawTextList(PyObject textList, PyObject pyPoints, PyObject foregroundList, 
+    PyObject backgroundList) -> PyObject"""
+        return _gdi.DC__DrawTextList(*args, **kwargs)
+
     def DrawPointList(self, points, pens=None):
         if pens is None:
            pens = []
@@ -1415,9 +2578,6 @@ class DC(core.Object):
            raise ValueError('backgrounds and coords must have same length')
         return  self._DrawTextList(textList, coords, foregrounds, backgrounds)
 
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class DCPtr(DC):
     def __init__(self, this):
@@ -1429,14 +2589,19 @@ _gdi.DC_swigregister(DCPtr)
 #---------------------------------------------------------------------------
 
 class MemoryDC(DC):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMemoryDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> MemoryDC"""
         newobj = _gdi.new_MemoryDC(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SelectObject(*args, **kwargs): return _gdi.MemoryDC_SelectObject(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMemoryDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SelectObject(*args, **kwargs):
+        """SelectObject(Bitmap bitmap)"""
+        return _gdi.MemoryDC_SelectObject(*args, **kwargs)
+
 
 class MemoryDCPtr(MemoryDC):
     def __init__(self, this):
@@ -1446,6 +2611,7 @@ class MemoryDCPtr(MemoryDC):
 _gdi.MemoryDC_swigregister(MemoryDCPtr)
 
 def MemoryDCFromDC(*args, **kwargs):
+    """MemoryDCFromDC(DC oldDC) -> MemoryDC"""
     val = _gdi.new_MemoryDCFromDC(*args, **kwargs)
     val.thisown = 1
     return val
@@ -1453,15 +2619,21 @@ def MemoryDCFromDC(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class BufferedDC(MemoryDC):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(DC dc, Bitmap buffer) -> BufferedDC"""
         newobj = _gdi.new_BufferedDC(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._dc = args[0] # save a ref so the other dc will not be deleted before self
-    def UnMask(*args, **kwargs): return _gdi.BufferedDC_UnMask(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def UnMask(*args, **kwargs):
+        """UnMask()"""
+        return _gdi.BufferedDC_UnMask(*args, **kwargs)
+
 
 class BufferedDCPtr(BufferedDC):
     def __init__(self, this):
@@ -1471,19 +2643,22 @@ class BufferedDCPtr(BufferedDC):
 _gdi.BufferedDC_swigregister(BufferedDCPtr)
 
 def BufferedDCInternalBuffer(*args, **kwargs):
+    """BufferedDCInternalBuffer(DC dc, Size area) -> BufferedDC"""
     val = _gdi.new_BufferedDCInternalBuffer(*args, **kwargs)
     val.thisown = 1
     val._dc = args[0] # save a ref so the other dc will not be deleted before self
     return val
 
 class BufferedPaintDC(BufferedDC):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBufferedPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window window, Bitmap buffer=NullBitmap) -> BufferedPaintDC"""
         newobj = _gdi.new_BufferedPaintDC(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBufferedPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class BufferedPaintDCPtr(BufferedPaintDC):
     def __init__(self, this):
@@ -1495,16 +2670,27 @@ _gdi.BufferedPaintDC_swigregister(BufferedPaintDCPtr)
 #---------------------------------------------------------------------------
 
 class ScreenDC(DC):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxScreenDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> ScreenDC"""
         newobj = _gdi.new_ScreenDC(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def StartDrawingOnTopWin(*args, **kwargs): return _gdi.ScreenDC_StartDrawingOnTopWin(*args, **kwargs)
-    def StartDrawingOnTop(*args, **kwargs): return _gdi.ScreenDC_StartDrawingOnTop(*args, **kwargs)
-    def EndDrawingOnTop(*args, **kwargs): return _gdi.ScreenDC_EndDrawingOnTop(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxScreenDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def StartDrawingOnTopWin(*args, **kwargs):
+        """StartDrawingOnTopWin(Window window) -> bool"""
+        return _gdi.ScreenDC_StartDrawingOnTopWin(*args, **kwargs)
+
+    def StartDrawingOnTop(*args, **kwargs):
+        """StartDrawingOnTop(Rect rect=None) -> bool"""
+        return _gdi.ScreenDC_StartDrawingOnTop(*args, **kwargs)
+
+    def EndDrawingOnTop(*args, **kwargs):
+        """EndDrawingOnTop() -> bool"""
+        return _gdi.ScreenDC_EndDrawingOnTop(*args, **kwargs)
+
 
 class ScreenDCPtr(ScreenDC):
     def __init__(self, this):
@@ -1516,13 +2702,15 @@ _gdi.ScreenDC_swigregister(ScreenDCPtr)
 #---------------------------------------------------------------------------
 
 class ClientDC(DC):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxClientDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window win) -> ClientDC"""
         newobj = _gdi.new_ClientDC(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxClientDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class ClientDCPtr(ClientDC):
     def __init__(self, this):
@@ -1534,13 +2722,15 @@ _gdi.ClientDC_swigregister(ClientDCPtr)
 #---------------------------------------------------------------------------
 
 class PaintDC(DC):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window win) -> PaintDC"""
         newobj = _gdi.new_PaintDC(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class PaintDCPtr(PaintDC):
     def __init__(self, this):
@@ -1552,13 +2742,15 @@ _gdi.PaintDC_swigregister(PaintDCPtr)
 #---------------------------------------------------------------------------
 
 class WindowDC(DC):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxWindowDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window win) -> WindowDC"""
         newobj = _gdi.new_WindowDC(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWindowDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class WindowDCPtr(WindowDC):
     def __init__(self, this):
@@ -1570,13 +2762,15 @@ _gdi.WindowDC_swigregister(WindowDCPtr)
 #---------------------------------------------------------------------------
 
 class MirrorDC(DC):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMirrorDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(DC dc, bool mirror) -> MirrorDC"""
         newobj = _gdi.new_MirrorDC(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMirrorDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class MirrorDCPtr(MirrorDC):
     def __init__(self, this):
@@ -1588,17 +2782,33 @@ _gdi.MirrorDC_swigregister(MirrorDCPtr)
 #---------------------------------------------------------------------------
 
 class PostScriptDC(DC):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPostScriptDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxPrintData printData) -> PostScriptDC"""
         newobj = _gdi.new_PostScriptDC(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetPrintData(*args, **kwargs): return _gdi.PostScriptDC_GetPrintData(*args, **kwargs)
-    def SetPrintData(*args, **kwargs): return _gdi.PostScriptDC_SetPrintData(*args, **kwargs)
-    SetResolution = staticmethod(_gdi.PostScriptDC_SetResolution)
-    GetResolution = staticmethod(_gdi.PostScriptDC_GetResolution)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPostScriptDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetPrintData(*args, **kwargs):
+        """GetPrintData() -> wxPrintData"""
+        return _gdi.PostScriptDC_GetPrintData(*args, **kwargs)
+
+    def SetPrintData(*args, **kwargs):
+        """SetPrintData(wxPrintData data)"""
+        return _gdi.PostScriptDC_SetPrintData(*args, **kwargs)
+
+    def SetResolution(*args, **kwargs):
+        """PostScriptDC.SetResolution(int ppi)"""
+        return _gdi.PostScriptDC_SetResolution(*args, **kwargs)
+
+    SetResolution = staticmethod(SetResolution)
+    def GetResolution(*args, **kwargs):
+        """PostScriptDC.GetResolution() -> int"""
+        return _gdi.PostScriptDC_GetResolution(*args, **kwargs)
+
+    GetResolution = staticmethod(GetResolution)
 
 class PostScriptDCPtr(PostScriptDC):
     def __init__(self, this):
@@ -1607,20 +2817,26 @@ class PostScriptDCPtr(PostScriptDC):
         self.__class__ = PostScriptDC
 _gdi.PostScriptDC_swigregister(PostScriptDCPtr)
 
-PostScriptDC_SetResolution = _gdi.PostScriptDC_SetResolution
+def PostScriptDC_SetResolution(*args, **kwargs):
+    """PostScriptDC_SetResolution(int ppi)"""
+    return _gdi.PostScriptDC_SetResolution(*args, **kwargs)
 
-PostScriptDC_GetResolution = _gdi.PostScriptDC_GetResolution
+def PostScriptDC_GetResolution(*args, **kwargs):
+    """PostScriptDC_GetResolution() -> int"""
+    return _gdi.PostScriptDC_GetResolution(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class MetaFile(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMetaFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString filename=wxPyEmptyString) -> MetaFile"""
         newobj = _gdi.new_MetaFile(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMetaFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class MetaFilePtr(MetaFile):
     def __init__(self, this):
@@ -1630,13 +2846,16 @@ class MetaFilePtr(MetaFile):
 _gdi.MetaFile_swigregister(MetaFilePtr)
 
 class MetaFileDC(DC):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMetaFileDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString filename=wxPyEmptyString, int width=0, int height=0, 
+    wxString description=wxPyEmptyString) -> MetaFileDC"""
         newobj = _gdi.new_MetaFileDC(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMetaFileDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class MetaFileDCPtr(MetaFileDC):
     def __init__(self, this):
@@ -1646,13 +2865,15 @@ class MetaFileDCPtr(MetaFileDC):
 _gdi.MetaFileDC_swigregister(MetaFileDCPtr)
 
 class PrinterDC(DC):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPrinterDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxPrintData printData) -> PrinterDC"""
         newobj = _gdi.new_PrinterDC(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPrinterDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class PrinterDCPtr(PrinterDC):
     def __init__(self, this):
@@ -1671,26 +2892,58 @@ IMAGE_LIST_NORMAL = _gdi.IMAGE_LIST_NORMAL
 IMAGE_LIST_SMALL = _gdi.IMAGE_LIST_SMALL
 IMAGE_LIST_STATE = _gdi.IMAGE_LIST_STATE
 class ImageList(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxImageList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int width, int height, int mask=True, int initialCount=1) -> ImageList"""
         newobj = _gdi.new_ImageList(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_ImageList):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Add(*args, **kwargs): return _gdi.ImageList_Add(*args, **kwargs)
-    def AddWithColourMask(*args, **kwargs): return _gdi.ImageList_AddWithColourMask(*args, **kwargs)
-    def AddIcon(*args, **kwargs): return _gdi.ImageList_AddIcon(*args, **kwargs)
-    def Replace(*args, **kwargs): return _gdi.ImageList_Replace(*args, **kwargs)
-    def Draw(*args, **kwargs): return _gdi.ImageList_Draw(*args, **kwargs)
-    def GetImageCount(*args, **kwargs): return _gdi.ImageList_GetImageCount(*args, **kwargs)
-    def Remove(*args, **kwargs): return _gdi.ImageList_Remove(*args, **kwargs)
-    def RemoveAll(*args, **kwargs): return _gdi.ImageList_RemoveAll(*args, **kwargs)
-    def GetSize(*args, **kwargs): return _gdi.ImageList_GetSize(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxImageList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Add(*args, **kwargs):
+        """Add(Bitmap bitmap, Bitmap mask=NullBitmap) -> int"""
+        return _gdi.ImageList_Add(*args, **kwargs)
+
+    def AddWithColourMask(*args, **kwargs):
+        """AddWithColourMask(Bitmap bitmap, Colour maskColour) -> int"""
+        return _gdi.ImageList_AddWithColourMask(*args, **kwargs)
+
+    def AddIcon(*args, **kwargs):
+        """AddIcon(Icon icon) -> int"""
+        return _gdi.ImageList_AddIcon(*args, **kwargs)
+
+    def Replace(*args, **kwargs):
+        """Replace(int index, Bitmap bitmap) -> bool"""
+        return _gdi.ImageList_Replace(*args, **kwargs)
+
+    def Draw(*args, **kwargs):
+        """Draw(int index, DC dc, int x, int x, int flags=IMAGELIST_DRAW_NORMAL, 
+    bool solidBackground=False) -> bool"""
+        return _gdi.ImageList_Draw(*args, **kwargs)
+
+    def GetImageCount(*args, **kwargs):
+        """GetImageCount() -> int"""
+        return _gdi.ImageList_GetImageCount(*args, **kwargs)
+
+    def Remove(*args, **kwargs):
+        """Remove(int index) -> bool"""
+        return _gdi.ImageList_Remove(*args, **kwargs)
+
+    def RemoveAll(*args, **kwargs):
+        """RemoveAll() -> bool"""
+        return _gdi.ImageList_RemoveAll(*args, **kwargs)
+
+    def GetSize(*args, **kwargs):
+        """GetSize(int index, int OUTPUT, int OUTPUT)"""
+        return _gdi.ImageList_GetSize(*args, **kwargs)
+
 
 class ImageListPtr(ImageList):
     def __init__(self, this):
@@ -1702,13 +2955,26 @@ _gdi.ImageList_swigregister(ImageListPtr)
 #---------------------------------------------------------------------------
 
 class PenList(core.Object):
-    def AddPen(*args, **kwargs): return _gdi.PenList_AddPen(*args, **kwargs)
-    def FindOrCreatePen(*args, **kwargs): return _gdi.PenList_FindOrCreatePen(*args, **kwargs)
-    def RemovePen(*args, **kwargs): return _gdi.PenList_RemovePen(*args, **kwargs)
-    def GetCount(*args, **kwargs): return _gdi.PenList_GetCount(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPenList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def AddPen(*args, **kwargs):
+        """AddPen(Pen pen)"""
+        return _gdi.PenList_AddPen(*args, **kwargs)
+
+    def FindOrCreatePen(*args, **kwargs):
+        """FindOrCreatePen(Colour colour, int width, int style) -> Pen"""
+        return _gdi.PenList_FindOrCreatePen(*args, **kwargs)
+
+    def RemovePen(*args, **kwargs):
+        """RemovePen(Pen pen)"""
+        return _gdi.PenList_RemovePen(*args, **kwargs)
+
+    def GetCount(*args, **kwargs):
+        """GetCount() -> int"""
+        return _gdi.PenList_GetCount(*args, **kwargs)
+
 
 class PenListPtr(PenList):
     def __init__(self, this):
@@ -1718,13 +2984,26 @@ class PenListPtr(PenList):
 _gdi.PenList_swigregister(PenListPtr)
 
 class BrushList(core.Object):
-    def AddBrush(*args, **kwargs): return _gdi.BrushList_AddBrush(*args, **kwargs)
-    def FindOrCreateBrush(*args, **kwargs): return _gdi.BrushList_FindOrCreateBrush(*args, **kwargs)
-    def RemoveBrush(*args, **kwargs): return _gdi.BrushList_RemoveBrush(*args, **kwargs)
-    def GetCount(*args, **kwargs): return _gdi.BrushList_GetCount(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBrushList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def AddBrush(*args, **kwargs):
+        """AddBrush(Brush brush)"""
+        return _gdi.BrushList_AddBrush(*args, **kwargs)
+
+    def FindOrCreateBrush(*args, **kwargs):
+        """FindOrCreateBrush(Colour colour, int style) -> Brush"""
+        return _gdi.BrushList_FindOrCreateBrush(*args, **kwargs)
+
+    def RemoveBrush(*args, **kwargs):
+        """RemoveBrush(Brush brush)"""
+        return _gdi.BrushList_RemoveBrush(*args, **kwargs)
+
+    def GetCount(*args, **kwargs):
+        """GetCount() -> int"""
+        return _gdi.BrushList_GetCount(*args, **kwargs)
+
 
 class BrushListPtr(BrushList):
     def __init__(self, this):
@@ -1734,22 +3013,38 @@ class BrushListPtr(BrushList):
 _gdi.BrushList_swigregister(BrushListPtr)
 
 class ColourDatabase(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxColourDatabase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> ColourDatabase"""
         newobj = _gdi.new_ColourDatabase(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_gdi.delete_ColourDatabase):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Find(*args, **kwargs): return _gdi.ColourDatabase_Find(*args, **kwargs)
-    def FindName(*args, **kwargs): return _gdi.ColourDatabase_FindName(*args, **kwargs)
+
+    def Find(*args, **kwargs):
+        """Find(wxString name) -> Colour"""
+        return _gdi.ColourDatabase_Find(*args, **kwargs)
+
+    def FindName(*args, **kwargs):
+        """FindName(Colour colour) -> wxString"""
+        return _gdi.ColourDatabase_FindName(*args, **kwargs)
+
     FindColour = Find 
-    def AddColour(*args, **kwargs): return _gdi.ColourDatabase_AddColour(*args, **kwargs)
-    def Append(*args, **kwargs): return _gdi.ColourDatabase_Append(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxColourDatabase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def AddColour(*args, **kwargs):
+        """AddColour(wxString name, Colour colour)"""
+        return _gdi.ColourDatabase_AddColour(*args, **kwargs)
+
+    def Append(*args, **kwargs):
+        """Append(wxString name, int red, int green, int blue)"""
+        return _gdi.ColourDatabase_Append(*args, **kwargs)
+
 
 class ColourDatabasePtr(ColourDatabase):
     def __init__(self, this):
@@ -1759,13 +3054,28 @@ class ColourDatabasePtr(ColourDatabase):
 _gdi.ColourDatabase_swigregister(ColourDatabasePtr)
 
 class FontList(core.Object):
-    def AddFont(*args, **kwargs): return _gdi.FontList_AddFont(*args, **kwargs)
-    def FindOrCreateFont(*args, **kwargs): return _gdi.FontList_FindOrCreateFont(*args, **kwargs)
-    def RemoveFont(*args, **kwargs): return _gdi.FontList_RemoveFont(*args, **kwargs)
-    def GetCount(*args, **kwargs): return _gdi.FontList_GetCount(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxFontList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def AddFont(*args, **kwargs):
+        """AddFont(Font font)"""
+        return _gdi.FontList_AddFont(*args, **kwargs)
+
+    def FindOrCreateFont(*args, **kwargs):
+        """FindOrCreateFont(int point_size, int family, int style, int weight, 
+    bool underline=False, wxString facename=wxPyEmptyString, 
+    wxFontEncoding encoding=FONTENCODING_DEFAULT) -> Font"""
+        return _gdi.FontList_FindOrCreateFont(*args, **kwargs)
+
+    def RemoveFont(*args, **kwargs):
+        """RemoveFont(Font font)"""
+        return _gdi.FontList_RemoveFont(*args, **kwargs)
+
+    def GetCount(*args, **kwargs):
+        """GetCount() -> int"""
+        return _gdi.FontList_GetCount(*args, **kwargs)
+
 
 class FontListPtr(FontList):
     def __init__(self, this):
@@ -1778,36 +3088,76 @@ _gdi.FontList_swigregister(FontListPtr)
 
 #---------------------------------------------------------------------------
 
-class DragImage(core.Object):
+class Effects(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxEffects instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
-        newobj = _gdi.new_DragImage(*args, **kwargs)
+        """__init__() -> Effects"""
+        newobj = _gdi.new_Effects(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __del__(self, destroy=_gdi.delete_DragImage):
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-    def SetBackingBitmap(*args, **kwargs): return _gdi.DragImage_SetBackingBitmap(*args, **kwargs)
-    def BeginDrag(*args, **kwargs): return _gdi.DragImage_BeginDrag(*args, **kwargs)
-    def BeginDragBounded(*args, **kwargs): return _gdi.DragImage_BeginDragBounded(*args, **kwargs)
-    def EndDrag(*args, **kwargs): return _gdi.DragImage_EndDrag(*args, **kwargs)
-    def Move(*args, **kwargs): return _gdi.DragImage_Move(*args, **kwargs)
-    def Show(*args, **kwargs): return _gdi.DragImage_Show(*args, **kwargs)
-    def Hide(*args, **kwargs): return _gdi.DragImage_Hide(*args, **kwargs)
-    def GetImageRect(*args, **kwargs): return _gdi.DragImage_GetImageRect(*args, **kwargs)
-    def DoDrawImage(*args, **kwargs): return _gdi.DragImage_DoDrawImage(*args, **kwargs)
-    def UpdateBackingFromWindow(*args, **kwargs): return _gdi.DragImage_UpdateBackingFromWindow(*args, **kwargs)
-    def RedrawImage(*args, **kwargs): return _gdi.DragImage_RedrawImage(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGenericDragImage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetHighlightColour(*args, **kwargs):
+        """GetHighlightColour() -> Colour"""
+        return _gdi.Effects_GetHighlightColour(*args, **kwargs)
+
+    def GetLightShadow(*args, **kwargs):
+        """GetLightShadow() -> Colour"""
+        return _gdi.Effects_GetLightShadow(*args, **kwargs)
+
+    def GetFaceColour(*args, **kwargs):
+        """GetFaceColour() -> Colour"""
+        return _gdi.Effects_GetFaceColour(*args, **kwargs)
+
+    def GetMediumShadow(*args, **kwargs):
+        """GetMediumShadow() -> Colour"""
+        return _gdi.Effects_GetMediumShadow(*args, **kwargs)
+
+    def GetDarkShadow(*args, **kwargs):
+        """GetDarkShadow() -> Colour"""
+        return _gdi.Effects_GetDarkShadow(*args, **kwargs)
+
+    def SetHighlightColour(*args, **kwargs):
+        """SetHighlightColour(Colour c)"""
+        return _gdi.Effects_SetHighlightColour(*args, **kwargs)
+
+    def SetLightShadow(*args, **kwargs):
+        """SetLightShadow(Colour c)"""
+        return _gdi.Effects_SetLightShadow(*args, **kwargs)
+
+    def SetFaceColour(*args, **kwargs):
+        """SetFaceColour(Colour c)"""
+        return _gdi.Effects_SetFaceColour(*args, **kwargs)
+
+    def SetMediumShadow(*args, **kwargs):
+        """SetMediumShadow(Colour c)"""
+        return _gdi.Effects_SetMediumShadow(*args, **kwargs)
+
+    def SetDarkShadow(*args, **kwargs):
+        """SetDarkShadow(Colour c)"""
+        return _gdi.Effects_SetDarkShadow(*args, **kwargs)
+
+    def Set(*args, **kwargs):
+        """Set(Colour highlightColour, Colour lightShadow, Colour faceColour, 
+    Colour mediumShadow, Colour darkShadow)"""
+        return _gdi.Effects_Set(*args, **kwargs)
+
+    def DrawSunkenEdge(*args, **kwargs):
+        """DrawSunkenEdge(DC dc, Rect rect, int borderSize=1)"""
+        return _gdi.Effects_DrawSunkenEdge(*args, **kwargs)
 
-class DragImagePtr(DragImage):
+    def TileBitmap(*args, **kwargs):
+        """TileBitmap(Rect rect, DC dc, Bitmap bitmap) -> bool"""
+        return _gdi.Effects_TileBitmap(*args, **kwargs)
+
+
+class EffectsPtr(Effects):
     def __init__(self, this):
         self.this = this
         if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = DragImage
-_gdi.DragImage_swigregister(DragImagePtr)
+        self.__class__ = Effects
+_gdi.Effects_swigregister(EffectsPtr)
 cvar = _gdi.cvar
 NORMAL_FONT = cvar.NORMAL_FONT
 SMALL_FONT = cvar.SMALL_FONT
@@ -1856,55 +3206,4 @@ ThePenList = cvar.ThePenList
 TheBrushList = cvar.TheBrushList
 TheColourDatabase = cvar.TheColourDatabase
 
-def DragIcon(*args, **kwargs):
-    val = _gdi.new_DragIcon(*args, **kwargs)
-    val.thisown = 1
-    return val
-
-def DragString(*args, **kwargs):
-    val = _gdi.new_DragString(*args, **kwargs)
-    val.thisown = 1
-    return val
-
-def DragTreeItem(*args, **kwargs):
-    val = _gdi.new_DragTreeItem(*args, **kwargs)
-    val.thisown = 1
-    return val
-
-def DragListItem(*args, **kwargs):
-    val = _gdi.new_DragListItem(*args, **kwargs)
-    val.thisown = 1
-    return val
-
-#---------------------------------------------------------------------------
-
-class Effects(core.Object):
-    def __init__(self, *args, **kwargs):
-        newobj = _gdi.new_Effects(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def GetHighlightColour(*args, **kwargs): return _gdi.Effects_GetHighlightColour(*args, **kwargs)
-    def GetLightShadow(*args, **kwargs): return _gdi.Effects_GetLightShadow(*args, **kwargs)
-    def GetFaceColour(*args, **kwargs): return _gdi.Effects_GetFaceColour(*args, **kwargs)
-    def GetMediumShadow(*args, **kwargs): return _gdi.Effects_GetMediumShadow(*args, **kwargs)
-    def GetDarkShadow(*args, **kwargs): return _gdi.Effects_GetDarkShadow(*args, **kwargs)
-    def SetHighlightColour(*args, **kwargs): return _gdi.Effects_SetHighlightColour(*args, **kwargs)
-    def SetLightShadow(*args, **kwargs): return _gdi.Effects_SetLightShadow(*args, **kwargs)
-    def SetFaceColour(*args, **kwargs): return _gdi.Effects_SetFaceColour(*args, **kwargs)
-    def SetMediumShadow(*args, **kwargs): return _gdi.Effects_SetMediumShadow(*args, **kwargs)
-    def SetDarkShadow(*args, **kwargs): return _gdi.Effects_SetDarkShadow(*args, **kwargs)
-    def Set(*args, **kwargs): return _gdi.Effects_Set(*args, **kwargs)
-    def DrawSunkenEdge(*args, **kwargs): return _gdi.Effects_DrawSunkenEdge(*args, **kwargs)
-    def TileBitmap(*args, **kwargs): return _gdi.Effects_TileBitmap(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxEffects instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-
-class EffectsPtr(Effects):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Effects
-_gdi.Effects_swigregister(EffectsPtr)
-
 
diff --git a/wxPython/src/gtk/gdi_wrap.cpp b/wxPython/src/gtk/gdi_wrap.cpp
index 80356fe1a4..177ea86ef3 100644
--- a/wxPython/src/gtk/gdi_wrap.cpp
+++ b/wxPython/src/gtk/gdi_wrap.cpp
@@ -222,66 +222,61 @@ SWIGEXPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxPostScriptDC swig_types[0] 
-#define  SWIGTYPE_p_wxGenericDragImage swig_types[1] 
-#define  SWIGTYPE_p_wxBrush swig_types[2] 
-#define  SWIGTYPE_p_wxColour swig_types[3] 
-#define  SWIGTYPE_p_wxCoord swig_types[4] 
-#define  SWIGTYPE_p_wxDC swig_types[5] 
-#define  SWIGTYPE_p_wxMirrorDC swig_types[6] 
-#define  SWIGTYPE_p_byte swig_types[7] 
-#define  SWIGTYPE_p_wxPyFontEnumerator swig_types[8] 
-#define  SWIGTYPE_p_wxIconLocation swig_types[9] 
-#define  SWIGTYPE_p_wxImage swig_types[10] 
-#define  SWIGTYPE_p_wxMetaFileDC swig_types[11] 
-#define  SWIGTYPE_p_wxMask swig_types[12] 
-#define  SWIGTYPE_p_wxFont swig_types[13] 
-#define  SWIGTYPE_p_wxWindow swig_types[14] 
-#define  SWIGTYPE_p_wxSize swig_types[15] 
-#define  SWIGTYPE_p_double swig_types[16] 
-#define  SWIGTYPE_p_wxMemoryDC swig_types[17] 
-#define  SWIGTYPE_p_wxFontMapper swig_types[18] 
-#define  SWIGTYPE_p_wxListCtrl swig_types[19] 
-#define  SWIGTYPE_p_wxEffects swig_types[20] 
-#define  SWIGTYPE_p_wxNativeEncodingInfo swig_types[21] 
-#define  SWIGTYPE_p_wxPalette swig_types[22] 
-#define  SWIGTYPE_p_wxBitmap swig_types[23] 
-#define  SWIGTYPE_p_wxObject swig_types[24] 
-#define  SWIGTYPE_p_wxRegionIterator swig_types[25] 
-#define  SWIGTYPE_p_wxRect swig_types[26] 
-#define  SWIGTYPE_p_wxString swig_types[27] 
-#define  SWIGTYPE_p_wxPrinterDC swig_types[28] 
-#define  SWIGTYPE_p_wxIconBundle swig_types[29] 
-#define  SWIGTYPE_p_wxPoint swig_types[30] 
-#define  SWIGTYPE_p_wxDash swig_types[31] 
-#define  SWIGTYPE_p_wxScreenDC swig_types[32] 
-#define  SWIGTYPE_p_wxCursor swig_types[33] 
-#define  SWIGTYPE_p_wxClientDC swig_types[34] 
-#define  SWIGTYPE_p_wxTreeCtrl swig_types[35] 
-#define  SWIGTYPE_p_wxBufferedDC swig_types[36] 
-#define  SWIGTYPE_p_wxImageList swig_types[37] 
-#define  SWIGTYPE_p_unsigned_char swig_types[38] 
-#define  SWIGTYPE_p_wxGDIObject swig_types[39] 
-#define  SWIGTYPE_p_wxLocale swig_types[40] 
-#define  SWIGTYPE_p_wxIcon swig_types[41] 
-#define  SWIGTYPE_p_wxRegion swig_types[42] 
-#define  SWIGTYPE_p_wxLanguageInfo swig_types[43] 
-#define  SWIGTYPE_p_wxConfigBase swig_types[44] 
-#define  SWIGTYPE_p_wxWindowDC swig_types[45] 
-#define  SWIGTYPE_p_wxPrintData swig_types[46] 
-#define  SWIGTYPE_p_wxBrushList swig_types[47] 
-#define  SWIGTYPE_p_wxFontList swig_types[48] 
-#define  SWIGTYPE_p_wxPen swig_types[49] 
-#define  SWIGTYPE_p_wxBufferedPaintDC swig_types[50] 
-#define  SWIGTYPE_p_wxPaintDC swig_types[51] 
-#define  SWIGTYPE_p_wxPenList swig_types[52] 
-#define  SWIGTYPE_p_wxTreeItemId swig_types[53] 
-#define  SWIGTYPE_p_wxPyPen swig_types[54] 
-#define  SWIGTYPE_p_int swig_types[55] 
-#define  SWIGTYPE_p_wxMetaFile swig_types[56] 
-#define  SWIGTYPE_p_wxNativeFontInfo swig_types[57] 
-#define  SWIGTYPE_p_wxEncodingConverter swig_types[58] 
-#define  SWIGTYPE_p_wxColourDatabase swig_types[59] 
-static swig_type_info *swig_types[61];
+#define  SWIGTYPE_p_wxBrush swig_types[1] 
+#define  SWIGTYPE_p_wxColour swig_types[2] 
+#define  SWIGTYPE_p_wxDC swig_types[3] 
+#define  SWIGTYPE_p_wxMirrorDC swig_types[4] 
+#define  SWIGTYPE_p_byte swig_types[5] 
+#define  SWIGTYPE_p_wxPyFontEnumerator swig_types[6] 
+#define  SWIGTYPE_p_wxIconLocation swig_types[7] 
+#define  SWIGTYPE_p_wxImage swig_types[8] 
+#define  SWIGTYPE_p_wxMetaFileDC swig_types[9] 
+#define  SWIGTYPE_p_wxMask swig_types[10] 
+#define  SWIGTYPE_p_wxFont swig_types[11] 
+#define  SWIGTYPE_p_wxWindow swig_types[12] 
+#define  SWIGTYPE_p_wxSize swig_types[13] 
+#define  SWIGTYPE_p_double swig_types[14] 
+#define  SWIGTYPE_p_wxMemoryDC swig_types[15] 
+#define  SWIGTYPE_p_wxFontMapper swig_types[16] 
+#define  SWIGTYPE_p_wxEffects swig_types[17] 
+#define  SWIGTYPE_p_wxNativeEncodingInfo swig_types[18] 
+#define  SWIGTYPE_p_wxPalette swig_types[19] 
+#define  SWIGTYPE_p_wxBitmap swig_types[20] 
+#define  SWIGTYPE_p_wxObject swig_types[21] 
+#define  SWIGTYPE_p_wxRegionIterator swig_types[22] 
+#define  SWIGTYPE_p_wxRect swig_types[23] 
+#define  SWIGTYPE_p_wxString swig_types[24] 
+#define  SWIGTYPE_p_wxPrinterDC swig_types[25] 
+#define  SWIGTYPE_p_wxIconBundle swig_types[26] 
+#define  SWIGTYPE_p_wxPoint swig_types[27] 
+#define  SWIGTYPE_p_wxDash swig_types[28] 
+#define  SWIGTYPE_p_wxScreenDC swig_types[29] 
+#define  SWIGTYPE_p_wxCursor swig_types[30] 
+#define  SWIGTYPE_p_wxClientDC swig_types[31] 
+#define  SWIGTYPE_p_wxBufferedDC swig_types[32] 
+#define  SWIGTYPE_p_wxImageList swig_types[33] 
+#define  SWIGTYPE_p_unsigned_char swig_types[34] 
+#define  SWIGTYPE_p_wxGDIObject swig_types[35] 
+#define  SWIGTYPE_p_wxLocale swig_types[36] 
+#define  SWIGTYPE_p_wxIcon swig_types[37] 
+#define  SWIGTYPE_p_wxRegion swig_types[38] 
+#define  SWIGTYPE_p_wxLanguageInfo swig_types[39] 
+#define  SWIGTYPE_p_wxConfigBase swig_types[40] 
+#define  SWIGTYPE_p_wxWindowDC swig_types[41] 
+#define  SWIGTYPE_p_wxPrintData swig_types[42] 
+#define  SWIGTYPE_p_wxBrushList swig_types[43] 
+#define  SWIGTYPE_p_wxFontList swig_types[44] 
+#define  SWIGTYPE_p_wxPen swig_types[45] 
+#define  SWIGTYPE_p_wxBufferedPaintDC swig_types[46] 
+#define  SWIGTYPE_p_wxPaintDC swig_types[47] 
+#define  SWIGTYPE_p_wxPenList swig_types[48] 
+#define  SWIGTYPE_p_wxPyPen swig_types[49] 
+#define  SWIGTYPE_p_int swig_types[50] 
+#define  SWIGTYPE_p_wxMetaFile swig_types[51] 
+#define  SWIGTYPE_p_wxNativeFontInfo swig_types[52] 
+#define  SWIGTYPE_p_wxEncodingConverter swig_types[53] 
+#define  SWIGTYPE_p_wxColourDatabase swig_types[54] 
+static swig_type_info *swig_types[56];
 
 /* -------- TYPES TABLE (END) -------- */
 
@@ -453,7 +448,7 @@ int wxIconLocation_GetIndex(wxIconLocation *self){
         }
 wxCursor *new_wxCursor(wxString const *cursorName,long flags,int hotSpotX,int hotSpotY){
 
-            wxCHECK_MSG(FALSE, NULL,
+            wxCHECK_MSG(False, NULL,
                         wxT("wxCursor constructor not implemented for wxGTK, use wxStockCursor, wxCursorFromImage, or wxCursorFromBits instead."));
 
 
@@ -539,7 +534,7 @@ PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){
 
 #include "wx/wxPython/pydrawxxx.h"
 
-wxColour wxDC_GetPixelXY(wxDC *self,wxCoord x,wxCoord y){
+wxColour wxDC_GetPixelXY(wxDC *self,int x,int y){
             wxColour col;
             self->GetPixel(x, y, &col);
             return col;
@@ -618,9 +613,6 @@ void wxColourDatabase_Append(wxColourDatabase *self,wxString const &name,int red
             self->AddColour(name, wxColour(red, green, blue));
         }
 
-#include <wx/generic/dragimgg.h>
-
-
 #include <wx/effects.h>
 
 #ifdef __cplusplus
@@ -825,7 +817,7 @@ static PyObject *_wrap_new_NamedColour(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxColour *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "colorName", NULL 
@@ -835,7 +827,7 @@ static PyObject *_wrap_new_NamedColour(PyObject *self, PyObject *args, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2083,7 +2075,7 @@ static PyObject *_wrap_new_Bitmap(PyObject *self, PyObject *args, PyObject *kwar
     wxString *arg1 = 0 ;
     int arg2 = (int) wxBITMAP_TYPE_ANY ;
     wxBitmap *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "name",(char *) "type", NULL 
@@ -2093,7 +2085,7 @@ static PyObject *_wrap_new_Bitmap(PyObject *self, PyObject *args, PyObject *kwar
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2531,7 +2523,7 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject
     int arg3 ;
     wxPalette *arg4 = (wxPalette *) (wxPalette *) NULL ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -2544,7 +2536,7 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj3) {
         if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxPalette,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -2577,7 +2569,7 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject
     wxString *arg2 = 0 ;
     int arg3 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2589,7 +2581,7 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2803,7 +2795,7 @@ static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs
     int arg3 = (int) -1 ;
     int arg4 = (int) -1 ;
     wxIcon *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "name",(char *) "flags",(char *) "desiredWidth",(char *) "desiredHeight", NULL 
@@ -2813,7 +2805,7 @@ static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2970,7 +2962,7 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k
     wxString *arg2 = 0 ;
     long arg3 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2982,7 +2974,7 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3299,7 +3291,7 @@ static PyObject *_wrap_IconLocation_SetFileName(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxIconLocation *arg1 = (wxIconLocation *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3311,7 +3303,7 @@ static PyObject *_wrap_IconLocation_SetFileName(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3447,7 +3439,7 @@ static PyObject *_wrap_new_IconBundleFromFile(PyObject *self, PyObject *args, Py
     wxString *arg1 = 0 ;
     long arg2 ;
     wxIconBundle *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "file",(char *) "type", NULL 
@@ -3457,7 +3449,7 @@ static PyObject *_wrap_new_IconBundleFromFile(PyObject *self, PyObject *args, Py
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3568,7 +3560,7 @@ static PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *self, PyObject *args
     wxIconBundle *arg1 = (wxIconBundle *) 0 ;
     wxString *arg2 = 0 ;
     long arg3 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3580,7 +3572,7 @@ static PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3817,10 +3809,10 @@ static PyObject * Cursor_swigregister(PyObject *self, PyObject *args) {
 }
 static PyObject *_wrap_new_Region(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    wxCoord arg1 = (wxCoord) 0 ;
-    wxCoord arg2 = (wxCoord) 0 ;
-    wxCoord arg3 = (wxCoord) 0 ;
-    wxCoord arg4 = (wxCoord) 0 ;
+    int arg1 = (int) 0 ;
+    int arg2 = (int) 0 ;
+    int arg3 = (int) 0 ;
+    int arg4 = (int) 0 ;
     wxRegion *result;
     char *kwnames[] = {
         (char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
@@ -3967,8 +3959,8 @@ static PyObject *_wrap_Region_Clear(PyObject *self, PyObject *args, PyObject *kw
 static PyObject *_wrap_Region_Offset(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     bool result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -3994,8 +3986,8 @@ static PyObject *_wrap_Region_Offset(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_Region_Contains(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -4085,10 +4077,10 @@ static PyObject *_wrap_Region_ContainsRect(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_Region_ContainsRectDim(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
     int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -4143,10 +4135,10 @@ static PyObject *_wrap_Region_GetBox(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
     bool result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -4260,10 +4252,10 @@ static PyObject *_wrap_Region_IsEmpty(PyObject *self, PyObject *args, PyObject *
 static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
     bool result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -4352,10 +4344,10 @@ static PyObject *_wrap_Region_UnionRegion(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
     bool result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -4444,10 +4436,10 @@ static PyObject *_wrap_Region_SubtractRegion(PyObject *self, PyObject *args, PyO
 static PyObject *_wrap_Region_Xor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
     bool result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -4666,7 +4658,7 @@ static PyObject *_wrap_delete_RegionIterator(PyObject *self, PyObject *args, PyO
 static PyObject *_wrap_RegionIterator_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -4676,7 +4668,7 @@ static PyObject *_wrap_RegionIterator_GetX(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)(arg1)->GetX();
+        result = (int)(arg1)->GetX();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -4691,7 +4683,7 @@ static PyObject *_wrap_RegionIterator_GetX(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_RegionIterator_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -4701,7 +4693,7 @@ static PyObject *_wrap_RegionIterator_GetY(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)(arg1)->GetY();
+        result = (int)(arg1)->GetY();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -4716,7 +4708,7 @@ static PyObject *_wrap_RegionIterator_GetY(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_RegionIterator_GetW(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -4726,7 +4718,7 @@ static PyObject *_wrap_RegionIterator_GetW(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)(arg1)->GetW();
+        result = (int)(arg1)->GetW();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -4741,7 +4733,7 @@ static PyObject *_wrap_RegionIterator_GetW(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_RegionIterator_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -4751,7 +4743,7 @@ static PyObject *_wrap_RegionIterator_GetWidth(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)(arg1)->GetWidth();
+        result = (int)(arg1)->GetWidth();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -4766,7 +4758,7 @@ static PyObject *_wrap_RegionIterator_GetWidth(PyObject *self, PyObject *args, P
 static PyObject *_wrap_RegionIterator_GetH(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -4776,7 +4768,7 @@ static PyObject *_wrap_RegionIterator_GetH(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)(arg1)->GetH();
+        result = (int)(arg1)->GetH();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -4791,7 +4783,7 @@ static PyObject *_wrap_RegionIterator_GetH(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_RegionIterator_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -4801,7 +4793,7 @@ static PyObject *_wrap_RegionIterator_GetHeight(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxRegionIterator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)(arg1)->GetHeight();
+        result = (int)(arg1)->GetHeight();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -5335,7 +5327,6 @@ static PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *self, PyObject *args
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString arg2 ;
-    wxString *argp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5344,8 +5335,12 @@ static PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *self, PyObject *args
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeFontInfo_SetFaceName",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeFontInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
+    {
+        wxString* sptr = wxString_in_helper(obj1);
+        if (sptr == NULL) SWIG_fail;
+        arg2 = *sptr;
+        delete sptr;
+    }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetFaceName(arg2);
@@ -5415,7 +5410,7 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *self, PyObject *args,
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5427,7 +5422,7 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5518,7 +5513,7 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *self, PyObject *a
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5530,7 +5525,7 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *self, PyObject *a
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5596,7 +5591,6 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
     wxString arg2 ;
-    wxString *argp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5605,8 +5599,12 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NativeEncodingInfo_facename_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxNativeEncodingInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
+    {
+        wxString* sptr = wxString_in_helper(obj1);
+        if (sptr == NULL) SWIG_fail;
+        arg2 = *sptr;
+        delete sptr;
+    }
     if (arg1) (arg1)->facename = arg2;
     
     Py_INCREF(Py_None); resultobj = Py_None;
@@ -5733,7 +5731,7 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *self, PyObject *a
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5745,7 +5743,7 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *self, PyObject *a
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5955,9 +5953,9 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxString *arg2 = 0 ;
-    bool arg3 = (bool) true ;
+    bool arg3 = (bool) True ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -5970,7 +5968,7 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         arg3 = PyInt_AsLong(obj2) ? true : false;
@@ -6135,7 +6133,7 @@ static PyObject *_wrap_FontMapper_SetConfigPath(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6147,7 +6145,7 @@ static PyObject *_wrap_FontMapper_SetConfigPath(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6205,9 +6203,9 @@ static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *self, PyObject *ar
     int arg2 ;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
-    bool arg4 = (bool) TRUE ;
+    bool arg4 = (bool) True ;
     PyObject *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -6221,7 +6219,7 @@ static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *self, PyObject *ar
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
@@ -6257,7 +6255,7 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject *
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     bool result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -6270,7 +6268,7 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject *
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -6326,7 +6324,7 @@ static PyObject *_wrap_FontMapper_SetDialogTitle(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6338,7 +6336,7 @@ static PyObject *_wrap_FontMapper_SetDialogTitle(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6375,12 +6373,12 @@ static PyObject *_wrap_new_Font(PyObject *self, PyObject *args, PyObject *kwargs
     int arg2 ;
     int arg3 ;
     int arg4 ;
-    bool arg5 = (bool) FALSE ;
+    bool arg5 = (bool) False ;
     wxString const &arg6_defvalue = wxPyEmptyString ;
     wxString *arg6 = (wxString *) &arg6_defvalue ;
     int arg7 = (int) wxFONTENCODING_DEFAULT ;
     wxFont *result;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj4 = 0 ;
     PyObject * obj5 = 0 ;
     char *kwnames[] = {
@@ -6396,7 +6394,7 @@ static PyObject *_wrap_new_Font(PyObject *self, PyObject *args, PyObject *kwargs
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -6477,7 +6475,7 @@ static PyObject *_wrap_new_FontFromNativeInfoString(PyObject *self, PyObject *ar
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxFont *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "info", NULL 
@@ -6487,7 +6485,7 @@ static PyObject *_wrap_new_FontFromNativeInfoString(PyObject *self, PyObject *ar
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6520,7 +6518,7 @@ static PyObject *_wrap_new_Font2(PyObject *self, PyObject *args, PyObject *kwarg
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     int arg5 = (int) wxFONTENCODING_DEFAULT ;
     wxFont *result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
         (char *) "pointSize",(char *) "family",(char *) "flags",(char *) "face",(char *) "encoding", NULL 
@@ -6531,7 +6529,7 @@ static PyObject *_wrap_new_Font2(PyObject *self, PyObject *args, PyObject *kwarg
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     {
@@ -7040,7 +7038,7 @@ static PyObject *_wrap_Font_SetFaceName(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7052,7 +7050,7 @@ static PyObject *_wrap_Font_SetFaceName(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7163,7 +7161,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *self, PyObject
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7175,7 +7173,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *self, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7203,7 +7201,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *self, PyObject *
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7215,7 +7213,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *self, PyObject *
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7335,7 +7333,7 @@ static PyObject *_wrap_Font_GetWeightString(PyObject *self, PyObject *args, PyOb
 static PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7522,7 +7520,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *self, PyObjec
     PyObject *resultobj;
     wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
     int arg2 = (int) wxFONTENCODING_SYSTEM ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
@@ -7556,7 +7554,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObjec
     wxString const &arg2_defvalue = wxPyEmptyString ;
     wxString *arg2 = (wxString *) &arg2_defvalue ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7569,7 +7567,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObjec
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     {
@@ -7695,7 +7693,6 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
     wxString arg2 ;
-    wxString *argp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7704,8 +7701,12 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_CanonicalName_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
+    {
+        wxString* sptr = wxString_in_helper(obj1);
+        if (sptr == NULL) SWIG_fail;
+        arg2 = *sptr;
+        delete sptr;
+    }
     if (arg1) (arg1)->CanonicalName = arg2;
     
     Py_INCREF(Py_None); resultobj = Py_None;
@@ -7745,7 +7746,6 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *ar
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
     wxString arg2 ;
-    wxString *argp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7754,8 +7754,12 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *ar
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LanguageInfo_Description_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxLanguageInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
+    {
+        wxString* sptr = wxString_in_helper(obj1);
+        if (sptr == NULL) SWIG_fail;
+        arg2 = *sptr;
+        delete sptr;
+    }
     if (arg1) (arg1)->Description = arg2;
     
     Py_INCREF(Py_None); resultobj = Py_None;
@@ -7854,12 +7858,12 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
-    bool arg5 = (bool) TRUE ;
-    bool arg6 = (bool) FALSE ;
+    bool arg5 = (bool) True ;
+    bool arg6 = (bool) False ;
     bool result;
-    bool temp2 = false ;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -7875,20 +7879,20 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     if (obj4) {
@@ -8182,7 +8186,7 @@ static PyObject *_wrap_Locale_GetCanonicalName(PyObject *self, PyObject *args, P
 static PyObject *_wrap_Locale_AddCatalogLookupPathPrefix(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "prefix", NULL 
@@ -8192,7 +8196,7 @@ static PyObject *_wrap_Locale_AddCatalogLookupPathPrefix(PyObject *self, PyObjec
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8221,7 +8225,7 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *self, PyObject *args, PyObjec
     wxLocale *arg1 = (wxLocale *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8233,7 +8237,7 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *self, PyObject *args, PyObjec
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8262,7 +8266,7 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *self, PyObject *args, PyObject
     wxLocale *arg1 = (wxLocale *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8274,7 +8278,7 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8354,7 +8358,7 @@ static PyObject *_wrap_Locale_FindLanguageInfo(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxLanguageInfo *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "locale", NULL 
@@ -8364,7 +8368,7 @@ static PyObject *_wrap_Locale_FindLanguageInfo(PyObject *self, PyObject *args, P
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8422,8 +8426,8 @@ static PyObject *_wrap_Locale_GetString(PyObject *self, PyObject *args, PyObject
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxString result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -8436,13 +8440,13 @@ static PyObject *_wrap_Locale_GetString(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -8542,14 +8546,14 @@ static PyObject *_wrap_GetTranslation__SWIG_0(PyObject *self, PyObject *args) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     
     if(!PyArg_ParseTuple(args,(char *)"O:GetTranslation",&obj0)) goto fail;
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8585,8 +8589,8 @@ static PyObject *_wrap_GetTranslation__SWIG_1(PyObject *self, PyObject *args) {
     wxString *arg2 = 0 ;
     size_t arg3 ;
     wxString result;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -8595,12 +8599,12 @@ static PyObject *_wrap_GetTranslation__SWIG_1(PyObject *self, PyObject *args) {
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     arg3 = (size_t) PyInt_AsLong(obj2);
     if (PyErr_Occurred()) SWIG_fail;
@@ -8780,7 +8784,7 @@ static PyObject *_wrap_EncodingConverter_Convert(PyObject *self, PyObject *args,
     wxEncodingConverter *arg1 = (wxEncodingConverter *) 0 ;
     wxString *arg2 = 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8792,7 +8796,7 @@ static PyObject *_wrap_EncodingConverter_Convert(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8989,8 +8993,8 @@ static PyObject *_wrap_DC_EndDrawing(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     wxColour *arg4 = 0 ;
     int arg5 = (int) wxFLOOD_SURFACE ;
     bool result;
@@ -9064,8 +9068,8 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw
 static PyObject *_wrap_DC_GetPixelXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     wxColour result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -9131,10 +9135,10 @@ static PyObject *_wrap_DC_GetPixel(PyObject *self, PyObject *args, PyObject *kwa
 static PyObject *_wrap_DC_DrawLineXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL 
@@ -9197,8 +9201,8 @@ static PyObject *_wrap_DC_DrawLine(PyObject *self, PyObject *args, PyObject *kwa
 static PyObject *_wrap_DC_CrossHairXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
@@ -9254,12 +9258,12 @@ static PyObject *_wrap_DC_CrossHair(PyObject *self, PyObject *args, PyObject *kw
 static PyObject *_wrap_DC_DrawArcXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
-    wxCoord arg6 ;
-    wxCoord arg7 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
+    int arg6 ;
+    int arg7 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2",(char *) "xc",(char *) "yc", NULL 
@@ -9329,10 +9333,10 @@ static PyObject *_wrap_DC_DrawArc(PyObject *self, PyObject *args, PyObject *kwar
 static PyObject *_wrap_DC_DrawCheckMarkXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
@@ -9388,10 +9392,10 @@ static PyObject *_wrap_DC_DrawCheckMark(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_DC_DrawEllipticArcXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
     double arg6 ;
     double arg7 ;
     PyObject * obj0 = 0 ;
@@ -9458,8 +9462,8 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_DC_DrawPointXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
@@ -9515,10 +9519,10 @@ static PyObject *_wrap_DC_DrawPoint(PyObject *self, PyObject *args, PyObject *kw
 static PyObject *_wrap_DC_DrawRectangleXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
@@ -9612,10 +9616,10 @@ static PyObject *_wrap_DC_DrawRectangleRect(PyObject *self, PyObject *args, PyOb
 static PyObject *_wrap_DC_DrawRoundedRectangleXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
     double arg6 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -9712,9 +9716,9 @@ static PyObject *_wrap_DC_DrawRoundedRectangleRect(PyObject *self, PyObject *arg
 static PyObject *_wrap_DC_DrawCircleXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "radius", NULL 
@@ -9740,7 +9744,7 @@ static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
-    wxCoord arg3 ;
+    int arg3 ;
     wxPoint temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -9771,10 +9775,10 @@ static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_DC_DrawEllipseXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
@@ -9869,8 +9873,8 @@ static PyObject *_wrap_DC_DrawIconXY(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxIcon *arg2 = 0 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
+    int arg3 ;
+    int arg4 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9938,9 +9942,9 @@ static PyObject *_wrap_DC_DrawBitmapXY(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxBitmap *arg2 = 0 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    bool arg5 = (bool) FALSE ;
+    int arg3 ;
+    int arg4 ;
+    bool arg5 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj4 = 0 ;
@@ -9977,7 +9981,7 @@ static PyObject *_wrap_DC_DrawBitmap(PyObject *self, PyObject *args, PyObject *k
     wxDC *arg1 = (wxDC *) 0 ;
     wxBitmap *arg2 = 0 ;
     wxPoint *arg3 = 0 ;
-    bool arg4 = (bool) FALSE ;
+    bool arg4 = (bool) False ;
     wxPoint temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -10019,9 +10023,9 @@ static PyObject *_wrap_DC_DrawTextXY(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    bool temp2 = false ;
+    int arg3 ;
+    int arg4 ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10033,7 +10037,7 @@ static PyObject *_wrap_DC_DrawTextXY(PyObject *self, PyObject *args, PyObject *k
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10062,7 +10066,7 @@ static PyObject *_wrap_DC_DrawText(PyObject *self, PyObject *args, PyObject *kwa
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
     wxPoint *arg3 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     wxPoint temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -10076,7 +10080,7 @@ static PyObject *_wrap_DC_DrawText(PyObject *self, PyObject *args, PyObject *kwa
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = &temp3;
@@ -10108,10 +10112,10 @@ static PyObject *_wrap_DC_DrawRotatedTextXY(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
+    int arg3 ;
+    int arg4 ;
     double arg5 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10123,7 +10127,7 @@ static PyObject *_wrap_DC_DrawRotatedTextXY(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10153,7 +10157,7 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje
     wxString *arg2 = 0 ;
     wxPoint *arg3 = 0 ;
     double arg4 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     wxPoint temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -10167,7 +10171,7 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = &temp3;
@@ -10198,17 +10202,17 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
     wxDC *arg6 = (wxDC *) 0 ;
-    wxCoord arg7 ;
-    wxCoord arg8 ;
+    int arg7 ;
+    int arg8 ;
     int arg9 = (int) wxCOPY ;
-    bool arg10 = (bool) FALSE ;
-    wxCoord arg11 = (wxCoord) -1 ;
-    wxCoord arg12 = (wxCoord) -1 ;
+    bool arg10 = (bool) False ;
+    int arg11 = (int) -1 ;
+    int arg12 = (int) -1 ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj5 = 0 ;
@@ -10246,7 +10250,7 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs)
     wxDC *arg4 = (wxDC *) 0 ;
     wxPoint *arg5 = 0 ;
     int arg6 = (int) wxCOPY ;
-    bool arg7 = (bool) FALSE ;
+    bool arg7 = (bool) False ;
     wxPoint const &arg8_defvalue = wxDefaultPosition ;
     wxPoint *arg8 = (wxPoint *) &arg8_defvalue ;
     bool result;
@@ -10309,8 +10313,8 @@ static PyObject *_wrap_DC_DrawLines(PyObject *self, PyObject *args, PyObject *kw
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
     wxPoint *arg3 = (wxPoint *) 0 ;
-    wxCoord arg4 = (wxCoord) 0 ;
-    wxCoord arg5 = (wxCoord) 0 ;
+    int arg4 = (int) 0 ;
+    int arg5 = (int) 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10348,8 +10352,8 @@ static PyObject *_wrap_DC_DrawPolygon(PyObject *self, PyObject *args, PyObject *
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
     wxPoint *arg3 = (wxPoint *) 0 ;
-    wxCoord arg4 = (wxCoord) 0 ;
-    wxCoord arg5 = (wxCoord) 0 ;
+    int arg4 = (int) 0 ;
+    int arg5 = (int) 0 ;
     int arg6 = (int) wxODDEVEN_RULE ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -10390,7 +10394,7 @@ static PyObject *_wrap_DC_DrawLabel(PyObject *self, PyObject *args, PyObject *kw
     wxRect *arg3 = 0 ;
     int arg4 = (int) wxALIGN_LEFT|wxALIGN_TOP ;
     int arg5 = (int) -1 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     wxRect temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -10404,7 +10408,7 @@ static PyObject *_wrap_DC_DrawLabel(PyObject *self, PyObject *args, PyObject *kw
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = &temp3;
@@ -10441,7 +10445,7 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *self, PyObject *args, PyObjec
     int arg5 = (int) wxALIGN_LEFT|wxALIGN_TOP ;
     int arg6 = (int) -1 ;
     wxRect result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     wxRect temp4 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -10456,7 +10460,7 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *self, PyObject *args, PyObjec
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (arg3 == NULL) {
@@ -10558,7 +10562,7 @@ static PyObject *_wrap_DC_StartDoc(PyObject *self, PyObject *args, PyObject *kwa
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10570,7 +10574,7 @@ static PyObject *_wrap_DC_StartDoc(PyObject *self, PyObject *args, PyObject *kwa
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10844,10 +10848,10 @@ static PyObject *_wrap_DC_SetPalette(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
-    wxCoord arg5 ;
+    int arg2 ;
+    int arg3 ;
+    int arg4 ;
+    int arg5 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL 
@@ -10957,14 +10961,14 @@ static PyObject *_wrap_DC_DestroyClippingRegion(PyObject *self, PyObject *args,
 static PyObject *_wrap_DC_GetClippingBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord *arg2 = (wxCoord *) 0 ;
-    wxCoord *arg3 = (wxCoord *) 0 ;
-    wxCoord *arg4 = (wxCoord *) 0 ;
-    wxCoord *arg5 = (wxCoord *) 0 ;
-    wxCoord temp2 ;
-    wxCoord temp3 ;
-    wxCoord temp4 ;
-    wxCoord temp5 ;
+    int *arg2 = (int *) 0 ;
+    int *arg3 = (int *) 0 ;
+    int *arg4 = (int *) 0 ;
+    int *arg5 = (int *) 0 ;
+    int temp2 ;
+    int temp3 ;
+    int temp4 ;
+    int temp5 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -11038,7 +11042,7 @@ static PyObject *_wrap_DC_GetClippingRect(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_DC_GetCharHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -11048,7 +11052,7 @@ static PyObject *_wrap_DC_GetCharHeight(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxDC const *)arg1)->GetCharHeight();
+        result = (int)((wxDC const *)arg1)->GetCharHeight();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -11063,7 +11067,7 @@ static PyObject *_wrap_DC_GetCharHeight(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_DC_GetCharWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -11073,7 +11077,7 @@ static PyObject *_wrap_DC_GetCharWidth(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxDC const *)arg1)->GetCharWidth();
+        result = (int)((wxDC const *)arg1)->GetCharWidth();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -11089,11 +11093,11 @@ static PyObject *_wrap_DC_GetTextExtent(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
-    wxCoord *arg3 = (wxCoord *) 0 ;
-    wxCoord *arg4 = (wxCoord *) 0 ;
-    bool temp2 = false ;
-    wxCoord temp3 ;
-    wxCoord temp4 ;
+    int *arg3 = (int *) 0 ;
+    int *arg4 = (int *) 0 ;
+    bool temp2 = False ;
+    int temp3 ;
+    int temp4 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -11107,7 +11111,7 @@ static PyObject *_wrap_DC_GetTextExtent(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11143,16 +11147,16 @@ static PyObject *_wrap_DC_GetFullTextExtent(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
-    wxCoord *arg3 = (wxCoord *) 0 ;
-    wxCoord *arg4 = (wxCoord *) 0 ;
-    wxCoord *arg5 = (wxCoord *) 0 ;
-    wxCoord *arg6 = (wxCoord *) 0 ;
+    int *arg3 = (int *) 0 ;
+    int *arg4 = (int *) 0 ;
+    int *arg5 = (int *) 0 ;
+    int *arg6 = (int *) 0 ;
     wxFont *arg7 = (wxFont *) NULL ;
-    bool temp2 = false ;
-    wxCoord temp3 ;
-    wxCoord temp4 ;
-    wxCoord temp5 ;
-    wxCoord temp6 ;
+    bool temp2 = False ;
+    int temp3 ;
+    int temp4 ;
+    int temp5 ;
+    int temp6 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11169,7 +11173,7 @@ static PyObject *_wrap_DC_GetFullTextExtent(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         if ((SWIG_ConvertPtr(obj2,(void **) &arg7, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -11216,14 +11220,14 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
-    wxCoord *arg3 = (wxCoord *) 0 ;
-    wxCoord *arg4 = (wxCoord *) 0 ;
-    wxCoord *arg5 = (wxCoord *) 0 ;
+    int *arg3 = (int *) 0 ;
+    int *arg4 = (int *) 0 ;
+    int *arg5 = (int *) 0 ;
     wxFont *arg6 = (wxFont *) NULL ;
-    bool temp2 = false ;
-    wxCoord temp3 ;
-    wxCoord temp4 ;
-    wxCoord temp5 ;
+    bool temp2 = False ;
+    int temp3 ;
+    int temp4 ;
+    int temp5 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11239,7 +11243,7 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         if ((SWIG_ConvertPtr(obj2,(void **) &arg6, SWIGTYPE_p_wxFont,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -11415,8 +11419,8 @@ static PyObject *_wrap_DC_GetSizeMM(PyObject *self, PyObject *args, PyObject *kw
 static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x", NULL 
@@ -11426,7 +11430,7 @@ static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxDC const *)arg1)->DeviceToLogicalX(arg2);
+        result = (int)((wxDC const *)arg1)->DeviceToLogicalX(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -11441,8 +11445,8 @@ static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "y", NULL 
@@ -11452,7 +11456,7 @@ static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxDC const *)arg1)->DeviceToLogicalY(arg2);
+        result = (int)((wxDC const *)arg1)->DeviceToLogicalY(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -11467,8 +11471,8 @@ static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x", NULL 
@@ -11478,7 +11482,7 @@ static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxDC const *)arg1)->DeviceToLogicalXRel(arg2);
+        result = (int)((wxDC const *)arg1)->DeviceToLogicalXRel(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -11493,8 +11497,8 @@ static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, Py
 static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "y", NULL 
@@ -11504,7 +11508,7 @@ static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxDC const *)arg1)->DeviceToLogicalYRel(arg2);
+        result = (int)((wxDC const *)arg1)->DeviceToLogicalYRel(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -11519,8 +11523,8 @@ static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, Py
 static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x", NULL 
@@ -11530,7 +11534,7 @@ static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxDC const *)arg1)->LogicalToDeviceX(arg2);
+        result = (int)((wxDC const *)arg1)->LogicalToDeviceX(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -11545,8 +11549,8 @@ static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "y", NULL 
@@ -11556,7 +11560,7 @@ static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxDC const *)arg1)->LogicalToDeviceY(arg2);
+        result = (int)((wxDC const *)arg1)->LogicalToDeviceY(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -11571,8 +11575,8 @@ static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x", NULL 
@@ -11582,7 +11586,7 @@ static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxDC const *)arg1)->LogicalToDeviceXRel(arg2);
+        result = (int)((wxDC const *)arg1)->LogicalToDeviceXRel(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -11597,8 +11601,8 @@ static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, Py
 static PyObject *_wrap_DC_LogicalToDeviceYRel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord result;
+    int arg2 ;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "y", NULL 
@@ -11608,7 +11612,7 @@ static PyObject *_wrap_DC_LogicalToDeviceYRel(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxDC const *)arg1)->LogicalToDeviceYRel(arg2);
+        result = (int)((wxDC const *)arg1)->LogicalToDeviceYRel(arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -12185,10 +12189,10 @@ static PyObject *_wrap_DC_SetLogicalScale(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_DC_GetLogicalOriginTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord *arg2 = (wxCoord *) 0 ;
-    wxCoord *arg3 = (wxCoord *) 0 ;
-    wxCoord temp2 ;
-    wxCoord temp3 ;
+    int *arg2 = (int *) 0 ;
+    int *arg3 = (int *) 0 ;
+    int temp2 ;
+    int temp3 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -12252,8 +12256,8 @@ static PyObject *_wrap_DC_GetLogicalOrigin(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_DC_SetLogicalOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
@@ -12278,10 +12282,10 @@ static PyObject *_wrap_DC_SetLogicalOrigin(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_DC_GetDeviceOriginTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord *arg2 = (wxCoord *) 0 ;
-    wxCoord *arg3 = (wxCoord *) 0 ;
-    wxCoord temp2 ;
-    wxCoord temp3 ;
+    int *arg2 = (int *) 0 ;
+    int *arg3 = (int *) 0 ;
+    int temp2 ;
+    int temp3 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -12345,8 +12349,8 @@ static PyObject *_wrap_DC_GetDeviceOrigin(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_DC_SetDeviceOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
@@ -12506,8 +12510,8 @@ static PyObject *_wrap_DC_GetOptimization(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_DC_CalcBoundingBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
@@ -12556,7 +12560,7 @@ static PyObject *_wrap_DC_ResetBoundingBox(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_DC_MinX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -12566,7 +12570,7 @@ static PyObject *_wrap_DC_MinX(PyObject *self, PyObject *args, PyObject *kwargs)
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxDC const *)arg1)->MinX();
+        result = (int)((wxDC const *)arg1)->MinX();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -12581,7 +12585,7 @@ static PyObject *_wrap_DC_MinX(PyObject *self, PyObject *args, PyObject *kwargs)
 static PyObject *_wrap_DC_MaxX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -12591,7 +12595,7 @@ static PyObject *_wrap_DC_MaxX(PyObject *self, PyObject *args, PyObject *kwargs)
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxDC const *)arg1)->MaxX();
+        result = (int)((wxDC const *)arg1)->MaxX();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -12606,7 +12610,7 @@ static PyObject *_wrap_DC_MaxX(PyObject *self, PyObject *args, PyObject *kwargs)
 static PyObject *_wrap_DC_MinY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -12616,7 +12620,7 @@ static PyObject *_wrap_DC_MinY(PyObject *self, PyObject *args, PyObject *kwargs)
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxDC const *)arg1)->MinY();
+        result = (int)((wxDC const *)arg1)->MinY();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -12631,7 +12635,7 @@ static PyObject *_wrap_DC_MinY(PyObject *self, PyObject *args, PyObject *kwargs)
 static PyObject *_wrap_DC_MaxY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
-    wxCoord result;
+    int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
@@ -12641,7 +12645,7 @@ static PyObject *_wrap_DC_MaxY(PyObject *self, PyObject *args, PyObject *kwargs)
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxCoord)((wxDC const *)arg1)->MaxY();
+        result = (int)((wxDC const *)arg1)->MaxY();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
@@ -13527,7 +13531,7 @@ static PyObject *_wrap_new_MetaFile(PyObject *self, PyObject *args, PyObject *kw
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
     wxMetaFile *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "filename", NULL 
@@ -13538,7 +13542,7 @@ static PyObject *_wrap_new_MetaFile(PyObject *self, PyObject *args, PyObject *kw
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     {
@@ -13579,8 +13583,8 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *self, PyObject *args, PyObject *
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     wxMetaFileDC *result;
-    bool temp1 = false ;
-    bool temp4 = false ;
+    bool temp1 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -13592,14 +13596,14 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *self, PyObject *args, PyObject *
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     {
@@ -13678,7 +13682,7 @@ static PyObject *_wrap_new_ImageList(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     int arg1 ;
     int arg2 ;
-    int arg3 = (int) TRUE ;
+    int arg3 = (int) True ;
     int arg4 = (int) 1 ;
     wxImageList *result;
     char *kwnames[] = {
@@ -13875,7 +13879,7 @@ static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject *
     int arg4 ;
     int arg5 ;
     int arg6 = (int) wxIMAGELIST_DRAW_NORMAL ;
-    bool arg7 = (bool) (bool)FALSE ;
+    bool arg7 = (bool) (bool)False ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
@@ -14320,7 +14324,7 @@ static PyObject *_wrap_ColourDatabase_Find(PyObject *self, PyObject *args, PyObj
     wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
     wxString *arg2 = 0 ;
     wxColour result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -14332,7 +14336,7 @@ static PyObject *_wrap_ColourDatabase_Find(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14403,7 +14407,7 @@ static PyObject *_wrap_ColourDatabase_AddColour(PyObject *self, PyObject *args,
     wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
     wxString *arg2 = 0 ;
     wxColour *arg3 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     wxColour temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -14417,7 +14421,7 @@ static PyObject *_wrap_ColourDatabase_AddColour(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = &temp3;
@@ -14452,7 +14456,7 @@ static PyObject *_wrap_ColourDatabase_Append(PyObject *self, PyObject *args, PyO
     int arg3 ;
     int arg4 ;
     int arg5 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -14464,7 +14468,7 @@ static PyObject *_wrap_ColourDatabase_Append(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14529,12 +14533,12 @@ static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args,
     int arg3 ;
     int arg4 ;
     int arg5 ;
-    bool arg6 = (bool) FALSE ;
+    bool arg6 = (bool) False ;
     wxString const &arg7_defvalue = wxPyEmptyString ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     int arg8 = (int) wxFONTENCODING_DEFAULT ;
     wxFont *result;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj5 = 0 ;
     PyObject * obj6 = 0 ;
@@ -14552,7 +14556,7 @@ static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args,
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -15280,727 +15284,122 @@ static PyObject *_wrap_TheColourDatabase_get() {
 }
 
 
-static PyObject *_wrap_new_DragImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Effects(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    wxBitmap *arg1 = 0 ;
-    wxCursor const &arg2_defvalue = wxNullCursor ;
-    wxCursor *arg2 = (wxCursor *) &arg2_defvalue ;
-    wxGenericDragImage *result;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
+    wxEffects *result;
     char *kwnames[] = {
-        (char *) "image",(char *) "cursor", NULL 
+        NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_DragImage",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg1 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
-    if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-        if (arg2 == NULL) {
-            PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-        }
-    }
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_Effects",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxGenericDragImage *)new wxGenericDragImage((wxBitmap const &)*arg1,(wxCursor const &)*arg2);
+        result = (wxEffects *)new wxEffects();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
+    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxEffects, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_new_DragIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_GetHighlightColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    wxIcon *arg1 = 0 ;
-    wxCursor const &arg2_defvalue = wxNullCursor ;
-    wxCursor *arg2 = (wxCursor *) &arg2_defvalue ;
-    wxGenericDragImage *result;
+    wxEffects *arg1 = (wxEffects *) 0 ;
+    wxColour result;
     PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "image",(char *) "cursor", NULL 
+        (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_DragIcon",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg1 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
-    if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-        if (arg2 == NULL) {
-            PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-        }
-    }
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetHighlightColour",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxGenericDragImage *)new wxGenericDragImage((wxIcon const &)*arg1,(wxCursor const &)*arg2);
+        result = ((wxEffects const *)arg1)->GetHighlightColour();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
+    {
+        wxColour * resultptr;
+        resultptr = new wxColour((wxColour &) result);
+        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_new_DragString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_GetLightShadow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    wxString *arg1 = 0 ;
-    wxCursor const &arg2_defvalue = wxNullCursor ;
-    wxCursor *arg2 = (wxCursor *) &arg2_defvalue ;
-    wxGenericDragImage *result;
-    bool temp1 = false ;
+    wxEffects *arg1 = (wxEffects *) 0 ;
+    wxColour result;
     PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "str",(char *) "cursor", NULL 
+        (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_DragString",kwnames,&obj0,&obj1)) goto fail;
-    {
-        arg1 = wxString_in_helper(obj0);
-        if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
-    }
-    if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-        if (arg2 == NULL) {
-            PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-        }
-    }
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetLightShadow",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxGenericDragImage *)new wxGenericDragImage((wxString const &)*arg1,(wxCursor const &)*arg2);
+        result = ((wxEffects const *)arg1)->GetLightShadow();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
     {
-        if (temp1)
-        delete arg1;
+        wxColour * resultptr;
+        resultptr = new wxColour((wxColour &) result);
+        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
     }
     return resultobj;
     fail:
-    {
-        if (temp1)
-        delete arg1;
-    }
     return NULL;
 }
 
 
-static PyObject *_wrap_new_DragTreeItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_GetFaceColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    wxTreeCtrl *arg1 = 0 ;
-    wxTreeItemId *arg2 = 0 ;
-    wxGenericDragImage *result;
+    wxEffects *arg1 = (wxEffects *) 0 ;
+    wxColour result;
     PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
     char *kwnames[] = {
-        (char *) "treeCtrl",(char *) "id", NULL 
+        (char *) "self", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_DragTreeItem",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg1 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetFaceColour",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxGenericDragImage *)new wxGenericDragImage((wxTreeCtrl const &)*arg1,*arg2);
+        result = ((wxEffects const *)arg1)->GetFaceColour();
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
+    {
+        wxColour * resultptr;
+        resultptr = new wxColour((wxColour &) result);
+        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
+    }
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_new_DragListItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_GetMediumShadow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    wxListCtrl *arg1 = 0 ;
-    long arg2 ;
-    wxGenericDragImage *result;
+    wxEffects *arg1 = (wxEffects *) 0 ;
+    wxColour result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
-        (char *) "listCtrl",(char *) "id", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol:new_DragListItem",kwnames,&obj0,&arg2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxListCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg1 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxGenericDragImage *)new wxGenericDragImage((wxListCtrl const &)*arg1,arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxGenericDragImage, 1);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_delete_DragImage(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_DragImage",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        delete arg1;
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_DragImage_SetBackingBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxBitmap *arg2 = (wxBitmap *) 0 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "bitmap", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DragImage_SetBackingBitmap",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->SetBackingBitmap(arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    Py_INCREF(Py_None); resultobj = Py_None;
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_DragImage_BeginDrag(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxPoint *arg2 = 0 ;
-    wxWindow *arg3 = (wxWindow *) 0 ;
-    bool arg4 = (bool) FALSE ;
-    wxRect *arg5 = (wxRect *) NULL ;
-    bool result;
-    wxPoint temp2 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    PyObject * obj2 = 0 ;
-    PyObject * obj3 = 0 ;
-    PyObject * obj4 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "hotspot",(char *) "window",(char *) "fullScreen",(char *) "rect", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:DragImage_BeginDrag",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = &temp2;
-        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-    }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (obj3) {
-        arg4 = PyInt_AsLong(obj3) ? true : false;
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    if (obj4) {
-        if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxRect,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->BeginDrag((wxPoint const &)*arg2,arg3,arg4,arg5);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = PyInt_FromLong((long)result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_DragImage_BeginDragBounded(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxPoint *arg2 = 0 ;
-    wxWindow *arg3 = (wxWindow *) 0 ;
-    wxWindow *arg4 = (wxWindow *) 0 ;
-    bool result;
-    wxPoint temp2 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    PyObject * obj2 = 0 ;
-    PyObject * obj3 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "hotspot",(char *) "window",(char *) "boundingWindow", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DragImage_BeginDragBounded",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = &temp2;
-        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-    }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->BeginDrag((wxPoint const &)*arg2,arg3,arg4);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = PyInt_FromLong((long)result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_DragImage_EndDrag(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    bool result;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DragImage_EndDrag",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->EndDrag();
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = PyInt_FromLong((long)result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_DragImage_Move(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxPoint *arg2 = 0 ;
-    bool result;
-    wxPoint temp2 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "pt", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DragImage_Move",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = &temp2;
-        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->Move((wxPoint const &)*arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = PyInt_FromLong((long)result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_DragImage_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    bool result;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DragImage_Show",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->Show();
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = PyInt_FromLong((long)result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_DragImage_Hide(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    bool result;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DragImage_Hide",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->Hide();
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = PyInt_FromLong((long)result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_DragImage_GetImageRect(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxPoint *arg2 = 0 ;
-    wxRect result;
-    wxPoint temp2 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "pos", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DragImage_GetImageRect",kwnames,&obj0,&obj1)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = &temp2;
-        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxGenericDragImage const *)arg1)->GetImageRect((wxPoint const &)*arg2);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    {
-        wxRect * resultptr;
-        resultptr = new wxRect((wxRect &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxRect, 1);
-    }
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_DragImage_DoDrawImage(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxDC *arg2 = 0 ;
-    wxPoint *arg3 = 0 ;
-    bool result;
-    wxPoint temp3 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    PyObject * obj2 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "dc",(char *) "pos", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DragImage_DoDrawImage",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
-    {
-        arg3 = &temp3;
-        if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxGenericDragImage const *)arg1)->DoDrawImage(*arg2,(wxPoint const &)*arg3);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = PyInt_FromLong((long)result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_DragImage_UpdateBackingFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxDC *arg2 = 0 ;
-    wxMemoryDC *arg3 = 0 ;
-    wxRect *arg4 = 0 ;
-    wxRect *arg5 = 0 ;
-    bool result;
-    wxRect temp4 ;
-    wxRect temp5 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    PyObject * obj2 = 0 ;
-    PyObject * obj3 = 0 ;
-    PyObject * obj4 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "windowDC",(char *) "destDC",(char *) "sourceRect",(char *) "destRect", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DragImage_UpdateBackingFromWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg2 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
-    if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxMemoryDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if (arg3 == NULL) {
-        PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; 
-    }
-    {
-        arg4 = &temp4;
-        if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
-    }
-    {
-        arg5 = &temp5;
-        if ( ! wxRect_helper(obj4, &arg5)) SWIG_fail;
-    }
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)((wxGenericDragImage const *)arg1)->UpdateBackingFromWindow(*arg2,*arg3,(wxRect const &)*arg4,(wxRect const &)*arg5);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = PyInt_FromLong((long)result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
-    wxPoint *arg2 = 0 ;
-    wxPoint *arg3 = 0 ;
-    bool arg4 ;
-    bool arg5 ;
-    bool result;
-    wxPoint temp2 ;
-    wxPoint temp3 ;
-    PyObject * obj0 = 0 ;
-    PyObject * obj1 = 0 ;
-    PyObject * obj2 = 0 ;
-    PyObject * obj3 = 0 ;
-    PyObject * obj4 = 0 ;
-    char *kwnames[] = {
-        (char *) "self",(char *) "oldPos",(char *) "newPos",(char *) "eraseOld",(char *) "drawNew", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DragImage_RedrawImage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGenericDragImage,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        arg2 = &temp2;
-        if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-    }
-    {
-        arg3 = &temp3;
-        if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
-    }
-    arg4 = PyInt_AsLong(obj3) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
-    arg5 = PyInt_AsLong(obj4) ? true : false;
-    if (PyErr_Occurred()) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (bool)(arg1)->RedrawImage((wxPoint const &)*arg2,(wxPoint const &)*arg3,arg4,arg5);
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = PyInt_FromLong((long)result);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject * DragImage_swigregister(PyObject *self, PyObject *args) {
-    PyObject *obj;
-    if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
-    SWIG_TypeClientData(SWIGTYPE_p_wxGenericDragImage, obj);
-    Py_INCREF(obj);
-    return Py_BuildValue((char *)"");
-}
-static PyObject *_wrap_new_Effects(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxEffects *result;
-    char *kwnames[] = {
-        NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_Effects",kwnames)) goto fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = (wxEffects *)new wxEffects();
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxEffects, 1);
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_Effects_GetHighlightColour(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxEffects *arg1 = (wxEffects *) 0 ;
-    wxColour result;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetHighlightColour",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxEffects const *)arg1)->GetHighlightColour();
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    {
-        wxColour * resultptr;
-        resultptr = new wxColour((wxColour &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
-    }
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_Effects_GetLightShadow(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxEffects *arg1 = (wxEffects *) 0 ;
-    wxColour result;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetLightShadow",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxEffects const *)arg1)->GetLightShadow();
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    {
-        wxColour * resultptr;
-        resultptr = new wxColour((wxColour &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
-    }
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_Effects_GetFaceColour(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxEffects *arg1 = (wxEffects *) 0 ;
-    wxColour result;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
-    };
-    
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetFaceColour",kwnames,&obj0)) goto fail;
-    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxEffects,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    {
-        PyThreadState* __tstate = wxPyBeginAllowThreads();
-        result = ((wxEffects const *)arg1)->GetFaceColour();
-        
-        wxPyEndAllowThreads(__tstate);
-        if (PyErr_Occurred()) SWIG_fail;
-    }
-    {
-        wxColour * resultptr;
-        resultptr = new wxColour((wxColour &) result);
-        resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
-    }
-    return resultobj;
-    fail:
-    return NULL;
-}
-
-
-static PyObject *_wrap_Effects_GetMediumShadow(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject *resultobj;
-    wxEffects *arg1 = (wxEffects *) 0 ;
-    wxColour result;
-    PyObject * obj0 = 0 ;
-    char *kwnames[] = {
-        (char *) "self", NULL 
+        (char *) "self", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Effects_GetMediumShadow",kwnames,&obj0)) goto fail;
@@ -16847,24 +16246,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FontList_RemoveFont", (PyCFunction) _wrap_FontList_RemoveFont, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"FontList_GetCount", (PyCFunction) _wrap_FontList_GetCount, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"FontList_swigregister", FontList_swigregister, METH_VARARGS },
-	 { (char *)"new_DragImage", (PyCFunction) _wrap_new_DragImage, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_DragIcon", (PyCFunction) _wrap_new_DragIcon, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_DragString", (PyCFunction) _wrap_new_DragString, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_DragTreeItem", (PyCFunction) _wrap_new_DragTreeItem, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"new_DragListItem", (PyCFunction) _wrap_new_DragListItem, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"delete_DragImage", (PyCFunction) _wrap_delete_DragImage, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"DragImage_SetBackingBitmap", (PyCFunction) _wrap_DragImage_SetBackingBitmap, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"DragImage_BeginDrag", (PyCFunction) _wrap_DragImage_BeginDrag, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"DragImage_BeginDragBounded", (PyCFunction) _wrap_DragImage_BeginDragBounded, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"DragImage_EndDrag", (PyCFunction) _wrap_DragImage_EndDrag, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"DragImage_Move", (PyCFunction) _wrap_DragImage_Move, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"DragImage_Show", (PyCFunction) _wrap_DragImage_Show, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"DragImage_Hide", (PyCFunction) _wrap_DragImage_Hide, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"DragImage_GetImageRect", (PyCFunction) _wrap_DragImage_GetImageRect, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"DragImage_DoDrawImage", (PyCFunction) _wrap_DragImage_DoDrawImage, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"DragImage_UpdateBackingFromWindow", (PyCFunction) _wrap_DragImage_UpdateBackingFromWindow, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"DragImage_RedrawImage", (PyCFunction) _wrap_DragImage_RedrawImage, METH_VARARGS | METH_KEYWORDS },
-	 { (char *)"DragImage_swigregister", DragImage_swigregister, METH_VARARGS },
 	 { (char *)"new_Effects", (PyCFunction) _wrap_new_Effects, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Effects_GetHighlightColour", (PyCFunction) _wrap_Effects_GetHighlightColour, METH_VARARGS | METH_KEYWORDS },
 	 { (char *)"Effects_GetLightShadow", (PyCFunction) _wrap_Effects_GetLightShadow, METH_VARARGS | METH_KEYWORDS },
@@ -16886,78 +16267,21 @@ static PyMethodDef SwigMethods[] = {
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
+static void *_p_wxControlTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *)  ((wxControl *) x));
+}
+static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x));
+}
+static void *_p_wxMenuBarTo_p_wxWindow(void *x) {
+    return (void *)((wxWindow *)  ((wxMenuBar *) x));
+}
 static void *_p_wxBufferedDCTo_p_wxMemoryDC(void *x) {
     return (void *)((wxMemoryDC *)  ((wxBufferedDC *) x));
 }
 static void *_p_wxBufferedPaintDCTo_p_wxMemoryDC(void *x) {
     return (void *)((wxMemoryDC *) (wxBufferedDC *) ((wxBufferedPaintDC *) x));
 }
-static void *_p_wxPyPenTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *) (wxPen *) ((wxPyPen *) x));
-}
-static void *_p_wxIconTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxIcon *) x));
-}
-static void *_p_wxPaletteTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxPalette *) x));
-}
-static void *_p_wxPenTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxPen *) x));
-}
-static void *_p_wxFontTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxFont *) x));
-}
-static void *_p_wxCursorTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxCursor *) x));
-}
-static void *_p_wxBitmapTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxBitmap *) x));
-}
-static void *_p_wxRegionTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxRegion *) x));
-}
-static void *_p_wxBrushTo_p_wxGDIObject(void *x) {
-    return (void *)((wxGDIObject *)  ((wxBrush *) x));
-}
-static void *_p_wxBufferedDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *) (wxMemoryDC *) ((wxBufferedDC *) x));
-}
-static void *_p_wxScreenDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxScreenDC *) x));
-}
-static void *_p_wxMirrorDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxMirrorDC *) x));
-}
-static void *_p_wxMemoryDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxMemoryDC *) x));
-}
-static void *_p_wxWindowDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxWindowDC *) x));
-}
-static void *_p_wxMetaFileDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxMetaFileDC *) x));
-}
-static void *_p_wxBufferedPaintDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *) (wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x));
-}
-static void *_p_wxClientDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxClientDC *) x));
-}
-static void *_p_wxPaintDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxPaintDC *) x));
-}
-static void *_p_wxPostScriptDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxPostScriptDC *) x));
-}
-static void *_p_wxPrinterDCTo_p_wxDC(void *x) {
-    return (void *)((wxDC *)  ((wxPrinterDC *) x));
-}
-static void *_p_wxPyPenTo_p_wxPen(void *x) {
-    return (void *)((wxPen *)  ((wxPyPen *) x));
-}
-static void *_p_wxBufferedPaintDCTo_p_wxBufferedDC(void *x) {
-    return (void *)((wxBufferedDC *)  ((wxBufferedPaintDC *) x));
-}
 static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) {
     return (void *)((wxObject *)  ((wxLayoutConstraints *) x));
 }
@@ -17162,9 +16486,6 @@ static void *_p_wxImageTo_p_wxObject(void *x) {
 static void *_p_wxScrollWinEventTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvent *) ((wxScrollWinEvent *) x));
 }
-static void *_p_wxGenericDragImageTo_p_wxObject(void *x) {
-    return (void *)((wxObject *)  ((wxGenericDragImage *) x));
-}
 static void *_p_wxPaletteTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxGDIObject *) ((wxPalette *) x));
 }
@@ -17276,20 +16597,75 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) {
 static void *_p_wxValidatorTo_p_wxObject(void *x) {
     return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x));
 }
-static void *_p_wxControlTo_p_wxWindow(void *x) {
-    return (void *)((wxWindow *)  ((wxControl *) x));
+static void *_p_wxBufferedPaintDCTo_p_wxBufferedDC(void *x) {
+    return (void *)((wxBufferedDC *)  ((wxBufferedPaintDC *) x));
 }
-static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) {
-    return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x));
+static void *_p_wxBufferedDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *) (wxMemoryDC *) ((wxBufferedDC *) x));
 }
-static void *_p_wxMenuBarTo_p_wxWindow(void *x) {
-    return (void *)((wxWindow *)  ((wxMenuBar *) x));
+static void *_p_wxScreenDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxScreenDC *) x));
+}
+static void *_p_wxMirrorDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxMirrorDC *) x));
+}
+static void *_p_wxMemoryDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxMemoryDC *) x));
+}
+static void *_p_wxWindowDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxWindowDC *) x));
+}
+static void *_p_wxMetaFileDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxMetaFileDC *) x));
+}
+static void *_p_wxBufferedPaintDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *) (wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x));
+}
+static void *_p_wxClientDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxClientDC *) x));
+}
+static void *_p_wxPaintDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxPaintDC *) x));
+}
+static void *_p_wxPostScriptDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxPostScriptDC *) x));
+}
+static void *_p_wxPrinterDCTo_p_wxDC(void *x) {
+    return (void *)((wxDC *)  ((wxPrinterDC *) x));
+}
+static void *_p_wxPyPenTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *) (wxPen *) ((wxPyPen *) x));
+}
+static void *_p_wxIconTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxIcon *) x));
+}
+static void *_p_wxPaletteTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxPalette *) x));
+}
+static void *_p_wxPenTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxPen *) x));
+}
+static void *_p_wxFontTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxFont *) x));
+}
+static void *_p_wxCursorTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxCursor *) x));
+}
+static void *_p_wxBitmapTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxBitmap *) x));
+}
+static void *_p_wxRegionTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxRegion *) x));
+}
+static void *_p_wxBrushTo_p_wxGDIObject(void *x) {
+    return (void *)((wxGDIObject *)  ((wxBrush *) x));
+}
+static void *_p_wxPyPenTo_p_wxPen(void *x) {
+    return (void *)((wxPen *)  ((wxPyPen *) x));
 }
 static swig_type_info _swigt__p_wxPostScriptDC[] = {{"_p_wxPostScriptDC", 0, "wxPostScriptDC *", 0},{"_p_wxPostScriptDC"},{0}};
-static swig_type_info _swigt__p_wxGenericDragImage[] = {{"_p_wxGenericDragImage", 0, "wxGenericDragImage *", 0},{"_p_wxGenericDragImage"},{0}};
 static swig_type_info _swigt__p_wxBrush[] = {{"_p_wxBrush", 0, "wxBrush *", 0},{"_p_wxBrush"},{0}};
 static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0},{"_p_wxColour"},{0}};
-static swig_type_info _swigt__p_wxCoord[] = {{"_p_wxCoord", 0, "wxCoord *", 0},{"_p_wxCoord"},{"_p_int"},{0}};
 static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxDC},{"_p_wxScreenDC", _p_wxScreenDCTo_p_wxDC},{"_p_wxMirrorDC", _p_wxMirrorDCTo_p_wxDC},{"_p_wxMemoryDC", _p_wxMemoryDCTo_p_wxDC},{"_p_wxWindowDC", _p_wxWindowDCTo_p_wxDC},{"_p_wxDC"},{"_p_wxMetaFileDC", _p_wxMetaFileDCTo_p_wxDC},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxDC},{"_p_wxClientDC", _p_wxClientDCTo_p_wxDC},{"_p_wxPaintDC", _p_wxPaintDCTo_p_wxDC},{"_p_wxPostScriptDC", _p_wxPostScriptDCTo_p_wxDC},{"_p_wxPrinterDC", _p_wxPrinterDCTo_p_wxDC},{0}};
 static swig_type_info _swigt__p_wxMirrorDC[] = {{"_p_wxMirrorDC", 0, "wxMirrorDC *", 0},{"_p_wxMirrorDC"},{0}};
 static swig_type_info _swigt__p_byte[] = {{"_p_byte", 0, "byte *", 0},{"_p_unsigned_char"},{"_p_byte"},{0}};
@@ -17304,12 +16680,11 @@ static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0},{"_p
 static swig_type_info _swigt__p_double[] = {{"_p_double", 0, "double *", 0},{"_p_double"},{0}};
 static swig_type_info _swigt__p_wxMemoryDC[] = {{"_p_wxMemoryDC", 0, "wxMemoryDC *", 0},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxMemoryDC},{"_p_wxMemoryDC"},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxMemoryDC},{0}};
 static swig_type_info _swigt__p_wxFontMapper[] = {{"_p_wxFontMapper", 0, "wxFontMapper *", 0},{"_p_wxFontMapper"},{0}};
-static swig_type_info _swigt__p_wxListCtrl[] = {{"_p_wxListCtrl", 0, "wxListCtrl *", 0},{"_p_wxListCtrl"},{0}};
 static swig_type_info _swigt__p_wxEffects[] = {{"_p_wxEffects", 0, "wxEffects *", 0},{"_p_wxEffects"},{0}};
 static swig_type_info _swigt__p_wxNativeEncodingInfo[] = {{"_p_wxNativeEncodingInfo", 0, "wxNativeEncodingInfo *", 0},{"_p_wxNativeEncodingInfo"},{0}};
 static swig_type_info _swigt__p_wxPalette[] = {{"_p_wxPalette", 0, "wxPalette *", 0},{"_p_wxPalette"},{0}};
 static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}};
-static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxRegionIterator", _p_wxRegionIteratorTo_p_wxObject},{"_p_wxPen", _p_wxPenTo_p_wxObject},{"_p_wxColourDatabase", _p_wxColourDatabaseTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxPenList", _p_wxPenListTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxMask", _p_wxMaskTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxFont", _p_wxFontTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxClientDC", _p_wxClientDCTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxMemoryDC", _p_wxMemoryDCTo_p_wxObject},{"_p_wxRegion", _p_wxRegionTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxDC", _p_wxDCTo_p_wxObject},{"_p_wxIcon", _p_wxIconTo_p_wxObject},{"_p_wxWindowDC", _p_wxWindowDCTo_p_wxObject},{"_p_wxGDIObject", _p_wxGDIObjectTo_p_wxObject},{"_p_wxEffects", _p_wxEffectsTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPostScriptDC", _p_wxPostScriptDCTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxPaintDC", _p_wxPaintDCTo_p_wxObject},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxObject},{"_p_wxPrinterDC", _p_wxPrinterDCTo_p_wxObject},{"_p_wxScreenDC", _p_wxScreenDCTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxGenericDragImage", _p_wxGenericDragImageTo_p_wxObject},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxObject},{"_p_wxPalette", _p_wxPaletteTo_p_wxObject},{"_p_wxImageList", _p_wxImageListTo_p_wxObject},{"_p_wxCursor", _p_wxCursorTo_p_wxObject},{"_p_wxObject"},{"_p_wxMirrorDC", _p_wxMirrorDCTo_p_wxObject},{"_p_wxEncodingConverter", _p_wxEncodingConverterTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxMetaFileDC", _p_wxMetaFileDCTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxBrushList", _p_wxBrushListTo_p_wxObject},{"_p_wxPyPen", _p_wxPyPenTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxBitmap", _p_wxBitmapTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxBrush", _p_wxBrushTo_p_wxObject},{"_p_wxMetaFile", _p_wxMetaFileTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxColour", _p_wxColourTo_p_wxObject},{"_p_wxFontList", _p_wxFontListTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{0}};
+static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxRegionIterator", _p_wxRegionIteratorTo_p_wxObject},{"_p_wxPen", _p_wxPenTo_p_wxObject},{"_p_wxColourDatabase", _p_wxColourDatabaseTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxPenList", _p_wxPenListTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxMask", _p_wxMaskTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxFont", _p_wxFontTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxClientDC", _p_wxClientDCTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxMemoryDC", _p_wxMemoryDCTo_p_wxObject},{"_p_wxRegion", _p_wxRegionTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxDC", _p_wxDCTo_p_wxObject},{"_p_wxIcon", _p_wxIconTo_p_wxObject},{"_p_wxWindowDC", _p_wxWindowDCTo_p_wxObject},{"_p_wxGDIObject", _p_wxGDIObjectTo_p_wxObject},{"_p_wxEffects", _p_wxEffectsTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPostScriptDC", _p_wxPostScriptDCTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxPaintDC", _p_wxPaintDCTo_p_wxObject},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxObject},{"_p_wxPrinterDC", _p_wxPrinterDCTo_p_wxObject},{"_p_wxScreenDC", _p_wxScreenDCTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxBufferedDC", _p_wxBufferedDCTo_p_wxObject},{"_p_wxPalette", _p_wxPaletteTo_p_wxObject},{"_p_wxImageList", _p_wxImageListTo_p_wxObject},{"_p_wxCursor", _p_wxCursorTo_p_wxObject},{"_p_wxObject"},{"_p_wxMirrorDC", _p_wxMirrorDCTo_p_wxObject},{"_p_wxEncodingConverter", _p_wxEncodingConverterTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxMetaFileDC", _p_wxMetaFileDCTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxBrushList", _p_wxBrushListTo_p_wxObject},{"_p_wxPyPen", _p_wxPyPenTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxBitmap", _p_wxBitmapTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxBrush", _p_wxBrushTo_p_wxObject},{"_p_wxMetaFile", _p_wxMetaFileTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxColour", _p_wxColourTo_p_wxObject},{"_p_wxFontList", _p_wxFontListTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{0}};
 static swig_type_info _swigt__p_wxRegionIterator[] = {{"_p_wxRegionIterator", 0, "wxRegionIterator *", 0},{"_p_wxRegionIterator"},{0}};
 static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p_wxRect"},{0}};
 static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}};
@@ -17320,7 +16695,6 @@ static swig_type_info _swigt__p_wxDash[] = {{"_p_wxDash", 0, "wxDash *", 0},{"_p
 static swig_type_info _swigt__p_wxScreenDC[] = {{"_p_wxScreenDC", 0, "wxScreenDC *", 0},{"_p_wxScreenDC"},{0}};
 static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0},{"_p_wxCursor"},{0}};
 static swig_type_info _swigt__p_wxClientDC[] = {{"_p_wxClientDC", 0, "wxClientDC *", 0},{"_p_wxClientDC"},{0}};
-static swig_type_info _swigt__p_wxTreeCtrl[] = {{"_p_wxTreeCtrl", 0, "wxTreeCtrl *", 0},{"_p_wxTreeCtrl"},{0}};
 static swig_type_info _swigt__p_wxBufferedDC[] = {{"_p_wxBufferedDC", 0, "wxBufferedDC *", 0},{"_p_wxBufferedDC"},{"_p_wxBufferedPaintDC", _p_wxBufferedPaintDCTo_p_wxBufferedDC},{0}};
 static swig_type_info _swigt__p_wxImageList[] = {{"_p_wxImageList", 0, "wxImageList *", 0},{"_p_wxImageList"},{0}};
 static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0},{"_p_unsigned_char"},{"_p_byte"},{0}};
@@ -17338,9 +16712,8 @@ static swig_type_info _swigt__p_wxPen[] = {{"_p_wxPen", 0, "wxPen *", 0},{"_p_wx
 static swig_type_info _swigt__p_wxBufferedPaintDC[] = {{"_p_wxBufferedPaintDC", 0, "wxBufferedPaintDC *", 0},{"_p_wxBufferedPaintDC"},{0}};
 static swig_type_info _swigt__p_wxPaintDC[] = {{"_p_wxPaintDC", 0, "wxPaintDC *", 0},{"_p_wxPaintDC"},{0}};
 static swig_type_info _swigt__p_wxPenList[] = {{"_p_wxPenList", 0, "wxPenList *", 0},{"_p_wxPenList"},{0}};
-static swig_type_info _swigt__p_wxTreeItemId[] = {{"_p_wxTreeItemId", 0, "wxTreeItemId *", 0},{"_p_wxTreeItemId"},{0}};
 static swig_type_info _swigt__p_wxPyPen[] = {{"_p_wxPyPen", 0, "wxPyPen *", 0},{"_p_wxPyPen"},{0}};
-static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_wxCoord"},{"_p_int"},{0}};
+static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_int"},{0}};
 static swig_type_info _swigt__p_wxMetaFile[] = {{"_p_wxMetaFile", 0, "wxMetaFile *", 0},{"_p_wxMetaFile"},{0}};
 static swig_type_info _swigt__p_wxNativeFontInfo[] = {{"_p_wxNativeFontInfo", 0, "wxNativeFontInfo *", 0},{"_p_wxNativeFontInfo"},{0}};
 static swig_type_info _swigt__p_wxEncodingConverter[] = {{"_p_wxEncodingConverter", 0, "wxEncodingConverter *", 0},{"_p_wxEncodingConverter"},{0}};
@@ -17348,10 +16721,8 @@ static swig_type_info _swigt__p_wxColourDatabase[] = {{"_p_wxColourDatabase", 0,
 
 static swig_type_info *swig_types_initial[] = {
 _swigt__p_wxPostScriptDC, 
-_swigt__p_wxGenericDragImage, 
 _swigt__p_wxBrush, 
 _swigt__p_wxColour, 
-_swigt__p_wxCoord, 
 _swigt__p_wxDC, 
 _swigt__p_wxMirrorDC, 
 _swigt__p_byte, 
@@ -17366,7 +16737,6 @@ _swigt__p_wxSize,
 _swigt__p_double, 
 _swigt__p_wxMemoryDC, 
 _swigt__p_wxFontMapper, 
-_swigt__p_wxListCtrl, 
 _swigt__p_wxEffects, 
 _swigt__p_wxNativeEncodingInfo, 
 _swigt__p_wxPalette, 
@@ -17382,7 +16752,6 @@ _swigt__p_wxDash,
 _swigt__p_wxScreenDC, 
 _swigt__p_wxCursor, 
 _swigt__p_wxClientDC, 
-_swigt__p_wxTreeCtrl, 
 _swigt__p_wxBufferedDC, 
 _swigt__p_wxImageList, 
 _swigt__p_unsigned_char, 
@@ -17400,7 +16769,6 @@ _swigt__p_wxPen,
 _swigt__p_wxBufferedPaintDC, 
 _swigt__p_wxPaintDC, 
 _swigt__p_wxPenList, 
-_swigt__p_wxTreeItemId, 
 _swigt__p_wxPyPen, 
 _swigt__p_int, 
 _swigt__p_wxMetaFile, 
@@ -17827,8 +17195,5 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"ThePenList",_wrap_ThePenList_get, _wrap_ThePenList_set);
     SWIG_addvarlink(SWIG_globals,(char*)"TheBrushList",_wrap_TheBrushList_get, _wrap_TheBrushList_set);
     SWIG_addvarlink(SWIG_globals,(char*)"TheColourDatabase",_wrap_TheColourDatabase_get, _wrap_TheColourDatabase_set);
-    
-    wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
-    
 }
 
diff --git a/wxPython/src/gtk/grid.py b/wxPython/src/gtk/grid.py
index c7ac998626..87fe1a39d6 100644
--- a/wxPython/src/gtk/grid.py
+++ b/wxPython/src/gtk/grid.py
@@ -16,16 +16,39 @@ GRID_VALUE_LONG = _grid.GRID_VALUE_LONG
 GRID_VALUE_CHOICEINT = _grid.GRID_VALUE_CHOICEINT
 GRID_VALUE_DATETIME = _grid.GRID_VALUE_DATETIME
 class GridCellRenderer(object):
-    def _setOORInfo(*args, **kwargs): return _grid.GridCellRenderer__setOORInfo(*args, **kwargs)
-    def SetParameters(*args, **kwargs): return _grid.GridCellRenderer_SetParameters(*args, **kwargs)
-    def IncRef(*args, **kwargs): return _grid.GridCellRenderer_IncRef(*args, **kwargs)
-    def DecRef(*args, **kwargs): return _grid.GridCellRenderer_DecRef(*args, **kwargs)
-    def Draw(*args, **kwargs): return _grid.GridCellRenderer_Draw(*args, **kwargs)
-    def GetBestSize(*args, **kwargs): return _grid.GridCellRenderer_GetBestSize(*args, **kwargs)
-    def Clone(*args, **kwargs): return _grid.GridCellRenderer_Clone(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGridCellRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def _setOORInfo(*args, **kwargs):
+        """_setOORInfo(PyObject _self)"""
+        return _grid.GridCellRenderer__setOORInfo(*args, **kwargs)
+
+    def SetParameters(*args, **kwargs):
+        """SetParameters(wxString params)"""
+        return _grid.GridCellRenderer_SetParameters(*args, **kwargs)
+
+    def IncRef(*args, **kwargs):
+        """IncRef()"""
+        return _grid.GridCellRenderer_IncRef(*args, **kwargs)
+
+    def DecRef(*args, **kwargs):
+        """DecRef()"""
+        return _grid.GridCellRenderer_DecRef(*args, **kwargs)
+
+    def Draw(*args, **kwargs):
+        """Draw(Grid grid, GridCellAttr attr, wxDC dc, Rect rect, int row, 
+    int col, bool isSelected)"""
+        return _grid.GridCellRenderer_Draw(*args, **kwargs)
+
+    def GetBestSize(*args, **kwargs):
+        """GetBestSize(Grid grid, GridCellAttr attr, wxDC dc, int row, int col) -> Size"""
+        return _grid.GridCellRenderer_GetBestSize(*args, **kwargs)
+
+    def Clone(*args, **kwargs):
+        """Clone() -> GridCellRenderer"""
+        return _grid.GridCellRenderer_Clone(*args, **kwargs)
+
 
 class GridCellRendererPtr(GridCellRenderer):
     def __init__(self, this):
@@ -38,16 +61,25 @@ GridNoCellCoords = cvar.GridNoCellCoords
 GridNoCellRect = cvar.GridNoCellRect
 
 class PyGridCellRenderer(GridCellRenderer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyGridCellRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PyGridCellRenderer"""
         newobj = _grid.new_PyGridCellRenderer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, PyGridCellRenderer);self._setOORInfo(self)
-    def _setCallbackInfo(*args, **kwargs): return _grid.PyGridCellRenderer__setCallbackInfo(*args, **kwargs)
-    def base_SetParameters(*args, **kwargs): return _grid.PyGridCellRenderer_base_SetParameters(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyGridCellRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _grid.PyGridCellRenderer__setCallbackInfo(*args, **kwargs)
+
+    def base_SetParameters(*args, **kwargs):
+        """base_SetParameters(wxString params)"""
+        return _grid.PyGridCellRenderer_base_SetParameters(*args, **kwargs)
+
 
 class PyGridCellRendererPtr(PyGridCellRenderer):
     def __init__(self, this):
@@ -57,14 +89,17 @@ class PyGridCellRendererPtr(PyGridCellRenderer):
 _grid.PyGridCellRenderer_swigregister(PyGridCellRendererPtr)
 
 class GridCellStringRenderer(GridCellRenderer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellStringRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> GridCellStringRenderer"""
         newobj = _grid.new_GridCellStringRenderer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellStringRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class GridCellStringRendererPtr(GridCellStringRenderer):
     def __init__(self, this):
@@ -74,14 +109,17 @@ class GridCellStringRendererPtr(GridCellStringRenderer):
 _grid.GridCellStringRenderer_swigregister(GridCellStringRendererPtr)
 
 class GridCellNumberRenderer(GridCellStringRenderer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellNumberRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> GridCellNumberRenderer"""
         newobj = _grid.new_GridCellNumberRenderer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellNumberRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class GridCellNumberRendererPtr(GridCellNumberRenderer):
     def __init__(self, this):
@@ -91,18 +129,33 @@ class GridCellNumberRendererPtr(GridCellNumberRenderer):
 _grid.GridCellNumberRenderer_swigregister(GridCellNumberRendererPtr)
 
 class GridCellFloatRenderer(GridCellStringRenderer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellFloatRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int width=-1, int precision=-1) -> GridCellFloatRenderer"""
         newobj = _grid.new_GridCellFloatRenderer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetWidth(*args, **kwargs): return _grid.GridCellFloatRenderer_GetWidth(*args, **kwargs)
-    def SetWidth(*args, **kwargs): return _grid.GridCellFloatRenderer_SetWidth(*args, **kwargs)
-    def GetPrecision(*args, **kwargs): return _grid.GridCellFloatRenderer_GetPrecision(*args, **kwargs)
-    def SetPrecision(*args, **kwargs): return _grid.GridCellFloatRenderer_SetPrecision(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellFloatRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetWidth(*args, **kwargs):
+        """GetWidth() -> int"""
+        return _grid.GridCellFloatRenderer_GetWidth(*args, **kwargs)
+
+    def SetWidth(*args, **kwargs):
+        """SetWidth(int width)"""
+        return _grid.GridCellFloatRenderer_SetWidth(*args, **kwargs)
+
+    def GetPrecision(*args, **kwargs):
+        """GetPrecision() -> int"""
+        return _grid.GridCellFloatRenderer_GetPrecision(*args, **kwargs)
+
+    def SetPrecision(*args, **kwargs):
+        """SetPrecision(int precision)"""
+        return _grid.GridCellFloatRenderer_SetPrecision(*args, **kwargs)
+
 
 class GridCellFloatRendererPtr(GridCellFloatRenderer):
     def __init__(self, this):
@@ -112,14 +165,17 @@ class GridCellFloatRendererPtr(GridCellFloatRenderer):
 _grid.GridCellFloatRenderer_swigregister(GridCellFloatRendererPtr)
 
 class GridCellBoolRenderer(GridCellRenderer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellBoolRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> GridCellBoolRenderer"""
         newobj = _grid.new_GridCellBoolRenderer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellBoolRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class GridCellBoolRendererPtr(GridCellBoolRenderer):
     def __init__(self, this):
@@ -129,14 +185,17 @@ class GridCellBoolRendererPtr(GridCellBoolRenderer):
 _grid.GridCellBoolRenderer_swigregister(GridCellBoolRendererPtr)
 
 class GridCellDateTimeRenderer(GridCellStringRenderer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellDateTimeRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString outformat=wxPyDateTimeFormatStr, wxString informat=wxPyDateTimeFormatStr) -> GridCellDateTimeRenderer"""
         newobj = _grid.new_GridCellDateTimeRenderer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellDateTimeRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class GridCellDateTimeRendererPtr(GridCellDateTimeRenderer):
     def __init__(self, this):
@@ -146,14 +205,17 @@ class GridCellDateTimeRendererPtr(GridCellDateTimeRenderer):
 _grid.GridCellDateTimeRenderer_swigregister(GridCellDateTimeRendererPtr)
 
 class GridCellEnumRenderer(GridCellStringRenderer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellEnumRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString choices=wxPyEmptyString) -> GridCellEnumRenderer"""
         newobj = _grid.new_GridCellEnumRenderer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellEnumRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class GridCellEnumRendererPtr(GridCellEnumRenderer):
     def __init__(self, this):
@@ -163,14 +225,17 @@ class GridCellEnumRendererPtr(GridCellEnumRenderer):
 _grid.GridCellEnumRenderer_swigregister(GridCellEnumRendererPtr)
 
 class GridCellAutoWrapStringRenderer(GridCellStringRenderer):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellAutoWrapStringRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> GridCellAutoWrapStringRenderer"""
         newobj = _grid.new_GridCellAutoWrapStringRenderer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellAutoWrapStringRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class GridCellAutoWrapStringRendererPtr(GridCellAutoWrapStringRenderer):
     def __init__(self, this):
@@ -180,31 +245,98 @@ class GridCellAutoWrapStringRendererPtr(GridCellAutoWrapStringRenderer):
 _grid.GridCellAutoWrapStringRenderer_swigregister(GridCellAutoWrapStringRendererPtr)
 
 class GridCellEditor(object):
-    def _setOORInfo(*args, **kwargs): return _grid.GridCellEditor__setOORInfo(*args, **kwargs)
-    def IsCreated(*args, **kwargs): return _grid.GridCellEditor_IsCreated(*args, **kwargs)
-    def GetControl(*args, **kwargs): return _grid.GridCellEditor_GetControl(*args, **kwargs)
-    def SetControl(*args, **kwargs): return _grid.GridCellEditor_SetControl(*args, **kwargs)
-    def GetCellAttr(*args, **kwargs): return _grid.GridCellEditor_GetCellAttr(*args, **kwargs)
-    def SetCellAttr(*args, **kwargs): return _grid.GridCellEditor_SetCellAttr(*args, **kwargs)
-    def SetParameters(*args, **kwargs): return _grid.GridCellEditor_SetParameters(*args, **kwargs)
-    def IncRef(*args, **kwargs): return _grid.GridCellEditor_IncRef(*args, **kwargs)
-    def DecRef(*args, **kwargs): return _grid.GridCellEditor_DecRef(*args, **kwargs)
-    def Create(*args, **kwargs): return _grid.GridCellEditor_Create(*args, **kwargs)
-    def BeginEdit(*args, **kwargs): return _grid.GridCellEditor_BeginEdit(*args, **kwargs)
-    def EndEdit(*args, **kwargs): return _grid.GridCellEditor_EndEdit(*args, **kwargs)
-    def Reset(*args, **kwargs): return _grid.GridCellEditor_Reset(*args, **kwargs)
-    def Clone(*args, **kwargs): return _grid.GridCellEditor_Clone(*args, **kwargs)
-    def SetSize(*args, **kwargs): return _grid.GridCellEditor_SetSize(*args, **kwargs)
-    def Show(*args, **kwargs): return _grid.GridCellEditor_Show(*args, **kwargs)
-    def PaintBackground(*args, **kwargs): return _grid.GridCellEditor_PaintBackground(*args, **kwargs)
-    def IsAcceptedKey(*args, **kwargs): return _grid.GridCellEditor_IsAcceptedKey(*args, **kwargs)
-    def StartingKey(*args, **kwargs): return _grid.GridCellEditor_StartingKey(*args, **kwargs)
-    def StartingClick(*args, **kwargs): return _grid.GridCellEditor_StartingClick(*args, **kwargs)
-    def HandleReturn(*args, **kwargs): return _grid.GridCellEditor_HandleReturn(*args, **kwargs)
-    def Destroy(*args, **kwargs): return _grid.GridCellEditor_Destroy(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGridCellEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def _setOORInfo(*args, **kwargs):
+        """_setOORInfo(PyObject _self)"""
+        return _grid.GridCellEditor__setOORInfo(*args, **kwargs)
+
+    def IsCreated(*args, **kwargs):
+        """IsCreated() -> bool"""
+        return _grid.GridCellEditor_IsCreated(*args, **kwargs)
+
+    def GetControl(*args, **kwargs):
+        """GetControl() -> Control"""
+        return _grid.GridCellEditor_GetControl(*args, **kwargs)
+
+    def SetControl(*args, **kwargs):
+        """SetControl(Control control)"""
+        return _grid.GridCellEditor_SetControl(*args, **kwargs)
+
+    def GetCellAttr(*args, **kwargs):
+        """GetCellAttr() -> GridCellAttr"""
+        return _grid.GridCellEditor_GetCellAttr(*args, **kwargs)
+
+    def SetCellAttr(*args, **kwargs):
+        """SetCellAttr(GridCellAttr attr)"""
+        return _grid.GridCellEditor_SetCellAttr(*args, **kwargs)
+
+    def SetParameters(*args, **kwargs):
+        """SetParameters(wxString params)"""
+        return _grid.GridCellEditor_SetParameters(*args, **kwargs)
+
+    def IncRef(*args, **kwargs):
+        """IncRef()"""
+        return _grid.GridCellEditor_IncRef(*args, **kwargs)
+
+    def DecRef(*args, **kwargs):
+        """DecRef()"""
+        return _grid.GridCellEditor_DecRef(*args, **kwargs)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, EvtHandler evtHandler)"""
+        return _grid.GridCellEditor_Create(*args, **kwargs)
+
+    def BeginEdit(*args, **kwargs):
+        """BeginEdit(int row, int col, Grid grid)"""
+        return _grid.GridCellEditor_BeginEdit(*args, **kwargs)
+
+    def EndEdit(*args, **kwargs):
+        """EndEdit(int row, int col, Grid grid) -> bool"""
+        return _grid.GridCellEditor_EndEdit(*args, **kwargs)
+
+    def Reset(*args, **kwargs):
+        """Reset()"""
+        return _grid.GridCellEditor_Reset(*args, **kwargs)
+
+    def Clone(*args, **kwargs):
+        """Clone() -> GridCellEditor"""
+        return _grid.GridCellEditor_Clone(*args, **kwargs)
+
+    def SetSize(*args, **kwargs):
+        """SetSize(Rect rect)"""
+        return _grid.GridCellEditor_SetSize(*args, **kwargs)
+
+    def Show(*args, **kwargs):
+        """Show(bool show, GridCellAttr attr=None)"""
+        return _grid.GridCellEditor_Show(*args, **kwargs)
+
+    def PaintBackground(*args, **kwargs):
+        """PaintBackground(Rect rectCell, GridCellAttr attr)"""
+        return _grid.GridCellEditor_PaintBackground(*args, **kwargs)
+
+    def IsAcceptedKey(*args, **kwargs):
+        """IsAcceptedKey(KeyEvent event) -> bool"""
+        return _grid.GridCellEditor_IsAcceptedKey(*args, **kwargs)
+
+    def StartingKey(*args, **kwargs):
+        """StartingKey(KeyEvent event)"""
+        return _grid.GridCellEditor_StartingKey(*args, **kwargs)
+
+    def StartingClick(*args, **kwargs):
+        """StartingClick()"""
+        return _grid.GridCellEditor_StartingClick(*args, **kwargs)
+
+    def HandleReturn(*args, **kwargs):
+        """HandleReturn(KeyEvent event)"""
+        return _grid.GridCellEditor_HandleReturn(*args, **kwargs)
+
+    def Destroy(*args, **kwargs):
+        """Destroy()"""
+        return _grid.GridCellEditor_Destroy(*args, **kwargs)
+
 
 class GridCellEditorPtr(GridCellEditor):
     def __init__(self, this):
@@ -214,24 +346,57 @@ class GridCellEditorPtr(GridCellEditor):
 _grid.GridCellEditor_swigregister(GridCellEditorPtr)
 
 class PyGridCellEditor(GridCellEditor):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyGridCellEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PyGridCellEditor"""
         newobj = _grid.new_PyGridCellEditor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, PyGridCellEditor);self._setOORInfo(self)
-    def _setCallbackInfo(*args, **kwargs): return _grid.PyGridCellEditor__setCallbackInfo(*args, **kwargs)
-    def base_SetSize(*args, **kwargs): return _grid.PyGridCellEditor_base_SetSize(*args, **kwargs)
-    def base_Show(*args, **kwargs): return _grid.PyGridCellEditor_base_Show(*args, **kwargs)
-    def base_PaintBackground(*args, **kwargs): return _grid.PyGridCellEditor_base_PaintBackground(*args, **kwargs)
-    def base_IsAcceptedKey(*args, **kwargs): return _grid.PyGridCellEditor_base_IsAcceptedKey(*args, **kwargs)
-    def base_StartingKey(*args, **kwargs): return _grid.PyGridCellEditor_base_StartingKey(*args, **kwargs)
-    def base_StartingClick(*args, **kwargs): return _grid.PyGridCellEditor_base_StartingClick(*args, **kwargs)
-    def base_HandleReturn(*args, **kwargs): return _grid.PyGridCellEditor_base_HandleReturn(*args, **kwargs)
-    def base_Destroy(*args, **kwargs): return _grid.PyGridCellEditor_base_Destroy(*args, **kwargs)
-    def base_SetParameters(*args, **kwargs): return _grid.PyGridCellEditor_base_SetParameters(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyGridCellEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _grid.PyGridCellEditor__setCallbackInfo(*args, **kwargs)
+
+    def base_SetSize(*args, **kwargs):
+        """base_SetSize(Rect rect)"""
+        return _grid.PyGridCellEditor_base_SetSize(*args, **kwargs)
+
+    def base_Show(*args, **kwargs):
+        """base_Show(bool show, GridCellAttr attr=None)"""
+        return _grid.PyGridCellEditor_base_Show(*args, **kwargs)
+
+    def base_PaintBackground(*args, **kwargs):
+        """base_PaintBackground(Rect rectCell, GridCellAttr attr)"""
+        return _grid.PyGridCellEditor_base_PaintBackground(*args, **kwargs)
+
+    def base_IsAcceptedKey(*args, **kwargs):
+        """base_IsAcceptedKey(KeyEvent event) -> bool"""
+        return _grid.PyGridCellEditor_base_IsAcceptedKey(*args, **kwargs)
+
+    def base_StartingKey(*args, **kwargs):
+        """base_StartingKey(KeyEvent event)"""
+        return _grid.PyGridCellEditor_base_StartingKey(*args, **kwargs)
+
+    def base_StartingClick(*args, **kwargs):
+        """base_StartingClick()"""
+        return _grid.PyGridCellEditor_base_StartingClick(*args, **kwargs)
+
+    def base_HandleReturn(*args, **kwargs):
+        """base_HandleReturn(KeyEvent event)"""
+        return _grid.PyGridCellEditor_base_HandleReturn(*args, **kwargs)
+
+    def base_Destroy(*args, **kwargs):
+        """base_Destroy()"""
+        return _grid.PyGridCellEditor_base_Destroy(*args, **kwargs)
+
+    def base_SetParameters(*args, **kwargs):
+        """base_SetParameters(wxString params)"""
+        return _grid.PyGridCellEditor_base_SetParameters(*args, **kwargs)
+
 
 class PyGridCellEditorPtr(PyGridCellEditor):
     def __init__(self, this):
@@ -241,15 +406,21 @@ class PyGridCellEditorPtr(PyGridCellEditor):
 _grid.PyGridCellEditor_swigregister(PyGridCellEditorPtr)
 
 class GridCellTextEditor(GridCellEditor):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellTextEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> GridCellTextEditor"""
         newobj = _grid.new_GridCellTextEditor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetValue(*args, **kwargs): return _grid.GridCellTextEditor_GetValue(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellTextEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> wxString"""
+        return _grid.GridCellTextEditor_GetValue(*args, **kwargs)
+
 
 class GridCellTextEditorPtr(GridCellTextEditor):
     def __init__(self, this):
@@ -259,15 +430,21 @@ class GridCellTextEditorPtr(GridCellTextEditor):
 _grid.GridCellTextEditor_swigregister(GridCellTextEditorPtr)
 
 class GridCellNumberEditor(GridCellTextEditor):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellNumberEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int min=-1, int max=-1) -> GridCellNumberEditor"""
         newobj = _grid.new_GridCellNumberEditor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetValue(*args, **kwargs): return _grid.GridCellNumberEditor_GetValue(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellNumberEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> wxString"""
+        return _grid.GridCellNumberEditor_GetValue(*args, **kwargs)
+
 
 class GridCellNumberEditorPtr(GridCellNumberEditor):
     def __init__(self, this):
@@ -277,15 +454,21 @@ class GridCellNumberEditorPtr(GridCellNumberEditor):
 _grid.GridCellNumberEditor_swigregister(GridCellNumberEditorPtr)
 
 class GridCellFloatEditor(GridCellTextEditor):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellFloatEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> GridCellFloatEditor"""
         newobj = _grid.new_GridCellFloatEditor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetValue(*args, **kwargs): return _grid.GridCellFloatEditor_GetValue(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellFloatEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> wxString"""
+        return _grid.GridCellFloatEditor_GetValue(*args, **kwargs)
+
 
 class GridCellFloatEditorPtr(GridCellFloatEditor):
     def __init__(self, this):
@@ -295,15 +478,21 @@ class GridCellFloatEditorPtr(GridCellFloatEditor):
 _grid.GridCellFloatEditor_swigregister(GridCellFloatEditorPtr)
 
 class GridCellBoolEditor(GridCellEditor):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellBoolEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> GridCellBoolEditor"""
         newobj = _grid.new_GridCellBoolEditor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetValue(*args, **kwargs): return _grid.GridCellBoolEditor_GetValue(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellBoolEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> wxString"""
+        return _grid.GridCellBoolEditor_GetValue(*args, **kwargs)
+
 
 class GridCellBoolEditorPtr(GridCellBoolEditor):
     def __init__(self, this):
@@ -313,15 +502,21 @@ class GridCellBoolEditorPtr(GridCellBoolEditor):
 _grid.GridCellBoolEditor_swigregister(GridCellBoolEditorPtr)
 
 class GridCellChoiceEditor(GridCellEditor):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellChoiceEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int LCOUNT=0, wxString choices=None, bool allowOthers=False) -> GridCellChoiceEditor"""
         newobj = _grid.new_GridCellChoiceEditor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetValue(*args, **kwargs): return _grid.GridCellChoiceEditor_GetValue(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellChoiceEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> wxString"""
+        return _grid.GridCellChoiceEditor_GetValue(*args, **kwargs)
+
 
 class GridCellChoiceEditorPtr(GridCellChoiceEditor):
     def __init__(self, this):
@@ -331,15 +526,21 @@ class GridCellChoiceEditorPtr(GridCellChoiceEditor):
 _grid.GridCellChoiceEditor_swigregister(GridCellChoiceEditorPtr)
 
 class GridCellEnumEditor(GridCellChoiceEditor):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellEnumEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString choices=wxPyEmptyString) -> GridCellEnumEditor"""
         newobj = _grid.new_GridCellEnumEditor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetValue(*args, **kwargs): return _grid.GridCellEnumEditor_GetValue(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellEnumEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> wxString"""
+        return _grid.GridCellEnumEditor_GetValue(*args, **kwargs)
+
 
 class GridCellEnumEditorPtr(GridCellEnumEditor):
     def __init__(self, this):
@@ -349,15 +550,21 @@ class GridCellEnumEditorPtr(GridCellEnumEditor):
 _grid.GridCellEnumEditor_swigregister(GridCellEnumEditorPtr)
 
 class GridCellAutoWrapStringEditor(GridCellTextEditor):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellAutoWrapStringEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> GridCellAutoWrapStringEditor"""
         newobj = _grid.new_GridCellAutoWrapStringEditor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetValue(*args, **kwargs): return _grid.GridCellAutoWrapStringEditor_GetValue(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellAutoWrapStringEditor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> wxString"""
+        return _grid.GridCellAutoWrapStringEditor_GetValue(*args, **kwargs)
+
 
 class GridCellAutoWrapStringEditorPtr(GridCellAutoWrapStringEditor):
     def __init__(self, this):
@@ -367,53 +574,155 @@ class GridCellAutoWrapStringEditorPtr(GridCellAutoWrapStringEditor):
 _grid.GridCellAutoWrapStringEditor_swigregister(GridCellAutoWrapStringEditorPtr)
 
 class GridCellAttr(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     Any = _grid.GridCellAttr_Any
     Default = _grid.GridCellAttr_Default
     Cell = _grid.GridCellAttr_Cell
     Row = _grid.GridCellAttr_Row
     Col = _grid.GridCellAttr_Col
     Merged = _grid.GridCellAttr_Merged
-    def _setOORInfo(*args, **kwargs): return _grid.GridCellAttr__setOORInfo(*args, **kwargs)
+    def _setOORInfo(*args, **kwargs):
+        """_setOORInfo(PyObject _self)"""
+        return _grid.GridCellAttr__setOORInfo(*args, **kwargs)
+
     def __init__(self, *args, **kwargs):
+        """__init__(GridCellAttr attrDefault=None) -> GridCellAttr"""
         newobj = _grid.new_GridCellAttr(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Clone(*args, **kwargs): return _grid.GridCellAttr_Clone(*args, **kwargs)
-    def MergeWith(*args, **kwargs): return _grid.GridCellAttr_MergeWith(*args, **kwargs)
-    def IncRef(*args, **kwargs): return _grid.GridCellAttr_IncRef(*args, **kwargs)
-    def DecRef(*args, **kwargs): return _grid.GridCellAttr_DecRef(*args, **kwargs)
-    def SetTextColour(*args, **kwargs): return _grid.GridCellAttr_SetTextColour(*args, **kwargs)
-    def SetBackgroundColour(*args, **kwargs): return _grid.GridCellAttr_SetBackgroundColour(*args, **kwargs)
-    def SetFont(*args, **kwargs): return _grid.GridCellAttr_SetFont(*args, **kwargs)
-    def SetAlignment(*args, **kwargs): return _grid.GridCellAttr_SetAlignment(*args, **kwargs)
-    def SetSize(*args, **kwargs): return _grid.GridCellAttr_SetSize(*args, **kwargs)
-    def SetOverflow(*args, **kwargs): return _grid.GridCellAttr_SetOverflow(*args, **kwargs)
-    def SetReadOnly(*args, **kwargs): return _grid.GridCellAttr_SetReadOnly(*args, **kwargs)
-    def SetRenderer(*args, **kwargs): return _grid.GridCellAttr_SetRenderer(*args, **kwargs)
-    def SetEditor(*args, **kwargs): return _grid.GridCellAttr_SetEditor(*args, **kwargs)
-    def SetKind(*args, **kwargs): return _grid.GridCellAttr_SetKind(*args, **kwargs)
-    def HasTextColour(*args, **kwargs): return _grid.GridCellAttr_HasTextColour(*args, **kwargs)
-    def HasBackgroundColour(*args, **kwargs): return _grid.GridCellAttr_HasBackgroundColour(*args, **kwargs)
-    def HasFont(*args, **kwargs): return _grid.GridCellAttr_HasFont(*args, **kwargs)
-    def HasAlignment(*args, **kwargs): return _grid.GridCellAttr_HasAlignment(*args, **kwargs)
-    def HasRenderer(*args, **kwargs): return _grid.GridCellAttr_HasRenderer(*args, **kwargs)
-    def HasEditor(*args, **kwargs): return _grid.GridCellAttr_HasEditor(*args, **kwargs)
-    def HasReadWriteMode(*args, **kwargs): return _grid.GridCellAttr_HasReadWriteMode(*args, **kwargs)
-    def HasOverflowMode(*args, **kwargs): return _grid.GridCellAttr_HasOverflowMode(*args, **kwargs)
-    def GetTextColour(*args, **kwargs): return _grid.GridCellAttr_GetTextColour(*args, **kwargs)
-    def GetBackgroundColour(*args, **kwargs): return _grid.GridCellAttr_GetBackgroundColour(*args, **kwargs)
-    def GetFont(*args, **kwargs): return _grid.GridCellAttr_GetFont(*args, **kwargs)
-    def GetAlignment(*args, **kwargs): return _grid.GridCellAttr_GetAlignment(*args, **kwargs)
-    def GetSize(*args, **kwargs): return _grid.GridCellAttr_GetSize(*args, **kwargs)
-    def GetOverflow(*args, **kwargs): return _grid.GridCellAttr_GetOverflow(*args, **kwargs)
-    def GetRenderer(*args, **kwargs): return _grid.GridCellAttr_GetRenderer(*args, **kwargs)
-    def GetEditor(*args, **kwargs): return _grid.GridCellAttr_GetEditor(*args, **kwargs)
-    def IsReadOnly(*args, **kwargs): return _grid.GridCellAttr_IsReadOnly(*args, **kwargs)
-    def SetDefAttr(*args, **kwargs): return _grid.GridCellAttr_SetDefAttr(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Clone(*args, **kwargs):
+        """Clone() -> GridCellAttr"""
+        return _grid.GridCellAttr_Clone(*args, **kwargs)
+
+    def MergeWith(*args, **kwargs):
+        """MergeWith(GridCellAttr mergefrom)"""
+        return _grid.GridCellAttr_MergeWith(*args, **kwargs)
+
+    def IncRef(*args, **kwargs):
+        """IncRef()"""
+        return _grid.GridCellAttr_IncRef(*args, **kwargs)
+
+    def DecRef(*args, **kwargs):
+        """DecRef()"""
+        return _grid.GridCellAttr_DecRef(*args, **kwargs)
+
+    def SetTextColour(*args, **kwargs):
+        """SetTextColour(wxColour colText)"""
+        return _grid.GridCellAttr_SetTextColour(*args, **kwargs)
+
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(wxColour colBack)"""
+        return _grid.GridCellAttr_SetBackgroundColour(*args, **kwargs)
+
+    def SetFont(*args, **kwargs):
+        """SetFont(wxFont font)"""
+        return _grid.GridCellAttr_SetFont(*args, **kwargs)
+
+    def SetAlignment(*args, **kwargs):
+        """SetAlignment(int hAlign, int vAlign)"""
+        return _grid.GridCellAttr_SetAlignment(*args, **kwargs)
+
+    def SetSize(*args, **kwargs):
+        """SetSize(int num_rows, int num_cols)"""
+        return _grid.GridCellAttr_SetSize(*args, **kwargs)
+
+    def SetOverflow(*args, **kwargs):
+        """SetOverflow(bool allow=True)"""
+        return _grid.GridCellAttr_SetOverflow(*args, **kwargs)
+
+    def SetReadOnly(*args, **kwargs):
+        """SetReadOnly(bool isReadOnly=True)"""
+        return _grid.GridCellAttr_SetReadOnly(*args, **kwargs)
+
+    def SetRenderer(*args, **kwargs):
+        """SetRenderer(GridCellRenderer renderer)"""
+        return _grid.GridCellAttr_SetRenderer(*args, **kwargs)
+
+    def SetEditor(*args, **kwargs):
+        """SetEditor(GridCellEditor editor)"""
+        return _grid.GridCellAttr_SetEditor(*args, **kwargs)
+
+    def SetKind(*args, **kwargs):
+        """SetKind(wxGridCellAttr::wxAttrKind kind)"""
+        return _grid.GridCellAttr_SetKind(*args, **kwargs)
+
+    def HasTextColour(*args, **kwargs):
+        """HasTextColour() -> bool"""
+        return _grid.GridCellAttr_HasTextColour(*args, **kwargs)
+
+    def HasBackgroundColour(*args, **kwargs):
+        """HasBackgroundColour() -> bool"""
+        return _grid.GridCellAttr_HasBackgroundColour(*args, **kwargs)
+
+    def HasFont(*args, **kwargs):
+        """HasFont() -> bool"""
+        return _grid.GridCellAttr_HasFont(*args, **kwargs)
+
+    def HasAlignment(*args, **kwargs):
+        """HasAlignment() -> bool"""
+        return _grid.GridCellAttr_HasAlignment(*args, **kwargs)
+
+    def HasRenderer(*args, **kwargs):
+        """HasRenderer() -> bool"""
+        return _grid.GridCellAttr_HasRenderer(*args, **kwargs)
+
+    def HasEditor(*args, **kwargs):
+        """HasEditor() -> bool"""
+        return _grid.GridCellAttr_HasEditor(*args, **kwargs)
+
+    def HasReadWriteMode(*args, **kwargs):
+        """HasReadWriteMode() -> bool"""
+        return _grid.GridCellAttr_HasReadWriteMode(*args, **kwargs)
+
+    def HasOverflowMode(*args, **kwargs):
+        """HasOverflowMode() -> bool"""
+        return _grid.GridCellAttr_HasOverflowMode(*args, **kwargs)
+
+    def GetTextColour(*args, **kwargs):
+        """GetTextColour() -> wxColour"""
+        return _grid.GridCellAttr_GetTextColour(*args, **kwargs)
+
+    def GetBackgroundColour(*args, **kwargs):
+        """GetBackgroundColour() -> wxColour"""
+        return _grid.GridCellAttr_GetBackgroundColour(*args, **kwargs)
+
+    def GetFont(*args, **kwargs):
+        """GetFont() -> wxFont"""
+        return _grid.GridCellAttr_GetFont(*args, **kwargs)
+
+    def GetAlignment(*args, **kwargs):
+        """GetAlignment(int OUTPUT, int OUTPUT)"""
+        return _grid.GridCellAttr_GetAlignment(*args, **kwargs)
+
+    def GetSize(*args, **kwargs):
+        """GetSize(int OUTPUT, int OUTPUT)"""
+        return _grid.GridCellAttr_GetSize(*args, **kwargs)
+
+    def GetOverflow(*args, **kwargs):
+        """GetOverflow() -> bool"""
+        return _grid.GridCellAttr_GetOverflow(*args, **kwargs)
+
+    def GetRenderer(*args, **kwargs):
+        """GetRenderer(Grid grid, int row, int col) -> GridCellRenderer"""
+        return _grid.GridCellAttr_GetRenderer(*args, **kwargs)
+
+    def GetEditor(*args, **kwargs):
+        """GetEditor(Grid grid, int row, int col) -> GridCellEditor"""
+        return _grid.GridCellAttr_GetEditor(*args, **kwargs)
+
+    def IsReadOnly(*args, **kwargs):
+        """IsReadOnly() -> bool"""
+        return _grid.GridCellAttr_IsReadOnly(*args, **kwargs)
+
+    def SetDefAttr(*args, **kwargs):
+        """SetDefAttr(GridCellAttr defAttr)"""
+        return _grid.GridCellAttr_SetDefAttr(*args, **kwargs)
+
 
 class GridCellAttrPtr(GridCellAttr):
     def __init__(self, this):
@@ -423,21 +732,45 @@ class GridCellAttrPtr(GridCellAttr):
 _grid.GridCellAttr_swigregister(GridCellAttrPtr)
 
 class GridCellAttrProvider(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellAttrProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> GridCellAttrProvider"""
         newobj = _grid.new_GridCellAttrProvider(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def _setOORInfo(*args, **kwargs): return _grid.GridCellAttrProvider__setOORInfo(*args, **kwargs)
-    def GetAttr(*args, **kwargs): return _grid.GridCellAttrProvider_GetAttr(*args, **kwargs)
-    def SetAttr(*args, **kwargs): return _grid.GridCellAttrProvider_SetAttr(*args, **kwargs)
-    def SetRowAttr(*args, **kwargs): return _grid.GridCellAttrProvider_SetRowAttr(*args, **kwargs)
-    def SetColAttr(*args, **kwargs): return _grid.GridCellAttrProvider_SetColAttr(*args, **kwargs)
-    def UpdateAttrRows(*args, **kwargs): return _grid.GridCellAttrProvider_UpdateAttrRows(*args, **kwargs)
-    def UpdateAttrCols(*args, **kwargs): return _grid.GridCellAttrProvider_UpdateAttrCols(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridCellAttrProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setOORInfo(*args, **kwargs):
+        """_setOORInfo(PyObject _self)"""
+        return _grid.GridCellAttrProvider__setOORInfo(*args, **kwargs)
+
+    def GetAttr(*args, **kwargs):
+        """GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) -> GridCellAttr"""
+        return _grid.GridCellAttrProvider_GetAttr(*args, **kwargs)
+
+    def SetAttr(*args, **kwargs):
+        """SetAttr(GridCellAttr attr, int row, int col)"""
+        return _grid.GridCellAttrProvider_SetAttr(*args, **kwargs)
+
+    def SetRowAttr(*args, **kwargs):
+        """SetRowAttr(GridCellAttr attr, int row)"""
+        return _grid.GridCellAttrProvider_SetRowAttr(*args, **kwargs)
+
+    def SetColAttr(*args, **kwargs):
+        """SetColAttr(GridCellAttr attr, int col)"""
+        return _grid.GridCellAttrProvider_SetColAttr(*args, **kwargs)
+
+    def UpdateAttrRows(*args, **kwargs):
+        """UpdateAttrRows(size_t pos, int numRows)"""
+        return _grid.GridCellAttrProvider_UpdateAttrRows(*args, **kwargs)
+
+    def UpdateAttrCols(*args, **kwargs):
+        """UpdateAttrCols(size_t pos, int numCols)"""
+        return _grid.GridCellAttrProvider_UpdateAttrCols(*args, **kwargs)
+
 
 class GridCellAttrProviderPtr(GridCellAttrProvider):
     def __init__(self, this):
@@ -447,19 +780,37 @@ class GridCellAttrProviderPtr(GridCellAttrProvider):
 _grid.GridCellAttrProvider_swigregister(GridCellAttrProviderPtr)
 
 class PyGridCellAttrProvider(GridCellAttrProvider):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyGridCellAttrProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PyGridCellAttrProvider"""
         newobj = _grid.new_PyGridCellAttrProvider(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, PyGridCellAttrProvider)
-    def _setCallbackInfo(*args, **kwargs): return _grid.PyGridCellAttrProvider__setCallbackInfo(*args, **kwargs)
-    def base_GetAttr(*args, **kwargs): return _grid.PyGridCellAttrProvider_base_GetAttr(*args, **kwargs)
-    def base_SetAttr(*args, **kwargs): return _grid.PyGridCellAttrProvider_base_SetAttr(*args, **kwargs)
-    def base_SetRowAttr(*args, **kwargs): return _grid.PyGridCellAttrProvider_base_SetRowAttr(*args, **kwargs)
-    def base_SetColAttr(*args, **kwargs): return _grid.PyGridCellAttrProvider_base_SetColAttr(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyGridCellAttrProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _grid.PyGridCellAttrProvider__setCallbackInfo(*args, **kwargs)
+
+    def base_GetAttr(*args, **kwargs):
+        """base_GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) -> GridCellAttr"""
+        return _grid.PyGridCellAttrProvider_base_GetAttr(*args, **kwargs)
+
+    def base_SetAttr(*args, **kwargs):
+        """base_SetAttr(GridCellAttr attr, int row, int col)"""
+        return _grid.PyGridCellAttrProvider_base_SetAttr(*args, **kwargs)
+
+    def base_SetRowAttr(*args, **kwargs):
+        """base_SetRowAttr(GridCellAttr attr, int row)"""
+        return _grid.PyGridCellAttrProvider_base_SetRowAttr(*args, **kwargs)
+
+    def base_SetColAttr(*args, **kwargs):
+        """base_SetColAttr(GridCellAttr attr, int col)"""
+        return _grid.PyGridCellAttrProvider_base_SetColAttr(*args, **kwargs)
+
 
 class PyGridCellAttrProviderPtr(PyGridCellAttrProvider):
     def __init__(self, this):
@@ -469,44 +820,150 @@ class PyGridCellAttrProviderPtr(PyGridCellAttrProvider):
 _grid.PyGridCellAttrProvider_swigregister(PyGridCellAttrProviderPtr)
 
 class GridTableBase(core.Object):
-    def _setOORInfo(*args, **kwargs): return _grid.GridTableBase__setOORInfo(*args, **kwargs)
-    def SetAttrProvider(*args, **kwargs): return _grid.GridTableBase_SetAttrProvider(*args, **kwargs)
-    def GetAttrProvider(*args, **kwargs): return _grid.GridTableBase_GetAttrProvider(*args, **kwargs)
-    def SetView(*args, **kwargs): return _grid.GridTableBase_SetView(*args, **kwargs)
-    def GetView(*args, **kwargs): return _grid.GridTableBase_GetView(*args, **kwargs)
-    def GetNumberRows(*args, **kwargs): return _grid.GridTableBase_GetNumberRows(*args, **kwargs)
-    def GetNumberCols(*args, **kwargs): return _grid.GridTableBase_GetNumberCols(*args, **kwargs)
-    def IsEmptyCell(*args, **kwargs): return _grid.GridTableBase_IsEmptyCell(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _grid.GridTableBase_GetValue(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _grid.GridTableBase_SetValue(*args, **kwargs)
-    def GetTypeName(*args, **kwargs): return _grid.GridTableBase_GetTypeName(*args, **kwargs)
-    def CanGetValueAs(*args, **kwargs): return _grid.GridTableBase_CanGetValueAs(*args, **kwargs)
-    def CanSetValueAs(*args, **kwargs): return _grid.GridTableBase_CanSetValueAs(*args, **kwargs)
-    def GetValueAsLong(*args, **kwargs): return _grid.GridTableBase_GetValueAsLong(*args, **kwargs)
-    def GetValueAsDouble(*args, **kwargs): return _grid.GridTableBase_GetValueAsDouble(*args, **kwargs)
-    def GetValueAsBool(*args, **kwargs): return _grid.GridTableBase_GetValueAsBool(*args, **kwargs)
-    def SetValueAsLong(*args, **kwargs): return _grid.GridTableBase_SetValueAsLong(*args, **kwargs)
-    def SetValueAsDouble(*args, **kwargs): return _grid.GridTableBase_SetValueAsDouble(*args, **kwargs)
-    def SetValueAsBool(*args, **kwargs): return _grid.GridTableBase_SetValueAsBool(*args, **kwargs)
-    def Clear(*args, **kwargs): return _grid.GridTableBase_Clear(*args, **kwargs)
-    def InsertRows(*args, **kwargs): return _grid.GridTableBase_InsertRows(*args, **kwargs)
-    def AppendRows(*args, **kwargs): return _grid.GridTableBase_AppendRows(*args, **kwargs)
-    def DeleteRows(*args, **kwargs): return _grid.GridTableBase_DeleteRows(*args, **kwargs)
-    def InsertCols(*args, **kwargs): return _grid.GridTableBase_InsertCols(*args, **kwargs)
-    def AppendCols(*args, **kwargs): return _grid.GridTableBase_AppendCols(*args, **kwargs)
-    def DeleteCols(*args, **kwargs): return _grid.GridTableBase_DeleteCols(*args, **kwargs)
-    def GetRowLabelValue(*args, **kwargs): return _grid.GridTableBase_GetRowLabelValue(*args, **kwargs)
-    def GetColLabelValue(*args, **kwargs): return _grid.GridTableBase_GetColLabelValue(*args, **kwargs)
-    def SetRowLabelValue(*args, **kwargs): return _grid.GridTableBase_SetRowLabelValue(*args, **kwargs)
-    def SetColLabelValue(*args, **kwargs): return _grid.GridTableBase_SetColLabelValue(*args, **kwargs)
-    def CanHaveAttributes(*args, **kwargs): return _grid.GridTableBase_CanHaveAttributes(*args, **kwargs)
-    def GetAttr(*args, **kwargs): return _grid.GridTableBase_GetAttr(*args, **kwargs)
-    def SetAttr(*args, **kwargs): return _grid.GridTableBase_SetAttr(*args, **kwargs)
-    def SetRowAttr(*args, **kwargs): return _grid.GridTableBase_SetRowAttr(*args, **kwargs)
-    def SetColAttr(*args, **kwargs): return _grid.GridTableBase_SetColAttr(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGridTableBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def _setOORInfo(*args, **kwargs):
+        """_setOORInfo(PyObject _self)"""
+        return _grid.GridTableBase__setOORInfo(*args, **kwargs)
+
+    def SetAttrProvider(*args, **kwargs):
+        """SetAttrProvider(GridCellAttrProvider attrProvider)"""
+        return _grid.GridTableBase_SetAttrProvider(*args, **kwargs)
+
+    def GetAttrProvider(*args, **kwargs):
+        """GetAttrProvider() -> GridCellAttrProvider"""
+        return _grid.GridTableBase_GetAttrProvider(*args, **kwargs)
+
+    def SetView(*args, **kwargs):
+        """SetView(Grid grid)"""
+        return _grid.GridTableBase_SetView(*args, **kwargs)
+
+    def GetView(*args, **kwargs):
+        """GetView() -> Grid"""
+        return _grid.GridTableBase_GetView(*args, **kwargs)
+
+    def GetNumberRows(*args, **kwargs):
+        """GetNumberRows() -> int"""
+        return _grid.GridTableBase_GetNumberRows(*args, **kwargs)
+
+    def GetNumberCols(*args, **kwargs):
+        """GetNumberCols() -> int"""
+        return _grid.GridTableBase_GetNumberCols(*args, **kwargs)
+
+    def IsEmptyCell(*args, **kwargs):
+        """IsEmptyCell(int row, int col) -> bool"""
+        return _grid.GridTableBase_IsEmptyCell(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue(int row, int col) -> wxString"""
+        return _grid.GridTableBase_GetValue(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(int row, int col, wxString value)"""
+        return _grid.GridTableBase_SetValue(*args, **kwargs)
+
+    def GetTypeName(*args, **kwargs):
+        """GetTypeName(int row, int col) -> wxString"""
+        return _grid.GridTableBase_GetTypeName(*args, **kwargs)
+
+    def CanGetValueAs(*args, **kwargs):
+        """CanGetValueAs(int row, int col, wxString typeName) -> bool"""
+        return _grid.GridTableBase_CanGetValueAs(*args, **kwargs)
+
+    def CanSetValueAs(*args, **kwargs):
+        """CanSetValueAs(int row, int col, wxString typeName) -> bool"""
+        return _grid.GridTableBase_CanSetValueAs(*args, **kwargs)
+
+    def GetValueAsLong(*args, **kwargs):
+        """GetValueAsLong(int row, int col) -> long"""
+        return _grid.GridTableBase_GetValueAsLong(*args, **kwargs)
+
+    def GetValueAsDouble(*args, **kwargs):
+        """GetValueAsDouble(int row, int col) -> double"""
+        return _grid.GridTableBase_GetValueAsDouble(*args, **kwargs)
+
+    def GetValueAsBool(*args, **kwargs):
+        """GetValueAsBool(int row, int col) -> bool"""
+        return _grid.GridTableBase_GetValueAsBool(*args, **kwargs)
+
+    def SetValueAsLong(*args, **kwargs):
+        """SetValueAsLong(int row, int col, long value)"""
+        return _grid.GridTableBase_SetValueAsLong(*args, **kwargs)
+
+    def SetValueAsDouble(*args, **kwargs):
+        """SetValueAsDouble(int row, int col, double value)"""
+        return _grid.GridTableBase_SetValueAsDouble(*args, **kwargs)
+
+    def SetValueAsBool(*args, **kwargs):
+        """SetValueAsBool(int row, int col, bool value)"""
+        return _grid.GridTableBase_SetValueAsBool(*args, **kwargs)
+
+    def Clear(*args, **kwargs):
+        """Clear()"""
+        return _grid.GridTableBase_Clear(*args, **kwargs)
+
+    def InsertRows(*args, **kwargs):
+        """InsertRows(size_t pos=0, size_t numRows=1) -> bool"""
+        return _grid.GridTableBase_InsertRows(*args, **kwargs)
+
+    def AppendRows(*args, **kwargs):
+        """AppendRows(size_t numRows=1) -> bool"""
+        return _grid.GridTableBase_AppendRows(*args, **kwargs)
+
+    def DeleteRows(*args, **kwargs):
+        """DeleteRows(size_t pos=0, size_t numRows=1) -> bool"""
+        return _grid.GridTableBase_DeleteRows(*args, **kwargs)
+
+    def InsertCols(*args, **kwargs):
+        """InsertCols(size_t pos=0, size_t numCols=1) -> bool"""
+        return _grid.GridTableBase_InsertCols(*args, **kwargs)
+
+    def AppendCols(*args, **kwargs):
+        """AppendCols(size_t numCols=1) -> bool"""
+        return _grid.GridTableBase_AppendCols(*args, **kwargs)
+
+    def DeleteCols(*args, **kwargs):
+        """DeleteCols(size_t pos=0, size_t numCols=1) -> bool"""
+        return _grid.GridTableBase_DeleteCols(*args, **kwargs)
+
+    def GetRowLabelValue(*args, **kwargs):
+        """GetRowLabelValue(int row) -> wxString"""
+        return _grid.GridTableBase_GetRowLabelValue(*args, **kwargs)
+
+    def GetColLabelValue(*args, **kwargs):
+        """GetColLabelValue(int col) -> wxString"""
+        return _grid.GridTableBase_GetColLabelValue(*args, **kwargs)
+
+    def SetRowLabelValue(*args, **kwargs):
+        """SetRowLabelValue(int row, wxString value)"""
+        return _grid.GridTableBase_SetRowLabelValue(*args, **kwargs)
+
+    def SetColLabelValue(*args, **kwargs):
+        """SetColLabelValue(int col, wxString value)"""
+        return _grid.GridTableBase_SetColLabelValue(*args, **kwargs)
+
+    def CanHaveAttributes(*args, **kwargs):
+        """CanHaveAttributes() -> bool"""
+        return _grid.GridTableBase_CanHaveAttributes(*args, **kwargs)
+
+    def GetAttr(*args, **kwargs):
+        """GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) -> GridCellAttr"""
+        return _grid.GridTableBase_GetAttr(*args, **kwargs)
+
+    def SetAttr(*args, **kwargs):
+        """SetAttr(GridCellAttr attr, int row, int col)"""
+        return _grid.GridTableBase_SetAttr(*args, **kwargs)
+
+    def SetRowAttr(*args, **kwargs):
+        """SetRowAttr(GridCellAttr attr, int row)"""
+        return _grid.GridTableBase_SetRowAttr(*args, **kwargs)
+
+    def SetColAttr(*args, **kwargs):
+        """SetColAttr(GridCellAttr attr, int col)"""
+        return _grid.GridTableBase_SetColAttr(*args, **kwargs)
+
 
 class GridTableBasePtr(GridTableBase):
     def __init__(self, this):
@@ -516,35 +973,103 @@ class GridTableBasePtr(GridTableBase):
 _grid.GridTableBase_swigregister(GridTableBasePtr)
 
 class PyGridTableBase(GridTableBase):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyGridTableBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PyGridTableBase"""
         newobj = _grid.new_PyGridTableBase(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, PyGridTableBase);self._setOORInfo(self)
-    def _setCallbackInfo(*args, **kwargs): return _grid.PyGridTableBase__setCallbackInfo(*args, **kwargs)
-    def Destroy(*args, **kwargs): return _grid.PyGridTableBase_Destroy(*args, **kwargs)
-    def base_GetTypeName(*args, **kwargs): return _grid.PyGridTableBase_base_GetTypeName(*args, **kwargs)
-    def base_CanGetValueAs(*args, **kwargs): return _grid.PyGridTableBase_base_CanGetValueAs(*args, **kwargs)
-    def base_CanSetValueAs(*args, **kwargs): return _grid.PyGridTableBase_base_CanSetValueAs(*args, **kwargs)
-    def base_Clear(*args, **kwargs): return _grid.PyGridTableBase_base_Clear(*args, **kwargs)
-    def base_InsertRows(*args, **kwargs): return _grid.PyGridTableBase_base_InsertRows(*args, **kwargs)
-    def base_AppendRows(*args, **kwargs): return _grid.PyGridTableBase_base_AppendRows(*args, **kwargs)
-    def base_DeleteRows(*args, **kwargs): return _grid.PyGridTableBase_base_DeleteRows(*args, **kwargs)
-    def base_InsertCols(*args, **kwargs): return _grid.PyGridTableBase_base_InsertCols(*args, **kwargs)
-    def base_AppendCols(*args, **kwargs): return _grid.PyGridTableBase_base_AppendCols(*args, **kwargs)
-    def base_DeleteCols(*args, **kwargs): return _grid.PyGridTableBase_base_DeleteCols(*args, **kwargs)
-    def base_GetRowLabelValue(*args, **kwargs): return _grid.PyGridTableBase_base_GetRowLabelValue(*args, **kwargs)
-    def base_GetColLabelValue(*args, **kwargs): return _grid.PyGridTableBase_base_GetColLabelValue(*args, **kwargs)
-    def base_SetRowLabelValue(*args, **kwargs): return _grid.PyGridTableBase_base_SetRowLabelValue(*args, **kwargs)
-    def base_SetColLabelValue(*args, **kwargs): return _grid.PyGridTableBase_base_SetColLabelValue(*args, **kwargs)
-    def base_CanHaveAttributes(*args, **kwargs): return _grid.PyGridTableBase_base_CanHaveAttributes(*args, **kwargs)
-    def base_GetAttr(*args, **kwargs): return _grid.PyGridTableBase_base_GetAttr(*args, **kwargs)
-    def base_SetAttr(*args, **kwargs): return _grid.PyGridTableBase_base_SetAttr(*args, **kwargs)
-    def base_SetRowAttr(*args, **kwargs): return _grid.PyGridTableBase_base_SetRowAttr(*args, **kwargs)
-    def base_SetColAttr(*args, **kwargs): return _grid.PyGridTableBase_base_SetColAttr(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyGridTableBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _grid.PyGridTableBase__setCallbackInfo(*args, **kwargs)
+
+    def Destroy(*args, **kwargs):
+        """Destroy()
+
+Deletes the C++ object this Python object is a proxy for."""
+        return _grid.PyGridTableBase_Destroy(*args, **kwargs)
+
+    def base_GetTypeName(*args, **kwargs):
+        """base_GetTypeName(int row, int col) -> wxString"""
+        return _grid.PyGridTableBase_base_GetTypeName(*args, **kwargs)
+
+    def base_CanGetValueAs(*args, **kwargs):
+        """base_CanGetValueAs(int row, int col, wxString typeName) -> bool"""
+        return _grid.PyGridTableBase_base_CanGetValueAs(*args, **kwargs)
+
+    def base_CanSetValueAs(*args, **kwargs):
+        """base_CanSetValueAs(int row, int col, wxString typeName) -> bool"""
+        return _grid.PyGridTableBase_base_CanSetValueAs(*args, **kwargs)
+
+    def base_Clear(*args, **kwargs):
+        """base_Clear()"""
+        return _grid.PyGridTableBase_base_Clear(*args, **kwargs)
+
+    def base_InsertRows(*args, **kwargs):
+        """base_InsertRows(size_t pos=0, size_t numRows=1) -> bool"""
+        return _grid.PyGridTableBase_base_InsertRows(*args, **kwargs)
+
+    def base_AppendRows(*args, **kwargs):
+        """base_AppendRows(size_t numRows=1) -> bool"""
+        return _grid.PyGridTableBase_base_AppendRows(*args, **kwargs)
+
+    def base_DeleteRows(*args, **kwargs):
+        """base_DeleteRows(size_t pos=0, size_t numRows=1) -> bool"""
+        return _grid.PyGridTableBase_base_DeleteRows(*args, **kwargs)
+
+    def base_InsertCols(*args, **kwargs):
+        """base_InsertCols(size_t pos=0, size_t numCols=1) -> bool"""
+        return _grid.PyGridTableBase_base_InsertCols(*args, **kwargs)
+
+    def base_AppendCols(*args, **kwargs):
+        """base_AppendCols(size_t numCols=1) -> bool"""
+        return _grid.PyGridTableBase_base_AppendCols(*args, **kwargs)
+
+    def base_DeleteCols(*args, **kwargs):
+        """base_DeleteCols(size_t pos=0, size_t numCols=1) -> bool"""
+        return _grid.PyGridTableBase_base_DeleteCols(*args, **kwargs)
+
+    def base_GetRowLabelValue(*args, **kwargs):
+        """base_GetRowLabelValue(int row) -> wxString"""
+        return _grid.PyGridTableBase_base_GetRowLabelValue(*args, **kwargs)
+
+    def base_GetColLabelValue(*args, **kwargs):
+        """base_GetColLabelValue(int col) -> wxString"""
+        return _grid.PyGridTableBase_base_GetColLabelValue(*args, **kwargs)
+
+    def base_SetRowLabelValue(*args, **kwargs):
+        """base_SetRowLabelValue(int row, wxString value)"""
+        return _grid.PyGridTableBase_base_SetRowLabelValue(*args, **kwargs)
+
+    def base_SetColLabelValue(*args, **kwargs):
+        """base_SetColLabelValue(int col, wxString value)"""
+        return _grid.PyGridTableBase_base_SetColLabelValue(*args, **kwargs)
+
+    def base_CanHaveAttributes(*args, **kwargs):
+        """base_CanHaveAttributes() -> bool"""
+        return _grid.PyGridTableBase_base_CanHaveAttributes(*args, **kwargs)
+
+    def base_GetAttr(*args, **kwargs):
+        """base_GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) -> GridCellAttr"""
+        return _grid.PyGridTableBase_base_GetAttr(*args, **kwargs)
+
+    def base_SetAttr(*args, **kwargs):
+        """base_SetAttr(GridCellAttr attr, int row, int col)"""
+        return _grid.PyGridTableBase_base_SetAttr(*args, **kwargs)
+
+    def base_SetRowAttr(*args, **kwargs):
+        """base_SetRowAttr(GridCellAttr attr, int row)"""
+        return _grid.PyGridTableBase_base_SetRowAttr(*args, **kwargs)
+
+    def base_SetColAttr(*args, **kwargs):
+        """base_SetColAttr(GridCellAttr attr, int col)"""
+        return _grid.PyGridTableBase_base_SetColAttr(*args, **kwargs)
+
 
 class PyGridTableBasePtr(PyGridTableBase):
     def __init__(self, this):
@@ -554,14 +1079,17 @@ class PyGridTableBasePtr(PyGridTableBase):
 _grid.PyGridTableBase_swigregister(PyGridTableBasePtr)
 
 class GridStringTable(GridTableBase):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridStringTable instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int numRows=0, int numCols=0) -> GridStringTable"""
         newobj = _grid.new_GridStringTable(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridStringTable instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class GridStringTablePtr(GridStringTable):
     def __init__(self, this):
@@ -579,25 +1107,53 @@ GRIDTABLE_NOTIFY_COLS_INSERTED = _grid.GRIDTABLE_NOTIFY_COLS_INSERTED
 GRIDTABLE_NOTIFY_COLS_APPENDED = _grid.GRIDTABLE_NOTIFY_COLS_APPENDED
 GRIDTABLE_NOTIFY_COLS_DELETED = _grid.GRIDTABLE_NOTIFY_COLS_DELETED
 class GridTableMessage(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridTableMessage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(GridTableBase table, int id, int comInt1=-1, int comInt2=-1) -> GridTableMessage"""
         newobj = _grid.new_GridTableMessage(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_grid.delete_GridTableMessage):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetTableObject(*args, **kwargs): return _grid.GridTableMessage_SetTableObject(*args, **kwargs)
-    def GetTableObject(*args, **kwargs): return _grid.GridTableMessage_GetTableObject(*args, **kwargs)
-    def SetId(*args, **kwargs): return _grid.GridTableMessage_SetId(*args, **kwargs)
-    def GetId(*args, **kwargs): return _grid.GridTableMessage_GetId(*args, **kwargs)
-    def SetCommandInt(*args, **kwargs): return _grid.GridTableMessage_SetCommandInt(*args, **kwargs)
-    def GetCommandInt(*args, **kwargs): return _grid.GridTableMessage_GetCommandInt(*args, **kwargs)
-    def SetCommandInt2(*args, **kwargs): return _grid.GridTableMessage_SetCommandInt2(*args, **kwargs)
-    def GetCommandInt2(*args, **kwargs): return _grid.GridTableMessage_GetCommandInt2(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridTableMessage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetTableObject(*args, **kwargs):
+        """SetTableObject(GridTableBase table)"""
+        return _grid.GridTableMessage_SetTableObject(*args, **kwargs)
+
+    def GetTableObject(*args, **kwargs):
+        """GetTableObject() -> GridTableBase"""
+        return _grid.GridTableMessage_GetTableObject(*args, **kwargs)
+
+    def SetId(*args, **kwargs):
+        """SetId(int id)"""
+        return _grid.GridTableMessage_SetId(*args, **kwargs)
+
+    def GetId(*args, **kwargs):
+        """GetId() -> int"""
+        return _grid.GridTableMessage_GetId(*args, **kwargs)
+
+    def SetCommandInt(*args, **kwargs):
+        """SetCommandInt(int comInt1)"""
+        return _grid.GridTableMessage_SetCommandInt(*args, **kwargs)
+
+    def GetCommandInt(*args, **kwargs):
+        """GetCommandInt() -> int"""
+        return _grid.GridTableMessage_GetCommandInt(*args, **kwargs)
+
+    def SetCommandInt2(*args, **kwargs):
+        """SetCommandInt2(int comInt2)"""
+        return _grid.GridTableMessage_SetCommandInt2(*args, **kwargs)
+
+    def GetCommandInt2(*args, **kwargs):
+        """GetCommandInt2() -> int"""
+        return _grid.GridTableMessage_GetCommandInt2(*args, **kwargs)
+
 
 class GridTableMessagePtr(GridTableMessage):
     def __init__(self, this):
@@ -607,23 +1163,53 @@ class GridTableMessagePtr(GridTableMessage):
 _grid.GridTableMessage_swigregister(GridTableMessagePtr)
 
 class GridCellCoords(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridCellCoords instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int r=-1, int c=-1) -> GridCellCoords"""
         newobj = _grid.new_GridCellCoords(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_grid.delete_GridCellCoords):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetRow(*args, **kwargs): return _grid.GridCellCoords_GetRow(*args, **kwargs)
-    def SetRow(*args, **kwargs): return _grid.GridCellCoords_SetRow(*args, **kwargs)
-    def GetCol(*args, **kwargs): return _grid.GridCellCoords_GetCol(*args, **kwargs)
-    def SetCol(*args, **kwargs): return _grid.GridCellCoords_SetCol(*args, **kwargs)
-    def Set(*args, **kwargs): return _grid.GridCellCoords_Set(*args, **kwargs)
-    def __eq__(*args, **kwargs): return _grid.GridCellCoords___eq__(*args, **kwargs)
-    def __ne__(*args, **kwargs): return _grid.GridCellCoords___ne__(*args, **kwargs)
-    def asTuple(*args, **kwargs): return _grid.GridCellCoords_asTuple(*args, **kwargs)
+
+    def GetRow(*args, **kwargs):
+        """GetRow() -> int"""
+        return _grid.GridCellCoords_GetRow(*args, **kwargs)
+
+    def SetRow(*args, **kwargs):
+        """SetRow(int n)"""
+        return _grid.GridCellCoords_SetRow(*args, **kwargs)
+
+    def GetCol(*args, **kwargs):
+        """GetCol() -> int"""
+        return _grid.GridCellCoords_GetCol(*args, **kwargs)
+
+    def SetCol(*args, **kwargs):
+        """SetCol(int n)"""
+        return _grid.GridCellCoords_SetCol(*args, **kwargs)
+
+    def Set(*args, **kwargs):
+        """Set(int row, int col)"""
+        return _grid.GridCellCoords_Set(*args, **kwargs)
+
+    def __eq__(*args, **kwargs):
+        """__eq__(GridCellCoords other) -> bool"""
+        return _grid.GridCellCoords___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(GridCellCoords other) -> bool"""
+        return _grid.GridCellCoords___ne__(*args, **kwargs)
+
+    def asTuple(*args, **kwargs):
+        """asTuple() -> PyObject"""
+        return _grid.GridCellCoords_asTuple(*args, **kwargs)
+
     def __str__(self):                   return str(self.asTuple())
     def __repr__(self):                  return 'wxGridCellCoords'+str(self.asTuple())
     def __len__(self):                   return len(self.asTuple())
@@ -642,205 +1228,776 @@ class GridCellCoordsPtr(GridCellCoords):
 _grid.GridCellCoords_swigregister(GridCellCoordsPtr)
 
 class Grid(windows.ScrolledWindow):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGrid instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=WANTS_CHARS, 
+    wxString name=PanelNameStr) -> Grid"""
         newobj = _grid.new_Grid(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
+
     wxGridSelectCells = _grid.Grid_wxGridSelectCells
     wxGridSelectRows = _grid.Grid_wxGridSelectRows
     wxGridSelectColumns = _grid.Grid_wxGridSelectColumns
-    def CreateGrid(*args, **kwargs): return _grid.Grid_CreateGrid(*args, **kwargs)
-    def SetSelectionMode(*args, **kwargs): return _grid.Grid_SetSelectionMode(*args, **kwargs)
-    def GetSelectionMode(*args, **kwargs): return _grid.Grid_GetSelectionMode(*args, **kwargs)
-    def GetNumberRows(*args, **kwargs): return _grid.Grid_GetNumberRows(*args, **kwargs)
-    def GetNumberCols(*args, **kwargs): return _grid.Grid_GetNumberCols(*args, **kwargs)
-    def ProcessTableMessage(*args, **kwargs): return _grid.Grid_ProcessTableMessage(*args, **kwargs)
-    def GetTable(*args, **kwargs): return _grid.Grid_GetTable(*args, **kwargs)
-    def SetTable(*args, **kwargs): return _grid.Grid_SetTable(*args, **kwargs)
-    def ClearGrid(*args, **kwargs): return _grid.Grid_ClearGrid(*args, **kwargs)
-    def InsertRows(*args, **kwargs): return _grid.Grid_InsertRows(*args, **kwargs)
-    def AppendRows(*args, **kwargs): return _grid.Grid_AppendRows(*args, **kwargs)
-    def DeleteRows(*args, **kwargs): return _grid.Grid_DeleteRows(*args, **kwargs)
-    def InsertCols(*args, **kwargs): return _grid.Grid_InsertCols(*args, **kwargs)
-    def AppendCols(*args, **kwargs): return _grid.Grid_AppendCols(*args, **kwargs)
-    def DeleteCols(*args, **kwargs): return _grid.Grid_DeleteCols(*args, **kwargs)
-    def DrawCellHighlight(*args, **kwargs): return _grid.Grid_DrawCellHighlight(*args, **kwargs)
-    def DrawTextRectangle(*args, **kwargs): return _grid.Grid_DrawTextRectangle(*args, **kwargs)
-    def GetTextBoxSize(*args, **kwargs): return _grid.Grid_GetTextBoxSize(*args, **kwargs)
-    def BeginBatch(*args, **kwargs): return _grid.Grid_BeginBatch(*args, **kwargs)
-    def EndBatch(*args, **kwargs): return _grid.Grid_EndBatch(*args, **kwargs)
-    def GetBatchCount(*args, **kwargs): return _grid.Grid_GetBatchCount(*args, **kwargs)
-    def ForceRefresh(*args, **kwargs): return _grid.Grid_ForceRefresh(*args, **kwargs)
-    def Refresh(*args, **kwargs): return _grid.Grid_Refresh(*args, **kwargs)
-    def IsEditable(*args, **kwargs): return _grid.Grid_IsEditable(*args, **kwargs)
-    def EnableEditing(*args, **kwargs): return _grid.Grid_EnableEditing(*args, **kwargs)
-    def EnableCellEditControl(*args, **kwargs): return _grid.Grid_EnableCellEditControl(*args, **kwargs)
-    def DisableCellEditControl(*args, **kwargs): return _grid.Grid_DisableCellEditControl(*args, **kwargs)
-    def CanEnableCellControl(*args, **kwargs): return _grid.Grid_CanEnableCellControl(*args, **kwargs)
-    def IsCellEditControlEnabled(*args, **kwargs): return _grid.Grid_IsCellEditControlEnabled(*args, **kwargs)
-    def IsCellEditControlShown(*args, **kwargs): return _grid.Grid_IsCellEditControlShown(*args, **kwargs)
-    def IsCurrentCellReadOnly(*args, **kwargs): return _grid.Grid_IsCurrentCellReadOnly(*args, **kwargs)
-    def ShowCellEditControl(*args, **kwargs): return _grid.Grid_ShowCellEditControl(*args, **kwargs)
-    def HideCellEditControl(*args, **kwargs): return _grid.Grid_HideCellEditControl(*args, **kwargs)
-    def SaveEditControlValue(*args, **kwargs): return _grid.Grid_SaveEditControlValue(*args, **kwargs)
-    def XYToCell(*args, **kwargs): return _grid.Grid_XYToCell(*args, **kwargs)
-    def YToRow(*args, **kwargs): return _grid.Grid_YToRow(*args, **kwargs)
-    def XToCol(*args, **kwargs): return _grid.Grid_XToCol(*args, **kwargs)
-    def YToEdgeOfRow(*args, **kwargs): return _grid.Grid_YToEdgeOfRow(*args, **kwargs)
-    def XToEdgeOfCol(*args, **kwargs): return _grid.Grid_XToEdgeOfCol(*args, **kwargs)
-    def CellToRect(*args, **kwargs): return _grid.Grid_CellToRect(*args, **kwargs)
-    def GetGridCursorRow(*args, **kwargs): return _grid.Grid_GetGridCursorRow(*args, **kwargs)
-    def GetGridCursorCol(*args, **kwargs): return _grid.Grid_GetGridCursorCol(*args, **kwargs)
-    def IsVisible(*args, **kwargs): return _grid.Grid_IsVisible(*args, **kwargs)
-    def MakeCellVisible(*args, **kwargs): return _grid.Grid_MakeCellVisible(*args, **kwargs)
-    def SetGridCursor(*args, **kwargs): return _grid.Grid_SetGridCursor(*args, **kwargs)
-    def MoveCursorUp(*args, **kwargs): return _grid.Grid_MoveCursorUp(*args, **kwargs)
-    def MoveCursorDown(*args, **kwargs): return _grid.Grid_MoveCursorDown(*args, **kwargs)
-    def MoveCursorLeft(*args, **kwargs): return _grid.Grid_MoveCursorLeft(*args, **kwargs)
-    def MoveCursorRight(*args, **kwargs): return _grid.Grid_MoveCursorRight(*args, **kwargs)
-    def MovePageDown(*args, **kwargs): return _grid.Grid_MovePageDown(*args, **kwargs)
-    def MovePageUp(*args, **kwargs): return _grid.Grid_MovePageUp(*args, **kwargs)
-    def MoveCursorUpBlock(*args, **kwargs): return _grid.Grid_MoveCursorUpBlock(*args, **kwargs)
-    def MoveCursorDownBlock(*args, **kwargs): return _grid.Grid_MoveCursorDownBlock(*args, **kwargs)
-    def MoveCursorLeftBlock(*args, **kwargs): return _grid.Grid_MoveCursorLeftBlock(*args, **kwargs)
-    def MoveCursorRightBlock(*args, **kwargs): return _grid.Grid_MoveCursorRightBlock(*args, **kwargs)
-    def GetDefaultRowLabelSize(*args, **kwargs): return _grid.Grid_GetDefaultRowLabelSize(*args, **kwargs)
-    def GetRowLabelSize(*args, **kwargs): return _grid.Grid_GetRowLabelSize(*args, **kwargs)
-    def GetDefaultColLabelSize(*args, **kwargs): return _grid.Grid_GetDefaultColLabelSize(*args, **kwargs)
-    def GetColLabelSize(*args, **kwargs): return _grid.Grid_GetColLabelSize(*args, **kwargs)
-    def GetLabelBackgroundColour(*args, **kwargs): return _grid.Grid_GetLabelBackgroundColour(*args, **kwargs)
-    def GetLabelTextColour(*args, **kwargs): return _grid.Grid_GetLabelTextColour(*args, **kwargs)
-    def GetLabelFont(*args, **kwargs): return _grid.Grid_GetLabelFont(*args, **kwargs)
-    def GetRowLabelAlignment(*args, **kwargs): return _grid.Grid_GetRowLabelAlignment(*args, **kwargs)
-    def GetColLabelAlignment(*args, **kwargs): return _grid.Grid_GetColLabelAlignment(*args, **kwargs)
-    def GetColLabelTextOrientation(*args, **kwargs): return _grid.Grid_GetColLabelTextOrientation(*args, **kwargs)
-    def GetRowLabelValue(*args, **kwargs): return _grid.Grid_GetRowLabelValue(*args, **kwargs)
-    def GetColLabelValue(*args, **kwargs): return _grid.Grid_GetColLabelValue(*args, **kwargs)
-    def GetGridLineColour(*args, **kwargs): return _grid.Grid_GetGridLineColour(*args, **kwargs)
-    def GetCellHighlightColour(*args, **kwargs): return _grid.Grid_GetCellHighlightColour(*args, **kwargs)
-    def GetCellHighlightPenWidth(*args, **kwargs): return _grid.Grid_GetCellHighlightPenWidth(*args, **kwargs)
-    def GetCellHighlightROPenWidth(*args, **kwargs): return _grid.Grid_GetCellHighlightROPenWidth(*args, **kwargs)
-    def SetRowLabelSize(*args, **kwargs): return _grid.Grid_SetRowLabelSize(*args, **kwargs)
-    def SetColLabelSize(*args, **kwargs): return _grid.Grid_SetColLabelSize(*args, **kwargs)
-    def SetLabelBackgroundColour(*args, **kwargs): return _grid.Grid_SetLabelBackgroundColour(*args, **kwargs)
-    def SetLabelTextColour(*args, **kwargs): return _grid.Grid_SetLabelTextColour(*args, **kwargs)
-    def SetLabelFont(*args, **kwargs): return _grid.Grid_SetLabelFont(*args, **kwargs)
-    def SetRowLabelAlignment(*args, **kwargs): return _grid.Grid_SetRowLabelAlignment(*args, **kwargs)
-    def SetColLabelAlignment(*args, **kwargs): return _grid.Grid_SetColLabelAlignment(*args, **kwargs)
-    def SetColLabelTextOrientation(*args, **kwargs): return _grid.Grid_SetColLabelTextOrientation(*args, **kwargs)
-    def SetRowLabelValue(*args, **kwargs): return _grid.Grid_SetRowLabelValue(*args, **kwargs)
-    def SetColLabelValue(*args, **kwargs): return _grid.Grid_SetColLabelValue(*args, **kwargs)
-    def SetGridLineColour(*args, **kwargs): return _grid.Grid_SetGridLineColour(*args, **kwargs)
-    def SetCellHighlightColour(*args, **kwargs): return _grid.Grid_SetCellHighlightColour(*args, **kwargs)
-    def SetCellHighlightPenWidth(*args, **kwargs): return _grid.Grid_SetCellHighlightPenWidth(*args, **kwargs)
-    def SetCellHighlightROPenWidth(*args, **kwargs): return _grid.Grid_SetCellHighlightROPenWidth(*args, **kwargs)
-    def EnableDragRowSize(*args, **kwargs): return _grid.Grid_EnableDragRowSize(*args, **kwargs)
-    def DisableDragRowSize(*args, **kwargs): return _grid.Grid_DisableDragRowSize(*args, **kwargs)
-    def CanDragRowSize(*args, **kwargs): return _grid.Grid_CanDragRowSize(*args, **kwargs)
-    def EnableDragColSize(*args, **kwargs): return _grid.Grid_EnableDragColSize(*args, **kwargs)
-    def DisableDragColSize(*args, **kwargs): return _grid.Grid_DisableDragColSize(*args, **kwargs)
-    def CanDragColSize(*args, **kwargs): return _grid.Grid_CanDragColSize(*args, **kwargs)
-    def EnableDragGridSize(*args, **kwargs): return _grid.Grid_EnableDragGridSize(*args, **kwargs)
-    def DisableDragGridSize(*args, **kwargs): return _grid.Grid_DisableDragGridSize(*args, **kwargs)
-    def CanDragGridSize(*args, **kwargs): return _grid.Grid_CanDragGridSize(*args, **kwargs)
-    def SetAttr(*args, **kwargs): return _grid.Grid_SetAttr(*args, **kwargs)
-    def SetRowAttr(*args, **kwargs): return _grid.Grid_SetRowAttr(*args, **kwargs)
-    def SetColAttr(*args, **kwargs): return _grid.Grid_SetColAttr(*args, **kwargs)
-    def SetColFormatBool(*args, **kwargs): return _grid.Grid_SetColFormatBool(*args, **kwargs)
-    def SetColFormatNumber(*args, **kwargs): return _grid.Grid_SetColFormatNumber(*args, **kwargs)
-    def SetColFormatFloat(*args, **kwargs): return _grid.Grid_SetColFormatFloat(*args, **kwargs)
-    def SetColFormatCustom(*args, **kwargs): return _grid.Grid_SetColFormatCustom(*args, **kwargs)
-    def EnableGridLines(*args, **kwargs): return _grid.Grid_EnableGridLines(*args, **kwargs)
-    def GridLinesEnabled(*args, **kwargs): return _grid.Grid_GridLinesEnabled(*args, **kwargs)
-    def GetDefaultRowSize(*args, **kwargs): return _grid.Grid_GetDefaultRowSize(*args, **kwargs)
-    def GetRowSize(*args, **kwargs): return _grid.Grid_GetRowSize(*args, **kwargs)
-    def GetDefaultColSize(*args, **kwargs): return _grid.Grid_GetDefaultColSize(*args, **kwargs)
-    def GetColSize(*args, **kwargs): return _grid.Grid_GetColSize(*args, **kwargs)
-    def GetDefaultCellBackgroundColour(*args, **kwargs): return _grid.Grid_GetDefaultCellBackgroundColour(*args, **kwargs)
-    def GetCellBackgroundColour(*args, **kwargs): return _grid.Grid_GetCellBackgroundColour(*args, **kwargs)
-    def GetDefaultCellTextColour(*args, **kwargs): return _grid.Grid_GetDefaultCellTextColour(*args, **kwargs)
-    def GetCellTextColour(*args, **kwargs): return _grid.Grid_GetCellTextColour(*args, **kwargs)
-    def GetDefaultCellFont(*args, **kwargs): return _grid.Grid_GetDefaultCellFont(*args, **kwargs)
-    def GetCellFont(*args, **kwargs): return _grid.Grid_GetCellFont(*args, **kwargs)
-    def GetDefaultCellAlignment(*args, **kwargs): return _grid.Grid_GetDefaultCellAlignment(*args, **kwargs)
-    def GetCellAlignment(*args, **kwargs): return _grid.Grid_GetCellAlignment(*args, **kwargs)
-    def GetDefaultCellOverflow(*args, **kwargs): return _grid.Grid_GetDefaultCellOverflow(*args, **kwargs)
-    def GetCellOverflow(*args, **kwargs): return _grid.Grid_GetCellOverflow(*args, **kwargs)
-    def GetCellSize(*args, **kwargs): return _grid.Grid_GetCellSize(*args, **kwargs)
-    def SetDefaultRowSize(*args, **kwargs): return _grid.Grid_SetDefaultRowSize(*args, **kwargs)
-    def SetRowSize(*args, **kwargs): return _grid.Grid_SetRowSize(*args, **kwargs)
-    def SetDefaultColSize(*args, **kwargs): return _grid.Grid_SetDefaultColSize(*args, **kwargs)
-    def SetColSize(*args, **kwargs): return _grid.Grid_SetColSize(*args, **kwargs)
-    def AutoSizeColumn(*args, **kwargs): return _grid.Grid_AutoSizeColumn(*args, **kwargs)
-    def AutoSizeRow(*args, **kwargs): return _grid.Grid_AutoSizeRow(*args, **kwargs)
-    def AutoSizeColumns(*args, **kwargs): return _grid.Grid_AutoSizeColumns(*args, **kwargs)
-    def AutoSizeRows(*args, **kwargs): return _grid.Grid_AutoSizeRows(*args, **kwargs)
-    def AutoSize(*args, **kwargs): return _grid.Grid_AutoSize(*args, **kwargs)
-    def AutoSizeRowLabelSize(*args, **kwargs): return _grid.Grid_AutoSizeRowLabelSize(*args, **kwargs)
-    def AutoSizeColLabelSize(*args, **kwargs): return _grid.Grid_AutoSizeColLabelSize(*args, **kwargs)
-    def SetColMinimalWidth(*args, **kwargs): return _grid.Grid_SetColMinimalWidth(*args, **kwargs)
-    def SetRowMinimalHeight(*args, **kwargs): return _grid.Grid_SetRowMinimalHeight(*args, **kwargs)
-    def SetColMinimalAcceptableWidth(*args, **kwargs): return _grid.Grid_SetColMinimalAcceptableWidth(*args, **kwargs)
-    def SetRowMinimalAcceptableHeight(*args, **kwargs): return _grid.Grid_SetRowMinimalAcceptableHeight(*args, **kwargs)
-    def GetColMinimalAcceptableWidth(*args, **kwargs): return _grid.Grid_GetColMinimalAcceptableWidth(*args, **kwargs)
-    def GetRowMinimalAcceptableHeight(*args, **kwargs): return _grid.Grid_GetRowMinimalAcceptableHeight(*args, **kwargs)
-    def SetDefaultCellBackgroundColour(*args, **kwargs): return _grid.Grid_SetDefaultCellBackgroundColour(*args, **kwargs)
-    def SetCellBackgroundColour(*args, **kwargs): return _grid.Grid_SetCellBackgroundColour(*args, **kwargs)
-    def SetDefaultCellTextColour(*args, **kwargs): return _grid.Grid_SetDefaultCellTextColour(*args, **kwargs)
-    def SetCellTextColour(*args, **kwargs): return _grid.Grid_SetCellTextColour(*args, **kwargs)
-    def SetDefaultCellFont(*args, **kwargs): return _grid.Grid_SetDefaultCellFont(*args, **kwargs)
-    def SetCellFont(*args, **kwargs): return _grid.Grid_SetCellFont(*args, **kwargs)
-    def SetDefaultCellAlignment(*args, **kwargs): return _grid.Grid_SetDefaultCellAlignment(*args, **kwargs)
-    def SetCellAlignment(*args, **kwargs): return _grid.Grid_SetCellAlignment(*args, **kwargs)
-    def SetDefaultCellOverflow(*args, **kwargs): return _grid.Grid_SetDefaultCellOverflow(*args, **kwargs)
-    def SetCellOverflow(*args, **kwargs): return _grid.Grid_SetCellOverflow(*args, **kwargs)
-    def SetCellSize(*args, **kwargs): return _grid.Grid_SetCellSize(*args, **kwargs)
-    def SetDefaultRenderer(*args, **kwargs): return _grid.Grid_SetDefaultRenderer(*args, **kwargs)
-    def SetCellRenderer(*args, **kwargs): return _grid.Grid_SetCellRenderer(*args, **kwargs)
-    def GetDefaultRenderer(*args, **kwargs): return _grid.Grid_GetDefaultRenderer(*args, **kwargs)
-    def GetCellRenderer(*args, **kwargs): return _grid.Grid_GetCellRenderer(*args, **kwargs)
-    def SetDefaultEditor(*args, **kwargs): return _grid.Grid_SetDefaultEditor(*args, **kwargs)
-    def SetCellEditor(*args, **kwargs): return _grid.Grid_SetCellEditor(*args, **kwargs)
-    def GetDefaultEditor(*args, **kwargs): return _grid.Grid_GetDefaultEditor(*args, **kwargs)
-    def GetCellEditor(*args, **kwargs): return _grid.Grid_GetCellEditor(*args, **kwargs)
-    def GetCellValue(*args, **kwargs): return _grid.Grid_GetCellValue(*args, **kwargs)
-    def SetCellValue(*args, **kwargs): return _grid.Grid_SetCellValue(*args, **kwargs)
-    def IsReadOnly(*args, **kwargs): return _grid.Grid_IsReadOnly(*args, **kwargs)
-    def SetReadOnly(*args, **kwargs): return _grid.Grid_SetReadOnly(*args, **kwargs)
-    def SelectRow(*args, **kwargs): return _grid.Grid_SelectRow(*args, **kwargs)
-    def SelectCol(*args, **kwargs): return _grid.Grid_SelectCol(*args, **kwargs)
-    def SelectBlock(*args, **kwargs): return _grid.Grid_SelectBlock(*args, **kwargs)
-    def SelectAll(*args, **kwargs): return _grid.Grid_SelectAll(*args, **kwargs)
-    def IsSelection(*args, **kwargs): return _grid.Grid_IsSelection(*args, **kwargs)
-    def ClearSelection(*args, **kwargs): return _grid.Grid_ClearSelection(*args, **kwargs)
-    def IsInSelection(*args, **kwargs): return _grid.Grid_IsInSelection(*args, **kwargs)
-    def GetSelectedCells(*args, **kwargs): return _grid.Grid_GetSelectedCells(*args, **kwargs)
-    def GetSelectionBlockTopLeft(*args, **kwargs): return _grid.Grid_GetSelectionBlockTopLeft(*args, **kwargs)
-    def GetSelectionBlockBottomRight(*args, **kwargs): return _grid.Grid_GetSelectionBlockBottomRight(*args, **kwargs)
-    def GetSelectedRows(*args, **kwargs): return _grid.Grid_GetSelectedRows(*args, **kwargs)
-    def GetSelectedCols(*args, **kwargs): return _grid.Grid_GetSelectedCols(*args, **kwargs)
-    def DeselectRow(*args, **kwargs): return _grid.Grid_DeselectRow(*args, **kwargs)
-    def DeselectCol(*args, **kwargs): return _grid.Grid_DeselectCol(*args, **kwargs)
-    def DeselectCell(*args, **kwargs): return _grid.Grid_DeselectCell(*args, **kwargs)
-    def BlockToDeviceRect(*args, **kwargs): return _grid.Grid_BlockToDeviceRect(*args, **kwargs)
-    def GetSelectionBackground(*args, **kwargs): return _grid.Grid_GetSelectionBackground(*args, **kwargs)
-    def GetSelectionForeground(*args, **kwargs): return _grid.Grid_GetSelectionForeground(*args, **kwargs)
-    def SetSelectionBackground(*args, **kwargs): return _grid.Grid_SetSelectionBackground(*args, **kwargs)
-    def SetSelectionForeground(*args, **kwargs): return _grid.Grid_SetSelectionForeground(*args, **kwargs)
-    def RegisterDataType(*args, **kwargs): return _grid.Grid_RegisterDataType(*args, **kwargs)
-    def GetDefaultEditorForCell(*args, **kwargs): return _grid.Grid_GetDefaultEditorForCell(*args, **kwargs)
-    def GetDefaultRendererForCell(*args, **kwargs): return _grid.Grid_GetDefaultRendererForCell(*args, **kwargs)
-    def GetDefaultEditorForType(*args, **kwargs): return _grid.Grid_GetDefaultEditorForType(*args, **kwargs)
-    def GetDefaultRendererForType(*args, **kwargs): return _grid.Grid_GetDefaultRendererForType(*args, **kwargs)
-    def SetMargins(*args, **kwargs): return _grid.Grid_SetMargins(*args, **kwargs)
-    def GetGridWindow(*args, **kwargs): return _grid.Grid_GetGridWindow(*args, **kwargs)
-    def GetGridRowLabelWindow(*args, **kwargs): return _grid.Grid_GetGridRowLabelWindow(*args, **kwargs)
-    def GetGridColLabelWindow(*args, **kwargs): return _grid.Grid_GetGridColLabelWindow(*args, **kwargs)
-    def GetGridCornerLabelWindow(*args, **kwargs): return _grid.Grid_GetGridCornerLabelWindow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGrid instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def CreateGrid(*args, **kwargs):
+        """CreateGrid(int numRows, int numCols, WXGRIDSELECTIONMODES selmode=wxGridSelectCells) -> bool"""
+        return _grid.Grid_CreateGrid(*args, **kwargs)
+
+    def SetSelectionMode(*args, **kwargs):
+        """SetSelectionMode(WXGRIDSELECTIONMODES selmode)"""
+        return _grid.Grid_SetSelectionMode(*args, **kwargs)
+
+    def GetSelectionMode(*args, **kwargs):
+        """GetSelectionMode() -> WXGRIDSELECTIONMODES"""
+        return _grid.Grid_GetSelectionMode(*args, **kwargs)
+
+    def GetNumberRows(*args, **kwargs):
+        """GetNumberRows() -> int"""
+        return _grid.Grid_GetNumberRows(*args, **kwargs)
+
+    def GetNumberCols(*args, **kwargs):
+        """GetNumberCols() -> int"""
+        return _grid.Grid_GetNumberCols(*args, **kwargs)
+
+    def ProcessTableMessage(*args, **kwargs):
+        """ProcessTableMessage(GridTableMessage ??) -> bool"""
+        return _grid.Grid_ProcessTableMessage(*args, **kwargs)
+
+    def GetTable(*args, **kwargs):
+        """GetTable() -> GridTableBase"""
+        return _grid.Grid_GetTable(*args, **kwargs)
+
+    def SetTable(*args, **kwargs):
+        """SetTable(GridTableBase table, bool takeOwnership=False, WXGRIDSELECTIONMODES selmode=wxGridSelectCells) -> bool"""
+        return _grid.Grid_SetTable(*args, **kwargs)
+
+    def ClearGrid(*args, **kwargs):
+        """ClearGrid()"""
+        return _grid.Grid_ClearGrid(*args, **kwargs)
+
+    def InsertRows(*args, **kwargs):
+        """InsertRows(int pos=0, int numRows=1, bool updateLabels=True) -> bool"""
+        return _grid.Grid_InsertRows(*args, **kwargs)
+
+    def AppendRows(*args, **kwargs):
+        """AppendRows(int numRows=1, bool updateLabels=True) -> bool"""
+        return _grid.Grid_AppendRows(*args, **kwargs)
+
+    def DeleteRows(*args, **kwargs):
+        """DeleteRows(int pos=0, int numRows=1, bool updateLabels=True) -> bool"""
+        return _grid.Grid_DeleteRows(*args, **kwargs)
+
+    def InsertCols(*args, **kwargs):
+        """InsertCols(int pos=0, int numCols=1, bool updateLabels=True) -> bool"""
+        return _grid.Grid_InsertCols(*args, **kwargs)
+
+    def AppendCols(*args, **kwargs):
+        """AppendCols(int numCols=1, bool updateLabels=True) -> bool"""
+        return _grid.Grid_AppendCols(*args, **kwargs)
+
+    def DeleteCols(*args, **kwargs):
+        """DeleteCols(int pos=0, int numCols=1, bool updateLabels=True) -> bool"""
+        return _grid.Grid_DeleteCols(*args, **kwargs)
+
+    def DrawCellHighlight(*args, **kwargs):
+        """DrawCellHighlight(wxDC dc, GridCellAttr attr)"""
+        return _grid.Grid_DrawCellHighlight(*args, **kwargs)
+
+    def DrawTextRectangle(*args, **kwargs):
+        """DrawTextRectangle(wxDC dc, wxString ??, Rect ??, int horizontalAlignment=LEFT, 
+    int verticalAlignment=TOP, int textOrientation=HORIZONTAL)"""
+        return _grid.Grid_DrawTextRectangle(*args, **kwargs)
+
+    def GetTextBoxSize(*args, **kwargs):
+        """GetTextBoxSize(wxDC dc, wxArrayString lines, long OUTPUT, long OUTPUT)"""
+        return _grid.Grid_GetTextBoxSize(*args, **kwargs)
+
+    def BeginBatch(*args, **kwargs):
+        """BeginBatch()"""
+        return _grid.Grid_BeginBatch(*args, **kwargs)
+
+    def EndBatch(*args, **kwargs):
+        """EndBatch()"""
+        return _grid.Grid_EndBatch(*args, **kwargs)
+
+    def GetBatchCount(*args, **kwargs):
+        """GetBatchCount() -> int"""
+        return _grid.Grid_GetBatchCount(*args, **kwargs)
+
+    def ForceRefresh(*args, **kwargs):
+        """ForceRefresh()"""
+        return _grid.Grid_ForceRefresh(*args, **kwargs)
+
+    def Refresh(*args, **kwargs):
+        """Refresh(bool eraseb=True, Rect rect=None)"""
+        return _grid.Grid_Refresh(*args, **kwargs)
+
+    def IsEditable(*args, **kwargs):
+        """IsEditable() -> bool"""
+        return _grid.Grid_IsEditable(*args, **kwargs)
+
+    def EnableEditing(*args, **kwargs):
+        """EnableEditing(bool edit)"""
+        return _grid.Grid_EnableEditing(*args, **kwargs)
+
+    def EnableCellEditControl(*args, **kwargs):
+        """EnableCellEditControl(bool enable=True)"""
+        return _grid.Grid_EnableCellEditControl(*args, **kwargs)
+
+    def DisableCellEditControl(*args, **kwargs):
+        """DisableCellEditControl()"""
+        return _grid.Grid_DisableCellEditControl(*args, **kwargs)
+
+    def CanEnableCellControl(*args, **kwargs):
+        """CanEnableCellControl() -> bool"""
+        return _grid.Grid_CanEnableCellControl(*args, **kwargs)
+
+    def IsCellEditControlEnabled(*args, **kwargs):
+        """IsCellEditControlEnabled() -> bool"""
+        return _grid.Grid_IsCellEditControlEnabled(*args, **kwargs)
+
+    def IsCellEditControlShown(*args, **kwargs):
+        """IsCellEditControlShown() -> bool"""
+        return _grid.Grid_IsCellEditControlShown(*args, **kwargs)
+
+    def IsCurrentCellReadOnly(*args, **kwargs):
+        """IsCurrentCellReadOnly() -> bool"""
+        return _grid.Grid_IsCurrentCellReadOnly(*args, **kwargs)
+
+    def ShowCellEditControl(*args, **kwargs):
+        """ShowCellEditControl()"""
+        return _grid.Grid_ShowCellEditControl(*args, **kwargs)
+
+    def HideCellEditControl(*args, **kwargs):
+        """HideCellEditControl()"""
+        return _grid.Grid_HideCellEditControl(*args, **kwargs)
+
+    def SaveEditControlValue(*args, **kwargs):
+        """SaveEditControlValue()"""
+        return _grid.Grid_SaveEditControlValue(*args, **kwargs)
+
+    def XYToCell(*args, **kwargs):
+        """XYToCell(int x, int y) -> GridCellCoords"""
+        return _grid.Grid_XYToCell(*args, **kwargs)
+
+    def YToRow(*args, **kwargs):
+        """YToRow(int y) -> int"""
+        return _grid.Grid_YToRow(*args, **kwargs)
+
+    def XToCol(*args, **kwargs):
+        """XToCol(int x) -> int"""
+        return _grid.Grid_XToCol(*args, **kwargs)
+
+    def YToEdgeOfRow(*args, **kwargs):
+        """YToEdgeOfRow(int y) -> int"""
+        return _grid.Grid_YToEdgeOfRow(*args, **kwargs)
+
+    def XToEdgeOfCol(*args, **kwargs):
+        """XToEdgeOfCol(int x) -> int"""
+        return _grid.Grid_XToEdgeOfCol(*args, **kwargs)
+
+    def CellToRect(*args, **kwargs):
+        """CellToRect(int row, int col) -> Rect"""
+        return _grid.Grid_CellToRect(*args, **kwargs)
+
+    def GetGridCursorRow(*args, **kwargs):
+        """GetGridCursorRow() -> int"""
+        return _grid.Grid_GetGridCursorRow(*args, **kwargs)
+
+    def GetGridCursorCol(*args, **kwargs):
+        """GetGridCursorCol() -> int"""
+        return _grid.Grid_GetGridCursorCol(*args, **kwargs)
+
+    def IsVisible(*args, **kwargs):
+        """IsVisible(int row, int col, bool wholeCellVisible=True) -> bool"""
+        return _grid.Grid_IsVisible(*args, **kwargs)
+
+    def MakeCellVisible(*args, **kwargs):
+        """MakeCellVisible(int row, int col)"""
+        return _grid.Grid_MakeCellVisible(*args, **kwargs)
+
+    def SetGridCursor(*args, **kwargs):
+        """SetGridCursor(int row, int col)"""
+        return _grid.Grid_SetGridCursor(*args, **kwargs)
+
+    def MoveCursorUp(*args, **kwargs):
+        """MoveCursorUp(bool expandSelection) -> bool"""
+        return _grid.Grid_MoveCursorUp(*args, **kwargs)
+
+    def MoveCursorDown(*args, **kwargs):
+        """MoveCursorDown(bool expandSelection) -> bool"""
+        return _grid.Grid_MoveCursorDown(*args, **kwargs)
+
+    def MoveCursorLeft(*args, **kwargs):
+        """MoveCursorLeft(bool expandSelection) -> bool"""
+        return _grid.Grid_MoveCursorLeft(*args, **kwargs)
+
+    def MoveCursorRight(*args, **kwargs):
+        """MoveCursorRight(bool expandSelection) -> bool"""
+        return _grid.Grid_MoveCursorRight(*args, **kwargs)
+
+    def MovePageDown(*args, **kwargs):
+        """MovePageDown() -> bool"""
+        return _grid.Grid_MovePageDown(*args, **kwargs)
+
+    def MovePageUp(*args, **kwargs):
+        """MovePageUp() -> bool"""
+        return _grid.Grid_MovePageUp(*args, **kwargs)
+
+    def MoveCursorUpBlock(*args, **kwargs):
+        """MoveCursorUpBlock(bool expandSelection) -> bool"""
+        return _grid.Grid_MoveCursorUpBlock(*args, **kwargs)
+
+    def MoveCursorDownBlock(*args, **kwargs):
+        """MoveCursorDownBlock(bool expandSelection) -> bool"""
+        return _grid.Grid_MoveCursorDownBlock(*args, **kwargs)
+
+    def MoveCursorLeftBlock(*args, **kwargs):
+        """MoveCursorLeftBlock(bool expandSelection) -> bool"""
+        return _grid.Grid_MoveCursorLeftBlock(*args, **kwargs)
+
+    def MoveCursorRightBlock(*args, **kwargs):
+        """MoveCursorRightBlock(bool expandSelection) -> bool"""
+        return _grid.Grid_MoveCursorRightBlock(*args, **kwargs)
+
+    def GetDefaultRowLabelSize(*args, **kwargs):
+        """GetDefaultRowLabelSize() -> int"""
+        return _grid.Grid_GetDefaultRowLabelSize(*args, **kwargs)
+
+    def GetRowLabelSize(*args, **kwargs):
+        """GetRowLabelSize() -> int"""
+        return _grid.Grid_GetRowLabelSize(*args, **kwargs)
+
+    def GetDefaultColLabelSize(*args, **kwargs):
+        """GetDefaultColLabelSize() -> int"""
+        return _grid.Grid_GetDefaultColLabelSize(*args, **kwargs)
+
+    def GetColLabelSize(*args, **kwargs):
+        """GetColLabelSize() -> int"""
+        return _grid.Grid_GetColLabelSize(*args, **kwargs)
+
+    def GetLabelBackgroundColour(*args, **kwargs):
+        """GetLabelBackgroundColour() -> wxColour"""
+        return _grid.Grid_GetLabelBackgroundColour(*args, **kwargs)
+
+    def GetLabelTextColour(*args, **kwargs):
+        """GetLabelTextColour() -> wxColour"""
+        return _grid.Grid_GetLabelTextColour(*args, **kwargs)
+
+    def GetLabelFont(*args, **kwargs):
+        """GetLabelFont() -> wxFont"""
+        return _grid.Grid_GetLabelFont(*args, **kwargs)
+
+    def GetRowLabelAlignment(*args, **kwargs):
+        """GetRowLabelAlignment(int OUTPUT, int OUTPUT)"""
+        return _grid.Grid_GetRowLabelAlignment(*args, **kwargs)
+
+    def GetColLabelAlignment(*args, **kwargs):
+        """GetColLabelAlignment(int OUTPUT, int OUTPUT)"""
+        return _grid.Grid_GetColLabelAlignment(*args, **kwargs)
+
+    def GetColLabelTextOrientation(*args, **kwargs):
+        """GetColLabelTextOrientation() -> int"""
+        return _grid.Grid_GetColLabelTextOrientation(*args, **kwargs)
+
+    def GetRowLabelValue(*args, **kwargs):
+        """GetRowLabelValue(int row) -> wxString"""
+        return _grid.Grid_GetRowLabelValue(*args, **kwargs)
+
+    def GetColLabelValue(*args, **kwargs):
+        """GetColLabelValue(int col) -> wxString"""
+        return _grid.Grid_GetColLabelValue(*args, **kwargs)
+
+    def GetGridLineColour(*args, **kwargs):
+        """GetGridLineColour() -> wxColour"""
+        return _grid.Grid_GetGridLineColour(*args, **kwargs)
+
+    def GetCellHighlightColour(*args, **kwargs):
+        """GetCellHighlightColour() -> wxColour"""
+        return _grid.Grid_GetCellHighlightColour(*args, **kwargs)
+
+    def GetCellHighlightPenWidth(*args, **kwargs):
+        """GetCellHighlightPenWidth() -> int"""
+        return _grid.Grid_GetCellHighlightPenWidth(*args, **kwargs)
+
+    def GetCellHighlightROPenWidth(*args, **kwargs):
+        """GetCellHighlightROPenWidth() -> int"""
+        return _grid.Grid_GetCellHighlightROPenWidth(*args, **kwargs)
+
+    def SetRowLabelSize(*args, **kwargs):
+        """SetRowLabelSize(int width)"""
+        return _grid.Grid_SetRowLabelSize(*args, **kwargs)
+
+    def SetColLabelSize(*args, **kwargs):
+        """SetColLabelSize(int height)"""
+        return _grid.Grid_SetColLabelSize(*args, **kwargs)
+
+    def SetLabelBackgroundColour(*args, **kwargs):
+        """SetLabelBackgroundColour(wxColour ??)"""
+        return _grid.Grid_SetLabelBackgroundColour(*args, **kwargs)
+
+    def SetLabelTextColour(*args, **kwargs):
+        """SetLabelTextColour(wxColour ??)"""
+        return _grid.Grid_SetLabelTextColour(*args, **kwargs)
+
+    def SetLabelFont(*args, **kwargs):
+        """SetLabelFont(wxFont ??)"""
+        return _grid.Grid_SetLabelFont(*args, **kwargs)
+
+    def SetRowLabelAlignment(*args, **kwargs):
+        """SetRowLabelAlignment(int horiz, int vert)"""
+        return _grid.Grid_SetRowLabelAlignment(*args, **kwargs)
+
+    def SetColLabelAlignment(*args, **kwargs):
+        """SetColLabelAlignment(int horiz, int vert)"""
+        return _grid.Grid_SetColLabelAlignment(*args, **kwargs)
+
+    def SetColLabelTextOrientation(*args, **kwargs):
+        """SetColLabelTextOrientation(int textOrientation)"""
+        return _grid.Grid_SetColLabelTextOrientation(*args, **kwargs)
+
+    def SetRowLabelValue(*args, **kwargs):
+        """SetRowLabelValue(int row, wxString ??)"""
+        return _grid.Grid_SetRowLabelValue(*args, **kwargs)
+
+    def SetColLabelValue(*args, **kwargs):
+        """SetColLabelValue(int col, wxString ??)"""
+        return _grid.Grid_SetColLabelValue(*args, **kwargs)
+
+    def SetGridLineColour(*args, **kwargs):
+        """SetGridLineColour(wxColour ??)"""
+        return _grid.Grid_SetGridLineColour(*args, **kwargs)
+
+    def SetCellHighlightColour(*args, **kwargs):
+        """SetCellHighlightColour(wxColour ??)"""
+        return _grid.Grid_SetCellHighlightColour(*args, **kwargs)
+
+    def SetCellHighlightPenWidth(*args, **kwargs):
+        """SetCellHighlightPenWidth(int width)"""
+        return _grid.Grid_SetCellHighlightPenWidth(*args, **kwargs)
+
+    def SetCellHighlightROPenWidth(*args, **kwargs):
+        """SetCellHighlightROPenWidth(int width)"""
+        return _grid.Grid_SetCellHighlightROPenWidth(*args, **kwargs)
+
+    def EnableDragRowSize(*args, **kwargs):
+        """EnableDragRowSize(bool enable=True)"""
+        return _grid.Grid_EnableDragRowSize(*args, **kwargs)
+
+    def DisableDragRowSize(*args, **kwargs):
+        """DisableDragRowSize()"""
+        return _grid.Grid_DisableDragRowSize(*args, **kwargs)
+
+    def CanDragRowSize(*args, **kwargs):
+        """CanDragRowSize() -> bool"""
+        return _grid.Grid_CanDragRowSize(*args, **kwargs)
+
+    def EnableDragColSize(*args, **kwargs):
+        """EnableDragColSize(bool enable=True)"""
+        return _grid.Grid_EnableDragColSize(*args, **kwargs)
+
+    def DisableDragColSize(*args, **kwargs):
+        """DisableDragColSize()"""
+        return _grid.Grid_DisableDragColSize(*args, **kwargs)
+
+    def CanDragColSize(*args, **kwargs):
+        """CanDragColSize() -> bool"""
+        return _grid.Grid_CanDragColSize(*args, **kwargs)
+
+    def EnableDragGridSize(*args, **kwargs):
+        """EnableDragGridSize(bool enable=True)"""
+        return _grid.Grid_EnableDragGridSize(*args, **kwargs)
+
+    def DisableDragGridSize(*args, **kwargs):
+        """DisableDragGridSize()"""
+        return _grid.Grid_DisableDragGridSize(*args, **kwargs)
+
+    def CanDragGridSize(*args, **kwargs):
+        """CanDragGridSize() -> bool"""
+        return _grid.Grid_CanDragGridSize(*args, **kwargs)
+
+    def SetAttr(*args, **kwargs):
+        """SetAttr(int row, int col, GridCellAttr attr)"""
+        return _grid.Grid_SetAttr(*args, **kwargs)
+
+    def SetRowAttr(*args, **kwargs):
+        """SetRowAttr(int row, GridCellAttr attr)"""
+        return _grid.Grid_SetRowAttr(*args, **kwargs)
+
+    def SetColAttr(*args, **kwargs):
+        """SetColAttr(int col, GridCellAttr attr)"""
+        return _grid.Grid_SetColAttr(*args, **kwargs)
+
+    def SetColFormatBool(*args, **kwargs):
+        """SetColFormatBool(int col)"""
+        return _grid.Grid_SetColFormatBool(*args, **kwargs)
+
+    def SetColFormatNumber(*args, **kwargs):
+        """SetColFormatNumber(int col)"""
+        return _grid.Grid_SetColFormatNumber(*args, **kwargs)
+
+    def SetColFormatFloat(*args, **kwargs):
+        """SetColFormatFloat(int col, int width=-1, int precision=-1)"""
+        return _grid.Grid_SetColFormatFloat(*args, **kwargs)
+
+    def SetColFormatCustom(*args, **kwargs):
+        """SetColFormatCustom(int col, wxString typeName)"""
+        return _grid.Grid_SetColFormatCustom(*args, **kwargs)
+
+    def EnableGridLines(*args, **kwargs):
+        """EnableGridLines(bool enable=True)"""
+        return _grid.Grid_EnableGridLines(*args, **kwargs)
+
+    def GridLinesEnabled(*args, **kwargs):
+        """GridLinesEnabled() -> bool"""
+        return _grid.Grid_GridLinesEnabled(*args, **kwargs)
+
+    def GetDefaultRowSize(*args, **kwargs):
+        """GetDefaultRowSize() -> int"""
+        return _grid.Grid_GetDefaultRowSize(*args, **kwargs)
+
+    def GetRowSize(*args, **kwargs):
+        """GetRowSize(int row) -> int"""
+        return _grid.Grid_GetRowSize(*args, **kwargs)
+
+    def GetDefaultColSize(*args, **kwargs):
+        """GetDefaultColSize() -> int"""
+        return _grid.Grid_GetDefaultColSize(*args, **kwargs)
+
+    def GetColSize(*args, **kwargs):
+        """GetColSize(int col) -> int"""
+        return _grid.Grid_GetColSize(*args, **kwargs)
+
+    def GetDefaultCellBackgroundColour(*args, **kwargs):
+        """GetDefaultCellBackgroundColour() -> wxColour"""
+        return _grid.Grid_GetDefaultCellBackgroundColour(*args, **kwargs)
+
+    def GetCellBackgroundColour(*args, **kwargs):
+        """GetCellBackgroundColour(int row, int col) -> wxColour"""
+        return _grid.Grid_GetCellBackgroundColour(*args, **kwargs)
+
+    def GetDefaultCellTextColour(*args, **kwargs):
+        """GetDefaultCellTextColour() -> wxColour"""
+        return _grid.Grid_GetDefaultCellTextColour(*args, **kwargs)
+
+    def GetCellTextColour(*args, **kwargs):
+        """GetCellTextColour(int row, int col) -> wxColour"""
+        return _grid.Grid_GetCellTextColour(*args, **kwargs)
+
+    def GetDefaultCellFont(*args, **kwargs):
+        """GetDefaultCellFont() -> wxFont"""
+        return _grid.Grid_GetDefaultCellFont(*args, **kwargs)
+
+    def GetCellFont(*args, **kwargs):
+        """GetCellFont(int row, int col) -> wxFont"""
+        return _grid.Grid_GetCellFont(*args, **kwargs)
+
+    def GetDefaultCellAlignment(*args, **kwargs):
+        """GetDefaultCellAlignment(int OUTPUT, int OUTPUT)"""
+        return _grid.Grid_GetDefaultCellAlignment(*args, **kwargs)
+
+    def GetCellAlignment(*args, **kwargs):
+        """GetCellAlignment(int row, int col, int OUTPUT, int OUTPUT)"""
+        return _grid.Grid_GetCellAlignment(*args, **kwargs)
+
+    def GetDefaultCellOverflow(*args, **kwargs):
+        """GetDefaultCellOverflow() -> bool"""
+        return _grid.Grid_GetDefaultCellOverflow(*args, **kwargs)
+
+    def GetCellOverflow(*args, **kwargs):
+        """GetCellOverflow(int row, int col) -> bool"""
+        return _grid.Grid_GetCellOverflow(*args, **kwargs)
+
+    def GetCellSize(*args, **kwargs):
+        """GetCellSize(int row, int col, int OUTPUT, int OUTPUT)"""
+        return _grid.Grid_GetCellSize(*args, **kwargs)
+
+    def SetDefaultRowSize(*args, **kwargs):
+        """SetDefaultRowSize(int height, bool resizeExistingRows=False)"""
+        return _grid.Grid_SetDefaultRowSize(*args, **kwargs)
+
+    def SetRowSize(*args, **kwargs):
+        """SetRowSize(int row, int height)"""
+        return _grid.Grid_SetRowSize(*args, **kwargs)
+
+    def SetDefaultColSize(*args, **kwargs):
+        """SetDefaultColSize(int width, bool resizeExistingCols=False)"""
+        return _grid.Grid_SetDefaultColSize(*args, **kwargs)
+
+    def SetColSize(*args, **kwargs):
+        """SetColSize(int col, int width)"""
+        return _grid.Grid_SetColSize(*args, **kwargs)
+
+    def AutoSizeColumn(*args, **kwargs):
+        """AutoSizeColumn(int col, bool setAsMin=True)"""
+        return _grid.Grid_AutoSizeColumn(*args, **kwargs)
+
+    def AutoSizeRow(*args, **kwargs):
+        """AutoSizeRow(int row, bool setAsMin=True)"""
+        return _grid.Grid_AutoSizeRow(*args, **kwargs)
+
+    def AutoSizeColumns(*args, **kwargs):
+        """AutoSizeColumns(bool setAsMin=True)"""
+        return _grid.Grid_AutoSizeColumns(*args, **kwargs)
+
+    def AutoSizeRows(*args, **kwargs):
+        """AutoSizeRows(bool setAsMin=True)"""
+        return _grid.Grid_AutoSizeRows(*args, **kwargs)
+
+    def AutoSize(*args, **kwargs):
+        """AutoSize()"""
+        return _grid.Grid_AutoSize(*args, **kwargs)
+
+    def AutoSizeRowLabelSize(*args, **kwargs):
+        """AutoSizeRowLabelSize(int row)"""
+        return _grid.Grid_AutoSizeRowLabelSize(*args, **kwargs)
+
+    def AutoSizeColLabelSize(*args, **kwargs):
+        """AutoSizeColLabelSize(int col)"""
+        return _grid.Grid_AutoSizeColLabelSize(*args, **kwargs)
+
+    def SetColMinimalWidth(*args, **kwargs):
+        """SetColMinimalWidth(int col, int width)"""
+        return _grid.Grid_SetColMinimalWidth(*args, **kwargs)
+
+    def SetRowMinimalHeight(*args, **kwargs):
+        """SetRowMinimalHeight(int row, int width)"""
+        return _grid.Grid_SetRowMinimalHeight(*args, **kwargs)
+
+    def SetColMinimalAcceptableWidth(*args, **kwargs):
+        """SetColMinimalAcceptableWidth(int width)"""
+        return _grid.Grid_SetColMinimalAcceptableWidth(*args, **kwargs)
+
+    def SetRowMinimalAcceptableHeight(*args, **kwargs):
+        """SetRowMinimalAcceptableHeight(int width)"""
+        return _grid.Grid_SetRowMinimalAcceptableHeight(*args, **kwargs)
+
+    def GetColMinimalAcceptableWidth(*args, **kwargs):
+        """GetColMinimalAcceptableWidth() -> int"""
+        return _grid.Grid_GetColMinimalAcceptableWidth(*args, **kwargs)
+
+    def GetRowMinimalAcceptableHeight(*args, **kwargs):
+        """GetRowMinimalAcceptableHeight() -> int"""
+        return _grid.Grid_GetRowMinimalAcceptableHeight(*args, **kwargs)
+
+    def SetDefaultCellBackgroundColour(*args, **kwargs):
+        """SetDefaultCellBackgroundColour(wxColour ??)"""
+        return _grid.Grid_SetDefaultCellBackgroundColour(*args, **kwargs)
+
+    def SetCellBackgroundColour(*args, **kwargs):
+        """SetCellBackgroundColour(int row, int col, wxColour ??)"""
+        return _grid.Grid_SetCellBackgroundColour(*args, **kwargs)
+
+    def SetDefaultCellTextColour(*args, **kwargs):
+        """SetDefaultCellTextColour(wxColour ??)"""
+        return _grid.Grid_SetDefaultCellTextColour(*args, **kwargs)
+
+    def SetCellTextColour(*args, **kwargs):
+        """SetCellTextColour(int row, int col, wxColour ??)"""
+        return _grid.Grid_SetCellTextColour(*args, **kwargs)
+
+    def SetDefaultCellFont(*args, **kwargs):
+        """SetDefaultCellFont(wxFont ??)"""
+        return _grid.Grid_SetDefaultCellFont(*args, **kwargs)
+
+    def SetCellFont(*args, **kwargs):
+        """SetCellFont(int row, int col, wxFont ??)"""
+        return _grid.Grid_SetCellFont(*args, **kwargs)
+
+    def SetDefaultCellAlignment(*args, **kwargs):
+        """SetDefaultCellAlignment(int horiz, int vert)"""
+        return _grid.Grid_SetDefaultCellAlignment(*args, **kwargs)
+
+    def SetCellAlignment(*args, **kwargs):
+        """SetCellAlignment(int row, int col, int horiz, int vert)"""
+        return _grid.Grid_SetCellAlignment(*args, **kwargs)
+
+    def SetDefaultCellOverflow(*args, **kwargs):
+        """SetDefaultCellOverflow(bool allow)"""
+        return _grid.Grid_SetDefaultCellOverflow(*args, **kwargs)
+
+    def SetCellOverflow(*args, **kwargs):
+        """SetCellOverflow(int row, int col, bool allow)"""
+        return _grid.Grid_SetCellOverflow(*args, **kwargs)
+
+    def SetCellSize(*args, **kwargs):
+        """SetCellSize(int row, int col, int num_rows, int num_cols)"""
+        return _grid.Grid_SetCellSize(*args, **kwargs)
+
+    def SetDefaultRenderer(*args, **kwargs):
+        """SetDefaultRenderer(GridCellRenderer renderer)"""
+        return _grid.Grid_SetDefaultRenderer(*args, **kwargs)
+
+    def SetCellRenderer(*args, **kwargs):
+        """SetCellRenderer(int row, int col, GridCellRenderer renderer)"""
+        return _grid.Grid_SetCellRenderer(*args, **kwargs)
+
+    def GetDefaultRenderer(*args, **kwargs):
+        """GetDefaultRenderer() -> GridCellRenderer"""
+        return _grid.Grid_GetDefaultRenderer(*args, **kwargs)
+
+    def GetCellRenderer(*args, **kwargs):
+        """GetCellRenderer(int row, int col) -> GridCellRenderer"""
+        return _grid.Grid_GetCellRenderer(*args, **kwargs)
+
+    def SetDefaultEditor(*args, **kwargs):
+        """SetDefaultEditor(GridCellEditor editor)"""
+        return _grid.Grid_SetDefaultEditor(*args, **kwargs)
+
+    def SetCellEditor(*args, **kwargs):
+        """SetCellEditor(int row, int col, GridCellEditor editor)"""
+        return _grid.Grid_SetCellEditor(*args, **kwargs)
+
+    def GetDefaultEditor(*args, **kwargs):
+        """GetDefaultEditor() -> GridCellEditor"""
+        return _grid.Grid_GetDefaultEditor(*args, **kwargs)
+
+    def GetCellEditor(*args, **kwargs):
+        """GetCellEditor(int row, int col) -> GridCellEditor"""
+        return _grid.Grid_GetCellEditor(*args, **kwargs)
+
+    def GetCellValue(*args, **kwargs):
+        """GetCellValue(int row, int col) -> wxString"""
+        return _grid.Grid_GetCellValue(*args, **kwargs)
+
+    def SetCellValue(*args, **kwargs):
+        """SetCellValue(int row, int col, wxString s)"""
+        return _grid.Grid_SetCellValue(*args, **kwargs)
+
+    def IsReadOnly(*args, **kwargs):
+        """IsReadOnly(int row, int col) -> bool"""
+        return _grid.Grid_IsReadOnly(*args, **kwargs)
+
+    def SetReadOnly(*args, **kwargs):
+        """SetReadOnly(int row, int col, bool isReadOnly=True)"""
+        return _grid.Grid_SetReadOnly(*args, **kwargs)
+
+    def SelectRow(*args, **kwargs):
+        """SelectRow(int row, bool addToSelected=False)"""
+        return _grid.Grid_SelectRow(*args, **kwargs)
+
+    def SelectCol(*args, **kwargs):
+        """SelectCol(int col, bool addToSelected=False)"""
+        return _grid.Grid_SelectCol(*args, **kwargs)
+
+    def SelectBlock(*args, **kwargs):
+        """SelectBlock(int topRow, int leftCol, int bottomRow, int rightCol, 
+    bool addToSelected=False)"""
+        return _grid.Grid_SelectBlock(*args, **kwargs)
+
+    def SelectAll(*args, **kwargs):
+        """SelectAll()"""
+        return _grid.Grid_SelectAll(*args, **kwargs)
+
+    def IsSelection(*args, **kwargs):
+        """IsSelection() -> bool"""
+        return _grid.Grid_IsSelection(*args, **kwargs)
+
+    def ClearSelection(*args, **kwargs):
+        """ClearSelection()"""
+        return _grid.Grid_ClearSelection(*args, **kwargs)
+
+    def IsInSelection(*args, **kwargs):
+        """IsInSelection(int row, int col) -> bool"""
+        return _grid.Grid_IsInSelection(*args, **kwargs)
+
+    def GetSelectedCells(*args, **kwargs):
+        """GetSelectedCells() -> wxGridCellCoordsArray"""
+        return _grid.Grid_GetSelectedCells(*args, **kwargs)
+
+    def GetSelectionBlockTopLeft(*args, **kwargs):
+        """GetSelectionBlockTopLeft() -> wxGridCellCoordsArray"""
+        return _grid.Grid_GetSelectionBlockTopLeft(*args, **kwargs)
+
+    def GetSelectionBlockBottomRight(*args, **kwargs):
+        """GetSelectionBlockBottomRight() -> wxGridCellCoordsArray"""
+        return _grid.Grid_GetSelectionBlockBottomRight(*args, **kwargs)
+
+    def GetSelectedRows(*args, **kwargs):
+        """GetSelectedRows() -> wxArrayInt"""
+        return _grid.Grid_GetSelectedRows(*args, **kwargs)
+
+    def GetSelectedCols(*args, **kwargs):
+        """GetSelectedCols() -> wxArrayInt"""
+        return _grid.Grid_GetSelectedCols(*args, **kwargs)
+
+    def DeselectRow(*args, **kwargs):
+        """DeselectRow(int row)"""
+        return _grid.Grid_DeselectRow(*args, **kwargs)
+
+    def DeselectCol(*args, **kwargs):
+        """DeselectCol(int col)"""
+        return _grid.Grid_DeselectCol(*args, **kwargs)
+
+    def DeselectCell(*args, **kwargs):
+        """DeselectCell(int row, int col)"""
+        return _grid.Grid_DeselectCell(*args, **kwargs)
+
+    def BlockToDeviceRect(*args, **kwargs):
+        """BlockToDeviceRect(GridCellCoords topLeft, GridCellCoords bottomRight) -> Rect"""
+        return _grid.Grid_BlockToDeviceRect(*args, **kwargs)
+
+    def GetSelectionBackground(*args, **kwargs):
+        """GetSelectionBackground() -> wxColour"""
+        return _grid.Grid_GetSelectionBackground(*args, **kwargs)
+
+    def GetSelectionForeground(*args, **kwargs):
+        """GetSelectionForeground() -> wxColour"""
+        return _grid.Grid_GetSelectionForeground(*args, **kwargs)
+
+    def SetSelectionBackground(*args, **kwargs):
+        """SetSelectionBackground(wxColour c)"""
+        return _grid.Grid_SetSelectionBackground(*args, **kwargs)
+
+    def SetSelectionForeground(*args, **kwargs):
+        """SetSelectionForeground(wxColour c)"""
+        return _grid.Grid_SetSelectionForeground(*args, **kwargs)
+
+    def RegisterDataType(*args, **kwargs):
+        """RegisterDataType(wxString typeName, GridCellRenderer renderer, GridCellEditor editor)"""
+        return _grid.Grid_RegisterDataType(*args, **kwargs)
+
+    def GetDefaultEditorForCell(*args, **kwargs):
+        """GetDefaultEditorForCell(int row, int col) -> GridCellEditor"""
+        return _grid.Grid_GetDefaultEditorForCell(*args, **kwargs)
+
+    def GetDefaultRendererForCell(*args, **kwargs):
+        """GetDefaultRendererForCell(int row, int col) -> GridCellRenderer"""
+        return _grid.Grid_GetDefaultRendererForCell(*args, **kwargs)
+
+    def GetDefaultEditorForType(*args, **kwargs):
+        """GetDefaultEditorForType(wxString typeName) -> GridCellEditor"""
+        return _grid.Grid_GetDefaultEditorForType(*args, **kwargs)
+
+    def GetDefaultRendererForType(*args, **kwargs):
+        """GetDefaultRendererForType(wxString typeName) -> GridCellRenderer"""
+        return _grid.Grid_GetDefaultRendererForType(*args, **kwargs)
+
+    def SetMargins(*args, **kwargs):
+        """SetMargins(int extraWidth, int extraHeight)"""
+        return _grid.Grid_SetMargins(*args, **kwargs)
+
+    def GetGridWindow(*args, **kwargs):
+        """GetGridWindow() -> Window"""
+        return _grid.Grid_GetGridWindow(*args, **kwargs)
+
+    def GetGridRowLabelWindow(*args, **kwargs):
+        """GetGridRowLabelWindow() -> Window"""
+        return _grid.Grid_GetGridRowLabelWindow(*args, **kwargs)
+
+    def GetGridColLabelWindow(*args, **kwargs):
+        """GetGridColLabelWindow() -> Window"""
+        return _grid.Grid_GetGridColLabelWindow(*args, **kwargs)
+
+    def GetGridCornerLabelWindow(*args, **kwargs):
+        """GetGridCornerLabelWindow() -> Window"""
+        return _grid.Grid_GetGridCornerLabelWindow(*args, **kwargs)
+
 
 class GridPtr(Grid):
     def __init__(self, this):
@@ -850,21 +2007,50 @@ class GridPtr(Grid):
 _grid.Grid_swigregister(GridPtr)
 
 class GridEvent(core.NotifyEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int id, wxEventType type, Grid obj, int row=-1, int col=-1, 
+    int x=-1, int y=-1, bool sel=True, bool control=False, 
+    bool shift=False, bool alt=False, 
+    bool meta=False) -> GridEvent"""
         newobj = _grid.new_GridEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetRow(*args, **kwargs): return _grid.GridEvent_GetRow(*args, **kwargs)
-    def GetCol(*args, **kwargs): return _grid.GridEvent_GetCol(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _grid.GridEvent_GetPosition(*args, **kwargs)
-    def Selecting(*args, **kwargs): return _grid.GridEvent_Selecting(*args, **kwargs)
-    def ControlDown(*args, **kwargs): return _grid.GridEvent_ControlDown(*args, **kwargs)
-    def MetaDown(*args, **kwargs): return _grid.GridEvent_MetaDown(*args, **kwargs)
-    def ShiftDown(*args, **kwargs): return _grid.GridEvent_ShiftDown(*args, **kwargs)
-    def AltDown(*args, **kwargs): return _grid.GridEvent_AltDown(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetRow(*args, **kwargs):
+        """GetRow() -> int"""
+        return _grid.GridEvent_GetRow(*args, **kwargs)
+
+    def GetCol(*args, **kwargs):
+        """GetCol() -> int"""
+        return _grid.GridEvent_GetCol(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point"""
+        return _grid.GridEvent_GetPosition(*args, **kwargs)
+
+    def Selecting(*args, **kwargs):
+        """Selecting() -> bool"""
+        return _grid.GridEvent_Selecting(*args, **kwargs)
+
+    def ControlDown(*args, **kwargs):
+        """ControlDown() -> bool"""
+        return _grid.GridEvent_ControlDown(*args, **kwargs)
+
+    def MetaDown(*args, **kwargs):
+        """MetaDown() -> bool"""
+        return _grid.GridEvent_MetaDown(*args, **kwargs)
+
+    def ShiftDown(*args, **kwargs):
+        """ShiftDown() -> bool"""
+        return _grid.GridEvent_ShiftDown(*args, **kwargs)
+
+    def AltDown(*args, **kwargs):
+        """AltDown() -> bool"""
+        return _grid.GridEvent_AltDown(*args, **kwargs)
+
 
 class GridEventPtr(GridEvent):
     def __init__(self, this):
@@ -874,19 +2060,41 @@ class GridEventPtr(GridEvent):
 _grid.GridEvent_swigregister(GridEventPtr)
 
 class GridSizeEvent(core.NotifyEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridSizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int id, wxEventType type, Grid obj, int rowOrCol=-1, 
+    int x=-1, int y=-1, bool control=False, bool shift=False, 
+    bool alt=False, bool meta=False) -> GridSizeEvent"""
         newobj = _grid.new_GridSizeEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetRowOrCol(*args, **kwargs): return _grid.GridSizeEvent_GetRowOrCol(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _grid.GridSizeEvent_GetPosition(*args, **kwargs)
-    def ControlDown(*args, **kwargs): return _grid.GridSizeEvent_ControlDown(*args, **kwargs)
-    def MetaDown(*args, **kwargs): return _grid.GridSizeEvent_MetaDown(*args, **kwargs)
-    def ShiftDown(*args, **kwargs): return _grid.GridSizeEvent_ShiftDown(*args, **kwargs)
-    def AltDown(*args, **kwargs): return _grid.GridSizeEvent_AltDown(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridSizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetRowOrCol(*args, **kwargs):
+        """GetRowOrCol() -> int"""
+        return _grid.GridSizeEvent_GetRowOrCol(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point"""
+        return _grid.GridSizeEvent_GetPosition(*args, **kwargs)
+
+    def ControlDown(*args, **kwargs):
+        """ControlDown() -> bool"""
+        return _grid.GridSizeEvent_ControlDown(*args, **kwargs)
+
+    def MetaDown(*args, **kwargs):
+        """MetaDown() -> bool"""
+        return _grid.GridSizeEvent_MetaDown(*args, **kwargs)
+
+    def ShiftDown(*args, **kwargs):
+        """ShiftDown() -> bool"""
+        return _grid.GridSizeEvent_ShiftDown(*args, **kwargs)
+
+    def AltDown(*args, **kwargs):
+        """AltDown() -> bool"""
+        return _grid.GridSizeEvent_AltDown(*args, **kwargs)
+
 
 class GridSizeEventPtr(GridSizeEvent):
     def __init__(self, this):
@@ -896,24 +2104,62 @@ class GridSizeEventPtr(GridSizeEvent):
 _grid.GridSizeEvent_swigregister(GridSizeEventPtr)
 
 class GridRangeSelectEvent(core.NotifyEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridRangeSelectEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int id, wxEventType type, Grid obj, GridCellCoords topLeft, 
+    GridCellCoords bottomRight, bool sel=True, 
+    bool control=False, bool shift=False, 
+    bool alt=False, bool meta=False) -> GridRangeSelectEvent"""
         newobj = _grid.new_GridRangeSelectEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetTopLeftCoords(*args, **kwargs): return _grid.GridRangeSelectEvent_GetTopLeftCoords(*args, **kwargs)
-    def GetBottomRightCoords(*args, **kwargs): return _grid.GridRangeSelectEvent_GetBottomRightCoords(*args, **kwargs)
-    def GetTopRow(*args, **kwargs): return _grid.GridRangeSelectEvent_GetTopRow(*args, **kwargs)
-    def GetBottomRow(*args, **kwargs): return _grid.GridRangeSelectEvent_GetBottomRow(*args, **kwargs)
-    def GetLeftCol(*args, **kwargs): return _grid.GridRangeSelectEvent_GetLeftCol(*args, **kwargs)
-    def GetRightCol(*args, **kwargs): return _grid.GridRangeSelectEvent_GetRightCol(*args, **kwargs)
-    def Selecting(*args, **kwargs): return _grid.GridRangeSelectEvent_Selecting(*args, **kwargs)
-    def ControlDown(*args, **kwargs): return _grid.GridRangeSelectEvent_ControlDown(*args, **kwargs)
-    def MetaDown(*args, **kwargs): return _grid.GridRangeSelectEvent_MetaDown(*args, **kwargs)
-    def ShiftDown(*args, **kwargs): return _grid.GridRangeSelectEvent_ShiftDown(*args, **kwargs)
-    def AltDown(*args, **kwargs): return _grid.GridRangeSelectEvent_AltDown(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridRangeSelectEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetTopLeftCoords(*args, **kwargs):
+        """GetTopLeftCoords() -> GridCellCoords"""
+        return _grid.GridRangeSelectEvent_GetTopLeftCoords(*args, **kwargs)
+
+    def GetBottomRightCoords(*args, **kwargs):
+        """GetBottomRightCoords() -> GridCellCoords"""
+        return _grid.GridRangeSelectEvent_GetBottomRightCoords(*args, **kwargs)
+
+    def GetTopRow(*args, **kwargs):
+        """GetTopRow() -> int"""
+        return _grid.GridRangeSelectEvent_GetTopRow(*args, **kwargs)
+
+    def GetBottomRow(*args, **kwargs):
+        """GetBottomRow() -> int"""
+        return _grid.GridRangeSelectEvent_GetBottomRow(*args, **kwargs)
+
+    def GetLeftCol(*args, **kwargs):
+        """GetLeftCol() -> int"""
+        return _grid.GridRangeSelectEvent_GetLeftCol(*args, **kwargs)
+
+    def GetRightCol(*args, **kwargs):
+        """GetRightCol() -> int"""
+        return _grid.GridRangeSelectEvent_GetRightCol(*args, **kwargs)
+
+    def Selecting(*args, **kwargs):
+        """Selecting() -> bool"""
+        return _grid.GridRangeSelectEvent_Selecting(*args, **kwargs)
+
+    def ControlDown(*args, **kwargs):
+        """ControlDown() -> bool"""
+        return _grid.GridRangeSelectEvent_ControlDown(*args, **kwargs)
+
+    def MetaDown(*args, **kwargs):
+        """MetaDown() -> bool"""
+        return _grid.GridRangeSelectEvent_MetaDown(*args, **kwargs)
+
+    def ShiftDown(*args, **kwargs):
+        """ShiftDown() -> bool"""
+        return _grid.GridRangeSelectEvent_ShiftDown(*args, **kwargs)
+
+    def AltDown(*args, **kwargs):
+        """AltDown() -> bool"""
+        return _grid.GridRangeSelectEvent_AltDown(*args, **kwargs)
+
 
 class GridRangeSelectEventPtr(GridRangeSelectEvent):
     def __init__(self, this):
@@ -923,19 +2169,40 @@ class GridRangeSelectEventPtr(GridRangeSelectEvent):
 _grid.GridRangeSelectEvent_swigregister(GridRangeSelectEventPtr)
 
 class GridEditorCreatedEvent(core.CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGridEditorCreatedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int id, wxEventType type, Object obj, int row, int col, 
+    Control ctrl) -> GridEditorCreatedEvent"""
         newobj = _grid.new_GridEditorCreatedEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetRow(*args, **kwargs): return _grid.GridEditorCreatedEvent_GetRow(*args, **kwargs)
-    def GetCol(*args, **kwargs): return _grid.GridEditorCreatedEvent_GetCol(*args, **kwargs)
-    def GetControl(*args, **kwargs): return _grid.GridEditorCreatedEvent_GetControl(*args, **kwargs)
-    def SetRow(*args, **kwargs): return _grid.GridEditorCreatedEvent_SetRow(*args, **kwargs)
-    def SetCol(*args, **kwargs): return _grid.GridEditorCreatedEvent_SetCol(*args, **kwargs)
-    def SetControl(*args, **kwargs): return _grid.GridEditorCreatedEvent_SetControl(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGridEditorCreatedEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetRow(*args, **kwargs):
+        """GetRow() -> int"""
+        return _grid.GridEditorCreatedEvent_GetRow(*args, **kwargs)
+
+    def GetCol(*args, **kwargs):
+        """GetCol() -> int"""
+        return _grid.GridEditorCreatedEvent_GetCol(*args, **kwargs)
+
+    def GetControl(*args, **kwargs):
+        """GetControl() -> Control"""
+        return _grid.GridEditorCreatedEvent_GetControl(*args, **kwargs)
+
+    def SetRow(*args, **kwargs):
+        """SetRow(int row)"""
+        return _grid.GridEditorCreatedEvent_SetRow(*args, **kwargs)
+
+    def SetCol(*args, **kwargs):
+        """SetCol(int col)"""
+        return _grid.GridEditorCreatedEvent_SetCol(*args, **kwargs)
+
+    def SetControl(*args, **kwargs):
+        """SetControl(Control ctrl)"""
+        return _grid.GridEditorCreatedEvent_SetControl(*args, **kwargs)
+
 
 class GridEditorCreatedEventPtr(GridEditorCreatedEvent):
     def __init__(self, this):
diff --git a/wxPython/src/gtk/grid_wrap.cpp b/wxPython/src/gtk/grid_wrap.cpp
index 4fed3bffa2..5d38991c82 100644
--- a/wxPython/src/gtk/grid_wrap.cpp
+++ b/wxPython/src/gtk/grid_wrap.cpp
@@ -311,7 +311,7 @@ PyObject* wxPyMake_##TYPE(TYPE* source) { \
         /* Otherwise make a new wrapper for it the old fashioned way and \
            give it the OOR treatment */ \
         if (! target) { \
-            target = wxPyConstructObject(source, wxT(#TYPE), FALSE); \
+            target = wxPyConstructObject(source, wxT(#TYPE), False); \
             if (target) \
                 source->SetClientObject(new wxPyOORClientData(target)); \
         } \
@@ -867,7 +867,7 @@ public:
 
 
     bool EndEdit(int row, int col, wxGrid* grid) {
-        bool rv = FALSE;
+        bool rv = False;
         wxPyBeginBlockThreads();
         if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
             PyObject* go = wxPyMake_wxObject(grid);
@@ -1152,7 +1152,7 @@ bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) {
         if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords")))
             goto error;
         *obj = ptr;
-        return TRUE;
+        return True;
     }
     // otherwise a 2-tuple of integers is expected
     else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
@@ -1166,12 +1166,12 @@ bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) {
         **obj = wxGridCellCoords(PyInt_AsLong(o1), PyInt_AsLong(o2));
         Py_DECREF(o1);
         Py_DECREF(o2);
-        return TRUE;
+        return True;
     }
 
  error:
     PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxGridCellCoords object.");
-    return FALSE;
+    return False;
 }
 
 
@@ -1180,13 +1180,13 @@ bool wxGridCellCoords_typecheck(PyObject* source) {
     
     if (wxPySwigInstance_Check(source) &&
         wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords")))
-        return true;
+        return True;
 
     PyErr_Clear();
     if (PySequence_Check(source) && PySequence_Length(source) == 2)
-        return true;
+        return True;
     
-    return false;
+    return False;
 }
 
 
@@ -1275,7 +1275,7 @@ static PyObject *_wrap_GridCellRenderer_SetParameters(PyObject *self, PyObject *
     PyObject *resultobj;
     wxGridCellRenderer *arg1 = (wxGridCellRenderer *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1287,7 +1287,7 @@ static PyObject *_wrap_GridCellRenderer_SetParameters(PyObject *self, PyObject *
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1553,7 +1553,7 @@ static PyObject *_wrap_PyGridCellRenderer_base_SetParameters(PyObject *self, PyO
     PyObject *resultobj;
     wxPyGridCellRenderer *arg1 = (wxPyGridCellRenderer *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1565,7 +1565,7 @@ static PyObject *_wrap_PyGridCellRenderer_base_SetParameters(PyObject *self, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1819,8 +1819,6 @@ static PyObject *_wrap_new_GridCellDateTimeRenderer(PyObject *self, PyObject *ar
     wxString arg1 = (wxString) wxPyDateTimeFormatStr ;
     wxString arg2 = (wxString) wxPyDateTimeFormatStr ;
     wxGridCellDateTimeRenderer *result;
-    wxString *argp1 ;
-    wxString *argp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1829,12 +1827,20 @@ static PyObject *_wrap_new_GridCellDateTimeRenderer(PyObject *self, PyObject *ar
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridCellDateTimeRenderer",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        if ((SWIG_ConvertPtr(obj0,(void **) &argp1, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-        arg1 = *argp1; 
+        {
+            wxString* sptr = wxString_in_helper(obj0);
+            if (sptr == NULL) SWIG_fail;
+            arg1 = *sptr;
+            delete sptr;
+        }
     }
     if (obj1) {
-        if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-        arg2 = *argp2; 
+        {
+            wxString* sptr = wxString_in_helper(obj1);
+            if (sptr == NULL) SWIG_fail;
+            arg2 = *sptr;
+            delete sptr;
+        }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1862,7 +1868,7 @@ static PyObject *_wrap_new_GridCellEnumRenderer(PyObject *self, PyObject *args,
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
     wxGridCellEnumRenderer *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "choices", NULL 
@@ -1873,7 +1879,7 @@ static PyObject *_wrap_new_GridCellEnumRenderer(PyObject *self, PyObject *args,
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     {
@@ -2098,7 +2104,7 @@ static PyObject *_wrap_GridCellEditor_SetParameters(PyObject *self, PyObject *ar
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2110,7 +2116,7 @@ static PyObject *_wrap_GridCellEditor_SetParameters(PyObject *self, PyObject *ar
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2186,7 +2192,7 @@ static PyObject *_wrap_GridCellEditor_Create(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxEvtHandler *arg4 = (wxEvtHandler *) 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -2860,7 +2866,7 @@ static PyObject *_wrap_PyGridCellEditor_base_SetParameters(PyObject *self, PyObj
     PyObject *resultobj;
     wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2872,7 +2878,7 @@ static PyObject *_wrap_PyGridCellEditor_base_SetParameters(PyObject *self, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3149,7 +3155,7 @@ static PyObject *_wrap_new_GridCellChoiceEditor(PyObject *self, PyObject *args,
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxString *arg2 = (wxString *) NULL ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     wxGridCellChoiceEditor *result;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3222,7 +3228,7 @@ static PyObject *_wrap_new_GridCellEnumEditor(PyObject *self, PyObject *args, Py
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
     wxGridCellEnumEditor *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "choices", NULL 
@@ -3233,7 +3239,7 @@ static PyObject *_wrap_new_GridCellEnumEditor(PyObject *self, PyObject *args, Py
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     {
@@ -3661,7 +3667,7 @@ static PyObject *_wrap_GridCellAttr_SetSize(PyObject *self, PyObject *args, PyOb
 static PyObject *_wrap_GridCellAttr_SetOverflow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3691,7 +3697,7 @@ static PyObject *_wrap_GridCellAttr_SetOverflow(PyObject *self, PyObject *args,
 static PyObject *_wrap_GridCellAttr_SetReadOnly(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4964,7 +4970,7 @@ static PyObject *_wrap_GridTableBase_SetValue(PyObject *self, PyObject *args, Py
     int arg2 ;
     int arg3 ;
     wxString *arg4 = 0 ;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -4976,7 +4982,7 @@ static PyObject *_wrap_GridTableBase_SetValue(PyObject *self, PyObject *args, Py
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5040,7 +5046,7 @@ static PyObject *_wrap_GridTableBase_CanGetValueAs(PyObject *self, PyObject *arg
     int arg3 ;
     wxString *arg4 = 0 ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -5052,7 +5058,7 @@ static PyObject *_wrap_GridTableBase_CanGetValueAs(PyObject *self, PyObject *arg
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5083,7 +5089,7 @@ static PyObject *_wrap_GridTableBase_CanSetValueAs(PyObject *self, PyObject *arg
     int arg3 ;
     wxString *arg4 = 0 ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -5095,7 +5101,7 @@ static PyObject *_wrap_GridTableBase_CanSetValueAs(PyObject *self, PyObject *arg
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5587,7 +5593,7 @@ static PyObject *_wrap_GridTableBase_SetRowLabelValue(PyObject *self, PyObject *
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -5599,7 +5605,7 @@ static PyObject *_wrap_GridTableBase_SetRowLabelValue(PyObject *self, PyObject *
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5628,7 +5634,7 @@ static PyObject *_wrap_GridTableBase_SetColLabelValue(PyObject *self, PyObject *
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -5640,7 +5646,7 @@ static PyObject *_wrap_GridTableBase_SetColLabelValue(PyObject *self, PyObject *
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5927,7 +5933,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *self, PyObje
     int arg3 ;
     wxString *arg4 = 0 ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -5939,7 +5945,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *self, PyObje
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5970,7 +5976,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *self, PyObje
     int arg3 ;
     wxString *arg4 = 0 ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -5982,7 +5988,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *self, PyObje
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6309,7 +6315,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowLabelValue(PyObject *self, PyO
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -6321,7 +6327,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowLabelValue(PyObject *self, PyO
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6350,7 +6356,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetColLabelValue(PyObject *self, PyO
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -6362,7 +6368,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetColLabelValue(PyObject *self, PyO
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7098,7 +7104,7 @@ static PyObject * GridCellCoords_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -7109,7 +7115,7 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs
     wxGrid *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -7136,7 +7142,7 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -7353,7 +7359,7 @@ static PyObject *_wrap_Grid_SetTable(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxGridTableBase *arg2 = (wxGridTableBase *) 0 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     WXGRIDSELECTIONMODES arg4 = (WXGRIDSELECTIONMODES) wxGrid::wxGridSelectCells ;
     bool result;
     PyObject * obj0 = 0 ;
@@ -7413,7 +7419,7 @@ static PyObject *_wrap_Grid_InsertRows(PyObject *self, PyObject *args, PyObject
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 = (int) 0 ;
     int arg3 = (int) 1 ;
-    bool arg4 = (bool) TRUE ;
+    bool arg4 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
@@ -7445,7 +7451,7 @@ static PyObject *_wrap_Grid_AppendRows(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 = (int) 1 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
@@ -7478,7 +7484,7 @@ static PyObject *_wrap_Grid_DeleteRows(PyObject *self, PyObject *args, PyObject
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 = (int) 0 ;
     int arg3 = (int) 1 ;
-    bool arg4 = (bool) TRUE ;
+    bool arg4 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
@@ -7511,7 +7517,7 @@ static PyObject *_wrap_Grid_InsertCols(PyObject *self, PyObject *args, PyObject
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 = (int) 0 ;
     int arg3 = (int) 1 ;
-    bool arg4 = (bool) TRUE ;
+    bool arg4 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
@@ -7543,7 +7549,7 @@ static PyObject *_wrap_Grid_AppendCols(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 = (int) 1 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
@@ -7576,7 +7582,7 @@ static PyObject *_wrap_Grid_DeleteCols(PyObject *self, PyObject *args, PyObject
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 = (int) 0 ;
     int arg3 = (int) 1 ;
-    bool arg4 = (bool) TRUE ;
+    bool arg4 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
@@ -7646,7 +7652,7 @@ static PyObject *_wrap_Grid_DrawTextRectangle(PyObject *self, PyObject *args, Py
     int arg5 = (int) wxLEFT ;
     int arg6 = (int) wxTOP ;
     int arg7 = (int) wxHORIZONTAL ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxRect temp4 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -7665,7 +7671,7 @@ static PyObject *_wrap_Grid_DrawTextRectangle(PyObject *self, PyObject *args, Py
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         arg4 = &temp4;
@@ -7864,7 +7870,7 @@ static PyObject *_wrap_Grid_ForceRefresh(PyObject *self, PyObject *args, PyObjec
 static PyObject *_wrap_Grid_Refresh(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     wxRect *arg3 = (wxRect *) NULL ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -7952,7 +7958,7 @@ static PyObject *_wrap_Grid_EnableEditing(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_Grid_EnableCellEditControl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8396,7 +8402,7 @@ static PyObject *_wrap_Grid_IsVisible(PyObject *self, PyObject *args, PyObject *
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
     int arg3 ;
-    bool arg4 = (bool) TRUE ;
+    bool arg4 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
@@ -9442,7 +9448,7 @@ static PyObject *_wrap_Grid_SetRowLabelValue(PyObject *self, PyObject *args, PyO
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -9454,7 +9460,7 @@ static PyObject *_wrap_Grid_SetRowLabelValue(PyObject *self, PyObject *args, PyO
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9483,7 +9489,7 @@ static PyObject *_wrap_Grid_SetColLabelValue(PyObject *self, PyObject *args, PyO
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -9495,7 +9501,7 @@ static PyObject *_wrap_Grid_SetColLabelValue(PyObject *self, PyObject *args, PyO
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9634,7 +9640,7 @@ static PyObject *_wrap_Grid_SetCellHighlightROPenWidth(PyObject *self, PyObject
 static PyObject *_wrap_Grid_EnableDragRowSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9713,7 +9719,7 @@ static PyObject *_wrap_Grid_CanDragRowSize(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_Grid_EnableDragColSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9792,7 +9798,7 @@ static PyObject *_wrap_Grid_CanDragColSize(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_Grid_EnableDragGridSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10035,7 +10041,7 @@ static PyObject *_wrap_Grid_SetColFormatCustom(PyObject *self, PyObject *args, P
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -10047,7 +10053,7 @@ static PyObject *_wrap_Grid_SetColFormatCustom(PyObject *self, PyObject *args, P
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10074,7 +10080,7 @@ static PyObject *_wrap_Grid_SetColFormatCustom(PyObject *self, PyObject *args, P
 static PyObject *_wrap_Grid_EnableGridLines(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10582,7 +10588,7 @@ static PyObject *_wrap_Grid_SetDefaultRowSize(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -10639,7 +10645,7 @@ static PyObject *_wrap_Grid_SetDefaultColSize(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -10696,7 +10702,7 @@ static PyObject *_wrap_Grid_AutoSizeColumn(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -10727,7 +10733,7 @@ static PyObject *_wrap_Grid_AutoSizeRow(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -10757,7 +10763,7 @@ static PyObject *_wrap_Grid_AutoSizeRow(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_Grid_AutoSizeColumns(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10787,7 +10793,7 @@ static PyObject *_wrap_Grid_AutoSizeColumns(PyObject *self, PyObject *args, PyOb
 static PyObject *_wrap_Grid_AutoSizeRows(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -11633,7 +11639,7 @@ static PyObject *_wrap_Grid_SetCellValue(PyObject *self, PyObject *args, PyObjec
     int arg2 ;
     int arg3 ;
     wxString *arg4 = 0 ;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -11645,7 +11651,7 @@ static PyObject *_wrap_Grid_SetCellValue(PyObject *self, PyObject *args, PyObjec
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11701,7 +11707,7 @@ static PyObject *_wrap_Grid_SetReadOnly(PyObject *self, PyObject *args, PyObject
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
     int arg3 ;
-    bool arg4 = (bool) TRUE ;
+    bool arg4 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -11732,7 +11738,7 @@ static PyObject *_wrap_Grid_SelectRow(PyObject *self, PyObject *args, PyObject *
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -11763,7 +11769,7 @@ static PyObject *_wrap_Grid_SelectCol(PyObject *self, PyObject *args, PyObject *
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -11797,7 +11803,7 @@ static PyObject *_wrap_Grid_SelectBlock(PyObject *self, PyObject *args, PyObject
     int arg3 ;
     int arg4 ;
     int arg5 ;
-    bool arg6 = (bool) FALSE ;
+    bool arg6 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj5 = 0 ;
     char *kwnames[] = {
@@ -12316,7 +12322,7 @@ static PyObject *_wrap_Grid_RegisterDataType(PyObject *self, PyObject *args, PyO
     wxString *arg2 = 0 ;
     wxGridCellRenderer *arg3 = (wxGridCellRenderer *) 0 ;
     wxGridCellEditor *arg4 = (wxGridCellEditor *) 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -12330,7 +12336,7 @@ static PyObject *_wrap_Grid_RegisterDataType(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxGridCellRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxGridCellEditor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -12419,7 +12425,7 @@ static PyObject *_wrap_Grid_GetDefaultEditorForType(PyObject *self, PyObject *ar
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxString *arg2 = 0 ;
     wxGridCellEditor *result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -12431,7 +12437,7 @@ static PyObject *_wrap_Grid_GetDefaultEditorForType(PyObject *self, PyObject *ar
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12462,7 +12468,7 @@ static PyObject *_wrap_Grid_GetDefaultRendererForType(PyObject *self, PyObject *
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxString *arg2 = 0 ;
     wxGridCellRenderer *result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -12474,7 +12480,7 @@ static PyObject *_wrap_Grid_GetDefaultRendererForType(PyObject *self, PyObject *
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12650,11 +12656,11 @@ static PyObject *_wrap_new_GridEvent(PyObject *self, PyObject *args, PyObject *k
     int arg5 = (int) -1 ;
     int arg6 = (int) -1 ;
     int arg7 = (int) -1 ;
-    bool arg8 = (bool) TRUE ;
-    bool arg9 = (bool) FALSE ;
-    bool arg10 = (bool) FALSE ;
-    bool arg11 = (bool) FALSE ;
-    bool arg12 = (bool) FALSE ;
+    bool arg8 = (bool) True ;
+    bool arg9 = (bool) False ;
+    bool arg10 = (bool) False ;
+    bool arg11 = (bool) False ;
+    bool arg12 = (bool) False ;
     wxGridEvent *result;
     PyObject * obj2 = 0 ;
     PyObject * obj7 = 0 ;
@@ -12921,10 +12927,10 @@ static PyObject *_wrap_new_GridSizeEvent(PyObject *self, PyObject *args, PyObjec
     int arg4 = (int) -1 ;
     int arg5 = (int) -1 ;
     int arg6 = (int) -1 ;
-    bool arg7 = (bool) FALSE ;
-    bool arg8 = (bool) FALSE ;
-    bool arg9 = (bool) FALSE ;
-    bool arg10 = (bool) FALSE ;
+    bool arg7 = (bool) False ;
+    bool arg8 = (bool) False ;
+    bool arg9 = (bool) False ;
+    bool arg10 = (bool) False ;
     wxGridSizeEvent *result;
     PyObject * obj2 = 0 ;
     PyObject * obj6 = 0 ;
@@ -13135,11 +13141,11 @@ static PyObject *_wrap_new_GridRangeSelectEvent(PyObject *self, PyObject *args,
     wxGrid *arg3 = (wxGrid *) 0 ;
     wxGridCellCoords *arg4 = 0 ;
     wxGridCellCoords *arg5 = 0 ;
-    bool arg6 = (bool) TRUE ;
-    bool arg7 = (bool) FALSE ;
-    bool arg8 = (bool) FALSE ;
-    bool arg9 = (bool) FALSE ;
-    bool arg10 = (bool) FALSE ;
+    bool arg6 = (bool) True ;
+    bool arg7 = (bool) False ;
+    bool arg8 = (bool) False ;
+    bool arg9 = (bool) False ;
+    bool arg10 = (bool) False ;
     wxGridRangeSelectEvent *result;
     wxGridCellCoords temp4 ;
     wxGridCellCoords temp5 ;
diff --git a/wxPython/src/gtk/html.py b/wxPython/src/gtk/html.py
index 03d9cec12f..452dae04c8 100644
--- a/wxPython/src/gtk/html.py
+++ b/wxPython/src/gtk/html.py
@@ -38,19 +38,39 @@ HTML_URL_PAGE = _html.HTML_URL_PAGE
 HTML_URL_IMAGE = _html.HTML_URL_IMAGE
 HTML_URL_OTHER = _html.HTML_URL_OTHER
 class HtmlLinkInfo(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlLinkInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString href, wxString target=wxPyEmptyString) -> HtmlLinkInfo"""
         newobj = _html.new_HtmlLinkInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetHref(*args, **kwargs): return _html.HtmlLinkInfo_GetHref(*args, **kwargs)
-    def GetTarget(*args, **kwargs): return _html.HtmlLinkInfo_GetTarget(*args, **kwargs)
-    def GetEvent(*args, **kwargs): return _html.HtmlLinkInfo_GetEvent(*args, **kwargs)
-    def GetHtmlCell(*args, **kwargs): return _html.HtmlLinkInfo_GetHtmlCell(*args, **kwargs)
-    def SetEvent(*args, **kwargs): return _html.HtmlLinkInfo_SetEvent(*args, **kwargs)
-    def SetHtmlCell(*args, **kwargs): return _html.HtmlLinkInfo_SetHtmlCell(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlLinkInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetHref(*args, **kwargs):
+        """GetHref() -> wxString"""
+        return _html.HtmlLinkInfo_GetHref(*args, **kwargs)
+
+    def GetTarget(*args, **kwargs):
+        """GetTarget() -> wxString"""
+        return _html.HtmlLinkInfo_GetTarget(*args, **kwargs)
+
+    def GetEvent(*args, **kwargs):
+        """GetEvent() -> MouseEvent"""
+        return _html.HtmlLinkInfo_GetEvent(*args, **kwargs)
+
+    def GetHtmlCell(*args, **kwargs):
+        """GetHtmlCell() -> HtmlCell"""
+        return _html.HtmlLinkInfo_GetHtmlCell(*args, **kwargs)
+
+    def SetEvent(*args, **kwargs):
+        """SetEvent(MouseEvent e)"""
+        return _html.HtmlLinkInfo_SetEvent(*args, **kwargs)
+
+    def SetHtmlCell(*args, **kwargs):
+        """SetHtmlCell(HtmlCell e)"""
+        return _html.HtmlLinkInfo_SetHtmlCell(*args, **kwargs)
+
 
 class HtmlLinkInfoPtr(HtmlLinkInfo):
     def __init__(self, this):
@@ -60,17 +80,42 @@ class HtmlLinkInfoPtr(HtmlLinkInfo):
 _html.HtmlLinkInfo_swigregister(HtmlLinkInfoPtr)
 
 class HtmlTag(core.Object):
-    def GetName(*args, **kwargs): return _html.HtmlTag_GetName(*args, **kwargs)
-    def HasParam(*args, **kwargs): return _html.HtmlTag_HasParam(*args, **kwargs)
-    def GetParam(*args, **kwargs): return _html.HtmlTag_GetParam(*args, **kwargs)
-    def GetAllParams(*args, **kwargs): return _html.HtmlTag_GetAllParams(*args, **kwargs)
-    def HasEnding(*args, **kwargs): return _html.HtmlTag_HasEnding(*args, **kwargs)
-    def GetBeginPos(*args, **kwargs): return _html.HtmlTag_GetBeginPos(*args, **kwargs)
-    def GetEndPos1(*args, **kwargs): return _html.HtmlTag_GetEndPos1(*args, **kwargs)
-    def GetEndPos2(*args, **kwargs): return _html.HtmlTag_GetEndPos2(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlTag instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetName(*args, **kwargs):
+        """GetName() -> wxString"""
+        return _html.HtmlTag_GetName(*args, **kwargs)
+
+    def HasParam(*args, **kwargs):
+        """HasParam(wxString par) -> bool"""
+        return _html.HtmlTag_HasParam(*args, **kwargs)
+
+    def GetParam(*args, **kwargs):
+        """GetParam(wxString par, int with_commas=False) -> wxString"""
+        return _html.HtmlTag_GetParam(*args, **kwargs)
+
+    def GetAllParams(*args, **kwargs):
+        """GetAllParams() -> wxString"""
+        return _html.HtmlTag_GetAllParams(*args, **kwargs)
+
+    def HasEnding(*args, **kwargs):
+        """HasEnding() -> bool"""
+        return _html.HtmlTag_HasEnding(*args, **kwargs)
+
+    def GetBeginPos(*args, **kwargs):
+        """GetBeginPos() -> int"""
+        return _html.HtmlTag_GetBeginPos(*args, **kwargs)
+
+    def GetEndPos1(*args, **kwargs):
+        """GetEndPos1() -> int"""
+        return _html.HtmlTag_GetEndPos1(*args, **kwargs)
+
+    def GetEndPos2(*args, **kwargs):
+        """GetEndPos2() -> int"""
+        return _html.HtmlTag_GetEndPos2(*args, **kwargs)
+
 
 class HtmlTagPtr(HtmlTag):
     def __init__(self, this):
@@ -80,20 +125,54 @@ class HtmlTagPtr(HtmlTag):
 _html.HtmlTag_swigregister(HtmlTagPtr)
 
 class HtmlParser(core.Object):
-    def SetFS(*args, **kwargs): return _html.HtmlParser_SetFS(*args, **kwargs)
-    def GetFS(*args, **kwargs): return _html.HtmlParser_GetFS(*args, **kwargs)
-    def Parse(*args, **kwargs): return _html.HtmlParser_Parse(*args, **kwargs)
-    def InitParser(*args, **kwargs): return _html.HtmlParser_InitParser(*args, **kwargs)
-    def DoneParser(*args, **kwargs): return _html.HtmlParser_DoneParser(*args, **kwargs)
-    def DoParsing(*args, **kwargs): return _html.HtmlParser_DoParsing(*args, **kwargs)
-    def StopParsing(*args, **kwargs): return _html.HtmlParser_StopParsing(*args, **kwargs)
-    def AddTagHandler(*args, **kwargs): return _html.HtmlParser_AddTagHandler(*args, **kwargs)
-    def GetSource(*args, **kwargs): return _html.HtmlParser_GetSource(*args, **kwargs)
-    def PushTagHandler(*args, **kwargs): return _html.HtmlParser_PushTagHandler(*args, **kwargs)
-    def PopTagHandler(*args, **kwargs): return _html.HtmlParser_PopTagHandler(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlParser instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetFS(*args, **kwargs):
+        """SetFS(FileSystem fs)"""
+        return _html.HtmlParser_SetFS(*args, **kwargs)
+
+    def GetFS(*args, **kwargs):
+        """GetFS() -> FileSystem"""
+        return _html.HtmlParser_GetFS(*args, **kwargs)
+
+    def Parse(*args, **kwargs):
+        """Parse(wxString source) -> Object"""
+        return _html.HtmlParser_Parse(*args, **kwargs)
+
+    def InitParser(*args, **kwargs):
+        """InitParser(wxString source)"""
+        return _html.HtmlParser_InitParser(*args, **kwargs)
+
+    def DoneParser(*args, **kwargs):
+        """DoneParser()"""
+        return _html.HtmlParser_DoneParser(*args, **kwargs)
+
+    def DoParsing(*args, **kwargs):
+        """DoParsing(int begin_pos, int end_pos)"""
+        return _html.HtmlParser_DoParsing(*args, **kwargs)
+
+    def StopParsing(*args, **kwargs):
+        """StopParsing()"""
+        return _html.HtmlParser_StopParsing(*args, **kwargs)
+
+    def AddTagHandler(*args, **kwargs):
+        """AddTagHandler(wxHtmlTagHandler handler)"""
+        return _html.HtmlParser_AddTagHandler(*args, **kwargs)
+
+    def GetSource(*args, **kwargs):
+        """GetSource() -> wxString"""
+        return _html.HtmlParser_GetSource(*args, **kwargs)
+
+    def PushTagHandler(*args, **kwargs):
+        """PushTagHandler(wxHtmlTagHandler handler, wxString tags)"""
+        return _html.HtmlParser_PushTagHandler(*args, **kwargs)
+
+    def PopTagHandler(*args, **kwargs):
+        """PopTagHandler()"""
+        return _html.HtmlParser_PopTagHandler(*args, **kwargs)
+
 
 class HtmlParserPtr(HtmlParser):
     def __init__(self, this):
@@ -103,42 +182,131 @@ class HtmlParserPtr(HtmlParser):
 _html.HtmlParser_swigregister(HtmlParserPtr)
 
 class HtmlWinParser(HtmlParser):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlWinParser instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(HtmlWindow wnd=None) -> HtmlWinParser"""
         newobj = _html.new_HtmlWinParser(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetDC(*args, **kwargs): return _html.HtmlWinParser_SetDC(*args, **kwargs)
-    def GetDC(*args, **kwargs): return _html.HtmlWinParser_GetDC(*args, **kwargs)
-    def GetCharHeight(*args, **kwargs): return _html.HtmlWinParser_GetCharHeight(*args, **kwargs)
-    def GetCharWidth(*args, **kwargs): return _html.HtmlWinParser_GetCharWidth(*args, **kwargs)
-    def GetWindow(*args, **kwargs): return _html.HtmlWinParser_GetWindow(*args, **kwargs)
-    def SetFonts(*args, **kwargs): return _html.HtmlWinParser_SetFonts(*args, **kwargs)
-    def GetContainer(*args, **kwargs): return _html.HtmlWinParser_GetContainer(*args, **kwargs)
-    def OpenContainer(*args, **kwargs): return _html.HtmlWinParser_OpenContainer(*args, **kwargs)
-    def SetContainer(*args, **kwargs): return _html.HtmlWinParser_SetContainer(*args, **kwargs)
-    def CloseContainer(*args, **kwargs): return _html.HtmlWinParser_CloseContainer(*args, **kwargs)
-    def GetFontSize(*args, **kwargs): return _html.HtmlWinParser_GetFontSize(*args, **kwargs)
-    def SetFontSize(*args, **kwargs): return _html.HtmlWinParser_SetFontSize(*args, **kwargs)
-    def GetFontBold(*args, **kwargs): return _html.HtmlWinParser_GetFontBold(*args, **kwargs)
-    def SetFontBold(*args, **kwargs): return _html.HtmlWinParser_SetFontBold(*args, **kwargs)
-    def GetFontItalic(*args, **kwargs): return _html.HtmlWinParser_GetFontItalic(*args, **kwargs)
-    def SetFontItalic(*args, **kwargs): return _html.HtmlWinParser_SetFontItalic(*args, **kwargs)
-    def GetFontUnderlined(*args, **kwargs): return _html.HtmlWinParser_GetFontUnderlined(*args, **kwargs)
-    def SetFontUnderlined(*args, **kwargs): return _html.HtmlWinParser_SetFontUnderlined(*args, **kwargs)
-    def GetFontFixed(*args, **kwargs): return _html.HtmlWinParser_GetFontFixed(*args, **kwargs)
-    def SetFontFixed(*args, **kwargs): return _html.HtmlWinParser_SetFontFixed(*args, **kwargs)
-    def GetAlign(*args, **kwargs): return _html.HtmlWinParser_GetAlign(*args, **kwargs)
-    def SetAlign(*args, **kwargs): return _html.HtmlWinParser_SetAlign(*args, **kwargs)
-    def GetLinkColor(*args, **kwargs): return _html.HtmlWinParser_GetLinkColor(*args, **kwargs)
-    def SetLinkColor(*args, **kwargs): return _html.HtmlWinParser_SetLinkColor(*args, **kwargs)
-    def GetActualColor(*args, **kwargs): return _html.HtmlWinParser_GetActualColor(*args, **kwargs)
-    def SetActualColor(*args, **kwargs): return _html.HtmlWinParser_SetActualColor(*args, **kwargs)
-    def SetLink(*args, **kwargs): return _html.HtmlWinParser_SetLink(*args, **kwargs)
-    def CreateCurrentFont(*args, **kwargs): return _html.HtmlWinParser_CreateCurrentFont(*args, **kwargs)
-    def GetLink(*args, **kwargs): return _html.HtmlWinParser_GetLink(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlWinParser instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetDC(*args, **kwargs):
+        """SetDC(wxDC dc)"""
+        return _html.HtmlWinParser_SetDC(*args, **kwargs)
+
+    def GetDC(*args, **kwargs):
+        """GetDC() -> wxDC"""
+        return _html.HtmlWinParser_GetDC(*args, **kwargs)
+
+    def GetCharHeight(*args, **kwargs):
+        """GetCharHeight() -> int"""
+        return _html.HtmlWinParser_GetCharHeight(*args, **kwargs)
+
+    def GetCharWidth(*args, **kwargs):
+        """GetCharWidth() -> int"""
+        return _html.HtmlWinParser_GetCharWidth(*args, **kwargs)
+
+    def GetWindow(*args, **kwargs):
+        """GetWindow() -> HtmlWindow"""
+        return _html.HtmlWinParser_GetWindow(*args, **kwargs)
+
+    def SetFonts(*args, **kwargs):
+        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        return _html.HtmlWinParser_SetFonts(*args, **kwargs)
+
+    def GetContainer(*args, **kwargs):
+        """GetContainer() -> HtmlContainerCell"""
+        return _html.HtmlWinParser_GetContainer(*args, **kwargs)
+
+    def OpenContainer(*args, **kwargs):
+        """OpenContainer() -> HtmlContainerCell"""
+        return _html.HtmlWinParser_OpenContainer(*args, **kwargs)
+
+    def SetContainer(*args, **kwargs):
+        """SetContainer(HtmlContainerCell c) -> HtmlContainerCell"""
+        return _html.HtmlWinParser_SetContainer(*args, **kwargs)
+
+    def CloseContainer(*args, **kwargs):
+        """CloseContainer() -> HtmlContainerCell"""
+        return _html.HtmlWinParser_CloseContainer(*args, **kwargs)
+
+    def GetFontSize(*args, **kwargs):
+        """GetFontSize() -> int"""
+        return _html.HtmlWinParser_GetFontSize(*args, **kwargs)
+
+    def SetFontSize(*args, **kwargs):
+        """SetFontSize(int s)"""
+        return _html.HtmlWinParser_SetFontSize(*args, **kwargs)
+
+    def GetFontBold(*args, **kwargs):
+        """GetFontBold() -> int"""
+        return _html.HtmlWinParser_GetFontBold(*args, **kwargs)
+
+    def SetFontBold(*args, **kwargs):
+        """SetFontBold(int x)"""
+        return _html.HtmlWinParser_SetFontBold(*args, **kwargs)
+
+    def GetFontItalic(*args, **kwargs):
+        """GetFontItalic() -> int"""
+        return _html.HtmlWinParser_GetFontItalic(*args, **kwargs)
+
+    def SetFontItalic(*args, **kwargs):
+        """SetFontItalic(int x)"""
+        return _html.HtmlWinParser_SetFontItalic(*args, **kwargs)
+
+    def GetFontUnderlined(*args, **kwargs):
+        """GetFontUnderlined() -> int"""
+        return _html.HtmlWinParser_GetFontUnderlined(*args, **kwargs)
+
+    def SetFontUnderlined(*args, **kwargs):
+        """SetFontUnderlined(int x)"""
+        return _html.HtmlWinParser_SetFontUnderlined(*args, **kwargs)
+
+    def GetFontFixed(*args, **kwargs):
+        """GetFontFixed() -> int"""
+        return _html.HtmlWinParser_GetFontFixed(*args, **kwargs)
+
+    def SetFontFixed(*args, **kwargs):
+        """SetFontFixed(int x)"""
+        return _html.HtmlWinParser_SetFontFixed(*args, **kwargs)
+
+    def GetAlign(*args, **kwargs):
+        """GetAlign() -> int"""
+        return _html.HtmlWinParser_GetAlign(*args, **kwargs)
+
+    def SetAlign(*args, **kwargs):
+        """SetAlign(int a)"""
+        return _html.HtmlWinParser_SetAlign(*args, **kwargs)
+
+    def GetLinkColor(*args, **kwargs):
+        """GetLinkColor() -> wxColour"""
+        return _html.HtmlWinParser_GetLinkColor(*args, **kwargs)
+
+    def SetLinkColor(*args, **kwargs):
+        """SetLinkColor(wxColour clr)"""
+        return _html.HtmlWinParser_SetLinkColor(*args, **kwargs)
+
+    def GetActualColor(*args, **kwargs):
+        """GetActualColor() -> wxColour"""
+        return _html.HtmlWinParser_GetActualColor(*args, **kwargs)
+
+    def SetActualColor(*args, **kwargs):
+        """SetActualColor(wxColour clr)"""
+        return _html.HtmlWinParser_SetActualColor(*args, **kwargs)
+
+    def SetLink(*args, **kwargs):
+        """SetLink(wxString link)"""
+        return _html.HtmlWinParser_SetLink(*args, **kwargs)
+
+    def CreateCurrentFont(*args, **kwargs):
+        """CreateCurrentFont() -> wxFont"""
+        return _html.HtmlWinParser_CreateCurrentFont(*args, **kwargs)
+
+    def GetLink(*args, **kwargs):
+        """GetLink() -> HtmlLinkInfo"""
+        return _html.HtmlWinParser_GetLink(*args, **kwargs)
+
 
 class HtmlWinParserPtr(HtmlWinParser):
     def __init__(self, this):
@@ -148,18 +316,33 @@ class HtmlWinParserPtr(HtmlWinParser):
 _html.HtmlWinParser_swigregister(HtmlWinParserPtr)
 
 class HtmlTagHandler(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyHtmlTagHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> HtmlTagHandler"""
         newobj = _html.new_HtmlTagHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, HtmlTagHandler)
-    def _setCallbackInfo(*args, **kwargs): return _html.HtmlTagHandler__setCallbackInfo(*args, **kwargs)
-    def SetParser(*args, **kwargs): return _html.HtmlTagHandler_SetParser(*args, **kwargs)
-    def GetParser(*args, **kwargs): return _html.HtmlTagHandler_GetParser(*args, **kwargs)
-    def ParseInner(*args, **kwargs): return _html.HtmlTagHandler_ParseInner(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyHtmlTagHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _html.HtmlTagHandler__setCallbackInfo(*args, **kwargs)
+
+    def SetParser(*args, **kwargs):
+        """SetParser(HtmlParser parser)"""
+        return _html.HtmlTagHandler_SetParser(*args, **kwargs)
+
+    def GetParser(*args, **kwargs):
+        """GetParser() -> HtmlParser"""
+        return _html.HtmlTagHandler_GetParser(*args, **kwargs)
+
+    def ParseInner(*args, **kwargs):
+        """ParseInner(HtmlTag tag)"""
+        return _html.HtmlTagHandler_ParseInner(*args, **kwargs)
+
 
 class HtmlTagHandlerPtr(HtmlTagHandler):
     def __init__(self, this):
@@ -169,18 +352,33 @@ class HtmlTagHandlerPtr(HtmlTagHandler):
 _html.HtmlTagHandler_swigregister(HtmlTagHandlerPtr)
 
 class HtmlWinTagHandler(HtmlTagHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyHtmlWinTagHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> HtmlWinTagHandler"""
         newobj = _html.new_HtmlWinTagHandler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, HtmlWinTagHandler)
-    def _setCallbackInfo(*args, **kwargs): return _html.HtmlWinTagHandler__setCallbackInfo(*args, **kwargs)
-    def SetParser(*args, **kwargs): return _html.HtmlWinTagHandler_SetParser(*args, **kwargs)
-    def GetParser(*args, **kwargs): return _html.HtmlWinTagHandler_GetParser(*args, **kwargs)
-    def ParseInner(*args, **kwargs): return _html.HtmlWinTagHandler_ParseInner(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyHtmlWinTagHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _html.HtmlWinTagHandler__setCallbackInfo(*args, **kwargs)
+
+    def SetParser(*args, **kwargs):
+        """SetParser(HtmlParser parser)"""
+        return _html.HtmlWinTagHandler_SetParser(*args, **kwargs)
+
+    def GetParser(*args, **kwargs):
+        """GetParser() -> HtmlWinParser"""
+        return _html.HtmlWinTagHandler_GetParser(*args, **kwargs)
+
+    def ParseInner(*args, **kwargs):
+        """ParseInner(HtmlTag tag)"""
+        return _html.HtmlWinTagHandler_ParseInner(*args, **kwargs)
+
 
 class HtmlWinTagHandlerPtr(HtmlWinTagHandler):
     def __init__(self, this):
@@ -190,33 +388,75 @@ class HtmlWinTagHandlerPtr(HtmlWinTagHandler):
 _html.HtmlWinTagHandler_swigregister(HtmlWinTagHandlerPtr)
 
 
-HtmlWinParser_AddTagHandler = _html.HtmlWinParser_AddTagHandler
+def HtmlWinParser_AddTagHandler(*args, **kwargs):
+    """HtmlWinParser_AddTagHandler(PyObject tagHandlerClass)"""
+    return _html.HtmlWinParser_AddTagHandler(*args, **kwargs)
 #---------------------------------------------------------------------------
 
 class HtmlSelection(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlSelection instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> HtmlSelection"""
         newobj = _html.new_HtmlSelection(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_html.delete_HtmlSelection):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Set(*args, **kwargs): return _html.HtmlSelection_Set(*args, **kwargs)
-    def SetCells(*args, **kwargs): return _html.HtmlSelection_SetCells(*args, **kwargs)
-    def GetFromCell(*args, **kwargs): return _html.HtmlSelection_GetFromCell(*args, **kwargs)
-    def GetToCell(*args, **kwargs): return _html.HtmlSelection_GetToCell(*args, **kwargs)
-    def GetFromPos(*args, **kwargs): return _html.HtmlSelection_GetFromPos(*args, **kwargs)
-    def GetToPos(*args, **kwargs): return _html.HtmlSelection_GetToPos(*args, **kwargs)
-    def GetFromPrivPos(*args, **kwargs): return _html.HtmlSelection_GetFromPrivPos(*args, **kwargs)
-    def GetToPrivPos(*args, **kwargs): return _html.HtmlSelection_GetToPrivPos(*args, **kwargs)
-    def SetFromPrivPos(*args, **kwargs): return _html.HtmlSelection_SetFromPrivPos(*args, **kwargs)
-    def SetToPrivPos(*args, **kwargs): return _html.HtmlSelection_SetToPrivPos(*args, **kwargs)
-    def ClearPrivPos(*args, **kwargs): return _html.HtmlSelection_ClearPrivPos(*args, **kwargs)
-    def IsEmpty(*args, **kwargs): return _html.HtmlSelection_IsEmpty(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlSelection instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Set(*args, **kwargs):
+        """Set(Point fromPos, HtmlCell fromCell, Point toPos, HtmlCell toCell)"""
+        return _html.HtmlSelection_Set(*args, **kwargs)
+
+    def SetCells(*args, **kwargs):
+        """SetCells(HtmlCell fromCell, HtmlCell toCell)"""
+        return _html.HtmlSelection_SetCells(*args, **kwargs)
+
+    def GetFromCell(*args, **kwargs):
+        """GetFromCell() -> HtmlCell"""
+        return _html.HtmlSelection_GetFromCell(*args, **kwargs)
+
+    def GetToCell(*args, **kwargs):
+        """GetToCell() -> HtmlCell"""
+        return _html.HtmlSelection_GetToCell(*args, **kwargs)
+
+    def GetFromPos(*args, **kwargs):
+        """GetFromPos() -> Point"""
+        return _html.HtmlSelection_GetFromPos(*args, **kwargs)
+
+    def GetToPos(*args, **kwargs):
+        """GetToPos() -> Point"""
+        return _html.HtmlSelection_GetToPos(*args, **kwargs)
+
+    def GetFromPrivPos(*args, **kwargs):
+        """GetFromPrivPos() -> Point"""
+        return _html.HtmlSelection_GetFromPrivPos(*args, **kwargs)
+
+    def GetToPrivPos(*args, **kwargs):
+        """GetToPrivPos() -> Point"""
+        return _html.HtmlSelection_GetToPrivPos(*args, **kwargs)
+
+    def SetFromPrivPos(*args, **kwargs):
+        """SetFromPrivPos(Point pos)"""
+        return _html.HtmlSelection_SetFromPrivPos(*args, **kwargs)
+
+    def SetToPrivPos(*args, **kwargs):
+        """SetToPrivPos(Point pos)"""
+        return _html.HtmlSelection_SetToPrivPos(*args, **kwargs)
+
+    def ClearPrivPos(*args, **kwargs):
+        """ClearPrivPos()"""
+        return _html.HtmlSelection_ClearPrivPos(*args, **kwargs)
+
+    def IsEmpty(*args, **kwargs):
+        """IsEmpty() -> bool"""
+        return _html.HtmlSelection_IsEmpty(*args, **kwargs)
+
 
 class HtmlSelectionPtr(HtmlSelection):
     def __init__(self, this):
@@ -229,23 +469,45 @@ HTML_SEL_OUT = _html.HTML_SEL_OUT
 HTML_SEL_IN = _html.HTML_SEL_IN
 HTML_SEL_CHANGING = _html.HTML_SEL_CHANGING
 class HtmlRenderingState(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlRenderingState instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> HtmlRenderingState"""
         newobj = _html.new_HtmlRenderingState(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_html.delete_HtmlRenderingState):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetSelectionState(*args, **kwargs): return _html.HtmlRenderingState_SetSelectionState(*args, **kwargs)
-    def GetSelectionState(*args, **kwargs): return _html.HtmlRenderingState_GetSelectionState(*args, **kwargs)
-    def SetFgColour(*args, **kwargs): return _html.HtmlRenderingState_SetFgColour(*args, **kwargs)
-    def GetFgColour(*args, **kwargs): return _html.HtmlRenderingState_GetFgColour(*args, **kwargs)
-    def SetBgColour(*args, **kwargs): return _html.HtmlRenderingState_SetBgColour(*args, **kwargs)
-    def GetBgColour(*args, **kwargs): return _html.HtmlRenderingState_GetBgColour(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlRenderingState instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetSelectionState(*args, **kwargs):
+        """SetSelectionState(wxHtmlSelectionState s)"""
+        return _html.HtmlRenderingState_SetSelectionState(*args, **kwargs)
+
+    def GetSelectionState(*args, **kwargs):
+        """GetSelectionState() -> wxHtmlSelectionState"""
+        return _html.HtmlRenderingState_GetSelectionState(*args, **kwargs)
+
+    def SetFgColour(*args, **kwargs):
+        """SetFgColour(wxColour c)"""
+        return _html.HtmlRenderingState_SetFgColour(*args, **kwargs)
+
+    def GetFgColour(*args, **kwargs):
+        """GetFgColour() -> wxColour"""
+        return _html.HtmlRenderingState_GetFgColour(*args, **kwargs)
+
+    def SetBgColour(*args, **kwargs):
+        """SetBgColour(wxColour c)"""
+        return _html.HtmlRenderingState_SetBgColour(*args, **kwargs)
+
+    def GetBgColour(*args, **kwargs):
+        """GetBgColour() -> wxColour"""
+        return _html.HtmlRenderingState_GetBgColour(*args, **kwargs)
+
 
 class HtmlRenderingStatePtr(HtmlRenderingState):
     def __init__(self, this):
@@ -255,11 +517,18 @@ class HtmlRenderingStatePtr(HtmlRenderingState):
 _html.HtmlRenderingState_swigregister(HtmlRenderingStatePtr)
 
 class HtmlRenderingStyle(object):
-    def GetSelectedTextColour(*args, **kwargs): return _html.HtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)
-    def GetSelectedTextBgColour(*args, **kwargs): return _html.HtmlRenderingStyle_GetSelectedTextBgColour(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlRenderingStyle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetSelectedTextColour(*args, **kwargs):
+        """GetSelectedTextColour(wxColour clr) -> wxColour"""
+        return _html.HtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)
+
+    def GetSelectedTextBgColour(*args, **kwargs):
+        """GetSelectedTextBgColour(wxColour clr) -> wxColour"""
+        return _html.HtmlRenderingStyle_GetSelectedTextBgColour(*args, **kwargs)
+
 
 class HtmlRenderingStylePtr(HtmlRenderingStyle):
     def __init__(self, this):
@@ -269,11 +538,18 @@ class HtmlRenderingStylePtr(HtmlRenderingStyle):
 _html.HtmlRenderingStyle_swigregister(HtmlRenderingStylePtr)
 
 class DefaultHtmlRenderingStyle(HtmlRenderingStyle):
-    def GetSelectedTextColour(*args, **kwargs): return _html.DefaultHtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)
-    def GetSelectedTextBgColour(*args, **kwargs): return _html.DefaultHtmlRenderingStyle_GetSelectedTextBgColour(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxDefaultHtmlRenderingStyle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetSelectedTextColour(*args, **kwargs):
+        """GetSelectedTextColour(wxColour clr) -> wxColour"""
+        return _html.DefaultHtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)
+
+    def GetSelectedTextBgColour(*args, **kwargs):
+        """GetSelectedTextBgColour(wxColour clr) -> wxColour"""
+        return _html.DefaultHtmlRenderingStyle_GetSelectedTextBgColour(*args, **kwargs)
+
 
 class DefaultHtmlRenderingStylePtr(DefaultHtmlRenderingStyle):
     def __init__(self, this):
@@ -283,22 +559,41 @@ class DefaultHtmlRenderingStylePtr(DefaultHtmlRenderingStyle):
 _html.DefaultHtmlRenderingStyle_swigregister(DefaultHtmlRenderingStylePtr)
 
 class HtmlRenderingInfo(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlRenderingInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> HtmlRenderingInfo"""
         newobj = _html.new_HtmlRenderingInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_html.delete_HtmlRenderingInfo):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetSelection(*args, **kwargs): return _html.HtmlRenderingInfo_SetSelection(*args, **kwargs)
-    def GetSelection(*args, **kwargs): return _html.HtmlRenderingInfo_GetSelection(*args, **kwargs)
-    def SetStyle(*args, **kwargs): return _html.HtmlRenderingInfo_SetStyle(*args, **kwargs)
-    def GetStyle(*args, **kwargs): return _html.HtmlRenderingInfo_GetStyle(*args, **kwargs)
-    def GetState(*args, **kwargs): return _html.HtmlRenderingInfo_GetState(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlRenderingInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(HtmlSelection s)"""
+        return _html.HtmlRenderingInfo_SetSelection(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> HtmlSelection"""
+        return _html.HtmlRenderingInfo_GetSelection(*args, **kwargs)
+
+    def SetStyle(*args, **kwargs):
+        """SetStyle(HtmlRenderingStyle style)"""
+        return _html.HtmlRenderingInfo_SetStyle(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle() -> HtmlRenderingStyle"""
+        return _html.HtmlRenderingInfo_GetStyle(*args, **kwargs)
+
+    def GetState(*args, **kwargs):
+        """GetState() -> HtmlRenderingState"""
+        return _html.HtmlRenderingInfo_GetState(*args, **kwargs)
+
 
 class HtmlRenderingInfoPtr(HtmlRenderingInfo):
     def __init__(self, this):
@@ -313,43 +608,135 @@ HTML_FIND_EXACT = _html.HTML_FIND_EXACT
 HTML_FIND_NEAREST_BEFORE = _html.HTML_FIND_NEAREST_BEFORE
 HTML_FIND_NEAREST_AFTER = _html.HTML_FIND_NEAREST_AFTER
 class HtmlCell(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> HtmlCell"""
         newobj = _html.new_HtmlCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetPosX(*args, **kwargs): return _html.HtmlCell_GetPosX(*args, **kwargs)
-    def GetPosY(*args, **kwargs): return _html.HtmlCell_GetPosY(*args, **kwargs)
-    def GetWidth(*args, **kwargs): return _html.HtmlCell_GetWidth(*args, **kwargs)
-    def GetHeight(*args, **kwargs): return _html.HtmlCell_GetHeight(*args, **kwargs)
-    def GetDescent(*args, **kwargs): return _html.HtmlCell_GetDescent(*args, **kwargs)
-    def GetLink(*args, **kwargs): return _html.HtmlCell_GetLink(*args, **kwargs)
-    def GetNext(*args, **kwargs): return _html.HtmlCell_GetNext(*args, **kwargs)
-    def GetParent(*args, **kwargs): return _html.HtmlCell_GetParent(*args, **kwargs)
-    def GetFirstChild(*args, **kwargs): return _html.HtmlCell_GetFirstChild(*args, **kwargs)
-    def GetCursor(*args, **kwargs): return _html.HtmlCell_GetCursor(*args, **kwargs)
-    def IsFormattingCell(*args, **kwargs): return _html.HtmlCell_IsFormattingCell(*args, **kwargs)
-    def SetLink(*args, **kwargs): return _html.HtmlCell_SetLink(*args, **kwargs)
-    def SetNext(*args, **kwargs): return _html.HtmlCell_SetNext(*args, **kwargs)
-    def SetParent(*args, **kwargs): return _html.HtmlCell_SetParent(*args, **kwargs)
-    def SetPos(*args, **kwargs): return _html.HtmlCell_SetPos(*args, **kwargs)
-    def Layout(*args, **kwargs): return _html.HtmlCell_Layout(*args, **kwargs)
-    def Draw(*args, **kwargs): return _html.HtmlCell_Draw(*args, **kwargs)
-    def DrawInvisible(*args, **kwargs): return _html.HtmlCell_DrawInvisible(*args, **kwargs)
-    def Find(*args, **kwargs): return _html.HtmlCell_Find(*args, **kwargs)
-    def AdjustPagebreak(*args, **kwargs): return _html.HtmlCell_AdjustPagebreak(*args, **kwargs)
-    def SetCanLiveOnPagebreak(*args, **kwargs): return _html.HtmlCell_SetCanLiveOnPagebreak(*args, **kwargs)
-    def IsLinebreakAllowed(*args, **kwargs): return _html.HtmlCell_IsLinebreakAllowed(*args, **kwargs)
-    def IsTerminalCell(*args, **kwargs): return _html.HtmlCell_IsTerminalCell(*args, **kwargs)
-    def FindCellByPos(*args, **kwargs): return _html.HtmlCell_FindCellByPos(*args, **kwargs)
-    def GetAbsPos(*args, **kwargs): return _html.HtmlCell_GetAbsPos(*args, **kwargs)
-    def GetFirstTerminal(*args, **kwargs): return _html.HtmlCell_GetFirstTerminal(*args, **kwargs)
-    def GetLastTerminal(*args, **kwargs): return _html.HtmlCell_GetLastTerminal(*args, **kwargs)
-    def GetDepth(*args, **kwargs): return _html.HtmlCell_GetDepth(*args, **kwargs)
-    def IsBefore(*args, **kwargs): return _html.HtmlCell_IsBefore(*args, **kwargs)
-    def ConvertToText(*args, **kwargs): return _html.HtmlCell_ConvertToText(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetPosX(*args, **kwargs):
+        """GetPosX() -> int"""
+        return _html.HtmlCell_GetPosX(*args, **kwargs)
+
+    def GetPosY(*args, **kwargs):
+        """GetPosY() -> int"""
+        return _html.HtmlCell_GetPosY(*args, **kwargs)
+
+    def GetWidth(*args, **kwargs):
+        """GetWidth() -> int"""
+        return _html.HtmlCell_GetWidth(*args, **kwargs)
+
+    def GetHeight(*args, **kwargs):
+        """GetHeight() -> int"""
+        return _html.HtmlCell_GetHeight(*args, **kwargs)
+
+    def GetDescent(*args, **kwargs):
+        """GetDescent() -> int"""
+        return _html.HtmlCell_GetDescent(*args, **kwargs)
+
+    def GetLink(*args, **kwargs):
+        """GetLink(int x=0, int y=0) -> HtmlLinkInfo"""
+        return _html.HtmlCell_GetLink(*args, **kwargs)
+
+    def GetNext(*args, **kwargs):
+        """GetNext() -> HtmlCell"""
+        return _html.HtmlCell_GetNext(*args, **kwargs)
+
+    def GetParent(*args, **kwargs):
+        """GetParent() -> HtmlContainerCell"""
+        return _html.HtmlCell_GetParent(*args, **kwargs)
+
+    def GetFirstChild(*args, **kwargs):
+        """GetFirstChild() -> HtmlCell"""
+        return _html.HtmlCell_GetFirstChild(*args, **kwargs)
+
+    def GetCursor(*args, **kwargs):
+        """GetCursor() -> wxCursor"""
+        return _html.HtmlCell_GetCursor(*args, **kwargs)
+
+    def IsFormattingCell(*args, **kwargs):
+        """IsFormattingCell() -> bool"""
+        return _html.HtmlCell_IsFormattingCell(*args, **kwargs)
+
+    def SetLink(*args, **kwargs):
+        """SetLink(HtmlLinkInfo link)"""
+        return _html.HtmlCell_SetLink(*args, **kwargs)
+
+    def SetNext(*args, **kwargs):
+        """SetNext(HtmlCell cell)"""
+        return _html.HtmlCell_SetNext(*args, **kwargs)
+
+    def SetParent(*args, **kwargs):
+        """SetParent(HtmlContainerCell p)"""
+        return _html.HtmlCell_SetParent(*args, **kwargs)
+
+    def SetPos(*args, **kwargs):
+        """SetPos(int x, int y)"""
+        return _html.HtmlCell_SetPos(*args, **kwargs)
+
+    def Layout(*args, **kwargs):
+        """Layout(int w)"""
+        return _html.HtmlCell_Layout(*args, **kwargs)
+
+    def Draw(*args, **kwargs):
+        """Draw(wxDC dc, int x, int y, int view_y1, int view_y2, HtmlRenderingInfo info)"""
+        return _html.HtmlCell_Draw(*args, **kwargs)
+
+    def DrawInvisible(*args, **kwargs):
+        """DrawInvisible(wxDC dc, int x, int y, HtmlRenderingInfo info)"""
+        return _html.HtmlCell_DrawInvisible(*args, **kwargs)
+
+    def Find(*args, **kwargs):
+        """Find(int condition, void param) -> HtmlCell"""
+        return _html.HtmlCell_Find(*args, **kwargs)
+
+    def AdjustPagebreak(*args, **kwargs):
+        """AdjustPagebreak(int INOUT) -> bool"""
+        return _html.HtmlCell_AdjustPagebreak(*args, **kwargs)
+
+    def SetCanLiveOnPagebreak(*args, **kwargs):
+        """SetCanLiveOnPagebreak(bool can)"""
+        return _html.HtmlCell_SetCanLiveOnPagebreak(*args, **kwargs)
+
+    def IsLinebreakAllowed(*args, **kwargs):
+        """IsLinebreakAllowed() -> bool"""
+        return _html.HtmlCell_IsLinebreakAllowed(*args, **kwargs)
+
+    def IsTerminalCell(*args, **kwargs):
+        """IsTerminalCell() -> bool"""
+        return _html.HtmlCell_IsTerminalCell(*args, **kwargs)
+
+    def FindCellByPos(*args, **kwargs):
+        """FindCellByPos(int x, int y, unsigned int flags=HTML_FIND_EXACT) -> HtmlCell"""
+        return _html.HtmlCell_FindCellByPos(*args, **kwargs)
+
+    def GetAbsPos(*args, **kwargs):
+        """GetAbsPos() -> Point"""
+        return _html.HtmlCell_GetAbsPos(*args, **kwargs)
+
+    def GetFirstTerminal(*args, **kwargs):
+        """GetFirstTerminal() -> HtmlCell"""
+        return _html.HtmlCell_GetFirstTerminal(*args, **kwargs)
+
+    def GetLastTerminal(*args, **kwargs):
+        """GetLastTerminal() -> HtmlCell"""
+        return _html.HtmlCell_GetLastTerminal(*args, **kwargs)
+
+    def GetDepth(*args, **kwargs):
+        """GetDepth() -> unsigned int"""
+        return _html.HtmlCell_GetDepth(*args, **kwargs)
+
+    def IsBefore(*args, **kwargs):
+        """IsBefore(HtmlCell cell) -> bool"""
+        return _html.HtmlCell_IsBefore(*args, **kwargs)
+
+    def ConvertToText(*args, **kwargs):
+        """ConvertToText(HtmlSelection sel) -> wxString"""
+        return _html.HtmlCell_ConvertToText(*args, **kwargs)
+
 
 class HtmlCellPtr(HtmlCell):
     def __init__(self, this):
@@ -359,13 +746,15 @@ class HtmlCellPtr(HtmlCell):
 _html.HtmlCell_swigregister(HtmlCellPtr)
 
 class HtmlWordCell(HtmlCell):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlWordCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString word, wxDC dc) -> HtmlWordCell"""
         newobj = _html.new_HtmlWordCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlWordCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class HtmlWordCellPtr(HtmlWordCell):
     def __init__(self, this):
@@ -375,29 +764,79 @@ class HtmlWordCellPtr(HtmlWordCell):
 _html.HtmlWordCell_swigregister(HtmlWordCellPtr)
 
 class HtmlContainerCell(HtmlCell):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlContainerCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(HtmlContainerCell parent) -> HtmlContainerCell"""
         newobj = _html.new_HtmlContainerCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def InsertCell(*args, **kwargs): return _html.HtmlContainerCell_InsertCell(*args, **kwargs)
-    def SetAlignHor(*args, **kwargs): return _html.HtmlContainerCell_SetAlignHor(*args, **kwargs)
-    def GetAlignHor(*args, **kwargs): return _html.HtmlContainerCell_GetAlignHor(*args, **kwargs)
-    def SetAlignVer(*args, **kwargs): return _html.HtmlContainerCell_SetAlignVer(*args, **kwargs)
-    def GetAlignVer(*args, **kwargs): return _html.HtmlContainerCell_GetAlignVer(*args, **kwargs)
-    def SetIndent(*args, **kwargs): return _html.HtmlContainerCell_SetIndent(*args, **kwargs)
-    def GetIndent(*args, **kwargs): return _html.HtmlContainerCell_GetIndent(*args, **kwargs)
-    def GetIndentUnits(*args, **kwargs): return _html.HtmlContainerCell_GetIndentUnits(*args, **kwargs)
-    def SetAlign(*args, **kwargs): return _html.HtmlContainerCell_SetAlign(*args, **kwargs)
-    def SetWidthFloat(*args, **kwargs): return _html.HtmlContainerCell_SetWidthFloat(*args, **kwargs)
-    def SetWidthFloatFromTag(*args, **kwargs): return _html.HtmlContainerCell_SetWidthFloatFromTag(*args, **kwargs)
-    def SetMinHeight(*args, **kwargs): return _html.HtmlContainerCell_SetMinHeight(*args, **kwargs)
-    def SetBackgroundColour(*args, **kwargs): return _html.HtmlContainerCell_SetBackgroundColour(*args, **kwargs)
-    def GetBackgroundColour(*args, **kwargs): return _html.HtmlContainerCell_GetBackgroundColour(*args, **kwargs)
-    def SetBorder(*args, **kwargs): return _html.HtmlContainerCell_SetBorder(*args, **kwargs)
-    def GetFirstChild(*args, **kwargs): return _html.HtmlContainerCell_GetFirstChild(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlContainerCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def InsertCell(*args, **kwargs):
+        """InsertCell(HtmlCell cell)"""
+        return _html.HtmlContainerCell_InsertCell(*args, **kwargs)
+
+    def SetAlignHor(*args, **kwargs):
+        """SetAlignHor(int al)"""
+        return _html.HtmlContainerCell_SetAlignHor(*args, **kwargs)
+
+    def GetAlignHor(*args, **kwargs):
+        """GetAlignHor() -> int"""
+        return _html.HtmlContainerCell_GetAlignHor(*args, **kwargs)
+
+    def SetAlignVer(*args, **kwargs):
+        """SetAlignVer(int al)"""
+        return _html.HtmlContainerCell_SetAlignVer(*args, **kwargs)
+
+    def GetAlignVer(*args, **kwargs):
+        """GetAlignVer() -> int"""
+        return _html.HtmlContainerCell_GetAlignVer(*args, **kwargs)
+
+    def SetIndent(*args, **kwargs):
+        """SetIndent(int i, int what, int units=HTML_UNITS_PIXELS)"""
+        return _html.HtmlContainerCell_SetIndent(*args, **kwargs)
+
+    def GetIndent(*args, **kwargs):
+        """GetIndent(int ind) -> int"""
+        return _html.HtmlContainerCell_GetIndent(*args, **kwargs)
+
+    def GetIndentUnits(*args, **kwargs):
+        """GetIndentUnits(int ind) -> int"""
+        return _html.HtmlContainerCell_GetIndentUnits(*args, **kwargs)
+
+    def SetAlign(*args, **kwargs):
+        """SetAlign(HtmlTag tag)"""
+        return _html.HtmlContainerCell_SetAlign(*args, **kwargs)
+
+    def SetWidthFloat(*args, **kwargs):
+        """SetWidthFloat(int w, int units)"""
+        return _html.HtmlContainerCell_SetWidthFloat(*args, **kwargs)
+
+    def SetWidthFloatFromTag(*args, **kwargs):
+        """SetWidthFloatFromTag(HtmlTag tag)"""
+        return _html.HtmlContainerCell_SetWidthFloatFromTag(*args, **kwargs)
+
+    def SetMinHeight(*args, **kwargs):
+        """SetMinHeight(int h, int align=HTML_ALIGN_TOP)"""
+        return _html.HtmlContainerCell_SetMinHeight(*args, **kwargs)
+
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(wxColour clr)"""
+        return _html.HtmlContainerCell_SetBackgroundColour(*args, **kwargs)
+
+    def GetBackgroundColour(*args, **kwargs):
+        """GetBackgroundColour() -> wxColour"""
+        return _html.HtmlContainerCell_GetBackgroundColour(*args, **kwargs)
+
+    def SetBorder(*args, **kwargs):
+        """SetBorder(wxColour clr1, wxColour clr2)"""
+        return _html.HtmlContainerCell_SetBorder(*args, **kwargs)
+
+    def GetFirstChild(*args, **kwargs):
+        """GetFirstChild() -> HtmlCell"""
+        return _html.HtmlContainerCell_GetFirstChild(*args, **kwargs)
+
 
 class HtmlContainerCellPtr(HtmlContainerCell):
     def __init__(self, this):
@@ -407,13 +846,15 @@ class HtmlContainerCellPtr(HtmlContainerCell):
 _html.HtmlContainerCell_swigregister(HtmlContainerCellPtr)
 
 class HtmlColourCell(HtmlCell):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlColourCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxColour clr, int flags=HTML_CLR_FOREGROUND) -> HtmlColourCell"""
         newobj = _html.new_HtmlColourCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlColourCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class HtmlColourCellPtr(HtmlColourCell):
     def __init__(self, this):
@@ -423,13 +864,15 @@ class HtmlColourCellPtr(HtmlColourCell):
 _html.HtmlColourCell_swigregister(HtmlColourCellPtr)
 
 class HtmlFontCell(HtmlCell):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlFontCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxFont font) -> HtmlFontCell"""
         newobj = _html.new_HtmlFontCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlFontCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class HtmlFontCellPtr(HtmlFontCell):
     def __init__(self, this):
@@ -439,13 +882,15 @@ class HtmlFontCellPtr(HtmlFontCell):
 _html.HtmlFontCell_swigregister(HtmlFontCellPtr)
 
 class HtmlWidgetCell(HtmlCell):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlWidgetCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window wnd, int w=0) -> HtmlWidgetCell"""
         newobj = _html.new_HtmlWidgetCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlWidgetCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class HtmlWidgetCellPtr(HtmlWidgetCell):
     def __init__(self, this):
@@ -457,15 +902,21 @@ _html.HtmlWidgetCell_swigregister(HtmlWidgetCellPtr)
 #---------------------------------------------------------------------------
 
 class HtmlFilter(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyHtmlFilter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> HtmlFilter"""
         newobj = _html.new_HtmlFilter(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, HtmlFilter)
-    def _setCallbackInfo(*args, **kwargs): return _html.HtmlFilter__setCallbackInfo(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyHtmlFilter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _html.HtmlFilter__setCallbackInfo(*args, **kwargs)
+
 
 class HtmlFilterPtr(HtmlFilter):
     def __init__(self, this):
@@ -477,45 +928,146 @@ _html.HtmlFilter_swigregister(HtmlFilterPtr)
 #---------------------------------------------------------------------------
 
 class HtmlWindow(windows.ScrolledWindow):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyHtmlWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, int style=HW_DEFAULT_STYLE, 
+    wxString name=wxPyHtmlWindowNameStr) -> HtmlWindow"""
         newobj = _html.new_HtmlWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, HtmlWindow); self._setOORInfo(self)
-    def Create(*args, **kwargs): return _html.HtmlWindow_Create(*args, **kwargs)
-    def _setCallbackInfo(*args, **kwargs): return _html.HtmlWindow__setCallbackInfo(*args, **kwargs)
-    def SetPage(*args, **kwargs): return _html.HtmlWindow_SetPage(*args, **kwargs)
-    def LoadPage(*args, **kwargs): return _html.HtmlWindow_LoadPage(*args, **kwargs)
-    def LoadFile(*args, **kwargs): return _html.HtmlWindow_LoadFile(*args, **kwargs)
-    def AppendToPage(*args, **kwargs): return _html.HtmlWindow_AppendToPage(*args, **kwargs)
-    def GetOpenedPage(*args, **kwargs): return _html.HtmlWindow_GetOpenedPage(*args, **kwargs)
-    def GetOpenedAnchor(*args, **kwargs): return _html.HtmlWindow_GetOpenedAnchor(*args, **kwargs)
-    def GetOpenedPageTitle(*args, **kwargs): return _html.HtmlWindow_GetOpenedPageTitle(*args, **kwargs)
-    def SetRelatedFrame(*args, **kwargs): return _html.HtmlWindow_SetRelatedFrame(*args, **kwargs)
-    def GetRelatedFrame(*args, **kwargs): return _html.HtmlWindow_GetRelatedFrame(*args, **kwargs)
-    def SetRelatedStatusBar(*args, **kwargs): return _html.HtmlWindow_SetRelatedStatusBar(*args, **kwargs)
-    def SetFonts(*args, **kwargs): return _html.HtmlWindow_SetFonts(*args, **kwargs)
-    def SetTitle(*args, **kwargs): return _html.HtmlWindow_SetTitle(*args, **kwargs)
-    def SetBorders(*args, **kwargs): return _html.HtmlWindow_SetBorders(*args, **kwargs)
-    def ReadCustomization(*args, **kwargs): return _html.HtmlWindow_ReadCustomization(*args, **kwargs)
-    def WriteCustomization(*args, **kwargs): return _html.HtmlWindow_WriteCustomization(*args, **kwargs)
-    def HistoryBack(*args, **kwargs): return _html.HtmlWindow_HistoryBack(*args, **kwargs)
-    def HistoryForward(*args, **kwargs): return _html.HtmlWindow_HistoryForward(*args, **kwargs)
-    def HistoryCanBack(*args, **kwargs): return _html.HtmlWindow_HistoryCanBack(*args, **kwargs)
-    def HistoryCanForward(*args, **kwargs): return _html.HtmlWindow_HistoryCanForward(*args, **kwargs)
-    def HistoryClear(*args, **kwargs): return _html.HtmlWindow_HistoryClear(*args, **kwargs)
-    def GetInternalRepresentation(*args, **kwargs): return _html.HtmlWindow_GetInternalRepresentation(*args, **kwargs)
-    def GetParser(*args, **kwargs): return _html.HtmlWindow_GetParser(*args, **kwargs)
-    def ScrollToAnchor(*args, **kwargs): return _html.HtmlWindow_ScrollToAnchor(*args, **kwargs)
-    def HasAnchor(*args, **kwargs): return _html.HtmlWindow_HasAnchor(*args, **kwargs)
-    AddFilter = staticmethod(_html.HtmlWindow_AddFilter)
-    def base_OnLinkClicked(*args, **kwargs): return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs)
-    def base_OnSetTitle(*args, **kwargs): return _html.HtmlWindow_base_OnSetTitle(*args, **kwargs)
-    def base_OnCellMouseHover(*args, **kwargs): return _html.HtmlWindow_base_OnCellMouseHover(*args, **kwargs)
-    def base_OnCellClicked(*args, **kwargs): return _html.HtmlWindow_base_OnCellClicked(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyHtmlWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, int style=HW_SCROLLBAR_AUTO, 
+    wxString name=wxPyHtmlWindowNameStr) -> bool"""
+        return _html.HtmlWindow_Create(*args, **kwargs)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _html.HtmlWindow__setCallbackInfo(*args, **kwargs)
+
+    def SetPage(*args, **kwargs):
+        """SetPage(wxString source) -> bool"""
+        return _html.HtmlWindow_SetPage(*args, **kwargs)
+
+    def LoadPage(*args, **kwargs):
+        """LoadPage(wxString location) -> bool"""
+        return _html.HtmlWindow_LoadPage(*args, **kwargs)
+
+    def LoadFile(*args, **kwargs):
+        """LoadFile(wxString filename) -> bool"""
+        return _html.HtmlWindow_LoadFile(*args, **kwargs)
+
+    def AppendToPage(*args, **kwargs):
+        """AppendToPage(wxString source) -> bool"""
+        return _html.HtmlWindow_AppendToPage(*args, **kwargs)
+
+    def GetOpenedPage(*args, **kwargs):
+        """GetOpenedPage() -> wxString"""
+        return _html.HtmlWindow_GetOpenedPage(*args, **kwargs)
+
+    def GetOpenedAnchor(*args, **kwargs):
+        """GetOpenedAnchor() -> wxString"""
+        return _html.HtmlWindow_GetOpenedAnchor(*args, **kwargs)
+
+    def GetOpenedPageTitle(*args, **kwargs):
+        """GetOpenedPageTitle() -> wxString"""
+        return _html.HtmlWindow_GetOpenedPageTitle(*args, **kwargs)
+
+    def SetRelatedFrame(*args, **kwargs):
+        """SetRelatedFrame(Frame frame, wxString format)"""
+        return _html.HtmlWindow_SetRelatedFrame(*args, **kwargs)
+
+    def GetRelatedFrame(*args, **kwargs):
+        """GetRelatedFrame() -> Frame"""
+        return _html.HtmlWindow_GetRelatedFrame(*args, **kwargs)
+
+    def SetRelatedStatusBar(*args, **kwargs):
+        """SetRelatedStatusBar(int bar)"""
+        return _html.HtmlWindow_SetRelatedStatusBar(*args, **kwargs)
+
+    def SetFonts(*args, **kwargs):
+        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        return _html.HtmlWindow_SetFonts(*args, **kwargs)
+
+    def SetTitle(*args, **kwargs):
+        """SetTitle(wxString title)"""
+        return _html.HtmlWindow_SetTitle(*args, **kwargs)
+
+    def SetBorders(*args, **kwargs):
+        """SetBorders(int b)"""
+        return _html.HtmlWindow_SetBorders(*args, **kwargs)
+
+    def ReadCustomization(*args, **kwargs):
+        """ReadCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        return _html.HtmlWindow_ReadCustomization(*args, **kwargs)
+
+    def WriteCustomization(*args, **kwargs):
+        """WriteCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        return _html.HtmlWindow_WriteCustomization(*args, **kwargs)
+
+    def HistoryBack(*args, **kwargs):
+        """HistoryBack() -> bool"""
+        return _html.HtmlWindow_HistoryBack(*args, **kwargs)
+
+    def HistoryForward(*args, **kwargs):
+        """HistoryForward() -> bool"""
+        return _html.HtmlWindow_HistoryForward(*args, **kwargs)
+
+    def HistoryCanBack(*args, **kwargs):
+        """HistoryCanBack() -> bool"""
+        return _html.HtmlWindow_HistoryCanBack(*args, **kwargs)
+
+    def HistoryCanForward(*args, **kwargs):
+        """HistoryCanForward() -> bool"""
+        return _html.HtmlWindow_HistoryCanForward(*args, **kwargs)
+
+    def HistoryClear(*args, **kwargs):
+        """HistoryClear()"""
+        return _html.HtmlWindow_HistoryClear(*args, **kwargs)
+
+    def GetInternalRepresentation(*args, **kwargs):
+        """GetInternalRepresentation() -> HtmlContainerCell"""
+        return _html.HtmlWindow_GetInternalRepresentation(*args, **kwargs)
+
+    def GetParser(*args, **kwargs):
+        """GetParser() -> HtmlWinParser"""
+        return _html.HtmlWindow_GetParser(*args, **kwargs)
+
+    def ScrollToAnchor(*args, **kwargs):
+        """ScrollToAnchor(wxString anchor) -> bool"""
+        return _html.HtmlWindow_ScrollToAnchor(*args, **kwargs)
+
+    def HasAnchor(*args, **kwargs):
+        """HasAnchor(wxString anchor) -> bool"""
+        return _html.HtmlWindow_HasAnchor(*args, **kwargs)
+
+    def AddFilter(*args, **kwargs):
+        """HtmlWindow.AddFilter(HtmlFilter filter)"""
+        return _html.HtmlWindow_AddFilter(*args, **kwargs)
+
+    AddFilter = staticmethod(AddFilter)
+    def base_OnLinkClicked(*args, **kwargs):
+        """base_OnLinkClicked(HtmlLinkInfo link)"""
+        return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs)
+
+    def base_OnSetTitle(*args, **kwargs):
+        """base_OnSetTitle(wxString title)"""
+        return _html.HtmlWindow_base_OnSetTitle(*args, **kwargs)
+
+    def base_OnCellMouseHover(*args, **kwargs):
+        """base_OnCellMouseHover(HtmlCell cell, int x, int y)"""
+        return _html.HtmlWindow_base_OnCellMouseHover(*args, **kwargs)
+
+    def base_OnCellClicked(*args, **kwargs):
+        """base_OnCellClicked(HtmlCell cell, int x, int y, MouseEvent event)"""
+        return _html.HtmlWindow_base_OnCellClicked(*args, **kwargs)
+
 
 class HtmlWindowPtr(HtmlWindow):
     def __init__(self, this):
@@ -525,32 +1077,58 @@ class HtmlWindowPtr(HtmlWindow):
 _html.HtmlWindow_swigregister(HtmlWindowPtr)
 
 def PreHtmlWindow(*args, **kwargs):
+    """PreHtmlWindow() -> HtmlWindow"""
     val = _html.new_PreHtmlWindow(*args, **kwargs)
     val.thisown = 1
     return val
 
-HtmlWindow_AddFilter = _html.HtmlWindow_AddFilter
+def HtmlWindow_AddFilter(*args, **kwargs):
+    """HtmlWindow_AddFilter(HtmlFilter filter)"""
+    return _html.HtmlWindow_AddFilter(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class HtmlDCRenderer(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlDCRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> HtmlDCRenderer"""
         newobj = _html.new_HtmlDCRenderer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_html.delete_HtmlDCRenderer):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetDC(*args, **kwargs): return _html.HtmlDCRenderer_SetDC(*args, **kwargs)
-    def SetSize(*args, **kwargs): return _html.HtmlDCRenderer_SetSize(*args, **kwargs)
-    def SetHtmlText(*args, **kwargs): return _html.HtmlDCRenderer_SetHtmlText(*args, **kwargs)
-    def SetFonts(*args, **kwargs): return _html.HtmlDCRenderer_SetFonts(*args, **kwargs)
-    def Render(*args, **kwargs): return _html.HtmlDCRenderer_Render(*args, **kwargs)
-    def GetTotalHeight(*args, **kwargs): return _html.HtmlDCRenderer_GetTotalHeight(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlDCRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetDC(*args, **kwargs):
+        """SetDC(wxDC dc, int maxwidth)"""
+        return _html.HtmlDCRenderer_SetDC(*args, **kwargs)
+
+    def SetSize(*args, **kwargs):
+        """SetSize(int width, int height)"""
+        return _html.HtmlDCRenderer_SetSize(*args, **kwargs)
+
+    def SetHtmlText(*args, **kwargs):
+        """SetHtmlText(wxString html, wxString basepath=wxPyEmptyString, bool isdir=True)"""
+        return _html.HtmlDCRenderer_SetHtmlText(*args, **kwargs)
+
+    def SetFonts(*args, **kwargs):
+        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        return _html.HtmlDCRenderer_SetFonts(*args, **kwargs)
+
+    def Render(*args, **kwargs):
+        """Render(int x, int y, int from=0, int dont_render=False, int to=INT_MAX, 
+    int choices=None, int LCOUNT=0) -> int"""
+        return _html.HtmlDCRenderer_Render(*args, **kwargs)
+
+    def GetTotalHeight(*args, **kwargs):
+        """GetTotalHeight() -> int"""
+        return _html.HtmlDCRenderer_GetTotalHeight(*args, **kwargs)
+
 
 class HtmlDCRendererPtr(HtmlDCRenderer):
     def __init__(self, this):
@@ -563,21 +1141,50 @@ PAGE_ODD = _html.PAGE_ODD
 PAGE_EVEN = _html.PAGE_EVEN
 PAGE_ALL = _html.PAGE_ALL
 class HtmlPrintout(windows.Printout):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString title=wxPyHtmlPrintoutTitleStr) -> HtmlPrintout"""
         newobj = _html.new_HtmlPrintout(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetHtmlText(*args, **kwargs): return _html.HtmlPrintout_SetHtmlText(*args, **kwargs)
-    def SetHtmlFile(*args, **kwargs): return _html.HtmlPrintout_SetHtmlFile(*args, **kwargs)
-    def SetHeader(*args, **kwargs): return _html.HtmlPrintout_SetHeader(*args, **kwargs)
-    def SetFooter(*args, **kwargs): return _html.HtmlPrintout_SetFooter(*args, **kwargs)
-    def SetFonts(*args, **kwargs): return _html.HtmlPrintout_SetFonts(*args, **kwargs)
-    def SetMargins(*args, **kwargs): return _html.HtmlPrintout_SetMargins(*args, **kwargs)
-    AddFilter = staticmethod(_html.HtmlPrintout_AddFilter)
-    CleanUpStatics = staticmethod(_html.HtmlPrintout_CleanUpStatics)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetHtmlText(*args, **kwargs):
+        """SetHtmlText(wxString html, wxString basepath=wxPyEmptyString, bool isdir=True)"""
+        return _html.HtmlPrintout_SetHtmlText(*args, **kwargs)
+
+    def SetHtmlFile(*args, **kwargs):
+        """SetHtmlFile(wxString htmlfile)"""
+        return _html.HtmlPrintout_SetHtmlFile(*args, **kwargs)
+
+    def SetHeader(*args, **kwargs):
+        """SetHeader(wxString header, int pg=PAGE_ALL)"""
+        return _html.HtmlPrintout_SetHeader(*args, **kwargs)
+
+    def SetFooter(*args, **kwargs):
+        """SetFooter(wxString footer, int pg=PAGE_ALL)"""
+        return _html.HtmlPrintout_SetFooter(*args, **kwargs)
+
+    def SetFonts(*args, **kwargs):
+        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        return _html.HtmlPrintout_SetFonts(*args, **kwargs)
+
+    def SetMargins(*args, **kwargs):
+        """SetMargins(float top=25.2, float bottom=25.2, float left=25.2, 
+    float right=25.2, float spaces=5)"""
+        return _html.HtmlPrintout_SetMargins(*args, **kwargs)
+
+    def AddFilter(*args, **kwargs):
+        """HtmlPrintout.AddFilter(wxHtmlFilter filter)"""
+        return _html.HtmlPrintout_AddFilter(*args, **kwargs)
+
+    AddFilter = staticmethod(AddFilter)
+    def CleanUpStatics(*args, **kwargs):
+        """HtmlPrintout.CleanUpStatics()"""
+        return _html.HtmlPrintout_CleanUpStatics(*args, **kwargs)
+
+    CleanUpStatics = staticmethod(CleanUpStatics)
 
 class HtmlPrintoutPtr(HtmlPrintout):
     def __init__(self, this):
@@ -586,33 +1193,74 @@ class HtmlPrintoutPtr(HtmlPrintout):
         self.__class__ = HtmlPrintout
 _html.HtmlPrintout_swigregister(HtmlPrintoutPtr)
 
-HtmlPrintout_AddFilter = _html.HtmlPrintout_AddFilter
+def HtmlPrintout_AddFilter(*args, **kwargs):
+    """HtmlPrintout_AddFilter(wxHtmlFilter filter)"""
+    return _html.HtmlPrintout_AddFilter(*args, **kwargs)
 
-HtmlPrintout_CleanUpStatics = _html.HtmlPrintout_CleanUpStatics
+def HtmlPrintout_CleanUpStatics(*args, **kwargs):
+    """HtmlPrintout_CleanUpStatics()"""
+    return _html.HtmlPrintout_CleanUpStatics(*args, **kwargs)
 
 class HtmlEasyPrinting(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlEasyPrinting instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString name=wxPyHtmlPrintingTitleStr, Window parentWindow=None) -> HtmlEasyPrinting"""
         newobj = _html.new_HtmlEasyPrinting(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_html.delete_HtmlEasyPrinting):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def PreviewFile(*args, **kwargs): return _html.HtmlEasyPrinting_PreviewFile(*args, **kwargs)
-    def PreviewText(*args, **kwargs): return _html.HtmlEasyPrinting_PreviewText(*args, **kwargs)
-    def PrintFile(*args, **kwargs): return _html.HtmlEasyPrinting_PrintFile(*args, **kwargs)
-    def PrintText(*args, **kwargs): return _html.HtmlEasyPrinting_PrintText(*args, **kwargs)
-    def PrinterSetup(*args, **kwargs): return _html.HtmlEasyPrinting_PrinterSetup(*args, **kwargs)
-    def PageSetup(*args, **kwargs): return _html.HtmlEasyPrinting_PageSetup(*args, **kwargs)
-    def SetHeader(*args, **kwargs): return _html.HtmlEasyPrinting_SetHeader(*args, **kwargs)
-    def SetFooter(*args, **kwargs): return _html.HtmlEasyPrinting_SetFooter(*args, **kwargs)
-    def SetFonts(*args, **kwargs): return _html.HtmlEasyPrinting_SetFonts(*args, **kwargs)
-    def GetPrintData(*args, **kwargs): return _html.HtmlEasyPrinting_GetPrintData(*args, **kwargs)
-    def GetPageSetupData(*args, **kwargs): return _html.HtmlEasyPrinting_GetPageSetupData(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlEasyPrinting instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def PreviewFile(*args, **kwargs):
+        """PreviewFile(wxString htmlfile)"""
+        return _html.HtmlEasyPrinting_PreviewFile(*args, **kwargs)
+
+    def PreviewText(*args, **kwargs):
+        """PreviewText(wxString htmltext, wxString basepath=wxPyEmptyString)"""
+        return _html.HtmlEasyPrinting_PreviewText(*args, **kwargs)
+
+    def PrintFile(*args, **kwargs):
+        """PrintFile(wxString htmlfile)"""
+        return _html.HtmlEasyPrinting_PrintFile(*args, **kwargs)
+
+    def PrintText(*args, **kwargs):
+        """PrintText(wxString htmltext, wxString basepath=wxPyEmptyString)"""
+        return _html.HtmlEasyPrinting_PrintText(*args, **kwargs)
+
+    def PrinterSetup(*args, **kwargs):
+        """PrinterSetup()"""
+        return _html.HtmlEasyPrinting_PrinterSetup(*args, **kwargs)
+
+    def PageSetup(*args, **kwargs):
+        """PageSetup()"""
+        return _html.HtmlEasyPrinting_PageSetup(*args, **kwargs)
+
+    def SetHeader(*args, **kwargs):
+        """SetHeader(wxString header, int pg=PAGE_ALL)"""
+        return _html.HtmlEasyPrinting_SetHeader(*args, **kwargs)
+
+    def SetFooter(*args, **kwargs):
+        """SetFooter(wxString footer, int pg=PAGE_ALL)"""
+        return _html.HtmlEasyPrinting_SetFooter(*args, **kwargs)
+
+    def SetFonts(*args, **kwargs):
+        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        return _html.HtmlEasyPrinting_SetFonts(*args, **kwargs)
+
+    def GetPrintData(*args, **kwargs):
+        """GetPrintData() -> PrintData"""
+        return _html.HtmlEasyPrinting_GetPrintData(*args, **kwargs)
+
+    def GetPageSetupData(*args, **kwargs):
+        """GetPageSetupData() -> PageSetupDialogData"""
+        return _html.HtmlEasyPrinting_GetPageSetupData(*args, **kwargs)
+
 
 class HtmlEasyPrintingPtr(HtmlEasyPrinting):
     def __init__(self, this):
@@ -624,24 +1272,60 @@ _html.HtmlEasyPrinting_swigregister(HtmlEasyPrintingPtr)
 #---------------------------------------------------------------------------
 
 class HtmlBookRecord(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlBookRecord instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString bookfile, wxString basepath, wxString title, 
+    wxString start) -> HtmlBookRecord"""
         newobj = _html.new_HtmlBookRecord(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetBookFile(*args, **kwargs): return _html.HtmlBookRecord_GetBookFile(*args, **kwargs)
-    def GetTitle(*args, **kwargs): return _html.HtmlBookRecord_GetTitle(*args, **kwargs)
-    def GetStart(*args, **kwargs): return _html.HtmlBookRecord_GetStart(*args, **kwargs)
-    def GetBasePath(*args, **kwargs): return _html.HtmlBookRecord_GetBasePath(*args, **kwargs)
-    def SetContentsRange(*args, **kwargs): return _html.HtmlBookRecord_SetContentsRange(*args, **kwargs)
-    def GetContentsStart(*args, **kwargs): return _html.HtmlBookRecord_GetContentsStart(*args, **kwargs)
-    def GetContentsEnd(*args, **kwargs): return _html.HtmlBookRecord_GetContentsEnd(*args, **kwargs)
-    def SetTitle(*args, **kwargs): return _html.HtmlBookRecord_SetTitle(*args, **kwargs)
-    def SetBasePath(*args, **kwargs): return _html.HtmlBookRecord_SetBasePath(*args, **kwargs)
-    def SetStart(*args, **kwargs): return _html.HtmlBookRecord_SetStart(*args, **kwargs)
-    def GetFullPath(*args, **kwargs): return _html.HtmlBookRecord_GetFullPath(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlBookRecord instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetBookFile(*args, **kwargs):
+        """GetBookFile() -> wxString"""
+        return _html.HtmlBookRecord_GetBookFile(*args, **kwargs)
+
+    def GetTitle(*args, **kwargs):
+        """GetTitle() -> wxString"""
+        return _html.HtmlBookRecord_GetTitle(*args, **kwargs)
+
+    def GetStart(*args, **kwargs):
+        """GetStart() -> wxString"""
+        return _html.HtmlBookRecord_GetStart(*args, **kwargs)
+
+    def GetBasePath(*args, **kwargs):
+        """GetBasePath() -> wxString"""
+        return _html.HtmlBookRecord_GetBasePath(*args, **kwargs)
+
+    def SetContentsRange(*args, **kwargs):
+        """SetContentsRange(int start, int end)"""
+        return _html.HtmlBookRecord_SetContentsRange(*args, **kwargs)
+
+    def GetContentsStart(*args, **kwargs):
+        """GetContentsStart() -> int"""
+        return _html.HtmlBookRecord_GetContentsStart(*args, **kwargs)
+
+    def GetContentsEnd(*args, **kwargs):
+        """GetContentsEnd() -> int"""
+        return _html.HtmlBookRecord_GetContentsEnd(*args, **kwargs)
+
+    def SetTitle(*args, **kwargs):
+        """SetTitle(wxString title)"""
+        return _html.HtmlBookRecord_SetTitle(*args, **kwargs)
+
+    def SetBasePath(*args, **kwargs):
+        """SetBasePath(wxString path)"""
+        return _html.HtmlBookRecord_SetBasePath(*args, **kwargs)
+
+    def SetStart(*args, **kwargs):
+        """SetStart(wxString start)"""
+        return _html.HtmlBookRecord_SetStart(*args, **kwargs)
+
+    def GetFullPath(*args, **kwargs):
+        """GetFullPath(wxString page) -> wxString"""
+        return _html.HtmlBookRecord_GetFullPath(*args, **kwargs)
+
 
 class HtmlBookRecordPtr(HtmlBookRecord):
     def __init__(self, this):
@@ -651,14 +1335,30 @@ class HtmlBookRecordPtr(HtmlBookRecord):
 _html.HtmlBookRecord_swigregister(HtmlBookRecordPtr)
 
 class HtmlContentsItem(object):
-    def GetLevel(*args, **kwargs): return _html.HtmlContentsItem_GetLevel(*args, **kwargs)
-    def GetID(*args, **kwargs): return _html.HtmlContentsItem_GetID(*args, **kwargs)
-    def GetName(*args, **kwargs): return _html.HtmlContentsItem_GetName(*args, **kwargs)
-    def GetPage(*args, **kwargs): return _html.HtmlContentsItem_GetPage(*args, **kwargs)
-    def GetBook(*args, **kwargs): return _html.HtmlContentsItem_GetBook(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlContentsItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetLevel(*args, **kwargs):
+        """GetLevel() -> int"""
+        return _html.HtmlContentsItem_GetLevel(*args, **kwargs)
+
+    def GetID(*args, **kwargs):
+        """GetID() -> int"""
+        return _html.HtmlContentsItem_GetID(*args, **kwargs)
+
+    def GetName(*args, **kwargs):
+        """GetName() -> wxString"""
+        return _html.HtmlContentsItem_GetName(*args, **kwargs)
+
+    def GetPage(*args, **kwargs):
+        """GetPage() -> wxString"""
+        return _html.HtmlContentsItem_GetPage(*args, **kwargs)
+
+    def GetBook(*args, **kwargs):
+        """GetBook() -> HtmlBookRecord"""
+        return _html.HtmlContentsItem_GetBook(*args, **kwargs)
+
 
 class HtmlContentsItemPtr(HtmlContentsItem):
     def __init__(self, this):
@@ -668,15 +1368,34 @@ class HtmlContentsItemPtr(HtmlContentsItem):
 _html.HtmlContentsItem_swigregister(HtmlContentsItemPtr)
 
 class HtmlSearchStatus(object):
-    def Search(*args, **kwargs): return _html.HtmlSearchStatus_Search(*args, **kwargs)
-    def IsActive(*args, **kwargs): return _html.HtmlSearchStatus_IsActive(*args, **kwargs)
-    def GetCurIndex(*args, **kwargs): return _html.HtmlSearchStatus_GetCurIndex(*args, **kwargs)
-    def GetMaxIndex(*args, **kwargs): return _html.HtmlSearchStatus_GetMaxIndex(*args, **kwargs)
-    def GetName(*args, **kwargs): return _html.HtmlSearchStatus_GetName(*args, **kwargs)
-    def GetContentsItem(*args, **kwargs): return _html.HtmlSearchStatus_GetContentsItem(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlSearchStatus instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Search(*args, **kwargs):
+        """Search() -> bool"""
+        return _html.HtmlSearchStatus_Search(*args, **kwargs)
+
+    def IsActive(*args, **kwargs):
+        """IsActive() -> bool"""
+        return _html.HtmlSearchStatus_IsActive(*args, **kwargs)
+
+    def GetCurIndex(*args, **kwargs):
+        """GetCurIndex() -> int"""
+        return _html.HtmlSearchStatus_GetCurIndex(*args, **kwargs)
+
+    def GetMaxIndex(*args, **kwargs):
+        """GetMaxIndex() -> int"""
+        return _html.HtmlSearchStatus_GetMaxIndex(*args, **kwargs)
+
+    def GetName(*args, **kwargs):
+        """GetName() -> wxString"""
+        return _html.HtmlSearchStatus_GetName(*args, **kwargs)
+
+    def GetContentsItem(*args, **kwargs):
+        """GetContentsItem() -> HtmlContentsItem"""
+        return _html.HtmlSearchStatus_GetContentsItem(*args, **kwargs)
+
 
 class HtmlSearchStatusPtr(HtmlSearchStatus):
     def __init__(self, this):
@@ -686,26 +1405,57 @@ class HtmlSearchStatusPtr(HtmlSearchStatus):
 _html.HtmlSearchStatus_swigregister(HtmlSearchStatusPtr)
 
 class HtmlHelpData(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlHelpData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> HtmlHelpData"""
         newobj = _html.new_HtmlHelpData(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_html.delete_HtmlHelpData):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetTempDir(*args, **kwargs): return _html.HtmlHelpData_SetTempDir(*args, **kwargs)
-    def AddBook(*args, **kwargs): return _html.HtmlHelpData_AddBook(*args, **kwargs)
-    def FindPageByName(*args, **kwargs): return _html.HtmlHelpData_FindPageByName(*args, **kwargs)
-    def FindPageById(*args, **kwargs): return _html.HtmlHelpData_FindPageById(*args, **kwargs)
-    def GetBookRecArray(*args, **kwargs): return _html.HtmlHelpData_GetBookRecArray(*args, **kwargs)
-    def GetContents(*args, **kwargs): return _html.HtmlHelpData_GetContents(*args, **kwargs)
-    def GetContentsCnt(*args, **kwargs): return _html.HtmlHelpData_GetContentsCnt(*args, **kwargs)
-    def GetIndex(*args, **kwargs): return _html.HtmlHelpData_GetIndex(*args, **kwargs)
-    def GetIndexCnt(*args, **kwargs): return _html.HtmlHelpData_GetIndexCnt(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlHelpData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetTempDir(*args, **kwargs):
+        """SetTempDir(wxString path)"""
+        return _html.HtmlHelpData_SetTempDir(*args, **kwargs)
+
+    def AddBook(*args, **kwargs):
+        """AddBook(wxString book) -> bool"""
+        return _html.HtmlHelpData_AddBook(*args, **kwargs)
+
+    def FindPageByName(*args, **kwargs):
+        """FindPageByName(wxString page) -> wxString"""
+        return _html.HtmlHelpData_FindPageByName(*args, **kwargs)
+
+    def FindPageById(*args, **kwargs):
+        """FindPageById(int id) -> wxString"""
+        return _html.HtmlHelpData_FindPageById(*args, **kwargs)
+
+    def GetBookRecArray(*args, **kwargs):
+        """GetBookRecArray() -> wxHtmlBookRecArray"""
+        return _html.HtmlHelpData_GetBookRecArray(*args, **kwargs)
+
+    def GetContents(*args, **kwargs):
+        """GetContents() -> HtmlContentsItem"""
+        return _html.HtmlHelpData_GetContents(*args, **kwargs)
+
+    def GetContentsCnt(*args, **kwargs):
+        """GetContentsCnt() -> int"""
+        return _html.HtmlHelpData_GetContentsCnt(*args, **kwargs)
+
+    def GetIndex(*args, **kwargs):
+        """GetIndex() -> HtmlContentsItem"""
+        return _html.HtmlHelpData_GetIndex(*args, **kwargs)
+
+    def GetIndexCnt(*args, **kwargs):
+        """GetIndexCnt() -> int"""
+        return _html.HtmlHelpData_GetIndexCnt(*args, **kwargs)
+
 
 class HtmlHelpDataPtr(HtmlHelpData):
     def __init__(self, this):
@@ -715,24 +1465,58 @@ class HtmlHelpDataPtr(HtmlHelpData):
 _html.HtmlHelpData_swigregister(HtmlHelpDataPtr)
 
 class HtmlHelpFrame(windows.Frame):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlHelpFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int ??, wxString title=wxPyEmptyString, 
+    int style=HF_DEFAULTSTYLE, HtmlHelpData data=None) -> HtmlHelpFrame"""
         newobj = _html.new_HtmlHelpFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetData(*args, **kwargs): return _html.HtmlHelpFrame_GetData(*args, **kwargs)
-    def SetTitleFormat(*args, **kwargs): return _html.HtmlHelpFrame_SetTitleFormat(*args, **kwargs)
-    def Display(*args, **kwargs): return _html.HtmlHelpFrame_Display(*args, **kwargs)
-    def DisplayID(*args, **kwargs): return _html.HtmlHelpFrame_DisplayID(*args, **kwargs)
-    def DisplayContents(*args, **kwargs): return _html.HtmlHelpFrame_DisplayContents(*args, **kwargs)
-    def DisplayIndex(*args, **kwargs): return _html.HtmlHelpFrame_DisplayIndex(*args, **kwargs)
-    def KeywordSearch(*args, **kwargs): return _html.HtmlHelpFrame_KeywordSearch(*args, **kwargs)
-    def UseConfig(*args, **kwargs): return _html.HtmlHelpFrame_UseConfig(*args, **kwargs)
-    def ReadCustomization(*args, **kwargs): return _html.HtmlHelpFrame_ReadCustomization(*args, **kwargs)
-    def WriteCustomization(*args, **kwargs): return _html.HtmlHelpFrame_WriteCustomization(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlHelpFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetData(*args, **kwargs):
+        """GetData() -> HtmlHelpData"""
+        return _html.HtmlHelpFrame_GetData(*args, **kwargs)
+
+    def SetTitleFormat(*args, **kwargs):
+        """SetTitleFormat(wxString format)"""
+        return _html.HtmlHelpFrame_SetTitleFormat(*args, **kwargs)
+
+    def Display(*args, **kwargs):
+        """Display(wxString x)"""
+        return _html.HtmlHelpFrame_Display(*args, **kwargs)
+
+    def DisplayID(*args, **kwargs):
+        """DisplayID(int id)"""
+        return _html.HtmlHelpFrame_DisplayID(*args, **kwargs)
+
+    def DisplayContents(*args, **kwargs):
+        """DisplayContents()"""
+        return _html.HtmlHelpFrame_DisplayContents(*args, **kwargs)
+
+    def DisplayIndex(*args, **kwargs):
+        """DisplayIndex()"""
+        return _html.HtmlHelpFrame_DisplayIndex(*args, **kwargs)
+
+    def KeywordSearch(*args, **kwargs):
+        """KeywordSearch(wxString keyword) -> bool"""
+        return _html.HtmlHelpFrame_KeywordSearch(*args, **kwargs)
+
+    def UseConfig(*args, **kwargs):
+        """UseConfig(wxConfigBase config, wxString rootpath=wxPyEmptyString)"""
+        return _html.HtmlHelpFrame_UseConfig(*args, **kwargs)
+
+    def ReadCustomization(*args, **kwargs):
+        """ReadCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        return _html.HtmlHelpFrame_ReadCustomization(*args, **kwargs)
+
+    def WriteCustomization(*args, **kwargs):
+        """WriteCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        return _html.HtmlHelpFrame_WriteCustomization(*args, **kwargs)
+
 
 class HtmlHelpFramePtr(HtmlHelpFrame):
     def __init__(self, this):
@@ -751,30 +1535,71 @@ HF_OPENFILES = _html.HF_OPENFILES
 HF_PRINT = _html.HF_PRINT
 HF_DEFAULTSTYLE = _html.HF_DEFAULTSTYLE
 class HtmlHelpController(core.EvtHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlHelpController instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int style=HF_DEFAULTSTYLE) -> HtmlHelpController"""
         newobj = _html.new_HtmlHelpController(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
+
     def __del__(self, destroy=_html.delete_HtmlHelpController):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetTitleFormat(*args, **kwargs): return _html.HtmlHelpController_SetTitleFormat(*args, **kwargs)
-    def SetTempDir(*args, **kwargs): return _html.HtmlHelpController_SetTempDir(*args, **kwargs)
-    def AddBook(*args, **kwargs): return _html.HtmlHelpController_AddBook(*args, **kwargs)
-    def Display(*args, **kwargs): return _html.HtmlHelpController_Display(*args, **kwargs)
-    def DisplayID(*args, **kwargs): return _html.HtmlHelpController_DisplayID(*args, **kwargs)
-    def DisplayContents(*args, **kwargs): return _html.HtmlHelpController_DisplayContents(*args, **kwargs)
-    def DisplayIndex(*args, **kwargs): return _html.HtmlHelpController_DisplayIndex(*args, **kwargs)
-    def KeywordSearch(*args, **kwargs): return _html.HtmlHelpController_KeywordSearch(*args, **kwargs)
-    def UseConfig(*args, **kwargs): return _html.HtmlHelpController_UseConfig(*args, **kwargs)
-    def ReadCustomization(*args, **kwargs): return _html.HtmlHelpController_ReadCustomization(*args, **kwargs)
-    def WriteCustomization(*args, **kwargs): return _html.HtmlHelpController_WriteCustomization(*args, **kwargs)
-    def GetFrame(*args, **kwargs): return _html.HtmlHelpController_GetFrame(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlHelpController instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetTitleFormat(*args, **kwargs):
+        """SetTitleFormat(wxString format)"""
+        return _html.HtmlHelpController_SetTitleFormat(*args, **kwargs)
+
+    def SetTempDir(*args, **kwargs):
+        """SetTempDir(wxString path)"""
+        return _html.HtmlHelpController_SetTempDir(*args, **kwargs)
+
+    def AddBook(*args, **kwargs):
+        """AddBook(wxString book, int show_wait_msg=False) -> bool"""
+        return _html.HtmlHelpController_AddBook(*args, **kwargs)
+
+    def Display(*args, **kwargs):
+        """Display(wxString x)"""
+        return _html.HtmlHelpController_Display(*args, **kwargs)
+
+    def DisplayID(*args, **kwargs):
+        """DisplayID(int id)"""
+        return _html.HtmlHelpController_DisplayID(*args, **kwargs)
+
+    def DisplayContents(*args, **kwargs):
+        """DisplayContents()"""
+        return _html.HtmlHelpController_DisplayContents(*args, **kwargs)
+
+    def DisplayIndex(*args, **kwargs):
+        """DisplayIndex()"""
+        return _html.HtmlHelpController_DisplayIndex(*args, **kwargs)
+
+    def KeywordSearch(*args, **kwargs):
+        """KeywordSearch(wxString keyword) -> bool"""
+        return _html.HtmlHelpController_KeywordSearch(*args, **kwargs)
+
+    def UseConfig(*args, **kwargs):
+        """UseConfig(wxConfigBase config, wxString rootpath=wxPyEmptyString)"""
+        return _html.HtmlHelpController_UseConfig(*args, **kwargs)
+
+    def ReadCustomization(*args, **kwargs):
+        """ReadCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        return _html.HtmlHelpController_ReadCustomization(*args, **kwargs)
+
+    def WriteCustomization(*args, **kwargs):
+        """WriteCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        return _html.HtmlHelpController_WriteCustomization(*args, **kwargs)
+
+    def GetFrame(*args, **kwargs):
+        """GetFrame() -> HtmlHelpFrame"""
+        return _html.HtmlHelpController_GetFrame(*args, **kwargs)
+
 
 class HtmlHelpControllerPtr(HtmlHelpController):
     def __init__(self, this):
diff --git a/wxPython/src/gtk/html_wrap.cpp b/wxPython/src/gtk/html_wrap.cpp
index 953057e0da..c1811c248e 100644
--- a/wxPython/src/gtk/html_wrap.cpp
+++ b/wxPython/src/gtk/html_wrap.cpp
@@ -441,9 +441,9 @@ class wxPyHtmlFilter : public wxHtmlFilter {
 public:
     wxPyHtmlFilter() : wxHtmlFilter() {}
 
-    // returns TRUE if this filter is able to open&read given file
+    // returns True if this filter is able to open&read given file
     virtual bool CanRead(const wxFSFile& file) const {
-        bool rval = FALSE;
+        bool rval = False;
         bool found;
         wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "CanRead"))) {
@@ -614,8 +614,8 @@ static PyObject *_wrap_new_HtmlLinkInfo(PyObject *self, PyObject *args, PyObject
     wxString const &arg2_defvalue = wxPyEmptyString ;
     wxString *arg2 = (wxString *) &arg2_defvalue ;
     wxHtmlLinkInfo *result;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -626,13 +626,13 @@ static PyObject *_wrap_new_HtmlLinkInfo(PyObject *self, PyObject *args, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     {
@@ -876,7 +876,7 @@ static PyObject *_wrap_HtmlTag_HasParam(PyObject *self, PyObject *args, PyObject
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -888,7 +888,7 @@ static PyObject *_wrap_HtmlTag_HasParam(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -916,9 +916,9 @@ static PyObject *_wrap_HtmlTag_GetParam(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     wxString *arg2 = 0 ;
-    int arg3 = (int) FALSE ;
+    int arg3 = (int) False ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -930,7 +930,7 @@ static PyObject *_wrap_HtmlTag_GetParam(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1157,7 +1157,7 @@ static PyObject *_wrap_HtmlParser_Parse(PyObject *self, PyObject *args, PyObject
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxString *arg2 = 0 ;
     wxObject *result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1169,7 +1169,7 @@ static PyObject *_wrap_HtmlParser_Parse(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1199,7 +1199,7 @@ static PyObject *_wrap_HtmlParser_InitParser(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1211,7 +1211,7 @@ static PyObject *_wrap_HtmlParser_InitParser(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1372,7 +1372,6 @@ static PyObject *_wrap_HtmlParser_PushTagHandler(PyObject *self, PyObject *args,
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxHtmlTagHandler *arg2 = (wxHtmlTagHandler *) 0 ;
     wxString arg3 ;
-    wxString *argp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -1383,8 +1382,12 @@ static PyObject *_wrap_HtmlParser_PushTagHandler(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlParser_PushTagHandler",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxHtmlTagHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg3 = *argp3; 
+    {
+        wxString* sptr = wxString_in_helper(obj2);
+        if (sptr == NULL) SWIG_fail;
+        arg3 = *sptr;
+        delete sptr;
+    }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->PushTagHandler(arg2,arg3);
@@ -1594,8 +1597,6 @@ static PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *self, PyObject *args, Py
     wxString arg2 ;
     wxString arg3 ;
     PyObject *arg4 = (PyObject *) NULL ;
-    wxString *argp2 ;
-    wxString *argp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -1606,10 +1607,18 @@ static PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *self, PyObject *args, Py
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlWinParser_SetFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlWinParser,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
-    if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg3 = *argp3; 
+    {
+        wxString* sptr = wxString_in_helper(obj1);
+        if (sptr == NULL) SWIG_fail;
+        arg2 = *sptr;
+        delete sptr;
+    }
+    {
+        wxString* sptr = wxString_in_helper(obj2);
+        if (sptr == NULL) SWIG_fail;
+        arg3 = *sptr;
+        delete sptr;
+    }
     if (obj3) {
         arg4 = obj3;
     }
@@ -2154,7 +2163,7 @@ static PyObject *_wrap_HtmlWinParser_SetLink(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2166,7 +2175,7 @@ static PyObject *_wrap_HtmlWinParser_SetLink(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4187,8 +4196,8 @@ static PyObject *_wrap_HtmlCell_IsTerminalCell(PyObject *self, PyObject *args, P
 static PyObject *_wrap_HtmlCell_FindCellByPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     unsigned int arg4 = (unsigned int) wxHTML_FIND_EXACT ;
     wxHtmlCell *result;
     PyObject * obj0 = 0 ;
@@ -4395,7 +4404,7 @@ static PyObject *_wrap_new_HtmlWordCell(PyObject *self, PyObject *args, PyObject
     wxString *arg1 = 0 ;
     wxDC *arg2 = 0 ;
     wxHtmlWordCell *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4406,7 +4415,7 @@ static PyObject *_wrap_new_HtmlWordCell(PyObject *self, PyObject *args, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (arg2 == NULL) {
@@ -5087,7 +5096,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject *
     wxPyHtmlWindow *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -5114,7 +5123,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject *
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -5180,7 +5189,7 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -5209,7 +5218,7 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -5269,7 +5278,7 @@ static PyObject *_wrap_HtmlWindow_SetPage(PyObject *self, PyObject *args, PyObje
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5281,7 +5290,7 @@ static PyObject *_wrap_HtmlWindow_SetPage(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5310,7 +5319,7 @@ static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *self, PyObject *args, PyObj
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5322,7 +5331,7 @@ static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5351,7 +5360,7 @@ static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *self, PyObject *args, PyObj
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5363,7 +5372,7 @@ static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5392,7 +5401,7 @@ static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *self, PyObject *args, P
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5404,7 +5413,7 @@ static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5526,7 +5535,7 @@ static PyObject *_wrap_HtmlWindow_SetRelatedFrame(PyObject *self, PyObject *args
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxFrame *arg2 = (wxFrame *) 0 ;
     wxString *arg3 = 0 ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -5540,7 +5549,7 @@ static PyObject *_wrap_HtmlWindow_SetRelatedFrame(PyObject *self, PyObject *args
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5622,8 +5631,6 @@ static PyObject *_wrap_HtmlWindow_SetFonts(PyObject *self, PyObject *args, PyObj
     wxString arg2 ;
     wxString arg3 ;
     PyObject *arg4 = (PyObject *) NULL ;
-    wxString *argp2 ;
-    wxString *argp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -5634,10 +5641,18 @@ static PyObject *_wrap_HtmlWindow_SetFonts(PyObject *self, PyObject *args, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlWindow_SetFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
-    if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg3 = *argp3; 
+    {
+        wxString* sptr = wxString_in_helper(obj1);
+        if (sptr == NULL) SWIG_fail;
+        arg2 = *sptr;
+        delete sptr;
+    }
+    {
+        wxString* sptr = wxString_in_helper(obj2);
+        if (sptr == NULL) SWIG_fail;
+        arg3 = *sptr;
+        delete sptr;
+    }
     if (obj3) {
         arg4 = obj3;
     }
@@ -5659,7 +5674,7 @@ static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5671,7 +5686,7 @@ static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5725,7 +5740,6 @@ static PyObject *_wrap_HtmlWindow_ReadCustomization(PyObject *self, PyObject *ar
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
     wxString arg3 = (wxString) wxPyEmptyString ;
-    wxString *argp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -5737,8 +5751,12 @@ static PyObject *_wrap_HtmlWindow_ReadCustomization(PyObject *self, PyObject *ar
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-        arg3 = *argp3; 
+        {
+            wxString* sptr = wxString_in_helper(obj2);
+            if (sptr == NULL) SWIG_fail;
+            arg3 = *sptr;
+            delete sptr;
+        }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5759,7 +5777,6 @@ static PyObject *_wrap_HtmlWindow_WriteCustomization(PyObject *self, PyObject *a
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
     wxString arg3 = (wxString) wxPyEmptyString ;
-    wxString *argp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -5771,8 +5788,12 @@ static PyObject *_wrap_HtmlWindow_WriteCustomization(PyObject *self, PyObject *a
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-        arg3 = *argp3; 
+        {
+            wxString* sptr = wxString_in_helper(obj2);
+            if (sptr == NULL) SWIG_fail;
+            arg3 = *sptr;
+            delete sptr;
+        }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5967,7 +5988,7 @@ static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *self, PyObject *args,
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5979,7 +6000,7 @@ static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6008,7 +6029,7 @@ static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *self, PyObject *args, PyOb
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6020,7 +6041,7 @@ static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6102,7 +6123,7 @@ static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *self, PyObject *args
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6114,7 +6135,7 @@ static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6142,8 +6163,8 @@ static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *self, PyObject
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
+    int arg3 ;
+    int arg4 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6171,8 +6192,8 @@ static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *self, PyObject *a
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
-    wxCoord arg3 ;
-    wxCoord arg4 ;
+    int arg3 ;
+    int arg4 ;
     wxMouseEvent *arg5 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -6315,9 +6336,9 @@ static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *self, PyObject *args
     wxString *arg2 = 0 ;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
-    bool arg4 = (bool) TRUE ;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool arg4 = (bool) True ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6331,13 +6352,13 @@ static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
@@ -6380,8 +6401,6 @@ static PyObject *_wrap_HtmlDCRenderer_SetFonts(PyObject *self, PyObject *args, P
     wxString arg2 ;
     wxString arg3 ;
     PyObject *arg4 = (PyObject *) NULL ;
-    wxString *argp2 ;
-    wxString *argp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6392,10 +6411,18 @@ static PyObject *_wrap_HtmlDCRenderer_SetFonts(PyObject *self, PyObject *args, P
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlDCRenderer_SetFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlDCRenderer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
-    if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg3 = *argp3; 
+    {
+        wxString* sptr = wxString_in_helper(obj1);
+        if (sptr == NULL) SWIG_fail;
+        arg2 = *sptr;
+        delete sptr;
+    }
+    {
+        wxString* sptr = wxString_in_helper(obj2);
+        if (sptr == NULL) SWIG_fail;
+        arg3 = *sptr;
+        delete sptr;
+    }
     if (obj3) {
         arg4 = obj3;
     }
@@ -6419,7 +6446,7 @@ static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *self, PyObject *args, PyO
     int arg2 ;
     int arg3 ;
     int arg4 = (int) 0 ;
-    int arg5 = (int) FALSE ;
+    int arg5 = (int) False ;
     int arg6 = (int) INT_MAX ;
     int *arg7 = (int *) NULL ;
     int arg8 = (int) 0 ;
@@ -6486,7 +6513,7 @@ static PyObject *_wrap_new_HtmlPrintout(PyObject *self, PyObject *args, PyObject
     wxString const &arg1_defvalue = wxPyHtmlPrintoutTitleStr ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
     wxHtmlPrintout *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "title", NULL 
@@ -6497,7 +6524,7 @@ static PyObject *_wrap_new_HtmlPrintout(PyObject *self, PyObject *args, PyObject
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     {
@@ -6528,9 +6555,9 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *self, PyObject *args,
     wxString *arg2 = 0 ;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
-    bool arg4 = (bool) TRUE ;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool arg4 = (bool) True ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6544,13 +6571,13 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
@@ -6591,7 +6618,7 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlFile(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6603,7 +6630,7 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlFile(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6632,7 +6659,7 @@ static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *self, PyObject *args, Py
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 = (int) wxPAGE_ALL ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6644,7 +6671,7 @@ static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6673,7 +6700,7 @@ static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *self, PyObject *args, Py
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 = (int) wxPAGE_ALL ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6685,7 +6712,7 @@ static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6715,8 +6742,6 @@ static PyObject *_wrap_HtmlPrintout_SetFonts(PyObject *self, PyObject *args, PyO
     wxString arg2 ;
     wxString arg3 ;
     PyObject *arg4 = (PyObject *) NULL ;
-    wxString *argp2 ;
-    wxString *argp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6727,10 +6752,18 @@ static PyObject *_wrap_HtmlPrintout_SetFonts(PyObject *self, PyObject *args, PyO
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlPrintout_SetFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlPrintout,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
-    if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg3 = *argp3; 
+    {
+        wxString* sptr = wxString_in_helper(obj1);
+        if (sptr == NULL) SWIG_fail;
+        arg2 = *sptr;
+        delete sptr;
+    }
+    {
+        wxString* sptr = wxString_in_helper(obj2);
+        if (sptr == NULL) SWIG_fail;
+        arg3 = *sptr;
+        delete sptr;
+    }
     if (obj3) {
         arg4 = obj3;
     }
@@ -6835,7 +6868,7 @@ static PyObject *_wrap_new_HtmlEasyPrinting(PyObject *self, PyObject *args, PyOb
     wxString *arg1 = (wxString *) &arg1_defvalue ;
     wxWindow *arg2 = (wxWindow *) NULL ;
     wxHtmlEasyPrinting *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6847,7 +6880,7 @@ static PyObject *_wrap_new_HtmlEasyPrinting(PyObject *self, PyObject *args, PyOb
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     if (obj1) {
@@ -6903,7 +6936,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewFile(PyObject *self, PyObject *ar
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -6915,7 +6948,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewFile(PyObject *self, PyObject *ar
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6945,8 +6978,8 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewText(PyObject *self, PyObject *ar
     wxString *arg2 = 0 ;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6959,13 +6992,13 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewText(PyObject *self, PyObject *ar
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -7002,7 +7035,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintFile(PyObject *self, PyObject *args
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7014,7 +7047,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintFile(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7044,8 +7077,8 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintText(PyObject *self, PyObject *args
     wxString *arg2 = 0 ;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -7058,13 +7091,13 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintText(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -7150,7 +7183,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *self, PyObject *args
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 = (int) wxPAGE_ALL ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7162,7 +7195,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7191,7 +7224,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *self, PyObject *args
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 = (int) wxPAGE_ALL ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7203,7 +7236,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7233,8 +7266,6 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFonts(PyObject *self, PyObject *args,
     wxString arg2 ;
     wxString arg3 ;
     PyObject *arg4 = (PyObject *) NULL ;
-    wxString *argp2 ;
-    wxString *argp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -7245,10 +7276,18 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFonts(PyObject *self, PyObject *args,
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlEasyPrinting_SetFonts",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlEasyPrinting,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
-    if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg3 = *argp3; 
+    {
+        wxString* sptr = wxString_in_helper(obj1);
+        if (sptr == NULL) SWIG_fail;
+        arg2 = *sptr;
+        delete sptr;
+    }
+    {
+        wxString* sptr = wxString_in_helper(obj2);
+        if (sptr == NULL) SWIG_fail;
+        arg3 = *sptr;
+        delete sptr;
+    }
     if (obj3) {
         arg4 = obj3;
     }
@@ -7330,10 +7369,10 @@ static PyObject *_wrap_new_HtmlBookRecord(PyObject *self, PyObject *args, PyObje
     wxString *arg3 = 0 ;
     wxString *arg4 = 0 ;
     wxHtmlBookRecord *result;
-    bool temp1 = false ;
-    bool temp2 = false ;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -7346,22 +7385,22 @@ static PyObject *_wrap_new_HtmlBookRecord(PyObject *self, PyObject *args, PyObje
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7613,7 +7652,7 @@ static PyObject *_wrap_HtmlBookRecord_SetTitle(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7625,7 +7664,7 @@ static PyObject *_wrap_HtmlBookRecord_SetTitle(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7653,7 +7692,7 @@ static PyObject *_wrap_HtmlBookRecord_SetBasePath(PyObject *self, PyObject *args
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7665,7 +7704,7 @@ static PyObject *_wrap_HtmlBookRecord_SetBasePath(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7693,7 +7732,7 @@ static PyObject *_wrap_HtmlBookRecord_SetStart(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7705,7 +7744,7 @@ static PyObject *_wrap_HtmlBookRecord_SetStart(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7734,7 +7773,7 @@ static PyObject *_wrap_HtmlBookRecord_GetFullPath(PyObject *self, PyObject *args
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString *arg2 = 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7746,7 +7785,7 @@ static PyObject *_wrap_HtmlBookRecord_GetFullPath(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8137,7 +8176,7 @@ static PyObject *_wrap_HtmlHelpData_SetTempDir(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8149,7 +8188,7 @@ static PyObject *_wrap_HtmlHelpData_SetTempDir(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8178,7 +8217,7 @@ static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *self, PyObject *args, PyOb
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8190,7 +8229,7 @@ static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8219,7 +8258,7 @@ static PyObject *_wrap_HtmlHelpData_FindPageByName(PyObject *self, PyObject *arg
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxString *arg2 = 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8231,7 +8270,7 @@ static PyObject *_wrap_HtmlHelpData_FindPageByName(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8437,12 +8476,12 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *self, PyObject *args, PyObjec
     int arg4 = (int) wxHF_DEFAULTSTYLE ;
     wxHtmlHelpData *arg5 = (wxHtmlHelpData *) NULL ;
     wxHtmlHelpFrame *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj4 = 0 ;
     char *kwnames[] = {
-        (char *) "parent",(char *) "wxWindowID",(char *) "title",(char *) "style",(char *) "data", NULL 
+        (char *) "parent","arg2",(char *) "title",(char *) "style",(char *) "data", NULL 
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OiO:new_HtmlHelpFrame",kwnames,&obj0,&arg2,&obj2,&arg4,&obj4)) goto fail;
@@ -8451,7 +8490,7 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *self, PyObject *args, PyObjec
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj4) {
@@ -8508,7 +8547,7 @@ static PyObject *_wrap_HtmlHelpFrame_SetTitleFormat(PyObject *self, PyObject *ar
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8520,7 +8559,7 @@ static PyObject *_wrap_HtmlHelpFrame_SetTitleFormat(PyObject *self, PyObject *ar
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8548,7 +8587,7 @@ static PyObject *_wrap_HtmlHelpFrame_Display(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8560,7 +8599,7 @@ static PyObject *_wrap_HtmlHelpFrame_Display(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8662,7 +8701,7 @@ static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *self, PyObject *arg
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8674,7 +8713,7 @@ static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8704,7 +8743,7 @@ static PyObject *_wrap_HtmlHelpFrame_UseConfig(PyObject *self, PyObject *args, P
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -8719,7 +8758,7 @@ static PyObject *_wrap_HtmlHelpFrame_UseConfig(PyObject *self, PyObject *args, P
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -8749,7 +8788,6 @@ static PyObject *_wrap_HtmlHelpFrame_ReadCustomization(PyObject *self, PyObject
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
     wxString arg3 = (wxString) wxPyEmptyString ;
-    wxString *argp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -8761,8 +8799,12 @@ static PyObject *_wrap_HtmlHelpFrame_ReadCustomization(PyObject *self, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-        arg3 = *argp3; 
+        {
+            wxString* sptr = wxString_in_helper(obj2);
+            if (sptr == NULL) SWIG_fail;
+            arg3 = *sptr;
+            delete sptr;
+        }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8783,7 +8825,6 @@ static PyObject *_wrap_HtmlHelpFrame_WriteCustomization(PyObject *self, PyObject
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
     wxString arg3 = (wxString) wxPyEmptyString ;
-    wxString *argp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -8795,8 +8836,12 @@ static PyObject *_wrap_HtmlHelpFrame_WriteCustomization(PyObject *self, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpFrame,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-        arg3 = *argp3; 
+        {
+            wxString* sptr = wxString_in_helper(obj2);
+            if (sptr == NULL) SWIG_fail;
+            arg3 = *sptr;
+            delete sptr;
+        }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8870,7 +8915,7 @@ static PyObject *_wrap_HtmlHelpController_SetTitleFormat(PyObject *self, PyObjec
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8882,7 +8927,7 @@ static PyObject *_wrap_HtmlHelpController_SetTitleFormat(PyObject *self, PyObjec
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8910,7 +8955,7 @@ static PyObject *_wrap_HtmlHelpController_SetTempDir(PyObject *self, PyObject *a
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8922,7 +8967,7 @@ static PyObject *_wrap_HtmlHelpController_SetTempDir(PyObject *self, PyObject *a
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8950,9 +8995,9 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *self, PyObject *args
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
-    int arg3 = (int) FALSE ;
+    int arg3 = (int) False ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -8964,7 +9009,7 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8992,7 +9037,7 @@ static PyObject *_wrap_HtmlHelpController_Display(PyObject *self, PyObject *args
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9004,7 +9049,7 @@ static PyObject *_wrap_HtmlHelpController_Display(PyObject *self, PyObject *args
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9106,7 +9151,7 @@ static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *self, PyObject
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -9118,7 +9163,7 @@ static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *self, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9148,7 +9193,7 @@ static PyObject *_wrap_HtmlHelpController_UseConfig(PyObject *self, PyObject *ar
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -9163,7 +9208,7 @@ static PyObject *_wrap_HtmlHelpController_UseConfig(PyObject *self, PyObject *ar
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -9193,7 +9238,6 @@ static PyObject *_wrap_HtmlHelpController_ReadCustomization(PyObject *self, PyOb
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
     wxString arg3 = (wxString) wxPyEmptyString ;
-    wxString *argp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -9205,8 +9249,12 @@ static PyObject *_wrap_HtmlHelpController_ReadCustomization(PyObject *self, PyOb
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpController,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-        arg3 = *argp3; 
+        {
+            wxString* sptr = wxString_in_helper(obj2);
+            if (sptr == NULL) SWIG_fail;
+            arg3 = *sptr;
+            delete sptr;
+        }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9227,7 +9275,6 @@ static PyObject *_wrap_HtmlHelpController_WriteCustomization(PyObject *self, PyO
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
     wxString arg3 = (wxString) wxPyEmptyString ;
-    wxString *argp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -9239,8 +9286,12 @@ static PyObject *_wrap_HtmlHelpController_WriteCustomization(PyObject *self, PyO
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxHtmlHelpController,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxConfigBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (obj2) {
-        if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-        arg3 = *argp3; 
+        {
+            wxString* sptr = wxString_in_helper(obj2);
+            if (sptr == NULL) SWIG_fail;
+            arg3 = *sptr;
+            delete sptr;
+        }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
diff --git a/wxPython/src/gtk/misc.py b/wxPython/src/gtk/misc.py
index 398fb878ce..0a4320709c 100644
--- a/wxPython/src/gtk/misc.py
+++ b/wxPython/src/gtk/misc.py
@@ -99,15 +99,40 @@ SYS_SCREEN_PDA = _misc.SYS_SCREEN_PDA
 SYS_SCREEN_SMALL = _misc.SYS_SCREEN_SMALL
 SYS_SCREEN_DESKTOP = _misc.SYS_SCREEN_DESKTOP
 class SystemSettings(object):
-    GetColour = staticmethod(_misc.SystemSettings_GetColour)
-    GetFont = staticmethod(_misc.SystemSettings_GetFont)
-    GetMetric = staticmethod(_misc.SystemSettings_GetMetric)
-    HasFeature = staticmethod(_misc.SystemSettings_HasFeature)
-    GetScreenType = staticmethod(_misc.SystemSettings_GetScreenType)
-    SetScreenType = staticmethod(_misc.SystemSettings_SetScreenType)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxSystemSettings instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetColour(*args, **kwargs):
+        """SystemSettings.GetColour(wxSystemColour index) -> wxColour"""
+        return _misc.SystemSettings_GetColour(*args, **kwargs)
+
+    GetColour = staticmethod(GetColour)
+    def GetFont(*args, **kwargs):
+        """SystemSettings.GetFont(wxSystemFont index) -> wxFont"""
+        return _misc.SystemSettings_GetFont(*args, **kwargs)
+
+    GetFont = staticmethod(GetFont)
+    def GetMetric(*args, **kwargs):
+        """SystemSettings.GetMetric(wxSystemMetric index) -> int"""
+        return _misc.SystemSettings_GetMetric(*args, **kwargs)
+
+    GetMetric = staticmethod(GetMetric)
+    def HasFeature(*args, **kwargs):
+        """SystemSettings.HasFeature(wxSystemFeature index) -> bool"""
+        return _misc.SystemSettings_HasFeature(*args, **kwargs)
+
+    HasFeature = staticmethod(HasFeature)
+    def GetScreenType(*args, **kwargs):
+        """SystemSettings.GetScreenType() -> wxSystemScreenType"""
+        return _misc.SystemSettings_GetScreenType(*args, **kwargs)
+
+    GetScreenType = staticmethod(GetScreenType)
+    def SetScreenType(*args, **kwargs):
+        """SystemSettings.SetScreenType(wxSystemScreenType screen)"""
+        return _misc.SystemSettings_SetScreenType(*args, **kwargs)
+
+    SetScreenType = staticmethod(SetScreenType)
 
 class SystemSettingsPtr(SystemSettings):
     def __init__(self, this):
@@ -116,31 +141,65 @@ class SystemSettingsPtr(SystemSettings):
         self.__class__ = SystemSettings
 _misc.SystemSettings_swigregister(SystemSettingsPtr)
 
-SystemSettings_GetColour = _misc.SystemSettings_GetColour
+def SystemSettings_GetColour(*args, **kwargs):
+    """SystemSettings_GetColour(wxSystemColour index) -> wxColour"""
+    return _misc.SystemSettings_GetColour(*args, **kwargs)
 
-SystemSettings_GetFont = _misc.SystemSettings_GetFont
+def SystemSettings_GetFont(*args, **kwargs):
+    """SystemSettings_GetFont(wxSystemFont index) -> wxFont"""
+    return _misc.SystemSettings_GetFont(*args, **kwargs)
 
-SystemSettings_GetMetric = _misc.SystemSettings_GetMetric
+def SystemSettings_GetMetric(*args, **kwargs):
+    """SystemSettings_GetMetric(wxSystemMetric index) -> int"""
+    return _misc.SystemSettings_GetMetric(*args, **kwargs)
 
-SystemSettings_HasFeature = _misc.SystemSettings_HasFeature
+def SystemSettings_HasFeature(*args, **kwargs):
+    """SystemSettings_HasFeature(wxSystemFeature index) -> bool"""
+    return _misc.SystemSettings_HasFeature(*args, **kwargs)
 
-SystemSettings_GetScreenType = _misc.SystemSettings_GetScreenType
+def SystemSettings_GetScreenType(*args, **kwargs):
+    """SystemSettings_GetScreenType() -> wxSystemScreenType"""
+    return _misc.SystemSettings_GetScreenType(*args, **kwargs)
 
-SystemSettings_SetScreenType = _misc.SystemSettings_SetScreenType
+def SystemSettings_SetScreenType(*args, **kwargs):
+    """SystemSettings_SetScreenType(wxSystemScreenType screen)"""
+    return _misc.SystemSettings_SetScreenType(*args, **kwargs)
 
 class SystemOptions(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSystemOptions instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> SystemOptions"""
         newobj = _misc.new_SystemOptions(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    SetOption = staticmethod(_misc.SystemOptions_SetOption)
-    SetOptionInt = staticmethod(_misc.SystemOptions_SetOptionInt)
-    GetOption = staticmethod(_misc.SystemOptions_GetOption)
-    GetOptionInt = staticmethod(_misc.SystemOptions_GetOptionInt)
-    HasOption = staticmethod(_misc.SystemOptions_HasOption)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSystemOptions instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetOption(*args, **kwargs):
+        """SystemOptions.SetOption(wxString name, wxString value)"""
+        return _misc.SystemOptions_SetOption(*args, **kwargs)
+
+    SetOption = staticmethod(SetOption)
+    def SetOptionInt(*args, **kwargs):
+        """SystemOptions.SetOptionInt(wxString name, int value)"""
+        return _misc.SystemOptions_SetOptionInt(*args, **kwargs)
+
+    SetOptionInt = staticmethod(SetOptionInt)
+    def GetOption(*args, **kwargs):
+        """SystemOptions.GetOption(wxString name) -> wxString"""
+        return _misc.SystemOptions_GetOption(*args, **kwargs)
+
+    GetOption = staticmethod(GetOption)
+    def GetOptionInt(*args, **kwargs):
+        """SystemOptions.GetOptionInt(wxString name) -> int"""
+        return _misc.SystemOptions_GetOptionInt(*args, **kwargs)
+
+    GetOptionInt = staticmethod(GetOptionInt)
+    def HasOption(*args, **kwargs):
+        """SystemOptions.HasOption(wxString name) -> bool"""
+        return _misc.SystemOptions_HasOption(*args, **kwargs)
+
+    HasOption = staticmethod(HasOption)
 
 class SystemOptionsPtr(SystemOptions):
     def __init__(self, this):
@@ -149,144 +208,292 @@ class SystemOptionsPtr(SystemOptions):
         self.__class__ = SystemOptions
 _misc.SystemOptions_swigregister(SystemOptionsPtr)
 
-SystemOptions_SetOption = _misc.SystemOptions_SetOption
+def SystemOptions_SetOption(*args, **kwargs):
+    """SystemOptions_SetOption(wxString name, wxString value)"""
+    return _misc.SystemOptions_SetOption(*args, **kwargs)
 
-SystemOptions_SetOptionInt = _misc.SystemOptions_SetOptionInt
+def SystemOptions_SetOptionInt(*args, **kwargs):
+    """SystemOptions_SetOptionInt(wxString name, int value)"""
+    return _misc.SystemOptions_SetOptionInt(*args, **kwargs)
 
-SystemOptions_GetOption = _misc.SystemOptions_GetOption
+def SystemOptions_GetOption(*args, **kwargs):
+    """SystemOptions_GetOption(wxString name) -> wxString"""
+    return _misc.SystemOptions_GetOption(*args, **kwargs)
 
-SystemOptions_GetOptionInt = _misc.SystemOptions_GetOptionInt
+def SystemOptions_GetOptionInt(*args, **kwargs):
+    """SystemOptions_GetOptionInt(wxString name) -> int"""
+    return _misc.SystemOptions_GetOptionInt(*args, **kwargs)
 
-SystemOptions_HasOption = _misc.SystemOptions_HasOption
+def SystemOptions_HasOption(*args, **kwargs):
+    """SystemOptions_HasOption(wxString name) -> bool"""
+    return _misc.SystemOptions_HasOption(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 
-NewId = _misc.NewId
+def NewId(*args, **kwargs):
+    """NewId() -> long"""
+    return _misc.NewId(*args, **kwargs)
 
-RegisterId = _misc.RegisterId
+def RegisterId(*args, **kwargs):
+    """RegisterId(long id)"""
+    return _misc.RegisterId(*args, **kwargs)
 
-GetCurrentId = _misc.GetCurrentId
+def GetCurrentId(*args, **kwargs):
+    """GetCurrentId() -> long"""
+    return _misc.GetCurrentId(*args, **kwargs)
 
-Bell = _misc.Bell
+def Bell(*args, **kwargs):
+    """Bell()"""
+    return _misc.Bell(*args, **kwargs)
 
-EndBusyCursor = _misc.EndBusyCursor
+def EndBusyCursor(*args, **kwargs):
+    """EndBusyCursor()"""
+    return _misc.EndBusyCursor(*args, **kwargs)
 
-GetElapsedTime = _misc.GetElapsedTime
+def GetElapsedTime(*args, **kwargs):
+    """GetElapsedTime(bool resetTimer=True) -> long"""
+    return _misc.GetElapsedTime(*args, **kwargs)
 
-GetMousePosition = _misc.GetMousePosition
+def GetMousePosition(*args, **kwargs):
+    """GetMousePosition(int OUTPUT, int OUTPUT)"""
+    return _misc.GetMousePosition(*args, **kwargs)
 
-IsBusy = _misc.IsBusy
+def IsBusy(*args, **kwargs):
+    """IsBusy() -> bool"""
+    return _misc.IsBusy(*args, **kwargs)
 
-Now = _misc.Now
+def Now(*args, **kwargs):
+    """Now() -> wxString"""
+    return _misc.Now(*args, **kwargs)
 
-Shell = _misc.Shell
+def Shell(*args, **kwargs):
+    """Shell(wxString command=wxPyEmptyString) -> bool"""
+    return _misc.Shell(*args, **kwargs)
 
-StartTimer = _misc.StartTimer
+def StartTimer(*args, **kwargs):
+    """StartTimer()"""
+    return _misc.StartTimer(*args, **kwargs)
 
-GetOsVersion = _misc.GetOsVersion
+def GetOsVersion(*args, **kwargs):
+    """GetOsVersion(int OUTPUT, int OUTPUT) -> int"""
+    return _misc.GetOsVersion(*args, **kwargs)
 
-GetOsDescription = _misc.GetOsDescription
+def GetOsDescription(*args, **kwargs):
+    """GetOsDescription() -> wxString"""
+    return _misc.GetOsDescription(*args, **kwargs)
 
-GetFreeMemory = _misc.GetFreeMemory
+def GetFreeMemory(*args, **kwargs):
+    """GetFreeMemory() -> long"""
+    return _misc.GetFreeMemory(*args, **kwargs)
 SHUTDOWN_POWEROFF = _misc.SHUTDOWN_POWEROFF
 SHUTDOWN_REBOOT = _misc.SHUTDOWN_REBOOT
 
-Shutdown = _misc.Shutdown
-
-Sleep = _misc.Sleep
-
-Usleep = _misc.Usleep
-
-EnableTopLevelWindows = _misc.EnableTopLevelWindows
-
-StripMenuCodes = _misc.StripMenuCodes
-
-GetEmailAddress = _misc.GetEmailAddress
-
-GetHostName = _misc.GetHostName
-
-GetFullHostName = _misc.GetFullHostName
-
-GetUserId = _misc.GetUserId
-
-GetUserName = _misc.GetUserName
-
-GetHomeDir = _misc.GetHomeDir
-
-GetUserHome = _misc.GetUserHome
-
-GetProcessId = _misc.GetProcessId
-
-Trap = _misc.Trap
-
-FileSelector = _misc.FileSelector
-
-LoadFileSelector = _misc.LoadFileSelector
-
-SaveFileSelector = _misc.SaveFileSelector
-
-DirSelector = _misc.DirSelector
-
-GetTextFromUser = _misc.GetTextFromUser
-
-GetPasswordFromUser = _misc.GetPasswordFromUser
-
-GetSingleChoice = _misc.GetSingleChoice
-
-GetSingleChoiceIndex = _misc.GetSingleChoiceIndex
-
-MessageBox = _misc.MessageBox
-
-GetNumberFromUser = _misc.GetNumberFromUser
-
-ColourDisplay = _misc.ColourDisplay
-
-DisplayDepth = _misc.DisplayDepth
-
-GetDisplayDepth = _misc.GetDisplayDepth
-
-DisplaySize = _misc.DisplaySize
-
-GetDisplaySize = _misc.GetDisplaySize
-
-DisplaySizeMM = _misc.DisplaySizeMM
-
-GetDisplaySizeMM = _misc.GetDisplaySizeMM
-
-ClientDisplayRect = _misc.ClientDisplayRect
-
-GetClientDisplayRect = _misc.GetClientDisplayRect
-
-SetCursor = _misc.SetCursor
-
-BeginBusyCursor = _misc.BeginBusyCursor
-
-GetActiveWindow = _misc.GetActiveWindow
-
-GenericFindWindowAtPoint = _misc.GenericFindWindowAtPoint
-
-FindWindowAtPoint = _misc.FindWindowAtPoint
-
-GetTopLevelParent = _misc.GetTopLevelParent
-
-WakeUpMainThread = _misc.WakeUpMainThread
-
-MutexGuiEnter = _misc.MutexGuiEnter
-
-MutexGuiLeave = _misc.MutexGuiLeave
+def Shutdown(*args, **kwargs):
+    """Shutdown(wxShutdownFlags wFlags) -> bool"""
+    return _misc.Shutdown(*args, **kwargs)
+
+def Sleep(*args, **kwargs):
+    """Sleep(int secs)"""
+    return _misc.Sleep(*args, **kwargs)
+
+def Usleep(*args, **kwargs):
+    """Usleep(unsigned long milliseconds)"""
+    return _misc.Usleep(*args, **kwargs)
+
+def EnableTopLevelWindows(*args, **kwargs):
+    """EnableTopLevelWindows(bool enable)"""
+    return _misc.EnableTopLevelWindows(*args, **kwargs)
+
+def StripMenuCodes(*args, **kwargs):
+    """StripMenuCodes(wxString in) -> wxString"""
+    return _misc.StripMenuCodes(*args, **kwargs)
+
+def GetEmailAddress(*args, **kwargs):
+    """GetEmailAddress() -> wxString"""
+    return _misc.GetEmailAddress(*args, **kwargs)
+
+def GetHostName(*args, **kwargs):
+    """GetHostName() -> wxString"""
+    return _misc.GetHostName(*args, **kwargs)
+
+def GetFullHostName(*args, **kwargs):
+    """GetFullHostName() -> wxString"""
+    return _misc.GetFullHostName(*args, **kwargs)
+
+def GetUserId(*args, **kwargs):
+    """GetUserId() -> wxString"""
+    return _misc.GetUserId(*args, **kwargs)
+
+def GetUserName(*args, **kwargs):
+    """GetUserName() -> wxString"""
+    return _misc.GetUserName(*args, **kwargs)
+
+def GetHomeDir(*args, **kwargs):
+    """GetHomeDir() -> wxString"""
+    return _misc.GetHomeDir(*args, **kwargs)
+
+def GetUserHome(*args, **kwargs):
+    """GetUserHome(wxString user=wxPyEmptyString) -> wxString"""
+    return _misc.GetUserHome(*args, **kwargs)
+
+def GetProcessId(*args, **kwargs):
+    """GetProcessId() -> unsigned long"""
+    return _misc.GetProcessId(*args, **kwargs)
+
+def Trap(*args, **kwargs):
+    """Trap()"""
+    return _misc.Trap(*args, **kwargs)
+
+def FileSelector(*args, **kwargs):
+    """FileSelector(wxString message=wxPyFileSelectorPromptStr, wxString default_path=wxPyEmptyString, 
+    wxString default_filename=wxPyEmptyString, 
+    wxString default_extension=wxPyEmptyString, 
+    wxString wildcard=wxPyFileSelectorDefaultWildcardStr, 
+    int flags=0, 
+    Window parent=None, int x=-1, int y=-1) -> wxString"""
+    return _misc.FileSelector(*args, **kwargs)
+
+def LoadFileSelector(*args, **kwargs):
+    """LoadFileSelector(wxString what, wxString extension, wxString default_name=wxPyEmptyString, 
+    Window parent=None) -> wxString"""
+    return _misc.LoadFileSelector(*args, **kwargs)
+
+def SaveFileSelector(*args, **kwargs):
+    """SaveFileSelector(wxString what, wxString extension, wxString default_name=wxPyEmptyString, 
+    Window parent=None) -> wxString"""
+    return _misc.SaveFileSelector(*args, **kwargs)
+
+def DirSelector(*args, **kwargs):
+    """DirSelector(wxString message=wxPyDirSelectorPromptStr, wxString defaultPath=wxPyEmptyString, 
+    long style=DD_DEFAULT_STYLE, 
+    Point pos=DefaultPosition, Window parent=None) -> wxString"""
+    return _misc.DirSelector(*args, **kwargs)
+
+def GetTextFromUser(*args, **kwargs):
+    """GetTextFromUser(wxString message, wxString caption=wxPyEmptyString, 
+    wxString default_value=wxPyEmptyString, Window parent=None, 
+    int x=-1, int y=-1, bool centre=True) -> wxString"""
+    return _misc.GetTextFromUser(*args, **kwargs)
+
+def GetPasswordFromUser(*args, **kwargs):
+    """GetPasswordFromUser(wxString message, wxString caption=wxPyEmptyString, 
+    wxString default_value=wxPyEmptyString, Window parent=None) -> wxString"""
+    return _misc.GetPasswordFromUser(*args, **kwargs)
+
+def GetSingleChoice(*args, **kwargs):
+    """GetSingleChoice(wxString message, wxString caption, int choices, wxString choices_array, 
+    Window parent=None, int x=-1, 
+    int y=-1, bool centre=True, int width=150, 
+    int height=200) -> wxString"""
+    return _misc.GetSingleChoice(*args, **kwargs)
+
+def GetSingleChoiceIndex(*args, **kwargs):
+    """GetSingleChoiceIndex(wxString message, wxString caption, int choices, wxString choices_array, 
+    Window parent=None, int x=-1, 
+    int y=-1, bool centre=True, int width=150, 
+    int height=200) -> int"""
+    return _misc.GetSingleChoiceIndex(*args, **kwargs)
+
+def MessageBox(*args, **kwargs):
+    """MessageBox(wxString message, wxString caption=wxPyEmptyString, 
+    int style=wxOK|wxCENTRE, Window parent=None, 
+    int x=-1, int y=-1) -> int"""
+    return _misc.MessageBox(*args, **kwargs)
+
+def GetNumberFromUser(*args, **kwargs):
+    """GetNumberFromUser(wxString message, wxString prompt, wxString caption, 
+    long value, long min=0, long max=100, Window parent=None, 
+    Point pos=DefaultPosition) -> long"""
+    return _misc.GetNumberFromUser(*args, **kwargs)
+
+def ColourDisplay(*args, **kwargs):
+    """ColourDisplay() -> bool"""
+    return _misc.ColourDisplay(*args, **kwargs)
+
+def DisplayDepth(*args, **kwargs):
+    """DisplayDepth() -> int"""
+    return _misc.DisplayDepth(*args, **kwargs)
+
+def GetDisplayDepth(*args, **kwargs):
+    """GetDisplayDepth() -> int"""
+    return _misc.GetDisplayDepth(*args, **kwargs)
+
+def DisplaySize(*args, **kwargs):
+    """DisplaySize(int OUTPUT, int OUTPUT)"""
+    return _misc.DisplaySize(*args, **kwargs)
+
+def GetDisplaySize(*args, **kwargs):
+    """GetDisplaySize() -> Size"""
+    return _misc.GetDisplaySize(*args, **kwargs)
+
+def DisplaySizeMM(*args, **kwargs):
+    """DisplaySizeMM(int OUTPUT, int OUTPUT)"""
+    return _misc.DisplaySizeMM(*args, **kwargs)
+
+def GetDisplaySizeMM(*args, **kwargs):
+    """GetDisplaySizeMM() -> Size"""
+    return _misc.GetDisplaySizeMM(*args, **kwargs)
+
+def ClientDisplayRect(*args, **kwargs):
+    """ClientDisplayRect(int OUTPUT, int OUTPUT, int OUTPUT, int OUTPUT)"""
+    return _misc.ClientDisplayRect(*args, **kwargs)
+
+def GetClientDisplayRect(*args, **kwargs):
+    """GetClientDisplayRect() -> Rect"""
+    return _misc.GetClientDisplayRect(*args, **kwargs)
+
+def SetCursor(*args, **kwargs):
+    """SetCursor(wxCursor cursor)"""
+    return _misc.SetCursor(*args, **kwargs)
+
+def BeginBusyCursor(*args, **kwargs):
+    """BeginBusyCursor(wxCursor cursor=wxHOURGLASS_CURSOR)"""
+    return _misc.BeginBusyCursor(*args, **kwargs)
+
+def GetActiveWindow(*args, **kwargs):
+    """GetActiveWindow() -> Window"""
+    return _misc.GetActiveWindow(*args, **kwargs)
+
+def GenericFindWindowAtPoint(*args, **kwargs):
+    """GenericFindWindowAtPoint(Point pt) -> Window"""
+    return _misc.GenericFindWindowAtPoint(*args, **kwargs)
+
+def FindWindowAtPoint(*args, **kwargs):
+    """FindWindowAtPoint(Point pt) -> Window"""
+    return _misc.FindWindowAtPoint(*args, **kwargs)
+
+def GetTopLevelParent(*args, **kwargs):
+    """GetTopLevelParent(Window win) -> Window"""
+    return _misc.GetTopLevelParent(*args, **kwargs)
+
+def WakeUpMainThread(*args, **kwargs):
+    """WakeUpMainThread()"""
+    return _misc.WakeUpMainThread(*args, **kwargs)
+
+def MutexGuiEnter(*args, **kwargs):
+    """MutexGuiEnter()"""
+    return _misc.MutexGuiEnter(*args, **kwargs)
+
+def MutexGuiLeave(*args, **kwargs):
+    """MutexGuiLeave()"""
+    return _misc.MutexGuiLeave(*args, **kwargs)
 class MutexGuiLocker(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMutexGuiLocker instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> MutexGuiLocker"""
         newobj = _misc.new_MutexGuiLocker(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_MutexGuiLocker):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMutexGuiLocker instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class MutexGuiLockerPtr(MutexGuiLocker):
     def __init__(self, this):
@@ -296,22 +503,43 @@ class MutexGuiLockerPtr(MutexGuiLocker):
 _misc.MutexGuiLocker_swigregister(MutexGuiLockerPtr)
 
 
-Thread_IsMain = _misc.Thread_IsMain
+def Thread_IsMain(*args, **kwargs):
+    """Thread_IsMain() -> bool"""
+    return _misc.Thread_IsMain(*args, **kwargs)
 #---------------------------------------------------------------------------
 
 class ToolTip(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxToolTip instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString tip) -> ToolTip"""
         newobj = _misc.new_ToolTip(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetTip(*args, **kwargs): return _misc.ToolTip_SetTip(*args, **kwargs)
-    def GetTip(*args, **kwargs): return _misc.ToolTip_GetTip(*args, **kwargs)
-    def GetWindow(*args, **kwargs): return _misc.ToolTip_GetWindow(*args, **kwargs)
-    Enable = staticmethod(_misc.ToolTip_Enable)
-    SetDelay = staticmethod(_misc.ToolTip_SetDelay)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxToolTip instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetTip(*args, **kwargs):
+        """SetTip(wxString tip)"""
+        return _misc.ToolTip_SetTip(*args, **kwargs)
+
+    def GetTip(*args, **kwargs):
+        """GetTip() -> wxString"""
+        return _misc.ToolTip_GetTip(*args, **kwargs)
+
+    def GetWindow(*args, **kwargs):
+        """GetWindow() -> Window"""
+        return _misc.ToolTip_GetWindow(*args, **kwargs)
+
+    def Enable(*args, **kwargs):
+        """ToolTip.Enable(bool flag)"""
+        return _misc.ToolTip_Enable(*args, **kwargs)
+
+    Enable = staticmethod(Enable)
+    def SetDelay(*args, **kwargs):
+        """ToolTip.SetDelay(long milliseconds)"""
+        return _misc.ToolTip_SetDelay(*args, **kwargs)
+
+    SetDelay = staticmethod(SetDelay)
 
 class ToolTipPtr(ToolTip):
     def __init__(self, this):
@@ -320,35 +548,82 @@ class ToolTipPtr(ToolTip):
         self.__class__ = ToolTip
 _misc.ToolTip_swigregister(ToolTipPtr)
 
-ToolTip_Enable = _misc.ToolTip_Enable
+def ToolTip_Enable(*args, **kwargs):
+    """ToolTip_Enable(bool flag)"""
+    return _misc.ToolTip_Enable(*args, **kwargs)
 
-ToolTip_SetDelay = _misc.ToolTip_SetDelay
+def ToolTip_SetDelay(*args, **kwargs):
+    """ToolTip_SetDelay(long milliseconds)"""
+    return _misc.ToolTip_SetDelay(*args, **kwargs)
 
 class Caret(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCaret instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window window, Size size) -> Caret"""
         newobj = _misc.new_Caret(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_Caret):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def IsOk(*args, **kwargs): return _misc.Caret_IsOk(*args, **kwargs)
-    def IsVisible(*args, **kwargs): return _misc.Caret_IsVisible(*args, **kwargs)
-    def GetPositionTuple(*args, **kwargs): return _misc.Caret_GetPositionTuple(*args, **kwargs)
-    def GetPosition(*args, **kwargs): return _misc.Caret_GetPosition(*args, **kwargs)
-    def GetSizeTuple(*args, **kwargs): return _misc.Caret_GetSizeTuple(*args, **kwargs)
-    def GetSize(*args, **kwargs): return _misc.Caret_GetSize(*args, **kwargs)
-    def GetWindow(*args, **kwargs): return _misc.Caret_GetWindow(*args, **kwargs)
-    def MoveXY(*args, **kwargs): return _misc.Caret_MoveXY(*args, **kwargs)
-    def Move(*args, **kwargs): return _misc.Caret_Move(*args, **kwargs)
-    def SetSizeWH(*args, **kwargs): return _misc.Caret_SetSizeWH(*args, **kwargs)
-    def SetSize(*args, **kwargs): return _misc.Caret_SetSize(*args, **kwargs)
-    def Show(*args, **kwargs): return _misc.Caret_Show(*args, **kwargs)
-    def Hide(*args, **kwargs): return _misc.Caret_Hide(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCaret instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def IsOk(*args, **kwargs):
+        """IsOk() -> bool"""
+        return _misc.Caret_IsOk(*args, **kwargs)
+
+    def IsVisible(*args, **kwargs):
+        """IsVisible() -> bool"""
+        return _misc.Caret_IsVisible(*args, **kwargs)
+
+    def GetPositionTuple(*args, **kwargs):
+        """GetPositionTuple(int OUTPUT, int OUTPUT)"""
+        return _misc.Caret_GetPositionTuple(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point"""
+        return _misc.Caret_GetPosition(*args, **kwargs)
+
+    def GetSizeTuple(*args, **kwargs):
+        """GetSizeTuple(int OUTPUT, int OUTPUT)"""
+        return _misc.Caret_GetSizeTuple(*args, **kwargs)
+
+    def GetSize(*args, **kwargs):
+        """GetSize() -> Size"""
+        return _misc.Caret_GetSize(*args, **kwargs)
+
+    def GetWindow(*args, **kwargs):
+        """GetWindow() -> Window"""
+        return _misc.Caret_GetWindow(*args, **kwargs)
+
+    def MoveXY(*args, **kwargs):
+        """MoveXY(int x, int y)"""
+        return _misc.Caret_MoveXY(*args, **kwargs)
+
+    def Move(*args, **kwargs):
+        """Move(Point pt)"""
+        return _misc.Caret_Move(*args, **kwargs)
+
+    def SetSizeWH(*args, **kwargs):
+        """SetSizeWH(int width, int height)"""
+        return _misc.Caret_SetSizeWH(*args, **kwargs)
+
+    def SetSize(*args, **kwargs):
+        """SetSize(Size size)"""
+        return _misc.Caret_SetSize(*args, **kwargs)
+
+    def Show(*args, **kwargs):
+        """Show(int show=True)"""
+        return _misc.Caret_Show(*args, **kwargs)
+
+    def Hide(*args, **kwargs):
+        """Hide()"""
+        return _misc.Caret_Hide(*args, **kwargs)
+
 
 class CaretPtr(Caret):
     def __init__(self, this):
@@ -358,21 +633,29 @@ class CaretPtr(Caret):
 _misc.Caret_swigregister(CaretPtr)
 
 
-Caret_GetBlinkTime = _misc.Caret_GetBlinkTime
+def Caret_GetBlinkTime(*args, **kwargs):
+    """Caret_GetBlinkTime() -> int"""
+    return _misc.Caret_GetBlinkTime(*args, **kwargs)
 
-Caret_SetBlinkTime = _misc.Caret_SetBlinkTime
+def Caret_SetBlinkTime(*args, **kwargs):
+    """Caret_SetBlinkTime(int milliseconds)"""
+    return _misc.Caret_SetBlinkTime(*args, **kwargs)
 class BusyCursor(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBusyCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxCursor cursor=wxHOURGLASS_CURSOR) -> BusyCursor"""
         newobj = _misc.new_BusyCursor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_BusyCursor):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBusyCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class BusyCursorPtr(BusyCursor):
     def __init__(self, this):
@@ -382,17 +665,21 @@ class BusyCursorPtr(BusyCursor):
 _misc.BusyCursor_swigregister(BusyCursorPtr)
 
 class WindowDisabler(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxWindowDisabler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window winToSkip=None) -> WindowDisabler"""
         newobj = _misc.new_WindowDisabler(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_WindowDisabler):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWindowDisabler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class WindowDisablerPtr(WindowDisabler):
     def __init__(self, this):
@@ -402,17 +689,21 @@ class WindowDisablerPtr(WindowDisabler):
 _misc.WindowDisabler_swigregister(WindowDisablerPtr)
 
 class BusyInfo(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBusyInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString message) -> BusyInfo"""
         newobj = _misc.new_BusyInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_BusyInfo):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBusyInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class BusyInfoPtr(BusyInfo):
     def __init__(self, this):
@@ -422,17 +713,31 @@ class BusyInfoPtr(BusyInfo):
 _misc.BusyInfo_swigregister(BusyInfoPtr)
 
 class StopWatch(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxStopWatch instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> StopWatch"""
         newobj = _misc.new_StopWatch(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def Start(*args, **kwargs): return _misc.StopWatch_Start(*args, **kwargs)
-    def Pause(*args, **kwargs): return _misc.StopWatch_Pause(*args, **kwargs)
-    def Resume(*args, **kwargs): return _misc.StopWatch_Resume(*args, **kwargs)
-    def Time(*args, **kwargs): return _misc.StopWatch_Time(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStopWatch instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Start(*args, **kwargs):
+        """Start(long t0=0)"""
+        return _misc.StopWatch_Start(*args, **kwargs)
+
+    def Pause(*args, **kwargs):
+        """Pause()"""
+        return _misc.StopWatch_Pause(*args, **kwargs)
+
+    def Resume(*args, **kwargs):
+        """Resume()"""
+        return _misc.StopWatch_Resume(*args, **kwargs)
+
+    def Time(*args, **kwargs):
+        """Time() -> long"""
+        return _misc.StopWatch_Time(*args, **kwargs)
+
 
 class StopWatchPtr(StopWatch):
     def __init__(self, this):
@@ -442,28 +747,65 @@ class StopWatchPtr(StopWatch):
 _misc.StopWatch_swigregister(StopWatchPtr)
 
 class FileHistory(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFileHistory instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int maxFiles=9) -> FileHistory"""
         newobj = _misc.new_FileHistory(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_FileHistory):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def AddFileToHistory(*args, **kwargs): return _misc.FileHistory_AddFileToHistory(*args, **kwargs)
-    def RemoveFileFromHistory(*args, **kwargs): return _misc.FileHistory_RemoveFileFromHistory(*args, **kwargs)
-    def GetMaxFiles(*args, **kwargs): return _misc.FileHistory_GetMaxFiles(*args, **kwargs)
-    def UseMenu(*args, **kwargs): return _misc.FileHistory_UseMenu(*args, **kwargs)
-    def RemoveMenu(*args, **kwargs): return _misc.FileHistory_RemoveMenu(*args, **kwargs)
-    def Load(*args, **kwargs): return _misc.FileHistory_Load(*args, **kwargs)
-    def Save(*args, **kwargs): return _misc.FileHistory_Save(*args, **kwargs)
-    def AddFilesToMenu(*args, **kwargs): return _misc.FileHistory_AddFilesToMenu(*args, **kwargs)
-    def AddFilesToThisMenu(*args, **kwargs): return _misc.FileHistory_AddFilesToThisMenu(*args, **kwargs)
-    def GetHistoryFile(*args, **kwargs): return _misc.FileHistory_GetHistoryFile(*args, **kwargs)
-    def GetCount(*args, **kwargs): return _misc.FileHistory_GetCount(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFileHistory instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def AddFileToHistory(*args, **kwargs):
+        """AddFileToHistory(wxString file)"""
+        return _misc.FileHistory_AddFileToHistory(*args, **kwargs)
+
+    def RemoveFileFromHistory(*args, **kwargs):
+        """RemoveFileFromHistory(int i)"""
+        return _misc.FileHistory_RemoveFileFromHistory(*args, **kwargs)
+
+    def GetMaxFiles(*args, **kwargs):
+        """GetMaxFiles() -> int"""
+        return _misc.FileHistory_GetMaxFiles(*args, **kwargs)
+
+    def UseMenu(*args, **kwargs):
+        """UseMenu(Menu menu)"""
+        return _misc.FileHistory_UseMenu(*args, **kwargs)
+
+    def RemoveMenu(*args, **kwargs):
+        """RemoveMenu(Menu menu)"""
+        return _misc.FileHistory_RemoveMenu(*args, **kwargs)
+
+    def Load(*args, **kwargs):
+        """Load(ConfigBase config)"""
+        return _misc.FileHistory_Load(*args, **kwargs)
+
+    def Save(*args, **kwargs):
+        """Save(ConfigBase config)"""
+        return _misc.FileHistory_Save(*args, **kwargs)
+
+    def AddFilesToMenu(*args, **kwargs):
+        """AddFilesToMenu()"""
+        return _misc.FileHistory_AddFilesToMenu(*args, **kwargs)
+
+    def AddFilesToThisMenu(*args, **kwargs):
+        """AddFilesToThisMenu(Menu menu)"""
+        return _misc.FileHistory_AddFilesToThisMenu(*args, **kwargs)
+
+    def GetHistoryFile(*args, **kwargs):
+        """GetHistoryFile(int i) -> wxString"""
+        return _misc.FileHistory_GetHistoryFile(*args, **kwargs)
+
+    def GetCount(*args, **kwargs):
+        """GetCount() -> int"""
+        return _misc.FileHistory_GetCount(*args, **kwargs)
+
 
 class FileHistoryPtr(FileHistory):
     def __init__(self, this):
@@ -473,19 +815,29 @@ class FileHistoryPtr(FileHistory):
 _misc.FileHistory_swigregister(FileHistoryPtr)
 
 class SingleInstanceChecker(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSingleInstanceChecker instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString name, wxString path=wxPyEmptyString) -> SingleInstanceChecker"""
         newobj = _misc.new_SingleInstanceChecker(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_SingleInstanceChecker):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Create(*args, **kwargs): return _misc.SingleInstanceChecker_Create(*args, **kwargs)
-    def IsAnotherRunning(*args, **kwargs): return _misc.SingleInstanceChecker_IsAnotherRunning(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSingleInstanceChecker instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(wxString name, wxString path=wxPyEmptyString) -> bool"""
+        return _misc.SingleInstanceChecker_Create(*args, **kwargs)
+
+    def IsAnotherRunning(*args, **kwargs):
+        """IsAnotherRunning() -> bool"""
+        return _misc.SingleInstanceChecker_IsAnotherRunning(*args, **kwargs)
+
 
 class SingleInstanceCheckerPtr(SingleInstanceChecker):
     def __init__(self, this):
@@ -495,25 +847,40 @@ class SingleInstanceCheckerPtr(SingleInstanceChecker):
 _misc.SingleInstanceChecker_swigregister(SingleInstanceCheckerPtr)
 
 def PreSingleInstanceChecker(*args, **kwargs):
+    """PreSingleInstanceChecker() -> SingleInstanceChecker"""
     val = _misc.new_PreSingleInstanceChecker(*args, **kwargs)
     val.thisown = 1
     return val
 
 
-DrawWindowOnDC = _misc.DrawWindowOnDC
+def DrawWindowOnDC(*args, **kwargs):
+    """DrawWindowOnDC(Window window, wxDC dc, int method)"""
+    return _misc.DrawWindowOnDC(*args, **kwargs)
 #---------------------------------------------------------------------------
 
 class TipProvider(object):
+    """"""
+    def __init__(self): raise RuntimeError, "No constructor defined"
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTipProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __del__(self, destroy=_misc.delete_TipProvider):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetTip(*args, **kwargs): return _misc.TipProvider_GetTip(*args, **kwargs)
-    def GetCurrentTip(*args, **kwargs): return _misc.TipProvider_GetCurrentTip(*args, **kwargs)
-    def PreprocessTip(*args, **kwargs): return _misc.TipProvider_PreprocessTip(*args, **kwargs)
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTipProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetTip(*args, **kwargs):
+        """GetTip() -> wxString"""
+        return _misc.TipProvider_GetTip(*args, **kwargs)
+
+    def GetCurrentTip(*args, **kwargs):
+        """GetCurrentTip() -> size_t"""
+        return _misc.TipProvider_GetCurrentTip(*args, **kwargs)
+
+    def PreprocessTip(*args, **kwargs):
+        """PreprocessTip(wxString tip) -> wxString"""
+        return _misc.TipProvider_PreprocessTip(*args, **kwargs)
+
 
 class TipProviderPtr(TipProvider):
     def __init__(self, this):
@@ -523,14 +890,19 @@ class TipProviderPtr(TipProvider):
 _misc.TipProvider_swigregister(TipProviderPtr)
 
 class PyTipProvider(TipProvider):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyTipProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(size_t currentTip) -> PyTipProvider"""
         newobj = _misc.new_PyTipProvider(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def _setCallbackInfo(*args, **kwargs): return _misc.PyTipProvider__setCallbackInfo(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTipProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _misc.PyTipProvider__setCallbackInfo(*args, **kwargs)
+
 
 class PyTipProviderPtr(PyTipProvider):
     def __init__(self, this):
@@ -540,33 +912,62 @@ class PyTipProviderPtr(PyTipProvider):
 _misc.PyTipProvider_swigregister(PyTipProviderPtr)
 
 
-ShowTip = _misc.ShowTip
+def ShowTip(*args, **kwargs):
+    """ShowTip(Window parent, TipProvider tipProvider, bool showAtStartup=True) -> bool"""
+    return _misc.ShowTip(*args, **kwargs)
 
-CreateFileTipProvider = _misc.CreateFileTipProvider
+def CreateFileTipProvider(*args, **kwargs):
+    """CreateFileTipProvider(wxString filename, size_t currentTip) -> TipProvider"""
+    return _misc.CreateFileTipProvider(*args, **kwargs)
 #---------------------------------------------------------------------------
 
 TIMER_CONTINUOUS = _misc.TIMER_CONTINUOUS
 TIMER_ONE_SHOT = _misc.TIMER_ONE_SHOT
 wxEVT_TIMER = _misc.wxEVT_TIMER
 class Timer(core.EvtHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyTimer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(EvtHandler owner=None, int id=-1) -> Timer"""
         newobj = _misc.new_Timer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_Timer):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetOwner(*args, **kwargs): return _misc.Timer_SetOwner(*args, **kwargs)
-    def Start(*args, **kwargs): return _misc.Timer_Start(*args, **kwargs)
-    def Stop(*args, **kwargs): return _misc.Timer_Stop(*args, **kwargs)
-    def Notify(*args, **kwargs): return _misc.Timer_Notify(*args, **kwargs)
-    def IsRunning(*args, **kwargs): return _misc.Timer_IsRunning(*args, **kwargs)
-    def GetInterval(*args, **kwargs): return _misc.Timer_GetInterval(*args, **kwargs)
-    def IsOneShot(*args, **kwargs): return _misc.Timer_IsOneShot(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTimer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetOwner(*args, **kwargs):
+        """SetOwner(EvtHandler owner, int id=-1)"""
+        return _misc.Timer_SetOwner(*args, **kwargs)
+
+    def Start(*args, **kwargs):
+        """Start(int milliseconds=-1, bool oneShot=False) -> bool"""
+        return _misc.Timer_Start(*args, **kwargs)
+
+    def Stop(*args, **kwargs):
+        """Stop()"""
+        return _misc.Timer_Stop(*args, **kwargs)
+
+    def Notify(*args, **kwargs):
+        """Notify()"""
+        return _misc.Timer_Notify(*args, **kwargs)
+
+    def IsRunning(*args, **kwargs):
+        """IsRunning() -> bool"""
+        return _misc.Timer_IsRunning(*args, **kwargs)
+
+    def GetInterval(*args, **kwargs):
+        """GetInterval() -> int"""
+        return _misc.Timer_GetInterval(*args, **kwargs)
+
+    def IsOneShot(*args, **kwargs):
+        """IsOneShot() -> bool"""
+        return _misc.Timer_IsOneShot(*args, **kwargs)
+
 
 class TimerPtr(Timer):
     def __init__(self, this):
@@ -590,14 +991,19 @@ EVT_TIMER = wx.PyEventBinder( wxEVT_TIMER, 1 )
                    
 
 class TimerEvent(core.Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTimerEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int timerid=0, int interval=0) -> TimerEvent"""
         newobj = _misc.new_TimerEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetInterval(*args, **kwargs): return _misc.TimerEvent_GetInterval(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTimerEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetInterval(*args, **kwargs):
+        """GetInterval() -> int"""
+        return _misc.TimerEvent_GetInterval(*args, **kwargs)
+
 
 class TimerEventPtr(TimerEvent):
     def __init__(self, this):
@@ -607,18 +1013,26 @@ class TimerEventPtr(TimerEvent):
 _misc.TimerEvent_swigregister(TimerEventPtr)
 
 class TimerRunner(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTimerRunner instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args):
+        """__init__(wxTimer timer) -> TimerRunner
+__init__(wxTimer timer, int milli, bool oneShot=False) -> TimerRunner"""
         newobj = _misc.new_TimerRunner(*args)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_TimerRunner):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Start(*args, **kwargs): return _misc.TimerRunner_Start(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTimerRunner instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Start(*args, **kwargs):
+        """Start(int milli, bool oneShot=False)"""
+        return _misc.TimerRunner_Start(*args, **kwargs)
+
 
 class TimerRunnerPtr(TimerRunner):
     def __init__(self, this):
@@ -651,38 +1065,138 @@ TraceResAlloc = _misc.TraceResAlloc
 TraceRefCount = _misc.TraceRefCount
 TraceOleCalls = _misc.TraceOleCalls
 class Log(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxLog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> Log"""
         newobj = _misc.new_Log(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    IsEnabled = staticmethod(_misc.Log_IsEnabled)
-    EnableLogging = staticmethod(_misc.Log_EnableLogging)
-    OnLog = staticmethod(_misc.Log_OnLog)
-    def Flush(*args, **kwargs): return _misc.Log_Flush(*args, **kwargs)
-    FlushActive = staticmethod(_misc.Log_FlushActive)
-    GetActiveTarget = staticmethod(_misc.Log_GetActiveTarget)
-    SetActiveTarget = staticmethod(_misc.Log_SetActiveTarget)
-    Suspend = staticmethod(_misc.Log_Suspend)
-    Resume = staticmethod(_misc.Log_Resume)
-    SetVerbose = staticmethod(_misc.Log_SetVerbose)
-    SetLogLevel = staticmethod(_misc.Log_SetLogLevel)
-    DontCreateOnDemand = staticmethod(_misc.Log_DontCreateOnDemand)
-    SetTraceMask = staticmethod(_misc.Log_SetTraceMask)
-    AddTraceMask = staticmethod(_misc.Log_AddTraceMask)
-    RemoveTraceMask = staticmethod(_misc.Log_RemoveTraceMask)
-    ClearTraceMasks = staticmethod(_misc.Log_ClearTraceMasks)
-    GetTraceMasks = staticmethod(_misc.Log_GetTraceMasks)
-    SetTimestamp = staticmethod(_misc.Log_SetTimestamp)
-    GetVerbose = staticmethod(_misc.Log_GetVerbose)
-    GetTraceMask = staticmethod(_misc.Log_GetTraceMask)
-    IsAllowedTraceMask = staticmethod(_misc.Log_IsAllowedTraceMask)
-    GetLogLevel = staticmethod(_misc.Log_GetLogLevel)
-    GetTimestamp = staticmethod(_misc.Log_GetTimestamp)
-    TimeStamp = staticmethod(_misc.Log_TimeStamp)
-    def Destroy(*args, **kwargs): return _misc.Log_Destroy(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def IsEnabled(*args, **kwargs):
+        """Log.IsEnabled() -> bool"""
+        return _misc.Log_IsEnabled(*args, **kwargs)
+
+    IsEnabled = staticmethod(IsEnabled)
+    def EnableLogging(*args, **kwargs):
+        """Log.EnableLogging(bool doIt=True) -> bool"""
+        return _misc.Log_EnableLogging(*args, **kwargs)
+
+    EnableLogging = staticmethod(EnableLogging)
+    def OnLog(*args, **kwargs):
+        """Log.OnLog(wxLogLevel level, wxChar szString, time_t t)"""
+        return _misc.Log_OnLog(*args, **kwargs)
+
+    OnLog = staticmethod(OnLog)
+    def Flush(*args, **kwargs):
+        """Flush()"""
+        return _misc.Log_Flush(*args, **kwargs)
+
+    def FlushActive(*args, **kwargs):
+        """Log.FlushActive()"""
+        return _misc.Log_FlushActive(*args, **kwargs)
+
+    FlushActive = staticmethod(FlushActive)
+    def GetActiveTarget(*args, **kwargs):
+        """Log.GetActiveTarget() -> Log"""
+        return _misc.Log_GetActiveTarget(*args, **kwargs)
+
+    GetActiveTarget = staticmethod(GetActiveTarget)
+    def SetActiveTarget(*args, **kwargs):
+        """Log.SetActiveTarget(Log pLogger) -> Log"""
+        return _misc.Log_SetActiveTarget(*args, **kwargs)
+
+    SetActiveTarget = staticmethod(SetActiveTarget)
+    def Suspend(*args, **kwargs):
+        """Log.Suspend()"""
+        return _misc.Log_Suspend(*args, **kwargs)
+
+    Suspend = staticmethod(Suspend)
+    def Resume(*args, **kwargs):
+        """Log.Resume()"""
+        return _misc.Log_Resume(*args, **kwargs)
+
+    Resume = staticmethod(Resume)
+    def SetVerbose(*args, **kwargs):
+        """Log.SetVerbose(bool bVerbose=True)"""
+        return _misc.Log_SetVerbose(*args, **kwargs)
+
+    SetVerbose = staticmethod(SetVerbose)
+    def SetLogLevel(*args, **kwargs):
+        """Log.SetLogLevel(wxLogLevel logLevel)"""
+        return _misc.Log_SetLogLevel(*args, **kwargs)
+
+    SetLogLevel = staticmethod(SetLogLevel)
+    def DontCreateOnDemand(*args, **kwargs):
+        """Log.DontCreateOnDemand()"""
+        return _misc.Log_DontCreateOnDemand(*args, **kwargs)
+
+    DontCreateOnDemand = staticmethod(DontCreateOnDemand)
+    def SetTraceMask(*args, **kwargs):
+        """Log.SetTraceMask(wxTraceMask ulMask)"""
+        return _misc.Log_SetTraceMask(*args, **kwargs)
+
+    SetTraceMask = staticmethod(SetTraceMask)
+    def AddTraceMask(*args, **kwargs):
+        """Log.AddTraceMask(wxString str)"""
+        return _misc.Log_AddTraceMask(*args, **kwargs)
+
+    AddTraceMask = staticmethod(AddTraceMask)
+    def RemoveTraceMask(*args, **kwargs):
+        """Log.RemoveTraceMask(wxString str)"""
+        return _misc.Log_RemoveTraceMask(*args, **kwargs)
+
+    RemoveTraceMask = staticmethod(RemoveTraceMask)
+    def ClearTraceMasks(*args, **kwargs):
+        """Log.ClearTraceMasks()"""
+        return _misc.Log_ClearTraceMasks(*args, **kwargs)
+
+    ClearTraceMasks = staticmethod(ClearTraceMasks)
+    def GetTraceMasks(*args, **kwargs):
+        """Log.GetTraceMasks() -> wxArrayString"""
+        return _misc.Log_GetTraceMasks(*args, **kwargs)
+
+    GetTraceMasks = staticmethod(GetTraceMasks)
+    def SetTimestamp(*args, **kwargs):
+        """Log.SetTimestamp(wxChar ts)"""
+        return _misc.Log_SetTimestamp(*args, **kwargs)
+
+    SetTimestamp = staticmethod(SetTimestamp)
+    def GetVerbose(*args, **kwargs):
+        """Log.GetVerbose() -> bool"""
+        return _misc.Log_GetVerbose(*args, **kwargs)
+
+    GetVerbose = staticmethod(GetVerbose)
+    def GetTraceMask(*args, **kwargs):
+        """Log.GetTraceMask() -> wxTraceMask"""
+        return _misc.Log_GetTraceMask(*args, **kwargs)
+
+    GetTraceMask = staticmethod(GetTraceMask)
+    def IsAllowedTraceMask(*args, **kwargs):
+        """Log.IsAllowedTraceMask(wxChar mask) -> bool"""
+        return _misc.Log_IsAllowedTraceMask(*args, **kwargs)
+
+    IsAllowedTraceMask = staticmethod(IsAllowedTraceMask)
+    def GetLogLevel(*args, **kwargs):
+        """Log.GetLogLevel() -> wxLogLevel"""
+        return _misc.Log_GetLogLevel(*args, **kwargs)
+
+    GetLogLevel = staticmethod(GetLogLevel)
+    def GetTimestamp(*args, **kwargs):
+        """Log.GetTimestamp() -> wxChar"""
+        return _misc.Log_GetTimestamp(*args, **kwargs)
+
+    GetTimestamp = staticmethod(GetTimestamp)
+    def TimeStamp(*args, **kwargs):
+        """Log.TimeStamp() -> wxString"""
+        return _misc.Log_TimeStamp(*args, **kwargs)
+
+    TimeStamp = staticmethod(TimeStamp)
+    def Destroy(*args, **kwargs):
+        """Destroy()"""
+        return _misc.Log_Destroy(*args, **kwargs)
+
 
 class LogPtr(Log):
     def __init__(self, this):
@@ -691,60 +1205,108 @@ class LogPtr(Log):
         self.__class__ = Log
 _misc.Log_swigregister(LogPtr)
 
-Log_IsEnabled = _misc.Log_IsEnabled
+def Log_IsEnabled(*args, **kwargs):
+    """Log_IsEnabled() -> bool"""
+    return _misc.Log_IsEnabled(*args, **kwargs)
 
-Log_EnableLogging = _misc.Log_EnableLogging
+def Log_EnableLogging(*args, **kwargs):
+    """Log_EnableLogging(bool doIt=True) -> bool"""
+    return _misc.Log_EnableLogging(*args, **kwargs)
 
-Log_OnLog = _misc.Log_OnLog
+def Log_OnLog(*args, **kwargs):
+    """Log_OnLog(wxLogLevel level, wxChar szString, time_t t)"""
+    return _misc.Log_OnLog(*args, **kwargs)
 
-Log_FlushActive = _misc.Log_FlushActive
+def Log_FlushActive(*args, **kwargs):
+    """Log_FlushActive()"""
+    return _misc.Log_FlushActive(*args, **kwargs)
 
-Log_GetActiveTarget = _misc.Log_GetActiveTarget
+def Log_GetActiveTarget(*args, **kwargs):
+    """Log_GetActiveTarget() -> Log"""
+    return _misc.Log_GetActiveTarget(*args, **kwargs)
 
-Log_SetActiveTarget = _misc.Log_SetActiveTarget
+def Log_SetActiveTarget(*args, **kwargs):
+    """Log_SetActiveTarget(Log pLogger) -> Log"""
+    return _misc.Log_SetActiveTarget(*args, **kwargs)
 
-Log_Suspend = _misc.Log_Suspend
+def Log_Suspend(*args, **kwargs):
+    """Log_Suspend()"""
+    return _misc.Log_Suspend(*args, **kwargs)
 
-Log_Resume = _misc.Log_Resume
+def Log_Resume(*args, **kwargs):
+    """Log_Resume()"""
+    return _misc.Log_Resume(*args, **kwargs)
 
-Log_SetVerbose = _misc.Log_SetVerbose
+def Log_SetVerbose(*args, **kwargs):
+    """Log_SetVerbose(bool bVerbose=True)"""
+    return _misc.Log_SetVerbose(*args, **kwargs)
 
-Log_SetLogLevel = _misc.Log_SetLogLevel
+def Log_SetLogLevel(*args, **kwargs):
+    """Log_SetLogLevel(wxLogLevel logLevel)"""
+    return _misc.Log_SetLogLevel(*args, **kwargs)
 
-Log_DontCreateOnDemand = _misc.Log_DontCreateOnDemand
+def Log_DontCreateOnDemand(*args, **kwargs):
+    """Log_DontCreateOnDemand()"""
+    return _misc.Log_DontCreateOnDemand(*args, **kwargs)
 
-Log_SetTraceMask = _misc.Log_SetTraceMask
+def Log_SetTraceMask(*args, **kwargs):
+    """Log_SetTraceMask(wxTraceMask ulMask)"""
+    return _misc.Log_SetTraceMask(*args, **kwargs)
 
-Log_AddTraceMask = _misc.Log_AddTraceMask
+def Log_AddTraceMask(*args, **kwargs):
+    """Log_AddTraceMask(wxString str)"""
+    return _misc.Log_AddTraceMask(*args, **kwargs)
 
-Log_RemoveTraceMask = _misc.Log_RemoveTraceMask
+def Log_RemoveTraceMask(*args, **kwargs):
+    """Log_RemoveTraceMask(wxString str)"""
+    return _misc.Log_RemoveTraceMask(*args, **kwargs)
 
-Log_ClearTraceMasks = _misc.Log_ClearTraceMasks
+def Log_ClearTraceMasks(*args, **kwargs):
+    """Log_ClearTraceMasks()"""
+    return _misc.Log_ClearTraceMasks(*args, **kwargs)
 
-Log_GetTraceMasks = _misc.Log_GetTraceMasks
+def Log_GetTraceMasks(*args, **kwargs):
+    """Log_GetTraceMasks() -> wxArrayString"""
+    return _misc.Log_GetTraceMasks(*args, **kwargs)
 
-Log_SetTimestamp = _misc.Log_SetTimestamp
+def Log_SetTimestamp(*args, **kwargs):
+    """Log_SetTimestamp(wxChar ts)"""
+    return _misc.Log_SetTimestamp(*args, **kwargs)
 
-Log_GetVerbose = _misc.Log_GetVerbose
+def Log_GetVerbose(*args, **kwargs):
+    """Log_GetVerbose() -> bool"""
+    return _misc.Log_GetVerbose(*args, **kwargs)
 
-Log_GetTraceMask = _misc.Log_GetTraceMask
+def Log_GetTraceMask(*args, **kwargs):
+    """Log_GetTraceMask() -> wxTraceMask"""
+    return _misc.Log_GetTraceMask(*args, **kwargs)
 
-Log_IsAllowedTraceMask = _misc.Log_IsAllowedTraceMask
+def Log_IsAllowedTraceMask(*args, **kwargs):
+    """Log_IsAllowedTraceMask(wxChar mask) -> bool"""
+    return _misc.Log_IsAllowedTraceMask(*args, **kwargs)
 
-Log_GetLogLevel = _misc.Log_GetLogLevel
+def Log_GetLogLevel(*args, **kwargs):
+    """Log_GetLogLevel() -> wxLogLevel"""
+    return _misc.Log_GetLogLevel(*args, **kwargs)
 
-Log_GetTimestamp = _misc.Log_GetTimestamp
+def Log_GetTimestamp(*args, **kwargs):
+    """Log_GetTimestamp() -> wxChar"""
+    return _misc.Log_GetTimestamp(*args, **kwargs)
 
-Log_TimeStamp = _misc.Log_TimeStamp
+def Log_TimeStamp(*args, **kwargs):
+    """Log_TimeStamp() -> wxString"""
+    return _misc.Log_TimeStamp(*args, **kwargs)
 
 class LogStderr(Log):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxLogStderr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> LogStderr"""
         newobj = _misc.new_LogStderr(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLogStderr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class LogStderrPtr(LogStderr):
     def __init__(self, this):
@@ -754,13 +1316,15 @@ class LogStderrPtr(LogStderr):
 _misc.LogStderr_swigregister(LogStderrPtr)
 
 class LogTextCtrl(Log):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxLogTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxTextCtrl pTextCtrl) -> LogTextCtrl"""
         newobj = _misc.new_LogTextCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLogTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class LogTextCtrlPtr(LogTextCtrl):
     def __init__(self, this):
@@ -770,13 +1334,15 @@ class LogTextCtrlPtr(LogTextCtrl):
 _misc.LogTextCtrl_swigregister(LogTextCtrlPtr)
 
 class LogGui(Log):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxLogGui instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> LogGui"""
         newobj = _misc.new_LogGui(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLogGui instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class LogGuiPtr(LogGui):
     def __init__(self, this):
@@ -786,18 +1352,36 @@ class LogGuiPtr(LogGui):
 _misc.LogGui_swigregister(LogGuiPtr)
 
 class LogWindow(Log):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxLogWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxFrame pParent, wxString szTitle, bool bShow=True, 
+    bool bPassToOld=True) -> LogWindow"""
         newobj = _misc.new_LogWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def Show(*args, **kwargs): return _misc.LogWindow_Show(*args, **kwargs)
-    def GetFrame(*args, **kwargs): return _misc.LogWindow_GetFrame(*args, **kwargs)
-    def GetOldLog(*args, **kwargs): return _misc.LogWindow_GetOldLog(*args, **kwargs)
-    def IsPassingMessages(*args, **kwargs): return _misc.LogWindow_IsPassingMessages(*args, **kwargs)
-    def PassMessages(*args, **kwargs): return _misc.LogWindow_PassMessages(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLogWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Show(*args, **kwargs):
+        """Show(bool bShow=True)"""
+        return _misc.LogWindow_Show(*args, **kwargs)
+
+    def GetFrame(*args, **kwargs):
+        """GetFrame() -> wxFrame"""
+        return _misc.LogWindow_GetFrame(*args, **kwargs)
+
+    def GetOldLog(*args, **kwargs):
+        """GetOldLog() -> Log"""
+        return _misc.LogWindow_GetOldLog(*args, **kwargs)
+
+    def IsPassingMessages(*args, **kwargs):
+        """IsPassingMessages() -> bool"""
+        return _misc.LogWindow_IsPassingMessages(*args, **kwargs)
+
+    def PassMessages(*args, **kwargs):
+        """PassMessages(bool bDoPass)"""
+        return _misc.LogWindow_PassMessages(*args, **kwargs)
+
 
 class LogWindowPtr(LogWindow):
     def __init__(self, this):
@@ -807,17 +1391,31 @@ class LogWindowPtr(LogWindow):
 _misc.LogWindow_swigregister(LogWindowPtr)
 
 class LogChain(Log):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxLogChain instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Log logger) -> LogChain"""
         newobj = _misc.new_LogChain(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetLog(*args, **kwargs): return _misc.LogChain_SetLog(*args, **kwargs)
-    def PassMessages(*args, **kwargs): return _misc.LogChain_PassMessages(*args, **kwargs)
-    def IsPassingMessages(*args, **kwargs): return _misc.LogChain_IsPassingMessages(*args, **kwargs)
-    def GetOldLog(*args, **kwargs): return _misc.LogChain_GetOldLog(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLogChain instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetLog(*args, **kwargs):
+        """SetLog(Log logger)"""
+        return _misc.LogChain_SetLog(*args, **kwargs)
+
+    def PassMessages(*args, **kwargs):
+        """PassMessages(bool bDoPass)"""
+        return _misc.LogChain_PassMessages(*args, **kwargs)
+
+    def IsPassingMessages(*args, **kwargs):
+        """IsPassingMessages() -> bool"""
+        return _misc.LogChain_IsPassingMessages(*args, **kwargs)
+
+    def GetOldLog(*args, **kwargs):
+        """GetOldLog() -> Log"""
+        return _misc.LogChain_GetOldLog(*args, **kwargs)
+
 
 class LogChainPtr(LogChain):
     def __init__(self, this):
@@ -827,49 +1425,85 @@ class LogChainPtr(LogChain):
 _misc.LogChain_swigregister(LogChainPtr)
 
 
-SysErrorCode = _misc.SysErrorCode
+def SysErrorCode(*args, **kwargs):
+    """SysErrorCode() -> unsigned long"""
+    return _misc.SysErrorCode(*args, **kwargs)
 
-SysErrorMsg = _misc.SysErrorMsg
+def SysErrorMsg(*args, **kwargs):
+    """SysErrorMsg(unsigned long nErrCode=0) -> wxString"""
+    return _misc.SysErrorMsg(*args, **kwargs)
 
-LogFatalError = _misc.LogFatalError
+def LogFatalError(*args, **kwargs):
+    """LogFatalError(wxString msg)"""
+    return _misc.LogFatalError(*args, **kwargs)
 
-LogError = _misc.LogError
+def LogError(*args, **kwargs):
+    """LogError(wxString msg)"""
+    return _misc.LogError(*args, **kwargs)
 
-LogWarning = _misc.LogWarning
+def LogWarning(*args, **kwargs):
+    """LogWarning(wxString msg)"""
+    return _misc.LogWarning(*args, **kwargs)
 
-LogMessage = _misc.LogMessage
+def LogMessage(*args, **kwargs):
+    """LogMessage(wxString msg)"""
+    return _misc.LogMessage(*args, **kwargs)
 
-LogInfo = _misc.LogInfo
+def LogInfo(*args, **kwargs):
+    """LogInfo(wxString msg)"""
+    return _misc.LogInfo(*args, **kwargs)
 
-LogDebug = _misc.LogDebug
+def LogDebug(*args, **kwargs):
+    """LogDebug(wxString msg)"""
+    return _misc.LogDebug(*args, **kwargs)
 
-LogVerbose = _misc.LogVerbose
+def LogVerbose(*args, **kwargs):
+    """LogVerbose(wxString msg)"""
+    return _misc.LogVerbose(*args, **kwargs)
 
-LogStatus = _misc.LogStatus
+def LogStatus(*args, **kwargs):
+    """LogStatus(wxString msg)"""
+    return _misc.LogStatus(*args, **kwargs)
 
-LogStatusFrame = _misc.LogStatusFrame
+def LogStatusFrame(*args, **kwargs):
+    """LogStatusFrame(wxFrame pFrame, wxString msg)"""
+    return _misc.LogStatusFrame(*args, **kwargs)
 
-LogSysError = _misc.LogSysError
+def LogSysError(*args, **kwargs):
+    """LogSysError(wxString msg)"""
+    return _misc.LogSysError(*args, **kwargs)
 
-LogTrace = _misc.LogTrace
+def LogTrace(*args, **kwargs):
+    """LogTrace(wxString msg)"""
+    return _misc.LogTrace(*args, **kwargs)
 
-LogTraceMask = _misc.LogTraceMask
+def LogTraceMask(*args, **kwargs):
+    """LogTraceMask(wxString mask, wxString msg)"""
+    return _misc.LogTraceMask(*args, **kwargs)
 
-LogGeneric = _misc.LogGeneric
+def LogGeneric(*args, **kwargs):
+    """LogGeneric(unsigned long level, wxString msg)"""
+    return _misc.LogGeneric(*args, **kwargs)
 
-SafeShowMessage = _misc.SafeShowMessage
+def SafeShowMessage(*args, **kwargs):
+    """SafeShowMessage(wxString title, wxString text)"""
+    return _misc.SafeShowMessage(*args, **kwargs)
 class LogNull(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxLogNull instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> LogNull"""
         newobj = _misc.new_LogNull(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_LogNull):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLogNull instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class LogNullPtr(LogNull):
     def __init__(self, this):
@@ -879,15 +1513,21 @@ class LogNullPtr(LogNull):
 _misc.LogNull_swigregister(LogNullPtr)
 
 class PyLog(Log):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyLog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PyLog"""
         newobj = _misc.new_PyLog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, PyLog)
-    def _setCallbackInfo(*args, **kwargs): return _misc.PyLog__setCallbackInfo(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyLog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _misc.PyLog__setCallbackInfo(*args, **kwargs)
+
 
 class PyLogPtr(PyLog):
     def __init__(self, this):
@@ -923,29 +1563,80 @@ SIGPIPE = _misc.SIGPIPE
 SIGALRM = _misc.SIGALRM
 SIGTERM = _misc.SIGTERM
 class Process(core.EvtHandler):
-    Kill = staticmethod(_misc.Process_Kill)
-    Exists = staticmethod(_misc.Process_Exists)
-    Open = staticmethod(_misc.Process_Open)
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyProcess instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Kill(*args, **kwargs):
+        """Process.Kill(int pid, wxSignal sig=SIGTERM) -> wxKillError"""
+        return _misc.Process_Kill(*args, **kwargs)
+
+    Kill = staticmethod(Kill)
+    def Exists(*args, **kwargs):
+        """Process.Exists(int pid) -> bool"""
+        return _misc.Process_Exists(*args, **kwargs)
+
+    Exists = staticmethod(Exists)
+    def Open(*args, **kwargs):
+        """Process.Open(wxString cmd, int flags=EXEC_ASYNC) -> Process"""
+        return _misc.Process_Open(*args, **kwargs)
+
+    Open = staticmethod(Open)
     def __init__(self, *args, **kwargs):
+        """__init__(EvtHandler parent=None, int id=-1) -> Process"""
         newobj = _misc.new_Process(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, Process)
-    def _setCallbackInfo(*args, **kwargs): return _misc.Process__setCallbackInfo(*args, **kwargs)
-    def base_OnTerminate(*args, **kwargs): return _misc.Process_base_OnTerminate(*args, **kwargs)
-    def Redirect(*args, **kwargs): return _misc.Process_Redirect(*args, **kwargs)
-    def IsRedirected(*args, **kwargs): return _misc.Process_IsRedirected(*args, **kwargs)
-    def Detach(*args, **kwargs): return _misc.Process_Detach(*args, **kwargs)
-    def GetInputStream(*args, **kwargs): return _misc.Process_GetInputStream(*args, **kwargs)
-    def GetErrorStream(*args, **kwargs): return _misc.Process_GetErrorStream(*args, **kwargs)
-    def GetOutputStream(*args, **kwargs): return _misc.Process_GetOutputStream(*args, **kwargs)
-    def CloseOutput(*args, **kwargs): return _misc.Process_CloseOutput(*args, **kwargs)
-    def IsInputOpened(*args, **kwargs): return _misc.Process_IsInputOpened(*args, **kwargs)
-    def IsInputAvailable(*args, **kwargs): return _misc.Process_IsInputAvailable(*args, **kwargs)
-    def IsErrorAvailable(*args, **kwargs): return _misc.Process_IsErrorAvailable(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyProcess instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _misc.Process__setCallbackInfo(*args, **kwargs)
+
+    def base_OnTerminate(*args, **kwargs):
+        """base_OnTerminate(int pid, int status)"""
+        return _misc.Process_base_OnTerminate(*args, **kwargs)
+
+    def Redirect(*args, **kwargs):
+        """Redirect()"""
+        return _misc.Process_Redirect(*args, **kwargs)
+
+    def IsRedirected(*args, **kwargs):
+        """IsRedirected() -> bool"""
+        return _misc.Process_IsRedirected(*args, **kwargs)
+
+    def Detach(*args, **kwargs):
+        """Detach()"""
+        return _misc.Process_Detach(*args, **kwargs)
+
+    def GetInputStream(*args, **kwargs):
+        """GetInputStream() -> wxInputStream"""
+        return _misc.Process_GetInputStream(*args, **kwargs)
+
+    def GetErrorStream(*args, **kwargs):
+        """GetErrorStream() -> wxInputStream"""
+        return _misc.Process_GetErrorStream(*args, **kwargs)
+
+    def GetOutputStream(*args, **kwargs):
+        """GetOutputStream() -> OutputStream"""
+        return _misc.Process_GetOutputStream(*args, **kwargs)
+
+    def CloseOutput(*args, **kwargs):
+        """CloseOutput()"""
+        return _misc.Process_CloseOutput(*args, **kwargs)
+
+    def IsInputOpened(*args, **kwargs):
+        """IsInputOpened() -> bool"""
+        return _misc.Process_IsInputOpened(*args, **kwargs)
+
+    def IsInputAvailable(*args, **kwargs):
+        """IsInputAvailable() -> bool"""
+        return _misc.Process_IsInputAvailable(*args, **kwargs)
+
+    def IsErrorAvailable(*args, **kwargs):
+        """IsErrorAvailable() -> bool"""
+        return _misc.Process_IsErrorAvailable(*args, **kwargs)
+
 
 class ProcessPtr(Process):
     def __init__(self, this):
@@ -954,24 +1645,38 @@ class ProcessPtr(Process):
         self.__class__ = Process
 _misc.Process_swigregister(ProcessPtr)
 
-Process_Kill = _misc.Process_Kill
+def Process_Kill(*args, **kwargs):
+    """Process_Kill(int pid, wxSignal sig=SIGTERM) -> wxKillError"""
+    return _misc.Process_Kill(*args, **kwargs)
 
-Process_Exists = _misc.Process_Exists
+def Process_Exists(*args, **kwargs):
+    """Process_Exists(int pid) -> bool"""
+    return _misc.Process_Exists(*args, **kwargs)
 
-Process_Open = _misc.Process_Open
+def Process_Open(*args, **kwargs):
+    """Process_Open(wxString cmd, int flags=EXEC_ASYNC) -> Process"""
+    return _misc.Process_Open(*args, **kwargs)
 
 class ProcessEvent(core.Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxProcessEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int id=0, int pid=0, int exitcode=0) -> ProcessEvent"""
         newobj = _misc.new_ProcessEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetPid(*args, **kwargs): return _misc.ProcessEvent_GetPid(*args, **kwargs)
-    def GetExitCode(*args, **kwargs): return _misc.ProcessEvent_GetExitCode(*args, **kwargs)
+    def GetPid(*args, **kwargs):
+        """GetPid() -> int"""
+        return _misc.ProcessEvent_GetPid(*args, **kwargs)
+
+    def GetExitCode(*args, **kwargs):
+        """GetExitCode() -> int"""
+        return _misc.ProcessEvent_GetExitCode(*args, **kwargs)
+
     m_pid = property(_misc.ProcessEvent_m_pid_get, _misc.ProcessEvent_m_pid_set)
     m_exitcode = property(_misc.ProcessEvent_m_exitcode_get, _misc.ProcessEvent_m_exitcode_set)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxProcessEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class ProcessEventPtr(ProcessEvent):
     def __init__(self, this):
@@ -988,7 +1693,9 @@ EXEC_SYNC = _misc.EXEC_SYNC
 EXEC_NOHIDE = _misc.EXEC_NOHIDE
 EXEC_MAKE_GROUP_LEADER = _misc.EXEC_MAKE_GROUP_LEADER
 
-Execute = _misc.Execute
+def Execute(*args, **kwargs):
+    """Execute(wxString command, int flags=EXEC_ASYNC, Process process=None) -> long"""
+    return _misc.Execute(*args, **kwargs)
 #---------------------------------------------------------------------------
 
 JOYSTICK1 = _misc.JOYSTICK1
@@ -999,60 +1706,190 @@ JOY_BUTTON2 = _misc.JOY_BUTTON2
 JOY_BUTTON3 = _misc.JOY_BUTTON3
 JOY_BUTTON4 = _misc.JOY_BUTTON4
 class Joystick(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxJoystick instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int joystick=JOYSTICK1) -> Joystick"""
         newobj = _misc.new_Joystick(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_Joystick):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetPosition(*args, **kwargs): return _misc.Joystick_GetPosition(*args, **kwargs)
-    def GetZPosition(*args, **kwargs): return _misc.Joystick_GetZPosition(*args, **kwargs)
-    def GetButtonState(*args, **kwargs): return _misc.Joystick_GetButtonState(*args, **kwargs)
-    def GetPOVPosition(*args, **kwargs): return _misc.Joystick_GetPOVPosition(*args, **kwargs)
-    def GetPOVCTSPosition(*args, **kwargs): return _misc.Joystick_GetPOVCTSPosition(*args, **kwargs)
-    def GetRudderPosition(*args, **kwargs): return _misc.Joystick_GetRudderPosition(*args, **kwargs)
-    def GetUPosition(*args, **kwargs): return _misc.Joystick_GetUPosition(*args, **kwargs)
-    def GetVPosition(*args, **kwargs): return _misc.Joystick_GetVPosition(*args, **kwargs)
-    def GetMovementThreshold(*args, **kwargs): return _misc.Joystick_GetMovementThreshold(*args, **kwargs)
-    def SetMovementThreshold(*args, **kwargs): return _misc.Joystick_SetMovementThreshold(*args, **kwargs)
-    def IsOk(*args, **kwargs): return _misc.Joystick_IsOk(*args, **kwargs)
-    def GetNumberJoysticks(*args, **kwargs): return _misc.Joystick_GetNumberJoysticks(*args, **kwargs)
-    def GetManufacturerId(*args, **kwargs): return _misc.Joystick_GetManufacturerId(*args, **kwargs)
-    def GetProductId(*args, **kwargs): return _misc.Joystick_GetProductId(*args, **kwargs)
-    def GetProductName(*args, **kwargs): return _misc.Joystick_GetProductName(*args, **kwargs)
-    def GetXMin(*args, **kwargs): return _misc.Joystick_GetXMin(*args, **kwargs)
-    def GetYMin(*args, **kwargs): return _misc.Joystick_GetYMin(*args, **kwargs)
-    def GetZMin(*args, **kwargs): return _misc.Joystick_GetZMin(*args, **kwargs)
-    def GetXMax(*args, **kwargs): return _misc.Joystick_GetXMax(*args, **kwargs)
-    def GetYMax(*args, **kwargs): return _misc.Joystick_GetYMax(*args, **kwargs)
-    def GetZMax(*args, **kwargs): return _misc.Joystick_GetZMax(*args, **kwargs)
-    def GetNumberButtons(*args, **kwargs): return _misc.Joystick_GetNumberButtons(*args, **kwargs)
-    def GetNumberAxes(*args, **kwargs): return _misc.Joystick_GetNumberAxes(*args, **kwargs)
-    def GetMaxButtons(*args, **kwargs): return _misc.Joystick_GetMaxButtons(*args, **kwargs)
-    def GetMaxAxes(*args, **kwargs): return _misc.Joystick_GetMaxAxes(*args, **kwargs)
-    def GetPollingMin(*args, **kwargs): return _misc.Joystick_GetPollingMin(*args, **kwargs)
-    def GetPollingMax(*args, **kwargs): return _misc.Joystick_GetPollingMax(*args, **kwargs)
-    def GetRudderMin(*args, **kwargs): return _misc.Joystick_GetRudderMin(*args, **kwargs)
-    def GetRudderMax(*args, **kwargs): return _misc.Joystick_GetRudderMax(*args, **kwargs)
-    def GetUMin(*args, **kwargs): return _misc.Joystick_GetUMin(*args, **kwargs)
-    def GetUMax(*args, **kwargs): return _misc.Joystick_GetUMax(*args, **kwargs)
-    def GetVMin(*args, **kwargs): return _misc.Joystick_GetVMin(*args, **kwargs)
-    def GetVMax(*args, **kwargs): return _misc.Joystick_GetVMax(*args, **kwargs)
-    def HasRudder(*args, **kwargs): return _misc.Joystick_HasRudder(*args, **kwargs)
-    def HasZ(*args, **kwargs): return _misc.Joystick_HasZ(*args, **kwargs)
-    def HasU(*args, **kwargs): return _misc.Joystick_HasU(*args, **kwargs)
-    def HasV(*args, **kwargs): return _misc.Joystick_HasV(*args, **kwargs)
-    def HasPOV(*args, **kwargs): return _misc.Joystick_HasPOV(*args, **kwargs)
-    def HasPOV4Dir(*args, **kwargs): return _misc.Joystick_HasPOV4Dir(*args, **kwargs)
-    def HasPOVCTS(*args, **kwargs): return _misc.Joystick_HasPOVCTS(*args, **kwargs)
-    def SetCapture(*args, **kwargs): return _misc.Joystick_SetCapture(*args, **kwargs)
-    def ReleaseCapture(*args, **kwargs): return _misc.Joystick_ReleaseCapture(*args, **kwargs)
+
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point"""
+        return _misc.Joystick_GetPosition(*args, **kwargs)
+
+    def GetZPosition(*args, **kwargs):
+        """GetZPosition() -> int"""
+        return _misc.Joystick_GetZPosition(*args, **kwargs)
+
+    def GetButtonState(*args, **kwargs):
+        """GetButtonState() -> int"""
+        return _misc.Joystick_GetButtonState(*args, **kwargs)
+
+    def GetPOVPosition(*args, **kwargs):
+        """GetPOVPosition() -> int"""
+        return _misc.Joystick_GetPOVPosition(*args, **kwargs)
+
+    def GetPOVCTSPosition(*args, **kwargs):
+        """GetPOVCTSPosition() -> int"""
+        return _misc.Joystick_GetPOVCTSPosition(*args, **kwargs)
+
+    def GetRudderPosition(*args, **kwargs):
+        """GetRudderPosition() -> int"""
+        return _misc.Joystick_GetRudderPosition(*args, **kwargs)
+
+    def GetUPosition(*args, **kwargs):
+        """GetUPosition() -> int"""
+        return _misc.Joystick_GetUPosition(*args, **kwargs)
+
+    def GetVPosition(*args, **kwargs):
+        """GetVPosition() -> int"""
+        return _misc.Joystick_GetVPosition(*args, **kwargs)
+
+    def GetMovementThreshold(*args, **kwargs):
+        """GetMovementThreshold() -> int"""
+        return _misc.Joystick_GetMovementThreshold(*args, **kwargs)
+
+    def SetMovementThreshold(*args, **kwargs):
+        """SetMovementThreshold(int threshold)"""
+        return _misc.Joystick_SetMovementThreshold(*args, **kwargs)
+
+    def IsOk(*args, **kwargs):
+        """IsOk(void ??) -> bool"""
+        return _misc.Joystick_IsOk(*args, **kwargs)
+
+    def GetNumberJoysticks(*args, **kwargs):
+        """GetNumberJoysticks() -> int"""
+        return _misc.Joystick_GetNumberJoysticks(*args, **kwargs)
+
+    def GetManufacturerId(*args, **kwargs):
+        """GetManufacturerId() -> int"""
+        return _misc.Joystick_GetManufacturerId(*args, **kwargs)
+
+    def GetProductId(*args, **kwargs):
+        """GetProductId() -> int"""
+        return _misc.Joystick_GetProductId(*args, **kwargs)
+
+    def GetProductName(*args, **kwargs):
+        """GetProductName() -> wxString"""
+        return _misc.Joystick_GetProductName(*args, **kwargs)
+
+    def GetXMin(*args, **kwargs):
+        """GetXMin() -> int"""
+        return _misc.Joystick_GetXMin(*args, **kwargs)
+
+    def GetYMin(*args, **kwargs):
+        """GetYMin() -> int"""
+        return _misc.Joystick_GetYMin(*args, **kwargs)
+
+    def GetZMin(*args, **kwargs):
+        """GetZMin() -> int"""
+        return _misc.Joystick_GetZMin(*args, **kwargs)
+
+    def GetXMax(*args, **kwargs):
+        """GetXMax() -> int"""
+        return _misc.Joystick_GetXMax(*args, **kwargs)
+
+    def GetYMax(*args, **kwargs):
+        """GetYMax() -> int"""
+        return _misc.Joystick_GetYMax(*args, **kwargs)
+
+    def GetZMax(*args, **kwargs):
+        """GetZMax() -> int"""
+        return _misc.Joystick_GetZMax(*args, **kwargs)
+
+    def GetNumberButtons(*args, **kwargs):
+        """GetNumberButtons() -> int"""
+        return _misc.Joystick_GetNumberButtons(*args, **kwargs)
+
+    def GetNumberAxes(*args, **kwargs):
+        """GetNumberAxes() -> int"""
+        return _misc.Joystick_GetNumberAxes(*args, **kwargs)
+
+    def GetMaxButtons(*args, **kwargs):
+        """GetMaxButtons() -> int"""
+        return _misc.Joystick_GetMaxButtons(*args, **kwargs)
+
+    def GetMaxAxes(*args, **kwargs):
+        """GetMaxAxes() -> int"""
+        return _misc.Joystick_GetMaxAxes(*args, **kwargs)
+
+    def GetPollingMin(*args, **kwargs):
+        """GetPollingMin() -> int"""
+        return _misc.Joystick_GetPollingMin(*args, **kwargs)
+
+    def GetPollingMax(*args, **kwargs):
+        """GetPollingMax() -> int"""
+        return _misc.Joystick_GetPollingMax(*args, **kwargs)
+
+    def GetRudderMin(*args, **kwargs):
+        """GetRudderMin() -> int"""
+        return _misc.Joystick_GetRudderMin(*args, **kwargs)
+
+    def GetRudderMax(*args, **kwargs):
+        """GetRudderMax() -> int"""
+        return _misc.Joystick_GetRudderMax(*args, **kwargs)
+
+    def GetUMin(*args, **kwargs):
+        """GetUMin() -> int"""
+        return _misc.Joystick_GetUMin(*args, **kwargs)
+
+    def GetUMax(*args, **kwargs):
+        """GetUMax() -> int"""
+        return _misc.Joystick_GetUMax(*args, **kwargs)
+
+    def GetVMin(*args, **kwargs):
+        """GetVMin() -> int"""
+        return _misc.Joystick_GetVMin(*args, **kwargs)
+
+    def GetVMax(*args, **kwargs):
+        """GetVMax() -> int"""
+        return _misc.Joystick_GetVMax(*args, **kwargs)
+
+    def HasRudder(*args, **kwargs):
+        """HasRudder() -> bool"""
+        return _misc.Joystick_HasRudder(*args, **kwargs)
+
+    def HasZ(*args, **kwargs):
+        """HasZ() -> bool"""
+        return _misc.Joystick_HasZ(*args, **kwargs)
+
+    def HasU(*args, **kwargs):
+        """HasU() -> bool"""
+        return _misc.Joystick_HasU(*args, **kwargs)
+
+    def HasV(*args, **kwargs):
+        """HasV() -> bool"""
+        return _misc.Joystick_HasV(*args, **kwargs)
+
+    def HasPOV(*args, **kwargs):
+        """HasPOV() -> bool"""
+        return _misc.Joystick_HasPOV(*args, **kwargs)
+
+    def HasPOV4Dir(*args, **kwargs):
+        """HasPOV4Dir() -> bool"""
+        return _misc.Joystick_HasPOV4Dir(*args, **kwargs)
+
+    def HasPOVCTS(*args, **kwargs):
+        """HasPOVCTS() -> bool"""
+        return _misc.Joystick_HasPOVCTS(*args, **kwargs)
+
+    def SetCapture(*args, **kwargs):
+        """SetCapture(Window win, int pollingFreq=0) -> bool"""
+        return _misc.Joystick_SetCapture(*args, **kwargs)
+
+    def ReleaseCapture(*args, **kwargs):
+        """ReleaseCapture() -> bool"""
+        return _misc.Joystick_ReleaseCapture(*args, **kwargs)
+
     def __nonzero__(self): return self.IsOk() 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxJoystick instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class JoystickPtr(Joystick):
     def __init__(self, this):
@@ -1066,34 +1903,85 @@ wxEVT_JOY_BUTTON_UP = _misc.wxEVT_JOY_BUTTON_UP
 wxEVT_JOY_MOVE = _misc.wxEVT_JOY_MOVE
 wxEVT_JOY_ZMOVE = _misc.wxEVT_JOY_ZMOVE
 class JoystickEvent(core.Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxJoystickEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     m_pos = property(_misc.JoystickEvent_m_pos_get, _misc.JoystickEvent_m_pos_set)
     m_zPosition = property(_misc.JoystickEvent_m_zPosition_get, _misc.JoystickEvent_m_zPosition_set)
     m_buttonChange = property(_misc.JoystickEvent_m_buttonChange_get, _misc.JoystickEvent_m_buttonChange_set)
     m_buttonState = property(_misc.JoystickEvent_m_buttonState_get, _misc.JoystickEvent_m_buttonState_set)
     m_joyStick = property(_misc.JoystickEvent_m_joyStick_get, _misc.JoystickEvent_m_joyStick_set)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType type=wxEVT_NULL, int state=0, int joystick=JOYSTICK1, 
+    int change=0) -> JoystickEvent"""
         newobj = _misc.new_JoystickEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetPosition(*args, **kwargs): return _misc.JoystickEvent_GetPosition(*args, **kwargs)
-    def GetZPosition(*args, **kwargs): return _misc.JoystickEvent_GetZPosition(*args, **kwargs)
-    def GetButtonState(*args, **kwargs): return _misc.JoystickEvent_GetButtonState(*args, **kwargs)
-    def GetButtonChange(*args, **kwargs): return _misc.JoystickEvent_GetButtonChange(*args, **kwargs)
-    def GetJoystick(*args, **kwargs): return _misc.JoystickEvent_GetJoystick(*args, **kwargs)
-    def SetJoystick(*args, **kwargs): return _misc.JoystickEvent_SetJoystick(*args, **kwargs)
-    def SetButtonState(*args, **kwargs): return _misc.JoystickEvent_SetButtonState(*args, **kwargs)
-    def SetButtonChange(*args, **kwargs): return _misc.JoystickEvent_SetButtonChange(*args, **kwargs)
-    def SetPosition(*args, **kwargs): return _misc.JoystickEvent_SetPosition(*args, **kwargs)
-    def SetZPosition(*args, **kwargs): return _misc.JoystickEvent_SetZPosition(*args, **kwargs)
-    def IsButton(*args, **kwargs): return _misc.JoystickEvent_IsButton(*args, **kwargs)
-    def IsMove(*args, **kwargs): return _misc.JoystickEvent_IsMove(*args, **kwargs)
-    def IsZMove(*args, **kwargs): return _misc.JoystickEvent_IsZMove(*args, **kwargs)
-    def ButtonDown(*args, **kwargs): return _misc.JoystickEvent_ButtonDown(*args, **kwargs)
-    def ButtonUp(*args, **kwargs): return _misc.JoystickEvent_ButtonUp(*args, **kwargs)
-    def ButtonIsDown(*args, **kwargs): return _misc.JoystickEvent_ButtonIsDown(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxJoystickEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> Point"""
+        return _misc.JoystickEvent_GetPosition(*args, **kwargs)
+
+    def GetZPosition(*args, **kwargs):
+        """GetZPosition() -> int"""
+        return _misc.JoystickEvent_GetZPosition(*args, **kwargs)
+
+    def GetButtonState(*args, **kwargs):
+        """GetButtonState() -> int"""
+        return _misc.JoystickEvent_GetButtonState(*args, **kwargs)
+
+    def GetButtonChange(*args, **kwargs):
+        """GetButtonChange() -> int"""
+        return _misc.JoystickEvent_GetButtonChange(*args, **kwargs)
+
+    def GetJoystick(*args, **kwargs):
+        """GetJoystick() -> int"""
+        return _misc.JoystickEvent_GetJoystick(*args, **kwargs)
+
+    def SetJoystick(*args, **kwargs):
+        """SetJoystick(int stick)"""
+        return _misc.JoystickEvent_SetJoystick(*args, **kwargs)
+
+    def SetButtonState(*args, **kwargs):
+        """SetButtonState(int state)"""
+        return _misc.JoystickEvent_SetButtonState(*args, **kwargs)
+
+    def SetButtonChange(*args, **kwargs):
+        """SetButtonChange(int change)"""
+        return _misc.JoystickEvent_SetButtonChange(*args, **kwargs)
+
+    def SetPosition(*args, **kwargs):
+        """SetPosition(Point pos)"""
+        return _misc.JoystickEvent_SetPosition(*args, **kwargs)
+
+    def SetZPosition(*args, **kwargs):
+        """SetZPosition(int zPos)"""
+        return _misc.JoystickEvent_SetZPosition(*args, **kwargs)
+
+    def IsButton(*args, **kwargs):
+        """IsButton() -> bool"""
+        return _misc.JoystickEvent_IsButton(*args, **kwargs)
+
+    def IsMove(*args, **kwargs):
+        """IsMove() -> bool"""
+        return _misc.JoystickEvent_IsMove(*args, **kwargs)
+
+    def IsZMove(*args, **kwargs):
+        """IsZMove() -> bool"""
+        return _misc.JoystickEvent_IsZMove(*args, **kwargs)
+
+    def ButtonDown(*args, **kwargs):
+        """ButtonDown(int but=JOY_BUTTON_ANY) -> bool"""
+        return _misc.JoystickEvent_ButtonDown(*args, **kwargs)
+
+    def ButtonUp(*args, **kwargs):
+        """ButtonUp(int but=JOY_BUTTON_ANY) -> bool"""
+        return _misc.JoystickEvent_ButtonUp(*args, **kwargs)
+
+    def ButtonIsDown(*args, **kwargs):
+        """ButtonIsDown(int but=JOY_BUTTON_ANY) -> bool"""
+        return _misc.JoystickEvent_ButtonIsDown(*args, **kwargs)
+
 
 class JoystickEventPtr(JoystickEvent):
     def __init__(self, this):
@@ -1117,20 +2005,30 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
 #---------------------------------------------------------------------------
 
 class Wave(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxWave instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString fileName, bool isResource=False) -> Wave"""
         newobj = _misc.new_Wave(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_Wave):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def IsOk(*args, **kwargs): return _misc.Wave_IsOk(*args, **kwargs)
-    def Play(*args, **kwargs): return _misc.Wave_Play(*args, **kwargs)
+
+    def IsOk(*args, **kwargs):
+        """IsOk() -> bool"""
+        return _misc.Wave_IsOk(*args, **kwargs)
+
+    def Play(*args, **kwargs):
+        """Play(bool async=True, bool looped=False) -> bool"""
+        return _misc.Wave_Play(*args, **kwargs)
+
     def __nonzero__(self): return self.IsOk() 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWave instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class WavePtr(Wave):
     def __init__(self, this):
@@ -1140,6 +2038,7 @@ class WavePtr(Wave):
 _misc.Wave_swigregister(WavePtr)
 
 def WaveData(*args, **kwargs):
+    """WaveData(wxString data) -> Wave"""
     val = _misc.new_WaveData(*args, **kwargs)
     val.thisown = 1
     return val
@@ -1152,25 +2051,64 @@ MAILCAP_KDE = _misc.MAILCAP_KDE
 MAILCAP_GNOME = _misc.MAILCAP_GNOME
 MAILCAP_ALL = _misc.MAILCAP_ALL
 class FileTypeInfo(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFileTypeInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString mimeType, wxString openCmd, wxString printCmd, 
+    wxString desc) -> FileTypeInfo"""
         newobj = _misc.new_FileTypeInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def IsValid(*args, **kwargs): return _misc.FileTypeInfo_IsValid(*args, **kwargs)
-    def SetIcon(*args, **kwargs): return _misc.FileTypeInfo_SetIcon(*args, **kwargs)
-    def SetShortDesc(*args, **kwargs): return _misc.FileTypeInfo_SetShortDesc(*args, **kwargs)
-    def GetMimeType(*args, **kwargs): return _misc.FileTypeInfo_GetMimeType(*args, **kwargs)
-    def GetOpenCommand(*args, **kwargs): return _misc.FileTypeInfo_GetOpenCommand(*args, **kwargs)
-    def GetPrintCommand(*args, **kwargs): return _misc.FileTypeInfo_GetPrintCommand(*args, **kwargs)
-    def GetShortDesc(*args, **kwargs): return _misc.FileTypeInfo_GetShortDesc(*args, **kwargs)
-    def GetDescription(*args, **kwargs): return _misc.FileTypeInfo_GetDescription(*args, **kwargs)
-    def GetExtensions(*args, **kwargs): return _misc.FileTypeInfo_GetExtensions(*args, **kwargs)
-    def GetExtensionsCount(*args, **kwargs): return _misc.FileTypeInfo_GetExtensionsCount(*args, **kwargs)
-    def GetIconFile(*args, **kwargs): return _misc.FileTypeInfo_GetIconFile(*args, **kwargs)
-    def GetIconIndex(*args, **kwargs): return _misc.FileTypeInfo_GetIconIndex(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFileTypeInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def IsValid(*args, **kwargs):
+        """IsValid() -> bool"""
+        return _misc.FileTypeInfo_IsValid(*args, **kwargs)
+
+    def SetIcon(*args, **kwargs):
+        """SetIcon(wxString iconFile, int iconIndex=0)"""
+        return _misc.FileTypeInfo_SetIcon(*args, **kwargs)
+
+    def SetShortDesc(*args, **kwargs):
+        """SetShortDesc(wxString shortDesc)"""
+        return _misc.FileTypeInfo_SetShortDesc(*args, **kwargs)
+
+    def GetMimeType(*args, **kwargs):
+        """GetMimeType() -> wxString"""
+        return _misc.FileTypeInfo_GetMimeType(*args, **kwargs)
+
+    def GetOpenCommand(*args, **kwargs):
+        """GetOpenCommand() -> wxString"""
+        return _misc.FileTypeInfo_GetOpenCommand(*args, **kwargs)
+
+    def GetPrintCommand(*args, **kwargs):
+        """GetPrintCommand() -> wxString"""
+        return _misc.FileTypeInfo_GetPrintCommand(*args, **kwargs)
+
+    def GetShortDesc(*args, **kwargs):
+        """GetShortDesc() -> wxString"""
+        return _misc.FileTypeInfo_GetShortDesc(*args, **kwargs)
+
+    def GetDescription(*args, **kwargs):
+        """GetDescription() -> wxString"""
+        return _misc.FileTypeInfo_GetDescription(*args, **kwargs)
+
+    def GetExtensions(*args, **kwargs):
+        """GetExtensions() -> wxArrayString"""
+        return _misc.FileTypeInfo_GetExtensions(*args, **kwargs)
+
+    def GetExtensionsCount(*args, **kwargs):
+        """GetExtensionsCount() -> int"""
+        return _misc.FileTypeInfo_GetExtensionsCount(*args, **kwargs)
+
+    def GetIconFile(*args, **kwargs):
+        """GetIconFile() -> wxString"""
+        return _misc.FileTypeInfo_GetIconFile(*args, **kwargs)
+
+    def GetIconIndex(*args, **kwargs):
+        """GetIconIndex() -> int"""
+        return _misc.FileTypeInfo_GetIconIndex(*args, **kwargs)
+
 
 class FileTypeInfoPtr(FileTypeInfo):
     def __init__(self, this):
@@ -1180,40 +2118,86 @@ class FileTypeInfoPtr(FileTypeInfo):
 _misc.FileTypeInfo_swigregister(FileTypeInfoPtr)
 
 def FileTypeInfoSequence(*args, **kwargs):
+    """FileTypeInfoSequence(wxArrayString sArray) -> FileTypeInfo"""
     val = _misc.new_FileTypeInfoSequence(*args, **kwargs)
     val.thisown = 1
     return val
 
 def NullFileTypeInfo(*args, **kwargs):
+    """NullFileTypeInfo() -> FileTypeInfo"""
     val = _misc.new_NullFileTypeInfo(*args, **kwargs)
     val.thisown = 1
     return val
 
 class FileType(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFileType instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(FileTypeInfo ftInfo) -> FileType"""
         newobj = _misc.new_FileType(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_FileType):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetMimeType(*args, **kwargs): return _misc.FileType_GetMimeType(*args, **kwargs)
-    def GetMimeTypes(*args, **kwargs): return _misc.FileType_GetMimeTypes(*args, **kwargs)
-    def GetExtensions(*args, **kwargs): return _misc.FileType_GetExtensions(*args, **kwargs)
-    def GetIcon(*args, **kwargs): return _misc.FileType_GetIcon(*args, **kwargs)
-    def GetIconInfo(*args, **kwargs): return _misc.FileType_GetIconInfo(*args, **kwargs)
-    def GetDescription(*args, **kwargs): return _misc.FileType_GetDescription(*args, **kwargs)
-    def GetOpenCommand(*args, **kwargs): return _misc.FileType_GetOpenCommand(*args, **kwargs)
-    def GetPrintCommand(*args, **kwargs): return _misc.FileType_GetPrintCommand(*args, **kwargs)
-    def GetAllCommands(*args, **kwargs): return _misc.FileType_GetAllCommands(*args, **kwargs)
-    def SetCommand(*args, **kwargs): return _misc.FileType_SetCommand(*args, **kwargs)
-    def SetDefaultIcon(*args, **kwargs): return _misc.FileType_SetDefaultIcon(*args, **kwargs)
-    def Unassociate(*args, **kwargs): return _misc.FileType_Unassociate(*args, **kwargs)
-    ExpandCommand = staticmethod(_misc.FileType_ExpandCommand)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFileType instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetMimeType(*args, **kwargs):
+        """GetMimeType() -> PyObject"""
+        return _misc.FileType_GetMimeType(*args, **kwargs)
+
+    def GetMimeTypes(*args, **kwargs):
+        """GetMimeTypes() -> PyObject"""
+        return _misc.FileType_GetMimeTypes(*args, **kwargs)
+
+    def GetExtensions(*args, **kwargs):
+        """GetExtensions() -> PyObject"""
+        return _misc.FileType_GetExtensions(*args, **kwargs)
+
+    def GetIcon(*args, **kwargs):
+        """GetIcon() -> wxIcon"""
+        return _misc.FileType_GetIcon(*args, **kwargs)
+
+    def GetIconInfo(*args, **kwargs):
+        """GetIconInfo() -> PyObject"""
+        return _misc.FileType_GetIconInfo(*args, **kwargs)
+
+    def GetDescription(*args, **kwargs):
+        """GetDescription() -> PyObject"""
+        return _misc.FileType_GetDescription(*args, **kwargs)
+
+    def GetOpenCommand(*args, **kwargs):
+        """GetOpenCommand(wxString filename, wxString mimetype=wxPyEmptyString) -> PyObject"""
+        return _misc.FileType_GetOpenCommand(*args, **kwargs)
+
+    def GetPrintCommand(*args, **kwargs):
+        """GetPrintCommand(wxString filename, wxString mimetype=wxPyEmptyString) -> PyObject"""
+        return _misc.FileType_GetPrintCommand(*args, **kwargs)
+
+    def GetAllCommands(*args, **kwargs):
+        """GetAllCommands(wxString filename, wxString mimetype=wxPyEmptyString) -> PyObject"""
+        return _misc.FileType_GetAllCommands(*args, **kwargs)
+
+    def SetCommand(*args, **kwargs):
+        """SetCommand(wxString cmd, wxString verb, bool overwriteprompt=True) -> bool"""
+        return _misc.FileType_SetCommand(*args, **kwargs)
+
+    def SetDefaultIcon(*args, **kwargs):
+        """SetDefaultIcon(wxString cmd=wxPyEmptyString, int index=0) -> bool"""
+        return _misc.FileType_SetDefaultIcon(*args, **kwargs)
+
+    def Unassociate(*args, **kwargs):
+        """Unassociate() -> bool"""
+        return _misc.FileType_Unassociate(*args, **kwargs)
+
+    def ExpandCommand(*args, **kwargs):
+        """FileType.ExpandCommand(wxString command, wxString filename, wxString mimetype=wxPyEmptyString) -> wxString"""
+        return _misc.FileType_ExpandCommand(*args, **kwargs)
+
+    ExpandCommand = staticmethod(ExpandCommand)
 
 class FileTypePtr(FileType):
     def __init__(self, this):
@@ -1222,31 +2206,71 @@ class FileTypePtr(FileType):
         self.__class__ = FileType
 _misc.FileType_swigregister(FileTypePtr)
 
-FileType_ExpandCommand = _misc.FileType_ExpandCommand
+def FileType_ExpandCommand(*args, **kwargs):
+    """FileType_ExpandCommand(wxString command, wxString filename, wxString mimetype=wxPyEmptyString) -> wxString"""
+    return _misc.FileType_ExpandCommand(*args, **kwargs)
 
 class MimeTypesManager(object):
-    IsOfType = staticmethod(_misc.MimeTypesManager_IsOfType)
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMimeTypesManager instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def IsOfType(*args, **kwargs):
+        """MimeTypesManager.IsOfType(wxString mimeType, wxString wildcard) -> bool"""
+        return _misc.MimeTypesManager_IsOfType(*args, **kwargs)
+
+    IsOfType = staticmethod(IsOfType)
     def __init__(self, *args, **kwargs):
+        """__init__() -> MimeTypesManager"""
         newobj = _misc.new_MimeTypesManager(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def Initialize(*args, **kwargs): return _misc.MimeTypesManager_Initialize(*args, **kwargs)
-    def ClearData(*args, **kwargs): return _misc.MimeTypesManager_ClearData(*args, **kwargs)
-    def GetFileTypeFromExtension(*args, **kwargs): return _misc.MimeTypesManager_GetFileTypeFromExtension(*args, **kwargs)
-    def GetFileTypeFromMimeType(*args, **kwargs): return _misc.MimeTypesManager_GetFileTypeFromMimeType(*args, **kwargs)
-    def ReadMailcap(*args, **kwargs): return _misc.MimeTypesManager_ReadMailcap(*args, **kwargs)
-    def ReadMimeTypes(*args, **kwargs): return _misc.MimeTypesManager_ReadMimeTypes(*args, **kwargs)
-    def EnumAllFileTypes(*args, **kwargs): return _misc.MimeTypesManager_EnumAllFileTypes(*args, **kwargs)
-    def AddFallback(*args, **kwargs): return _misc.MimeTypesManager_AddFallback(*args, **kwargs)
-    def Associate(*args, **kwargs): return _misc.MimeTypesManager_Associate(*args, **kwargs)
-    def Unassociate(*args, **kwargs): return _misc.MimeTypesManager_Unassociate(*args, **kwargs)
+    def Initialize(*args, **kwargs):
+        """Initialize(int mailcapStyle=MAILCAP_ALL, wxString extraDir=wxPyEmptyString)"""
+        return _misc.MimeTypesManager_Initialize(*args, **kwargs)
+
+    def ClearData(*args, **kwargs):
+        """ClearData()"""
+        return _misc.MimeTypesManager_ClearData(*args, **kwargs)
+
+    def GetFileTypeFromExtension(*args, **kwargs):
+        """GetFileTypeFromExtension(wxString ext) -> FileType"""
+        return _misc.MimeTypesManager_GetFileTypeFromExtension(*args, **kwargs)
+
+    def GetFileTypeFromMimeType(*args, **kwargs):
+        """GetFileTypeFromMimeType(wxString mimeType) -> FileType"""
+        return _misc.MimeTypesManager_GetFileTypeFromMimeType(*args, **kwargs)
+
+    def ReadMailcap(*args, **kwargs):
+        """ReadMailcap(wxString filename, bool fallback=False) -> bool"""
+        return _misc.MimeTypesManager_ReadMailcap(*args, **kwargs)
+
+    def ReadMimeTypes(*args, **kwargs):
+        """ReadMimeTypes(wxString filename) -> bool"""
+        return _misc.MimeTypesManager_ReadMimeTypes(*args, **kwargs)
+
+    def EnumAllFileTypes(*args, **kwargs):
+        """EnumAllFileTypes() -> PyObject"""
+        return _misc.MimeTypesManager_EnumAllFileTypes(*args, **kwargs)
+
+    def AddFallback(*args, **kwargs):
+        """AddFallback(FileTypeInfo ft)"""
+        return _misc.MimeTypesManager_AddFallback(*args, **kwargs)
+
+    def Associate(*args, **kwargs):
+        """Associate(FileTypeInfo ftInfo) -> FileType"""
+        return _misc.MimeTypesManager_Associate(*args, **kwargs)
+
+    def Unassociate(*args, **kwargs):
+        """Unassociate(FileType ft) -> bool"""
+        return _misc.MimeTypesManager_Unassociate(*args, **kwargs)
+
     def __del__(self, destroy=_misc.delete_MimeTypesManager):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMimeTypesManager instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class MimeTypesManagerPtr(MimeTypesManager):
     def __init__(self, this):
@@ -1257,29 +2281,59 @@ _misc.MimeTypesManager_swigregister(MimeTypesManagerPtr)
 cvar = _misc.cvar
 TheMimeTypesManager = cvar.TheMimeTypesManager
 
-MimeTypesManager_IsOfType = _misc.MimeTypesManager_IsOfType
+def MimeTypesManager_IsOfType(*args, **kwargs):
+    """MimeTypesManager_IsOfType(wxString mimeType, wxString wildcard) -> bool"""
+    return _misc.MimeTypesManager_IsOfType(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class ArtProvider(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyArtProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> ArtProvider"""
         newobj = _misc.new_ArtProvider(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, ArtProvider)
+
     def __del__(self, destroy=_misc.delete_ArtProvider):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def _setCallbackInfo(*args, **kwargs): return _misc.ArtProvider__setCallbackInfo(*args, **kwargs)
-    PushProvider = staticmethod(_misc.ArtProvider_PushProvider)
-    PopProvider = staticmethod(_misc.ArtProvider_PopProvider)
-    RemoveProvider = staticmethod(_misc.ArtProvider_RemoveProvider)
-    GetBitmap = staticmethod(_misc.ArtProvider_GetBitmap)
-    GetIcon = staticmethod(_misc.ArtProvider_GetIcon)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyArtProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _misc.ArtProvider__setCallbackInfo(*args, **kwargs)
+
+    def PushProvider(*args, **kwargs):
+        """ArtProvider.PushProvider(ArtProvider provider)"""
+        return _misc.ArtProvider_PushProvider(*args, **kwargs)
+
+    PushProvider = staticmethod(PushProvider)
+    def PopProvider(*args, **kwargs):
+        """ArtProvider.PopProvider() -> bool"""
+        return _misc.ArtProvider_PopProvider(*args, **kwargs)
+
+    PopProvider = staticmethod(PopProvider)
+    def RemoveProvider(*args, **kwargs):
+        """ArtProvider.RemoveProvider(ArtProvider provider) -> bool"""
+        return _misc.ArtProvider_RemoveProvider(*args, **kwargs)
+
+    RemoveProvider = staticmethod(RemoveProvider)
+    def GetBitmap(*args, **kwargs):
+        """ArtProvider.GetBitmap(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxBitmap"""
+        return _misc.ArtProvider_GetBitmap(*args, **kwargs)
+
+    GetBitmap = staticmethod(GetBitmap)
+    def GetIcon(*args, **kwargs):
+        """ArtProvider.GetIcon(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxIcon"""
+        return _misc.ArtProvider_GetIcon(*args, **kwargs)
+
+    GetIcon = staticmethod(GetIcon)
 
 class ArtProviderPtr(ArtProvider):
     def __init__(self, this):
@@ -1326,15 +2380,25 @@ ART_WARNING = cvar.ART_WARNING
 ART_INFORMATION = cvar.ART_INFORMATION
 ART_MISSING_IMAGE = cvar.ART_MISSING_IMAGE
 
-ArtProvider_PushProvider = _misc.ArtProvider_PushProvider
+def ArtProvider_PushProvider(*args, **kwargs):
+    """ArtProvider_PushProvider(ArtProvider provider)"""
+    return _misc.ArtProvider_PushProvider(*args, **kwargs)
 
-ArtProvider_PopProvider = _misc.ArtProvider_PopProvider
+def ArtProvider_PopProvider(*args, **kwargs):
+    """ArtProvider_PopProvider() -> bool"""
+    return _misc.ArtProvider_PopProvider(*args, **kwargs)
 
-ArtProvider_RemoveProvider = _misc.ArtProvider_RemoveProvider
+def ArtProvider_RemoveProvider(*args, **kwargs):
+    """ArtProvider_RemoveProvider(ArtProvider provider) -> bool"""
+    return _misc.ArtProvider_RemoveProvider(*args, **kwargs)
 
-ArtProvider_GetBitmap = _misc.ArtProvider_GetBitmap
+def ArtProvider_GetBitmap(*args, **kwargs):
+    """ArtProvider_GetBitmap(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxBitmap"""
+    return _misc.ArtProvider_GetBitmap(*args, **kwargs)
 
-ArtProvider_GetIcon = _misc.ArtProvider_GetIcon
+def ArtProvider_GetIcon(*args, **kwargs):
+    """ArtProvider_GetIcon(wxString id, wxString client=ART_OTHER, Size size=DefaultSize) -> wxIcon"""
+    return _misc.ArtProvider_GetIcon(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
@@ -1343,59 +2407,189 @@ CONFIG_USE_GLOBAL_FILE = _misc.CONFIG_USE_GLOBAL_FILE
 CONFIG_USE_RELATIVE_PATH = _misc.CONFIG_USE_RELATIVE_PATH
 CONFIG_USE_NO_ESCAPE_CHARACTERS = _misc.CONFIG_USE_NO_ESCAPE_CHARACTERS
 class ConfigBase(object):
+    """"""
+    def __init__(self): raise RuntimeError, "No constructor defined"
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxConfigBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __del__(self, destroy=_misc.delete_ConfigBase):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
+
     Type_Unknown = _misc.ConfigBase_Type_Unknown
     Type_String = _misc.ConfigBase_Type_String
     Type_Boolean = _misc.ConfigBase_Type_Boolean
     Type_Integer = _misc.ConfigBase_Type_Integer
     Type_Float = _misc.ConfigBase_Type_Float
-    Set = staticmethod(_misc.ConfigBase_Set)
-    Get = staticmethod(_misc.ConfigBase_Get)
-    Create = staticmethod(_misc.ConfigBase_Create)
-    DontCreateOnDemand = staticmethod(_misc.ConfigBase_DontCreateOnDemand)
-    def SetPath(*args, **kwargs): return _misc.ConfigBase_SetPath(*args, **kwargs)
-    def GetPath(*args, **kwargs): return _misc.ConfigBase_GetPath(*args, **kwargs)
-    def GetFirstGroup(*args, **kwargs): return _misc.ConfigBase_GetFirstGroup(*args, **kwargs)
-    def GetNextGroup(*args, **kwargs): return _misc.ConfigBase_GetNextGroup(*args, **kwargs)
-    def GetFirstEntry(*args, **kwargs): return _misc.ConfigBase_GetFirstEntry(*args, **kwargs)
-    def GetNextEntry(*args, **kwargs): return _misc.ConfigBase_GetNextEntry(*args, **kwargs)
-    def GetNumberOfEntries(*args, **kwargs): return _misc.ConfigBase_GetNumberOfEntries(*args, **kwargs)
-    def GetNumberOfGroups(*args, **kwargs): return _misc.ConfigBase_GetNumberOfGroups(*args, **kwargs)
-    def HasGroup(*args, **kwargs): return _misc.ConfigBase_HasGroup(*args, **kwargs)
-    def HasEntry(*args, **kwargs): return _misc.ConfigBase_HasEntry(*args, **kwargs)
-    def Exists(*args, **kwargs): return _misc.ConfigBase_Exists(*args, **kwargs)
-    def GetEntryType(*args, **kwargs): return _misc.ConfigBase_GetEntryType(*args, **kwargs)
-    def Read(*args, **kwargs): return _misc.ConfigBase_Read(*args, **kwargs)
-    def ReadInt(*args, **kwargs): return _misc.ConfigBase_ReadInt(*args, **kwargs)
-    def ReadFloat(*args, **kwargs): return _misc.ConfigBase_ReadFloat(*args, **kwargs)
-    def ReadBool(*args, **kwargs): return _misc.ConfigBase_ReadBool(*args, **kwargs)
-    def Write(*args, **kwargs): return _misc.ConfigBase_Write(*args, **kwargs)
-    def WriteInt(*args, **kwargs): return _misc.ConfigBase_WriteInt(*args, **kwargs)
-    def WriteFloat(*args, **kwargs): return _misc.ConfigBase_WriteFloat(*args, **kwargs)
-    def WriteBool(*args, **kwargs): return _misc.ConfigBase_WriteBool(*args, **kwargs)
-    def Flush(*args, **kwargs): return _misc.ConfigBase_Flush(*args, **kwargs)
-    def RenameEntry(*args, **kwargs): return _misc.ConfigBase_RenameEntry(*args, **kwargs)
-    def RenameGroup(*args, **kwargs): return _misc.ConfigBase_RenameGroup(*args, **kwargs)
-    def DeleteEntry(*args, **kwargs): return _misc.ConfigBase_DeleteEntry(*args, **kwargs)
-    def DeleteGroup(*args, **kwargs): return _misc.ConfigBase_DeleteGroup(*args, **kwargs)
-    def DeleteAll(*args, **kwargs): return _misc.ConfigBase_DeleteAll(*args, **kwargs)
-    def IsExpandingEnvVars(*args, **kwargs): return _misc.ConfigBase_IsExpandingEnvVars(*args, **kwargs)
-    def SetExpandEnvVars(*args, **kwargs): return _misc.ConfigBase_SetExpandEnvVars(*args, **kwargs)
-    def SetRecordDefaults(*args, **kwargs): return _misc.ConfigBase_SetRecordDefaults(*args, **kwargs)
-    def IsRecordingDefaults(*args, **kwargs): return _misc.ConfigBase_IsRecordingDefaults(*args, **kwargs)
-    def ExpandEnvVars(*args, **kwargs): return _misc.ConfigBase_ExpandEnvVars(*args, **kwargs)
-    def GetAppName(*args, **kwargs): return _misc.ConfigBase_GetAppName(*args, **kwargs)
-    def GetVendorName(*args, **kwargs): return _misc.ConfigBase_GetVendorName(*args, **kwargs)
-    def SetAppName(*args, **kwargs): return _misc.ConfigBase_SetAppName(*args, **kwargs)
-    def SetVendorName(*args, **kwargs): return _misc.ConfigBase_SetVendorName(*args, **kwargs)
-    def SetStyle(*args, **kwargs): return _misc.ConfigBase_SetStyle(*args, **kwargs)
-    def GetStyle(*args, **kwargs): return _misc.ConfigBase_GetStyle(*args, **kwargs)
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxConfigBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Set(*args, **kwargs):
+        """ConfigBase.Set(ConfigBase pConfig) -> ConfigBase"""
+        return _misc.ConfigBase_Set(*args, **kwargs)
+
+    Set = staticmethod(Set)
+    def Get(*args, **kwargs):
+        """ConfigBase.Get(bool createOnDemand=True) -> ConfigBase"""
+        return _misc.ConfigBase_Get(*args, **kwargs)
+
+    Get = staticmethod(Get)
+    def Create(*args, **kwargs):
+        """ConfigBase.Create() -> ConfigBase"""
+        return _misc.ConfigBase_Create(*args, **kwargs)
+
+    Create = staticmethod(Create)
+    def DontCreateOnDemand(*args, **kwargs):
+        """ConfigBase.DontCreateOnDemand()"""
+        return _misc.ConfigBase_DontCreateOnDemand(*args, **kwargs)
+
+    DontCreateOnDemand = staticmethod(DontCreateOnDemand)
+    def SetPath(*args, **kwargs):
+        """SetPath(wxString strPath)"""
+        return _misc.ConfigBase_SetPath(*args, **kwargs)
+
+    def GetPath(*args, **kwargs):
+        """GetPath() -> wxString"""
+        return _misc.ConfigBase_GetPath(*args, **kwargs)
+
+    def GetFirstGroup(*args, **kwargs):
+        """GetFirstGroup() -> PyObject"""
+        return _misc.ConfigBase_GetFirstGroup(*args, **kwargs)
+
+    def GetNextGroup(*args, **kwargs):
+        """GetNextGroup(long index) -> PyObject"""
+        return _misc.ConfigBase_GetNextGroup(*args, **kwargs)
+
+    def GetFirstEntry(*args, **kwargs):
+        """GetFirstEntry() -> PyObject"""
+        return _misc.ConfigBase_GetFirstEntry(*args, **kwargs)
+
+    def GetNextEntry(*args, **kwargs):
+        """GetNextEntry(long index) -> PyObject"""
+        return _misc.ConfigBase_GetNextEntry(*args, **kwargs)
+
+    def GetNumberOfEntries(*args, **kwargs):
+        """GetNumberOfEntries(bool bRecursive=False) -> size_t"""
+        return _misc.ConfigBase_GetNumberOfEntries(*args, **kwargs)
+
+    def GetNumberOfGroups(*args, **kwargs):
+        """GetNumberOfGroups(bool bRecursive=False) -> size_t"""
+        return _misc.ConfigBase_GetNumberOfGroups(*args, **kwargs)
+
+    def HasGroup(*args, **kwargs):
+        """HasGroup(wxString strName) -> bool"""
+        return _misc.ConfigBase_HasGroup(*args, **kwargs)
+
+    def HasEntry(*args, **kwargs):
+        """HasEntry(wxString strName) -> bool"""
+        return _misc.ConfigBase_HasEntry(*args, **kwargs)
+
+    def Exists(*args, **kwargs):
+        """Exists(wxString strName) -> bool"""
+        return _misc.ConfigBase_Exists(*args, **kwargs)
+
+    def GetEntryType(*args, **kwargs):
+        """GetEntryType(wxString name) -> wxConfigBase::EntryType"""
+        return _misc.ConfigBase_GetEntryType(*args, **kwargs)
+
+    def Read(*args, **kwargs):
+        """Read(wxString key, wxString defaultVal=wxPyEmptyString) -> wxString"""
+        return _misc.ConfigBase_Read(*args, **kwargs)
+
+    def ReadInt(*args, **kwargs):
+        """ReadInt(wxString key, long defaultVal=0) -> long"""
+        return _misc.ConfigBase_ReadInt(*args, **kwargs)
+
+    def ReadFloat(*args, **kwargs):
+        """ReadFloat(wxString key, double defaultVal=0.0) -> double"""
+        return _misc.ConfigBase_ReadFloat(*args, **kwargs)
+
+    def ReadBool(*args, **kwargs):
+        """ReadBool(wxString key, bool defaultVal=False) -> bool"""
+        return _misc.ConfigBase_ReadBool(*args, **kwargs)
+
+    def Write(*args, **kwargs):
+        """Write(wxString key, wxString value) -> bool"""
+        return _misc.ConfigBase_Write(*args, **kwargs)
+
+    def WriteInt(*args, **kwargs):
+        """WriteInt(wxString key, long value) -> bool"""
+        return _misc.ConfigBase_WriteInt(*args, **kwargs)
+
+    def WriteFloat(*args, **kwargs):
+        """WriteFloat(wxString key, double value) -> bool"""
+        return _misc.ConfigBase_WriteFloat(*args, **kwargs)
+
+    def WriteBool(*args, **kwargs):
+        """WriteBool(wxString key, bool value) -> bool"""
+        return _misc.ConfigBase_WriteBool(*args, **kwargs)
+
+    def Flush(*args, **kwargs):
+        """Flush(bool bCurrentOnly=False) -> bool"""
+        return _misc.ConfigBase_Flush(*args, **kwargs)
+
+    def RenameEntry(*args, **kwargs):
+        """RenameEntry(wxString oldName, wxString newName) -> bool"""
+        return _misc.ConfigBase_RenameEntry(*args, **kwargs)
+
+    def RenameGroup(*args, **kwargs):
+        """RenameGroup(wxString oldName, wxString newName) -> bool"""
+        return _misc.ConfigBase_RenameGroup(*args, **kwargs)
+
+    def DeleteEntry(*args, **kwargs):
+        """DeleteEntry(wxString key, bool bDeleteGroupIfEmpty=True) -> bool"""
+        return _misc.ConfigBase_DeleteEntry(*args, **kwargs)
+
+    def DeleteGroup(*args, **kwargs):
+        """DeleteGroup(wxString key) -> bool"""
+        return _misc.ConfigBase_DeleteGroup(*args, **kwargs)
+
+    def DeleteAll(*args, **kwargs):
+        """DeleteAll() -> bool"""
+        return _misc.ConfigBase_DeleteAll(*args, **kwargs)
+
+    def IsExpandingEnvVars(*args, **kwargs):
+        """IsExpandingEnvVars() -> bool"""
+        return _misc.ConfigBase_IsExpandingEnvVars(*args, **kwargs)
+
+    def SetExpandEnvVars(*args, **kwargs):
+        """SetExpandEnvVars(bool bDoIt=True)"""
+        return _misc.ConfigBase_SetExpandEnvVars(*args, **kwargs)
+
+    def SetRecordDefaults(*args, **kwargs):
+        """SetRecordDefaults(bool bDoIt=True)"""
+        return _misc.ConfigBase_SetRecordDefaults(*args, **kwargs)
+
+    def IsRecordingDefaults(*args, **kwargs):
+        """IsRecordingDefaults() -> bool"""
+        return _misc.ConfigBase_IsRecordingDefaults(*args, **kwargs)
+
+    def ExpandEnvVars(*args, **kwargs):
+        """ExpandEnvVars(wxString str) -> wxString"""
+        return _misc.ConfigBase_ExpandEnvVars(*args, **kwargs)
+
+    def GetAppName(*args, **kwargs):
+        """GetAppName() -> wxString"""
+        return _misc.ConfigBase_GetAppName(*args, **kwargs)
+
+    def GetVendorName(*args, **kwargs):
+        """GetVendorName() -> wxString"""
+        return _misc.ConfigBase_GetVendorName(*args, **kwargs)
+
+    def SetAppName(*args, **kwargs):
+        """SetAppName(wxString appName)"""
+        return _misc.ConfigBase_SetAppName(*args, **kwargs)
+
+    def SetVendorName(*args, **kwargs):
+        """SetVendorName(wxString vendorName)"""
+        return _misc.ConfigBase_SetVendorName(*args, **kwargs)
+
+    def SetStyle(*args, **kwargs):
+        """SetStyle(long style)"""
+        return _misc.ConfigBase_SetStyle(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle() -> long"""
+        return _misc.ConfigBase_GetStyle(*args, **kwargs)
+
 
 class ConfigBasePtr(ConfigBase):
     def __init__(self, this):
@@ -1404,27 +2598,42 @@ class ConfigBasePtr(ConfigBase):
         self.__class__ = ConfigBase
 _misc.ConfigBase_swigregister(ConfigBasePtr)
 
-ConfigBase_Set = _misc.ConfigBase_Set
+def ConfigBase_Set(*args, **kwargs):
+    """ConfigBase_Set(ConfigBase pConfig) -> ConfigBase"""
+    return _misc.ConfigBase_Set(*args, **kwargs)
 
-ConfigBase_Get = _misc.ConfigBase_Get
+def ConfigBase_Get(*args, **kwargs):
+    """ConfigBase_Get(bool createOnDemand=True) -> ConfigBase"""
+    return _misc.ConfigBase_Get(*args, **kwargs)
 
-ConfigBase_Create = _misc.ConfigBase_Create
+def ConfigBase_Create(*args, **kwargs):
+    """ConfigBase_Create() -> ConfigBase"""
+    return _misc.ConfigBase_Create(*args, **kwargs)
 
-ConfigBase_DontCreateOnDemand = _misc.ConfigBase_DontCreateOnDemand
+def ConfigBase_DontCreateOnDemand(*args, **kwargs):
+    """ConfigBase_DontCreateOnDemand()"""
+    return _misc.ConfigBase_DontCreateOnDemand(*args, **kwargs)
 
 class ConfigPathChanger(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxConfigPathChanger instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(ConfigBase pContainer, wxString strEntry) -> ConfigPathChanger"""
         newobj = _misc.new_ConfigPathChanger(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_ConfigPathChanger):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Name(*args, **kwargs): return _misc.ConfigPathChanger_Name(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxConfigPathChanger instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Name(*args, **kwargs):
+        """Name() -> wxString"""
+        return _misc.ConfigPathChanger_Name(*args, **kwargs)
+
 
 class ConfigPathChangerPtr(ConfigPathChanger):
     def __init__(self, this):
@@ -1434,17 +2643,24 @@ class ConfigPathChangerPtr(ConfigPathChanger):
 _misc.ConfigPathChanger_swigregister(ConfigPathChangerPtr)
 
 class Config(ConfigBase):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxConfig instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString appName=wxPyEmptyString, wxString vendorName=wxPyEmptyString, 
+    wxString localFilename=wxPyEmptyString, 
+    wxString globalFilename=wxPyEmptyString, 
+    long style=0) -> Config"""
         newobj = _misc.new_Config(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_Config):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxConfig instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class ConfigPtr(Config):
     def __init__(self, this):
@@ -1454,17 +2670,24 @@ class ConfigPtr(Config):
 _misc.Config_swigregister(ConfigPtr)
 
 class FileConfig(ConfigBase):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFileConfig instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString appName=wxPyEmptyString, wxString vendorName=wxPyEmptyString, 
+    wxString localFilename=wxPyEmptyString, 
+    wxString globalFilename=wxPyEmptyString, 
+    long style=0) -> FileConfig"""
         newobj = _misc.new_FileConfig(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_FileConfig):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFileConfig instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class FileConfigPtr(FileConfig):
     def __init__(self, this):
@@ -1474,10 +2697,15 @@ class FileConfigPtr(FileConfig):
 _misc.FileConfig_swigregister(FileConfigPtr)
 
 
-ExpandEnvVars = _misc.ExpandEnvVars
+def ExpandEnvVars(*args, **kwargs):
+    """ExpandEnvVars(wxString sz) -> wxString"""
+    return _misc.ExpandEnvVars(*args, **kwargs)
 #---------------------------------------------------------------------------
 
 class DateTime(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDateTime instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     Local = _misc.DateTime_Local
     GMT_12 = _misc.DateTime_GMT_12
     GMT_11 = _misc.DateTime_GMT_11
@@ -1633,119 +2861,466 @@ class DateTime(object):
     Default_First = _misc.DateTime_Default_First
     Monday_First = _misc.DateTime_Monday_First
     Sunday_First = _misc.DateTime_Sunday_First
-    SetCountry = staticmethod(_misc.DateTime_SetCountry)
-    GetCountry = staticmethod(_misc.DateTime_GetCountry)
-    IsWestEuropeanCountry = staticmethod(_misc.DateTime_IsWestEuropeanCountry)
-    GetCurrentYear = staticmethod(_misc.DateTime_GetCurrentYear)
-    ConvertYearToBC = staticmethod(_misc.DateTime_ConvertYearToBC)
-    GetCurrentMonth = staticmethod(_misc.DateTime_GetCurrentMonth)
-    IsLeapYear = staticmethod(_misc.DateTime_IsLeapYear)
-    GetCentury = staticmethod(_misc.DateTime_GetCentury)
-    GetNumberOfDaysinYear = staticmethod(_misc.DateTime_GetNumberOfDaysinYear)
-    GetNumberOfDaysInMonth = staticmethod(_misc.DateTime_GetNumberOfDaysInMonth)
-    GetMonthName = staticmethod(_misc.DateTime_GetMonthName)
-    GetWeekDayName = staticmethod(_misc.DateTime_GetWeekDayName)
-    GetAmPmStrings = staticmethod(_misc.DateTime_GetAmPmStrings)
-    IsDSTApplicable = staticmethod(_misc.DateTime_IsDSTApplicable)
-    GetBeginDST = staticmethod(_misc.DateTime_GetBeginDST)
-    GetEndDST = staticmethod(_misc.DateTime_GetEndDST)
-    Now = staticmethod(_misc.DateTime_Now)
-    UNow = staticmethod(_misc.DateTime_UNow)
-    Today = staticmethod(_misc.DateTime_Today)
+    def SetCountry(*args, **kwargs):
+        """DateTime.SetCountry(wxDateTime::Country country)"""
+        return _misc.DateTime_SetCountry(*args, **kwargs)
+
+    SetCountry = staticmethod(SetCountry)
+    def GetCountry(*args, **kwargs):
+        """DateTime.GetCountry() -> wxDateTime::Country"""
+        return _misc.DateTime_GetCountry(*args, **kwargs)
+
+    GetCountry = staticmethod(GetCountry)
+    def IsWestEuropeanCountry(*args, **kwargs):
+        """DateTime.IsWestEuropeanCountry(wxDateTime::Country country=Country_Default) -> bool"""
+        return _misc.DateTime_IsWestEuropeanCountry(*args, **kwargs)
+
+    IsWestEuropeanCountry = staticmethod(IsWestEuropeanCountry)
+    def GetCurrentYear(*args, **kwargs):
+        """DateTime.GetCurrentYear(wxDateTime::Calendar cal=Gregorian) -> int"""
+        return _misc.DateTime_GetCurrentYear(*args, **kwargs)
+
+    GetCurrentYear = staticmethod(GetCurrentYear)
+    def ConvertYearToBC(*args, **kwargs):
+        """DateTime.ConvertYearToBC(int year) -> int"""
+        return _misc.DateTime_ConvertYearToBC(*args, **kwargs)
+
+    ConvertYearToBC = staticmethod(ConvertYearToBC)
+    def GetCurrentMonth(*args, **kwargs):
+        """DateTime.GetCurrentMonth(wxDateTime::Calendar cal=Gregorian) -> wxDateTime::Month"""
+        return _misc.DateTime_GetCurrentMonth(*args, **kwargs)
+
+    GetCurrentMonth = staticmethod(GetCurrentMonth)
+    def IsLeapYear(*args, **kwargs):
+        """DateTime.IsLeapYear(int year=Inv_Year, wxDateTime::Calendar cal=Gregorian) -> bool"""
+        return _misc.DateTime_IsLeapYear(*args, **kwargs)
+
+    IsLeapYear = staticmethod(IsLeapYear)
+    def GetCentury(*args, **kwargs):
+        """DateTime.GetCentury(int year=Inv_Year) -> int"""
+        return _misc.DateTime_GetCentury(*args, **kwargs)
+
+    GetCentury = staticmethod(GetCentury)
+    def GetNumberOfDaysinYear(*args, **kwargs):
+        """DateTime.GetNumberOfDaysinYear(int year, wxDateTime::Calendar cal=Gregorian) -> wxDateTime_t"""
+        return _misc.DateTime_GetNumberOfDaysinYear(*args, **kwargs)
+
+    GetNumberOfDaysinYear = staticmethod(GetNumberOfDaysinYear)
+    def GetNumberOfDaysInMonth(*args, **kwargs):
+        """DateTime.GetNumberOfDaysInMonth(wxDateTime::Month month, int year=Inv_Year, wxDateTime::Calendar cal=Gregorian) -> wxDateTime_t"""
+        return _misc.DateTime_GetNumberOfDaysInMonth(*args, **kwargs)
+
+    GetNumberOfDaysInMonth = staticmethod(GetNumberOfDaysInMonth)
+    def GetMonthName(*args, **kwargs):
+        """DateTime.GetMonthName(wxDateTime::Month month, wxDateTime::NameFlags flags=Name_Full) -> wxString"""
+        return _misc.DateTime_GetMonthName(*args, **kwargs)
+
+    GetMonthName = staticmethod(GetMonthName)
+    def GetWeekDayName(*args, **kwargs):
+        """DateTime.GetWeekDayName(wxDateTime::WeekDay weekday, wxDateTime::NameFlags flags=Name_Full) -> wxString"""
+        return _misc.DateTime_GetWeekDayName(*args, **kwargs)
+
+    GetWeekDayName = staticmethod(GetWeekDayName)
+    def GetAmPmStrings(*args, **kwargs):
+        """DateTime.GetAmPmStrings(wxString OUTPUT, wxString OUTPUT)"""
+        return _misc.DateTime_GetAmPmStrings(*args, **kwargs)
+
+    GetAmPmStrings = staticmethod(GetAmPmStrings)
+    def IsDSTApplicable(*args, **kwargs):
+        """DateTime.IsDSTApplicable(int year=Inv_Year, wxDateTime::Country country=Country_Default) -> bool"""
+        return _misc.DateTime_IsDSTApplicable(*args, **kwargs)
+
+    IsDSTApplicable = staticmethod(IsDSTApplicable)
+    def GetBeginDST(*args, **kwargs):
+        """DateTime.GetBeginDST(int year=Inv_Year, wxDateTime::Country country=Country_Default) -> DateTime"""
+        return _misc.DateTime_GetBeginDST(*args, **kwargs)
+
+    GetBeginDST = staticmethod(GetBeginDST)
+    def GetEndDST(*args, **kwargs):
+        """DateTime.GetEndDST(int year=Inv_Year, wxDateTime::Country country=Country_Default) -> DateTime"""
+        return _misc.DateTime_GetEndDST(*args, **kwargs)
+
+    GetEndDST = staticmethod(GetEndDST)
+    def Now(*args, **kwargs):
+        """DateTime.Now() -> DateTime"""
+        return _misc.DateTime_Now(*args, **kwargs)
+
+    Now = staticmethod(Now)
+    def UNow(*args, **kwargs):
+        """DateTime.UNow() -> DateTime"""
+        return _misc.DateTime_UNow(*args, **kwargs)
+
+    UNow = staticmethod(UNow)
+    def Today(*args, **kwargs):
+        """DateTime.Today() -> DateTime"""
+        return _misc.DateTime_Today(*args, **kwargs)
+
+    Today = staticmethod(Today)
     def __init__(self, *args, **kwargs):
+        """__init__() -> DateTime"""
         newobj = _misc.new_DateTime(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_DateTime):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetToCurrent(*args, **kwargs): return _misc.DateTime_SetToCurrent(*args, **kwargs)
-    def SetTimeT(*args, **kwargs): return _misc.DateTime_SetTimeT(*args, **kwargs)
-    def SetJDN(*args, **kwargs): return _misc.DateTime_SetJDN(*args, **kwargs)
-    def SetHMS(*args, **kwargs): return _misc.DateTime_SetHMS(*args, **kwargs)
-    def Set(*args, **kwargs): return _misc.DateTime_Set(*args, **kwargs)
-    def ResetTime(*args, **kwargs): return _misc.DateTime_ResetTime(*args, **kwargs)
-    def SetYear(*args, **kwargs): return _misc.DateTime_SetYear(*args, **kwargs)
-    def SetMonth(*args, **kwargs): return _misc.DateTime_SetMonth(*args, **kwargs)
-    def SetDay(*args, **kwargs): return _misc.DateTime_SetDay(*args, **kwargs)
-    def SetHour(*args, **kwargs): return _misc.DateTime_SetHour(*args, **kwargs)
-    def SetMinute(*args, **kwargs): return _misc.DateTime_SetMinute(*args, **kwargs)
-    def SetSecond(*args, **kwargs): return _misc.DateTime_SetSecond(*args, **kwargs)
-    def SetMillisecond(*args, **kwargs): return _misc.DateTime_SetMillisecond(*args, **kwargs)
-    def SetToWeekDayInSameWeek(*args, **kwargs): return _misc.DateTime_SetToWeekDayInSameWeek(*args, **kwargs)
-    def GetWeekDayInSameWeek(*args, **kwargs): return _misc.DateTime_GetWeekDayInSameWeek(*args, **kwargs)
-    def SetToNextWeekDay(*args, **kwargs): return _misc.DateTime_SetToNextWeekDay(*args, **kwargs)
-    def GetNextWeekDay(*args, **kwargs): return _misc.DateTime_GetNextWeekDay(*args, **kwargs)
-    def SetToPrevWeekDay(*args, **kwargs): return _misc.DateTime_SetToPrevWeekDay(*args, **kwargs)
-    def GetPrevWeekDay(*args, **kwargs): return _misc.DateTime_GetPrevWeekDay(*args, **kwargs)
-    def SetToWeekDay(*args, **kwargs): return _misc.DateTime_SetToWeekDay(*args, **kwargs)
-    def SetToLastWeekDay(*args, **kwargs): return _misc.DateTime_SetToLastWeekDay(*args, **kwargs)
-    def GetLastWeekDay(*args, **kwargs): return _misc.DateTime_GetLastWeekDay(*args, **kwargs)
-    def SetToTheWeek(*args, **kwargs): return _misc.DateTime_SetToTheWeek(*args, **kwargs)
-    def GetWeek(*args, **kwargs): return _misc.DateTime_GetWeek(*args, **kwargs)
-    def SetToLastMonthDay(*args, **kwargs): return _misc.DateTime_SetToLastMonthDay(*args, **kwargs)
-    def GetLastMonthDay(*args, **kwargs): return _misc.DateTime_GetLastMonthDay(*args, **kwargs)
-    def SetToYearDay(*args, **kwargs): return _misc.DateTime_SetToYearDay(*args, **kwargs)
-    def GetYearDay(*args, **kwargs): return _misc.DateTime_GetYearDay(*args, **kwargs)
-    def GetJulianDayNumber(*args, **kwargs): return _misc.DateTime_GetJulianDayNumber(*args, **kwargs)
-    def GetJDN(*args, **kwargs): return _misc.DateTime_GetJDN(*args, **kwargs)
-    def GetModifiedJulianDayNumber(*args, **kwargs): return _misc.DateTime_GetModifiedJulianDayNumber(*args, **kwargs)
-    def GetMJD(*args, **kwargs): return _misc.DateTime_GetMJD(*args, **kwargs)
-    def GetRataDie(*args, **kwargs): return _misc.DateTime_GetRataDie(*args, **kwargs)
-    def ToTimezone(*args, **kwargs): return _misc.DateTime_ToTimezone(*args, **kwargs)
-    def MakeTimezone(*args, **kwargs): return _misc.DateTime_MakeTimezone(*args, **kwargs)
-    def ToGMT(*args, **kwargs): return _misc.DateTime_ToGMT(*args, **kwargs)
-    def MakeGMT(*args, **kwargs): return _misc.DateTime_MakeGMT(*args, **kwargs)
-    def IsDST(*args, **kwargs): return _misc.DateTime_IsDST(*args, **kwargs)
-    def IsValid(*args, **kwargs): return _misc.DateTime_IsValid(*args, **kwargs)
-    def GetTicks(*args, **kwargs): return _misc.DateTime_GetTicks(*args, **kwargs)
-    def GetYear(*args, **kwargs): return _misc.DateTime_GetYear(*args, **kwargs)
-    def GetMonth(*args, **kwargs): return _misc.DateTime_GetMonth(*args, **kwargs)
-    def GetDay(*args, **kwargs): return _misc.DateTime_GetDay(*args, **kwargs)
-    def GetWeekDay(*args, **kwargs): return _misc.DateTime_GetWeekDay(*args, **kwargs)
-    def GetHour(*args, **kwargs): return _misc.DateTime_GetHour(*args, **kwargs)
-    def GetMinute(*args, **kwargs): return _misc.DateTime_GetMinute(*args, **kwargs)
-    def GetSecond(*args, **kwargs): return _misc.DateTime_GetSecond(*args, **kwargs)
-    def GetMillisecond(*args, **kwargs): return _misc.DateTime_GetMillisecond(*args, **kwargs)
-    def GetDayOfYear(*args, **kwargs): return _misc.DateTime_GetDayOfYear(*args, **kwargs)
-    def GetWeekOfYear(*args, **kwargs): return _misc.DateTime_GetWeekOfYear(*args, **kwargs)
-    def GetWeekOfMonth(*args, **kwargs): return _misc.DateTime_GetWeekOfMonth(*args, **kwargs)
-    def IsWorkDay(*args, **kwargs): return _misc.DateTime_IsWorkDay(*args, **kwargs)
-    def IsEqualTo(*args, **kwargs): return _misc.DateTime_IsEqualTo(*args, **kwargs)
-    def IsEarlierThan(*args, **kwargs): return _misc.DateTime_IsEarlierThan(*args, **kwargs)
-    def IsLaterThan(*args, **kwargs): return _misc.DateTime_IsLaterThan(*args, **kwargs)
-    def IsStrictlyBetween(*args, **kwargs): return _misc.DateTime_IsStrictlyBetween(*args, **kwargs)
-    def IsBetween(*args, **kwargs): return _misc.DateTime_IsBetween(*args, **kwargs)
-    def IsSameDate(*args, **kwargs): return _misc.DateTime_IsSameDate(*args, **kwargs)
-    def IsSameTime(*args, **kwargs): return _misc.DateTime_IsSameTime(*args, **kwargs)
-    def IsEqualUpTo(*args, **kwargs): return _misc.DateTime_IsEqualUpTo(*args, **kwargs)
-    def AddTS(*args, **kwargs): return _misc.DateTime_AddTS(*args, **kwargs)
-    def AddDS(*args, **kwargs): return _misc.DateTime_AddDS(*args, **kwargs)
-    def SubtractTS(*args, **kwargs): return _misc.DateTime_SubtractTS(*args, **kwargs)
-    def SubtractDS(*args, **kwargs): return _misc.DateTime_SubtractDS(*args, **kwargs)
-    def Subtract(*args, **kwargs): return _misc.DateTime_Subtract(*args, **kwargs)
-    def __iadd__(*args): return _misc.DateTime___iadd__(*args)
-    def __isub__(*args): return _misc.DateTime___isub__(*args)
-    def __add__(*args): return _misc.DateTime___add__(*args)
-    def __sub__(*args): return _misc.DateTime___sub__(*args)
-    def __lt__(*args): return _misc.DateTime___lt__(*args)
-    def __le__(*args): return _misc.DateTime___le__(*args)
-    def __gt__(*args): return _misc.DateTime___gt__(*args)
-    def __ge__(*args): return _misc.DateTime___ge__(*args)
-    def __eq__(*args): return _misc.DateTime___eq__(*args)
-    def __ne__(*args): return _misc.DateTime___ne__(*args)
-    def ParseRfc822Date(*args, **kwargs): return _misc.DateTime_ParseRfc822Date(*args, **kwargs)
-    def ParseFormat(*args, **kwargs): return _misc.DateTime_ParseFormat(*args, **kwargs)
-    def ParseDateTime(*args, **kwargs): return _misc.DateTime_ParseDateTime(*args, **kwargs)
-    def ParseDate(*args, **kwargs): return _misc.DateTime_ParseDate(*args, **kwargs)
-    def ParseTime(*args, **kwargs): return _misc.DateTime_ParseTime(*args, **kwargs)
-    def Format(*args, **kwargs): return _misc.DateTime_Format(*args, **kwargs)
-    def FormatDate(*args, **kwargs): return _misc.DateTime_FormatDate(*args, **kwargs)
-    def FormatTime(*args, **kwargs): return _misc.DateTime_FormatTime(*args, **kwargs)
-    def FormatISODate(*args, **kwargs): return _misc.DateTime_FormatISODate(*args, **kwargs)
-    def FormatISOTime(*args, **kwargs): return _misc.DateTime_FormatISOTime(*args, **kwargs)
+
+    def SetToCurrent(*args, **kwargs):
+        """SetToCurrent() -> DateTime"""
+        return _misc.DateTime_SetToCurrent(*args, **kwargs)
+
+    def SetTimeT(*args, **kwargs):
+        """SetTimeT(time_t timet) -> DateTime"""
+        return _misc.DateTime_SetTimeT(*args, **kwargs)
+
+    def SetJDN(*args, **kwargs):
+        """SetJDN(double jdn) -> DateTime"""
+        return _misc.DateTime_SetJDN(*args, **kwargs)
+
+    def SetHMS(*args, **kwargs):
+        """SetHMS(wxDateTime_t hour, wxDateTime_t minute=0, wxDateTime_t second=0, 
+    wxDateTime_t millisec=0) -> DateTime"""
+        return _misc.DateTime_SetHMS(*args, **kwargs)
+
+    def Set(*args, **kwargs):
+        """Set(wxDateTime_t day, wxDateTime::Month month=Inv_Month, 
+    int year=Inv_Year, wxDateTime_t hour=0, wxDateTime_t minute=0, 
+    wxDateTime_t second=0, wxDateTime_t millisec=0) -> DateTime"""
+        return _misc.DateTime_Set(*args, **kwargs)
+
+    def ResetTime(*args, **kwargs):
+        """ResetTime() -> DateTime"""
+        return _misc.DateTime_ResetTime(*args, **kwargs)
+
+    def SetYear(*args, **kwargs):
+        """SetYear(int year) -> DateTime"""
+        return _misc.DateTime_SetYear(*args, **kwargs)
+
+    def SetMonth(*args, **kwargs):
+        """SetMonth(wxDateTime::Month month) -> DateTime"""
+        return _misc.DateTime_SetMonth(*args, **kwargs)
+
+    def SetDay(*args, **kwargs):
+        """SetDay(wxDateTime_t day) -> DateTime"""
+        return _misc.DateTime_SetDay(*args, **kwargs)
+
+    def SetHour(*args, **kwargs):
+        """SetHour(wxDateTime_t hour) -> DateTime"""
+        return _misc.DateTime_SetHour(*args, **kwargs)
+
+    def SetMinute(*args, **kwargs):
+        """SetMinute(wxDateTime_t minute) -> DateTime"""
+        return _misc.DateTime_SetMinute(*args, **kwargs)
+
+    def SetSecond(*args, **kwargs):
+        """SetSecond(wxDateTime_t second) -> DateTime"""
+        return _misc.DateTime_SetSecond(*args, **kwargs)
+
+    def SetMillisecond(*args, **kwargs):
+        """SetMillisecond(wxDateTime_t millisecond) -> DateTime"""
+        return _misc.DateTime_SetMillisecond(*args, **kwargs)
+
+    def SetToWeekDayInSameWeek(*args, **kwargs):
+        """SetToWeekDayInSameWeek(wxDateTime::WeekDay weekday, wxDateTime::WeekFlags flags=Monday_First) -> DateTime"""
+        return _misc.DateTime_SetToWeekDayInSameWeek(*args, **kwargs)
+
+    def GetWeekDayInSameWeek(*args, **kwargs):
+        """GetWeekDayInSameWeek(wxDateTime::WeekDay weekday, wxDateTime::WeekFlags flags=Monday_First) -> DateTime"""
+        return _misc.DateTime_GetWeekDayInSameWeek(*args, **kwargs)
+
+    def SetToNextWeekDay(*args, **kwargs):
+        """SetToNextWeekDay(wxDateTime::WeekDay weekday) -> DateTime"""
+        return _misc.DateTime_SetToNextWeekDay(*args, **kwargs)
+
+    def GetNextWeekDay(*args, **kwargs):
+        """GetNextWeekDay(wxDateTime::WeekDay weekday) -> DateTime"""
+        return _misc.DateTime_GetNextWeekDay(*args, **kwargs)
+
+    def SetToPrevWeekDay(*args, **kwargs):
+        """SetToPrevWeekDay(wxDateTime::WeekDay weekday) -> DateTime"""
+        return _misc.DateTime_SetToPrevWeekDay(*args, **kwargs)
+
+    def GetPrevWeekDay(*args, **kwargs):
+        """GetPrevWeekDay(wxDateTime::WeekDay weekday) -> DateTime"""
+        return _misc.DateTime_GetPrevWeekDay(*args, **kwargs)
+
+    def SetToWeekDay(*args, **kwargs):
+        """SetToWeekDay(wxDateTime::WeekDay weekday, int n=1, wxDateTime::Month month=Inv_Month, 
+    int year=Inv_Year) -> bool"""
+        return _misc.DateTime_SetToWeekDay(*args, **kwargs)
+
+    def SetToLastWeekDay(*args, **kwargs):
+        """SetToLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month=Inv_Month, 
+    int year=Inv_Year) -> bool"""
+        return _misc.DateTime_SetToLastWeekDay(*args, **kwargs)
+
+    def GetLastWeekDay(*args, **kwargs):
+        """GetLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month=Inv_Month, 
+    int year=Inv_Year) -> DateTime"""
+        return _misc.DateTime_GetLastWeekDay(*args, **kwargs)
+
+    def SetToTheWeek(*args, **kwargs):
+        """SetToTheWeek(wxDateTime_t numWeek, wxDateTime::WeekDay weekday=Mon, 
+    wxDateTime::WeekFlags flags=Monday_First) -> bool"""
+        return _misc.DateTime_SetToTheWeek(*args, **kwargs)
+
+    def GetWeek(*args, **kwargs):
+        """GetWeek(wxDateTime_t numWeek, wxDateTime::WeekDay weekday=Mon, 
+    wxDateTime::WeekFlags flags=Monday_First) -> DateTime"""
+        return _misc.DateTime_GetWeek(*args, **kwargs)
+
+    def SetToLastMonthDay(*args, **kwargs):
+        """SetToLastMonthDay(wxDateTime::Month month=Inv_Month, int year=Inv_Year) -> DateTime"""
+        return _misc.DateTime_SetToLastMonthDay(*args, **kwargs)
+
+    def GetLastMonthDay(*args, **kwargs):
+        """GetLastMonthDay(wxDateTime::Month month=Inv_Month, int year=Inv_Year) -> DateTime"""
+        return _misc.DateTime_GetLastMonthDay(*args, **kwargs)
+
+    def SetToYearDay(*args, **kwargs):
+        """SetToYearDay(wxDateTime_t yday) -> DateTime"""
+        return _misc.DateTime_SetToYearDay(*args, **kwargs)
+
+    def GetYearDay(*args, **kwargs):
+        """GetYearDay(wxDateTime_t yday) -> DateTime"""
+        return _misc.DateTime_GetYearDay(*args, **kwargs)
+
+    def GetJulianDayNumber(*args, **kwargs):
+        """GetJulianDayNumber() -> double"""
+        return _misc.DateTime_GetJulianDayNumber(*args, **kwargs)
+
+    def GetJDN(*args, **kwargs):
+        """GetJDN() -> double"""
+        return _misc.DateTime_GetJDN(*args, **kwargs)
+
+    def GetModifiedJulianDayNumber(*args, **kwargs):
+        """GetModifiedJulianDayNumber() -> double"""
+        return _misc.DateTime_GetModifiedJulianDayNumber(*args, **kwargs)
+
+    def GetMJD(*args, **kwargs):
+        """GetMJD() -> double"""
+        return _misc.DateTime_GetMJD(*args, **kwargs)
+
+    def GetRataDie(*args, **kwargs):
+        """GetRataDie() -> double"""
+        return _misc.DateTime_GetRataDie(*args, **kwargs)
+
+    def ToTimezone(*args, **kwargs):
+        """ToTimezone(wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
+        return _misc.DateTime_ToTimezone(*args, **kwargs)
+
+    def MakeTimezone(*args, **kwargs):
+        """MakeTimezone(wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
+        return _misc.DateTime_MakeTimezone(*args, **kwargs)
+
+    def ToGMT(*args, **kwargs):
+        """ToGMT(bool noDST=False) -> DateTime"""
+        return _misc.DateTime_ToGMT(*args, **kwargs)
+
+    def MakeGMT(*args, **kwargs):
+        """MakeGMT(bool noDST=False) -> DateTime"""
+        return _misc.DateTime_MakeGMT(*args, **kwargs)
+
+    def IsDST(*args, **kwargs):
+        """IsDST(wxDateTime::Country country=Country_Default) -> int"""
+        return _misc.DateTime_IsDST(*args, **kwargs)
+
+    def IsValid(*args, **kwargs):
+        """IsValid() -> bool"""
+        return _misc.DateTime_IsValid(*args, **kwargs)
+
+    def GetTicks(*args, **kwargs):
+        """GetTicks() -> time_t"""
+        return _misc.DateTime_GetTicks(*args, **kwargs)
+
+    def GetYear(*args, **kwargs):
+        """GetYear(wxDateTime::TimeZone tz=LOCAL_TZ) -> int"""
+        return _misc.DateTime_GetYear(*args, **kwargs)
+
+    def GetMonth(*args, **kwargs):
+        """GetMonth(wxDateTime::TimeZone tz=LOCAL_TZ) -> wxDateTime::Month"""
+        return _misc.DateTime_GetMonth(*args, **kwargs)
+
+    def GetDay(*args, **kwargs):
+        """GetDay(wxDateTime::TimeZone tz=LOCAL_TZ) -> wxDateTime_t"""
+        return _misc.DateTime_GetDay(*args, **kwargs)
+
+    def GetWeekDay(*args, **kwargs):
+        """GetWeekDay(wxDateTime::TimeZone tz=LOCAL_TZ) -> wxDateTime::WeekDay"""
+        return _misc.DateTime_GetWeekDay(*args, **kwargs)
+
+    def GetHour(*args, **kwargs):
+        """GetHour(wxDateTime::TimeZone tz=LOCAL_TZ) -> wxDateTime_t"""
+        return _misc.DateTime_GetHour(*args, **kwargs)
+
+    def GetMinute(*args, **kwargs):
+        """GetMinute(wxDateTime::TimeZone tz=LOCAL_TZ) -> wxDateTime_t"""
+        return _misc.DateTime_GetMinute(*args, **kwargs)
+
+    def GetSecond(*args, **kwargs):
+        """GetSecond(wxDateTime::TimeZone tz=LOCAL_TZ) -> wxDateTime_t"""
+        return _misc.DateTime_GetSecond(*args, **kwargs)
+
+    def GetMillisecond(*args, **kwargs):
+        """GetMillisecond(wxDateTime::TimeZone tz=LOCAL_TZ) -> wxDateTime_t"""
+        return _misc.DateTime_GetMillisecond(*args, **kwargs)
+
+    def GetDayOfYear(*args, **kwargs):
+        """GetDayOfYear(wxDateTime::TimeZone tz=LOCAL_TZ) -> wxDateTime_t"""
+        return _misc.DateTime_GetDayOfYear(*args, **kwargs)
+
+    def GetWeekOfYear(*args, **kwargs):
+        """GetWeekOfYear(wxDateTime::WeekFlags flags=Monday_First, wxDateTime::TimeZone tz=LOCAL_TZ) -> wxDateTime_t"""
+        return _misc.DateTime_GetWeekOfYear(*args, **kwargs)
+
+    def GetWeekOfMonth(*args, **kwargs):
+        """GetWeekOfMonth(wxDateTime::WeekFlags flags=Monday_First, wxDateTime::TimeZone tz=LOCAL_TZ) -> wxDateTime_t"""
+        return _misc.DateTime_GetWeekOfMonth(*args, **kwargs)
+
+    def IsWorkDay(*args, **kwargs):
+        """IsWorkDay(wxDateTime::Country country=Country_Default) -> bool"""
+        return _misc.DateTime_IsWorkDay(*args, **kwargs)
+
+    def IsEqualTo(*args, **kwargs):
+        """IsEqualTo(DateTime datetime) -> bool"""
+        return _misc.DateTime_IsEqualTo(*args, **kwargs)
+
+    def IsEarlierThan(*args, **kwargs):
+        """IsEarlierThan(DateTime datetime) -> bool"""
+        return _misc.DateTime_IsEarlierThan(*args, **kwargs)
+
+    def IsLaterThan(*args, **kwargs):
+        """IsLaterThan(DateTime datetime) -> bool"""
+        return _misc.DateTime_IsLaterThan(*args, **kwargs)
+
+    def IsStrictlyBetween(*args, **kwargs):
+        """IsStrictlyBetween(DateTime t1, DateTime t2) -> bool"""
+        return _misc.DateTime_IsStrictlyBetween(*args, **kwargs)
+
+    def IsBetween(*args, **kwargs):
+        """IsBetween(DateTime t1, DateTime t2) -> bool"""
+        return _misc.DateTime_IsBetween(*args, **kwargs)
+
+    def IsSameDate(*args, **kwargs):
+        """IsSameDate(DateTime dt) -> bool"""
+        return _misc.DateTime_IsSameDate(*args, **kwargs)
+
+    def IsSameTime(*args, **kwargs):
+        """IsSameTime(DateTime dt) -> bool"""
+        return _misc.DateTime_IsSameTime(*args, **kwargs)
+
+    def IsEqualUpTo(*args, **kwargs):
+        """IsEqualUpTo(DateTime dt, TimeSpan ts) -> bool"""
+        return _misc.DateTime_IsEqualUpTo(*args, **kwargs)
+
+    def AddTS(*args, **kwargs):
+        """AddTS(TimeSpan diff) -> DateTime"""
+        return _misc.DateTime_AddTS(*args, **kwargs)
+
+    def AddDS(*args, **kwargs):
+        """AddDS(DateSpan diff) -> DateTime"""
+        return _misc.DateTime_AddDS(*args, **kwargs)
+
+    def SubtractTS(*args, **kwargs):
+        """SubtractTS(TimeSpan diff) -> DateTime"""
+        return _misc.DateTime_SubtractTS(*args, **kwargs)
+
+    def SubtractDS(*args, **kwargs):
+        """SubtractDS(DateSpan diff) -> DateTime"""
+        return _misc.DateTime_SubtractDS(*args, **kwargs)
+
+    def Subtract(*args, **kwargs):
+        """Subtract(DateTime dt) -> TimeSpan"""
+        return _misc.DateTime_Subtract(*args, **kwargs)
+
+    def __iadd__(*args):
+        """__iadd__(TimeSpan diff) -> DateTime
+__iadd__(DateSpan diff) -> DateTime"""
+        return _misc.DateTime___iadd__(*args)
+
+    def __isub__(*args):
+        """__isub__(TimeSpan diff) -> DateTime
+__isub__(DateSpan diff) -> DateTime"""
+        return _misc.DateTime___isub__(*args)
+
+    def __add__(*args):
+        """__add__(TimeSpan other) -> DateTime
+__add__(DateSpan other) -> DateTime"""
+        return _misc.DateTime___add__(*args)
+
+    def __sub__(*args):
+        """__sub__(DateTime other) -> TimeSpan
+__sub__(TimeSpan other) -> DateTime
+__sub__(DateSpan other) -> DateTime"""
+        return _misc.DateTime___sub__(*args)
+
+    def __lt__(*args):
+        """__lt__(DateTime other) -> bool"""
+        return _misc.DateTime___lt__(*args)
+
+    def __le__(*args):
+        """__le__(DateTime other) -> bool"""
+        return _misc.DateTime___le__(*args)
+
+    def __gt__(*args):
+        """__gt__(DateTime other) -> bool"""
+        return _misc.DateTime___gt__(*args)
+
+    def __ge__(*args):
+        """__ge__(DateTime other) -> bool"""
+        return _misc.DateTime___ge__(*args)
+
+    def __eq__(*args):
+        """__eq__(DateTime other) -> bool"""
+        return _misc.DateTime___eq__(*args)
+
+    def __ne__(*args):
+        """__ne__(DateTime other) -> bool"""
+        return _misc.DateTime___ne__(*args)
+
+    def ParseRfc822Date(*args, **kwargs):
+        """ParseRfc822Date(wxString date) -> int"""
+        return _misc.DateTime_ParseRfc822Date(*args, **kwargs)
+
+    def ParseFormat(*args, **kwargs):
+        """ParseFormat(wxString date, wxString format=wxPyDateFormatStr, DateTime dateDef=wxDefaultDateTime) -> int"""
+        return _misc.DateTime_ParseFormat(*args, **kwargs)
+
+    def ParseDateTime(*args, **kwargs):
+        """ParseDateTime(wxString datetime) -> int"""
+        return _misc.DateTime_ParseDateTime(*args, **kwargs)
+
+    def ParseDate(*args, **kwargs):
+        """ParseDate(wxString date) -> int"""
+        return _misc.DateTime_ParseDate(*args, **kwargs)
+
+    def ParseTime(*args, **kwargs):
+        """ParseTime(wxString time) -> int"""
+        return _misc.DateTime_ParseTime(*args, **kwargs)
+
+    def Format(*args, **kwargs):
+        """Format(wxString format=wxPyDateFormatStr, wxDateTime::TimeZone tz=LOCAL_TZ) -> wxString"""
+        return _misc.DateTime_Format(*args, **kwargs)
+
+    def FormatDate(*args, **kwargs):
+        """FormatDate() -> wxString"""
+        return _misc.DateTime_FormatDate(*args, **kwargs)
+
+    def FormatTime(*args, **kwargs):
+        """FormatTime() -> wxString"""
+        return _misc.DateTime_FormatTime(*args, **kwargs)
+
+    def FormatISODate(*args, **kwargs):
+        """FormatISODate() -> wxString"""
+        return _misc.DateTime_FormatISODate(*args, **kwargs)
+
+    def FormatISOTime(*args, **kwargs):
+        """FormatISOTime() -> wxString"""
+        return _misc.DateTime_FormatISOTime(*args, **kwargs)
+
     def __repr__(self):
         return '<wxDateTime: \"%s\" at %s>' % ( self.Format(), self.this)
     def __str__(self):
@@ -1759,116 +3334,303 @@ class DateTimePtr(DateTime):
         self.__class__ = DateTime
 _misc.DateTime_swigregister(DateTimePtr)
 
-DateTime_SetCountry = _misc.DateTime_SetCountry
+def DateTime_SetCountry(*args, **kwargs):
+    """DateTime_SetCountry(wxDateTime::Country country)"""
+    return _misc.DateTime_SetCountry(*args, **kwargs)
 
-DateTime_GetCountry = _misc.DateTime_GetCountry
+def DateTime_GetCountry(*args, **kwargs):
+    """DateTime_GetCountry() -> wxDateTime::Country"""
+    return _misc.DateTime_GetCountry(*args, **kwargs)
 
-DateTime_IsWestEuropeanCountry = _misc.DateTime_IsWestEuropeanCountry
+def DateTime_IsWestEuropeanCountry(*args, **kwargs):
+    """DateTime_IsWestEuropeanCountry(wxDateTime::Country country=Country_Default) -> bool"""
+    return _misc.DateTime_IsWestEuropeanCountry(*args, **kwargs)
 
-DateTime_GetCurrentYear = _misc.DateTime_GetCurrentYear
+def DateTime_GetCurrentYear(*args, **kwargs):
+    """DateTime_GetCurrentYear(wxDateTime::Calendar cal=Gregorian) -> int"""
+    return _misc.DateTime_GetCurrentYear(*args, **kwargs)
 
-DateTime_ConvertYearToBC = _misc.DateTime_ConvertYearToBC
+def DateTime_ConvertYearToBC(*args, **kwargs):
+    """DateTime_ConvertYearToBC(int year) -> int"""
+    return _misc.DateTime_ConvertYearToBC(*args, **kwargs)
 
-DateTime_GetCurrentMonth = _misc.DateTime_GetCurrentMonth
+def DateTime_GetCurrentMonth(*args, **kwargs):
+    """DateTime_GetCurrentMonth(wxDateTime::Calendar cal=Gregorian) -> wxDateTime::Month"""
+    return _misc.DateTime_GetCurrentMonth(*args, **kwargs)
 
-DateTime_IsLeapYear = _misc.DateTime_IsLeapYear
+def DateTime_IsLeapYear(*args, **kwargs):
+    """DateTime_IsLeapYear(int year=Inv_Year, wxDateTime::Calendar cal=Gregorian) -> bool"""
+    return _misc.DateTime_IsLeapYear(*args, **kwargs)
 
-DateTime_GetCentury = _misc.DateTime_GetCentury
+def DateTime_GetCentury(*args, **kwargs):
+    """DateTime_GetCentury(int year=Inv_Year) -> int"""
+    return _misc.DateTime_GetCentury(*args, **kwargs)
 
-DateTime_GetNumberOfDaysinYear = _misc.DateTime_GetNumberOfDaysinYear
+def DateTime_GetNumberOfDaysinYear(*args, **kwargs):
+    """DateTime_GetNumberOfDaysinYear(int year, wxDateTime::Calendar cal=Gregorian) -> wxDateTime_t"""
+    return _misc.DateTime_GetNumberOfDaysinYear(*args, **kwargs)
 
-DateTime_GetNumberOfDaysInMonth = _misc.DateTime_GetNumberOfDaysInMonth
+def DateTime_GetNumberOfDaysInMonth(*args, **kwargs):
+    """DateTime_GetNumberOfDaysInMonth(wxDateTime::Month month, int year=Inv_Year, wxDateTime::Calendar cal=Gregorian) -> wxDateTime_t"""
+    return _misc.DateTime_GetNumberOfDaysInMonth(*args, **kwargs)
 
-DateTime_GetMonthName = _misc.DateTime_GetMonthName
+def DateTime_GetMonthName(*args, **kwargs):
+    """DateTime_GetMonthName(wxDateTime::Month month, wxDateTime::NameFlags flags=Name_Full) -> wxString"""
+    return _misc.DateTime_GetMonthName(*args, **kwargs)
 
-DateTime_GetWeekDayName = _misc.DateTime_GetWeekDayName
+def DateTime_GetWeekDayName(*args, **kwargs):
+    """DateTime_GetWeekDayName(wxDateTime::WeekDay weekday, wxDateTime::NameFlags flags=Name_Full) -> wxString"""
+    return _misc.DateTime_GetWeekDayName(*args, **kwargs)
 
-DateTime_GetAmPmStrings = _misc.DateTime_GetAmPmStrings
+def DateTime_GetAmPmStrings(*args, **kwargs):
+    """DateTime_GetAmPmStrings(wxString OUTPUT, wxString OUTPUT)"""
+    return _misc.DateTime_GetAmPmStrings(*args, **kwargs)
 
-DateTime_IsDSTApplicable = _misc.DateTime_IsDSTApplicable
+def DateTime_IsDSTApplicable(*args, **kwargs):
+    """DateTime_IsDSTApplicable(int year=Inv_Year, wxDateTime::Country country=Country_Default) -> bool"""
+    return _misc.DateTime_IsDSTApplicable(*args, **kwargs)
 
-DateTime_GetBeginDST = _misc.DateTime_GetBeginDST
+def DateTime_GetBeginDST(*args, **kwargs):
+    """DateTime_GetBeginDST(int year=Inv_Year, wxDateTime::Country country=Country_Default) -> DateTime"""
+    return _misc.DateTime_GetBeginDST(*args, **kwargs)
 
-DateTime_GetEndDST = _misc.DateTime_GetEndDST
+def DateTime_GetEndDST(*args, **kwargs):
+    """DateTime_GetEndDST(int year=Inv_Year, wxDateTime::Country country=Country_Default) -> DateTime"""
+    return _misc.DateTime_GetEndDST(*args, **kwargs)
 
-DateTime_Now = _misc.DateTime_Now
+def DateTime_Now(*args, **kwargs):
+    """DateTime_Now() -> DateTime"""
+    return _misc.DateTime_Now(*args, **kwargs)
 
-DateTime_UNow = _misc.DateTime_UNow
+def DateTime_UNow(*args, **kwargs):
+    """DateTime_UNow() -> DateTime"""
+    return _misc.DateTime_UNow(*args, **kwargs)
 
-DateTime_Today = _misc.DateTime_Today
+def DateTime_Today(*args, **kwargs):
+    """DateTime_Today() -> DateTime"""
+    return _misc.DateTime_Today(*args, **kwargs)
 
 def DateTimeFromTimeT(*args, **kwargs):
+    """DateTimeFromTimeT(time_t timet) -> DateTime"""
     val = _misc.new_DateTimeFromTimeT(*args, **kwargs)
     val.thisown = 1
     return val
 
 def DateTimeFromJDN(*args, **kwargs):
+    """DateTimeFromJDN(double jdn) -> DateTime"""
     val = _misc.new_DateTimeFromJDN(*args, **kwargs)
     val.thisown = 1
     return val
 
 def DateTimeFromHMS(*args, **kwargs):
+    """DateTimeFromHMS(wxDateTime_t hour, wxDateTime_t minute=0, wxDateTime_t second=0, 
+    wxDateTime_t millisec=0) -> DateTime"""
     val = _misc.new_DateTimeFromHMS(*args, **kwargs)
     val.thisown = 1
     return val
 
 def DateTimeFromDMY(*args, **kwargs):
+    """DateTimeFromDMY(wxDateTime_t day, wxDateTime::Month month=Inv_Month, 
+    int year=Inv_Year, wxDateTime_t hour=0, wxDateTime_t minute=0, 
+    wxDateTime_t second=0, wxDateTime_t millisec=0) -> DateTime"""
     val = _misc.new_DateTimeFromDMY(*args, **kwargs)
     val.thisown = 1
     return val
 
 class TimeSpan(object):
-    Seconds = staticmethod(_misc.TimeSpan_Seconds)
-    Second = staticmethod(_misc.TimeSpan_Second)
-    Minutes = staticmethod(_misc.TimeSpan_Minutes)
-    Minute = staticmethod(_misc.TimeSpan_Minute)
-    Hours = staticmethod(_misc.TimeSpan_Hours)
-    Hour = staticmethod(_misc.TimeSpan_Hour)
-    Days = staticmethod(_misc.TimeSpan_Days)
-    Day = staticmethod(_misc.TimeSpan_Day)
-    Weeks = staticmethod(_misc.TimeSpan_Weeks)
-    Week = staticmethod(_misc.TimeSpan_Week)
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTimeSpan instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Seconds(*args, **kwargs):
+        """TimeSpan.Seconds(long sec) -> TimeSpan"""
+        return _misc.TimeSpan_Seconds(*args, **kwargs)
+
+    Seconds = staticmethod(Seconds)
+    def Second(*args, **kwargs):
+        """TimeSpan.Second() -> TimeSpan"""
+        return _misc.TimeSpan_Second(*args, **kwargs)
+
+    Second = staticmethod(Second)
+    def Minutes(*args, **kwargs):
+        """TimeSpan.Minutes(long min) -> TimeSpan"""
+        return _misc.TimeSpan_Minutes(*args, **kwargs)
+
+    Minutes = staticmethod(Minutes)
+    def Minute(*args, **kwargs):
+        """TimeSpan.Minute() -> TimeSpan"""
+        return _misc.TimeSpan_Minute(*args, **kwargs)
+
+    Minute = staticmethod(Minute)
+    def Hours(*args, **kwargs):
+        """TimeSpan.Hours(long hours) -> TimeSpan"""
+        return _misc.TimeSpan_Hours(*args, **kwargs)
+
+    Hours = staticmethod(Hours)
+    def Hour(*args, **kwargs):
+        """TimeSpan.Hour() -> TimeSpan"""
+        return _misc.TimeSpan_Hour(*args, **kwargs)
+
+    Hour = staticmethod(Hour)
+    def Days(*args, **kwargs):
+        """TimeSpan.Days(long days) -> TimeSpan"""
+        return _misc.TimeSpan_Days(*args, **kwargs)
+
+    Days = staticmethod(Days)
+    def Day(*args, **kwargs):
+        """TimeSpan.Day() -> TimeSpan"""
+        return _misc.TimeSpan_Day(*args, **kwargs)
+
+    Day = staticmethod(Day)
+    def Weeks(*args, **kwargs):
+        """TimeSpan.Weeks(long days) -> TimeSpan"""
+        return _misc.TimeSpan_Weeks(*args, **kwargs)
+
+    Weeks = staticmethod(Weeks)
+    def Week(*args, **kwargs):
+        """TimeSpan.Week() -> TimeSpan"""
+        return _misc.TimeSpan_Week(*args, **kwargs)
+
+    Week = staticmethod(Week)
     def __init__(self, *args, **kwargs):
+        """__init__(long hours=0, long minutes=0, long seconds=0, long milliseconds=0) -> TimeSpan"""
         newobj = _misc.new_TimeSpan(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_TimeSpan):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Add(*args, **kwargs): return _misc.TimeSpan_Add(*args, **kwargs)
-    def Subtract(*args, **kwargs): return _misc.TimeSpan_Subtract(*args, **kwargs)
-    def Multiply(*args, **kwargs): return _misc.TimeSpan_Multiply(*args, **kwargs)
-    def Neg(*args, **kwargs): return _misc.TimeSpan_Neg(*args, **kwargs)
-    def Abs(*args, **kwargs): return _misc.TimeSpan_Abs(*args, **kwargs)
-    def __iadd__(*args, **kwargs): return _misc.TimeSpan___iadd__(*args, **kwargs)
-    def __isub__(*args, **kwargs): return _misc.TimeSpan___isub__(*args, **kwargs)
-    def __imul__(*args, **kwargs): return _misc.TimeSpan___imul__(*args, **kwargs)
-    def __neg__(*args, **kwargs): return _misc.TimeSpan___neg__(*args, **kwargs)
-    def __add__(*args, **kwargs): return _misc.TimeSpan___add__(*args, **kwargs)
-    def __sub__(*args, **kwargs): return _misc.TimeSpan___sub__(*args, **kwargs)
-    def __mul__(*args, **kwargs): return _misc.TimeSpan___mul__(*args, **kwargs)
-    def __rmul__(*args, **kwargs): return _misc.TimeSpan___rmul__(*args, **kwargs)
-    def __lt__(*args, **kwargs): return _misc.TimeSpan___lt__(*args, **kwargs)
-    def __le__(*args, **kwargs): return _misc.TimeSpan___le__(*args, **kwargs)
-    def __gt__(*args, **kwargs): return _misc.TimeSpan___gt__(*args, **kwargs)
-    def __ge__(*args, **kwargs): return _misc.TimeSpan___ge__(*args, **kwargs)
-    def __eq__(*args, **kwargs): return _misc.TimeSpan___eq__(*args, **kwargs)
-    def __ne__(*args, **kwargs): return _misc.TimeSpan___ne__(*args, **kwargs)
-    def IsNull(*args, **kwargs): return _misc.TimeSpan_IsNull(*args, **kwargs)
-    def IsPositive(*args, **kwargs): return _misc.TimeSpan_IsPositive(*args, **kwargs)
-    def IsNegative(*args, **kwargs): return _misc.TimeSpan_IsNegative(*args, **kwargs)
-    def IsEqualTo(*args, **kwargs): return _misc.TimeSpan_IsEqualTo(*args, **kwargs)
-    def IsLongerThan(*args, **kwargs): return _misc.TimeSpan_IsLongerThan(*args, **kwargs)
-    def IsShorterThan(*args, **kwargs): return _misc.TimeSpan_IsShorterThan(*args, **kwargs)
-    def GetWeeks(*args, **kwargs): return _misc.TimeSpan_GetWeeks(*args, **kwargs)
-    def GetDays(*args, **kwargs): return _misc.TimeSpan_GetDays(*args, **kwargs)
-    def GetHours(*args, **kwargs): return _misc.TimeSpan_GetHours(*args, **kwargs)
-    def GetMinutes(*args, **kwargs): return _misc.TimeSpan_GetMinutes(*args, **kwargs)
-    def GetSeconds(*args, **kwargs): return _misc.TimeSpan_GetSeconds(*args, **kwargs)
-    def GetMilliseconds(*args, **kwargs): return _misc.TimeSpan_GetMilliseconds(*args, **kwargs)
-    def Format(*args, **kwargs): return _misc.TimeSpan_Format(*args, **kwargs)
+
+    def Add(*args, **kwargs):
+        """Add(TimeSpan diff) -> TimeSpan"""
+        return _misc.TimeSpan_Add(*args, **kwargs)
+
+    def Subtract(*args, **kwargs):
+        """Subtract(TimeSpan diff) -> TimeSpan"""
+        return _misc.TimeSpan_Subtract(*args, **kwargs)
+
+    def Multiply(*args, **kwargs):
+        """Multiply(int n) -> TimeSpan"""
+        return _misc.TimeSpan_Multiply(*args, **kwargs)
+
+    def Neg(*args, **kwargs):
+        """Neg() -> TimeSpan"""
+        return _misc.TimeSpan_Neg(*args, **kwargs)
+
+    def Abs(*args, **kwargs):
+        """Abs() -> TimeSpan"""
+        return _misc.TimeSpan_Abs(*args, **kwargs)
+
+    def __iadd__(*args, **kwargs):
+        """__iadd__(TimeSpan diff) -> TimeSpan"""
+        return _misc.TimeSpan___iadd__(*args, **kwargs)
+
+    def __isub__(*args, **kwargs):
+        """__isub__(TimeSpan diff) -> TimeSpan"""
+        return _misc.TimeSpan___isub__(*args, **kwargs)
+
+    def __imul__(*args, **kwargs):
+        """__imul__(int n) -> TimeSpan"""
+        return _misc.TimeSpan___imul__(*args, **kwargs)
+
+    def __neg__(*args, **kwargs):
+        """__neg__() -> TimeSpan"""
+        return _misc.TimeSpan___neg__(*args, **kwargs)
+
+    def __add__(*args, **kwargs):
+        """__add__(TimeSpan other) -> TimeSpan"""
+        return _misc.TimeSpan___add__(*args, **kwargs)
+
+    def __sub__(*args, **kwargs):
+        """__sub__(TimeSpan other) -> TimeSpan"""
+        return _misc.TimeSpan___sub__(*args, **kwargs)
+
+    def __mul__(*args, **kwargs):
+        """__mul__(int n) -> TimeSpan"""
+        return _misc.TimeSpan___mul__(*args, **kwargs)
+
+    def __rmul__(*args, **kwargs):
+        """__rmul__(int n) -> TimeSpan"""
+        return _misc.TimeSpan___rmul__(*args, **kwargs)
+
+    def __lt__(*args, **kwargs):
+        """__lt__(TimeSpan other) -> bool"""
+        return _misc.TimeSpan___lt__(*args, **kwargs)
+
+    def __le__(*args, **kwargs):
+        """__le__(TimeSpan other) -> bool"""
+        return _misc.TimeSpan___le__(*args, **kwargs)
+
+    def __gt__(*args, **kwargs):
+        """__gt__(TimeSpan other) -> bool"""
+        return _misc.TimeSpan___gt__(*args, **kwargs)
+
+    def __ge__(*args, **kwargs):
+        """__ge__(TimeSpan other) -> bool"""
+        return _misc.TimeSpan___ge__(*args, **kwargs)
+
+    def __eq__(*args, **kwargs):
+        """__eq__(TimeSpan other) -> bool"""
+        return _misc.TimeSpan___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(TimeSpan other) -> bool"""
+        return _misc.TimeSpan___ne__(*args, **kwargs)
+
+    def IsNull(*args, **kwargs):
+        """IsNull() -> bool"""
+        return _misc.TimeSpan_IsNull(*args, **kwargs)
+
+    def IsPositive(*args, **kwargs):
+        """IsPositive() -> bool"""
+        return _misc.TimeSpan_IsPositive(*args, **kwargs)
+
+    def IsNegative(*args, **kwargs):
+        """IsNegative() -> bool"""
+        return _misc.TimeSpan_IsNegative(*args, **kwargs)
+
+    def IsEqualTo(*args, **kwargs):
+        """IsEqualTo(TimeSpan ts) -> bool"""
+        return _misc.TimeSpan_IsEqualTo(*args, **kwargs)
+
+    def IsLongerThan(*args, **kwargs):
+        """IsLongerThan(TimeSpan ts) -> bool"""
+        return _misc.TimeSpan_IsLongerThan(*args, **kwargs)
+
+    def IsShorterThan(*args, **kwargs):
+        """IsShorterThan(TimeSpan t) -> bool"""
+        return _misc.TimeSpan_IsShorterThan(*args, **kwargs)
+
+    def GetWeeks(*args, **kwargs):
+        """GetWeeks() -> int"""
+        return _misc.TimeSpan_GetWeeks(*args, **kwargs)
+
+    def GetDays(*args, **kwargs):
+        """GetDays() -> int"""
+        return _misc.TimeSpan_GetDays(*args, **kwargs)
+
+    def GetHours(*args, **kwargs):
+        """GetHours() -> int"""
+        return _misc.TimeSpan_GetHours(*args, **kwargs)
+
+    def GetMinutes(*args, **kwargs):
+        """GetMinutes() -> int"""
+        return _misc.TimeSpan_GetMinutes(*args, **kwargs)
+
+    def GetSeconds(*args, **kwargs):
+        """GetSeconds() -> wxLongLong"""
+        return _misc.TimeSpan_GetSeconds(*args, **kwargs)
+
+    def GetMilliseconds(*args, **kwargs):
+        """GetMilliseconds() -> wxLongLong"""
+        return _misc.TimeSpan_GetMilliseconds(*args, **kwargs)
+
+    def Format(*args, **kwargs):
+        """Format(wxString format=wxPyTimeSpanFormatStr) -> wxString"""
+        return _misc.TimeSpan_Format(*args, **kwargs)
+
     def __repr__(self):
         return '<wxTimeSpan: \"%s\" at %s>' % ( self.Format(), self.this)
     def __str__(self):
@@ -1882,69 +3644,194 @@ class TimeSpanPtr(TimeSpan):
         self.__class__ = TimeSpan
 _misc.TimeSpan_swigregister(TimeSpanPtr)
 
-TimeSpan_Seconds = _misc.TimeSpan_Seconds
+def TimeSpan_Seconds(*args, **kwargs):
+    """TimeSpan_Seconds(long sec) -> TimeSpan"""
+    return _misc.TimeSpan_Seconds(*args, **kwargs)
 
-TimeSpan_Second = _misc.TimeSpan_Second
+def TimeSpan_Second(*args, **kwargs):
+    """TimeSpan_Second() -> TimeSpan"""
+    return _misc.TimeSpan_Second(*args, **kwargs)
 
-TimeSpan_Minutes = _misc.TimeSpan_Minutes
+def TimeSpan_Minutes(*args, **kwargs):
+    """TimeSpan_Minutes(long min) -> TimeSpan"""
+    return _misc.TimeSpan_Minutes(*args, **kwargs)
 
-TimeSpan_Minute = _misc.TimeSpan_Minute
+def TimeSpan_Minute(*args, **kwargs):
+    """TimeSpan_Minute() -> TimeSpan"""
+    return _misc.TimeSpan_Minute(*args, **kwargs)
 
-TimeSpan_Hours = _misc.TimeSpan_Hours
+def TimeSpan_Hours(*args, **kwargs):
+    """TimeSpan_Hours(long hours) -> TimeSpan"""
+    return _misc.TimeSpan_Hours(*args, **kwargs)
 
-TimeSpan_Hour = _misc.TimeSpan_Hour
+def TimeSpan_Hour(*args, **kwargs):
+    """TimeSpan_Hour() -> TimeSpan"""
+    return _misc.TimeSpan_Hour(*args, **kwargs)
 
-TimeSpan_Days = _misc.TimeSpan_Days
+def TimeSpan_Days(*args, **kwargs):
+    """TimeSpan_Days(long days) -> TimeSpan"""
+    return _misc.TimeSpan_Days(*args, **kwargs)
 
-TimeSpan_Day = _misc.TimeSpan_Day
+def TimeSpan_Day(*args, **kwargs):
+    """TimeSpan_Day() -> TimeSpan"""
+    return _misc.TimeSpan_Day(*args, **kwargs)
 
-TimeSpan_Weeks = _misc.TimeSpan_Weeks
+def TimeSpan_Weeks(*args, **kwargs):
+    """TimeSpan_Weeks(long days) -> TimeSpan"""
+    return _misc.TimeSpan_Weeks(*args, **kwargs)
 
-TimeSpan_Week = _misc.TimeSpan_Week
+def TimeSpan_Week(*args, **kwargs):
+    """TimeSpan_Week() -> TimeSpan"""
+    return _misc.TimeSpan_Week(*args, **kwargs)
 
 class DateSpan(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDateSpan instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int years=0, int months=0, int weeks=0, int days=0) -> DateSpan"""
         newobj = _misc.new_DateSpan(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_DateSpan):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    Days = staticmethod(_misc.DateSpan_Days)
-    Day = staticmethod(_misc.DateSpan_Day)
-    Weeks = staticmethod(_misc.DateSpan_Weeks)
-    Week = staticmethod(_misc.DateSpan_Week)
-    Months = staticmethod(_misc.DateSpan_Months)
-    Month = staticmethod(_misc.DateSpan_Month)
-    Years = staticmethod(_misc.DateSpan_Years)
-    Year = staticmethod(_misc.DateSpan_Year)
-    def SetYears(*args, **kwargs): return _misc.DateSpan_SetYears(*args, **kwargs)
-    def SetMonths(*args, **kwargs): return _misc.DateSpan_SetMonths(*args, **kwargs)
-    def SetWeeks(*args, **kwargs): return _misc.DateSpan_SetWeeks(*args, **kwargs)
-    def SetDays(*args, **kwargs): return _misc.DateSpan_SetDays(*args, **kwargs)
-    def GetYears(*args, **kwargs): return _misc.DateSpan_GetYears(*args, **kwargs)
-    def GetMonths(*args, **kwargs): return _misc.DateSpan_GetMonths(*args, **kwargs)
-    def GetWeeks(*args, **kwargs): return _misc.DateSpan_GetWeeks(*args, **kwargs)
-    def GetDays(*args, **kwargs): return _misc.DateSpan_GetDays(*args, **kwargs)
-    def GetTotalDays(*args, **kwargs): return _misc.DateSpan_GetTotalDays(*args, **kwargs)
-    def Add(*args, **kwargs): return _misc.DateSpan_Add(*args, **kwargs)
-    def Subtract(*args, **kwargs): return _misc.DateSpan_Subtract(*args, **kwargs)
-    def Neg(*args, **kwargs): return _misc.DateSpan_Neg(*args, **kwargs)
-    def Multiply(*args, **kwargs): return _misc.DateSpan_Multiply(*args, **kwargs)
-    def __iadd__(*args, **kwargs): return _misc.DateSpan___iadd__(*args, **kwargs)
-    def __isub__(*args, **kwargs): return _misc.DateSpan___isub__(*args, **kwargs)
-    def __neg__(*args, **kwargs): return _misc.DateSpan___neg__(*args, **kwargs)
-    def __imul__(*args, **kwargs): return _misc.DateSpan___imul__(*args, **kwargs)
-    def __add__(*args, **kwargs): return _misc.DateSpan___add__(*args, **kwargs)
-    def __sub__(*args, **kwargs): return _misc.DateSpan___sub__(*args, **kwargs)
-    def __mul__(*args, **kwargs): return _misc.DateSpan___mul__(*args, **kwargs)
-    def __rmul__(*args, **kwargs): return _misc.DateSpan___rmul__(*args, **kwargs)
-    def __eq__(*args, **kwargs): return _misc.DateSpan___eq__(*args, **kwargs)
-    def __ne__(*args, **kwargs): return _misc.DateSpan___ne__(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDateSpan instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Days(*args, **kwargs):
+        """DateSpan.Days(int days) -> DateSpan"""
+        return _misc.DateSpan_Days(*args, **kwargs)
+
+    Days = staticmethod(Days)
+    def Day(*args, **kwargs):
+        """DateSpan.Day() -> DateSpan"""
+        return _misc.DateSpan_Day(*args, **kwargs)
+
+    Day = staticmethod(Day)
+    def Weeks(*args, **kwargs):
+        """DateSpan.Weeks(int weeks) -> DateSpan"""
+        return _misc.DateSpan_Weeks(*args, **kwargs)
+
+    Weeks = staticmethod(Weeks)
+    def Week(*args, **kwargs):
+        """DateSpan.Week() -> DateSpan"""
+        return _misc.DateSpan_Week(*args, **kwargs)
+
+    Week = staticmethod(Week)
+    def Months(*args, **kwargs):
+        """DateSpan.Months(int mon) -> DateSpan"""
+        return _misc.DateSpan_Months(*args, **kwargs)
+
+    Months = staticmethod(Months)
+    def Month(*args, **kwargs):
+        """DateSpan.Month() -> DateSpan"""
+        return _misc.DateSpan_Month(*args, **kwargs)
+
+    Month = staticmethod(Month)
+    def Years(*args, **kwargs):
+        """DateSpan.Years(int years) -> DateSpan"""
+        return _misc.DateSpan_Years(*args, **kwargs)
+
+    Years = staticmethod(Years)
+    def Year(*args, **kwargs):
+        """DateSpan.Year() -> DateSpan"""
+        return _misc.DateSpan_Year(*args, **kwargs)
+
+    Year = staticmethod(Year)
+    def SetYears(*args, **kwargs):
+        """SetYears(int n) -> DateSpan"""
+        return _misc.DateSpan_SetYears(*args, **kwargs)
+
+    def SetMonths(*args, **kwargs):
+        """SetMonths(int n) -> DateSpan"""
+        return _misc.DateSpan_SetMonths(*args, **kwargs)
+
+    def SetWeeks(*args, **kwargs):
+        """SetWeeks(int n) -> DateSpan"""
+        return _misc.DateSpan_SetWeeks(*args, **kwargs)
+
+    def SetDays(*args, **kwargs):
+        """SetDays(int n) -> DateSpan"""
+        return _misc.DateSpan_SetDays(*args, **kwargs)
+
+    def GetYears(*args, **kwargs):
+        """GetYears() -> int"""
+        return _misc.DateSpan_GetYears(*args, **kwargs)
+
+    def GetMonths(*args, **kwargs):
+        """GetMonths() -> int"""
+        return _misc.DateSpan_GetMonths(*args, **kwargs)
+
+    def GetWeeks(*args, **kwargs):
+        """GetWeeks() -> int"""
+        return _misc.DateSpan_GetWeeks(*args, **kwargs)
+
+    def GetDays(*args, **kwargs):
+        """GetDays() -> int"""
+        return _misc.DateSpan_GetDays(*args, **kwargs)
+
+    def GetTotalDays(*args, **kwargs):
+        """GetTotalDays() -> int"""
+        return _misc.DateSpan_GetTotalDays(*args, **kwargs)
+
+    def Add(*args, **kwargs):
+        """Add(DateSpan other) -> DateSpan"""
+        return _misc.DateSpan_Add(*args, **kwargs)
+
+    def Subtract(*args, **kwargs):
+        """Subtract(DateSpan other) -> DateSpan"""
+        return _misc.DateSpan_Subtract(*args, **kwargs)
+
+    def Neg(*args, **kwargs):
+        """Neg() -> DateSpan"""
+        return _misc.DateSpan_Neg(*args, **kwargs)
+
+    def Multiply(*args, **kwargs):
+        """Multiply(int factor) -> DateSpan"""
+        return _misc.DateSpan_Multiply(*args, **kwargs)
+
+    def __iadd__(*args, **kwargs):
+        """__iadd__(DateSpan other) -> DateSpan"""
+        return _misc.DateSpan___iadd__(*args, **kwargs)
+
+    def __isub__(*args, **kwargs):
+        """__isub__(DateSpan other) -> DateSpan"""
+        return _misc.DateSpan___isub__(*args, **kwargs)
+
+    def __neg__(*args, **kwargs):
+        """__neg__() -> DateSpan"""
+        return _misc.DateSpan___neg__(*args, **kwargs)
+
+    def __imul__(*args, **kwargs):
+        """__imul__(int factor) -> DateSpan"""
+        return _misc.DateSpan___imul__(*args, **kwargs)
+
+    def __add__(*args, **kwargs):
+        """__add__(DateSpan other) -> DateSpan"""
+        return _misc.DateSpan___add__(*args, **kwargs)
+
+    def __sub__(*args, **kwargs):
+        """__sub__(DateSpan other) -> DateSpan"""
+        return _misc.DateSpan___sub__(*args, **kwargs)
+
+    def __mul__(*args, **kwargs):
+        """__mul__(int n) -> DateSpan"""
+        return _misc.DateSpan___mul__(*args, **kwargs)
+
+    def __rmul__(*args, **kwargs):
+        """__rmul__(int n) -> DateSpan"""
+        return _misc.DateSpan___rmul__(*args, **kwargs)
+
+    def __eq__(*args, **kwargs):
+        """__eq__(DateSpan other) -> bool"""
+        return _misc.DateSpan___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(DateSpan other) -> bool"""
+        return _misc.DateSpan___ne__(*args, **kwargs)
+
 
 class DateSpanPtr(DateSpan):
     def __init__(self, this):
@@ -1953,30 +3840,54 @@ class DateSpanPtr(DateSpan):
         self.__class__ = DateSpan
 _misc.DateSpan_swigregister(DateSpanPtr)
 
-DateSpan_Days = _misc.DateSpan_Days
+def DateSpan_Days(*args, **kwargs):
+    """DateSpan_Days(int days) -> DateSpan"""
+    return _misc.DateSpan_Days(*args, **kwargs)
 
-DateSpan_Day = _misc.DateSpan_Day
+def DateSpan_Day(*args, **kwargs):
+    """DateSpan_Day() -> DateSpan"""
+    return _misc.DateSpan_Day(*args, **kwargs)
 
-DateSpan_Weeks = _misc.DateSpan_Weeks
+def DateSpan_Weeks(*args, **kwargs):
+    """DateSpan_Weeks(int weeks) -> DateSpan"""
+    return _misc.DateSpan_Weeks(*args, **kwargs)
 
-DateSpan_Week = _misc.DateSpan_Week
+def DateSpan_Week(*args, **kwargs):
+    """DateSpan_Week() -> DateSpan"""
+    return _misc.DateSpan_Week(*args, **kwargs)
 
-DateSpan_Months = _misc.DateSpan_Months
+def DateSpan_Months(*args, **kwargs):
+    """DateSpan_Months(int mon) -> DateSpan"""
+    return _misc.DateSpan_Months(*args, **kwargs)
 
-DateSpan_Month = _misc.DateSpan_Month
+def DateSpan_Month(*args, **kwargs):
+    """DateSpan_Month() -> DateSpan"""
+    return _misc.DateSpan_Month(*args, **kwargs)
 
-DateSpan_Years = _misc.DateSpan_Years
+def DateSpan_Years(*args, **kwargs):
+    """DateSpan_Years(int years) -> DateSpan"""
+    return _misc.DateSpan_Years(*args, **kwargs)
 
-DateSpan_Year = _misc.DateSpan_Year
+def DateSpan_Year(*args, **kwargs):
+    """DateSpan_Year() -> DateSpan"""
+    return _misc.DateSpan_Year(*args, **kwargs)
 
 
-GetLocalTime = _misc.GetLocalTime
+def GetLocalTime(*args, **kwargs):
+    """GetLocalTime() -> long"""
+    return _misc.GetLocalTime(*args, **kwargs)
 
-GetUTCTime = _misc.GetUTCTime
+def GetUTCTime(*args, **kwargs):
+    """GetUTCTime() -> long"""
+    return _misc.GetUTCTime(*args, **kwargs)
 
-GetCurrentTime = _misc.GetCurrentTime
+def GetCurrentTime(*args, **kwargs):
+    """GetCurrentTime() -> long"""
+    return _misc.GetCurrentTime(*args, **kwargs)
 
-GetLocalTimeMillis = _misc.GetLocalTimeMillis
+def GetLocalTimeMillis(*args, **kwargs):
+    """GetLocalTimeMillis() -> wxLongLong"""
+    return _misc.GetLocalTimeMillis(*args, **kwargs)
 #---------------------------------------------------------------------------
 
 DF_INVALID = _misc.DF_INVALID
@@ -2000,23 +3911,47 @@ DF_PRIVATE = _misc.DF_PRIVATE
 DF_HTML = _misc.DF_HTML
 DF_MAX = _misc.DF_MAX
 class DataFormat(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDataFormat instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxDataFormatId type) -> DataFormat"""
         newobj = _misc.new_DataFormat(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_DataFormat):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __eq__(*args): return _misc.DataFormat___eq__(*args)
-    def __ne__(*args): return _misc.DataFormat___ne__(*args)
-    def SetType(*args, **kwargs): return _misc.DataFormat_SetType(*args, **kwargs)
-    def GetType(*args, **kwargs): return _misc.DataFormat_GetType(*args, **kwargs)
-    def GetId(*args, **kwargs): return _misc.DataFormat_GetId(*args, **kwargs)
-    def SetId(*args, **kwargs): return _misc.DataFormat_SetId(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDataFormat instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def __eq__(*args):
+        """__eq__(wxDataFormatId format) -> bool
+__eq__(DataFormat format) -> bool"""
+        return _misc.DataFormat___eq__(*args)
+
+    def __ne__(*args):
+        """__ne__(wxDataFormatId format) -> bool
+__ne__(DataFormat format) -> bool"""
+        return _misc.DataFormat___ne__(*args)
+
+    def SetType(*args, **kwargs):
+        """SetType(wxDataFormatId format)"""
+        return _misc.DataFormat_SetType(*args, **kwargs)
+
+    def GetType(*args, **kwargs):
+        """GetType() -> wxDataFormatId"""
+        return _misc.DataFormat_GetType(*args, **kwargs)
+
+    def GetId(*args, **kwargs):
+        """GetId() -> wxString"""
+        return _misc.DataFormat_GetId(*args, **kwargs)
+
+    def SetId(*args, **kwargs):
+        """SetId(wxString format)"""
+        return _misc.DataFormat_SetId(*args, **kwargs)
+
 
 class DataFormatPtr(DataFormat):
     def __init__(self, this):
@@ -2026,28 +3961,53 @@ class DataFormatPtr(DataFormat):
 _misc.DataFormat_swigregister(DataFormatPtr)
 
 def CustomDataFormat(*args, **kwargs):
+    """CustomDataFormat(wxString format) -> DataFormat"""
     val = _misc.new_CustomDataFormat(*args, **kwargs)
     val.thisown = 1
     return val
 
 class DataObject(object):
+    """"""
+    def __init__(self): raise RuntimeError, "No constructor defined"
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     Get = _misc.DataObject_Get
     Set = _misc.DataObject_Set
     Both = _misc.DataObject_Both
     def __del__(self, destroy=_misc.delete_DataObject):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetPreferredFormat(*args, **kwargs): return _misc.DataObject_GetPreferredFormat(*args, **kwargs)
-    def GetFormatCount(*args, **kwargs): return _misc.DataObject_GetFormatCount(*args, **kwargs)
-    def IsSupported(*args, **kwargs): return _misc.DataObject_IsSupported(*args, **kwargs)
-    def GetDataSize(*args, **kwargs): return _misc.DataObject_GetDataSize(*args, **kwargs)
-    def GetAllFormats(*args, **kwargs): return _misc.DataObject_GetAllFormats(*args, **kwargs)
-    def GetDataHere(*args, **kwargs): return _misc.DataObject_GetDataHere(*args, **kwargs)
-    def SetData(*args, **kwargs): return _misc.DataObject_SetData(*args, **kwargs)
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetPreferredFormat(*args, **kwargs):
+        """GetPreferredFormat(wxDataObject::Direction dir=Get) -> DataFormat"""
+        return _misc.DataObject_GetPreferredFormat(*args, **kwargs)
+
+    def GetFormatCount(*args, **kwargs):
+        """GetFormatCount(wxDataObject::Direction dir=Get) -> size_t"""
+        return _misc.DataObject_GetFormatCount(*args, **kwargs)
+
+    def IsSupported(*args, **kwargs):
+        """IsSupported(DataFormat format, wxDataObject::Direction dir=Get) -> bool"""
+        return _misc.DataObject_IsSupported(*args, **kwargs)
+
+    def GetDataSize(*args, **kwargs):
+        """GetDataSize(DataFormat format) -> size_t"""
+        return _misc.DataObject_GetDataSize(*args, **kwargs)
+
+    def GetAllFormats(*args, **kwargs):
+        """GetAllFormats(DataFormat formats, wxDataObject::Direction dir=Get)"""
+        return _misc.DataObject_GetAllFormats(*args, **kwargs)
+
+    def GetDataHere(*args, **kwargs):
+        """GetDataHere(DataFormat format, void buf) -> bool"""
+        return _misc.DataObject_GetDataHere(*args, **kwargs)
+
+    def SetData(*args, **kwargs):
+        """SetData(DataFormat format, size_t len, void buf) -> bool"""
+        return _misc.DataObject_SetData(*args, **kwargs)
+
 
 class DataObjectPtr(DataObject):
     def __init__(self, this):
@@ -2058,15 +4018,23 @@ _misc.DataObject_swigregister(DataObjectPtr)
 FormatInvalid = cvar.FormatInvalid
 
 class DataObjectSimple(DataObject):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDataObjectSimple instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(DataFormat format=FormatInvalid) -> DataObjectSimple"""
         newobj = _misc.new_DataObjectSimple(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetFormat(*args, **kwargs): return _misc.DataObjectSimple_GetFormat(*args, **kwargs)
-    def SetFormat(*args, **kwargs): return _misc.DataObjectSimple_SetFormat(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDataObjectSimple instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetFormat(*args, **kwargs):
+        """GetFormat() -> DataFormat"""
+        return _misc.DataObjectSimple_GetFormat(*args, **kwargs)
+
+    def SetFormat(*args, **kwargs):
+        """SetFormat(DataFormat format)"""
+        return _misc.DataObjectSimple_SetFormat(*args, **kwargs)
+
 
 class DataObjectSimplePtr(DataObjectSimple):
     def __init__(self, this):
@@ -2076,15 +4044,21 @@ class DataObjectSimplePtr(DataObjectSimple):
 _misc.DataObjectSimple_swigregister(DataObjectSimplePtr)
 
 class PyDataObjectSimple(DataObjectSimple):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyDataObjectSimple instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(DataFormat format=FormatInvalid) -> PyDataObjectSimple"""
         newobj = _misc.new_PyDataObjectSimple(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, PyDataObjectSimple)
-    def _setCallbackInfo(*args, **kwargs): return _misc.PyDataObjectSimple__setCallbackInfo(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyDataObjectSimple instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _misc.PyDataObjectSimple__setCallbackInfo(*args, **kwargs)
+
 
 class PyDataObjectSimplePtr(PyDataObjectSimple):
     def __init__(self, this):
@@ -2094,17 +4068,21 @@ class PyDataObjectSimplePtr(PyDataObjectSimple):
 _misc.PyDataObjectSimple_swigregister(PyDataObjectSimplePtr)
 
 class DataObjectComposite(DataObject):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDataObjectComposite instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> DataObjectComposite"""
         newobj = _misc.new_DataObjectComposite(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def Add(*args, **kwargs): 
+    def Add(*args, **kwargs):
+        """Add(DataObjectSimple dataObject, int preferred=False)"""
         val = _misc.DataObjectComposite_Add(*args, **kwargs)
         args[1].thisown = 0
         return val
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDataObjectComposite instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class DataObjectCompositePtr(DataObjectComposite):
     def __init__(self, this):
@@ -2114,16 +4092,27 @@ class DataObjectCompositePtr(DataObjectComposite):
 _misc.DataObjectComposite_swigregister(DataObjectCompositePtr)
 
 class TextDataObject(DataObjectSimple):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTextDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString text=wxPyEmptyString) -> TextDataObject"""
         newobj = _misc.new_TextDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetTextLength(*args, **kwargs): return _misc.TextDataObject_GetTextLength(*args, **kwargs)
-    def GetText(*args, **kwargs): return _misc.TextDataObject_GetText(*args, **kwargs)
-    def SetText(*args, **kwargs): return _misc.TextDataObject_SetText(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTextDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetTextLength(*args, **kwargs):
+        """GetTextLength() -> size_t"""
+        return _misc.TextDataObject_GetTextLength(*args, **kwargs)
+
+    def GetText(*args, **kwargs):
+        """GetText() -> wxString"""
+        return _misc.TextDataObject_GetText(*args, **kwargs)
+
+    def SetText(*args, **kwargs):
+        """SetText(wxString text)"""
+        return _misc.TextDataObject_SetText(*args, **kwargs)
+
 
 class TextDataObjectPtr(TextDataObject):
     def __init__(self, this):
@@ -2133,15 +4122,21 @@ class TextDataObjectPtr(TextDataObject):
 _misc.TextDataObject_swigregister(TextDataObjectPtr)
 
 class PyTextDataObject(TextDataObject):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyTextDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString text=wxPyEmptyString) -> PyTextDataObject"""
         newobj = _misc.new_PyTextDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, PyTextDataObject)
-    def _setCallbackInfo(*args, **kwargs): return _misc.PyTextDataObject__setCallbackInfo(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTextDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _misc.PyTextDataObject__setCallbackInfo(*args, **kwargs)
+
 
 class PyTextDataObjectPtr(PyTextDataObject):
     def __init__(self, this):
@@ -2151,15 +4146,23 @@ class PyTextDataObjectPtr(PyTextDataObject):
 _misc.PyTextDataObject_swigregister(PyTextDataObjectPtr)
 
 class BitmapDataObject(DataObjectSimple):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBitmapDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxBitmap bitmap=wxNullBitmap) -> BitmapDataObject"""
         newobj = _misc.new_BitmapDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetBitmap(*args, **kwargs): return _misc.BitmapDataObject_GetBitmap(*args, **kwargs)
-    def SetBitmap(*args, **kwargs): return _misc.BitmapDataObject_SetBitmap(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBitmapDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetBitmap(*args, **kwargs):
+        """GetBitmap() -> wxBitmap"""
+        return _misc.BitmapDataObject_GetBitmap(*args, **kwargs)
+
+    def SetBitmap(*args, **kwargs):
+        """SetBitmap(wxBitmap bitmap)"""
+        return _misc.BitmapDataObject_SetBitmap(*args, **kwargs)
+
 
 class BitmapDataObjectPtr(BitmapDataObject):
     def __init__(self, this):
@@ -2169,15 +4172,21 @@ class BitmapDataObjectPtr(BitmapDataObject):
 _misc.BitmapDataObject_swigregister(BitmapDataObjectPtr)
 
 class PyBitmapDataObject(BitmapDataObject):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyBitmapDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxBitmap bitmap=wxNullBitmap) -> PyBitmapDataObject"""
         newobj = _misc.new_PyBitmapDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, PyBitmapDataObject)
-    def _setCallbackInfo(*args, **kwargs): return _misc.PyBitmapDataObject__setCallbackInfo(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyBitmapDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _misc.PyBitmapDataObject__setCallbackInfo(*args, **kwargs)
+
 
 class PyBitmapDataObjectPtr(PyBitmapDataObject):
     def __init__(self, this):
@@ -2187,14 +4196,19 @@ class PyBitmapDataObjectPtr(PyBitmapDataObject):
 _misc.PyBitmapDataObject_swigregister(PyBitmapDataObjectPtr)
 
 class FileDataObject(DataObjectSimple):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFileDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> FileDataObject"""
         newobj = _misc.new_FileDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetFilenames(*args, **kwargs): return _misc.FileDataObject_GetFilenames(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFileDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetFilenames(*args, **kwargs):
+        """GetFilenames() -> wxArrayString"""
+        return _misc.FileDataObject_GetFilenames(*args, **kwargs)
+
 
 class FileDataObjectPtr(FileDataObject):
     def __init__(self, this):
@@ -2204,17 +4218,31 @@ class FileDataObjectPtr(FileDataObject):
 _misc.FileDataObject_swigregister(FileDataObjectPtr)
 
 class CustomDataObject(DataObjectSimple):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCustomDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(DataFormat format=FormatInvalid) -> CustomDataObject"""
         newobj = _misc.new_CustomDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def TakeData(*args, **kwargs): return _misc.CustomDataObject_TakeData(*args, **kwargs)
-    def SetData(*args, **kwargs): return _misc.CustomDataObject_SetData(*args, **kwargs)
-    def GetSize(*args, **kwargs): return _misc.CustomDataObject_GetSize(*args, **kwargs)
-    def GetData(*args, **kwargs): return _misc.CustomDataObject_GetData(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCustomDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def TakeData(*args, **kwargs):
+        """TakeData(PyObject data)"""
+        return _misc.CustomDataObject_TakeData(*args, **kwargs)
+
+    def SetData(*args, **kwargs):
+        """SetData(PyObject data) -> bool"""
+        return _misc.CustomDataObject_SetData(*args, **kwargs)
+
+    def GetSize(*args, **kwargs):
+        """GetSize() -> size_t"""
+        return _misc.CustomDataObject_GetSize(*args, **kwargs)
+
+    def GetData(*args, **kwargs):
+        """GetData() -> PyObject"""
+        return _misc.CustomDataObject_GetData(*args, **kwargs)
+
 
 class CustomDataObjectPtr(CustomDataObject):
     def __init__(self, this):
@@ -2224,15 +4252,23 @@ class CustomDataObjectPtr(CustomDataObject):
 _misc.CustomDataObject_swigregister(CustomDataObjectPtr)
 
 class URLDataObject(DataObjectComposite):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxURLDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> URLDataObject"""
         newobj = _misc.new_URLDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetURL(*args, **kwargs): return _misc.URLDataObject_GetURL(*args, **kwargs)
-    def SetURL(*args, **kwargs): return _misc.URLDataObject_SetURL(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxURLDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetURL(*args, **kwargs):
+        """GetURL() -> wxString"""
+        return _misc.URLDataObject_GetURL(*args, **kwargs)
+
+    def SetURL(*args, **kwargs):
+        """SetURL(wxString url)"""
+        return _misc.URLDataObject_SetURL(*args, **kwargs)
+
 
 class URLDataObjectPtr(URLDataObject):
     def __init__(self, this):
@@ -2242,13 +4278,15 @@ class URLDataObjectPtr(URLDataObject):
 _misc.URLDataObject_swigregister(URLDataObjectPtr)
 
 class MetafileDataObject(DataObjectSimple):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMetafileDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> MetafileDataObject"""
         newobj = _misc.new_MetafileDataObject(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMetafileDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class MetafileDataObjectPtr(MetafileDataObject):
     def __init__(self, this):
@@ -2269,25 +4307,50 @@ DragMove = _misc.DragMove
 DragLink = _misc.DragLink
 DragCancel = _misc.DragCancel
 
-IsDragResultOk = _misc.IsDragResultOk
+def IsDragResultOk(*args, **kwargs):
+    """IsDragResultOk(wxDragResult res) -> bool"""
+    return _misc.IsDragResultOk(*args, **kwargs)
 class DropSource(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyDropSource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window win=None, wxIcon copy=wxNullIcon, wxIcon move=wxNullIcon, 
+    wxIcon none=wxNullIcon) -> DropSource"""
         newobj = _misc.new_DropSource(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def _setCallbackInfo(*args, **kwargs): return _misc.DropSource__setCallbackInfo(*args, **kwargs)
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class, int incref)"""
+        return _misc.DropSource__setCallbackInfo(*args, **kwargs)
+
     def __del__(self, destroy=_misc.delete_DropSource):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def SetData(*args, **kwargs): return _misc.DropSource_SetData(*args, **kwargs)
-    def GetDataObject(*args, **kwargs): return _misc.DropSource_GetDataObject(*args, **kwargs)
-    def SetCursor(*args, **kwargs): return _misc.DropSource_SetCursor(*args, **kwargs)
-    def DoDragDrop(*args, **kwargs): return _misc.DropSource_DoDragDrop(*args, **kwargs)
-    def base_GiveFeedback(*args, **kwargs): return _misc.DropSource_base_GiveFeedback(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyDropSource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetData(*args, **kwargs):
+        """SetData(DataObject data)"""
+        return _misc.DropSource_SetData(*args, **kwargs)
+
+    def GetDataObject(*args, **kwargs):
+        """GetDataObject() -> DataObject"""
+        return _misc.DropSource_GetDataObject(*args, **kwargs)
+
+    def SetCursor(*args, **kwargs):
+        """SetCursor(wxDragResult res, wxCursor cursor)"""
+        return _misc.DropSource_SetCursor(*args, **kwargs)
+
+    def DoDragDrop(*args, **kwargs):
+        """DoDragDrop(int flags=Drag_CopyOnly) -> wxDragResult"""
+        return _misc.DropSource_DoDragDrop(*args, **kwargs)
+
+    def base_GiveFeedback(*args, **kwargs):
+        """base_GiveFeedback(wxDragResult effect) -> bool"""
+        return _misc.DropSource_base_GiveFeedback(*args, **kwargs)
+
 
 class DropSourcePtr(DropSource):
     def __init__(self, this):
@@ -2297,29 +4360,57 @@ class DropSourcePtr(DropSource):
 _misc.DropSource_swigregister(DropSourcePtr)
 
 class DropTarget(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(DataObject dataObject=None) -> DropTarget"""
         newobj = _misc.new_DropTarget(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         if args: args[1].thisown = 0; self._setCallbackInfo(self, DropTarget)
-    def _setCallbackInfo(*args, **kwargs): return _misc.DropTarget__setCallbackInfo(*args, **kwargs)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _misc.DropTarget__setCallbackInfo(*args, **kwargs)
+
     def __del__(self, destroy=_misc.delete_DropTarget):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetDataObject(*args, **kwargs): return _misc.DropTarget_GetDataObject(*args, **kwargs)
-    def SetDataObject(*args, **kwargs): 
+
+    def GetDataObject(*args, **kwargs):
+        """GetDataObject() -> DataObject"""
+        return _misc.DropTarget_GetDataObject(*args, **kwargs)
+
+    def SetDataObject(*args, **kwargs):
+        """SetDataObject(DataObject dataObject)"""
         val = _misc.DropTarget_SetDataObject(*args, **kwargs)
         args[1].thisown = 0
         return val
-    def base_OnEnter(*args, **kwargs): return _misc.DropTarget_base_OnEnter(*args, **kwargs)
-    def base_OnDragOver(*args, **kwargs): return _misc.DropTarget_base_OnDragOver(*args, **kwargs)
-    def base_OnLeave(*args, **kwargs): return _misc.DropTarget_base_OnLeave(*args, **kwargs)
-    def base_OnDrop(*args, **kwargs): return _misc.DropTarget_base_OnDrop(*args, **kwargs)
-    def GetData(*args, **kwargs): return _misc.DropTarget_GetData(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def base_OnEnter(*args, **kwargs):
+        """base_OnEnter(int x, int y, wxDragResult def) -> wxDragResult"""
+        return _misc.DropTarget_base_OnEnter(*args, **kwargs)
+
+    def base_OnDragOver(*args, **kwargs):
+        """base_OnDragOver(int x, int y, wxDragResult def) -> wxDragResult"""
+        return _misc.DropTarget_base_OnDragOver(*args, **kwargs)
+
+    def base_OnLeave(*args, **kwargs):
+        """base_OnLeave()"""
+        return _misc.DropTarget_base_OnLeave(*args, **kwargs)
+
+    def base_OnDrop(*args, **kwargs):
+        """base_OnDrop(int x, int y) -> bool"""
+        return _misc.DropTarget_base_OnDrop(*args, **kwargs)
+
+    def GetData(*args, **kwargs):
+        """GetData() -> bool"""
+        return _misc.DropTarget_GetData(*args, **kwargs)
+
 
 class DropTargetPtr(DropTarget):
     def __init__(self, this):
@@ -2330,20 +4421,41 @@ _misc.DropTarget_swigregister(DropTargetPtr)
 
 PyDropTarget = DropTarget 
 class TextDropTarget(DropTarget):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyTextDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> TextDropTarget"""
         newobj = _misc.new_TextDropTarget(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, TextDropTarget)
-    def _setCallbackInfo(*args, **kwargs): return _misc.TextDropTarget__setCallbackInfo(*args, **kwargs)
-    def base_OnEnter(*args, **kwargs): return _misc.TextDropTarget_base_OnEnter(*args, **kwargs)
-    def base_OnDragOver(*args, **kwargs): return _misc.TextDropTarget_base_OnDragOver(*args, **kwargs)
-    def base_OnLeave(*args, **kwargs): return _misc.TextDropTarget_base_OnLeave(*args, **kwargs)
-    def base_OnDrop(*args, **kwargs): return _misc.TextDropTarget_base_OnDrop(*args, **kwargs)
-    def base_OnData(*args, **kwargs): return _misc.TextDropTarget_base_OnData(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTextDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _misc.TextDropTarget__setCallbackInfo(*args, **kwargs)
+
+    def base_OnEnter(*args, **kwargs):
+        """base_OnEnter(int x, int y, wxDragResult def) -> wxDragResult"""
+        return _misc.TextDropTarget_base_OnEnter(*args, **kwargs)
+
+    def base_OnDragOver(*args, **kwargs):
+        """base_OnDragOver(int x, int y, wxDragResult def) -> wxDragResult"""
+        return _misc.TextDropTarget_base_OnDragOver(*args, **kwargs)
+
+    def base_OnLeave(*args, **kwargs):
+        """base_OnLeave()"""
+        return _misc.TextDropTarget_base_OnLeave(*args, **kwargs)
+
+    def base_OnDrop(*args, **kwargs):
+        """base_OnDrop(int x, int y) -> bool"""
+        return _misc.TextDropTarget_base_OnDrop(*args, **kwargs)
+
+    def base_OnData(*args, **kwargs):
+        """base_OnData(int x, int y, wxDragResult def) -> wxDragResult"""
+        return _misc.TextDropTarget_base_OnData(*args, **kwargs)
+
 
 class TextDropTargetPtr(TextDropTarget):
     def __init__(self, this):
@@ -2353,20 +4465,41 @@ class TextDropTargetPtr(TextDropTarget):
 _misc.TextDropTarget_swigregister(TextDropTargetPtr)
 
 class FileDropTarget(DropTarget):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyFileDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> FileDropTarget"""
         newobj = _misc.new_FileDropTarget(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, FileDropTarget)
-    def _setCallbackInfo(*args, **kwargs): return _misc.FileDropTarget__setCallbackInfo(*args, **kwargs)
-    def base_OnEnter(*args, **kwargs): return _misc.FileDropTarget_base_OnEnter(*args, **kwargs)
-    def base_OnDragOver(*args, **kwargs): return _misc.FileDropTarget_base_OnDragOver(*args, **kwargs)
-    def base_OnLeave(*args, **kwargs): return _misc.FileDropTarget_base_OnLeave(*args, **kwargs)
-    def base_OnDrop(*args, **kwargs): return _misc.FileDropTarget_base_OnDrop(*args, **kwargs)
-    def base_OnData(*args, **kwargs): return _misc.FileDropTarget_base_OnData(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyFileDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _misc.FileDropTarget__setCallbackInfo(*args, **kwargs)
+
+    def base_OnEnter(*args, **kwargs):
+        """base_OnEnter(int x, int y, wxDragResult def) -> wxDragResult"""
+        return _misc.FileDropTarget_base_OnEnter(*args, **kwargs)
+
+    def base_OnDragOver(*args, **kwargs):
+        """base_OnDragOver(int x, int y, wxDragResult def) -> wxDragResult"""
+        return _misc.FileDropTarget_base_OnDragOver(*args, **kwargs)
+
+    def base_OnLeave(*args, **kwargs):
+        """base_OnLeave()"""
+        return _misc.FileDropTarget_base_OnLeave(*args, **kwargs)
+
+    def base_OnDrop(*args, **kwargs):
+        """base_OnDrop(int x, int y) -> bool"""
+        return _misc.FileDropTarget_base_OnDrop(*args, **kwargs)
+
+    def base_OnData(*args, **kwargs):
+        """base_OnData(int x, int y, wxDragResult def) -> wxDragResult"""
+        return _misc.FileDropTarget_base_OnData(*args, **kwargs)
+
 
 class FileDropTargetPtr(FileDropTarget):
     def __init__(self, this):
@@ -2378,27 +4511,61 @@ _misc.FileDropTarget_swigregister(FileDropTargetPtr)
 #---------------------------------------------------------------------------
 
 class Clipboard(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxClipboard instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> Clipboard"""
         newobj = _misc.new_Clipboard(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_Clipboard):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Open(*args, **kwargs): return _misc.Clipboard_Open(*args, **kwargs)
-    def Close(*args, **kwargs): return _misc.Clipboard_Close(*args, **kwargs)
-    def IsOpened(*args, **kwargs): return _misc.Clipboard_IsOpened(*args, **kwargs)
-    def AddData(*args, **kwargs): return _misc.Clipboard_AddData(*args, **kwargs)
-    def SetData(*args, **kwargs): return _misc.Clipboard_SetData(*args, **kwargs)
-    def IsSupported(*args, **kwargs): return _misc.Clipboard_IsSupported(*args, **kwargs)
-    def GetData(*args, **kwargs): return _misc.Clipboard_GetData(*args, **kwargs)
-    def Clear(*args, **kwargs): return _misc.Clipboard_Clear(*args, **kwargs)
-    def Flush(*args, **kwargs): return _misc.Clipboard_Flush(*args, **kwargs)
-    def UsePrimarySelection(*args, **kwargs): return _misc.Clipboard_UsePrimarySelection(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxClipboard instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Open(*args, **kwargs):
+        """Open() -> bool"""
+        return _misc.Clipboard_Open(*args, **kwargs)
+
+    def Close(*args, **kwargs):
+        """Close()"""
+        return _misc.Clipboard_Close(*args, **kwargs)
+
+    def IsOpened(*args, **kwargs):
+        """IsOpened() -> bool"""
+        return _misc.Clipboard_IsOpened(*args, **kwargs)
+
+    def AddData(*args, **kwargs):
+        """AddData(DataObject data) -> bool"""
+        return _misc.Clipboard_AddData(*args, **kwargs)
+
+    def SetData(*args, **kwargs):
+        """SetData(DataObject data) -> bool"""
+        return _misc.Clipboard_SetData(*args, **kwargs)
+
+    def IsSupported(*args, **kwargs):
+        """IsSupported(DataFormat format) -> bool"""
+        return _misc.Clipboard_IsSupported(*args, **kwargs)
+
+    def GetData(*args, **kwargs):
+        """GetData(DataObject data) -> bool"""
+        return _misc.Clipboard_GetData(*args, **kwargs)
+
+    def Clear(*args, **kwargs):
+        """Clear()"""
+        return _misc.Clipboard_Clear(*args, **kwargs)
+
+    def Flush(*args, **kwargs):
+        """Flush() -> bool"""
+        return _misc.Clipboard_Flush(*args, **kwargs)
+
+    def UsePrimarySelection(*args, **kwargs):
+        """UsePrimarySelection(bool primary=False)"""
+        return _misc.Clipboard_UsePrimarySelection(*args, **kwargs)
+
 
 class ClipboardPtr(Clipboard):
     def __init__(self, this):
@@ -2408,18 +4575,25 @@ class ClipboardPtr(Clipboard):
 _misc.Clipboard_swigregister(ClipboardPtr)
 
 class ClipboardLocker(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxClipboardLocker instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Clipboard clipboard=None) -> ClipboardLocker"""
         newobj = _misc.new_ClipboardLocker(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_misc.delete_ClipboardLocker):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __nonzero__(*args, **kwargs): return _misc.ClipboardLocker___nonzero__(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxClipboardLocker instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def __nonzero__(*args, **kwargs):
+        """__nonzero__() -> bool"""
+        return _misc.ClipboardLocker___nonzero__(*args, **kwargs)
+
 
 class ClipboardLockerPtr(ClipboardLocker):
     def __init__(self, this):
diff --git a/wxPython/src/gtk/misc_wrap.cpp b/wxPython/src/gtk/misc_wrap.cpp
index b9299c6ba3..37b1f89280 100644
--- a/wxPython/src/gtk/misc_wrap.cpp
+++ b/wxPython/src/gtk/misc_wrap.cpp
@@ -368,7 +368,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 #ifdef WXP_WITH_THREAD
         return wxThread::IsMain();
 #else
-        return TRUE;
+        return True;
 #endif
     }
 
@@ -437,12 +437,12 @@ void wxDrawWindowOnDC(wxWindow* window, const wxDC& dc, int method)
             // WM_PRINT.  For most native widgets nothing is drawn to the dc
             // at all, with or without Themes.
             typedef BOOL (WINAPI *PrintWindow_t)(HWND, HDC, UINT);
-            static bool s_triedToLoad = false;
+            static bool s_triedToLoad = False;
             static PrintWindow_t pfnPrintWindow = NULL;
             if ( !s_triedToLoad )
             {
 
-                s_triedToLoad = true;
+                s_triedToLoad = True;
                 wxDynamicLibrary dllUser32(_T("user32.dll"));
                 if ( dllUser32.IsLoaded() )
                 {
@@ -556,7 +556,7 @@ public:
     int GetMovementThreshold() { return -1; }
     void SetMovementThreshold(int threshold) {}
 
-    bool IsOk(void) { return FALSE; }
+    bool IsOk(void) { return False; }
     int GetNumberJoysticks() { return -1; }
     int GetManufacturerId() { return -1; }
     int GetProductId() { return -1; }
@@ -580,16 +580,16 @@ public:
     int GetVMin() { return -1; }
     int GetVMax() { return -1; }
 
-    bool HasRudder() { return FALSE; }
-    bool HasZ() { return FALSE; }
-    bool HasU() { return FALSE; }
-    bool HasV() { return FALSE; }
-    bool HasPOV() { return FALSE; }
-    bool HasPOV4Dir() { return FALSE; }
-    bool HasPOVCTS() { return FALSE; }
+    bool HasRudder() { return False; }
+    bool HasZ() { return False; }
+    bool HasU() { return False; }
+    bool HasV() { return False; }
+    bool HasPOV() { return False; }
+    bool HasPOV4Dir() { return False; }
+    bool HasPOVCTS() { return False; }
 
-    bool SetCapture(wxWindow* win, int pollingFreq = 0) { return FALSE; }
-    bool ReleaseCapture() { return FALSE; }
+    bool SetCapture(wxWindow* win, int pollingFreq = 0) { return False; }
+    bool ReleaseCapture() { return False; }
 };
 #endif
 
@@ -602,7 +602,7 @@ public:
 class wxWave : public wxObject
 {
 public:
-    wxWave(const wxString& fileName, bool isResource = FALSE) {
+    wxWave(const wxString& fileName, bool isResource = False) {
         wxPyBeginBlockThreads();
         PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform.");
         wxPyEndBlockThreads();
@@ -615,8 +615,8 @@ public:
 
     ~wxWave() {}
 
-    bool  IsOk() const { return FALSE; }
-    bool  Play(bool async = TRUE, bool looped = FALSE) const { return FALSE; }
+    bool  IsOk() const { return False; }
+    bool  Play(bool async = True, bool looped = False) const { return False; }
 };
 
 #endif
@@ -667,7 +667,7 @@ PyObject *wxFileType_GetIconInfo(wxFileType *self){
                 wxPyBeginBlockThreads();
                 PyObject* tuple = PyTuple_New(3);
                 PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(loc),
-                                                              wxT("wxIcon"), TRUE));
+                                                              wxT("wxIcon"), True));
                 PyTuple_SetItem(tuple, 1, wx2PyString(iconFile));
                 PyTuple_SetItem(tuple, 2, PyInt_FromLong(iconIndex));
                 wxPyEndBlockThreads();
@@ -948,7 +948,7 @@ bool wxPyDataObjectSimple::GetDataHere(void *buf) const {
     // return either a string or None and then act appropriately with the
     // C++ version.
 
-    bool rval = FALSE;
+    bool rval = False;
     wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "GetDataHere")) {
         PyObject* ro;
@@ -967,7 +967,7 @@ bool wxPyDataObjectSimple::GetDataHere(void *buf) const {
 bool wxPyDataObjectSimple::SetData(size_t len, const void *buf) const{
     // For this one we simply need to make a string from buf and len
     // and send it to the Python method.
-    bool rval = FALSE;
+    bool rval = False;
     wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "SetData")) {
         PyObject* data = PyString_FromStringAndSize((char*)buf, len);
@@ -1026,7 +1026,7 @@ wxBitmap wxPyBitmapDataObject::GetBitmap() const {
 void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) {
     wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "SetBitmap")) {
-        PyObject* bo = wxPyConstructObject((void*)&bitmap, wxT("wxBitmap"), false);
+        PyObject* bo = wxPyConstructObject((void*)&bitmap, wxT("wxBitmap"), False);
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", bo));
         Py_DECREF(bo);
     }
@@ -1050,7 +1050,7 @@ bool wxCustomDataObject_SetData(wxCustomDataObject *self,PyObject *data){
             else {
                 // raise a TypeError if not a string
                 PyErr_SetString(PyExc_TypeError, "String expected.");
-                return FALSE;
+                return False;
             }
         }
 PyObject *wxCustomDataObject_GetData(wxCustomDataObject *self){
@@ -1108,7 +1108,7 @@ public:
     // execute or otherwise mouse movement would be too slow
     DEC_PYCALLBACK_DR_2WXCDR(OnDragOver);
     
-    // called after OnDrop() returns TRUE: you will usually just call
+    // called after OnDrop() returns True: you will usually just call
     // GetData() from here and, probably, also refresh something to update the
     // new data and, finally, return the code indicating how did the operation
     // complete (returning default value in case of success and wxDragError on
@@ -1116,7 +1116,7 @@ public:
     DEC_PYCALLBACK_DR_2WXCDR_pure(OnData);
     
     // this function is called when data is dropped at position (x, y) - if it
-    // returns TRUE, OnData() will be called immediately afterwards which will
+    // returns True, OnData() will be called immediately afterwards which will
     // allow to retrieve the data dropped.
     DEC_PYCALLBACK_BOOL_INTINT(OnDrop);
 
@@ -1172,7 +1172,7 @@ public:
 
 bool wxPyFileDropTarget::OnDropFiles(wxCoord x, wxCoord y,
                                      const wxArrayString& filenames) {
-    bool rval = FALSE;
+    bool rval = False;
     wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "OnDropFiles")) {
         PyObject* list = wxArrayString2PyList_helper(filenames);
@@ -1375,8 +1375,8 @@ static PyObject *_wrap_SystemOptions_SetOption(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -1387,12 +1387,12 @@ static PyObject *_wrap_SystemOptions_SetOption(PyObject *self, PyObject *args, P
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1428,7 +1428,7 @@ static PyObject *_wrap_SystemOptions_SetOptionInt(PyObject *self, PyObject *args
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     int arg2 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "name",(char *) "value", NULL 
@@ -1438,7 +1438,7 @@ static PyObject *_wrap_SystemOptions_SetOptionInt(PyObject *self, PyObject *args
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1466,7 +1466,7 @@ static PyObject *_wrap_SystemOptions_GetOption(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "name", NULL 
@@ -1476,7 +1476,7 @@ static PyObject *_wrap_SystemOptions_GetOption(PyObject *self, PyObject *args, P
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1510,7 +1510,7 @@ static PyObject *_wrap_SystemOptions_GetOptionInt(PyObject *self, PyObject *args
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     int result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "name", NULL 
@@ -1520,7 +1520,7 @@ static PyObject *_wrap_SystemOptions_GetOptionInt(PyObject *self, PyObject *args
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1548,7 +1548,7 @@ static PyObject *_wrap_SystemOptions_HasOption(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "name", NULL 
@@ -1558,7 +1558,7 @@ static PyObject *_wrap_SystemOptions_HasOption(PyObject *self, PyObject *args, P
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1699,7 +1699,7 @@ static PyObject *_wrap_EndBusyCursor(PyObject *self, PyObject *args, PyObject *k
 
 static PyObject *_wrap_GetElapsedTime(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    bool arg1 = (bool) TRUE ;
+    bool arg1 = (bool) True ;
     long result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -1815,7 +1815,7 @@ static PyObject *_wrap_Shell(PyObject *self, PyObject *args, PyObject *kwargs) {
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
     bool result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "command", NULL 
@@ -1826,7 +1826,7 @@ static PyObject *_wrap_Shell(PyObject *self, PyObject *args, PyObject *kwargs) {
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     {
@@ -2057,7 +2057,7 @@ static PyObject *_wrap_StripMenuCodes(PyObject *self, PyObject *args, PyObject *
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "in", NULL 
@@ -2067,7 +2067,7 @@ static PyObject *_wrap_StripMenuCodes(PyObject *self, PyObject *args, PyObject *
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2270,7 +2270,7 @@ static PyObject *_wrap_GetUserHome(PyObject *self, PyObject *args, PyObject *kwa
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
     wxString result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "user", NULL 
@@ -2281,7 +2281,7 @@ static PyObject *_wrap_GetUserHome(PyObject *self, PyObject *args, PyObject *kwa
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     {
@@ -2372,11 +2372,11 @@ static PyObject *_wrap_FileSelector(PyObject *self, PyObject *args, PyObject *kw
     int arg8 = (int) -1 ;
     int arg9 = (int) -1 ;
     wxString result;
-    bool temp1 = false ;
-    bool temp2 = false ;
-    bool temp3 = false ;
-    bool temp4 = false ;
-    bool temp5 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
+    bool temp3 = False ;
+    bool temp4 = False ;
+    bool temp5 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -2392,35 +2392,35 @@ static PyObject *_wrap_FileSelector(PyObject *self, PyObject *args, PyObject *kw
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     if (obj4) {
         {
             arg5 = wxString_in_helper(obj4);
             if (arg5 == NULL) SWIG_fail;
-            temp5 = true;
+            temp5 = True;
         }
     }
     if (obj6) {
@@ -2494,9 +2494,9 @@ static PyObject *_wrap_LoadFileSelector(PyObject *self, PyObject *args, PyObject
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxWindow *arg4 = (wxWindow *) NULL ;
     wxString result;
-    bool temp1 = false ;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -2509,18 +2509,18 @@ static PyObject *_wrap_LoadFileSelector(PyObject *self, PyObject *args, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
@@ -2578,9 +2578,9 @@ static PyObject *_wrap_SaveFileSelector(PyObject *self, PyObject *args, PyObject
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxWindow *arg4 = (wxWindow *) NULL ;
     wxString result;
-    bool temp1 = false ;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -2593,18 +2593,18 @@ static PyObject *_wrap_SaveFileSelector(PyObject *self, PyObject *args, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
@@ -2665,8 +2665,8 @@ static PyObject *_wrap_DirSelector(PyObject *self, PyObject *args, PyObject *kwa
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxWindow *arg5 = (wxWindow *) NULL ;
     wxString result;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     wxPoint temp4 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -2681,14 +2681,14 @@ static PyObject *_wrap_DirSelector(PyObject *self, PyObject *args, PyObject *kwa
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj3) {
@@ -2746,11 +2746,11 @@ static PyObject *_wrap_GetTextFromUser(PyObject *self, PyObject *args, PyObject
     wxWindow *arg4 = (wxWindow *) NULL ;
     int arg5 = (int) -1 ;
     int arg6 = (int) -1 ;
-    bool arg7 = (bool) TRUE ;
+    bool arg7 = (bool) True ;
     wxString result;
-    bool temp1 = false ;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -2764,20 +2764,20 @@ static PyObject *_wrap_GetTextFromUser(PyObject *self, PyObject *args, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
@@ -2840,9 +2840,9 @@ static PyObject *_wrap_GetPasswordFromUser(PyObject *self, PyObject *args, PyObj
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxWindow *arg4 = (wxWindow *) NULL ;
     wxString result;
-    bool temp1 = false ;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -2855,20 +2855,20 @@ static PyObject *_wrap_GetPasswordFromUser(PyObject *self, PyObject *args, PyObj
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
@@ -2927,12 +2927,12 @@ static PyObject *_wrap_GetSingleChoice(PyObject *self, PyObject *args, PyObject
     wxWindow *arg5 = (wxWindow *) NULL ;
     int arg6 = (int) -1 ;
     int arg7 = (int) -1 ;
-    bool arg8 = (bool) TRUE ;
+    bool arg8 = (bool) True ;
     int arg9 = (int) 150 ;
     int arg10 = (int) 200 ;
     wxString result;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -2946,12 +2946,12 @@ static PyObject *_wrap_GetSingleChoice(PyObject *self, PyObject *args, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = PyList_Size(obj2);
@@ -3016,12 +3016,12 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb
     wxWindow *arg5 = (wxWindow *) NULL ;
     int arg6 = (int) -1 ;
     int arg7 = (int) -1 ;
-    bool arg8 = (bool) TRUE ;
+    bool arg8 = (bool) True ;
     int arg9 = (int) 150 ;
     int arg10 = (int) 200 ;
     int result;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3035,12 +3035,12 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = PyList_Size(obj2);
@@ -3100,8 +3100,8 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar
     int arg5 = (int) -1 ;
     int arg6 = (int) -1 ;
     int result;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -3113,13 +3113,13 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj3) {
@@ -3167,9 +3167,9 @@ static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObjec
     wxPoint const &arg8_defvalue = wxDefaultPosition ;
     wxPoint *arg8 = (wxPoint *) &arg8_defvalue ;
     long result;
-    bool temp1 = false ;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     wxPoint temp8 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -3184,17 +3184,17 @@ static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObjec
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj6) {
         if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -3814,7 +3814,7 @@ static PyObject *_wrap_new_ToolTip(PyObject *self, PyObject *args, PyObject *kwa
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxToolTip *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "tip", NULL 
@@ -3824,7 +3824,7 @@ static PyObject *_wrap_new_ToolTip(PyObject *self, PyObject *args, PyObject *kwa
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3854,7 +3854,7 @@ static PyObject *_wrap_ToolTip_SetTip(PyObject *self, PyObject *args, PyObject *
     PyObject *resultobj;
     wxToolTip *arg1 = (wxToolTip *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3866,7 +3866,7 @@ static PyObject *_wrap_ToolTip_SetTip(PyObject *self, PyObject *args, PyObject *
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4386,7 +4386,7 @@ static PyObject *_wrap_Caret_SetSize(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_Caret_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
-    int arg2 = (int) TRUE ;
+    int arg2 = (int) True ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "show", NULL 
@@ -4603,7 +4603,7 @@ static PyObject *_wrap_new_BusyInfo(PyObject *self, PyObject *args, PyObject *kw
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxBusyInfo *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "message", NULL 
@@ -4613,7 +4613,7 @@ static PyObject *_wrap_new_BusyInfo(PyObject *self, PyObject *args, PyObject *kw
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4846,7 +4846,7 @@ static PyObject *_wrap_FileHistory_AddFileToHistory(PyObject *self, PyObject *ar
     PyObject *resultobj;
     wxFileHistory *arg1 = (wxFileHistory *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4858,7 +4858,7 @@ static PyObject *_wrap_FileHistory_AddFileToHistory(PyObject *self, PyObject *ar
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5167,8 +5167,8 @@ static PyObject *_wrap_new_SingleInstanceChecker(PyObject *self, PyObject *args,
     wxString const &arg2_defvalue = wxPyEmptyString ;
     wxString *arg2 = (wxString *) &arg2_defvalue ;
     wxSingleInstanceChecker *result;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5179,13 +5179,13 @@ static PyObject *_wrap_new_SingleInstanceChecker(PyObject *self, PyObject *args,
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     {
@@ -5271,8 +5271,8 @@ static PyObject *_wrap_SingleInstanceChecker_Create(PyObject *self, PyObject *ar
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     bool result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -5285,13 +5285,13 @@ static PyObject *_wrap_SingleInstanceChecker_Create(PyObject *self, PyObject *ar
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -5472,7 +5472,7 @@ static PyObject *_wrap_TipProvider_PreprocessTip(PyObject *self, PyObject *args,
     wxTipProvider *arg1 = (wxTipProvider *) 0 ;
     wxString *arg2 = 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5484,7 +5484,7 @@ static PyObject *_wrap_TipProvider_PreprocessTip(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5588,7 +5588,7 @@ static PyObject *_wrap_ShowTip(PyObject *self, PyObject *args, PyObject *kwargs)
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxTipProvider *arg2 = (wxTipProvider *) 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -5623,7 +5623,7 @@ static PyObject *_wrap_CreateFileTipProvider(PyObject *self, PyObject *args, PyO
     wxString *arg1 = 0 ;
     size_t arg2 ;
     wxTipProvider *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -5634,7 +5634,7 @@ static PyObject *_wrap_CreateFileTipProvider(PyObject *self, PyObject *args, PyO
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     arg2 = (size_t) PyInt_AsLong(obj1);
     if (PyErr_Occurred()) SWIG_fail;
@@ -5744,7 +5744,7 @@ static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwa
     PyObject *resultobj;
     wxPyTimer *arg1 = (wxPyTimer *) 0 ;
     int arg2 = (int) -1 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
@@ -5987,7 +5987,7 @@ static PyObject *_wrap_new_TimerRunner__SWIG_1(PyObject *self, PyObject *args) {
     PyObject *resultobj;
     wxTimer *arg1 = 0 ;
     int arg2 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     wxTimerRunner *result;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6101,7 +6101,7 @@ static PyObject *_wrap_TimerRunner_Start(PyObject *self, PyObject *args, PyObjec
     PyObject *resultobj;
     wxTimerRunner *arg1 = (wxTimerRunner *) 0 ;
     int arg2 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -6181,7 +6181,7 @@ static PyObject *_wrap_Log_IsEnabled(PyObject *self, PyObject *args, PyObject *k
 
 static PyObject *_wrap_Log_EnableLogging(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    bool arg1 = (bool) TRUE ;
+    bool arg1 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -6375,7 +6375,7 @@ static PyObject *_wrap_Log_Resume(PyObject *self, PyObject *args, PyObject *kwar
 
 static PyObject *_wrap_Log_SetVerbose(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    bool arg1 = (bool) TRUE ;
+    bool arg1 = (bool) True ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "bVerbose", NULL 
@@ -6474,7 +6474,7 @@ static PyObject *_wrap_Log_SetTraceMask(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_Log_AddTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "str", NULL 
@@ -6484,7 +6484,7 @@ static PyObject *_wrap_Log_AddTraceMask(PyObject *self, PyObject *args, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6511,7 +6511,7 @@ static PyObject *_wrap_Log_AddTraceMask(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_Log_RemoveTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "str", NULL 
@@ -6521,7 +6521,7 @@ static PyObject *_wrap_Log_RemoveTraceMask(PyObject *self, PyObject *args, PyObj
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6883,10 +6883,10 @@ static PyObject *_wrap_new_LogWindow(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxString *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
-    bool arg4 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
+    bool arg4 = (bool) True ;
     wxLogWindow *result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6900,7 +6900,7 @@ static PyObject *_wrap_new_LogWindow(PyObject *self, PyObject *args, PyObject *k
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         arg3 = PyInt_AsLong(obj2) ? true : false;
@@ -6935,7 +6935,7 @@ static PyObject *_wrap_new_LogWindow(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_LogWindow_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogWindow *arg1 = (wxLogWindow *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7270,7 +7270,7 @@ static PyObject *_wrap_SysErrorMsg(PyObject *self, PyObject *args, PyObject *kwa
 static PyObject *_wrap_LogFatalError(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "msg", NULL 
@@ -7280,7 +7280,7 @@ static PyObject *_wrap_LogFatalError(PyObject *self, PyObject *args, PyObject *k
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7307,7 +7307,7 @@ static PyObject *_wrap_LogFatalError(PyObject *self, PyObject *args, PyObject *k
 static PyObject *_wrap_LogError(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "msg", NULL 
@@ -7317,7 +7317,7 @@ static PyObject *_wrap_LogError(PyObject *self, PyObject *args, PyObject *kwargs
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7344,7 +7344,7 @@ static PyObject *_wrap_LogError(PyObject *self, PyObject *args, PyObject *kwargs
 static PyObject *_wrap_LogWarning(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "msg", NULL 
@@ -7354,7 +7354,7 @@ static PyObject *_wrap_LogWarning(PyObject *self, PyObject *args, PyObject *kwar
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7381,7 +7381,7 @@ static PyObject *_wrap_LogWarning(PyObject *self, PyObject *args, PyObject *kwar
 static PyObject *_wrap_LogMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "msg", NULL 
@@ -7391,7 +7391,7 @@ static PyObject *_wrap_LogMessage(PyObject *self, PyObject *args, PyObject *kwar
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7418,7 +7418,7 @@ static PyObject *_wrap_LogMessage(PyObject *self, PyObject *args, PyObject *kwar
 static PyObject *_wrap_LogInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "msg", NULL 
@@ -7428,7 +7428,7 @@ static PyObject *_wrap_LogInfo(PyObject *self, PyObject *args, PyObject *kwargs)
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7455,7 +7455,7 @@ static PyObject *_wrap_LogInfo(PyObject *self, PyObject *args, PyObject *kwargs)
 static PyObject *_wrap_LogDebug(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "msg", NULL 
@@ -7465,7 +7465,7 @@ static PyObject *_wrap_LogDebug(PyObject *self, PyObject *args, PyObject *kwargs
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7492,7 +7492,7 @@ static PyObject *_wrap_LogDebug(PyObject *self, PyObject *args, PyObject *kwargs
 static PyObject *_wrap_LogVerbose(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "msg", NULL 
@@ -7502,7 +7502,7 @@ static PyObject *_wrap_LogVerbose(PyObject *self, PyObject *args, PyObject *kwar
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7529,7 +7529,7 @@ static PyObject *_wrap_LogVerbose(PyObject *self, PyObject *args, PyObject *kwar
 static PyObject *_wrap_LogStatus(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "msg", NULL 
@@ -7539,7 +7539,7 @@ static PyObject *_wrap_LogStatus(PyObject *self, PyObject *args, PyObject *kwarg
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7567,7 +7567,7 @@ static PyObject *_wrap_LogStatusFrame(PyObject *self, PyObject *args, PyObject *
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7579,7 +7579,7 @@ static PyObject *_wrap_LogStatusFrame(PyObject *self, PyObject *args, PyObject *
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7606,7 +7606,7 @@ static PyObject *_wrap_LogStatusFrame(PyObject *self, PyObject *args, PyObject *
 static PyObject *_wrap_LogSysError(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "msg", NULL 
@@ -7616,7 +7616,7 @@ static PyObject *_wrap_LogSysError(PyObject *self, PyObject *args, PyObject *kwa
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7643,7 +7643,7 @@ static PyObject *_wrap_LogSysError(PyObject *self, PyObject *args, PyObject *kwa
 static PyObject *_wrap_LogTrace(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "msg", NULL 
@@ -7653,7 +7653,7 @@ static PyObject *_wrap_LogTrace(PyObject *self, PyObject *args, PyObject *kwargs
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7681,8 +7681,8 @@ static PyObject *_wrap_LogTraceMask(PyObject *self, PyObject *args, PyObject *kw
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7693,12 +7693,12 @@ static PyObject *_wrap_LogTraceMask(PyObject *self, PyObject *args, PyObject *kw
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7734,7 +7734,7 @@ static PyObject *_wrap_LogGeneric(PyObject *self, PyObject *args, PyObject *kwar
     PyObject *resultobj;
     unsigned long arg1 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7747,7 +7747,7 @@ static PyObject *_wrap_LogGeneric(PyObject *self, PyObject *args, PyObject *kwar
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7775,8 +7775,8 @@ static PyObject *_wrap_SafeShowMessage(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -7787,12 +7787,12 @@ static PyObject *_wrap_SafeShowMessage(PyObject *self, PyObject *args, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7988,7 +7988,7 @@ static PyObject *_wrap_Process_Open(PyObject *self, PyObject *args, PyObject *kw
     wxString *arg1 = 0 ;
     int arg2 = (int) wxEXEC_ASYNC ;
     wxPyProcess *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "cmd",(char *) "flags", NULL 
@@ -7998,7 +7998,7 @@ static PyObject *_wrap_Process_Open(PyObject *self, PyObject *args, PyObject *kw
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8203,7 +8203,7 @@ static PyObject *_wrap_Process_GetInputStream(PyObject *self, PyObject *args, Py
         if (result) {
             _ptr = new wxPyInputStream(result);
         }
-        resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), true);
+        resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), True);
     }
     return resultobj;
     fail:
@@ -8235,7 +8235,7 @@ static PyObject *_wrap_Process_GetErrorStream(PyObject *self, PyObject *args, Py
         if (result) {
             _ptr = new wxPyInputStream(result);
         }
-        resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), true);
+        resultobj = wxPyConstructObject(_ptr, wxT("wxPyInputStream"), True);
     }
     return resultobj;
     fail:
@@ -8542,7 +8542,7 @@ static PyObject *_wrap_Execute(PyObject *self, PyObject *args, PyObject *kwargs)
     int arg2 = (int) wxEXEC_ASYNC ;
     wxPyProcess *arg3 = (wxPyProcess *) NULL ;
     long result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -8553,7 +8553,7 @@ static PyObject *_wrap_Execute(PyObject *self, PyObject *args, PyObject *kwargs)
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if (obj2) {
         if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxPyProcess,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -10349,9 +10349,9 @@ static PyObject * JoystickEvent_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_Wave(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
-    bool arg2 = (bool) FALSE ;
+    bool arg2 = (bool) False ;
     wxWave *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10362,7 +10362,7 @@ static PyObject *_wrap_new_Wave(PyObject *self, PyObject *args, PyObject *kwargs
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if (obj1) {
         arg2 = PyInt_AsLong(obj1) ? true : false;
@@ -10394,7 +10394,7 @@ static PyObject *_wrap_new_WaveData(PyObject *self, PyObject *args, PyObject *kw
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxWave *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "data", NULL 
@@ -10404,7 +10404,7 @@ static PyObject *_wrap_new_WaveData(PyObject *self, PyObject *args, PyObject *kw
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10480,8 +10480,8 @@ static PyObject *_wrap_Wave_IsOk(PyObject *self, PyObject *args, PyObject *kwarg
 static PyObject *_wrap_Wave_Play(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWave *arg1 = (wxWave *) 0 ;
-    bool arg2 = (bool) TRUE ;
-    bool arg3 = (bool) FALSE ;
+    bool arg2 = (bool) True ;
+    bool arg3 = (bool) False ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -10528,10 +10528,10 @@ static PyObject *_wrap_new_FileTypeInfo(PyObject *self, PyObject *args, PyObject
     wxString *arg3 = 0 ;
     wxString *arg4 = 0 ;
     wxFileTypeInfo *result;
-    bool temp1 = false ;
-    bool temp2 = false ;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -10544,22 +10544,22 @@ static PyObject *_wrap_new_FileTypeInfo(PyObject *self, PyObject *args, PyObject
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10708,7 +10708,7 @@ static PyObject *_wrap_FileTypeInfo_SetIcon(PyObject *self, PyObject *args, PyOb
     wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 = (int) 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10720,7 +10720,7 @@ static PyObject *_wrap_FileTypeInfo_SetIcon(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10748,7 +10748,7 @@ static PyObject *_wrap_FileTypeInfo_SetShortDesc(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10760,7 +10760,7 @@ static PyObject *_wrap_FileTypeInfo_SetShortDesc(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11248,8 +11248,8 @@ static PyObject *_wrap_FileType_GetOpenCommand(PyObject *self, PyObject *args, P
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     PyObject *result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11262,13 +11262,13 @@ static PyObject *_wrap_FileType_GetOpenCommand(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -11308,8 +11308,8 @@ static PyObject *_wrap_FileType_GetPrintCommand(PyObject *self, PyObject *args,
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     PyObject *result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11322,13 +11322,13 @@ static PyObject *_wrap_FileType_GetPrintCommand(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -11368,8 +11368,8 @@ static PyObject *_wrap_FileType_GetAllCommands(PyObject *self, PyObject *args, P
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     PyObject *result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11382,13 +11382,13 @@ static PyObject *_wrap_FileType_GetAllCommands(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -11426,10 +11426,10 @@ static PyObject *_wrap_FileType_SetCommand(PyObject *self, PyObject *args, PyObj
     wxFileType *arg1 = (wxFileType *) 0 ;
     wxString *arg2 = 0 ;
     wxString *arg3 = 0 ;
-    bool arg4 = (bool) TRUE ;
+    bool arg4 = (bool) True ;
     bool result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11443,12 +11443,12 @@ static PyObject *_wrap_FileType_SetCommand(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         arg4 = PyInt_AsLong(obj3) ? true : false;
@@ -11491,7 +11491,7 @@ static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *self, PyObject *args, P
     wxString *arg2 = (wxString *) &arg2_defvalue ;
     int arg3 = (int) 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -11504,7 +11504,7 @@ static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *self, PyObject *args, P
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     {
@@ -11561,9 +11561,9 @@ static PyObject *_wrap_FileType_ExpandCommand(PyObject *self, PyObject *args, Py
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxString result;
-    bool temp1 = false ;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11575,18 +11575,18 @@ static PyObject *_wrap_FileType_ExpandCommand(PyObject *self, PyObject *args, Py
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -11659,8 +11659,8 @@ static PyObject *_wrap_MimeTypesManager_IsOfType(PyObject *self, PyObject *args,
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -11671,12 +11671,12 @@ static PyObject *_wrap_MimeTypesManager_IsOfType(PyObject *self, PyObject *args,
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11736,7 +11736,7 @@ static PyObject *_wrap_MimeTypesManager_Initialize(PyObject *self, PyObject *arg
     int arg2 = (int) wxMAILCAP_ALL ;
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -11749,7 +11749,7 @@ static PyObject *_wrap_MimeTypesManager_Initialize(PyObject *self, PyObject *arg
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -11803,7 +11803,7 @@ static PyObject *_wrap_MimeTypesManager_GetFileTypeFromExtension(PyObject *self,
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     wxString *arg2 = 0 ;
     wxFileType *result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -11815,7 +11815,7 @@ static PyObject *_wrap_MimeTypesManager_GetFileTypeFromExtension(PyObject *self,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11844,7 +11844,7 @@ static PyObject *_wrap_MimeTypesManager_GetFileTypeFromMimeType(PyObject *self,
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     wxString *arg2 = 0 ;
     wxFileType *result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -11856,7 +11856,7 @@ static PyObject *_wrap_MimeTypesManager_GetFileTypeFromMimeType(PyObject *self,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11884,9 +11884,9 @@ static PyObject *_wrap_MimeTypesManager_ReadMailcap(PyObject *self, PyObject *ar
     PyObject *resultobj;
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     wxString *arg2 = 0 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -11899,7 +11899,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMailcap(PyObject *self, PyObject *ar
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         arg3 = PyInt_AsLong(obj2) ? true : false;
@@ -11932,7 +11932,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMimeTypes(PyObject *self, PyObject *
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -11944,7 +11944,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMimeTypes(PyObject *self, PyObject *
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13028,8 +13028,8 @@ static PyObject *_wrap_ArtProvider_GetBitmap(PyObject *self, PyObject *args, PyO
     wxSize const &arg3_defvalue = wxDefaultSize ;
     wxSize *arg3 = (wxSize *) &arg3_defvalue ;
     wxBitmap result;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     wxSize temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -13042,13 +13042,13 @@ static PyObject *_wrap_ArtProvider_GetBitmap(PyObject *self, PyObject *args, PyO
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj2) {
@@ -13099,8 +13099,8 @@ static PyObject *_wrap_ArtProvider_GetIcon(PyObject *self, PyObject *args, PyObj
     wxSize const &arg3_defvalue = wxDefaultSize ;
     wxSize *arg3 = (wxSize *) &arg3_defvalue ;
     wxIcon result;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     wxSize temp3 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -13113,13 +13113,13 @@ static PyObject *_wrap_ArtProvider_GetIcon(PyObject *self, PyObject *args, PyObj
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj2) {
@@ -13220,7 +13220,7 @@ static PyObject *_wrap_ConfigBase_Set(PyObject *self, PyObject *args, PyObject *
 
 static PyObject *_wrap_ConfigBase_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    bool arg1 = (bool) TRUE ;
+    bool arg1 = (bool) True ;
     wxConfigBase *result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -13293,7 +13293,7 @@ static PyObject *_wrap_ConfigBase_SetPath(PyObject *self, PyObject *args, PyObje
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -13305,7 +13305,7 @@ static PyObject *_wrap_ConfigBase_SetPath(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13462,7 +13462,7 @@ static PyObject *_wrap_ConfigBase_GetNextEntry(PyObject *self, PyObject *args, P
 static PyObject *_wrap_ConfigBase_GetNumberOfEntries(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
-    bool arg2 = (bool) FALSE ;
+    bool arg2 = (bool) False ;
     size_t result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -13493,7 +13493,7 @@ static PyObject *_wrap_ConfigBase_GetNumberOfEntries(PyObject *self, PyObject *a
 static PyObject *_wrap_ConfigBase_GetNumberOfGroups(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
-    bool arg2 = (bool) FALSE ;
+    bool arg2 = (bool) False ;
     size_t result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -13526,7 +13526,7 @@ static PyObject *_wrap_ConfigBase_HasGroup(PyObject *self, PyObject *args, PyObj
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -13538,7 +13538,7 @@ static PyObject *_wrap_ConfigBase_HasGroup(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13567,7 +13567,7 @@ static PyObject *_wrap_ConfigBase_HasEntry(PyObject *self, PyObject *args, PyObj
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -13579,7 +13579,7 @@ static PyObject *_wrap_ConfigBase_HasEntry(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13608,7 +13608,7 @@ static PyObject *_wrap_ConfigBase_Exists(PyObject *self, PyObject *args, PyObjec
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -13620,7 +13620,7 @@ static PyObject *_wrap_ConfigBase_Exists(PyObject *self, PyObject *args, PyObjec
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13649,7 +13649,7 @@ static PyObject *_wrap_ConfigBase_GetEntryType(PyObject *self, PyObject *args, P
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -13661,7 +13661,7 @@ static PyObject *_wrap_ConfigBase_GetEntryType(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13692,8 +13692,8 @@ static PyObject *_wrap_ConfigBase_Read(PyObject *self, PyObject *args, PyObject
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     wxString result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -13706,13 +13706,13 @@ static PyObject *_wrap_ConfigBase_Read(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -13757,7 +13757,7 @@ static PyObject *_wrap_ConfigBase_ReadInt(PyObject *self, PyObject *args, PyObje
     wxString *arg2 = 0 ;
     long arg3 = (long) 0 ;
     long result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -13769,7 +13769,7 @@ static PyObject *_wrap_ConfigBase_ReadInt(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13799,7 +13799,7 @@ static PyObject *_wrap_ConfigBase_ReadFloat(PyObject *self, PyObject *args, PyOb
     wxString *arg2 = 0 ;
     double arg3 = (double) 0.0 ;
     double result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -13811,7 +13811,7 @@ static PyObject *_wrap_ConfigBase_ReadFloat(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13839,9 +13839,9 @@ static PyObject *_wrap_ConfigBase_ReadBool(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -13854,7 +13854,7 @@ static PyObject *_wrap_ConfigBase_ReadBool(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         arg3 = PyInt_AsLong(obj2) ? true : false;
@@ -13888,8 +13888,8 @@ static PyObject *_wrap_ConfigBase_Write(PyObject *self, PyObject *args, PyObject
     wxString *arg2 = 0 ;
     wxString *arg3 = 0 ;
     bool result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -13902,12 +13902,12 @@ static PyObject *_wrap_ConfigBase_Write(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13945,7 +13945,7 @@ static PyObject *_wrap_ConfigBase_WriteInt(PyObject *self, PyObject *args, PyObj
     wxString *arg2 = 0 ;
     long arg3 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -13957,7 +13957,7 @@ static PyObject *_wrap_ConfigBase_WriteInt(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13987,7 +13987,7 @@ static PyObject *_wrap_ConfigBase_WriteFloat(PyObject *self, PyObject *args, PyO
     wxString *arg2 = 0 ;
     double arg3 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -13999,7 +13999,7 @@ static PyObject *_wrap_ConfigBase_WriteFloat(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14029,7 +14029,7 @@ static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyOb
     wxString *arg2 = 0 ;
     bool arg3 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -14042,7 +14042,7 @@ static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     arg3 = PyInt_AsLong(obj2) ? true : false;
     if (PyErr_Occurred()) SWIG_fail;
@@ -14071,7 +14071,7 @@ static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyOb
 static PyObject *_wrap_ConfigBase_Flush(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
-    bool arg2 = (bool) FALSE ;
+    bool arg2 = (bool) False ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -14105,8 +14105,8 @@ static PyObject *_wrap_ConfigBase_RenameEntry(PyObject *self, PyObject *args, Py
     wxString *arg2 = 0 ;
     wxString *arg3 = 0 ;
     bool result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -14119,12 +14119,12 @@ static PyObject *_wrap_ConfigBase_RenameEntry(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14162,8 +14162,8 @@ static PyObject *_wrap_ConfigBase_RenameGroup(PyObject *self, PyObject *args, Py
     wxString *arg2 = 0 ;
     wxString *arg3 = 0 ;
     bool result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -14176,12 +14176,12 @@ static PyObject *_wrap_ConfigBase_RenameGroup(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14217,9 +14217,9 @@ static PyObject *_wrap_ConfigBase_DeleteEntry(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -14232,7 +14232,7 @@ static PyObject *_wrap_ConfigBase_DeleteEntry(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         arg3 = PyInt_AsLong(obj2) ? true : false;
@@ -14265,7 +14265,7 @@ static PyObject *_wrap_ConfigBase_DeleteGroup(PyObject *self, PyObject *args, Py
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
     bool result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -14277,7 +14277,7 @@ static PyObject *_wrap_ConfigBase_DeleteGroup(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14354,7 +14354,7 @@ static PyObject *_wrap_ConfigBase_IsExpandingEnvVars(PyObject *self, PyObject *a
 static PyObject *_wrap_ConfigBase_SetExpandEnvVars(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -14384,7 +14384,7 @@ static PyObject *_wrap_ConfigBase_SetExpandEnvVars(PyObject *self, PyObject *arg
 static PyObject *_wrap_ConfigBase_SetRecordDefaults(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -14441,7 +14441,7 @@ static PyObject *_wrap_ConfigBase_ExpandEnvVars(PyObject *self, PyObject *args,
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -14453,7 +14453,7 @@ static PyObject *_wrap_ConfigBase_ExpandEnvVars(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14549,7 +14549,7 @@ static PyObject *_wrap_ConfigBase_SetAppName(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -14561,7 +14561,7 @@ static PyObject *_wrap_ConfigBase_SetAppName(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14589,7 +14589,7 @@ static PyObject *_wrap_ConfigBase_SetVendorName(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -14601,7 +14601,7 @@ static PyObject *_wrap_ConfigBase_SetVendorName(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14687,7 +14687,7 @@ static PyObject *_wrap_new_ConfigPathChanger(PyObject *self, PyObject *args, PyO
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
     wxConfigPathChanger *result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -14699,7 +14699,7 @@ static PyObject *_wrap_new_ConfigPathChanger(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14794,10 +14794,10 @@ static PyObject *_wrap_new_Config(PyObject *self, PyObject *args, PyObject *kwar
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     long arg5 = (long) 0 ;
     wxConfig *result;
-    bool temp1 = false ;
-    bool temp2 = false ;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -14811,28 +14811,28 @@ static PyObject *_wrap_new_Config(PyObject *self, PyObject *args, PyObject *kwar
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     {
@@ -14924,10 +14924,10 @@ static PyObject *_wrap_new_FileConfig(PyObject *self, PyObject *args, PyObject *
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     long arg5 = (long) 0 ;
     wxFileConfig *result;
-    bool temp1 = false ;
-    bool temp2 = false ;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -14941,28 +14941,28 @@ static PyObject *_wrap_new_FileConfig(PyObject *self, PyObject *args, PyObject *
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     if (obj1) {
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     {
@@ -15046,7 +15046,7 @@ static PyObject *_wrap_ExpandEnvVars(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "sz", NULL 
@@ -15056,7 +15056,7 @@ static PyObject *_wrap_ExpandEnvVars(PyObject *self, PyObject *args, PyObject *k
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16786,7 +16786,7 @@ static PyObject *_wrap_DateTime_ToTimezone(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime::TimeZone *arg2 = 0 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     wxDateTime result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -16832,7 +16832,7 @@ static PyObject *_wrap_DateTime_MakeTimezone(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime::TimeZone *arg2 = 0 ;
-    bool arg3 = (bool) FALSE ;
+    bool arg3 = (bool) False ;
     wxDateTime *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -16876,7 +16876,7 @@ static PyObject *_wrap_DateTime_MakeTimezone(PyObject *self, PyObject *args, PyO
 static PyObject *_wrap_DateTime_ToGMT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
-    bool arg2 = (bool) FALSE ;
+    bool arg2 = (bool) False ;
     wxDateTime result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -16911,7 +16911,7 @@ static PyObject *_wrap_DateTime_ToGMT(PyObject *self, PyObject *args, PyObject *
 static PyObject *_wrap_DateTime_MakeGMT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
-    bool arg2 = (bool) FALSE ;
+    bool arg2 = (bool) False ;
     wxDateTime *result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -18663,7 +18663,7 @@ static PyObject *_wrap_DateTime_ParseRfc822Date(PyObject *self, PyObject *args,
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -18675,7 +18675,7 @@ static PyObject *_wrap_DateTime_ParseRfc822Date(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18708,8 +18708,8 @@ static PyObject *_wrap_DateTime_ParseFormat(PyObject *self, PyObject *args, PyOb
     wxDateTime const &arg4_defvalue = wxDefaultDateTime ;
     wxDateTime *arg4 = (wxDateTime *) &arg4_defvalue ;
     int result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -18723,13 +18723,13 @@ static PyObject *_wrap_DateTime_ParseFormat(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
@@ -18773,7 +18773,7 @@ static PyObject *_wrap_DateTime_ParseDateTime(PyObject *self, PyObject *args, Py
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -18785,7 +18785,7 @@ static PyObject *_wrap_DateTime_ParseDateTime(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18814,7 +18814,7 @@ static PyObject *_wrap_DateTime_ParseDate(PyObject *self, PyObject *args, PyObje
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -18826,7 +18826,7 @@ static PyObject *_wrap_DateTime_ParseDate(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18855,7 +18855,7 @@ static PyObject *_wrap_DateTime_ParseTime(PyObject *self, PyObject *args, PyObje
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxString *arg2 = 0 ;
     int result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -18867,7 +18867,7 @@ static PyObject *_wrap_DateTime_ParseTime(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18899,7 +18899,7 @@ static PyObject *_wrap_DateTime_Format(PyObject *self, PyObject *args, PyObject
     wxDateTime::TimeZone const &arg3_defvalue = LOCAL_TZ ;
     wxDateTime::TimeZone *arg3 = (wxDateTime::TimeZone *) &arg3_defvalue ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -18913,7 +18913,7 @@ static PyObject *_wrap_DateTime_Format(PyObject *self, PyObject *args, PyObject
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj2) {
@@ -20342,7 +20342,7 @@ static PyObject *_wrap_TimeSpan_Format(PyObject *self, PyObject *args, PyObject
     wxString const &arg2_defvalue = wxPyTimeSpanFormatStr ;
     wxString *arg2 = (wxString *) &arg2_defvalue ;
     wxString result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -20355,7 +20355,7 @@ static PyObject *_wrap_TimeSpan_Format(PyObject *self, PyObject *args, PyObject
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     {
@@ -21471,7 +21471,7 @@ static PyObject *_wrap_new_CustomDataFormat(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxDataFormat *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "format", NULL 
@@ -21481,7 +21481,7 @@ static PyObject *_wrap_new_CustomDataFormat(PyObject *self, PyObject *args, PyOb
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21838,7 +21838,7 @@ static PyObject *_wrap_DataFormat_SetId(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxDataFormat *arg1 = (wxDataFormat *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -21850,7 +21850,7 @@ static PyObject *_wrap_DataFormat_SetId(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22335,7 +22335,7 @@ static PyObject *_wrap_DataObjectComposite_Add(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxDataObjectComposite *arg1 = (wxDataObjectComposite *) 0 ;
     wxDataObjectSimple *arg2 = (wxDataObjectSimple *) 0 ;
-    int arg3 = (int) FALSE ;
+    int arg3 = (int) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -22371,7 +22371,7 @@ static PyObject *_wrap_new_TextDataObject(PyObject *self, PyObject *args, PyObje
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
     wxTextDataObject *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "text", NULL 
@@ -22382,7 +22382,7 @@ static PyObject *_wrap_new_TextDataObject(PyObject *self, PyObject *args, PyObje
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     {
@@ -22467,7 +22467,7 @@ static PyObject *_wrap_TextDataObject_SetText(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     wxTextDataObject *arg1 = (wxTextDataObject *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -22479,7 +22479,7 @@ static PyObject *_wrap_TextDataObject_SetText(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22515,7 +22515,7 @@ static PyObject *_wrap_new_PyTextDataObject(PyObject *self, PyObject *args, PyOb
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
     wxPyTextDataObject *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "text", NULL 
@@ -22526,7 +22526,7 @@ static PyObject *_wrap_new_PyTextDataObject(PyObject *self, PyObject *args, PyOb
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     {
@@ -23012,7 +23012,7 @@ static PyObject *_wrap_URLDataObject_SetURL(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxURLDataObject *arg1 = (wxURLDataObject *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -23024,7 +23024,7 @@ static PyObject *_wrap_URLDataObject_SetURL(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23497,8 +23497,8 @@ static PyObject *_wrap_DropTarget_SetDataObject(PyObject *self, PyObject *args,
 static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     int arg4 ;
     int result;
     PyObject * obj0 = 0 ;
@@ -23525,8 +23525,8 @@ static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *self, PyObject *args, P
 static PyObject *_wrap_DropTarget_base_OnDragOver(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     int arg4 ;
     int result;
     PyObject * obj0 = 0 ;
@@ -23577,8 +23577,8 @@ static PyObject *_wrap_DropTarget_base_OnLeave(PyObject *self, PyObject *args, P
 static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     bool result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -23688,8 +23688,8 @@ static PyObject *_wrap_TextDropTarget__setCallbackInfo(PyObject *self, PyObject
 static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     int arg4 ;
     int result;
     PyObject * obj0 = 0 ;
@@ -23716,8 +23716,8 @@ static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *self, PyObject *arg
 static PyObject *_wrap_TextDropTarget_base_OnDragOver(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     int arg4 ;
     int result;
     PyObject * obj0 = 0 ;
@@ -23768,8 +23768,8 @@ static PyObject *_wrap_TextDropTarget_base_OnLeave(PyObject *self, PyObject *arg
 static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     bool result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -23795,8 +23795,8 @@ static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *self, PyObject *args
 static PyObject *_wrap_TextDropTarget_base_OnData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     int arg4 ;
     int result;
     PyObject * obj0 = 0 ;
@@ -23882,8 +23882,8 @@ static PyObject *_wrap_FileDropTarget__setCallbackInfo(PyObject *self, PyObject
 static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     int arg4 ;
     int result;
     PyObject * obj0 = 0 ;
@@ -23910,8 +23910,8 @@ static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *self, PyObject *arg
 static PyObject *_wrap_FileDropTarget_base_OnDragOver(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     int arg4 ;
     int result;
     PyObject * obj0 = 0 ;
@@ -23962,8 +23962,8 @@ static PyObject *_wrap_FileDropTarget_base_OnLeave(PyObject *self, PyObject *arg
 static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     bool result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -23989,8 +23989,8 @@ static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *self, PyObject *args
 static PyObject *_wrap_FileDropTarget_base_OnData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     int arg4 ;
     int result;
     PyObject * obj0 = 0 ;
@@ -24311,7 +24311,7 @@ static PyObject *_wrap_Clipboard_Flush(PyObject *self, PyObject *args, PyObject
 static PyObject *_wrap_Clipboard_UsePrimarySelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *arg1 = (wxClipboard *) 0 ;
-    bool arg2 = (bool) FALSE ;
+    bool arg2 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
diff --git a/wxPython/src/gtk/windows.py b/wxPython/src/gtk/windows.py
index 25026e1ddc..52db762c1d 100644
--- a/wxPython/src/gtk/windows.py
+++ b/wxPython/src/gtk/windows.py
@@ -8,16 +8,29 @@ wx = core
 #---------------------------------------------------------------------------
 
 class Panel(core.Window):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPanel instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
+    wxString name=PanelNameStr) -> Panel"""
         newobj = _windows.new_Panel(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _windows.Panel_Create(*args, **kwargs)
-    def InitDialog(*args, **kwargs): return _windows.Panel_InitDialog(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPanel instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
+    wxString name=PanelNameStr) -> bool"""
+        return _windows.Panel_Create(*args, **kwargs)
+
+    def InitDialog(*args, **kwargs):
+        """InitDialog()"""
+        return _windows.Panel_InitDialog(*args, **kwargs)
+
 
 class PanelPtr(Panel):
     def __init__(self, this):
@@ -27,6 +40,7 @@ class PanelPtr(Panel):
 _windows.Panel_swigregister(PanelPtr)
 
 def PrePanel(*args, **kwargs):
+    """PrePanel() -> Panel"""
     val = _windows.new_PrePanel(*args, **kwargs)
     val.thisown = 1
     return val
@@ -34,32 +48,100 @@ def PrePanel(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class ScrolledWindow(Panel):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
+    wxString name=PanelNameStr) -> ScrolledWindow"""
         newobj = _windows.new_ScrolledWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _windows.ScrolledWindow_Create(*args, **kwargs)
-    def SetScrollbars(*args, **kwargs): return _windows.ScrolledWindow_SetScrollbars(*args, **kwargs)
-    def Scroll(*args, **kwargs): return _windows.ScrolledWindow_Scroll(*args, **kwargs)
-    def GetScrollPageSize(*args, **kwargs): return _windows.ScrolledWindow_GetScrollPageSize(*args, **kwargs)
-    def SetScrollPageSize(*args, **kwargs): return _windows.ScrolledWindow_SetScrollPageSize(*args, **kwargs)
-    def SetScrollRate(*args, **kwargs): return _windows.ScrolledWindow_SetScrollRate(*args, **kwargs)
-    def GetScrollPixelsPerUnit(*args, **kwargs): return _windows.ScrolledWindow_GetScrollPixelsPerUnit(*args, **kwargs)
-    def EnableScrolling(*args, **kwargs): return _windows.ScrolledWindow_EnableScrolling(*args, **kwargs)
-    def GetViewStart(*args, **kwargs): return _windows.ScrolledWindow_GetViewStart(*args, **kwargs)
-    def SetScale(*args, **kwargs): return _windows.ScrolledWindow_SetScale(*args, **kwargs)
-    def GetScaleX(*args, **kwargs): return _windows.ScrolledWindow_GetScaleX(*args, **kwargs)
-    def GetScaleY(*args, **kwargs): return _windows.ScrolledWindow_GetScaleY(*args, **kwargs)
-    def CalcScrolledPosition(*args): return _windows.ScrolledWindow_CalcScrolledPosition(*args)
-    def CalcUnscrolledPosition(*args): return _windows.ScrolledWindow_CalcUnscrolledPosition(*args)
-    def AdjustScrollbars(*args, **kwargs): return _windows.ScrolledWindow_AdjustScrollbars(*args, **kwargs)
-    def CalcScrollInc(*args, **kwargs): return _windows.ScrolledWindow_CalcScrollInc(*args, **kwargs)
-    def SetTargetWindow(*args, **kwargs): return _windows.ScrolledWindow_SetTargetWindow(*args, **kwargs)
-    def GetTargetWindow(*args, **kwargs): return _windows.ScrolledWindow_GetTargetWindow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
+    wxString name=PanelNameStr) -> bool"""
+        return _windows.ScrolledWindow_Create(*args, **kwargs)
+
+    def SetScrollbars(*args, **kwargs):
+        """SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, 
+    int noUnitsY, int xPos=0, int yPos=0, bool noRefresh=False)"""
+        return _windows.ScrolledWindow_SetScrollbars(*args, **kwargs)
+
+    def Scroll(*args, **kwargs):
+        """Scroll(int x, int y)"""
+        return _windows.ScrolledWindow_Scroll(*args, **kwargs)
+
+    def GetScrollPageSize(*args, **kwargs):
+        """GetScrollPageSize(int orient) -> int"""
+        return _windows.ScrolledWindow_GetScrollPageSize(*args, **kwargs)
+
+    def SetScrollPageSize(*args, **kwargs):
+        """SetScrollPageSize(int orient, int pageSize)"""
+        return _windows.ScrolledWindow_SetScrollPageSize(*args, **kwargs)
+
+    def SetScrollRate(*args, **kwargs):
+        """SetScrollRate(int xstep, int ystep)"""
+        return _windows.ScrolledWindow_SetScrollRate(*args, **kwargs)
+
+    def GetScrollPixelsPerUnit(*args, **kwargs):
+        """GetScrollPixelsPerUnit() -> (xUnit, yUnit)
+
+
+        get the size of one logical unit in physical ones
+        """
+        return _windows.ScrolledWindow_GetScrollPixelsPerUnit(*args, **kwargs)
+
+    def EnableScrolling(*args, **kwargs):
+        """EnableScrolling(bool x_scrolling, bool y_scrolling)"""
+        return _windows.ScrolledWindow_EnableScrolling(*args, **kwargs)
+
+    def GetViewStart(*args, **kwargs):
+        """GetViewStart(int OUTPUT, int OUTPUT)"""
+        return _windows.ScrolledWindow_GetViewStart(*args, **kwargs)
+
+    def SetScale(*args, **kwargs):
+        """SetScale(double xs, double ys)"""
+        return _windows.ScrolledWindow_SetScale(*args, **kwargs)
+
+    def GetScaleX(*args, **kwargs):
+        """GetScaleX() -> double"""
+        return _windows.ScrolledWindow_GetScaleX(*args, **kwargs)
+
+    def GetScaleY(*args, **kwargs):
+        """GetScaleY() -> double"""
+        return _windows.ScrolledWindow_GetScaleY(*args, **kwargs)
+
+    def CalcScrolledPosition(*args):
+        """CalcScrolledPosition(int x, int y, int OUTPUT, int OUTPUT)
+CalcScrolledPosition(Point pt) -> Point"""
+        return _windows.ScrolledWindow_CalcScrolledPosition(*args)
+
+    def CalcUnscrolledPosition(*args):
+        """CalcUnscrolledPosition(int x, int y, int OUTPUT, int OUTPUT)
+CalcUnscrolledPosition(Point pt) -> Point"""
+        return _windows.ScrolledWindow_CalcUnscrolledPosition(*args)
+
+    def AdjustScrollbars(*args, **kwargs):
+        """AdjustScrollbars()"""
+        return _windows.ScrolledWindow_AdjustScrollbars(*args, **kwargs)
+
+    def CalcScrollInc(*args, **kwargs):
+        """CalcScrollInc(ScrollWinEvent event) -> int"""
+        return _windows.ScrolledWindow_CalcScrollInc(*args, **kwargs)
+
+    def SetTargetWindow(*args, **kwargs):
+        """SetTargetWindow(Window target)"""
+        return _windows.ScrolledWindow_SetTargetWindow(*args, **kwargs)
+
+    def GetTargetWindow(*args, **kwargs):
+        """GetTargetWindow() -> Window"""
+        return _windows.ScrolledWindow_GetTargetWindow(*args, **kwargs)
+
 
 class ScrolledWindowPtr(ScrolledWindow):
     def __init__(self, this):
@@ -69,6 +151,7 @@ class ScrolledWindowPtr(ScrolledWindow):
 _windows.ScrolledWindow_swigregister(ScrolledWindowPtr)
 
 def PreScrolledWindow(*args, **kwargs):
+    """PreScrolledWindow() -> ScrolledWindow"""
     val = _windows.new_PreScrolledWindow(*args, **kwargs)
     val.thisown = 1
     return val
@@ -76,23 +159,45 @@ def PreScrolledWindow(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class AcceleratorEntry(object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxAcceleratorEntry instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int flags=0, int keyCode=0, int cmd=0, MenuItem item=None) -> AcceleratorEntry"""
         newobj = _windows.new_AcceleratorEntry(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_windows.delete_AcceleratorEntry):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Set(*args, **kwargs): return _windows.AcceleratorEntry_Set(*args, **kwargs)
-    def SetMenuItem(*args, **kwargs): return _windows.AcceleratorEntry_SetMenuItem(*args, **kwargs)
-    def GetMenuItem(*args, **kwargs): return _windows.AcceleratorEntry_GetMenuItem(*args, **kwargs)
-    def GetFlags(*args, **kwargs): return _windows.AcceleratorEntry_GetFlags(*args, **kwargs)
-    def GetKeyCode(*args, **kwargs): return _windows.AcceleratorEntry_GetKeyCode(*args, **kwargs)
-    def GetCommand(*args, **kwargs): return _windows.AcceleratorEntry_GetCommand(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxAcceleratorEntry instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Set(*args, **kwargs):
+        """Set(int flags, int keyCode, int cmd, MenuItem item=None)"""
+        return _windows.AcceleratorEntry_Set(*args, **kwargs)
+
+    def SetMenuItem(*args, **kwargs):
+        """SetMenuItem(MenuItem item)"""
+        return _windows.AcceleratorEntry_SetMenuItem(*args, **kwargs)
+
+    def GetMenuItem(*args, **kwargs):
+        """GetMenuItem() -> MenuItem"""
+        return _windows.AcceleratorEntry_GetMenuItem(*args, **kwargs)
+
+    def GetFlags(*args, **kwargs):
+        """GetFlags() -> int"""
+        return _windows.AcceleratorEntry_GetFlags(*args, **kwargs)
+
+    def GetKeyCode(*args, **kwargs):
+        """GetKeyCode() -> int"""
+        return _windows.AcceleratorEntry_GetKeyCode(*args, **kwargs)
+
+    def GetCommand(*args, **kwargs):
+        """GetCommand() -> int"""
+        return _windows.AcceleratorEntry_GetCommand(*args, **kwargs)
+
 
 class AcceleratorEntryPtr(AcceleratorEntry):
     def __init__(self, this):
@@ -102,18 +207,25 @@ class AcceleratorEntryPtr(AcceleratorEntry):
 _windows.AcceleratorEntry_swigregister(AcceleratorEntryPtr)
 
 class AcceleratorTable(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxAcceleratorTable instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int n, AcceleratorEntry entries) -> AcceleratorTable"""
         newobj = _windows.new_AcceleratorTable(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_windows.delete_AcceleratorTable):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def Ok(*args, **kwargs): return _windows.AcceleratorTable_Ok(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxAcceleratorTable instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _windows.AcceleratorTable_Ok(*args, **kwargs)
+
 
 class AcceleratorTablePtr(AcceleratorTable):
     def __init__(self, this):
@@ -123,7 +235,9 @@ class AcceleratorTablePtr(AcceleratorTable):
 _windows.AcceleratorTable_swigregister(AcceleratorTablePtr)
 
 
-GetAccelFromString = _windows.GetAccelFromString
+def GetAccelFromString(*args, **kwargs):
+    """GetAccelFromString(wxString label) -> AcceleratorEntry"""
+    return _windows.GetAccelFromString(*args, **kwargs)
 #---------------------------------------------------------------------------
 
 FULLSCREEN_NOMENUBAR = _windows.FULLSCREEN_NOMENUBAR
@@ -134,22 +248,62 @@ FULLSCREEN_NOCAPTION = _windows.FULLSCREEN_NOCAPTION
 FULLSCREEN_ALL = _windows.FULLSCREEN_ALL
 TOPLEVEL_EX_DIALOG = _windows.TOPLEVEL_EX_DIALOG
 class TopLevelWindow(core.Window):
-    def Maximize(*args, **kwargs): return _windows.TopLevelWindow_Maximize(*args, **kwargs)
-    def Restore(*args, **kwargs): return _windows.TopLevelWindow_Restore(*args, **kwargs)
-    def Iconize(*args, **kwargs): return _windows.TopLevelWindow_Iconize(*args, **kwargs)
-    def IsMaximized(*args, **kwargs): return _windows.TopLevelWindow_IsMaximized(*args, **kwargs)
-    def IsIconized(*args, **kwargs): return _windows.TopLevelWindow_IsIconized(*args, **kwargs)
-    def GetIcon(*args, **kwargs): return _windows.TopLevelWindow_GetIcon(*args, **kwargs)
-    def SetIcon(*args, **kwargs): return _windows.TopLevelWindow_SetIcon(*args, **kwargs)
-    def SetIcons(*args, **kwargs): return _windows.TopLevelWindow_SetIcons(*args, **kwargs)
-    def ShowFullScreen(*args, **kwargs): return _windows.TopLevelWindow_ShowFullScreen(*args, **kwargs)
-    def IsFullScreen(*args, **kwargs): return _windows.TopLevelWindow_IsFullScreen(*args, **kwargs)
-    def SetTitle(*args, **kwargs): return _windows.TopLevelWindow_SetTitle(*args, **kwargs)
-    def GetTitle(*args, **kwargs): return _windows.TopLevelWindow_GetTitle(*args, **kwargs)
-    def SetShape(*args, **kwargs): return _windows.TopLevelWindow_SetShape(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxTopLevelWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Maximize(*args, **kwargs):
+        """Maximize(bool maximize=True)"""
+        return _windows.TopLevelWindow_Maximize(*args, **kwargs)
+
+    def Restore(*args, **kwargs):
+        """Restore()"""
+        return _windows.TopLevelWindow_Restore(*args, **kwargs)
+
+    def Iconize(*args, **kwargs):
+        """Iconize(bool iconize=True)"""
+        return _windows.TopLevelWindow_Iconize(*args, **kwargs)
+
+    def IsMaximized(*args, **kwargs):
+        """IsMaximized() -> bool"""
+        return _windows.TopLevelWindow_IsMaximized(*args, **kwargs)
+
+    def IsIconized(*args, **kwargs):
+        """IsIconized() -> bool"""
+        return _windows.TopLevelWindow_IsIconized(*args, **kwargs)
+
+    def GetIcon(*args, **kwargs):
+        """GetIcon() -> wxIcon"""
+        return _windows.TopLevelWindow_GetIcon(*args, **kwargs)
+
+    def SetIcon(*args, **kwargs):
+        """SetIcon(wxIcon icon)"""
+        return _windows.TopLevelWindow_SetIcon(*args, **kwargs)
+
+    def SetIcons(*args, **kwargs):
+        """SetIcons(wxIconBundle icons)"""
+        return _windows.TopLevelWindow_SetIcons(*args, **kwargs)
+
+    def ShowFullScreen(*args, **kwargs):
+        """ShowFullScreen(bool show, long style=FULLSCREEN_ALL) -> bool"""
+        return _windows.TopLevelWindow_ShowFullScreen(*args, **kwargs)
+
+    def IsFullScreen(*args, **kwargs):
+        """IsFullScreen() -> bool"""
+        return _windows.TopLevelWindow_IsFullScreen(*args, **kwargs)
+
+    def SetTitle(*args, **kwargs):
+        """SetTitle(wxString title)"""
+        return _windows.TopLevelWindow_SetTitle(*args, **kwargs)
+
+    def GetTitle(*args, **kwargs):
+        """GetTitle() -> wxString"""
+        return _windows.TopLevelWindow_GetTitle(*args, **kwargs)
+
+    def SetShape(*args, **kwargs):
+        """SetShape(wxRegion region) -> bool"""
+        return _windows.TopLevelWindow_SetShape(*args, **kwargs)
+
 
 class TopLevelWindowPtr(TopLevelWindow):
     def __init__(self, this):
@@ -163,35 +317,103 @@ NullAcceleratorTable = cvar.NullAcceleratorTable
 #---------------------------------------------------------------------------
 
 class Frame(TopLevelWindow):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
+    wxString name=wxPyFrameNameStr) -> Frame"""
         newobj = _windows.new_Frame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _windows.Frame_Create(*args, **kwargs)
-    def GetClientAreaOrigin(*args, **kwargs): return _windows.Frame_GetClientAreaOrigin(*args, **kwargs)
-    def SendSizeEvent(*args, **kwargs): return _windows.Frame_SendSizeEvent(*args, **kwargs)
-    def SetMenuBar(*args, **kwargs): return _windows.Frame_SetMenuBar(*args, **kwargs)
-    def GetMenuBar(*args, **kwargs): return _windows.Frame_GetMenuBar(*args, **kwargs)
-    def ProcessCommand(*args, **kwargs): return _windows.Frame_ProcessCommand(*args, **kwargs)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
+    wxString name=wxPyFrameNameStr) -> bool"""
+        return _windows.Frame_Create(*args, **kwargs)
+
+    def GetClientAreaOrigin(*args, **kwargs):
+        """GetClientAreaOrigin() -> Point"""
+        return _windows.Frame_GetClientAreaOrigin(*args, **kwargs)
+
+    def SendSizeEvent(*args, **kwargs):
+        """SendSizeEvent()"""
+        return _windows.Frame_SendSizeEvent(*args, **kwargs)
+
+    def SetMenuBar(*args, **kwargs):
+        """SetMenuBar(MenuBar menubar)"""
+        return _windows.Frame_SetMenuBar(*args, **kwargs)
+
+    def GetMenuBar(*args, **kwargs):
+        """GetMenuBar() -> MenuBar"""
+        return _windows.Frame_GetMenuBar(*args, **kwargs)
+
+    def ProcessCommand(*args, **kwargs):
+        """ProcessCommand(int winid) -> bool"""
+        return _windows.Frame_ProcessCommand(*args, **kwargs)
+
     Command = ProcessCommand 
-    def CreateStatusBar(*args, **kwargs): return _windows.Frame_CreateStatusBar(*args, **kwargs)
-    def GetStatusBar(*args, **kwargs): return _windows.Frame_GetStatusBar(*args, **kwargs)
-    def SetStatusBar(*args, **kwargs): return _windows.Frame_SetStatusBar(*args, **kwargs)
-    def SetStatusText(*args, **kwargs): return _windows.Frame_SetStatusText(*args, **kwargs)
-    def SetStatusWidths(*args, **kwargs): return _windows.Frame_SetStatusWidths(*args, **kwargs)
-    def PushStatusText(*args, **kwargs): return _windows.Frame_PushStatusText(*args, **kwargs)
-    def PopStatusText(*args, **kwargs): return _windows.Frame_PopStatusText(*args, **kwargs)
-    def SetStatusBarPane(*args, **kwargs): return _windows.Frame_SetStatusBarPane(*args, **kwargs)
-    def GetStatusBarPane(*args, **kwargs): return _windows.Frame_GetStatusBarPane(*args, **kwargs)
-    def CreateToolBar(*args, **kwargs): return _windows.Frame_CreateToolBar(*args, **kwargs)
-    def GetToolBar(*args, **kwargs): return _windows.Frame_GetToolBar(*args, **kwargs)
-    def SetToolBar(*args, **kwargs): return _windows.Frame_SetToolBar(*args, **kwargs)
-    def DoGiveHelp(*args, **kwargs): return _windows.Frame_DoGiveHelp(*args, **kwargs)
-    def DoMenuUpdates(*args, **kwargs): return _windows.Frame_DoMenuUpdates(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def CreateStatusBar(*args, **kwargs):
+        """CreateStatusBar(int number=1, long style=ST_SIZEGRIP, int winid=0, 
+    wxString name=wxPyStatusLineNameStr) -> StatusBar"""
+        return _windows.Frame_CreateStatusBar(*args, **kwargs)
+
+    def GetStatusBar(*args, **kwargs):
+        """GetStatusBar() -> StatusBar"""
+        return _windows.Frame_GetStatusBar(*args, **kwargs)
+
+    def SetStatusBar(*args, **kwargs):
+        """SetStatusBar(StatusBar statBar)"""
+        return _windows.Frame_SetStatusBar(*args, **kwargs)
+
+    def SetStatusText(*args, **kwargs):
+        """SetStatusText(wxString text, int number=0)"""
+        return _windows.Frame_SetStatusText(*args, **kwargs)
+
+    def SetStatusWidths(*args, **kwargs):
+        """SetStatusWidths(int widths, int widths_field)"""
+        return _windows.Frame_SetStatusWidths(*args, **kwargs)
+
+    def PushStatusText(*args, **kwargs):
+        """PushStatusText(wxString text, int number=0)"""
+        return _windows.Frame_PushStatusText(*args, **kwargs)
+
+    def PopStatusText(*args, **kwargs):
+        """PopStatusText(int number=0)"""
+        return _windows.Frame_PopStatusText(*args, **kwargs)
+
+    def SetStatusBarPane(*args, **kwargs):
+        """SetStatusBarPane(int n)"""
+        return _windows.Frame_SetStatusBarPane(*args, **kwargs)
+
+    def GetStatusBarPane(*args, **kwargs):
+        """GetStatusBarPane() -> int"""
+        return _windows.Frame_GetStatusBarPane(*args, **kwargs)
+
+    def CreateToolBar(*args, **kwargs):
+        """CreateToolBar(long style=-1, int winid=-1, wxString name=wxPyToolBarNameStr) -> wxToolBar"""
+        return _windows.Frame_CreateToolBar(*args, **kwargs)
+
+    def GetToolBar(*args, **kwargs):
+        """GetToolBar() -> wxToolBar"""
+        return _windows.Frame_GetToolBar(*args, **kwargs)
+
+    def SetToolBar(*args, **kwargs):
+        """SetToolBar(wxToolBar toolbar)"""
+        return _windows.Frame_SetToolBar(*args, **kwargs)
+
+    def DoGiveHelp(*args, **kwargs):
+        """DoGiveHelp(wxString text, bool show)"""
+        return _windows.Frame_DoGiveHelp(*args, **kwargs)
+
+    def DoMenuUpdates(*args, **kwargs):
+        """DoMenuUpdates(Menu menu=None)"""
+        return _windows.Frame_DoMenuUpdates(*args, **kwargs)
+
 
 class FramePtr(Frame):
     def __init__(self, this):
@@ -201,6 +423,7 @@ class FramePtr(Frame):
 _windows.Frame_swigregister(FramePtr)
 
 def PreFrame(*args, **kwargs):
+    """PreFrame() -> Frame"""
     val = _windows.new_PreFrame(*args, **kwargs)
     val.thisown = 1
     return val
@@ -208,24 +431,61 @@ def PreFrame(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class Dialog(TopLevelWindow):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=DEFAULT_DIALOG_STYLE, 
+    wxString name=wxPyDialogNameStr) -> Dialog"""
         newobj = _windows.new_Dialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _windows.Dialog_Create(*args, **kwargs)
-    def SetReturnCode(*args, **kwargs): return _windows.Dialog_SetReturnCode(*args, **kwargs)
-    def GetReturnCode(*args, **kwargs): return _windows.Dialog_GetReturnCode(*args, **kwargs)
-    def CreateTextSizer(*args, **kwargs): return _windows.Dialog_CreateTextSizer(*args, **kwargs)
-    def CreateButtonSizer(*args, **kwargs): return _windows.Dialog_CreateButtonSizer(*args, **kwargs)
-    def SetModal(*args, **kwargs): return _windows.Dialog_SetModal(*args, **kwargs)
-    def IsModal(*args, **kwargs): return _windows.Dialog_IsModal(*args, **kwargs)
-    def ShowModal(*args, **kwargs): return _windows.Dialog_ShowModal(*args, **kwargs)
-    def EndModal(*args, **kwargs): return _windows.Dialog_EndModal(*args, **kwargs)
-    def IsModalShowing(*args, **kwargs): return _windows.Dialog_IsModalShowing(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=DEFAULT_DIALOG_STYLE, 
+    wxString name=wxPyDialogNameStr) -> bool"""
+        return _windows.Dialog_Create(*args, **kwargs)
+
+    def SetReturnCode(*args, **kwargs):
+        """SetReturnCode(int returnCode)"""
+        return _windows.Dialog_SetReturnCode(*args, **kwargs)
+
+    def GetReturnCode(*args, **kwargs):
+        """GetReturnCode() -> int"""
+        return _windows.Dialog_GetReturnCode(*args, **kwargs)
+
+    def CreateTextSizer(*args, **kwargs):
+        """CreateTextSizer(wxString message) -> Sizer"""
+        return _windows.Dialog_CreateTextSizer(*args, **kwargs)
+
+    def CreateButtonSizer(*args, **kwargs):
+        """CreateButtonSizer(long flags) -> Sizer"""
+        return _windows.Dialog_CreateButtonSizer(*args, **kwargs)
+
+    def SetModal(*args, **kwargs):
+        """SetModal(bool flag)"""
+        return _windows.Dialog_SetModal(*args, **kwargs)
+
+    def IsModal(*args, **kwargs):
+        """IsModal() -> bool"""
+        return _windows.Dialog_IsModal(*args, **kwargs)
+
+    def ShowModal(*args, **kwargs):
+        """ShowModal() -> int"""
+        return _windows.Dialog_ShowModal(*args, **kwargs)
+
+    def EndModal(*args, **kwargs):
+        """EndModal(int retCode)"""
+        return _windows.Dialog_EndModal(*args, **kwargs)
+
+    def IsModalShowing(*args, **kwargs):
+        """IsModalShowing() -> bool"""
+        return _windows.Dialog_IsModalShowing(*args, **kwargs)
+
 
 class DialogPtr(Dialog):
     def __init__(self, this):
@@ -235,6 +495,7 @@ class DialogPtr(Dialog):
 _windows.Dialog_swigregister(DialogPtr)
 
 def PreDialog(*args, **kwargs):
+    """PreDialog() -> Dialog"""
     val = _windows.new_PreDialog(*args, **kwargs)
     val.thisown = 1
     return val
@@ -242,15 +503,25 @@ def PreDialog(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class MiniFrame(Frame):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMiniFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
+    wxString name=wxPyFrameNameStr) -> MiniFrame"""
         newobj = _windows.new_MiniFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _windows.MiniFrame_Create(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMiniFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
+    wxString name=wxPyFrameNameStr) -> bool"""
+        return _windows.MiniFrame_Create(*args, **kwargs)
+
 
 class MiniFramePtr(MiniFrame):
     def __init__(self, this):
@@ -260,6 +531,7 @@ class MiniFramePtr(MiniFrame):
 _windows.MiniFrame_swigregister(MiniFramePtr)
 
 def PreMiniFrame(*args, **kwargs):
+    """PreMiniFrame() -> MiniFrame"""
     val = _windows.new_PreMiniFrame(*args, **kwargs)
     val.thisown = 1
     return val
@@ -272,16 +544,26 @@ SPLASH_NO_CENTRE = _windows.SPLASH_NO_CENTRE
 SPLASH_TIMEOUT = _windows.SPLASH_TIMEOUT
 SPLASH_NO_TIMEOUT = _windows.SPLASH_NO_TIMEOUT
 class SplashScreenWindow(core.Window):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSplashScreenWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxBitmap bitmap, Window parent, int id, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=NO_BORDER) -> SplashScreenWindow"""
         newobj = _windows.new_SplashScreenWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def SetBitmap(*args, **kwargs): return _windows.SplashScreenWindow_SetBitmap(*args, **kwargs)
-    def GetBitmap(*args, **kwargs): return _windows.SplashScreenWindow_GetBitmap(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSplashScreenWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetBitmap(*args, **kwargs):
+        """SetBitmap(wxBitmap bitmap)"""
+        return _windows.SplashScreenWindow_SetBitmap(*args, **kwargs)
+
+    def GetBitmap(*args, **kwargs):
+        """GetBitmap() -> wxBitmap"""
+        return _windows.SplashScreenWindow_GetBitmap(*args, **kwargs)
+
 
 class SplashScreenWindowPtr(SplashScreenWindow):
     def __init__(self, this):
@@ -291,17 +573,31 @@ class SplashScreenWindowPtr(SplashScreenWindow):
 _windows.SplashScreenWindow_swigregister(SplashScreenWindowPtr)
 
 class SplashScreen(Frame):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSplashScreen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxBitmap bitmap, long splashStyle, int milliseconds, 
+    Window parent, int id, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP) -> SplashScreen"""
         newobj = _windows.new_SplashScreen(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetSplashStyle(*args, **kwargs): return _windows.SplashScreen_GetSplashStyle(*args, **kwargs)
-    def GetSplashWindow(*args, **kwargs): return _windows.SplashScreen_GetSplashWindow(*args, **kwargs)
-    def GetTimeout(*args, **kwargs): return _windows.SplashScreen_GetTimeout(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSplashScreen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetSplashStyle(*args, **kwargs):
+        """GetSplashStyle() -> long"""
+        return _windows.SplashScreen_GetSplashStyle(*args, **kwargs)
+
+    def GetSplashWindow(*args, **kwargs):
+        """GetSplashWindow() -> SplashScreenWindow"""
+        return _windows.SplashScreen_GetSplashWindow(*args, **kwargs)
+
+    def GetTimeout(*args, **kwargs):
+        """GetTimeout() -> int"""
+        return _windows.SplashScreen_GetTimeout(*args, **kwargs)
+
 
 class SplashScreenPtr(SplashScreen):
     def __init__(self, this):
@@ -313,26 +609,65 @@ _windows.SplashScreen_swigregister(SplashScreenPtr)
 #---------------------------------------------------------------------------
 
 class StatusBar(core.Window):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxStatusBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, long style=ST_SIZEGRIP, wxString name=wxPyStatusLineNameStr) -> StatusBar"""
         newobj = _windows.new_StatusBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _windows.StatusBar_Create(*args, **kwargs)
-    def SetFieldsCount(*args, **kwargs): return _windows.StatusBar_SetFieldsCount(*args, **kwargs)
-    def GetFieldsCount(*args, **kwargs): return _windows.StatusBar_GetFieldsCount(*args, **kwargs)
-    def SetStatusText(*args, **kwargs): return _windows.StatusBar_SetStatusText(*args, **kwargs)
-    def GetStatusText(*args, **kwargs): return _windows.StatusBar_GetStatusText(*args, **kwargs)
-    def PushStatusText(*args, **kwargs): return _windows.StatusBar_PushStatusText(*args, **kwargs)
-    def PopStatusText(*args, **kwargs): return _windows.StatusBar_PopStatusText(*args, **kwargs)
-    def SetStatusWidths(*args, **kwargs): return _windows.StatusBar_SetStatusWidths(*args, **kwargs)
-    def GetFieldRect(*args, **kwargs): return _windows.StatusBar_GetFieldRect(*args, **kwargs)
-    def SetMinHeight(*args, **kwargs): return _windows.StatusBar_SetMinHeight(*args, **kwargs)
-    def GetBorderX(*args, **kwargs): return _windows.StatusBar_GetBorderX(*args, **kwargs)
-    def GetBorderY(*args, **kwargs): return _windows.StatusBar_GetBorderY(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStatusBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, long style=ST_SIZEGRIP, wxString name=wxPyStatusLineNameStr) -> bool"""
+        return _windows.StatusBar_Create(*args, **kwargs)
+
+    def SetFieldsCount(*args, **kwargs):
+        """SetFieldsCount(int number=1)"""
+        return _windows.StatusBar_SetFieldsCount(*args, **kwargs)
+
+    def GetFieldsCount(*args, **kwargs):
+        """GetFieldsCount() -> int"""
+        return _windows.StatusBar_GetFieldsCount(*args, **kwargs)
+
+    def SetStatusText(*args, **kwargs):
+        """SetStatusText(wxString text, int number=0)"""
+        return _windows.StatusBar_SetStatusText(*args, **kwargs)
+
+    def GetStatusText(*args, **kwargs):
+        """GetStatusText(int number=0) -> wxString"""
+        return _windows.StatusBar_GetStatusText(*args, **kwargs)
+
+    def PushStatusText(*args, **kwargs):
+        """PushStatusText(wxString text, int number=0)"""
+        return _windows.StatusBar_PushStatusText(*args, **kwargs)
+
+    def PopStatusText(*args, **kwargs):
+        """PopStatusText(int number=0)"""
+        return _windows.StatusBar_PopStatusText(*args, **kwargs)
+
+    def SetStatusWidths(*args, **kwargs):
+        """SetStatusWidths(int widths, int widths_field)"""
+        return _windows.StatusBar_SetStatusWidths(*args, **kwargs)
+
+    def GetFieldRect(*args, **kwargs):
+        """GetFieldRect(int i, Rect rect) -> bool"""
+        return _windows.StatusBar_GetFieldRect(*args, **kwargs)
+
+    def SetMinHeight(*args, **kwargs):
+        """SetMinHeight(int height)"""
+        return _windows.StatusBar_SetMinHeight(*args, **kwargs)
+
+    def GetBorderX(*args, **kwargs):
+        """GetBorderX() -> int"""
+        return _windows.StatusBar_GetBorderX(*args, **kwargs)
+
+    def GetBorderY(*args, **kwargs):
+        """GetBorderY() -> int"""
+        return _windows.StatusBar_GetBorderY(*args, **kwargs)
+
 
 class StatusBarPtr(StatusBar):
     def __init__(self, this):
@@ -342,6 +677,7 @@ class StatusBarPtr(StatusBar):
 _windows.StatusBar_swigregister(StatusBarPtr)
 
 def PreStatusBar(*args, **kwargs):
+    """PreStatusBar() -> StatusBar"""
     val = _windows.new_PreStatusBar(*args, **kwargs)
     val.thisown = 1
     return val
@@ -362,37 +698,111 @@ SPLIT_DRAG_NONE = _windows.SPLIT_DRAG_NONE
 SPLIT_DRAG_DRAGGING = _windows.SPLIT_DRAG_DRAGGING
 SPLIT_DRAG_LEFT_DOWN = _windows.SPLIT_DRAG_LEFT_DOWN
 class SplitterWindow(core.Window):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSplitterWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point point=DefaultPosition, 
+    Size size=DefaultSize, long style=SP_3D, wxString name=wxPySplitterNameStr) -> SplitterWindow"""
         newobj = _windows.new_SplitterWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _windows.SplitterWindow_Create(*args, **kwargs)
-    def GetWindow1(*args, **kwargs): return _windows.SplitterWindow_GetWindow1(*args, **kwargs)
-    def GetWindow2(*args, **kwargs): return _windows.SplitterWindow_GetWindow2(*args, **kwargs)
-    def SetSplitMode(*args, **kwargs): return _windows.SplitterWindow_SetSplitMode(*args, **kwargs)
-    def GetSplitMode(*args, **kwargs): return _windows.SplitterWindow_GetSplitMode(*args, **kwargs)
-    def Initialize(*args, **kwargs): return _windows.SplitterWindow_Initialize(*args, **kwargs)
-    def SplitVertically(*args, **kwargs): return _windows.SplitterWindow_SplitVertically(*args, **kwargs)
-    def SplitHorizontally(*args, **kwargs): return _windows.SplitterWindow_SplitHorizontally(*args, **kwargs)
-    def Unsplit(*args, **kwargs): return _windows.SplitterWindow_Unsplit(*args, **kwargs)
-    def ReplaceWindow(*args, **kwargs): return _windows.SplitterWindow_ReplaceWindow(*args, **kwargs)
-    def IsSplit(*args, **kwargs): return _windows.SplitterWindow_IsSplit(*args, **kwargs)
-    def SetSashSize(*args, **kwargs): return _windows.SplitterWindow_SetSashSize(*args, **kwargs)
-    def SetBorderSize(*args, **kwargs): return _windows.SplitterWindow_SetBorderSize(*args, **kwargs)
-    def GetSashSize(*args, **kwargs): return _windows.SplitterWindow_GetSashSize(*args, **kwargs)
-    def GetBorderSize(*args, **kwargs): return _windows.SplitterWindow_GetBorderSize(*args, **kwargs)
-    def SetSashPosition(*args, **kwargs): return _windows.SplitterWindow_SetSashPosition(*args, **kwargs)
-    def GetSashPosition(*args, **kwargs): return _windows.SplitterWindow_GetSashPosition(*args, **kwargs)
-    def SetMinimumPaneSize(*args, **kwargs): return _windows.SplitterWindow_SetMinimumPaneSize(*args, **kwargs)
-    def GetMinimumPaneSize(*args, **kwargs): return _windows.SplitterWindow_GetMinimumPaneSize(*args, **kwargs)
-    def SashHitTest(*args, **kwargs): return _windows.SplitterWindow_SashHitTest(*args, **kwargs)
-    def SizeWindows(*args, **kwargs): return _windows.SplitterWindow_SizeWindows(*args, **kwargs)
-    def SetNeedUpdating(*args, **kwargs): return _windows.SplitterWindow_SetNeedUpdating(*args, **kwargs)
-    def GetNeedUpdating(*args, **kwargs): return _windows.SplitterWindow_GetNeedUpdating(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSplitterWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point point=DefaultPosition, 
+    Size size=DefaultSize, long style=SP_3D, wxString name=wxPySplitterNameStr) -> bool"""
+        return _windows.SplitterWindow_Create(*args, **kwargs)
+
+    def GetWindow1(*args, **kwargs):
+        """GetWindow1() -> Window"""
+        return _windows.SplitterWindow_GetWindow1(*args, **kwargs)
+
+    def GetWindow2(*args, **kwargs):
+        """GetWindow2() -> Window"""
+        return _windows.SplitterWindow_GetWindow2(*args, **kwargs)
+
+    def SetSplitMode(*args, **kwargs):
+        """SetSplitMode(int mode)"""
+        return _windows.SplitterWindow_SetSplitMode(*args, **kwargs)
+
+    def GetSplitMode(*args, **kwargs):
+        """GetSplitMode() -> wxSplitMode"""
+        return _windows.SplitterWindow_GetSplitMode(*args, **kwargs)
+
+    def Initialize(*args, **kwargs):
+        """Initialize(Window window)"""
+        return _windows.SplitterWindow_Initialize(*args, **kwargs)
+
+    def SplitVertically(*args, **kwargs):
+        """SplitVertically(Window window1, Window window2, int sashPosition=0) -> bool"""
+        return _windows.SplitterWindow_SplitVertically(*args, **kwargs)
+
+    def SplitHorizontally(*args, **kwargs):
+        """SplitHorizontally(Window window1, Window window2, int sashPosition=0) -> bool"""
+        return _windows.SplitterWindow_SplitHorizontally(*args, **kwargs)
+
+    def Unsplit(*args, **kwargs):
+        """Unsplit(Window toRemove=None) -> bool"""
+        return _windows.SplitterWindow_Unsplit(*args, **kwargs)
+
+    def ReplaceWindow(*args, **kwargs):
+        """ReplaceWindow(Window winOld, Window winNew) -> bool"""
+        return _windows.SplitterWindow_ReplaceWindow(*args, **kwargs)
+
+    def IsSplit(*args, **kwargs):
+        """IsSplit() -> bool"""
+        return _windows.SplitterWindow_IsSplit(*args, **kwargs)
+
+    def SetSashSize(*args, **kwargs):
+        """SetSashSize(int width)"""
+        return _windows.SplitterWindow_SetSashSize(*args, **kwargs)
+
+    def SetBorderSize(*args, **kwargs):
+        """SetBorderSize(int width)"""
+        return _windows.SplitterWindow_SetBorderSize(*args, **kwargs)
+
+    def GetSashSize(*args, **kwargs):
+        """GetSashSize() -> int"""
+        return _windows.SplitterWindow_GetSashSize(*args, **kwargs)
+
+    def GetBorderSize(*args, **kwargs):
+        """GetBorderSize() -> int"""
+        return _windows.SplitterWindow_GetBorderSize(*args, **kwargs)
+
+    def SetSashPosition(*args, **kwargs):
+        """SetSashPosition(int position, bool redraw=True)"""
+        return _windows.SplitterWindow_SetSashPosition(*args, **kwargs)
+
+    def GetSashPosition(*args, **kwargs):
+        """GetSashPosition() -> int"""
+        return _windows.SplitterWindow_GetSashPosition(*args, **kwargs)
+
+    def SetMinimumPaneSize(*args, **kwargs):
+        """SetMinimumPaneSize(int min)"""
+        return _windows.SplitterWindow_SetMinimumPaneSize(*args, **kwargs)
+
+    def GetMinimumPaneSize(*args, **kwargs):
+        """GetMinimumPaneSize() -> int"""
+        return _windows.SplitterWindow_GetMinimumPaneSize(*args, **kwargs)
+
+    def SashHitTest(*args, **kwargs):
+        """SashHitTest(int x, int y, int tolerance=5) -> bool"""
+        return _windows.SplitterWindow_SashHitTest(*args, **kwargs)
+
+    def SizeWindows(*args, **kwargs):
+        """SizeWindows()"""
+        return _windows.SplitterWindow_SizeWindows(*args, **kwargs)
+
+    def SetNeedUpdating(*args, **kwargs):
+        """SetNeedUpdating(bool needUpdating)"""
+        return _windows.SplitterWindow_SetNeedUpdating(*args, **kwargs)
+
+    def GetNeedUpdating(*args, **kwargs):
+        """GetNeedUpdating() -> bool"""
+        return _windows.SplitterWindow_GetNeedUpdating(*args, **kwargs)
+
 
 class SplitterWindowPtr(SplitterWindow):
     def __init__(self, this):
@@ -402,23 +812,41 @@ class SplitterWindowPtr(SplitterWindow):
 _windows.SplitterWindow_swigregister(SplitterWindowPtr)
 
 def PreSplitterWindow(*args, **kwargs):
+    """PreSplitterWindow() -> SplitterWindow"""
     val = _windows.new_PreSplitterWindow(*args, **kwargs)
     val.thisown = 1
     return val
 
 class SplitterEvent(core.NotifyEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSplitterEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType type=wxEVT_NULL, SplitterWindow splitter=(wxSplitterWindow *) NULL) -> SplitterEvent"""
         newobj = _windows.new_SplitterEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetSashPosition(*args, **kwargs): return _windows.SplitterEvent_SetSashPosition(*args, **kwargs)
-    def GetSashPosition(*args, **kwargs): return _windows.SplitterEvent_GetSashPosition(*args, **kwargs)
-    def GetWindowBeingRemoved(*args, **kwargs): return _windows.SplitterEvent_GetWindowBeingRemoved(*args, **kwargs)
-    def GetX(*args, **kwargs): return _windows.SplitterEvent_GetX(*args, **kwargs)
-    def GetY(*args, **kwargs): return _windows.SplitterEvent_GetY(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSplitterEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetSashPosition(*args, **kwargs):
+        """SetSashPosition(int pos)"""
+        return _windows.SplitterEvent_SetSashPosition(*args, **kwargs)
+
+    def GetSashPosition(*args, **kwargs):
+        """GetSashPosition() -> int"""
+        return _windows.SplitterEvent_GetSashPosition(*args, **kwargs)
+
+    def GetWindowBeingRemoved(*args, **kwargs):
+        """GetWindowBeingRemoved() -> Window"""
+        return _windows.SplitterEvent_GetWindowBeingRemoved(*args, **kwargs)
+
+    def GetX(*args, **kwargs):
+        """GetX() -> int"""
+        return _windows.SplitterEvent_GetX(*args, **kwargs)
+
+    def GetY(*args, **kwargs):
+        """GetY() -> int"""
+        return _windows.SplitterEvent_GetY(*args, **kwargs)
+
 
 class SplitterEventPtr(SplitterEvent):
     def __init__(self, this):
@@ -452,34 +880,101 @@ SASH_BOTTOM = _windows.SASH_BOTTOM
 SASH_LEFT = _windows.SASH_LEFT
 SASH_NONE = _windows.SASH_NONE
 class SashWindow(core.Window):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSashWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=wxCLIP_CHILDREN|wxSW_3D, 
+    wxString name=wxPySashNameStr) -> SashWindow"""
         newobj = _windows.new_SashWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _windows.SashWindow_Create(*args, **kwargs)
-    def SetSashVisible(*args, **kwargs): return _windows.SashWindow_SetSashVisible(*args, **kwargs)
-    def GetSashVisible(*args, **kwargs): return _windows.SashWindow_GetSashVisible(*args, **kwargs)
-    def SetSashBorder(*args, **kwargs): return _windows.SashWindow_SetSashBorder(*args, **kwargs)
-    def HasBorder(*args, **kwargs): return _windows.SashWindow_HasBorder(*args, **kwargs)
-    def GetEdgeMargin(*args, **kwargs): return _windows.SashWindow_GetEdgeMargin(*args, **kwargs)
-    def SetDefaultBorderSize(*args, **kwargs): return _windows.SashWindow_SetDefaultBorderSize(*args, **kwargs)
-    def GetDefaultBorderSize(*args, **kwargs): return _windows.SashWindow_GetDefaultBorderSize(*args, **kwargs)
-    def SetExtraBorderSize(*args, **kwargs): return _windows.SashWindow_SetExtraBorderSize(*args, **kwargs)
-    def GetExtraBorderSize(*args, **kwargs): return _windows.SashWindow_GetExtraBorderSize(*args, **kwargs)
-    def SetMinimumSizeX(*args, **kwargs): return _windows.SashWindow_SetMinimumSizeX(*args, **kwargs)
-    def SetMinimumSizeY(*args, **kwargs): return _windows.SashWindow_SetMinimumSizeY(*args, **kwargs)
-    def GetMinimumSizeX(*args, **kwargs): return _windows.SashWindow_GetMinimumSizeX(*args, **kwargs)
-    def GetMinimumSizeY(*args, **kwargs): return _windows.SashWindow_GetMinimumSizeY(*args, **kwargs)
-    def SetMaximumSizeX(*args, **kwargs): return _windows.SashWindow_SetMaximumSizeX(*args, **kwargs)
-    def SetMaximumSizeY(*args, **kwargs): return _windows.SashWindow_SetMaximumSizeY(*args, **kwargs)
-    def GetMaximumSizeX(*args, **kwargs): return _windows.SashWindow_GetMaximumSizeX(*args, **kwargs)
-    def GetMaximumSizeY(*args, **kwargs): return _windows.SashWindow_GetMaximumSizeY(*args, **kwargs)
-    def SashHitTest(*args, **kwargs): return _windows.SashWindow_SashHitTest(*args, **kwargs)
-    def SizeWindows(*args, **kwargs): return _windows.SashWindow_SizeWindows(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSashWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=wxCLIP_CHILDREN|wxSW_3D, 
+    wxString name=wxPySashNameStr) -> bool"""
+        return _windows.SashWindow_Create(*args, **kwargs)
+
+    def SetSashVisible(*args, **kwargs):
+        """SetSashVisible(wxSashEdgePosition edge, bool sash)"""
+        return _windows.SashWindow_SetSashVisible(*args, **kwargs)
+
+    def GetSashVisible(*args, **kwargs):
+        """GetSashVisible(wxSashEdgePosition edge) -> bool"""
+        return _windows.SashWindow_GetSashVisible(*args, **kwargs)
+
+    def SetSashBorder(*args, **kwargs):
+        """SetSashBorder(wxSashEdgePosition edge, bool border)"""
+        return _windows.SashWindow_SetSashBorder(*args, **kwargs)
+
+    def HasBorder(*args, **kwargs):
+        """HasBorder(wxSashEdgePosition edge) -> bool"""
+        return _windows.SashWindow_HasBorder(*args, **kwargs)
+
+    def GetEdgeMargin(*args, **kwargs):
+        """GetEdgeMargin(wxSashEdgePosition edge) -> int"""
+        return _windows.SashWindow_GetEdgeMargin(*args, **kwargs)
+
+    def SetDefaultBorderSize(*args, **kwargs):
+        """SetDefaultBorderSize(int width)"""
+        return _windows.SashWindow_SetDefaultBorderSize(*args, **kwargs)
+
+    def GetDefaultBorderSize(*args, **kwargs):
+        """GetDefaultBorderSize() -> int"""
+        return _windows.SashWindow_GetDefaultBorderSize(*args, **kwargs)
+
+    def SetExtraBorderSize(*args, **kwargs):
+        """SetExtraBorderSize(int width)"""
+        return _windows.SashWindow_SetExtraBorderSize(*args, **kwargs)
+
+    def GetExtraBorderSize(*args, **kwargs):
+        """GetExtraBorderSize() -> int"""
+        return _windows.SashWindow_GetExtraBorderSize(*args, **kwargs)
+
+    def SetMinimumSizeX(*args, **kwargs):
+        """SetMinimumSizeX(int min)"""
+        return _windows.SashWindow_SetMinimumSizeX(*args, **kwargs)
+
+    def SetMinimumSizeY(*args, **kwargs):
+        """SetMinimumSizeY(int min)"""
+        return _windows.SashWindow_SetMinimumSizeY(*args, **kwargs)
+
+    def GetMinimumSizeX(*args, **kwargs):
+        """GetMinimumSizeX() -> int"""
+        return _windows.SashWindow_GetMinimumSizeX(*args, **kwargs)
+
+    def GetMinimumSizeY(*args, **kwargs):
+        """GetMinimumSizeY() -> int"""
+        return _windows.SashWindow_GetMinimumSizeY(*args, **kwargs)
+
+    def SetMaximumSizeX(*args, **kwargs):
+        """SetMaximumSizeX(int max)"""
+        return _windows.SashWindow_SetMaximumSizeX(*args, **kwargs)
+
+    def SetMaximumSizeY(*args, **kwargs):
+        """SetMaximumSizeY(int max)"""
+        return _windows.SashWindow_SetMaximumSizeY(*args, **kwargs)
+
+    def GetMaximumSizeX(*args, **kwargs):
+        """GetMaximumSizeX() -> int"""
+        return _windows.SashWindow_GetMaximumSizeX(*args, **kwargs)
+
+    def GetMaximumSizeY(*args, **kwargs):
+        """GetMaximumSizeY() -> int"""
+        return _windows.SashWindow_GetMaximumSizeY(*args, **kwargs)
+
+    def SashHitTest(*args, **kwargs):
+        """SashHitTest(int x, int y, int tolerance=2) -> wxSashEdgePosition"""
+        return _windows.SashWindow_SashHitTest(*args, **kwargs)
+
+    def SizeWindows(*args, **kwargs):
+        """SizeWindows()"""
+        return _windows.SashWindow_SizeWindows(*args, **kwargs)
+
 
 class SashWindowPtr(SashWindow):
     def __init__(self, this):
@@ -489,6 +984,7 @@ class SashWindowPtr(SashWindow):
 _windows.SashWindow_swigregister(SashWindowPtr)
 
 def PreSashWindow(*args, **kwargs):
+    """PreSashWindow() -> SashWindow"""
     val = _windows.new_PreSashWindow(*args, **kwargs)
     val.thisown = 1
     return val
@@ -496,19 +992,39 @@ def PreSashWindow(*args, **kwargs):
 SASH_STATUS_OK = _windows.SASH_STATUS_OK
 SASH_STATUS_OUT_OF_RANGE = _windows.SASH_STATUS_OUT_OF_RANGE
 class SashEvent(core.CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSashEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int id=0, wxSashEdgePosition edge=SASH_NONE) -> SashEvent"""
         newobj = _windows.new_SashEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetEdge(*args, **kwargs): return _windows.SashEvent_SetEdge(*args, **kwargs)
-    def GetEdge(*args, **kwargs): return _windows.SashEvent_GetEdge(*args, **kwargs)
-    def SetDragRect(*args, **kwargs): return _windows.SashEvent_SetDragRect(*args, **kwargs)
-    def GetDragRect(*args, **kwargs): return _windows.SashEvent_GetDragRect(*args, **kwargs)
-    def SetDragStatus(*args, **kwargs): return _windows.SashEvent_SetDragStatus(*args, **kwargs)
-    def GetDragStatus(*args, **kwargs): return _windows.SashEvent_GetDragStatus(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSashEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetEdge(*args, **kwargs):
+        """SetEdge(wxSashEdgePosition edge)"""
+        return _windows.SashEvent_SetEdge(*args, **kwargs)
+
+    def GetEdge(*args, **kwargs):
+        """GetEdge() -> wxSashEdgePosition"""
+        return _windows.SashEvent_GetEdge(*args, **kwargs)
+
+    def SetDragRect(*args, **kwargs):
+        """SetDragRect(Rect rect)"""
+        return _windows.SashEvent_SetDragRect(*args, **kwargs)
+
+    def GetDragRect(*args, **kwargs):
+        """GetDragRect() -> Rect"""
+        return _windows.SashEvent_GetDragRect(*args, **kwargs)
+
+    def SetDragStatus(*args, **kwargs):
+        """SetDragStatus(wxSashDragStatus status)"""
+        return _windows.SashEvent_SetDragStatus(*args, **kwargs)
+
+    def GetDragStatus(*args, **kwargs):
+        """GetDragStatus() -> wxSashDragStatus"""
+        return _windows.SashEvent_GetDragStatus(*args, **kwargs)
+
 
 class SashEventPtr(SashEvent):
     def __init__(self, this):
@@ -537,23 +1053,55 @@ LAYOUT_QUERY = _windows.LAYOUT_QUERY
 wxEVT_QUERY_LAYOUT_INFO = _windows.wxEVT_QUERY_LAYOUT_INFO
 wxEVT_CALCULATE_LAYOUT = _windows.wxEVT_CALCULATE_LAYOUT
 class QueryLayoutInfoEvent(core.Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxQueryLayoutInfoEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int id=0) -> QueryLayoutInfoEvent"""
         newobj = _windows.new_QueryLayoutInfoEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetRequestedLength(*args, **kwargs): return _windows.QueryLayoutInfoEvent_SetRequestedLength(*args, **kwargs)
-    def GetRequestedLength(*args, **kwargs): return _windows.QueryLayoutInfoEvent_GetRequestedLength(*args, **kwargs)
-    def SetFlags(*args, **kwargs): return _windows.QueryLayoutInfoEvent_SetFlags(*args, **kwargs)
-    def GetFlags(*args, **kwargs): return _windows.QueryLayoutInfoEvent_GetFlags(*args, **kwargs)
-    def SetSize(*args, **kwargs): return _windows.QueryLayoutInfoEvent_SetSize(*args, **kwargs)
-    def GetSize(*args, **kwargs): return _windows.QueryLayoutInfoEvent_GetSize(*args, **kwargs)
-    def SetOrientation(*args, **kwargs): return _windows.QueryLayoutInfoEvent_SetOrientation(*args, **kwargs)
-    def GetOrientation(*args, **kwargs): return _windows.QueryLayoutInfoEvent_GetOrientation(*args, **kwargs)
-    def SetAlignment(*args, **kwargs): return _windows.QueryLayoutInfoEvent_SetAlignment(*args, **kwargs)
-    def GetAlignment(*args, **kwargs): return _windows.QueryLayoutInfoEvent_GetAlignment(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxQueryLayoutInfoEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetRequestedLength(*args, **kwargs):
+        """SetRequestedLength(int length)"""
+        return _windows.QueryLayoutInfoEvent_SetRequestedLength(*args, **kwargs)
+
+    def GetRequestedLength(*args, **kwargs):
+        """GetRequestedLength() -> int"""
+        return _windows.QueryLayoutInfoEvent_GetRequestedLength(*args, **kwargs)
+
+    def SetFlags(*args, **kwargs):
+        """SetFlags(int flags)"""
+        return _windows.QueryLayoutInfoEvent_SetFlags(*args, **kwargs)
+
+    def GetFlags(*args, **kwargs):
+        """GetFlags() -> int"""
+        return _windows.QueryLayoutInfoEvent_GetFlags(*args, **kwargs)
+
+    def SetSize(*args, **kwargs):
+        """SetSize(Size size)"""
+        return _windows.QueryLayoutInfoEvent_SetSize(*args, **kwargs)
+
+    def GetSize(*args, **kwargs):
+        """GetSize() -> Size"""
+        return _windows.QueryLayoutInfoEvent_GetSize(*args, **kwargs)
+
+    def SetOrientation(*args, **kwargs):
+        """SetOrientation(wxLayoutOrientation orient)"""
+        return _windows.QueryLayoutInfoEvent_SetOrientation(*args, **kwargs)
+
+    def GetOrientation(*args, **kwargs):
+        """GetOrientation() -> wxLayoutOrientation"""
+        return _windows.QueryLayoutInfoEvent_GetOrientation(*args, **kwargs)
+
+    def SetAlignment(*args, **kwargs):
+        """SetAlignment(wxLayoutAlignment align)"""
+        return _windows.QueryLayoutInfoEvent_SetAlignment(*args, **kwargs)
+
+    def GetAlignment(*args, **kwargs):
+        """GetAlignment() -> wxLayoutAlignment"""
+        return _windows.QueryLayoutInfoEvent_GetAlignment(*args, **kwargs)
+
 
 class QueryLayoutInfoEventPtr(QueryLayoutInfoEvent):
     def __init__(self, this):
@@ -563,17 +1111,31 @@ class QueryLayoutInfoEventPtr(QueryLayoutInfoEvent):
 _windows.QueryLayoutInfoEvent_swigregister(QueryLayoutInfoEventPtr)
 
 class CalculateLayoutEvent(core.Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCalculateLayoutEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int id=0) -> CalculateLayoutEvent"""
         newobj = _windows.new_CalculateLayoutEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetFlags(*args, **kwargs): return _windows.CalculateLayoutEvent_SetFlags(*args, **kwargs)
-    def GetFlags(*args, **kwargs): return _windows.CalculateLayoutEvent_GetFlags(*args, **kwargs)
-    def SetRect(*args, **kwargs): return _windows.CalculateLayoutEvent_SetRect(*args, **kwargs)
-    def GetRect(*args, **kwargs): return _windows.CalculateLayoutEvent_GetRect(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCalculateLayoutEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetFlags(*args, **kwargs):
+        """SetFlags(int flags)"""
+        return _windows.CalculateLayoutEvent_SetFlags(*args, **kwargs)
+
+    def GetFlags(*args, **kwargs):
+        """GetFlags() -> int"""
+        return _windows.CalculateLayoutEvent_GetFlags(*args, **kwargs)
+
+    def SetRect(*args, **kwargs):
+        """SetRect(Rect rect)"""
+        return _windows.CalculateLayoutEvent_SetRect(*args, **kwargs)
+
+    def GetRect(*args, **kwargs):
+        """GetRect() -> Rect"""
+        return _windows.CalculateLayoutEvent_GetRect(*args, **kwargs)
+
 
 class CalculateLayoutEventPtr(CalculateLayoutEvent):
     def __init__(self, this):
@@ -586,20 +1148,45 @@ EVT_QUERY_LAYOUT_INFO = wx.PyEventBinder( wxEVT_QUERY_LAYOUT_INFO )
 EVT_CALCULATE_LAYOUT = wx.PyEventBinder( wxEVT_CALCULATE_LAYOUT )
 
 class SashLayoutWindow(SashWindow):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSashLayoutWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=wxCLIP_CHILDREN|wxSW_3D, 
+    wxString name=wxPySashLayoutNameStr) -> SashLayoutWindow"""
         newobj = _windows.new_SashLayoutWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _windows.SashLayoutWindow_Create(*args, **kwargs)
-    def GetAlignment(*args, **kwargs): return _windows.SashLayoutWindow_GetAlignment(*args, **kwargs)
-    def GetOrientation(*args, **kwargs): return _windows.SashLayoutWindow_GetOrientation(*args, **kwargs)
-    def SetAlignment(*args, **kwargs): return _windows.SashLayoutWindow_SetAlignment(*args, **kwargs)
-    def SetDefaultSize(*args, **kwargs): return _windows.SashLayoutWindow_SetDefaultSize(*args, **kwargs)
-    def SetOrientation(*args, **kwargs): return _windows.SashLayoutWindow_SetOrientation(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSashLayoutWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=wxCLIP_CHILDREN|wxSW_3D, 
+    wxString name=wxPySashLayoutNameStr) -> bool"""
+        return _windows.SashLayoutWindow_Create(*args, **kwargs)
+
+    def GetAlignment(*args, **kwargs):
+        """GetAlignment() -> wxLayoutAlignment"""
+        return _windows.SashLayoutWindow_GetAlignment(*args, **kwargs)
+
+    def GetOrientation(*args, **kwargs):
+        """GetOrientation() -> wxLayoutOrientation"""
+        return _windows.SashLayoutWindow_GetOrientation(*args, **kwargs)
+
+    def SetAlignment(*args, **kwargs):
+        """SetAlignment(wxLayoutAlignment alignment)"""
+        return _windows.SashLayoutWindow_SetAlignment(*args, **kwargs)
+
+    def SetDefaultSize(*args, **kwargs):
+        """SetDefaultSize(Size size)"""
+        return _windows.SashLayoutWindow_SetDefaultSize(*args, **kwargs)
+
+    def SetOrientation(*args, **kwargs):
+        """SetOrientation(wxLayoutOrientation orientation)"""
+        return _windows.SashLayoutWindow_SetOrientation(*args, **kwargs)
+
 
 class SashLayoutWindowPtr(SashLayoutWindow):
     def __init__(self, this):
@@ -609,25 +1196,39 @@ class SashLayoutWindowPtr(SashLayoutWindow):
 _windows.SashLayoutWindow_swigregister(SashLayoutWindowPtr)
 
 def PreSashLayoutWindow(*args, **kwargs):
+    """PreSashLayoutWindow() -> SashLayoutWindow"""
     val = _windows.new_PreSashLayoutWindow(*args, **kwargs)
     val.thisown = 1
     return val
 
 class LayoutAlgorithm(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxLayoutAlgorithm instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> LayoutAlgorithm"""
         newobj = _windows.new_LayoutAlgorithm(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_windows.delete_LayoutAlgorithm):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def LayoutMDIFrame(*args, **kwargs): return _windows.LayoutAlgorithm_LayoutMDIFrame(*args, **kwargs)
-    def LayoutFrame(*args, **kwargs): return _windows.LayoutAlgorithm_LayoutFrame(*args, **kwargs)
-    def LayoutWindow(*args, **kwargs): return _windows.LayoutAlgorithm_LayoutWindow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLayoutAlgorithm instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def LayoutMDIFrame(*args, **kwargs):
+        """LayoutMDIFrame(MDIParentFrame frame, Rect rect=None) -> bool"""
+        return _windows.LayoutAlgorithm_LayoutMDIFrame(*args, **kwargs)
+
+    def LayoutFrame(*args, **kwargs):
+        """LayoutFrame(Frame frame, Window mainWindow=None) -> bool"""
+        return _windows.LayoutAlgorithm_LayoutFrame(*args, **kwargs)
+
+    def LayoutWindow(*args, **kwargs):
+        """LayoutWindow(Window parent, Window mainWindow=None) -> bool"""
+        return _windows.LayoutAlgorithm_LayoutWindow(*args, **kwargs)
+
 
 class LayoutAlgorithmPtr(LayoutAlgorithm):
     def __init__(self, this):
@@ -639,16 +1240,25 @@ _windows.LayoutAlgorithm_swigregister(LayoutAlgorithmPtr)
 #---------------------------------------------------------------------------
 
 class PopupWindow(core.Window):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPopupWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int flags=BORDER_NONE) -> PopupWindow"""
         newobj = _windows.new_PopupWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _windows.PopupWindow_Create(*args, **kwargs)
-    def Position(*args, **kwargs): return _windows.PopupWindow_Position(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPopupWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int flags=BORDER_NONE) -> bool"""
+        return _windows.PopupWindow_Create(*args, **kwargs)
+
+    def Position(*args, **kwargs):
+        """Position(Point ptOrigin, Size size)"""
+        return _windows.PopupWindow_Position(*args, **kwargs)
+
 
 class PopupWindowPtr(PopupWindow):
     def __init__(self, this):
@@ -658,6 +1268,7 @@ class PopupWindowPtr(PopupWindow):
 _windows.PopupWindow_swigregister(PopupWindowPtr)
 
 def PrePopupWindow(*args, **kwargs):
+    """PrePopupWindow() -> PopupWindow"""
     val = _windows.new_PrePopupWindow(*args, **kwargs)
     val.thisown = 1
     return val
@@ -665,17 +1276,29 @@ def PrePopupWindow(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class PopupTransientWindow(PopupWindow):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyPopupTransientWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int style=BORDER_NONE) -> PopupTransientWindow"""
         newobj = _windows.new_PopupTransientWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self);self._setCallbackInfo(self, PopupTransientWindow)
-    def _setCallbackInfo(*args, **kwargs): return _windows.PopupTransientWindow__setCallbackInfo(*args, **kwargs)
-    def Popup(*args, **kwargs): return _windows.PopupTransientWindow_Popup(*args, **kwargs)
-    def Dismiss(*args, **kwargs): return _windows.PopupTransientWindow_Dismiss(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyPopupTransientWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _windows.PopupTransientWindow__setCallbackInfo(*args, **kwargs)
+
+    def Popup(*args, **kwargs):
+        """Popup(Window focus=None)"""
+        return _windows.PopupTransientWindow_Popup(*args, **kwargs)
+
+    def Dismiss(*args, **kwargs):
+        """Dismiss()"""
+        return _windows.PopupTransientWindow_Dismiss(*args, **kwargs)
+
 
 class PopupTransientWindowPtr(PopupTransientWindow):
     def __init__(self, this):
@@ -685,6 +1308,7 @@ class PopupTransientWindowPtr(PopupTransientWindow):
 _windows.PopupTransientWindow_swigregister(PopupTransientWindowPtr)
 
 def PrePopupTransientWindow(*args, **kwargs):
+    """PrePopupTransientWindow() -> PopupTransientWindow"""
     val = _windows.new_PrePopupTransientWindow(*args, **kwargs)
     val.thisown = 1
     return val
@@ -692,16 +1316,25 @@ def PrePopupTransientWindow(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class TipWindow(PopupTransientWindow):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTipWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, wxString text, int maxLength=100, Rect rectBound=None) -> TipWindow"""
         newobj = _windows.new_TipWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def SetBoundingRect(*args, **kwargs): return _windows.TipWindow_SetBoundingRect(*args, **kwargs)
-    def Close(*args, **kwargs): return _windows.TipWindow_Close(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTipWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetBoundingRect(*args, **kwargs):
+        """SetBoundingRect(Rect rectBound)"""
+        return _windows.TipWindow_SetBoundingRect(*args, **kwargs)
+
+    def Close(*args, **kwargs):
+        """Close()"""
+        return _windows.TipWindow_Close(*args, **kwargs)
+
 
 class TipWindowPtr(TipWindow):
     def __init__(self, this):
@@ -713,29 +1346,79 @@ _windows.TipWindow_swigregister(TipWindowPtr)
 #---------------------------------------------------------------------------
 
 class VScrolledWindow(Panel):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyVScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, wxString name=PanelNameStr) -> VScrolledWindow"""
         newobj = _windows.new_VScrolledWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self); self._setCallbackInfo(self, VScrolledWindow)
-    def _setCallbackInfo(*args, **kwargs): return _windows.VScrolledWindow__setCallbackInfo(*args, **kwargs)
-    def Create(*args, **kwargs): return _windows.VScrolledWindow_Create(*args, **kwargs)
-    def SetLineCount(*args, **kwargs): return _windows.VScrolledWindow_SetLineCount(*args, **kwargs)
-    def ScrollToLine(*args, **kwargs): return _windows.VScrolledWindow_ScrollToLine(*args, **kwargs)
-    def ScrollLines(*args, **kwargs): return _windows.VScrolledWindow_ScrollLines(*args, **kwargs)
-    def ScrollPages(*args, **kwargs): return _windows.VScrolledWindow_ScrollPages(*args, **kwargs)
-    def RefreshLine(*args, **kwargs): return _windows.VScrolledWindow_RefreshLine(*args, **kwargs)
-    def RefreshLines(*args, **kwargs): return _windows.VScrolledWindow_RefreshLines(*args, **kwargs)
-    def HitTestXT(*args, **kwargs): return _windows.VScrolledWindow_HitTestXT(*args, **kwargs)
-    def HitTest(*args, **kwargs): return _windows.VScrolledWindow_HitTest(*args, **kwargs)
-    def RefreshAll(*args, **kwargs): return _windows.VScrolledWindow_RefreshAll(*args, **kwargs)
-    def GetLineCount(*args, **kwargs): return _windows.VScrolledWindow_GetLineCount(*args, **kwargs)
-    def GetFirstVisibleLine(*args, **kwargs): return _windows.VScrolledWindow_GetFirstVisibleLine(*args, **kwargs)
-    def GetLastVisibleLine(*args, **kwargs): return _windows.VScrolledWindow_GetLastVisibleLine(*args, **kwargs)
-    def IsVisible(*args, **kwargs): return _windows.VScrolledWindow_IsVisible(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyVScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _windows.VScrolledWindow__setCallbackInfo(*args, **kwargs)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, wxString name=PanelNameStr) -> bool"""
+        return _windows.VScrolledWindow_Create(*args, **kwargs)
+
+    def SetLineCount(*args, **kwargs):
+        """SetLineCount(size_t count)"""
+        return _windows.VScrolledWindow_SetLineCount(*args, **kwargs)
+
+    def ScrollToLine(*args, **kwargs):
+        """ScrollToLine(size_t line) -> bool"""
+        return _windows.VScrolledWindow_ScrollToLine(*args, **kwargs)
+
+    def ScrollLines(*args, **kwargs):
+        """ScrollLines(int lines) -> bool"""
+        return _windows.VScrolledWindow_ScrollLines(*args, **kwargs)
+
+    def ScrollPages(*args, **kwargs):
+        """ScrollPages(int pages) -> bool"""
+        return _windows.VScrolledWindow_ScrollPages(*args, **kwargs)
+
+    def RefreshLine(*args, **kwargs):
+        """RefreshLine(size_t line)"""
+        return _windows.VScrolledWindow_RefreshLine(*args, **kwargs)
+
+    def RefreshLines(*args, **kwargs):
+        """RefreshLines(size_t from, size_t to)"""
+        return _windows.VScrolledWindow_RefreshLines(*args, **kwargs)
+
+    def HitTestXT(*args, **kwargs):
+        """HitTestXT(int x, int y) -> int"""
+        return _windows.VScrolledWindow_HitTestXT(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """HitTest(Point pt) -> int"""
+        return _windows.VScrolledWindow_HitTest(*args, **kwargs)
+
+    def RefreshAll(*args, **kwargs):
+        """RefreshAll()"""
+        return _windows.VScrolledWindow_RefreshAll(*args, **kwargs)
+
+    def GetLineCount(*args, **kwargs):
+        """GetLineCount() -> size_t"""
+        return _windows.VScrolledWindow_GetLineCount(*args, **kwargs)
+
+    def GetFirstVisibleLine(*args, **kwargs):
+        """GetFirstVisibleLine() -> size_t"""
+        return _windows.VScrolledWindow_GetFirstVisibleLine(*args, **kwargs)
+
+    def GetLastVisibleLine(*args, **kwargs):
+        """GetLastVisibleLine() -> size_t"""
+        return _windows.VScrolledWindow_GetLastVisibleLine(*args, **kwargs)
+
+    def IsVisible(*args, **kwargs):
+        """IsVisible(size_t line) -> bool"""
+        return _windows.VScrolledWindow_IsVisible(*args, **kwargs)
+
 
 class VScrolledWindowPtr(VScrolledWindow):
     def __init__(self, this):
@@ -745,42 +1428,117 @@ class VScrolledWindowPtr(VScrolledWindow):
 _windows.VScrolledWindow_swigregister(VScrolledWindowPtr)
 
 def PreVScrolledWindow(*args, **kwargs):
+    """PreVScrolledWindow() -> VScrolledWindow"""
     val = _windows.new_PreVScrolledWindow(*args, **kwargs)
     val.thisown = 1
     return val
 
 class VListBox(VScrolledWindow):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyVListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, wxString name=wxPyVListBoxNameStr) -> VListBox"""
         newobj = _windows.new_VListBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self);self._setCallbackInfo(self, VListBox)
-    def _setCallbackInfo(*args, **kwargs): return _windows.VListBox__setCallbackInfo(*args, **kwargs)
-    def Create(*args, **kwargs): return _windows.VListBox_Create(*args, **kwargs)
-    def GetItemCount(*args, **kwargs): return _windows.VListBox_GetItemCount(*args, **kwargs)
-    def HasMultipleSelection(*args, **kwargs): return _windows.VListBox_HasMultipleSelection(*args, **kwargs)
-    def GetSelection(*args, **kwargs): return _windows.VListBox_GetSelection(*args, **kwargs)
-    def IsCurrent(*args, **kwargs): return _windows.VListBox_IsCurrent(*args, **kwargs)
-    def IsSelected(*args, **kwargs): return _windows.VListBox_IsSelected(*args, **kwargs)
-    def GetSelectedCount(*args, **kwargs): return _windows.VListBox_GetSelectedCount(*args, **kwargs)
-    def GetFirstSelected(*args, **kwargs): return _windows.VListBox_GetFirstSelected(*args, **kwargs)
-    def GetNextSelected(*args, **kwargs): return _windows.VListBox_GetNextSelected(*args, **kwargs)
-    def GetMargins(*args, **kwargs): return _windows.VListBox_GetMargins(*args, **kwargs)
-    def GetSelectionBackground(*args, **kwargs): return _windows.VListBox_GetSelectionBackground(*args, **kwargs)
-    def SetItemCount(*args, **kwargs): return _windows.VListBox_SetItemCount(*args, **kwargs)
-    def Clear(*args, **kwargs): return _windows.VListBox_Clear(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _windows.VListBox_SetSelection(*args, **kwargs)
-    def Select(*args, **kwargs): return _windows.VListBox_Select(*args, **kwargs)
-    def SelectRange(*args, **kwargs): return _windows.VListBox_SelectRange(*args, **kwargs)
-    def Toggle(*args, **kwargs): return _windows.VListBox_Toggle(*args, **kwargs)
-    def SelectAll(*args, **kwargs): return _windows.VListBox_SelectAll(*args, **kwargs)
-    def DeselectAll(*args, **kwargs): return _windows.VListBox_DeselectAll(*args, **kwargs)
-    def SetMargins(*args, **kwargs): return _windows.VListBox_SetMargins(*args, **kwargs)
-    def SetMarginsXY(*args, **kwargs): return _windows.VListBox_SetMarginsXY(*args, **kwargs)
-    def SetSelectionBackground(*args, **kwargs): return _windows.VListBox_SetSelectionBackground(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyVListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _windows.VListBox__setCallbackInfo(*args, **kwargs)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, wxString name=wxPyVListBoxNameStr) -> bool"""
+        return _windows.VListBox_Create(*args, **kwargs)
+
+    def GetItemCount(*args, **kwargs):
+        """GetItemCount() -> size_t"""
+        return _windows.VListBox_GetItemCount(*args, **kwargs)
+
+    def HasMultipleSelection(*args, **kwargs):
+        """HasMultipleSelection() -> bool"""
+        return _windows.VListBox_HasMultipleSelection(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> int"""
+        return _windows.VListBox_GetSelection(*args, **kwargs)
+
+    def IsCurrent(*args, **kwargs):
+        """IsCurrent(size_t item) -> bool"""
+        return _windows.VListBox_IsCurrent(*args, **kwargs)
+
+    def IsSelected(*args, **kwargs):
+        """IsSelected(size_t item) -> bool"""
+        return _windows.VListBox_IsSelected(*args, **kwargs)
+
+    def GetSelectedCount(*args, **kwargs):
+        """GetSelectedCount() -> size_t"""
+        return _windows.VListBox_GetSelectedCount(*args, **kwargs)
+
+    def GetFirstSelected(*args, **kwargs):
+        """GetFirstSelected(unsigned long cookie) -> int"""
+        return _windows.VListBox_GetFirstSelected(*args, **kwargs)
+
+    def GetNextSelected(*args, **kwargs):
+        """GetNextSelected(unsigned long cookie) -> int"""
+        return _windows.VListBox_GetNextSelected(*args, **kwargs)
+
+    def GetMargins(*args, **kwargs):
+        """GetMargins() -> Point"""
+        return _windows.VListBox_GetMargins(*args, **kwargs)
+
+    def GetSelectionBackground(*args, **kwargs):
+        """GetSelectionBackground() -> wxColour"""
+        return _windows.VListBox_GetSelectionBackground(*args, **kwargs)
+
+    def SetItemCount(*args, **kwargs):
+        """SetItemCount(size_t count)"""
+        return _windows.VListBox_SetItemCount(*args, **kwargs)
+
+    def Clear(*args, **kwargs):
+        """Clear()"""
+        return _windows.VListBox_Clear(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(int selection)"""
+        return _windows.VListBox_SetSelection(*args, **kwargs)
+
+    def Select(*args, **kwargs):
+        """Select(size_t item, bool select=True) -> bool"""
+        return _windows.VListBox_Select(*args, **kwargs)
+
+    def SelectRange(*args, **kwargs):
+        """SelectRange(size_t from, size_t to) -> bool"""
+        return _windows.VListBox_SelectRange(*args, **kwargs)
+
+    def Toggle(*args, **kwargs):
+        """Toggle(size_t item)"""
+        return _windows.VListBox_Toggle(*args, **kwargs)
+
+    def SelectAll(*args, **kwargs):
+        """SelectAll() -> bool"""
+        return _windows.VListBox_SelectAll(*args, **kwargs)
+
+    def DeselectAll(*args, **kwargs):
+        """DeselectAll() -> bool"""
+        return _windows.VListBox_DeselectAll(*args, **kwargs)
+
+    def SetMargins(*args, **kwargs):
+        """SetMargins(Point pt)"""
+        return _windows.VListBox_SetMargins(*args, **kwargs)
+
+    def SetMarginsXY(*args, **kwargs):
+        """SetMarginsXY(int x, int y)"""
+        return _windows.VListBox_SetMarginsXY(*args, **kwargs)
+
+    def SetSelectionBackground(*args, **kwargs):
+        """SetSelectionBackground(wxColour col)"""
+        return _windows.VListBox_SetSelectionBackground(*args, **kwargs)
+
 
 class VListBoxPtr(VListBox):
     def __init__(self, this):
@@ -790,23 +1548,41 @@ class VListBoxPtr(VListBox):
 _windows.VListBox_swigregister(VListBoxPtr)
 
 def PreVListBox(*args, **kwargs):
+    """PreVListBox() -> VListBox"""
     val = _windows.new_PreVListBox(*args, **kwargs)
     val.thisown = 1
     return val
 
 class HtmlListBox(VListBox):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyHtmlListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, wxString name=wxPyVListBoxNameStr) -> HtmlListBox"""
         newobj = _windows.new_HtmlListBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self);self._setCallbackInfo(self, HtmlListBox)
-    def _setCallbackInfo(*args, **kwargs): return _windows.HtmlListBox__setCallbackInfo(*args, **kwargs)
-    def Create(*args, **kwargs): return _windows.HtmlListBox_Create(*args, **kwargs)
-    def RefreshAll(*args, **kwargs): return _windows.HtmlListBox_RefreshAll(*args, **kwargs)
-    def SetItemCount(*args, **kwargs): return _windows.HtmlListBox_SetItemCount(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyHtmlListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _windows.HtmlListBox__setCallbackInfo(*args, **kwargs)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, wxString name=wxPyVListBoxNameStr) -> bool"""
+        return _windows.HtmlListBox_Create(*args, **kwargs)
+
+    def RefreshAll(*args, **kwargs):
+        """RefreshAll()"""
+        return _windows.HtmlListBox_RefreshAll(*args, **kwargs)
+
+    def SetItemCount(*args, **kwargs):
+        """SetItemCount(size_t count)"""
+        return _windows.HtmlListBox_SetItemCount(*args, **kwargs)
+
 
 class HtmlListBoxPtr(HtmlListBox):
     def __init__(self, this):
@@ -816,6 +1592,7 @@ class HtmlListBoxPtr(HtmlListBox):
 _windows.HtmlListBox_swigregister(HtmlListBoxPtr)
 
 def PreHtmlListBox(*args, **kwargs):
+    """PreHtmlListBox() -> HtmlListBox"""
     val = _windows.new_PreHtmlListBox(*args, **kwargs)
     val.thisown = 1
     return val
@@ -823,22 +1600,41 @@ def PreHtmlListBox(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class TaskBarIcon(core.EvtHandler):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTaskBarIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> TaskBarIcon"""
         newobj = _windows.new_TaskBarIcon(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_windows.delete_TaskBarIcon):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def IsOk(*args, **kwargs): return _windows.TaskBarIcon_IsOk(*args, **kwargs)
-    def IsIconInstalled(*args, **kwargs): return _windows.TaskBarIcon_IsIconInstalled(*args, **kwargs)
-    def SetIcon(*args, **kwargs): return _windows.TaskBarIcon_SetIcon(*args, **kwargs)
-    def RemoveIcon(*args, **kwargs): return _windows.TaskBarIcon_RemoveIcon(*args, **kwargs)
-    def PopupMenu(*args, **kwargs): return _windows.TaskBarIcon_PopupMenu(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTaskBarIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def IsOk(*args, **kwargs):
+        """IsOk() -> bool"""
+        return _windows.TaskBarIcon_IsOk(*args, **kwargs)
+
+    def IsIconInstalled(*args, **kwargs):
+        """IsIconInstalled() -> bool"""
+        return _windows.TaskBarIcon_IsIconInstalled(*args, **kwargs)
+
+    def SetIcon(*args, **kwargs):
+        """SetIcon(wxIcon icon, wxString tooltip=wxPyEmptyString) -> bool"""
+        return _windows.TaskBarIcon_SetIcon(*args, **kwargs)
+
+    def RemoveIcon(*args, **kwargs):
+        """RemoveIcon(void ??) -> bool"""
+        return _windows.TaskBarIcon_RemoveIcon(*args, **kwargs)
+
+    def PopupMenu(*args, **kwargs):
+        """PopupMenu(Menu menu) -> bool"""
+        return _windows.TaskBarIcon_PopupMenu(*args, **kwargs)
+
 
 class TaskBarIconPtr(TaskBarIcon):
     def __init__(self, this):
@@ -848,13 +1644,15 @@ class TaskBarIconPtr(TaskBarIcon):
 _windows.TaskBarIcon_swigregister(TaskBarIconPtr)
 
 class TaskBarIconEvent(core.Event):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTaskBarIconEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType evtType, TaskBarIcon tbIcon) -> TaskBarIconEvent"""
         newobj = _windows.new_TaskBarIconEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTaskBarIconEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class TaskBarIconEventPtr(TaskBarIconEvent):
     def __init__(self, this):
@@ -881,23 +1679,45 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
 #---------------------------------------------------------------------------
 
 class ColourData(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxColourData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> ColourData"""
         newobj = _windows.new_ColourData(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_windows.delete_ColourData):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetChooseFull(*args, **kwargs): return _windows.ColourData_GetChooseFull(*args, **kwargs)
-    def GetColour(*args, **kwargs): return _windows.ColourData_GetColour(*args, **kwargs)
-    def GetCustomColour(*args, **kwargs): return _windows.ColourData_GetCustomColour(*args, **kwargs)
-    def SetChooseFull(*args, **kwargs): return _windows.ColourData_SetChooseFull(*args, **kwargs)
-    def SetColour(*args, **kwargs): return _windows.ColourData_SetColour(*args, **kwargs)
-    def SetCustomColour(*args, **kwargs): return _windows.ColourData_SetCustomColour(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxColourData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetChooseFull(*args, **kwargs):
+        """GetChooseFull() -> bool"""
+        return _windows.ColourData_GetChooseFull(*args, **kwargs)
+
+    def GetColour(*args, **kwargs):
+        """GetColour() -> wxColour"""
+        return _windows.ColourData_GetColour(*args, **kwargs)
+
+    def GetCustomColour(*args, **kwargs):
+        """GetCustomColour(int i) -> wxColour"""
+        return _windows.ColourData_GetCustomColour(*args, **kwargs)
+
+    def SetChooseFull(*args, **kwargs):
+        """SetChooseFull(int flag)"""
+        return _windows.ColourData_SetChooseFull(*args, **kwargs)
+
+    def SetColour(*args, **kwargs):
+        """SetColour(wxColour colour)"""
+        return _windows.ColourData_SetColour(*args, **kwargs)
+
+    def SetCustomColour(*args, **kwargs):
+        """SetCustomColour(int i, wxColour colour)"""
+        return _windows.ColourData_SetCustomColour(*args, **kwargs)
+
 
 class ColourDataPtr(ColourData):
     def __init__(self, this):
@@ -907,16 +1727,25 @@ class ColourDataPtr(ColourData):
 _windows.ColourData_swigregister(ColourDataPtr)
 
 class ColourDialog(Dialog):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxColourDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, ColourData data=None) -> ColourDialog"""
         newobj = _windows.new_ColourDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetColourData(*args, **kwargs): return _windows.ColourDialog_GetColourData(*args, **kwargs)
-    def ShowModal(*args, **kwargs): return _windows.ColourDialog_ShowModal(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxColourDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetColourData(*args, **kwargs):
+        """GetColourData() -> ColourData"""
+        return _windows.ColourDialog_GetColourData(*args, **kwargs)
+
+    def ShowModal(*args, **kwargs):
+        """ShowModal() -> int"""
+        return _windows.ColourDialog_ShowModal(*args, **kwargs)
+
 
 class ColourDialogPtr(ColourDialog):
     def __init__(self, this):
@@ -926,20 +1755,44 @@ class ColourDialogPtr(ColourDialog):
 _windows.ColourDialog_swigregister(ColourDialogPtr)
 
 class DirDialog(Dialog):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDirDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, wxString message=wxPyDirSelectorPromptStr, 
+    wxString defaultPath=wxPyEmptyString, 
+    long style=0, Point pos=DefaultPosition, Size size=DefaultSize, 
+    wxString name=wxPyDirDialogNameStr) -> DirDialog"""
         newobj = _windows.new_DirDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetPath(*args, **kwargs): return _windows.DirDialog_GetPath(*args, **kwargs)
-    def GetMessage(*args, **kwargs): return _windows.DirDialog_GetMessage(*args, **kwargs)
-    def GetStyle(*args, **kwargs): return _windows.DirDialog_GetStyle(*args, **kwargs)
-    def SetMessage(*args, **kwargs): return _windows.DirDialog_SetMessage(*args, **kwargs)
-    def SetPath(*args, **kwargs): return _windows.DirDialog_SetPath(*args, **kwargs)
-    def ShowModal(*args, **kwargs): return _windows.DirDialog_ShowModal(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDirDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetPath(*args, **kwargs):
+        """GetPath() -> wxString"""
+        return _windows.DirDialog_GetPath(*args, **kwargs)
+
+    def GetMessage(*args, **kwargs):
+        """GetMessage() -> wxString"""
+        return _windows.DirDialog_GetMessage(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle() -> long"""
+        return _windows.DirDialog_GetStyle(*args, **kwargs)
+
+    def SetMessage(*args, **kwargs):
+        """SetMessage(wxString message)"""
+        return _windows.DirDialog_SetMessage(*args, **kwargs)
+
+    def SetPath(*args, **kwargs):
+        """SetPath(wxString path)"""
+        return _windows.DirDialog_SetPath(*args, **kwargs)
+
+    def ShowModal(*args, **kwargs):
+        """ShowModal() -> int"""
+        return _windows.DirDialog_ShowModal(*args, **kwargs)
+
 
 class DirDialogPtr(DirDialog):
     def __init__(self, this):
@@ -949,30 +1802,85 @@ class DirDialogPtr(DirDialog):
 _windows.DirDialog_swigregister(DirDialogPtr)
 
 class FileDialog(Dialog):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFileDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, wxString message=wxPyFileSelectorPromptStr, 
+    wxString defaultDir=wxPyEmptyString, 
+    wxString defaultFile=wxPyEmptyString, wxString wildcard=wxPyFileSelectorDefaultWildcardStr, 
+    long style=0, 
+    Point pos=DefaultPosition) -> FileDialog"""
         newobj = _windows.new_FileDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def SetMessage(*args, **kwargs): return _windows.FileDialog_SetMessage(*args, **kwargs)
-    def SetPath(*args, **kwargs): return _windows.FileDialog_SetPath(*args, **kwargs)
-    def SetDirectory(*args, **kwargs): return _windows.FileDialog_SetDirectory(*args, **kwargs)
-    def SetFilename(*args, **kwargs): return _windows.FileDialog_SetFilename(*args, **kwargs)
-    def SetWildcard(*args, **kwargs): return _windows.FileDialog_SetWildcard(*args, **kwargs)
-    def SetStyle(*args, **kwargs): return _windows.FileDialog_SetStyle(*args, **kwargs)
-    def SetFilterIndex(*args, **kwargs): return _windows.FileDialog_SetFilterIndex(*args, **kwargs)
-    def GetMessage(*args, **kwargs): return _windows.FileDialog_GetMessage(*args, **kwargs)
-    def GetPath(*args, **kwargs): return _windows.FileDialog_GetPath(*args, **kwargs)
-    def GetDirectory(*args, **kwargs): return _windows.FileDialog_GetDirectory(*args, **kwargs)
-    def GetFilename(*args, **kwargs): return _windows.FileDialog_GetFilename(*args, **kwargs)
-    def GetWildcard(*args, **kwargs): return _windows.FileDialog_GetWildcard(*args, **kwargs)
-    def GetStyle(*args, **kwargs): return _windows.FileDialog_GetStyle(*args, **kwargs)
-    def GetFilterIndex(*args, **kwargs): return _windows.FileDialog_GetFilterIndex(*args, **kwargs)
-    def GetFilenames(*args, **kwargs): return _windows.FileDialog_GetFilenames(*args, **kwargs)
-    def GetPaths(*args, **kwargs): return _windows.FileDialog_GetPaths(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFileDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetMessage(*args, **kwargs):
+        """SetMessage(wxString message)"""
+        return _windows.FileDialog_SetMessage(*args, **kwargs)
+
+    def SetPath(*args, **kwargs):
+        """SetPath(wxString path)"""
+        return _windows.FileDialog_SetPath(*args, **kwargs)
+
+    def SetDirectory(*args, **kwargs):
+        """SetDirectory(wxString dir)"""
+        return _windows.FileDialog_SetDirectory(*args, **kwargs)
+
+    def SetFilename(*args, **kwargs):
+        """SetFilename(wxString name)"""
+        return _windows.FileDialog_SetFilename(*args, **kwargs)
+
+    def SetWildcard(*args, **kwargs):
+        """SetWildcard(wxString wildCard)"""
+        return _windows.FileDialog_SetWildcard(*args, **kwargs)
+
+    def SetStyle(*args, **kwargs):
+        """SetStyle(long style)"""
+        return _windows.FileDialog_SetStyle(*args, **kwargs)
+
+    def SetFilterIndex(*args, **kwargs):
+        """SetFilterIndex(int filterIndex)"""
+        return _windows.FileDialog_SetFilterIndex(*args, **kwargs)
+
+    def GetMessage(*args, **kwargs):
+        """GetMessage() -> wxString"""
+        return _windows.FileDialog_GetMessage(*args, **kwargs)
+
+    def GetPath(*args, **kwargs):
+        """GetPath() -> wxString"""
+        return _windows.FileDialog_GetPath(*args, **kwargs)
+
+    def GetDirectory(*args, **kwargs):
+        """GetDirectory() -> wxString"""
+        return _windows.FileDialog_GetDirectory(*args, **kwargs)
+
+    def GetFilename(*args, **kwargs):
+        """GetFilename() -> wxString"""
+        return _windows.FileDialog_GetFilename(*args, **kwargs)
+
+    def GetWildcard(*args, **kwargs):
+        """GetWildcard() -> wxString"""
+        return _windows.FileDialog_GetWildcard(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle() -> long"""
+        return _windows.FileDialog_GetStyle(*args, **kwargs)
+
+    def GetFilterIndex(*args, **kwargs):
+        """GetFilterIndex() -> int"""
+        return _windows.FileDialog_GetFilterIndex(*args, **kwargs)
+
+    def GetFilenames(*args, **kwargs):
+        """GetFilenames() -> PyObject"""
+        return _windows.FileDialog_GetFilenames(*args, **kwargs)
+
+    def GetPaths(*args, **kwargs):
+        """GetPaths() -> PyObject"""
+        return _windows.FileDialog_GetPaths(*args, **kwargs)
+
 
 class FileDialogPtr(FileDialog):
     def __init__(self, this):
@@ -983,16 +1891,27 @@ _windows.FileDialog_swigregister(FileDialogPtr)
 
 CHOICEDLG_STYLE = _windows.CHOICEDLG_STYLE
 class MultiChoiceDialog(Dialog):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMultiChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, wxString message, wxString caption, 
+    int LCOUNT, wxString choices, long style=CHOICEDLG_STYLE, 
+    Point pos=DefaultPosition) -> MultiChoiceDialog"""
         newobj = _windows.new_MultiChoiceDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def SetSelections(*args, **kwargs): return _windows.MultiChoiceDialog_SetSelections(*args, **kwargs)
-    def GetSelections(*args, **kwargs): return _windows.MultiChoiceDialog_GetSelections(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMultiChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def SetSelections(*args, **kwargs):
+        """SetSelections(wxArrayInt selections)"""
+        return _windows.MultiChoiceDialog_SetSelections(*args, **kwargs)
+
+    def GetSelections(*args, **kwargs):
+        """GetSelections() -> PyObject"""
+        return _windows.MultiChoiceDialog_GetSelections(*args, **kwargs)
+
 
 class MultiChoiceDialogPtr(MultiChoiceDialog):
     def __init__(self, this):
@@ -1002,18 +1921,35 @@ class MultiChoiceDialogPtr(MultiChoiceDialog):
 _windows.MultiChoiceDialog_swigregister(MultiChoiceDialogPtr)
 
 class SingleChoiceDialog(Dialog):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSingleChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, wxString message, wxString caption, 
+    int choices, wxString choices_array, long style=CHOICEDLG_STYLE, 
+    Point pos=DefaultPosition) -> SingleChoiceDialog"""
         newobj = _windows.new_SingleChoiceDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetSelection(*args, **kwargs): return _windows.SingleChoiceDialog_GetSelection(*args, **kwargs)
-    def GetStringSelection(*args, **kwargs): return _windows.SingleChoiceDialog_GetStringSelection(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _windows.SingleChoiceDialog_SetSelection(*args, **kwargs)
-    def ShowModal(*args, **kwargs): return _windows.SingleChoiceDialog_ShowModal(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSingleChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> int"""
+        return _windows.SingleChoiceDialog_GetSelection(*args, **kwargs)
+
+    def GetStringSelection(*args, **kwargs):
+        """GetStringSelection() -> wxString"""
+        return _windows.SingleChoiceDialog_GetStringSelection(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(int sel)"""
+        return _windows.SingleChoiceDialog_SetSelection(*args, **kwargs)
+
+    def ShowModal(*args, **kwargs):
+        """ShowModal() -> int"""
+        return _windows.SingleChoiceDialog_ShowModal(*args, **kwargs)
+
 
 class SingleChoiceDialogPtr(SingleChoiceDialog):
     def __init__(self, this):
@@ -1023,17 +1959,32 @@ class SingleChoiceDialogPtr(SingleChoiceDialog):
 _windows.SingleChoiceDialog_swigregister(SingleChoiceDialogPtr)
 
 class TextEntryDialog(Dialog):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTextEntryDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, wxString message, wxString caption=wxPyGetTextFromUserPromptStr, 
+    wxString defaultValue=wxPyEmptyString, 
+    long style=wxOK|wxCANCEL|wxCENTRE, 
+    Point pos=DefaultPosition) -> TextEntryDialog"""
         newobj = _windows.new_TextEntryDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetValue(*args, **kwargs): return _windows.TextEntryDialog_GetValue(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _windows.TextEntryDialog_SetValue(*args, **kwargs)
-    def ShowModal(*args, **kwargs): return _windows.TextEntryDialog_ShowModal(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTextEntryDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> wxString"""
+        return _windows.TextEntryDialog_GetValue(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(wxString value)"""
+        return _windows.TextEntryDialog_SetValue(*args, **kwargs)
+
+    def ShowModal(*args, **kwargs):
+        """ShowModal() -> int"""
+        return _windows.TextEntryDialog_ShowModal(*args, **kwargs)
+
 
 class TextEntryDialogPtr(TextEntryDialog):
     def __init__(self, this):
@@ -1043,30 +1994,73 @@ class TextEntryDialogPtr(TextEntryDialog):
 _windows.TextEntryDialog_swigregister(TextEntryDialogPtr)
 
 class FontData(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFontData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> FontData"""
         newobj = _windows.new_FontData(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_windows.delete_FontData):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def EnableEffects(*args, **kwargs): return _windows.FontData_EnableEffects(*args, **kwargs)
-    def GetAllowSymbols(*args, **kwargs): return _windows.FontData_GetAllowSymbols(*args, **kwargs)
-    def GetColour(*args, **kwargs): return _windows.FontData_GetColour(*args, **kwargs)
-    def GetChosenFont(*args, **kwargs): return _windows.FontData_GetChosenFont(*args, **kwargs)
-    def GetEnableEffects(*args, **kwargs): return _windows.FontData_GetEnableEffects(*args, **kwargs)
-    def GetInitialFont(*args, **kwargs): return _windows.FontData_GetInitialFont(*args, **kwargs)
-    def GetShowHelp(*args, **kwargs): return _windows.FontData_GetShowHelp(*args, **kwargs)
-    def SetAllowSymbols(*args, **kwargs): return _windows.FontData_SetAllowSymbols(*args, **kwargs)
-    def SetChosenFont(*args, **kwargs): return _windows.FontData_SetChosenFont(*args, **kwargs)
-    def SetColour(*args, **kwargs): return _windows.FontData_SetColour(*args, **kwargs)
-    def SetInitialFont(*args, **kwargs): return _windows.FontData_SetInitialFont(*args, **kwargs)
-    def SetRange(*args, **kwargs): return _windows.FontData_SetRange(*args, **kwargs)
-    def SetShowHelp(*args, **kwargs): return _windows.FontData_SetShowHelp(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFontData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def EnableEffects(*args, **kwargs):
+        """EnableEffects(bool enable)"""
+        return _windows.FontData_EnableEffects(*args, **kwargs)
+
+    def GetAllowSymbols(*args, **kwargs):
+        """GetAllowSymbols() -> bool"""
+        return _windows.FontData_GetAllowSymbols(*args, **kwargs)
+
+    def GetColour(*args, **kwargs):
+        """GetColour() -> wxColour"""
+        return _windows.FontData_GetColour(*args, **kwargs)
+
+    def GetChosenFont(*args, **kwargs):
+        """GetChosenFont() -> wxFont"""
+        return _windows.FontData_GetChosenFont(*args, **kwargs)
+
+    def GetEnableEffects(*args, **kwargs):
+        """GetEnableEffects() -> bool"""
+        return _windows.FontData_GetEnableEffects(*args, **kwargs)
+
+    def GetInitialFont(*args, **kwargs):
+        """GetInitialFont() -> wxFont"""
+        return _windows.FontData_GetInitialFont(*args, **kwargs)
+
+    def GetShowHelp(*args, **kwargs):
+        """GetShowHelp() -> bool"""
+        return _windows.FontData_GetShowHelp(*args, **kwargs)
+
+    def SetAllowSymbols(*args, **kwargs):
+        """SetAllowSymbols(bool allowSymbols)"""
+        return _windows.FontData_SetAllowSymbols(*args, **kwargs)
+
+    def SetChosenFont(*args, **kwargs):
+        """SetChosenFont(wxFont font)"""
+        return _windows.FontData_SetChosenFont(*args, **kwargs)
+
+    def SetColour(*args, **kwargs):
+        """SetColour(wxColour colour)"""
+        return _windows.FontData_SetColour(*args, **kwargs)
+
+    def SetInitialFont(*args, **kwargs):
+        """SetInitialFont(wxFont font)"""
+        return _windows.FontData_SetInitialFont(*args, **kwargs)
+
+    def SetRange(*args, **kwargs):
+        """SetRange(int min, int max)"""
+        return _windows.FontData_SetRange(*args, **kwargs)
+
+    def SetShowHelp(*args, **kwargs):
+        """SetShowHelp(bool showHelp)"""
+        return _windows.FontData_SetShowHelp(*args, **kwargs)
+
 
 class FontDataPtr(FontData):
     def __init__(self, this):
@@ -1076,16 +2070,25 @@ class FontDataPtr(FontData):
 _windows.FontData_swigregister(FontDataPtr)
 
 class FontDialog(Dialog):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFontDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, FontData data) -> FontDialog"""
         newobj = _windows.new_FontDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetFontData(*args, **kwargs): return _windows.FontDialog_GetFontData(*args, **kwargs)
-    def ShowModal(*args, **kwargs): return _windows.FontDialog_ShowModal(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFontDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetFontData(*args, **kwargs):
+        """GetFontData() -> FontData"""
+        return _windows.FontDialog_GetFontData(*args, **kwargs)
+
+    def ShowModal(*args, **kwargs):
+        """ShowModal() -> int"""
+        return _windows.FontDialog_ShowModal(*args, **kwargs)
+
 
 class FontDialogPtr(FontDialog):
     def __init__(self, this):
@@ -1095,15 +2098,23 @@ class FontDialogPtr(FontDialog):
 _windows.FontDialog_swigregister(FontDialogPtr)
 
 class MessageDialog(Dialog):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMessageDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, wxString message, wxString caption=wxPyMessageBoxCaptionStr, 
+    long style=wxOK|wxCANCEL|wxCENTRE, 
+    Point pos=DefaultPosition) -> MessageDialog"""
         newobj = _windows.new_MessageDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def ShowModal(*args, **kwargs): return _windows.MessageDialog_ShowModal(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMessageDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def ShowModal(*args, **kwargs):
+        """ShowModal() -> int"""
+        return _windows.MessageDialog_ShowModal(*args, **kwargs)
+
 
 class MessageDialogPtr(MessageDialog):
     def __init__(self, this):
@@ -1113,16 +2124,26 @@ class MessageDialogPtr(MessageDialog):
 _windows.MessageDialog_swigregister(MessageDialogPtr)
 
 class ProgressDialog(Frame):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxProgressDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString title, wxString message, int maximum=100, 
+    Window parent=None, int style=wxPD_AUTO_HIDE|wxPD_APP_MODAL) -> ProgressDialog"""
         newobj = _windows.new_ProgressDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Update(*args, **kwargs): return _windows.ProgressDialog_Update(*args, **kwargs)
-    def Resume(*args, **kwargs): return _windows.ProgressDialog_Resume(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxProgressDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Update(*args, **kwargs):
+        """Update(int value, wxString newmsg=wxPyEmptyString) -> bool"""
+        return _windows.ProgressDialog_Update(*args, **kwargs)
+
+    def Resume(*args, **kwargs):
+        """Resume()"""
+        return _windows.ProgressDialog_Resume(*args, **kwargs)
+
 
 class ProgressDialogPtr(ProgressDialog):
     def __init__(self, this):
@@ -1157,20 +2178,43 @@ EVT_COMMAND_FIND_REPLACE_ALL = EVT_FIND_REPLACE_ALL
 EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE        
 
 class FindDialogEvent(core.CommandEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFindDialogEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType commandType=wxEVT_NULL, int id=0) -> FindDialogEvent"""
         newobj = _windows.new_FindDialogEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetFlags(*args, **kwargs): return _windows.FindDialogEvent_GetFlags(*args, **kwargs)
-    def GetFindString(*args, **kwargs): return _windows.FindDialogEvent_GetFindString(*args, **kwargs)
-    def GetReplaceString(*args, **kwargs): return _windows.FindDialogEvent_GetReplaceString(*args, **kwargs)
-    def GetDialog(*args, **kwargs): return _windows.FindDialogEvent_GetDialog(*args, **kwargs)
-    def SetFlags(*args, **kwargs): return _windows.FindDialogEvent_SetFlags(*args, **kwargs)
-    def SetFindString(*args, **kwargs): return _windows.FindDialogEvent_SetFindString(*args, **kwargs)
-    def SetReplaceString(*args, **kwargs): return _windows.FindDialogEvent_SetReplaceString(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFindDialogEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetFlags(*args, **kwargs):
+        """GetFlags() -> int"""
+        return _windows.FindDialogEvent_GetFlags(*args, **kwargs)
+
+    def GetFindString(*args, **kwargs):
+        """GetFindString() -> wxString"""
+        return _windows.FindDialogEvent_GetFindString(*args, **kwargs)
+
+    def GetReplaceString(*args, **kwargs):
+        """GetReplaceString() -> wxString"""
+        return _windows.FindDialogEvent_GetReplaceString(*args, **kwargs)
+
+    def GetDialog(*args, **kwargs):
+        """GetDialog() -> FindReplaceDialog"""
+        return _windows.FindDialogEvent_GetDialog(*args, **kwargs)
+
+    def SetFlags(*args, **kwargs):
+        """SetFlags(int flags)"""
+        return _windows.FindDialogEvent_SetFlags(*args, **kwargs)
+
+    def SetFindString(*args, **kwargs):
+        """SetFindString(wxString str)"""
+        return _windows.FindDialogEvent_SetFindString(*args, **kwargs)
+
+    def SetReplaceString(*args, **kwargs):
+        """SetReplaceString(wxString str)"""
+        return _windows.FindDialogEvent_SetReplaceString(*args, **kwargs)
+
 
 class FindDialogEventPtr(FindDialogEvent):
     def __init__(self, this):
@@ -1180,23 +2224,45 @@ class FindDialogEventPtr(FindDialogEvent):
 _windows.FindDialogEvent_swigregister(FindDialogEventPtr)
 
 class FindReplaceData(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFindReplaceData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(int flags=0) -> FindReplaceData"""
         newobj = _windows.new_FindReplaceData(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_windows.delete_FindReplaceData):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetFindString(*args, **kwargs): return _windows.FindReplaceData_GetFindString(*args, **kwargs)
-    def GetReplaceString(*args, **kwargs): return _windows.FindReplaceData_GetReplaceString(*args, **kwargs)
-    def GetFlags(*args, **kwargs): return _windows.FindReplaceData_GetFlags(*args, **kwargs)
-    def SetFlags(*args, **kwargs): return _windows.FindReplaceData_SetFlags(*args, **kwargs)
-    def SetFindString(*args, **kwargs): return _windows.FindReplaceData_SetFindString(*args, **kwargs)
-    def SetReplaceString(*args, **kwargs): return _windows.FindReplaceData_SetReplaceString(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFindReplaceData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetFindString(*args, **kwargs):
+        """GetFindString() -> wxString"""
+        return _windows.FindReplaceData_GetFindString(*args, **kwargs)
+
+    def GetReplaceString(*args, **kwargs):
+        """GetReplaceString() -> wxString"""
+        return _windows.FindReplaceData_GetReplaceString(*args, **kwargs)
+
+    def GetFlags(*args, **kwargs):
+        """GetFlags() -> int"""
+        return _windows.FindReplaceData_GetFlags(*args, **kwargs)
+
+    def SetFlags(*args, **kwargs):
+        """SetFlags(int flags)"""
+        return _windows.FindReplaceData_SetFlags(*args, **kwargs)
+
+    def SetFindString(*args, **kwargs):
+        """SetFindString(wxString str)"""
+        return _windows.FindReplaceData_SetFindString(*args, **kwargs)
+
+    def SetReplaceString(*args, **kwargs):
+        """SetReplaceString(wxString str)"""
+        return _windows.FindReplaceData_SetReplaceString(*args, **kwargs)
+
 
 class FindReplaceDataPtr(FindReplaceData):
     def __init__(self, this):
@@ -1206,17 +2272,31 @@ class FindReplaceDataPtr(FindReplaceData):
 _windows.FindReplaceData_swigregister(FindReplaceDataPtr)
 
 class FindReplaceDialog(Dialog):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxFindReplaceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, FindReplaceData data, wxString title, 
+    int style=0) -> FindReplaceDialog"""
         newobj = _windows.new_FindReplaceDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _windows.FindReplaceDialog_Create(*args, **kwargs)
-    def GetData(*args, **kwargs): return _windows.FindReplaceDialog_GetData(*args, **kwargs)
-    def SetData(*args, **kwargs): return _windows.FindReplaceDialog_SetData(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFindReplaceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, FindReplaceData data, wxString title, 
+    int style=0) -> bool"""
+        return _windows.FindReplaceDialog_Create(*args, **kwargs)
+
+    def GetData(*args, **kwargs):
+        """GetData() -> FindReplaceData"""
+        return _windows.FindReplaceDialog_GetData(*args, **kwargs)
+
+    def SetData(*args, **kwargs):
+        """SetData(FindReplaceData data)"""
+        return _windows.FindReplaceDialog_SetData(*args, **kwargs)
+
 
 class FindReplaceDialogPtr(FindReplaceDialog):
     def __init__(self, this):
@@ -1226,6 +2306,7 @@ class FindReplaceDialogPtr(FindReplaceDialog):
 _windows.FindReplaceDialog_swigregister(FindReplaceDialogPtr)
 
 def PreFindReplaceDialog(*args, **kwargs):
+    """PreFindReplaceDialog() -> FindReplaceDialog"""
     val = _windows.new_PreFindReplaceDialog(*args, **kwargs)
     val.thisown = 1
     return val
@@ -1241,23 +2322,57 @@ IDM_WINDOWTILEVERT = _windows.IDM_WINDOWTILEVERT
 FIRST_MDI_CHILD = _windows.FIRST_MDI_CHILD
 LAST_MDI_CHILD = _windows.LAST_MDI_CHILD
 class MDIParentFrame(Frame):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMDIParentFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 
+    wxString name=wxPyFrameNameStr) -> MDIParentFrame"""
         newobj = _windows.new_MDIParentFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _windows.MDIParentFrame_Create(*args, **kwargs)
-    def ActivateNext(*args, **kwargs): return _windows.MDIParentFrame_ActivateNext(*args, **kwargs)
-    def ActivatePrevious(*args, **kwargs): return _windows.MDIParentFrame_ActivatePrevious(*args, **kwargs)
-    def ArrangeIcons(*args, **kwargs): return _windows.MDIParentFrame_ArrangeIcons(*args, **kwargs)
-    def Cascade(*args, **kwargs): return _windows.MDIParentFrame_Cascade(*args, **kwargs)
-    def GetActiveChild(*args, **kwargs): return _windows.MDIParentFrame_GetActiveChild(*args, **kwargs)
-    def GetClientWindow(*args, **kwargs): return _windows.MDIParentFrame_GetClientWindow(*args, **kwargs)
-    def GetToolBar(*args, **kwargs): return _windows.MDIParentFrame_GetToolBar(*args, **kwargs)
-    def Tile(*args, **kwargs): return _windows.MDIParentFrame_Tile(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMDIParentFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id, wxString title, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 
+    wxString name=wxPyFrameNameStr) -> bool"""
+        return _windows.MDIParentFrame_Create(*args, **kwargs)
+
+    def ActivateNext(*args, **kwargs):
+        """ActivateNext()"""
+        return _windows.MDIParentFrame_ActivateNext(*args, **kwargs)
+
+    def ActivatePrevious(*args, **kwargs):
+        """ActivatePrevious()"""
+        return _windows.MDIParentFrame_ActivatePrevious(*args, **kwargs)
+
+    def ArrangeIcons(*args, **kwargs):
+        """ArrangeIcons()"""
+        return _windows.MDIParentFrame_ArrangeIcons(*args, **kwargs)
+
+    def Cascade(*args, **kwargs):
+        """Cascade()"""
+        return _windows.MDIParentFrame_Cascade(*args, **kwargs)
+
+    def GetActiveChild(*args, **kwargs):
+        """GetActiveChild() -> MDIChildFrame"""
+        return _windows.MDIParentFrame_GetActiveChild(*args, **kwargs)
+
+    def GetClientWindow(*args, **kwargs):
+        """GetClientWindow() -> MDIClientWindow"""
+        return _windows.MDIParentFrame_GetClientWindow(*args, **kwargs)
+
+    def GetToolBar(*args, **kwargs):
+        """GetToolBar() -> Window"""
+        return _windows.MDIParentFrame_GetToolBar(*args, **kwargs)
+
+    def Tile(*args, **kwargs):
+        """Tile()"""
+        return _windows.MDIParentFrame_Tile(*args, **kwargs)
+
 
 class MDIParentFramePtr(MDIParentFrame):
     def __init__(self, this):
@@ -1267,23 +2382,43 @@ class MDIParentFramePtr(MDIParentFrame):
 _windows.MDIParentFrame_swigregister(MDIParentFramePtr)
 
 def PreMDIParentFrame(*args, **kwargs):
+    """PreMDIParentFrame() -> MDIParentFrame"""
     val = _windows.new_PreMDIParentFrame(*args, **kwargs)
     val.thisown = 1
     return val
 
 class MDIChildFrame(Frame):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMDIChildFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(MDIParentFrame parent, int id, wxString title, Point pos=DefaultPosition, 
+    Size size=DefaultSize, 
+    long style=DEFAULT_FRAME_STYLE, wxString name=wxPyFrameNameStr) -> MDIChildFrame"""
         newobj = _windows.new_MDIChildFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _windows.MDIChildFrame_Create(*args, **kwargs)
-    def Activate(*args, **kwargs): return _windows.MDIChildFrame_Activate(*args, **kwargs)
-    def Maximize(*args, **kwargs): return _windows.MDIChildFrame_Maximize(*args, **kwargs)
-    def Restore(*args, **kwargs): return _windows.MDIChildFrame_Restore(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMDIChildFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(MDIParentFrame parent, int id, wxString title, Point pos=DefaultPosition, 
+    Size size=DefaultSize, 
+    long style=DEFAULT_FRAME_STYLE, wxString name=wxPyFrameNameStr) -> bool"""
+        return _windows.MDIChildFrame_Create(*args, **kwargs)
+
+    def Activate(*args, **kwargs):
+        """Activate()"""
+        return _windows.MDIChildFrame_Activate(*args, **kwargs)
+
+    def Maximize(*args, **kwargs):
+        """Maximize(bool maximize)"""
+        return _windows.MDIChildFrame_Maximize(*args, **kwargs)
+
+    def Restore(*args, **kwargs):
+        """Restore()"""
+        return _windows.MDIChildFrame_Restore(*args, **kwargs)
+
 
 class MDIChildFramePtr(MDIChildFrame):
     def __init__(self, this):
@@ -1293,20 +2428,27 @@ class MDIChildFramePtr(MDIChildFrame):
 _windows.MDIChildFrame_swigregister(MDIChildFramePtr)
 
 def PreMDIChildFrame(*args, **kwargs):
+    """PreMDIChildFrame() -> MDIChildFrame"""
     val = _windows.new_PreMDIChildFrame(*args, **kwargs)
     val.thisown = 1
     return val
 
 class MDIClientWindow(core.Window):
-    def __init__(self, *args, **kwargs):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxMDIClientWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(MDIParentFrame parent, long style=0) -> MDIClientWindow"""
         newobj = _windows.new_MDIClientWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _windows.MDIClientWindow_Create(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMDIClientWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(MDIParentFrame parent, long style=0) -> bool"""
+        return _windows.MDIClientWindow_Create(*args, **kwargs)
+
 
 class MDIClientWindowPtr(MDIClientWindow):
     def __init__(self, this):
@@ -1316,6 +2458,7 @@ class MDIClientWindowPtr(MDIClientWindow):
 _windows.MDIClientWindow_swigregister(MDIClientWindowPtr)
 
 def PreMDIClientWindow(*args, **kwargs):
+    """PreMDIClientWindow() -> MDIClientWindow"""
     val = _windows.new_PreMDIClientWindow(*args, **kwargs)
     val.thisown = 1
     return val
@@ -1323,33 +2466,94 @@ def PreMDIClientWindow(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class PyWindow(core.Window):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, wxString name=PanelNameStr) -> PyWindow"""
         newobj = _windows.new_PyWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self); self._setCallbackInfo(self, PyWindow)
-    def _setCallbackInfo(*args, **kwargs): return _windows.PyWindow__setCallbackInfo(*args, **kwargs)
-    def base_DoMoveWindow(*args, **kwargs): return _windows.PyWindow_base_DoMoveWindow(*args, **kwargs)
-    def base_DoSetSize(*args, **kwargs): return _windows.PyWindow_base_DoSetSize(*args, **kwargs)
-    def base_DoSetClientSize(*args, **kwargs): return _windows.PyWindow_base_DoSetClientSize(*args, **kwargs)
-    def base_DoSetVirtualSize(*args, **kwargs): return _windows.PyWindow_base_DoSetVirtualSize(*args, **kwargs)
-    def base_DoGetSize(*args, **kwargs): return _windows.PyWindow_base_DoGetSize(*args, **kwargs)
-    def base_DoGetClientSize(*args, **kwargs): return _windows.PyWindow_base_DoGetClientSize(*args, **kwargs)
-    def base_DoGetPosition(*args, **kwargs): return _windows.PyWindow_base_DoGetPosition(*args, **kwargs)
-    def base_DoGetVirtualSize(*args, **kwargs): return _windows.PyWindow_base_DoGetVirtualSize(*args, **kwargs)
-    def base_DoGetBestSize(*args, **kwargs): return _windows.PyWindow_base_DoGetBestSize(*args, **kwargs)
-    def base_InitDialog(*args, **kwargs): return _windows.PyWindow_base_InitDialog(*args, **kwargs)
-    def base_TransferDataToWindow(*args, **kwargs): return _windows.PyWindow_base_TransferDataToWindow(*args, **kwargs)
-    def base_TransferDataFromWindow(*args, **kwargs): return _windows.PyWindow_base_TransferDataFromWindow(*args, **kwargs)
-    def base_Validate(*args, **kwargs): return _windows.PyWindow_base_Validate(*args, **kwargs)
-    def base_AcceptsFocus(*args, **kwargs): return _windows.PyWindow_base_AcceptsFocus(*args, **kwargs)
-    def base_AcceptsFocusFromKeyboard(*args, **kwargs): return _windows.PyWindow_base_AcceptsFocusFromKeyboard(*args, **kwargs)
-    def base_GetMaxSize(*args, **kwargs): return _windows.PyWindow_base_GetMaxSize(*args, **kwargs)
-    def base_AddChild(*args, **kwargs): return _windows.PyWindow_base_AddChild(*args, **kwargs)
-    def base_RemoveChild(*args, **kwargs): return _windows.PyWindow_base_RemoveChild(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _windows.PyWindow__setCallbackInfo(*args, **kwargs)
+
+    def base_DoMoveWindow(*args, **kwargs):
+        """base_DoMoveWindow(int x, int y, int width, int height)"""
+        return _windows.PyWindow_base_DoMoveWindow(*args, **kwargs)
+
+    def base_DoSetSize(*args, **kwargs):
+        """base_DoSetSize(int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
+        return _windows.PyWindow_base_DoSetSize(*args, **kwargs)
+
+    def base_DoSetClientSize(*args, **kwargs):
+        """base_DoSetClientSize(int width, int height)"""
+        return _windows.PyWindow_base_DoSetClientSize(*args, **kwargs)
+
+    def base_DoSetVirtualSize(*args, **kwargs):
+        """base_DoSetVirtualSize(int x, int y)"""
+        return _windows.PyWindow_base_DoSetVirtualSize(*args, **kwargs)
+
+    def base_DoGetSize(*args, **kwargs):
+        """base_DoGetSize(int OUTPUT, int OUTPUT)"""
+        return _windows.PyWindow_base_DoGetSize(*args, **kwargs)
+
+    def base_DoGetClientSize(*args, **kwargs):
+        """base_DoGetClientSize(int OUTPUT, int OUTPUT)"""
+        return _windows.PyWindow_base_DoGetClientSize(*args, **kwargs)
+
+    def base_DoGetPosition(*args, **kwargs):
+        """base_DoGetPosition(int OUTPUT, int OUTPUT)"""
+        return _windows.PyWindow_base_DoGetPosition(*args, **kwargs)
+
+    def base_DoGetVirtualSize(*args, **kwargs):
+        """base_DoGetVirtualSize() -> Size"""
+        return _windows.PyWindow_base_DoGetVirtualSize(*args, **kwargs)
+
+    def base_DoGetBestSize(*args, **kwargs):
+        """base_DoGetBestSize() -> Size"""
+        return _windows.PyWindow_base_DoGetBestSize(*args, **kwargs)
+
+    def base_InitDialog(*args, **kwargs):
+        """base_InitDialog()"""
+        return _windows.PyWindow_base_InitDialog(*args, **kwargs)
+
+    def base_TransferDataToWindow(*args, **kwargs):
+        """base_TransferDataToWindow() -> bool"""
+        return _windows.PyWindow_base_TransferDataToWindow(*args, **kwargs)
+
+    def base_TransferDataFromWindow(*args, **kwargs):
+        """base_TransferDataFromWindow() -> bool"""
+        return _windows.PyWindow_base_TransferDataFromWindow(*args, **kwargs)
+
+    def base_Validate(*args, **kwargs):
+        """base_Validate() -> bool"""
+        return _windows.PyWindow_base_Validate(*args, **kwargs)
+
+    def base_AcceptsFocus(*args, **kwargs):
+        """base_AcceptsFocus() -> bool"""
+        return _windows.PyWindow_base_AcceptsFocus(*args, **kwargs)
+
+    def base_AcceptsFocusFromKeyboard(*args, **kwargs):
+        """base_AcceptsFocusFromKeyboard() -> bool"""
+        return _windows.PyWindow_base_AcceptsFocusFromKeyboard(*args, **kwargs)
+
+    def base_GetMaxSize(*args, **kwargs):
+        """base_GetMaxSize() -> Size"""
+        return _windows.PyWindow_base_GetMaxSize(*args, **kwargs)
+
+    def base_AddChild(*args, **kwargs):
+        """base_AddChild(Window child)"""
+        return _windows.PyWindow_base_AddChild(*args, **kwargs)
+
+    def base_RemoveChild(*args, **kwargs):
+        """base_RemoveChild(Window child)"""
+        return _windows.PyWindow_base_RemoveChild(*args, **kwargs)
+
 
 class PyWindowPtr(PyWindow):
     def __init__(self, this):
@@ -1359,33 +2563,94 @@ class PyWindowPtr(PyWindow):
 _windows.PyWindow_swigregister(PyWindowPtr)
 
 class PyPanel(Panel):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyPanel instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, wxString name=PanelNameStr) -> PyPanel"""
         newobj = _windows.new_PyPanel(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)
-    def _setCallbackInfo(*args, **kwargs): return _windows.PyPanel__setCallbackInfo(*args, **kwargs)
-    def base_DoMoveWindow(*args, **kwargs): return _windows.PyPanel_base_DoMoveWindow(*args, **kwargs)
-    def base_DoSetSize(*args, **kwargs): return _windows.PyPanel_base_DoSetSize(*args, **kwargs)
-    def base_DoSetClientSize(*args, **kwargs): return _windows.PyPanel_base_DoSetClientSize(*args, **kwargs)
-    def base_DoSetVirtualSize(*args, **kwargs): return _windows.PyPanel_base_DoSetVirtualSize(*args, **kwargs)
-    def base_DoGetSize(*args, **kwargs): return _windows.PyPanel_base_DoGetSize(*args, **kwargs)
-    def base_DoGetClientSize(*args, **kwargs): return _windows.PyPanel_base_DoGetClientSize(*args, **kwargs)
-    def base_DoGetPosition(*args, **kwargs): return _windows.PyPanel_base_DoGetPosition(*args, **kwargs)
-    def base_DoGetVirtualSize(*args, **kwargs): return _windows.PyPanel_base_DoGetVirtualSize(*args, **kwargs)
-    def base_DoGetBestSize(*args, **kwargs): return _windows.PyPanel_base_DoGetBestSize(*args, **kwargs)
-    def base_InitDialog(*args, **kwargs): return _windows.PyPanel_base_InitDialog(*args, **kwargs)
-    def base_TransferDataToWindow(*args, **kwargs): return _windows.PyPanel_base_TransferDataToWindow(*args, **kwargs)
-    def base_TransferDataFromWindow(*args, **kwargs): return _windows.PyPanel_base_TransferDataFromWindow(*args, **kwargs)
-    def base_Validate(*args, **kwargs): return _windows.PyPanel_base_Validate(*args, **kwargs)
-    def base_AcceptsFocus(*args, **kwargs): return _windows.PyPanel_base_AcceptsFocus(*args, **kwargs)
-    def base_AcceptsFocusFromKeyboard(*args, **kwargs): return _windows.PyPanel_base_AcceptsFocusFromKeyboard(*args, **kwargs)
-    def base_GetMaxSize(*args, **kwargs): return _windows.PyPanel_base_GetMaxSize(*args, **kwargs)
-    def base_AddChild(*args, **kwargs): return _windows.PyPanel_base_AddChild(*args, **kwargs)
-    def base_RemoveChild(*args, **kwargs): return _windows.PyPanel_base_RemoveChild(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyPanel instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _windows.PyPanel__setCallbackInfo(*args, **kwargs)
+
+    def base_DoMoveWindow(*args, **kwargs):
+        """base_DoMoveWindow(int x, int y, int width, int height)"""
+        return _windows.PyPanel_base_DoMoveWindow(*args, **kwargs)
+
+    def base_DoSetSize(*args, **kwargs):
+        """base_DoSetSize(int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
+        return _windows.PyPanel_base_DoSetSize(*args, **kwargs)
+
+    def base_DoSetClientSize(*args, **kwargs):
+        """base_DoSetClientSize(int width, int height)"""
+        return _windows.PyPanel_base_DoSetClientSize(*args, **kwargs)
+
+    def base_DoSetVirtualSize(*args, **kwargs):
+        """base_DoSetVirtualSize(int x, int y)"""
+        return _windows.PyPanel_base_DoSetVirtualSize(*args, **kwargs)
+
+    def base_DoGetSize(*args, **kwargs):
+        """base_DoGetSize(int OUTPUT, int OUTPUT)"""
+        return _windows.PyPanel_base_DoGetSize(*args, **kwargs)
+
+    def base_DoGetClientSize(*args, **kwargs):
+        """base_DoGetClientSize(int OUTPUT, int OUTPUT)"""
+        return _windows.PyPanel_base_DoGetClientSize(*args, **kwargs)
+
+    def base_DoGetPosition(*args, **kwargs):
+        """base_DoGetPosition(int OUTPUT, int OUTPUT)"""
+        return _windows.PyPanel_base_DoGetPosition(*args, **kwargs)
+
+    def base_DoGetVirtualSize(*args, **kwargs):
+        """base_DoGetVirtualSize() -> Size"""
+        return _windows.PyPanel_base_DoGetVirtualSize(*args, **kwargs)
+
+    def base_DoGetBestSize(*args, **kwargs):
+        """base_DoGetBestSize() -> Size"""
+        return _windows.PyPanel_base_DoGetBestSize(*args, **kwargs)
+
+    def base_InitDialog(*args, **kwargs):
+        """base_InitDialog()"""
+        return _windows.PyPanel_base_InitDialog(*args, **kwargs)
+
+    def base_TransferDataToWindow(*args, **kwargs):
+        """base_TransferDataToWindow() -> bool"""
+        return _windows.PyPanel_base_TransferDataToWindow(*args, **kwargs)
+
+    def base_TransferDataFromWindow(*args, **kwargs):
+        """base_TransferDataFromWindow() -> bool"""
+        return _windows.PyPanel_base_TransferDataFromWindow(*args, **kwargs)
+
+    def base_Validate(*args, **kwargs):
+        """base_Validate() -> bool"""
+        return _windows.PyPanel_base_Validate(*args, **kwargs)
+
+    def base_AcceptsFocus(*args, **kwargs):
+        """base_AcceptsFocus() -> bool"""
+        return _windows.PyPanel_base_AcceptsFocus(*args, **kwargs)
+
+    def base_AcceptsFocusFromKeyboard(*args, **kwargs):
+        """base_AcceptsFocusFromKeyboard() -> bool"""
+        return _windows.PyPanel_base_AcceptsFocusFromKeyboard(*args, **kwargs)
+
+    def base_GetMaxSize(*args, **kwargs):
+        """base_GetMaxSize() -> Size"""
+        return _windows.PyPanel_base_GetMaxSize(*args, **kwargs)
+
+    def base_AddChild(*args, **kwargs):
+        """base_AddChild(Window child)"""
+        return _windows.PyPanel_base_AddChild(*args, **kwargs)
+
+    def base_RemoveChild(*args, **kwargs):
+        """base_RemoveChild(Window child)"""
+        return _windows.PyPanel_base_RemoveChild(*args, **kwargs)
+
 
 class PyPanelPtr(PyPanel):
     def __init__(self, this):
@@ -1401,59 +2666,186 @@ PRINT_MODE_PREVIEW = _windows.PRINT_MODE_PREVIEW
 PRINT_MODE_FILE = _windows.PRINT_MODE_FILE
 PRINT_MODE_PRINTER = _windows.PRINT_MODE_PRINTER
 class PrintData(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPrintData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PrintData"""
         newobj = _windows.new_PrintData(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_windows.delete_PrintData):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetNoCopies(*args, **kwargs): return _windows.PrintData_GetNoCopies(*args, **kwargs)
-    def GetCollate(*args, **kwargs): return _windows.PrintData_GetCollate(*args, **kwargs)
-    def GetOrientation(*args, **kwargs): return _windows.PrintData_GetOrientation(*args, **kwargs)
-    def Ok(*args, **kwargs): return _windows.PrintData_Ok(*args, **kwargs)
-    def GetPrinterName(*args, **kwargs): return _windows.PrintData_GetPrinterName(*args, **kwargs)
-    def GetColour(*args, **kwargs): return _windows.PrintData_GetColour(*args, **kwargs)
-    def GetDuplex(*args, **kwargs): return _windows.PrintData_GetDuplex(*args, **kwargs)
-    def GetPaperId(*args, **kwargs): return _windows.PrintData_GetPaperId(*args, **kwargs)
-    def GetPaperSize(*args, **kwargs): return _windows.PrintData_GetPaperSize(*args, **kwargs)
-    def GetQuality(*args, **kwargs): return _windows.PrintData_GetQuality(*args, **kwargs)
-    def SetNoCopies(*args, **kwargs): return _windows.PrintData_SetNoCopies(*args, **kwargs)
-    def SetCollate(*args, **kwargs): return _windows.PrintData_SetCollate(*args, **kwargs)
-    def SetOrientation(*args, **kwargs): return _windows.PrintData_SetOrientation(*args, **kwargs)
-    def SetPrinterName(*args, **kwargs): return _windows.PrintData_SetPrinterName(*args, **kwargs)
-    def SetColour(*args, **kwargs): return _windows.PrintData_SetColour(*args, **kwargs)
-    def SetDuplex(*args, **kwargs): return _windows.PrintData_SetDuplex(*args, **kwargs)
-    def SetPaperId(*args, **kwargs): return _windows.PrintData_SetPaperId(*args, **kwargs)
-    def SetPaperSize(*args, **kwargs): return _windows.PrintData_SetPaperSize(*args, **kwargs)
-    def SetQuality(*args, **kwargs): return _windows.PrintData_SetQuality(*args, **kwargs)
-    def GetPrinterCommand(*args, **kwargs): return _windows.PrintData_GetPrinterCommand(*args, **kwargs)
-    def GetPrinterOptions(*args, **kwargs): return _windows.PrintData_GetPrinterOptions(*args, **kwargs)
-    def GetPreviewCommand(*args, **kwargs): return _windows.PrintData_GetPreviewCommand(*args, **kwargs)
-    def GetFilename(*args, **kwargs): return _windows.PrintData_GetFilename(*args, **kwargs)
-    def GetFontMetricPath(*args, **kwargs): return _windows.PrintData_GetFontMetricPath(*args, **kwargs)
-    def GetPrinterScaleX(*args, **kwargs): return _windows.PrintData_GetPrinterScaleX(*args, **kwargs)
-    def GetPrinterScaleY(*args, **kwargs): return _windows.PrintData_GetPrinterScaleY(*args, **kwargs)
-    def GetPrinterTranslateX(*args, **kwargs): return _windows.PrintData_GetPrinterTranslateX(*args, **kwargs)
-    def GetPrinterTranslateY(*args, **kwargs): return _windows.PrintData_GetPrinterTranslateY(*args, **kwargs)
-    def GetPrintMode(*args, **kwargs): return _windows.PrintData_GetPrintMode(*args, **kwargs)
-    def SetPrinterCommand(*args, **kwargs): return _windows.PrintData_SetPrinterCommand(*args, **kwargs)
-    def SetPrinterOptions(*args, **kwargs): return _windows.PrintData_SetPrinterOptions(*args, **kwargs)
-    def SetPreviewCommand(*args, **kwargs): return _windows.PrintData_SetPreviewCommand(*args, **kwargs)
-    def SetFilename(*args, **kwargs): return _windows.PrintData_SetFilename(*args, **kwargs)
-    def SetFontMetricPath(*args, **kwargs): return _windows.PrintData_SetFontMetricPath(*args, **kwargs)
-    def SetPrinterScaleX(*args, **kwargs): return _windows.PrintData_SetPrinterScaleX(*args, **kwargs)
-    def SetPrinterScaleY(*args, **kwargs): return _windows.PrintData_SetPrinterScaleY(*args, **kwargs)
-    def SetPrinterScaling(*args, **kwargs): return _windows.PrintData_SetPrinterScaling(*args, **kwargs)
-    def SetPrinterTranslateX(*args, **kwargs): return _windows.PrintData_SetPrinterTranslateX(*args, **kwargs)
-    def SetPrinterTranslateY(*args, **kwargs): return _windows.PrintData_SetPrinterTranslateY(*args, **kwargs)
-    def SetPrinterTranslation(*args, **kwargs): return _windows.PrintData_SetPrinterTranslation(*args, **kwargs)
-    def SetPrintMode(*args, **kwargs): return _windows.PrintData_SetPrintMode(*args, **kwargs)
+
+    def GetNoCopies(*args, **kwargs):
+        """GetNoCopies() -> int"""
+        return _windows.PrintData_GetNoCopies(*args, **kwargs)
+
+    def GetCollate(*args, **kwargs):
+        """GetCollate() -> bool"""
+        return _windows.PrintData_GetCollate(*args, **kwargs)
+
+    def GetOrientation(*args, **kwargs):
+        """GetOrientation() -> int"""
+        return _windows.PrintData_GetOrientation(*args, **kwargs)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _windows.PrintData_Ok(*args, **kwargs)
+
+    def GetPrinterName(*args, **kwargs):
+        """GetPrinterName() -> wxString"""
+        return _windows.PrintData_GetPrinterName(*args, **kwargs)
+
+    def GetColour(*args, **kwargs):
+        """GetColour() -> bool"""
+        return _windows.PrintData_GetColour(*args, **kwargs)
+
+    def GetDuplex(*args, **kwargs):
+        """GetDuplex() -> wxDuplexMode"""
+        return _windows.PrintData_GetDuplex(*args, **kwargs)
+
+    def GetPaperId(*args, **kwargs):
+        """GetPaperId() -> wxPaperSize"""
+        return _windows.PrintData_GetPaperId(*args, **kwargs)
+
+    def GetPaperSize(*args, **kwargs):
+        """GetPaperSize() -> Size"""
+        return _windows.PrintData_GetPaperSize(*args, **kwargs)
+
+    def GetQuality(*args, **kwargs):
+        """GetQuality() -> wxPrintQuality"""
+        return _windows.PrintData_GetQuality(*args, **kwargs)
+
+    def SetNoCopies(*args, **kwargs):
+        """SetNoCopies(int v)"""
+        return _windows.PrintData_SetNoCopies(*args, **kwargs)
+
+    def SetCollate(*args, **kwargs):
+        """SetCollate(bool flag)"""
+        return _windows.PrintData_SetCollate(*args, **kwargs)
+
+    def SetOrientation(*args, **kwargs):
+        """SetOrientation(int orient)"""
+        return _windows.PrintData_SetOrientation(*args, **kwargs)
+
+    def SetPrinterName(*args, **kwargs):
+        """SetPrinterName(wxString name)"""
+        return _windows.PrintData_SetPrinterName(*args, **kwargs)
+
+    def SetColour(*args, **kwargs):
+        """SetColour(bool colour)"""
+        return _windows.PrintData_SetColour(*args, **kwargs)
+
+    def SetDuplex(*args, **kwargs):
+        """SetDuplex(wxDuplexMode duplex)"""
+        return _windows.PrintData_SetDuplex(*args, **kwargs)
+
+    def SetPaperId(*args, **kwargs):
+        """SetPaperId(wxPaperSize sizeId)"""
+        return _windows.PrintData_SetPaperId(*args, **kwargs)
+
+    def SetPaperSize(*args, **kwargs):
+        """SetPaperSize(Size sz)"""
+        return _windows.PrintData_SetPaperSize(*args, **kwargs)
+
+    def SetQuality(*args, **kwargs):
+        """SetQuality(wxPrintQuality quality)"""
+        return _windows.PrintData_SetQuality(*args, **kwargs)
+
+    def GetPrinterCommand(*args, **kwargs):
+        """GetPrinterCommand() -> wxString"""
+        return _windows.PrintData_GetPrinterCommand(*args, **kwargs)
+
+    def GetPrinterOptions(*args, **kwargs):
+        """GetPrinterOptions() -> wxString"""
+        return _windows.PrintData_GetPrinterOptions(*args, **kwargs)
+
+    def GetPreviewCommand(*args, **kwargs):
+        """GetPreviewCommand() -> wxString"""
+        return _windows.PrintData_GetPreviewCommand(*args, **kwargs)
+
+    def GetFilename(*args, **kwargs):
+        """GetFilename() -> wxString"""
+        return _windows.PrintData_GetFilename(*args, **kwargs)
+
+    def GetFontMetricPath(*args, **kwargs):
+        """GetFontMetricPath() -> wxString"""
+        return _windows.PrintData_GetFontMetricPath(*args, **kwargs)
+
+    def GetPrinterScaleX(*args, **kwargs):
+        """GetPrinterScaleX() -> double"""
+        return _windows.PrintData_GetPrinterScaleX(*args, **kwargs)
+
+    def GetPrinterScaleY(*args, **kwargs):
+        """GetPrinterScaleY() -> double"""
+        return _windows.PrintData_GetPrinterScaleY(*args, **kwargs)
+
+    def GetPrinterTranslateX(*args, **kwargs):
+        """GetPrinterTranslateX() -> long"""
+        return _windows.PrintData_GetPrinterTranslateX(*args, **kwargs)
+
+    def GetPrinterTranslateY(*args, **kwargs):
+        """GetPrinterTranslateY() -> long"""
+        return _windows.PrintData_GetPrinterTranslateY(*args, **kwargs)
+
+    def GetPrintMode(*args, **kwargs):
+        """GetPrintMode() -> wxPrintMode"""
+        return _windows.PrintData_GetPrintMode(*args, **kwargs)
+
+    def SetPrinterCommand(*args, **kwargs):
+        """SetPrinterCommand(wxString command)"""
+        return _windows.PrintData_SetPrinterCommand(*args, **kwargs)
+
+    def SetPrinterOptions(*args, **kwargs):
+        """SetPrinterOptions(wxString options)"""
+        return _windows.PrintData_SetPrinterOptions(*args, **kwargs)
+
+    def SetPreviewCommand(*args, **kwargs):
+        """SetPreviewCommand(wxString command)"""
+        return _windows.PrintData_SetPreviewCommand(*args, **kwargs)
+
+    def SetFilename(*args, **kwargs):
+        """SetFilename(wxString filename)"""
+        return _windows.PrintData_SetFilename(*args, **kwargs)
+
+    def SetFontMetricPath(*args, **kwargs):
+        """SetFontMetricPath(wxString path)"""
+        return _windows.PrintData_SetFontMetricPath(*args, **kwargs)
+
+    def SetPrinterScaleX(*args, **kwargs):
+        """SetPrinterScaleX(double x)"""
+        return _windows.PrintData_SetPrinterScaleX(*args, **kwargs)
+
+    def SetPrinterScaleY(*args, **kwargs):
+        """SetPrinterScaleY(double y)"""
+        return _windows.PrintData_SetPrinterScaleY(*args, **kwargs)
+
+    def SetPrinterScaling(*args, **kwargs):
+        """SetPrinterScaling(double x, double y)"""
+        return _windows.PrintData_SetPrinterScaling(*args, **kwargs)
+
+    def SetPrinterTranslateX(*args, **kwargs):
+        """SetPrinterTranslateX(long x)"""
+        return _windows.PrintData_SetPrinterTranslateX(*args, **kwargs)
+
+    def SetPrinterTranslateY(*args, **kwargs):
+        """SetPrinterTranslateY(long y)"""
+        return _windows.PrintData_SetPrinterTranslateY(*args, **kwargs)
+
+    def SetPrinterTranslation(*args, **kwargs):
+        """SetPrinterTranslation(long x, long y)"""
+        return _windows.PrintData_SetPrinterTranslation(*args, **kwargs)
+
+    def SetPrintMode(*args, **kwargs):
+        """SetPrintMode(wxPrintMode printMode)"""
+        return _windows.PrintData_SetPrintMode(*args, **kwargs)
+
     def __nonzero__(self): return self.Ok() 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPrintData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class PrintDataPtr(PrintData):
     def __init__(self, this):
@@ -1463,47 +2855,138 @@ class PrintDataPtr(PrintData):
 _windows.PrintData_swigregister(PrintDataPtr)
 
 class PageSetupDialogData(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPageSetupDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PageSetupDialogData"""
         newobj = _windows.new_PageSetupDialogData(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_windows.delete_PageSetupDialogData):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def EnableHelp(*args, **kwargs): return _windows.PageSetupDialogData_EnableHelp(*args, **kwargs)
-    def EnableMargins(*args, **kwargs): return _windows.PageSetupDialogData_EnableMargins(*args, **kwargs)
-    def EnableOrientation(*args, **kwargs): return _windows.PageSetupDialogData_EnableOrientation(*args, **kwargs)
-    def EnablePaper(*args, **kwargs): return _windows.PageSetupDialogData_EnablePaper(*args, **kwargs)
-    def EnablePrinter(*args, **kwargs): return _windows.PageSetupDialogData_EnablePrinter(*args, **kwargs)
-    def GetDefaultMinMargins(*args, **kwargs): return _windows.PageSetupDialogData_GetDefaultMinMargins(*args, **kwargs)
-    def GetEnableMargins(*args, **kwargs): return _windows.PageSetupDialogData_GetEnableMargins(*args, **kwargs)
-    def GetEnableOrientation(*args, **kwargs): return _windows.PageSetupDialogData_GetEnableOrientation(*args, **kwargs)
-    def GetEnablePaper(*args, **kwargs): return _windows.PageSetupDialogData_GetEnablePaper(*args, **kwargs)
-    def GetEnablePrinter(*args, **kwargs): return _windows.PageSetupDialogData_GetEnablePrinter(*args, **kwargs)
-    def GetEnableHelp(*args, **kwargs): return _windows.PageSetupDialogData_GetEnableHelp(*args, **kwargs)
-    def GetDefaultInfo(*args, **kwargs): return _windows.PageSetupDialogData_GetDefaultInfo(*args, **kwargs)
-    def GetMarginTopLeft(*args, **kwargs): return _windows.PageSetupDialogData_GetMarginTopLeft(*args, **kwargs)
-    def GetMarginBottomRight(*args, **kwargs): return _windows.PageSetupDialogData_GetMarginBottomRight(*args, **kwargs)
-    def GetMinMarginTopLeft(*args, **kwargs): return _windows.PageSetupDialogData_GetMinMarginTopLeft(*args, **kwargs)
-    def GetMinMarginBottomRight(*args, **kwargs): return _windows.PageSetupDialogData_GetMinMarginBottomRight(*args, **kwargs)
-    def GetPaperId(*args, **kwargs): return _windows.PageSetupDialogData_GetPaperId(*args, **kwargs)
-    def GetPaperSize(*args, **kwargs): return _windows.PageSetupDialogData_GetPaperSize(*args, **kwargs)
-    def GetPrintData(*args, **kwargs): return _windows.PageSetupDialogData_GetPrintData(*args, **kwargs)
-    def Ok(*args, **kwargs): return _windows.PageSetupDialogData_Ok(*args, **kwargs)
-    def SetDefaultInfo(*args, **kwargs): return _windows.PageSetupDialogData_SetDefaultInfo(*args, **kwargs)
-    def SetDefaultMinMargins(*args, **kwargs): return _windows.PageSetupDialogData_SetDefaultMinMargins(*args, **kwargs)
-    def SetMarginTopLeft(*args, **kwargs): return _windows.PageSetupDialogData_SetMarginTopLeft(*args, **kwargs)
-    def SetMarginBottomRight(*args, **kwargs): return _windows.PageSetupDialogData_SetMarginBottomRight(*args, **kwargs)
-    def SetMinMarginTopLeft(*args, **kwargs): return _windows.PageSetupDialogData_SetMinMarginTopLeft(*args, **kwargs)
-    def SetMinMarginBottomRight(*args, **kwargs): return _windows.PageSetupDialogData_SetMinMarginBottomRight(*args, **kwargs)
-    def SetPaperId(*args, **kwargs): return _windows.PageSetupDialogData_SetPaperId(*args, **kwargs)
-    def SetPaperSize(*args, **kwargs): return _windows.PageSetupDialogData_SetPaperSize(*args, **kwargs)
-    def SetPrintData(*args, **kwargs): return _windows.PageSetupDialogData_SetPrintData(*args, **kwargs)
+
+    def EnableHelp(*args, **kwargs):
+        """EnableHelp(bool flag)"""
+        return _windows.PageSetupDialogData_EnableHelp(*args, **kwargs)
+
+    def EnableMargins(*args, **kwargs):
+        """EnableMargins(bool flag)"""
+        return _windows.PageSetupDialogData_EnableMargins(*args, **kwargs)
+
+    def EnableOrientation(*args, **kwargs):
+        """EnableOrientation(bool flag)"""
+        return _windows.PageSetupDialogData_EnableOrientation(*args, **kwargs)
+
+    def EnablePaper(*args, **kwargs):
+        """EnablePaper(bool flag)"""
+        return _windows.PageSetupDialogData_EnablePaper(*args, **kwargs)
+
+    def EnablePrinter(*args, **kwargs):
+        """EnablePrinter(bool flag)"""
+        return _windows.PageSetupDialogData_EnablePrinter(*args, **kwargs)
+
+    def GetDefaultMinMargins(*args, **kwargs):
+        """GetDefaultMinMargins() -> bool"""
+        return _windows.PageSetupDialogData_GetDefaultMinMargins(*args, **kwargs)
+
+    def GetEnableMargins(*args, **kwargs):
+        """GetEnableMargins() -> bool"""
+        return _windows.PageSetupDialogData_GetEnableMargins(*args, **kwargs)
+
+    def GetEnableOrientation(*args, **kwargs):
+        """GetEnableOrientation() -> bool"""
+        return _windows.PageSetupDialogData_GetEnableOrientation(*args, **kwargs)
+
+    def GetEnablePaper(*args, **kwargs):
+        """GetEnablePaper() -> bool"""
+        return _windows.PageSetupDialogData_GetEnablePaper(*args, **kwargs)
+
+    def GetEnablePrinter(*args, **kwargs):
+        """GetEnablePrinter() -> bool"""
+        return _windows.PageSetupDialogData_GetEnablePrinter(*args, **kwargs)
+
+    def GetEnableHelp(*args, **kwargs):
+        """GetEnableHelp() -> bool"""
+        return _windows.PageSetupDialogData_GetEnableHelp(*args, **kwargs)
+
+    def GetDefaultInfo(*args, **kwargs):
+        """GetDefaultInfo() -> bool"""
+        return _windows.PageSetupDialogData_GetDefaultInfo(*args, **kwargs)
+
+    def GetMarginTopLeft(*args, **kwargs):
+        """GetMarginTopLeft() -> Point"""
+        return _windows.PageSetupDialogData_GetMarginTopLeft(*args, **kwargs)
+
+    def GetMarginBottomRight(*args, **kwargs):
+        """GetMarginBottomRight() -> Point"""
+        return _windows.PageSetupDialogData_GetMarginBottomRight(*args, **kwargs)
+
+    def GetMinMarginTopLeft(*args, **kwargs):
+        """GetMinMarginTopLeft() -> Point"""
+        return _windows.PageSetupDialogData_GetMinMarginTopLeft(*args, **kwargs)
+
+    def GetMinMarginBottomRight(*args, **kwargs):
+        """GetMinMarginBottomRight() -> Point"""
+        return _windows.PageSetupDialogData_GetMinMarginBottomRight(*args, **kwargs)
+
+    def GetPaperId(*args, **kwargs):
+        """GetPaperId() -> wxPaperSize"""
+        return _windows.PageSetupDialogData_GetPaperId(*args, **kwargs)
+
+    def GetPaperSize(*args, **kwargs):
+        """GetPaperSize() -> Size"""
+        return _windows.PageSetupDialogData_GetPaperSize(*args, **kwargs)
+
+    def GetPrintData(*args, **kwargs):
+        """GetPrintData() -> PrintData"""
+        return _windows.PageSetupDialogData_GetPrintData(*args, **kwargs)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _windows.PageSetupDialogData_Ok(*args, **kwargs)
+
+    def SetDefaultInfo(*args, **kwargs):
+        """SetDefaultInfo(bool flag)"""
+        return _windows.PageSetupDialogData_SetDefaultInfo(*args, **kwargs)
+
+    def SetDefaultMinMargins(*args, **kwargs):
+        """SetDefaultMinMargins(bool flag)"""
+        return _windows.PageSetupDialogData_SetDefaultMinMargins(*args, **kwargs)
+
+    def SetMarginTopLeft(*args, **kwargs):
+        """SetMarginTopLeft(Point pt)"""
+        return _windows.PageSetupDialogData_SetMarginTopLeft(*args, **kwargs)
+
+    def SetMarginBottomRight(*args, **kwargs):
+        """SetMarginBottomRight(Point pt)"""
+        return _windows.PageSetupDialogData_SetMarginBottomRight(*args, **kwargs)
+
+    def SetMinMarginTopLeft(*args, **kwargs):
+        """SetMinMarginTopLeft(Point pt)"""
+        return _windows.PageSetupDialogData_SetMinMarginTopLeft(*args, **kwargs)
+
+    def SetMinMarginBottomRight(*args, **kwargs):
+        """SetMinMarginBottomRight(Point pt)"""
+        return _windows.PageSetupDialogData_SetMinMarginBottomRight(*args, **kwargs)
+
+    def SetPaperId(*args, **kwargs):
+        """SetPaperId(wxPaperSize id)"""
+        return _windows.PageSetupDialogData_SetPaperId(*args, **kwargs)
+
+    def SetPaperSize(*args, **kwargs):
+        """SetPaperSize(Size size)"""
+        return _windows.PageSetupDialogData_SetPaperSize(*args, **kwargs)
+
+    def SetPrintData(*args, **kwargs):
+        """SetPrintData(PrintData printData)"""
+        return _windows.PageSetupDialogData_SetPrintData(*args, **kwargs)
+
     def __nonzero__(self): return self.Ok() 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPageSetupDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class PageSetupDialogDataPtr(PageSetupDialogData):
     def __init__(self, this):
@@ -1513,16 +2996,25 @@ class PageSetupDialogDataPtr(PageSetupDialogData):
 _windows.PageSetupDialogData_swigregister(PageSetupDialogDataPtr)
 
 class PageSetupDialog(Dialog):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPageSetupDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, PageSetupDialogData data=None) -> PageSetupDialog"""
         newobj = _windows.new_PageSetupDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetPageSetupData(*args, **kwargs): return _windows.PageSetupDialog_GetPageSetupData(*args, **kwargs)
-    def ShowModal(*args, **kwargs): return _windows.PageSetupDialog_ShowModal(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPageSetupDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetPageSetupData(*args, **kwargs):
+        """GetPageSetupData() -> PageSetupDialogData"""
+        return _windows.PageSetupDialog_GetPageSetupData(*args, **kwargs)
+
+    def ShowModal(*args, **kwargs):
+        """ShowModal() -> int"""
+        return _windows.PageSetupDialog_ShowModal(*args, **kwargs)
+
 
 class PageSetupDialogPtr(PageSetupDialog):
     def __init__(self, this):
@@ -1532,49 +3024,146 @@ class PageSetupDialogPtr(PageSetupDialog):
 _windows.PageSetupDialog_swigregister(PageSetupDialogPtr)
 
 class PrintDialogData(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPrintDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__() -> PrintDialogData"""
         newobj = _windows.new_PrintDialogData(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_windows.delete_PrintDialogData):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def GetFromPage(*args, **kwargs): return _windows.PrintDialogData_GetFromPage(*args, **kwargs)
-    def GetToPage(*args, **kwargs): return _windows.PrintDialogData_GetToPage(*args, **kwargs)
-    def GetMinPage(*args, **kwargs): return _windows.PrintDialogData_GetMinPage(*args, **kwargs)
-    def GetMaxPage(*args, **kwargs): return _windows.PrintDialogData_GetMaxPage(*args, **kwargs)
-    def GetNoCopies(*args, **kwargs): return _windows.PrintDialogData_GetNoCopies(*args, **kwargs)
-    def GetAllPages(*args, **kwargs): return _windows.PrintDialogData_GetAllPages(*args, **kwargs)
-    def GetSelection(*args, **kwargs): return _windows.PrintDialogData_GetSelection(*args, **kwargs)
-    def GetCollate(*args, **kwargs): return _windows.PrintDialogData_GetCollate(*args, **kwargs)
-    def GetPrintToFile(*args, **kwargs): return _windows.PrintDialogData_GetPrintToFile(*args, **kwargs)
-    def GetSetupDialog(*args, **kwargs): return _windows.PrintDialogData_GetSetupDialog(*args, **kwargs)
-    def SetFromPage(*args, **kwargs): return _windows.PrintDialogData_SetFromPage(*args, **kwargs)
-    def SetToPage(*args, **kwargs): return _windows.PrintDialogData_SetToPage(*args, **kwargs)
-    def SetMinPage(*args, **kwargs): return _windows.PrintDialogData_SetMinPage(*args, **kwargs)
-    def SetMaxPage(*args, **kwargs): return _windows.PrintDialogData_SetMaxPage(*args, **kwargs)
-    def SetNoCopies(*args, **kwargs): return _windows.PrintDialogData_SetNoCopies(*args, **kwargs)
-    def SetAllPages(*args, **kwargs): return _windows.PrintDialogData_SetAllPages(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _windows.PrintDialogData_SetSelection(*args, **kwargs)
-    def SetCollate(*args, **kwargs): return _windows.PrintDialogData_SetCollate(*args, **kwargs)
-    def SetPrintToFile(*args, **kwargs): return _windows.PrintDialogData_SetPrintToFile(*args, **kwargs)
-    def SetSetupDialog(*args, **kwargs): return _windows.PrintDialogData_SetSetupDialog(*args, **kwargs)
-    def EnablePrintToFile(*args, **kwargs): return _windows.PrintDialogData_EnablePrintToFile(*args, **kwargs)
-    def EnableSelection(*args, **kwargs): return _windows.PrintDialogData_EnableSelection(*args, **kwargs)
-    def EnablePageNumbers(*args, **kwargs): return _windows.PrintDialogData_EnablePageNumbers(*args, **kwargs)
-    def EnableHelp(*args, **kwargs): return _windows.PrintDialogData_EnableHelp(*args, **kwargs)
-    def GetEnablePrintToFile(*args, **kwargs): return _windows.PrintDialogData_GetEnablePrintToFile(*args, **kwargs)
-    def GetEnableSelection(*args, **kwargs): return _windows.PrintDialogData_GetEnableSelection(*args, **kwargs)
-    def GetEnablePageNumbers(*args, **kwargs): return _windows.PrintDialogData_GetEnablePageNumbers(*args, **kwargs)
-    def GetEnableHelp(*args, **kwargs): return _windows.PrintDialogData_GetEnableHelp(*args, **kwargs)
-    def Ok(*args, **kwargs): return _windows.PrintDialogData_Ok(*args, **kwargs)
-    def GetPrintData(*args, **kwargs): return _windows.PrintDialogData_GetPrintData(*args, **kwargs)
-    def SetPrintData(*args, **kwargs): return _windows.PrintDialogData_SetPrintData(*args, **kwargs)
+
+    def GetFromPage(*args, **kwargs):
+        """GetFromPage() -> int"""
+        return _windows.PrintDialogData_GetFromPage(*args, **kwargs)
+
+    def GetToPage(*args, **kwargs):
+        """GetToPage() -> int"""
+        return _windows.PrintDialogData_GetToPage(*args, **kwargs)
+
+    def GetMinPage(*args, **kwargs):
+        """GetMinPage() -> int"""
+        return _windows.PrintDialogData_GetMinPage(*args, **kwargs)
+
+    def GetMaxPage(*args, **kwargs):
+        """GetMaxPage() -> int"""
+        return _windows.PrintDialogData_GetMaxPage(*args, **kwargs)
+
+    def GetNoCopies(*args, **kwargs):
+        """GetNoCopies() -> int"""
+        return _windows.PrintDialogData_GetNoCopies(*args, **kwargs)
+
+    def GetAllPages(*args, **kwargs):
+        """GetAllPages() -> bool"""
+        return _windows.PrintDialogData_GetAllPages(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> bool"""
+        return _windows.PrintDialogData_GetSelection(*args, **kwargs)
+
+    def GetCollate(*args, **kwargs):
+        """GetCollate() -> bool"""
+        return _windows.PrintDialogData_GetCollate(*args, **kwargs)
+
+    def GetPrintToFile(*args, **kwargs):
+        """GetPrintToFile() -> bool"""
+        return _windows.PrintDialogData_GetPrintToFile(*args, **kwargs)
+
+    def GetSetupDialog(*args, **kwargs):
+        """GetSetupDialog() -> bool"""
+        return _windows.PrintDialogData_GetSetupDialog(*args, **kwargs)
+
+    def SetFromPage(*args, **kwargs):
+        """SetFromPage(int v)"""
+        return _windows.PrintDialogData_SetFromPage(*args, **kwargs)
+
+    def SetToPage(*args, **kwargs):
+        """SetToPage(int v)"""
+        return _windows.PrintDialogData_SetToPage(*args, **kwargs)
+
+    def SetMinPage(*args, **kwargs):
+        """SetMinPage(int v)"""
+        return _windows.PrintDialogData_SetMinPage(*args, **kwargs)
+
+    def SetMaxPage(*args, **kwargs):
+        """SetMaxPage(int v)"""
+        return _windows.PrintDialogData_SetMaxPage(*args, **kwargs)
+
+    def SetNoCopies(*args, **kwargs):
+        """SetNoCopies(int v)"""
+        return _windows.PrintDialogData_SetNoCopies(*args, **kwargs)
+
+    def SetAllPages(*args, **kwargs):
+        """SetAllPages(bool flag)"""
+        return _windows.PrintDialogData_SetAllPages(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(bool flag)"""
+        return _windows.PrintDialogData_SetSelection(*args, **kwargs)
+
+    def SetCollate(*args, **kwargs):
+        """SetCollate(bool flag)"""
+        return _windows.PrintDialogData_SetCollate(*args, **kwargs)
+
+    def SetPrintToFile(*args, **kwargs):
+        """SetPrintToFile(bool flag)"""
+        return _windows.PrintDialogData_SetPrintToFile(*args, **kwargs)
+
+    def SetSetupDialog(*args, **kwargs):
+        """SetSetupDialog(bool flag)"""
+        return _windows.PrintDialogData_SetSetupDialog(*args, **kwargs)
+
+    def EnablePrintToFile(*args, **kwargs):
+        """EnablePrintToFile(bool flag)"""
+        return _windows.PrintDialogData_EnablePrintToFile(*args, **kwargs)
+
+    def EnableSelection(*args, **kwargs):
+        """EnableSelection(bool flag)"""
+        return _windows.PrintDialogData_EnableSelection(*args, **kwargs)
+
+    def EnablePageNumbers(*args, **kwargs):
+        """EnablePageNumbers(bool flag)"""
+        return _windows.PrintDialogData_EnablePageNumbers(*args, **kwargs)
+
+    def EnableHelp(*args, **kwargs):
+        """EnableHelp(bool flag)"""
+        return _windows.PrintDialogData_EnableHelp(*args, **kwargs)
+
+    def GetEnablePrintToFile(*args, **kwargs):
+        """GetEnablePrintToFile() -> bool"""
+        return _windows.PrintDialogData_GetEnablePrintToFile(*args, **kwargs)
+
+    def GetEnableSelection(*args, **kwargs):
+        """GetEnableSelection() -> bool"""
+        return _windows.PrintDialogData_GetEnableSelection(*args, **kwargs)
+
+    def GetEnablePageNumbers(*args, **kwargs):
+        """GetEnablePageNumbers() -> bool"""
+        return _windows.PrintDialogData_GetEnablePageNumbers(*args, **kwargs)
+
+    def GetEnableHelp(*args, **kwargs):
+        """GetEnableHelp() -> bool"""
+        return _windows.PrintDialogData_GetEnableHelp(*args, **kwargs)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _windows.PrintDialogData_Ok(*args, **kwargs)
+
+    def GetPrintData(*args, **kwargs):
+        """GetPrintData() -> PrintData"""
+        return _windows.PrintDialogData_GetPrintData(*args, **kwargs)
+
+    def SetPrintData(*args, **kwargs):
+        """SetPrintData(PrintData printData)"""
+        return _windows.PrintDialogData_SetPrintData(*args, **kwargs)
+
     def __nonzero__(self): return self.Ok() 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPrintDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class PrintDialogDataPtr(PrintDialogData):
     def __init__(self, this):
@@ -1584,17 +3173,29 @@ class PrintDialogDataPtr(PrintDialogData):
 _windows.PrintDialogData_swigregister(PrintDialogDataPtr)
 
 class PrintDialog(Dialog):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPrintDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, PrintDialogData data=None) -> PrintDialog"""
         newobj = _windows.new_PrintDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def GetPrintDialogData(*args, **kwargs): return _windows.PrintDialog_GetPrintDialogData(*args, **kwargs)
-    def GetPrintDC(*args, **kwargs): return _windows.PrintDialog_GetPrintDC(*args, **kwargs)
-    def ShowModal(*args, **kwargs): return _windows.PrintDialog_ShowModal(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPrintDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetPrintDialogData(*args, **kwargs):
+        """GetPrintDialogData() -> PrintDialogData"""
+        return _windows.PrintDialog_GetPrintDialogData(*args, **kwargs)
+
+    def GetPrintDC(*args, **kwargs):
+        """GetPrintDC() -> wxDC"""
+        return _windows.PrintDialog_GetPrintDC(*args, **kwargs)
+
+    def ShowModal(*args, **kwargs):
+        """ShowModal() -> int"""
+        return _windows.PrintDialog_ShowModal(*args, **kwargs)
+
 
 class PrintDialogPtr(PrintDialog):
     def __init__(self, this):
@@ -1607,25 +3208,54 @@ PRINTER_NO_ERROR = _windows.PRINTER_NO_ERROR
 PRINTER_CANCELLED = _windows.PRINTER_CANCELLED
 PRINTER_ERROR = _windows.PRINTER_ERROR
 class Printer(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPrinter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(PrintDialogData data=None) -> Printer"""
         newobj = _windows.new_Printer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_windows.delete_Printer):
+        """__del__()"""
         try:
             if self.thisown: destroy(self)
         except: pass
-    def CreateAbortWindow(*args, **kwargs): return _windows.Printer_CreateAbortWindow(*args, **kwargs)
-    def GetPrintDialogData(*args, **kwargs): return _windows.Printer_GetPrintDialogData(*args, **kwargs)
-    def Print(*args, **kwargs): return _windows.Printer_Print(*args, **kwargs)
-    def PrintDialog(*args, **kwargs): return _windows.Printer_PrintDialog(*args, **kwargs)
-    def ReportError(*args, **kwargs): return _windows.Printer_ReportError(*args, **kwargs)
-    def Setup(*args, **kwargs): return _windows.Printer_Setup(*args, **kwargs)
-    def GetAbort(*args, **kwargs): return _windows.Printer_GetAbort(*args, **kwargs)
-    GetLastError = staticmethod(_windows.Printer_GetLastError)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPrinter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def CreateAbortWindow(*args, **kwargs):
+        """CreateAbortWindow(Window parent, Printout printout)"""
+        return _windows.Printer_CreateAbortWindow(*args, **kwargs)
+
+    def GetPrintDialogData(*args, **kwargs):
+        """GetPrintDialogData() -> PrintDialogData"""
+        return _windows.Printer_GetPrintDialogData(*args, **kwargs)
+
+    def Print(*args, **kwargs):
+        """Print(Window parent, Printout printout, int prompt=True) -> bool"""
+        return _windows.Printer_Print(*args, **kwargs)
+
+    def PrintDialog(*args, **kwargs):
+        """PrintDialog(Window parent) -> wxDC"""
+        return _windows.Printer_PrintDialog(*args, **kwargs)
+
+    def ReportError(*args, **kwargs):
+        """ReportError(Window parent, Printout printout, wxString message)"""
+        return _windows.Printer_ReportError(*args, **kwargs)
+
+    def Setup(*args, **kwargs):
+        """Setup(Window parent) -> bool"""
+        return _windows.Printer_Setup(*args, **kwargs)
+
+    def GetAbort(*args, **kwargs):
+        """GetAbort() -> bool"""
+        return _windows.Printer_GetAbort(*args, **kwargs)
+
+    def GetLastError(*args, **kwargs):
+        """Printer.GetLastError() -> wxPrinterError"""
+        return _windows.Printer_GetLastError(*args, **kwargs)
+
+    GetLastError = staticmethod(GetLastError)
 
 class PrinterPtr(Printer):
     def __init__(self, this):
@@ -1634,38 +3264,106 @@ class PrinterPtr(Printer):
         self.__class__ = Printer
 _windows.Printer_swigregister(PrinterPtr)
 
-Printer_GetLastError = _windows.Printer_GetLastError
+def Printer_GetLastError(*args, **kwargs):
+    """Printer_GetLastError() -> wxPrinterError"""
+    return _windows.Printer_GetLastError(*args, **kwargs)
 
 class Printout(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxString title=wxPyPrintoutTitleStr) -> Printout"""
         newobj = _windows.new_Printout(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, Printout)
-    def _setCallbackInfo(*args, **kwargs): return _windows.Printout__setCallbackInfo(*args, **kwargs)
-    def GetTitle(*args, **kwargs): return _windows.Printout_GetTitle(*args, **kwargs)
-    def GetDC(*args, **kwargs): return _windows.Printout_GetDC(*args, **kwargs)
-    def SetDC(*args, **kwargs): return _windows.Printout_SetDC(*args, **kwargs)
-    def GetPageSizePixels(*args, **kwargs): return _windows.Printout_GetPageSizePixels(*args, **kwargs)
-    def SetPageSizePixels(*args, **kwargs): return _windows.Printout_SetPageSizePixels(*args, **kwargs)
-    def SetPageSizeMM(*args, **kwargs): return _windows.Printout_SetPageSizeMM(*args, **kwargs)
-    def GetPageSizeMM(*args, **kwargs): return _windows.Printout_GetPageSizeMM(*args, **kwargs)
-    def SetPPIScreen(*args, **kwargs): return _windows.Printout_SetPPIScreen(*args, **kwargs)
-    def GetPPIScreen(*args, **kwargs): return _windows.Printout_GetPPIScreen(*args, **kwargs)
-    def SetPPIPrinter(*args, **kwargs): return _windows.Printout_SetPPIPrinter(*args, **kwargs)
-    def GetPPIPrinter(*args, **kwargs): return _windows.Printout_GetPPIPrinter(*args, **kwargs)
-    def IsPreview(*args, **kwargs): return _windows.Printout_IsPreview(*args, **kwargs)
-    def SetIsPreview(*args, **kwargs): return _windows.Printout_SetIsPreview(*args, **kwargs)
-    def base_OnBeginDocument(*args, **kwargs): return _windows.Printout_base_OnBeginDocument(*args, **kwargs)
-    def base_OnEndDocument(*args, **kwargs): return _windows.Printout_base_OnEndDocument(*args, **kwargs)
-    def base_OnBeginPrinting(*args, **kwargs): return _windows.Printout_base_OnBeginPrinting(*args, **kwargs)
-    def base_OnEndPrinting(*args, **kwargs): return _windows.Printout_base_OnEndPrinting(*args, **kwargs)
-    def base_OnPreparePrinting(*args, **kwargs): return _windows.Printout_base_OnPreparePrinting(*args, **kwargs)
-    def base_GetPageInfo(*args, **kwargs): return _windows.Printout_base_GetPageInfo(*args, **kwargs)
-    def base_HasPage(*args, **kwargs): return _windows.Printout_base_HasPage(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _windows.Printout__setCallbackInfo(*args, **kwargs)
+
+    def GetTitle(*args, **kwargs):
+        """GetTitle() -> wxString"""
+        return _windows.Printout_GetTitle(*args, **kwargs)
+
+    def GetDC(*args, **kwargs):
+        """GetDC() -> wxDC"""
+        return _windows.Printout_GetDC(*args, **kwargs)
+
+    def SetDC(*args, **kwargs):
+        """SetDC(wxDC dc)"""
+        return _windows.Printout_SetDC(*args, **kwargs)
+
+    def GetPageSizePixels(*args, **kwargs):
+        """GetPageSizePixels(int OUTPUT, int OUTPUT)"""
+        return _windows.Printout_GetPageSizePixels(*args, **kwargs)
+
+    def SetPageSizePixels(*args, **kwargs):
+        """SetPageSizePixels(int w, int h)"""
+        return _windows.Printout_SetPageSizePixels(*args, **kwargs)
+
+    def SetPageSizeMM(*args, **kwargs):
+        """SetPageSizeMM(int w, int h)"""
+        return _windows.Printout_SetPageSizeMM(*args, **kwargs)
+
+    def GetPageSizeMM(*args, **kwargs):
+        """GetPageSizeMM(int OUTPUT, int OUTPUT)"""
+        return _windows.Printout_GetPageSizeMM(*args, **kwargs)
+
+    def SetPPIScreen(*args, **kwargs):
+        """SetPPIScreen(int x, int y)"""
+        return _windows.Printout_SetPPIScreen(*args, **kwargs)
+
+    def GetPPIScreen(*args, **kwargs):
+        """GetPPIScreen(int OUTPUT, int OUTPUT)"""
+        return _windows.Printout_GetPPIScreen(*args, **kwargs)
+
+    def SetPPIPrinter(*args, **kwargs):
+        """SetPPIPrinter(int x, int y)"""
+        return _windows.Printout_SetPPIPrinter(*args, **kwargs)
+
+    def GetPPIPrinter(*args, **kwargs):
+        """GetPPIPrinter(int OUTPUT, int OUTPUT)"""
+        return _windows.Printout_GetPPIPrinter(*args, **kwargs)
+
+    def IsPreview(*args, **kwargs):
+        """IsPreview() -> bool"""
+        return _windows.Printout_IsPreview(*args, **kwargs)
+
+    def SetIsPreview(*args, **kwargs):
+        """SetIsPreview(bool p)"""
+        return _windows.Printout_SetIsPreview(*args, **kwargs)
+
+    def base_OnBeginDocument(*args, **kwargs):
+        """base_OnBeginDocument(int startPage, int endPage) -> bool"""
+        return _windows.Printout_base_OnBeginDocument(*args, **kwargs)
+
+    def base_OnEndDocument(*args, **kwargs):
+        """base_OnEndDocument()"""
+        return _windows.Printout_base_OnEndDocument(*args, **kwargs)
+
+    def base_OnBeginPrinting(*args, **kwargs):
+        """base_OnBeginPrinting()"""
+        return _windows.Printout_base_OnBeginPrinting(*args, **kwargs)
+
+    def base_OnEndPrinting(*args, **kwargs):
+        """base_OnEndPrinting()"""
+        return _windows.Printout_base_OnEndPrinting(*args, **kwargs)
+
+    def base_OnPreparePrinting(*args, **kwargs):
+        """base_OnPreparePrinting()"""
+        return _windows.Printout_base_OnPreparePrinting(*args, **kwargs)
+
+    def base_GetPageInfo(*args, **kwargs):
+        """base_GetPageInfo(int OUTPUT, int OUTPUT, int OUTPUT, int OUTPUT)"""
+        return _windows.Printout_base_GetPageInfo(*args, **kwargs)
+
+    def base_HasPage(*args, **kwargs):
+        """base_HasPage(int page) -> bool"""
+        return _windows.Printout_base_HasPage(*args, **kwargs)
+
 
 class PrintoutPtr(Printout):
     def __init__(self, this):
@@ -1675,14 +3373,19 @@ class PrintoutPtr(Printout):
 _windows.Printout_swigregister(PrintoutPtr)
 
 class PreviewCanvas(ScrolledWindow):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPreviewCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(PrintPreview preview, Window parent, Point pos=DefaultPosition, 
+    Size size=DefaultSize, long style=0, 
+    wxString name=wxPyPreviewCanvasNameStr) -> PreviewCanvas"""
         newobj = _windows.new_PreviewCanvas(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._self._setOORInfo(self)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPreviewCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
 
 class PreviewCanvasPtr(PreviewCanvas):
     def __init__(self, this):
@@ -1692,18 +3395,35 @@ class PreviewCanvasPtr(PreviewCanvas):
 _windows.PreviewCanvas_swigregister(PreviewCanvasPtr)
 
 class PreviewFrame(Frame):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPreviewFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(PrintPreview preview, Frame parent, wxString title, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=DEFAULT_FRAME_STYLE, wxString name=wxPyFrameNameStr) -> PreviewFrame"""
         newobj = _windows.new_PreviewFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._self._setOORInfo(self)
-    def Initialize(*args, **kwargs): return _windows.PreviewFrame_Initialize(*args, **kwargs)
-    def CreateControlBar(*args, **kwargs): return _windows.PreviewFrame_CreateControlBar(*args, **kwargs)
-    def CreateCanvas(*args, **kwargs): return _windows.PreviewFrame_CreateCanvas(*args, **kwargs)
-    def GetControlBar(*args, **kwargs): return _windows.PreviewFrame_GetControlBar(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPreviewFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Initialize(*args, **kwargs):
+        """Initialize()"""
+        return _windows.PreviewFrame_Initialize(*args, **kwargs)
+
+    def CreateControlBar(*args, **kwargs):
+        """CreateControlBar()"""
+        return _windows.PreviewFrame_CreateControlBar(*args, **kwargs)
+
+    def CreateCanvas(*args, **kwargs):
+        """CreateCanvas()"""
+        return _windows.PreviewFrame_CreateCanvas(*args, **kwargs)
+
+    def GetControlBar(*args, **kwargs):
+        """GetControlBar() -> PreviewControlBar"""
+        return _windows.PreviewFrame_GetControlBar(*args, **kwargs)
+
 
 class PreviewFramePtr(PreviewFrame):
     def __init__(self, this):
@@ -1729,22 +3449,51 @@ ID_PREVIEW_FIRST = _windows.ID_PREVIEW_FIRST
 ID_PREVIEW_LAST = _windows.ID_PREVIEW_LAST
 ID_PREVIEW_GOTO = _windows.ID_PREVIEW_GOTO
 class PreviewControlBar(Panel):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPreviewControlBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(PrintPreview preview, long buttons, Window parent, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=TAB_TRAVERSAL, wxString name=PanelNameStr) -> PreviewControlBar"""
         newobj = _windows.new_PreviewControlBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._self._setOORInfo(self)
-    def GetZoomControl(*args, **kwargs): return _windows.PreviewControlBar_GetZoomControl(*args, **kwargs)
-    def SetZoomControl(*args, **kwargs): return _windows.PreviewControlBar_SetZoomControl(*args, **kwargs)
-    def GetPrintPreview(*args, **kwargs): return _windows.PreviewControlBar_GetPrintPreview(*args, **kwargs)
-    def OnNext(*args, **kwargs): return _windows.PreviewControlBar_OnNext(*args, **kwargs)
-    def OnPrevious(*args, **kwargs): return _windows.PreviewControlBar_OnPrevious(*args, **kwargs)
-    def OnFirst(*args, **kwargs): return _windows.PreviewControlBar_OnFirst(*args, **kwargs)
-    def OnLast(*args, **kwargs): return _windows.PreviewControlBar_OnLast(*args, **kwargs)
-    def OnGoto(*args, **kwargs): return _windows.PreviewControlBar_OnGoto(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPreviewControlBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def GetZoomControl(*args, **kwargs):
+        """GetZoomControl() -> int"""
+        return _windows.PreviewControlBar_GetZoomControl(*args, **kwargs)
+
+    def SetZoomControl(*args, **kwargs):
+        """SetZoomControl(int zoom)"""
+        return _windows.PreviewControlBar_SetZoomControl(*args, **kwargs)
+
+    def GetPrintPreview(*args, **kwargs):
+        """GetPrintPreview() -> PrintPreview"""
+        return _windows.PreviewControlBar_GetPrintPreview(*args, **kwargs)
+
+    def OnNext(*args, **kwargs):
+        """OnNext()"""
+        return _windows.PreviewControlBar_OnNext(*args, **kwargs)
+
+    def OnPrevious(*args, **kwargs):
+        """OnPrevious()"""
+        return _windows.PreviewControlBar_OnPrevious(*args, **kwargs)
+
+    def OnFirst(*args, **kwargs):
+        """OnFirst()"""
+        return _windows.PreviewControlBar_OnFirst(*args, **kwargs)
+
+    def OnLast(*args, **kwargs):
+        """OnLast()"""
+        return _windows.PreviewControlBar_OnLast(*args, **kwargs)
+
+    def OnGoto(*args, **kwargs):
+        """OnGoto()"""
+        return _windows.PreviewControlBar_OnGoto(*args, **kwargs)
+
 
 class PreviewControlBarPtr(PreviewControlBar):
     def __init__(self, this):
@@ -1754,36 +3503,104 @@ class PreviewControlBarPtr(PreviewControlBar):
 _windows.PreviewControlBar_swigregister(PreviewControlBarPtr)
 
 class PrintPreview(core.Object):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Printout printout, Printout printoutForPrinting, PrintData data=None) -> PrintPreview"""
         newobj = _windows.new_PrintPreview(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def SetCurrentPage(*args, **kwargs): return _windows.PrintPreview_SetCurrentPage(*args, **kwargs)
-    def GetCurrentPage(*args, **kwargs): return _windows.PrintPreview_GetCurrentPage(*args, **kwargs)
-    def SetPrintout(*args, **kwargs): return _windows.PrintPreview_SetPrintout(*args, **kwargs)
-    def GetPrintout(*args, **kwargs): return _windows.PrintPreview_GetPrintout(*args, **kwargs)
-    def GetPrintoutForPrinting(*args, **kwargs): return _windows.PrintPreview_GetPrintoutForPrinting(*args, **kwargs)
-    def SetFrame(*args, **kwargs): return _windows.PrintPreview_SetFrame(*args, **kwargs)
-    def SetCanvas(*args, **kwargs): return _windows.PrintPreview_SetCanvas(*args, **kwargs)
-    def GetFrame(*args, **kwargs): return _windows.PrintPreview_GetFrame(*args, **kwargs)
-    def GetCanvas(*args, **kwargs): return _windows.PrintPreview_GetCanvas(*args, **kwargs)
-    def PaintPage(*args, **kwargs): return _windows.PrintPreview_PaintPage(*args, **kwargs)
-    def DrawBlankPage(*args, **kwargs): return _windows.PrintPreview_DrawBlankPage(*args, **kwargs)
-    def RenderPage(*args, **kwargs): return _windows.PrintPreview_RenderPage(*args, **kwargs)
-    def AdjustScrollbars(*args, **kwargs): return _windows.PrintPreview_AdjustScrollbars(*args, **kwargs)
-    def GetPrintDialogData(*args, **kwargs): return _windows.PrintPreview_GetPrintDialogData(*args, **kwargs)
-    def SetZoom(*args, **kwargs): return _windows.PrintPreview_SetZoom(*args, **kwargs)
-    def GetZoom(*args, **kwargs): return _windows.PrintPreview_GetZoom(*args, **kwargs)
-    def GetMaxPage(*args, **kwargs): return _windows.PrintPreview_GetMaxPage(*args, **kwargs)
-    def GetMinPage(*args, **kwargs): return _windows.PrintPreview_GetMinPage(*args, **kwargs)
-    def Ok(*args, **kwargs): return _windows.PrintPreview_Ok(*args, **kwargs)
-    def SetOk(*args, **kwargs): return _windows.PrintPreview_SetOk(*args, **kwargs)
-    def Print(*args, **kwargs): return _windows.PrintPreview_Print(*args, **kwargs)
-    def DetermineScaling(*args, **kwargs): return _windows.PrintPreview_DetermineScaling(*args, **kwargs)
+    def SetCurrentPage(*args, **kwargs):
+        """SetCurrentPage(int pageNum) -> bool"""
+        return _windows.PrintPreview_SetCurrentPage(*args, **kwargs)
+
+    def GetCurrentPage(*args, **kwargs):
+        """GetCurrentPage() -> int"""
+        return _windows.PrintPreview_GetCurrentPage(*args, **kwargs)
+
+    def SetPrintout(*args, **kwargs):
+        """SetPrintout(Printout printout)"""
+        return _windows.PrintPreview_SetPrintout(*args, **kwargs)
+
+    def GetPrintout(*args, **kwargs):
+        """GetPrintout() -> Printout"""
+        return _windows.PrintPreview_GetPrintout(*args, **kwargs)
+
+    def GetPrintoutForPrinting(*args, **kwargs):
+        """GetPrintoutForPrinting() -> Printout"""
+        return _windows.PrintPreview_GetPrintoutForPrinting(*args, **kwargs)
+
+    def SetFrame(*args, **kwargs):
+        """SetFrame(Frame frame)"""
+        return _windows.PrintPreview_SetFrame(*args, **kwargs)
+
+    def SetCanvas(*args, **kwargs):
+        """SetCanvas(PreviewCanvas canvas)"""
+        return _windows.PrintPreview_SetCanvas(*args, **kwargs)
+
+    def GetFrame(*args, **kwargs):
+        """GetFrame() -> Frame"""
+        return _windows.PrintPreview_GetFrame(*args, **kwargs)
+
+    def GetCanvas(*args, **kwargs):
+        """GetCanvas() -> PreviewCanvas"""
+        return _windows.PrintPreview_GetCanvas(*args, **kwargs)
+
+    def PaintPage(*args, **kwargs):
+        """PaintPage(PreviewCanvas canvas, wxDC dc) -> bool"""
+        return _windows.PrintPreview_PaintPage(*args, **kwargs)
+
+    def DrawBlankPage(*args, **kwargs):
+        """DrawBlankPage(PreviewCanvas canvas, wxDC dc) -> bool"""
+        return _windows.PrintPreview_DrawBlankPage(*args, **kwargs)
+
+    def RenderPage(*args, **kwargs):
+        """RenderPage(int pageNum) -> bool"""
+        return _windows.PrintPreview_RenderPage(*args, **kwargs)
+
+    def AdjustScrollbars(*args, **kwargs):
+        """AdjustScrollbars(PreviewCanvas canvas)"""
+        return _windows.PrintPreview_AdjustScrollbars(*args, **kwargs)
+
+    def GetPrintDialogData(*args, **kwargs):
+        """GetPrintDialogData() -> PrintDialogData"""
+        return _windows.PrintPreview_GetPrintDialogData(*args, **kwargs)
+
+    def SetZoom(*args, **kwargs):
+        """SetZoom(int percent)"""
+        return _windows.PrintPreview_SetZoom(*args, **kwargs)
+
+    def GetZoom(*args, **kwargs):
+        """GetZoom() -> int"""
+        return _windows.PrintPreview_GetZoom(*args, **kwargs)
+
+    def GetMaxPage(*args, **kwargs):
+        """GetMaxPage() -> int"""
+        return _windows.PrintPreview_GetMaxPage(*args, **kwargs)
+
+    def GetMinPage(*args, **kwargs):
+        """GetMinPage() -> int"""
+        return _windows.PrintPreview_GetMinPage(*args, **kwargs)
+
+    def Ok(*args, **kwargs):
+        """Ok() -> bool"""
+        return _windows.PrintPreview_Ok(*args, **kwargs)
+
+    def SetOk(*args, **kwargs):
+        """SetOk(bool ok)"""
+        return _windows.PrintPreview_SetOk(*args, **kwargs)
+
+    def Print(*args, **kwargs):
+        """Print(bool interactive) -> bool"""
+        return _windows.PrintPreview_Print(*args, **kwargs)
+
+    def DetermineScaling(*args, **kwargs):
+        """DetermineScaling()"""
+        return _windows.PrintPreview_DetermineScaling(*args, **kwargs)
+
     def __nonzero__(self): return self.Ok() 
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
 class PrintPreviewPtr(PrintPreview):
     def __init__(self, this):
@@ -1793,22 +3610,49 @@ class PrintPreviewPtr(PrintPreview):
 _windows.PrintPreview_swigregister(PrintPreviewPtr)
 
 class PyPrintPreview(PrintPreview):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Printout printout, Printout printoutForPrinting, PrintData data=None) -> PyPrintPreview"""
         newobj = _windows.new_PyPrintPreview(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, PyPrintPreview)
-    def _setCallbackInfo(*args, **kwargs): return _windows.PyPrintPreview__setCallbackInfo(*args, **kwargs)
-    def base_SetCurrentPage(*args, **kwargs): return _windows.PyPrintPreview_base_SetCurrentPage(*args, **kwargs)
-    def base_PaintPage(*args, **kwargs): return _windows.PyPrintPreview_base_PaintPage(*args, **kwargs)
-    def base_DrawBlankPage(*args, **kwargs): return _windows.PyPrintPreview_base_DrawBlankPage(*args, **kwargs)
-    def base_RenderPage(*args, **kwargs): return _windows.PyPrintPreview_base_RenderPage(*args, **kwargs)
-    def base_SetZoom(*args, **kwargs): return _windows.PyPrintPreview_base_SetZoom(*args, **kwargs)
-    def base_Print(*args, **kwargs): return _windows.PyPrintPreview_base_Print(*args, **kwargs)
-    def base_DetermineScaling(*args, **kwargs): return _windows.PyPrintPreview_base_DetermineScaling(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _windows.PyPrintPreview__setCallbackInfo(*args, **kwargs)
+
+    def base_SetCurrentPage(*args, **kwargs):
+        """base_SetCurrentPage(int pageNum) -> bool"""
+        return _windows.PyPrintPreview_base_SetCurrentPage(*args, **kwargs)
+
+    def base_PaintPage(*args, **kwargs):
+        """base_PaintPage(PreviewCanvas canvas, wxDC dc) -> bool"""
+        return _windows.PyPrintPreview_base_PaintPage(*args, **kwargs)
+
+    def base_DrawBlankPage(*args, **kwargs):
+        """base_DrawBlankPage(PreviewCanvas canvas, wxDC dc) -> bool"""
+        return _windows.PyPrintPreview_base_DrawBlankPage(*args, **kwargs)
+
+    def base_RenderPage(*args, **kwargs):
+        """base_RenderPage(int pageNum) -> bool"""
+        return _windows.PyPrintPreview_base_RenderPage(*args, **kwargs)
+
+    def base_SetZoom(*args, **kwargs):
+        """base_SetZoom(int percent)"""
+        return _windows.PyPrintPreview_base_SetZoom(*args, **kwargs)
+
+    def base_Print(*args, **kwargs):
+        """base_Print(bool interactive) -> bool"""
+        return _windows.PyPrintPreview_base_Print(*args, **kwargs)
+
+    def base_DetermineScaling(*args, **kwargs):
+        """base_DetermineScaling()"""
+        return _windows.PyPrintPreview_base_DetermineScaling(*args, **kwargs)
+
 
 class PyPrintPreviewPtr(PyPrintPreview):
     def __init__(self, this):
@@ -1818,20 +3662,43 @@ class PyPrintPreviewPtr(PyPrintPreview):
 _windows.PyPrintPreview_swigregister(PyPrintPreviewPtr)
 
 class PyPreviewFrame(PreviewFrame):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyPreviewFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(PrintPreview preview, Frame parent, wxString title, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=DEFAULT_FRAME_STYLE, wxString name=wxPyFrameNameStr) -> PyPreviewFrame"""
         newobj = _windows.new_PyPreviewFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, PyPreviewFrame); self._setOORInfo(self)
-    def _setCallbackInfo(*args, **kwargs): return _windows.PyPreviewFrame__setCallbackInfo(*args, **kwargs)
-    def SetPreviewCanvas(*args, **kwargs): return _windows.PyPreviewFrame_SetPreviewCanvas(*args, **kwargs)
-    def SetControlBar(*args, **kwargs): return _windows.PyPreviewFrame_SetControlBar(*args, **kwargs)
-    def base_Initialize(*args, **kwargs): return _windows.PyPreviewFrame_base_Initialize(*args, **kwargs)
-    def base_CreateCanvas(*args, **kwargs): return _windows.PyPreviewFrame_base_CreateCanvas(*args, **kwargs)
-    def base_CreateControlBar(*args, **kwargs): return _windows.PyPreviewFrame_base_CreateControlBar(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyPreviewFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _windows.PyPreviewFrame__setCallbackInfo(*args, **kwargs)
+
+    def SetPreviewCanvas(*args, **kwargs):
+        """SetPreviewCanvas(PreviewCanvas canvas)"""
+        return _windows.PyPreviewFrame_SetPreviewCanvas(*args, **kwargs)
+
+    def SetControlBar(*args, **kwargs):
+        """SetControlBar(PreviewControlBar bar)"""
+        return _windows.PyPreviewFrame_SetControlBar(*args, **kwargs)
+
+    def base_Initialize(*args, **kwargs):
+        """base_Initialize()"""
+        return _windows.PyPreviewFrame_base_Initialize(*args, **kwargs)
+
+    def base_CreateCanvas(*args, **kwargs):
+        """base_CreateCanvas()"""
+        return _windows.PyPreviewFrame_base_CreateCanvas(*args, **kwargs)
+
+    def base_CreateControlBar(*args, **kwargs):
+        """base_CreateControlBar()"""
+        return _windows.PyPreviewFrame_base_CreateControlBar(*args, **kwargs)
+
 
 class PyPreviewFramePtr(PyPreviewFrame):
     def __init__(self, this):
@@ -1841,18 +3708,35 @@ class PyPreviewFramePtr(PyPreviewFrame):
 _windows.PyPreviewFrame_swigregister(PyPreviewFramePtr)
 
 class PyPreviewControlBar(PreviewControlBar):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyPreviewControlBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(PrintPreview preview, long buttons, Window parent, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=0, wxString name=PanelNameStr) -> PyPreviewControlBar"""
         newobj = _windows.new_PyPreviewControlBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, PyPreviewControlBar); self._setOORInfo(self)
-    def _setCallbackInfo(*args, **kwargs): return _windows.PyPreviewControlBar__setCallbackInfo(*args, **kwargs)
-    def SetPrintPreview(*args, **kwargs): return _windows.PyPreviewControlBar_SetPrintPreview(*args, **kwargs)
-    def base_CreateButtons(*args, **kwargs): return _windows.PyPreviewControlBar_base_CreateButtons(*args, **kwargs)
-    def base_SetZoomControl(*args, **kwargs): return _windows.PyPreviewControlBar_base_SetZoomControl(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyPreviewControlBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _windows.PyPreviewControlBar__setCallbackInfo(*args, **kwargs)
+
+    def SetPrintPreview(*args, **kwargs):
+        """SetPrintPreview(PrintPreview preview)"""
+        return _windows.PyPreviewControlBar_SetPrintPreview(*args, **kwargs)
+
+    def base_CreateButtons(*args, **kwargs):
+        """base_CreateButtons()"""
+        return _windows.PyPreviewControlBar_base_CreateButtons(*args, **kwargs)
+
+    def base_SetZoomControl(*args, **kwargs):
+        """base_SetZoomControl(int zoom)"""
+        return _windows.PyPreviewControlBar_base_SetZoomControl(*args, **kwargs)
+
 
 class PyPreviewControlBarPtr(PyPreviewControlBar):
     def __init__(self, this):
diff --git a/wxPython/src/gtk/windows_wrap.cpp b/wxPython/src/gtk/windows_wrap.cpp
index 5551a6d5e4..1e866f13f6 100644
--- a/wxPython/src/gtk/windows_wrap.cpp
+++ b/wxPython/src/gtk/windows_wrap.cpp
@@ -406,7 +406,7 @@ IMP_PYCALLBACK_BOOL_(wxPyPopupTransientWindow, wxPopupTransientWindow, CanDismis
 
 #include <wx/tipwin.h>
 
-wxTipWindow *new_wxTipWindow(wxWindow *parent,wxString const *text,wxCoord maxLength,wxRect *rectBound){
+wxTipWindow *new_wxTipWindow(wxWindow *parent,wxString const *text,int maxLength,wxRect *rectBound){
             wxString tmp = *text;
             return new wxTipWindow(parent, tmp, maxLength, NULL, rectBound);
         }
@@ -471,7 +471,7 @@ public:
 
     // find the index of the line we need to show at the top of the window such
     // that the last (fully or partially) visible line is the given one
-    size_t FindFirstFromBottom(size_t lineLast, bool fullyVisible = false)
+    size_t FindFirstFromBottom(size_t lineLast, bool fullyVisible = False)
     { return wxVScrolledWindow::FindFirstFromBottom(lineLast, fullyVisible); }
 
     // get the total height of the lines between lineMin (inclusive) and
@@ -819,7 +819,7 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, RemoveChild);
 
 // Since this one would be tough and ugly to do with the Macros...
 void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) {
-    bool hadErr = FALSE;
+    bool hadErr = False;
     bool found;
 
     wxPyBeginBlockThreads();
@@ -830,22 +830,22 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p
 
             val = PyTuple_GetItem(result, 0);
             if (PyInt_Check(val))    *minPage = PyInt_AsLong(val);
-            else hadErr = TRUE;
+            else hadErr = True;
 
             val = PyTuple_GetItem(result, 1);
             if (PyInt_Check(val))    *maxPage = PyInt_AsLong(val);
-            else hadErr = TRUE;
+            else hadErr = True;
 
             val = PyTuple_GetItem(result, 2);
             if (PyInt_Check(val))    *pageFrom = PyInt_AsLong(val);
-            else hadErr = TRUE;
+            else hadErr = True;
 
             val = PyTuple_GetItem(result, 3);
             if (PyInt_Check(val))    *pageTo = PyInt_AsLong(val);
-            else hadErr = TRUE;
+            else hadErr = True;
         }
         else
-            hadErr = TRUE;
+            hadErr = True;
 
         if (hadErr) {
             PyErr_SetString(PyExc_TypeError, "GetPageInfo should return a tuple of 4 integers.");
@@ -882,7 +882,7 @@ IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage);
 
 #define IMP_PYCALLBACK_BOOL_PREWINDC(CLASS, PCLASS, CBNAME)                     \
     bool CLASS::CBNAME(wxPreviewCanvas* a, wxDC& b) {                           \
-        bool rval=FALSE;                                                        \
+        bool rval=False;                                                        \
         bool found;                                                             \
         wxPyBeginBlockThreads();                                                \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
@@ -1005,7 +1005,7 @@ extern "C" {
 static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 = (int) (int)-1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -1016,7 +1016,7 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg
     wxPanel *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -1025,7 +1025,7 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg
         (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL 
     };
     
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|OOlO:new_Panel",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|iOOlO:new_Panel",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (obj2) {
         {
@@ -1043,7 +1043,7 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -1094,7 +1094,7 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw
     PyObject *resultobj;
     wxPanel *arg1 = (wxPanel *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -1105,7 +1105,7 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -1134,7 +1134,7 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -1193,7 +1193,7 @@ static PyObject * Panel_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) (wxWindowID)-1 ;
+    int arg2 = (int) (int)-1 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -1204,7 +1204,7 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje
     wxScrolledWindow *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -1231,7 +1231,7 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -1282,7 +1282,7 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 = (wxWindowID) (wxWindowID)-1 ;
+    int arg3 = (int) (int)-1 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -1293,7 +1293,7 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -1322,7 +1322,7 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -1356,7 +1356,7 @@ static PyObject *_wrap_ScrolledWindow_SetScrollbars(PyObject *self, PyObject *ar
     int arg5 ;
     int arg6 = (int) 0 ;
     int arg7 = (int) 0 ;
-    bool arg8 = (bool) FALSE ;
+    bool arg8 = (bool) False ;
     PyObject * obj0 = 0 ;
     PyObject * obj7 = 0 ;
     char *kwnames[] = {
@@ -2379,7 +2379,7 @@ static PyObject *_wrap_GetAccelFromString(PyObject *self, PyObject *args, PyObje
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxAcceleratorEntry *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "label", NULL 
@@ -2389,7 +2389,7 @@ static PyObject *_wrap_GetAccelFromString(PyObject *self, PyObject *args, PyObje
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2416,7 +2416,7 @@ static PyObject *_wrap_GetAccelFromString(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_TopLevelWindow_Maximize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2470,7 +2470,7 @@ static PyObject *_wrap_TopLevelWindow_Restore(PyObject *self, PyObject *args, Py
 static PyObject *_wrap_TopLevelWindow_Iconize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
-    bool arg2 = (bool) TRUE ;
+    bool arg2 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2695,7 +2695,7 @@ static PyObject *_wrap_TopLevelWindow_SetTitle(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -2707,7 +2707,7 @@ static PyObject *_wrap_TopLevelWindow_SetTitle(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2803,7 +2803,7 @@ static PyObject * TopLevelWindow_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -2813,10 +2813,10 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg
     wxString const &arg7_defvalue = wxPyFrameNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     wxFrame *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -2831,7 +2831,7 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -2849,7 +2849,7 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -2912,7 +2912,7 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxString *arg4 = 0 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -2922,10 +2922,10 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw
     wxString const &arg8_defvalue = wxPyFrameNameStr ;
     wxString *arg8 = (wxString *) &arg8_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -2942,7 +2942,7 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
@@ -2960,7 +2960,7 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -3131,11 +3131,11 @@ static PyObject *_wrap_Frame_CreateStatusBar(PyObject *self, PyObject *args, PyO
     wxFrame *arg1 = (wxFrame *) 0 ;
     int arg2 = (int) 1 ;
     long arg3 = (long) wxST_SIZEGRIP ;
-    wxWindowID arg4 = (wxWindowID) 0 ;
+    int arg4 = (int) 0 ;
     wxString const &arg5_defvalue = wxPyStatusLineNameStr ;
     wxString *arg5 = (wxString *) &arg5_defvalue ;
     wxStatusBar *result;
-    bool temp5 = false ;
+    bool temp5 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj4 = 0 ;
     char *kwnames[] = {
@@ -3148,7 +3148,7 @@ static PyObject *_wrap_Frame_CreateStatusBar(PyObject *self, PyObject *args, PyO
         {
             arg5 = wxString_in_helper(obj4);
             if (arg5 == NULL) SWIG_fail;
-            temp5 = true;
+            temp5 = True;
         }
     }
     {
@@ -3234,7 +3234,7 @@ static PyObject *_wrap_Frame_SetStatusText(PyObject *self, PyObject *args, PyObj
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 = (int) 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3246,7 +3246,7 @@ static PyObject *_wrap_Frame_SetStatusText(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3313,7 +3313,7 @@ static PyObject *_wrap_Frame_PushStatusText(PyObject *self, PyObject *args, PyOb
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 = (int) 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3325,7 +3325,7 @@ static PyObject *_wrap_Frame_PushStatusText(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3428,11 +3428,11 @@ static PyObject *_wrap_Frame_CreateToolBar(PyObject *self, PyObject *args, PyObj
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     long arg2 = (long) -1 ;
-    wxWindowID arg3 = (wxWindowID) -1 ;
+    int arg3 = (int) -1 ;
     wxString const &arg4_defvalue = wxPyToolBarNameStr ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     wxToolBar *result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -3445,7 +3445,7 @@ static PyObject *_wrap_Frame_CreateToolBar(PyObject *self, PyObject *args, PyObj
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     {
@@ -3531,7 +3531,7 @@ static PyObject *_wrap_Frame_DoGiveHelp(PyObject *self, PyObject *args, PyObject
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxString *arg2 = 0 ;
     bool arg3 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3544,7 +3544,7 @@ static PyObject *_wrap_Frame_DoGiveHelp(PyObject *self, PyObject *args, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     arg3 = PyInt_AsLong(obj2) ? true : false;
     if (PyErr_Occurred()) SWIG_fail;
@@ -3609,7 +3609,7 @@ static PyObject * Frame_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -3619,10 +3619,10 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar
     wxString const &arg7_defvalue = wxPyDialogNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     wxDialog *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -3637,7 +3637,7 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -3655,7 +3655,7 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -3714,7 +3714,7 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxDialog *arg1 = (wxDialog *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxString *arg4 = 0 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -3724,10 +3724,10 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k
     wxString const &arg8_defvalue = wxPyDialogNameStr ;
     wxString *arg8 = (wxString *) &arg8_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -3744,7 +3744,7 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
@@ -3762,7 +3762,7 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -3850,7 +3850,7 @@ static PyObject *_wrap_Dialog_CreateTextSizer(PyObject *self, PyObject *args, Py
     wxDialog *arg1 = (wxDialog *) 0 ;
     wxString *arg2 = 0 ;
     wxSizer *result;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -3862,7 +3862,7 @@ static PyObject *_wrap_Dialog_CreateTextSizer(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4054,7 +4054,7 @@ static PyObject * Dialog_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -4064,10 +4064,10 @@ static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *k
     wxString const &arg7_defvalue = wxPyFrameNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     wxMiniFrame *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -4082,7 +4082,7 @@ static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *k
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -4100,7 +4100,7 @@ static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *k
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -4159,7 +4159,7 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxMiniFrame *arg1 = (wxMiniFrame *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxString *arg4 = 0 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -4169,10 +4169,10 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject
     wxString const &arg8_defvalue = wxPyFrameNameStr ;
     wxString *arg8 = (wxString *) &arg8_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -4189,7 +4189,7 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
@@ -4207,7 +4207,7 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -4251,7 +4251,7 @@ static PyObject *_wrap_new_SplashScreenWindow(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     wxBitmap *arg1 = 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -4371,7 +4371,7 @@ static PyObject *_wrap_new_SplashScreen(PyObject *self, PyObject *args, PyObject
     long arg2 ;
     int arg3 ;
     wxWindow *arg4 = (wxWindow *) 0 ;
-    wxWindowID arg5 ;
+    int arg5 ;
     wxPoint const &arg6_defvalue = wxDefaultPosition ;
     wxPoint *arg6 = (wxPoint *) &arg6_defvalue ;
     wxSize const &arg7_defvalue = wxDefaultSize ;
@@ -4505,12 +4505,12 @@ static PyObject * SplashScreen_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) -1 ;
+    int arg2 = (int) -1 ;
     long arg3 = (long) wxST_SIZEGRIP ;
     wxString const &arg4_defvalue = wxPyStatusLineNameStr ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     wxStatusBar *result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj3 = 0 ;
     char *kwnames[] = {
@@ -4523,7 +4523,7 @@ static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *k
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     {
@@ -4578,12 +4578,12 @@ static PyObject *_wrap_StatusBar_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     long arg4 = (long) wxST_SIZEGRIP ;
     wxString const &arg5_defvalue = wxPyStatusLineNameStr ;
     wxString *arg5 = (wxString *) &arg5_defvalue ;
     bool result;
-    bool temp5 = false ;
+    bool temp5 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj4 = 0 ;
@@ -4598,7 +4598,7 @@ static PyObject *_wrap_StatusBar_Create(PyObject *self, PyObject *args, PyObject
         {
             arg5 = wxString_in_helper(obj4);
             if (arg5 == NULL) SWIG_fail;
-            temp5 = true;
+            temp5 = True;
         }
     }
     {
@@ -4678,7 +4678,7 @@ static PyObject *_wrap_StatusBar_SetStatusText(PyObject *self, PyObject *args, P
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 = (int) 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4690,7 +4690,7 @@ static PyObject *_wrap_StatusBar_SetStatusText(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4751,7 +4751,7 @@ static PyObject *_wrap_StatusBar_PushStatusText(PyObject *self, PyObject *args,
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     wxString *arg2 = 0 ;
     int arg3 = (int) 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4763,7 +4763,7 @@ static PyObject *_wrap_StatusBar_PushStatusText(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4968,7 +4968,7 @@ static PyObject * StatusBar_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -4979,7 +4979,7 @@ static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObje
     wxSplitterWindow *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -5006,7 +5006,7 @@ static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObje
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -5057,7 +5057,7 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -5068,7 +5068,7 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -5097,7 +5097,7 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -5507,7 +5507,7 @@ static PyObject *_wrap_SplitterWindow_SetSashPosition(PyObject *self, PyObject *
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     int arg2 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -5886,7 +5886,7 @@ static PyObject * SplitterEvent_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -5897,7 +5897,7 @@ static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject *
     wxSashWindow *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -5924,7 +5924,7 @@ static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject *
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -5975,7 +5975,7 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -5986,7 +5986,7 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -6015,7 +6015,7 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -6728,7 +6728,7 @@ static PyObject * SashEvent_swigregister(PyObject *self, PyObject *args) {
 }
 static PyObject *_wrap_new_QueryLayoutInfoEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    wxWindowID arg1 = (wxWindowID) 0 ;
+    int arg1 = (int) 0 ;
     wxQueryLayoutInfoEvent *result;
     char *kwnames[] = {
         (char *) "id", NULL 
@@ -7018,7 +7018,7 @@ static PyObject * QueryLayoutInfoEvent_swigregister(PyObject *self, PyObject *ar
 }
 static PyObject *_wrap_new_CalculateLayoutEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
-    wxWindowID arg1 = (wxWindowID) 0 ;
+    int arg1 = (int) 0 ;
     wxCalculateLayoutEvent *result;
     char *kwnames[] = {
         (char *) "id", NULL 
@@ -7159,7 +7159,7 @@ static PyObject * CalculateLayoutEvent_swigregister(PyObject *self, PyObject *ar
 static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -7170,7 +7170,7 @@ static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyOb
     wxSashLayoutWindow *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -7197,7 +7197,7 @@ static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyOb
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -7248,7 +7248,7 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxSashLayoutWindow *arg1 = (wxSashLayoutWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -7259,7 +7259,7 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -7288,7 +7288,7 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -7867,7 +7867,7 @@ static PyObject *_wrap_new_TipWindow(PyObject *self, PyObject *args, PyObject *k
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = (wxString *) 0 ;
-    wxCoord arg3 = (wxCoord) 100 ;
+    int arg3 = (int) 100 ;
     wxRect *arg4 = (wxRect *) NULL ;
     wxTipWindow *result;
     PyObject * obj0 = 0 ;
@@ -7962,7 +7962,7 @@ static PyObject * TipWindow_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) wxID_ANY ;
+    int arg2 = (int) wxID_ANY ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -7973,7 +7973,7 @@ static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObj
     wxPyVScrolledWindow *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -8000,7 +8000,7 @@ static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObj
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -8081,7 +8081,7 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 = (wxWindowID) wxID_ANY ;
+    int arg3 = (int) wxID_ANY ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -8092,7 +8092,7 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -8121,7 +8121,7 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -8318,8 +8318,8 @@ static PyObject *_wrap_VScrolledWindow_RefreshLines(PyObject *self, PyObject *ar
 static PyObject *_wrap_VScrolledWindow_HitTestXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     int result;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
@@ -8512,7 +8512,7 @@ static PyObject * VScrolledWindow_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) wxID_ANY ;
+    int arg2 = (int) wxID_ANY ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -8523,7 +8523,7 @@ static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kw
     wxPyVListBox *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -8550,7 +8550,7 @@ static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kw
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -8631,7 +8631,7 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 = (wxWindowID) wxID_ANY ;
+    int arg3 = (int) wxID_ANY ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -8642,7 +8642,7 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -8671,7 +8671,7 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -9054,7 +9054,7 @@ static PyObject *_wrap_VListBox_Select(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     size_t arg2 ;
-    bool arg3 = (bool) true ;
+    bool arg3 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -9230,8 +9230,8 @@ static PyObject *_wrap_VListBox_SetMargins(PyObject *self, PyObject *args, PyObj
 static PyObject *_wrap_VListBox_SetMarginsXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
-    wxCoord arg2 ;
-    wxCoord arg3 ;
+    int arg2 ;
+    int arg3 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "x",(char *) "y", NULL 
@@ -9294,7 +9294,7 @@ static PyObject * VListBox_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 = (wxWindowID) wxID_ANY ;
+    int arg2 = (int) wxID_ANY ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -9305,7 +9305,7 @@ static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject
     wxPyHtmlListBox *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -9332,7 +9332,7 @@ static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -9413,7 +9413,7 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje
     PyObject *resultobj;
     wxPyHtmlListBox *arg1 = (wxPyHtmlListBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 = (wxWindowID) wxID_ANY ;
+    int arg3 = (int) wxID_ANY ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
     wxSize const &arg5_defvalue = wxDefaultSize ;
@@ -9424,7 +9424,7 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje
     bool result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -9453,7 +9453,7 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -9640,7 +9640,7 @@ static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *self, PyObject *args, PyObj
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     bool result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -9658,7 +9658,7 @@ static PyObject *_wrap_TaskBarIcon_SetIcon(PyObject *self, PyObject *args, PyObj
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -10106,11 +10106,11 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k
     wxString const &arg7_defvalue = wxPyDirDialogNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     wxDirDialog *result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -10127,14 +10127,14 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj4) {
@@ -10153,7 +10153,7 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -10285,7 +10285,7 @@ static PyObject *_wrap_DirDialog_SetMessage(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxDirDialog *arg1 = (wxDirDialog *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10297,7 +10297,7 @@ static PyObject *_wrap_DirDialog_SetMessage(PyObject *self, PyObject *args, PyOb
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10325,7 +10325,7 @@ static PyObject *_wrap_DirDialog_SetPath(PyObject *self, PyObject *args, PyObjec
     PyObject *resultobj;
     wxDirDialog *arg1 = (wxDirDialog *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10337,7 +10337,7 @@ static PyObject *_wrap_DirDialog_SetPath(PyObject *self, PyObject *args, PyObjec
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10408,10 +10408,10 @@ static PyObject *_wrap_new_FileDialog(PyObject *self, PyObject *args, PyObject *
     wxPoint const &arg7_defvalue = wxDefaultPosition ;
     wxPoint *arg7 = (wxPoint *) &arg7_defvalue ;
     wxFileDialog *result;
-    bool temp2 = false ;
-    bool temp3 = false ;
-    bool temp4 = false ;
-    bool temp5 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
+    bool temp4 = False ;
+    bool temp5 = False ;
     wxPoint temp7 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -10429,28 +10429,28 @@ static PyObject *_wrap_new_FileDialog(PyObject *self, PyObject *args, PyObject *
         {
             arg2 = wxString_in_helper(obj1);
             if (arg2 == NULL) SWIG_fail;
-            temp2 = true;
+            temp2 = True;
         }
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     if (obj4) {
         {
             arg5 = wxString_in_helper(obj4);
             if (arg5 == NULL) SWIG_fail;
-            temp5 = true;
+            temp5 = True;
         }
     }
     if (obj6) {
@@ -10509,7 +10509,7 @@ static PyObject *_wrap_FileDialog_SetMessage(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10521,7 +10521,7 @@ static PyObject *_wrap_FileDialog_SetMessage(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10549,7 +10549,7 @@ static PyObject *_wrap_FileDialog_SetPath(PyObject *self, PyObject *args, PyObje
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10561,7 +10561,7 @@ static PyObject *_wrap_FileDialog_SetPath(PyObject *self, PyObject *args, PyObje
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10589,7 +10589,7 @@ static PyObject *_wrap_FileDialog_SetDirectory(PyObject *self, PyObject *args, P
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10601,7 +10601,7 @@ static PyObject *_wrap_FileDialog_SetDirectory(PyObject *self, PyObject *args, P
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10629,7 +10629,7 @@ static PyObject *_wrap_FileDialog_SetFilename(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10641,7 +10641,7 @@ static PyObject *_wrap_FileDialog_SetFilename(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10669,7 +10669,7 @@ static PyObject *_wrap_FileDialog_SetWildcard(PyObject *self, PyObject *args, Py
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -10681,7 +10681,7 @@ static PyObject *_wrap_FileDialog_SetWildcard(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11028,8 +11028,8 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO
     wxPoint const &arg7_defvalue = wxDefaultPosition ;
     wxPoint *arg7 = (wxPoint *) &arg7_defvalue ;
     wxMultiChoiceDialog *result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     wxPoint temp7 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -11045,12 +11045,12 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
     if (obj6) {
@@ -11179,8 +11179,8 @@ static PyObject *_wrap_new_SingleChoiceDialog(PyObject *self, PyObject *args, Py
     wxPoint const &arg7_defvalue = wxDefaultPosition ;
     wxPoint *arg7 = (wxPoint *) &arg7_defvalue ;
     wxSingleChoiceDialog *result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     wxPoint temp6 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -11196,12 +11196,12 @@ static PyObject *_wrap_new_SingleChoiceDialog(PyObject *self, PyObject *args, Py
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         arg4 = PyList_Size(obj3);
@@ -11375,9 +11375,9 @@ static PyObject *_wrap_new_TextEntryDialog(PyObject *self, PyObject *args, PyObj
     wxPoint const &arg6_defvalue = wxDefaultPosition ;
     wxPoint *arg6 = (wxPoint *) &arg6_defvalue ;
     wxTextEntryDialog *result;
-    bool temp2 = false ;
-    bool temp3 = false ;
-    bool temp4 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
+    bool temp4 = False ;
     wxPoint temp6 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -11393,20 +11393,20 @@ static PyObject *_wrap_new_TextEntryDialog(PyObject *self, PyObject *args, PyObj
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     if (obj5) {
@@ -11488,7 +11488,7 @@ static PyObject *_wrap_TextEntryDialog_SetValue(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxTextEntryDialog *arg1 = (wxTextEntryDialog *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -11500,7 +11500,7 @@ static PyObject *_wrap_TextEntryDialog_SetValue(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12073,8 +12073,8 @@ static PyObject *_wrap_new_MessageDialog(PyObject *self, PyObject *args, PyObjec
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
     wxMessageDialog *result;
-    bool temp2 = false ;
-    bool temp3 = false ;
+    bool temp2 = False ;
+    bool temp3 = False ;
     wxPoint temp5 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -12089,13 +12089,13 @@ static PyObject *_wrap_new_MessageDialog(PyObject *self, PyObject *args, PyObjec
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj2) {
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj4) {
@@ -12174,8 +12174,8 @@ static PyObject *_wrap_new_ProgressDialog(PyObject *self, PyObject *args, PyObje
     wxWindow *arg4 = (wxWindow *) NULL ;
     int arg5 = (int) wxPD_AUTO_HIDE|wxPD_APP_MODAL ;
     wxProgressDialog *result;
-    bool temp1 = false ;
-    bool temp2 = false ;
+    bool temp1 = False ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -12187,12 +12187,12 @@ static PyObject *_wrap_new_ProgressDialog(PyObject *self, PyObject *args, PyObje
     {
         arg1 = wxString_in_helper(obj0);
         if (arg1 == NULL) SWIG_fail;
-        temp1 = true;
+        temp1 = True;
     }
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     if (obj3) {
         if ((SWIG_ConvertPtr(obj3,(void **) &arg4, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
@@ -12234,7 +12234,7 @@ static PyObject *_wrap_ProgressDialog_Update(PyObject *self, PyObject *args, PyO
     wxString const &arg3_defvalue = wxPyEmptyString ;
     wxString *arg3 = (wxString *) &arg3_defvalue ;
     bool result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     char *kwnames[] = {
@@ -12247,7 +12247,7 @@ static PyObject *_wrap_ProgressDialog_Update(PyObject *self, PyObject *args, PyO
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     {
@@ -12465,7 +12465,7 @@ static PyObject *_wrap_FindDialogEvent_SetFindString(PyObject *self, PyObject *a
     PyObject *resultobj;
     wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -12477,7 +12477,7 @@ static PyObject *_wrap_FindDialogEvent_SetFindString(PyObject *self, PyObject *a
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12505,7 +12505,7 @@ static PyObject *_wrap_FindDialogEvent_SetReplaceString(PyObject *self, PyObject
     PyObject *resultobj;
     wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -12517,7 +12517,7 @@ static PyObject *_wrap_FindDialogEvent_SetReplaceString(PyObject *self, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12705,7 +12705,7 @@ static PyObject *_wrap_FindReplaceData_SetFindString(PyObject *self, PyObject *a
     PyObject *resultobj;
     wxFindReplaceData *arg1 = (wxFindReplaceData *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -12717,7 +12717,7 @@ static PyObject *_wrap_FindReplaceData_SetFindString(PyObject *self, PyObject *a
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12745,7 +12745,7 @@ static PyObject *_wrap_FindReplaceData_SetReplaceString(PyObject *self, PyObject
     PyObject *resultobj;
     wxFindReplaceData *arg1 = (wxFindReplaceData *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -12757,7 +12757,7 @@ static PyObject *_wrap_FindReplaceData_SetReplaceString(PyObject *self, PyObject
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12795,7 +12795,7 @@ static PyObject *_wrap_new_FindReplaceDialog(PyObject *self, PyObject *args, PyO
     wxString *arg3 = 0 ;
     int arg4 = (int) 0 ;
     wxFindReplaceDialog *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -12809,7 +12809,7 @@ static PyObject *_wrap_new_FindReplaceDialog(PyObject *self, PyObject *args, PyO
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12863,7 +12863,7 @@ static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args,
     wxString *arg4 = 0 ;
     int arg5 = (int) 0 ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -12879,7 +12879,7 @@ static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args,
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12965,7 +12965,7 @@ static PyObject * FindReplaceDialog_swigregister(PyObject *self, PyObject *args)
 static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -12975,10 +12975,10 @@ static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObje
     wxString const &arg7_defvalue = wxPyFrameNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     wxMDIParentFrame *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -12993,7 +12993,7 @@ static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObje
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -13011,7 +13011,7 @@ static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObje
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -13070,7 +13070,7 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxString *arg4 = 0 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -13080,10 +13080,10 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO
     wxString const &arg8_defvalue = wxPyFrameNameStr ;
     wxString *arg8 = (wxString *) &arg8_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -13100,7 +13100,7 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
@@ -13118,7 +13118,7 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -13362,7 +13362,7 @@ static PyObject * MDIParentFrame_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxString *arg3 = 0 ;
     wxPoint const &arg4_defvalue = wxDefaultPosition ;
     wxPoint *arg4 = (wxPoint *) &arg4_defvalue ;
@@ -13372,10 +13372,10 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec
     wxString const &arg7_defvalue = wxPyFrameNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     wxMDIChildFrame *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -13390,7 +13390,7 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -13408,7 +13408,7 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -13471,7 +13471,7 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb
     PyObject *resultobj;
     wxMDIChildFrame *arg1 = (wxMDIChildFrame *) 0 ;
     wxMDIParentFrame *arg2 = (wxMDIParentFrame *) 0 ;
-    wxWindowID arg3 ;
+    int arg3 ;
     wxString *arg4 = 0 ;
     wxPoint const &arg5_defvalue = wxDefaultPosition ;
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
@@ -13481,10 +13481,10 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb
     wxString const &arg8_defvalue = wxPyFrameNameStr ;
     wxString *arg8 = (wxString *) &arg8_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp5 ;
     wxSize temp6 ;
-    bool temp8 = false ;
+    bool temp8 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj3 = 0 ;
@@ -13501,7 +13501,7 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     if (obj4) {
         {
@@ -13519,7 +13519,7 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb
         {
             arg8 = wxString_in_helper(obj7);
             if (arg8 == NULL) SWIG_fail;
-            temp8 = true;
+            temp8 = True;
         }
     }
     {
@@ -13726,7 +13726,7 @@ static PyObject * MDIClientWindow_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -13737,7 +13737,7 @@ static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kw
     wxPyWindow *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -13764,7 +13764,7 @@ static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kw
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -14342,7 +14342,7 @@ static PyObject * PyWindow_swigregister(PyObject *self, PyObject *args) {
 static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
-    wxWindowID arg2 ;
+    int arg2 ;
     wxPoint const &arg3_defvalue = wxDefaultPosition ;
     wxPoint *arg3 = (wxPoint *) &arg3_defvalue ;
     wxSize const &arg4_defvalue = wxDefaultSize ;
@@ -14353,7 +14353,7 @@ static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwa
     wxPyPanel *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -14380,7 +14380,7 @@ static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwa
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -15343,7 +15343,7 @@ static PyObject *_wrap_PrintData_SetPrinterName(PyObject *self, PyObject *args,
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -15355,7 +15355,7 @@ static PyObject *_wrap_PrintData_SetPrinterName(PyObject *self, PyObject *args,
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15786,7 +15786,7 @@ static PyObject *_wrap_PrintData_SetPrinterCommand(PyObject *self, PyObject *arg
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -15798,7 +15798,7 @@ static PyObject *_wrap_PrintData_SetPrinterCommand(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15826,7 +15826,7 @@ static PyObject *_wrap_PrintData_SetPrinterOptions(PyObject *self, PyObject *arg
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -15838,7 +15838,7 @@ static PyObject *_wrap_PrintData_SetPrinterOptions(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15866,7 +15866,7 @@ static PyObject *_wrap_PrintData_SetPreviewCommand(PyObject *self, PyObject *arg
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -15878,7 +15878,7 @@ static PyObject *_wrap_PrintData_SetPreviewCommand(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15906,7 +15906,7 @@ static PyObject *_wrap_PrintData_SetFilename(PyObject *self, PyObject *args, PyO
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -15918,7 +15918,7 @@ static PyObject *_wrap_PrintData_SetFilename(PyObject *self, PyObject *args, PyO
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15946,7 +15946,7 @@ static PyObject *_wrap_PrintData_SetFontMetricPath(PyObject *self, PyObject *arg
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *arg2 = 0 ;
-    bool temp2 = false ;
+    bool temp2 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -15958,7 +15958,7 @@ static PyObject *_wrap_PrintData_SetFontMetricPath(PyObject *self, PyObject *arg
     {
         arg2 = wxString_in_helper(obj1);
         if (arg2 == NULL) SWIG_fail;
-        temp2 = true;
+        temp2 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18207,7 +18207,7 @@ static PyObject *_wrap_Printer_Print(PyObject *self, PyObject *args, PyObject *k
     wxPrinter *arg1 = (wxPrinter *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
     wxPyPrintout *arg3 = (wxPyPrintout *) 0 ;
-    int arg4 = (int) TRUE ;
+    int arg4 = (int) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -18270,7 +18270,7 @@ static PyObject *_wrap_Printer_ReportError(PyObject *self, PyObject *args, PyObj
     wxWindow *arg2 = (wxWindow *) 0 ;
     wxPyPrintout *arg3 = (wxPyPrintout *) 0 ;
     wxString *arg4 = 0 ;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -18286,7 +18286,7 @@ static PyObject *_wrap_Printer_ReportError(PyObject *self, PyObject *args, PyObj
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
-        temp4 = true;
+        temp4 = True;
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18397,7 +18397,7 @@ static PyObject *_wrap_new_Printout(PyObject *self, PyObject *args, PyObject *kw
     wxString const &arg1_defvalue = wxPyPrintoutTitleStr ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
     wxPyPrintout *result;
-    bool temp1 = false ;
+    bool temp1 = False ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "title", NULL 
@@ -18408,7 +18408,7 @@ static PyObject *_wrap_new_Printout(PyObject *self, PyObject *args, PyObject *kw
         {
             arg1 = wxString_in_helper(obj0);
             if (arg1 == NULL) SWIG_fail;
-            temp1 = true;
+            temp1 = True;
         }
     }
     {
@@ -19081,7 +19081,7 @@ static PyObject *_wrap_new_PreviewCanvas(PyObject *self, PyObject *args, PyObjec
     wxPreviewCanvas *result;
     wxPoint temp3 ;
     wxSize temp4 ;
-    bool temp6 = false ;
+    bool temp6 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -19110,7 +19110,7 @@ static PyObject *_wrap_new_PreviewCanvas(PyObject *self, PyObject *args, PyObjec
         {
             arg6 = wxString_in_helper(obj5);
             if (arg6 == NULL) SWIG_fail;
-            temp6 = true;
+            temp6 = True;
         }
     }
     {
@@ -19155,10 +19155,10 @@ static PyObject *_wrap_new_PreviewFrame(PyObject *self, PyObject *args, PyObject
     wxString const &arg7_defvalue = wxPyFrameNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     wxPreviewFrame *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -19175,7 +19175,7 @@ static PyObject *_wrap_new_PreviewFrame(PyObject *self, PyObject *args, PyObject
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -19193,7 +19193,7 @@ static PyObject *_wrap_new_PreviewFrame(PyObject *self, PyObject *args, PyObject
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -19345,7 +19345,7 @@ static PyObject *_wrap_new_PreviewControlBar(PyObject *self, PyObject *args, PyO
     wxPreviewControlBar *result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -19374,7 +19374,7 @@ static PyObject *_wrap_new_PreviewControlBar(PyObject *self, PyObject *args, PyO
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -20515,10 +20515,10 @@ static PyObject *_wrap_new_PyPreviewFrame(PyObject *self, PyObject *args, PyObje
     wxString const &arg7_defvalue = wxPyFrameNameStr ;
     wxString *arg7 = (wxString *) &arg7_defvalue ;
     wxPyPreviewFrame *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -20535,7 +20535,7 @@ static PyObject *_wrap_new_PyPreviewFrame(PyObject *self, PyObject *args, PyObje
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
-        temp3 = true;
+        temp3 = True;
     }
     if (obj3) {
         {
@@ -20553,7 +20553,7 @@ static PyObject *_wrap_new_PyPreviewFrame(PyObject *self, PyObject *args, PyObje
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
@@ -20764,7 +20764,7 @@ static PyObject *_wrap_new_PyPreviewControlBar(PyObject *self, PyObject *args, P
     wxPyPreviewControlBar *result;
     wxPoint temp4 ;
     wxSize temp5 ;
-    bool temp7 = false ;
+    bool temp7 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
     PyObject * obj3 = 0 ;
@@ -20793,7 +20793,7 @@ static PyObject *_wrap_new_PyPreviewControlBar(PyObject *self, PyObject *args, P
         {
             arg7 = wxString_in_helper(obj6);
             if (arg7 == NULL) SWIG_fail;
-            temp7 = true;
+            temp7 = True;
         }
     }
     {
diff --git a/wxPython/src/gtk/wizard.py b/wxPython/src/gtk/wizard.py
index 0389bce88a..55feb72b34 100644
--- a/wxPython/src/gtk/wizard.py
+++ b/wxPython/src/gtk/wizard.py
@@ -19,15 +19,24 @@ EVT_WIZARD_HELP          = wx.PyEventBinder( wxEVT_WIZARD_HELP, 1)
 EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
 
 class WizardEvent(core.NotifyEvent):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxWizardEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(wxEventType type=wxEVT_NULL, int id=-1, bool direction=True, 
+    WizardPage page=None) -> WizardEvent"""
         newobj = _wizard.new_WizardEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-    def GetDirection(*args, **kwargs): return _wizard.WizardEvent_GetDirection(*args, **kwargs)
-    def GetPage(*args, **kwargs): return _wizard.WizardEvent_GetPage(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWizardEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetDirection(*args, **kwargs):
+        """GetDirection() -> bool"""
+        return _wizard.WizardEvent_GetDirection(*args, **kwargs)
+
+    def GetPage(*args, **kwargs):
+        """GetPage() -> WizardPage"""
+        return _wizard.WizardEvent_GetPage(*args, **kwargs)
+
 
 class WizardEventPtr(WizardEvent):
     def __init__(self, this):
@@ -37,13 +46,26 @@ class WizardEventPtr(WizardEvent):
 _wizard.WizardEvent_swigregister(WizardEventPtr)
 
 class WizardPage(windows.Panel):
-    def Create(*args, **kwargs): return _wizard.WizardPage_Create(*args, **kwargs)
-    def GetPrev(*args, **kwargs): return _wizard.WizardPage_GetPrev(*args, **kwargs)
-    def GetNext(*args, **kwargs): return _wizard.WizardPage_GetNext(*args, **kwargs)
-    def GetBitmap(*args, **kwargs): return _wizard.WizardPage_GetBitmap(*args, **kwargs)
+    """"""
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxWizardPage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Create(*args, **kwargs):
+        """Create(Wizard parent, wxBitmap bitmap=wxNullBitmap, wxString resource=wxPyEmptyString) -> bool"""
+        return _wizard.WizardPage_Create(*args, **kwargs)
+
+    def GetPrev(*args, **kwargs):
+        """GetPrev() -> WizardPage"""
+        return _wizard.WizardPage_GetPrev(*args, **kwargs)
+
+    def GetNext(*args, **kwargs):
+        """GetNext() -> WizardPage"""
+        return _wizard.WizardPage_GetNext(*args, **kwargs)
+
+    def GetBitmap(*args, **kwargs):
+        """GetBitmap() -> wxBitmap"""
+        return _wizard.WizardPage_GetBitmap(*args, **kwargs)
+
 
 class WizardPagePtr(WizardPage):
     def __init__(self, this):
@@ -53,34 +75,97 @@ class WizardPagePtr(WizardPage):
 _wizard.WizardPage_swigregister(WizardPagePtr)
 
 class PyWizardPage(WizardPage):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyWizardPage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Wizard parent, wxBitmap bitmap=&wxNullBitmap, wxString resource=&wxPyEmptyString) -> PyWizardPage"""
         newobj = _wizard.new_PyWizardPage(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setCallbackInfo(self, PyWizardPage);self._setOORInfo(self)
-    def Create(*args, **kwargs): return _wizard.PyWizardPage_Create(*args, **kwargs)
-    def _setCallbackInfo(*args, **kwargs): return _wizard.PyWizardPage__setCallbackInfo(*args, **kwargs)
-    def base_DoMoveWindow(*args, **kwargs): return _wizard.PyWizardPage_base_DoMoveWindow(*args, **kwargs)
-    def base_DoSetSize(*args, **kwargs): return _wizard.PyWizardPage_base_DoSetSize(*args, **kwargs)
-    def base_DoSetClientSize(*args, **kwargs): return _wizard.PyWizardPage_base_DoSetClientSize(*args, **kwargs)
-    def base_DoSetVirtualSize(*args, **kwargs): return _wizard.PyWizardPage_base_DoSetVirtualSize(*args, **kwargs)
-    def base_DoGetSize(*args, **kwargs): return _wizard.PyWizardPage_base_DoGetSize(*args, **kwargs)
-    def base_DoGetClientSize(*args, **kwargs): return _wizard.PyWizardPage_base_DoGetClientSize(*args, **kwargs)
-    def base_DoGetPosition(*args, **kwargs): return _wizard.PyWizardPage_base_DoGetPosition(*args, **kwargs)
-    def base_DoGetVirtualSize(*args, **kwargs): return _wizard.PyWizardPage_base_DoGetVirtualSize(*args, **kwargs)
-    def base_DoGetBestSize(*args, **kwargs): return _wizard.PyWizardPage_base_DoGetBestSize(*args, **kwargs)
-    def base_InitDialog(*args, **kwargs): return _wizard.PyWizardPage_base_InitDialog(*args, **kwargs)
-    def base_TransferDataToWindow(*args, **kwargs): return _wizard.PyWizardPage_base_TransferDataToWindow(*args, **kwargs)
-    def base_TransferDataFromWindow(*args, **kwargs): return _wizard.PyWizardPage_base_TransferDataFromWindow(*args, **kwargs)
-    def base_Validate(*args, **kwargs): return _wizard.PyWizardPage_base_Validate(*args, **kwargs)
-    def base_AcceptsFocus(*args, **kwargs): return _wizard.PyWizardPage_base_AcceptsFocus(*args, **kwargs)
-    def base_AcceptsFocusFromKeyboard(*args, **kwargs): return _wizard.PyWizardPage_base_AcceptsFocusFromKeyboard(*args, **kwargs)
-    def base_GetMaxSize(*args, **kwargs): return _wizard.PyWizardPage_base_GetMaxSize(*args, **kwargs)
-    def base_AddChild(*args, **kwargs): return _wizard.PyWizardPage_base_AddChild(*args, **kwargs)
-    def base_RemoveChild(*args, **kwargs): return _wizard.PyWizardPage_base_RemoveChild(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyWizardPage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Wizard parent, wxBitmap bitmap=wxNullBitmap, wxString resource=wxPyEmptyString) -> bool"""
+        return _wizard.PyWizardPage_Create(*args, **kwargs)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _wizard.PyWizardPage__setCallbackInfo(*args, **kwargs)
+
+    def base_DoMoveWindow(*args, **kwargs):
+        """base_DoMoveWindow(int x, int y, int width, int height)"""
+        return _wizard.PyWizardPage_base_DoMoveWindow(*args, **kwargs)
+
+    def base_DoSetSize(*args, **kwargs):
+        """base_DoSetSize(int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
+        return _wizard.PyWizardPage_base_DoSetSize(*args, **kwargs)
+
+    def base_DoSetClientSize(*args, **kwargs):
+        """base_DoSetClientSize(int width, int height)"""
+        return _wizard.PyWizardPage_base_DoSetClientSize(*args, **kwargs)
+
+    def base_DoSetVirtualSize(*args, **kwargs):
+        """base_DoSetVirtualSize(int x, int y)"""
+        return _wizard.PyWizardPage_base_DoSetVirtualSize(*args, **kwargs)
+
+    def base_DoGetSize(*args, **kwargs):
+        """base_DoGetSize(int OUTPUT, int OUTPUT)"""
+        return _wizard.PyWizardPage_base_DoGetSize(*args, **kwargs)
+
+    def base_DoGetClientSize(*args, **kwargs):
+        """base_DoGetClientSize(int OUTPUT, int OUTPUT)"""
+        return _wizard.PyWizardPage_base_DoGetClientSize(*args, **kwargs)
+
+    def base_DoGetPosition(*args, **kwargs):
+        """base_DoGetPosition(int OUTPUT, int OUTPUT)"""
+        return _wizard.PyWizardPage_base_DoGetPosition(*args, **kwargs)
+
+    def base_DoGetVirtualSize(*args, **kwargs):
+        """base_DoGetVirtualSize() -> Size"""
+        return _wizard.PyWizardPage_base_DoGetVirtualSize(*args, **kwargs)
+
+    def base_DoGetBestSize(*args, **kwargs):
+        """base_DoGetBestSize() -> Size"""
+        return _wizard.PyWizardPage_base_DoGetBestSize(*args, **kwargs)
+
+    def base_InitDialog(*args, **kwargs):
+        """base_InitDialog()"""
+        return _wizard.PyWizardPage_base_InitDialog(*args, **kwargs)
+
+    def base_TransferDataToWindow(*args, **kwargs):
+        """base_TransferDataToWindow() -> bool"""
+        return _wizard.PyWizardPage_base_TransferDataToWindow(*args, **kwargs)
+
+    def base_TransferDataFromWindow(*args, **kwargs):
+        """base_TransferDataFromWindow() -> bool"""
+        return _wizard.PyWizardPage_base_TransferDataFromWindow(*args, **kwargs)
+
+    def base_Validate(*args, **kwargs):
+        """base_Validate() -> bool"""
+        return _wizard.PyWizardPage_base_Validate(*args, **kwargs)
+
+    def base_AcceptsFocus(*args, **kwargs):
+        """base_AcceptsFocus() -> bool"""
+        return _wizard.PyWizardPage_base_AcceptsFocus(*args, **kwargs)
+
+    def base_AcceptsFocusFromKeyboard(*args, **kwargs):
+        """base_AcceptsFocusFromKeyboard() -> bool"""
+        return _wizard.PyWizardPage_base_AcceptsFocusFromKeyboard(*args, **kwargs)
+
+    def base_GetMaxSize(*args, **kwargs):
+        """base_GetMaxSize() -> Size"""
+        return _wizard.PyWizardPage_base_GetMaxSize(*args, **kwargs)
+
+    def base_AddChild(*args, **kwargs):
+        """base_AddChild(Window child)"""
+        return _wizard.PyWizardPage_base_AddChild(*args, **kwargs)
+
+    def base_RemoveChild(*args, **kwargs):
+        """base_RemoveChild(Window child)"""
+        return _wizard.PyWizardPage_base_RemoveChild(*args, **kwargs)
+
 
 class PyWizardPagePtr(PyWizardPage):
     def __init__(self, this):
@@ -90,23 +175,42 @@ class PyWizardPagePtr(PyWizardPage):
 _wizard.PyWizardPage_swigregister(PyWizardPagePtr)
 
 def PrePyWizardPage(*args, **kwargs):
+    """PrePyWizardPage() -> PyWizardPage"""
     val = _wizard.new_PrePyWizardPage(*args, **kwargs)
     val.thisown = 1
     return val
 
 class WizardPageSimple(WizardPage):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxWizardPageSimple instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Wizard parent, WizardPage prev=None, WizardPage next=None, 
+    wxBitmap bitmap=wxNullBitmap, wxChar resource=None) -> WizardPageSimple"""
         newobj = _wizard.new_WizardPageSimple(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _wizard.WizardPageSimple_Create(*args, **kwargs)
-    def SetPrev(*args, **kwargs): return _wizard.WizardPageSimple_SetPrev(*args, **kwargs)
-    def SetNext(*args, **kwargs): return _wizard.WizardPageSimple_SetNext(*args, **kwargs)
-    Chain = staticmethod(_wizard.WizardPageSimple_Chain)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWizardPageSimple instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Wizard parent=None, WizardPage prev=None, WizardPage next=None, 
+    wxBitmap bitmap=wxNullBitmap, wxChar resource=None) -> bool"""
+        return _wizard.WizardPageSimple_Create(*args, **kwargs)
+
+    def SetPrev(*args, **kwargs):
+        """SetPrev(WizardPage prev)"""
+        return _wizard.WizardPageSimple_SetPrev(*args, **kwargs)
+
+    def SetNext(*args, **kwargs):
+        """SetNext(WizardPage next)"""
+        return _wizard.WizardPageSimple_SetNext(*args, **kwargs)
+
+    def Chain(*args, **kwargs):
+        """WizardPageSimple.Chain(WizardPageSimple first, WizardPageSimple second)"""
+        return _wizard.WizardPageSimple_Chain(*args, **kwargs)
+
+    Chain = staticmethod(Chain)
 
 class WizardPageSimplePtr(WizardPageSimple):
     def __init__(self, this):
@@ -116,34 +220,82 @@ class WizardPageSimplePtr(WizardPageSimple):
 _wizard.WizardPageSimple_swigregister(WizardPageSimplePtr)
 
 def PreWizardPageSimple(*args, **kwargs):
+    """PreWizardPageSimple() -> WizardPageSimple"""
     val = _wizard.new_PreWizardPageSimple(*args, **kwargs)
     val.thisown = 1
     return val
 
-WizardPageSimple_Chain = _wizard.WizardPageSimple_Chain
+def WizardPageSimple_Chain(*args, **kwargs):
+    """WizardPageSimple_Chain(WizardPageSimple first, WizardPageSimple second)"""
+    return _wizard.WizardPageSimple_Chain(*args, **kwargs)
 
 class Wizard(windows.Dialog):
+    """"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxWizard instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
+        """__init__(Window parent, int id=-1, wxString title=wxEmptyString, 
+    wxBitmap bitmap=wxNullBitmap, Point pos=DefaultPosition, 
+    long style=DEFAULT_DIALOG_STYLE) -> Wizard"""
         newobj = _wizard.new_Wizard(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
-    def Create(*args, **kwargs): return _wizard.Wizard_Create(*args, **kwargs)
-    def Init(*args, **kwargs): return _wizard.Wizard_Init(*args, **kwargs)
-    def RunWizard(*args, **kwargs): return _wizard.Wizard_RunWizard(*args, **kwargs)
-    def GetCurrentPage(*args, **kwargs): return _wizard.Wizard_GetCurrentPage(*args, **kwargs)
-    def SetPageSize(*args, **kwargs): return _wizard.Wizard_SetPageSize(*args, **kwargs)
-    def GetPageSize(*args, **kwargs): return _wizard.Wizard_GetPageSize(*args, **kwargs)
-    def FitToPage(*args, **kwargs): return _wizard.Wizard_FitToPage(*args, **kwargs)
-    def GetPageAreaSizer(*args, **kwargs): return _wizard.Wizard_GetPageAreaSizer(*args, **kwargs)
-    def SetBorder(*args, **kwargs): return _wizard.Wizard_SetBorder(*args, **kwargs)
-    def IsRunning(*args, **kwargs): return _wizard.Wizard_IsRunning(*args, **kwargs)
-    def ShowPage(*args, **kwargs): return _wizard.Wizard_ShowPage(*args, **kwargs)
-    def HasNextPage(*args, **kwargs): return _wizard.Wizard_HasNextPage(*args, **kwargs)
-    def HasPrevPage(*args, **kwargs): return _wizard.Wizard_HasPrevPage(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWizard instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """Create(Window parent, int id=-1, wxString title=wxEmptyString, 
+    wxBitmap bitmap=wxNullBitmap, Point pos=DefaultPosition) -> bool"""
+        return _wizard.Wizard_Create(*args, **kwargs)
+
+    def Init(*args, **kwargs):
+        """Init()"""
+        return _wizard.Wizard_Init(*args, **kwargs)
+
+    def RunWizard(*args, **kwargs):
+        """RunWizard(WizardPage firstPage) -> bool"""
+        return _wizard.Wizard_RunWizard(*args, **kwargs)
+
+    def GetCurrentPage(*args, **kwargs):
+        """GetCurrentPage() -> WizardPage"""
+        return _wizard.Wizard_GetCurrentPage(*args, **kwargs)
+
+    def SetPageSize(*args, **kwargs):
+        """SetPageSize(Size size)"""
+        return _wizard.Wizard_SetPageSize(*args, **kwargs)
+
+    def GetPageSize(*args, **kwargs):
+        """GetPageSize() -> Size"""
+        return _wizard.Wizard_GetPageSize(*args, **kwargs)
+
+    def FitToPage(*args, **kwargs):
+        """FitToPage(WizardPage firstPage)"""
+        return _wizard.Wizard_FitToPage(*args, **kwargs)
+
+    def GetPageAreaSizer(*args, **kwargs):
+        """GetPageAreaSizer() -> Sizer"""
+        return _wizard.Wizard_GetPageAreaSizer(*args, **kwargs)
+
+    def SetBorder(*args, **kwargs):
+        """SetBorder(int border)"""
+        return _wizard.Wizard_SetBorder(*args, **kwargs)
+
+    def IsRunning(*args, **kwargs):
+        """IsRunning() -> bool"""
+        return _wizard.Wizard_IsRunning(*args, **kwargs)
+
+    def ShowPage(*args, **kwargs):
+        """ShowPage(WizardPage page, bool goingForward=True) -> bool"""
+        return _wizard.Wizard_ShowPage(*args, **kwargs)
+
+    def HasNextPage(*args, **kwargs):
+        """HasNextPage(WizardPage page) -> bool"""
+        return _wizard.Wizard_HasNextPage(*args, **kwargs)
+
+    def HasPrevPage(*args, **kwargs):
+        """HasPrevPage(WizardPage page) -> bool"""
+        return _wizard.Wizard_HasPrevPage(*args, **kwargs)
+
 
 class WizardPtr(Wizard):
     def __init__(self, this):
@@ -153,6 +305,7 @@ class WizardPtr(Wizard):
 _wizard.Wizard_swigregister(WizardPtr)
 
 def PreWizard(*args, **kwargs):
+    """PreWizard() -> Wizard"""
     val = _wizard.new_PreWizard(*args, **kwargs)
     val.thisown = 1
     return val
diff --git a/wxPython/src/gtk/wizard_wrap.cpp b/wxPython/src/gtk/wizard_wrap.cpp
index 4dcdd082f8..2191002c9e 100644
--- a/wxPython/src/gtk/wizard_wrap.cpp
+++ b/wxPython/src/gtk/wizard_wrap.cpp
@@ -385,7 +385,7 @@ static PyObject *_wrap_new_WizardEvent(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) -1 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     wxWizardPage *arg4 = (wxWizardPage *) NULL ;
     wxWizardEvent *result;
     PyObject * obj2 = 0 ;
@@ -484,7 +484,7 @@ static PyObject *_wrap_WizardPage_Create(PyObject *self, PyObject *args, PyObjec
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -506,7 +506,7 @@ static PyObject *_wrap_WizardPage_Create(PyObject *self, PyObject *args, PyObjec
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     {
@@ -687,7 +687,7 @@ static PyObject *_wrap_PyWizardPage_Create(PyObject *self, PyObject *args, PyObj
     wxString const &arg4_defvalue = wxPyEmptyString ;
     wxString *arg4 = (wxString *) &arg4_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -709,7 +709,7 @@ static PyObject *_wrap_PyWizardPage_Create(PyObject *self, PyObject *args, PyObj
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     {
@@ -1509,7 +1509,7 @@ static PyObject *_wrap_new_Wizard(PyObject *self, PyObject *args, PyObject *kwar
     wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
     long arg6 = (long) wxDEFAULT_DIALOG_STYLE ;
     wxWizard *result;
-    bool temp3 = false ;
+    bool temp3 = False ;
     wxPoint temp5 ;
     PyObject * obj0 = 0 ;
     PyObject * obj2 = 0 ;
@@ -1525,7 +1525,7 @@ static PyObject *_wrap_new_Wizard(PyObject *self, PyObject *args, PyObject *kwar
         {
             arg3 = wxString_in_helper(obj2);
             if (arg3 == NULL) SWIG_fail;
-            temp3 = true;
+            temp3 = True;
         }
     }
     if (obj3) {
@@ -1596,7 +1596,7 @@ static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *k
     wxPoint const &arg6_defvalue = wxDefaultPosition ;
     wxPoint *arg6 = (wxPoint *) &arg6_defvalue ;
     bool result;
-    bool temp4 = false ;
+    bool temp4 = False ;
     wxPoint temp6 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -1614,7 +1614,7 @@ static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *k
         {
             arg4 = wxString_in_helper(obj3);
             if (arg4 == NULL) SWIG_fail;
-            temp4 = true;
+            temp4 = True;
         }
     }
     if (obj4) {
@@ -1898,7 +1898,7 @@ static PyObject *_wrap_Wizard_ShowPage(PyObject *self, PyObject *args, PyObject
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxWizardPage *arg2 = (wxWizardPage *) 0 ;
-    bool arg3 = (bool) TRUE ;
+    bool arg3 = (bool) True ;
     bool result;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
diff --git a/wxPython/wxPython/controls.py b/wxPython/wxPython/controls.py
index 0df70d9c71..a7e354b6b4 100644
--- a/wxPython/wxPython/controls.py
+++ b/wxPython/wxPython/controls.py
@@ -351,6 +351,11 @@ wxHelpProvider_Set = wx.controls.HelpProvider_Set
 wxHelpProvider_Get = wx.controls.HelpProvider_Get
 wxHelpProvider = wx.controls.HelpProvider
 wxSimpleHelpProvider = wx.controls.SimpleHelpProvider
+wxDragIcon = wx.controls.DragIcon
+wxDragString = wx.controls.DragString
+wxDragTreeItem = wx.controls.DragTreeItem
+wxDragListItem = wx.controls.DragListItem
+wxDragImage = wx.controls.DragImage
 
 
 d = globals()
diff --git a/wxPython/wxPython/core.py b/wxPython/wxPython/core.py
index 6d4d7f073e..d40cc45ec0 100644
--- a/wxPython/wxPython/core.py
+++ b/wxPython/wxPython/core.py
@@ -899,6 +899,7 @@ wxWakeUpIdle = wx.core.WakeUpIdle
 wxPostEvent = wx.core.PostEvent
 wxApp_CleanUp = wx.core.App_CleanUp
 wxGetApp = wx.core.GetApp
+wxPanelNameStr = wx.core.PanelNameStr
 wxPreWindow = wx.core.PreWindow
 wxWindow_NewControlId = wx.core.Window_NewControlId
 wxWindow_NextControlId = wx.core.Window_NextControlId
diff --git a/wxPython/wxPython/gdi.py b/wxPython/wxPython/gdi.py
index 761e00e6bd..0f277f27ea 100644
--- a/wxPython/wxPython/gdi.py
+++ b/wxPython/wxPython/gdi.py
@@ -493,11 +493,6 @@ wxTheFontList = wx.gdi.TheFontList
 wxThePenList = wx.gdi.ThePenList
 wxTheBrushList = wx.gdi.TheBrushList
 wxTheColourDatabase = wx.gdi.TheColourDatabase
-wxDragIcon = wx.gdi.DragIcon
-wxDragString = wx.gdi.DragString
-wxDragTreeItem = wx.gdi.DragTreeItem
-wxDragListItem = wx.gdi.DragListItem
-wxDragImage = wx.gdi.DragImage
 wxEffects = wx.gdi.Effects
 
 
-- 
2.45.2