diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 865bd2ed7d..e3cb52907a 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -94,12 +94,12 @@ elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_CXX_COMPILER_ID} endif() endif() -if(wxBUILD_COMPATIBILITY VERSION_LESS 3.0) - set(WXWIN_COMPATIBILITY_2_8 ON) -endif() -if(wxBUILD_COMPATIBILITY VERSION_LESS 3.1) +if(wxBUILD_COMPATIBILITY VERSION_LESS 3.2) set(WXWIN_COMPATIBILITY_3_0 ON) endif() +if(wxBUILD_COMPATIBILITY VERSION_LESS 3.3) + set(WXWIN_COMPATIBILITY_3_2 ON) +endif() if(wxUSE_NO_RTTI) if(MSVC) diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in index bce33a73f3..36e09fc4e2 100644 --- a/build/cmake/setup.h.in +++ b/build/cmake/setup.h.in @@ -130,10 +130,10 @@ #endif -#cmakedefine01 WXWIN_COMPATIBILITY_2_8 - #cmakedefine01 WXWIN_COMPATIBILITY_3_0 +#cmakedefine01 WXWIN_COMPATIBILITY_3_2 + #cmakedefine01 wxDIALOG_UNIT_COMPATIBILITY #cmakedefine01 wxUSE_UNSAFE_WXSTRING_CONV diff --git a/configure b/configure index e88bc82889..49d2389e1d 100755 --- a/configure +++ b/configure @@ -1152,8 +1152,8 @@ enable_permissive enable_vararg_macros enable_universal_binary enable_macosx_arch -enable_compat28 enable_compat30 +enable_compat32 enable_rpath enable_visibility enable_tls @@ -2124,8 +2124,8 @@ Optional Features: --disable-vararg_macros don't use vararg macros, even if they are supported --enable-universal_binary=archs create universal binary for the specified (or all supported) architectures --enable-macosx_arch=ARCH build for just the specified architecture - --enable-compat28 enable wxWidgets 2.8 compatibility - --disable-compat30 disable wxWidgets 3.0 compatibility + --enable-compat30 enable wxWidgets 3.0 compatibility + --disable-compat32 disable wxWidgets 3.2 compatibility --disable-rpath disable use of rpath for uninstalled builds --disable-visibility disable use of ELF symbols visibility even if supported --disable-tls disable use of compiler TLS support @@ -6315,35 +6315,6 @@ fi fi fi - # Check whether --enable-compat28 was given. -if test "${enable_compat28+set}" = set; then : - enableval=$enable_compat28; - if test "$enableval" = yes; then - wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes' - else - wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no' - fi - -else - - wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}" - -fi - - - eval "$wx_cv_use_compat28" - - - enablestring=disable - defaultval= - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - # Check whether --enable-compat30 was given. if test "${enable_compat30+set}" = set; then : enableval=$enable_compat30; @@ -6363,6 +6334,35 @@ fi eval "$wx_cv_use_compat30" + enablestring=disable + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + # Check whether --enable-compat32 was given. +if test "${enable_compat32+set}" = set; then : + enableval=$enable_compat32; + if test "$enableval" = yes; then + wx_cv_use_compat32='WXWIN_COMPATIBILITY_3_2=yes' + else + wx_cv_use_compat32='WXWIN_COMPATIBILITY_3_2=no' + fi + +else + + wx_cv_use_compat32='WXWIN_COMPATIBILITY_3_2=${'DEFAULT_WXWIN_COMPATIBILITY_3_2":-$defaultval}" + +fi + + + eval "$wx_cv_use_compat32" + + enablestring=disable defaultval= @@ -37707,15 +37707,15 @@ if test "x$wxUSE_REPRODUCIBLE_BUILD" = "xyes"; then fi -if test "x$WXWIN_COMPATIBILITY_2_8" = "xyes"; then - $as_echo "#define WXWIN_COMPATIBILITY_2_8 1" >>confdefs.h +if test "x$WXWIN_COMPATIBILITY_3_0" = "xyes"; then + $as_echo "#define WXWIN_COMPATIBILITY_3_0 1" >>confdefs.h - WXWIN_COMPATIBILITY_3_0="yes" + WXWIN_COMPATIBILITY_3_2="yes" fi -if test "x$WXWIN_COMPATIBILITY_3_0" != "xno"; then - $as_echo "#define WXWIN_COMPATIBILITY_3_0 1" >>confdefs.h +if test "x$WXWIN_COMPATIBILITY_3_2" != "xno"; then + $as_echo "#define WXWIN_COMPATIBILITY_3_2 1" >>confdefs.h fi @@ -47362,8 +47362,8 @@ else fi echo " What level of wxWidgets compatibility should be enabled?" -echo " wxWidgets 2.8 ${WXWIN_COMPATIBILITY_2_8:-no}" -echo " wxWidgets 3.0 ${WXWIN_COMPATIBILITY_3_0:-yes}" +echo " wxWidgets 3.0 ${WXWIN_COMPATIBILITY_3_0:-no}" +echo " wxWidgets 3.2 ${WXWIN_COMPATIBILITY_3_2:-yes}" echo " Which libraries should wxWidgets use?" echo " STL ${wxUSE_STL}" diff --git a/configure.in b/configure.in index 1dff0dc99f..9839065b6d 100644 --- a/configure.in +++ b/configure.in @@ -700,8 +700,8 @@ WX_ARG_ENABLE_PARAM(universal_binary, [[ --enable-universal_binary=archs create WX_ARG_ENABLE_PARAM(macosx_arch, [[ --enable-macosx_arch=ARCH build for just the specified architecture]], wxUSE_MAC_ARCH) fi dnl USE_DARWIN -WX_ARG_ENABLE(compat28, [ --enable-compat28 enable wxWidgets 2.8 compatibility], WXWIN_COMPATIBILITY_2_8) -WX_ARG_DISABLE(compat30, [ --disable-compat30 disable wxWidgets 3.0 compatibility], WXWIN_COMPATIBILITY_3_0) +WX_ARG_ENABLE(compat30, [ --enable-compat30 enable wxWidgets 3.0 compatibility], WXWIN_COMPATIBILITY_3_0) +WX_ARG_DISABLE(compat32, [ --disable-compat32 disable wxWidgets 3.2 compatibility], WXWIN_COMPATIBILITY_3_2) WX_ARG_DISABLE(rpath, [ --disable-rpath disable use of rpath for uninstalled builds], wxUSE_RPATH) @@ -5484,14 +5484,14 @@ dnl --------------------------------------------------------------------------- dnl compatibility level dnl --------------------------------------------------------------------------- -if test "x$WXWIN_COMPATIBILITY_2_8" = "xyes"; then - AC_DEFINE(WXWIN_COMPATIBILITY_2_8) +if test "x$WXWIN_COMPATIBILITY_3_0" = "xyes"; then + AC_DEFINE(WXWIN_COMPATIBILITY_3_0) - WXWIN_COMPATIBILITY_3_0="yes" + WXWIN_COMPATIBILITY_3_2="yes" fi -if test "x$WXWIN_COMPATIBILITY_3_0" != "xno"; then - AC_DEFINE(WXWIN_COMPATIBILITY_3_0) +if test "x$WXWIN_COMPATIBILITY_3_2" != "xno"; then + AC_DEFINE(WXWIN_COMPATIBILITY_3_2) fi dnl --------------------------------------------------------------------------- @@ -8842,8 +8842,8 @@ else fi echo " What level of wxWidgets compatibility should be enabled?" -echo " wxWidgets 2.8 ${WXWIN_COMPATIBILITY_2_8:-no}" -echo " wxWidgets 3.0 ${WXWIN_COMPATIBILITY_3_0:-yes}" +echo " wxWidgets 3.0 ${WXWIN_COMPATIBILITY_3_0:-no}" +echo " wxWidgets 3.2 ${WXWIN_COMPATIBILITY_3_2:-yes}" echo " Which libraries should wxWidgets use?" echo " STL ${wxUSE_STL}" diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index 462a8fe72c..e6e836984e 100644 --- a/docs/doxygen/mainpages/const_cpp.h +++ b/docs/doxygen/mainpages/const_cpp.h @@ -315,20 +315,20 @@ And, finally, the symbol is completely removed from the library in the next stable version after this, i.e. @c x.y+4. @c WXWIN_COMPATIBILITY_x_y itself is removed as well at this time, as it is not useful any longer. -According to this general rule, currently, i.e. in wxWidgets 3.2, the following -two symbols are defined: @c WXWIN_COMPATIBILITY_2_8, as 0, and @c -WXWIN_COMPATIBILITY_3_0, as 1. Please see @ref overview_backwardcompat for even +According to this general rule, currently, i.e. in wxWidgets 3.4, the following +two symbols are defined: @c WXWIN_COMPATIBILITY_3_0, as 0, and @c +WXWIN_COMPATIBILITY_3_2, as 1. Please see @ref overview_backwardcompat for even more details. @beginDefList -@itemdef{WXWIN_COMPATIBILITY_2_8, - defined as 0 by default meaning that symbols existing in wxWidgets 2.8 - but deprecated in 3.0 release are not available by default. It can be +@itemdef{WXWIN_COMPATIBILITY_3_0, + defined as 0 by default meaning that symbols existing in wxWidgets 3.0 + but deprecated in 3.2 release are not available by default. It can be changed to 1 to make them available, but it is strongly recommended to update the code using them instead.} -@itemdef{WXWIN_COMPATIBILITY_3_0, - defined as 1 by default meaning that symbols existing in wxWidgets 3.0 - but deprecated since then are still available. It can be changed to 1 +@itemdef{WXWIN_COMPATIBILITY_3_2, + defined as 1 by default meaning that symbols existing in wxWidgets 3.2 + but deprecated since then are still available. It can be changed to 0 to ensure that no deprecated symbols are used accidentally.} @itemdef{wxDIALOG_UNIT_COMPATIBILITY, wxMSW-specific setting which can be set to 1 to make diff --git a/docs/qt/install.md b/docs/qt/install.md index 455a80f687..aa5ed67e4e 100644 --- a/docs/qt/install.md +++ b/docs/qt/install.md @@ -146,7 +146,7 @@ Android (disable currently unsupported/unneeded features) and run make: mkdir bldqt5droid cd bldqt5droid ../configure --with-qt --enable-debug --build=x86_64-unknown-linux-gnu \ - --host=arm-linux-androideabi --disable-compat28 --disable-shared \ + --host=arm-linux-androideabi --disable-compat30 --disable-shared \ --disable-arttango --enable-image --disable-dragimage --disable-sockets \ --with-libtiff=no --without-opengl --disable-baseevtloop --disable-utf8 make diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h index 66ce004571..4546982c42 100644 --- a/include/wx/android/setup.h +++ b/include/wx/android/setup.h @@ -25,16 +25,6 @@ // compatibility settings // ---------------------------------------------------------------------------- -// This setting determines the compatibility with 2.8 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_8 0 - // This setting determines the compatibility with 3.0 API: set it to 0 to // flag all cases of using deprecated functions. // @@ -43,7 +33,17 @@ // in the version after it completely. // // Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_3_0 1 +#define WXWIN_COMPATIBILITY_3_0 0 + +// This setting determines the compatibility with 3.2 API: set it to 0 to +// flag all cases of using deprecated functions. +// +// Default is 1 but please try building your code with 0 as the default will +// change to 0 in the next version and the deprecated functions will disappear +// in the version after it completely. +// +// Recommended setting: 0 (please update your code) +#define WXWIN_COMPATIBILITY_3_2 1 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when // default system font is used for wxWindow::GetCharWidth/Height() instead of diff --git a/include/wx/gtk/setup.h b/include/wx/gtk/setup.h index e1b491e317..38fdd57c1f 100644 --- a/include/wx/gtk/setup.h +++ b/include/wx/gtk/setup.h @@ -26,16 +26,6 @@ // compatibility settings // ---------------------------------------------------------------------------- -// This setting determines the compatibility with 2.8 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_8 0 - // This setting determines the compatibility with 3.0 API: set it to 0 to // flag all cases of using deprecated functions. // @@ -44,7 +34,17 @@ // in the version after it completely. // // Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_3_0 1 +#define WXWIN_COMPATIBILITY_3_0 0 + +// This setting determines the compatibility with 3.2 API: set it to 0 to +// flag all cases of using deprecated functions. +// +// Default is 1 but please try building your code with 0 as the default will +// change to 0 in the next version and the deprecated functions will disappear +// in the version after it completely. +// +// Recommended setting: 0 (please update your code) +#define WXWIN_COMPATIBILITY_3_2 1 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when // default system font is used for wxWindow::GetCharWidth/Height() instead of diff --git a/include/wx/motif/setup.h b/include/wx/motif/setup.h index 6ac6bf82de..09cb0b2798 100644 --- a/include/wx/motif/setup.h +++ b/include/wx/motif/setup.h @@ -26,16 +26,6 @@ // compatibility settings // ---------------------------------------------------------------------------- -// This setting determines the compatibility with 2.8 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_8 0 - // This setting determines the compatibility with 3.0 API: set it to 0 to // flag all cases of using deprecated functions. // @@ -44,7 +34,17 @@ // in the version after it completely. // // Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_3_0 1 +#define WXWIN_COMPATIBILITY_3_0 0 + +// This setting determines the compatibility with 3.2 API: set it to 0 to +// flag all cases of using deprecated functions. +// +// Default is 1 but please try building your code with 0 as the default will +// change to 0 in the next version and the deprecated functions will disappear +// in the version after it completely. +// +// Recommended setting: 0 (please update your code) +#define WXWIN_COMPATIBILITY_3_2 1 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when // default system font is used for wxWindow::GetCharWidth/Height() instead of diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h index 6a875dc179..05f95fa7c2 100644 --- a/include/wx/msw/setup.h +++ b/include/wx/msw/setup.h @@ -26,16 +26,6 @@ // compatibility settings // ---------------------------------------------------------------------------- -// This setting determines the compatibility with 2.8 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_8 0 - // This setting determines the compatibility with 3.0 API: set it to 0 to // flag all cases of using deprecated functions. // @@ -44,7 +34,17 @@ // in the version after it completely. // // Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_3_0 1 +#define WXWIN_COMPATIBILITY_3_0 0 + +// This setting determines the compatibility with 3.2 API: set it to 0 to +// flag all cases of using deprecated functions. +// +// Default is 1 but please try building your code with 0 as the default will +// change to 0 in the next version and the deprecated functions will disappear +// in the version after it completely. +// +// Recommended setting: 0 (please update your code) +#define WXWIN_COMPATIBILITY_3_2 1 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when // default system font is used for wxWindow::GetCharWidth/Height() instead of diff --git a/include/wx/osx/setup.h b/include/wx/osx/setup.h index edb835cc8c..007582d5ed 100644 --- a/include/wx/osx/setup.h +++ b/include/wx/osx/setup.h @@ -32,16 +32,6 @@ // compatibility settings // ---------------------------------------------------------------------------- -// This setting determines the compatibility with 2.8 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_8 0 - // This setting determines the compatibility with 3.0 API: set it to 0 to // flag all cases of using deprecated functions. // @@ -50,7 +40,17 @@ // in the version after it completely. // // Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_3_0 1 +#define WXWIN_COMPATIBILITY_3_0 0 + +// This setting determines the compatibility with 3.2 API: set it to 0 to +// flag all cases of using deprecated functions. +// +// Default is 1 but please try building your code with 0 as the default will +// change to 0 in the next version and the deprecated functions will disappear +// in the version after it completely. +// +// Recommended setting: 0 (please update your code) +#define WXWIN_COMPATIBILITY_3_2 1 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when // default system font is used for wxWindow::GetCharWidth/Height() instead of diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 8b7a63c15f..2cc691c41d 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -22,16 +22,6 @@ // compatibility settings // ---------------------------------------------------------------------------- -// This setting determines the compatibility with 2.8 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_8 0 - // This setting determines the compatibility with 3.0 API: set it to 0 to // flag all cases of using deprecated functions. // @@ -40,7 +30,17 @@ // in the version after it completely. // // Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_3_0 1 +#define WXWIN_COMPATIBILITY_3_0 0 + +// This setting determines the compatibility with 3.2 API: set it to 0 to +// flag all cases of using deprecated functions. +// +// Default is 1 but please try building your code with 0 as the default will +// change to 0 in the next version and the deprecated functions will disappear +// in the version after it completely. +// +// Recommended setting: 0 (please update your code) +#define WXWIN_COMPATIBILITY_3_2 1 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when // default system font is used for wxWindow::GetCharWidth/Height() instead of diff --git a/include/wx/univ/setup.h b/include/wx/univ/setup.h index 1382b90bab..6b66d5e4a8 100644 --- a/include/wx/univ/setup.h +++ b/include/wx/univ/setup.h @@ -25,16 +25,6 @@ // compatibility settings // ---------------------------------------------------------------------------- -// This setting determines the compatibility with 2.8 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_8 0 - // This setting determines the compatibility with 3.0 API: set it to 0 to // flag all cases of using deprecated functions. // @@ -43,7 +33,17 @@ // in the version after it completely. // // Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_3_0 1 +#define WXWIN_COMPATIBILITY_3_0 0 + +// This setting determines the compatibility with 3.2 API: set it to 0 to +// flag all cases of using deprecated functions. +// +// Default is 1 but please try building your code with 0 as the default will +// change to 0 in the next version and the deprecated functions will disappear +// in the version after it completely. +// +// Recommended setting: 0 (please update your code) +#define WXWIN_COMPATIBILITY_3_2 1 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when // default system font is used for wxWindow::GetCharWidth/Height() instead of diff --git a/setup.h.in b/setup.h.in index f76293bab4..7cbe89b7ee 100644 --- a/setup.h.in +++ b/setup.h.in @@ -130,10 +130,10 @@ #endif -#define WXWIN_COMPATIBILITY_2_8 0 - #define WXWIN_COMPATIBILITY_3_0 0 +#define WXWIN_COMPATIBILITY_3_2 0 + #define wxDIALOG_UNIT_COMPATIBILITY 0 #define wxUSE_UNSAFE_WXSTRING_CONV 0 diff --git a/setup.h_vms b/setup.h_vms index c8b3047212..e0c05436e1 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -172,10 +172,10 @@ typedef pid_t GPid; #define wxUSE_GUI 1 #endif -#define WXWIN_COMPATIBILITY_2_8 0 - #define WXWIN_COMPATIBILITY_3_0 0 +#define WXWIN_COMPATIBILITY_3_2 0 + #define wxEVENTS_COMPATIBILITY_2_8 0 #define wxDIALOG_UNIT_COMPATIBILITY 1