no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h
index 51d793766e73a84310b22e8a82617bf548942826..8a568a70570c868b45b0d219105a9f061c9f722b 100644 (file)
--- a/include/wx/gtk/animate.h
+++ b/include/wx/gtk/animate.h
@@ -27,6 +27,8 @@ typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter;
 class WXDLLIMPEXP_ADV wxAnimation : public wxAnimationBase
 {
 public:
 class WXDLLIMPEXP_ADV wxAnimation : public wxAnimationBase
 {
 public:

+    wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY)
+        : m_pixbuf(NULL) { LoadFile(name, type); }

     wxAnimation(GdkPixbufAnimation *p = NULL);
     wxAnimation(const wxAnimation&);
     ~wxAnimation() { UnRef(); }
     wxAnimation(GdkPixbufAnimation *p = NULL);
     wxAnimation(const wxAnimation&);
     ~wxAnimation() { UnRef(); }


@@ -39,14 +41,12 @@ public:
 
     // unfortunately GdkPixbufAnimation does not expose these info:
 
 
     // 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;
 


@@ -113,6 +113,7 @@ public:     // event handler
 public:     // public API
 
     virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY);
 public:     // public API
 
     virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY);

+    virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY);

 
     virtual void SetAnimation(const wxAnimation &anim);
     virtual wxAnimation GetAnimation() const
 
     virtual void SetAnimation(const wxAnimation &anim);
     virtual wxAnimation GetAnimation() const


@@ -124,14 +125,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();