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

Define __WXGTK20__ again for wxGTK 3 builds

Browse source 
This was accidentally broken in fb4f0b590c (Remove wxGTK1 port and GPE
support, 2022-10-16): even though the commit message explicitly said
that __WXGTK20__ was still defined, it actually wasn't any more.

Fix this now by just doing it always when using wxGTK. This allows to
drop WXGTK2 variable entirely, as it's not used any longer and we don't
need to set it.

Closes #23444.
This commit is contained in:
Vadim Zeitlin 2023-04-12 19:30:57 +02:00
parent d6fc5230e0
commit 6485e0200f
2 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
configure vendored
View file

@ -26696,7 +26696,6 @@ if test "$wxUSE_GUI" = "yes"; then
GUI_TK_LIBRARY=
WXGTK2=
WXGTK3=
WXGTK4=
@ -27686,8 +27685,7 @@ $as_echo "$wx_cv_lib_gtk" >&6; }
3) WXGTK3=1
TOOLKIT_VERSION=3
;;
2.0) WXGTK2=1
TOOLKIT_VERSION=2
2.0) TOOLKIT_VERSION=2
;;
*) as_fn_error $? "
The development files for GTK+ were not found. Please
@ -35454,12 +35452,10 @@ _ACEOF
_ACEOF
fi
if test "$WXGTK2" = 1 ; then
cat >>confdefs.h <<_ACEOF
cat >>confdefs.h <<_ACEOF
#define __WXGTK20__ 1
_ACEOF
fi
fi
if test "$WXQT" = 1 ; then

10
configure.in
View file

@ -2779,7 +2779,6 @@ if test "$wxUSE_GUI" = "yes"; then
GUI_TK_LIBRARY=
WXGTK2=
WXGTK3=
WXGTK4=
@ -2875,8 +2874,7 @@ if test "$wxUSE_GUI" = "yes"; then
3) WXGTK3=1
TOOLKIT_VERSION=3
;;
2.0) WXGTK2=1
TOOLKIT_VERSION=2
2.0) TOOLKIT_VERSION=2
;;
*) AC_MSG_ERROR([
The development files for GTK+ were not found. Please
@ -4706,9 +4704,9 @@ if test "$wxUSE_GTK" = 1 ; then
if test "$WXGTK3" = 1 ; then
AC_DEFINE_UNQUOTED(__WXGTK3__, 1)
fi
if test "$WXGTK2" = 1 ; then
AC_DEFINE_UNQUOTED(__WXGTK20__,1)
fi
dnl Note that this is intentionally defined for GTK 3 (and later) too, as
dnl it was originally used to distinguish between GTK 1 and 2.
AC_DEFINE_UNQUOTED(__WXGTK20__,1)
fi
if test "$WXQT" = 1 ; then