X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d03fd34d3cca63ba73cee48271eda244ceb98337..315ebf688c0e69bed47cd3149158198b781b5f65:/wxPython/src/msw/core.py diff --git a/wxPython/src/msw/core.py b/wxPython/src/msw/core.py index 55739471d9..3cb44c5789 100644 --- a/wxPython/src/msw/core.py +++ b/wxPython/src/msw/core.py @@ -765,9 +765,8 @@ class Size(object): elif index == 1: self.height = val else: raise IndexError def __nonzero__(self): return self.Get() != (0,0) - def __getinitargs__(self): return () - def __getstate__(self): return self.Get() - def __setstate__(self, state): self.Set(*state) + __safe_for_unpickling__ = True + def __reduce__(self): return (wx.Size, self.Get()) class SizePtr(Size): @@ -863,9 +862,8 @@ class RealPoint(object): elif index == 1: self.y = val else: raise IndexError def __nonzero__(self): return self.Get() != (0.0, 0.0) - def __getinitargs__(self): return () - def __getstate__(self): return self.Get() - def __setstate__(self, state): self.Set(*state) + __safe_for_unpickling__ = True + def __reduce__(self): return (wx.RealPoint, self.Get()) class RealPointPtr(RealPoint): @@ -977,9 +975,8 @@ class Point(object): elif index == 1: self.y = val else: raise IndexError def __nonzero__(self): return self.Get() != (0,0) - def __getinitargs__(self): return () - def __getstate__(self): return self.Get() - def __setstate__(self, state): self.Set(*state) + __safe_for_unpickling__ = True + def __reduce__(self): return (wx.Point, self.Get()) class PointPtr(Point): @@ -1251,9 +1248,8 @@ class Rect(object): elif index == 3: self.height = val else: raise IndexError def __nonzero__(self): return self.Get() != (0,0,0,0) - def __getinitargs__(self): return () - def __getstate__(self): return self.Get() - def __setstate__(self, state): self.Set(*state) + __safe_for_unpickling__ = True + def __reduce__(self): return (wx.Rect, self.Get()) class RectPtr(Rect): @@ -1425,10 +1421,8 @@ class Point2D(object): elif index == 1: self.y = val else: raise IndexError def __nonzero__(self): return self.Get() != (0.0, 0.0) - def __getinitargs__(self): return () - def __getstate__(self): return self.Get() - def __setstate__(self, state): self.Set(*state) - + __safe_for_unpickling__ = True + def __reduce__(self): return (wx.Point2D, self.Get()) class Point2DPtr(Point2D): @@ -1717,17 +1711,17 @@ class FileSystem(Object): return _core.FileSystem_FindNext(*args, **kwargs) def AddHandler(*args, **kwargs): - """FileSystem.AddHandler(CPPFileSystemHandler handler)""" + """AddHandler(CPPFileSystemHandler handler)""" return _core.FileSystem_AddHandler(*args, **kwargs) AddHandler = staticmethod(AddHandler) def CleanUpHandlers(*args, **kwargs): - """FileSystem.CleanUpHandlers()""" + """CleanUpHandlers()""" return _core.FileSystem_CleanUpHandlers(*args, **kwargs) CleanUpHandlers = staticmethod(CleanUpHandlers) def FileNameToURL(*args, **kwargs): - """FileSystem.FileNameToURL(String filename) -> String""" + """FileNameToURL(String filename) -> String""" return _core.FileSystem_FileNameToURL(*args, **kwargs) FileNameToURL = staticmethod(FileNameToURL) @@ -1844,7 +1838,7 @@ class MemoryFSHandler(CPPFileSystemHandler): self.thisown = 1 del newobj.thisown def RemoveFile(*args, **kwargs): - """MemoryFSHandler.RemoveFile(String filename)""" + """RemoveFile(String filename)""" return _core.MemoryFSHandler_RemoveFile(*args, **kwargs) RemoveFile = staticmethod(RemoveFile) @@ -1938,7 +1932,7 @@ class ImageHistogram(object): del newobj.thisown def MakeKey(*args, **kwargs): """ - ImageHistogram.MakeKey(unsigned char r, unsigned char g, unsigned char b) -> unsigned long + MakeKey(unsigned char r, unsigned char g, unsigned char b) -> unsigned long Get the key in the histogram for the given RGB values """ @@ -2053,12 +2047,12 @@ class Image(Object): return _core.Image_SetMaskFromImage(*args, **kwargs) def CanRead(*args, **kwargs): - """Image.CanRead(String name) -> bool""" + """CanRead(String name) -> bool""" return _core.Image_CanRead(*args, **kwargs) CanRead = staticmethod(CanRead) def GetImageCount(*args, **kwargs): - """Image.GetImageCount(String name, long type=BITMAP_TYPE_ANY) -> int""" + """GetImageCount(String name, long type=BITMAP_TYPE_ANY) -> int""" return _core.Image_GetImageCount(*args, **kwargs) GetImageCount = staticmethod(GetImageCount) @@ -2079,7 +2073,7 @@ class Image(Object): return _core.Image_SaveMimeFile(*args, **kwargs) def CanReadStream(*args, **kwargs): - """Image.CanReadStream(InputStream stream) -> bool""" + """CanReadStream(InputStream stream) -> bool""" return _core.Image_CanReadStream(*args, **kwargs) CanReadStream = staticmethod(CanReadStream) @@ -2226,22 +2220,22 @@ class Image(Object): return _core.Image_ComputeHistogram(*args, **kwargs) def AddHandler(*args, **kwargs): - """Image.AddHandler(ImageHandler handler)""" + """AddHandler(ImageHandler handler)""" return _core.Image_AddHandler(*args, **kwargs) AddHandler = staticmethod(AddHandler) def InsertHandler(*args, **kwargs): - """Image.InsertHandler(ImageHandler handler)""" + """InsertHandler(ImageHandler handler)""" return _core.Image_InsertHandler(*args, **kwargs) InsertHandler = staticmethod(InsertHandler) def RemoveHandler(*args, **kwargs): - """Image.RemoveHandler(String name) -> bool""" + """RemoveHandler(String name) -> bool""" return _core.Image_RemoveHandler(*args, **kwargs) RemoveHandler = staticmethod(RemoveHandler) def GetImageExtWildcard(*args, **kwargs): - """Image.GetImageExtWildcard() -> String""" + """GetImageExtWildcard() -> String""" return _core.Image_GetImageExtWildcard(*args, **kwargs) GetImageExtWildcard = staticmethod(GetImageExtWildcard) @@ -2945,10 +2939,6 @@ EVT_COMMAND_SCROLL_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK, 1) EVT_COMMAND_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE, 1) EVT_COMMAND_SCROLL_ENDSCROLL = wx.PyEventBinder( wxEVT_SCROLL_ENDSCROLL, 1) -EVT_SPIN_UP = wx.PyEventBinder( wxEVT_SCROLL_LINEUP, 1) -EVT_SPIN_DOWN = wx.PyEventBinder( wxEVT_SCROLL_LINEDOWN, 1) -EVT_SPIN = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK, 1) - EVT_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_BUTTON_CLICKED, 1) EVT_CHECKBOX = wx.PyEventBinder( wxEVT_COMMAND_CHECKBOX_CLICKED, 1) EVT_CHOICE = wx.PyEventBinder( wxEVT_COMMAND_CHOICE_SELECTED, 1) @@ -4041,32 +4031,32 @@ class UpdateUIEvent(CommandEvent): return _core.UpdateUIEvent_SetText(*args, **kwargs) def SetUpdateInterval(*args, **kwargs): - """UpdateUIEvent.SetUpdateInterval(long updateInterval)""" + """SetUpdateInterval(long updateInterval)""" return _core.UpdateUIEvent_SetUpdateInterval(*args, **kwargs) SetUpdateInterval = staticmethod(SetUpdateInterval) def GetUpdateInterval(*args, **kwargs): - """UpdateUIEvent.GetUpdateInterval() -> long""" + """GetUpdateInterval() -> long""" return _core.UpdateUIEvent_GetUpdateInterval(*args, **kwargs) GetUpdateInterval = staticmethod(GetUpdateInterval) def CanUpdate(*args, **kwargs): - """UpdateUIEvent.CanUpdate(Window win) -> bool""" + """CanUpdate(Window win) -> bool""" return _core.UpdateUIEvent_CanUpdate(*args, **kwargs) CanUpdate = staticmethod(CanUpdate) def ResetUpdateTime(*args, **kwargs): - """UpdateUIEvent.ResetUpdateTime()""" + """ResetUpdateTime()""" return _core.UpdateUIEvent_ResetUpdateTime(*args, **kwargs) ResetUpdateTime = staticmethod(ResetUpdateTime) def SetMode(*args, **kwargs): - """UpdateUIEvent.SetMode(int mode)""" + """SetMode(int mode)""" return _core.UpdateUIEvent_SetMode(*args, **kwargs) SetMode = staticmethod(SetMode) def GetMode(*args, **kwargs): - """UpdateUIEvent.GetMode() -> int""" + """GetMode() -> int""" return _core.UpdateUIEvent_GetMode(*args, **kwargs) GetMode = staticmethod(GetMode) @@ -4353,17 +4343,17 @@ class IdleEvent(Event): return _core.IdleEvent_MoreRequested(*args, **kwargs) def SetMode(*args, **kwargs): - """IdleEvent.SetMode(int mode)""" + """SetMode(int mode)""" return _core.IdleEvent_SetMode(*args, **kwargs) SetMode = staticmethod(SetMode) def GetMode(*args, **kwargs): - """IdleEvent.GetMode() -> int""" + """GetMode() -> int""" return _core.IdleEvent_GetMode(*args, **kwargs) GetMode = staticmethod(GetMode) def CanSend(*args, **kwargs): - """IdleEvent.CanSend(Window win) -> bool""" + """CanSend(Window win) -> bool""" return _core.IdleEvent_CanSend(*args, **kwargs) CanSend = staticmethod(CanSend) @@ -4739,52 +4729,52 @@ class PyApp(EvtHandler): return _core.PyApp_GetAssertMode(*args, **kwargs) def GetMacSupportPCMenuShortcuts(*args, **kwargs): - """PyApp.GetMacSupportPCMenuShortcuts() -> bool""" + """GetMacSupportPCMenuShortcuts() -> bool""" return _core.PyApp_GetMacSupportPCMenuShortcuts(*args, **kwargs) GetMacSupportPCMenuShortcuts = staticmethod(GetMacSupportPCMenuShortcuts) def GetMacAboutMenuItemId(*args, **kwargs): - """PyApp.GetMacAboutMenuItemId() -> long""" + """GetMacAboutMenuItemId() -> long""" return _core.PyApp_GetMacAboutMenuItemId(*args, **kwargs) GetMacAboutMenuItemId = staticmethod(GetMacAboutMenuItemId) def GetMacPreferencesMenuItemId(*args, **kwargs): - """PyApp.GetMacPreferencesMenuItemId() -> long""" + """GetMacPreferencesMenuItemId() -> long""" return _core.PyApp_GetMacPreferencesMenuItemId(*args, **kwargs) GetMacPreferencesMenuItemId = staticmethod(GetMacPreferencesMenuItemId) def GetMacExitMenuItemId(*args, **kwargs): - """PyApp.GetMacExitMenuItemId() -> long""" + """GetMacExitMenuItemId() -> long""" return _core.PyApp_GetMacExitMenuItemId(*args, **kwargs) GetMacExitMenuItemId = staticmethod(GetMacExitMenuItemId) def GetMacHelpMenuTitleName(*args, **kwargs): - """PyApp.GetMacHelpMenuTitleName() -> String""" + """GetMacHelpMenuTitleName() -> String""" return _core.PyApp_GetMacHelpMenuTitleName(*args, **kwargs) GetMacHelpMenuTitleName = staticmethod(GetMacHelpMenuTitleName) def SetMacSupportPCMenuShortcuts(*args, **kwargs): - """PyApp.SetMacSupportPCMenuShortcuts(bool val)""" + """SetMacSupportPCMenuShortcuts(bool val)""" return _core.PyApp_SetMacSupportPCMenuShortcuts(*args, **kwargs) SetMacSupportPCMenuShortcuts = staticmethod(SetMacSupportPCMenuShortcuts) def SetMacAboutMenuItemId(*args, **kwargs): - """PyApp.SetMacAboutMenuItemId(long val)""" + """SetMacAboutMenuItemId(long val)""" return _core.PyApp_SetMacAboutMenuItemId(*args, **kwargs) SetMacAboutMenuItemId = staticmethod(SetMacAboutMenuItemId) def SetMacPreferencesMenuItemId(*args, **kwargs): - """PyApp.SetMacPreferencesMenuItemId(long val)""" + """SetMacPreferencesMenuItemId(long val)""" return _core.PyApp_SetMacPreferencesMenuItemId(*args, **kwargs) SetMacPreferencesMenuItemId = staticmethod(SetMacPreferencesMenuItemId) def SetMacExitMenuItemId(*args, **kwargs): - """PyApp.SetMacExitMenuItemId(long val)""" + """SetMacExitMenuItemId(long val)""" return _core.PyApp_SetMacExitMenuItemId(*args, **kwargs) SetMacExitMenuItemId = staticmethod(SetMacExitMenuItemId) def SetMacHelpMenuTitleName(*args, **kwargs): - """PyApp.SetMacHelpMenuTitleName(String val)""" + """SetMacHelpMenuTitleName(String val)""" return _core.PyApp_SetMacHelpMenuTitleName(*args, **kwargs) SetMacHelpMenuTitleName = staticmethod(SetMacHelpMenuTitleName) @@ -4798,7 +4788,7 @@ class PyApp(EvtHandler): def GetComCtl32Version(*args, **kwargs): """ - PyApp.GetComCtl32Version() -> int + GetComCtl32Version() -> int Returns 400, 470, 471 for comctl32.dll 4.00, 4.70, 4.71 or 0 if it wasn't found at all. Raises an exception on non-Windows platforms. @@ -4958,6 +4948,7 @@ class PyOnDemandOutputWindow: style=wx.DEFAULT_FRAME_STYLE | wx.NO_FULL_REPAINT_ON_RESIZE) self.text = wx.TextCtrl(self.frame, -1, "", style = wx.TE_MULTILINE | wx.TE_READONLY) + self.text.AppendText(st) self.frame.SetSize((450, 300)) self.frame.Show(True) EVT_CLOSE(self.frame, self.OnCloseWindow) @@ -5308,17 +5299,17 @@ class Window(EvtHandler): return _core.Window_GetId(*args, **kwargs) def NewControlId(*args, **kwargs): - """Window.NewControlId() -> int""" + """NewControlId() -> int""" return _core.Window_NewControlId(*args, **kwargs) NewControlId = staticmethod(NewControlId) def NextControlId(*args, **kwargs): - """Window.NextControlId(int winid) -> int""" + """NextControlId(int winid) -> int""" return _core.Window_NextControlId(*args, **kwargs) NextControlId = staticmethod(NextControlId) def PrevControlId(*args, **kwargs): - """Window.PrevControlId(int winid) -> int""" + """PrevControlId(int winid) -> int""" return _core.Window_PrevControlId(*args, **kwargs) PrevControlId = staticmethod(PrevControlId) @@ -5628,7 +5619,7 @@ class Window(EvtHandler): return _core.Window_SetFocusFromKbd(*args, **kwargs) def FindFocus(*args, **kwargs): - """Window.FindFocus() -> Window""" + """FindFocus() -> Window""" return _core.Window_FindFocus(*args, **kwargs) FindFocus = staticmethod(FindFocus) @@ -5769,7 +5760,7 @@ class Window(EvtHandler): return _core.Window_ReleaseMouse(*args, **kwargs) def GetCapture(*args, **kwargs): - """Window.GetCapture() -> Window""" + """GetCapture() -> Window""" return _core.Window_GetCapture(*args, **kwargs) GetCapture = staticmethod(GetCapture) @@ -6020,9 +6011,7 @@ class Window(EvtHandler): def SetDropTarget(*args, **kwargs): """SetDropTarget(PyDropTarget dropTarget)""" - val = _core.Window_SetDropTarget(*args, **kwargs) - args[1].thisown = 0 - return val + return _core.Window_SetDropTarget(*args, **kwargs) def GetDropTarget(*args, **kwargs): """GetDropTarget() -> PyDropTarget""" @@ -6185,12 +6174,12 @@ class Validator(EvtHandler): return _core.Validator_SetWindow(*args, **kwargs) def IsSilent(*args, **kwargs): - """Validator.IsSilent() -> bool""" + """IsSilent() -> bool""" return _core.Validator_IsSilent(*args, **kwargs) IsSilent = staticmethod(IsSilent) def SetBellOnError(*args, **kwargs): - """Validator.SetBellOnError(int doIt=True)""" + """SetBellOnError(int doIt=True)""" return _core.Validator_SetBellOnError(*args, **kwargs) SetBellOnError = staticmethod(SetBellOnError) @@ -6249,27 +6238,27 @@ class Menu(EvtHandler): self._setOORInfo(self) def Append(*args, **kwargs): - """Append(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL)""" + """Append(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL) -> MenuItem""" return _core.Menu_Append(*args, **kwargs) def AppendSeparator(*args, **kwargs): - """AppendSeparator()""" + """AppendSeparator() -> MenuItem""" return _core.Menu_AppendSeparator(*args, **kwargs) def AppendCheckItem(*args, **kwargs): - """AppendCheckItem(int id, String text, String help=EmptyString)""" + """AppendCheckItem(int id, String text, String help=EmptyString) -> MenuItem""" return _core.Menu_AppendCheckItem(*args, **kwargs) def AppendRadioItem(*args, **kwargs): - """AppendRadioItem(int id, String text, String help=EmptyString)""" + """AppendRadioItem(int id, String text, String help=EmptyString) -> MenuItem""" return _core.Menu_AppendRadioItem(*args, **kwargs) def AppendMenu(*args, **kwargs): - """AppendMenu(int id, String text, Menu submenu, String help=EmptyString)""" + """AppendMenu(int id, String text, Menu submenu, String help=EmptyString) -> MenuItem""" return _core.Menu_AppendMenu(*args, **kwargs) def AppendItem(*args, **kwargs): - """AppendItem(MenuItem item)""" + """AppendItem(MenuItem item) -> MenuItem""" return _core.Menu_AppendItem(*args, **kwargs) def Break(*args, **kwargs): @@ -6277,54 +6266,54 @@ class Menu(EvtHandler): return _core.Menu_Break(*args, **kwargs) def InsertItem(*args, **kwargs): - """InsertItem(size_t pos, MenuItem item) -> bool""" + """InsertItem(size_t pos, MenuItem item) -> MenuItem""" return _core.Menu_InsertItem(*args, **kwargs) def Insert(*args, **kwargs): """ Insert(size_t pos, int id, String text, String help=EmptyString, - int kind=ITEM_NORMAL) + int kind=ITEM_NORMAL) -> MenuItem """ return _core.Menu_Insert(*args, **kwargs) def InsertSeparator(*args, **kwargs): - """InsertSeparator(size_t pos)""" + """InsertSeparator(size_t pos) -> MenuItem""" return _core.Menu_InsertSeparator(*args, **kwargs) def InsertCheckItem(*args, **kwargs): - """InsertCheckItem(size_t pos, int id, String text, String help=EmptyString)""" + """InsertCheckItem(size_t pos, int id, String text, String help=EmptyString) -> MenuItem""" return _core.Menu_InsertCheckItem(*args, **kwargs) def InsertRadioItem(*args, **kwargs): - """InsertRadioItem(size_t pos, int id, String text, String help=EmptyString)""" + """InsertRadioItem(size_t pos, int id, String text, String help=EmptyString) -> MenuItem""" return _core.Menu_InsertRadioItem(*args, **kwargs) def InsertMenu(*args, **kwargs): - """InsertMenu(size_t pos, int id, String text, Menu submenu, String help=EmptyString)""" + """InsertMenu(size_t pos, int id, String text, Menu submenu, String help=EmptyString) -> MenuItem""" return _core.Menu_InsertMenu(*args, **kwargs) def PrependItem(*args, **kwargs): - """PrependItem(MenuItem item)""" + """PrependItem(MenuItem item) -> MenuItem""" return _core.Menu_PrependItem(*args, **kwargs) def Prepend(*args, **kwargs): - """Prepend(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL)""" + """Prepend(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL) -> MenuItem""" return _core.Menu_Prepend(*args, **kwargs) def PrependSeparator(*args, **kwargs): - """PrependSeparator()""" + """PrependSeparator() -> MenuItem""" return _core.Menu_PrependSeparator(*args, **kwargs) def PrependCheckItem(*args, **kwargs): - """PrependCheckItem(int id, String text, String help=EmptyString)""" + """PrependCheckItem(int id, String text, String help=EmptyString) -> MenuItem""" return _core.Menu_PrependCheckItem(*args, **kwargs) def PrependRadioItem(*args, **kwargs): - """PrependRadioItem(int id, String text, String help=EmptyString)""" + """PrependRadioItem(int id, String text, String help=EmptyString) -> MenuItem""" return _core.Menu_PrependRadioItem(*args, **kwargs) def PrependMenu(*args, **kwargs): - """PrependMenu(int id, String text, Menu submenu, String help=EmptyString)""" + """PrependMenu(int id, String text, Menu submenu, String help=EmptyString) -> MenuItem""" return _core.Menu_PrependMenu(*args, **kwargs) def Remove(*args, **kwargs): @@ -6653,7 +6642,7 @@ class MenuItem(Object): return _core.MenuItem_GetText(*args, **kwargs) def GetLabelFromText(*args, **kwargs): - """MenuItem.GetLabelFromText(String text) -> String""" + """GetLabelFromText(String text) -> String""" return _core.MenuItem_GetLabelFromText(*args, **kwargs) GetLabelFromText = staticmethod(GetLabelFromText) @@ -6762,7 +6751,7 @@ class MenuItem(Object): return _core.MenuItem_GetMarginWidth(*args, **kwargs) def GetDefaultMarginWidth(*args, **kwargs): - """MenuItem.GetDefaultMarginWidth() -> int""" + """GetDefaultMarginWidth() -> int""" return _core.MenuItem_GetDefaultMarginWidth(*args, **kwargs) GetDefaultMarginWidth = staticmethod(GetDefaultMarginWidth) @@ -7167,7 +7156,7 @@ class Sizer(Object): childinfo = (childinfo, ) self.Add(*childinfo) - + # for backwards compatibility only, please do not use in new code AddWindow = AddSizer = AddSpacer = Add PrependWindow = PrependSizer = PrependSpacer = Prepend InsertWindow = InsertSizer = InsertSpacer = Insert @@ -7550,9 +7539,8 @@ class GBPosition(object): elif index == 1: self.SetCol(val) else: raise IndexError def __nonzero__(self): return self.Get() != (0,0) - def __getinitargs__(self): return () - def __getstate__(self): return self.Get() - def __setstate__(self, state): self.Set(*state) + __safe_for_unpickling__ = True + def __reduce__(self): return (wx.GBPosition, self.Get()) row = property(GetRow, SetRow) col = property(GetCol, SetCol) @@ -7616,9 +7604,8 @@ class GBSpan(object): elif index == 1: self.SetColspan(val) else: raise IndexError def __nonzero__(self): return self.Get() != (0,0) - def __getinitargs__(self): return () - def __getstate__(self): return self.Get() - def __setstate__(self, state): self.Set(*state) + __safe_for_unpickling__ = True + def __reduce__(self): return (wx.GBSpan, self.Get()) rowspan = property(GetRowspan, SetRowspan) colspan = property(GetColspan, SetColspan)