X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab7ce33c563651f790f99d64ee56727706047ae3..e395058687cca1ee355492bc8390a534fcbff069:/contrib/utils/wxrcedit/nodehnd.h

diff --git a/contrib/utils/wxrcedit/nodehnd.h b/contrib/utils/wxrcedit/nodehnd.h
index 869c324fc4..81d060ade1 100644
--- a/contrib/utils/wxrcedit/nodehnd.h
+++ b/contrib/utils/wxrcedit/nodehnd.h
@@ -22,9 +22,9 @@ class WXDLLEXPORT wxListCtrl;
 class EditorFrame;
 
 #include "wx/treectrl.h"
-#include "wx/xrc/xml.h"
+#include "wx/xml/xml.h"
 #include "nodesdb.h"
-
+#include "wx/arrstr.h"
 
 
 
@@ -32,10 +32,10 @@ class NodeHandler : public wxObject
 {
     public:
         static NodeHandler *Find(wxXmlNode *node);
-    
+
         NodeHandler(NodeInfo *ni);
         virtual ~NodeHandler();
-        
+
         virtual bool CanHandle(wxXmlNode *node);
         virtual wxTreeItemId CreateTreeNode(wxTreeCtrl *treectrl, wxTreeItemId parent,
                                     wxXmlNode *node);
@@ -45,12 +45,12 @@ class NodeHandler : public wxObject
         wxArrayString& GetChildTypes();
         virtual void InsertNode(wxXmlNode *parent, wxXmlNode *node, wxXmlNode *insert_before = NULL);
         virtual wxXmlNode *GetRealNode(wxXmlNode *node) { return node; }
-        
+
     protected:
 
         NodeInfo *m_NodeInfo;
         wxArrayString m_ChildTypes;
-        
+
         static wxList ms_Handlers;
         static bool ms_HandlersLoaded;
 };
@@ -60,7 +60,7 @@ class NodeHandlerPanel : public NodeHandler
 {
     public:
         NodeHandlerPanel(NodeInfo *ni) : NodeHandler(ni) {}
-        
+
         virtual wxTreeItemId CreateTreeNode(wxTreeCtrl *treectrl, wxTreeItemId parent,
                                     wxXmlNode *node);
         virtual void InsertNode(wxXmlNode *parent, wxXmlNode *node, wxXmlNode *insert_before = NULL);
@@ -72,7 +72,7 @@ class NodeHandlerSizer : public NodeHandlerPanel
 {
     public:
         NodeHandlerSizer(NodeInfo *ni) : NodeHandlerPanel(ni) {}
-        
+
         virtual void InsertNode(wxXmlNode *parent, wxXmlNode *node, wxXmlNode *insert_before = NULL);
         virtual int GetTreeIcon(wxXmlNode *node);
 };
@@ -102,7 +102,7 @@ class NodeHandlerNotebook : public NodeHandlerPanel
 {
     public:
         NodeHandlerNotebook(NodeInfo *ni) : NodeHandlerPanel(ni) {}
-        
+
         virtual void InsertNode(wxXmlNode *parent, wxXmlNode *node, wxXmlNode *insert_before = NULL);
 };
 
@@ -111,7 +111,7 @@ class NodeHandlerNotebook : public NodeHandlerPanel
 class NodeHandlerNotebookPage : public NodeHandlerSizerItem
 {
     public:
-        NodeHandlerNotebookPage(NodeInfo *ni) : 
+        NodeHandlerNotebookPage(NodeInfo *ni) :
                                         NodeHandlerSizerItem(ni) {}
 };
 
@@ -122,9 +122,9 @@ class NodeHandlerUnknown : public NodeHandler
 {
     public:
         NodeHandlerUnknown() : NodeHandler(new NodeInfo) {}
-        
-        virtual bool CanHandle(wxXmlNode *node) { return TRUE; }
+
+        virtual bool CanHandle(wxXmlNode *WXUNUSED(node)) { return true; }
 };
 
 
-#endif 
+#endif