Fixed initialisation order warning

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

diff --git a/include/wx/animate.h b/include/wx/animate.h
index d40361a958fa8ab54caa0550878e146f8485a8dd..583b1afc74eab829baa1f5844bdfde3a8e282500 100644 (file)
--- a/include/wx/animate.h
+++ b/include/wx/animate.h
@@ -19,6 +19,7 @@
 #include "wx/animdecod.h"
 #include "wx/control.h"
 #include "wx/timer.h"
 #include "wx/animdecod.h"
 #include "wx/control.h"
 #include "wx/timer.h"

+#include "wx/bitmap.h"

 
 class WXDLLIMPEXP_ADV wxAnimation;
 
 
 class WXDLLIMPEXP_ADV wxAnimation;
 


@@ -64,7 +65,6 @@ protected:
 // auto-resizes by default to fit the new animation when SetAnimation() is called
 #define wxAC_DEFAULT_STYLE       (wxNO_BORDER)
 
 // auto-resizes by default to fit the new animation when SetAnimation() is called
 #define wxAC_DEFAULT_STYLE       (wxNO_BORDER)
 

-

 class WXDLLIMPEXP_ADV wxAnimationCtrlBase : public wxControl
 {
 public:
 class WXDLLIMPEXP_ADV wxAnimationCtrlBase : public wxControl
 {
 public:


@@ -82,6 +82,13 @@ public:     // public API
 
     virtual bool IsPlaying() const = 0;
 
 
     virtual bool IsPlaying() const = 0;
 

+    virtual void SetInactiveBitmap(const wxBitmap &bmp);
+    wxBitmap GetInactiveBitmap() const
+        { return m_bmpStatic; }
+
+protected:
+    wxBitmap m_bmpStatic;
+

 private:
     DECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase)
 };
 private:
     DECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase)
 };


@@ -91,7 +98,7 @@ private:
 // include the platform-specific version of the wxAnimationCtrl class
 // ----------------------------------------------------------------------------
 
 // include the platform-specific version of the wxAnimationCtrl class
 // ----------------------------------------------------------------------------
 

-#if defined(__WXGTK20__)
+#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)

     #include "wx/gtk/animate.h"
 #else
     #include "wx/generic/animate.h"
     #include "wx/gtk/animate.h"
 #else
     #include "wx/generic/animate.h"