Ensure that the default wxWebView backends are registered.

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

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index 72d7b1cdf28e661fd01e12a9b5dee40289ba4ee0..764afc22abefd3ae8b06e486e868733dca556117 100644 (file)
--- 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/os2/private/timer.h"
+

 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/window.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/intl.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"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"

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

 
 #include <time.h>
 #include <sys/types.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
 
 // 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
                     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);
 
 // timer callback used for all timers
 ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
 

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

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


@@ -70,37 +64,10 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 // wxTimer class
 // ----------------------------------------------------------------------------
 
 // wxTimer class
 // ----------------------------------------------------------------------------
 

-void wxTimer::Init()
-{
-    m_ulId = 0;
-}
-
-wxTimer::~wxTimer()
-{
-    wxTimer::Stop();
-}
-
-void wxTimer::Notify()
+bool wxOS2TimerImpl::Start( int nMilliseconds, bool bOneShot )

 {
 {

-    //
-    // 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") );
+    if ( !wxTimerImpl::Start( nMilliseconds, bOneShot ) )
+        return false;

 
     wxWindow* pWin = NULL;
 
 
     wxWindow* pWin = NULL;
 


@@ -114,11 +81,14 @@ bool wxTimer::Start( int nMilliseconds, bool bOneShot )
                                 );
     }
     else
                                 );
     }
     else

+    {

         m_ulId = ::WinStartTimer( m_Hab
                                  ,NULLHANDLE
                                  ,0
                                  ,(ULONG)nMilliseconds
                                 );
         m_ulId = ::WinStartTimer( m_Hab
                                  ,NULLHANDLE
                                  ,0
                                  ,(ULONG)nMilliseconds
                                 );

+    }
+

     if (m_ulId > 0L)
     {
         // check that SetTimer() didn't reuse an existing id: according to
     if (m_ulId > 0L)
     {
         // check that SetTimer() didn't reuse an existing id: according to


@@ -147,7 +117,7 @@ bool wxTimer::Start( int nMilliseconds, bool bOneShot )
     }
 }
 
     }
 }
 

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

 {
     if ( m_ulId )
     {
 {
     if ( m_ulId )
     {


@@ -170,7 +140,7 @@ void wxTimer::Stop()
 // ----------------------------------------------------------------------------
 
 void wxProcessTimer(
 // ----------------------------------------------------------------------------
 
 void wxProcessTimer(

-  wxTimer&                          rTimer
+  wxOS2TimerImpl&                          rTimer

 )
 {
     //
 )
 {
     //