From 06bda3e5de51894484d548027963ae486f4e72bd Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 2 Apr 2020 12:59:26 -0700 Subject: [PATCH] Revert change that ended up just moving some lines --- include/wx/gtk/animate.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h index 9d06947ddf..b8893eca79 100644 --- a/include/wx/gtk/animate.h +++ b/include/wx/gtk/animate.h @@ -38,6 +38,11 @@ public: { return m_pixbuf != NULL; } + // unfortunately GdkPixbufAnimation does not expose these info: + + virtual unsigned int GetFrameCount() const wxOVERRIDE { return 0; } + virtual wxImage GetFrame(unsigned int frame) const wxOVERRIDE; + // we can retrieve the delay for a frame only after building // a GdkPixbufAnimationIter... virtual int GetDelay(unsigned int WXUNUSED(frame)) const wxOVERRIDE { return 0; } @@ -46,14 +51,6 @@ public: virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; virtual bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - // unfortunately GdkPixbufAnimation does not expose these info: - - virtual unsigned int GetFrameCount() const wxOVERRIDE - { return 0; } - virtual wxImage GetFrame(unsigned int WXUNUSED(frame)) const wxOVERRIDE - { return wxNullImage; } - - // Implementation public: // used by GTK callbacks