X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9bf356bd13606500a2c91029914f85e01e5d8cd..70ee369088ef1d54628883a1da7c20b1796d5b94:/wxPython/src/msw/_windows.py diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index b63226efe3..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 @@ -1426,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) @@ -1758,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)""" @@ -1819,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)""" @@ -1922,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)""" @@ -2019,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) @@ -2051,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)""" @@ -2128,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): @@ -2184,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 ) @@ -2191,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 ) #--------------------------------------------------------------------------- @@ -2311,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 @@ -2369,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 @@ -2384,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 @@ -3334,7 +3338,7 @@ 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)""" @@ -3511,7 +3515,7 @@ 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)""" @@ -3688,7 +3692,7 @@ 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)""" @@ -4442,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; @@ -4859,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)""" @@ -4913,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)""" @@ -4967,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)"""