Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Name the base animation class wxGenericAnimation with a wxAnimation shim class

Browse Source
This commit is contained in:
Robin Dunn
2020-03-27 14:33:11 -07:00
parent fae15d39a6
commit 488084c2f5
5 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/animate.h
View File

@@ -21,6 +21,7 @@
#include "wx/bitmap.h"
class WXDLLIMPEXP_FWD_CORE wxAnimation;
//class WXDLLIMPEXP_FWD_CORE wxAnimationGeneric;
extern WXDLLIMPEXP_DATA_CORE(wxAnimation) wxNullAnimation;
extern WXDLLIMPEXP_DATA_CORE(const char) wxAnimationCtrlNameStr[];
@@ -32,11 +33,11 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxAnimationCtrlNameStr[];
WX_DECLARE_LIST_WITH_DECL(wxAnimationDecoder, wxAnimationDecoderList, class WXDLLIMPEXP_ADV);
class WXDLLIMPEXP_ADV wxAnimation : public wxObject
class WXDLLIMPEXP_ADV wxGenericAnimation : public wxObject
{
public:
wxAnimation() {}
wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY)
wxGenericAnimation() {}
wxGenericAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY)
{ LoadFile(name, type); }
virtual bool IsOk() const
@@ -71,7 +72,7 @@ public:
static void CleanUpHandlers();
static void InitStandardHandlers();
wxDECLARE_DYNAMIC_CLASS(wxAnimation);
wxDECLARE_DYNAMIC_CLASS(wxGenericAnimation);
};
@@ -138,6 +139,18 @@ private:
#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
#include "wx/gtk/animate.h"
#else
class WXDLLIMPEXP_ADV wxAnimation : public wxGenericAnimation
{
public:
wxAnimation()
: wxGenericAnimation() {}
wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY)
: wxGenericAnimation(name, type) {}
private:
wxDECLARE_DYNAMIC_CLASS(wxAnimation);
};
#include "wx/generic/animate.h"
class WXDLLIMPEXP_ADV wxAnimationCtrl : public wxGenericAnimationCtrl