Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move wxAdv library contents into wxCore

Browse Source 
This basically removes the "adv" library, even though it's still
preserved for compatibility with user make/project files referring to
it.

It is done because the distinction between "adv" and "core" was never
really clear (e.g. why wxTreeCtrl was in core but wxTreeListCtrl in
adv?) and it prevented some core classes from using adv ones.
This commit is contained in:
Vadim Zeitlin
2018-08-27 16:34:34 +02:00
parent b38813a5e9
commit 3ffa651a34
314 changed files with 9761 additions and 11422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
configure vendored
View File

@@ -665,7 +665,6 @@ COND_wxUSE_LIBPNG_builtin
COND_wxUSE_LIBJPEG_builtin
COND_wxUSE_EXPAT_builtin
COND_WXUNIV_1
COND_WXUNIV_0
COND_WITH_PLUGIN_SDL_1
COND_WINDOWS_IMPLIB_1
COND_USE_XRC_1
@@ -696,18 +695,17 @@ COND_USE_EXCEPTIONS_1
COND_USE_EXCEPTIONS_0
COND_USE_CAIRO_1
COND_UNICODE_1
COND_TOOLKIT_X11_WXUNIV_1
COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1
COND_TOOLKIT_X11_USE_GUI_1
COND_TOOLKIT_X11
COND_TOOLKIT_Qt
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_QT_USE_GUI_1
COND_TOOLKIT_QT
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1
COND_TOOLKIT_OSX_IPHONE
COND_TOOLKIT_OSX_COCOA_WXUNIV_0
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_OSX_COCOA_USE_GUI_1
COND_TOOLKIT_OSX_COCOA
COND_TOOLKIT_OSX_CARBON
@@ -721,16 +719,12 @@ COND_TOOLKIT_MAC
COND_TOOLKIT_GTK_USE_GUI_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
@@ -739,7 +733,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_
COND_TOOLKIT_GTK
COND_TOOLKIT_DFB_USE_GUI_1
COND_TOOLKIT_DFB
COND_TOOLKIT_COCOA_USE_GUI_1
COND_TOOLKIT_COCOA
COND_TOOLKIT_
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1
@@ -758,11 +751,8 @@ COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
COND_SHARED_0
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
COND_PLATFORM_WIN32_1_SHARED_0
COND_PLATFORM_WIN32_1
COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4
@@ -771,11 +761,8 @@ COND_PLATFORM_WIN32_0
COND_PLATFORM_UNIX_1_USE_PLUGINS_0
COND_PLATFORM_UNIX_1_USE_GUI_1
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
COND_PLATFORM_UNIX_1
COND_PLATFORM_UNIX_0
COND_PLATFORM_OS2_1
@@ -787,11 +774,8 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0
COND_PLATFORM_MACOSX_1
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
@@ -40992,31 +40976,16 @@ EOF
COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
@@ -41072,31 +41041,16 @@ EOF
COND_PLATFORM_UNIX_1=""
fi
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
fi
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
fi
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
fi
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
fi
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
fi
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
@@ -41137,31 +41091,16 @@ EOF
COND_PLATFORM_WIN32_1_SHARED_0=""
fi
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
fi
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
fi
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
fi
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
fi
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
fi
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
@@ -41252,11 +41191,6 @@ EOF
COND_TOOLKIT_COCOA=""
fi
COND_TOOLKIT_COCOA_USE_GUI_1="#"
if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_COCOA_USE_GUI_1=""
fi
COND_TOOLKIT_DFB="#"
if test "x$TOOLKIT" = "xDFB" ; then
COND_TOOLKIT_DFB=""
@@ -41297,16 +41231,6 @@ EOF
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1=""
fi
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
fi
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x1" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1=""
fi
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
@@ -41322,11 +41246,6 @@ EOF
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0=""
fi
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0=""
fi
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
@@ -41342,11 +41261,6 @@ EOF
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0=""
fi
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_WXUNIV_0="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_WXUNIV_0=""
fi
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1=""
@@ -41412,6 +41326,11 @@ EOF
COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
fi
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
fi
COND_TOOLKIT_OSX_COCOA_WXUNIV_0="#"
if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_OSX_COCOA_WXUNIV_0=""
@@ -41437,11 +41356,6 @@ EOF
COND_TOOLKIT_QT=""
fi
COND_TOOLKIT_QT_USE_GUI_1="#"
if test "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_QT_USE_GUI_1=""
fi
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0=""
@@ -41467,11 +41381,6 @@ EOF
COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1=""
fi
COND_TOOLKIT_X11_WXUNIV_1="#"
if test "x$TOOLKIT" = "xX11" -a "x$WXUNIV" = "x1" ; then
COND_TOOLKIT_X11_WXUNIV_1=""
fi
COND_UNICODE_1="#"
if test "x$UNICODE" = "x1" ; then
COND_UNICODE_1=""
@@ -41622,11 +41531,6 @@ EOF
COND_WITH_PLUGIN_SDL_1=""
fi
COND_WXUNIV_0="#"
if test "x$WXUNIV" = "x0" ; then
COND_WXUNIV_0=""
fi
COND_WXUNIV_1="#"
if test "x$WXUNIV" = "x1" ; then
COND_WXUNIV_1=""