From 398b178431a491148c1d88e41ce93ce2a267c15d Mon Sep 17 00:00:00 2001
From: Robin Dunn <>
Date: Tue, 24 Mar 2020 14:49:03 -0700
Subject: [PATCH] Compile native or generic animation classes based on wxUSE
 flags

---
 include/wx/animate.h     | 6 ++++--
 include/wx/chkconf.h     | 8 ++++++++
 src/generic/animateg.cpp | 6 ++++--
 src/gtk/animate.cpp      | 4 +++-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/include/wx/animate.h b/include/wx/animate.h
index 63e188b863..da1383d542 100644
--- a/include/wx/animate.h
+++ b/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
 
diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 9d0e7f743c..0164426b0c 100644
--- a/include/wx/chkconf.h
+++ b/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."
diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp
index c27fc524a9..4ace7dc266 100644
--- a/src/generic/animateg.cpp
+++ b/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
 
diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp
index 1bf80687e1..d53dd5a440 100644
--- a/src/gtk/animate.cpp
+++ b/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