X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f65a69e9a01cfa41129cd7ba12d92b00f6c6aa1d..3527f29c8769e09d796c547c0c309f8b86407012:/contrib/utils/wxrc/wxrc.cpp?ds=inline diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp index efac3d2f93..79362762e1 100644 --- a/contrib/utils/wxrc/wxrc.cpp +++ b/contrib/utils/wxrc/wxrc.cpp @@ -20,10 +20,10 @@ #pragma hdrstop #endif -// for all others, include the necessary headers (this file is usually all you -// need because it includes almost all "standard" wxWindows headers +// for all others, include the necessary headers #ifndef WX_PRECOMP - #include "wx/wx.h" + #include "wx/app.h" + #include "wx/log.h" #endif #include "wx/cmdline.h" @@ -36,6 +36,8 @@ class XmlResApp : public wxAppConsole { public: + // don't use builtin cmd line parsing: + virtual bool OnInit() { return true; } virtual int OnRun(); @@ -62,7 +64,7 @@ private: int retCode; }; -IMPLEMENT_APP(XmlResApp) +IMPLEMENT_APP_CONSOLE(XmlResApp) int XmlResApp::OnRun() { @@ -92,7 +94,10 @@ int XmlResApp::OnRun() { case -1: return 0; + #if 0 + // break is unreachable because of return earlier break; + #endif case 0: retCode = 0; @@ -102,12 +107,19 @@ int XmlResApp::OnRun() else CompileRes(); return retCode; + #if 0 + // break is unreachable because of return earlier break; + #endif + #if 0 + // default return moved outside of switch to avoid warning about lack of return in function default: return 1; break; + #endif } + return 1; }