remove WXWIN_COMPATIBILITY_2_6, add WXWIN_COMPATIBILITY_3_0

closes #15792

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-01-04 20:07:33 +00:00
parent 61728d5d54
commit 967a94c91a
140 changed files with 291 additions and 1561 deletions

View File

@@ -1257,16 +1257,16 @@
Section 3a: check consistency of the non-GUI settings.
*/
#if WXWIN_COMPATIBILITY_2_6
# if !WXWIN_COMPATIBILITY_2_8
#if WXWIN_COMPATIBILITY_2_8
# if !WXWIN_COMPATIBILITY_3_0
# ifdef wxABORT_ON_CONFIG_ERROR
# error "2.6.X compatibility requires 2.8.X compatibility"
# error "2.8.X compatibility requires 3.0.X compatibility"
# else
# undef WXWIN_COMPATIBILITY_2_8
# define WXWIN_COMPATIBILITY_2_8 1
# undef WXWIN_COMPATIBILITY_3_0
# define WXWIN_COMPATIBILITY_3_0 1
# endif
# endif
#endif /* WXWIN_COMPATIBILITY_2_6 */
#endif /* WXWIN_COMPATIBILITY_2_8 */
#if wxUSE_ARCHIVE_STREAMS
# if !wxUSE_DATETIME