Stop deriving native wxGTK wxAnimationCtrl from generic one

This is unnecessary and confusing.
This commit is contained in:
Vadim Zeitlin
2020-04-06 01:09:36 +02:00
parent 3678d67f92
commit d9b1ca54ca
4 changed files with 7 additions and 3 deletions

View File

@@ -146,13 +146,13 @@ protected:
// include the platform-specific version of the wxAnimationCtrl class // include the platform-specific version of the wxAnimationCtrl class
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#include "wx/generic/animate.h"
#if defined(__WXGTK20__) #if defined(__WXGTK20__)
#include "wx/gtk/animate.h" #include "wx/gtk/animate.h"
#define wxHAS_NATIVE_ANIMATIONCTRL #define wxHAS_NATIVE_ANIMATIONCTRL
#else #else
#include "wx/generic/animate.h"
class WXDLLIMPEXP_ADV wxAnimationCtrl : public wxGenericAnimationCtrl class WXDLLIMPEXP_ADV wxAnimationCtrl : public wxGenericAnimationCtrl
{ {
public: public:

View File

@@ -21,7 +21,7 @@ typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter;
// Resize to animation size if this is set // Resize to animation size if this is set
#define wxAN_FIT_ANIMATION 0x0010 #define wxAN_FIT_ANIMATION 0x0010
class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxGenericAnimationCtrl class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase
{ {
public: public:
wxAnimationCtrl() { Init(); } wxAnimationCtrl() { Init(); }

View File

@@ -42,6 +42,9 @@
#error Cannot compile this sample if wxAnimationCtrl is not enabled #error Cannot compile this sample if wxAnimationCtrl is not enabled
#endif #endif
#ifdef wxHAS_NATIVE_ANIMATIONCTRL
#include "wx/generic/animate.h"
#endif
wxIMPLEMENT_APP(MyApp); wxIMPLEMENT_APP(MyApp);

View File

@@ -17,6 +17,7 @@
#if wxUSE_ANIMATIONCTRL #if wxUSE_ANIMATIONCTRL
#include "wx/animate.h" #include "wx/animate.h"
#include "wx/generic/animate.h"
#include "wx/generic/private/animate.h" #include "wx/generic/private/animate.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP