fixed deadlock when calling wxPostEvent() from worker thread

[wxWidgets.git] / wxPython / src / msw / xrc.py

diff --git a/wxPython/src/msw/xrc.py b/wxPython/src/msw/xrc.py
index 31946bfa96cf86081877e7f6239d2c1ba34df205..6bee8d35af951a4125b2cff0f4dcf77406b758d6 100644 (file)
--- a/wxPython/src/msw/xrc.py
+++ b/wxPython/src/msw/xrc.py
@@ -223,6 +223,7 @@ PosString = cvar.PosString
 BitmapString = cvar.BitmapString
 IconString = cvar.IconString
 FontString = cvar.FontString
+AnimationString = cvar.AnimationString
 
 def EmptyXmlResource(*args, **kwargs):
     """EmptyXmlResource(int flags=XRC_USE_LOCALE, String domain=wxEmptyString) -> XmlResource"""
@@ -261,7 +262,7 @@ class XmlSubclassFactory(object):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> XmlSubclassFactory"""
         _xrc.XmlSubclassFactory_swiginit(self,_xrc.new_XmlSubclassFactory(*args, **kwargs))
-        self._setCallbackInfo(self, XmlSubclassFactory)
+        XmlSubclassFactory._setCallbackInfo(self, self, XmlSubclassFactory)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -534,7 +535,7 @@ class XmlResourceHandler(_core.Object):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> XmlResourceHandler"""
         _xrc.XmlResourceHandler_swiginit(self,_xrc.new_XmlResourceHandler(*args, **kwargs))
-        self._setCallbackInfo(self, XmlResourceHandler)
+        XmlResourceHandler._setCallbackInfo(self, self, XmlResourceHandler)
 
     __swig_destroy__ = _xrc.delete_XmlResourceHandler
     __del__ = lambda self : None;
@@ -660,6 +661,10 @@ class XmlResourceHandler(_core.Object):
         """GetFont(self, String param=FontString) -> Font"""
         return _xrc.XmlResourceHandler_GetFont(*args, **kwargs)
 
+    def GetAnimation(*args, **kwargs):
+        """GetAnimation(self, String param=AnimationString) -> wxAnimation"""
+        return _xrc.XmlResourceHandler_GetAnimation(*args, **kwargs)
+
     def SetupWindow(*args, **kwargs):
         """SetupWindow(self, Window wnd)"""
         return _xrc.XmlResourceHandler_SetupWindow(*args, **kwargs)
@@ -703,7 +708,12 @@ TheXmlResource = XmlResource_Get()
 
 
 def _my_import(name):
-    mod = __import__(name)
+    try:
+        mod = __import__(name)
+    except ImportError:
+        import traceback
+        print traceback.format_exc()
+        raise
     components = name.split('.')
     for comp in components[1:]:
         mod = getattr(mod, comp)