make wxTmemchr() return (and take) char* instead of void* in ANSI build too

[wxWidgets.git] / include / wx / gtk / animate.h

diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h
index 51d793766e73a84310b22e8a82617bf548942826..ef51ffe35242187d989db59faa95d1086076ce09 100644 (file)
--- a/include/wx/gtk/animate.h
+++ b/include/wx/gtk/animate.h
@@ -39,14 +39,12 @@ public:
 
     // unfortunately GdkPixbufAnimation does not expose these info:
 
-    virtual size_t GetFrameCount() const
-        { return 0; }
-    virtual wxImage GetFrame(size_t i) const;
+    virtual unsigned int GetFrameCount() const { return 0; }
+    virtual wxImage GetFrame(unsigned int frame) const;
 
     // we can retrieve the delay for a frame only after building
     // a GdkPixbufAnimationIter...
-    virtual int GetDelay(size_t i) const
-        { return 0; }
+    virtual int GetDelay(unsigned int frame) const { return 0; }
 
     virtual wxSize GetSize() const;
 
@@ -124,14 +122,13 @@ public:     // public API
     virtual bool IsPlaying() const;
 
     bool SetBackgroundColour( const wxColour &colour );
-    void SetInactiveBitmap(const wxBitmap &bmp);
 
 protected:
 
+    virtual void DisplayStaticImage();
     virtual wxSize DoGetBestSize() const;
     void FitToAnimation();
     void ClearToBackgroundColour();
-    void DisplayStaticImage();
 
     void ResetAnim();
     void ResetIter();