X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05a98b6d5d201eb8edea04b1ab022e4a9a46e9f0..3aa8e4ea6db0478d3bc862f59f100408bdc8732f:/include/wx/gtk/animate.h diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h index fcd39a3784..1bc82afc18 100644 --- a/include/wx/gtk/animate.h +++ b/include/wx/gtk/animate.h @@ -27,31 +27,24 @@ typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter; class WXDLLIMPEXP_ADV wxAnimation : public wxAnimationBase { public: - wxAnimation(GdkPixbufAnimation *p = NULL) { m_pixbuf = p; } + wxAnimation(GdkPixbufAnimation *p = NULL); wxAnimation(const wxAnimation&); ~wxAnimation() { UnRef(); } wxAnimation& operator= (const wxAnimation&); - bool operator == (const wxAnimation& anim) const - { return m_pixbuf == anim.m_pixbuf; } - bool operator != (const wxAnimation& anim) const - { return m_pixbuf != anim.m_pixbuf; } - virtual bool IsOk() const { return m_pixbuf != NULL; } // unfortunately GdkPixbufAnimation does not expose these info: - virtual size_t GetFrameCount() const - { return 0; } - virtual wxImage GetFrame(size_t i) const; + virtual unsigned int GetFrameCount() const { return 0; } + virtual wxImage GetFrame(unsigned int frame) const; // we can retrieve the delay for a frame only after building // a GdkPixbufAnimationIter... - virtual int GetDelay(size_t i) const - { return 0; } + virtual int GetDelay(unsigned int WXUNUSED(frame)) const { return 0; } virtual wxSize GetSize() const; @@ -68,9 +61,6 @@ public: // used by GTK callbacks protected: GdkPixbufAnimation *m_pixbuf; - // used temporary by Load() - //bool m_bLoadComplete; - private: void UnRef(); @@ -135,6 +125,7 @@ public: // public API protected: + virtual void DisplayStaticImage(); virtual wxSize DoGetBestSize() const; void FitToAnimation(); void ClearToBackgroundColour();