X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/999d9a9f795cfc745681989ae0f30e531cde059f..72594e90b2da8c167ba63b89b2c168c57a19cab4:/include/wx/xrc/xmlres.h diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index 61247013fa..7843e4f161 100644 --- 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 - 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; } @@ -176,10 +176,6 @@ protected: // Creates resource from info in given node: wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL); - // Remove nodes with property "platform" that does not - // match current platform - void ProcessPlatformProperty(wxXmlNode *node); - bool GetUseLocale() { return m_useLocale; } private: @@ -198,7 +194,7 @@ private: // 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. ...) to integer id that is needed by @@ -347,7 +343,9 @@ protected: { return m_resource->CreateResFromNode(node, parent, instance); } // helper +#if wxUSE_FILESYSTEM wxFileSystem& GetCurFileSystem() { return m_resource->GetCurFileSystem(); } +#endif }; #define ADD_STYLE(style) AddStyle(wxT(#style), style)