added length argument to wxString::wxString(wchar_t*), just like in case of wxChar...

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

diff --git a/wxPython/contrib/xrc/xrc.py b/wxPython/contrib/xrc/xrc.py
index 7338628c21a5bc3124400154c06312cf2a44e2d5..aa703e2e0c1b5b156729e0b9ad7d6e4ebce3ce77 100644 (file)
--- a/wxPython/contrib/xrc/xrc.py
+++ b/wxPython/contrib/xrc/xrc.py
@@ -131,11 +131,27 @@ def wxXmlResource(*_args,**_kwargs):
 
 wxXmlResource_GetXMLID = xrcc.wxXmlResource_GetXMLID
 
+def wxXmlResource_Get(*_args, **_kwargs):
+    val = apply(xrcc.wxXmlResource_Get,_args,_kwargs)
+    if val: val = wxXmlResourcePtr(val)
+    return val
+
+def wxXmlResource_Set(*_args, **_kwargs):
+    val = apply(xrcc.wxXmlResource_Set,_args,_kwargs)
+    if val: val = wxXmlResourcePtr(val)
+    return val
+
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 wxXRC_USE_LOCALE = xrcc.wxXRC_USE_LOCALE
 wxXRC_NO_SUBCLASSING = xrcc.wxXRC_NO_SUBCLASSING
-cvar = xrcc.cvar
-wxTheXmlResource = wxXmlResourcePtr(xrcc.cvar.wxTheXmlResource)
+
+
+#-------------- USER INCLUDE -----------------------
+
+
+# The global was removed  in favor of static accessor functions.  This is for
+# backwards compatibility:
+wxTheXmlResource = wxXmlResource_Get()