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

Restore wxAnimation::GetFrame() constness

Browse Source 
This got lost, almost surely accidentally, in 706c8e8ad6 (Merge branch
'disable-native-animation', 2020-04-07), so just restore it now.

See https://github.com/wxWidgets/wxWidgets/pull/1768

Closes #18725.
This commit is contained in:
Vadim Zeitlin
2020-04-12 16:32:58 +02:00
parent 2197f9d10e
commit ed077e17cf
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/animate.h
View File

@@ -48,7 +48,7 @@ public:
int GetDelay(unsigned int frame) const; int GetDelay(unsigned int frame) const;
unsigned int GetFrameCount() const; unsigned int GetFrameCount() const;
wxImage GetFrame(unsigned int frame); wxImage GetFrame(unsigned int frame) const;
wxSize GetSize() const; wxSize GetSize() const;
bool LoadFile(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY); bool LoadFile(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY);

2
interface/wx/animate.h
View File

@@ -381,7 +381,7 @@ public:
This method is not implemented in the native wxGTK implementation of This method is not implemented in the native wxGTK implementation of
this class and always returns an invalid image there. this class and always returns an invalid image there.
*/ */
wxImage GetFrame(unsigned int frame); wxImage GetFrame(unsigned int frame) const;
/** /**
Returns the size of the animation. Returns the size of the animation.

2
src/common/animatecmn.cpp
View File

@@ -103,7 +103,7 @@ unsigned int wxAnimation::GetFrameCount() const
return GetImpl()->GetFrameCount(); return GetImpl()->GetFrameCount();
} }
wxImage wxAnimation::GetFrame(unsigned int frame) wxImage wxAnimation::GetFrame(unsigned int frame) const
{ {
wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid animation") ); wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid animation") );
return GetImpl()->GetFrame(frame); return GetImpl()->GetFrame(frame);