Added some more docstrings, and also a few little tweaks along the way.

[wxWidgets.git] / wxPython / src / msw / windows.py

diff --git a/wxPython/src/msw/windows.py b/wxPython/src/msw/windows.py
index 036fe83f95765d3a76bebe0c5b61b573a1491945..0f00827fe1e338d137b99dc8d2687279920cf4c3 100644 (file)
--- a/wxPython/src/msw/windows.py
+++ b/wxPython/src/msw/windows.py
@@ -8,13 +8,14 @@ wx = core
 #---------------------------------------------------------------------------
 
 class Panel(core.Window):
 #---------------------------------------------------------------------------
 
 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):
     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"""
+        """
+        __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
+            String name=PanelNameStr) -> Panel
+        """

         newobj = _windows.new_Panel(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_Panel(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -22,9 +23,11 @@ class Panel(core.Window):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setOORInfo(self)
 
     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"""
+        """
+        Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
+            String name=PanelNameStr) -> bool
+        """

         return _windows.Panel_Create(*args, **kwargs)
 
     def InitDialog(*args, **kwargs):
         return _windows.Panel_Create(*args, **kwargs)
 
     def InitDialog(*args, **kwargs):


@@ -48,13 +51,14 @@ def PrePanel(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class ScrolledWindow(Panel):
 #---------------------------------------------------------------------------
 
 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):
     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"""
+        """
+        __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
+            String name=PanelNameStr) -> ScrolledWindow
+        """

         newobj = _windows.new_ScrolledWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_ScrolledWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -62,14 +66,18 @@ class ScrolledWindow(Panel):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):

-        """Create(Window parent, int id=-1, Point pos=DefaultPosition, 
-    Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
-    wxString name=PanelNameStr) -> bool"""
+        """
+        Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
+            String name=PanelNameStr) -> bool
+        """

         return _windows.ScrolledWindow_Create(*args, **kwargs)
 
     def SetScrollbars(*args, **kwargs):
         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)"""
+        """
+        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):
         return _windows.ScrolledWindow_SetScrollbars(*args, **kwargs)
 
     def Scroll(*args, **kwargs):


@@ -89,10 +97,10 @@ class ScrolledWindow(Panel):
         return _windows.ScrolledWindow_SetScrollRate(*args, **kwargs)
 
     def GetScrollPixelsPerUnit(*args, **kwargs):
         return _windows.ScrolledWindow_SetScrollRate(*args, **kwargs)
 
     def GetScrollPixelsPerUnit(*args, **kwargs):

-        """GetScrollPixelsPerUnit() -> (xUnit, yUnit)
-
+        """
+        GetScrollPixelsPerUnit() -> (xUnit, yUnit)

 
 

-        get the size of one logical unit in physical ones
+        Get the size of one logical unit in physical units.

         """
         return _windows.ScrolledWindow_GetScrollPixelsPerUnit(*args, **kwargs)
 
         """
         return _windows.ScrolledWindow_GetScrollPixelsPerUnit(*args, **kwargs)
 


@@ -101,7 +109,11 @@ class ScrolledWindow(Panel):
         return _windows.ScrolledWindow_EnableScrolling(*args, **kwargs)
 
     def GetViewStart(*args, **kwargs):
         return _windows.ScrolledWindow_EnableScrolling(*args, **kwargs)
 
     def GetViewStart(*args, **kwargs):

-        """GetViewStart(int OUTPUT, int OUTPUT)"""
+        """
+        GetViewStart() -> (x,y)
+
+        Get the view start
+        """

         return _windows.ScrolledWindow_GetViewStart(*args, **kwargs)
 
     def SetScale(*args, **kwargs):
         return _windows.ScrolledWindow_GetViewStart(*args, **kwargs)
 
     def SetScale(*args, **kwargs):


@@ -117,13 +129,21 @@ class ScrolledWindow(Panel):
         return _windows.ScrolledWindow_GetScaleY(*args, **kwargs)
 
     def CalcScrolledPosition(*args):
         return _windows.ScrolledWindow_GetScaleY(*args, **kwargs)
 
     def CalcScrolledPosition(*args):

-        """CalcScrolledPosition(int x, int y, int OUTPUT, int OUTPUT)
-CalcScrolledPosition(Point pt) -> Point"""
+        """
+        CalcScrolledPosition(Point pt) -> Point
+        CalcScrolledPosition(int x, int y) -> (sx, sy)
+
+        Translate between scrolled and unscrolled coordinates.
+        """

         return _windows.ScrolledWindow_CalcScrolledPosition(*args)
 
     def CalcUnscrolledPosition(*args):
         return _windows.ScrolledWindow_CalcScrolledPosition(*args)
 
     def CalcUnscrolledPosition(*args):

-        """CalcUnscrolledPosition(int x, int y, int OUTPUT, int OUTPUT)
-CalcUnscrolledPosition(Point pt) -> Point"""
+        """
+        CalcUnscrolledPosition(Point pt) -> Point
+        CalcUnscrolledPosition(int x, int y) -> (ux, uy)
+
+        Translate between scrolled and unscrolled coordinates.
+        """

         return _windows.ScrolledWindow_CalcUnscrolledPosition(*args)
 
     def AdjustScrollbars(*args, **kwargs):
         return _windows.ScrolledWindow_CalcUnscrolledPosition(*args)
 
     def AdjustScrollbars(*args, **kwargs):


@@ -166,88 +186,6 @@ 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):
-        """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):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = 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):
-        """Ok() -> bool"""
-        return _windows.AcceleratorTable_Ok(*args, **kwargs)
-
-
-class AcceleratorTablePtr(AcceleratorTable):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = AcceleratorTable
-_windows.AcceleratorTable_swigregister(AcceleratorTablePtr)
-
-
-def GetAccelFromString(*args, **kwargs):
-    """GetAccelFromString(wxString label) -> AcceleratorEntry"""
-    return _windows.GetAccelFromString(*args, **kwargs)
-#---------------------------------------------------------------------------
-

 FULLSCREEN_NOMENUBAR = _windows.FULLSCREEN_NOMENUBAR
 FULLSCREEN_NOTOOLBAR = _windows.FULLSCREEN_NOTOOLBAR
 FULLSCREEN_NOSTATUSBAR = _windows.FULLSCREEN_NOSTATUSBAR
 FULLSCREEN_NOMENUBAR = _windows.FULLSCREEN_NOMENUBAR
 FULLSCREEN_NOTOOLBAR = _windows.FULLSCREEN_NOTOOLBAR
 FULLSCREEN_NOSTATUSBAR = _windows.FULLSCREEN_NOSTATUSBAR


@@ -256,7 +194,6 @@ FULLSCREEN_NOCAPTION = _windows.FULLSCREEN_NOCAPTION
 FULLSCREEN_ALL = _windows.FULLSCREEN_ALL
 TOPLEVEL_EX_DIALOG = _windows.TOPLEVEL_EX_DIALOG
 class TopLevelWindow(core.Window):
 FULLSCREEN_ALL = _windows.FULLSCREEN_ALL
 TOPLEVEL_EX_DIALOG = _windows.TOPLEVEL_EX_DIALOG
 class TopLevelWindow(core.Window):

-    """"""

     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 __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,)


@@ -281,11 +218,11 @@ class TopLevelWindow(core.Window):
         return _windows.TopLevelWindow_IsIconized(*args, **kwargs)
 
     def GetIcon(*args, **kwargs):
         return _windows.TopLevelWindow_IsIconized(*args, **kwargs)
 
     def GetIcon(*args, **kwargs):

-        """GetIcon() -> wxIcon"""
+        """GetIcon() -> Icon"""

         return _windows.TopLevelWindow_GetIcon(*args, **kwargs)
 
     def SetIcon(*args, **kwargs):
         return _windows.TopLevelWindow_GetIcon(*args, **kwargs)
 
     def SetIcon(*args, **kwargs):

-        """SetIcon(wxIcon icon)"""
+        """SetIcon(Icon icon)"""

         return _windows.TopLevelWindow_SetIcon(*args, **kwargs)
 
     def SetIcons(*args, **kwargs):
         return _windows.TopLevelWindow_SetIcon(*args, **kwargs)
 
     def SetIcons(*args, **kwargs):


@@ -301,15 +238,15 @@ class TopLevelWindow(core.Window):
         return _windows.TopLevelWindow_IsFullScreen(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):
         return _windows.TopLevelWindow_IsFullScreen(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):

-        """SetTitle(wxString title)"""
+        """SetTitle(String title)"""

         return _windows.TopLevelWindow_SetTitle(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):
         return _windows.TopLevelWindow_SetTitle(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):

-        """GetTitle() -> wxString"""
+        """GetTitle() -> String"""

         return _windows.TopLevelWindow_GetTitle(*args, **kwargs)
 
     def SetShape(*args, **kwargs):
         return _windows.TopLevelWindow_GetTitle(*args, **kwargs)
 
     def SetShape(*args, **kwargs):

-        """SetShape(wxRegion region) -> bool"""
+        """SetShape(Region region) -> bool"""

         return _windows.TopLevelWindow_SetShape(*args, **kwargs)
 
 
         return _windows.TopLevelWindow_SetShape(*args, **kwargs)
 
 


@@ -320,18 +257,22 @@ class TopLevelWindowPtr(TopLevelWindow):
         self.__class__ = TopLevelWindow
 _windows.TopLevelWindow_swigregister(TopLevelWindowPtr)
 cvar = _windows.cvar
         self.__class__ = TopLevelWindow
 _windows.TopLevelWindow_swigregister(TopLevelWindowPtr)
 cvar = _windows.cvar

-NullAcceleratorTable = cvar.NullAcceleratorTable
+FrameNameStr = cvar.FrameNameStr
+DialogNameStr = cvar.DialogNameStr
+StatusLineNameStr = cvar.StatusLineNameStr
+ToolBarNameStr = cvar.ToolBarNameStr

 
 #---------------------------------------------------------------------------
 
 class Frame(TopLevelWindow):
 
 #---------------------------------------------------------------------------
 
 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):
     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"""
+        """
+        __init__(Window parent, int id, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
+            String name=FrameNameStr) -> Frame
+        """

         newobj = _windows.new_Frame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_Frame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -339,9 +280,11 @@ class Frame(TopLevelWindow):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setOORInfo(self)
 
     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"""
+        """
+        Create(Window parent, int id, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
+            String name=FrameNameStr) -> bool
+        """

         return _windows.Frame_Create(*args, **kwargs)
 
     def GetClientAreaOrigin(*args, **kwargs):
         return _windows.Frame_Create(*args, **kwargs)
 
     def GetClientAreaOrigin(*args, **kwargs):


@@ -366,8 +309,10 @@ class Frame(TopLevelWindow):
 
     Command = ProcessCommand 
     def CreateStatusBar(*args, **kwargs):
 
     Command = ProcessCommand 
     def CreateStatusBar(*args, **kwargs):

-        """CreateStatusBar(int number=1, long style=ST_SIZEGRIP, int winid=0, 
-    wxString name=wxPyStatusLineNameStr) -> StatusBar"""
+        """
+        CreateStatusBar(int number=1, long style=ST_SIZEGRIP, int winid=0, 
+            String name=StatusLineNameStr) -> StatusBar
+        """

         return _windows.Frame_CreateStatusBar(*args, **kwargs)
 
     def GetStatusBar(*args, **kwargs):
         return _windows.Frame_CreateStatusBar(*args, **kwargs)
 
     def GetStatusBar(*args, **kwargs):


@@ -379,7 +324,7 @@ class Frame(TopLevelWindow):
         return _windows.Frame_SetStatusBar(*args, **kwargs)
 
     def SetStatusText(*args, **kwargs):
         return _windows.Frame_SetStatusBar(*args, **kwargs)
 
     def SetStatusText(*args, **kwargs):

-        """SetStatusText(wxString text, int number=0)"""
+        """SetStatusText(String text, int number=0)"""

         return _windows.Frame_SetStatusText(*args, **kwargs)
 
     def SetStatusWidths(*args, **kwargs):
         return _windows.Frame_SetStatusText(*args, **kwargs)
 
     def SetStatusWidths(*args, **kwargs):


@@ -387,7 +332,7 @@ class Frame(TopLevelWindow):
         return _windows.Frame_SetStatusWidths(*args, **kwargs)
 
     def PushStatusText(*args, **kwargs):
         return _windows.Frame_SetStatusWidths(*args, **kwargs)
 
     def PushStatusText(*args, **kwargs):

-        """PushStatusText(wxString text, int number=0)"""
+        """PushStatusText(String text, int number=0)"""

         return _windows.Frame_PushStatusText(*args, **kwargs)
 
     def PopStatusText(*args, **kwargs):
         return _windows.Frame_PushStatusText(*args, **kwargs)
 
     def PopStatusText(*args, **kwargs):


@@ -403,7 +348,7 @@ class Frame(TopLevelWindow):
         return _windows.Frame_GetStatusBarPane(*args, **kwargs)
 
     def CreateToolBar(*args, **kwargs):
         return _windows.Frame_GetStatusBarPane(*args, **kwargs)
 
     def CreateToolBar(*args, **kwargs):

-        """CreateToolBar(long style=-1, int winid=-1, wxString name=wxPyToolBarNameStr) -> wxToolBar"""
+        """CreateToolBar(long style=-1, int winid=-1, String name=ToolBarNameStr) -> wxToolBar"""

         return _windows.Frame_CreateToolBar(*args, **kwargs)
 
     def GetToolBar(*args, **kwargs):
         return _windows.Frame_CreateToolBar(*args, **kwargs)
 
     def GetToolBar(*args, **kwargs):


@@ -415,7 +360,7 @@ class Frame(TopLevelWindow):
         return _windows.Frame_SetToolBar(*args, **kwargs)
 
     def DoGiveHelp(*args, **kwargs):
         return _windows.Frame_SetToolBar(*args, **kwargs)
 
     def DoGiveHelp(*args, **kwargs):

-        """DoGiveHelp(wxString text, bool show)"""
+        """DoGiveHelp(String text, bool show)"""

         return _windows.Frame_DoGiveHelp(*args, **kwargs)
 
     def DoMenuUpdates(*args, **kwargs):
         return _windows.Frame_DoGiveHelp(*args, **kwargs)
 
     def DoMenuUpdates(*args, **kwargs):


@@ -439,13 +384,14 @@ def PreFrame(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class Dialog(TopLevelWindow):
 #---------------------------------------------------------------------------
 
 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):
     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"""
+        """
+        __init__(Window parent, int id, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=DEFAULT_DIALOG_STYLE, 
+            String name=DialogNameStr) -> Dialog
+        """

         newobj = _windows.new_Dialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_Dialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -453,9 +399,11 @@ class Dialog(TopLevelWindow):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setOORInfo(self)
 
     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"""
+        """
+        Create(Window parent, int id, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=DEFAULT_DIALOG_STYLE, 
+            String name=DialogNameStr) -> bool
+        """

         return _windows.Dialog_Create(*args, **kwargs)
 
     def SetReturnCode(*args, **kwargs):
         return _windows.Dialog_Create(*args, **kwargs)
 
     def SetReturnCode(*args, **kwargs):


@@ -467,17 +415,13 @@ class Dialog(TopLevelWindow):
         return _windows.Dialog_GetReturnCode(*args, **kwargs)
 
     def CreateTextSizer(*args, **kwargs):
         return _windows.Dialog_GetReturnCode(*args, **kwargs)
 
     def CreateTextSizer(*args, **kwargs):

-        """CreateTextSizer(wxString message) -> Sizer"""
+        """CreateTextSizer(String message) -> Sizer"""

         return _windows.Dialog_CreateTextSizer(*args, **kwargs)
 
     def CreateButtonSizer(*args, **kwargs):
         """CreateButtonSizer(long flags) -> Sizer"""
         return _windows.Dialog_CreateButtonSizer(*args, **kwargs)
 
         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 IsModal(*args, **kwargs):
         """IsModal() -> bool"""
         return _windows.Dialog_IsModal(*args, **kwargs)


@@ -511,13 +455,14 @@ def PreDialog(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class MiniFrame(Frame):
 #---------------------------------------------------------------------------
 
 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):
     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"""
+        """
+        __init__(Window parent, int id, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
+            String name=FrameNameStr) -> MiniFrame
+        """

         newobj = _windows.new_MiniFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_MiniFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -525,9 +470,11 @@ class MiniFrame(Frame):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setOORInfo(self)
 
     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"""
+        """
+        Create(Window parent, int id, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
+            String name=FrameNameStr) -> bool
+        """

         return _windows.MiniFrame_Create(*args, **kwargs)
 
 
         return _windows.MiniFrame_Create(*args, **kwargs)
 
 


@@ -552,12 +499,13 @@ SPLASH_NO_CENTRE = _windows.SPLASH_NO_CENTRE
 SPLASH_TIMEOUT = _windows.SPLASH_TIMEOUT
 SPLASH_NO_TIMEOUT = _windows.SPLASH_NO_TIMEOUT
 class SplashScreenWindow(core.Window):
 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):
     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"""
+        """
+        __init__(Bitmap 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
         newobj = _windows.new_SplashScreenWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -565,11 +513,11 @@ class SplashScreenWindow(core.Window):
         self._setOORInfo(self)
 
     def SetBitmap(*args, **kwargs):
         self._setOORInfo(self)
 
     def SetBitmap(*args, **kwargs):

-        """SetBitmap(wxBitmap bitmap)"""
+        """SetBitmap(Bitmap bitmap)"""

         return _windows.SplashScreenWindow_SetBitmap(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):
         return _windows.SplashScreenWindow_SetBitmap(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):

-        """GetBitmap() -> wxBitmap"""
+        """GetBitmap() -> Bitmap"""

         return _windows.SplashScreenWindow_GetBitmap(*args, **kwargs)
 
 
         return _windows.SplashScreenWindow_GetBitmap(*args, **kwargs)
 
 


@@ -581,13 +529,14 @@ class SplashScreenWindowPtr(SplashScreenWindow):
 _windows.SplashScreenWindow_swigregister(SplashScreenWindowPtr)
 
 class SplashScreen(Frame):
 _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):
     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"""
+        """
+        __init__(Bitmap 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
         newobj = _windows.new_SplashScreen(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -617,11 +566,10 @@ _windows.SplashScreen_swigregister(SplashScreenPtr)
 #---------------------------------------------------------------------------
 
 class StatusBar(core.Window):
 #---------------------------------------------------------------------------
 
 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):
     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"""
+        """__init__(Window parent, int id=-1, long style=ST_SIZEGRIP, String name=StatusLineNameStr) -> StatusBar"""

         newobj = _windows.new_StatusBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_StatusBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -629,7 +577,7 @@ class StatusBar(core.Window):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):

-        """Create(Window parent, int id, long style=ST_SIZEGRIP, wxString name=wxPyStatusLineNameStr) -> bool"""
+        """Create(Window parent, int id, long style=ST_SIZEGRIP, String name=StatusLineNameStr) -> bool"""

         return _windows.StatusBar_Create(*args, **kwargs)
 
     def SetFieldsCount(*args, **kwargs):
         return _windows.StatusBar_Create(*args, **kwargs)
 
     def SetFieldsCount(*args, **kwargs):


@@ -641,15 +589,15 @@ class StatusBar(core.Window):
         return _windows.StatusBar_GetFieldsCount(*args, **kwargs)
 
     def SetStatusText(*args, **kwargs):
         return _windows.StatusBar_GetFieldsCount(*args, **kwargs)
 
     def SetStatusText(*args, **kwargs):

-        """SetStatusText(wxString text, int number=0)"""
+        """SetStatusText(String text, int number=0)"""

         return _windows.StatusBar_SetStatusText(*args, **kwargs)
 
     def GetStatusText(*args, **kwargs):
         return _windows.StatusBar_SetStatusText(*args, **kwargs)
 
     def GetStatusText(*args, **kwargs):

-        """GetStatusText(int number=0) -> wxString"""
+        """GetStatusText(int number=0) -> String"""

         return _windows.StatusBar_GetStatusText(*args, **kwargs)
 
     def PushStatusText(*args, **kwargs):
         return _windows.StatusBar_GetStatusText(*args, **kwargs)
 
     def PushStatusText(*args, **kwargs):

-        """PushStatusText(wxString text, int number=0)"""
+        """PushStatusText(String text, int number=0)"""

         return _windows.StatusBar_PushStatusText(*args, **kwargs)
 
     def PopStatusText(*args, **kwargs):
         return _windows.StatusBar_PushStatusText(*args, **kwargs)
 
     def PopStatusText(*args, **kwargs):


@@ -661,7 +609,7 @@ class StatusBar(core.Window):
         return _windows.StatusBar_SetStatusWidths(*args, **kwargs)
 
     def GetFieldRect(*args, **kwargs):
         return _windows.StatusBar_SetStatusWidths(*args, **kwargs)
 
     def GetFieldRect(*args, **kwargs):

-        """GetFieldRect(int i, Rect rect) -> bool"""
+        """GetFieldRect(int i) -> Rect"""

         return _windows.StatusBar_GetFieldRect(*args, **kwargs)
 
     def SetMinHeight(*args, **kwargs):
         return _windows.StatusBar_GetFieldRect(*args, **kwargs)
 
     def SetMinHeight(*args, **kwargs):


@@ -706,12 +654,14 @@ 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):
 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):
     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"""
+        """
+        __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=SP_3D, String name=SplitterNameStr) -> SplitterWindow
+        """
+        if kwargs.has_key('point'): kwargs['pos'] = kwargs['point']

         newobj = _windows.new_SplitterWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_SplitterWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -719,8 +669,10 @@ class SplitterWindow(core.Window):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):

-        """Create(Window parent, int id, Point point=DefaultPosition, 
-    Size size=DefaultSize, long style=SP_3D, wxString name=wxPySplitterNameStr) -> bool"""
+        """
+        Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=SP_3D, String name=SplitterNameStr) -> bool
+        """

         return _windows.SplitterWindow_Create(*args, **kwargs)
 
     def GetWindow1(*args, **kwargs):
         return _windows.SplitterWindow_Create(*args, **kwargs)
 
     def GetWindow1(*args, **kwargs):


@@ -736,7 +688,7 @@ class SplitterWindow(core.Window):
         return _windows.SplitterWindow_SetSplitMode(*args, **kwargs)
 
     def GetSplitMode(*args, **kwargs):
         return _windows.SplitterWindow_SetSplitMode(*args, **kwargs)
 
     def GetSplitMode(*args, **kwargs):

-        """GetSplitMode() -> wxSplitMode"""
+        """GetSplitMode() -> int"""

         return _windows.SplitterWindow_GetSplitMode(*args, **kwargs)
 
     def Initialize(*args, **kwargs):
         return _windows.SplitterWindow_GetSplitMode(*args, **kwargs)
 
     def Initialize(*args, **kwargs):


@@ -818,6 +770,7 @@ class SplitterWindowPtr(SplitterWindow):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = SplitterWindow
 _windows.SplitterWindow_swigregister(SplitterWindowPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = SplitterWindow
 _windows.SplitterWindow_swigregister(SplitterWindowPtr)

+SplitterNameStr = cvar.SplitterNameStr

 
 def PreSplitterWindow(*args, **kwargs):
     """PreSplitterWindow() -> SplitterWindow"""
 
 def PreSplitterWindow(*args, **kwargs):
     """PreSplitterWindow() -> SplitterWindow"""


@@ -826,7 +779,6 @@ def PreSplitterWindow(*args, **kwargs):
     return val
 
 class SplitterEvent(core.NotifyEvent):
     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):
     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):


@@ -888,13 +840,14 @@ SASH_BOTTOM = _windows.SASH_BOTTOM
 SASH_LEFT = _windows.SASH_LEFT
 SASH_NONE = _windows.SASH_NONE
 class SashWindow(core.Window):
 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):
     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"""
+        """
+        __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxCLIP_CHILDREN|wxSW_3D, 
+            String name=SashNameStr) -> SashWindow
+        """

         newobj = _windows.new_SashWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_SashWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -902,29 +855,31 @@ class SashWindow(core.Window):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setOORInfo(self)
 
     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"""
+        """
+        Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxCLIP_CHILDREN|wxSW_3D, 
+            String name=SashNameStr) -> bool
+        """

         return _windows.SashWindow_Create(*args, **kwargs)
 
     def SetSashVisible(*args, **kwargs):
         return _windows.SashWindow_Create(*args, **kwargs)
 
     def SetSashVisible(*args, **kwargs):

-        """SetSashVisible(wxSashEdgePosition edge, bool sash)"""
+        """SetSashVisible(int edge, bool sash)"""

         return _windows.SashWindow_SetSashVisible(*args, **kwargs)
 
     def GetSashVisible(*args, **kwargs):
         return _windows.SashWindow_SetSashVisible(*args, **kwargs)
 
     def GetSashVisible(*args, **kwargs):

-        """GetSashVisible(wxSashEdgePosition edge) -> bool"""
+        """GetSashVisible(int edge) -> bool"""

         return _windows.SashWindow_GetSashVisible(*args, **kwargs)
 
     def SetSashBorder(*args, **kwargs):
         return _windows.SashWindow_GetSashVisible(*args, **kwargs)
 
     def SetSashBorder(*args, **kwargs):

-        """SetSashBorder(wxSashEdgePosition edge, bool border)"""
+        """SetSashBorder(int edge, bool border)"""

         return _windows.SashWindow_SetSashBorder(*args, **kwargs)
 
     def HasBorder(*args, **kwargs):
         return _windows.SashWindow_SetSashBorder(*args, **kwargs)
 
     def HasBorder(*args, **kwargs):

-        """HasBorder(wxSashEdgePosition edge) -> bool"""
+        """HasBorder(int edge) -> bool"""

         return _windows.SashWindow_HasBorder(*args, **kwargs)
 
     def GetEdgeMargin(*args, **kwargs):
         return _windows.SashWindow_HasBorder(*args, **kwargs)
 
     def GetEdgeMargin(*args, **kwargs):

-        """GetEdgeMargin(wxSashEdgePosition edge) -> int"""
+        """GetEdgeMargin(int edge) -> int"""

         return _windows.SashWindow_GetEdgeMargin(*args, **kwargs)
 
     def SetDefaultBorderSize(*args, **kwargs):
         return _windows.SashWindow_GetEdgeMargin(*args, **kwargs)
 
     def SetDefaultBorderSize(*args, **kwargs):


@@ -976,7 +931,7 @@ class SashWindow(core.Window):
         return _windows.SashWindow_GetMaximumSizeY(*args, **kwargs)
 
     def SashHitTest(*args, **kwargs):
         return _windows.SashWindow_GetMaximumSizeY(*args, **kwargs)
 
     def SashHitTest(*args, **kwargs):

-        """SashHitTest(int x, int y, int tolerance=2) -> wxSashEdgePosition"""
+        """SashHitTest(int x, int y, int tolerance=2) -> int"""

         return _windows.SashWindow_SashHitTest(*args, **kwargs)
 
     def SizeWindows(*args, **kwargs):
         return _windows.SashWindow_SashHitTest(*args, **kwargs)
 
     def SizeWindows(*args, **kwargs):


@@ -990,6 +945,8 @@ class SashWindowPtr(SashWindow):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = SashWindow
 _windows.SashWindow_swigregister(SashWindowPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = SashWindow
 _windows.SashWindow_swigregister(SashWindowPtr)

+SashNameStr = cvar.SashNameStr
+SashLayoutNameStr = cvar.SashLayoutNameStr

 
 def PreSashWindow(*args, **kwargs):
     """PreSashWindow() -> SashWindow"""
 
 def PreSashWindow(*args, **kwargs):
     """PreSashWindow() -> SashWindow"""


@@ -1000,21 +957,20 @@ 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):
 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):
     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"""
+        """__init__(int id=0, int edge=SASH_NONE) -> SashEvent"""

         newobj = _windows.new_SashEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def SetEdge(*args, **kwargs):
         newobj = _windows.new_SashEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def SetEdge(*args, **kwargs):

-        """SetEdge(wxSashEdgePosition edge)"""
+        """SetEdge(int edge)"""

         return _windows.SashEvent_SetEdge(*args, **kwargs)
 
     def GetEdge(*args, **kwargs):
         return _windows.SashEvent_SetEdge(*args, **kwargs)
 
     def GetEdge(*args, **kwargs):

-        """GetEdge() -> wxSashEdgePosition"""
+        """GetEdge() -> int"""

         return _windows.SashEvent_GetEdge(*args, **kwargs)
 
     def SetDragRect(*args, **kwargs):
         return _windows.SashEvent_GetEdge(*args, **kwargs)
 
     def SetDragRect(*args, **kwargs):


@@ -1026,11 +982,11 @@ class SashEvent(core.CommandEvent):
         return _windows.SashEvent_GetDragRect(*args, **kwargs)
 
     def SetDragStatus(*args, **kwargs):
         return _windows.SashEvent_GetDragRect(*args, **kwargs)
 
     def SetDragStatus(*args, **kwargs):

-        """SetDragStatus(wxSashDragStatus status)"""
+        """SetDragStatus(int status)"""

         return _windows.SashEvent_SetDragStatus(*args, **kwargs)
 
     def GetDragStatus(*args, **kwargs):
         return _windows.SashEvent_SetDragStatus(*args, **kwargs)
 
     def GetDragStatus(*args, **kwargs):

-        """GetDragStatus() -> wxSashDragStatus"""
+        """GetDragStatus() -> int"""

         return _windows.SashEvent_GetDragStatus(*args, **kwargs)
 
 
         return _windows.SashEvent_GetDragStatus(*args, **kwargs)
 
 


@@ -1061,7 +1017,6 @@ 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):
 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):
     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):


@@ -1095,19 +1050,19 @@ class QueryLayoutInfoEvent(core.Event):
         return _windows.QueryLayoutInfoEvent_GetSize(*args, **kwargs)
 
     def SetOrientation(*args, **kwargs):
         return _windows.QueryLayoutInfoEvent_GetSize(*args, **kwargs)
 
     def SetOrientation(*args, **kwargs):

-        """SetOrientation(wxLayoutOrientation orient)"""
+        """SetOrientation(int orient)"""

         return _windows.QueryLayoutInfoEvent_SetOrientation(*args, **kwargs)
 
     def GetOrientation(*args, **kwargs):
         return _windows.QueryLayoutInfoEvent_SetOrientation(*args, **kwargs)
 
     def GetOrientation(*args, **kwargs):

-        """GetOrientation() -> wxLayoutOrientation"""
+        """GetOrientation() -> int"""

         return _windows.QueryLayoutInfoEvent_GetOrientation(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):
         return _windows.QueryLayoutInfoEvent_GetOrientation(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):

-        """SetAlignment(wxLayoutAlignment align)"""
+        """SetAlignment(int align)"""

         return _windows.QueryLayoutInfoEvent_SetAlignment(*args, **kwargs)
 
     def GetAlignment(*args, **kwargs):
         return _windows.QueryLayoutInfoEvent_SetAlignment(*args, **kwargs)
 
     def GetAlignment(*args, **kwargs):

-        """GetAlignment() -> wxLayoutAlignment"""
+        """GetAlignment() -> int"""

         return _windows.QueryLayoutInfoEvent_GetAlignment(*args, **kwargs)
 
 
         return _windows.QueryLayoutInfoEvent_GetAlignment(*args, **kwargs)
 
 


@@ -1119,7 +1074,6 @@ class QueryLayoutInfoEventPtr(QueryLayoutInfoEvent):
 _windows.QueryLayoutInfoEvent_swigregister(QueryLayoutInfoEventPtr)
 
 class CalculateLayoutEvent(core.Event):
 _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):
     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):


@@ -1156,13 +1110,14 @@ EVT_QUERY_LAYOUT_INFO = wx.PyEventBinder( wxEVT_QUERY_LAYOUT_INFO )
 EVT_CALCULATE_LAYOUT = wx.PyEventBinder( wxEVT_CALCULATE_LAYOUT )
 
 class SashLayoutWindow(SashWindow):
 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):
     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"""
+        """
+        __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxCLIP_CHILDREN|wxSW_3D, 
+            String name=SashLayoutNameStr) -> SashLayoutWindow
+        """

         newobj = _windows.new_SashLayoutWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_SashLayoutWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1170,21 +1125,23 @@ class SashLayoutWindow(SashWindow):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setOORInfo(self)
 
     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"""
+        """
+        Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxCLIP_CHILDREN|wxSW_3D, 
+            String name=SashLayoutNameStr) -> bool
+        """

         return _windows.SashLayoutWindow_Create(*args, **kwargs)
 
     def GetAlignment(*args, **kwargs):
         return _windows.SashLayoutWindow_Create(*args, **kwargs)
 
     def GetAlignment(*args, **kwargs):

-        """GetAlignment() -> wxLayoutAlignment"""
+        """GetAlignment() -> int"""

         return _windows.SashLayoutWindow_GetAlignment(*args, **kwargs)
 
     def GetOrientation(*args, **kwargs):
         return _windows.SashLayoutWindow_GetAlignment(*args, **kwargs)
 
     def GetOrientation(*args, **kwargs):

-        """GetOrientation() -> wxLayoutOrientation"""
+        """GetOrientation() -> int"""

         return _windows.SashLayoutWindow_GetOrientation(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):
         return _windows.SashLayoutWindow_GetOrientation(*args, **kwargs)
 
     def SetAlignment(*args, **kwargs):

-        """SetAlignment(wxLayoutAlignment alignment)"""
+        """SetAlignment(int alignment)"""

         return _windows.SashLayoutWindow_SetAlignment(*args, **kwargs)
 
     def SetDefaultSize(*args, **kwargs):
         return _windows.SashLayoutWindow_SetAlignment(*args, **kwargs)
 
     def SetDefaultSize(*args, **kwargs):


@@ -1192,7 +1149,7 @@ class SashLayoutWindow(SashWindow):
         return _windows.SashLayoutWindow_SetDefaultSize(*args, **kwargs)
 
     def SetOrientation(*args, **kwargs):
         return _windows.SashLayoutWindow_SetDefaultSize(*args, **kwargs)
 
     def SetOrientation(*args, **kwargs):

-        """SetOrientation(wxLayoutOrientation orientation)"""
+        """SetOrientation(int orientation)"""

         return _windows.SashLayoutWindow_SetOrientation(*args, **kwargs)
 
 
         return _windows.SashLayoutWindow_SetOrientation(*args, **kwargs)
 
 


@@ -1210,7 +1167,6 @@ def PreSashLayoutWindow(*args, **kwargs):
     return val
 
 class LayoutAlgorithm(core.Object):
     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):
     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):


@@ -1248,7 +1204,6 @@ _windows.LayoutAlgorithm_swigregister(LayoutAlgorithmPtr)
 #---------------------------------------------------------------------------
 
 class PopupWindow(core.Window):
 #---------------------------------------------------------------------------
 
 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):
     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):


@@ -1284,7 +1239,6 @@ def PrePopupWindow(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class PopupTransientWindow(PopupWindow):
 #---------------------------------------------------------------------------
 
 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):
     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):


@@ -1324,11 +1278,10 @@ def PrePopupTransientWindow(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class TipWindow(PopupTransientWindow):
 #---------------------------------------------------------------------------
 
 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):
     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"""
+        """__init__(Window parent, String text, int maxLength=100, Rect rectBound=None) -> TipWindow"""

         newobj = _windows.new_TipWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_TipWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1354,12 +1307,13 @@ _windows.TipWindow_swigregister(TipWindowPtr)
 #---------------------------------------------------------------------------
 
 class VScrolledWindow(Panel):
 #---------------------------------------------------------------------------
 
 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):
     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"""
+        """
+        __init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> VScrolledWindow
+        """

         newobj = _windows.new_VScrolledWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_VScrolledWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1371,8 +1325,10 @@ class VScrolledWindow(Panel):
         return _windows.VScrolledWindow__setCallbackInfo(*args, **kwargs)
 
     def Create(*args, **kwargs):
         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"""
+        """
+        Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> bool
+        """

         return _windows.VScrolledWindow_Create(*args, **kwargs)
 
     def SetLineCount(*args, **kwargs):
         return _windows.VScrolledWindow_Create(*args, **kwargs)
 
     def SetLineCount(*args, **kwargs):


@@ -1442,12 +1398,13 @@ def PreVScrolledWindow(*args, **kwargs):
     return val
 
 class VListBox(VScrolledWindow):
     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):
     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"""
+        """
+        __init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -> VListBox
+        """

         newobj = _windows.new_VListBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_VListBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1459,8 +1416,10 @@ class VListBox(VScrolledWindow):
         return _windows.VListBox__setCallbackInfo(*args, **kwargs)
 
     def Create(*args, **kwargs):
         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"""
+        """
+        Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -> bool
+        """

         return _windows.VListBox_Create(*args, **kwargs)
 
     def GetItemCount(*args, **kwargs):
         return _windows.VListBox_Create(*args, **kwargs)
 
     def GetItemCount(*args, **kwargs):


@@ -1500,7 +1459,7 @@ class VListBox(VScrolledWindow):
         return _windows.VListBox_GetMargins(*args, **kwargs)
 
     def GetSelectionBackground(*args, **kwargs):
         return _windows.VListBox_GetMargins(*args, **kwargs)
 
     def GetSelectionBackground(*args, **kwargs):

-        """GetSelectionBackground() -> wxColour"""
+        """GetSelectionBackground() -> Colour"""

         return _windows.VListBox_GetSelectionBackground(*args, **kwargs)
 
     def SetItemCount(*args, **kwargs):
         return _windows.VListBox_GetSelectionBackground(*args, **kwargs)
 
     def SetItemCount(*args, **kwargs):


@@ -1544,7 +1503,7 @@ class VListBox(VScrolledWindow):
         return _windows.VListBox_SetMarginsXY(*args, **kwargs)
 
     def SetSelectionBackground(*args, **kwargs):
         return _windows.VListBox_SetMarginsXY(*args, **kwargs)
 
     def SetSelectionBackground(*args, **kwargs):

-        """SetSelectionBackground(wxColour col)"""
+        """SetSelectionBackground(Colour col)"""

         return _windows.VListBox_SetSelectionBackground(*args, **kwargs)
 
 
         return _windows.VListBox_SetSelectionBackground(*args, **kwargs)
 
 


@@ -1554,6 +1513,7 @@ class VListBoxPtr(VListBox):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = VListBox
 _windows.VListBox_swigregister(VListBoxPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = VListBox
 _windows.VListBox_swigregister(VListBoxPtr)

+VListBoxNameStr = cvar.VListBoxNameStr

 
 def PreVListBox(*args, **kwargs):
     """PreVListBox() -> VListBox"""
 
 def PreVListBox(*args, **kwargs):
     """PreVListBox() -> VListBox"""


@@ -1562,12 +1522,13 @@ def PreVListBox(*args, **kwargs):
     return val
 
 class HtmlListBox(VListBox):
     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):
     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"""
+        """
+        __init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -> HtmlListBox
+        """

         newobj = _windows.new_HtmlListBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_HtmlListBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1579,8 +1540,10 @@ class HtmlListBox(VListBox):
         return _windows.HtmlListBox__setCallbackInfo(*args, **kwargs)
 
     def Create(*args, **kwargs):
         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"""
+        """
+        Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -> bool
+        """

         return _windows.HtmlListBox_Create(*args, **kwargs)
 
     def RefreshAll(*args, **kwargs):
         return _windows.HtmlListBox_Create(*args, **kwargs)
 
     def RefreshAll(*args, **kwargs):


@@ -1608,7 +1571,6 @@ def PreHtmlListBox(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class TaskBarIcon(core.EvtHandler):
 #---------------------------------------------------------------------------
 
 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):
     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):


@@ -1632,11 +1594,11 @@ class TaskBarIcon(core.EvtHandler):
         return _windows.TaskBarIcon_IsIconInstalled(*args, **kwargs)
 
     def SetIcon(*args, **kwargs):
         return _windows.TaskBarIcon_IsIconInstalled(*args, **kwargs)
 
     def SetIcon(*args, **kwargs):

-        """SetIcon(wxIcon icon, wxString tooltip=wxPyEmptyString) -> bool"""
+        """SetIcon(Icon icon, String tooltip=EmptyString) -> bool"""

         return _windows.TaskBarIcon_SetIcon(*args, **kwargs)
 
     def RemoveIcon(*args, **kwargs):
         return _windows.TaskBarIcon_SetIcon(*args, **kwargs)
 
     def RemoveIcon(*args, **kwargs):

-        """RemoveIcon(void ??) -> bool"""
+        """RemoveIcon() -> bool"""

         return _windows.TaskBarIcon_RemoveIcon(*args, **kwargs)
 
     def PopupMenu(*args, **kwargs):
         return _windows.TaskBarIcon_RemoveIcon(*args, **kwargs)
 
     def PopupMenu(*args, **kwargs):


@@ -1652,7 +1614,6 @@ class TaskBarIconPtr(TaskBarIcon):
 _windows.TaskBarIcon_swigregister(TaskBarIconPtr)
 
 class TaskBarIconEvent(core.Event):
 _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):
     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):


@@ -1687,7 +1648,6 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
 #---------------------------------------------------------------------------
 
 class ColourData(core.Object):
 #---------------------------------------------------------------------------
 
 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):
     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):


@@ -1707,11 +1667,11 @@ class ColourData(core.Object):
         return _windows.ColourData_GetChooseFull(*args, **kwargs)
 
     def GetColour(*args, **kwargs):
         return _windows.ColourData_GetChooseFull(*args, **kwargs)
 
     def GetColour(*args, **kwargs):

-        """GetColour() -> wxColour"""
+        """GetColour() -> Colour"""

         return _windows.ColourData_GetColour(*args, **kwargs)
 
     def GetCustomColour(*args, **kwargs):
         return _windows.ColourData_GetColour(*args, **kwargs)
 
     def GetCustomColour(*args, **kwargs):

-        """GetCustomColour(int i) -> wxColour"""
+        """GetCustomColour(int i) -> Colour"""

         return _windows.ColourData_GetCustomColour(*args, **kwargs)
 
     def SetChooseFull(*args, **kwargs):
         return _windows.ColourData_GetCustomColour(*args, **kwargs)
 
     def SetChooseFull(*args, **kwargs):


@@ -1719,11 +1679,11 @@ class ColourData(core.Object):
         return _windows.ColourData_SetChooseFull(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
         return _windows.ColourData_SetChooseFull(*args, **kwargs)
 
     def SetColour(*args, **kwargs):

-        """SetColour(wxColour colour)"""
+        """SetColour(Colour colour)"""

         return _windows.ColourData_SetColour(*args, **kwargs)
 
     def SetCustomColour(*args, **kwargs):
         return _windows.ColourData_SetColour(*args, **kwargs)
 
     def SetCustomColour(*args, **kwargs):

-        """SetCustomColour(int i, wxColour colour)"""
+        """SetCustomColour(int i, Colour colour)"""

         return _windows.ColourData_SetCustomColour(*args, **kwargs)
 
 
         return _windows.ColourData_SetCustomColour(*args, **kwargs)
 
 


@@ -1733,9 +1693,14 @@ class ColourDataPtr(ColourData):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = ColourData
 _windows.ColourData_swigregister(ColourDataPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = ColourData
 _windows.ColourData_swigregister(ColourDataPtr)

+FileSelectorPromptStr = cvar.FileSelectorPromptStr
+DirSelectorPromptStr = cvar.DirSelectorPromptStr
+DirDialogNameStr = cvar.DirDialogNameStr
+FileSelectorDefaultWildcardStr = cvar.FileSelectorDefaultWildcardStr
+GetTextFromUserPromptStr = cvar.GetTextFromUserPromptStr
+MessageBoxCaptionStr = cvar.MessageBoxCaptionStr

 
 class ColourDialog(Dialog):
 
 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):
     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):


@@ -1763,14 +1728,15 @@ class ColourDialogPtr(ColourDialog):
 _windows.ColourDialog_swigregister(ColourDialogPtr)
 
 class DirDialog(Dialog):
 _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):
     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"""
+        """
+        __init__(Window parent, String message=DirSelectorPromptStr, 
+            String defaultPath=EmptyString, long style=0, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            String name=DirDialogNameStr) -> DirDialog
+        """

         newobj = _windows.new_DirDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_DirDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1778,11 +1744,11 @@ class DirDialog(Dialog):
         self._setOORInfo(self)
 
     def GetPath(*args, **kwargs):
         self._setOORInfo(self)
 
     def GetPath(*args, **kwargs):

-        """GetPath() -> wxString"""
+        """GetPath() -> String"""

         return _windows.DirDialog_GetPath(*args, **kwargs)
 
     def GetMessage(*args, **kwargs):
         return _windows.DirDialog_GetPath(*args, **kwargs)
 
     def GetMessage(*args, **kwargs):

-        """GetMessage() -> wxString"""
+        """GetMessage() -> String"""

         return _windows.DirDialog_GetMessage(*args, **kwargs)
 
     def GetStyle(*args, **kwargs):
         return _windows.DirDialog_GetMessage(*args, **kwargs)
 
     def GetStyle(*args, **kwargs):


@@ -1790,11 +1756,11 @@ class DirDialog(Dialog):
         return _windows.DirDialog_GetStyle(*args, **kwargs)
 
     def SetMessage(*args, **kwargs):
         return _windows.DirDialog_GetStyle(*args, **kwargs)
 
     def SetMessage(*args, **kwargs):

-        """SetMessage(wxString message)"""
+        """SetMessage(String message)"""

         return _windows.DirDialog_SetMessage(*args, **kwargs)
 
     def SetPath(*args, **kwargs):
         return _windows.DirDialog_SetMessage(*args, **kwargs)
 
     def SetPath(*args, **kwargs):

-        """SetPath(wxString path)"""
+        """SetPath(String path)"""

         return _windows.DirDialog_SetPath(*args, **kwargs)
 
     def ShowModal(*args, **kwargs):
         return _windows.DirDialog_SetPath(*args, **kwargs)
 
     def ShowModal(*args, **kwargs):


@@ -1810,15 +1776,15 @@ class DirDialogPtr(DirDialog):
 _windows.DirDialog_swigregister(DirDialogPtr)
 
 class FileDialog(Dialog):
 _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):
     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"""
+        """
+        __init__(Window parent, String message=FileSelectorPromptStr, 
+            String defaultDir=EmptyString, String defaultFile=EmptyString, 
+            String wildcard=FileSelectorDefaultWildcardStr, 
+            long style=0, Point pos=DefaultPosition) -> FileDialog
+        """

         newobj = _windows.new_FileDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_FileDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1826,23 +1792,23 @@ class FileDialog(Dialog):
         self._setOORInfo(self)
 
     def SetMessage(*args, **kwargs):
         self._setOORInfo(self)
 
     def SetMessage(*args, **kwargs):

-        """SetMessage(wxString message)"""
+        """SetMessage(String message)"""

         return _windows.FileDialog_SetMessage(*args, **kwargs)
 
     def SetPath(*args, **kwargs):
         return _windows.FileDialog_SetMessage(*args, **kwargs)
 
     def SetPath(*args, **kwargs):

-        """SetPath(wxString path)"""
+        """SetPath(String path)"""

         return _windows.FileDialog_SetPath(*args, **kwargs)
 
     def SetDirectory(*args, **kwargs):
         return _windows.FileDialog_SetPath(*args, **kwargs)
 
     def SetDirectory(*args, **kwargs):

-        """SetDirectory(wxString dir)"""
+        """SetDirectory(String dir)"""

         return _windows.FileDialog_SetDirectory(*args, **kwargs)
 
     def SetFilename(*args, **kwargs):
         return _windows.FileDialog_SetDirectory(*args, **kwargs)
 
     def SetFilename(*args, **kwargs):

-        """SetFilename(wxString name)"""
+        """SetFilename(String name)"""

         return _windows.FileDialog_SetFilename(*args, **kwargs)
 
     def SetWildcard(*args, **kwargs):
         return _windows.FileDialog_SetFilename(*args, **kwargs)
 
     def SetWildcard(*args, **kwargs):

-        """SetWildcard(wxString wildCard)"""
+        """SetWildcard(String wildCard)"""

         return _windows.FileDialog_SetWildcard(*args, **kwargs)
 
     def SetStyle(*args, **kwargs):
         return _windows.FileDialog_SetWildcard(*args, **kwargs)
 
     def SetStyle(*args, **kwargs):


@@ -1854,23 +1820,23 @@ class FileDialog(Dialog):
         return _windows.FileDialog_SetFilterIndex(*args, **kwargs)
 
     def GetMessage(*args, **kwargs):
         return _windows.FileDialog_SetFilterIndex(*args, **kwargs)
 
     def GetMessage(*args, **kwargs):

-        """GetMessage() -> wxString"""
+        """GetMessage() -> String"""

         return _windows.FileDialog_GetMessage(*args, **kwargs)
 
     def GetPath(*args, **kwargs):
         return _windows.FileDialog_GetMessage(*args, **kwargs)
 
     def GetPath(*args, **kwargs):

-        """GetPath() -> wxString"""
+        """GetPath() -> String"""

         return _windows.FileDialog_GetPath(*args, **kwargs)
 
     def GetDirectory(*args, **kwargs):
         return _windows.FileDialog_GetPath(*args, **kwargs)
 
     def GetDirectory(*args, **kwargs):

-        """GetDirectory() -> wxString"""
+        """GetDirectory() -> String"""

         return _windows.FileDialog_GetDirectory(*args, **kwargs)
 
     def GetFilename(*args, **kwargs):
         return _windows.FileDialog_GetDirectory(*args, **kwargs)
 
     def GetFilename(*args, **kwargs):

-        """GetFilename() -> wxString"""
+        """GetFilename() -> String"""

         return _windows.FileDialog_GetFilename(*args, **kwargs)
 
     def GetWildcard(*args, **kwargs):
         return _windows.FileDialog_GetFilename(*args, **kwargs)
 
     def GetWildcard(*args, **kwargs):

-        """GetWildcard() -> wxString"""
+        """GetWildcard() -> String"""

         return _windows.FileDialog_GetWildcard(*args, **kwargs)
 
     def GetStyle(*args, **kwargs):
         return _windows.FileDialog_GetWildcard(*args, **kwargs)
 
     def GetStyle(*args, **kwargs):


@@ -1899,13 +1865,14 @@ _windows.FileDialog_swigregister(FileDialogPtr)
 
 CHOICEDLG_STYLE = _windows.CHOICEDLG_STYLE
 class MultiChoiceDialog(Dialog):
 
 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):
     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"""
+        """
+        __init__(Window parent, String message, String caption, int choices=0, 
+            String choices_array, long style=CHOICEDLG_STYLE, 
+            Point pos=DefaultPosition) -> MultiChoiceDialog
+        """

         newobj = _windows.new_MultiChoiceDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_MultiChoiceDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1929,13 +1896,14 @@ class MultiChoiceDialogPtr(MultiChoiceDialog):
 _windows.MultiChoiceDialog_swigregister(MultiChoiceDialogPtr)
 
 class SingleChoiceDialog(Dialog):
 _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):
     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"""
+        """
+        __init__(Window parent, String message, String caption, int choices, 
+            String choices_array, long style=CHOICEDLG_STYLE, 
+            Point pos=DefaultPosition) -> SingleChoiceDialog
+        """

         newobj = _windows.new_SingleChoiceDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_SingleChoiceDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1947,7 +1915,7 @@ class SingleChoiceDialog(Dialog):
         return _windows.SingleChoiceDialog_GetSelection(*args, **kwargs)
 
     def GetStringSelection(*args, **kwargs):
         return _windows.SingleChoiceDialog_GetSelection(*args, **kwargs)
 
     def GetStringSelection(*args, **kwargs):

-        """GetStringSelection() -> wxString"""
+        """GetStringSelection() -> String"""

         return _windows.SingleChoiceDialog_GetStringSelection(*args, **kwargs)
 
     def SetSelection(*args, **kwargs):
         return _windows.SingleChoiceDialog_GetStringSelection(*args, **kwargs)
 
     def SetSelection(*args, **kwargs):


@@ -1967,14 +1935,14 @@ class SingleChoiceDialogPtr(SingleChoiceDialog):
 _windows.SingleChoiceDialog_swigregister(SingleChoiceDialogPtr)
 
 class TextEntryDialog(Dialog):
 _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):
     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"""
+        """
+        __init__(Window parent, String message, String caption=GetTextFromUserPromptStr, 
+            String defaultValue=EmptyString, 
+            long style=wxOK|wxCANCEL|wxCENTRE, Point pos=DefaultPosition) -> TextEntryDialog
+        """

         newobj = _windows.new_TextEntryDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_TextEntryDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1982,11 +1950,11 @@ class TextEntryDialog(Dialog):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):

-        """GetValue() -> wxString"""
+        """GetValue() -> String"""

         return _windows.TextEntryDialog_GetValue(*args, **kwargs)
 
     def SetValue(*args, **kwargs):
         return _windows.TextEntryDialog_GetValue(*args, **kwargs)
 
     def SetValue(*args, **kwargs):

-        """SetValue(wxString value)"""
+        """SetValue(String value)"""

         return _windows.TextEntryDialog_SetValue(*args, **kwargs)
 
     def ShowModal(*args, **kwargs):
         return _windows.TextEntryDialog_SetValue(*args, **kwargs)
 
     def ShowModal(*args, **kwargs):


@@ -2002,7 +1970,6 @@ class TextEntryDialogPtr(TextEntryDialog):
 _windows.TextEntryDialog_swigregister(TextEntryDialogPtr)
 
 class FontData(core.Object):
 _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):
     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):


@@ -2026,11 +1993,11 @@ class FontData(core.Object):
         return _windows.FontData_GetAllowSymbols(*args, **kwargs)
 
     def GetColour(*args, **kwargs):
         return _windows.FontData_GetAllowSymbols(*args, **kwargs)
 
     def GetColour(*args, **kwargs):

-        """GetColour() -> wxColour"""
+        """GetColour() -> Colour"""

         return _windows.FontData_GetColour(*args, **kwargs)
 
     def GetChosenFont(*args, **kwargs):
         return _windows.FontData_GetColour(*args, **kwargs)
 
     def GetChosenFont(*args, **kwargs):

-        """GetChosenFont() -> wxFont"""
+        """GetChosenFont() -> Font"""

         return _windows.FontData_GetChosenFont(*args, **kwargs)
 
     def GetEnableEffects(*args, **kwargs):
         return _windows.FontData_GetChosenFont(*args, **kwargs)
 
     def GetEnableEffects(*args, **kwargs):


@@ -2038,7 +2005,7 @@ class FontData(core.Object):
         return _windows.FontData_GetEnableEffects(*args, **kwargs)
 
     def GetInitialFont(*args, **kwargs):
         return _windows.FontData_GetEnableEffects(*args, **kwargs)
 
     def GetInitialFont(*args, **kwargs):

-        """GetInitialFont() -> wxFont"""
+        """GetInitialFont() -> Font"""

         return _windows.FontData_GetInitialFont(*args, **kwargs)
 
     def GetShowHelp(*args, **kwargs):
         return _windows.FontData_GetInitialFont(*args, **kwargs)
 
     def GetShowHelp(*args, **kwargs):


@@ -2050,15 +2017,15 @@ class FontData(core.Object):
         return _windows.FontData_SetAllowSymbols(*args, **kwargs)
 
     def SetChosenFont(*args, **kwargs):
         return _windows.FontData_SetAllowSymbols(*args, **kwargs)
 
     def SetChosenFont(*args, **kwargs):

-        """SetChosenFont(wxFont font)"""
+        """SetChosenFont(Font font)"""

         return _windows.FontData_SetChosenFont(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
         return _windows.FontData_SetChosenFont(*args, **kwargs)
 
     def SetColour(*args, **kwargs):

-        """SetColour(wxColour colour)"""
+        """SetColour(Colour colour)"""

         return _windows.FontData_SetColour(*args, **kwargs)
 
     def SetInitialFont(*args, **kwargs):
         return _windows.FontData_SetColour(*args, **kwargs)
 
     def SetInitialFont(*args, **kwargs):

-        """SetInitialFont(wxFont font)"""
+        """SetInitialFont(Font font)"""

         return _windows.FontData_SetInitialFont(*args, **kwargs)
 
     def SetRange(*args, **kwargs):
         return _windows.FontData_SetInitialFont(*args, **kwargs)
 
     def SetRange(*args, **kwargs):


@@ -2078,7 +2045,6 @@ class FontDataPtr(FontData):
 _windows.FontData_swigregister(FontDataPtr)
 
 class FontDialog(Dialog):
 _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):
     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):


@@ -2106,13 +2072,14 @@ class FontDialogPtr(FontDialog):
 _windows.FontDialog_swigregister(FontDialogPtr)
 
 class MessageDialog(Dialog):
 _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):
     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"""
+        """
+        __init__(Window parent, String message, String caption=MessageBoxCaptionStr, 
+            long style=wxOK|wxCANCEL|wxCENTRE, 
+            Point pos=DefaultPosition) -> MessageDialog
+        """

         newobj = _windows.new_MessageDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_MessageDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -2132,12 +2099,13 @@ class MessageDialogPtr(MessageDialog):
 _windows.MessageDialog_swigregister(MessageDialogPtr)
 
 class ProgressDialog(Frame):
 _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):
     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"""
+        """
+        __init__(String title, String 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
         newobj = _windows.new_ProgressDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -2145,7 +2113,7 @@ class ProgressDialog(Frame):
         self._setOORInfo(self)
 
     def Update(*args, **kwargs):
         self._setOORInfo(self)
 
     def Update(*args, **kwargs):

-        """Update(int value, wxString newmsg=wxPyEmptyString) -> bool"""
+        """Update(int value, String newmsg=EmptyString) -> bool"""

         return _windows.ProgressDialog_Update(*args, **kwargs)
 
     def Resume(*args, **kwargs):
         return _windows.ProgressDialog_Update(*args, **kwargs)
 
     def Resume(*args, **kwargs):


@@ -2186,7 +2154,6 @@ EVT_COMMAND_FIND_REPLACE_ALL = EVT_FIND_REPLACE_ALL
 EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE        
 
 class FindDialogEvent(core.CommandEvent):
 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):
     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):


@@ -2200,11 +2167,11 @@ class FindDialogEvent(core.CommandEvent):
         return _windows.FindDialogEvent_GetFlags(*args, **kwargs)
 
     def GetFindString(*args, **kwargs):
         return _windows.FindDialogEvent_GetFlags(*args, **kwargs)
 
     def GetFindString(*args, **kwargs):

-        """GetFindString() -> wxString"""
+        """GetFindString() -> String"""

         return _windows.FindDialogEvent_GetFindString(*args, **kwargs)
 
     def GetReplaceString(*args, **kwargs):
         return _windows.FindDialogEvent_GetFindString(*args, **kwargs)
 
     def GetReplaceString(*args, **kwargs):

-        """GetReplaceString() -> wxString"""
+        """GetReplaceString() -> String"""

         return _windows.FindDialogEvent_GetReplaceString(*args, **kwargs)
 
     def GetDialog(*args, **kwargs):
         return _windows.FindDialogEvent_GetReplaceString(*args, **kwargs)
 
     def GetDialog(*args, **kwargs):


@@ -2216,11 +2183,11 @@ class FindDialogEvent(core.CommandEvent):
         return _windows.FindDialogEvent_SetFlags(*args, **kwargs)
 
     def SetFindString(*args, **kwargs):
         return _windows.FindDialogEvent_SetFlags(*args, **kwargs)
 
     def SetFindString(*args, **kwargs):

-        """SetFindString(wxString str)"""
+        """SetFindString(String str)"""

         return _windows.FindDialogEvent_SetFindString(*args, **kwargs)
 
     def SetReplaceString(*args, **kwargs):
         return _windows.FindDialogEvent_SetFindString(*args, **kwargs)
 
     def SetReplaceString(*args, **kwargs):

-        """SetReplaceString(wxString str)"""
+        """SetReplaceString(String str)"""

         return _windows.FindDialogEvent_SetReplaceString(*args, **kwargs)
 
 
         return _windows.FindDialogEvent_SetReplaceString(*args, **kwargs)
 
 


@@ -2232,7 +2199,6 @@ class FindDialogEventPtr(FindDialogEvent):
 _windows.FindDialogEvent_swigregister(FindDialogEventPtr)
 
 class FindReplaceData(core.Object):
 _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):
     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):


@@ -2248,11 +2214,11 @@ class FindReplaceData(core.Object):
         except: pass
 
     def GetFindString(*args, **kwargs):
         except: pass
 
     def GetFindString(*args, **kwargs):

-        """GetFindString() -> wxString"""
+        """GetFindString() -> String"""

         return _windows.FindReplaceData_GetFindString(*args, **kwargs)
 
     def GetReplaceString(*args, **kwargs):
         return _windows.FindReplaceData_GetFindString(*args, **kwargs)
 
     def GetReplaceString(*args, **kwargs):

-        """GetReplaceString() -> wxString"""
+        """GetReplaceString() -> String"""

         return _windows.FindReplaceData_GetReplaceString(*args, **kwargs)
 
     def GetFlags(*args, **kwargs):
         return _windows.FindReplaceData_GetReplaceString(*args, **kwargs)
 
     def GetFlags(*args, **kwargs):


@@ -2264,11 +2230,11 @@ class FindReplaceData(core.Object):
         return _windows.FindReplaceData_SetFlags(*args, **kwargs)
 
     def SetFindString(*args, **kwargs):
         return _windows.FindReplaceData_SetFlags(*args, **kwargs)
 
     def SetFindString(*args, **kwargs):

-        """SetFindString(wxString str)"""
+        """SetFindString(String str)"""

         return _windows.FindReplaceData_SetFindString(*args, **kwargs)
 
     def SetReplaceString(*args, **kwargs):
         return _windows.FindReplaceData_SetFindString(*args, **kwargs)
 
     def SetReplaceString(*args, **kwargs):

-        """SetReplaceString(wxString str)"""
+        """SetReplaceString(String str)"""

         return _windows.FindReplaceData_SetReplaceString(*args, **kwargs)
 
 
         return _windows.FindReplaceData_SetReplaceString(*args, **kwargs)
 
 


@@ -2280,12 +2246,13 @@ class FindReplaceDataPtr(FindReplaceData):
 _windows.FindReplaceData_swigregister(FindReplaceDataPtr)
 
 class FindReplaceDialog(Dialog):
 _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):
     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"""
+        """
+        __init__(Window parent, FindReplaceData data, String title, 
+            int style=0) -> FindReplaceDialog
+        """

         newobj = _windows.new_FindReplaceDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_FindReplaceDialog(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -2293,8 +2260,10 @@ class FindReplaceDialog(Dialog):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):

-        """Create(Window parent, FindReplaceData data, wxString title, 
-    int style=0) -> bool"""
+        """
+        Create(Window parent, FindReplaceData data, String title, 
+            int style=0) -> bool
+        """

         return _windows.FindReplaceDialog_Create(*args, **kwargs)
 
     def GetData(*args, **kwargs):
         return _windows.FindReplaceDialog_Create(*args, **kwargs)
 
     def GetData(*args, **kwargs):


@@ -2330,13 +2299,14 @@ IDM_WINDOWTILEVERT = _windows.IDM_WINDOWTILEVERT
 FIRST_MDI_CHILD = _windows.FIRST_MDI_CHILD
 LAST_MDI_CHILD = _windows.LAST_MDI_CHILD
 class MDIParentFrame(Frame):
 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):
     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"""
+        """
+        __init__(Window parent, int id, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 
+            String name=FrameNameStr) -> MDIParentFrame
+        """

         newobj = _windows.new_MDIParentFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_MDIParentFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -2344,9 +2314,11 @@ class MDIParentFrame(Frame):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setOORInfo(self)
 
     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"""
+        """
+        Create(Window parent, int id, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 
+            String name=FrameNameStr) -> bool
+        """

         return _windows.MDIParentFrame_Create(*args, **kwargs)
 
     def ActivateNext(*args, **kwargs):
         return _windows.MDIParentFrame_Create(*args, **kwargs)
 
     def ActivateNext(*args, **kwargs):


@@ -2408,13 +2380,14 @@ def PreMDIParentFrame(*args, **kwargs):
     return val
 
 class MDIChildFrame(Frame):
     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):
     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"""
+        """
+        __init__(MDIParentFrame parent, int id, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
+            String name=FrameNameStr) -> MDIChildFrame
+        """

         newobj = _windows.new_MDIChildFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_MDIChildFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -2422,9 +2395,11 @@ class MDIChildFrame(Frame):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setOORInfo(self)
 
     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"""
+        """
+        Create(MDIParentFrame parent, int id, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
+            String name=FrameNameStr) -> bool
+        """

         return _windows.MDIChildFrame_Create(*args, **kwargs)
 
     def Activate(*args, **kwargs):
         return _windows.MDIChildFrame_Create(*args, **kwargs)
 
     def Activate(*args, **kwargs):


@@ -2454,7 +2429,6 @@ def PreMDIChildFrame(*args, **kwargs):
     return val
 
 class MDIClientWindow(core.Window):
     return val
 
 class MDIClientWindow(core.Window):

-    """"""

     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):
     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):


@@ -2486,12 +2460,13 @@ def PreMDIClientWindow(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class PyWindow(core.Window):
 #---------------------------------------------------------------------------
 
 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):
     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"""
+        """
+        __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=0, String name=PanelNameStr) -> PyWindow
+        """

         newobj = _windows.new_PyWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_PyWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -2519,15 +2494,15 @@ class PyWindow(core.Window):
         return _windows.PyWindow_base_DoSetVirtualSize(*args, **kwargs)
 
     def base_DoGetSize(*args, **kwargs):
         return _windows.PyWindow_base_DoSetVirtualSize(*args, **kwargs)
 
     def base_DoGetSize(*args, **kwargs):

-        """base_DoGetSize(int OUTPUT, int OUTPUT)"""
+        """base_DoGetSize() -> (width, height)"""

         return _windows.PyWindow_base_DoGetSize(*args, **kwargs)
 
     def base_DoGetClientSize(*args, **kwargs):
         return _windows.PyWindow_base_DoGetSize(*args, **kwargs)
 
     def base_DoGetClientSize(*args, **kwargs):

-        """base_DoGetClientSize(int OUTPUT, int OUTPUT)"""
+        """base_DoGetClientSize() -> (width, height)"""

         return _windows.PyWindow_base_DoGetClientSize(*args, **kwargs)
 
     def base_DoGetPosition(*args, **kwargs):
         return _windows.PyWindow_base_DoGetClientSize(*args, **kwargs)
 
     def base_DoGetPosition(*args, **kwargs):

-        """base_DoGetPosition(int OUTPUT, int OUTPUT)"""
+        """base_DoGetPosition() -> (x,y)"""

         return _windows.PyWindow_base_DoGetPosition(*args, **kwargs)
 
     def base_DoGetVirtualSize(*args, **kwargs):
         return _windows.PyWindow_base_DoGetPosition(*args, **kwargs)
 
     def base_DoGetVirtualSize(*args, **kwargs):


@@ -2583,12 +2558,13 @@ class PyWindowPtr(PyWindow):
 _windows.PyWindow_swigregister(PyWindowPtr)
 
 class PyPanel(Panel):
 _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):
     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"""
+        """
+        __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=0, String name=PanelNameStr) -> PyPanel
+        """

         newobj = _windows.new_PyPanel(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_PyPanel(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -2616,15 +2592,15 @@ class PyPanel(Panel):
         return _windows.PyPanel_base_DoSetVirtualSize(*args, **kwargs)
 
     def base_DoGetSize(*args, **kwargs):
         return _windows.PyPanel_base_DoSetVirtualSize(*args, **kwargs)
 
     def base_DoGetSize(*args, **kwargs):

-        """base_DoGetSize(int OUTPUT, int OUTPUT)"""
+        """base_DoGetSize() -> (width, height)"""

         return _windows.PyPanel_base_DoGetSize(*args, **kwargs)
 
     def base_DoGetClientSize(*args, **kwargs):
         return _windows.PyPanel_base_DoGetSize(*args, **kwargs)
 
     def base_DoGetClientSize(*args, **kwargs):

-        """base_DoGetClientSize(int OUTPUT, int OUTPUT)"""
+        """base_DoGetClientSize() -> (width, height)"""

         return _windows.PyPanel_base_DoGetClientSize(*args, **kwargs)
 
     def base_DoGetPosition(*args, **kwargs):
         return _windows.PyPanel_base_DoGetClientSize(*args, **kwargs)
 
     def base_DoGetPosition(*args, **kwargs):

-        """base_DoGetPosition(int OUTPUT, int OUTPUT)"""
+        """base_DoGetPosition() -> (x,y)"""

         return _windows.PyPanel_base_DoGetPosition(*args, **kwargs)
 
     def base_DoGetVirtualSize(*args, **kwargs):
         return _windows.PyPanel_base_DoGetPosition(*args, **kwargs)
 
     def base_DoGetVirtualSize(*args, **kwargs):


@@ -2685,8 +2661,8 @@ PRINT_MODE_NONE = _windows.PRINT_MODE_NONE
 PRINT_MODE_PREVIEW = _windows.PRINT_MODE_PREVIEW
 PRINT_MODE_FILE = _windows.PRINT_MODE_FILE
 PRINT_MODE_PRINTER = _windows.PRINT_MODE_PRINTER
 PRINT_MODE_PREVIEW = _windows.PRINT_MODE_PREVIEW
 PRINT_MODE_FILE = _windows.PRINT_MODE_FILE
 PRINT_MODE_PRINTER = _windows.PRINT_MODE_PRINTER

+PRINT_MODE_STREAM = _windows.PRINT_MODE_STREAM

 class PrintData(core.Object):
 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):
     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):


@@ -2718,7 +2694,7 @@ class PrintData(core.Object):
         return _windows.PrintData_Ok(*args, **kwargs)
 
     def GetPrinterName(*args, **kwargs):
         return _windows.PrintData_Ok(*args, **kwargs)
 
     def GetPrinterName(*args, **kwargs):

-        """GetPrinterName() -> wxString"""
+        """GetPrinterName() -> String"""

         return _windows.PrintData_GetPrinterName(*args, **kwargs)
 
     def GetColour(*args, **kwargs):
         return _windows.PrintData_GetPrinterName(*args, **kwargs)
 
     def GetColour(*args, **kwargs):


@@ -2726,11 +2702,11 @@ class PrintData(core.Object):
         return _windows.PrintData_GetColour(*args, **kwargs)
 
     def GetDuplex(*args, **kwargs):
         return _windows.PrintData_GetColour(*args, **kwargs)
 
     def GetDuplex(*args, **kwargs):

-        """GetDuplex() -> wxDuplexMode"""
+        """GetDuplex() -> int"""

         return _windows.PrintData_GetDuplex(*args, **kwargs)
 
     def GetPaperId(*args, **kwargs):
         return _windows.PrintData_GetDuplex(*args, **kwargs)
 
     def GetPaperId(*args, **kwargs):

-        """GetPaperId() -> wxPaperSize"""
+        """GetPaperId() -> int"""

         return _windows.PrintData_GetPaperId(*args, **kwargs)
 
     def GetPaperSize(*args, **kwargs):
         return _windows.PrintData_GetPaperId(*args, **kwargs)
 
     def GetPaperSize(*args, **kwargs):


@@ -2738,7 +2714,7 @@ class PrintData(core.Object):
         return _windows.PrintData_GetPaperSize(*args, **kwargs)
 
     def GetQuality(*args, **kwargs):
         return _windows.PrintData_GetPaperSize(*args, **kwargs)
 
     def GetQuality(*args, **kwargs):

-        """GetQuality() -> wxPrintQuality"""
+        """GetQuality() -> int"""

         return _windows.PrintData_GetQuality(*args, **kwargs)
 
     def SetNoCopies(*args, **kwargs):
         return _windows.PrintData_GetQuality(*args, **kwargs)
 
     def SetNoCopies(*args, **kwargs):


@@ -2754,7 +2730,7 @@ class PrintData(core.Object):
         return _windows.PrintData_SetOrientation(*args, **kwargs)
 
     def SetPrinterName(*args, **kwargs):
         return _windows.PrintData_SetOrientation(*args, **kwargs)
 
     def SetPrinterName(*args, **kwargs):

-        """SetPrinterName(wxString name)"""
+        """SetPrinterName(String name)"""

         return _windows.PrintData_SetPrinterName(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
         return _windows.PrintData_SetPrinterName(*args, **kwargs)
 
     def SetColour(*args, **kwargs):


@@ -2762,11 +2738,11 @@ class PrintData(core.Object):
         return _windows.PrintData_SetColour(*args, **kwargs)
 
     def SetDuplex(*args, **kwargs):
         return _windows.PrintData_SetColour(*args, **kwargs)
 
     def SetDuplex(*args, **kwargs):

-        """SetDuplex(wxDuplexMode duplex)"""
+        """SetDuplex(int duplex)"""

         return _windows.PrintData_SetDuplex(*args, **kwargs)
 
     def SetPaperId(*args, **kwargs):
         return _windows.PrintData_SetDuplex(*args, **kwargs)
 
     def SetPaperId(*args, **kwargs):

-        """SetPaperId(wxPaperSize sizeId)"""
+        """SetPaperId(int sizeId)"""

         return _windows.PrintData_SetPaperId(*args, **kwargs)
 
     def SetPaperSize(*args, **kwargs):
         return _windows.PrintData_SetPaperId(*args, **kwargs)
 
     def SetPaperSize(*args, **kwargs):


@@ -2774,27 +2750,27 @@ class PrintData(core.Object):
         return _windows.PrintData_SetPaperSize(*args, **kwargs)
 
     def SetQuality(*args, **kwargs):
         return _windows.PrintData_SetPaperSize(*args, **kwargs)
 
     def SetQuality(*args, **kwargs):

-        """SetQuality(wxPrintQuality quality)"""
+        """SetQuality(int quality)"""

         return _windows.PrintData_SetQuality(*args, **kwargs)
 
     def GetPrinterCommand(*args, **kwargs):
         return _windows.PrintData_SetQuality(*args, **kwargs)
 
     def GetPrinterCommand(*args, **kwargs):

-        """GetPrinterCommand() -> wxString"""
+        """GetPrinterCommand() -> String"""

         return _windows.PrintData_GetPrinterCommand(*args, **kwargs)
 
     def GetPrinterOptions(*args, **kwargs):
         return _windows.PrintData_GetPrinterCommand(*args, **kwargs)
 
     def GetPrinterOptions(*args, **kwargs):

-        """GetPrinterOptions() -> wxString"""
+        """GetPrinterOptions() -> String"""

         return _windows.PrintData_GetPrinterOptions(*args, **kwargs)
 
     def GetPreviewCommand(*args, **kwargs):
         return _windows.PrintData_GetPrinterOptions(*args, **kwargs)
 
     def GetPreviewCommand(*args, **kwargs):

-        """GetPreviewCommand() -> wxString"""
+        """GetPreviewCommand() -> String"""

         return _windows.PrintData_GetPreviewCommand(*args, **kwargs)
 
     def GetFilename(*args, **kwargs):
         return _windows.PrintData_GetPreviewCommand(*args, **kwargs)
 
     def GetFilename(*args, **kwargs):

-        """GetFilename() -> wxString"""
+        """GetFilename() -> String"""

         return _windows.PrintData_GetFilename(*args, **kwargs)
 
     def GetFontMetricPath(*args, **kwargs):
         return _windows.PrintData_GetFilename(*args, **kwargs)
 
     def GetFontMetricPath(*args, **kwargs):

-        """GetFontMetricPath() -> wxString"""
+        """GetFontMetricPath() -> String"""

         return _windows.PrintData_GetFontMetricPath(*args, **kwargs)
 
     def GetPrinterScaleX(*args, **kwargs):
         return _windows.PrintData_GetFontMetricPath(*args, **kwargs)
 
     def GetPrinterScaleX(*args, **kwargs):


@@ -2814,27 +2790,27 @@ class PrintData(core.Object):
         return _windows.PrintData_GetPrinterTranslateY(*args, **kwargs)
 
     def GetPrintMode(*args, **kwargs):
         return _windows.PrintData_GetPrinterTranslateY(*args, **kwargs)
 
     def GetPrintMode(*args, **kwargs):

-        """GetPrintMode() -> wxPrintMode"""
+        """GetPrintMode() -> int"""

         return _windows.PrintData_GetPrintMode(*args, **kwargs)
 
     def SetPrinterCommand(*args, **kwargs):
         return _windows.PrintData_GetPrintMode(*args, **kwargs)
 
     def SetPrinterCommand(*args, **kwargs):

-        """SetPrinterCommand(wxString command)"""
+        """SetPrinterCommand(String command)"""

         return _windows.PrintData_SetPrinterCommand(*args, **kwargs)
 
     def SetPrinterOptions(*args, **kwargs):
         return _windows.PrintData_SetPrinterCommand(*args, **kwargs)
 
     def SetPrinterOptions(*args, **kwargs):

-        """SetPrinterOptions(wxString options)"""
+        """SetPrinterOptions(String options)"""

         return _windows.PrintData_SetPrinterOptions(*args, **kwargs)
 
     def SetPreviewCommand(*args, **kwargs):
         return _windows.PrintData_SetPrinterOptions(*args, **kwargs)
 
     def SetPreviewCommand(*args, **kwargs):

-        """SetPreviewCommand(wxString command)"""
+        """SetPreviewCommand(String command)"""

         return _windows.PrintData_SetPreviewCommand(*args, **kwargs)
 
     def SetFilename(*args, **kwargs):
         return _windows.PrintData_SetPreviewCommand(*args, **kwargs)
 
     def SetFilename(*args, **kwargs):

-        """SetFilename(wxString filename)"""
+        """SetFilename(String filename)"""

         return _windows.PrintData_SetFilename(*args, **kwargs)
 
     def SetFontMetricPath(*args, **kwargs):
         return _windows.PrintData_SetFilename(*args, **kwargs)
 
     def SetFontMetricPath(*args, **kwargs):

-        """SetFontMetricPath(wxString path)"""
+        """SetFontMetricPath(String path)"""

         return _windows.PrintData_SetFontMetricPath(*args, **kwargs)
 
     def SetPrinterScaleX(*args, **kwargs):
         return _windows.PrintData_SetFontMetricPath(*args, **kwargs)
 
     def SetPrinterScaleX(*args, **kwargs):


@@ -2862,9 +2838,17 @@ class PrintData(core.Object):
         return _windows.PrintData_SetPrinterTranslation(*args, **kwargs)
 
     def SetPrintMode(*args, **kwargs):
         return _windows.PrintData_SetPrinterTranslation(*args, **kwargs)
 
     def SetPrintMode(*args, **kwargs):

-        """SetPrintMode(wxPrintMode printMode)"""
+        """SetPrintMode(int printMode)"""

         return _windows.PrintData_SetPrintMode(*args, **kwargs)
 
         return _windows.PrintData_SetPrintMode(*args, **kwargs)
 

+    def GetOutputStream(*args, **kwargs):
+        """GetOutputStream() -> OutputStream"""
+        return _windows.PrintData_GetOutputStream(*args, **kwargs)
+
+    def SetOutputStream(*args, **kwargs):
+        """SetOutputStream(OutputStream outputstream)"""
+        return _windows.PrintData_SetOutputStream(*args, **kwargs)
+

     def __nonzero__(self): return self.Ok() 
 
 class PrintDataPtr(PrintData):
     def __nonzero__(self): return self.Ok() 
 
 class PrintDataPtr(PrintData):


@@ -2873,9 +2857,10 @@ class PrintDataPtr(PrintData):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = PrintData
 _windows.PrintData_swigregister(PrintDataPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = PrintData
 _windows.PrintData_swigregister(PrintDataPtr)

+PrintoutTitleStr = cvar.PrintoutTitleStr
+PreviewCanvasNameStr = cvar.PreviewCanvasNameStr

 
 class PageSetupDialogData(core.Object):
 
 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):
     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):


@@ -2955,7 +2940,7 @@ class PageSetupDialogData(core.Object):
         return _windows.PageSetupDialogData_GetMinMarginBottomRight(*args, **kwargs)
 
     def GetPaperId(*args, **kwargs):
         return _windows.PageSetupDialogData_GetMinMarginBottomRight(*args, **kwargs)
 
     def GetPaperId(*args, **kwargs):

-        """GetPaperId() -> wxPaperSize"""
+        """GetPaperId() -> int"""

         return _windows.PageSetupDialogData_GetPaperId(*args, **kwargs)
 
     def GetPaperSize(*args, **kwargs):
         return _windows.PageSetupDialogData_GetPaperId(*args, **kwargs)
 
     def GetPaperSize(*args, **kwargs):


@@ -2995,7 +2980,7 @@ class PageSetupDialogData(core.Object):
         return _windows.PageSetupDialogData_SetMinMarginBottomRight(*args, **kwargs)
 
     def SetPaperId(*args, **kwargs):
         return _windows.PageSetupDialogData_SetMinMarginBottomRight(*args, **kwargs)
 
     def SetPaperId(*args, **kwargs):

-        """SetPaperId(wxPaperSize id)"""
+        """SetPaperId(int id)"""

         return _windows.PageSetupDialogData_SetPaperId(*args, **kwargs)
 
     def SetPaperSize(*args, **kwargs):
         return _windows.PageSetupDialogData_SetPaperId(*args, **kwargs)
 
     def SetPaperSize(*args, **kwargs):


@@ -3016,7 +3001,6 @@ class PageSetupDialogDataPtr(PageSetupDialogData):
 _windows.PageSetupDialogData_swigregister(PageSetupDialogDataPtr)
 
 class PageSetupDialog(Dialog):
 _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):
     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):


@@ -3044,7 +3028,6 @@ class PageSetupDialogPtr(PageSetupDialog):
 _windows.PageSetupDialog_swigregister(PageSetupDialogPtr)
 
 class PrintDialogData(core.Object):
 _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):
     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):


@@ -3193,7 +3176,6 @@ class PrintDialogDataPtr(PrintDialogData):
 _windows.PrintDialogData_swigregister(PrintDialogDataPtr)
 
 class PrintDialog(Dialog):
 _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):
     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):


@@ -3209,7 +3191,7 @@ class PrintDialog(Dialog):
         return _windows.PrintDialog_GetPrintDialogData(*args, **kwargs)
 
     def GetPrintDC(*args, **kwargs):
         return _windows.PrintDialog_GetPrintDialogData(*args, **kwargs)
 
     def GetPrintDC(*args, **kwargs):

-        """GetPrintDC() -> wxDC"""
+        """GetPrintDC() -> DC"""

         return _windows.PrintDialog_GetPrintDC(*args, **kwargs)
 
     def ShowModal(*args, **kwargs):
         return _windows.PrintDialog_GetPrintDC(*args, **kwargs)
 
     def ShowModal(*args, **kwargs):


@@ -3228,7 +3210,6 @@ PRINTER_NO_ERROR = _windows.PRINTER_NO_ERROR
 PRINTER_CANCELLED = _windows.PRINTER_CANCELLED
 PRINTER_ERROR = _windows.PRINTER_ERROR
 class Printer(core.Object):
 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):
     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):


@@ -3256,11 +3237,11 @@ class Printer(core.Object):
         return _windows.Printer_Print(*args, **kwargs)
 
     def PrintDialog(*args, **kwargs):
         return _windows.Printer_Print(*args, **kwargs)
 
     def PrintDialog(*args, **kwargs):

-        """PrintDialog(Window parent) -> wxDC"""
+        """PrintDialog(Window parent) -> DC"""

         return _windows.Printer_PrintDialog(*args, **kwargs)
 
     def ReportError(*args, **kwargs):
         return _windows.Printer_PrintDialog(*args, **kwargs)
 
     def ReportError(*args, **kwargs):

-        """ReportError(Window parent, Printout printout, wxString message)"""
+        """ReportError(Window parent, Printout printout, String message)"""

         return _windows.Printer_ReportError(*args, **kwargs)
 
     def Setup(*args, **kwargs):
         return _windows.Printer_ReportError(*args, **kwargs)
 
     def Setup(*args, **kwargs):


@@ -3272,7 +3253,7 @@ class Printer(core.Object):
         return _windows.Printer_GetAbort(*args, **kwargs)
 
     def GetLastError(*args, **kwargs):
         return _windows.Printer_GetAbort(*args, **kwargs)
 
     def GetLastError(*args, **kwargs):

-        """Printer.GetLastError() -> wxPrinterError"""
+        """GetLastError() -> int"""

         return _windows.Printer_GetLastError(*args, **kwargs)
 
     GetLastError = staticmethod(GetLastError)
         return _windows.Printer_GetLastError(*args, **kwargs)
 
     GetLastError = staticmethod(GetLastError)


@@ -3285,15 +3266,14 @@ class PrinterPtr(Printer):
 _windows.Printer_swigregister(PrinterPtr)
 
 def Printer_GetLastError(*args, **kwargs):
 _windows.Printer_swigregister(PrinterPtr)
 
 def Printer_GetLastError(*args, **kwargs):

-    """Printer_GetLastError() -> wxPrinterError"""
+    """Printer_GetLastError() -> int"""

     return _windows.Printer_GetLastError(*args, **kwargs)
 
 class Printout(core.Object):
     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):
     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"""
+        """__init__(String title=PrintoutTitleStr) -> Printout"""

         newobj = _windows.new_Printout(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_Printout(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -3305,31 +3285,31 @@ class Printout(core.Object):
         return _windows.Printout__setCallbackInfo(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):
         return _windows.Printout__setCallbackInfo(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):

-        """GetTitle() -> wxString"""
+        """GetTitle() -> String"""

         return _windows.Printout_GetTitle(*args, **kwargs)
 
     def GetDC(*args, **kwargs):
         return _windows.Printout_GetTitle(*args, **kwargs)
 
     def GetDC(*args, **kwargs):

-        """GetDC() -> wxDC"""
+        """GetDC() -> DC"""

         return _windows.Printout_GetDC(*args, **kwargs)
 
     def SetDC(*args, **kwargs):
         return _windows.Printout_GetDC(*args, **kwargs)
 
     def SetDC(*args, **kwargs):

-        """SetDC(wxDC dc)"""
+        """SetDC(DC dc)"""

         return _windows.Printout_SetDC(*args, **kwargs)
 
         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 SetPageSizePixels(*args, **kwargs):
         """SetPageSizePixels(int w, int h)"""
         return _windows.Printout_SetPageSizePixels(*args, **kwargs)
 

+    def GetPageSizePixels(*args, **kwargs):
+        """GetPageSizePixels() -> (w, h)"""
+        return _windows.Printout_GetPageSizePixels(*args, **kwargs)
+

     def SetPageSizeMM(*args, **kwargs):
         """SetPageSizeMM(int w, int h)"""
         return _windows.Printout_SetPageSizeMM(*args, **kwargs)
 
     def GetPageSizeMM(*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)"""
+        """GetPageSizeMM() -> (w, h)"""

         return _windows.Printout_GetPageSizeMM(*args, **kwargs)
 
     def SetPPIScreen(*args, **kwargs):
         return _windows.Printout_GetPageSizeMM(*args, **kwargs)
 
     def SetPPIScreen(*args, **kwargs):


@@ -3337,7 +3317,7 @@ class Printout(core.Object):
         return _windows.Printout_SetPPIScreen(*args, **kwargs)
 
     def GetPPIScreen(*args, **kwargs):
         return _windows.Printout_SetPPIScreen(*args, **kwargs)
 
     def GetPPIScreen(*args, **kwargs):

-        """GetPPIScreen(int OUTPUT, int OUTPUT)"""
+        """GetPPIScreen() -> (x,y)"""

         return _windows.Printout_GetPPIScreen(*args, **kwargs)
 
     def SetPPIPrinter(*args, **kwargs):
         return _windows.Printout_GetPPIScreen(*args, **kwargs)
 
     def SetPPIPrinter(*args, **kwargs):


@@ -3345,7 +3325,7 @@ class Printout(core.Object):
         return _windows.Printout_SetPPIPrinter(*args, **kwargs)
 
     def GetPPIPrinter(*args, **kwargs):
         return _windows.Printout_SetPPIPrinter(*args, **kwargs)
 
     def GetPPIPrinter(*args, **kwargs):

-        """GetPPIPrinter(int OUTPUT, int OUTPUT)"""
+        """GetPPIPrinter() -> (x,y)"""

         return _windows.Printout_GetPPIPrinter(*args, **kwargs)
 
     def IsPreview(*args, **kwargs):
         return _windows.Printout_GetPPIPrinter(*args, **kwargs)
 
     def IsPreview(*args, **kwargs):


@@ -3376,14 +3356,14 @@ class Printout(core.Object):
         """base_OnPreparePrinting()"""
         return _windows.Printout_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)
 
     def base_HasPage(*args, **kwargs):
         """base_HasPage(int page) -> bool"""
         return _windows.Printout_base_HasPage(*args, **kwargs)
 

+    def base_GetPageInfo(*args, **kwargs):
+        """base_GetPageInfo() -> (minPage, maxPage, pageFrom, pageTo)"""
+        return _windows.Printout_base_GetPageInfo(*args, **kwargs)
+

 
 class PrintoutPtr(Printout):
     def __init__(self, this):
 
 class PrintoutPtr(Printout):
     def __init__(self, this):


@@ -3393,18 +3373,19 @@ class PrintoutPtr(Printout):
 _windows.Printout_swigregister(PrintoutPtr)
 
 class PreviewCanvas(ScrolledWindow):
 _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):
     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"""
+        """
+        __init__(PrintPreview preview, Window parent, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            String name=PreviewCanvasNameStr) -> PreviewCanvas
+        """

         newobj = _windows.new_PreviewCanvas(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _windows.new_PreviewCanvas(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-        self._self._setOORInfo(self)
+        self._setOORInfo(self)

 
 
 class PreviewCanvasPtr(PreviewCanvas):
 
 
 class PreviewCanvasPtr(PreviewCanvas):


@@ -3415,18 +3396,19 @@ class PreviewCanvasPtr(PreviewCanvas):
 _windows.PreviewCanvas_swigregister(PreviewCanvasPtr)
 
 class PreviewFrame(Frame):
 _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):
     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"""
+        """
+        __init__(PrintPreview preview, Frame parent, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> PreviewFrame
+        """

         newobj = _windows.new_PreviewFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _windows.new_PreviewFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-        self._self._setOORInfo(self)
+        self._setOORInfo(self)

 
     def Initialize(*args, **kwargs):
         """Initialize()"""
 
     def Initialize(*args, **kwargs):
         """Initialize()"""


@@ -3469,18 +3451,19 @@ ID_PREVIEW_FIRST = _windows.ID_PREVIEW_FIRST
 ID_PREVIEW_LAST = _windows.ID_PREVIEW_LAST
 ID_PREVIEW_GOTO = _windows.ID_PREVIEW_GOTO
 class PreviewControlBar(Panel):
 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):
     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"""
+        """
+        __init__(PrintPreview preview, long buttons, Window parent, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=TAB_TRAVERSAL, String name=PanelNameStr) -> PreviewControlBar
+        """

         newobj = _windows.new_PreviewControlBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _windows.new_PreviewControlBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-        self._self._setOORInfo(self)
+        self._setOORInfo(self)

 
     def GetZoomControl(*args, **kwargs):
         """GetZoomControl() -> int"""
 
     def GetZoomControl(*args, **kwargs):
         """GetZoomControl() -> int"""


@@ -3523,7 +3506,6 @@ class PreviewControlBarPtr(PreviewControlBar):
 _windows.PreviewControlBar_swigregister(PreviewControlBarPtr)
 
 class PrintPreview(core.Object):
 _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):
     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):


@@ -3569,11 +3551,11 @@ class PrintPreview(core.Object):
         return _windows.PrintPreview_GetCanvas(*args, **kwargs)
 
     def PaintPage(*args, **kwargs):
         return _windows.PrintPreview_GetCanvas(*args, **kwargs)
 
     def PaintPage(*args, **kwargs):

-        """PaintPage(PreviewCanvas canvas, wxDC dc) -> bool"""
+        """PaintPage(PreviewCanvas canvas, DC dc) -> bool"""

         return _windows.PrintPreview_PaintPage(*args, **kwargs)
 
     def DrawBlankPage(*args, **kwargs):
         return _windows.PrintPreview_PaintPage(*args, **kwargs)
 
     def DrawBlankPage(*args, **kwargs):

-        """DrawBlankPage(PreviewCanvas canvas, wxDC dc) -> bool"""
+        """DrawBlankPage(PreviewCanvas canvas, DC dc) -> bool"""

         return _windows.PrintPreview_DrawBlankPage(*args, **kwargs)
 
     def RenderPage(*args, **kwargs):
         return _windows.PrintPreview_DrawBlankPage(*args, **kwargs)
 
     def RenderPage(*args, **kwargs):


@@ -3630,7 +3612,6 @@ class PrintPreviewPtr(PrintPreview):
 _windows.PrintPreview_swigregister(PrintPreviewPtr)
 
 class PyPrintPreview(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):
     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):


@@ -3650,11 +3631,11 @@ class PyPrintPreview(PrintPreview):
         return _windows.PyPrintPreview_base_SetCurrentPage(*args, **kwargs)
 
     def base_PaintPage(*args, **kwargs):
         return _windows.PyPrintPreview_base_SetCurrentPage(*args, **kwargs)
 
     def base_PaintPage(*args, **kwargs):

-        """base_PaintPage(PreviewCanvas canvas, wxDC dc) -> bool"""
+        """base_PaintPage(PreviewCanvas canvas, DC dc) -> bool"""

         return _windows.PyPrintPreview_base_PaintPage(*args, **kwargs)
 
     def base_DrawBlankPage(*args, **kwargs):
         return _windows.PyPrintPreview_base_PaintPage(*args, **kwargs)
 
     def base_DrawBlankPage(*args, **kwargs):

-        """base_DrawBlankPage(PreviewCanvas canvas, wxDC dc) -> bool"""
+        """base_DrawBlankPage(PreviewCanvas canvas, DC dc) -> bool"""

         return _windows.PyPrintPreview_base_DrawBlankPage(*args, **kwargs)
 
     def base_RenderPage(*args, **kwargs):
         return _windows.PyPrintPreview_base_DrawBlankPage(*args, **kwargs)
 
     def base_RenderPage(*args, **kwargs):


@@ -3682,13 +3663,14 @@ class PyPrintPreviewPtr(PyPrintPreview):
 _windows.PyPrintPreview_swigregister(PyPrintPreviewPtr)
 
 class PyPreviewFrame(PreviewFrame):
 _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):
     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"""
+        """
+        __init__(PrintPreview preview, Frame parent, String title, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> PyPreviewFrame
+        """

         newobj = _windows.new_PyPreviewFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_PyPreviewFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -3728,13 +3710,14 @@ class PyPreviewFramePtr(PyPreviewFrame):
 _windows.PyPreviewFrame_swigregister(PyPreviewFramePtr)
 
 class PyPreviewControlBar(PreviewControlBar):
 _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):
     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"""
+        """
+        __init__(PrintPreview preview, long buttons, Window parent, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=0, String name=PanelNameStr) -> PyPreviewControlBar
+        """

         newobj = _windows.new_PyPreviewControlBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows.new_PyPreviewControlBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1