Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2007-04-20 01:29:16 +00:00
parent a9c9588480
commit c2ca375c56
62 changed files with 1554 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/gtk/timer.cpp
View File

@@ -12,28 +12,23 @@
#if wxUSE_TIMER
#include "wx/timer.h"
#include "wx/gtk/private/timer.h"
#include <gtk/gtk.h>
// ----------------------------------------------------------------------------
// wxTimer
// wxTimerImpl
// ----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
extern "C" {
static gboolean timeout_callback(gpointer data)
{
wxTimer *timer = (wxTimer*)data;
wxGTKTimerImpl *timer = (wxGTKTimerImpl*)data;
// Don't change the order of anything in this callback!
if (timer->IsOneShot())
{
// This sets m_tag to -1
const bool keepGoing = !timer->IsOneShot();
if ( !keepGoing )
timer->Stop();
}
// When getting called from GDK's timer handler we
// are no longer within GDK's grab on the GUI
@@ -45,40 +40,29 @@ static gboolean timeout_callback(gpointer data)
// Release lock again.
gdk_threads_leave();
return !timer->IsOneShot();
}
return keepGoing;
}
void wxTimer::Init()
} // extern "C"
bool wxGTKTimerImpl::Start(int millisecs, bool oneShot)
{
m_sourceId = 0;
m_milli = 1000;
}
if ( !wxTimerImpl::Start(millisecs, oneShot) )
return false;
wxTimer::~wxTimer()
{
Stop();
}
bool wxTimer::Start( int millisecs, bool oneShot )
{
(void)wxTimerBase::Start(millisecs, oneShot);
if (m_sourceId != 0)
g_source_remove(m_sourceId);
wxASSERT_MSG( !m_sourceId, _T("shouldn't be still running") );
m_sourceId = g_timeout_add(m_milli, timeout_callback, this);
return true;
}
void wxTimer::Stop()
void wxGTKTimerImpl::Stop()
{
if (m_sourceId != 0)
{
g_source_remove(m_sourceId);
m_sourceId = 0;
}
wxASSERT_MSG( m_sourceId, _T("should be running") );
g_source_remove(m_sourceId);
m_sourceId = 0;
}
#endif // wxUSE_TIMER