X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2461cfa0d9b786a26a783237bca38c920efecb51..079f4130b861d094c79e0952966caad8b85dab67:/src/os2/timer.cpp

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index 7aa78227b3..764afc22ab 100644
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.cpp
+// Name:        src/os2/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      David Webster
 // Modified by:
@@ -9,27 +9,21 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-    #pragma implementation "timer.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/window.h"
-#include "wx/os2/private.h"
+#include "wx/os2/private/timer.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/setup.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/intl.h"
-#include "wx/log.h"
-
-#include "wx/timer.h"
+#include "wx/os2/private.h"
 
 #include <time.h>
 #include <sys/types.h>
@@ -42,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
@@ -62,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
 // ============================================================================
@@ -76,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)
     {
@@ -125,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
@@ -154,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 )
     {
@@ -181,7 +140,7 @@ void wxTimer::Stop()
 // ----------------------------------------------------------------------------
 
 void wxProcessTimer(
-  wxTimer&                          rTimer
+  wxOS2TimerImpl&                          rTimer
 )
 {
     //
@@ -210,4 +169,3 @@ ULONG wxTimerProc(
     wxProcessTimer(*(node->second));
     return 0;
 }
-