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

source id type is unsigned; minor cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-03-10 18:51:55 +00:00
parent b91fd70410
commit 855f31ebe7
2 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/gtk/timer.h
View File

@@ -7,8 +7,8 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __GTKTIMERH__
#define __GTKTIMERH__
#ifndef _WX_GTK_TIMER_H_
#define _WX_GTK_TIMER_H_
//-----------------------------------------------------------------------------
// wxTimer
@@ -22,18 +22,17 @@ public:
{ Init(); }
virtual ~wxTimer();
virtual bool Start( int millisecs = -1, bool oneShot = FALSE );
virtual bool Start(int millisecs = -1, bool oneShot = false);
virtual void Stop();
virtual bool IsRunning() const { return m_tag != -1; }
protected:
void Init();
int m_tag;
virtual bool IsRunning() const { return m_sourceId != 0; }
private:
void Init();
unsigned m_sourceId;
DECLARE_ABSTRACT_CLASS(wxTimer)
};
#endif // __GTKTIMERH__
#endif // _WX_GTK_TIMER_H_

27
src/gtk/timer.cpp
View File

@@ -14,7 +14,7 @@
#include "wx/timer.h"
#include "gtk/gtk.h"
#include <gtk/gtk.h>
// ----------------------------------------------------------------------------
// wxTimer
@@ -23,7 +23,7 @@
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
extern "C" {
static gint timeout_callback( gpointer data )
static gboolean timeout_callback(gpointer data)
{
wxTimer *timer = (wxTimer*)data;
@@ -45,42 +45,39 @@ static gint timeout_callback( gpointer data )
// Release lock again.
gdk_threads_leave();
if (timer->IsOneShot())
return FALSE;
return TRUE;
return !timer->IsOneShot();
}
}
void wxTimer::Init()
{
m_tag = -1;
m_sourceId = 0;
m_milli = 1000;
}
wxTimer::~wxTimer()
{
wxTimer::Stop();
Stop();
}
bool wxTimer::Start( int millisecs, bool oneShot )
{
(void)wxTimerBase::Start(millisecs, oneShot);
if (m_tag != -1)
g_source_remove( m_tag );
if (m_sourceId != 0)
g_source_remove(m_sourceId);
m_tag = g_timeout_add( m_milli, timeout_callback, this );
m_sourceId = g_timeout_add(m_milli, timeout_callback, this);
return TRUE;
return true;
}
void wxTimer::Stop()
{
if (m_tag != -1)
if (m_sourceId != 0)
{
g_source_remove( m_tag );
m_tag = -1;
g_source_remove(m_sourceId);
m_sourceId = 0;
}
}