Now that the typemap is handling buffer-compatible objects correctly

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

diff --git a/wxPython/src/mac/xrc.py b/wxPython/src/mac/xrc.py
index 3738f97ee598e813d530b9935a574af2a72a0d0d..a6df54936638ca7114d42cf0e7c5b0216ecc2d9c 100644 (file)
--- a/wxPython/src/mac/xrc.py
+++ b/wxPython/src/mac/xrc.py
@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.29.

 # Don't modify this file, modify the SWIG interface instead.
 
 """
 # Don't modify this file, modify the SWIG interface instead.
 
 """


@@ -7,17 +7,17 @@ controls on a panel, etc. to be loaded from an XML file.
 """
 
 import _xrc
 """
 
 import _xrc

-
+import new
+new_instancemethod = new.instancemethod

 def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
 def _swig_setattr_nondynamic(self,class_type,name,value,static=1):

+    if (name == "thisown"): return self.this.own(value)

     if (name == "this"):
     if (name == "this"):

-        if isinstance(value, class_type):
-            self.__dict__[name] = value.this
-            if hasattr(value,"thisown"): self.__dict__["thisown"] = value.thisown
-            del value.thisown
+        if type(value).__name__ == 'PySwigObject':
+            self.__dict__[name] = value

             return
     method = class_type.__swig_setmethods__.get(name,None)
     if method: return method(self,value)
             return
     method = class_type.__swig_setmethods__.get(name,None)
     if method: return method(self,value)

-    if (not static) or hasattr(self,name) or (name == "thisown"):
+    if (not static) or hasattr(self,name):

         self.__dict__[name] = value
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
         self.__dict__[name] = value
     else:
         raise AttributeError("You cannot add attributes to %s" % self)


@@ -26,10 +26,16 @@ def _swig_setattr(self,class_type,name,value):
     return _swig_setattr_nondynamic(self,class_type,name,value,0)
 
 def _swig_getattr(self,class_type,name):
     return _swig_setattr_nondynamic(self,class_type,name,value,0)
 
 def _swig_getattr(self,class_type,name):

+    if (name == "thisown"): return self.this.own()

     method = class_type.__swig_getmethods__.get(name,None)
     if method: return method(self)
     raise AttributeError,name
 
     method = class_type.__swig_getmethods__.get(name,None)
     if method: return method(self)
     raise AttributeError,name
 

+def _swig_repr(self):
+    try: strthis = "proxy of " + self.this.__repr__()
+    except: strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+

 import types
 try:
     _object = types.ObjectType
 import types
 try:
     _object = types.ObjectType


@@ -42,7 +48,8 @@ del types
 
 def _swig_setattr_nondynamic_method(set):
     def set_attr(self,name,value):
 
 def _swig_setattr_nondynamic_method(set):
     def set_attr(self,name,value):

-        if hasattr(self,name) or (name in ("this", "thisown")):
+        if (name == "thisown"): return self.this.own(value)
+        if hasattr(self,name) or (name == "this"):

             set(self,name,value)
         else:
             raise AttributeError("You cannot add attributes to %s" % self)
             set(self,name,value)
         else:
             raise AttributeError("You cannot add attributes to %s" % self)


@@ -63,22 +70,15 @@ XRC_NO_SUBCLASSING = _xrc.XRC_NO_SUBCLASSING
 XRC_NO_RELOADING = _xrc.XRC_NO_RELOADING
 class XmlResource(_core.Object):
     """Proxy of C++ XmlResource class"""
 XRC_NO_RELOADING = _xrc.XRC_NO_RELOADING
 class XmlResource(_core.Object):
     """Proxy of C++ XmlResource class"""

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxXmlResource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
-        """__init__(self, String filemask, int flags=XRC_USE_LOCALE) -> XmlResource"""
-        newobj = _xrc.new_XmlResource(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """__init__(self, String filemask, int flags=XRC_USE_LOCALE, String domain=wxEmptyString) -> XmlResource"""
+        _xrc.XmlResource_swiginit(self,_xrc.new_XmlResource(*args, **kwargs))

         self.InitAllHandlers()
 
         self.InitAllHandlers()
 

-    def __del__(self, destroy=_xrc.delete_XmlResource):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+    __swig_destroy__ = _xrc.delete_XmlResource
+    __del__ = lambda self : None;

     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)


@@ -87,6 +87,10 @@ class XmlResource(_core.Object):
         """LoadFromString(self, String data) -> bool"""
         return _xrc.XmlResource_LoadFromString(*args, **kwargs)
 
         """LoadFromString(self, String data) -> bool"""
         return _xrc.XmlResource_LoadFromString(*args, **kwargs)
 

+    def Unload(*args, **kwargs):
+        """Unload(self, String filename) -> bool"""
+        return _xrc.XmlResource_Unload(*args, **kwargs)
+

     def InitAllHandlers(*args, **kwargs):
         """InitAllHandlers(self)"""
         return _xrc.XmlResource_InitAllHandlers(*args, **kwargs)
     def InitAllHandlers(*args, **kwargs):
         """InitAllHandlers(self)"""
         return _xrc.XmlResource_InitAllHandlers(*args, **kwargs)


@@ -169,7 +173,7 @@ class XmlResource(_core.Object):
         return _xrc.XmlResource_AttachUnknownControl(*args, **kwargs)
 
     def GetXRCID(*args, **kwargs):
         return _xrc.XmlResource_AttachUnknownControl(*args, **kwargs)
 
     def GetXRCID(*args, **kwargs):

-        """GetXRCID(String str_id) -> int"""
+        """GetXRCID(String str_id, int value_if_not_found=ID_NONE) -> int"""

         return _xrc.XmlResource_GetXRCID(*args, **kwargs)
 
     GetXRCID = staticmethod(GetXRCID)
         return _xrc.XmlResource_GetXRCID(*args, **kwargs)
 
     GetXRCID = staticmethod(GetXRCID)


@@ -199,13 +203,15 @@ class XmlResource(_core.Object):
         """SetFlags(self, int flags)"""
         return _xrc.XmlResource_SetFlags(*args, **kwargs)
 
         """SetFlags(self, int flags)"""
         return _xrc.XmlResource_SetFlags(*args, **kwargs)
 

+    def GetDomain(*args, **kwargs):
+        """GetDomain(self) -> String"""
+        return _xrc.XmlResource_GetDomain(*args, **kwargs)

 
 

-class XmlResourcePtr(XmlResource):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = XmlResource
-_xrc.XmlResource_swigregister(XmlResourcePtr)
+    def SetDomain(*args, **kwargs):
+        """SetDomain(self, String domain)"""
+        return _xrc.XmlResource_SetDomain(*args, **kwargs)
+
+_xrc.XmlResource_swigregister(XmlResource)

 cvar = _xrc.cvar
 UTF8String = cvar.UTF8String
 StyleString = cvar.StyleString
 cvar = _xrc.cvar
 UTF8String = cvar.UTF8String
 StyleString = cvar.StyleString


@@ -216,30 +222,29 @@ IconString = cvar.IconString
 FontString = cvar.FontString
 
 def EmptyXmlResource(*args, **kwargs):
 FontString = cvar.FontString
 
 def EmptyXmlResource(*args, **kwargs):

-    """EmptyXmlResource(int flags=XRC_USE_LOCALE) -> XmlResource"""
+    """EmptyXmlResource(int flags=XRC_USE_LOCALE, String domain=wxEmptyString) -> XmlResource"""

     val = _xrc.new_EmptyXmlResource(*args, **kwargs)
     val = _xrc.new_EmptyXmlResource(*args, **kwargs)

-    val.thisown = 1

     val.InitAllHandlers()
     return val
 
 def XmlResource_AddSubclassFactory(*args, **kwargs):
     val.InitAllHandlers()
     return val
 
 def XmlResource_AddSubclassFactory(*args, **kwargs):

-    """XmlResource_AddSubclassFactory(XmlSubclassFactory factory)"""
-    return _xrc.XmlResource_AddSubclassFactory(*args, **kwargs)
+  """XmlResource_AddSubclassFactory(XmlSubclassFactory factory)"""
+  return _xrc.XmlResource_AddSubclassFactory(*args, **kwargs)

 
 def XmlResource_GetXRCID(*args, **kwargs):
 
 def XmlResource_GetXRCID(*args, **kwargs):

-    """XmlResource_GetXRCID(String str_id) -> int"""
-    return _xrc.XmlResource_GetXRCID(*args, **kwargs)
+  """XmlResource_GetXRCID(String str_id, int value_if_not_found=ID_NONE) -> int"""
+  return _xrc.XmlResource_GetXRCID(*args, **kwargs)

 
 

-def XmlResource_Get(*args, **kwargs):
-    """XmlResource_Get() -> XmlResource"""
-    return _xrc.XmlResource_Get(*args, **kwargs)
+def XmlResource_Get(*args):
+  """XmlResource_Get() -> XmlResource"""
+  return _xrc.XmlResource_Get(*args)

 
 def XmlResource_Set(*args, **kwargs):
 
 def XmlResource_Set(*args, **kwargs):

-    """XmlResource_Set(XmlResource res) -> XmlResource"""
-    return _xrc.XmlResource_Set(*args, **kwargs)
+  """XmlResource_Set(XmlResource res) -> XmlResource"""
+  return _xrc.XmlResource_Set(*args, **kwargs)

 
 

-def XRCID(str_id):
-    return XmlResource_GetXRCID(str_id)
+def XRCID(str_id, value_if_not_found = wx.ID_NONE):
+    return XmlResource_GetXRCID(str_id, value_if_not_found)

 
 def XRCCTRL(window, str_id, *ignoreargs):
     return window.FindWindowById(XRCID(str_id))
 
 def XRCCTRL(window, str_id, *ignoreargs):
     return window.FindWindowById(XRCID(str_id))


@@ -248,27 +253,18 @@ def XRCCTRL(window, str_id, *ignoreargs):
 
 class XmlSubclassFactory(object):
     """Proxy of C++ XmlSubclassFactory class"""
 
 class XmlSubclassFactory(object):
     """Proxy of C++ XmlSubclassFactory class"""

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyXmlSubclassFactory instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self) -> XmlSubclassFactory"""
         """__init__(self) -> XmlSubclassFactory"""

-        newobj = _xrc.new_XmlSubclassFactory(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _xrc.XmlSubclassFactory_swiginit(self,_xrc.new_XmlSubclassFactory(*args, **kwargs))

         self._setCallbackInfo(self, XmlSubclassFactory)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _xrc.XmlSubclassFactory__setCallbackInfo(*args, **kwargs)
 
         self._setCallbackInfo(self, XmlSubclassFactory)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _xrc.XmlSubclassFactory__setCallbackInfo(*args, **kwargs)
 

-
-class XmlSubclassFactoryPtr(XmlSubclassFactory):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = XmlSubclassFactory
-_xrc.XmlSubclassFactory_swigregister(XmlSubclassFactoryPtr)
+_xrc.XmlSubclassFactory_swigregister(XmlSubclassFactory)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -287,17 +283,14 @@ XML_NOTATION_NODE = _xrc.XML_NOTATION_NODE
 XML_HTML_DOCUMENT_NODE = _xrc.XML_HTML_DOCUMENT_NODE
 class XmlProperty(object):
     """Proxy of C++ XmlProperty class"""
 XML_HTML_DOCUMENT_NODE = _xrc.XML_HTML_DOCUMENT_NODE
 class XmlProperty(object):
     """Proxy of C++ XmlProperty class"""

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxXmlProperty instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """
         __init__(self, String name=EmptyString, String value=EmptyString, 
             XmlProperty next=None) -> XmlProperty
         """
         """
         __init__(self, String name=EmptyString, String value=EmptyString, 
             XmlProperty next=None) -> XmlProperty
         """

-        newobj = _xrc.new_XmlProperty(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _xrc.XmlProperty_swiginit(self,_xrc.new_XmlProperty(*args, **kwargs))

     def GetName(*args, **kwargs):
         """GetName(self) -> String"""
         return _xrc.XmlProperty_GetName(*args, **kwargs)
     def GetName(*args, **kwargs):
         """GetName(self) -> String"""
         return _xrc.XmlProperty_GetName(*args, **kwargs)


@@ -322,34 +315,21 @@ class XmlProperty(object):
         """SetNext(self, XmlProperty next)"""
         return _xrc.XmlProperty_SetNext(*args, **kwargs)
 
         """SetNext(self, XmlProperty next)"""
         return _xrc.XmlProperty_SetNext(*args, **kwargs)
 

-
-class XmlPropertyPtr(XmlProperty):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = XmlProperty
-_xrc.XmlProperty_swigregister(XmlPropertyPtr)
+_xrc.XmlProperty_swigregister(XmlProperty)

 
 class XmlNode(object):
     """Proxy of C++ XmlNode class"""
 
 class XmlNode(object):
     """Proxy of C++ XmlNode class"""

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxXmlNode instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """
         __init__(self, XmlNode parent=None, int type=0, String name=EmptyString, 
             String content=EmptyString, XmlProperty props=None, 
             XmlNode next=None) -> XmlNode
         """
         """
         __init__(self, XmlNode parent=None, int type=0, String name=EmptyString, 
             String content=EmptyString, XmlProperty props=None, 
             XmlNode next=None) -> XmlNode
         """

-        newobj = _xrc.new_XmlNode(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_xrc.delete_XmlNode):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _xrc.XmlNode_swiginit(self,_xrc.new_XmlNode(*args, **kwargs))
+    __swig_destroy__ = _xrc.delete_XmlNode
+    __del__ = lambda self : None;

     def AddChild(*args, **kwargs):
         """AddChild(self, XmlNode child)"""
         return _xrc.XmlNode_AddChild(*args, **kwargs)
     def AddChild(*args, **kwargs):
         """AddChild(self, XmlNode child)"""
         return _xrc.XmlNode_AddChild(*args, **kwargs)


@@ -438,36 +418,22 @@ class XmlNode(object):
         """SetProperties(self, XmlProperty prop)"""
         return _xrc.XmlNode_SetProperties(*args, **kwargs)
 
         """SetProperties(self, XmlProperty prop)"""
         return _xrc.XmlNode_SetProperties(*args, **kwargs)
 

-
-class XmlNodePtr(XmlNode):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = XmlNode
-_xrc.XmlNode_swigregister(XmlNodePtr)
+_xrc.XmlNode_swigregister(XmlNode)

 
 def XmlNodeEasy(*args, **kwargs):
     """XmlNodeEasy(int type, String name, String content=EmptyString) -> XmlNode"""
     val = _xrc.new_XmlNodeEasy(*args, **kwargs)
 
 def XmlNodeEasy(*args, **kwargs):
     """XmlNodeEasy(int type, String name, String content=EmptyString) -> XmlNode"""
     val = _xrc.new_XmlNodeEasy(*args, **kwargs)

-    val.thisown = 1

     return val
 
 class XmlDocument(_core.Object):
     """Proxy of C++ XmlDocument class"""
     return val
 
 class XmlDocument(_core.Object):
     """Proxy of C++ XmlDocument class"""

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxXmlDocument instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self, String filename, String encoding=UTF8String) -> XmlDocument"""
         """__init__(self, String filename, String encoding=UTF8String) -> XmlDocument"""

-        newobj = _xrc.new_XmlDocument(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_xrc.delete_XmlDocument):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _xrc.XmlDocument_swiginit(self,_xrc.new_XmlDocument(*args, **kwargs))
+    __swig_destroy__ = _xrc.delete_XmlDocument
+    __del__ = lambda self : None;

     def Load(*args, **kwargs):
         """Load(self, String filename, String encoding=UTF8String) -> bool"""
         return _xrc.XmlDocument_Load(*args, **kwargs)
     def Load(*args, **kwargs):
         """Load(self, String filename, String encoding=UTF8String) -> bool"""
         return _xrc.XmlDocument_Load(*args, **kwargs)


@@ -512,38 +478,27 @@ class XmlDocument(_core.Object):
         """SetFileEncoding(self, String encoding)"""
         return _xrc.XmlDocument_SetFileEncoding(*args, **kwargs)
 
         """SetFileEncoding(self, String encoding)"""
         return _xrc.XmlDocument_SetFileEncoding(*args, **kwargs)
 

-
-class XmlDocumentPtr(XmlDocument):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = XmlDocument
-_xrc.XmlDocument_swigregister(XmlDocumentPtr)
+_xrc.XmlDocument_swigregister(XmlDocument)

 
 def XmlDocumentFromStream(*args, **kwargs):
     """XmlDocumentFromStream(InputStream stream, String encoding=UTF8String) -> XmlDocument"""
     val = _xrc.new_XmlDocumentFromStream(*args, **kwargs)
 
 def XmlDocumentFromStream(*args, **kwargs):
     """XmlDocumentFromStream(InputStream stream, String encoding=UTF8String) -> XmlDocument"""
     val = _xrc.new_XmlDocumentFromStream(*args, **kwargs)

-    val.thisown = 1

     return val
 
 def EmptyXmlDocument(*args, **kwargs):
     """EmptyXmlDocument() -> XmlDocument"""
     val = _xrc.new_EmptyXmlDocument(*args, **kwargs)
     return val
 
 def EmptyXmlDocument(*args, **kwargs):
     """EmptyXmlDocument() -> XmlDocument"""
     val = _xrc.new_EmptyXmlDocument(*args, **kwargs)

-    val.thisown = 1

     return val
 
 #---------------------------------------------------------------------------
 
 class XmlResourceHandler(_core.Object):
     """Proxy of C++ XmlResourceHandler class"""
     return val
 
 #---------------------------------------------------------------------------
 
 class XmlResourceHandler(_core.Object):
     """Proxy of C++ XmlResourceHandler class"""

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyXmlResourceHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self) -> XmlResourceHandler"""
         """__init__(self) -> XmlResourceHandler"""

-        newobj = _xrc.new_XmlResourceHandler(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _xrc.XmlResourceHandler_swiginit(self,_xrc.new_XmlResourceHandler(*args, **kwargs))

         self._setCallbackInfo(self, XmlResourceHandler)
 
     def _setCallbackInfo(*args, **kwargs):
         self._setCallbackInfo(self, XmlResourceHandler)
 
     def _setCallbackInfo(*args, **kwargs):


@@ -688,13 +643,7 @@ class XmlResourceHandler(_core.Object):
         """GetCurFileSystem(self) -> FileSystem"""
         return _xrc.XmlResourceHandler_GetCurFileSystem(*args, **kwargs)
 
         """GetCurFileSystem(self) -> FileSystem"""
         return _xrc.XmlResourceHandler_GetCurFileSystem(*args, **kwargs)
 

-
-class XmlResourceHandlerPtr(XmlResourceHandler):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = XmlResourceHandler
-_xrc.XmlResourceHandler_swigregister(XmlResourceHandlerPtr)
+_xrc.XmlResourceHandler_swigregister(XmlResourceHandler)

 
 #----------------------------------------------------------------------------
 # The global was removed  in favor of static accessor functions.  This is for
 
 #----------------------------------------------------------------------------
 # The global was removed  in favor of static accessor functions.  This is for


@@ -734,3 +683,4 @@ XmlResource_AddSubclassFactory(XmlSubclassFactory_Python())
 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------
 
 

+