commented out controlDef for carbon

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

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index bca6302c871e4e2c489ca245c641766aaa929fb2..bb897e1f78b3c53b8595699047657e2e629d41f0 100644 (file)
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -31,104 +31,141 @@
 #include <sys/types.h>
 
 #include <sys/timeb.h>
-
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
 wxList wxTimerList(wxKEY_INTEGER);
-UINT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
+ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
-#endif
 
-wxTimer::wxTimer()
+void wxTimer::Init()
 {
-    milli = 0 ;
-    id = 0;
-    oneShot = FALSE;
+    m_ulId = 0;
 }
 
 wxTimer::~wxTimer()
 {
     Stop();
-
+    wxTimer::Stop();
     wxTimerList.DeleteObject(this);
 }
 
-bool wxTimer::Start(int milliseconds,bool mode)
+void wxTimer::Notify()
 {
-    oneShot = mode;
-    if (milliseconds < 0)
-        milliseconds = lastMilli;
-
-    wxCHECK_MSG( milliseconds > 0, FALSE, wxT("invalid value for timer timeour") );
+    //
+    // 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
+                            );
 
-    lastMilli = milli = milliseconds;
+    wxCHECK_MSG( m_milli > 0L, FALSE, wxT("invalid value for timer") );
 
     wxTimerList.DeleteObject(this);
-// TODO:
-/*
-    TIMERPROC wxTimerProcInst = (TIMERPROC)
-        MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
-
-    id = SetTimer(NULL, (UINT)(id ? id : 1),
-                  (UINT)milliseconds, wxTimerProcInst);
-*/
-    if (id > 0)
-    {
-        wxTimerList.Append(id, this);
 
-        return TRUE;
+    wxWindow*                       pWin = NULL;
+
+    if (m_owner)
+    {
+        pWin = (wxWindow*)m_owner;
+        m_ulId = ::WinStartTimer( m_Hab
+                                 ,pWin->GetHWND()
+                                 ,m_idTimer
+                                 ,(ULONG)nMilliseconds
+                                );
+    }
+    else
+        m_ulId = ::WinStartTimer( m_Hab
+                                 ,NULLHANDLE
+                                 ,0
+                                 ,(ULONG)nMilliseconds
+                                );
+    if (m_ulId > 0L)
+    {
+        wxTimerList.Append( m_ulId
+                           ,this
+                          );
+        return(TRUE);
     }
     else
     {
         wxLogSysError(_("Couldn't create a timer"));
 
-        return FALSE;
+        return(FALSE);
     }
 }
 
 void wxTimer::Stop()
 {
-    if ( id )
+    if ( m_ulId )
     {
-//        KillTimer(NULL, (UINT)id);
+        if (m_owner)
+        {
+            wxWindow*                   pWin = (wxWindow*)m_owner;
+
+            ::WinStopTimer(m_Hab, pWin->GetHWND(), m_ulId);
+        }
+        else
+            ::WinStopTimer(m_Hab, NULLHANDLE, m_ulId);
         wxTimerList.DeleteObject(this);
     }
-    id = 0;
-    milli = 0;
+    m_ulId = 0L;
 }
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
-void wxProcessTimer(wxTimer& timer)
+void wxProcessTimer(
+  wxTimer&                          rTimer
+)
 {
+    //
     // Avoid to process spurious timer events
-    if ( timer.id == 0)
+    //
+    if (rTimer.m_ulId == 0L)
         return;
 
-    if ( timer.oneShot )
-        timer.Stop();
+    if (rTimer.IsOneShot())
+        rTimer.Stop();
 
-    timer.Notify();
+    rTimer.Notify();
 }
 
-UINT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
+ULONG wxTimerProc(
+  HWND                              WXUNUSED(hwnd)
+, ULONG
+, int                               nIdTimer
+, ULONG
+)
 {
-    wxNode *node = wxTimerList.Find((long)idTimer);
-
-    wxCHECK_MSG( node, 0, wxT("bogus timer id in wxTimerProc") );
+    wxNode*                         pNode = wxTimerList.Find((ULONG)nIdTimer);
 
-    wxProcessTimer(*(wxTimer *)node->Data());
+    wxCHECK_MSG(pNode, 0, wxT("bogus timer id in wxTimerProc") );
 
+    wxProcessTimer(*(wxTimer *)pNode->Data());
     return 0;
 }