From 1fa74df7f4fcb2ad03ca9443ecdc65b126ef896a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 25 Mar 2020 14:03:28 -0700 Subject: [PATCH] Remove --disable-nativeanimation and wxUSE_NATIVE_ANIMATIONCTRL --- build/cmake/setup.h.in | 2 -- configure.in | 6 ------ include/wx/android/setup.h | 9 --------- include/wx/chkconf.h | 8 -------- include/wx/gtk/setup0.h | 9 --------- include/wx/motif/setup0.h | 9 --------- include/wx/msw/setup0.h | 9 --------- include/wx/osx/setup0.h | 9 --------- include/wx/setup_inc.h | 9 --------- include/wx/univ/setup0.h | 9 --------- setup.h.in | 2 -- setup.h_vms | 2 -- 12 files changed, 83 deletions(-) diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in index 92747098b9..c18154227b 100644 --- a/build/cmake/setup.h.in +++ b/build/cmake/setup.h.in @@ -415,8 +415,6 @@ #cmakedefine01 wxUSE_NATIVE_DATAVIEWCTRL -#cmakedefine01 wxUSE_NATIVE_ANIMATIONCTRL - #cmakedefine01 wxUSE_STATUSBAR #cmakedefine01 wxUSE_NATIVE_STATUSBAR diff --git a/configure.in b/configure.in index a9af45a012..76039da63c 100644 --- a/configure.in +++ b/configure.in @@ -934,7 +934,6 @@ WX_ARG_FEATURE(comboctrl, [ --enable-comboctrl use wxComboCtrl class], w WX_ARG_FEATURE(commandlinkbutton, [ --enable-commandlinkbutton use wxCommmandLinkButton class], wxUSE_COMMANDLINKBUTTON) WX_ARG_FEATURE(dataviewctrl,[ --enable-dataviewctrl use wxDataViewCtrl class], wxUSE_DATAVIEWCTRL) WX_ARG_DISABLE(nativedvc, [ --disable-nativedvc disable use of native wxDataViewCtrl even if available], wxUSE_NATIVE_DATAVIEWCTRL) -WX_ARG_DISABLE(nativeanimation, [ --disable-nativeanimation disable use of native wxAnimationCtrl (and supporting classes) even if available], wxUSE_NATIVE_ANIMATIONCTRL) WX_ARG_FEATURE(datepick, [ --enable-datepick use wxDatePickerCtrl class], wxUSE_DATEPICKCTRL) WX_ARG_FEATURE(detect_sm, [ --enable-detect_sm use code to detect X11 session manager], wxUSE_DETECT_SM) WX_ARG_FEATURE(dirpicker, [ --enable-dirpicker use wxDirPickerCtrl class], wxUSE_DIRPICKERCTRL) @@ -6700,11 +6699,6 @@ if test "$wxUSE_ANIMATIONCTRL" = "yes"; then AC_DEFINE(wxUSE_ANIMATIONCTRL) USES_CONTROLS=1 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS animate" - - if test "$wxUSE_NATIVE_ANIMATIONCTRL" = "yes"; then - AC_DEFINE(wxUSE_NATIVE_ANIMATIONCTRL) - fi - fi if test "$wxUSE_BANNERWINDOW" = "yes"; then diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h index fdeea69e37..af4585828d 100644 --- a/include/wx/android/setup.h +++ b/include/wx/android/setup.h @@ -922,15 +922,6 @@ // the native control limitations. #define wxUSE_NATIVE_DATAVIEWCTRL 1 -// Use native version of wxAnimationCtrl and supporting classes, if available, -// otherwise use the generic version of the animation classes. -// -// Default is 1. -// -// Recommended setting: 1, but can be set to 0 if your program is affected by -// the native control limitations. -#define wxUSE_NATIVE_ANIMATIONCTRL 1 - // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. // diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 0164426b0c..9d0e7f743c 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -657,14 +657,6 @@ # endif #endif /* !defined(wxUSE_NATIVE_DATAVIEWCTRL) */ -#ifndef wxUSE_NATIVE_ANIMATIONCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_NATIVE_ANIMATIONCTRL must be defined, please read comment near the top of this file." -# else -# define wxUSE_NATIVE_ANIMATIONCTRL 1 -# endif -#endif /* !defined(wxUSE_NATIVE_ANIMATIONCTRL) */ - #ifndef wxUSE_DATEPICKCTRL # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_DATEPICKCTRL must be defined, please read comment near the top of this file." diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h index 059be214dd..639f912d52 100644 --- a/include/wx/gtk/setup0.h +++ b/include/wx/gtk/setup0.h @@ -923,15 +923,6 @@ // the native control limitations. #define wxUSE_NATIVE_DATAVIEWCTRL 1 -// Use native version of wxAnimationCtrl and supporting classes, if available, -// otherwise use the generic version of the animation classes. -// -// Default is 1. -// -// Recommended setting: 1, but can be set to 0 if your program is affected by -// the native control limitations. -#define wxUSE_NATIVE_ANIMATIONCTRL 1 - // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. // diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index 8e82173472..7f7ff9eb8a 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -923,15 +923,6 @@ // the native control limitations. #define wxUSE_NATIVE_DATAVIEWCTRL 1 -// Use native version of wxAnimationCtrl and supporting classes, if available, -// otherwise use the generic version of the animation classes. -// -// Default is 1. -// -// Recommended setting: 1, but can be set to 0 if your program is affected by -// the native control limitations. -#define wxUSE_NATIVE_ANIMATIONCTRL 1 - // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. // diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 22d421af06..e7b9d06668 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -923,15 +923,6 @@ // the native control limitations. #define wxUSE_NATIVE_DATAVIEWCTRL 1 -// Use native version of wxAnimationCtrl and supporting classes, if available, -// otherwise use the generic version of the animation classes. -// -// Default is 1. -// -// Recommended setting: 1, but can be set to 0 if your program is affected by -// the native control limitations. -#define wxUSE_NATIVE_ANIMATIONCTRL 1 - // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. // diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h index 102b6dd013..d45ea59db7 100644 --- a/include/wx/osx/setup0.h +++ b/include/wx/osx/setup0.h @@ -929,15 +929,6 @@ // the native control limitations. #define wxUSE_NATIVE_DATAVIEWCTRL 1 -// Use native version of wxAnimationCtrl and supporting classes, if available, -// otherwise use the generic version of the animation classes. -// -// Default is 1. -// -// Recommended setting: 1, but can be set to 0 if your program is affected by -// the native control limitations. -#define wxUSE_NATIVE_ANIMATIONCTRL 1 - // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. // diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 8407946990..99e95fd8b7 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -919,15 +919,6 @@ // the native control limitations. #define wxUSE_NATIVE_DATAVIEWCTRL 1 -// Use native version of wxAnimationCtrl and supporting classes, if available, -// otherwise use the generic version of the animation classes. -// -// Default is 1. -// -// Recommended setting: 1, but can be set to 0 if your program is affected by -// the native control limitations. -#define wxUSE_NATIVE_ANIMATIONCTRL 1 - // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. // diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 70d94b601b..7c2852039b 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -922,15 +922,6 @@ // the native control limitations. #define wxUSE_NATIVE_DATAVIEWCTRL 1 -// Use native version of wxAnimationCtrl and supporting classes, if available, -// otherwise use the generic version of the animation classes. -// -// Default is 1. -// -// Recommended setting: 1, but can be set to 0 if your program is affected by -// the native control limitations. -#define wxUSE_NATIVE_ANIMATIONCTRL 1 - // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. // diff --git a/setup.h.in b/setup.h.in index b43ec55c36..26ed7a7d14 100644 --- a/setup.h.in +++ b/setup.h.in @@ -415,8 +415,6 @@ #define wxUSE_NATIVE_DATAVIEWCTRL 0 -#define wxUSE_NATIVE_ANIMATIONCTRL 0 - #define wxUSE_STATUSBAR 0 #define wxUSE_NATIVE_STATUSBAR 0 diff --git a/setup.h_vms b/setup.h_vms index 57af15dc19..92efe12b49 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -465,8 +465,6 @@ typedef pid_t GPid; #define wxUSE_NATIVE_DATAVIEWCTRL 0 -#define wxUSE_NATIVE_ANIMATIONCTRL 1 - #define wxUSE_STATUSBAR 1 #define wxUSE_NATIVE_STATUSBAR 0