Add --disable-nativeanimation configure option, and wxUSE_NATIVE_ANIMATIONCTRL

configure

@@ -1253,6 +1253,7 @@ enable_comboctrl
 enable_commandlinkbutton
 enable_dataviewctrl
 enable_nativedvc
+enable_nativeanimation
 enable_datepick
 enable_detect_sm
 enable_dirpicker
@@ -2208,6 +2209,7 @@ Optional Features:
   --enable-commandlinkbutton      use wxCommmandLinkButton class
   --enable-dataviewctrl   use wxDataViewCtrl class
   --disable-nativedvc     disable use of native wxDataViewCtrl even if available
+  --disable-nativeanimation     disable use of native wxAnimationCtrl (and supporting classes) even if available
   --enable-datepick       use wxDatePickerCtrl class
   --enable-detect_sm      use code to detect X11 session manager
   --enable-dirpicker      use wxDirPickerCtrl class
@@ -9758,6 +9760,35 @@ fi
           eval "$wx_cv_use_nativedvc"
 
 
+          enablestring=disable
+          defaultval=
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          # Check whether --enable-nativeanimation was given.
+if test "${enable_nativeanimation+set}" = set; then :
+  enableval=$enable_nativeanimation;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_nativeanimation='wxUSE_NATIVE_ANIMATIONCTRL=yes'
+                          else
+                            wx_cv_use_nativeanimation='wxUSE_NATIVE_ANIMATIONCTRL=no'
+                          fi
+
+else
+
+                          wx_cv_use_nativeanimation='wxUSE_NATIVE_ANIMATIONCTRL=${'DEFAULT_wxUSE_NATIVE_ANIMATIONCTRL":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_nativeanimation"
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -35766,6 +35797,12 @@ if test "$wxUSE_ANIMATIONCTRL" = "yes"; then
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS animate"
+
+  if test "$wxUSE_NATIVE_ANIMATIONCTRL" = "yes"; then
+    $as_echo "#define wxUSE_NATIVE_ANIMATIONCTRL 1" >>confdefs.h
+
+  fi
+
 fi
 
 if test "$wxUSE_BANNERWINDOW" = "yes"; then

configure.in

@@ -934,6 +934,7 @@ 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)
@@ -6699,6 +6700,11 @@ 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

include/wx/android/setup.h

@@ -922,6 +922,15 @@
 // the native control limitations.
 #define wxUSE_NATIVE_DATAVIEWCTRL 1
 
+// Use generic version of wxAnimationCtrl and supporting classes, even if a 
+// native one is available?
+//
+// 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.
 //

include/wx/gtk/setup0.h

@@ -923,6 +923,15 @@
 // the native control limitations.
 #define wxUSE_NATIVE_DATAVIEWCTRL 1
 
+// Use generic version of wxAnimationCtrl and supporting classes, even if a 
+// native one is available?
+//
+// 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.
 //

include/wx/motif/setup0.h

@@ -923,6 +923,15 @@
 // the native control limitations.
 #define wxUSE_NATIVE_DATAVIEWCTRL 1
 
+// Use generic version of wxAnimationCtrl and supporting classes, even if a 
+// native one is available?
+//
+// 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.
 //

include/wx/msw/setup0.h

@@ -923,6 +923,15 @@
 // the native control limitations.
 #define wxUSE_NATIVE_DATAVIEWCTRL 1
 
+// Use generic version of wxAnimationCtrl and supporting classes, even if a 
+// native one is available?
+//
+// 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.
 //

include/wx/osx/setup0.h

@@ -929,6 +929,15 @@
 // the native control limitations.
 #define wxUSE_NATIVE_DATAVIEWCTRL 1
 
+// Use generic version of wxAnimationCtrl and supporting classes, even if a 
+// native one is available?
+//
+// 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.
 //

include/wx/setup_inc.h

@@ -919,6 +919,15 @@
 // the native control limitations.
 #define wxUSE_NATIVE_DATAVIEWCTRL 1
 
+// Use generic version of wxAnimationCtrl and supporting classes, even if a 
+// native one is available?
+//
+// 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.
 //

include/wx/univ/setup0.h

@@ -922,6 +922,15 @@
 // the native control limitations.
 #define wxUSE_NATIVE_DATAVIEWCTRL 1
 
+// Use generic version of wxAnimationCtrl and supporting classes, even if a 
+// native one is available?
+//
+// 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.
 //

setup.h.in

@@ -415,6 +415,8 @@
 
 #define wxUSE_NATIVE_DATAVIEWCTRL 0
 
+#define wxUSE_NATIVE_ANIMATIONCTRL 0
+
 #define wxUSE_STATUSBAR    0
 
 #define wxUSE_NATIVE_STATUSBAR        0

setup.h_vms

@@ -465,6 +465,8 @@ typedef pid_t GPid;
 
 #define wxUSE_NATIVE_DATAVIEWCTRL 0
 
+#define wxUSE_NATIVE_ANIMATIONCTRL 0
+
 #define wxUSE_STATUSBAR    1
 
 #define wxUSE_NATIVE_STATUSBAR        0