Remove --disable-nativeanimation and wxUSE_NATIVE_ANIMATIONCTRL
This commit is contained in:
@@ -415,8 +415,6 @@
|
|||||||
|
|
||||||
#cmakedefine01 wxUSE_NATIVE_DATAVIEWCTRL
|
#cmakedefine01 wxUSE_NATIVE_DATAVIEWCTRL
|
||||||
|
|
||||||
#cmakedefine01 wxUSE_NATIVE_ANIMATIONCTRL
|
|
||||||
|
|
||||||
#cmakedefine01 wxUSE_STATUSBAR
|
#cmakedefine01 wxUSE_STATUSBAR
|
||||||
|
|
||||||
#cmakedefine01 wxUSE_NATIVE_STATUSBAR
|
#cmakedefine01 wxUSE_NATIVE_STATUSBAR
|
||||||
|
@@ -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(commandlinkbutton, [ --enable-commandlinkbutton use wxCommmandLinkButton class], wxUSE_COMMANDLINKBUTTON)
|
||||||
WX_ARG_FEATURE(dataviewctrl,[ --enable-dataviewctrl use wxDataViewCtrl class], wxUSE_DATAVIEWCTRL)
|
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(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(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(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)
|
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)
|
AC_DEFINE(wxUSE_ANIMATIONCTRL)
|
||||||
USES_CONTROLS=1
|
USES_CONTROLS=1
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS animate"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS animate"
|
||||||
|
|
||||||
if test "$wxUSE_NATIVE_ANIMATIONCTRL" = "yes"; then
|
|
||||||
AC_DEFINE(wxUSE_NATIVE_ANIMATIONCTRL)
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_BANNERWINDOW" = "yes"; then
|
if test "$wxUSE_BANNERWINDOW" = "yes"; then
|
||||||
|
@@ -922,15 +922,6 @@
|
|||||||
// the native control limitations.
|
// the native control limitations.
|
||||||
#define wxUSE_NATIVE_DATAVIEWCTRL 1
|
#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
|
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
|
||||||
// below either wxStatusBar95 or a generic wxStatusBar will be used.
|
// below either wxStatusBar95 or a generic wxStatusBar will be used.
|
||||||
//
|
//
|
||||||
|
@@ -657,14 +657,6 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif /* !defined(wxUSE_NATIVE_DATAVIEWCTRL) */
|
#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
|
#ifndef wxUSE_DATEPICKCTRL
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
# error "wxUSE_DATEPICKCTRL must be defined, please read comment near the top of this file."
|
# error "wxUSE_DATEPICKCTRL must be defined, please read comment near the top of this file."
|
||||||
|
@@ -923,15 +923,6 @@
|
|||||||
// the native control limitations.
|
// the native control limitations.
|
||||||
#define wxUSE_NATIVE_DATAVIEWCTRL 1
|
#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
|
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
|
||||||
// below either wxStatusBar95 or a generic wxStatusBar will be used.
|
// below either wxStatusBar95 or a generic wxStatusBar will be used.
|
||||||
//
|
//
|
||||||
|
@@ -923,15 +923,6 @@
|
|||||||
// the native control limitations.
|
// the native control limitations.
|
||||||
#define wxUSE_NATIVE_DATAVIEWCTRL 1
|
#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
|
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
|
||||||
// below either wxStatusBar95 or a generic wxStatusBar will be used.
|
// below either wxStatusBar95 or a generic wxStatusBar will be used.
|
||||||
//
|
//
|
||||||
|
@@ -923,15 +923,6 @@
|
|||||||
// the native control limitations.
|
// the native control limitations.
|
||||||
#define wxUSE_NATIVE_DATAVIEWCTRL 1
|
#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
|
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
|
||||||
// below either wxStatusBar95 or a generic wxStatusBar will be used.
|
// below either wxStatusBar95 or a generic wxStatusBar will be used.
|
||||||
//
|
//
|
||||||
|
@@ -929,15 +929,6 @@
|
|||||||
// the native control limitations.
|
// the native control limitations.
|
||||||
#define wxUSE_NATIVE_DATAVIEWCTRL 1
|
#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
|
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
|
||||||
// below either wxStatusBar95 or a generic wxStatusBar will be used.
|
// below either wxStatusBar95 or a generic wxStatusBar will be used.
|
||||||
//
|
//
|
||||||
|
@@ -919,15 +919,6 @@
|
|||||||
// the native control limitations.
|
// the native control limitations.
|
||||||
#define wxUSE_NATIVE_DATAVIEWCTRL 1
|
#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
|
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
|
||||||
// below either wxStatusBar95 or a generic wxStatusBar will be used.
|
// below either wxStatusBar95 or a generic wxStatusBar will be used.
|
||||||
//
|
//
|
||||||
|
@@ -922,15 +922,6 @@
|
|||||||
// the native control limitations.
|
// the native control limitations.
|
||||||
#define wxUSE_NATIVE_DATAVIEWCTRL 1
|
#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
|
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
|
||||||
// below either wxStatusBar95 or a generic wxStatusBar will be used.
|
// below either wxStatusBar95 or a generic wxStatusBar will be used.
|
||||||
//
|
//
|
||||||
|
@@ -415,8 +415,6 @@
|
|||||||
|
|
||||||
#define wxUSE_NATIVE_DATAVIEWCTRL 0
|
#define wxUSE_NATIVE_DATAVIEWCTRL 0
|
||||||
|
|
||||||
#define wxUSE_NATIVE_ANIMATIONCTRL 0
|
|
||||||
|
|
||||||
#define wxUSE_STATUSBAR 0
|
#define wxUSE_STATUSBAR 0
|
||||||
|
|
||||||
#define wxUSE_NATIVE_STATUSBAR 0
|
#define wxUSE_NATIVE_STATUSBAR 0
|
||||||
|
@@ -465,8 +465,6 @@ typedef pid_t GPid;
|
|||||||
|
|
||||||
#define wxUSE_NATIVE_DATAVIEWCTRL 0
|
#define wxUSE_NATIVE_DATAVIEWCTRL 0
|
||||||
|
|
||||||
#define wxUSE_NATIVE_ANIMATIONCTRL 1
|
|
||||||
|
|
||||||
#define wxUSE_STATUSBAR 1
|
#define wxUSE_STATUSBAR 1
|
||||||
|
|
||||||
#define wxUSE_NATIVE_STATUSBAR 0
|
#define wxUSE_NATIVE_STATUSBAR 0
|
||||||
|
Reference in New Issue
Block a user