Fixed compile errors, warnings and other DSMs, and improved comments.

[wxWidgets.git] / utils / wxrc / wxrc.cpp

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index 79d7540fc356ef193df2e640600b014cf7cd8dc8..5741a87450cd0a8a039a2082862bbb5a10285e0c 100644 (file)
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -27,8 +27,8 @@
 #endif
 
 #include "wx/cmdline.h"
 #endif
 
 #include "wx/cmdline.h"

-#include "wx/xml/xml.h"
-#include "wx/xml/xmlio.h"
+#include "wx/xrc/xml.h"
+#include "wx/xrc/xmlio.h"

 #include "wx/ffile.h"
 #include "wx/wfstream.h"
 
 #include "wx/ffile.h"
 #include "wx/wfstream.h"
 


@@ -358,8 +358,8 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist)
 \
 #include \"wx/filesys.h\"\n\
 #include \"wx/fs_mem.h\"\n\
 \
 #include \"wx/filesys.h\"\n\
 #include \"wx/fs_mem.h\"\n\

-#include \"wx/xml/xmlres.h\"\n\
-#include \"wx/xml/xh_all.h\"\n\
+#include \"wx/xrc/xmlres.h\"\n\
+#include \"wx/xrc/xh_all.h\"\n\

 \n");
 
     for (i = 0; i < flist.Count(); i++)
 \n");
 
     for (i = 0; i < flist.Count(); i++)