fixed the bug with the order of 2 size events when the scrollbar[s] (dis)appear in...

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

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index 143664514bf5572272fda67e6a5a77737fd48448..7843e4f1611642d0f595c4b325165456354e4bfc 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);
 
     // 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:
     bool GetUseLocale() { return m_useLocale; }
 
 private:


@@ -347,7 +343,9 @@ protected:
         { return m_resource->CreateResFromNode(node, parent, instance); }
 
     // helper
         { return m_resource->CreateResFromNode(node, parent, instance); }
 
     // helper

+#if wxUSE_FILESYSTEM

     wxFileSystem& GetCurFileSystem() { return m_resource->GetCurFileSystem(); }
     wxFileSystem& GetCurFileSystem() { return m_resource->GetCurFileSystem(); }

+#endif

 };
 
 #define ADD_STYLE(style) AddStyle(wxT(#style), style)
 };
 
 #define ADD_STYLE(style) AddStyle(wxT(#style), style)