diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h
index 84e951d014..c07faae189 100644
--- a/include/wx/android/setup.h
+++ b/include/wx/android/setup.h
@@ -922,8 +922,8 @@
 // the native control limitations.
 #define wxUSE_NATIVE_DATAVIEWCTRL 1
 
-// Use generic version of wxAnimationCtrl and supporting classes, even if a 
-// native one is available?
+// Use native version of wxAnimationCtrl and supporting classes, if available,
+// otherwise use the generic version of the animation classes.
 //
 // Default is 1.
 //
@@ -931,6 +931,7 @@
 // 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/gtk/setup0.h b/include/wx/gtk/setup0.h
index 82a7e43eae..059be214dd 100644
--- a/include/wx/gtk/setup0.h
+++ b/include/wx/gtk/setup0.h
@@ -923,8 +923,8 @@
 // the native control limitations.
 #define wxUSE_NATIVE_DATAVIEWCTRL 1
 
-// Use generic version of wxAnimationCtrl and supporting classes, even if a 
-// native one is available?
+// Use native version of wxAnimationCtrl and supporting classes, if available,
+// otherwise use the generic version of the animation classes.
 //
 // Default is 1.
 //
diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index 8b24dcec32..8e82173472 100644
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -923,8 +923,8 @@
 // the native control limitations.
 #define wxUSE_NATIVE_DATAVIEWCTRL 1
 
-// Use generic version of wxAnimationCtrl and supporting classes, even if a 
-// native one is available?
+// Use native version of wxAnimationCtrl and supporting classes, if available,
+// otherwise use the generic version of the animation classes.
 //
 // Default is 1.
 //
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index f8bc121909..22d421af06 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -923,8 +923,8 @@
 // the native control limitations.
 #define wxUSE_NATIVE_DATAVIEWCTRL 1
 
-// Use generic version of wxAnimationCtrl and supporting classes, even if a 
-// native one is available?
+// Use native version of wxAnimationCtrl and supporting classes, if available,
+// otherwise use the generic version of the animation classes.
 //
 // Default is 1.
 //
diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h
index 430224fd01..102b6dd013 100644
--- a/include/wx/osx/setup0.h
+++ b/include/wx/osx/setup0.h
@@ -929,8 +929,8 @@
 // the native control limitations.
 #define wxUSE_NATIVE_DATAVIEWCTRL 1
 
-// Use generic version of wxAnimationCtrl and supporting classes, even if a 
-// native one is available?
+// Use native version of wxAnimationCtrl and supporting classes, if available,
+// otherwise use the generic version of the animation classes.
 //
 // Default is 1.
 //
diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index cd9a823592..8407946990 100644
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -919,8 +919,8 @@
 // the native control limitations.
 #define wxUSE_NATIVE_DATAVIEWCTRL 1
 
-// Use generic version of wxAnimationCtrl and supporting classes, even if a 
-// native one is available?
+// Use native version of wxAnimationCtrl and supporting classes, if available,
+// otherwise use the generic version of the animation classes.
 //
 // Default is 1.
 //
diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 16a78a50fa..70d94b601b 100644
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -922,8 +922,8 @@
 // the native control limitations.
 #define wxUSE_NATIVE_DATAVIEWCTRL 1
 
-// Use generic version of wxAnimationCtrl and supporting classes, even if a 
-// native one is available?
+// Use native version of wxAnimationCtrl and supporting classes, if available,
+// otherwise use the generic version of the animation classes.
 //
 // Default is 1.
 //
diff --git a/setup.h_vms b/setup.h_vms
index 51334a9fc0..57af15dc19 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -465,7 +465,7 @@ typedef pid_t GPid;
 
 #define wxUSE_NATIVE_DATAVIEWCTRL 0
 
-#define wxUSE_NATIVE_ANIMATIONCTRL 0
+#define wxUSE_NATIVE_ANIMATIONCTRL 1
 
 #define wxUSE_STATUSBAR    1