solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Remove v2.8 compatibility flag, add v3.2 flag

Browse source
This commit is contained in:
Artur Wieczorek 2022-08-01 17:36:48 +02:00
parent 667c5c843b
commit 8a64c8abdc
15 changed files with 145 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

8
build/cmake/init.cmake
View file

@ -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)

4
build/cmake/setup.h.in
View file

@ -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

78
configure vendored
View file

@ -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}"

18
configure.in
View file

@ -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}"

18
docs/doxygen/mainpages/const_cpp.h
View file

@ -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

2
docs/qt/install.md
View file

@ -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

22
include/wx/android/setup.h
View file

@ -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

22
include/wx/gtk/setup.h
View file

@ -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

22
include/wx/motif/setup.h
View file

@ -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

22
include/wx/msw/setup.h
View file

@ -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

22
include/wx/osx/setup.h
View file

@ -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

22
include/wx/setup_inc.h
View file

@ -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

22
include/wx/univ/setup.h
View file

@ -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

4
setup.h.in
View file

@ -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

4
setup.h_vms
View file

@ -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