bitwise vs. logical operator

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

diff --git a/wxPython/src/msw/xrc.py b/wxPython/src/msw/xrc.py
index cf28fe485f2ed635ba1289ba9bdb13a960295be7..6bee8d35af951a4125b2cff0f4dcf77406b758d6 100644 (file)
--- a/wxPython/src/msw/xrc.py
+++ b/wxPython/src/msw/xrc.py
@@ -79,10 +79,6 @@ class XmlResource(_core.Object):
 
     __swig_destroy__ = _xrc.delete_XmlResource
     __del__ = lambda self : None;
 
     __swig_destroy__ = _xrc.delete_XmlResource
     __del__ = lambda self : None;

-    def GetFirstRoot(*args, **kwargs):
-        """GetFirstRoot(self) -> XmlNode"""
-        return _xrc.XmlResource_GetFirstRoot(*args, **kwargs)
-

     def Load(*args, **kwargs):
         """Load(self, String filemask) -> bool"""
         return _xrc.XmlResource_Load(*args, **kwargs)
     def Load(*args, **kwargs):
         """Load(self, String filemask) -> bool"""
         return _xrc.XmlResource_Load(*args, **kwargs)


@@ -266,7 +262,7 @@ class XmlSubclassFactory(object):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> XmlSubclassFactory"""
         _xrc.XmlSubclassFactory_swiginit(self,_xrc.new_XmlSubclassFactory(*args, **kwargs))
     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)"""
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""


@@ -539,7 +535,7 @@ class XmlResourceHandler(_core.Object):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> XmlResourceHandler"""
         _xrc.XmlResourceHandler_swiginit(self,_xrc.new_XmlResourceHandler(*args, **kwargs))
     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;
 
     __swig_destroy__ = _xrc.delete_XmlResourceHandler
     __del__ = lambda self : None;


@@ -712,7 +708,12 @@ TheXmlResource = XmlResource_Get()
 
 
 def _my_import(name):
 
 
 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)
     components = name.split('.')
     for comp in components[1:]:
         mod = getattr(mod, comp)