From: Vadim Zeitlin Date: Mon, 30 Oct 2006 19:14:13 +0000 (+0000) Subject: use explicit virtual keyword with overridden virtual methods X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8d1517cef26509f5b2fca218145af4e4db7a4be2 use explicit virtual keyword with overridden virtual methods git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/generic/animate.h b/include/wx/generic/animate.h index f56056e595..f0cf9bbf9f 100644 --- a/include/wx/generic/animate.h +++ b/include/wx/generic/animate.h @@ -28,16 +28,18 @@ public: 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; + virtual size_t GetFrameCount() const; + virtual int GetDelay(size_t i) const; + virtual wxImage GetFrame(size_t i) const; + virtual wxSize GetSize() const; - bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY); - bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY); + virtual bool LoadFile(const wxString& filename, + wxAnimationType type = wxANIMATION_TYPE_ANY); + virtual bool Load(wxInputStream& stream, + wxAnimationType type = wxANIMATION_TYPE_ANY); public: // extended interface used by the generic implementation of wxAnimationCtrl