From 891bb1943fd866e6f2b63ad1f170a44d133b6479 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sun, 21 Nov 2004 00:51:22 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/mac/_core.py | 13 +++++-------- wxPython/src/msw/_core.py | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index 817f8533e0..292e6c7ad9 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -10814,7 +10814,6 @@ class _wxPyUnbornObject(object): #---------------------------------------------------------------------------- -_wxPyCallAfterId = None def CallAfter(callable, *args, **kw): """ @@ -10828,19 +10827,17 @@ def CallAfter(callable, *args, **kw): app = wx.GetApp() assert app is not None, 'No wx.App created yet' - global _wxPyCallAfterId - if _wxPyCallAfterId is None: - _wxPyCallAfterId = wx.NewEventType() - app.Connect(-1, -1, _wxPyCallAfterId, - lambda event: event.callable(*event.args, **event.kw) ) + if not hasattr(app, "_CallAfterId"): + app._CallAfterId = wx.NewEventType() + app.Connect(-1, -1, app._CallAfterId, + lambda event: event.callable(*event.args, **event.kw) ) evt = wx.PyEvent() - evt.SetEventType(_wxPyCallAfterId) + evt.SetEventType(app._CallAfterId) evt.callable = callable evt.args = args evt.kw = kw wx.PostEvent(app, evt) - #---------------------------------------------------------------------------- diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 621941d283..6fbf7ccaff 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -10883,7 +10883,6 @@ class _wxPyUnbornObject(object): #---------------------------------------------------------------------------- -_wxPyCallAfterId = None def CallAfter(callable, *args, **kw): """ @@ -10897,19 +10896,17 @@ def CallAfter(callable, *args, **kw): app = wx.GetApp() assert app is not None, 'No wx.App created yet' - global _wxPyCallAfterId - if _wxPyCallAfterId is None: - _wxPyCallAfterId = wx.NewEventType() - app.Connect(-1, -1, _wxPyCallAfterId, - lambda event: event.callable(*event.args, **event.kw) ) + if not hasattr(app, "_CallAfterId"): + app._CallAfterId = wx.NewEventType() + app.Connect(-1, -1, app._CallAfterId, + lambda event: event.callable(*event.args, **event.kw) ) evt = wx.PyEvent() - evt.SetEventType(_wxPyCallAfterId) + evt.SetEventType(app._CallAfterId) evt.callable = callable evt.args = args evt.kw = kw wx.PostEvent(app, evt) - #----------------------------------------------------------------------------