added GetIfActive() method returning non-NULL engine only if themes are not only...

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

diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py
index 2a21a1e7b2f973107e5f446b9fcce0f08c12f64a..8827ee9582aa7605a45d5caf98990fe83c0e8761 100644 (file)
--- a/wxPython/src/msw/_windows.py
+++ b/wxPython/src/msw/_windows.py
@@ -27,6 +27,8 @@ class Panel(_core.Window):
         Create(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
             String name=PanelNameStr) -> bool
         Create(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
             String name=PanelNameStr) -> bool

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

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


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

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

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


@@ -137,7 +141,11 @@ class ScrolledWindow(Panel):
         return _windows_.ScrolledWindow_SetScrollRate(*args, **kwargs)
 
     def GetScrollPixelsPerUnit(*args, **kwargs):
         return _windows_.ScrolledWindow_SetScrollRate(*args, **kwargs)
 
     def GetScrollPixelsPerUnit(*args, **kwargs):

-        """GetScrollPixelsPerUnit() -> (xUnit, yUnit)"""
+        """
+        GetScrollPixelsPerUnit() -> (xUnit, yUnit)
+
+        Get the size of one logical unit in physical units.
+        """

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


@@ -145,7 +153,11 @@ class ScrolledWindow(Panel):
         return _windows_.ScrolledWindow_EnableScrolling(*args, **kwargs)
 
     def GetViewStart(*args, **kwargs):
         return _windows_.ScrolledWindow_EnableScrolling(*args, **kwargs)
 
     def GetViewStart(*args, **kwargs):

-        """GetViewStart() -> (x,y)"""
+        """
+        GetViewStart() -> (x,y)
+
+        Get the view start
+        """

         return _windows_.ScrolledWindow_GetViewStart(*args, **kwargs)
 
     def SetScale(*args, **kwargs):
         return _windows_.ScrolledWindow_GetViewStart(*args, **kwargs)
 
     def SetScale(*args, **kwargs):


@@ -202,6 +214,14 @@ 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
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes


@@ -274,6 +294,7 @@ FRAME_FLOAT_ON_PARENT = _windows_.FRAME_FLOAT_ON_PARENT
 FRAME_NO_WINDOW_MENU = _windows_.FRAME_NO_WINDOW_MENU
 FRAME_NO_TASKBAR = _windows_.FRAME_NO_TASKBAR
 FRAME_SHAPED = _windows_.FRAME_SHAPED
 FRAME_NO_WINDOW_MENU = _windows_.FRAME_NO_WINDOW_MENU
 FRAME_NO_TASKBAR = _windows_.FRAME_NO_TASKBAR
 FRAME_SHAPED = _windows_.FRAME_SHAPED

+FRAME_DRAWER = _windows_.FRAME_DRAWER

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


@@ -285,6 +306,8 @@ FULLSCREEN_NOBORDER = _windows_.FULLSCREEN_NOBORDER
 FULLSCREEN_NOCAPTION = _windows_.FULLSCREEN_NOCAPTION
 FULLSCREEN_ALL = _windows_.FULLSCREEN_ALL
 TOPLEVEL_EX_DIALOG = _windows_.TOPLEVEL_EX_DIALOG
 FULLSCREEN_NOCAPTION = _windows_.FULLSCREEN_NOCAPTION
 FULLSCREEN_ALL = _windows_.FULLSCREEN_ALL
 TOPLEVEL_EX_DIALOG = _windows_.TOPLEVEL_EX_DIALOG

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

 class TopLevelWindow(_core.Window):
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
 class TopLevelWindow(_core.Window):
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):


@@ -349,6 +372,22 @@ class TopLevelWindow(_core.Window):
         """SetShape(self, Region region) -> bool"""
         return _windows_.TopLevelWindow_SetShape(*args, **kwargs)
 
         """SetShape(self, Region region) -> bool"""
         return _windows_.TopLevelWindow_SetShape(*args, **kwargs)
 

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

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


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

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

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


@@ -737,6 +779,9 @@ _windows_.SplashScreen_swigregister(SplashScreenPtr)
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

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

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


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

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

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


@@ -1756,7 +1805,14 @@ class VScrolledWindow(Panel):
         return _windows_.VScrolledWindow_ScrollToLine(*args, **kwargs)
 
     def ScrollLines(*args, **kwargs):
         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):
         return _windows_.VScrolledWindow_ScrollLines(*args, **kwargs)
 
     def ScrollPages(*args, **kwargs):


@@ -1778,12 +1834,20 @@ 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):
-        """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):
 
     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):
         return _windows_.VScrolledWindow_HitTest(*args, **kwargs)
 
     def RefreshAll(*args, **kwargs):


@@ -1870,11 +1934,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):


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

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

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

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

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


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

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

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


@@ -2471,7 +2535,12 @@ class MultiChoiceDialog(Dialog):
         self._setOORInfo(self)
 
     def SetSelections(*args, **kwargs):
         self._setOORInfo(self)
 
     def SetSelections(*args, **kwargs):

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

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


@@ -2548,7 +2617,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=wxTextEntryDialogStyle, Point pos=DefaultPosition) -> TextEntryDialog

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


@@ -2583,6 +2652,28 @@ class TextEntryDialogPtr(TextEntryDialog):
         self.__class__ = TextEntryDialog
 _windows_.TextEntryDialog_swigregister(TextEntryDialogPtr)
 
         self.__class__ = TextEntryDialog
 _windows_.TextEntryDialog_swigregister(TextEntryDialogPtr)
 

+class PasswordEntryDialog(TextEntryDialog):
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPasswordEntryDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self, Window parent, String message, String caption=GetPasswordFromUserPromptStr, 
+            String value=EmptyString, 
+            long style=wxTextEntryDialogStyle, 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


@@ -2828,8 +2919,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


@@ -3643,12 +3736,30 @@ PRINT_MODE_PREVIEW = _windows_.PRINT_MODE_PREVIEW
 PRINT_MODE_FILE = _windows_.PRINT_MODE_FILE
 PRINT_MODE_PRINTER = _windows_.PRINT_MODE_PRINTER
 PRINT_MODE_STREAM = _windows_.PRINT_MODE_STREAM
 PRINT_MODE_FILE = _windows_.PRINT_MODE_FILE
 PRINT_MODE_PRINTER = _windows_.PRINT_MODE_PRINTER
 PRINT_MODE_STREAM = _windows_.PRINT_MODE_STREAM

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

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

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

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


@@ -3698,6 +3809,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)


@@ -3734,6 +3853,23 @@ class PrintData(_core.Object):
         """SetQuality(self, int quality)"""
         return _windows_.PrintData_SetQuality(*args, **kwargs)
 
         """SetQuality(self, int quality)"""
         return _windows_.PrintData_SetQuality(*args, **kwargs)
 

+    def SetBin(*args, **kwargs):
+        """SetBin(self, int bin)"""
+        return _windows_.PrintData_SetBin(*args, **kwargs)
+
+    def SetPrintMode(*args, **kwargs):
+        """SetPrintMode(self, int printMode)"""
+        return _windows_.PrintData_SetPrintMode(*args, **kwargs)
+
+    def GetFilename(*args, **kwargs):
+        """GetFilename(self) -> String"""
+        return _windows_.PrintData_GetFilename(*args, **kwargs)
+
+    def SetFilename(*args, **kwargs):
+        """SetFilename(self, String filename)"""
+        return _windows_.PrintData_SetFilename(*args, **kwargs)
+
+    def __nonzero__(self): return self.Ok() 

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


@@ -3746,10 +3882,6 @@ class PrintData(_core.Object):
         """GetPreviewCommand(self) -> String"""
         return _windows_.PrintData_GetPreviewCommand(*args, **kwargs)
 
         """GetPreviewCommand(self) -> String"""
         return _windows_.PrintData_GetPreviewCommand(*args, **kwargs)
 

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

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


@@ -3770,10 +3902,6 @@ class PrintData(_core.Object):
         """GetPrinterTranslateY(self) -> long"""
         return _windows_.PrintData_GetPrinterTranslateY(*args, **kwargs)
 
         """GetPrinterTranslateY(self) -> long"""
         return _windows_.PrintData_GetPrinterTranslateY(*args, **kwargs)
 

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

     def SetPrinterCommand(*args, **kwargs):
         """SetPrinterCommand(self, String command)"""
         return _windows_.PrintData_SetPrinterCommand(*args, **kwargs)
     def SetPrinterCommand(*args, **kwargs):
         """SetPrinterCommand(self, String command)"""
         return _windows_.PrintData_SetPrinterCommand(*args, **kwargs)


@@ -3786,10 +3914,6 @@ class PrintData(_core.Object):
         """SetPreviewCommand(self, String command)"""
         return _windows_.PrintData_SetPreviewCommand(*args, **kwargs)
 
         """SetPreviewCommand(self, String command)"""
         return _windows_.PrintData_SetPreviewCommand(*args, **kwargs)
 

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

     def SetFontMetricPath(*args, **kwargs):
         """SetFontMetricPath(self, String path)"""
         return _windows_.PrintData_SetFontMetricPath(*args, **kwargs)
     def SetFontMetricPath(*args, **kwargs):
         """SetFontMetricPath(self, String path)"""
         return _windows_.PrintData_SetFontMetricPath(*args, **kwargs)


@@ -3818,19 +3942,6 @@ class PrintData(_core.Object):
         """SetPrinterTranslation(self, long x, long y)"""
         return _windows_.PrintData_SetPrinterTranslation(*args, **kwargs)
 
         """SetPrinterTranslation(self, long x, long y)"""
         return _windows_.PrintData_SetPrinterTranslation(*args, **kwargs)
 

-    def SetPrintMode(*args, **kwargs):
-        """SetPrintMode(self, int printMode)"""
-        return _windows_.PrintData_SetPrintMode(*args, **kwargs)
-
-    def GetOutputStream(*args, **kwargs):
-        """GetOutputStream(self) -> OutputStream"""
-        return _windows_.PrintData_GetOutputStream(*args, **kwargs)
-
-    def SetOutputStream(*args, **kwargs):
-        """SetOutputStream(self, OutputStream outputstream)"""
-        return _windows_.PrintData_SetOutputStream(*args, **kwargs)
-
-    def __nonzero__(self): return self.Ok() 

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


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

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

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


@@ -4066,6 +4180,10 @@ class PrintDialogData(_core.Object):
         """GetSetupDialog(self) -> bool"""
         return _windows_.PrintDialogData_GetSetupDialog(*args, **kwargs)
 
         """GetSetupDialog(self) -> bool"""
         return _windows_.PrintDialogData_GetSetupDialog(*args, **kwargs)
 

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

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


@@ -4102,10 +4220,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)


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

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

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


@@ -4168,20 +4282,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):


@@ -4209,28 +4325,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"""