Compile native or generic animation classes based on wxUSE flags

include/wx/animate.h

@@ -114,9 +114,11 @@ private:
 // include the platform-specific version of the wxAnimationCtrl class
 // ----------------------------------------------------------------------------
 
-#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+#if wxUSE_NATIVE_ANIMATIONCTRL && defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+    #define wxUSE_GENERIC_ANIMATIONCTRL 0
     #include "wx/gtk/animate.h"
-#else
+#else 
+    #define wxUSE_GENERIC_ANIMATIONCTRL 1
     #include "wx/generic/animate.h"
 #endif
 

include/wx/chkconf.h

@@ -657,6 +657,14 @@
 #   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."

src/generic/animateg.cpp

@@ -14,10 +14,11 @@
   #pragma hdrstop
 #endif  //__BORLANDC__
 
-#if wxUSE_ANIMATIONCTRL
-
+#if wxUSE_ANIMATIONCTRL 
 #include "wx/animate.h"
 
+#if wxUSE_GENERIC_ANIMATIONCTRL
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/image.h"
@@ -692,5 +693,6 @@ void wxAnimationCtrl::OnSize(wxSizeEvent &WXUNUSED(event))
     }
 }
 
+#endif // wxUSE_GENERIC_ANIMATIONCTRL
 #endif // wxUSE_ANIMATIONCTRL
 

src/gtk/animate.cpp

@@ -12,9 +12,10 @@
 #include "wx/wxprec.h"
 
 #if wxUSE_ANIMATIONCTRL && !defined(__WXUNIVERSAL__)
-
 #include "wx/animate.h"
 
+#if !wxUSE_GENERIC_ANIMATIONCTRL
+
 #ifndef WX_PRECOMP
     #include "wx/image.h"
     #include "wx/log.h"
@@ -466,4 +467,5 @@ void wxAnimationCtrl::OnTimer(wxTimerEvent& WXUNUSED(ev))
     }
 }
 
+#endif      // !wxUSE_GENERIC_ANIMATIONCTRL
 #endif      // wxUSE_ANIMATIONCTRL