X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e07c114691a53dd0203809b6c630a4320aef05f7..8fde39dfea217d340c9151ae70b4d23d93e0eaf7:/include/wx/generic/animate.h?ds=inline diff --git a/include/wx/generic/animate.h b/include/wx/generic/animate.h index 9a7b30f58b..efc1c29446 100644 --- a/include/wx/generic/animate.h +++ b/include/wx/generic/animate.h @@ -12,6 +12,8 @@ #ifndef _WX_GENERIC_ANIMATEH__ #define _WX_GENERIC_ANIMATEH__ +#include "wx/bitmap.h" + // ---------------------------------------------------------------------------- // wxAnimation // ---------------------------------------------------------------------------- @@ -21,26 +23,24 @@ WX_DECLARE_LIST_WITH_DECL(wxAnimationDecoder, wxAnimationDecoderList, class WXDL class WXDLLIMPEXP_ADV wxAnimation : public wxAnimationBase { public: - bool operator == (const wxAnimation& anim) const - { return m_refData == anim.m_refData; } - bool operator != (const wxAnimation& anim) const - { return m_refData != anim.m_refData; } - - bool IsOk() const + virtual bool IsOk() const { return m_refData != NULL; } - size_t GetFrameCount() const; - int GetDelay(size_t i) const; - wxImage GetFrame(size_t i) const; - wxSize GetSize() const; - - bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY); - bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY); - -public: // extended interface used by the generic implementation of wxAnimationCtrl - - wxPoint GetFramePosition(size_t frame) const; - wxAnimationDisposal GetDisposalMethod(size_t frame) const; + virtual unsigned int GetFrameCount() const; + virtual int GetDelay(unsigned int i) const; + virtual wxImage GetFrame(unsigned int i) const; + virtual wxSize GetSize() const; + + virtual bool LoadFile(const wxString& filename, + wxAnimationType type = wxANIMATION_TYPE_ANY); + virtual bool Load(wxInputStream& stream, + wxAnimationType type = wxANIMATION_TYPE_ANY); + + // extended interface used by the generic implementation of wxAnimationCtrl + wxPoint GetFramePosition(unsigned int frame) const; + wxSize GetFrameSize(unsigned int frame) const; + wxAnimationDisposal GetDisposalMethod(unsigned int frame) const; + wxColour GetTransparentColour(unsigned int frame) const; wxColour GetBackgroundColour() const; protected: @@ -66,7 +66,7 @@ public: class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase { public: - wxAnimationCtrl(); + wxAnimationCtrl() { Init(); } wxAnimationCtrl(wxWindow *parent, wxWindowID id, const wxAnimation& anim = wxNullAnimation, @@ -75,9 +75,13 @@ public: long style = wxAC_DEFAULT_STYLE, const wxString& name = wxAnimationCtrlNameStr) { + Init(); + Create(parent, id, anim, pos, size, style, name); } + void Init(); + bool Create(wxWindow *parent, wxWindowID id, const wxAnimation& anim = wxNullAnimation, const wxPoint& pos = wxDefaultPosition, @@ -100,6 +104,11 @@ public: wxAnimation GetAnimation() const { return m_animation; } + virtual void SetInactiveBitmap(const wxBitmap &bmp); + + // override base class method + virtual bool SetBackgroundColour(const wxColour& col); + public: // event handlers void OnPaint(wxPaintEvent& event); @@ -132,16 +141,19 @@ protected: // internal utilities void FitToAnimation(); // Draw the background; use this when e.g. previous frame had wxANIM_TOBACKGROUND disposal. + void DisposeToBackground(); void DisposeToBackground(wxDC& dc); + void DisposeToBackground(wxDC& dc, const wxPoint &pos, const wxSize &sz); void IncrementalUpdateBackingStore(); - void RebuildBackingStoreUpToFrame(size_t); - void DrawFrame(wxDC &dc, size_t); + bool RebuildBackingStoreUpToFrame(unsigned int); + void DrawFrame(wxDC &dc, unsigned int); + virtual void DisplayStaticImage(); virtual wxSize DoGetBestSize() const; protected: - size_t m_currentFrame; // Current frame + unsigned int m_currentFrame; // Current frame bool m_looped; // Looped, or not wxTimer m_timer; // The timer wxAnimation m_animation; // The animation