more about the downloadable swig

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

diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py
index 21bfc56f5684de9b38e4b0d81d6d32532aaa845e..56bf8701e1b9e580a2c738d49358a2ed013ba40f 100644 (file)
--- a/wxPython/src/mac/_windows.py
+++ b/wxPython/src/mac/_windows.py
@@ -1,13 +1,55 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.

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

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

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

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

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


@@ -36,11 +78,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):


@@ -55,9 +137,27 @@ 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):

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

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


@@ -179,6 +279,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):


@@ -193,6 +319,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


@@ -216,6 +359,9 @@ FRAME_FLOAT_ON_PARENT = _windows_.FRAME_FLOAT_ON_PARENT
 FRAME_NO_WINDOW_MENU = _windows_.FRAME_NO_WINDOW_MENU
 FRAME_NO_TASKBAR = _windows_.FRAME_NO_TASKBAR
 FRAME_SHAPED = _windows_.FRAME_SHAPED
 FRAME_NO_WINDOW_MENU = _windows_.FRAME_NO_WINDOW_MENU
 FRAME_NO_TASKBAR = _windows_.FRAME_NO_TASKBAR
 FRAME_SHAPED = _windows_.FRAME_SHAPED

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

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


@@ -227,7 +373,10 @@ FULLSCREEN_NOBORDER = _windows_.FULLSCREEN_NOBORDER
 FULLSCREEN_NOCAPTION = _windows_.FULLSCREEN_NOCAPTION
 FULLSCREEN_ALL = _windows_.FULLSCREEN_ALL
 TOPLEVEL_EX_DIALOG = _windows_.TOPLEVEL_EX_DIALOG
 FULLSCREEN_NOCAPTION = _windows_.FULLSCREEN_NOCAPTION
 FULLSCREEN_ALL = _windows_.FULLSCREEN_ALL
 TOPLEVEL_EX_DIALOG = _windows_.TOPLEVEL_EX_DIALOG

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

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

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

     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxTopLevelWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxTopLevelWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)


@@ -272,25 +421,25 @@ class TopLevelWindow(_core.Window):
         return _windows_.TopLevelWindow_IsFullScreen(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):
         return _windows_.TopLevelWindow_IsFullScreen(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):

-        """
-        SetTitle(self, String title)
-
-        Sets the window's title. Applicable only to frames and dialogs.
-        """
+        """SetTitle(self, String title)"""

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

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

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

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

     def MacSetMetalAppearance(*args, **kwargs):
         """MacSetMetalAppearance(self, bool on)"""
         return _windows_.TopLevelWindow_MacSetMetalAppearance(*args, **kwargs)
     def MacSetMetalAppearance(*args, **kwargs):
         """MacSetMetalAppearance(self, bool on)"""
         return _windows_.TopLevelWindow_MacSetMetalAppearance(*args, **kwargs)


@@ -315,13 +464,14 @@ ToolBarNameStr = cvar.ToolBarNameStr
 #---------------------------------------------------------------------------
 
 class Frame(TopLevelWindow):
 #---------------------------------------------------------------------------
 
 class Frame(TopLevelWindow):

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

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

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


@@ -331,9 +481,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)
 


@@ -366,7 +516,7 @@ class Frame(TopLevelWindow):
     Command = ProcessCommand 
     def CreateStatusBar(*args, **kwargs):
         """
     Command = ProcessCommand 
     def CreateStatusBar(*args, **kwargs):
         """

-        CreateStatusBar(self, int number=1, long style=ST_SIZEGRIP, int winid=0, 
+        CreateStatusBar(self, int number=1, long style=DEFAULT_STATUSBAR_STYLE, int winid=0, 

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


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

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

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


@@ -423,6 +573,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):


@@ -437,16 +605,35 @@ 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):

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

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

+    ButtonSizerFlags = _windows_.Dialog_ButtonSizerFlags

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


@@ -456,9 +643,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)
 


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

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

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

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

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


@@ -490,6 +681,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):


@@ -504,16 +716,34 @@ 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):

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

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

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


@@ -523,9 +753,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)
 


@@ -551,6 +781,7 @@ SPLASH_NO_CENTRE = _windows_.SPLASH_NO_CENTRE
 SPLASH_TIMEOUT = _windows_.SPLASH_TIMEOUT
 SPLASH_NO_TIMEOUT = _windows_.SPLASH_NO_TIMEOUT
 class SplashScreenWindow(_core.Window):
 SPLASH_TIMEOUT = _windows_.SPLASH_TIMEOUT
 SPLASH_NO_TIMEOUT = _windows_.SPLASH_NO_TIMEOUT
 class SplashScreenWindow(_core.Window):

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

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


@@ -581,12 +812,13 @@ class SplashScreenWindowPtr(SplashScreenWindow):
 _windows_.SplashScreenWindow_swigregister(SplashScreenWindowPtr)
 
 class SplashScreen(Frame):
 _windows_.SplashScreenWindow_swigregister(SplashScreenWindowPtr)
 
 class SplashScreen(Frame):

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

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


@@ -617,11 +849,18 @@ _windows_.SplashScreen_swigregister(SplashScreenPtr)
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

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

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

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

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

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

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


@@ -629,7 +868,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):


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

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

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

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

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


@@ -676,6 +919,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):


@@ -690,6 +951,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


@@ -708,10 +986,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,)


@@ -759,8 +1036,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)
 


@@ -776,9 +1053,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.  The child window is shown if it is currently hidden.

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


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

-        Initializes the left and right panes of the splitter window.
-
-            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.
+        Initializes the left and right panes of the splitter window.  The
+        child windows are shown if they are currently hidden.

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


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

-        Initializes the top and bottom panes of the splitter window.
-
-            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.
+        Initializes the top and bottom panes of the splitter window.  The
+        child windows are shown if they are currently hidden.

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


@@ -838,9 +1081,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


@@ -854,18 +1097,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)
 


@@ -873,16 +1114,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)
 


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

-        Sets the sash size
+        Sets the sash size.

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


@@ -906,7 +1146,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)
 


@@ -930,8 +1170,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)
 


@@ -943,19 +1183,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)
 


@@ -991,6 +1252,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):


@@ -1010,6 +1289,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):


@@ -1028,14 +1324,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 function is only meaningful during EVT_SPLITTER_SASH_POS_CHANGING
+        and EVT_SPLITTER_SASH_POS_CHANGED events.  In the case of _CHANGED
+        events, sets the the new sash position. In the case of _CHANGING
+        events, sets the new tracking bar position so visual feedback during
+        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)
 


@@ -1043,9 +1337,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)
 


@@ -1053,8 +1346,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)
 


@@ -1110,12 +1403,13 @@ SASH_BOTTOM = _windows_.SASH_BOTTOM
 SASH_LEFT = _windows_.SASH_LEFT
 SASH_NONE = _windows_.SASH_NONE
 class SashWindow(_core.Window):
 SASH_LEFT = _windows_.SASH_LEFT
 SASH_NONE = _windows_.SASH_NONE
 class SashWindow(_core.Window):

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

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

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


@@ -1126,8 +1420,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)


@@ -1227,6 +1521,7 @@ def PreSashWindow(*args, **kwargs):
 SASH_STATUS_OK = _windows_.SASH_STATUS_OK
 SASH_STATUS_OUT_OF_RANGE = _windows_.SASH_STATUS_OUT_OF_RANGE
 class SashEvent(_core.CommandEvent):
 SASH_STATUS_OK = _windows_.SASH_STATUS_OK
 SASH_STATUS_OUT_OF_RANGE = _windows_.SASH_STATUS_OUT_OF_RANGE
 class SashEvent(_core.CommandEvent):

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

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


@@ -1287,6 +1582,7 @@ LAYOUT_QUERY = _windows_.LAYOUT_QUERY
 wxEVT_QUERY_LAYOUT_INFO = _windows_.wxEVT_QUERY_LAYOUT_INFO
 wxEVT_CALCULATE_LAYOUT = _windows_.wxEVT_CALCULATE_LAYOUT
 class QueryLayoutInfoEvent(_core.Event):
 wxEVT_QUERY_LAYOUT_INFO = _windows_.wxEVT_QUERY_LAYOUT_INFO
 wxEVT_CALCULATE_LAYOUT = _windows_.wxEVT_CALCULATE_LAYOUT
 class QueryLayoutInfoEvent(_core.Event):

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

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


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

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

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


@@ -1380,12 +1677,13 @@ EVT_QUERY_LAYOUT_INFO = wx.PyEventBinder( wxEVT_QUERY_LAYOUT_INFO )
 EVT_CALCULATE_LAYOUT = wx.PyEventBinder( wxEVT_CALCULATE_LAYOUT )
 
 class SashLayoutWindow(SashWindow):
 EVT_CALCULATE_LAYOUT = wx.PyEventBinder( wxEVT_CALCULATE_LAYOUT )
 
 class SashLayoutWindow(SashWindow):

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

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

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


@@ -1396,8 +1694,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)


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

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

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


@@ -1472,6 +1771,7 @@ class LayoutAlgorithmPtr(LayoutAlgorithm):
 _windows_.LayoutAlgorithm_swigregister(LayoutAlgorithmPtr)
 
 class PopupWindow(_core.Window):
 _windows_.LayoutAlgorithm_swigregister(LayoutAlgorithmPtr)
 
 class PopupWindow(_core.Window):

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

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


@@ -1495,6 +1795,7 @@ def PrePopupWindow(*args, **kwargs):
     return val
 
 class PopupTransientWindow(PopupWindow):
     return val
 
 class PopupTransientWindow(PopupWindow):

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

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


@@ -1520,6 +1821,7 @@ def PrePopupTransientWindow(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class TipWindow(Frame):
 #---------------------------------------------------------------------------
 
 class TipWindow(Frame):

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

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


@@ -1535,7 +1837,14 @@ class TipWindow(Frame):
         return _windows_.TipWindow_SetBoundingRect(*args, **kwargs)
 
     def Close(*args, **kwargs):
         return _windows_.TipWindow_SetBoundingRect(*args, **kwargs)
 
     def Close(*args, **kwargs):

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

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


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

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

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


@@ -1596,7 +1906,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.


@@ -1611,13 +1921,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):
         """


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

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

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


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

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

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


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

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

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


@@ -1711,11 +2030,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):


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

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

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


@@ -1839,19 +2159,20 @@ def PreHtmlListBox(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class TaskBarIcon(_core.EvtHandler):
 #---------------------------------------------------------------------------
 
 class TaskBarIcon(_core.EvtHandler):

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

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

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

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

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


@@ -1861,6 +2182,27 @@ class TaskBarIcon(_core.EvtHandler):
         """
         return _windows_.TaskBarIcon_Destroy(*args, **kwargs)
 
         """
         return _windows_.TaskBarIcon_Destroy(*args, **kwargs)
 

+    def IsOk(*args, **kwargs):
+        """IsOk(self) -> bool"""
+        return _windows_.TaskBarIcon_IsOk(*args, **kwargs)
+
+    def __nonzero__(self): return self.IsOk() 
+    def IsIconInstalled(*args, **kwargs):
+        """IsIconInstalled(self) -> bool"""
+        return _windows_.TaskBarIcon_IsIconInstalled(*args, **kwargs)
+
+    def SetIcon(*args, **kwargs):
+        """SetIcon(self, Icon icon, String tooltip=EmptyString) -> bool"""
+        return _windows_.TaskBarIcon_SetIcon(*args, **kwargs)
+
+    def RemoveIcon(*args, **kwargs):
+        """RemoveIcon(self) -> bool"""
+        return _windows_.TaskBarIcon_RemoveIcon(*args, **kwargs)
+
+    def PopupMenu(*args, **kwargs):
+        """PopupMenu(self, Menu menu) -> bool"""
+        return _windows_.TaskBarIcon_PopupMenu(*args, **kwargs)
+

 
 class TaskBarIconPtr(TaskBarIcon):
     def __init__(self, this):
 
 class TaskBarIconPtr(TaskBarIcon):
     def __init__(self, this):


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

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

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

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

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


@@ -1951,7 +2294,7 @@ class ColourData(_core.Object):
 
         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
 
         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.
+        all invalid colours.

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


@@ -1979,7 +2322,7 @@ class ColourData(_core.Object):
         SetCustomColour(self, int i, Colour colour)
 
         Sets the i'th custom colour for the colour dialog. i should be an
         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.
+        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)
 


@@ -2031,21 +2374,17 @@ class ColourDialogPtr(ColourDialog):
         self.__class__ = ColourDialog
 _windows_.ColourDialog_swigregister(ColourDialogPtr)
 
         self.__class__ = ColourDialog
 _windows_.ColourDialog_swigregister(ColourDialogPtr)
 

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

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

-
-
-    Window  Styles
-    --------------
-        ====================  ==========================================
-        wx.DD_NEW_DIR_BUTTON  Add 'Create new directory' button and allow
-                              directory names to be editable. On Windows
-                              the new directory button is only available
-                              with recent versions of the common dialogs.
-        ====================  ==========================================
-

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


@@ -2116,45 +2455,6 @@ class FileDialog(Dialog):
     """
     wx.FileDialog allows the user to select one or more files from the
     filesystem.
     """
     wx.FileDialog allows the user to select one or more files from the
     filesystem.

-
-    In Windows, this is the common file selector dialog. On X based
-    platforms a generic alternative is used.  The path and filename are
-    distinct elements of a full file pathname. If path is "", the
-    current directory will be used. If filename is "", no default
-    filename will be supplied. The wildcard determines what files are
-    displayed in the file selector, and file extension supplies a type
-    extension for the required filename.
-
-    Both the X and Windows versions implement a wildcard filter. Typing a
-    filename containing wildcards (*, ?) in the filename text item, and
-    clicking on Ok, will result in only those files matching the pattern
-    being displayed. The wildcard may be a specification for multiple
-    types of file with a description for each, such as::
-
-       "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"
-
-
-    Window  Styles
-    --------------
-        ==================   ==========================================
-        wx.OPEN              This is an open dialog.
-
-        wx.SAVE              This is a save dialog.
-
-        wx.HIDE_READONLY     For open dialog only: hide the checkbox
-                             allowing to open the file in read-only mode.
-
-        wx.OVERWRITE_PROMPT  For save dialog only: prompt for a confirmation
-                             if a file will be overwritten.
-
-        wx.MULTIPLE          For open dialog only: allows selecting multiple
-                             files.
-
-        wx.CHANGE_DIR        Change the current working directory to the
-                             directory  where the file(s) chosen by the user
-                             are.
-        ==================   ==========================================
-

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


@@ -2328,11 +2628,22 @@ class MultiChoiceDialog(Dialog):
         return "<%s.%s; proxy of C++ wxMultiChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxMultiChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window parent, String message, String caption,
-            List choices=[], long style=CHOICEDLG_STYLE,
+        __init__(self, Window parent, String message, String caption,
+            List choices=EmptyList, long style=CHOICEDLG_STYLE,

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

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

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


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

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

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


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

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

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


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

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

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


@@ -2415,6 +2728,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):


@@ -2423,7 +2737,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.
         """


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

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

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


@@ -2647,31 +2984,14 @@ class FontDialogPtr(FontDialog):
         self.__class__ = FontDialog
 _windows_.FontDialog_swigregister(FontDialogPtr)
 
         self.__class__ = FontDialog
 _windows_.FontDialog_swigregister(FontDialogPtr)
 

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

 class MessageDialog(Dialog):
     """
     This class provides a simple dialog that shows a single or multi-line
     message, with a choice of OK, Yes, No and/or Cancel buttons.
 class MessageDialog(Dialog):
     """
     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.

-
-
-    Window Styles
-    --------------
-        =================    =============================================
-        wx.OK                Show an OK button.
-        wx.CANCEL            Show a Cancel button.
-        wx.YES_NO            Show Yes and No buttons.
-        wx.YES_DEFAULT       Used with wxYES_NO, makes Yes button the
-                             default - which is the default behaviour.
-        wx.NO_DEFAULT        Used with wxYES_NO, makes No button the default.
-        wx.ICON_EXCLAMATION  Shows an exclamation mark icon.
-        wx.ICON_HAND         Shows an error icon.
-        wx.ICON_ERROR        Shows an error icon - the same as wxICON_HAND.
-        wx.ICON_QUESTION     Shows a question mark icon.
-        wx.ICON_INFORMATION  Shows an information (i) icon.
-        wx.STAY_ON_TOP       The message box stays on top of all other
-                             window, even those of the other applications
-                             (Windows only).
-        =================    =============================================
-

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


@@ -2701,34 +3021,6 @@ 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.

-
-    Window Styles
-    --------------
-        =================     =============================================
-        wx.PD_APP_MODAL       Make the progress dialog modal. If this flag is
-                              not given, it is only "locally" modal -
-                              that is the input to the parent window is
-                              disabled, but not to the other ones.
-
-        wx.PD_AUTO_HIDE       Causes the progress dialog to disappear from
-                              screen as soon as the maximum value of the
-                              progress meter has been reached.
-
-        wx.PD_CAN_ABORT       This flag tells the dialog that it should have
-                              a "Cancel" button which the user may press. If
-                              this happens, the next call to Update() will
-                              return false.
-
-        wx.PD_ELAPSED_TIME    This flag tells the dialog that it should show
-                              elapsed time (since creating the dialog).
-
-        wx.PD_ESTIMATED_TIME  This flag tells the dialog that it should show
-                              estimated time.
-
-        wx.PD_REMAINING_TIME  This flag tells the dialog that it should show
-                              remaining time.
-        =================     =============================================
-

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


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

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

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


@@ -2881,19 +3175,6 @@ class FindReplaceData(_core.Object):
 
     Note that all SetXXX() methods may only be called before showing the
     dialog and calling them has no effect later.
 
     Note that all SetXXX() methods may only be called before showing the
     dialog and calling them has no effect later.

-
-    Flags
-    -----
-        ================   ===============================================  
-        wx.FR_DOWN         Downward search/replace selected (otherwise,
-                           upwards)
-
-        wx.FR_WHOLEWORD    Whole word search/replace selected
-
-        wx.FR_MATCHCASE    Case sensitive search/replace selected
-                           (otherwise, case insensitive)
-        ================   ===============================================  
-

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


@@ -2978,21 +3259,6 @@ class FindReplaceDialog(Dialog):
     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.
     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.

-
-
-    Window Styles
-    -------------
-
-        =====================  =========================================
-        wx.FR_REPLACEDIALOG    replace dialog (otherwise find dialog)
-
-        wx.FR_NOUPDOWN         don't allow changing the search direction
-
-        wx.FR_NOMATCHCASE      don't allow case sensitive searching
-
-        wx.FR_NOWHOLEWORD      don't allow whole word searching
-        =====================  =========================================
-

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


@@ -3061,15 +3327,18 @@ IDM_WINDOWCASCADE = _windows_.IDM_WINDOWCASCADE
 IDM_WINDOWICONS = _windows_.IDM_WINDOWICONS
 IDM_WINDOWNEXT = _windows_.IDM_WINDOWNEXT
 IDM_WINDOWTILEVERT = _windows_.IDM_WINDOWTILEVERT
 IDM_WINDOWICONS = _windows_.IDM_WINDOWICONS
 IDM_WINDOWNEXT = _windows_.IDM_WINDOWNEXT
 IDM_WINDOWTILEVERT = _windows_.IDM_WINDOWTILEVERT

+IDM_WINDOWPREV = _windows_.IDM_WINDOWPREV

 FIRST_MDI_CHILD = _windows_.FIRST_MDI_CHILD
 LAST_MDI_CHILD = _windows_.LAST_MDI_CHILD
 class MDIParentFrame(Frame):
 FIRST_MDI_CHILD = _windows_.FIRST_MDI_CHILD
 LAST_MDI_CHILD = _windows_.LAST_MDI_CHILD
 class MDIParentFrame(Frame):

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

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

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


@@ -3080,8 +3349,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)


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

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

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


@@ -3133,12 +3403,14 @@ def PreMDIParentFrame(*args, **kwargs):
     return val
 
 class MDIChildFrame(Frame):
     return val
 
 class MDIChildFrame(Frame):

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

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

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


@@ -3149,8 +3421,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)


@@ -3160,7 +3433,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):


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

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

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


@@ -3213,12 +3487,13 @@ def PreMDIClientWindow(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class PyWindow(_core.Window):
 #---------------------------------------------------------------------------
 
 class PyWindow(_core.Window):

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

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

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


@@ -3230,6 +3505,14 @@ 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 DoEraseBackground(*args, **kwargs):
+        """DoEraseBackground(self, DC dc) -> bool"""
+        return _windows_.PyWindow_DoEraseBackground(*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)


@@ -3306,9 +3589,13 @@ class PyWindow(_core.Window):
         """base_ShouldInheritColours(self) -> bool"""
         return _windows_.PyWindow_base_ShouldInheritColours(*args, **kwargs)
 
         """base_ShouldInheritColours(self) -> bool"""
         return _windows_.PyWindow_base_ShouldInheritColours(*args, **kwargs)
 

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

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


@@ -3325,12 +3612,13 @@ def PrePyWindow(*args, **kwargs):
     return val
 
 class PyPanel(Panel):
     return val
 
 class PyPanel(Panel):

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

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

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


@@ -3342,6 +3630,14 @@ 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 DoEraseBackground(*args, **kwargs):
+        """DoEraseBackground(self, DC dc) -> bool"""
+        return _windows_.PyPanel_DoEraseBackground(*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)


@@ -3418,9 +3714,13 @@ class PyPanel(Panel):
         """base_ShouldInheritColours(self) -> bool"""
         return _windows_.PyPanel_base_ShouldInheritColours(*args, **kwargs)
 
         """base_ShouldInheritColours(self) -> bool"""
         return _windows_.PyPanel_base_ShouldInheritColours(*args, **kwargs)
 

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

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


@@ -3437,23 +3737,32 @@ def PrePyPanel(*args, **kwargs):
     return val
 
 class PyScrolledWindow(ScrolledWindow):
     return val
 
 class PyScrolledWindow(ScrolledWindow):

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

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

-        __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
         self.thisown = 1
         del newobj.thisown
         """
         newobj = _windows_.new_PyScrolledWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

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

 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyScrolledWindow__setCallbackInfo(*args, **kwargs)
 
 
     def _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 DoEraseBackground(*args, **kwargs):
+        """DoEraseBackground(self, DC dc) -> bool"""
+        return _windows_.PyScrolledWindow_DoEraseBackground(*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)


@@ -3530,9 +3839,13 @@ class PyScrolledWindow(ScrolledWindow):
         """base_ShouldInheritColours(self) -> bool"""
         return _windows_.PyScrolledWindow_base_ShouldInheritColours(*args, **kwargs)
 
         """base_ShouldInheritColours(self) -> bool"""
         return _windows_.PyScrolledWindow_base_ShouldInheritColours(*args, **kwargs)
 

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

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


@@ -3555,12 +3868,31 @@ PRINT_MODE_PREVIEW = _windows_.PRINT_MODE_PREVIEW
 PRINT_MODE_FILE = _windows_.PRINT_MODE_FILE
 PRINT_MODE_PRINTER = _windows_.PRINT_MODE_PRINTER
 PRINT_MODE_STREAM = _windows_.PRINT_MODE_STREAM
 PRINT_MODE_FILE = _windows_.PRINT_MODE_FILE
 PRINT_MODE_PRINTER = _windows_.PRINT_MODE_PRINTER
 PRINT_MODE_STREAM = _windows_.PRINT_MODE_STREAM

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

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

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

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

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

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


@@ -3610,6 +3942,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)


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

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

 
 

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

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

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

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

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

 
 

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

 
 

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

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


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

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

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

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

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


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

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

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


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

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

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


@@ -3902,12 +4184,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)


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

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

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

+        __init__(self, PrintDialogData printData) -> PrintDialogData

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


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

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

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


@@ -4014,10 +4296,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)


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

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

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


@@ -4080,20 +4359,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):


@@ -4106,6 +4387,7 @@ PRINTER_NO_ERROR = _windows_.PRINTER_NO_ERROR
 PRINTER_CANCELLED = _windows_.PRINTER_CANCELLED
 PRINTER_ERROR = _windows_.PRINTER_ERROR
 class Printer(_core.Object):
 PRINTER_CANCELLED = _windows_.PRINTER_CANCELLED
 PRINTER_ERROR = _windows_.PRINTER_ERROR
 class Printer(_core.Object):

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

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


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

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

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

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

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

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

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

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

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


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

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

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


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

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

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


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

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

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


@@ -4347,6 +4632,7 @@ ID_PREVIEW_FIRST = _windows_.ID_PREVIEW_FIRST
 ID_PREVIEW_LAST = _windows_.ID_PREVIEW_LAST
 ID_PREVIEW_GOTO = _windows_.ID_PREVIEW_GOTO
 class PreviewControlBar(Panel):
 ID_PREVIEW_LAST = _windows_.ID_PREVIEW_LAST
 ID_PREVIEW_GOTO = _windows_.ID_PREVIEW_GOTO
 class PreviewControlBar(Panel):

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

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


@@ -4402,11 +4688,13 @@ class PreviewControlBarPtr(PreviewControlBar):
 _windows_.PreviewControlBar_swigregister(PreviewControlBarPtr)
 
 class PrintPreview(_core.Object):
 _windows_.PreviewControlBar_swigregister(PreviewControlBarPtr)
 
 class PrintPreview(_core.Object):

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

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args):
         """
         __init__(self, Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PrintPreview
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args):
         """
         __init__(self, Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PrintPreview

+        __init__(self, Printout printout, Printout printoutForPrinting) -> PrintPreview

         __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PrintPreview
         """
         newobj = _windows_.new_PrintPreview(*args)
         __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PrintPreview
         """
         newobj = _windows_.new_PrintPreview(*args)


@@ -4511,11 +4799,13 @@ class PrintPreviewPtr(PrintPreview):
 _windows_.PrintPreview_swigregister(PrintPreviewPtr)
 
 class PyPrintPreview(PrintPreview):
 _windows_.PrintPreview_swigregister(PrintPreviewPtr)
 
 class PyPrintPreview(PrintPreview):

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

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args):
         """
         __init__(self, Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PyPrintPreview
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args):
         """
         __init__(self, Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PyPrintPreview

+        __init__(self, Printout printout, Printout printoutForPrinting) -> PyPrintPreview

         __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PyPrintPreview
         """
         newobj = _windows_.new_PyPrintPreview(*args)
         __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PyPrintPreview
         """
         newobj = _windows_.new_PyPrintPreview(*args)


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

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

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


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

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

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


@@ -4651,3 +4943,4 @@ class PyPreviewControlBarPtr(PyPreviewControlBar):
 _windows_.PyPreviewControlBar_swigregister(PyPreviewControlBarPtr)
 
 
 _windows_.PyPreviewControlBar_swigregister(PyPreviewControlBarPtr)
 
 

+