X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51b83b37560a05eb688e8ed584bca47b0d1f968e..3a9becbd5439254a77e7dbc0278d80117a397264:/wxPython/src/msw/_windows.py?ds=sidebyside diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index f379d9a793..8dfc22ae34 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -360,6 +360,8 @@ 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 @@ -522,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) @@ -862,7 +864,10 @@ 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,) 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 @@ -1140,7 +1145,7 @@ class SplitterWindow(_core.Window): """ SetSashSize(self, int width) - Sets the sash size. Currently a NOP. + Sets the sash size. """ return _windows_.SplitterWindow_SetSashSize(*args, **kwargs) @@ -1975,6 +1980,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) @@ -1983,10 +2000,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): @@ -2643,11 +2656,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 @@ -2660,7 +2684,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) @@ -2669,6 +2694,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) @@ -2687,7 +2713,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. @@ -3325,6 +3351,7 @@ 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): @@ -3394,7 +3421,7 @@ class MDIParentFrame(Frame): return _windows_.MDIParentFrame_SetToolBar(*args, **kwargs) def Tile(*args, **kwargs): - """Tile(self)""" + """Tile(self, int orient=HORIZONTAL)""" return _windows_.MDIParentFrame_Tile(*args, **kwargs) @@ -3518,6 +3545,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) @@ -3594,10 +3625,6 @@ 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) @@ -3639,6 +3666,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) @@ -3715,10 +3746,6 @@ 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) @@ -3750,7 +3777,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)""" @@ -3760,6 +3787,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) @@ -3836,10 +3867,6 @@ 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) @@ -4000,6 +4027,14 @@ class PrintData(_core.Object): 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) @@ -4090,6 +4125,7 @@ class PageSetupDialogData(_core.Object): """ __init__(self) -> PageSetupDialogData __init__(self, PageSetupDialogData data) -> PageSetupDialogData + __init__(self, PrintData data) -> PageSetupDialogData """ newobj = _windows_.new_PageSetupDialogData(*args) self.this = newobj.this @@ -4217,6 +4253,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): @@ -4264,6 +4308,7 @@ class PrintDialogData(_core.Object): """ __init__(self) -> PrintDialogData __init__(self, PrintData printData) -> PrintDialogData + __init__(self, PrintDialogData printData) -> PrintDialogData """ newobj = _windows_.new_PrintDialogData(*args) self.this = newobj.this