make wxArtProvider pure virtual (I was not so on

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

diff --git a/wxPython/contrib/xrc/xrc.py b/wxPython/contrib/xrc/xrc.py
index ada0084f5b167fe30e3f7ecb2e0dd1e8578ebd56..73e37ee13d1b1ba891a2834ecc5580721f71bcec 100644 (file)
--- a/wxPython/contrib/xrc/xrc.py
+++ b/wxPython/contrib/xrc/xrc.py
@@ -9,12 +9,16 @@ from windows import *
 
 from gdi import *
 
+from fonts import *
+
 from clip_dnd import *
 
 from events import *
 
 from streams import *
 
+from utils import *
+
 from mdi import *
 
 from frames import *
@@ -39,14 +43,14 @@ from sizers import *
 
 from filesys import *
 
-from utils import *
+def XRCID(str_id):
+    return wxXmlResource_GetXRCID(str_id)
 
-def XMLID(str_id):
-    return wxXmlResource_GetXMLID(str_id)
-
-def XMLCTRL(window, str_id, *args):
-    return window.FindWindowById(XMLID(str_id))
+def XRCCTRL(window, str_id, *ignoreargs):
+    return window.FindWindowById(XRCID(str_id))
 
+XMLID = XRCID
+XMLCTRL = XRCCTRL
 
 class wxXmlResourcePtr(wxObjectPtr):
     def __init__(self,this):
@@ -129,11 +133,29 @@ def wxXmlResource(*_args,**_kwargs):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
-wxXmlResource_GetXMLID = xrcc.wxXmlResource_GetXMLID
+wxXmlResource_GetXRCID = xrcc.wxXmlResource_GetXRCID
+
+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 ------------------
 
-cvar = xrcc.cvar
-wxTheXmlResource = wxXmlResourcePtr(xrcc.cvar.wxTheXmlResource)
+wxXRC_USE_LOCALE = xrcc.wxXRC_USE_LOCALE
+wxXRC_NO_SUBCLASSING = xrcc.wxXRC_NO_SUBCLASSING
+
+
+#-------------- USER INCLUDE -----------------------
+
+
+# The global was removed  in favor of static accessor functions.  This is for
+# backwards compatibility:
+wxTheXmlResource = wxXmlResource_Get()