bugfixes, bugfixes, bugfixes...

[wxWidgets.git] / include / wx / xrc / xmlres.h

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index 61247013fa5d60f1321d78025e531668b0a52896..143664514bf5572272fda67e6a5a77737fd48448 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -154,7 +154,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 GetXMLID(const wxChar *str_id);

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


@@ -198,7 +198,7 @@ private:
 
 
 // Global instance of resource class. For your convenience.
 
 
 // Global instance of resource class. For your convenience.

-extern wxXmlResource *wxTheXmlResource;
+extern WXXMLDLLEXPORT wxXmlResource *wxTheXmlResource;

 
 // This macro translates string identifier (as used in XML resource,
 // e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by
 
 // This macro translates string identifier (as used in XML resource,
 // e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by