projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nuke GTK1 from include/gtk
[wxWidgets.git]
/
include
/
wx
/
build.h
diff --git
a/include/wx/build.h
b/include/wx/build.h
index b64fb8f5d67f66064010afa77912d238f26aa9ca..f0cebe20875bc28de16077e96c2acf3b25e5f406 100644
(file)
--- a/
include/wx/build.h
+++ b/
include/wx/build.h
@@
-77,16
+77,16
@@
#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"
-#else
- #define __WX_BO_WXWIN_COMPAT_2_2
-#endif
#if WXWIN_COMPATIBILITY_2_4
#define __WX_BO_WXWIN_COMPAT_2_4 ",compatible with 2.4"
#else
#define __WX_BO_WXWIN_COMPAT_2_4
#endif
#if WXWIN_COMPATIBILITY_2_4
#define __WX_BO_WXWIN_COMPAT_2_4 ",compatible with 2.4"
#else
#define __WX_BO_WXWIN_COMPAT_2_4
#endif
+#if WXWIN_COMPATIBILITY_2_6
+ #define __WX_BO_WXWIN_COMPAT_2_6 ",compatible with 2.6"
+#else
+ #define __WX_BO_WXWIN_COMPAT_2_6
+#endif
// deriving wxWin containers from STL ones changes them completely:
#if wxUSE_STL
// deriving wxWin containers from STL ones changes them completely:
#if wxUSE_STL
@@
-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_
4 __WX_BO_WXWIN_COMPAT_2_6
\
")"
")"
@@
-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