wxPalette unified. Source cleaning.

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

diff --git a/include/wx/build.h b/include/wx/build.h
index c09f52a415c65fffde24124819da1d8a33b4fb89..6e0a6dc8ceaca93c79999341df2d9d759628783a 100644 (file)
--- a/include/wx/build.h
+++ b/include/wx/build.h
@@ -94,7 +94,7 @@
 #else
     #define __WX_BO_STL ",wx containers"
 #endif
 #else
     #define __WX_BO_STL ",wx containers"
 #endif

- 
+

 // This macro is passed as argument to wxConsoleApp::CheckBuildOptions()
 #define WX_BUILD_OPTIONS_SIGNATURE \
     __WX_BO_VERSION(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) \
 // This macro is passed as argument to wxConsoleApp::CheckBuildOptions()
 #define WX_BUILD_OPTIONS_SIGNATURE \
     __WX_BO_VERSION(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) \


@@ -112,13 +112,14 @@
 // Use this macro to check build options. Adding it to a file in DLL will
 // ensure that the DLL checks build options in same way IMPLEMENT_APP() does.
 #define WX_CHECK_BUILD_OPTIONS(libName)                                 \
 // Use this macro to check build options. Adding it to a file in DLL will
 // ensure that the DLL checks build options in same way IMPLEMENT_APP() does.
 #define WX_CHECK_BUILD_OPTIONS(libName)                                 \

-    static bool wxCheckBuildOptions()                                   \
+    static struct wxBuildOptionsChecker                                 \

     {                                                                   \
     {                                                                   \

-        wxAppConsole::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE,     \
-                                        libName);                       \
-        return true;                                                    \
-    };                                                                  \
-    static bool gs_buildOptionsCheck = wxCheckBuildOptions();
+        wxBuildOptionsChecker()                                         \
+        {                                                               \
+            wxAppConsole::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, \
+                                            libName);                   \
+        }                                                               \
+    } gs_buildOptionsCheck;

 
 
 #if WXWIN_COMPATIBILITY_2_4
 
 
 #if WXWIN_COMPATIBILITY_2_4