Reverted FILLCOLORHINT->FILLCOLOR change. Now when a near black themeColor is returne...

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

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index 5262040cf6dc4e5fb091ed200b32b5a9f385164b..e01bedb5523cf5b3390fe8c4c8f23b83c50b0e90 100644 (file)
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -1,52 +1,175 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        timer.cpp
 // Purpose:     wxTimer implementation
 /////////////////////////////////////////////////////////////////////////////
 // Name:        timer.cpp
 // Purpose:     wxTimer implementation

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/17/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "timer.h"
+    #pragma implementation "timer.h"

 #endif
 
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/window.h"
+#include "wx/os2/private.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/setup.h"
+    #include "wx/list.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+#endif
+
+#include "wx/intl.h"
+#include "wx/log.h"
+

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

-#if !USE_SHARED_LIBRARY
+#include <time.h>
+#include <sys/types.h>
+
+#include <sys/timeb.h>
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+wxList wxTimerList(wxKEY_INTEGER);
+ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+

 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)

-#endif

 
 

-wxTimer::wxTimer()
+void wxTimer::Init()

 {
 {

-    m_milli = 0 ;
-    m_id = 0;
-    m_oneShot = FALSE;
+    m_ulId = 0;

 }
 
 wxTimer::~wxTimer()
 {
 }
 
 wxTimer::~wxTimer()
 {

-    Stop();
+    wxTimer::Stop();
+
+    wxTimerList.DeleteObject(this);

 }
 
 }
 

-bool wxTimer::Start(int milliseconds,bool mode)
+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
+)

 {
 {

-    m_oneShot = mode ;
-    if (milliseconds <= 0)
-        return FALSE;
+    (void)wxTimerBase::Start( nMilliseconds
+                             ,bOneShot
+                            );
+
+    wxCHECK_MSG( m_milli > 0L, FALSE, wxT("invalid value for timer") );
+
+    wxTimerList.DeleteObject(this);
+
+    wxWindow*                       pWin = NULL;

 
 

-    m_milli = milliseconds;
+    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"));

 
 

-    // TODO: set the timer going.
-    return FALSE;
+        return(FALSE);
+    }

 }
 
 void wxTimer::Stop()
 {
 }
 
 void wxTimer::Stop()
 {

-    m_id = 0 ;
-    m_milli = 0 ;
+    if ( m_ulId )
+    {
+        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);
+    }
+    m_ulId = 0L;
+}
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+void wxProcessTimer(
+  wxTimer&                          rTimer
+)
+{
+    //
+    // Avoid to process spurious timer events
+    //
+    if (rTimer.m_ulId == 0L)
+        return;
+
+    if (rTimer.IsOneShot())
+        rTimer.Stop();
+
+    rTimer.Notify();

 }
 
 }
 

+ULONG wxTimerProc(
+  HWND                              WXUNUSED(hwnd)
+, ULONG
+, int                               nIdTimer
+, ULONG
+)
+{
+    wxNode*                         pNode = wxTimerList.Find((ULONG)nIdTimer);
+
+    wxCHECK_MSG(pNode, 0, wxT("bogus timer id in wxTimerProc") );
+    if (pNode)
+      wxProcessTimer(*(wxTimer *)pNode->GetData());
+    return 0;
+}