Works a little better when you remember to say "virtual"

[wxWidgets.git] / include / wx / app.h

diff --git a/include/wx/app.h b/include/wx/app.h
index 3698f65a09e5219691a405ab488c27ef17a9deea..edd3eef48865a0ff307693c7e9911a9ec1777490 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -257,12 +257,18 @@ public:
                           const wxChar *cond,
                           const wxChar *msg);
 #endif // __WXDEBUG__
-    
+
     // check that the wxBuildOptions object (constructed in the application
     // itself, usually the one from IMPLEMENT_APP() macro) matches the build
     // options of the library and abort if it doesn't
     static bool CheckBuildOptions(const char *optionsSignature,
                                   const char *componentName);
+#if WXWIN_COMPATIBILITY_2_4
+    static bool CheckBuildOptions(const wxBuildOptions& buildOptions)
+    {
+        return CheckBuildOptions(buildOptions.m_signature, "your program");
+    }
+#endif
 
     // implementation only from now on
     // -------------------------------
@@ -465,9 +471,10 @@ public:
     // command line parsing (GUI-specific)
     // ------------------------------------------------------------------------
 
+#if wxUSE_CMDLINE_PARSER
     virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
     virtual void OnInitCmdLine(wxCmdLineParser& parser);
-
+#endif
 
     // miscellaneous other stuff
     // ------------------------------------------------------------------------
@@ -590,18 +597,27 @@ public:
 // be in your main program (e.g. hello.cpp). Now IMPLEMENT_APP should add this
 // code if required.
 
+#define IMPLEMENT_WXWIN_MAIN_CONSOLE \
+        int main(int argc, char **argv) { return wxEntry(argc, argv); }
+
 #if !wxUSE_GUI || !defined(__WXMSW__)
     #define IMPLEMENT_WXWIN_MAIN                                              \
-        int main(int argc, char **argv) { return wxEntry(argc, argv); }
-#elif defined(__WXMSW__) && defined(WXUSINGDLL)
+        IMPLEMENT_WXWIN_MAIN_CONSOLE
+#elif defined(__WXMSW__)
     // we need HINSTANCE declaration to define WinMain()
     #include "wx/msw/wrapwin.h"
 
+    #ifdef SW_SHOWNORMAL
+    #define wxSW_SHOWNORMAL SW_SHOWNORMAL
+    #else
+    #define wxSW_SHOWNORMAL 0
+    #endif
+
     #define IMPLEMENT_WXWIN_MAIN \
         extern int wxEntry(HINSTANCE hInstance,                               \
                            HINSTANCE hPrevInstance = NULL,                    \
                            char *pCmdLine = NULL,                             \
-                           int nCmdShow = SW_NORMAL);                         \
+                           int nCmdShow = wxSW_SHOWNORMAL);                         \
         extern "C" int WINAPI WinMain(HINSTANCE hInstance,                    \
                                       HINSTANCE hPrevInstance,                \
                                       char *lpCmdLine,                        \
@@ -648,6 +664,11 @@ public:
     IMPLEMENT_APP_NO_THEMES(appname)        \
     IMPLEMENT_WX_THEME_SUPPORT
 
+// Same as IMPLEMENT_APP(), but for console applications.
+#define IMPLEMENT_APP_CONSOLE(appname)      \
+    IMPLEMENT_APP_NO_MAIN(appname)          \
+    IMPLEMENT_WXWIN_MAIN_CONSOLE
+
 // this macro can be used multiple times and just allows you to use wxGetApp()
 // function
 #define DECLARE_APP(appname) extern appname& wxGetApp();