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

Add missing wxOVERRIDE, and some other cleanup

Browse Source
This commit is contained in:
Robin Dunn 2020-04-01 14:55:08 -07:00
parent 6b6a930e9c
commit fb69a2975f
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/animate.h
View File

@ -28,10 +28,6 @@ class WXDLLIMPEXP_ADV wxAnimationGTKImpl : public wxAnimationImpl
public: public:
wxAnimationGTKImpl() wxAnimationGTKImpl()
: m_pixbuf(NULL) {} : m_pixbuf(NULL) {}
// wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY)
// : m_pixbuf(NULL) { LoadFile(name, type); }
// wxAnimation(GdkPixbufAnimation *p = NULL);
// wxAnimation(const wxAnimation&);
~wxAnimationGTKImpl() { UnRef(); } ~wxAnimationGTKImpl() { UnRef(); }
// wxAnimation& operator= (const wxAnimation&); // wxAnimation& operator= (const wxAnimation&);
@ -119,7 +115,7 @@ public: // public API
virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE;
virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE;
void SetAnimation(const wxAnimation &anim); void SetAnimation(const wxAnimation &anim) wxOVERRIDE;
virtual bool Play() wxOVERRIDE; virtual bool Play() wxOVERRIDE;
virtual void Stop() wxOVERRIDE; virtual void Stop() wxOVERRIDE;

2
src/common/animatecmn.cpp
View File

@ -90,7 +90,7 @@ wxSize wxAnimation::GetSize() const
bool wxAnimation::LoadFile(const wxString& name, wxAnimationType type) bool wxAnimation::LoadFile(const wxString& name, wxAnimationType type)
{ {
// the animation impl may not be fully ready until after it has loaded the // the animation impl may not be fully ready until after it has loaded the
// file, so just check GetImpl the Load methods // file, so just check GetImpl in the Load methods
wxCHECK_MSG( GetImpl(), false, wxT("invalid animation") ); wxCHECK_MSG( GetImpl(), false, wxT("invalid animation") );
return GetImpl()->LoadFile(name, type); return GetImpl()->LoadFile(name, type);
} }