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

Remove wxGTK1 port and GPE support

Browse source 
Remove the port files and references to it from the common headers and
elsewhere.

Also remove GPE (GNOME PDA Environment) support as libgpewidget is
unmaintained since 2006 or so and has never been really used.

Use __WXGTK__ to test for any version of wxGTK now. Still define
__WXGTK20__ for compatibility, but always define it now and don't test
for it in the library code.
This commit is contained in:
Vadim Zeitlin 2022-10-16 16:34:47 +02:00
parent 0ef1cdcc21
commit fb4f0b590c
405 changed files with 828 additions and 43064 deletions
Download patch file Download diff file Expand all files Collapse all files

8
wxwin.m4
View file

@ -599,7 +599,7 @@ AC_DEFUN([WX_STANDARD_OPTIONS],
[WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Build as shared library], [auto])])
dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-toolkit since it's an option
dnl which must be able to accept the auto|gtk1|gtk2|msw|... values
dnl which must be able to accept the auto|gtk2|msw|... values
ifelse(index([$1], [toolkit]), [-1],,
[
AC_ARG_WITH([toolkit],
@ -615,12 +615,12 @@ AC_DEFUN([WX_STANDARD_OPTIONS],
TOOLKIT="$withval"
dnl PORT must be one of the allowed values
if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a "$TOOLKIT" != "gtk3" -a \
if test "$TOOLKIT" != "gtk2" -a "$TOOLKIT" != "gtk3" -a \
"$TOOLKIT" != "msw" -a \
"$TOOLKIT" != "osx_carbon" -a "$TOOLKIT" != "osx_cocoa" -a \
"$TOOLKIT" != "dfb" -a "$TOOLKIT" != "x11" -a "$TOOLKIT" != "base"; then
AC_MSG_ERROR([
Unrecognized option value (allowed values: auto, gtk1, gtk2, gtk3, msw, osx_carbon, osx_cocoa, dfb, x11, base)
Unrecognized option value (allowed values: auto, gtk2, gtk3, msw, osx_carbon, osx_cocoa, dfb, x11, base)
])
fi
@ -871,7 +871,6 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
dnl so we will detect the wxWidgets relative build setting and use it
AC_MSG_CHECKING([which wxWidgets toolkit was selected])
WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*")
WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
WX_GTKPORT3=$(expr "$WX_SELECTEDCONFIG" : ".*gtk3.*")
WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
@ -882,7 +881,6 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
WX_BASEPORT=$(expr "$WX_SELECTEDCONFIG" : ".*base.*")
WX_PORT="unknown"
if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
if test "$WX_GTKPORT3" != "0"; then WX_PORT="gtk3"; fi
if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi