got rid of wxXmlResourceHandler::CheckPlatform, the check is now done while loading xml file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -128,6 +128,10 @@ class WXDLLEXPORT wxXmlResource : public wxObject
|
|||||||
// Creates resource from info in given node:
|
// Creates resource from info in given node:
|
||||||
wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL);
|
wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL);
|
||||||
|
|
||||||
|
// Remove nodes with property "platform" that does not
|
||||||
|
// match current platform
|
||||||
|
void ProcessPlatformProperty(wxXmlNode *node);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
wxList m_Handlers;
|
wxList m_Handlers;
|
||||||
wxXmlResourceDataRecords m_Data;
|
wxXmlResourceDataRecords m_Data;
|
||||||
@@ -190,10 +194,6 @@ class WXDLLEXPORT wxXmlResourceHandler : public wxObject
|
|||||||
// resource from it, FALSE otherwise.
|
// resource from it, FALSE otherwise.
|
||||||
virtual bool CanHandle(wxXmlNode *node) = 0;
|
virtual bool CanHandle(wxXmlNode *node) = 0;
|
||||||
|
|
||||||
// Check "platform" property if it matches this platform
|
|
||||||
// that is, if this node 'exists' under this platform
|
|
||||||
static bool CheckPlatform(wxXmlNode *node);
|
|
||||||
|
|
||||||
void SetParentResource(wxXmlResource *res) { m_Resource = res; }
|
void SetParentResource(wxXmlResource *res) { m_Resource = res; }
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user