Remove unnecessary Mac-specific TOOLKIT_LOWERCASE setting.

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

diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h
index ef51ffe35242187d989db59faa95d1086076ce09..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(); }


@@ -44,7 +46,7 @@ public:
 
     // 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(unsigned int frame) const { return 0; }
+    virtual int GetDelay(unsigned int WXUNUSED(frame)) const { return 0; }

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


@@ -111,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