A little cleanup

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

diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py
index ec3c79b95dfb760a878e5745c05fe79f05e20a82..ae4df6c38be01731e9cc0509d75e2fdbd6585f28 100644 (file)
--- a/wxPython/src/msw/_windows.py
+++ b/wxPython/src/msw/_windows.py
@@ -5,7 +5,6 @@ import _windows_
 
 import _core
 wx = _core 
 
 import _core
 wx = _core 

-__docfilter__ = wx.__docfilter__ 

 #---------------------------------------------------------------------------
 
 class Panel(_core.Window):
 #---------------------------------------------------------------------------
 
 class Panel(_core.Window):


@@ -37,11 +36,51 @@ class Panel(_core.Window):
         """
         InitDialog(self)
 
         """
         InitDialog(self)
 

-        Sends an EVT_INIT_DIALOG event, whose handler usually transfers
-        data to the dialog via validators.
+        Sends an EVT_INIT_DIALOG event, whose handler usually transfers data
+        to the dialog via validators.

         """
         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
+
+        Get the default attributes for this class.  This is useful if you want
+        to use the same font or colour in your own control as in a standard
+        control -- which is a much better idea than hard coding specific
+        colours or fonts which might look completely out of place on the
+        user's system, especially if it uses themes.
+
+        The variant parameter is only relevant under Mac currently and is
+        ignore under other platforms. Under Mac, it will change the size of
+        the returned font. See `wx.Window.SetWindowVariant` for more about
+        this.
+        """
+        return _windows_.Panel_GetClassDefaultAttributes(*args, **kwargs)
+
+    GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

 
 class PanelPtr(Panel):
     def __init__(self, this):
 
 class PanelPtr(Panel):
     def __init__(self, this):


@@ -56,6 +95,23 @@ def PrePanel(*args, **kwargs):
     val.thisown = 1
     return val
 
     val.thisown = 1
     return val
 

+def Panel_GetClassDefaultAttributes(*args, **kwargs):
+    """
+    Panel_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
+
+    Get the default attributes for this class.  This is useful if you want
+    to use the same font or colour in your own control as in a standard
+    control -- which is a much better idea than hard coding specific
+    colours or fonts which might look completely out of place on the
+    user's system, especially if it uses themes.
+
+    The variant parameter is only relevant under Mac currently and is
+    ignore under other platforms. Under Mac, it will change the size of
+    the returned font. See `wx.Window.SetWindowVariant` for more about
+    this.
+    """
+    return _windows_.Panel_GetClassDefaultAttributes(*args, **kwargs)
+

 #---------------------------------------------------------------------------
 
 class ScrolledWindow(Panel):
 #---------------------------------------------------------------------------
 
 class ScrolledWindow(Panel):


@@ -180,6 +236,32 @@ class ScrolledWindow(Panel):
         """GetTargetRect(self) -> Rect"""
         return _windows_.ScrolledWindow_GetTargetRect(*args, **kwargs)
 
         """GetTargetRect(self) -> Rect"""
         return _windows_.ScrolledWindow_GetTargetRect(*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
+
+        Get the default attributes for this class.  This is useful if you want
+        to use the same font or colour in your own control as in a standard
+        control -- which is a much better idea than hard coding specific
+        colours or fonts which might look completely out of place on the
+        user's system, especially if it uses themes.
+
+        The variant parameter is only relevant under Mac currently and is
+        ignore under other platforms. Under Mac, it will change the size of
+        the returned font. See `wx.Window.SetWindowVariant` for more about
+        this.
+        """
+        return _windows_.ScrolledWindow_GetClassDefaultAttributes(*args, **kwargs)
+
+    GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

 
 class ScrolledWindowPtr(ScrolledWindow):
     def __init__(self, this):
 
 class ScrolledWindowPtr(ScrolledWindow):
     def __init__(self, this):


@@ -194,6 +276,23 @@ def PreScrolledWindow(*args, **kwargs):
     val.thisown = 1
     return val
 
     val.thisown = 1
     return val
 

+def ScrolledWindow_GetClassDefaultAttributes(*args, **kwargs):
+    """
+    ScrolledWindow_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
+
+    Get the default attributes for this class.  This is useful if you want
+    to use the same font or colour in your own control as in a standard
+    control -- which is a much better idea than hard coding specific
+    colours or fonts which might look completely out of place on the
+    user's system, especially if it uses themes.
+
+    The variant parameter is only relevant under Mac currently and is
+    ignore under other platforms. Under Mac, it will change the size of
+    the returned font. See `wx.Window.SetWindowVariant` for more about
+    this.
+    """
+    return _windows_.ScrolledWindow_GetClassDefaultAttributes(*args, **kwargs)
+

 #---------------------------------------------------------------------------
 
 STAY_ON_TOP = _windows_.STAY_ON_TOP
 #---------------------------------------------------------------------------
 
 STAY_ON_TOP = _windows_.STAY_ON_TOP


@@ -217,6 +316,7 @@ 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

 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


@@ -228,6 +328,8 @@ 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):
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
 class TopLevelWindow(_core.Window):
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):


@@ -292,6 +394,22 @@ class TopLevelWindow(_core.Window):
         """SetShape(self, Region region) -> bool"""
         return _windows_.TopLevelWindow_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):


@@ -312,9 +430,9 @@ class Frame(TopLevelWindow):
         return "<%s.%s; proxy of C++ wxFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(self, Window parent, int id, String title, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
-            String name=FrameNameStr) -> Frame
+        __init__(self, Window parent, int id=-1, String title=EmptyString, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> Frame

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


@@ -324,9 +442,9 @@ class Frame(TopLevelWindow):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(self, Window parent, int id, String title, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
-            String name=FrameNameStr) -> bool
+        Create(self, Window parent, int id=-1, String title=EmptyString, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> bool

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


@@ -416,6 +534,24 @@ class Frame(TopLevelWindow):
         """DoMenuUpdates(self, Menu menu=None)"""
         return _windows_.Frame_DoMenuUpdates(*args, **kwargs)
 
         """DoMenuUpdates(self, Menu menu=None)"""
         return _windows_.Frame_DoMenuUpdates(*args, **kwargs)
 

+    def GetClassDefaultAttributes(*args, **kwargs):
+        """
+        GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
+
+        Get the default attributes for this class.  This is useful if you want
+        to use the same font or colour in your own control as in a standard
+        control -- which is a much better idea than hard coding specific
+        colours or fonts which might look completely out of place on the
+        user's system, especially if it uses themes.
+
+        The variant parameter is only relevant under Mac currently and is
+        ignore under other platforms. Under Mac, it will change the size of
+        the returned font. See `wx.Window.SetWindowVariant` for more about
+        this.
+        """
+        return _windows_.Frame_GetClassDefaultAttributes(*args, **kwargs)
+
+    GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

 
 class FramePtr(Frame):
     def __init__(self, this):
 
 class FramePtr(Frame):
     def __init__(self, this):


@@ -430,6 +566,23 @@ def PreFrame(*args, **kwargs):
     val.thisown = 1
     return val
 
     val.thisown = 1
     return val
 

+def Frame_GetClassDefaultAttributes(*args, **kwargs):
+    """
+    Frame_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
+
+    Get the default attributes for this class.  This is useful if you want
+    to use the same font or colour in your own control as in a standard
+    control -- which is a much better idea than hard coding specific
+    colours or fonts which might look completely out of place on the
+    user's system, especially if it uses themes.
+
+    The variant parameter is only relevant under Mac currently and is
+    ignore under other platforms. Under Mac, it will change the size of
+    the returned font. See `wx.Window.SetWindowVariant` for more about
+    this.
+    """
+    return _windows_.Frame_GetClassDefaultAttributes(*args, **kwargs)
+

 #---------------------------------------------------------------------------
 
 class Dialog(TopLevelWindow):
 #---------------------------------------------------------------------------
 
 class Dialog(TopLevelWindow):


@@ -437,9 +590,9 @@ class Dialog(TopLevelWindow):
         return "<%s.%s; proxy of C++ wxDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(self, Window parent, int id, String title, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=DEFAULT_DIALOG_STYLE, 
-            String name=DialogNameStr) -> Dialog
+        __init__(self, Window parent, int id=-1, String title=EmptyString, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=DEFAULT_DIALOG_STYLE, String name=DialogNameStr) -> Dialog

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


@@ -449,9 +602,9 @@ class Dialog(TopLevelWindow):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(self, Window parent, int id, String title, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=DEFAULT_DIALOG_STYLE, 
-            String name=DialogNameStr) -> bool
+        Create(self, Window parent, int id=-1, String title=EmptyString, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=DEFAULT_DIALOG_STYLE, String name=DialogNameStr) -> bool

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


@@ -483,6 +636,27 @@ class Dialog(TopLevelWindow):
         """EndModal(self, int retCode)"""
         return _windows_.Dialog_EndModal(*args, **kwargs)
 
         """EndModal(self, int retCode)"""
         return _windows_.Dialog_EndModal(*args, **kwargs)
 

+    def GetClassDefaultAttributes(*args, **kwargs):
+        """
+        GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
+
+        Get the default attributes for this class.  This is useful if you want
+        to use the same font or colour in your own control as in a standard
+        control -- which is a much better idea than hard coding specific
+        colours or fonts which might look completely out of place on the
+        user's system, especially if it uses themes.
+
+        The variant parameter is only relevant under Mac currently and is
+        ignore under other platforms. Under Mac, it will change the size of
+        the returned font. See `wx.Window.SetWindowVariant` for more about
+        this.
+        """
+        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):


@@ -497,6 +671,23 @@ def PreDialog(*args, **kwargs):
     val.thisown = 1
     return val
 
     val.thisown = 1
     return val
 

+def Dialog_GetClassDefaultAttributes(*args, **kwargs):
+    """
+    Dialog_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
+
+    Get the default attributes for this class.  This is useful if you want
+    to use the same font or colour in your own control as in a standard
+    control -- which is a much better idea than hard coding specific
+    colours or fonts which might look completely out of place on the
+    user's system, especially if it uses themes.
+
+    The variant parameter is only relevant under Mac currently and is
+    ignore under other platforms. Under Mac, it will change the size of
+    the returned font. See `wx.Window.SetWindowVariant` for more about
+    this.
+    """
+    return _windows_.Dialog_GetClassDefaultAttributes(*args, **kwargs)
+

 #---------------------------------------------------------------------------
 
 class MiniFrame(Frame):
 #---------------------------------------------------------------------------
 
 class MiniFrame(Frame):


@@ -504,9 +695,9 @@ class MiniFrame(Frame):
         return "<%s.%s; proxy of C++ wxMiniFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxMiniFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(self, Window parent, int id, String title, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
-            String name=FrameNameStr) -> MiniFrame
+        __init__(self, Window parent, int id=-1, String title=EmptyString, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> MiniFrame

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


@@ -516,9 +707,9 @@ class MiniFrame(Frame):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(self, Window parent, int id, String title, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
-            String name=FrameNameStr) -> bool
+        Create(self, Window parent, int id=-1, String title=EmptyString, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> bool

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


@@ -579,7 +770,7 @@ class SplashScreen(Frame):
     def __init__(self, *args, **kwargs):
         """
         __init__(self, Bitmap bitmap, long splashStyle, int milliseconds, 
     def __init__(self, *args, **kwargs):
         """
         __init__(self, Bitmap bitmap, long splashStyle, int milliseconds, 

-            Window parent, int id, Point pos=DefaultPosition, 
+            Window parent, int id=-1, Point pos=DefaultPosition, 

             Size size=DefaultSize, long style=wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP) -> SplashScreen
         """
         newobj = _windows_.new_SplashScreen(*args, **kwargs)
             Size size=DefaultSize, long style=wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP) -> SplashScreen
         """
         newobj = _windows_.new_SplashScreen(*args, **kwargs)


@@ -610,6 +801,9 @@ _windows_.SplashScreen_swigregister(SplashScreenPtr)
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

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

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


@@ -622,7 +816,7 @@ class StatusBar(_core.Window):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):

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

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


@@ -653,6 +847,10 @@ class StatusBar(_core.Window):
         """SetStatusWidths(self, int widths, int widths_field)"""
         return _windows_.StatusBar_SetStatusWidths(*args, **kwargs)
 
         """SetStatusWidths(self, int widths, int widths_field)"""
         return _windows_.StatusBar_SetStatusWidths(*args, **kwargs)
 

+    def SetStatusStyles(*args, **kwargs):
+        """SetStatusStyles(self, int styles, int styles_field)"""
+        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)


@@ -669,6 +867,24 @@ class StatusBar(_core.Window):
         """GetBorderY(self) -> int"""
         return _windows_.StatusBar_GetBorderY(*args, **kwargs)
 
         """GetBorderY(self) -> int"""
         return _windows_.StatusBar_GetBorderY(*args, **kwargs)
 

+    def GetClassDefaultAttributes(*args, **kwargs):
+        """
+        GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
+
+        Get the default attributes for this class.  This is useful if you want
+        to use the same font or colour in your own control as in a standard
+        control -- which is a much better idea than hard coding specific
+        colours or fonts which might look completely out of place on the
+        user's system, especially if it uses themes.
+
+        The variant parameter is only relevant under Mac currently and is
+        ignore under other platforms. Under Mac, it will change the size of
+        the returned font. See `wx.Window.SetWindowVariant` for more about
+        this.
+        """
+        return _windows_.StatusBar_GetClassDefaultAttributes(*args, **kwargs)
+
+    GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

 
 class StatusBarPtr(StatusBar):
     def __init__(self, this):
 
 class StatusBarPtr(StatusBar):
     def __init__(self, this):


@@ -683,6 +899,23 @@ def PreStatusBar(*args, **kwargs):
     val.thisown = 1
     return val
 
     val.thisown = 1
     return val
 

+def StatusBar_GetClassDefaultAttributes(*args, **kwargs):
+    """
+    StatusBar_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
+
+    Get the default attributes for this class.  This is useful if you want
+    to use the same font or colour in your own control as in a standard
+    control -- which is a much better idea than hard coding specific
+    colours or fonts which might look completely out of place on the
+    user's system, especially if it uses themes.
+
+    The variant parameter is only relevant under Mac currently and is
+    ignore under other platforms. Under Mac, it will change the size of
+    the returned font. See `wx.Window.SetWindowVariant` for more about
+    this.
+    """
+    return _windows_.StatusBar_GetClassDefaultAttributes(*args, **kwargs)
+

 #---------------------------------------------------------------------------
 
 SP_NOBORDER = _windows_.SP_NOBORDER
 #---------------------------------------------------------------------------
 
 SP_NOBORDER = _windows_.SP_NOBORDER


@@ -701,10 +934,9 @@ SPLIT_DRAG_DRAGGING = _windows_.SPLIT_DRAG_DRAGGING
 SPLIT_DRAG_LEFT_DOWN = _windows_.SPLIT_DRAG_LEFT_DOWN
 class SplitterWindow(_core.Window):
     """
 SPLIT_DRAG_LEFT_DOWN = _windows_.SPLIT_DRAG_LEFT_DOWN
 class SplitterWindow(_core.Window):
     """

-    wx.SplitterWindow manages up to two subwindows or panes,
-    with an optional vertical or horizontal split which can be
-    used with the mouse or programmatically.
-
+    wx.SplitterWindow manages up to two subwindows or panes, with an
+    optional vertical or horizontal split which can be used with the mouse
+    or programmatically.

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


@@ -752,8 +984,8 @@ class SplitterWindow(_core.Window):
         SetSplitMode(self, int mode)
 
         Sets the split mode.  The mode can be wx.SPLIT_VERTICAL or
         SetSplitMode(self, int mode)
 
         Sets the split mode.  The mode can be wx.SPLIT_VERTICAL or

-        wx.SPLIT_HORIZONTAL.  This only sets the internal variable;
-        does not update the display.
+        wx.SPLIT_HORIZONTAL.  This only sets the internal variable; does not
+        update the display.

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


@@ -769,9 +1001,9 @@ class SplitterWindow(_core.Window):
         """
         Initialize(self, Window window)
 
         """
         Initialize(self, Window 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 splitter 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
+        splitter window.

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


@@ -780,24 +1012,6 @@ class SplitterWindow(_core.Window):
         SplitVertically(self, Window window1, Window window2, int sashPosition=0) -> bool
 
         Initializes the left and right panes of the splitter window.
         SplitVertically(self, Window window1, Window window2, int sashPosition=0) -> bool
 
         Initializes the left and right panes of the splitter window.

-
-            window1       The left pane.
-            window2       The right pane.
-            sashPosition  The initial position of the sash. If this
-                          value is positive, it specifies the size
-                          of the left pane. If it is negative, it is
-                          absolute value gives the size of the right
-                          pane. Finally, specify 0 (default) to
-                          choose the default position (half of the
-                          total window width).
-
-        Returns True if successful, False otherwise (the window was
-        already split).
-
-        SplitVertically should be called if you wish to initially
-        view two panes. It can also be called at any subsequent
-        time, but the application should check that the window is
-        not currently split using IsSplit.

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


@@ -806,24 +1020,6 @@ class SplitterWindow(_core.Window):
         SplitHorizontally(self, Window window1, Window window2, int sashPosition=0) -> bool
 
         Initializes the top and bottom panes of the splitter window.
         SplitHorizontally(self, Window window1, Window window2, int sashPosition=0) -> bool
 
         Initializes the top and bottom panes of the splitter window.

-
-            window1       The top pane.
-            window2       The bottom pane.
-            sashPosition  The initial position of the sash. If this
-                          value is positive, it specifies the size
-                          of the upper pane. If it is negative, it
-                          is absolute value gives the size of the
-                          lower pane. Finally, specify 0 (default)
-                          to choose the default position (half of
-                          the total window height).
-
-        Returns True if successful, False otherwise (the window was
-        already split).
-
-        SplitHorizontally should be called if you wish to initially
-        view two panes. It can also be called at any subsequent
-        time, but the application should check that the window is
-        not currently split using IsSplit.

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


@@ -831,9 +1027,9 @@ class SplitterWindow(_core.Window):
         """
         Unsplit(self, Window toRemove=None) -> bool
 
         """
         Unsplit(self, Window toRemove=None) -> bool
 

-        Unsplits the window.  Pass the pane to remove, or None to
-        remove the right or bottom pane.  Returns True if
-        successful, False otherwise (the window was not split).
+        Unsplits the window.  Pass the pane to remove, or None to remove the
+        right or bottom pane.  Returns True if successful, False otherwise (the
+        window was not split).

 
         This function will not actually delete the pane being
         removed; it sends EVT_SPLITTER_UNSPLIT which can be handled
 
         This function will not actually delete the pane being
         removed; it sends EVT_SPLITTER_UNSPLIT which can be handled


@@ -847,18 +1043,16 @@ class SplitterWindow(_core.Window):
         ReplaceWindow(self, Window winOld, Window winNew) -> bool
 
         This function replaces one of the windows managed by the
         ReplaceWindow(self, Window winOld, Window winNew) -> bool
 
         This function replaces one of the windows managed by the

-        SplitterWindow with another one. It is in general better to
-        use it instead of calling Unsplit() and then resplitting the
-        window back because it will provoke much less flicker. It is
-        valid to call this function whether the splitter has two
-        windows or only one.
-
-        Both parameters should be non-None and winOld must specify
-        one of the windows managed by the splitter. If the
-        parameters are incorrect or the window couldn't be replaced,
-        False is returned. Otherwise the function will return True,
-        but please notice that it will not Destroy the replaced
-        window and you may wish to do it yourself.
+        SplitterWindow with another one. It is in general better to use it
+        instead of calling Unsplit() and then resplitting the window back
+        because it will provoke much less flicker. It is valid to call this
+        function whether the splitter has two windows or only one.
+
+        Both parameters should be non-None and winOld must specify one of the
+        windows managed by the splitter. If the parameters are incorrect or
+        the window couldn't be replaced, False is returned. Otherwise the
+        function will return True, but please notice that it will not Destroy
+        the replaced window and you may wish to do it yourself.

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


@@ -866,16 +1060,15 @@ class SplitterWindow(_core.Window):
         """
         UpdateSize(self)
 
         """
         UpdateSize(self)
 

-        Causes any pending sizing of the sash and child panes to
-        take place immediately.
+        Causes any pending sizing of the sash and child panes to take place
+        immediately.

 
 

-        Such resizing normally takes place in idle time, in order to
-        wait for layout to be completed. However, this can cause
-        unacceptable flicker as the panes are resized after the
-        window has been shown. To work around this, you can perform
-        window layout (for example by sending a size event to the
-        parent window), and then call this function, before showing
-        the top-level window.
+        Such resizing normally takes place in idle time, in order to wait for
+        layout to be completed. However, this can cause unacceptable flicker
+        as the panes are resized after the window has been shown. To work
+        around this, you can perform window layout (for example by sending a
+        size event to the parent window), and then call this function, before
+        showing the top-level window.

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


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

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

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


@@ -899,7 +1092,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)
 


@@ -923,8 +1116,8 @@ class SplitterWindow(_core.Window):
         """
         SetSashPosition(self, int position, bool redraw=True)
 
         """
         SetSashPosition(self, int position, bool redraw=True)
 

-        Sets the sash position, in pixels.  If redraw is Ttrue then
-        the panes are resized and the sash and border are redrawn.
+        Sets the sash position, in pixels.  If redraw is Ttrue then the panes
+        are resized and the sash and border are redrawn.

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


@@ -936,19 +1129,40 @@ 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)
 
         Sets the minimum pane size in pixels.
 
     def SetMinimumPaneSize(*args, **kwargs):
         """
         SetMinimumPaneSize(self, int min)
 
         Sets the minimum pane size in pixels.
 

-        The default minimum pane size is zero, which means that
-        either pane can be reduced to zero by dragging the sash,
-        thus removing one of the panes. To prevent this behaviour (and
-        veto out-of-range sash dragging), set a minimum size,
-        for example 20 pixels. If the wx.SP_PERMIT_UNSPLIT style is
-        used when a splitter window is created, the window may be
-        unsplit even if minimum size is non-zero.
+        The default minimum pane size is zero, which means that either pane
+        can be reduced to zero by dragging the sash, thus removing one of the
+        panes. To prevent this behaviour (and veto out-of-range sash
+        dragging), set a minimum size, for example 20 pixels. If the
+        wx.SP_PERMIT_UNSPLIT style is used when a splitter window is created,
+        the window may be unsplit even if minimum size is non-zero.

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


@@ -984,6 +1198,24 @@ class SplitterWindow(_core.Window):
         """GetNeedUpdating(self) -> bool"""
         return _windows_.SplitterWindow_GetNeedUpdating(*args, **kwargs)
 
         """GetNeedUpdating(self) -> bool"""
         return _windows_.SplitterWindow_GetNeedUpdating(*args, **kwargs)
 

+    def GetClassDefaultAttributes(*args, **kwargs):
+        """
+        GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
+
+        Get the default attributes for this class.  This is useful if you want
+        to use the same font or colour in your own control as in a standard
+        control -- which is a much better idea than hard coding specific
+        colours or fonts which might look completely out of place on the
+        user's system, especially if it uses themes.
+
+        The variant parameter is only relevant under Mac currently and is
+        ignore under other platforms. Under Mac, it will change the size of
+        the returned font. See `wx.Window.SetWindowVariant` for more about
+        this.
+        """
+        return _windows_.SplitterWindow_GetClassDefaultAttributes(*args, **kwargs)
+
+    GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

 
 class SplitterWindowPtr(SplitterWindow):
     def __init__(self, this):
 
 class SplitterWindowPtr(SplitterWindow):
     def __init__(self, this):


@@ -1003,6 +1235,23 @@ def PreSplitterWindow(*args, **kwargs):
     val.thisown = 1
     return val
 
     val.thisown = 1
     return val
 

+def SplitterWindow_GetClassDefaultAttributes(*args, **kwargs):
+    """
+    SplitterWindow_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
+
+    Get the default attributes for this class.  This is useful if you want
+    to use the same font or colour in your own control as in a standard
+    control -- which is a much better idea than hard coding specific
+    colours or fonts which might look completely out of place on the
+    user's system, especially if it uses themes.
+
+    The variant parameter is only relevant under Mac currently and is
+    ignore under other platforms. Under Mac, it will change the size of
+    the returned font. See `wx.Window.SetWindowVariant` for more about
+    this.
+    """
+    return _windows_.SplitterWindow_GetClassDefaultAttributes(*args, **kwargs)
+

 class SplitterEvent(_core.NotifyEvent):
     """This class represents the events generated by a splitter control."""
     def __repr__(self):
 class SplitterEvent(_core.NotifyEvent):
     """This class represents the events generated by a splitter control."""
     def __repr__(self):


@@ -1021,14 +1270,12 @@ class SplitterEvent(_core.NotifyEvent):
         """
         SetSashPosition(self, int pos)
 
         """
         SetSashPosition(self, int pos)
 

-        This funciton 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 dragging will represent that change
-        that will actually take place. Set to -1 from the event
-        handler code to prevent repositioning.
+        This funciton 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
+        dragging will represent that change that will actually take place. Set
+        to -1 from the event handler code to prevent repositioning.

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


@@ -1036,9 +1283,8 @@ class SplitterEvent(_core.NotifyEvent):
         """
         GetSashPosition(self) -> int
 
         """
         GetSashPosition(self) -> int
 

-        Returns the new sash position while in
-        EVT_SPLITTER_SASH_POS_CHANGING and
-        EVT_SPLITTER_SASH_POS_CHANGED events.
+        Returns the new sash position while in EVT_SPLITTER_SASH_POS_CHANGING
+        and EVT_SPLITTER_SASH_POS_CHANGED events.

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


@@ -1046,8 +1292,8 @@ class SplitterEvent(_core.NotifyEvent):
         """
         GetWindowBeingRemoved(self) -> Window
 
         """
         GetWindowBeingRemoved(self) -> Window
 

-        Returns a pointer to the window being removed when a
-        splitter window is unsplit.
+        Returns a pointer to the window being removed when a splitter window
+        is unsplit.

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


@@ -1107,8 +1353,8 @@ class SashWindow(_core.Window):
         return "<%s.%s; proxy of C++ wxSashWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxSashWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=wxCLIP_CHILDREN|wxSW_3D, 
+        __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=wxCLIP_CHILDREN|wxSW_3D, 

             String name=SashNameStr) -> SashWindow
         """
         newobj = _windows_.new_SashWindow(*args, **kwargs)
             String name=SashNameStr) -> SashWindow
         """
         newobj = _windows_.new_SashWindow(*args, **kwargs)


@@ -1119,8 +1365,8 @@ class SashWindow(_core.Window):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=wxCLIP_CHILDREN|wxSW_3D, 
+        Create(self, Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=wxCLIP_CHILDREN|wxSW_3D, 

             String name=SashNameStr) -> bool
         """
         return _windows_.SashWindow_Create(*args, **kwargs)
             String name=SashNameStr) -> bool
         """
         return _windows_.SashWindow_Create(*args, **kwargs)


@@ -1377,8 +1623,8 @@ class SashLayoutWindow(SashWindow):
         return "<%s.%s; proxy of C++ wxSashLayoutWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxSashLayoutWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=wxCLIP_CHILDREN|wxSW_3D, 
+        __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=wxCLIP_CHILDREN|wxSW_3D, 

             String name=SashLayoutNameStr) -> SashLayoutWindow
         """
         newobj = _windows_.new_SashLayoutWindow(*args, **kwargs)
             String name=SashLayoutNameStr) -> SashLayoutWindow
         """
         newobj = _windows_.new_SashLayoutWindow(*args, **kwargs)


@@ -1389,8 +1635,8 @@ class SashLayoutWindow(SashWindow):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=wxCLIP_CHILDREN|wxSW_3D, 
+        Create(self, Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=wxCLIP_CHILDREN|wxSW_3D, 

             String name=SashLayoutNameStr) -> bool
         """
         return _windows_.SashLayoutWindow_Create(*args, **kwargs)
             String name=SashLayoutNameStr) -> bool
         """
         return _windows_.SashLayoutWindow_Create(*args, **kwargs)


@@ -1617,7 +1863,7 @@ class VScrolledWindow(Panel):
         """
         ScrollPages(self, int pages) -> bool
 
         """
         ScrollPages(self, int pages) -> bool
 

-        If the platform and window class supports it,  scrolls the window by
+        If the platform and window class supports it, scrolls the window by

         the given number of pages down, if pages is positive, or up if pages
         is negative.  Returns True if the window was scrolled, False if it was
         already on top/bottom and nothing was done.
         the given number of pages down, if pages is positive, or up if pages
         is negative.  Returns True if the window was scrolled, False if it was
         already on top/bottom and nothing was done.


@@ -1632,13 +1878,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):
         """


@@ -1732,11 +1978,11 @@ class VListBox(VScrolledWindow):
         return _windows_.VListBox_GetSelectedCount(*args, **kwargs)
 
     def GetFirstSelected(*args, **kwargs):
         return _windows_.VListBox_GetSelectedCount(*args, **kwargs)
 
     def GetFirstSelected(*args, **kwargs):

-        """GetFirstSelected(self, unsigned long cookie) -> int"""
+        """GetFirstSelected(self) -> PyObject"""

         return _windows_.VListBox_GetFirstSelected(*args, **kwargs)
 
     def GetNextSelected(*args, **kwargs):
         return _windows_.VListBox_GetFirstSelected(*args, **kwargs)
 
     def GetNextSelected(*args, **kwargs):

-        """GetNextSelected(self, unsigned long cookie) -> int"""
+        """GetNextSelected(self, unsigned long cookie) -> PyObject"""

         return _windows_.VListBox_GetNextSelected(*args, **kwargs)
 
     def GetMargins(*args, **kwargs):
         return _windows_.VListBox_GetNextSelected(*args, **kwargs)
 
     def GetMargins(*args, **kwargs):


@@ -1839,6 +2085,10 @@ class HtmlListBox(VListBox):
         """SetItemCount(self, size_t count)"""
         return _windows_.HtmlListBox_SetItemCount(*args, **kwargs)
 
         """SetItemCount(self, size_t count)"""
         return _windows_.HtmlListBox_SetItemCount(*args, **kwargs)
 

+    def GetFileSystem(*args, **kwargs):
+        """GetFileSystem(self) -> FileSystem"""
+        return _windows_.HtmlListBox_GetFileSystem(*args, **kwargs)
+

 
 class HtmlListBoxPtr(HtmlListBox):
     def __init__(self, this):
 
 class HtmlListBoxPtr(HtmlListBox):
     def __init__(self, this):


@@ -1857,18 +2107,18 @@ def PreHtmlListBox(*args, **kwargs):
 
 class TaskBarIcon(_core.EvtHandler):
     def __repr__(self):
 
 class TaskBarIcon(_core.EvtHandler):
     def __repr__(self):

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

-    def __del__(self, destroy=_windows_.delete_TaskBarIcon):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
+        self._setCallbackInfo(self, TaskBarIcon, 0)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)"""
+        return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs)

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


@@ -1911,7 +2161,7 @@ class TaskBarIconEvent(_core.Event):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxTaskBarIconEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxTaskBarIconEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__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


@@ -1942,7 +2192,11 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
 #---------------------------------------------------------------------------
 
 class ColourData(_core.Object):
 #---------------------------------------------------------------------------
 
 class ColourData(_core.Object):

-    """This class holds a variety of information related to colour dialogs."""
+    """
+    This class holds a variety of information related to the colour
+    chooser dialog, used to transfer settings and results to and from the
+    `wx.ColourDialog`.
+    """

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


@@ -1965,9 +2219,9 @@ class ColourData(_core.Object):
         """
         GetChooseFull(self) -> bool
 
         """
         GetChooseFull(self) -> bool
 

-        Under Windows, determines whether the Windows colour dialog will display
-        the full dialog with custom colour selection controls. Has no meaning
-        under other platforms.  The default value is true.
+        Under Windows, determines whether the Windows colour dialog will
+        display the full dialog with custom colour selection controls. Has no
+        meaning under other platforms.  The default value is true.

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


@@ -1983,8 +2237,9 @@ class ColourData(_core.Object):
         """
         GetCustomColour(self, int i) -> Colour
 
         """
         GetCustomColour(self, int i) -> Colour
 

-        Gets the i'th custom colour associated with the colour dialog. i should
-        be an integer between 0 and 15. The default custom colours are all white.
+        Gets the i'th custom colour associated with the colour dialog. i
+        should be an integer between 0 and 15. The default custom colours are
+        all invalid colours.

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


@@ -1992,9 +2247,9 @@ class ColourData(_core.Object):
         """
         SetChooseFull(self, int flag)
 
         """
         SetChooseFull(self, int flag)
 

-        Under Windows, tells the Windows colour dialog to display the full dialog
-        with custom colour selection controls. Under other platforms, has no effect.
-        The default value is true.
+        Under Windows, tells the Windows colour dialog to display the full
+        dialog with custom colour selection controls. Under other platforms,
+        has no effect.  The default value is true.

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


@@ -2002,7 +2257,8 @@ class ColourData(_core.Object):
         """
         SetColour(self, Colour colour)
 
         """
         SetColour(self, Colour colour)
 

-        Sets the default colour for the colour dialog.  The default colour is black.
+        Sets the default colour for the colour dialog.  The default colour is
+        black.

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


@@ -2010,8 +2266,8 @@ class ColourData(_core.Object):
         """
         SetCustomColour(self, int i, Colour colour)
 
         """
         SetCustomColour(self, int i, Colour colour)
 

-        Sets the i'th custom colour for the colour dialog. i should be an integer
-        between 0 and 15. The default custom colours are all white.
+        Sets the i'th custom colour for the colour dialog. i should be an
+        integer between 0 and 15. The default custom colours are all invalid colours.

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


@@ -2037,8 +2293,9 @@ class ColourDialog(Dialog):
         """
         __init__(self, Window parent, ColourData data=None) -> ColourDialog
 
         """
         __init__(self, Window parent, ColourData data=None) -> ColourDialog
 

-        Constructor. Pass a parent window, and optionally a ColourData, which
-        will be copied to the colour dialog's internal ColourData instance.
+        Constructor. Pass a parent window, and optionally a `wx.ColourData`,
+        which will be copied to the colour dialog's internal ColourData
+        instance.

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


@@ -2050,7 +2307,7 @@ class ColourDialog(Dialog):
         """
         GetColourData(self) -> ColourData
 
         """
         GetColourData(self) -> ColourData
 

-        Returns a reference to the ColourData used by the dialog.
+        Returns a reference to the `wx.ColourData` used by the dialog.

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


@@ -2063,7 +2320,10 @@ class ColourDialogPtr(ColourDialog):
 _windows_.ColourDialog_swigregister(ColourDialogPtr)
 
 class DirDialog(Dialog):
 _windows_.ColourDialog_swigregister(ColourDialogPtr)
 
 class DirDialog(Dialog):

-    """This class represents the directory chooser dialog."""
+    """
+    wx.DirDialog allows the user to select a directory by browising the
+    file system.
+    """

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


@@ -2130,7 +2390,10 @@ class DirDialogPtr(DirDialog):
 _windows_.DirDialog_swigregister(DirDialogPtr)
 
 class FileDialog(Dialog):
 _windows_.DirDialog_swigregister(DirDialogPtr)
 
 class FileDialog(Dialog):

-    """This class represents the file chooser dialog."""
+    """
+    wx.FileDialog allows the user to select one or more files from the
+    filesystem.
+    """

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


@@ -2160,8 +2423,8 @@ class FileDialog(Dialog):
         """
         SetPath(self, String path)
 
         """
         SetPath(self, String path)
 

-        Sets the path (the combined directory and filename that will
-        be returned when the dialog is dismissed).
+        Sets the path (the combined directory and filename that will be
+        returned when the dialog is dismissed).

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


@@ -2185,8 +2448,11 @@ class FileDialog(Dialog):
         """
         SetWildcard(self, String wildCard)
 
         """
         SetWildcard(self, String wildCard)
 

-        Sets the wildcard, which can contain multiple file types, for example:
+        Sets the wildcard, which can contain multiple file types, for
+        example::
+

             "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"
             "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"

+

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


@@ -2260,8 +2526,8 @@ class FileDialog(Dialog):
 
         Returns the index into the list of filters supplied, optionally, in
         the wildcard parameter. Before the dialog is shown, this is the index
 
         Returns the index into the list of filters supplied, optionally, in
         the wildcard parameter. Before the dialog is shown, this is the index

-        which will be used when the dialog is first displayed. After the dialog
-        is shown, this is the index selected by the user.
+        which will be used when the dialog is first displayed. After the
+        dialog is shown, this is the index selected by the user.

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


@@ -2269,8 +2535,8 @@ class FileDialog(Dialog):
         """
         GetFilenames(self) -> PyObject
 
         """
         GetFilenames(self) -> PyObject
 

-        Returns a list of filenames chosen in the dialog.  This function should
-        only be used with the dialogs which have wx.MULTIPLE style, use
+        Returns a list of filenames chosen in the dialog.  This function
+        should only be used with the dialogs which have wx.MULTIPLE style, use

         GetFilename for the others.
         """
         return _windows_.FileDialog_GetFilenames(*args, **kwargs)
         GetFilename for the others.
         """
         return _windows_.FileDialog_GetFilenames(*args, **kwargs)


@@ -2280,8 +2546,8 @@ class FileDialog(Dialog):
         GetPaths(self) -> PyObject
 
         Fills the array paths with the full paths of the files chosen. This
         GetPaths(self) -> PyObject
 
         Fills the array paths with the full paths of the files chosen. This

-        function should only be used with the dialogs which have wx.MULTIPLE style,
-        use GetPath for the others.
+        function should only be used with the dialogs which have wx.MULTIPLE
+        style, use GetPath for the others.

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


@@ -2316,7 +2582,8 @@ class MultiChoiceDialog(Dialog):
         """
         SetSelections(List selections)
 
         """
         SetSelections(List selections)
 

-        Specify the items in the list that shoudl be selected, using a list of integers.
+        Specify the items in the list that should be selected, using a list of
+        integers.

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


@@ -2386,6 +2653,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):


@@ -2394,7 +2662,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.
         """


@@ -2429,15 +2697,41 @@ class TextEntryDialogPtr(TextEntryDialog):
         self.__class__ = TextEntryDialog
 _windows_.TextEntryDialog_swigregister(TextEntryDialogPtr)
 
         self.__class__ = TextEntryDialog
 _windows_.TextEntryDialog_swigregister(TextEntryDialogPtr)
 

+class PasswordEntryDialog(TextEntryDialog):
+    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):
 class FontData(_core.Object):

-    """This class holds a variety of information related to font dialogs."""
+    """
+    This class holds a variety of information related to font dialogs and
+    is used to transfer settings to and results from a `wx.FontDialog`.
+    """

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxFontData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         __init__(self) -> FontData
 
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxFontData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         __init__(self) -> FontData
 

-        This class holds a variety of information related to font dialogs.
+        This class holds a variety of information related to font dialogs and
+        is used to transfer settings to and results from a `wx.FontDialog`.

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


@@ -2453,8 +2747,8 @@ class FontData(_core.Object):
         """
         EnableEffects(self, bool enable)
 
         """
         EnableEffects(self, bool enable)
 

-        Enables or disables 'effects' under MS Windows only. This refers
-        to the controls for manipulating colour, strikeout and underline
+        Enables or disables 'effects' under MS Windows only. This refers to
+        the controls for manipulating colour, strikeout and underline

         properties.  The default value is true.
         """
         return _windows_.FontData_EnableEffects(*args, **kwargs)
         properties.  The default value is true.
         """
         return _windows_.FontData_EnableEffects(*args, **kwargs)


@@ -2463,8 +2757,9 @@ class FontData(_core.Object):
         """
         GetAllowSymbols(self) -> bool
 
         """
         GetAllowSymbols(self) -> bool
 

-        Under MS Windows, returns a flag determining whether symbol fonts can be
-        selected. Has no effect on other platforms. The default value is true.
+        Under MS Windows, returns a flag determining whether symbol fonts can
+        be selected. Has no effect on other platforms. The default value is
+        true.

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


@@ -2472,7 +2767,8 @@ class FontData(_core.Object):
         """
         GetColour(self) -> Colour
 
         """
         GetColour(self) -> Colour
 

-        Gets the colour associated with the font dialog. The default value is black.
+        Gets the colour associated with the font dialog. The default value is
+        black.

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


@@ -2496,8 +2792,8 @@ class FontData(_core.Object):
         """
         GetInitialFont(self) -> Font
 
         """
         GetInitialFont(self) -> Font
 

-        Gets the font that will be initially used by the font dialog. This should have
-        previously been set by the application.
+        Gets the font that will be initially used by the font dialog. This
+        should have previously been set by the application.

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


@@ -2505,8 +2801,8 @@ class FontData(_core.Object):
         """
         GetShowHelp(self) -> bool
 
         """
         GetShowHelp(self) -> bool
 

-        Returns true if the Help button will be shown (Windows only).  The default
-        value is false.
+        Returns true if the Help button will be shown (Windows only).  The
+        default value is false.

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


@@ -2514,8 +2810,8 @@ class FontData(_core.Object):
         """
         SetAllowSymbols(self, bool allowSymbols)
 
         """
         SetAllowSymbols(self, bool allowSymbols)
 

-        Under MS Windows, determines whether symbol fonts can be selected. Has no
-        effect on other platforms.  The default value is true.
+        Under MS Windows, determines whether symbol fonts can be selected. Has
+        no effect on other platforms.  The default value is true.

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


@@ -2523,7 +2819,8 @@ class FontData(_core.Object):
         """
         SetChosenFont(self, Font font)
 
         """
         SetChosenFont(self, Font font)
 

-        Sets the font that will be returned to the user (for internal use only).
+        Sets the font that will be returned to the user (normally for internal
+        use only).

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


@@ -2531,8 +2828,8 @@ class FontData(_core.Object):
         """
         SetColour(self, Colour colour)
 
         """
         SetColour(self, Colour colour)
 

-        Sets the colour that will be used for the font foreground colour.  The default
-        colour is black.
+        Sets the colour that will be used for the font foreground colour.  The
+        default colour is black.

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


@@ -2548,8 +2845,8 @@ class FontData(_core.Object):
         """
         SetRange(self, int min, int max)
 
         """
         SetRange(self, int min, int max)
 

-        Sets the valid range for the font point size (Windows only).  The default is
-        0, 0 (unrestricted range).
+        Sets the valid range for the font point size (Windows only).  The
+        default is 0, 0 (unrestricted range).

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


@@ -2557,8 +2854,8 @@ class FontData(_core.Object):
         """
         SetShowHelp(self, bool showHelp)
 
         """
         SetShowHelp(self, bool showHelp)
 

-        Determines whether the Help button will be displayed in the font dialog
-        (Windows only).  The default value is false.
+        Determines whether the Help button will be displayed in the font
+        dialog (Windows only).  The default value is false.

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


@@ -2571,15 +2868,22 @@ class FontDataPtr(FontData):
 _windows_.FontData_swigregister(FontDataPtr)
 
 class FontDialog(Dialog):
 _windows_.FontData_swigregister(FontDataPtr)
 
 class FontDialog(Dialog):

-    """This class represents the font chooser dialog."""
+    """
+    wx.FontDialog allows the user to select a system font and its attributes.
+
+    :see: `wx.FontData`
+
+    """

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxFontDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         __init__(self, Window parent, FontData data) -> FontDialog
 
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxFontDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         __init__(self, Window parent, FontData data) -> FontDialog
 

-        Constructor. Pass a parent window and the FontData object to be
-        used to initialize the dialog controls.
+        Constructor. Pass a parent window and the `wx.FontData` object to be
+        used to initialize the dialog controls.  Call `ShowModal` to display
+        the dialog.  If ShowModal returns ``wx.ID_OK`` then you can fetch the
+        results with via the `wx.FontData` returned by `GetFontData`.

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


@@ -2591,7 +2895,8 @@ class FontDialog(Dialog):
         """
         GetFontData(self) -> FontData
 
         """
         GetFontData(self) -> FontData
 

-        Returns a reference to the internal FontData used by the FontDialog.
+        Returns a reference to the internal `wx.FontData` used by the
+        wx.FontDialog.

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


@@ -2605,8 +2910,8 @@ _windows_.FontDialog_swigregister(FontDialogPtr)
 
 class MessageDialog(Dialog):
     """
 
 class MessageDialog(Dialog):
     """

-    This class provides a dialog that shows a single or multi-line message, with
-    a choice of OK, Yes, No and Cancel buttons.
+    This class provides a simple dialog that shows a single or multi-line
+    message, with a choice of OK, Yes, No and/or Cancel buttons.

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


@@ -2616,8 +2921,7 @@ class MessageDialog(Dialog):
             long style=wxOK|wxCANCEL|wxCENTRE, 
             Point pos=DefaultPosition) -> MessageDialog
 
             long style=wxOK|wxCANCEL|wxCENTRE, 
             Point pos=DefaultPosition) -> MessageDialog
 

-        This class provides a dialog that shows a single or multi-line message, with
-        a choice of OK, Yes, No and Cancel buttons.
+        Constructor, use `ShowModal` to display the dialog.

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


@@ -2635,8 +2939,8 @@ _windows_.MessageDialog_swigregister(MessageDialogPtr)
 
 class ProgressDialog(Frame):
     """
 
 class ProgressDialog(Frame):
     """

-    A dialog that shows a short message and a progress bar. Optionally, it can
-    display an ABORT button.
+    A dialog that shows a short message and a progress bar. Optionally, it
+    can display an ABORT button.

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


@@ -2645,8 +2949,9 @@ class ProgressDialog(Frame):
         __init__(self, String title, String message, int maximum=100, Window parent=None, 
             int style=wxPD_AUTO_HIDE|wxPD_APP_MODAL) -> ProgressDialog
 
         __init__(self, String title, String message, int maximum=100, Window parent=None, 
             int style=wxPD_AUTO_HIDE|wxPD_APP_MODAL) -> ProgressDialog
 

-        Constructor. Creates the dialog, displays it and disables user input for other
-        windows, or, if wxPD_APP_MODAL flag is not given, for its parent window only.
+        Constructor. Creates the dialog, displays it and disables user input
+        for other windows, or, if wx.PD_APP_MODAL flag is not given, for its
+        parent window only.

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


@@ -2658,13 +2963,15 @@ class ProgressDialog(Frame):
         """
         Update(self, int value, String newmsg=EmptyString) -> bool
 
         """
         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.
+        Updates the dialog, setting the progress bar to the new value and, if
+        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 not confirmed
-        the dialog may be resumed with Resume function.
+        If false is returned, the application can either immediately destroy
+        the dialog or ask the user for the confirmation and if the abort is
+        not confirmed the dialog may be resumed with Resume function.

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


@@ -2672,7 +2979,8 @@ class ProgressDialog(Frame):
         """
         Resume(self)
 
         """
         Resume(self)
 

-        Can be used to continue with the dialog, after the user had chosen to abort.
+        Can be used to continue with the dialog, after the user had chosen to
+        abort.

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


@@ -2744,8 +3052,8 @@ class FindDialogEvent(_core.CommandEvent):
         """
         GetReplaceString(self) -> String
 
         """
         GetReplaceString(self) -> String
 

-        Return the string to replace the search string with (only
-        for replace and replace all events).
+        Return the string to replace the search string with (only for replace
+        and replace all events).

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


@@ -2779,23 +3087,14 @@ _windows_.FindDialogEvent_swigregister(FindDialogEventPtr)
 
 class FindReplaceData(_core.Object):
     """
 
 class FindReplaceData(_core.Object):
     """

-    FindReplaceData holds the data for FindReplaceDialog. It is used to initialize
-    the dialog with the default values and will keep the last values from the
-    dialog when it is closed. It is also updated each time a wxFindDialogEvent is
-    generated so instead of using the wxFindDialogEvent methods you can also
-    directly query this object.
-
-    Note that all SetXXX() methods may only be called before showing the dialog
-    and calling them has no effect later.
-
-     Flags
-        wxFR_DOWN:          downward search/replace selected (otherwise, upwards)
-
-        wxFR_WHOLEWORD:     whole word search/replace selected
-
-        wxFR_MATCHCASE:     case sensitive search/replace selected (otherwise,
-                            case insensitive)
-
+    wx.FindReplaceData holds the data for wx.FindReplaceDialog. It is used
+    to initialize the dialog with the default values and will keep the
+    last values from the dialog when it is closed. It is also updated each
+    time a `wx.FindDialogEvent` is generated so instead of using the
+    `wx.FindDialogEvent` methods you can also directly query this object.
+
+    Note that all SetXXX() methods may only be called before showing the
+    dialog and calling them has no effect later.

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


@@ -2873,13 +3172,13 @@ _windows_.FindReplaceData_swigregister(FindReplaceDataPtr)
 
 class FindReplaceDialog(Dialog):
     """
 
 class FindReplaceDialog(Dialog):
     """

-    FindReplaceDialog is a standard modeless dialog which is used to allow the
-    user to search for some text (and possibly replace it with something
-    else). The actual searching is supposed to be done in the owner window which
-    is the parent of this dialog. Note that it means that unlike for the other
-    standard dialogs this one must have a parent window. Also note that there is
-    no way to use this dialog in a modal way; it is always, by design and
-    implementation, modeless.
+    wx.FindReplaceDialog is a standard modeless dialog which is used to
+    allow the user to search for some text (and possibly replace it with
+    something else). The actual searching is supposed to be done in the
+    owner window which is the parent of this dialog. Note that it means
+    that unlike for the other standard dialogs this one must have a parent
+    window. Also note that there is no way to use this dialog in a modal
+    way; it is always, by design and implementation, modeless.

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


@@ -2955,8 +3254,9 @@ class MDIParentFrame(Frame):
         return "<%s.%s; proxy of C++ wxMDIParentFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxMDIParentFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(self, Window parent, int id, String title, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 
+        __init__(self, Window parent, int id=-1, String title=EmptyString, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 

             String name=FrameNameStr) -> MDIParentFrame
         """
         newobj = _windows_.new_MDIParentFrame(*args, **kwargs)
             String name=FrameNameStr) -> MDIParentFrame
         """
         newobj = _windows_.new_MDIParentFrame(*args, **kwargs)


@@ -2967,8 +3267,9 @@ class MDIParentFrame(Frame):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(self, Window parent, int id, String title, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 
+        Create(self, Window parent, int id=-1, String title=EmptyString, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 

             String name=FrameNameStr) -> bool
         """
         return _windows_.MDIParentFrame_Create(*args, **kwargs)
             String name=FrameNameStr) -> bool
         """
         return _windows_.MDIParentFrame_Create(*args, **kwargs)


@@ -3036,8 +3337,9 @@ class MDIChildFrame(Frame):
         return "<%s.%s; proxy of C++ wxMDIChildFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxMDIChildFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(self, MDIParentFrame parent, int id, String title, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
+        __init__(self, MDIParentFrame parent, int id=-1, String title=EmptyString, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=DEFAULT_FRAME_STYLE, 

             String name=FrameNameStr) -> MDIChildFrame
         """
         newobj = _windows_.new_MDIChildFrame(*args, **kwargs)
             String name=FrameNameStr) -> MDIChildFrame
         """
         newobj = _windows_.new_MDIChildFrame(*args, **kwargs)


@@ -3048,8 +3350,9 @@ class MDIChildFrame(Frame):
 
     def Create(*args, **kwargs):
         """
 
     def Create(*args, **kwargs):
         """

-        Create(self, MDIParentFrame parent, int id, String title, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
+        Create(self, MDIParentFrame parent, int id=-1, String title=EmptyString, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=DEFAULT_FRAME_STYLE, 

             String name=FrameNameStr) -> bool
         """
         return _windows_.MDIChildFrame_Create(*args, **kwargs)
             String name=FrameNameStr) -> bool
         """
         return _windows_.MDIChildFrame_Create(*args, **kwargs)


@@ -3059,7 +3362,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):


@@ -3116,8 +3419,8 @@ class PyWindow(_core.Window):
         return "<%s.%s; proxy of C++ wxPyWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxPyWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=0, String name=PanelNameStr) -> PyWindow
+        __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyWindow

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


@@ -3129,6 +3432,10 @@ class PyWindow(_core.Window):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyWindow__setCallbackInfo(*args, **kwargs)
 
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyWindow__setCallbackInfo(*args, **kwargs)
 

+    def 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 base_DoMoveWindow(*args, **kwargs):
         """base_DoMoveWindow(self, int x, int y, int width, int height)"""
         return _windows_.PyWindow_base_DoMoveWindow(*args, **kwargs)


@@ -3209,6 +3516,10 @@ class PyWindow(_core.Window):
         """base_ApplyParentThemeBackground(self, Colour c)"""
         return _windows_.PyWindow_base_ApplyParentThemeBackground(*args, **kwargs)
 
         """base_ApplyParentThemeBackground(self, Colour c)"""
         return _windows_.PyWindow_base_ApplyParentThemeBackground(*args, **kwargs)
 

+    def base_GetDefaultAttributes(*args, **kwargs):
+        """base_GetDefaultAttributes(self) -> VisualAttributes"""
+        return _windows_.PyWindow_base_GetDefaultAttributes(*args, **kwargs)
+

 
 class PyWindowPtr(PyWindow):
     def __init__(self, this):
 
 class PyWindowPtr(PyWindow):
     def __init__(self, this):


@@ -3228,8 +3539,8 @@ class PyPanel(Panel):
         return "<%s.%s; proxy of C++ wxPyPanel instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxPyPanel instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=0, String name=PanelNameStr) -> PyPanel
+        __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyPanel

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


@@ -3241,6 +3552,10 @@ class PyPanel(Panel):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyPanel__setCallbackInfo(*args, **kwargs)
 
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyPanel__setCallbackInfo(*args, **kwargs)
 

+    def 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 base_DoMoveWindow(*args, **kwargs):
         """base_DoMoveWindow(self, int x, int y, int width, int height)"""
         return _windows_.PyPanel_base_DoMoveWindow(*args, **kwargs)


@@ -3321,6 +3636,10 @@ class PyPanel(Panel):
         """base_ApplyParentThemeBackground(self, Colour c)"""
         return _windows_.PyPanel_base_ApplyParentThemeBackground(*args, **kwargs)
 
         """base_ApplyParentThemeBackground(self, Colour c)"""
         return _windows_.PyPanel_base_ApplyParentThemeBackground(*args, **kwargs)
 

+    def base_GetDefaultAttributes(*args, **kwargs):
+        """base_GetDefaultAttributes(self) -> VisualAttributes"""
+        return _windows_.PyPanel_base_GetDefaultAttributes(*args, **kwargs)
+

 
 class PyPanelPtr(PyPanel):
     def __init__(self, this):
 
 class PyPanelPtr(PyPanel):
     def __init__(self, this):


@@ -3340,8 +3659,8 @@ class PyScrolledWindow(ScrolledWindow):
         return "<%s.%s; proxy of C++ wxPyScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxPyScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=0, String name=PanelNameStr) -> PyScrolledWindow
+        __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyScrolledWindow

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


@@ -3353,6 +3672,10 @@ class PyScrolledWindow(ScrolledWindow):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyScrolledWindow__setCallbackInfo(*args, **kwargs)
 
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyScrolledWindow__setCallbackInfo(*args, **kwargs)
 

+    def 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 base_DoMoveWindow(*args, **kwargs):
         """base_DoMoveWindow(self, int x, int y, int width, int height)"""
         return _windows_.PyScrolledWindow_base_DoMoveWindow(*args, **kwargs)


@@ -3433,6 +3756,10 @@ class PyScrolledWindow(ScrolledWindow):
         """base_ApplyParentThemeBackground(self, Colour c)"""
         return _windows_.PyScrolledWindow_base_ApplyParentThemeBackground(*args, **kwargs)
 
         """base_ApplyParentThemeBackground(self, Colour c)"""
         return _windows_.PyScrolledWindow_base_ApplyParentThemeBackground(*args, **kwargs)
 

+    def base_GetDefaultAttributes(*args, **kwargs):
+        """base_GetDefaultAttributes(self) -> VisualAttributes"""
+        return _windows_.PyScrolledWindow_base_GetDefaultAttributes(*args, **kwargs)
+

 
 class PyScrolledWindowPtr(PyScrolledWindow):
     def __init__(self, this):
 
 class PyScrolledWindowPtr(PyScrolledWindow):
     def __init__(self, this):


@@ -3454,12 +3781,30 @@ 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):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPrintData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 class PrintData(_core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPrintData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

-    def __init__(self, *args, **kwargs):
-        """__init__(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


@@ -3509,6 +3854,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)


@@ -3545,6 +3898,23 @@ 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 SetBin(*args, **kwargs):
+        """SetBin(self, int bin)"""
+        return _windows_.PrintData_SetBin(*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 SetFilename(*args, **kwargs):
+        """SetFilename(self, String filename)"""
+        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 GetPrinterCommand(*args, **kwargs):
         """GetPrinterCommand(self) -> String"""
         return _windows_.PrintData_GetPrinterCommand(*args, **kwargs)


@@ -3557,10 +3927,6 @@ class PrintData(_core.Object):
         """GetPreviewCommand(self) -> String"""
         return _windows_.PrintData_GetPreviewCommand(*args, **kwargs)
 
         """GetPreviewCommand(self) -> String"""
         return _windows_.PrintData_GetPreviewCommand(*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 GetFontMetricPath(*args, **kwargs):
         """GetFontMetricPath(self) -> String"""
         return _windows_.PrintData_GetFontMetricPath(*args, **kwargs)


@@ -3581,10 +3947,6 @@ class PrintData(_core.Object):
         """GetPrinterTranslateY(self) -> long"""
         return _windows_.PrintData_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 SetPrinterCommand(*args, **kwargs):
         """SetPrinterCommand(self, String command)"""
         return _windows_.PrintData_SetPrinterCommand(*args, **kwargs)


@@ -3597,10 +3959,6 @@ class PrintData(_core.Object):
         """SetPreviewCommand(self, String command)"""
         return _windows_.PrintData_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 SetFontMetricPath(*args, **kwargs):
         """SetFontMetricPath(self, String path)"""
         return _windows_.PrintData_SetFontMetricPath(*args, **kwargs)
     def SetFontMetricPath(*args, **kwargs):
         """SetFontMetricPath(self, String path)"""
         return _windows_.PrintData_SetFontMetricPath(*args, **kwargs)


@@ -3629,19 +3987,6 @@ class PrintData(_core.Object):
         """SetPrinterTranslation(self, long x, long y)"""
         return _windows_.PrintData_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 SetOutputStream(*args, **kwargs):
-        """SetOutputStream(self, OutputStream outputstream)"""
-        return _windows_.PrintData_SetOutputStream(*args, **kwargs)
-
-    def __nonzero__(self): return self.Ok() 

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


@@ -3655,9 +4000,12 @@ PreviewCanvasNameStr = cvar.PreviewCanvasNameStr
 class PageSetupDialogData(_core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPageSetupDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 class PageSetupDialogData(_core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPageSetupDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

-    def __init__(self, *args, **kwargs):
-        """__init__(self) -> PageSetupDialogData"""
-        newobj = _windows_.new_PageSetupDialogData(*args, **kwargs)
+    def __init__(self, *args):
+        """
+        __init__(self) -> PageSetupDialogData
+        __init__(self, PageSetupDialogData 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


@@ -3792,7 +4140,7 @@ class PageSetupDialogDataPtr(PageSetupDialogData):
         self.__class__ = PageSetupDialogData
 _windows_.PageSetupDialogData_swigregister(PageSetupDialogDataPtr)
 
         self.__class__ = PageSetupDialogData
 _windows_.PageSetupDialogData_swigregister(PageSetupDialogDataPtr)
 

-class PageSetupDialog(Dialog):
+class PageSetupDialog(_core.Object):

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


@@ -3801,12 +4149,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)


@@ -3877,6 +4227,10 @@ class PrintDialogData(_core.Object):
         """GetSetupDialog(self) -> bool"""
         return _windows_.PrintDialogData_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)


@@ -3913,10 +4267,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)


@@ -3970,7 +4320,7 @@ class PrintDialogDataPtr(PrintDialogData):
         self.__class__ = PrintDialogData
 _windows_.PrintDialogData_swigregister(PrintDialogDataPtr)
 
         self.__class__ = PrintDialogData
 _windows_.PrintDialogData_swigregister(PrintDialogDataPtr)
 

-class PrintDialog(Dialog):
+class PrintDialog(_core.Object):

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


@@ -3979,20 +4329,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):


@@ -4020,35 +4372,35 @@ 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"""
         return _windows_.Printer_GetAbort(*args, **kwargs)
 
     def GetLastError(*args, **kwargs):
 
     def GetAbort(*args, **kwargs):
         """GetAbort(self) -> bool"""
         return _windows_.Printer_GetAbort(*args, **kwargs)
 
     def GetLastError(*args, **kwargs):

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

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