X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5263701c22ed4dfff59a47b0d8a3f8ab1396688..bbc3761ee897d2cdae209c60d415ba00fe825554:/wxPython/src/msw/_core.py diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 40f94cdb62..81c9364b07 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -705,9 +705,8 @@ class Object(object): Deletes the C++ object this Python object is a proxy for. """ - val = _core_.Object_Destroy(*args, **kwargs) - args[0].thisown = 0 - return val + args[0].this.own(False) + return _core_.Object_Destroy(*args, **kwargs) ClassName = property(GetClassName,doc="See `GetClassName`") _core_.Object_swigregister(Object) @@ -1373,9 +1372,12 @@ class Rect(object): """ return _core_.Rect_ContainsRect(*args, **kwargs) - Inside = wx._deprecated(Contains, "Use `Contains` instead.") - InsideXY = wx._deprecated(ContainsXY, "Use `ContainsXY` instead.") - InsideRect = wx._deprecated(ContainsRect, "Use `ContainsRect` instead.") + #Inside = wx._deprecated(Contains, "Use `Contains` instead.") + #InsideXY = wx._deprecated(ContainsXY, "Use `ContainsXY` instead.") + #InsideRect = wx._deprecated(ContainsRect, "Use `ContainsRect` instead.") + Inside = Contains + InsideXY = ContainsXY + InsideRect = ContainsRect def Intersects(*args, **kwargs): """ @@ -1498,6 +1500,8 @@ class Point2D(object): Create a w.Point2D object. """ _core_.Point2D_swiginit(self,_core_.new_Point2D(*args, **kwargs)) + __swig_destroy__ = _core_.delete_Point2D + __del__ = lambda self : None; def GetFloor(*args, **kwargs): """ GetFloor() -> (x,y) @@ -2316,9 +2320,8 @@ class Image(Object): Destroys the image data. """ - val = _core_.Image_Destroy(*args, **kwargs) - args[0].thisown = 0 - return val + args[0].this.own(False) + return _core_.Image_Destroy(*args, **kwargs) def Scale(*args, **kwargs): """ @@ -2646,14 +2649,15 @@ class Image(Object): """ return _core_.Image_LoadMimeStream(*args, **kwargs) - def Ok(*args, **kwargs): + def IsOk(*args, **kwargs): """ - Ok(self) -> bool + IsOk(self) -> bool Returns true if image data is present. """ - return _core_.Image_Ok(*args, **kwargs) + return _core_.Image_IsOk(*args, **kwargs) + Ok = IsOk def GetWidth(*args, **kwargs): """ GetWidth(self) -> int @@ -3031,7 +3035,7 @@ class Image(Object): return _core_.Image_HSVtoRGB(*args, **kwargs) HSVtoRGB = staticmethod(HSVtoRGB) - def __nonzero__(self): return self.Ok() + def __nonzero__(self): return self.IsOk() AlphaBuffer = property(GetAlphaBuffer,SetAlphaBuffer,doc="See `GetAlphaBuffer` and `SetAlphaBuffer`") AlphaData = property(GetAlphaData,SetAlphaData,doc="See `GetAlphaData` and `SetAlphaData`") Data = property(GetData,SetData,doc="See `GetData` and `SetData`") @@ -3040,7 +3044,6 @@ class Image(Object): MaskBlue = property(GetMaskBlue,doc="See `GetMaskBlue`") MaskGreen = property(GetMaskGreen,doc="See `GetMaskGreen`") MaskRed = property(GetMaskRed,doc="See `GetMaskRed`") - Size = property(GetSize,doc="See `GetSize`") Width = property(GetWidth,doc="See `GetWidth`") _core_.Image_swigregister(Image) @@ -3477,6 +3480,18 @@ class EvtHandler(Object): """ProcessPendingEvents(self)""" return _core_.EvtHandler_ProcessPendingEvents(*args, **kwargs) + def AllowReentrance(*args, **kwargs): + """AllowReentrance(self, bool allow=True)""" + return _core_.EvtHandler_AllowReentrance(*args, **kwargs) + + def IsReentranceAllowed(*args, **kwargs): + """IsReentranceAllowed(self) -> bool""" + return _core_.EvtHandler_IsReentranceAllowed(*args, **kwargs) + + def IsEventHandlingInProgress(*args, **kwargs): + """IsEventHandlingInProgress(self) -> bool""" + return _core_.EvtHandler_IsEventHandlingInProgress(*args, **kwargs) + def Connect(*args, **kwargs): """Connect(self, int id, int lastId, int eventType, PyObject func)""" return _core_.EvtHandler_Connect(*args, **kwargs) @@ -7480,8 +7495,8 @@ in on the main display of your Mac.""" destroy(self) def Destroy(self): + self.this.own(False) wx.PyApp.Destroy(self) - self.thisown = 0 def SetTopWindow(self, frame): """Set the \"main\" top level window""" @@ -7796,10 +7811,11 @@ class AcceleratorTable(Object): _core_.AcceleratorTable_swiginit(self,_core_.new_AcceleratorTable(*args, **kwargs)) __swig_destroy__ = _core_.delete_AcceleratorTable __del__ = lambda self : None; - def Ok(*args, **kwargs): - """Ok(self) -> bool""" - return _core_.AcceleratorTable_Ok(*args, **kwargs) + def IsOk(*args, **kwargs): + """IsOk(self) -> bool""" + return _core_.AcceleratorTable_IsOk(*args, **kwargs) + Ok = IsOk _core_.AcceleratorTable_swigregister(AcceleratorTable) @@ -7886,9 +7902,8 @@ class Window(EvtHandler): Returns True if the window has either been successfully deleted, or it has been added to the list of windows pending real deletion. """ - val = _core_.Window_Destroy(*args, **kwargs) - args[0].thisown = 0 - return val + args[0].this.own(False) + return _core_.Window_Destroy(*args, **kwargs) def DestroyChildren(*args, **kwargs): """ @@ -9173,7 +9188,7 @@ class Window(EvtHandler): window instead of waiting for the EVT_PAINT event to happen, (normally this would usually only happen when the flow of control returns to the event loop.) Notice that this function doesn't refresh the window and - does nothing if the window has been already repainted. Use Refresh + does nothing if the window has been already repainted. Use `Refresh` first if you want to immediately redraw the window (or some portion of it) unconditionally. """ @@ -9236,6 +9251,17 @@ class Window(EvtHandler): """ return _core_.Window_PrepareDC(*args, **kwargs) + def IsDoubleBuffered(*args, **kwargs): + """ + IsDoubleBuffered(self) -> bool + + Returns ``True`` if the window contents is double-buffered by the + system, i.e. if any drawing done on the window is really done on a + temporary backing surface and transferred to the screen all at once + later. + """ + return _core_.Window_IsDoubleBuffered(*args, **kwargs) + def GetUpdateRegion(*args, **kwargs): """ GetUpdateRegion(self) -> Region @@ -10448,29 +10474,16 @@ class Menu(EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - val = _core_.Menu_Destroy(*args, **kwargs) - args[0].thisown = 0 - return val + args[0].this.own(False) + return _core_.Menu_Destroy(*args, **kwargs) def DestroyId(*args, **kwargs): - """ - DestroyId(self, int id) -> bool - - Deletes the C++ object this Python object is a proxy for. - """ - val = _core_.Menu_DestroyId(*args, **kwargs) - args[0].thisown = 0 - return val + """DestroyId(self, int id) -> bool""" + return _core_.Menu_DestroyId(*args, **kwargs) def DestroyItem(*args, **kwargs): - """ - DestroyItem(self, MenuItem item) -> bool - - Deletes the C++ object this Python object is a proxy for. - """ - val = _core_.Menu_DestroyItem(*args, **kwargs) - args[0].thisown = 0 - return val + """DestroyItem(self, MenuItem item) -> bool""" + return _core_.Menu_DestroyItem(*args, **kwargs) def GetMenuItemCount(*args, **kwargs): """GetMenuItemCount(self) -> size_t""" @@ -11012,14 +11025,6 @@ class Control(Window): """ return _core_.Control_Command(*args, **kwargs) - def GetLabel(*args, **kwargs): - """ - GetLabel(self) -> String - - Return a control's text. - """ - return _core_.Control_GetLabel(*args, **kwargs) - def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -11039,7 +11044,6 @@ class Control(Window): GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) Alignment = property(GetAlignment,doc="See `GetAlignment`") - Label = property(GetLabel,doc="See `GetLabel`") LabelText = property(GetLabelText,doc="See `GetLabelText`") _core_.Control_swigregister(Control) ControlNameStr = cvar.ControlNameStr @@ -13492,7 +13496,7 @@ def CallAfter(callable, *args, **kw): method calls from non-GUI threads. Any extra positional or keyword args are passed on to the callable when it is called. - :see: `wx.FutureCall` + :see: `wx.CallLater` """ app = wx.GetApp() assert app is not None, 'No wx.App created yet' @@ -13511,7 +13515,7 @@ def CallAfter(callable, *args, **kw): #---------------------------------------------------------------------------- -class FutureCall: +class CallLater: """ A convenience class for `wx.Timer`, that calls the given callable object once after the given amount of milliseconds, passing any @@ -13522,7 +13526,7 @@ class FutureCall: then there is no need to hold a reference to this object. It will hold a reference to itself while the timer is running (the timer has a reference to self.Notify) but the cycle will be broken when - the timer completes, automatically cleaning up the wx.FutureCall + the timer completes, automatically cleaning up the wx.CallLater object. :see: `wx.CallAfter` @@ -13612,6 +13616,9 @@ class FutureCall: Result = property(GetResult) +class FutureCall(CallLater): + """A compatibility alias for `CallLater`.""" + #---------------------------------------------------------------------------- # Control which items in this module should be documented by epydoc. # We allow only classes and functions, which will help reduce the size