Fixed compilation error.

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

diff --git a/wxPython/contrib/xrc/xrc.i b/wxPython/contrib/xrc/xrc.i
index 9b626d09660b404f3425115b9f74b3d08138ae19..dbf81e43ec8502ea97f43093535e13bb685ed342 100644 (file)
--- a/wxPython/contrib/xrc/xrc.i
+++ b/wxPython/contrib/xrc/xrc.i
@@ -122,7 +122,7 @@ public:
     // Returns numeric ID that is equivalent to string id used in XML
     // resource. To be used in event tables
     // Macro XMLID is provided for convenience
     // Returns numeric ID that is equivalent to string id used in XML
     // resource. To be used in event tables
     // Macro XMLID is provided for convenience

-    static int GetXMLID(const char *str_id);
+    static int GetXRCID(const char *str_id);

 
     // Returns version info (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a)
     long GetVersion() const;
 
     // Returns version info (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a)
     long GetVersion() const;


@@ -131,29 +131,30 @@ public:
     // is less than the argument, +1 if greater and 0 if they equal.
     int CompareVersion(int major, int minor, int release, int revision) const;
 
     // is less than the argument, +1 if greater and 0 if they equal.
     int CompareVersion(int major, int minor, int release, int revision) const;
 

-};

 
 

-//----------------------------------------------------------------------
+    // Gets global resources object or create one if none exists
+    static wxXmlResource *Get();
+    // Sets global resources object and returns pointer to previous one (may be NULL).
+    static wxXmlResource *Set(wxXmlResource *res);

 
 

-%readonly
-// Global instance of resource class. For your convenience.
-wxXmlResource *wxTheXmlResource;
-%readwrite
+};

 
 //----------------------------------------------------------------------
 
 %pragma(python) code = "
 
 //----------------------------------------------------------------------
 
 %pragma(python) code = "

-def XMLID(str_id):
-    return wxXmlResource_GetXMLID(str_id)
+def XRCID(str_id):
+    return wxXmlResource_GetXRCID(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

 "
 
 //----------------------------------------------------------------------
 
 "
 
 //----------------------------------------------------------------------
 

-// TODO:  Add wxXmlResourceHandler and etc.
+// TODO:  Add wxXmlResourceHandler and allow it to be derived from.

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -162,10 +163,15 @@ def XMLCTRL(window, str_id, *args):
     wxClassInfo::CleanUpClasses();
     wxClassInfo::InitializeClasses();
 
     wxClassInfo::CleanUpClasses();
     wxClassInfo::InitializeClasses();
 

-    wxXmlInitXmlModule();

     wxXmlInitResourceModule();
     wxXmlInitResourceModule();

-    wxTheXmlResource->InitAllHandlers();
+    wxXmlResource::Get()->InitAllHandlers();

 
 %}
 
 
 %}
 

-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------
+// This file gets appended to the shadow class file.
+//----------------------------------------------------------------------
+
+%pragma(python) include="_xrcextras.py";
+
+