X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4676948b6814c97b93c431a8cbcd8c0352c87ba9..ac8d0c118b7403e2838e75124b442051299e6f6c:/src/msw/timer.cpp?ds=sidebyside

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 3781b06f2b..cccb8ed09f 100644
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "timer.h"
 #endif
 
@@ -49,19 +49,13 @@ WX_DECLARE_HASH_MAP( long,
 
 wxTimerMap wxTimerList;
 
-void WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
+void WINAPI wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
-#ifdef __WIN32__
-    #define _EXPORT
-#else
-    #define _EXPORT _export
-#endif
-
-// should probably be in wx/msw/private.h
+// should probably be in wx/msw/missing.h
 #ifdef __WXMICROWIN__
     #define MakeProcInstance(proc, hinst) proc
 #endif
@@ -98,7 +92,7 @@ bool wxTimer::Start(int milliseconds, bool oneShot)
 
 #ifdef __WXWINCE__
     m_id = ::SetTimer(NULL, (UINT)(m_id ? m_id : 1),
-                      (UINT)m_milli, (void (__stdcall *)(struct HWND__ *,unsigned int,unsigned int,unsigned long)) wxTimerProc);
+                      (UINT)m_milli, (TIMERPROC) wxTimerProc);
 #else
     TIMERPROC wxTimerProcInst = (TIMERPROC)
         MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
@@ -149,7 +143,7 @@ void wxProcessTimer(wxTimer& timer)
     timer.Notify();
 }
 
-void WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
+void WINAPI wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
 {
     
     wxTimerMap::iterator node = wxTimerList.find((long)idTimer);
@@ -157,8 +151,7 @@ void WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
     wxASSERT_MSG( node != wxTimerList.end(), wxT("bogus timer id in wxTimerProc") );
 
     wxProcessTimer(*(node->second));
-
-    // return 0;
 }
 
 #endif // wxUSE_TIMER
+