more wxSocket code wx-ification: use wxDynamicLibrary instead of raw Win32 calls

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

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index e9904ba27cae700518ec109b39a412985d036111..90279587056034653bc5a748ad219a0d43f75c69 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -18,19 +18,17 @@
 
 #if wxUSE_TIMER
 
 
 #if wxUSE_TIMER
 

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

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

-    #include "wx/window.h"

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

+    #include "wx/hashmap.h"

 #endif
 
 #endif
 

-#include "wx/hashmap.h"
-

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


@@ -39,7 +37,7 @@
 
 // define a hash containing all the timers: it is indexed by timer id and
 // contains the corresponding timer
 
 // define a hash containing all the timers: it is indexed by timer id and
 // contains the corresponding timer

-WX_DECLARE_HASH_MAP(unsigned long, wxTimer *, wxIntegerHash, wxIntegerEqual,
+WX_DECLARE_HASH_MAP(unsigned long, wxMSWTimerImpl *, wxIntegerHash, wxIntegerEqual,

                     wxTimerMap);
 
 // instead of using a global here, wrap it in a static function as otherwise it
                     wxTimerMap);
 
 // instead of using a global here, wrap it in a static function as otherwise it


@@ -59,35 +57,18 @@ static wxTimerMap& TimerMap()
 // timer callback used for all timers
 void WINAPI wxTimerProc(HWND hwnd, UINT msg, UINT_PTR idTimer, DWORD dwTime);
 
 // timer callback used for all timers
 void WINAPI wxTimerProc(HWND hwnd, UINT msg, UINT_PTR idTimer, DWORD dwTime);
 

-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// wxTimer class
+// wxMSWTimerImpl class

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxTimer::Init()
-{
-    m_id = 0;
-}
-
-wxTimer::~wxTimer()
+bool wxMSWTimerImpl::Start(int milliseconds, bool oneShot)

 {
 {

-    wxTimer::Stop();
-}
-
-bool wxTimer::Start(int milliseconds, bool oneShot)
-{
-    (void)wxTimerBase::Start(milliseconds, oneShot);
-
-    wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeout") );
+    if ( !wxTimerImpl::Start(milliseconds, oneShot) )
+        return false;

 
     m_id = ::SetTimer
              (
 
     m_id = ::SetTimer
              (


@@ -122,14 +103,13 @@ bool wxTimer::Start(int milliseconds, bool oneShot)
     return true;
 }
 
     return true;
 }
 

-void wxTimer::Stop()
+void wxMSWTimerImpl::Stop()

 {
 {

-    if ( m_id )
-    {
-        ::KillTimer(NULL, m_id);
+    wxASSERT_MSG( m_id, _T("should be running") );

 
 

-        TimerMap().erase(m_id);
-    }
+    ::KillTimer(NULL, m_id);
+
+    TimerMap().erase(m_id);

 
     m_id = 0;
 }
 
     m_id = 0;
 }


@@ -138,9 +118,9 @@ void wxTimer::Stop()
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 

-void wxProcessTimer(wxTimer& timer)
+void wxProcessTimer(wxMSWTimerImpl& timer)

 {
 {

-    wxASSERT_MSG( timer.m_id != 0, _T("bogus timer id") );
+    wxASSERT_MSG( timer.IsRunning(), _T("bogus timer id") );

 
     if ( timer.IsOneShot() )
         timer.Stop();
 
     if ( timer.IsOneShot() )
         timer.Stop();