log wxChoice events in the same format as wxComboBox ones to make it simpler to compa...

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

diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py
index 1aa383161d125b584f4e4c9b8cd175936a8d7286..ff1aad2f6a915fb10ab2cd27f14d22beacbad42d 100644 (file)
--- a/wxPython/src/gtk/_windows.py
+++ b/wxPython/src/gtk/_windows.py
@@ -1,4 +1,4 @@
-# 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_


@@ -352,6 +352,8 @@ 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_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


@@ -411,19 +413,11 @@ 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):
         return _windows_.TopLevelWindow_GetTitle(*args, **kwargs)
 
     def SetShape(*args, **kwargs):


@@ -446,6 +440,15 @@ class TopLevelWindow(_core.Window):
         """MacGetMetalAppearance(self) -> bool"""
         return _windows_.TopLevelWindow_MacGetMetalAppearance(*args, **kwargs)
 
         """MacGetMetalAppearance(self) -> bool"""
         return _windows_.TopLevelWindow_MacGetMetalAppearance(*args, **kwargs)
 

+    def CenterOnScreen(*args, **kwargs):
+        """
+        CenterOnScreen(self, int dir=BOTH)
+
+        Center the window on screen
+        """
+        return _windows_.TopLevelWindow_CenterOnScreen(*args, **kwargs)
+
+    CentreOnScreen = CenterOnScreen 

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


@@ -514,8 +517,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)
 


@@ -626,6 +629,7 @@ 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,)
     """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,)

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


@@ -654,12 +658,28 @@ class Dialog(TopLevelWindow):
         """GetReturnCode(self) -> int"""
         return _windows_.Dialog_GetReturnCode(*args, **kwargs)
 
         """GetReturnCode(self) -> int"""
         return _windows_.Dialog_GetReturnCode(*args, **kwargs)
 

+    def SetAffirmativeId(*args, **kwargs):
+        """SetAffirmativeId(self, int affirmativeId)"""
+        return _windows_.Dialog_SetAffirmativeId(*args, **kwargs)
+
+    def GetAffirmativeId(*args, **kwargs):
+        """GetAffirmativeId(self) -> int"""
+        return _windows_.Dialog_GetAffirmativeId(*args, **kwargs)
+
+    def SetEscapeId(*args, **kwargs):
+        """SetEscapeId(self, int escapeId)"""
+        return _windows_.Dialog_SetEscapeId(*args, **kwargs)
+
+    def GetEscapeId(*args, **kwargs):
+        """GetEscapeId(self) -> int"""
+        return _windows_.Dialog_GetEscapeId(*args, **kwargs)
+

     def CreateTextSizer(*args, **kwargs):
         """CreateTextSizer(self, String message) -> Sizer"""
         return _windows_.Dialog_CreateTextSizer(*args, **kwargs)
 
     def CreateButtonSizer(*args, **kwargs):
     def CreateTextSizer(*args, **kwargs):
         """CreateTextSizer(self, String message) -> Sizer"""
         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)
 
     def CreateStdDialogButtonSizer(*args, **kwargs):
         return _windows_.Dialog_CreateButtonSizer(*args, **kwargs)
 
     def CreateStdDialogButtonSizer(*args, **kwargs):


@@ -696,9 +716,6 @@ class Dialog(TopLevelWindow):
         return _windows_.Dialog_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         return _windows_.Dialog_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

-    def SendSizeEvent(self):
-        self.ProcessEvent(wx.SizeEvent((-1,-1)))
-

 
 class DialogPtr(Dialog):
     def __init__(self, this):
 
 class DialogPtr(Dialog):
     def __init__(self, this):


@@ -855,7 +872,7 @@ class StatusBar(_core.Window):
         return "<%s.%s; proxy of C++ wxStatusBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         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)


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

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

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


@@ -1970,6 +1987,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)


@@ -1978,10 +2007,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):


@@ -2187,6 +2212,12 @@ class TaskBarIcon(_core.EvtHandler):
         del newobj.thisown
         self._setCallbackInfo(self, TaskBarIcon, 0)
 
         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 _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)"""
         return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs)
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)"""
         return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs)


@@ -2197,7 +2228,9 @@ class TaskBarIcon(_core.EvtHandler):
 
         Deletes the C++ object this Python object is a proxy for.
         """
 
         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"""


@@ -2391,6 +2424,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


@@ -2638,11 +2678,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


@@ -2655,7 +2706,8 @@ class MultiChoiceDialog(Dialog):
         SetSelections(List selections)
 
         Specify the items in the list that should be selected, using a list of
         SetSelections(List selections)
 
         Specify the items in the list that should be selected, using a list of

-        integers.
+        integers.  The list should specify the indexes of the items that
+        should be selected.

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


@@ -2664,6 +2716,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)
 


@@ -2682,7 +2735,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.


@@ -2981,6 +3034,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


@@ -3378,7 +3435,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)
 
 


@@ -3502,89 +3559,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 DoMoveWindow(*args, **kwargs):
+        """DoMoveWindow(self, int x, int y, int width, int height)"""
+        return _windows_.PyWindow_DoMoveWindow(*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_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 DoSetClientSize(*args, **kwargs):
+        """DoSetClientSize(self, int width, int height)"""
+        return _windows_.PyWindow_DoSetClientSize(*args, **kwargs)

 
 

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

 
 

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

 
 

-    def base_DoGetSize(*args, **kwargs):
-        """base_DoGetSize() -> (width, height)"""
-        return _windows_.PyWindow_base_DoGetSize(*args, **kwargs)
+    def DoGetClientSize(*args, **kwargs):
+        """DoGetClientSize() -> (width, height)"""
+        return _windows_.PyWindow_DoGetClientSize(*args, **kwargs)

 
 

-    def base_DoGetClientSize(*args, **kwargs):
-        """base_DoGetClientSize() -> (width, height)"""
-        return _windows_.PyWindow_base_DoGetClientSize(*args, **kwargs)
+    def DoGetPosition(*args, **kwargs):
+        """DoGetPosition() -> (x,y)"""
+        return _windows_.PyWindow_DoGetPosition(*args, **kwargs)

 
 

-    def base_DoGetPosition(*args, **kwargs):
-        """base_DoGetPosition() -> (x,y)"""
-        return _windows_.PyWindow_base_DoGetPosition(*args, **kwargs)
+    def DoGetVirtualSize(*args, **kwargs):
+        """DoGetVirtualSize(self) -> Size"""
+        return _windows_.PyWindow_DoGetVirtualSize(*args, **kwargs)

 
 

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

 
 

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

 
 

-    def base_InitDialog(*args, **kwargs):
-        """base_InitDialog(self)"""
-        return _windows_.PyWindow_base_InitDialog(*args, **kwargs)
+        Sends an EVT_INIT_DIALOG event, whose handler usually transfers data
+        to the dialog via validators.
+        """
+        return _windows_.PyWindow_InitDialog(*args, **kwargs)

 
 

-    def base_TransferDataToWindow(*args, **kwargs):
-        """base_TransferDataToWindow(self) -> bool"""
-        return _windows_.PyWindow_base_TransferDataToWindow(*args, **kwargs)
+    def TransferDataToWindow(*args, **kwargs):
+        """
+        TransferDataToWindow(self) -> bool

 
 

-    def base_TransferDataFromWindow(*args, **kwargs):
-        """base_TransferDataFromWindow(self) -> bool"""
-        return _windows_.PyWindow_base_TransferDataFromWindow(*args, **kwargs)
+        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 base_Validate(*args, **kwargs):
-        """base_Validate(self) -> bool"""
-        return _windows_.PyWindow_base_Validate(*args, **kwargs)
+    def TransferDataFromWindow(*args, **kwargs):
+        """
+        TransferDataFromWindow(self) -> bool

 
 

-    def base_AcceptsFocus(*args, **kwargs):
-        """base_AcceptsFocus(self) -> bool"""
-        return _windows_.PyWindow_base_AcceptsFocus(*args, **kwargs)
+        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 base_AcceptsFocusFromKeyboard(*args, **kwargs):
-        """base_AcceptsFocusFromKeyboard(self) -> bool"""
-        return _windows_.PyWindow_base_AcceptsFocusFromKeyboard(*args, **kwargs)
+    def Validate(*args, **kwargs):
+        """
+        Validate(self) -> bool

 
 

-    def base_GetMaxSize(*args, **kwargs):
-        """base_GetMaxSize(self) -> Size"""
-        return _windows_.PyWindow_base_GetMaxSize(*args, **kwargs)
+        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 base_AddChild(*args, **kwargs):
-        """base_AddChild(self, Window child)"""
-        return _windows_.PyWindow_base_AddChild(*args, **kwargs)
+    def AcceptsFocus(*args, **kwargs):
+        """
+        AcceptsFocus(self) -> bool

 
 

-    def base_RemoveChild(*args, **kwargs):
-        """base_RemoveChild(self, Window child)"""
-        return _windows_.PyWindow_base_RemoveChild(*args, **kwargs)
+        Can this window have focus?
+        """
+        return _windows_.PyWindow_AcceptsFocus(*args, **kwargs)

 
 

-    def base_ShouldInheritColours(*args, **kwargs):
-        """base_ShouldInheritColours(self) -> bool"""
-        return _windows_.PyWindow_base_ShouldInheritColours(*args, **kwargs)
+    def AcceptsFocusFromKeyboard(*args, **kwargs):
+        """
+        AcceptsFocusFromKeyboard(self) -> bool

 
 

-    def base_ApplyParentThemeBackground(*args, **kwargs):
-        """base_ApplyParentThemeBackground(self, Colour c)"""
-        return _windows_.PyWindow_base_ApplyParentThemeBackground(*args, **kwargs)
+        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 base_GetDefaultAttributes(*args, **kwargs):
-        """base_GetDefaultAttributes(self) -> VisualAttributes"""
-        return _windows_.PyWindow_base_GetDefaultAttributes(*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_DoSetClientSize(*args, **kw):
+        return PyWindow.DoSetClientSize(*args, **kw)
+    base_DoSetClientSize = wx._deprecated(base_DoSetClientSize,
+                                   "Please use PyWindow.DoSetClientSize instead.")
+
+    def base_DoSetVirtualSize(*args, **kw):
+        return PyWindow.DoSetVirtualSize(*args, **kw)
+    base_DoSetVirtualSize = wx._deprecated(base_DoSetVirtualSize,
+                                   "Please use PyWindow.DoSetVirtualSize instead.")
+
+    def base_DoGetSize(*args, **kw):
+        return PyWindow.DoGetSize(*args, **kw)
+    base_DoGetSize = wx._deprecated(base_DoGetSize,
+                                   "Please use PyWindow.DoGetSize instead.")
+
+    def base_DoGetClientSize(*args, **kw):
+        return PyWindow.DoGetClientSize(*args, **kw)
+    base_DoGetClientSize = wx._deprecated(base_DoGetClientSize,
+                                   "Please use PyWindow.DoGetClientSize instead.")
+
+    def base_DoGetPosition(*args, **kw):
+        return PyWindow.DoGetPosition(*args, **kw)
+    base_DoGetPosition = wx._deprecated(base_DoGetPosition,
+                                   "Please use PyWindow.DoGetPosition instead.")
+
+    def base_DoGetVirtualSize(*args, **kw):
+        return PyWindow.DoGetVirtualSize(*args, **kw)
+    base_DoGetVirtualSize = wx._deprecated(base_DoGetVirtualSize,
+                                   "Please use PyWindow.DoGetVirtualSize instead.")
+
+    def base_DoGetBestSize(*args, **kw):
+        return PyWindow.DoGetBestSize(*args, **kw)
+    base_DoGetBestSize = wx._deprecated(base_DoGetBestSize,
+                                   "Please use PyWindow.DoGetBestSize instead.")
+
+    def base_InitDialog(*args, **kw):
+        return PyWindow.InitDialog(*args, **kw)
+    base_InitDialog = wx._deprecated(base_InitDialog,
+                                   "Please use PyWindow.InitDialog instead.")
+
+    def base_TransferDataToWindow(*args, **kw):
+        return PyWindow.TransferDataToWindow(*args, **kw)
+    base_TransferDataToWindow = wx._deprecated(base_TransferDataToWindow,
+                                   "Please use PyWindow.TransferDataToWindow instead.")
+
+    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):


@@ -3623,89 +3845,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):


@@ -3734,7 +4121,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)"""


@@ -3744,89 +4131,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 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 DoSetSize(*args, **kwargs):
+        """DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
+        return _windows_.PyScrolledWindow_DoSetSize(*args, **kwargs)

 
 

-    def base_DoSetClientSize(*args, **kwargs):
-        """base_DoSetClientSize(self, int width, int height)"""
-        return _windows_.PyScrolledWindow_base_DoSetClientSize(*args, **kwargs)
+    def DoSetClientSize(*args, **kwargs):
+        """DoSetClientSize(self, int width, int height)"""
+        return _windows_.PyScrolledWindow_DoSetClientSize(*args, **kwargs)

 
 

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

 
 

-    def base_DoGetSize(*args, **kwargs):
-        """base_DoGetSize() -> (width, height)"""
-        return _windows_.PyScrolledWindow_base_DoGetSize(*args, **kwargs)
+    def DoGetSize(*args, **kwargs):
+        """DoGetSize() -> (width, height)"""
+        return _windows_.PyScrolledWindow_DoGetSize(*args, **kwargs)

 
 

-    def base_DoGetClientSize(*args, **kwargs):
-        """base_DoGetClientSize() -> (width, height)"""
-        return _windows_.PyScrolledWindow_base_DoGetClientSize(*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 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_.PyScrolledWindow_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_.PyScrolledWindow_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_.PyScrolledWindow_ShouldInheritColours(*args, **kwargs)

 
 

-    def base_DoGetPosition(*args, **kwargs):
-        """base_DoGetPosition() -> (x,y)"""
-        return _windows_.PyScrolledWindow_base_DoGetPosition(*args, **kwargs)
+    def GetDefaultAttributes(*args, **kwargs):
+        """GetDefaultAttributes(self) -> VisualAttributes"""
+        return _windows_.PyScrolledWindow_GetDefaultAttributes(*args, **kwargs)

 
 

-    def base_DoGetVirtualSize(*args, **kwargs):
-        """base_DoGetVirtualSize(self) -> Size"""
-        return _windows_.PyScrolledWindow_base_DoGetVirtualSize(*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):


@@ -3984,77 +4536,13 @@ class PrintData(_core.Object):
         return _windows_.PrintData_SetFilename(*args, **kwargs)
 
     def __nonzero__(self): return self.Ok() 
         return _windows_.PrintData_SetFilename(*args, **kwargs)
 
     def __nonzero__(self): return self.Ok() 

-    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 GetPreviewCommand(*args, **kwargs):
-        """GetPreviewCommand(self) -> String"""
-        return _windows_.PrintData_GetPreviewCommand(*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 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 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 GetPrivData(*args, **kwargs):
+        """GetPrivData(self) -> PyObject"""
+        return _windows_.PrintData_GetPrivData(*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 SetPrivData(*args, **kwargs):
+        """SetPrivData(self, PyObject data)"""
+        return _windows_.PrintData_SetPrivData(*args, **kwargs)

 
 
 class PrintDataPtr(PrintData):
 
 
 class PrintDataPtr(PrintData):


@@ -4305,14 +4793,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 SetSetupDialog(*args, **kwargs):
-        """SetSetupDialog(self, bool flag)"""
-        return _windows_.PrintDialogData_SetSetupDialog(*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)


@@ -4568,33 +5048,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):


@@ -4869,33 +5379,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 PaintPage(*args, **kwargs):
+        """PaintPage(self, PreviewCanvas canvas, DC dc) -> bool"""
+        return _windows_.PyPrintPreview_PaintPage(*args, **kwargs)
+
+    def DrawBlankPage(*args, **kwargs):
+        """DrawBlankPage(self, PreviewCanvas canvas, DC dc) -> bool"""
+        return _windows_.PyPrintPreview_DrawBlankPage(*args, **kwargs)
+
+    def RenderPage(*args, **kwargs):
+        """RenderPage(self, int pageNum) -> bool"""
+        return _windows_.PyPrintPreview_RenderPage(*args, **kwargs)
+
+    def SetZoom(*args, **kwargs):
+        """SetZoom(self, int percent)"""
+        return _windows_.PyPrintPreview_SetZoom(*args, **kwargs)
+
+    def Print(*args, **kwargs):
+        """Print(self, bool interactive) -> bool"""
+        return _windows_.PyPrintPreview_Print(*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, **kwargs):
-        """base_PaintPage(self, PreviewCanvas canvas, DC dc) -> bool"""
-        return _windows_.PyPrintPreview_base_PaintPage(*args, **kwargs)
+    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, **kwargs):
-        """base_DrawBlankPage(self, PreviewCanvas canvas, DC dc) -> bool"""
-        return _windows_.PyPrintPreview_base_DrawBlankPage(*args, **kwargs)
+    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, **kwargs):
-        """base_RenderPage(self, int pageNum) -> bool"""
-        return _windows_.PyPrintPreview_base_RenderPage(*args, **kwargs)
+    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, **kwargs):
-        """base_SetZoom(self, int percent)"""
-        return _windows_.PyPrintPreview_base_SetZoom(*args, **kwargs)
+    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, **kwargs):
-        """base_Print(self, bool interactive) -> bool"""
-        return _windows_.PyPrintPreview_base_Print(*args, **kwargs)
+    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, **kwargs):
-        """base_DetermineScaling(self)"""
-        return _windows_.PyPrintPreview_base_DetermineScaling(*args, **kwargs)
+    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):


@@ -4933,17 +5478,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 CreateCanvas(*args, **kwargs):
+        """CreateCanvas(self)"""
+        return _windows_.PyPreviewFrame_CreateCanvas(*args, **kwargs)

 
 

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

 
 

-    def base_CreateControlBar(*args, **kwargs):
-        """base_CreateControlBar(self)"""
-        return _windows_.PyPreviewFrame_base_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):


@@ -4977,13 +5537,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):


@@ -4994,3 +5564,4 @@ class PyPreviewControlBarPtr(PyPreviewControlBar):
 _windows_.PyPreviewControlBar_swigregister(PyPreviewControlBarPtr)
 
 
 _windows_.PyPreviewControlBar_swigregister(PyPreviewControlBarPtr)
 
 

+