metadata support for metadata

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 755a3f25e9a3979e2dfb201c4720cb916b2b1f0d..b3b00cb981caa55d0ad13cd8dd5cd20f74d7fb34 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__
                           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
     // 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
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------


@@ -593,7 +599,7 @@ public:
 #if !wxUSE_GUI || !defined(__WXMSW__)
     #define IMPLEMENT_WXWIN_MAIN                                              \
         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)
+#elif defined(__WXMSW__)

     // we need HINSTANCE declaration to define WinMain()
     #include "wx/msw/wrapwin.h"
 
     // we need HINSTANCE declaration to define WinMain()
     #include "wx/msw/wrapwin.h"
 


@@ -628,7 +634,8 @@ public:
 #define IMPLEMENT_APP_NO_MAIN(appname)                                      \
     wxAppConsole *wxCreateApp()                                             \
     {                                                                       \
 #define IMPLEMENT_APP_NO_MAIN(appname)                                      \
     wxAppConsole *wxCreateApp()                                             \
     {                                                                       \

-        wxAppConsole::CheckBuildOptions(wxBuildOptions());                  \
+        wxAppConsole::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE,         \
+                                        "your program");                    \

         return new appname;                                                 \
     }                                                                       \
     wxAppInitializer                                                        \
         return new appname;                                                 \
     }                                                                       \
     wxAppInitializer                                                        \