]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/src/mac/_windows.py
Add *wxTopLevelWindowGTK*RequestUserAttention*int*;
[wxWidgets.git] / wxPython / src / mac / _windows.py
index 7ecf54af71d78188034d9ff075ffd258346d8758..b50328b8f4ee753ae598afa06221583c73a75553 100644 (file)
@@ -3,11 +3,53 @@
 
 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):
+    """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):
@@ -27,6 +69,8 @@ class Panel(_core.Window):
         Create(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
             String name=PanelNameStr) -> bool
+
+        Create the GUI part of the Window for 2-phase creation mode.
         """
         return _windows_.Panel_Create(*args, **kwargs)
 
@@ -39,6 +83,28 @@ class Panel(_core.Window):
         """
         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
@@ -91,6 +157,7 @@ def Panel_GetClassDefaultAttributes(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 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):
@@ -110,6 +177,8 @@ class ScrolledWindow(Panel):
         Create(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
             String name=PanelNameStr) -> bool
+
+        Create the GUI part of the Window for 2-phase creation mode.
         """
         return _windows_.ScrolledWindow_Create(*args, **kwargs)
 
@@ -210,6 +279,14 @@ class ScrolledWindow(Panel):
         """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
@@ -282,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_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
@@ -293,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
+USER_ATTENTION_INFO = _windows_.USER_ATTENTION_INFO
+USER_ATTENTION_ERROR = _windows_.USER_ATTENTION_ERROR
 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,)
@@ -357,6 +440,14 @@ class TopLevelWindow(_core.Window):
         """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)
@@ -381,6 +472,7 @@ ToolBarNameStr = cvar.ToolBarNameStr
 #---------------------------------------------------------------------------
 
 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):
@@ -432,7 +524,7 @@ class Frame(TopLevelWindow):
     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)
@@ -450,7 +542,7 @@ class Frame(TopLevelWindow):
         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):
@@ -541,6 +633,7 @@ def Frame_GetClassDefaultAttributes(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 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 __init__(self, *args, **kwargs):
@@ -579,6 +672,10 @@ class Dialog(TopLevelWindow):
         """CreateButtonSizer(self, long flags) -> Sizer"""
         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)
@@ -609,6 +706,9 @@ class Dialog(TopLevelWindow):
         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):
@@ -643,6 +743,7 @@ def Dialog_GetClassDefaultAttributes(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 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):
@@ -687,6 +788,7 @@ SPLASH_NO_CENTRE = _windows_.SPLASH_NO_CENTRE
 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):
@@ -717,6 +819,7 @@ class SplashScreenWindowPtr(SplashScreenWindow):
 _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):
@@ -753,11 +856,18 @@ _windows_.SplashScreen_swigregister(SplashScreenPtr)
 
 #---------------------------------------------------------------------------
 
+SB_NORMAL = _windows_.SB_NORMAL
+SB_FLAT = _windows_.SB_FLAT
+SB_RAISED = _windows_.SB_RAISED
 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):
-        """__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
@@ -793,9 +903,13 @@ class StatusBar(_core.Window):
         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)
 
+    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)
@@ -948,7 +1062,7 @@ class SplitterWindow(_core.Window):
 
         Initializes the splitter window to have one pane.  This should be
         called if you wish to initially view only a single pane in the
-        splitter window.
+        splitter window.  The child window is shown if it is currently hidden.
         """
         return _windows_.SplitterWindow_Initialize(*args, **kwargs)
 
@@ -956,7 +1070,8 @@ class SplitterWindow(_core.Window):
         """
         SplitVertically(self, Window window1, Window window2, int sashPosition=0) -> bool
 
-        Initializes the left and right panes of the splitter window.
+        Initializes the left and right panes of the splitter window.  The
+        child windows are shown if they are currently hidden.
         """
         return _windows_.SplitterWindow_SplitVertically(*args, **kwargs)
 
@@ -964,7 +1079,8 @@ class SplitterWindow(_core.Window):
         """
         SplitHorizontally(self, Window window1, Window window2, int sashPosition=0) -> bool
 
-        Initializes the top and bottom panes of the splitter window.
+        Initializes the top and bottom panes of the splitter window.  The
+        child windows are shown if they are currently hidden.
         """
         return _windows_.SplitterWindow_SplitHorizontally(*args, **kwargs)
 
@@ -1029,7 +1145,7 @@ class SplitterWindow(_core.Window):
         """
         SetSashSize(self, int width)
 
-        Sets the sash size
+        Sets the sash size.
         """
         return _windows_.SplitterWindow_SetSashSize(*args, **kwargs)
 
@@ -1037,7 +1153,7 @@ class SplitterWindow(_core.Window):
         """
         SetBorderSize(self, int width)
 
-        Sets the border size
+        Sets the border size. Currently a NOP.
         """
         return _windows_.SplitterWindow_SetBorderSize(*args, **kwargs)
 
@@ -1074,6 +1190,28 @@ class SplitterWindow(_core.Window):
         """
         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)
@@ -1193,7 +1331,7 @@ class SplitterEvent(_core.NotifyEvent):
         """
         SetSashPosition(self, int pos)
 
-        This funciton is only meaningful during EVT_SPLITTER_SASH_POS_CHANGING
+        This function is only meaningful during EVT_SPLITTER_SASH_POS_CHANGING
         and EVT_SPLITTER_SASH_POS_CHANGED events.  In the case of _CHANGED
         events, sets the the new sash position. In the case of _CHANGING
         events, sets the new tracking bar position so visual feedback during
@@ -1272,6 +1410,7 @@ SASH_BOTTOM = _windows_.SASH_BOTTOM
 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):
@@ -1389,6 +1528,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):
+    """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):
@@ -1449,6 +1589,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):
+    """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):
@@ -1506,6 +1647,7 @@ class QueryLayoutInfoEventPtr(QueryLayoutInfoEvent):
 _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):
@@ -1542,6 +1684,7 @@ EVT_QUERY_LAYOUT_INFO = wx.PyEventBinder( wxEVT_QUERY_LAYOUT_INFO )
 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):
@@ -1599,6 +1742,7 @@ def PreSashLayoutWindow(*args, **kwargs):
     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):
@@ -1634,6 +1778,7 @@ class LayoutAlgorithmPtr(LayoutAlgorithm):
 _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):
@@ -1657,6 +1802,7 @@ def PrePopupWindow(*args, **kwargs):
     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):
@@ -1682,6 +1828,7 @@ def PrePopupTransientWindow(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 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):
@@ -1697,7 +1844,14 @@ class TipWindow(Frame):
         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)
 
 
@@ -1711,6 +1865,7 @@ _windows_.TipWindow_swigregister(TipWindowPtr)
 #---------------------------------------------------------------------------
 
 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):
@@ -1744,7 +1899,14 @@ class VScrolledWindow(Panel):
         return _windows_.VScrolledWindow_ScrollToLine(*args, **kwargs)
 
     def ScrollLines(*args, **kwargs):
-        """ScrollLines(self, int lines) -> bool"""
+        """
+        ScrollLines(self, int lines) -> bool
+
+        If the platform and window class supports it, scrolls the window by
+        the given number of lines down, if lines is positive, or up if lines
+        is negative.  Returns True if the window was scrolled, False if it was
+        already on top/bottom and nothing was done.
+        """
         return _windows_.VScrolledWindow_ScrollLines(*args, **kwargs)
 
     def ScrollPages(*args, **kwargs):
@@ -1766,12 +1928,20 @@ class VScrolledWindow(Panel):
         """RefreshLines(self, size_t from, size_t to)"""
         return _windows_.VScrolledWindow_RefreshLines(*args, **kwargs)
 
-    def HitTestXT(*args, **kwargs):
-        """HitTestXT(self, int x, int y) -> int"""
-        return _windows_.VScrolledWindow_HitTestXT(*args, **kwargs)
+    def HitTestXY(*args, **kwargs):
+        """
+        HitTestXY(self, int x, int y) -> int
+
+        Test where the given (in client coords) point lies
+        """
+        return _windows_.VScrolledWindow_HitTestXY(*args, **kwargs)
 
     def HitTest(*args, **kwargs):
-        """HitTest(self, Point pt) -> int"""
+        """
+        HitTest(self, Point pt) -> int
+
+        Test where the given (in client coords) point lies
+        """
         return _windows_.VScrolledWindow_HitTest(*args, **kwargs)
 
     def RefreshAll(*args, **kwargs):
@@ -1782,6 +1952,18 @@ class VScrolledWindow(Panel):
         """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)
@@ -1790,10 +1972,6 @@ class VScrolledWindow(Panel):
         """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):
@@ -1809,6 +1987,7 @@ def PreVScrolledWindow(*args, **kwargs):
     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):
@@ -1933,6 +2112,7 @@ def PreVListBox(*args, **kwargs):
     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):
@@ -1986,19 +2166,20 @@ def PreHtmlListBox(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class TaskBarIcon(_core.EvtHandler):
+    """Proxy of C++ TaskBarIcon class"""
     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 __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):
         """
@@ -2008,6 +2189,27 @@ class TaskBarIcon(_core.EvtHandler):
         """
         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):
@@ -2017,10 +2219,11 @@ class TaskBarIconPtr(TaskBarIcon):
 _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):
-        """__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
@@ -2425,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):
         """
-        __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
 
-        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
@@ -2442,7 +2656,8 @@ class MultiChoiceDialog(Dialog):
         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)
 
@@ -2451,6 +2666,7 @@ class MultiChoiceDialog(Dialog):
         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)
 
@@ -2469,7 +2685,7 @@ class SingleChoiceDialog(Dialog):
     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.
@@ -2512,6 +2728,7 @@ class SingleChoiceDialogPtr(SingleChoiceDialog):
         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):
@@ -2520,7 +2737,7 @@ class TextEntryDialog(Dialog):
         """
         __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.
         """
@@ -2555,6 +2772,29 @@ class TextEntryDialogPtr(TextEntryDialog):
         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
@@ -2802,7 +3042,7 @@ class ProgressDialog(Frame):
         Updates the dialog, setting the progress bar to the new value and, if
         given changes the message above it. The value given should be less
         than or equal to the maximum value given to the constructor and the
-        dialog is closed if it is equal to the maximum.  Returns true unless
+        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
@@ -3083,9 +3323,11 @@ IDM_WINDOWCASCADE = _windows_.IDM_WINDOWCASCADE
 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):
+    """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):
@@ -3139,7 +3381,7 @@ class MDIParentFrame(Frame):
         return _windows_.MDIParentFrame_GetToolBar(*args, **kwargs)
 
     def Tile(*args, **kwargs):
-        """Tile(self)"""
+        """Tile(self, int orient=HORIZONTAL)"""
         return _windows_.MDIParentFrame_Tile(*args, **kwargs)
 
 
@@ -3157,6 +3399,7 @@ def PreMDIParentFrame(*args, **kwargs):
     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):
@@ -3186,7 +3429,7 @@ class MDIChildFrame(Frame):
         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):
@@ -3208,6 +3451,7 @@ def PreMDIChildFrame(*args, **kwargs):
     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):
@@ -3239,6 +3483,7 @@ def PreMDIClientWindow(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 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):
@@ -3260,6 +3505,10 @@ class PyWindow(_core.Window):
         """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)
@@ -3336,14 +3585,14 @@ class PyWindow(_core.Window):
         """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):
     def __init__(self, this):
@@ -3359,6 +3608,7 @@ def PrePyWindow(*args, **kwargs):
     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):
@@ -3380,6 +3630,10 @@ class PyPanel(Panel):
         """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)
@@ -3456,14 +3710,14 @@ class PyPanel(Panel):
         """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):
     def __init__(self, this):
@@ -3479,6 +3733,7 @@ def PrePyPanel(*args, **kwargs):
     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):
@@ -3490,7 +3745,7 @@ class PyScrolledWindow(ScrolledWindow):
         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)"""
@@ -3500,6 +3755,10 @@ class PyScrolledWindow(ScrolledWindow):
         """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)
@@ -3576,14 +3835,14 @@ class PyScrolledWindow(ScrolledWindow):
         """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):
     def __init__(self, this):
@@ -3605,7 +3864,23 @@ 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
+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):
+    """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 __init__(self, *args):
@@ -3663,6 +3938,14 @@ class PrintData(_core.Object):
         """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)
@@ -3699,6 +3982,31 @@ class PrintData(_core.Object):
         """SetQuality(self, int quality)"""
         return _windows_.PrintData_SetQuality(*args, **kwargs)
 
+    def SetBin(*args, **kwargs):
+        """SetBin(self, int bin)"""
+        return _windows_.PrintData_SetBin(*args, **kwargs)
+
+    def SetPrintMode(*args, **kwargs):
+        """SetPrintMode(self, int printMode)"""
+        return _windows_.PrintData_SetPrintMode(*args, **kwargs)
+
+    def GetFilename(*args, **kwargs):
+        """GetFilename(self) -> String"""
+        return _windows_.PrintData_GetFilename(*args, **kwargs)
+
+    def SetFilename(*args, **kwargs):
+        """SetFilename(self, String filename)"""
+        return _windows_.PrintData_SetFilename(*args, **kwargs)
+
+    def __nonzero__(self): return self.Ok() 
+    def GetPrivData(*args, **kwargs):
+        """GetPrivData(self) -> PyObject"""
+        return _windows_.PrintData_GetPrivData(*args, **kwargs)
+
+    def SetPrivData(*args, **kwargs):
+        """SetPrivData(self, PyObject data)"""
+        return _windows_.PrintData_SetPrivData(*args, **kwargs)
+
     def GetPrinterCommand(*args, **kwargs):
         """GetPrinterCommand(self) -> String"""
         return _windows_.PrintData_GetPrinterCommand(*args, **kwargs)
@@ -3711,10 +4019,6 @@ class PrintData(_core.Object):
         """GetPreviewCommand(self) -> String"""
         return _windows_.PrintData_GetPreviewCommand(*args, **kwargs)
 
-    def GetFilename(*args, **kwargs):
-        """GetFilename(self) -> String"""
-        return _windows_.PrintData_GetFilename(*args, **kwargs)
-
     def GetFontMetricPath(*args, **kwargs):
         """GetFontMetricPath(self) -> String"""
         return _windows_.PrintData_GetFontMetricPath(*args, **kwargs)
@@ -3735,10 +4039,6 @@ class PrintData(_core.Object):
         """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)
@@ -3751,10 +4051,6 @@ class PrintData(_core.Object):
         """SetPreviewCommand(self, String command)"""
         return _windows_.PrintData_SetPreviewCommand(*args, **kwargs)
 
-    def SetFilename(*args, **kwargs):
-        """SetFilename(self, String filename)"""
-        return _windows_.PrintData_SetFilename(*args, **kwargs)
-
     def SetFontMetricPath(*args, **kwargs):
         """SetFontMetricPath(self, String path)"""
         return _windows_.PrintData_SetFontMetricPath(*args, **kwargs)
@@ -3783,19 +4079,6 @@ class PrintData(_core.Object):
         """SetPrinterTranslation(self, long x, long y)"""
         return _windows_.PrintData_SetPrinterTranslation(*args, **kwargs)
 
-    def SetPrintMode(*args, **kwargs):
-        """SetPrintMode(self, int printMode)"""
-        return _windows_.PrintData_SetPrintMode(*args, **kwargs)
-
-    def GetOutputStream(*args, **kwargs):
-        """GetOutputStream(self) -> OutputStream"""
-        return _windows_.PrintData_GetOutputStream(*args, **kwargs)
-
-    def SetOutputStream(*args, **kwargs):
-        """SetOutputStream(self, OutputStream outputstream)"""
-        return _windows_.PrintData_SetOutputStream(*args, **kwargs)
-
-    def __nonzero__(self): return self.Ok() 
 
 class PrintDataPtr(PrintData):
     def __init__(self, this):
@@ -3807,12 +4090,14 @@ PrintoutTitleStr = cvar.PrintoutTitleStr
 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 __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
@@ -3940,6 +4225,14 @@ class PageSetupDialogData(_core.Object):
         """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):
@@ -3949,7 +4242,8 @@ class PageSetupDialogDataPtr(PageSetupDialogData):
         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):
@@ -3958,12 +4252,14 @@ class PageSetupDialog(Dialog):
         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 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)
@@ -3977,12 +4273,14 @@ class PageSetupDialogPtr(PageSetupDialog):
 _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
+        __init__(self, PrintDialogData printData) -> PrintDialogData
         """
         newobj = _windows_.new_PrintDialogData(*args)
         self.this = newobj.this
@@ -4034,6 +4332,10 @@ class PrintDialogData(_core.Object):
         """GetSetupDialog(self) -> bool"""
         return _windows_.PrintDialogData_GetSetupDialog(*args, **kwargs)
 
+    def SetSetupDialog(*args, **kwargs):
+        """SetSetupDialog(self, bool flag)"""
+        return _windows_.PrintDialogData_SetSetupDialog(*args, **kwargs)
+
     def SetFromPage(*args, **kwargs):
         """SetFromPage(self, int v)"""
         return _windows_.PrintDialogData_SetFromPage(*args, **kwargs)
@@ -4070,10 +4372,6 @@ class PrintDialogData(_core.Object):
         """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)
@@ -4127,7 +4425,8 @@ class PrintDialogDataPtr(PrintDialogData):
         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):
@@ -4136,20 +4435,22 @@ class PrintDialog(Dialog):
         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 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 ShowModal(*args, **kwargs):
-        """ShowModal(self) -> int"""
-        return _windows_.PrintDialog_ShowModal(*args, **kwargs)
-
 
 class PrintDialogPtr(PrintDialog):
     def __init__(self, this):
@@ -4162,6 +4463,7 @@ PRINTER_NO_ERROR = _windows_.PRINTER_NO_ERROR
 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):
@@ -4177,28 +4479,28 @@ class Printer(_core.Object):
         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)
 
-    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):
-        """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)
 
-    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"""
@@ -4222,6 +4524,7 @@ def Printer_GetLastError(*args, **kwargs):
     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):
@@ -4325,6 +4628,7 @@ class PrintoutPtr(Printout):
 _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):
@@ -4348,6 +4652,7 @@ class PreviewCanvasPtr(PreviewCanvas):
 _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):
@@ -4403,6 +4708,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):
+    """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):
@@ -4458,6 +4764,7 @@ class PreviewControlBarPtr(PreviewControlBar):
 _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):
@@ -4567,6 +4874,7 @@ class PrintPreviewPtr(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):
@@ -4621,6 +4929,7 @@ class PyPrintPreviewPtr(PyPrintPreview):
 _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):
@@ -4668,6 +4977,7 @@ class PyPreviewFramePtr(PyPreviewFrame):
 _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):