ProcessPlatformProperty should not be a member of wxXmlResource

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/xrc/xmlres.h b/contrib/include/wx/xrc/xmlres.h
index 143664514bf5572272fda67e6a5a77737fd48448..01832ae8cd8f144260b9e314a7c0a30b846c2688 100644 (file)
--- a/contrib/include/wx/xrc/xmlres.h
+++ b/contrib/include/wx/xrc/xmlres.h
@@ -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:

diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp
index 79d0ef314af365f89cbaca41a40e3db9756708a4..c5f7a8c8ed6fb771fcef1ca12d902ad66349c401 100644 (file)
--- a/contrib/src/xrc/xmlres.cpp
+++ b/contrib/src/xrc/xmlres.cpp
@@ -210,7 +210,7 @@ bool wxXmlResource::AttachUnknownControl(const wxString& name,
 }
 
 
-void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node)
+static void ProcessPlatformProperty(wxXmlNode *node)
 {
     wxString s;
     bool isok;

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index 143664514bf5572272fda67e6a5a77737fd48448..01832ae8cd8f144260b9e314a7c0a30b846c2688 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -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:

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 79d0ef314af365f89cbaca41a40e3db9756708a4..c5f7a8c8ed6fb771fcef1ca12d902ad66349c401 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -210,7 +210,7 @@ bool wxXmlResource::AttachUnknownControl(const wxString& name,
 }
 
 
-void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node)
+static void ProcessPlatformProperty(wxXmlNode *node)
 {
     wxString s;
     bool isok;