X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dba7934c9d1b520ff7b48cd0d80cc52f8be6a052..70ee369088ef1d54628883a1da7c20b1796d5b94:/wxPython/src/msw/_windows.py diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index 2eac3a7e22..3f6b371091 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -313,13 +313,11 @@ ICONIZE = _windows_.ICONIZE MINIMIZE = _windows_.MINIMIZE MAXIMIZE = _windows_.MAXIMIZE CLOSE_BOX = _windows_.CLOSE_BOX -THICK_FRAME = _windows_.THICK_FRAME SYSTEM_MENU = _windows_.SYSTEM_MENU MINIMIZE_BOX = _windows_.MINIMIZE_BOX MAXIMIZE_BOX = _windows_.MAXIMIZE_BOX TINY_CAPTION_HORIZ = _windows_.TINY_CAPTION_HORIZ TINY_CAPTION_VERT = _windows_.TINY_CAPTION_VERT -RESIZE_BOX = _windows_.RESIZE_BOX RESIZE_BORDER = _windows_.RESIZE_BORDER DIALOG_NO_PARENT = _windows_.DIALOG_NO_PARENT DEFAULT_FRAME_STYLE = _windows_.DEFAULT_FRAME_STYLE @@ -333,12 +331,18 @@ FRAME_DRAWER = _windows_.FRAME_DRAWER FRAME_EX_METAL = _windows_.FRAME_EX_METAL DIALOG_EX_METAL = _windows_.DIALOG_EX_METAL WS_EX_CONTEXTHELP = _windows_.WS_EX_CONTEXTHELP -DIALOG_MODAL = _windows_.DIALOG_MODAL -DIALOG_MODELESS = _windows_.DIALOG_MODELESS -USER_COLOURS = _windows_.USER_COLOURS -NO_3D = _windows_.NO_3D FRAME_EX_CONTEXTHELP = _windows_.FRAME_EX_CONTEXTHELP DIALOG_EX_CONTEXTHELP = _windows_.DIALOG_EX_CONTEXTHELP +# deprecated +RESIZE_BOX = MAXIMIZE_BOX +THICK_FRAME = RESIZE_BORDER + +# Obsolete +wxDIALOG_MODAL = 0 +wxDIALOG_MODELESS = 0 +wxUSER_COLOURS = 0 +wxNO_3D = 0 + FULLSCREEN_NOMENUBAR = _windows_.FULLSCREEN_NOMENUBAR FULLSCREEN_NOTOOLBAR = _windows_.FULLSCREEN_NOTOOLBAR FULLSCREEN_NOSTATUSBAR = _windows_.FULLSCREEN_NOSTATUSBAR @@ -405,6 +409,10 @@ class TopLevelWindow(_core.Window): """GetTitle(self) -> String""" return _windows_.TopLevelWindow_GetTitle(*args, **kwargs) + def EnableCloseButton(*args, **kwargs): + """EnableCloseButton(self, bool enable) -> bool""" + return _windows_.TopLevelWindow_EnableCloseButton(*args, **kwargs) + def SetShape(*args, **kwargs): """SetShape(self, Region region) -> bool""" return _windows_.TopLevelWindow_SetShape(*args, **kwargs) @@ -434,10 +442,6 @@ class TopLevelWindow(_core.Window): return _windows_.TopLevelWindow_CenterOnScreen(*args, **kwargs) CentreOnScreen = CenterOnScreen - def EnableCloseButton(*args, **kwargs): - """EnableCloseButton(self, bool enable=True) -> bool""" - return _windows_.TopLevelWindow_EnableCloseButton(*args, **kwargs) - def GetDefaultItem(*args, **kwargs): """ GetDefaultItem(self) -> Window @@ -679,9 +683,16 @@ class Dialog(TopLevelWindow): """CreateTextSizer(self, String message) -> Sizer""" return _windows_.Dialog_CreateTextSizer(*args, **kwargs) - def CreateButtonSizer(*args, **kwargs): - """CreateButtonSizer(self, long flags, bool separated=False, int distance=0) -> Sizer""" - return _windows_.Dialog_CreateButtonSizer(*args, **kwargs) + def _CreateButtonSizer(*args, **kwargs): + """_CreateButtonSizer(self, long flags) -> Sizer""" + return _windows_.Dialog__CreateButtonSizer(*args, **kwargs) + + def CreateButtonSizer(self, flags, *ignored): + return self._CreateButtonSizer(flags) + + def CreateSeparatedButtonSizer(*args, **kwargs): + """CreateSeparatedButtonSizer(self, long flags) -> Sizer""" + return _windows_.Dialog_CreateSeparatedButtonSizer(*args, **kwargs) def CreateStdDialogButtonSizer(*args, **kwargs): """CreateStdDialogButtonSizer(self, long flags) -> StdDialogButtonSizer""" @@ -746,6 +757,7 @@ def Dialog_GetClassDefaultAttributes(*args, **kwargs): #--------------------------------------------------------------------------- +DEFAULT_MINIFRAME_STYLE = _windows_.DEFAULT_MINIFRAME_STYLE class MiniFrame(Frame): """Proxy of C++ MiniFrame class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -754,7 +766,7 @@ class MiniFrame(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) -> MiniFrame + long style=DEFAULT_MINIFRAME_STYLE, String name=FrameNameStr) -> MiniFrame """ _windows_.MiniFrame_swiginit(self,_windows_.new_MiniFrame(*args, **kwargs)) self._setOORInfo(self) @@ -763,7 +775,7 @@ class MiniFrame(Frame): """ 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 + long style=DEFAULT_MINIFRAME_STYLE, String name=FrameNameStr) -> bool """ return _windows_.MiniFrame_Create(*args, **kwargs) @@ -1418,14 +1430,6 @@ class SashWindow(_core.Window): """GetSashVisible(self, int edge) -> bool""" return _windows_.SashWindow_GetSashVisible(*args, **kwargs) - def SetSashBorder(*args, **kwargs): - """SetSashBorder(self, int edge, bool border)""" - return _windows_.SashWindow_SetSashBorder(*args, **kwargs) - - def HasBorder(*args, **kwargs): - """HasBorder(self, int edge) -> bool""" - return _windows_.SashWindow_HasBorder(*args, **kwargs) - def GetEdgeMargin(*args, **kwargs): """GetEdgeMargin(self, int edge) -> int""" return _windows_.SashWindow_GetEdgeMargin(*args, **kwargs) @@ -1750,7 +1754,7 @@ class PopupTransientWindow(PopupWindow): def __init__(self, *args, **kwargs): """__init__(self, Window parent, int style=BORDER_NONE) -> PopupTransientWindow""" _windows_.PopupTransientWindow_swiginit(self,_windows_.new_PopupTransientWindow(*args, **kwargs)) - self._setOORInfo(self);self._setCallbackInfo(self, PopupTransientWindow) + self._setOORInfo(self);PopupTransientWindow._setCallbackInfo(self, self, PopupTransientWindow) def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)""" @@ -1811,7 +1815,7 @@ class VScrolledWindow(Panel): Size size=DefaultSize, long style=0, String name=PanelNameStr) -> VScrolledWindow """ _windows_.VScrolledWindow_swiginit(self,_windows_.new_VScrolledWindow(*args, **kwargs)) - self._setOORInfo(self); self._setCallbackInfo(self, VScrolledWindow) + self._setOORInfo(self);VScrolledWindow._setCallbackInfo(self, self, VScrolledWindow) def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)""" @@ -1914,7 +1918,7 @@ class VListBox(VScrolledWindow): Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -> VListBox """ _windows_.VListBox_swiginit(self,_windows_.new_VListBox(*args, **kwargs)) - self._setOORInfo(self);self._setCallbackInfo(self, VListBox) + self._setOORInfo(self);VListBox._setCallbackInfo(self, self, VListBox) def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)""" @@ -2011,6 +2015,10 @@ class VListBox(VScrolledWindow): """SetSelectionBackground(self, Colour col)""" return _windows_.VListBox_SetSelectionBackground(*args, **kwargs) + def RefreshSelected(*args, **kwargs): + """RefreshSelected(self)""" + return _windows_.VListBox_RefreshSelected(*args, **kwargs) + def OnDrawSeparator(*args, **kwargs): """OnDrawSeparator(self, DC dc, Rect rect, size_t n)""" return _windows_.VListBox_OnDrawSeparator(*args, **kwargs) @@ -2043,7 +2051,7 @@ class HtmlListBox(VListBox): Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -> HtmlListBox """ _windows_.HtmlListBox_swiginit(self,_windows_.new_HtmlListBox(*args, **kwargs)) - self._setOORInfo(self);self._setCallbackInfo(self, HtmlListBox) + self._setOORInfo(self);HtmlListBox._setCallbackInfo(self, self, HtmlListBox) def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)""" @@ -2076,6 +2084,41 @@ def PreHtmlListBox(*args, **kwargs): val = _windows_.new_PreHtmlListBox(*args, **kwargs) return val +HLB_DEFAULT_STYLE = _windows_.HLB_DEFAULT_STYLE +HLB_MULTIPLE = _windows_.HLB_MULTIPLE +class SimpleHtmlListBox(HtmlListBox,_core.ItemContainer): + """Proxy of C++ SimpleHtmlListBox class""" + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, + Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray, + long style=HLB_DEFAULT_STYLE, + Validator validator=DefaultValidator, + String name=SimpleHtmlListBoxNameStr) -> SimpleHtmlListBox + """ + _windows_.SimpleHtmlListBox_swiginit(self,_windows_.new_SimpleHtmlListBox(*args, **kwargs)) + self._setOORInfo(self) + + def Create(*args, **kwargs): + """ + Create(self, Window parent, int id=-1, Point pos=DefaultPosition, + Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray, + long style=HLB_DEFAULT_STYLE, + Validator validator=DefaultValidator, + String name=SimpleHtmlListBoxNameStr) -> bool + """ + return _windows_.SimpleHtmlListBox_Create(*args, **kwargs) + +_windows_.SimpleHtmlListBox_swigregister(SimpleHtmlListBox) +SimpleHtmlListBoxNameStr = cvar.SimpleHtmlListBoxNameStr + +def PreSimpleHtmlListBox(*args, **kwargs): + """PreSimpleHtmlListBox() -> SimpleHtmlListBox""" + val = _windows_.new_PreSimpleHtmlListBox(*args, **kwargs) + return val + #--------------------------------------------------------------------------- class TaskBarIcon(_core.EvtHandler): @@ -2085,12 +2128,12 @@ class TaskBarIcon(_core.EvtHandler): def __init__(self, *args, **kwargs): """__init__(self) -> TaskBarIcon""" _windows_.TaskBarIcon_swiginit(self,_windows_.new_TaskBarIcon(*args, **kwargs)) - self._setCallbackInfo(self, TaskBarIcon, 0) + TaskBarIcon._setCallbackInfo(self, self, TaskBarIcon) __swig_destroy__ = _windows_.delete_TaskBarIcon __del__ = lambda self : None; def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)""" + """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=0)""" return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs) def Destroy(*args, **kwargs): @@ -2099,9 +2142,8 @@ class TaskBarIcon(_core.EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - val = _windows_.TaskBarIcon_Destroy(*args, **kwargs) - args[0].thisown = 0 - return val + args[0].this.own(False) + return _windows_.TaskBarIcon_Destroy(*args, **kwargs) def IsOk(*args, **kwargs): """IsOk(self) -> bool""" @@ -2142,6 +2184,7 @@ wxEVT_TASKBAR_RIGHT_DOWN = _windows_.wxEVT_TASKBAR_RIGHT_DOWN wxEVT_TASKBAR_RIGHT_UP = _windows_.wxEVT_TASKBAR_RIGHT_UP wxEVT_TASKBAR_LEFT_DCLICK = _windows_.wxEVT_TASKBAR_LEFT_DCLICK wxEVT_TASKBAR_RIGHT_DCLICK = _windows_.wxEVT_TASKBAR_RIGHT_DCLICK +wxEVT_TASKBAR_CLICK = _windows_.wxEVT_TASKBAR_CLICK EVT_TASKBAR_MOVE = wx.PyEventBinder ( wxEVT_TASKBAR_MOVE ) EVT_TASKBAR_LEFT_DOWN = wx.PyEventBinder ( wxEVT_TASKBAR_LEFT_DOWN ) EVT_TASKBAR_LEFT_UP = wx.PyEventBinder ( wxEVT_TASKBAR_LEFT_UP ) @@ -2149,6 +2192,7 @@ EVT_TASKBAR_RIGHT_DOWN = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DOWN ) EVT_TASKBAR_RIGHT_UP = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_UP ) EVT_TASKBAR_LEFT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_LEFT_DCLICK ) EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK ) +EVT_TASKBAR_CLICK = wx.PyEventBinder ( wxEVT_TASKBAR_CLICK ) #--------------------------------------------------------------------------- @@ -2269,9 +2313,10 @@ def GetColourFromUser(*args, **kwargs): String caption=EmptyString) -> Colour """ return _windows_.GetColourFromUser(*args, **kwargs) +DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR +DD_DIR_MUST_EXIST = _windows_.DD_DIR_MUST_EXIST DD_NEW_DIR_BUTTON = _windows_.DD_NEW_DIR_BUTTON DD_DEFAULT_STYLE = _windows_.DD_DEFAULT_STYLE -DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR class DirDialog(Dialog): """ wx.DirDialog allows the user to select a directory by browising the @@ -2327,13 +2372,6 @@ class DirDialog(Dialog): Path = property(GetPath,SetPath,doc="See `GetPath` and `SetPath`") _windows_.DirDialog_swigregister(DirDialog) -OPEN = _windows_.OPEN -SAVE = _windows_.SAVE -OVERWRITE_PROMPT = _windows_.OVERWRITE_PROMPT -FILE_MUST_EXIST = _windows_.FILE_MUST_EXIST -MULTIPLE = _windows_.MULTIPLE -CHANGE_DIR = _windows_.CHANGE_DIR -HIDE_READONLY = _windows_.HIDE_READONLY FD_OPEN = _windows_.FD_OPEN FD_SAVE = _windows_.FD_SAVE FD_OVERWRITE_PROMPT = _windows_.FD_OVERWRITE_PROMPT @@ -2342,6 +2380,14 @@ FD_MULTIPLE = _windows_.FD_MULTIPLE FD_CHANGE_DIR = _windows_.FD_CHANGE_DIR FD_PREVIEW = _windows_.FD_PREVIEW FD_DEFAULT_STYLE = _windows_.FD_DEFAULT_STYLE +# deprecated names +OPEN = FD_OPEN, +SAVE = FD_SAVE, +OVERWRITE_PROMPT = FD_OVERWRITE_PROMPT, +FILE_MUST_EXIST = FD_FILE_MUST_EXIST, +MULTIPLE = FD_MULTIPLE, +CHANGE_DIR = FD_CHANGE_DIR + class FileDialog(Dialog): """ wx.FileDialog allows the user to select one or more files from the @@ -2795,7 +2841,6 @@ class FontData(_core.Object): AllowSymbols = property(GetAllowSymbols,SetAllowSymbols,doc="See `GetAllowSymbols` and `SetAllowSymbols`") ChosenFont = property(GetChosenFont,SetChosenFont,doc="See `GetChosenFont` and `SetChosenFont`") Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") - EnableEffects = property(GetEnableEffects,doc="See `GetEnableEffects`") InitialFont = property(GetInitialFont,SetInitialFont,doc="See `GetInitialFont` and `SetInitialFont`") ShowHelp = property(GetShowHelp,SetShowHelp,doc="See `GetShowHelp` and `SetShowHelp`") _windows_.FontData_swigregister(FontData) @@ -2903,16 +2948,17 @@ class ProgressDialog(Frame): """ return _windows_.ProgressDialog_Update(*args, **kwargs) - def UpdatePulse(*args, **kwargs): + def Pulse(*args, **kwargs): """ - UpdatePulse(self, String newmsg) --> (continue, skip) + Pulse(self, String newmsg) --> (continue, skip) Just like `Update` but switches the dialog to use a gauge in interminante mode and calls `wx.Gauge.Pulse` to show the user a bit of progress. """ - return _windows_.ProgressDialog_UpdatePulse(*args, **kwargs) + return _windows_.ProgressDialog_Pulse(*args, **kwargs) + UpdatePulse = Pulse def Resume(*args, **kwargs): """ Resume(self) @@ -3292,16 +3338,13 @@ class PyWindow(_core.Window): Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyWindow """ _windows_.PyWindow_swiginit(self,_windows_.new_PyWindow(*args, **kwargs)) - self._setOORInfo(self); self._setCallbackInfo(self, PyWindow) + self._setOORInfo(self);PyWindow._setCallbackInfo(self, self, PyWindow) def _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) - + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyWindow_DoEraseBackground(*args, **kwargs) @@ -3472,16 +3515,13 @@ class PyPanel(Panel): Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyPanel """ _windows_.PyPanel_swiginit(self,_windows_.new_PyPanel(*args, **kwargs)) - self._setOORInfo(self); self._setCallbackInfo(self, PyPanel) + self._setOORInfo(self);PyPanel._setCallbackInfo(self, self, PyPanel) def _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) - + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyPanel_DoEraseBackground(*args, **kwargs) @@ -3652,16 +3692,13 @@ class PyScrolledWindow(ScrolledWindow): Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyScrolledWindow """ _windows_.PyScrolledWindow_swiginit(self,_windows_.new_PyScrolledWindow(*args, **kwargs)) - self._setOORInfo(self); self._setCallbackInfo(self, PyScrolledWindow) + self._setOORInfo(self);PyScrolledWindow._setCallbackInfo(self, self, PyScrolledWindow) 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) - + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyScrolledWindow_DoEraseBackground(*args, **kwargs) @@ -3868,10 +3905,15 @@ class PrintData(_core.Object): """GetOrientation(self) -> int""" return _windows_.PrintData_GetOrientation(*args, **kwargs) - def Ok(*args, **kwargs): - """Ok(self) -> bool""" - return _windows_.PrintData_Ok(*args, **kwargs) + def IsOrientationReversed(*args, **kwargs): + """IsOrientationReversed(self) -> bool""" + return _windows_.PrintData_IsOrientationReversed(*args, **kwargs) + + def IsOk(*args, **kwargs): + """IsOk(self) -> bool""" + return _windows_.PrintData_IsOk(*args, **kwargs) + Ok = IsOk def GetPrinterName(*args, **kwargs): """GetPrinterName(self) -> String""" return _windows_.PrintData_GetPrinterName(*args, **kwargs) @@ -3904,6 +3946,10 @@ class PrintData(_core.Object): """GetPrintMode(self) -> int""" return _windows_.PrintData_GetPrintMode(*args, **kwargs) + def GetMedia(*args, **kwargs): + """GetMedia(self) -> int""" + return _windows_.PrintData_GetMedia(*args, **kwargs) + def SetNoCopies(*args, **kwargs): """SetNoCopies(self, int v)""" return _windows_.PrintData_SetNoCopies(*args, **kwargs) @@ -3916,6 +3962,10 @@ class PrintData(_core.Object): """SetOrientation(self, int orient)""" return _windows_.PrintData_SetOrientation(*args, **kwargs) + def SetOrientationReversed(*args, **kwargs): + """SetOrientationReversed(self, bool reversed)""" + return _windows_.PrintData_SetOrientationReversed(*args, **kwargs) + def SetPrinterName(*args, **kwargs): """SetPrinterName(self, String name)""" return _windows_.PrintData_SetPrinterName(*args, **kwargs) @@ -3948,6 +3998,10 @@ class PrintData(_core.Object): """SetPrintMode(self, int printMode)""" return _windows_.PrintData_SetPrintMode(*args, **kwargs) + def SetMedia(*args, **kwargs): + """SetMedia(self, int media)""" + return _windows_.PrintData_SetMedia(*args, **kwargs) + def GetFilename(*args, **kwargs): """GetFilename(self) -> String""" return _windows_.PrintData_GetFilename(*args, **kwargs) @@ -3956,7 +4010,7 @@ class PrintData(_core.Object): """SetFilename(self, String filename)""" return _windows_.PrintData_SetFilename(*args, **kwargs) - def __nonzero__(self): return self.Ok() + def __nonzero__(self): return self.IsOk() def GetPrivData(*args, **kwargs): """GetPrivData(self) -> PyObject""" return _windows_.PrintData_GetPrivData(*args, **kwargs) @@ -4071,10 +4125,11 @@ class PageSetupDialogData(_core.Object): """GetPrintData(self) -> PrintData""" return _windows_.PageSetupDialogData_GetPrintData(*args, **kwargs) - def Ok(*args, **kwargs): - """Ok(self) -> bool""" - return _windows_.PageSetupDialogData_Ok(*args, **kwargs) + def IsOk(*args, **kwargs): + """IsOk(self) -> bool""" + return _windows_.PageSetupDialogData_IsOk(*args, **kwargs) + Ok = IsOk def SetDefaultInfo(*args, **kwargs): """SetDefaultInfo(self, bool flag)""" return _windows_.PageSetupDialogData_SetDefaultInfo(*args, **kwargs) @@ -4119,7 +4174,7 @@ class PageSetupDialogData(_core.Object): """CalculatePaperSizeFromId(self)""" return _windows_.PageSetupDialogData_CalculatePaperSizeFromId(*args, **kwargs) - def __nonzero__(self): return self.Ok() + def __nonzero__(self): return self.IsOk() DefaultInfo = property(GetDefaultInfo,SetDefaultInfo,doc="See `GetDefaultInfo` and `SetDefaultInfo`") DefaultMinMargins = property(GetDefaultMinMargins,SetDefaultMinMargins,doc="See `GetDefaultMinMargins` and `SetDefaultMinMargins`") MarginBottomRight = property(GetMarginBottomRight,SetMarginBottomRight,doc="See `GetMarginBottomRight` and `SetMarginBottomRight`") @@ -4274,10 +4329,11 @@ class PrintDialogData(_core.Object): """GetEnableHelp(self) -> bool""" return _windows_.PrintDialogData_GetEnableHelp(*args, **kwargs) - def Ok(*args, **kwargs): - """Ok(self) -> bool""" - return _windows_.PrintDialogData_Ok(*args, **kwargs) + def IsOk(*args, **kwargs): + """IsOk(self) -> bool""" + return _windows_.PrintDialogData_IsOk(*args, **kwargs) + Ok = IsOk def GetPrintData(*args, **kwargs): """GetPrintData(self) -> PrintData""" return _windows_.PrintDialogData_GetPrintData(*args, **kwargs) @@ -4286,7 +4342,7 @@ class PrintDialogData(_core.Object): """SetPrintData(self, PrintData printData)""" return _windows_.PrintDialogData_SetPrintData(*args, **kwargs) - def __nonzero__(self): return self.Ok() + def __nonzero__(self): return self.IsOk() AllPages = property(GetAllPages,SetAllPages,doc="See `GetAllPages` and `SetAllPages`") Collate = property(GetCollate,SetCollate,doc="See `GetCollate` and `SetCollate`") FromPage = property(GetFromPage,SetFromPage,doc="See `GetFromPage` and `SetFromPage`") @@ -4390,7 +4446,7 @@ class Printout(_core.Object): def __init__(self, *args, **kwargs): """__init__(self, String title=PrintoutTitleStr) -> Printout""" _windows_.Printout_swiginit(self,_windows_.new_Printout(*args, **kwargs)) - self._setCallbackInfo(self, Printout) + Printout._setCallbackInfo(self, self, Printout) __swig_destroy__ = _windows_.delete_Printout __del__ = lambda self : None; @@ -4410,6 +4466,54 @@ class Printout(_core.Object): """SetDC(self, DC dc)""" return _windows_.Printout_SetDC(*args, **kwargs) + def FitThisSizeToPaper(*args, **kwargs): + """FitThisSizeToPaper(self, Size imageSize)""" + return _windows_.Printout_FitThisSizeToPaper(*args, **kwargs) + + def FitThisSizeToPage(*args, **kwargs): + """FitThisSizeToPage(self, Size imageSize)""" + return _windows_.Printout_FitThisSizeToPage(*args, **kwargs) + + def FitThisSizeToPageMargins(*args, **kwargs): + """FitThisSizeToPageMargins(self, Size imageSize, PageSetupDialogData pageSetupData)""" + return _windows_.Printout_FitThisSizeToPageMargins(*args, **kwargs) + + def MapScreenSizeToPaper(*args, **kwargs): + """MapScreenSizeToPaper(self)""" + return _windows_.Printout_MapScreenSizeToPaper(*args, **kwargs) + + def MapScreenSizeToPage(*args, **kwargs): + """MapScreenSizeToPage(self)""" + return _windows_.Printout_MapScreenSizeToPage(*args, **kwargs) + + def MapScreenSizeToPageMargins(*args, **kwargs): + """MapScreenSizeToPageMargins(self, PageSetupDialogData pageSetupData)""" + return _windows_.Printout_MapScreenSizeToPageMargins(*args, **kwargs) + + def MapScreenSizeToDevice(*args, **kwargs): + """MapScreenSizeToDevice(self)""" + return _windows_.Printout_MapScreenSizeToDevice(*args, **kwargs) + + def GetLogicalPaperRect(*args, **kwargs): + """GetLogicalPaperRect(self) -> Rect""" + return _windows_.Printout_GetLogicalPaperRect(*args, **kwargs) + + def GetLogicalPageRect(*args, **kwargs): + """GetLogicalPageRect(self) -> Rect""" + return _windows_.Printout_GetLogicalPageRect(*args, **kwargs) + + def GetLogicalPageMarginsRect(*args, **kwargs): + """GetLogicalPageMarginsRect(self, PageSetupDialogData pageSetupData) -> Rect""" + return _windows_.Printout_GetLogicalPageMarginsRect(*args, **kwargs) + + def SetLogicalOrigin(*args, **kwargs): + """SetLogicalOrigin(self, int x, int y)""" + return _windows_.Printout_SetLogicalOrigin(*args, **kwargs) + + def OffsetLogicalOrigin(*args, **kwargs): + """OffsetLogicalOrigin(self, int xoff, int yoff)""" + return _windows_.Printout_OffsetLogicalOrigin(*args, **kwargs) + def SetPageSizePixels(*args, **kwargs): """SetPageSizePixels(self, int w, int h)""" return _windows_.Printout_SetPageSizePixels(*args, **kwargs) @@ -4442,6 +4546,14 @@ class Printout(_core.Object): """GetPPIPrinter() -> (x,y)""" return _windows_.Printout_GetPPIPrinter(*args, **kwargs) + def SetPaperRectPixels(*args, **kwargs): + """SetPaperRectPixels(self, Rect paperRectPixels)""" + return _windows_.Printout_SetPaperRectPixels(*args, **kwargs) + + def GetPaperRectPixels(*args, **kwargs): + """GetPaperRectPixels(self) -> Rect""" + return _windows_.Printout_GetPaperRectPixels(*args, **kwargs) + def IsPreview(*args, **kwargs): """IsPreview(self) -> bool""" return _windows_.Printout_IsPreview(*args, **kwargs) @@ -4712,10 +4824,11 @@ class PrintPreview(_core.Object): """GetMinPage(self) -> int""" return _windows_.PrintPreview_GetMinPage(*args, **kwargs) - def Ok(*args, **kwargs): - """Ok(self) -> bool""" - return _windows_.PrintPreview_Ok(*args, **kwargs) + def IsOk(*args, **kwargs): + """IsOk(self) -> bool""" + return _windows_.PrintPreview_IsOk(*args, **kwargs) + Ok = IsOk def SetOk(*args, **kwargs): """SetOk(self, bool ok)""" return _windows_.PrintPreview_SetOk(*args, **kwargs) @@ -4728,7 +4841,7 @@ class PrintPreview(_core.Object): """DetermineScaling(self)""" return _windows_.PrintPreview_DetermineScaling(*args, **kwargs) - def __nonzero__(self): return self.Ok() + def __nonzero__(self): return self.IsOk() Canvas = property(GetCanvas,SetCanvas,doc="See `GetCanvas` and `SetCanvas`") CurrentPage = property(GetCurrentPage,SetCurrentPage,doc="See `GetCurrentPage` and `SetCurrentPage`") Frame = property(GetFrame,SetFrame,doc="See `GetFrame` and `SetFrame`") @@ -4750,7 +4863,7 @@ class PyPrintPreview(PrintPreview): __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PyPrintPreview """ _windows_.PyPrintPreview_swiginit(self,_windows_.new_PyPrintPreview(*args)) - self._setCallbackInfo(self, PyPrintPreview) + PyPrintPreview._setCallbackInfo(self, self, PyPrintPreview) def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)""" @@ -4804,7 +4917,7 @@ class PyPreviewFrame(PreviewFrame): long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> PyPreviewFrame """ _windows_.PyPreviewFrame_swiginit(self,_windows_.new_PyPreviewFrame(*args, **kwargs)) - self._setCallbackInfo(self, PyPreviewFrame); self._setOORInfo(self) + self._setOORInfo(self);PyPreviewFrame._setCallbackInfo(self, self, PyPreviewFrame) def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)""" @@ -4858,7 +4971,7 @@ class PyPreviewControlBar(PreviewControlBar): long style=0, String name=PanelNameStr) -> PyPreviewControlBar """ _windows_.PyPreviewControlBar_swiginit(self,_windows_.new_PyPreviewControlBar(*args, **kwargs)) - self._setCallbackInfo(self, PyPreviewControlBar); self._setOORInfo(self) + self._setOORInfo(self);PyPreviewControlBar._setCallbackInfo(self, self, PyPreviewControlBar) def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)"""