Finally fixed control scrolling

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

diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h
index 6e43a643c9b78937cc8ae32ddbc531966f598d16..ef51ffe35242187d989db59faa95d1086076ce09 100644 (file)
--- a/include/wx/gtk/animate.h
+++ b/include/wx/gtk/animate.h
@@ -24,34 +24,27 @@ typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter;
 // refcounted so that assignment is very fast
 // ----------------------------------------------------------------------------
 
 // refcounted so that assignment is very fast
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxAnimation : public wxAnimationBase
+class WXDLLIMPEXP_ADV wxAnimation : public wxAnimationBase

 {
 public:
 {
 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 frame) const { return 0; }

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


@@ -68,9 +61,6 @@ public:     // used by GTK callbacks
 protected:
     GdkPixbufAnimation *m_pixbuf;
 
 protected:
     GdkPixbufAnimation *m_pixbuf;
 

-    // used temporary by Load()
-    //bool m_bLoadComplete;
-

 private:
     void UnRef();
 
 private:
     void UnRef();
 


@@ -89,7 +79,7 @@ private:
 class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase
 {
 public:
 class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase
 {
 public:

-    wxAnimationCtrl();
+    wxAnimationCtrl() { Init(); }

     wxAnimationCtrl(wxWindow *parent,
                         wxWindowID id,
                         const wxAnimation& anim = wxNullAnimation,
     wxAnimationCtrl(wxWindow *parent,
                         wxWindowID id,
                         const wxAnimation& anim = wxNullAnimation,


@@ -98,9 +88,13 @@ public:
                         long style = wxAC_DEFAULT_STYLE,
                         const wxString& name = wxAnimationCtrlNameStr)
     {
                         long style = wxAC_DEFAULT_STYLE,
                         const wxString& name = wxAnimationCtrlNameStr)
     {

+        Init();
+

         Create(parent, id, anim, pos, size, style, name);
     }
 
         Create(parent, id, anim, pos, size, style, name);
     }
 

+    void Init();
+

     bool Create(wxWindow *parent, wxWindowID id,
                 const wxAnimation& anim = wxNullAnimation,
                 const wxPoint& pos = wxDefaultPosition,
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxAnimation& anim = wxNullAnimation,
                 const wxPoint& pos = wxDefaultPosition,


@@ -131,6 +125,7 @@ public:     // public API
 
 protected:
 
 
 protected:
 

+    virtual void DisplayStaticImage();

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