preparation for allowing to use wxTimer in wxBase (heavily modified patch 1113088):

1. Changed wxTimer to use wxTimerImpl 2. Added Unix-specific generic timer implementation 3. Added wxAppTraits::CreateTimerImpl() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-20 01:29:16 +00:00
parent a9c9588480
commit c2ca375c56
62 changed files with 1554 additions and 931 deletions
--- a/src/common/timerimpl.cpp
+++ b/src/common/timerimpl.cpp
@@ -0,0 +1,84 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        common/timercmn.cpp
+// Purpose:     wxTimerBase implementation
+// Author:      Julian Smart, Guillermo Rodriguez, Vadim Zeitlin
+// Modified by: VZ: extracted all non-wxTimer stuff in stopwatch.cpp (20.06.03)
+// Created:     04/01/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+//              (c) 1999 Guillermo Rodriguez <guille@iies.es>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxWin headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_TIMER
+
+#include "wx/private/timer.h"
+#include "wx/utils.h"               // for wxNewId()
+
+wxTimerImpl::wxTimerImpl(wxTimer *timer)
+{
+    m_timer = timer;
+    m_owner = NULL;
+    m_idTimer = wxID_ANY;
+    m_milli = 0;
+    m_oneShot = false;
+}
+
+void wxTimerImpl::SetOwner(wxEvtHandler *owner, int timerid)
+{
+    m_owner = owner;
+    m_idTimer = timerid == wxID_ANY ? wxNewId() : timerid;
+}
+
+void wxTimerImpl::SendEvent()
+{
+    wxTimerEvent event(m_idTimer, m_milli);
+    event.SetEventObject(m_owner);
+    (void)m_owner->ProcessEvent(event);
+}
+
+bool wxTimerImpl::Start(int milliseconds, bool oneShot)
+{
+    // under MSW timers only work when they're started from the main thread so
+    // let the caller know about it
+#if wxUSE_THREADS
+    wxASSERT_MSG( wxThread::IsMain(),
+                  _T("timer can only be started from the main thread") );
+#endif // wxUSE_THREADS
+
+    if ( IsRunning() )
+    {
+        // not stopping the already running timer might work for some
+        // platforms (no problems under MSW) but leads to mysterious crashes
+        // on the others (GTK), so to be on the safe side do it here
+        Stop();
+    }
+
+    if ( milliseconds != -1 )
+    {
+        m_milli = milliseconds;
+    }
+
+    m_oneShot = oneShot;
+
+    return true;
+}
+
+
+#endif // wxUSE_TIMER
+