Stop deriving native wxGTK wxAnimationCtrl from generic one
This is unnecessary and confusing.
This commit is contained in:
@@ -146,13 +146,13 @@ protected:
|
||||
// include the platform-specific version of the wxAnimationCtrl class
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#include "wx/generic/animate.h"
|
||||
|
||||
#if defined(__WXGTK20__)
|
||||
#include "wx/gtk/animate.h"
|
||||
|
||||
#define wxHAS_NATIVE_ANIMATIONCTRL
|
||||
#else
|
||||
#include "wx/generic/animate.h"
|
||||
|
||||
class WXDLLIMPEXP_ADV wxAnimationCtrl : public wxGenericAnimationCtrl
|
||||
{
|
||||
public:
|
||||
|
@@ -21,7 +21,7 @@ typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter;
|
||||
// Resize to animation size if this is set
|
||||
#define wxAN_FIT_ANIMATION 0x0010
|
||||
|
||||
class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxGenericAnimationCtrl
|
||||
class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase
|
||||
{
|
||||
public:
|
||||
wxAnimationCtrl() { Init(); }
|
||||
|
@@ -42,6 +42,9 @@
|
||||
#error Cannot compile this sample if wxAnimationCtrl is not enabled
|
||||
#endif
|
||||
|
||||
#ifdef wxHAS_NATIVE_ANIMATIONCTRL
|
||||
#include "wx/generic/animate.h"
|
||||
#endif
|
||||
|
||||
wxIMPLEMENT_APP(MyApp);
|
||||
|
||||
|
@@ -17,6 +17,7 @@
|
||||
#if wxUSE_ANIMATIONCTRL
|
||||
|
||||
#include "wx/animate.h"
|
||||
#include "wx/generic/animate.h"
|
||||
#include "wx/generic/private/animate.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
|
Reference in New Issue
Block a user