Respect the REUSEADDR flag to allow rebinding; bind to local port prior to connecting...

[wxWidgets.git] / wxPython / src / gtk / _windows.py

diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py
index 95c98e54191224a72c63eb4f5b4c4af22c527ed7..c730a91735f18962da44929e26cf9320a0c30ade 100644 (file)
--- a/wxPython/src/gtk/_windows.py
+++ b/wxPython/src/gtk/_windows.py
@@ -1,13 +1,55 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.

 # Don't modify this file, modify the SWIG interface instead.
 
 import _windows_
 
 # Don't modify this file, modify the SWIG interface instead.
 
 import _windows_
 

+def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
+    if (name == "this"):
+        if isinstance(value, class_type):
+            self.__dict__[name] = value.this
+            if hasattr(value,"thisown"): self.__dict__["thisown"] = value.thisown
+            del value.thisown
+            return
+    method = class_type.__swig_setmethods__.get(name,None)
+    if method: return method(self,value)
+    if (not static) or hasattr(self,name) or (name == "thisown"):
+        self.__dict__[name] = value
+    else:
+        raise AttributeError("You cannot add attributes to %s" % self)
+
+def _swig_setattr(self,class_type,name,value):
+    return _swig_setattr_nondynamic(self,class_type,name,value,0)
+
+def _swig_getattr(self,class_type,name):
+    method = class_type.__swig_getmethods__.get(name,None)
+    if method: return method(self)
+    raise AttributeError,name
+
+import types
+try:
+    _object = types.ObjectType
+    _newclass = 1
+except AttributeError:
+    class _object : pass
+    _newclass = 0
+del types
+
+
+def _swig_setattr_nondynamic_method(set):
+    def set_attr(self,name,value):
+        if hasattr(self,name) or (name in ("this", "thisown")):
+            set(self,name,value)
+        else:
+            raise AttributeError("You cannot add attributes to %s" % self)
+    return set_attr
+
+

 import _core
 wx = _core 
 #---------------------------------------------------------------------------
 
 class Panel(_core.Window):
 import _core
 wx = _core 
 #---------------------------------------------------------------------------
 
 class Panel(_core.Window):

+    """Proxy of C++ Panel class"""

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


@@ -27,6 +69,8 @@ class Panel(_core.Window):
         Create(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
             String name=PanelNameStr) -> bool
         Create(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
             String name=PanelNameStr) -> bool

+
+        Create the GUI part of the Window for 2-phase creation mode.

         """
         return _windows_.Panel_Create(*args, **kwargs)
 
         """
         return _windows_.Panel_Create(*args, **kwargs)
 


@@ -39,6 +83,28 @@ class Panel(_core.Window):
         """
         return _windows_.Panel_InitDialog(*args, **kwargs)
 
         """
         return _windows_.Panel_InitDialog(*args, **kwargs)
 

+    def SetFocus(*args, **kwargs):
+        """
+        SetFocus(self)
+
+        Overrides `wx.Window.SetFocus`.  This method uses the (undocumented)
+        mix-in class wxControlContainer which manages the focus and TAB logic
+        for controls which usually have child controls.  In practice, if you
+        call this method and the panel has at least one child window, then the
+        focus will be given to the child window.
+        """
+        return _windows_.Panel_SetFocus(*args, **kwargs)
+
+    def SetFocusIgnoringChildren(*args, **kwargs):
+        """
+        SetFocusIgnoringChildren(self)
+
+        In contrast to `SetFocus` (see above) this will set the focus to the
+        panel even of there are child windows in the panel. This is only
+        rarely needed.
+        """
+        return _windows_.Panel_SetFocusIgnoringChildren(*args, **kwargs)
+

     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes


@@ -91,6 +157,7 @@ def Panel_GetClassDefaultAttributes(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class ScrolledWindow(Panel):
 #---------------------------------------------------------------------------
 
 class ScrolledWindow(Panel):

+    """Proxy of C++ ScrolledWindow class"""

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


@@ -110,6 +177,8 @@ class ScrolledWindow(Panel):
         Create(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
             String name=PanelNameStr) -> bool
         Create(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
             String name=PanelNameStr) -> bool

+
+        Create the GUI part of the Window for 2-phase creation mode.

         """
         return _windows_.ScrolledWindow_Create(*args, **kwargs)
 
         """
         return _windows_.ScrolledWindow_Create(*args, **kwargs)
 


@@ -137,7 +206,11 @@ 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 units.
+        """

         return _windows_.ScrolledWindow_GetScrollPixelsPerUnit(*args, **kwargs)
 
     def EnableScrolling(*args, **kwargs):
         return _windows_.ScrolledWindow_GetScrollPixelsPerUnit(*args, **kwargs)
 
     def EnableScrolling(*args, **kwargs):


@@ -145,7 +218,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() -> (x,y)"""
+        """
+        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):


@@ -194,6 +271,14 @@ class ScrolledWindow(Panel):
         """GetTargetWindow(self) -> Window"""
         return _windows_.ScrolledWindow_GetTargetWindow(*args, **kwargs)
 
         """GetTargetWindow(self) -> Window"""
         return _windows_.ScrolledWindow_GetTargetWindow(*args, **kwargs)
 

+    def DoPrepareDC(*args, **kwargs):
+        """
+        DoPrepareDC(self, DC dc)
+
+        Normally what is called by `PrepareDC`.
+        """
+        return _windows_.ScrolledWindow_DoPrepareDC(*args, **kwargs)
+

     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes


@@ -266,6 +351,9 @@ FRAME_FLOAT_ON_PARENT = _windows_.FRAME_FLOAT_ON_PARENT
 FRAME_NO_WINDOW_MENU = _windows_.FRAME_NO_WINDOW_MENU
 FRAME_NO_TASKBAR = _windows_.FRAME_NO_TASKBAR
 FRAME_SHAPED = _windows_.FRAME_SHAPED
 FRAME_NO_WINDOW_MENU = _windows_.FRAME_NO_WINDOW_MENU
 FRAME_NO_TASKBAR = _windows_.FRAME_NO_TASKBAR
 FRAME_SHAPED = _windows_.FRAME_SHAPED

+FRAME_DRAWER = _windows_.FRAME_DRAWER
+FRAME_EX_METAL = _windows_.FRAME_EX_METAL
+DIALOG_EX_METAL = _windows_.DIALOG_EX_METAL

 DIALOG_MODAL = _windows_.DIALOG_MODAL
 DIALOG_MODELESS = _windows_.DIALOG_MODELESS
 USER_COLOURS = _windows_.USER_COLOURS
 DIALOG_MODAL = _windows_.DIALOG_MODAL
 DIALOG_MODELESS = _windows_.DIALOG_MODELESS
 USER_COLOURS = _windows_.USER_COLOURS


@@ -277,7 +365,10 @@ FULLSCREEN_NOBORDER = _windows_.FULLSCREEN_NOBORDER
 FULLSCREEN_NOCAPTION = _windows_.FULLSCREEN_NOCAPTION
 FULLSCREEN_ALL = _windows_.FULLSCREEN_ALL
 TOPLEVEL_EX_DIALOG = _windows_.TOPLEVEL_EX_DIALOG
 FULLSCREEN_NOCAPTION = _windows_.FULLSCREEN_NOCAPTION
 FULLSCREEN_ALL = _windows_.FULLSCREEN_ALL
 TOPLEVEL_EX_DIALOG = _windows_.TOPLEVEL_EX_DIALOG

+USER_ATTENTION_INFO = _windows_.USER_ATTENTION_INFO
+USER_ATTENTION_ERROR = _windows_.USER_ATTENTION_ERROR

 class TopLevelWindow(_core.Window):
 class TopLevelWindow(_core.Window):

+    """Proxy of C++ TopLevelWindow class"""

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


@@ -322,25 +413,33 @@ 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(self, String title)
-
-        Sets the window's title. Applicable only to frames and dialogs.
-        """
+        """SetTitle(self, String title)"""

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

-        """
-        GetTitle(self) -> String
-
-        Gets the window's title. Applicable only to frames and dialogs.
-        """
+        """GetTitle(self) -> String"""

         return _windows_.TopLevelWindow_GetTitle(*args, **kwargs)
 
     def SetShape(*args, **kwargs):
         """SetShape(self, Region region) -> bool"""
         return _windows_.TopLevelWindow_SetShape(*args, **kwargs)
 
         return _windows_.TopLevelWindow_GetTitle(*args, **kwargs)
 
     def SetShape(*args, **kwargs):
         """SetShape(self, Region region) -> bool"""
         return _windows_.TopLevelWindow_SetShape(*args, **kwargs)
 

+    def RequestUserAttention(*args, **kwargs):
+        """RequestUserAttention(self, int flags=USER_ATTENTION_INFO)"""
+        return _windows_.TopLevelWindow_RequestUserAttention(*args, **kwargs)
+
+    def IsActive(*args, **kwargs):
+        """IsActive(self) -> bool"""
+        return _windows_.TopLevelWindow_IsActive(*args, **kwargs)
+
+    def MacSetMetalAppearance(*args, **kwargs):
+        """MacSetMetalAppearance(self, bool on)"""
+        return _windows_.TopLevelWindow_MacSetMetalAppearance(*args, **kwargs)
+
+    def MacGetMetalAppearance(*args, **kwargs):
+        """MacGetMetalAppearance(self) -> bool"""
+        return _windows_.TopLevelWindow_MacGetMetalAppearance(*args, **kwargs)
+

 
 class TopLevelWindowPtr(TopLevelWindow):
     def __init__(self, this):
 
 class TopLevelWindowPtr(TopLevelWindow):
     def __init__(self, this):


@@ -357,6 +456,7 @@ ToolBarNameStr = cvar.ToolBarNameStr
 #---------------------------------------------------------------------------
 
 class Frame(TopLevelWindow):
 #---------------------------------------------------------------------------
 
 class Frame(TopLevelWindow):

+    """Proxy of C++ Frame class"""

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


@@ -408,8 +508,8 @@ class Frame(TopLevelWindow):
     Command = ProcessCommand 
     def CreateStatusBar(*args, **kwargs):
         """
     Command = ProcessCommand 
     def CreateStatusBar(*args, **kwargs):
         """

-        CreateStatusBar(self, int number=1, long style=wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE, 
-            int winid=0, String name=StatusLineNameStr) -> StatusBar
+        CreateStatusBar(self, int number=1, long style=DEFAULT_STATUSBAR_STYLE, int winid=0, 
+            String name=StatusLineNameStr) -> StatusBar

         """
         return _windows_.Frame_CreateStatusBar(*args, **kwargs)
 
         """
         return _windows_.Frame_CreateStatusBar(*args, **kwargs)
 


@@ -426,7 +526,7 @@ class Frame(TopLevelWindow):
         return _windows_.Frame_SetStatusText(*args, **kwargs)
 
     def SetStatusWidths(*args, **kwargs):
         return _windows_.Frame_SetStatusText(*args, **kwargs)
 
     def SetStatusWidths(*args, **kwargs):

-        """SetStatusWidths(self, int widths, int widths_field)"""
+        """SetStatusWidths(self, int widths)"""

         return _windows_.Frame_SetStatusWidths(*args, **kwargs)
 
     def PushStatusText(*args, **kwargs):
         return _windows_.Frame_SetStatusWidths(*args, **kwargs)
 
     def PushStatusText(*args, **kwargs):


@@ -517,8 +617,10 @@ def Frame_GetClassDefaultAttributes(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class Dialog(TopLevelWindow):
 #---------------------------------------------------------------------------
 
 class Dialog(TopLevelWindow):

+    """Proxy of C++ Dialog class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

+    ButtonSizerFlags = _windows_.Dialog_ButtonSizerFlags

     def __init__(self, *args, **kwargs):
         """
         __init__(self, Window parent, int id=-1, String title=EmptyString, 
     def __init__(self, *args, **kwargs):
         """
         __init__(self, Window parent, int id=-1, String title=EmptyString, 


@@ -552,9 +654,13 @@ class Dialog(TopLevelWindow):
         return _windows_.Dialog_CreateTextSizer(*args, **kwargs)
 
     def CreateButtonSizer(*args, **kwargs):
         return _windows_.Dialog_CreateTextSizer(*args, **kwargs)
 
     def CreateButtonSizer(*args, **kwargs):

-        """CreateButtonSizer(self, long flags) -> Sizer"""
+        """CreateButtonSizer(self, long flags, bool separated=False, int distance=0) -> Sizer"""

         return _windows_.Dialog_CreateButtonSizer(*args, **kwargs)
 
         return _windows_.Dialog_CreateButtonSizer(*args, **kwargs)
 

+    def CreateStdDialogButtonSizer(*args, **kwargs):
+        """CreateStdDialogButtonSizer(self, long flags) -> StdDialogButtonSizer"""
+        return _windows_.Dialog_CreateStdDialogButtonSizer(*args, **kwargs)
+

     def IsModal(*args, **kwargs):
         """IsModal(self) -> bool"""
         return _windows_.Dialog_IsModal(*args, **kwargs)
     def IsModal(*args, **kwargs):
         """IsModal(self) -> bool"""
         return _windows_.Dialog_IsModal(*args, **kwargs)


@@ -619,6 +725,7 @@ def Dialog_GetClassDefaultAttributes(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class MiniFrame(Frame):
 #---------------------------------------------------------------------------
 
 class MiniFrame(Frame):

+    """Proxy of C++ MiniFrame class"""

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


@@ -663,6 +770,7 @@ 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):

+    """Proxy of C++ SplashScreenWindow class"""

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


@@ -693,6 +801,7 @@ class SplashScreenWindowPtr(SplashScreenWindow):
 _windows_.SplashScreenWindow_swigregister(SplashScreenWindowPtr)
 
 class SplashScreen(Frame):
 _windows_.SplashScreenWindow_swigregister(SplashScreenWindowPtr)
 
 class SplashScreen(Frame):

+    """Proxy of C++ SplashScreen class"""

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


@@ -729,12 +838,16 @@ _windows_.SplashScreen_swigregister(SplashScreenPtr)
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

+SB_NORMAL = _windows_.SB_NORMAL
+SB_FLAT = _windows_.SB_FLAT
+SB_RAISED = _windows_.SB_RAISED

 class StatusBar(_core.Window):
 class StatusBar(_core.Window):

+    """Proxy of C++ StatusBar class"""

     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__(self, Window parent, int id=-1, long style=wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE, 
+        __init__(self, Window parent, int id=-1, long style=DEFAULT_STATUSBAR_STYLE, 

             String name=StatusLineNameStr) -> StatusBar
         """
         newobj = _windows_.new_StatusBar(*args, **kwargs)
             String name=StatusLineNameStr) -> StatusBar
         """
         newobj = _windows_.new_StatusBar(*args, **kwargs)


@@ -772,9 +885,13 @@ class StatusBar(_core.Window):
         return _windows_.StatusBar_PopStatusText(*args, **kwargs)
 
     def SetStatusWidths(*args, **kwargs):
         return _windows_.StatusBar_PopStatusText(*args, **kwargs)
 
     def SetStatusWidths(*args, **kwargs):

-        """SetStatusWidths(self, int widths, int widths_field)"""
+        """SetStatusWidths(self, int widths)"""

         return _windows_.StatusBar_SetStatusWidths(*args, **kwargs)
 
         return _windows_.StatusBar_SetStatusWidths(*args, **kwargs)
 

+    def SetStatusStyles(*args, **kwargs):
+        """SetStatusStyles(self, int styles)"""
+        return _windows_.StatusBar_SetStatusStyles(*args, **kwargs)
+

     def GetFieldRect(*args, **kwargs):
         """GetFieldRect(self, int i) -> Rect"""
         return _windows_.StatusBar_GetFieldRect(*args, **kwargs)
     def GetFieldRect(*args, **kwargs):
         """GetFieldRect(self, int i) -> Rect"""
         return _windows_.StatusBar_GetFieldRect(*args, **kwargs)


@@ -927,7 +1044,7 @@ class SplitterWindow(_core.Window):
 
         Initializes the splitter window to have one pane.  This should be
         called if you wish to initially view only a single pane in the
 
         Initializes the splitter window to have one pane.  This should be
         called if you wish to initially view only a single pane in the

-        splitter window.
+        splitter window.  The child window is shown if it is currently hidden.

         """
         return _windows_.SplitterWindow_Initialize(*args, **kwargs)
 
         """
         return _windows_.SplitterWindow_Initialize(*args, **kwargs)
 


@@ -935,7 +1052,8 @@ class SplitterWindow(_core.Window):
         """
         SplitVertically(self, Window window1, Window window2, int sashPosition=0) -> bool
 
         """
         SplitVertically(self, Window window1, Window window2, int sashPosition=0) -> bool
 

-        Initializes the left and right panes of the splitter window.
+        Initializes the left and right panes of the splitter window.  The
+        child windows are shown if they are currently hidden.

         """
         return _windows_.SplitterWindow_SplitVertically(*args, **kwargs)
 
         """
         return _windows_.SplitterWindow_SplitVertically(*args, **kwargs)
 


@@ -943,7 +1061,8 @@ class SplitterWindow(_core.Window):
         """
         SplitHorizontally(self, Window window1, Window window2, int sashPosition=0) -> bool
 
         """
         SplitHorizontally(self, Window window1, Window window2, int sashPosition=0) -> bool
 

-        Initializes the top and bottom panes of the splitter window.
+        Initializes the top and bottom panes of the splitter window.  The
+        child windows are shown if they are currently hidden.

         """
         return _windows_.SplitterWindow_SplitHorizontally(*args, **kwargs)
 
         """
         return _windows_.SplitterWindow_SplitHorizontally(*args, **kwargs)
 


@@ -1008,7 +1127,7 @@ class SplitterWindow(_core.Window):
         """
         SetSashSize(self, int width)
 
         """
         SetSashSize(self, int width)
 

-        Sets the sash size
+        Sets the sash size.

         """
         return _windows_.SplitterWindow_SetSashSize(*args, **kwargs)
 
         """
         return _windows_.SplitterWindow_SetSashSize(*args, **kwargs)
 


@@ -1016,7 +1135,7 @@ class SplitterWindow(_core.Window):
         """
         SetBorderSize(self, int width)
 
         """
         SetBorderSize(self, int width)
 

-        Sets the border size
+        Sets the border size. Currently a NOP.

         """
         return _windows_.SplitterWindow_SetBorderSize(*args, **kwargs)
 
         """
         return _windows_.SplitterWindow_SetBorderSize(*args, **kwargs)
 


@@ -1053,6 +1172,28 @@ class SplitterWindow(_core.Window):
         """
         return _windows_.SplitterWindow_GetSashPosition(*args, **kwargs)
 
         """
         return _windows_.SplitterWindow_GetSashPosition(*args, **kwargs)
 

+    def SetSashGravity(*args, **kwargs):
+        """
+        SetSashGravity(self, double gravity)
+
+        Set the sash gravity.  Gravity is a floating-point factor between 0.0
+        and 1.0 which controls position of sash while resizing the
+        `wx.SplitterWindow`.  The gravity specifies how much the left/top
+        window will grow while resizing.
+        """
+        return _windows_.SplitterWindow_SetSashGravity(*args, **kwargs)
+
+    def GetSashGravity(*args, **kwargs):
+        """
+        GetSashGravity(self) -> double
+
+        Gets the sash gravity.
+
+        :see: `SetSashGravity`
+
+        """
+        return _windows_.SplitterWindow_GetSashGravity(*args, **kwargs)
+

     def SetMinimumPaneSize(*args, **kwargs):
         """
         SetMinimumPaneSize(self, int min)
     def SetMinimumPaneSize(*args, **kwargs):
         """
         SetMinimumPaneSize(self, int min)


@@ -1172,7 +1313,7 @@ class SplitterEvent(_core.NotifyEvent):
         """
         SetSashPosition(self, int pos)
 
         """
         SetSashPosition(self, int pos)
 

-        This funciton is only meaningful during EVT_SPLITTER_SASH_POS_CHANGING
+        This function is only meaningful during EVT_SPLITTER_SASH_POS_CHANGING

         and EVT_SPLITTER_SASH_POS_CHANGED events.  In the case of _CHANGED
         events, sets the the new sash position. In the case of _CHANGING
         events, sets the new tracking bar position so visual feedback during
         and EVT_SPLITTER_SASH_POS_CHANGED events.  In the case of _CHANGED
         events, sets the the new sash position. In the case of _CHANGING
         events, sets the new tracking bar position so visual feedback during


@@ -1251,6 +1392,7 @@ 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):

+    """Proxy of C++ SashWindow class"""

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


@@ -1368,6 +1510,7 @@ 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):

+    """Proxy of C++ SashEvent class"""

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


@@ -1428,6 +1571,7 @@ 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):

+    """Proxy of C++ QueryLayoutInfoEvent class"""

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


@@ -1485,6 +1629,7 @@ class QueryLayoutInfoEventPtr(QueryLayoutInfoEvent):
 _windows_.QueryLayoutInfoEvent_swigregister(QueryLayoutInfoEventPtr)
 
 class CalculateLayoutEvent(_core.Event):
 _windows_.QueryLayoutInfoEvent_swigregister(QueryLayoutInfoEventPtr)
 
 class CalculateLayoutEvent(_core.Event):

+    """Proxy of C++ CalculateLayoutEvent class"""

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


@@ -1521,6 +1666,7 @@ 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):

+    """Proxy of C++ SashLayoutWindow class"""

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


@@ -1578,6 +1724,7 @@ def PreSashLayoutWindow(*args, **kwargs):
     return val
 
 class LayoutAlgorithm(_core.Object):
     return val
 
 class LayoutAlgorithm(_core.Object):

+    """Proxy of C++ LayoutAlgorithm class"""

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


@@ -1615,6 +1762,7 @@ _windows_.LayoutAlgorithm_swigregister(LayoutAlgorithmPtr)
 #---------------------------------------------------------------------------
 
 class PopupWindow(_core.Window):
 #---------------------------------------------------------------------------
 
 class PopupWindow(_core.Window):

+    """Proxy of C++ PopupWindow class"""

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


@@ -1650,6 +1798,7 @@ def PrePopupWindow(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class PopupTransientWindow(PopupWindow):
 #---------------------------------------------------------------------------
 
 class PopupTransientWindow(PopupWindow):

+    """Proxy of C++ PopupTransientWindow class"""

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


@@ -1689,6 +1838,7 @@ def PrePopupTransientWindow(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class TipWindow(PopupTransientWindow):
 #---------------------------------------------------------------------------
 
 class TipWindow(PopupTransientWindow):

+    """Proxy of C++ TipWindow class"""

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


@@ -1704,7 +1854,14 @@ class TipWindow(PopupTransientWindow):
         return _windows_.TipWindow_SetBoundingRect(*args, **kwargs)
 
     def Close(*args, **kwargs):
         return _windows_.TipWindow_SetBoundingRect(*args, **kwargs)
 
     def Close(*args, **kwargs):

-        """Close(self)"""
+        """
+        Close(self)
+
+        This function simply generates a EVT_CLOSE event whose handler usually
+        tries to close the window. It doesn't close the window itself,
+        however.  If force is False (the default) then the window's close
+        handler will be allowed to veto the destruction of the window.
+        """

         return _windows_.TipWindow_Close(*args, **kwargs)
 
 
         return _windows_.TipWindow_Close(*args, **kwargs)
 
 


@@ -1718,6 +1875,7 @@ _windows_.TipWindow_swigregister(TipWindowPtr)
 #---------------------------------------------------------------------------
 
 class VScrolledWindow(Panel):
 #---------------------------------------------------------------------------
 
 class VScrolledWindow(Panel):

+    """Proxy of C++ VScrolledWindow class"""

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


@@ -1780,13 +1938,13 @@ class VScrolledWindow(Panel):
         """RefreshLines(self, size_t from, size_t to)"""
         return _windows_.VScrolledWindow_RefreshLines(*args, **kwargs)
 
         """RefreshLines(self, size_t from, size_t to)"""
         return _windows_.VScrolledWindow_RefreshLines(*args, **kwargs)
 

-    def HitTestXT(*args, **kwargs):
+    def HitTestXY(*args, **kwargs):

         """
         """

-        HitTestXT(self, int x, int y) -> int
+        HitTestXY(self, int x, int y) -> int

 
         Test where the given (in client coords) point lies
         """
 
         Test where the given (in client coords) point lies
         """

-        return _windows_.VScrolledWindow_HitTestXT(*args, **kwargs)
+        return _windows_.VScrolledWindow_HitTestXY(*args, **kwargs)

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


@@ -1804,6 +1962,18 @@ class VScrolledWindow(Panel):
         """GetLineCount(self) -> size_t"""
         return _windows_.VScrolledWindow_GetLineCount(*args, **kwargs)
 
         """GetLineCount(self) -> size_t"""
         return _windows_.VScrolledWindow_GetLineCount(*args, **kwargs)
 

+    def GetVisibleBegin(*args, **kwargs):
+        """GetVisibleBegin(self) -> size_t"""
+        return _windows_.VScrolledWindow_GetVisibleBegin(*args, **kwargs)
+
+    def GetVisibleEnd(*args, **kwargs):
+        """GetVisibleEnd(self) -> size_t"""
+        return _windows_.VScrolledWindow_GetVisibleEnd(*args, **kwargs)
+
+    def IsVisible(*args, **kwargs):
+        """IsVisible(self, size_t line) -> bool"""
+        return _windows_.VScrolledWindow_IsVisible(*args, **kwargs)
+

     def GetFirstVisibleLine(*args, **kwargs):
         """GetFirstVisibleLine(self) -> size_t"""
         return _windows_.VScrolledWindow_GetFirstVisibleLine(*args, **kwargs)
     def GetFirstVisibleLine(*args, **kwargs):
         """GetFirstVisibleLine(self) -> size_t"""
         return _windows_.VScrolledWindow_GetFirstVisibleLine(*args, **kwargs)


@@ -1812,10 +1982,6 @@ class VScrolledWindow(Panel):
         """GetLastVisibleLine(self) -> size_t"""
         return _windows_.VScrolledWindow_GetLastVisibleLine(*args, **kwargs)
 
         """GetLastVisibleLine(self) -> size_t"""
         return _windows_.VScrolledWindow_GetLastVisibleLine(*args, **kwargs)
 

-    def IsVisible(*args, **kwargs):
-        """IsVisible(self, size_t line) -> bool"""
-        return _windows_.VScrolledWindow_IsVisible(*args, **kwargs)
-

 
 class VScrolledWindowPtr(VScrolledWindow):
     def __init__(self, this):
 
 class VScrolledWindowPtr(VScrolledWindow):
     def __init__(self, this):


@@ -1831,6 +1997,7 @@ def PreVScrolledWindow(*args, **kwargs):
     return val
 
 class VListBox(VScrolledWindow):
     return val
 
 class VListBox(VScrolledWindow):

+    """Proxy of C++ VListBox class"""

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


@@ -1955,6 +2122,7 @@ def PreVListBox(*args, **kwargs):
     return val
 
 class HtmlListBox(VListBox):
     return val
 
 class HtmlListBox(VListBox):

+    """Proxy of C++ HtmlListBox class"""

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


@@ -2008,27 +2176,36 @@ def PreHtmlListBox(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class TaskBarIcon(_core.EvtHandler):
 #---------------------------------------------------------------------------
 
 class TaskBarIcon(_core.EvtHandler):

+    """Proxy of C++ TaskBarIcon class"""

     def __repr__(self):
     def __repr__(self):

-        return "<%s.%s; proxy of C++ wxTaskBarIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+        return "<%s.%s; proxy of C++ wxPyTaskBarIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
         """__init__(self) -> TaskBarIcon"""
         newobj = _windows_.new_TaskBarIcon(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __init__(self, *args, **kwargs):
         """__init__(self) -> TaskBarIcon"""
         newobj = _windows_.new_TaskBarIcon(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

+        self._setCallbackInfo(self, TaskBarIcon, 0)
+

     def __del__(self, destroy=_windows_.delete_TaskBarIcon):
         """__del__(self)"""
         try:
             if self.thisown: destroy(self)
         except: pass
 
     def __del__(self, destroy=_windows_.delete_TaskBarIcon):
         """__del__(self)"""
         try:
             if self.thisown: destroy(self)
         except: pass
 

+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)"""
+        return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs)
+

     def Destroy(*args, **kwargs):
         """
         Destroy(self)
 
         Deletes the C++ object this Python object is a proxy for.
         """
     def Destroy(*args, **kwargs):
         """
         Destroy(self)
 
         Deletes the C++ object this Python object is a proxy for.
         """

-        return _windows_.TaskBarIcon_Destroy(*args, **kwargs)
+        val = _windows_.TaskBarIcon_Destroy(*args, **kwargs)
+        args[0].thisown = 0
+        return val

 
     def IsOk(*args, **kwargs):
         """IsOk(self) -> bool"""
 
     def IsOk(*args, **kwargs):
         """IsOk(self) -> bool"""


@@ -2060,10 +2237,11 @@ class TaskBarIconPtr(TaskBarIcon):
 _windows_.TaskBarIcon_swigregister(TaskBarIconPtr)
 
 class TaskBarIconEvent(_core.Event):
 _windows_.TaskBarIcon_swigregister(TaskBarIconPtr)
 
 class TaskBarIconEvent(_core.Event):

+    """Proxy of C++ TaskBarIconEvent class"""

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

-        """__init__(self, wxEventType evtType, TaskBarIcon tbIcon) -> TaskBarIconEvent"""
+        """__init__(self, wxEventType evtType, wxTaskBarIcon tbIcon) -> TaskBarIconEvent"""

         newobj = _windows_.new_TaskBarIconEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _windows_.new_TaskBarIconEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -2221,6 +2399,13 @@ class ColourDialogPtr(ColourDialog):
         self.__class__ = ColourDialog
 _windows_.ColourDialog_swigregister(ColourDialogPtr)
 
         self.__class__ = ColourDialog
 _windows_.ColourDialog_swigregister(ColourDialogPtr)
 

+
+def GetColourFromUser(*args, **kwargs):
+    """
+    GetColourFromUser(Window parent=(wxWindow *) NULL, Colour colInit=wxNullColour, 
+        String caption=EmptyString) -> Colour
+    """
+    return _windows_.GetColourFromUser(*args, **kwargs)

 class DirDialog(Dialog):
     """
     wx.DirDialog allows the user to select a directory by browising the
 class DirDialog(Dialog):
     """
     wx.DirDialog allows the user to select a directory by browising the


@@ -2468,11 +2653,22 @@ class MultiChoiceDialog(Dialog):
         return "<%s.%s; proxy of C++ wxMultiChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         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, String message, String caption,
-            List choices=[], long style=CHOICEDLG_STYLE,
+        __init__(self, Window parent, String message, String caption,
+            List choices=EmptyList, long style=CHOICEDLG_STYLE,

             Point pos=DefaultPosition) -> MultiChoiceDialog
 
             Point pos=DefaultPosition) -> MultiChoiceDialog
 

-        Constructor.  Use ShowModal method to show the dialog.
+        Constructor.  Use the `ShowModal` method to show the dialog.
+
+            :param parent: The parent window.
+            :param message: Text to display above the list of selections.
+            :param caption: Text to use in the title bar of the dialog.
+            :param choices: A list of strings or unicode objects that the
+                user is allowed to choose from.
+            :param style: Styles to apply to the dialog.  The default value is
+                equivallent to wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER|wx.OK|wx.CANCEL|wx.CENTER.
+            :param pos: Where to position the dialog (not used on Windows)
+
+

         """
         newobj = _windows_.new_MultiChoiceDialog(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _windows_.new_MultiChoiceDialog(*args, **kwargs)
         self.this = newobj.this


@@ -2481,7 +2677,13 @@ class MultiChoiceDialog(Dialog):
         self._setOORInfo(self)
 
     def SetSelections(*args, **kwargs):
         self._setOORInfo(self)
 
     def SetSelections(*args, **kwargs):

-        """SetSelections(List selections)"""
+        """
+        SetSelections(List selections)
+
+        Specify the items in the list that should be selected, using a list of
+        integers.  The list should specify the indexes of the items that
+        should be selected.
+        """

         return _windows_.MultiChoiceDialog_SetSelections(*args, **kwargs)
 
     def GetSelections(*args, **kwargs):
         return _windows_.MultiChoiceDialog_SetSelections(*args, **kwargs)
 
     def GetSelections(*args, **kwargs):


@@ -2489,6 +2691,7 @@ class MultiChoiceDialog(Dialog):
         GetSelections() -> [selections]
 
         Returns a list of integers representing the items that are selected.
         GetSelections() -> [selections]
 
         Returns a list of integers representing the items that are selected.

+        If an item is selected then its index will appear in the list.

         """
         return _windows_.MultiChoiceDialog_GetSelections(*args, **kwargs)
 
         """
         return _windows_.MultiChoiceDialog_GetSelections(*args, **kwargs)
 


@@ -2507,7 +2710,7 @@ class SingleChoiceDialog(Dialog):
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, String message, String caption,
     def __init__(self, *args, **kwargs):
         """
         __init__(Window parent, String message, String caption,

-            List choices=[], long style=CHOICEDLG_STYLE,
+            List choices=EmptyList, long style=CHOICEDLG_STYLE,

             Point pos=DefaultPosition) -> SingleChoiceDialog
 
         Constructor.  Use ShowModal method to show the dialog.
             Point pos=DefaultPosition) -> SingleChoiceDialog
 
         Constructor.  Use ShowModal method to show the dialog.


@@ -2550,6 +2753,7 @@ class SingleChoiceDialogPtr(SingleChoiceDialog):
         self.__class__ = SingleChoiceDialog
 _windows_.SingleChoiceDialog_swigregister(SingleChoiceDialogPtr)
 
         self.__class__ = SingleChoiceDialog
 _windows_.SingleChoiceDialog_swigregister(SingleChoiceDialogPtr)
 

+TextEntryDialogStyle = _windows_.TextEntryDialogStyle

 class TextEntryDialog(Dialog):
     """A dialog with text control, [ok] and [cancel] buttons"""
     def __repr__(self):
 class TextEntryDialog(Dialog):
     """A dialog with text control, [ok] and [cancel] buttons"""
     def __repr__(self):


@@ -2558,7 +2762,7 @@ class TextEntryDialog(Dialog):
         """
         __init__(self, Window parent, String message, String caption=GetTextFromUserPromptStr, 
             String defaultValue=EmptyString, 
         """
         __init__(self, Window parent, String message, String caption=GetTextFromUserPromptStr, 
             String defaultValue=EmptyString, 

-            long style=wxOK|wxCANCEL|wxCENTRE, Point pos=DefaultPosition) -> TextEntryDialog
+            long style=TextEntryDialogStyle, Point pos=DefaultPosition) -> TextEntryDialog

 
         Constructor.  Use ShowModal method to show the dialog.
         """
 
         Constructor.  Use ShowModal method to show the dialog.
         """


@@ -2593,6 +2797,29 @@ class TextEntryDialogPtr(TextEntryDialog):
         self.__class__ = TextEntryDialog
 _windows_.TextEntryDialog_swigregister(TextEntryDialogPtr)
 
         self.__class__ = TextEntryDialog
 _windows_.TextEntryDialog_swigregister(TextEntryDialogPtr)
 

+class PasswordEntryDialog(TextEntryDialog):
+    """Proxy of C++ PasswordEntryDialog class"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPasswordEntryDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self, Window parent, String message, String caption=GetPasswordFromUserPromptStr, 
+            String value=EmptyString, 
+            long style=TextEntryDialogStyle, Point pos=DefaultPosition) -> PasswordEntryDialog
+        """
+        newobj = _windows_.new_PasswordEntryDialog(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+
+class PasswordEntryDialogPtr(PasswordEntryDialog):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PasswordEntryDialog
+_windows_.PasswordEntryDialog_swigregister(PasswordEntryDialogPtr)
+GetPasswordFromUserPromptStr = cvar.GetPasswordFromUserPromptStr
+

 class FontData(_core.Object):
     """
     This class holds a variety of information related to font dialogs and
 class FontData(_core.Object):
     """
     This class holds a variety of information related to font dialogs and


@@ -2782,6 +3009,10 @@ class FontDialogPtr(FontDialog):
         self.__class__ = FontDialog
 _windows_.FontDialog_swigregister(FontDialogPtr)
 
         self.__class__ = FontDialog
 _windows_.FontDialog_swigregister(FontDialogPtr)
 

+
+def GetFontFromUser(*args, **kwargs):
+    """GetFontFromUser(Window parent=None, Font fontInit=wxNullFont, String caption=EmptyString) -> Font"""
+    return _windows_.GetFontFromUser(*args, **kwargs)

 class MessageDialog(Dialog):
     """
     This class provides a simple dialog that shows a single or multi-line
 class MessageDialog(Dialog):
     """
     This class provides a simple dialog that shows a single or multi-line


@@ -2838,8 +3069,10 @@ class ProgressDialog(Frame):
         Update(self, int value, String newmsg=EmptyString) -> bool
 
         Updates the dialog, setting the progress bar to the new value and, if
         Update(self, int value, String newmsg=EmptyString) -> bool
 
         Updates the dialog, setting the progress bar to the new value and, if

-        given changes the message above it. Returns true unless the Cancel
-        button has been pressed.
+        given changes the message above it. The value given should be less
+        than or equal to the maximum value given to the constructor and the
+        dialog is closed if it is equal to the maximum.  Returns True unless
+        the Cancel button has been pressed.

 
         If false is returned, the application can either immediately destroy
         the dialog or ask the user for the confirmation and if the abort is
 
         If false is returned, the application can either immediately destroy
         the dialog or ask the user for the confirmation and if the abort is


@@ -3119,9 +3352,11 @@ IDM_WINDOWCASCADE = _windows_.IDM_WINDOWCASCADE
 IDM_WINDOWICONS = _windows_.IDM_WINDOWICONS
 IDM_WINDOWNEXT = _windows_.IDM_WINDOWNEXT
 IDM_WINDOWTILEVERT = _windows_.IDM_WINDOWTILEVERT
 IDM_WINDOWICONS = _windows_.IDM_WINDOWICONS
 IDM_WINDOWNEXT = _windows_.IDM_WINDOWNEXT
 IDM_WINDOWTILEVERT = _windows_.IDM_WINDOWTILEVERT

+IDM_WINDOWPREV = _windows_.IDM_WINDOWPREV

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

+    """Proxy of C++ MDIParentFrame class"""

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


@@ -3175,7 +3410,7 @@ class MDIParentFrame(Frame):
         return _windows_.MDIParentFrame_GetToolBar(*args, **kwargs)
 
     def Tile(*args, **kwargs):
         return _windows_.MDIParentFrame_GetToolBar(*args, **kwargs)
 
     def Tile(*args, **kwargs):

-        """Tile(self)"""
+        """Tile(self, int orient=HORIZONTAL)"""

         return _windows_.MDIParentFrame_Tile(*args, **kwargs)
 
 
         return _windows_.MDIParentFrame_Tile(*args, **kwargs)
 
 


@@ -3193,6 +3428,7 @@ def PreMDIParentFrame(*args, **kwargs):
     return val
 
 class MDIChildFrame(Frame):
     return val
 
 class MDIChildFrame(Frame):

+    """Proxy of C++ MDIChildFrame class"""

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


@@ -3222,7 +3458,7 @@ class MDIChildFrame(Frame):
         return _windows_.MDIChildFrame_Activate(*args, **kwargs)
 
     def Maximize(*args, **kwargs):
         return _windows_.MDIChildFrame_Activate(*args, **kwargs)
 
     def Maximize(*args, **kwargs):

-        """Maximize(self, bool maximize)"""
+        """Maximize(self, bool maximize=True)"""

         return _windows_.MDIChildFrame_Maximize(*args, **kwargs)
 
     def Restore(*args, **kwargs):
         return _windows_.MDIChildFrame_Maximize(*args, **kwargs)
 
     def Restore(*args, **kwargs):


@@ -3244,6 +3480,7 @@ def PreMDIChildFrame(*args, **kwargs):
     return val
 
 class MDIClientWindow(_core.Window):
     return val
 
 class MDIClientWindow(_core.Window):

+    """Proxy of C++ MDIClientWindow class"""

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


@@ -3275,6 +3512,7 @@ def PreMDIClientWindow(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class PyWindow(_core.Window):
 #---------------------------------------------------------------------------
 
 class PyWindow(_core.Window):

+    """Proxy of C++ PyWindow class"""

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


@@ -3296,89 +3534,254 @@ class PyWindow(_core.Window):
         """SetBestSize(self, Size size)"""
         return _windows_.PyWindow_SetBestSize(*args, **kwargs)
 
         """SetBestSize(self, Size size)"""
         return _windows_.PyWindow_SetBestSize(*args, **kwargs)
 

-    def base_DoMoveWindow(*args, **kwargs):
-        """base_DoMoveWindow(self, int x, int y, int width, int height)"""
-        return _windows_.PyWindow_base_DoMoveWindow(*args, **kwargs)
+    def DoEraseBackground(*args, **kwargs):
+        """DoEraseBackground(self, DC dc) -> bool"""
+        return _windows_.PyWindow_DoEraseBackground(*args, **kwargs)

 
 

-    def base_DoSetSize(*args, **kwargs):
-        """base_DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
-        return _windows_.PyWindow_base_DoSetSize(*args, **kwargs)
+    def DoMoveWindow(*args, **kwargs):
+        """DoMoveWindow(self, int x, int y, int width, int height)"""
+        return _windows_.PyWindow_DoMoveWindow(*args, **kwargs)

 
 

-    def base_DoSetClientSize(*args, **kwargs):
-        """base_DoSetClientSize(self, int width, int height)"""
-        return _windows_.PyWindow_base_DoSetClientSize(*args, **kwargs)
+    def DoSetSize(*args, **kwargs):
+        """DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
+        return _windows_.PyWindow_DoSetSize(*args, **kwargs)

 
 

-    def base_DoSetVirtualSize(*args, **kwargs):
-        """base_DoSetVirtualSize(self, int x, int y)"""
-        return _windows_.PyWindow_base_DoSetVirtualSize(*args, **kwargs)
+    def DoSetClientSize(*args, **kwargs):
+        """DoSetClientSize(self, int width, int height)"""
+        return _windows_.PyWindow_DoSetClientSize(*args, **kwargs)

 
 

-    def base_DoGetSize(*args, **kwargs):
-        """base_DoGetSize() -> (width, height)"""
-        return _windows_.PyWindow_base_DoGetSize(*args, **kwargs)
+    def DoSetVirtualSize(*args, **kwargs):
+        """DoSetVirtualSize(self, int x, int y)"""
+        return _windows_.PyWindow_DoSetVirtualSize(*args, **kwargs)

 
 

-    def base_DoGetClientSize(*args, **kwargs):
-        """base_DoGetClientSize() -> (width, height)"""
-        return _windows_.PyWindow_base_DoGetClientSize(*args, **kwargs)
+    def DoGetSize(*args, **kwargs):
+        """DoGetSize() -> (width, height)"""
+        return _windows_.PyWindow_DoGetSize(*args, **kwargs)

 
 

-    def base_DoGetPosition(*args, **kwargs):
-        """base_DoGetPosition() -> (x,y)"""
-        return _windows_.PyWindow_base_DoGetPosition(*args, **kwargs)
+    def DoGetClientSize(*args, **kwargs):
+        """DoGetClientSize() -> (width, height)"""
+        return _windows_.PyWindow_DoGetClientSize(*args, **kwargs)

 
 

-    def base_DoGetVirtualSize(*args, **kwargs):
-        """base_DoGetVirtualSize(self) -> Size"""
-        return _windows_.PyWindow_base_DoGetVirtualSize(*args, **kwargs)
+    def DoGetPosition(*args, **kwargs):
+        """DoGetPosition() -> (x,y)"""
+        return _windows_.PyWindow_DoGetPosition(*args, **kwargs)

 
 

-    def base_DoGetBestSize(*args, **kwargs):
-        """base_DoGetBestSize(self) -> Size"""
-        return _windows_.PyWindow_base_DoGetBestSize(*args, **kwargs)
+    def DoGetVirtualSize(*args, **kwargs):
+        """DoGetVirtualSize(self) -> Size"""
+        return _windows_.PyWindow_DoGetVirtualSize(*args, **kwargs)

 
 

-    def base_InitDialog(*args, **kwargs):
-        """base_InitDialog(self)"""
-        return _windows_.PyWindow_base_InitDialog(*args, **kwargs)
+    def DoGetBestSize(*args, **kwargs):
+        """DoGetBestSize(self) -> Size"""
+        return _windows_.PyWindow_DoGetBestSize(*args, **kwargs)

 
 

-    def base_TransferDataToWindow(*args, **kwargs):
-        """base_TransferDataToWindow(self) -> bool"""
-        return _windows_.PyWindow_base_TransferDataToWindow(*args, **kwargs)
+    def InitDialog(*args, **kwargs):
+        """
+        InitDialog(self)
+
+        Sends an EVT_INIT_DIALOG event, whose handler usually transfers data
+        to the dialog via validators.
+        """
+        return _windows_.PyWindow_InitDialog(*args, **kwargs)
+
+    def TransferDataToWindow(*args, **kwargs):
+        """
+        TransferDataToWindow(self) -> bool
+
+        Transfers values to child controls from data areas specified by their
+        validators.  If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra
+        style flag set, the method will also call TransferDataToWindow() of
+        all child windows.
+        """
+        return _windows_.PyWindow_TransferDataToWindow(*args, **kwargs)
+
+    def TransferDataFromWindow(*args, **kwargs):
+        """
+        TransferDataFromWindow(self) -> bool
+
+        Transfers values from child controls to data areas specified by their
+        validators. Returns false if a transfer failed.  If the window has
+        wx.WS_EX_VALIDATE_RECURSIVELY extra style flag set, the method will
+        also call TransferDataFromWindow() of all child windows.
+        """
+        return _windows_.PyWindow_TransferDataFromWindow(*args, **kwargs)
+
+    def Validate(*args, **kwargs):
+        """
+        Validate(self) -> bool
+
+        Validates the current values of the child controls using their
+        validators.  If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra
+        style flag set, the method will also call Validate() of all child
+        windows.  Returns false if any of the validations failed.
+        """
+        return _windows_.PyWindow_Validate(*args, **kwargs)
+
+    def AcceptsFocus(*args, **kwargs):
+        """
+        AcceptsFocus(self) -> bool
+
+        Can this window have focus?
+        """
+        return _windows_.PyWindow_AcceptsFocus(*args, **kwargs)
+
+    def AcceptsFocusFromKeyboard(*args, **kwargs):
+        """
+        AcceptsFocusFromKeyboard(self) -> bool
+
+        Can this window be given focus by keyboard navigation? if not, the
+        only way to give it focus (provided it accepts it at all) is to click
+        it.
+        """
+        return _windows_.PyWindow_AcceptsFocusFromKeyboard(*args, **kwargs)
+
+    def GetMaxSize(*args, **kwargs):
+        """GetMaxSize(self) -> Size"""
+        return _windows_.PyWindow_GetMaxSize(*args, **kwargs)
+
+    def AddChild(*args, **kwargs):
+        """
+        AddChild(self, Window child)
+
+        Adds a child window. This is called automatically by window creation
+        functions so should not be required by the application programmer.
+        """
+        return _windows_.PyWindow_AddChild(*args, **kwargs)
+
+    def RemoveChild(*args, **kwargs):
+        """
+        RemoveChild(self, Window child)
+
+        Removes a child window. This is called automatically by window
+        deletion functions so should not be required by the application
+        programmer.
+        """
+        return _windows_.PyWindow_RemoveChild(*args, **kwargs)
+
+    def ShouldInheritColours(*args, **kwargs):
+        """
+        ShouldInheritColours(self) -> bool
+
+        Return true from here to allow the colours of this window to be
+        changed by InheritAttributes, returning false forbids inheriting them
+        from the parent window.
+
+        The base class version returns false, but this method is overridden in
+        wxControl where it returns true.
+        """
+        return _windows_.PyWindow_ShouldInheritColours(*args, **kwargs)
+
+    def GetDefaultAttributes(*args, **kwargs):
+        """GetDefaultAttributes(self) -> VisualAttributes"""
+        return _windows_.PyWindow_GetDefaultAttributes(*args, **kwargs)
+
+    def OnInternalIdle(*args, **kwargs):
+        """OnInternalIdle(self)"""
+        return _windows_.PyWindow_OnInternalIdle(*args, **kwargs)
+
+    def base_DoMoveWindow(*args, **kw):
+        return PyWindow.DoMoveWindow(*args, **kw)
+    base_DoMoveWindow = wx._deprecated(base_DoMoveWindow,
+                                   "Please use PyWindow.DoMoveWindow instead.")
+
+    def base_DoSetSize(*args, **kw):
+        return PyWindow.DoSetSize(*args, **kw)
+    base_DoSetSize = wx._deprecated(base_DoSetSize,
+                                   "Please use PyWindow.DoSetSize instead.")

 
 

-    def base_TransferDataFromWindow(*args, **kwargs):
-        """base_TransferDataFromWindow(self) -> bool"""
-        return _windows_.PyWindow_base_TransferDataFromWindow(*args, **kwargs)
+    def base_DoSetClientSize(*args, **kw):
+        return PyWindow.DoSetClientSize(*args, **kw)
+    base_DoSetClientSize = wx._deprecated(base_DoSetClientSize,
+                                   "Please use PyWindow.DoSetClientSize instead.")

 
 

-    def base_Validate(*args, **kwargs):
-        """base_Validate(self) -> bool"""
-        return _windows_.PyWindow_base_Validate(*args, **kwargs)
+    def base_DoSetVirtualSize(*args, **kw):
+        return PyWindow.DoSetVirtualSize(*args, **kw)
+    base_DoSetVirtualSize = wx._deprecated(base_DoSetVirtualSize,
+                                   "Please use PyWindow.DoSetVirtualSize instead.")

 
 

-    def base_AcceptsFocus(*args, **kwargs):
-        """base_AcceptsFocus(self) -> bool"""
-        return _windows_.PyWindow_base_AcceptsFocus(*args, **kwargs)
+    def base_DoGetSize(*args, **kw):
+        return PyWindow.DoGetSize(*args, **kw)
+    base_DoGetSize = wx._deprecated(base_DoGetSize,
+                                   "Please use PyWindow.DoGetSize instead.")

 
 

-    def base_AcceptsFocusFromKeyboard(*args, **kwargs):
-        """base_AcceptsFocusFromKeyboard(self) -> bool"""
-        return _windows_.PyWindow_base_AcceptsFocusFromKeyboard(*args, **kwargs)
+    def base_DoGetClientSize(*args, **kw):
+        return PyWindow.DoGetClientSize(*args, **kw)
+    base_DoGetClientSize = wx._deprecated(base_DoGetClientSize,
+                                   "Please use PyWindow.DoGetClientSize instead.")

 
 

-    def base_GetMaxSize(*args, **kwargs):
-        """base_GetMaxSize(self) -> Size"""
-        return _windows_.PyWindow_base_GetMaxSize(*args, **kwargs)
+    def base_DoGetPosition(*args, **kw):
+        return PyWindow.DoGetPosition(*args, **kw)
+    base_DoGetPosition = wx._deprecated(base_DoGetPosition,
+                                   "Please use PyWindow.DoGetPosition instead.")

 
 

-    def base_AddChild(*args, **kwargs):
-        """base_AddChild(self, Window child)"""
-        return _windows_.PyWindow_base_AddChild(*args, **kwargs)
+    def base_DoGetVirtualSize(*args, **kw):
+        return PyWindow.DoGetVirtualSize(*args, **kw)
+    base_DoGetVirtualSize = wx._deprecated(base_DoGetVirtualSize,
+                                   "Please use PyWindow.DoGetVirtualSize instead.")

 
 

-    def base_RemoveChild(*args, **kwargs):
-        """base_RemoveChild(self, Window child)"""
-        return _windows_.PyWindow_base_RemoveChild(*args, **kwargs)
+    def base_DoGetBestSize(*args, **kw):
+        return PyWindow.DoGetBestSize(*args, **kw)
+    base_DoGetBestSize = wx._deprecated(base_DoGetBestSize,
+                                   "Please use PyWindow.DoGetBestSize instead.")

 
 

-    def base_ShouldInheritColours(*args, **kwargs):
-        """base_ShouldInheritColours(self) -> bool"""
-        return _windows_.PyWindow_base_ShouldInheritColours(*args, **kwargs)
+    def base_InitDialog(*args, **kw):
+        return PyWindow.InitDialog(*args, **kw)
+    base_InitDialog = wx._deprecated(base_InitDialog,
+                                   "Please use PyWindow.InitDialog instead.")

 
 

-    def base_ApplyParentThemeBackground(*args, **kwargs):
-        """base_ApplyParentThemeBackground(self, Colour c)"""
-        return _windows_.PyWindow_base_ApplyParentThemeBackground(*args, **kwargs)
+    def base_TransferDataToWindow(*args, **kw):
+        return PyWindow.TransferDataToWindow(*args, **kw)
+    base_TransferDataToWindow = wx._deprecated(base_TransferDataToWindow,
+                                   "Please use PyWindow.TransferDataToWindow instead.")

 
 

-    def base_GetDefaultAttributes(*args, **kwargs):
-        """base_GetDefaultAttributes(self) -> VisualAttributes"""
-        return _windows_.PyWindow_base_GetDefaultAttributes(*args, **kwargs)
+    def base_TransferDataFromWindow(*args, **kw):
+        return PyWindow.TransferDataFromWindow(*args, **kw)
+    base_TransferDataFromWindow = wx._deprecated(base_TransferDataFromWindow,
+                                   "Please use PyWindow.TransferDataFromWindow instead.")
+
+    def base_Validate(*args, **kw):
+        return PyWindow.Validate(*args, **kw)
+    base_Validate = wx._deprecated(base_Validate,
+                                   "Please use PyWindow.Validate instead.")
+
+    def base_AcceptsFocus(*args, **kw):
+        return PyWindow.AcceptsFocus(*args, **kw)
+    base_AcceptsFocus = wx._deprecated(base_AcceptsFocus,
+                                   "Please use PyWindow.AcceptsFocus instead.")
+
+    def base_AcceptsFocusFromKeyboard(*args, **kw):
+        return PyWindow.AcceptsFocusFromKeyboard(*args, **kw)
+    base_AcceptsFocusFromKeyboard = wx._deprecated(base_AcceptsFocusFromKeyboard,
+                                   "Please use PyWindow.AcceptsFocusFromKeyboard instead.")
+
+    def base_GetMaxSize(*args, **kw):
+        return PyWindow.GetMaxSize(*args, **kw)
+    base_GetMaxSize = wx._deprecated(base_GetMaxSize,
+                                   "Please use PyWindow.GetMaxSize instead.")
+
+    def base_AddChild(*args, **kw):
+        return PyWindow.AddChild(*args, **kw)
+    base_AddChild = wx._deprecated(base_AddChild,
+                                   "Please use PyWindow.AddChild instead.")
+
+    def base_RemoveChild(*args, **kw):
+        return PyWindow.RemoveChild(*args, **kw)
+    base_RemoveChild = wx._deprecated(base_RemoveChild,
+                                   "Please use PyWindow.RemoveChild instead.")
+
+    def base_ShouldInheritColours(*args, **kw):
+        return PyWindow.ShouldInheritColours(*args, **kw)
+    base_ShouldInheritColours = wx._deprecated(base_ShouldInheritColours,
+                                   "Please use PyWindow.ShouldInheritColours instead.")
+
+    def base_GetDefaultAttributes(*args, **kw):
+        return PyWindow.GetDefaultAttributes(*args, **kw)
+    base_GetDefaultAttributes = wx._deprecated(base_GetDefaultAttributes,
+                                   "Please use PyWindow.GetDefaultAttributes instead.")
+
+    def base_OnInternalIdle(*args, **kw):
+        return PyWindow.OnInternalIdle(*args, **kw)
+    base_OnInternalIdle = wx._deprecated(base_OnInternalIdle,
+                                   "Please use PyWindow.OnInternalIdle instead.")

 
 
 class PyWindowPtr(PyWindow):
 
 
 class PyWindowPtr(PyWindow):


@@ -3395,6 +3798,7 @@ def PrePyWindow(*args, **kwargs):
     return val
 
 class PyPanel(Panel):
     return val
 
 class PyPanel(Panel):

+    """Proxy of C++ PyPanel class"""

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


@@ -3416,89 +3820,254 @@ class PyPanel(Panel):
         """SetBestSize(self, Size size)"""
         return _windows_.PyPanel_SetBestSize(*args, **kwargs)
 
         """SetBestSize(self, Size size)"""
         return _windows_.PyPanel_SetBestSize(*args, **kwargs)
 

-    def base_DoMoveWindow(*args, **kwargs):
-        """base_DoMoveWindow(self, int x, int y, int width, int height)"""
-        return _windows_.PyPanel_base_DoMoveWindow(*args, **kwargs)
+    def DoEraseBackground(*args, **kwargs):
+        """DoEraseBackground(self, DC dc) -> bool"""
+        return _windows_.PyPanel_DoEraseBackground(*args, **kwargs)
+
+    def DoMoveWindow(*args, **kwargs):
+        """DoMoveWindow(self, int x, int y, int width, int height)"""
+        return _windows_.PyPanel_DoMoveWindow(*args, **kwargs)
+
+    def DoSetSize(*args, **kwargs):
+        """DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
+        return _windows_.PyPanel_DoSetSize(*args, **kwargs)
+
+    def DoSetClientSize(*args, **kwargs):
+        """DoSetClientSize(self, int width, int height)"""
+        return _windows_.PyPanel_DoSetClientSize(*args, **kwargs)
+
+    def DoSetVirtualSize(*args, **kwargs):
+        """DoSetVirtualSize(self, int x, int y)"""
+        return _windows_.PyPanel_DoSetVirtualSize(*args, **kwargs)
+
+    def DoGetSize(*args, **kwargs):
+        """DoGetSize() -> (width, height)"""
+        return _windows_.PyPanel_DoGetSize(*args, **kwargs)
+
+    def DoGetClientSize(*args, **kwargs):
+        """DoGetClientSize() -> (width, height)"""
+        return _windows_.PyPanel_DoGetClientSize(*args, **kwargs)
+
+    def DoGetPosition(*args, **kwargs):
+        """DoGetPosition() -> (x,y)"""
+        return _windows_.PyPanel_DoGetPosition(*args, **kwargs)
+
+    def DoGetVirtualSize(*args, **kwargs):
+        """DoGetVirtualSize(self) -> Size"""
+        return _windows_.PyPanel_DoGetVirtualSize(*args, **kwargs)
+
+    def DoGetBestSize(*args, **kwargs):
+        """DoGetBestSize(self) -> Size"""
+        return _windows_.PyPanel_DoGetBestSize(*args, **kwargs)
+
+    def InitDialog(*args, **kwargs):
+        """
+        InitDialog(self)
+
+        Sends an EVT_INIT_DIALOG event, whose handler usually transfers data
+        to the dialog via validators.
+        """
+        return _windows_.PyPanel_InitDialog(*args, **kwargs)
+
+    def TransferDataToWindow(*args, **kwargs):
+        """
+        TransferDataToWindow(self) -> bool
+
+        Transfers values to child controls from data areas specified by their
+        validators.  If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra
+        style flag set, the method will also call TransferDataToWindow() of
+        all child windows.
+        """
+        return _windows_.PyPanel_TransferDataToWindow(*args, **kwargs)
+
+    def TransferDataFromWindow(*args, **kwargs):
+        """
+        TransferDataFromWindow(self) -> bool
+
+        Transfers values from child controls to data areas specified by their
+        validators. Returns false if a transfer failed.  If the window has
+        wx.WS_EX_VALIDATE_RECURSIVELY extra style flag set, the method will
+        also call TransferDataFromWindow() of all child windows.
+        """
+        return _windows_.PyPanel_TransferDataFromWindow(*args, **kwargs)
+
+    def Validate(*args, **kwargs):
+        """
+        Validate(self) -> bool
+
+        Validates the current values of the child controls using their
+        validators.  If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra
+        style flag set, the method will also call Validate() of all child
+        windows.  Returns false if any of the validations failed.
+        """
+        return _windows_.PyPanel_Validate(*args, **kwargs)
+
+    def AcceptsFocus(*args, **kwargs):
+        """
+        AcceptsFocus(self) -> bool
+
+        Can this window have focus?
+        """
+        return _windows_.PyPanel_AcceptsFocus(*args, **kwargs)
+
+    def AcceptsFocusFromKeyboard(*args, **kwargs):
+        """
+        AcceptsFocusFromKeyboard(self) -> bool
+
+        Can this window be given focus by keyboard navigation? if not, the
+        only way to give it focus (provided it accepts it at all) is to click
+        it.
+        """
+        return _windows_.PyPanel_AcceptsFocusFromKeyboard(*args, **kwargs)
+
+    def GetMaxSize(*args, **kwargs):
+        """GetMaxSize(self) -> Size"""
+        return _windows_.PyPanel_GetMaxSize(*args, **kwargs)
+
+    def AddChild(*args, **kwargs):
+        """
+        AddChild(self, Window child)
+
+        Adds a child window. This is called automatically by window creation
+        functions so should not be required by the application programmer.
+        """
+        return _windows_.PyPanel_AddChild(*args, **kwargs)
+
+    def RemoveChild(*args, **kwargs):
+        """
+        RemoveChild(self, Window child)

 
 

-    def base_DoSetSize(*args, **kwargs):
-        """base_DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
-        return _windows_.PyPanel_base_DoSetSize(*args, **kwargs)
+        Removes a child window. This is called automatically by window
+        deletion functions so should not be required by the application
+        programmer.
+        """
+        return _windows_.PyPanel_RemoveChild(*args, **kwargs)

 
 

-    def base_DoSetClientSize(*args, **kwargs):
-        """base_DoSetClientSize(self, int width, int height)"""
-        return _windows_.PyPanel_base_DoSetClientSize(*args, **kwargs)
+    def ShouldInheritColours(*args, **kwargs):
+        """
+        ShouldInheritColours(self) -> bool

 
 

-    def base_DoSetVirtualSize(*args, **kwargs):
-        """base_DoSetVirtualSize(self, int x, int y)"""
-        return _windows_.PyPanel_base_DoSetVirtualSize(*args, **kwargs)
+        Return true from here to allow the colours of this window to be
+        changed by InheritAttributes, returning false forbids inheriting them
+        from the parent window.

 
 

-    def base_DoGetSize(*args, **kwargs):
-        """base_DoGetSize() -> (width, height)"""
-        return _windows_.PyPanel_base_DoGetSize(*args, **kwargs)
+        The base class version returns false, but this method is overridden in
+        wxControl where it returns true.
+        """
+        return _windows_.PyPanel_ShouldInheritColours(*args, **kwargs)

 
 

-    def base_DoGetClientSize(*args, **kwargs):
-        """base_DoGetClientSize() -> (width, height)"""
-        return _windows_.PyPanel_base_DoGetClientSize(*args, **kwargs)
+    def GetDefaultAttributes(*args, **kwargs):
+        """GetDefaultAttributes(self) -> VisualAttributes"""
+        return _windows_.PyPanel_GetDefaultAttributes(*args, **kwargs)

 
 

-    def base_DoGetPosition(*args, **kwargs):
-        """base_DoGetPosition() -> (x,y)"""
-        return _windows_.PyPanel_base_DoGetPosition(*args, **kwargs)
+    def OnInternalIdle(*args, **kwargs):
+        """OnInternalIdle(self)"""
+        return _windows_.PyPanel_OnInternalIdle(*args, **kwargs)

 
 

-    def base_DoGetVirtualSize(*args, **kwargs):
-        """base_DoGetVirtualSize(self) -> Size"""
-        return _windows_.PyPanel_base_DoGetVirtualSize(*args, **kwargs)
+    def base_DoMoveWindow(*args, **kw):
+        return PyPanel.DoMoveWindow(*args, **kw)
+    base_DoMoveWindow = wx._deprecated(base_DoMoveWindow,
+                                   "Please use PyPanel.DoMoveWindow instead.")

 
 

-    def base_DoGetBestSize(*args, **kwargs):
-        """base_DoGetBestSize(self) -> Size"""
-        return _windows_.PyPanel_base_DoGetBestSize(*args, **kwargs)
+    def base_DoSetSize(*args, **kw):
+        return PyPanel.DoSetSize(*args, **kw)
+    base_DoSetSize = wx._deprecated(base_DoSetSize,
+                                   "Please use PyPanel.DoSetSize instead.")

 
 

-    def base_InitDialog(*args, **kwargs):
-        """base_InitDialog(self)"""
-        return _windows_.PyPanel_base_InitDialog(*args, **kwargs)
+    def base_DoSetClientSize(*args, **kw):
+        return PyPanel.DoSetClientSize(*args, **kw)
+    base_DoSetClientSize = wx._deprecated(base_DoSetClientSize,
+                                   "Please use PyPanel.DoSetClientSize instead.")

 
 

-    def base_TransferDataToWindow(*args, **kwargs):
-        """base_TransferDataToWindow(self) -> bool"""
-        return _windows_.PyPanel_base_TransferDataToWindow(*args, **kwargs)
+    def base_DoSetVirtualSize(*args, **kw):
+        return PyPanel.DoSetVirtualSize(*args, **kw)
+    base_DoSetVirtualSize = wx._deprecated(base_DoSetVirtualSize,
+                                   "Please use PyPanel.DoSetVirtualSize instead.")

 
 

-    def base_TransferDataFromWindow(*args, **kwargs):
-        """base_TransferDataFromWindow(self) -> bool"""
-        return _windows_.PyPanel_base_TransferDataFromWindow(*args, **kwargs)
+    def base_DoGetSize(*args, **kw):
+        return PyPanel.DoGetSize(*args, **kw)
+    base_DoGetSize = wx._deprecated(base_DoGetSize,
+                                   "Please use PyPanel.DoGetSize instead.")

 
 

-    def base_Validate(*args, **kwargs):
-        """base_Validate(self) -> bool"""
-        return _windows_.PyPanel_base_Validate(*args, **kwargs)
+    def base_DoGetClientSize(*args, **kw):
+        return PyPanel.DoGetClientSize(*args, **kw)
+    base_DoGetClientSize = wx._deprecated(base_DoGetClientSize,
+                                   "Please use PyPanel.DoGetClientSize instead.")

 
 

-    def base_AcceptsFocus(*args, **kwargs):
-        """base_AcceptsFocus(self) -> bool"""
-        return _windows_.PyPanel_base_AcceptsFocus(*args, **kwargs)
+    def base_DoGetPosition(*args, **kw):
+        return PyPanel.DoGetPosition(*args, **kw)
+    base_DoGetPosition = wx._deprecated(base_DoGetPosition,
+                                   "Please use PyPanel.DoGetPosition instead.")

 
 

-    def base_AcceptsFocusFromKeyboard(*args, **kwargs):
-        """base_AcceptsFocusFromKeyboard(self) -> bool"""
-        return _windows_.PyPanel_base_AcceptsFocusFromKeyboard(*args, **kwargs)
+    def base_DoGetVirtualSize(*args, **kw):
+        return PyPanel.DoGetVirtualSize(*args, **kw)
+    base_DoGetVirtualSize = wx._deprecated(base_DoGetVirtualSize,
+                                   "Please use PyPanel.DoGetVirtualSize instead.")

 
 

-    def base_GetMaxSize(*args, **kwargs):
-        """base_GetMaxSize(self) -> Size"""
-        return _windows_.PyPanel_base_GetMaxSize(*args, **kwargs)
+    def base_DoGetBestSize(*args, **kw):
+        return PyPanel.DoGetBestSize(*args, **kw)
+    base_DoGetBestSize = wx._deprecated(base_DoGetBestSize,
+                                   "Please use PyPanel.DoGetBestSize instead.")

 
 

-    def base_AddChild(*args, **kwargs):
-        """base_AddChild(self, Window child)"""
-        return _windows_.PyPanel_base_AddChild(*args, **kwargs)
+    def base_InitDialog(*args, **kw):
+        return PyPanel.InitDialog(*args, **kw)
+    base_InitDialog = wx._deprecated(base_InitDialog,
+                                   "Please use PyPanel.InitDialog instead.")

 
 

-    def base_RemoveChild(*args, **kwargs):
-        """base_RemoveChild(self, Window child)"""
-        return _windows_.PyPanel_base_RemoveChild(*args, **kwargs)
+    def base_TransferDataToWindow(*args, **kw):
+        return PyPanel.TransferDataToWindow(*args, **kw)
+    base_TransferDataToWindow = wx._deprecated(base_TransferDataToWindow,
+                                   "Please use PyPanel.TransferDataToWindow instead.")

 
 

-    def base_ShouldInheritColours(*args, **kwargs):
-        """base_ShouldInheritColours(self) -> bool"""
-        return _windows_.PyPanel_base_ShouldInheritColours(*args, **kwargs)
+    def base_TransferDataFromWindow(*args, **kw):
+        return PyPanel.TransferDataFromWindow(*args, **kw)
+    base_TransferDataFromWindow = wx._deprecated(base_TransferDataFromWindow,
+                                   "Please use PyPanel.TransferDataFromWindow instead.")

 
 

-    def base_ApplyParentThemeBackground(*args, **kwargs):
-        """base_ApplyParentThemeBackground(self, Colour c)"""
-        return _windows_.PyPanel_base_ApplyParentThemeBackground(*args, **kwargs)
+    def base_Validate(*args, **kw):
+        return PyPanel.Validate(*args, **kw)
+    base_Validate = wx._deprecated(base_Validate,
+                                   "Please use PyPanel.Validate instead.")

 
 

-    def base_GetDefaultAttributes(*args, **kwargs):
-        """base_GetDefaultAttributes(self) -> VisualAttributes"""
-        return _windows_.PyPanel_base_GetDefaultAttributes(*args, **kwargs)
+    def base_AcceptsFocus(*args, **kw):
+        return PyPanel.AcceptsFocus(*args, **kw)
+    base_AcceptsFocus = wx._deprecated(base_AcceptsFocus,
+                                   "Please use PyPanel.AcceptsFocus instead.")
+
+    def base_AcceptsFocusFromKeyboard(*args, **kw):
+        return PyPanel.AcceptsFocusFromKeyboard(*args, **kw)
+    base_AcceptsFocusFromKeyboard = wx._deprecated(base_AcceptsFocusFromKeyboard,
+                                   "Please use PyPanel.AcceptsFocusFromKeyboard instead.")
+
+    def base_GetMaxSize(*args, **kw):
+        return PyPanel.GetMaxSize(*args, **kw)
+    base_GetMaxSize = wx._deprecated(base_GetMaxSize,
+                                   "Please use PyPanel.GetMaxSize instead.")
+
+    def base_AddChild(*args, **kw):
+        return PyPanel.AddChild(*args, **kw)
+    base_AddChild = wx._deprecated(base_AddChild,
+                                   "Please use PyPanel.AddChild instead.")
+
+    def base_RemoveChild(*args, **kw):
+        return PyPanel.RemoveChild(*args, **kw)
+    base_RemoveChild = wx._deprecated(base_RemoveChild,
+                                   "Please use PyPanel.RemoveChild instead.")
+
+    def base_ShouldInheritColours(*args, **kw):
+        return PyPanel.ShouldInheritColours(*args, **kw)
+    base_ShouldInheritColours = wx._deprecated(base_ShouldInheritColours,
+                                   "Please use PyPanel.ShouldInheritColours instead.")
+
+    def base_GetDefaultAttributes(*args, **kw):
+        return PyPanel.GetDefaultAttributes(*args, **kw)
+    base_GetDefaultAttributes = wx._deprecated(base_GetDefaultAttributes,
+                                   "Please use PyPanel.GetDefaultAttributes instead.")
+
+    def base_OnInternalIdle(*args, **kw):
+        return PyPanel.OnInternalIdle(*args, **kw)
+    base_OnInternalIdle = wx._deprecated(base_OnInternalIdle,
+                                   "Please use PyPanel.OnInternalIdle instead.")

 
 
 class PyPanelPtr(PyPanel):
 
 
 class PyPanelPtr(PyPanel):


@@ -3515,6 +4084,7 @@ def PrePyPanel(*args, **kwargs):
     return val
 
 class PyScrolledWindow(ScrolledWindow):
     return val
 
 class PyScrolledWindow(ScrolledWindow):

+    """Proxy of C++ PyScrolledWindow class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyScrolledWindow 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++ wxPyScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -3526,7 +4096,7 @@ class PyScrolledWindow(ScrolledWindow):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-        self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)
+        self._setOORInfo(self); self._setCallbackInfo(self, PyScrolledWindow)

 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""


@@ -3536,89 +4106,254 @@ class PyScrolledWindow(ScrolledWindow):
         """SetBestSize(self, Size size)"""
         return _windows_.PyScrolledWindow_SetBestSize(*args, **kwargs)
 
         """SetBestSize(self, Size size)"""
         return _windows_.PyScrolledWindow_SetBestSize(*args, **kwargs)
 

-    def base_DoMoveWindow(*args, **kwargs):
-        """base_DoMoveWindow(self, int x, int y, int width, int height)"""
-        return _windows_.PyScrolledWindow_base_DoMoveWindow(*args, **kwargs)
+    def DoEraseBackground(*args, **kwargs):
+        """DoEraseBackground(self, DC dc) -> bool"""
+        return _windows_.PyScrolledWindow_DoEraseBackground(*args, **kwargs)
+
+    def DoMoveWindow(*args, **kwargs):
+        """DoMoveWindow(self, int x, int y, int width, int height)"""
+        return _windows_.PyScrolledWindow_DoMoveWindow(*args, **kwargs)
+
+    def DoSetSize(*args, **kwargs):
+        """DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
+        return _windows_.PyScrolledWindow_DoSetSize(*args, **kwargs)
+
+    def DoSetClientSize(*args, **kwargs):
+        """DoSetClientSize(self, int width, int height)"""
+        return _windows_.PyScrolledWindow_DoSetClientSize(*args, **kwargs)
+
+    def DoSetVirtualSize(*args, **kwargs):
+        """DoSetVirtualSize(self, int x, int y)"""
+        return _windows_.PyScrolledWindow_DoSetVirtualSize(*args, **kwargs)
+
+    def DoGetSize(*args, **kwargs):
+        """DoGetSize() -> (width, height)"""
+        return _windows_.PyScrolledWindow_DoGetSize(*args, **kwargs)
+
+    def DoGetClientSize(*args, **kwargs):
+        """DoGetClientSize() -> (width, height)"""
+        return _windows_.PyScrolledWindow_DoGetClientSize(*args, **kwargs)
+
+    def DoGetPosition(*args, **kwargs):
+        """DoGetPosition() -> (x,y)"""
+        return _windows_.PyScrolledWindow_DoGetPosition(*args, **kwargs)
+
+    def DoGetVirtualSize(*args, **kwargs):
+        """DoGetVirtualSize(self) -> Size"""
+        return _windows_.PyScrolledWindow_DoGetVirtualSize(*args, **kwargs)
+
+    def DoGetBestSize(*args, **kwargs):
+        """DoGetBestSize(self) -> Size"""
+        return _windows_.PyScrolledWindow_DoGetBestSize(*args, **kwargs)
+
+    def InitDialog(*args, **kwargs):
+        """
+        InitDialog(self)
+
+        Sends an EVT_INIT_DIALOG event, whose handler usually transfers data
+        to the dialog via validators.
+        """
+        return _windows_.PyScrolledWindow_InitDialog(*args, **kwargs)
+
+    def TransferDataToWindow(*args, **kwargs):
+        """
+        TransferDataToWindow(self) -> bool
+
+        Transfers values to child controls from data areas specified by their
+        validators.  If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra
+        style flag set, the method will also call TransferDataToWindow() of
+        all child windows.
+        """
+        return _windows_.PyScrolledWindow_TransferDataToWindow(*args, **kwargs)
+
+    def TransferDataFromWindow(*args, **kwargs):
+        """
+        TransferDataFromWindow(self) -> bool
+
+        Transfers values from child controls to data areas specified by their
+        validators. Returns false if a transfer failed.  If the window has
+        wx.WS_EX_VALIDATE_RECURSIVELY extra style flag set, the method will
+        also call TransferDataFromWindow() of all child windows.
+        """
+        return _windows_.PyScrolledWindow_TransferDataFromWindow(*args, **kwargs)
+
+    def Validate(*args, **kwargs):
+        """
+        Validate(self) -> bool
+
+        Validates the current values of the child controls using their
+        validators.  If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra
+        style flag set, the method will also call Validate() of all child
+        windows.  Returns false if any of the validations failed.
+        """
+        return _windows_.PyScrolledWindow_Validate(*args, **kwargs)
+
+    def AcceptsFocus(*args, **kwargs):
+        """
+        AcceptsFocus(self) -> bool
+
+        Can this window have focus?
+        """
+        return _windows_.PyScrolledWindow_AcceptsFocus(*args, **kwargs)
+
+    def AcceptsFocusFromKeyboard(*args, **kwargs):
+        """
+        AcceptsFocusFromKeyboard(self) -> bool
+
+        Can this window be given focus by keyboard navigation? if not, the
+        only way to give it focus (provided it accepts it at all) is to click
+        it.
+        """
+        return _windows_.PyScrolledWindow_AcceptsFocusFromKeyboard(*args, **kwargs)
+
+    def GetMaxSize(*args, **kwargs):
+        """GetMaxSize(self) -> Size"""
+        return _windows_.PyScrolledWindow_GetMaxSize(*args, **kwargs)

 
 

-    def base_DoSetSize(*args, **kwargs):
-        """base_DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
-        return _windows_.PyScrolledWindow_base_DoSetSize(*args, **kwargs)
+    def AddChild(*args, **kwargs):
+        """
+        AddChild(self, Window child)

 
 

-    def base_DoSetClientSize(*args, **kwargs):
-        """base_DoSetClientSize(self, int width, int height)"""
-        return _windows_.PyScrolledWindow_base_DoSetClientSize(*args, **kwargs)
+        Adds a child window. This is called automatically by window creation
+        functions so should not be required by the application programmer.
+        """
+        return _windows_.PyScrolledWindow_AddChild(*args, **kwargs)

 
 

-    def base_DoSetVirtualSize(*args, **kwargs):
-        """base_DoSetVirtualSize(self, int x, int y)"""
-        return _windows_.PyScrolledWindow_base_DoSetVirtualSize(*args, **kwargs)
+    def RemoveChild(*args, **kwargs):
+        """
+        RemoveChild(self, Window child)

 
 

-    def base_DoGetSize(*args, **kwargs):
-        """base_DoGetSize() -> (width, height)"""
-        return _windows_.PyScrolledWindow_base_DoGetSize(*args, **kwargs)
+        Removes a child window. This is called automatically by window
+        deletion functions so should not be required by the application
+        programmer.
+        """
+        return _windows_.PyScrolledWindow_RemoveChild(*args, **kwargs)

 
 

-    def base_DoGetClientSize(*args, **kwargs):
-        """base_DoGetClientSize() -> (width, height)"""
-        return _windows_.PyScrolledWindow_base_DoGetClientSize(*args, **kwargs)
+    def ShouldInheritColours(*args, **kwargs):
+        """
+        ShouldInheritColours(self) -> bool

 
 

-    def base_DoGetPosition(*args, **kwargs):
-        """base_DoGetPosition() -> (x,y)"""
-        return _windows_.PyScrolledWindow_base_DoGetPosition(*args, **kwargs)
+        Return true from here to allow the colours of this window to be
+        changed by InheritAttributes, returning false forbids inheriting them
+        from the parent window.

 
 

-    def base_DoGetVirtualSize(*args, **kwargs):
-        """base_DoGetVirtualSize(self) -> Size"""
-        return _windows_.PyScrolledWindow_base_DoGetVirtualSize(*args, **kwargs)
+        The base class version returns false, but this method is overridden in
+        wxControl where it returns true.
+        """
+        return _windows_.PyScrolledWindow_ShouldInheritColours(*args, **kwargs)
+
+    def GetDefaultAttributes(*args, **kwargs):
+        """GetDefaultAttributes(self) -> VisualAttributes"""
+        return _windows_.PyScrolledWindow_GetDefaultAttributes(*args, **kwargs)
+
+    def OnInternalIdle(*args, **kwargs):
+        """OnInternalIdle(self)"""
+        return _windows_.PyScrolledWindow_OnInternalIdle(*args, **kwargs)

 
 

-    def base_DoGetBestSize(*args, **kwargs):
-        """base_DoGetBestSize(self) -> Size"""
-        return _windows_.PyScrolledWindow_base_DoGetBestSize(*args, **kwargs)
+    def base_DoMoveWindow(*args, **kw):
+        return PyScrolledWindow.DoMoveWindow(*args, **kw)
+    base_DoMoveWindow = wx._deprecated(base_DoMoveWindow,
+                                   "Please use PyScrolledWindow.DoMoveWindow instead.")

 
 

-    def base_InitDialog(*args, **kwargs):
-        """base_InitDialog(self)"""
-        return _windows_.PyScrolledWindow_base_InitDialog(*args, **kwargs)
+    def base_DoSetSize(*args, **kw):
+        return PyScrolledWindow.DoSetSize(*args, **kw)
+    base_DoSetSize = wx._deprecated(base_DoSetSize,
+                                   "Please use PyScrolledWindow.DoSetSize instead.")

 
 

-    def base_TransferDataToWindow(*args, **kwargs):
-        """base_TransferDataToWindow(self) -> bool"""
-        return _windows_.PyScrolledWindow_base_TransferDataToWindow(*args, **kwargs)
+    def base_DoSetClientSize(*args, **kw):
+        return PyScrolledWindow.DoSetClientSize(*args, **kw)
+    base_DoSetClientSize = wx._deprecated(base_DoSetClientSize,
+                                   "Please use PyScrolledWindow.DoSetClientSize instead.")

 
 

-    def base_TransferDataFromWindow(*args, **kwargs):
-        """base_TransferDataFromWindow(self) -> bool"""
-        return _windows_.PyScrolledWindow_base_TransferDataFromWindow(*args, **kwargs)
+    def base_DoSetVirtualSize(*args, **kw):
+        return PyScrolledWindow.DoSetVirtualSize(*args, **kw)
+    base_DoSetVirtualSize = wx._deprecated(base_DoSetVirtualSize,
+                                   "Please use PyScrolledWindow.DoSetVirtualSize instead.")

 
 

-    def base_Validate(*args, **kwargs):
-        """base_Validate(self) -> bool"""
-        return _windows_.PyScrolledWindow_base_Validate(*args, **kwargs)
+    def base_DoGetSize(*args, **kw):
+        return PyScrolledWindow.DoGetSize(*args, **kw)
+    base_DoGetSize = wx._deprecated(base_DoGetSize,
+                                   "Please use PyScrolledWindow.DoGetSize instead.")

 
 

-    def base_AcceptsFocus(*args, **kwargs):
-        """base_AcceptsFocus(self) -> bool"""
-        return _windows_.PyScrolledWindow_base_AcceptsFocus(*args, **kwargs)
+    def base_DoGetClientSize(*args, **kw):
+        return PyScrolledWindow.DoGetClientSize(*args, **kw)
+    base_DoGetClientSize = wx._deprecated(base_DoGetClientSize,
+                                   "Please use PyScrolledWindow.DoGetClientSize instead.")

 
 

-    def base_AcceptsFocusFromKeyboard(*args, **kwargs):
-        """base_AcceptsFocusFromKeyboard(self) -> bool"""
-        return _windows_.PyScrolledWindow_base_AcceptsFocusFromKeyboard(*args, **kwargs)
+    def base_DoGetPosition(*args, **kw):
+        return PyScrolledWindow.DoGetPosition(*args, **kw)
+    base_DoGetPosition = wx._deprecated(base_DoGetPosition,
+                                   "Please use PyScrolledWindow.DoGetPosition instead.")

 
 

-    def base_GetMaxSize(*args, **kwargs):
-        """base_GetMaxSize(self) -> Size"""
-        return _windows_.PyScrolledWindow_base_GetMaxSize(*args, **kwargs)
+    def base_DoGetVirtualSize(*args, **kw):
+        return PyScrolledWindow.DoGetVirtualSize(*args, **kw)
+    base_DoGetVirtualSize = wx._deprecated(base_DoGetVirtualSize,
+                                   "Please use PyScrolledWindow.DoGetVirtualSize instead.")

 
 

-    def base_AddChild(*args, **kwargs):
-        """base_AddChild(self, Window child)"""
-        return _windows_.PyScrolledWindow_base_AddChild(*args, **kwargs)
+    def base_DoGetBestSize(*args, **kw):
+        return PyScrolledWindow.DoGetBestSize(*args, **kw)
+    base_DoGetBestSize = wx._deprecated(base_DoGetBestSize,
+                                   "Please use PyScrolledWindow.DoGetBestSize instead.")

 
 

-    def base_RemoveChild(*args, **kwargs):
-        """base_RemoveChild(self, Window child)"""
-        return _windows_.PyScrolledWindow_base_RemoveChild(*args, **kwargs)
+    def base_InitDialog(*args, **kw):
+        return PyScrolledWindow.InitDialog(*args, **kw)
+    base_InitDialog = wx._deprecated(base_InitDialog,
+                                   "Please use PyScrolledWindow.InitDialog instead.")

 
 

-    def base_ShouldInheritColours(*args, **kwargs):
-        """base_ShouldInheritColours(self) -> bool"""
-        return _windows_.PyScrolledWindow_base_ShouldInheritColours(*args, **kwargs)
+    def base_TransferDataToWindow(*args, **kw):
+        return PyScrolledWindow.TransferDataToWindow(*args, **kw)
+    base_TransferDataToWindow = wx._deprecated(base_TransferDataToWindow,
+                                   "Please use PyScrolledWindow.TransferDataToWindow instead.")

 
 

-    def base_ApplyParentThemeBackground(*args, **kwargs):
-        """base_ApplyParentThemeBackground(self, Colour c)"""
-        return _windows_.PyScrolledWindow_base_ApplyParentThemeBackground(*args, **kwargs)
+    def base_TransferDataFromWindow(*args, **kw):
+        return PyScrolledWindow.TransferDataFromWindow(*args, **kw)
+    base_TransferDataFromWindow = wx._deprecated(base_TransferDataFromWindow,
+                                   "Please use PyScrolledWindow.TransferDataFromWindow instead.")

 
 

-    def base_GetDefaultAttributes(*args, **kwargs):
-        """base_GetDefaultAttributes(self) -> VisualAttributes"""
-        return _windows_.PyScrolledWindow_base_GetDefaultAttributes(*args, **kwargs)
+    def base_Validate(*args, **kw):
+        return PyScrolledWindow.Validate(*args, **kw)
+    base_Validate = wx._deprecated(base_Validate,
+                                   "Please use PyScrolledWindow.Validate instead.")
+
+    def base_AcceptsFocus(*args, **kw):
+        return PyScrolledWindow.AcceptsFocus(*args, **kw)
+    base_AcceptsFocus = wx._deprecated(base_AcceptsFocus,
+                                   "Please use PyScrolledWindow.AcceptsFocus instead.")
+
+    def base_AcceptsFocusFromKeyboard(*args, **kw):
+        return PyScrolledWindow.AcceptsFocusFromKeyboard(*args, **kw)
+    base_AcceptsFocusFromKeyboard = wx._deprecated(base_AcceptsFocusFromKeyboard,
+                                   "Please use PyScrolledWindow.AcceptsFocusFromKeyboard instead.")
+
+    def base_GetMaxSize(*args, **kw):
+        return PyScrolledWindow.GetMaxSize(*args, **kw)
+    base_GetMaxSize = wx._deprecated(base_GetMaxSize,
+                                   "Please use PyScrolledWindow.GetMaxSize instead.")
+
+    def base_AddChild(*args, **kw):
+        return PyScrolledWindow.AddChild(*args, **kw)
+    base_AddChild = wx._deprecated(base_AddChild,
+                                   "Please use PyScrolledWindow.AddChild instead.")
+
+    def base_RemoveChild(*args, **kw):
+        return PyScrolledWindow.RemoveChild(*args, **kw)
+    base_RemoveChild = wx._deprecated(base_RemoveChild,
+                                   "Please use PyScrolledWindow.RemoveChild instead.")
+
+    def base_ShouldInheritColours(*args, **kw):
+        return PyScrolledWindow.ShouldInheritColours(*args, **kw)
+    base_ShouldInheritColours = wx._deprecated(base_ShouldInheritColours,
+                                   "Please use PyScrolledWindow.ShouldInheritColours instead.")
+
+    def base_GetDefaultAttributes(*args, **kw):
+        return PyScrolledWindow.GetDefaultAttributes(*args, **kw)
+    base_GetDefaultAttributes = wx._deprecated(base_GetDefaultAttributes,
+                                   "Please use PyScrolledWindow.GetDefaultAttributes instead.")
+
+    def base_OnInternalIdle(*args, **kw):
+        return PyScrolledWindow.OnInternalIdle(*args, **kw)
+    base_OnInternalIdle = wx._deprecated(base_OnInternalIdle,
+                                   "Please use PyScrolledWindow.OnInternalIdle instead.")

 
 
 class PyScrolledWindowPtr(PyScrolledWindow):
 
 
 class PyScrolledWindowPtr(PyScrolledWindow):


@@ -3641,12 +4376,31 @@ 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
 PRINT_MODE_FILE = _windows_.PRINT_MODE_FILE
 PRINT_MODE_PRINTER = _windows_.PRINT_MODE_PRINTER
 PRINT_MODE_STREAM = _windows_.PRINT_MODE_STREAM

+PRINTBIN_DEFAULT = _windows_.PRINTBIN_DEFAULT
+PRINTBIN_ONLYONE = _windows_.PRINTBIN_ONLYONE
+PRINTBIN_LOWER = _windows_.PRINTBIN_LOWER
+PRINTBIN_MIDDLE = _windows_.PRINTBIN_MIDDLE
+PRINTBIN_MANUAL = _windows_.PRINTBIN_MANUAL
+PRINTBIN_ENVELOPE = _windows_.PRINTBIN_ENVELOPE
+PRINTBIN_ENVMANUAL = _windows_.PRINTBIN_ENVMANUAL
+PRINTBIN_AUTO = _windows_.PRINTBIN_AUTO
+PRINTBIN_TRACTOR = _windows_.PRINTBIN_TRACTOR
+PRINTBIN_SMALLFMT = _windows_.PRINTBIN_SMALLFMT
+PRINTBIN_LARGEFMT = _windows_.PRINTBIN_LARGEFMT
+PRINTBIN_LARGECAPACITY = _windows_.PRINTBIN_LARGECAPACITY
+PRINTBIN_CASSETTE = _windows_.PRINTBIN_CASSETTE
+PRINTBIN_FORMSOURCE = _windows_.PRINTBIN_FORMSOURCE
+PRINTBIN_USER = _windows_.PRINTBIN_USER

 class PrintData(_core.Object):
 class PrintData(_core.Object):

+    """Proxy of C++ PrintData class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPrintData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPrintData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

-    def __init__(self, *args, **kwargs):
-        """__init__(self) -> PrintData"""
-        newobj = _windows_.new_PrintData(*args, **kwargs)
+    def __init__(self, *args):
+        """
+        __init__(self) -> PrintData
+        __init__(self, PrintData data) -> PrintData
+        """
+        newobj = _windows_.new_PrintData(*args)

         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown


@@ -3696,6 +4450,14 @@ class PrintData(_core.Object):
         """GetQuality(self) -> int"""
         return _windows_.PrintData_GetQuality(*args, **kwargs)
 
         """GetQuality(self) -> int"""
         return _windows_.PrintData_GetQuality(*args, **kwargs)
 

+    def GetBin(*args, **kwargs):
+        """GetBin(self) -> int"""
+        return _windows_.PrintData_GetBin(*args, **kwargs)
+
+    def GetPrintMode(*args, **kwargs):
+        """GetPrintMode(self) -> int"""
+        return _windows_.PrintData_GetPrintMode(*args, **kwargs)
+

     def SetNoCopies(*args, **kwargs):
         """SetNoCopies(self, int v)"""
         return _windows_.PrintData_SetNoCopies(*args, **kwargs)
     def SetNoCopies(*args, **kwargs):
         """SetNoCopies(self, int v)"""
         return _windows_.PrintData_SetNoCopies(*args, **kwargs)


@@ -3732,103 +4494,31 @@ class PrintData(_core.Object):
         """SetQuality(self, int quality)"""
         return _windows_.PrintData_SetQuality(*args, **kwargs)
 
         """SetQuality(self, int quality)"""
         return _windows_.PrintData_SetQuality(*args, **kwargs)
 

-    def GetPrinterCommand(*args, **kwargs):
-        """GetPrinterCommand(self) -> String"""
-        return _windows_.PrintData_GetPrinterCommand(*args, **kwargs)
-
-    def GetPrinterOptions(*args, **kwargs):
-        """GetPrinterOptions(self) -> String"""
-        return _windows_.PrintData_GetPrinterOptions(*args, **kwargs)
+    def SetBin(*args, **kwargs):
+        """SetBin(self, int bin)"""
+        return _windows_.PrintData_SetBin(*args, **kwargs)

 
 

-    def GetPreviewCommand(*args, **kwargs):
-        """GetPreviewCommand(self) -> String"""
-        return _windows_.PrintData_GetPreviewCommand(*args, **kwargs)
+    def SetPrintMode(*args, **kwargs):
+        """SetPrintMode(self, int printMode)"""
+        return _windows_.PrintData_SetPrintMode(*args, **kwargs)

 
     def GetFilename(*args, **kwargs):
         """GetFilename(self) -> String"""
         return _windows_.PrintData_GetFilename(*args, **kwargs)
 
 
     def GetFilename(*args, **kwargs):
         """GetFilename(self) -> String"""
         return _windows_.PrintData_GetFilename(*args, **kwargs)
 

-    def GetFontMetricPath(*args, **kwargs):
-        """GetFontMetricPath(self) -> String"""
-        return _windows_.PrintData_GetFontMetricPath(*args, **kwargs)
-
-    def GetPrinterScaleX(*args, **kwargs):
-        """GetPrinterScaleX(self) -> double"""
-        return _windows_.PrintData_GetPrinterScaleX(*args, **kwargs)
-
-    def GetPrinterScaleY(*args, **kwargs):
-        """GetPrinterScaleY(self) -> double"""
-        return _windows_.PrintData_GetPrinterScaleY(*args, **kwargs)
-
-    def GetPrinterTranslateX(*args, **kwargs):
-        """GetPrinterTranslateX(self) -> long"""
-        return _windows_.PrintData_GetPrinterTranslateX(*args, **kwargs)
-
-    def GetPrinterTranslateY(*args, **kwargs):
-        """GetPrinterTranslateY(self) -> long"""
-        return _windows_.PrintData_GetPrinterTranslateY(*args, **kwargs)
-
-    def GetPrintMode(*args, **kwargs):
-        """GetPrintMode(self) -> int"""
-        return _windows_.PrintData_GetPrintMode(*args, **kwargs)
-
-    def SetPrinterCommand(*args, **kwargs):
-        """SetPrinterCommand(self, String command)"""
-        return _windows_.PrintData_SetPrinterCommand(*args, **kwargs)
-
-    def SetPrinterOptions(*args, **kwargs):
-        """SetPrinterOptions(self, String options)"""
-        return _windows_.PrintData_SetPrinterOptions(*args, **kwargs)
-
-    def SetPreviewCommand(*args, **kwargs):
-        """SetPreviewCommand(self, String command)"""
-        return _windows_.PrintData_SetPreviewCommand(*args, **kwargs)
-

     def SetFilename(*args, **kwargs):
         """SetFilename(self, String filename)"""
         return _windows_.PrintData_SetFilename(*args, **kwargs)
 
     def SetFilename(*args, **kwargs):
         """SetFilename(self, String filename)"""
         return _windows_.PrintData_SetFilename(*args, **kwargs)
 

-    def SetFontMetricPath(*args, **kwargs):
-        """SetFontMetricPath(self, String path)"""
-        return _windows_.PrintData_SetFontMetricPath(*args, **kwargs)
-
-    def SetPrinterScaleX(*args, **kwargs):
-        """SetPrinterScaleX(self, double x)"""
-        return _windows_.PrintData_SetPrinterScaleX(*args, **kwargs)
-
-    def SetPrinterScaleY(*args, **kwargs):
-        """SetPrinterScaleY(self, double y)"""
-        return _windows_.PrintData_SetPrinterScaleY(*args, **kwargs)
-
-    def SetPrinterScaling(*args, **kwargs):
-        """SetPrinterScaling(self, double x, double y)"""
-        return _windows_.PrintData_SetPrinterScaling(*args, **kwargs)
-
-    def SetPrinterTranslateX(*args, **kwargs):
-        """SetPrinterTranslateX(self, long x)"""
-        return _windows_.PrintData_SetPrinterTranslateX(*args, **kwargs)
-
-    def SetPrinterTranslateY(*args, **kwargs):
-        """SetPrinterTranslateY(self, long y)"""
-        return _windows_.PrintData_SetPrinterTranslateY(*args, **kwargs)
-
-    def SetPrinterTranslation(*args, **kwargs):
-        """SetPrinterTranslation(self, long x, long y)"""
-        return _windows_.PrintData_SetPrinterTranslation(*args, **kwargs)
-
-    def SetPrintMode(*args, **kwargs):
-        """SetPrintMode(self, int printMode)"""
-        return _windows_.PrintData_SetPrintMode(*args, **kwargs)
-
-    def GetOutputStream(*args, **kwargs):
-        """GetOutputStream(self) -> OutputStream"""
-        return _windows_.PrintData_GetOutputStream(*args, **kwargs)
+    def __nonzero__(self): return self.Ok() 
+    def GetPrivData(*args, **kwargs):
+        """GetPrivData(self) -> PyObject"""
+        return _windows_.PrintData_GetPrivData(*args, **kwargs)

 
 

-    def SetOutputStream(*args, **kwargs):
-        """SetOutputStream(self, OutputStream outputstream)"""
-        return _windows_.PrintData_SetOutputStream(*args, **kwargs)
+    def SetPrivData(*args, **kwargs):
+        """SetPrivData(self, PyObject data)"""
+        return _windows_.PrintData_SetPrivData(*args, **kwargs)

 
 

-    def __nonzero__(self): return self.Ok() 

 
 class PrintDataPtr(PrintData):
     def __init__(self, this):
 
 class PrintDataPtr(PrintData):
     def __init__(self, this):


@@ -3840,11 +4530,16 @@ PrintoutTitleStr = cvar.PrintoutTitleStr
 PreviewCanvasNameStr = cvar.PreviewCanvasNameStr
 
 class PageSetupDialogData(_core.Object):
 PreviewCanvasNameStr = cvar.PreviewCanvasNameStr
 
 class PageSetupDialogData(_core.Object):

+    """Proxy of C++ PageSetupDialogData class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPageSetupDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPageSetupDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

-    def __init__(self, *args, **kwargs):
-        """__init__(self) -> PageSetupDialogData"""
-        newobj = _windows_.new_PageSetupDialogData(*args, **kwargs)
+    def __init__(self, *args):
+        """
+        __init__(self) -> PageSetupDialogData
+        __init__(self, PageSetupDialogData data) -> PageSetupDialogData
+        __init__(self, PrintData data) -> PageSetupDialogData
+        """
+        newobj = _windows_.new_PageSetupDialogData(*args)

         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown


@@ -3970,6 +4665,14 @@ class PageSetupDialogData(_core.Object):
         """SetPrintData(self, PrintData printData)"""
         return _windows_.PageSetupDialogData_SetPrintData(*args, **kwargs)
 
         """SetPrintData(self, PrintData printData)"""
         return _windows_.PageSetupDialogData_SetPrintData(*args, **kwargs)
 

+    def CalculateIdFromPaperSize(*args, **kwargs):
+        """CalculateIdFromPaperSize(self)"""
+        return _windows_.PageSetupDialogData_CalculateIdFromPaperSize(*args, **kwargs)
+
+    def CalculatePaperSizeFromId(*args, **kwargs):
+        """CalculatePaperSizeFromId(self)"""
+        return _windows_.PageSetupDialogData_CalculatePaperSizeFromId(*args, **kwargs)
+

     def __nonzero__(self): return self.Ok() 
 
 class PageSetupDialogDataPtr(PageSetupDialogData):
     def __nonzero__(self): return self.Ok() 
 
 class PageSetupDialogDataPtr(PageSetupDialogData):


@@ -3979,7 +4682,8 @@ class PageSetupDialogDataPtr(PageSetupDialogData):
         self.__class__ = PageSetupDialogData
 _windows_.PageSetupDialogData_swigregister(PageSetupDialogDataPtr)
 
         self.__class__ = PageSetupDialogData
 _windows_.PageSetupDialogData_swigregister(PageSetupDialogDataPtr)
 

-class PageSetupDialog(Dialog):
+class PageSetupDialog(_core.Object):
+    """Proxy of C++ PageSetupDialog class"""

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


@@ -3988,12 +4692,14 @@ class PageSetupDialog(Dialog):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-        self._setOORInfo(self)
-

     def GetPageSetupData(*args, **kwargs):
         """GetPageSetupData(self) -> PageSetupDialogData"""
         return _windows_.PageSetupDialog_GetPageSetupData(*args, **kwargs)
 
     def GetPageSetupData(*args, **kwargs):
         """GetPageSetupData(self) -> PageSetupDialogData"""
         return _windows_.PageSetupDialog_GetPageSetupData(*args, **kwargs)
 

+    def GetPageSetupDialogData(*args, **kwargs):
+        """GetPageSetupDialogData(self) -> PageSetupDialogData"""
+        return _windows_.PageSetupDialog_GetPageSetupDialogData(*args, **kwargs)
+

     def ShowModal(*args, **kwargs):
         """ShowModal(self) -> int"""
         return _windows_.PageSetupDialog_ShowModal(*args, **kwargs)
     def ShowModal(*args, **kwargs):
         """ShowModal(self) -> int"""
         return _windows_.PageSetupDialog_ShowModal(*args, **kwargs)


@@ -4007,12 +4713,14 @@ class PageSetupDialogPtr(PageSetupDialog):
 _windows_.PageSetupDialog_swigregister(PageSetupDialogPtr)
 
 class PrintDialogData(_core.Object):
 _windows_.PageSetupDialog_swigregister(PageSetupDialogPtr)
 
 class PrintDialogData(_core.Object):

+    """Proxy of C++ PrintDialogData class"""

     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):
         """
         __init__(self) -> PrintDialogData
         __init__(self, PrintData printData) -> PrintDialogData
     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):
         """
         __init__(self) -> PrintDialogData
         __init__(self, PrintData printData) -> PrintDialogData

+        __init__(self, PrintDialogData printData) -> PrintDialogData

         """
         newobj = _windows_.new_PrintDialogData(*args)
         self.this = newobj.this
         """
         newobj = _windows_.new_PrintDialogData(*args)
         self.this = newobj.this


@@ -4060,10 +4768,6 @@ class PrintDialogData(_core.Object):
         """GetPrintToFile(self) -> bool"""
         return _windows_.PrintDialogData_GetPrintToFile(*args, **kwargs)
 
         """GetPrintToFile(self) -> bool"""
         return _windows_.PrintDialogData_GetPrintToFile(*args, **kwargs)
 

-    def GetSetupDialog(*args, **kwargs):
-        """GetSetupDialog(self) -> bool"""
-        return _windows_.PrintDialogData_GetSetupDialog(*args, **kwargs)
-

     def SetFromPage(*args, **kwargs):
         """SetFromPage(self, int v)"""
         return _windows_.PrintDialogData_SetFromPage(*args, **kwargs)
     def SetFromPage(*args, **kwargs):
         """SetFromPage(self, int v)"""
         return _windows_.PrintDialogData_SetFromPage(*args, **kwargs)


@@ -4100,10 +4804,6 @@ class PrintDialogData(_core.Object):
         """SetPrintToFile(self, bool flag)"""
         return _windows_.PrintDialogData_SetPrintToFile(*args, **kwargs)
 
         """SetPrintToFile(self, bool flag)"""
         return _windows_.PrintDialogData_SetPrintToFile(*args, **kwargs)
 

-    def SetSetupDialog(*args, **kwargs):
-        """SetSetupDialog(self, bool flag)"""
-        return _windows_.PrintDialogData_SetSetupDialog(*args, **kwargs)
-

     def EnablePrintToFile(*args, **kwargs):
         """EnablePrintToFile(self, bool flag)"""
         return _windows_.PrintDialogData_EnablePrintToFile(*args, **kwargs)
     def EnablePrintToFile(*args, **kwargs):
         """EnablePrintToFile(self, bool flag)"""
         return _windows_.PrintDialogData_EnablePrintToFile(*args, **kwargs)


@@ -4157,7 +4857,8 @@ class PrintDialogDataPtr(PrintDialogData):
         self.__class__ = PrintDialogData
 _windows_.PrintDialogData_swigregister(PrintDialogDataPtr)
 
         self.__class__ = PrintDialogData
 _windows_.PrintDialogData_swigregister(PrintDialogDataPtr)
 

-class PrintDialog(Dialog):
+class PrintDialog(_core.Object):
+    """Proxy of C++ PrintDialog class"""

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


@@ -4166,20 +4867,22 @@ class PrintDialog(Dialog):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-        self._setOORInfo(self)
+    def ShowModal(*args, **kwargs):
+        """ShowModal(self) -> int"""
+        return _windows_.PrintDialog_ShowModal(*args, **kwargs)

 
     def GetPrintDialogData(*args, **kwargs):
         """GetPrintDialogData(self) -> PrintDialogData"""
         return _windows_.PrintDialog_GetPrintDialogData(*args, **kwargs)
 
 
     def GetPrintDialogData(*args, **kwargs):
         """GetPrintDialogData(self) -> PrintDialogData"""
         return _windows_.PrintDialog_GetPrintDialogData(*args, **kwargs)
 

+    def GetPrintData(*args, **kwargs):
+        """GetPrintData(self) -> PrintData"""
+        return _windows_.PrintDialog_GetPrintData(*args, **kwargs)
+

     def GetPrintDC(*args, **kwargs):
         """GetPrintDC(self) -> DC"""
         return _windows_.PrintDialog_GetPrintDC(*args, **kwargs)
 
     def GetPrintDC(*args, **kwargs):
         """GetPrintDC(self) -> DC"""
         return _windows_.PrintDialog_GetPrintDC(*args, **kwargs)
 

-    def ShowModal(*args, **kwargs):
-        """ShowModal(self) -> int"""
-        return _windows_.PrintDialog_ShowModal(*args, **kwargs)
-

 
 class PrintDialogPtr(PrintDialog):
     def __init__(self, this):
 
 class PrintDialogPtr(PrintDialog):
     def __init__(self, this):


@@ -4192,6 +4895,7 @@ 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):

+    """Proxy of C++ Printer class"""

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


@@ -4207,28 +4911,28 @@ class Printer(_core.Object):
         except: pass
 
     def CreateAbortWindow(*args, **kwargs):
         except: pass
 
     def CreateAbortWindow(*args, **kwargs):

-        """CreateAbortWindow(self, Window parent, Printout printout)"""
+        """CreateAbortWindow(self, Window parent, Printout printout) -> Window"""

         return _windows_.Printer_CreateAbortWindow(*args, **kwargs)
 
         return _windows_.Printer_CreateAbortWindow(*args, **kwargs)
 

-    def GetPrintDialogData(*args, **kwargs):
-        """GetPrintDialogData(self) -> PrintDialogData"""
-        return _windows_.Printer_GetPrintDialogData(*args, **kwargs)
+    def ReportError(*args, **kwargs):
+        """ReportError(self, Window parent, Printout printout, String message)"""
+        return _windows_.Printer_ReportError(*args, **kwargs)
+
+    def Setup(*args, **kwargs):
+        """Setup(self, Window parent) -> bool"""
+        return _windows_.Printer_Setup(*args, **kwargs)

 
     def Print(*args, **kwargs):
 
     def Print(*args, **kwargs):

-        """Print(self, Window parent, Printout printout, int prompt=True) -> bool"""
+        """Print(self, Window parent, Printout printout, bool prompt=True) -> bool"""

         return _windows_.Printer_Print(*args, **kwargs)
 
     def PrintDialog(*args, **kwargs):
         """PrintDialog(self, Window parent) -> DC"""
         return _windows_.Printer_PrintDialog(*args, **kwargs)
 
         return _windows_.Printer_Print(*args, **kwargs)
 
     def PrintDialog(*args, **kwargs):
         """PrintDialog(self, Window parent) -> DC"""
         return _windows_.Printer_PrintDialog(*args, **kwargs)
 

-    def ReportError(*args, **kwargs):
-        """ReportError(self, Window parent, Printout printout, String message)"""
-        return _windows_.Printer_ReportError(*args, **kwargs)
-
-    def Setup(*args, **kwargs):
-        """Setup(self, Window parent) -> bool"""
-        return _windows_.Printer_Setup(*args, **kwargs)
+    def GetPrintDialogData(*args, **kwargs):
+        """GetPrintDialogData(self) -> PrintDialogData"""
+        return _windows_.Printer_GetPrintDialogData(*args, **kwargs)

 
     def GetAbort(*args, **kwargs):
         """GetAbort(self) -> bool"""
 
     def GetAbort(*args, **kwargs):
         """GetAbort(self) -> bool"""


@@ -4252,6 +4956,7 @@ def Printer_GetLastError(*args, **kwargs):
     return _windows_.Printer_GetLastError(*args, **kwargs)
 
 class Printout(_core.Object):
     return _windows_.Printer_GetLastError(*args, **kwargs)
 
 class Printout(_core.Object):

+    """Proxy of C++ Printout class"""

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


@@ -4318,33 +5023,63 @@ class Printout(_core.Object):
         """SetIsPreview(self, bool p)"""
         return _windows_.Printout_SetIsPreview(*args, **kwargs)
 
         """SetIsPreview(self, bool p)"""
         return _windows_.Printout_SetIsPreview(*args, **kwargs)
 

-    def base_OnBeginDocument(*args, **kwargs):
-        """base_OnBeginDocument(self, int startPage, int endPage) -> bool"""
-        return _windows_.Printout_base_OnBeginDocument(*args, **kwargs)
+    def OnBeginDocument(*args, **kwargs):
+        """OnBeginDocument(self, int startPage, int endPage) -> bool"""
+        return _windows_.Printout_OnBeginDocument(*args, **kwargs)
+
+    def OnEndDocument(*args, **kwargs):
+        """OnEndDocument(self)"""
+        return _windows_.Printout_OnEndDocument(*args, **kwargs)
+
+    def OnBeginPrinting(*args, **kwargs):
+        """OnBeginPrinting(self)"""
+        return _windows_.Printout_OnBeginPrinting(*args, **kwargs)
+
+    def OnEndPrinting(*args, **kwargs):
+        """OnEndPrinting(self)"""
+        return _windows_.Printout_OnEndPrinting(*args, **kwargs)
+
+    def OnPreparePrinting(*args, **kwargs):
+        """OnPreparePrinting(self)"""
+        return _windows_.Printout_OnPreparePrinting(*args, **kwargs)

 
 

-    def base_OnEndDocument(*args, **kwargs):
-        """base_OnEndDocument(self)"""
-        return _windows_.Printout_base_OnEndDocument(*args, **kwargs)
+    def HasPage(*args, **kwargs):
+        """HasPage(self, int page) -> bool"""
+        return _windows_.Printout_HasPage(*args, **kwargs)

 
 

-    def base_OnBeginPrinting(*args, **kwargs):
-        """base_OnBeginPrinting(self)"""
-        return _windows_.Printout_base_OnBeginPrinting(*args, **kwargs)
+    def GetPageInfo(*args, **kwargs):
+        """GetPageInfo() -> (minPage, maxPage, pageFrom, pageTo)"""
+        return _windows_.Printout_GetPageInfo(*args, **kwargs)

 
 

-    def base_OnEndPrinting(*args, **kwargs):
-        """base_OnEndPrinting(self)"""
-        return _windows_.Printout_base_OnEndPrinting(*args, **kwargs)
+    def base_OnBeginDocument(*args, **kw):
+        return Printout.OnBeginDocument(*args, **kw)
+    base_OnBeginDocument = wx._deprecated(base_OnBeginDocument,
+                                   "Please use Printout.OnBeginDocument instead.")

 
 

-    def base_OnPreparePrinting(*args, **kwargs):
-        """base_OnPreparePrinting(self)"""
-        return _windows_.Printout_base_OnPreparePrinting(*args, **kwargs)
+    def base_OnEndDocument(*args, **kw):
+        return Printout.OnEndDocument(*args, **kw)
+    base_OnEndDocument = wx._deprecated(base_OnEndDocument,
+                                   "Please use Printout.OnEndDocument instead.")

 
 

-    def base_HasPage(*args, **kwargs):
-        """base_HasPage(self, int page) -> bool"""
-        return _windows_.Printout_base_HasPage(*args, **kwargs)
+    def base_OnBeginPrinting(*args, **kw):
+        return Printout.OnBeginPrinting(*args, **kw)
+    base_OnBeginPrinting = wx._deprecated(base_OnBeginPrinting,
+                                   "Please use Printout.OnBeginPrinting instead.")

 
 

-    def base_GetPageInfo(*args, **kwargs):
-        """base_GetPageInfo() -> (minPage, maxPage, pageFrom, pageTo)"""
-        return _windows_.Printout_base_GetPageInfo(*args, **kwargs)
+    def base_OnEndPrinting(*args, **kw):
+        return Printout.OnEndPrinting(*args, **kw)
+    base_OnEndPrinting = wx._deprecated(base_OnEndPrinting,
+                                   "Please use Printout.OnEndPrinting instead.")
+
+    def base_OnPreparePrinting(*args, **kw):
+        return Printout.OnPreparePrinting(*args, **kw)
+    base_OnPreparePrinting = wx._deprecated(base_OnPreparePrinting,
+                                   "Please use Printout.OnPreparePrinting instead.")
+
+    def base_GetPageInfo(*args, **kw):
+        return Printout.GetPageInfo(*args, **kw)
+    base_GetPageInfo = wx._deprecated(base_GetPageInfo,
+                                   "Please use Printout.GetPageInfo instead.")

 
 
 class PrintoutPtr(Printout):
 
 
 class PrintoutPtr(Printout):


@@ -4355,6 +5090,7 @@ class PrintoutPtr(Printout):
 _windows_.Printout_swigregister(PrintoutPtr)
 
 class PreviewCanvas(ScrolledWindow):
 _windows_.Printout_swigregister(PrintoutPtr)
 
 class PreviewCanvas(ScrolledWindow):

+    """Proxy of C++ PreviewCanvas class"""

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


@@ -4378,6 +5114,7 @@ class PreviewCanvasPtr(PreviewCanvas):
 _windows_.PreviewCanvas_swigregister(PreviewCanvasPtr)
 
 class PreviewFrame(Frame):
 _windows_.PreviewCanvas_swigregister(PreviewCanvasPtr)
 
 class PreviewFrame(Frame):

+    """Proxy of C++ PreviewFrame class"""

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


@@ -4433,6 +5170,7 @@ 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):

+    """Proxy of C++ PreviewControlBar class"""

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


@@ -4488,6 +5226,7 @@ class PreviewControlBarPtr(PreviewControlBar):
 _windows_.PreviewControlBar_swigregister(PreviewControlBarPtr)
 
 class PrintPreview(_core.Object):
 _windows_.PreviewControlBar_swigregister(PreviewControlBarPtr)
 
 class PrintPreview(_core.Object):

+    """Proxy of C++ PrintPreview class"""

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


@@ -4597,6 +5336,7 @@ class PrintPreviewPtr(PrintPreview):
 _windows_.PrintPreview_swigregister(PrintPreviewPtr)
 
 class PyPrintPreview(PrintPreview):
 _windows_.PrintPreview_swigregister(PrintPreviewPtr)
 
 class PyPrintPreview(PrintPreview):

+    """Proxy of C++ PyPrintPreview class"""

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


@@ -4614,33 +5354,68 @@ class PyPrintPreview(PrintPreview):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyPrintPreview__setCallbackInfo(*args, **kwargs)
 
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyPrintPreview__setCallbackInfo(*args, **kwargs)
 

-    def base_SetCurrentPage(*args, **kwargs):
-        """base_SetCurrentPage(self, int pageNum) -> bool"""
-        return _windows_.PyPrintPreview_base_SetCurrentPage(*args, **kwargs)
+    def SetCurrentPage(*args, **kwargs):
+        """SetCurrentPage(self, int pageNum) -> bool"""
+        return _windows_.PyPrintPreview_SetCurrentPage(*args, **kwargs)

 
 

-    def base_PaintPage(*args, **kwargs):
-        """base_PaintPage(self, PreviewCanvas canvas, DC dc) -> bool"""
-        return _windows_.PyPrintPreview_base_PaintPage(*args, **kwargs)
+    def PaintPage(*args, **kwargs):
+        """PaintPage(self, PreviewCanvas canvas, DC dc) -> bool"""
+        return _windows_.PyPrintPreview_PaintPage(*args, **kwargs)

 
 

-    def base_DrawBlankPage(*args, **kwargs):
-        """base_DrawBlankPage(self, PreviewCanvas canvas, DC dc) -> bool"""
-        return _windows_.PyPrintPreview_base_DrawBlankPage(*args, **kwargs)
+    def DrawBlankPage(*args, **kwargs):
+        """DrawBlankPage(self, PreviewCanvas canvas, DC dc) -> bool"""
+        return _windows_.PyPrintPreview_DrawBlankPage(*args, **kwargs)

 
 

-    def base_RenderPage(*args, **kwargs):
-        """base_RenderPage(self, int pageNum) -> bool"""
-        return _windows_.PyPrintPreview_base_RenderPage(*args, **kwargs)
+    def RenderPage(*args, **kwargs):
+        """RenderPage(self, int pageNum) -> bool"""
+        return _windows_.PyPrintPreview_RenderPage(*args, **kwargs)

 
 

-    def base_SetZoom(*args, **kwargs):
-        """base_SetZoom(self, int percent)"""
-        return _windows_.PyPrintPreview_base_SetZoom(*args, **kwargs)
+    def SetZoom(*args, **kwargs):
+        """SetZoom(self, int percent)"""
+        return _windows_.PyPrintPreview_SetZoom(*args, **kwargs)

 
 

-    def base_Print(*args, **kwargs):
-        """base_Print(self, bool interactive) -> bool"""
-        return _windows_.PyPrintPreview_base_Print(*args, **kwargs)
+    def Print(*args, **kwargs):
+        """Print(self, bool interactive) -> bool"""
+        return _windows_.PyPrintPreview_Print(*args, **kwargs)

 
 

-    def base_DetermineScaling(*args, **kwargs):
-        """base_DetermineScaling(self)"""
-        return _windows_.PyPrintPreview_base_DetermineScaling(*args, **kwargs)
+    def DetermineScaling(*args, **kwargs):
+        """DetermineScaling(self)"""
+        return _windows_.PyPrintPreview_DetermineScaling(*args, **kwargs)
+
+    def base_SetCurrentPage(*args, **kw):
+        return PyPrintPreview.SetCurrentPage(*args, **kw)
+    base_SetCurrentPage = wx._deprecated(base_SetCurrentPage,
+                                   "Please use PyPrintPreview.SetCurrentPage instead.")
+
+    def base_PaintPage(*args, **kw):
+        return PyPrintPreview.PaintPage(*args, **kw)
+    base_PaintPage = wx._deprecated(base_PaintPage,
+                                   "Please use PyPrintPreview.PaintPage instead.")
+
+    def base_DrawBlankPage(*args, **kw):
+        return PyPrintPreview.DrawBlankPage(*args, **kw)
+    base_DrawBlankPage = wx._deprecated(base_DrawBlankPage,
+                                   "Please use PyPrintPreview.DrawBlankPage instead.")
+
+    def base_RenderPage(*args, **kw):
+        return PyPrintPreview.RenderPage(*args, **kw)
+    base_RenderPage = wx._deprecated(base_RenderPage,
+                                   "Please use PyPrintPreview.RenderPage instead.")
+
+    def base_SetZoom(*args, **kw):
+        return PyPrintPreview.SetZoom(*args, **kw)
+    base_SetZoom = wx._deprecated(base_SetZoom,
+                                   "Please use PyPrintPreview.SetZoom instead.")
+
+    def base_Print(*args, **kw):
+        return PyPrintPreview.Print(*args, **kw)
+    base_Print = wx._deprecated(base_Print,
+                                   "Please use PyPrintPreview.Print instead.")
+
+    def base_DetermineScaling(*args, **kw):
+        return PyPrintPreview.DetermineScaling(*args, **kw)
+    base_DetermineScaling = wx._deprecated(base_DetermineScaling,
+                                   "Please use PyPrintPreview.DetermineScaling instead.")

 
 
 class PyPrintPreviewPtr(PyPrintPreview):
 
 
 class PyPrintPreviewPtr(PyPrintPreview):


@@ -4651,6 +5426,7 @@ class PyPrintPreviewPtr(PyPrintPreview):
 _windows_.PyPrintPreview_swigregister(PyPrintPreviewPtr)
 
 class PyPreviewFrame(PreviewFrame):
 _windows_.PyPrintPreview_swigregister(PyPrintPreviewPtr)
 
 class PyPreviewFrame(PreviewFrame):

+    """Proxy of C++ PyPreviewFrame class"""

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


@@ -4677,17 +5453,32 @@ class PyPreviewFrame(PreviewFrame):
         """SetControlBar(self, PreviewControlBar bar)"""
         return _windows_.PyPreviewFrame_SetControlBar(*args, **kwargs)
 
         """SetControlBar(self, PreviewControlBar bar)"""
         return _windows_.PyPreviewFrame_SetControlBar(*args, **kwargs)
 

-    def base_Initialize(*args, **kwargs):
-        """base_Initialize(self)"""
-        return _windows_.PyPreviewFrame_base_Initialize(*args, **kwargs)
+    def Initialize(*args, **kwargs):
+        """Initialize(self)"""
+        return _windows_.PyPreviewFrame_Initialize(*args, **kwargs)

 
 

-    def base_CreateCanvas(*args, **kwargs):
-        """base_CreateCanvas(self)"""
-        return _windows_.PyPreviewFrame_base_CreateCanvas(*args, **kwargs)
+    def CreateCanvas(*args, **kwargs):
+        """CreateCanvas(self)"""
+        return _windows_.PyPreviewFrame_CreateCanvas(*args, **kwargs)

 
 

-    def base_CreateControlBar(*args, **kwargs):
-        """base_CreateControlBar(self)"""
-        return _windows_.PyPreviewFrame_base_CreateControlBar(*args, **kwargs)
+    def CreateControlBar(*args, **kwargs):
+        """CreateControlBar(self)"""
+        return _windows_.PyPreviewFrame_CreateControlBar(*args, **kwargs)
+
+    def base_Initialize(*args, **kw):
+        return PyPreviewFrame.Initialize(*args, **kw)
+    base_Initialize = wx._deprecated(base_Initialize,
+                                   "Please use PyPreviewFrame.Initialize instead.")
+
+    def base_CreateCanvas(*args, **kw):
+        return PyPreviewFrame.CreateCanvas(*args, **kw)
+    base_CreateCanvas = wx._deprecated(base_CreateCanvas,
+                                   "Please use PyPreviewFrame.CreateCanvas instead.")
+
+    def base_CreateControlBar(*args, **kw):
+        return PyPreviewFrame.CreateControlBar(*args, **kw)
+    base_CreateControlBar = wx._deprecated(base_CreateControlBar,
+                                   "Please use PyPreviewFrame.CreateControlBar instead.")

 
 
 class PyPreviewFramePtr(PyPreviewFrame):
 
 
 class PyPreviewFramePtr(PyPreviewFrame):


@@ -4698,6 +5489,7 @@ class PyPreviewFramePtr(PyPreviewFrame):
 _windows_.PyPreviewFrame_swigregister(PyPreviewFramePtr)
 
 class PyPreviewControlBar(PreviewControlBar):
 _windows_.PyPreviewFrame_swigregister(PyPreviewFramePtr)
 
 class PyPreviewControlBar(PreviewControlBar):

+    """Proxy of C++ PyPreviewControlBar class"""

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


@@ -4720,13 +5512,23 @@ class PyPreviewControlBar(PreviewControlBar):
         """SetPrintPreview(self, PrintPreview preview)"""
         return _windows_.PyPreviewControlBar_SetPrintPreview(*args, **kwargs)
 
         """SetPrintPreview(self, PrintPreview preview)"""
         return _windows_.PyPreviewControlBar_SetPrintPreview(*args, **kwargs)
 

-    def base_CreateButtons(*args, **kwargs):
-        """base_CreateButtons(self)"""
-        return _windows_.PyPreviewControlBar_base_CreateButtons(*args, **kwargs)
+    def CreateButtons(*args, **kwargs):
+        """CreateButtons(self)"""
+        return _windows_.PyPreviewControlBar_CreateButtons(*args, **kwargs)

 
 

-    def base_SetZoomControl(*args, **kwargs):
-        """base_SetZoomControl(self, int zoom)"""
-        return _windows_.PyPreviewControlBar_base_SetZoomControl(*args, **kwargs)
+    def SetZoomControl(*args, **kwargs):
+        """SetZoomControl(self, int zoom)"""
+        return _windows_.PyPreviewControlBar_SetZoomControl(*args, **kwargs)
+
+    def base_CreateButtons(*args, **kw):
+        return PreviewControlBar.CreateButtons(*args, **kw)
+    base_CreateButtons = wx._deprecated(base_CreateButtons,
+                                   "Please use PreviewControlBar.CreateButtons instead.")
+
+    def base_SetZoomControl(*args, **kw):
+        return PreviewControlBar.SetZoomControl(*args, **kw)
+    base_SetZoomControl = wx._deprecated(base_SetZoomControl,
+                                   "Please use PreviewControlBar.SetZoomControl instead.")

 
 
 class PyPreviewControlBarPtr(PyPreviewControlBar):
 
 
 class PyPreviewControlBarPtr(PyPreviewControlBar):


@@ -4737,3 +5539,4 @@ class PyPreviewControlBarPtr(PyPreviewControlBar):
 _windows_.PyPreviewControlBar_swigregister(PyPreviewControlBarPtr)
 
 
 _windows_.PyPreviewControlBar_swigregister(PyPreviewControlBarPtr)
 
 

+