metadata support for metadata

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

diff --git a/include/wx/app.h b/include/wx/app.h
index c95c47751cea6aba2aebfca8e3e242be4e7e544c..b3b00cb981caa55d0ad13cd8dd5cd20f74d7fb34 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -170,11 +170,13 @@ public:
 
 #if wxUSE_CMDLINE_PARSER
     // this one is called from OnInit() to add all supported options
-    // to the given parser
+    // to the given parser (don't forget to call the base class version if you
+    // override it!)
     virtual void OnInitCmdLine(wxCmdLineParser& parser);
 
     // called after successfully parsing the command line, return TRUE
-    // to continue and FALSE to exit
+    // to continue and FALSE to exit (don't forget to call the base class
+    // version if you override it!)
     virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
 
     // called if "--help" option was specified, return TRUE to continue
@@ -255,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 wxBuildOptions& buildOptions);
-
+    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
     // -------------------------------
@@ -346,6 +354,9 @@ public:
         // Override: rarely in GUI applications, always in console ones.
     virtual int OnRun();
 
+        // a matching function for OnInit()
+    virtual int OnExit();
+
         // very last clean up function
         //
         // Override: very rarely
@@ -457,6 +468,13 @@ public:
     int GetPrintMode() const { return wxPRINT_POSTSCRIPT; }
 
 
+    // command line parsing (GUI-specific)
+    // ------------------------------------------------------------------------
+
+    virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
+    virtual void OnInitCmdLine(wxCmdLineParser& parser);
+
+
     // miscellaneous other stuff
     // ------------------------------------------------------------------------
 
@@ -581,10 +599,9 @@ public:
 #if !wxUSE_GUI || !defined(__WXMSW__)
     #define IMPLEMENT_WXWIN_MAIN                                              \
         int main(int argc, char **argv) { return wxEntry(argc, argv); }
-#elif defined(__WXMSW__) && defined(WXUSINGDLL)
+#elif defined(__WXMSW__)
     // we need HINSTANCE declaration to define WinMain()
-    #include <windows.h>
-    #include "wx/msw/winundef.h"
+    #include "wx/msw/wrapwin.h"
 
     #define IMPLEMENT_WXWIN_MAIN \
         extern int wxEntry(HINSTANCE hInstance,                               \
@@ -617,7 +634,8 @@ public:
 #define IMPLEMENT_APP_NO_MAIN(appname)                                      \
     wxAppConsole *wxCreateApp()                                             \
     {                                                                       \
-        wxAppConsole::CheckBuildOptions(wxBuildOptions());                  \
+        wxAppConsole::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE,         \
+                                        "your program");                    \
         return new appname;                                                 \
     }                                                                       \
     wxAppInitializer                                                        \