Fix interface definition of GetMouseCursorAt

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

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index 7aa78227b3db7311cb004190db8fc8ad07e6ff92..764afc22abefd3ae8b06e486e868733dca556117 100644 (file)
--- 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:
 // Purpose:     wxTimer implementation
 // Author:      David Webster
 // Modified by:


@@ -9,27 +9,21 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "timer.h"
-#endif
-

 // 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/window.h"
-#include "wx/os2/private.h"
+#include "wx/os2/private/timer.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-    #include "wx/setup.h"

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

+    #include "wx/window.h"

     #include "wx/event.h"
     #include "wx/app.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/os2/private.h"

 
 #include <time.h>
 #include <sys/types.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
 
 // 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


@@ -62,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
 // ============================================================================


@@ -76,44 +64,12 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 // wxTimer class
 // ----------------------------------------------------------------------------
 
 // 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)
     {
 
     if (m_owner)
     {


@@ -125,11 +81,14 @@ bool wxTimer::Start(
                                 );
     }
     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


@@ -154,11 +113,11 @@ bool wxTimer::Start(
     {
         wxLogSysError(_("Couldn't create a timer"));
 
     {
         wxLogSysError(_("Couldn't create a timer"));
 

-        return(FALSE);
+        return false;

     }
 }
 
     }
 }
 

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

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


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

-  wxTimer&                          rTimer
+  wxOS2TimerImpl&                          rTimer

 )
 {
     //
 )
 {
     //


@@ -210,4 +169,3 @@ ULONG wxTimerProc(
     wxProcessTimer(*(node->second));
     return 0;
 }
     wxProcessTimer(*(node->second));
     return 0;
 }

-