Merge recent wxPython changes from 2.8 branch to HEAD

[wxWidgets.git] / wxPython / src / animate.i

diff --git a/wxPython/src/animate.i b/wxPython/src/animate.i
index 8a2d294bdcbb294baf31017d8f4403092696d5af..2efc3fd6e8a80d93948466bf5a0f1d3912b8586e 100644 (file)
--- a/wxPython/src/animate.i
+++ b/wxPython/src/animate.i
@@ -77,12 +77,12 @@ public:
     virtual bool IsOk() const;
 
     // can be -1
     virtual bool IsOk() const;
 
     // can be -1

-    virtual int GetDelay(size_t i) const;
+    virtual int GetDelay(int i) const;

 
 

-    virtual size_t GetFrameCount() const;
+    virtual int GetFrameCount() const;

 
     %newobject GetFrame;
 
     %newobject GetFrame;

-    virtual wxImage GetFrame(size_t i) const;
+    virtual wxImage GetFrame(int i) const;

     virtual wxSize GetSize() const;
 
     virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY);
     virtual wxSize GetSize() const;
 
     virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY);


@@ -112,17 +112,17 @@ public:
 public:     // extended interface used by the generic implementation of wxAnimationCtrl
 
 #ifndef __WXGTK__
 public:     // extended interface used by the generic implementation of wxAnimationCtrl
 
 #ifndef __WXGTK__

-    wxPoint GetFramePosition(size_t frame) const;
-    wxSize GetFrameSize(size_t frame) const;
-    wxAnimationDisposal GetDisposalMethod(size_t frame) const;
-    wxColour GetTransparentColour(size_t frame) const;
+    wxPoint GetFramePosition(int frame) const;
+    wxSize GetFrameSize(int frame) const;
+    wxAnimationDisposal GetDisposalMethod(int frame) const;
+    wxColour GetTransparentColour(int frame) const;

     wxColour GetBackgroundColour() const;
 #else
     %extend {
     wxColour GetBackgroundColour() const;
 #else
     %extend {

-        wxPoint GetFramePosition(size_t frame) const { return wxDefaultPosition; }
-        wxSize GetFrameSize(size_t frame) const { return wxDefaultSize; }
-        wxAnimationDisposal GetDisposalMethod(size_t frame) const { return wxANIM_UNSPECIFIED; }
-        wxColour GetTransparentColour(size_t frame) const { return wxNullColour; }
+        wxPoint GetFramePosition(int frame) const { return wxDefaultPosition; }
+        wxSize GetFrameSize(int frame) const { return wxDefaultSize; }
+        wxAnimationDisposal GetDisposalMethod(int frame) const { return wxANIM_UNSPECIFIED; }
+        wxColour GetTransparentColour(int frame) const { return wxNullColour; }

         wxColour GetBackgroundColour() const { return wxNullColour; }
     }
 #endif
         wxColour GetBackgroundColour() const { return wxNullColour; }
     }
 #endif


@@ -178,6 +178,10 @@ public:
     virtual void Stop();
 
     virtual bool IsPlaying() const;
     virtual void Stop();
 
     virtual bool IsPlaying() const;

+    virtual void SetInactiveBitmap(const wxBitmap &bmp);
+    wxBitmap GetInactiveBitmap() const;
+
+    %property(InactiveBitmap, GetInactiveBitmap, SetInactiveBitmap);

 };
 
 
 };