X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/999d9a9f795cfc745681989ae0f30e531cde059f..dcb39c53303d1ec6884f7bcd7bc9dc101e560e62:/contrib/utils/wxrcedit/edapp.cpp diff --git a/contrib/utils/wxrcedit/edapp.cpp b/contrib/utils/wxrcedit/edapp.cpp index e06b5bf15d..dc2edda79c 100644 --- 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; }