set eol-style

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

diff --git a/include/wx/build.h b/include/wx/build.h
index b64fb8f5d67f66064010afa77912d238f26aa9ca..5141afcbc7821748425ce10a5825b18c8061897e 100644 (file)
--- a/include/wx/build.h
+++ b/include/wx/build.h
@@ -77,15 +77,15 @@
 #endif
 
 // WXWIN_COMPATIBILITY macros affect presence of virtual functions
 #endif
 
 // WXWIN_COMPATIBILITY macros affect presence of virtual functions

-#if WXWIN_COMPATIBILITY_2_2
-    #define __WX_BO_WXWIN_COMPAT_2_2 ",compatible with 2.2"
+#if WXWIN_COMPATIBILITY_2_6
+    #define __WX_BO_WXWIN_COMPAT_2_6 ",compatible with 2.6"

 #else
 #else

-    #define __WX_BO_WXWIN_COMPAT_2_2
+    #define __WX_BO_WXWIN_COMPAT_2_6

 #endif
 #endif

-#if WXWIN_COMPATIBILITY_2_4
-    #define __WX_BO_WXWIN_COMPAT_2_4 ",compatible with 2.4"
+#if WXWIN_COMPATIBILITY_2_8
+    #define __WX_BO_WXWIN_COMPAT_2_8 ",compatible with 2.8"

 #else
 #else

-    #define __WX_BO_WXWIN_COMPAT_2_4
+    #define __WX_BO_WXWIN_COMPAT_2_8

 #endif
 
 // deriving wxWin containers from STL ones changes them completely:
 #endif
 
 // deriving wxWin containers from STL ones changes them completely:


@@ -101,7 +101,7 @@
     " (" __WX_BO_DEBUG "," __WX_BO_UNICODE \
      __WX_BO_COMPILER \
      __WX_BO_STL \
     " (" __WX_BO_DEBUG "," __WX_BO_UNICODE \
      __WX_BO_COMPILER \
      __WX_BO_STL \

-     __WX_BO_WXWIN_COMPAT_2_2 __WX_BO_WXWIN_COMPAT_2_4 \
+     __WX_BO_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 \

      ")"
 
 
      ")"
 
 


@@ -112,37 +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
-
-// ----------------------------------------------------------------------------
-// wxBuildOptions
-// ----------------------------------------------------------------------------
-
-// NB: Don't use this class in new code, it relies on the ctor being always
-//     inlined. WX_BUILD_OPTIONS_SIGNATURE always works.
-class wxBuildOptions
-{
-public:
-    // the ctor must be inline to get the compilation settings of the code
-    // which included this header
-    wxBuildOptions() : m_signature(WX_BUILD_OPTIONS_SIGNATURE) {}
-
-private:
-    const char *m_signature;
-
-    // actually only CheckBuildOptions() should be our friend but well...
-    friend class wxAppConsole;
-};
-
-#endif // WXWIN_COMPATIBILITY_2_4
-

 #endif // _WX_BUILD_H_
 #endif // _WX_BUILD_H_