use common AllocExclusive, rather than custom code

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

diff --git a/include/wx/animate.h b/include/wx/animate.h
index 5d2772fec55cea0354223bb9d093399e1bddbfd2..d40361a958fa8ab54caa0550878e146f8485a8dd 100644 (file)
--- a/include/wx/animate.h
+++ b/include/wx/animate.h
@@ -16,27 +16,21 @@
 
 #if wxUSE_ANIMATIONCTRL
 
 
 #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"

 
 class WXDLLIMPEXP_ADV wxAnimation;
 
 
 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
 // ----------------------------------------------------------------------------
 
 
 
 // ----------------------------------------------------------------------------
 // wxAnimationBase
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     wxAnimationBase() {}
 {
 public:
     wxAnimationBase() {}


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

-#if defined(__WXGTK__)
+#if defined(__WXGTK20__)

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