Add wxDataViewTextRendererAttr, blind noop under wxMac

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

diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h
index 56dd791cf9a44191d0f2c837368460e5d9c9b803..1bc82afc180e147420f98fd6e603f561bae53ae8 100644 (file)
--- a/include/wx/gtk/animate.h
+++ b/include/wx/gtk/animate.h
@@ -27,31 +27,24 @@ typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter;
 class WXDLLIMPEXP_ADV wxAnimation : public wxAnimationBase
 {
 public:
 class WXDLLIMPEXP_ADV wxAnimation : public wxAnimationBase
 {
 public:

-    wxAnimation(GdkPixbufAnimation *p = NULL) { m_pixbuf = p; }
+    wxAnimation(GdkPixbufAnimation *p = NULL);

     wxAnimation(const wxAnimation&);
     ~wxAnimation() { UnRef(); }
 
     wxAnimation& operator= (const wxAnimation&);
 
     wxAnimation(const wxAnimation&);
     ~wxAnimation() { UnRef(); }
 
     wxAnimation& operator= (const wxAnimation&);
 

-    bool operator == (const wxAnimation& anim) const
-        { return m_pixbuf == anim.m_pixbuf; }
-    bool operator != (const wxAnimation& anim) const
-        { return m_pixbuf != anim.m_pixbuf; }
-

     virtual bool IsOk() const
         { return m_pixbuf != NULL; }
 
 
     // unfortunately GdkPixbufAnimation does not expose these info:
 
     virtual bool IsOk() const
         { return m_pixbuf != NULL; }
 
 
     // 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...
 
     // 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 WXUNUSED(frame)) const { return 0; }

 
     virtual wxSize GetSize() const;
 
 
     virtual wxSize GetSize() const;
 


@@ -129,14 +122,13 @@ public:     // public API
     virtual bool IsPlaying() const;
 
     bool SetBackgroundColour( const wxColour &colour );
     virtual bool IsPlaying() const;
 
     bool SetBackgroundColour( const wxColour &colour );

-    void SetInactiveBitmap(const wxBitmap &bmp);

 
 protected:
 
 
 protected:
 

+    virtual void DisplayStaticImage();

     virtual wxSize DoGetBestSize() const;
     void FitToAnimation();
     void ClearToBackgroundColour();
     virtual wxSize DoGetBestSize() const;
     void FitToAnimation();
     void ClearToBackgroundColour();

-    void DisplayStaticImage();

 
     void ResetAnim();
     void ResetIter();
 
     void ResetAnim();
     void ResetIter();