make --static flag act on --cppflags too.

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

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 79419ead0f38da96000a7cd0832fbd8e90619555..17f1c1755262b12c6e436c86148cde384a3162bb 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -20,27 +20,21 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/window.h"
-#include "wx/msw/private.h"
+#if wxUSE_TIMER

 
 #ifndef WX_PRECOMP
     #include "wx/setup.h"
 
 #ifndef WX_PRECOMP
     #include "wx/setup.h"

+    #include "wx/window.h"

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

+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/intl.h"
-#include "wx/log.h"
-

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

-#include <time.h>
-#include <sys/types.h>
-
-#if !defined(__SC__) && !defined(__GNUWIN32__) && !defined(__MWERKS__)
-    #include <sys/timeb.h>
-#endif
+#include "wx/msw/private.h"

 
 // ----------------------------------------------------------------------------
 // private functions
 
 // ----------------------------------------------------------------------------
 // private functions


@@ -59,9 +53,7 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
     #define _EXPORT _export
 #endif
 
     #define _EXPORT _export
 #endif
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
-#endif
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -71,39 +63,40 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
 // wxTimer class
 // ----------------------------------------------------------------------------
 
 // wxTimer class
 // ----------------------------------------------------------------------------
 

-wxTimer::wxTimer()
+void wxTimer::Init()

 {
 {

-    milli = 0;
-    lastMilli = -1;
-    id = 0;
+    m_id = 0;

 }
 
 wxTimer::~wxTimer()
 {
 }
 
 wxTimer::~wxTimer()
 {

-    Stop();
+    wxTimer::Stop();

 
     wxTimerList.DeleteObject(this);
 }
 
 
     wxTimerList.DeleteObject(this);
 }
 

-bool wxTimer::Start(int milliseconds, bool mode)
+bool wxTimer::Start(int milliseconds, bool oneShot)

 {
 {

-    oneShot = mode;
-    if (milliseconds < 0)
-        milliseconds = lastMilli;
-
-    wxCHECK_MSG( milliseconds > 0, FALSE, T("invalid value for timer timeour") );
+    (void)wxTimerBase::Start(milliseconds, oneShot);

 
 

-    lastMilli = milli = milliseconds;
+    wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeour") );

 
     wxTimerList.DeleteObject(this);
 
     wxTimerList.DeleteObject(this);

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

     TIMERPROC wxTimerProcInst = (TIMERPROC)
         MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
 
     TIMERPROC wxTimerProcInst = (TIMERPROC)
         MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
 

-    id = SetTimer(NULL, (UINT)(id ? id : 1),
-                  (UINT)milliseconds, wxTimerProcInst);
-    if (id > 0)
+    m_id = SetTimer(NULL, (UINT)(m_id ? m_id : 1),
+                    (UINT)milliseconds, wxTimerProcInst);
+#endif
+
+    if ( m_id > 0 )

     {
     {

-        wxTimerList.Append(id, this);
+        wxTimerList.Append(m_id, this);

 
         return TRUE;
     }
 
         return TRUE;
     }


@@ -117,13 +110,13 @@ bool wxTimer::Start(int milliseconds, bool mode)
 
 void wxTimer::Stop()
 {
 
 void wxTimer::Stop()
 {

-    if ( id )
+    if ( m_id )

     {
     {

-        KillTimer(NULL, (UINT)id);
+        KillTimer(NULL, (UINT)m_id);

         wxTimerList.DeleteObject(this);
     }
         wxTimerList.DeleteObject(this);
     }

-    id = 0;
-    milli = 0;
+
+    m_id = 0;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -133,10 +126,10 @@ void wxTimer::Stop()
 void wxProcessTimer(wxTimer& timer)
 {
     // Avoid to process spurious timer events
 void wxProcessTimer(wxTimer& timer)
 {
     // Avoid to process spurious timer events

-    if ( timer.id == 0)
+    if ( timer.m_id == 0)

         return;
 
         return;
 

-    if ( timer.oneShot )
+    if ( timer.IsOneShot() )

         timer.Stop();
 
     timer.Notify();
         timer.Stop();
 
     timer.Notify();


@@ -146,9 +139,11 @@ UINT WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
 {
     wxNode *node = wxTimerList.Find((long)idTimer);
 
 {
     wxNode *node = wxTimerList.Find((long)idTimer);
 

-    wxCHECK_MSG( node, 0, T("bogus timer id in wxTimerProc") );
+    wxCHECK_MSG( node, 0, wxT("bogus timer id in wxTimerProc") );

 
     wxProcessTimer(*(wxTimer *)node->Data());
 
     return 0;
 }
 
     wxProcessTimer(*(wxTimer *)node->Data());
 
     return 0;
 }

+
+#endif // wxUSE_TIMER