compilation fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 822ece8f3577d0e1dac104cf33b00e1d43ba4866..14c53817f0eadd70eefed8de5027a2b70f83cd3e 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -23,8 +23,6 @@
 #if wxUSE_TIMER
 
 #ifndef WX_PRECOMP
 #if wxUSE_TIMER
 
 #ifndef WX_PRECOMP

-    #include "wx/hashmap.h"
-    #include "wx/setup.h"

     #include "wx/window.h"
     #include "wx/list.h"
     #include "wx/event.h"
     #include "wx/window.h"
     #include "wx/list.h"
     #include "wx/event.h"


@@ -33,6 +31,8 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

+#include "wx/hashmap.h"
+

 #include "wx/timer.h"
 
 #include "wx/msw/private.h"
 #include "wx/timer.h"
 
 #include "wx/msw/private.h"


@@ -42,7 +42,7 @@
 // ----------------------------------------------------------------------------
 
 WX_DECLARE_HASH_MAP( long,
 // ----------------------------------------------------------------------------
 
 WX_DECLARE_HASH_MAP( long,

-                     wxTimer*,
+                     wxTimer *,

                      wxIntegerHash,
                      wxIntegerEqual,
                      wxTimerMap );
                      wxIntegerHash,
                      wxIntegerEqual,
                      wxTimerMap );