Added generic LoadObject methods that can load any classtype from a

[wxWidgets.git] / wxPython / contrib / xrc / xrc.py

diff --git a/wxPython/contrib/xrc/xrc.py b/wxPython/contrib/xrc/xrc.py
index 73e37ee13d1b1ba891a2834ecc5580721f71bcec..2837e83749f3f76428d5a6da0214aa1bea1267d1 100644 (file)
--- a/wxPython/contrib/xrc/xrc.py
+++ b/wxPython/contrib/xrc/xrc.py
@@ -62,6 +62,9 @@ class wxXmlResourcePtr(wxObjectPtr):
     def Load(self, *_args, **_kwargs):
         val = apply(xrcc.wxXmlResource_Load,(self,) + _args, _kwargs)
         return val
     def Load(self, *_args, **_kwargs):
         val = apply(xrcc.wxXmlResource_Load,(self,) + _args, _kwargs)
         return val

+    def LoadFromString(self, *_args, **_kwargs):
+        val = apply(xrcc.wxXmlResource_LoadFromString,(self,) + _args, _kwargs)
+        return val

     def InitAllHandlers(self, *_args, **_kwargs):
         val = apply(xrcc.wxXmlResource_InitAllHandlers,(self,) + _args, _kwargs)
         return val
     def InitAllHandlers(self, *_args, **_kwargs):
         val = apply(xrcc.wxXmlResource_InitAllHandlers,(self,) + _args, _kwargs)
         return val


@@ -77,6 +80,9 @@ class wxXmlResourcePtr(wxObjectPtr):
     def LoadMenuBar(self, *_args, **_kwargs):
         val = apply(xrcc.wxXmlResource_LoadMenuBar,(self,) + _args, _kwargs)
         return val
     def LoadMenuBar(self, *_args, **_kwargs):
         val = apply(xrcc.wxXmlResource_LoadMenuBar,(self,) + _args, _kwargs)
         return val

+    def LoadMenuBarOnFrame(self, *_args, **_kwargs):
+        val = apply(xrcc.wxXmlResource_LoadMenuBarOnFrame,(self,) + _args, _kwargs)
+        return val

     def LoadToolBar(self, *_args, **_kwargs):
         val = apply(xrcc.wxXmlResource_LoadToolBar,(self,) + _args, _kwargs)
         return val
     def LoadToolBar(self, *_args, **_kwargs):
         val = apply(xrcc.wxXmlResource_LoadToolBar,(self,) + _args, _kwargs)
         return val


@@ -118,14 +124,16 @@ class wxXmlResourcePtr(wxObjectPtr):
         return "<C wxXmlResource instance at %s>" % (self.this,)
 class wxXmlResource(wxXmlResourcePtr):
     def __init__(self,*_args,**_kwargs):
         return "<C wxXmlResource instance at %s>" % (self.this,)
 class wxXmlResource(wxXmlResourcePtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(xrcc.new_wxXmlResourceEmpty,_args,_kwargs)
+        self.this = apply(xrcc.new_wxXmlResource,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

+        self.InitAllHandlers()

 
 
 
 
 
 

-def wxXmlResource(*_args,**_kwargs):
-    val = wxXmlResourcePtr(apply(xrcc.new_wxXmlResource,_args,_kwargs))
+def wxEmptyXmlResource(*_args,**_kwargs):
+    val = wxXmlResourcePtr(apply(xrcc.new_wxEmptyXmlResource,_args,_kwargs))

     val.thisown = 1
     val.thisown = 1

+    val.InitAllHandlers()

     return val
 
 
     return val