Various fixes to contrib bakefiles. Regenerated corresponding

[wxWidgets.git] / contrib / utils / wxrcedit / editor.cpp

diff --git a/contrib/utils/wxrcedit/editor.cpp b/contrib/utils/wxrcedit/editor.cpp
index d24f9b932a41c1e3a808f3a5e0cb8a7358cf6dc2..a77da8d858e5f8c8f797319c32c609d31c424c83 100644 (file)
--- a/contrib/utils/wxrcedit/editor.cpp
+++ b/contrib/utils/wxrcedit/editor.cpp
@@ -19,7 +19,7 @@
 #endif
 
 #include "wx/wx.h"
-#include "wx/xrc/xml.h"
+#include "wx/xml/xml.h"
 #include "wx/xrc/xmlres.h"
 #include "wx/splitter.h"
 #include "wx/config.h"
@@ -396,7 +396,7 @@ void EditorFrame::RefreshTree()
 static void RecursivelyExpand(wxTreeCtrl *t, wxTreeItemId item)
 {
     t->Expand(item);
-    long cookie;
+    void* cookie;
     wxTreeItemId id = t->GetFirstChild(item, cookie);
     while (id.IsOk())
     {
@@ -416,7 +416,7 @@ bool EditorFrame::SelectNode(wxXmlNode *node, wxTreeItemId *root)
     wxTreeItemId item;
     XmlTreeData *dt;
     wxXmlNode *nd;
-    long cookie;
+    void* cookie;
     
     item = m_TreeCtrl->GetFirstChild(*root, cookie);
     while (item.IsOk())