X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/521bf4ff3ef47059265beff5d53c9e1162beb122..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/os2/timer.cpp

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index 8c322fbb38..764afc22ab 100644
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -12,18 +12,18 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/os2/private/timer.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/window.h"
     #include "wx/list.h"
+    #include "wx/window.h"
     #include "wx/event.h"
     #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/os2/private.h"
-#include "wx/intl.h"
-#include "wx/log.h"
-
-#include "wx/timer.h"
 
 #include <time.h>
 #include <sys/types.h>
@@ -36,7 +36,7 @@
 
 // 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, wxOS2TimerImpl *, wxIntegerHash, wxIntegerEqual,
                     wxTimerMap);
 
 // instead of using a global here, wrap it in a static function as otherwise it
@@ -56,12 +56,6 @@ static wxTimerMap& TimerMap()
 // timer callback used for all timers
 ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
 
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -70,44 +64,12 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 // wxTimer class
 // ----------------------------------------------------------------------------
 
-void wxTimer::Init()
+bool wxOS2TimerImpl::Start( int nMilliseconds, bool bOneShot )
 {
-    m_ulId = 0;
-}
+    if ( !wxTimerImpl::Start( nMilliseconds, bOneShot ) )
+        return false;
 
-wxTimer::~wxTimer()
-{
-    wxTimer::Stop();
-}
-
-void wxTimer::Notify()
-{
-    //
-    // The base class version generates an event if it has owner - which it
-    // should because otherwise nobody can process timer events, but it does
-    // not use the OS's ID, which OS/2 must have to figure out which timer fired
-    //
-    wxCHECK_RET( m_owner, _T("wxTimer::Notify() should be overridden.") );
-
-    wxTimerEvent                    vEvent( m_idTimer
-                                           ,m_milli
-                                          );
-
-    (void)m_owner->ProcessEvent(vEvent);
-} // end of wxTimer::Notify
-
-bool wxTimer::Start(
-  int                               nMilliseconds
-, bool                              bOneShot
-)
-{
-    (void)wxTimerBase::Start( nMilliseconds
-                             ,bOneShot
-                            );
-
-    wxCHECK_MSG( m_milli > 0L, FALSE, wxT("invalid value for timer") );
-
-    wxWindow*                       pWin = NULL;
+    wxWindow* pWin = NULL;
 
     if (m_owner)
     {
@@ -119,11 +81,14 @@ bool wxTimer::Start(
                                 );
     }
     else
+    {
         m_ulId = ::WinStartTimer( m_Hab
                                  ,NULLHANDLE
                                  ,0
                                  ,(ULONG)nMilliseconds
                                 );
+    }
+
     if (m_ulId > 0L)
     {
         // check that SetTimer() didn't reuse an existing id: according to
@@ -148,11 +113,11 @@ bool wxTimer::Start(
     {
         wxLogSysError(_("Couldn't create a timer"));
 
-        return(FALSE);
+        return false;
     }
 }
 
-void wxTimer::Stop()
+void wxOS2TimerImpl::Stop()
 {
     if ( m_ulId )
     {
@@ -175,7 +140,7 @@ void wxTimer::Stop()
 // ----------------------------------------------------------------------------
 
 void wxProcessTimer(
-  wxTimer&                          rTimer
+  wxOS2TimerImpl&                          rTimer
 )
 {
     //