xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 14c53817f0eadd70eefed8de5027a2b70f83cd3e..cccb8ed09fc7634b5468a4eb6706ca60e85ef3f5 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "timer.h"
 #endif
 
     #pragma implementation "timer.h"
 #endif
 


@@ -48,19 +48,14 @@ WX_DECLARE_HASH_MAP( long,
                      wxTimerMap );
 
 wxTimerMap wxTimerList;
                      wxTimerMap );
 
 wxTimerMap wxTimerList;

-UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
+
+void WINAPI wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);

 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // 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
 #ifdef __WXMICROWIN__
     #define MakeProcInstance(proc, hinst) proc
 #endif


@@ -95,11 +90,16 @@ bool wxTimer::Start(int milliseconds, bool oneShot)
 
     wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeour") );
 
 
     wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeour") );
 

+#ifdef __WXWINCE__
+    m_id = ::SetTimer(NULL, (UINT)(m_id ? m_id : 1),
+                      (UINT)m_milli, (TIMERPROC) wxTimerProc);
+#else

     TIMERPROC wxTimerProcInst = (TIMERPROC)
         MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
 
     m_id = ::SetTimer(NULL, (UINT)(m_id ? m_id : 1),
                       (UINT)m_milli, wxTimerProcInst);
     TIMERPROC wxTimerProcInst = (TIMERPROC)
         MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
 
     m_id = ::SetTimer(NULL, (UINT)(m_id ? m_id : 1),
                       (UINT)m_milli, wxTimerProcInst);

+#endif

 
     if ( m_id > 0 )
     {
 
     if ( m_id > 0 )
     {


@@ -143,17 +143,15 @@ void wxProcessTimer(wxTimer& timer)
     timer.Notify();
 }
 
     timer.Notify();
 }
 

-UINT 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);
 
 {
     
     wxTimerMap::iterator node = wxTimerList.find((long)idTimer);
 

-    wxCHECK_MSG( node != wxTimerList.end(), 0,
-                 wxT("bogus timer id in wxTimerProc") );
+    wxASSERT_MSG( node != wxTimerList.end(), wxT("bogus timer id in wxTimerProc") );

 
     wxProcessTimer(*(node->second));
 
     wxProcessTimer(*(node->second));

-
-    return 0;

 }
 
 #endif // wxUSE_TIMER
 }
 
 #endif // wxUSE_TIMER

+