X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5263701c22ed4dfff59a47b0d8a3f8ab1396688..7b497846ea92ee9e5c584ef7f55f60b6424f0bde:/wxPython/src/mac/_core.py diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index 8f06644198..4f2f220f99 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -1373,9 +1373,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): """ @@ -11008,14 +11011,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 @@ -11035,7 +11030,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 @@ -13488,7 +13482,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' @@ -13507,7 +13501,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 @@ -13518,7 +13512,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` @@ -13608,6 +13602,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