move some data definitions to more appropriate places

[wxWidgets.git] / src / msw / timer.cpp

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 9a2b997200f01ec25060d916c0c75134c72bdcf2..e9904ba27cae700518ec109b39a412985d036111 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/timer.cpp
+// Name:        src/msw/timer.cpp

 // Purpose:     wxTimer implementation
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (use hash map instead of list, global rewrite)
 // Purpose:     wxTimer implementation
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (use hash map instead of list, global rewrite)


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "timer.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -22,9 +18,11 @@
 
 #if wxUSE_TIMER
 
 
 #if wxUSE_TIMER
 

+#include "wx/timer.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/window.h"

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

+    #include "wx/window.h"

     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/intl.h"


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

-#include "wx/timer.h"
-

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


@@ -166,4 +162,3 @@ wxTimerProc(HWND WXUNUSED(hwnd),
 }
 
 #endif // wxUSE_TIMER
 }
 
 #endif // wxUSE_TIMER

-