fix for bug in wxEditableListBox in connection with new wxListCtrl

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

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index f36768d150afa42b8e7fd9d34bac03c64c2095a0..5741a87450cd0a8a039a2082862bbb5a10285e0c 100644 (file)
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -27,8 +27,8 @@
 #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"
 
@@ -98,6 +98,12 @@ int XmlResApp::OnRun()
         { wxCMD_LINE_NONE }
     };
 
+#if wxUSE_GUI
+    // VS: I need reasonable output to console from wxCmdLineParser
+    wxLog::SetTimestamp(NULL);
+    delete wxLog::SetActiveTarget(new wxLogStderr);
+#endif
+
     wxXmlDocument::AddHandler(new wxXmlIOHandlerBinZ);
 
     wxCmdLineParser parser(cmdLineDesc, argc, argv);
@@ -352,8 +358,8 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist)
 \
 #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++)