corrected version number extraction

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

diff --git a/contrib/utils/wxrcedit/edapp.cpp b/contrib/utils/wxrcedit/edapp.cpp
index e06b5bf15da25aaf5156f9eaeafb7d961e29d203..dc2edda79cfc4e6f84483f424ebd1fc7553c2d13 100644 (file)
--- a/contrib/utils/wxrcedit/edapp.cpp
+++ b/contrib/utils/wxrcedit/edapp.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation
     #pragma interface
 #endif
@@ -20,12 +20,12 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
 
-#include "wx/xrc/xml.h"
+#include "wx/xml/xml.h"
 #include "wx/image.h"
 #include "wx/wx.h"
 
@@ -47,13 +47,15 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
-    wxString arg = (argc >= 1) ? argv[1] : "";
+    SetVendorName(wxT("wxWidgets"));
+    SetAppName(wxT("wxrcedit"));
+    wxString arg = (argc >= 1) ? argv[1] : _T("");
     wxInitAllImageHandlers();
     wxFrame *frame = new EditorFrame(NULL, arg);
     SetTopWindow(frame);
-    frame->Show(TRUE);
-    PreviewFrame::Get()->Show(TRUE);
-    PropertiesFrame::Get()->Show(TRUE);
-    return TRUE;
+    frame->Show(true);
+    PreviewFrame::Get()->Show(true);
+    PropertiesFrame::Get()->Show(true);
+    return true;
 }