Adding label editing to native OS X listctrl.

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

diff --git a/include/wx/animate.h b/include/wx/animate.h
index 5d2772fec55cea0354223bb9d093399e1bddbfd2..d228b37f19286e40d3a65d5a8e3639d57697580e 100644 (file)
--- a/include/wx/animate.h
+++ b/include/wx/animate.h
@@ -16,27 +16,22 @@
 
 #if wxUSE_ANIMATIONCTRL
 
-#include <wx/defs.h>
-#include <wx/string.h>
-#include <wx/gdicmn.h>
-#include <wx/list.h>
-#include <wx/timer.h>
-#include <wx/bitmap.h>
-#include <wx/colour.h>
-#include <wx/control.h>
-#include <wx/animdecod.h>
+#include "wx/animdecod.h"
+#include "wx/control.h"
+#include "wx/timer.h"
+#include "wx/bitmap.h"
 
 class WXDLLIMPEXP_ADV wxAnimation;
 
-extern WXDLLEXPORT_DATA(wxAnimation) wxNullAnimation;
-extern WXDLLEXPORT_DATA(const wxChar) wxAnimationCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_ADV(wxAnimation) wxNullAnimation;
+extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxAnimationCtrlNameStr[];
 
 
 // ----------------------------------------------------------------------------
 // wxAnimationBase
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxAnimationBase : public wxGDIObject
+class WXDLLIMPEXP_ADV wxAnimationBase : public wxGDIObject
 {
 public:
     wxAnimationBase() {}
@@ -70,7 +65,6 @@ protected:
 // 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:
@@ -88,6 +82,13 @@ public:     // public API
 
     virtual bool IsPlaying() const = 0;
 
+    virtual void SetInactiveBitmap(const wxBitmap &bmp) = 0;
+    wxBitmap GetInactiveBitmap() const
+        { return m_bmpStatic; }
+
+protected:
+    wxBitmap m_bmpStatic;
+
 private:
     DECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase)
 };
@@ -97,7 +98,7 @@ private:
 // include the platform-specific version of the wxAnimationCtrl class
 // ----------------------------------------------------------------------------
 
-#if defined(__WXGTK__)
+#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/animate.h"
 #else
     #include "wx/generic/animate.h"