X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4adcc439d0efcff77559470918ff5e3e0f70a33..fae803f27be8ae1c4fe8f8775b333cc0fc80bdee:/include/wx/gtk/animate.h diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h index b58865029e..d9dbe1b72a 100644 --- a/include/wx/gtk/animate.h +++ b/include/wx/gtk/animate.h @@ -33,11 +33,6 @@ public: 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; } @@ -68,9 +63,6 @@ public: // used by GTK callbacks protected: GdkPixbufAnimation *m_pixbuf; - // used temporary by Load() - //bool m_bLoadComplete; - private: void UnRef(); @@ -89,7 +81,7 @@ private: class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase { public: - wxAnimationCtrl(); + wxAnimationCtrl() { Init(); } wxAnimationCtrl(wxWindow *parent, wxWindowID id, const wxAnimation& anim = wxNullAnimation, @@ -98,9 +90,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, @@ -128,12 +124,14 @@ public: // public API virtual bool IsPlaying() const; bool SetBackgroundColour( const wxColour &colour ); + void SetInactiveBitmap(const wxBitmap &bmp); protected: virtual wxSize DoGetBestSize() const; void FitToAnimation(); void ClearToBackgroundColour(); + void DisplayStaticImage(); void ResetAnim(); void ResetIter();