projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct a print format specifier mismatch in wxFileConfig::Parse().
[wxWidgets.git]
/
src
/
gtk1
/
timer.cpp
diff --git
a/src/gtk1/timer.cpp
b/src/gtk1/timer.cpp
index c5e8bd37add140f03a8b4ebbc29f69811547ede3..f099957c69a9735f2334435ec343f70281ebd9aa 100644
(file)
--- a/
src/gtk1/timer.cpp
+++ b/
src/gtk1/timer.cpp
@@
-7,12
+7,11
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_TIMER
#include "wx/wxprec.h"
#if wxUSE_TIMER
-#include "wx/timer.h"
+#include "wx/
gtk1/private/
timer.h"
#include "gtk/gtk.h"
#include "gtk/gtk.h"
@@
-20,20
+19,14
@@
// wxTimer
// ----------------------------------------------------------------------------
// wxTimer
// ----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-
extern "C" {
extern "C" {
-static gint timeout_callback(
gpointer data
)
+static gint timeout_callback(
void *data
)
{
{
- wxTimer *timer = (wxTimer*)data;
-
- // Don't change the order of anything in this callback!
+ wxTimerImpl * const timer = (wxTimerImpl *)data;
- if (timer->IsOneShot())
- {
- // This sets m_tag to -1
+ const bool keepGoing = !timer->IsOneShot();
+ if ( !keepGoing )
timer->Stop();
timer->Stop();
- }
// When getting called from GDK's timer handler we
// are no longer within GDK's grab on the GUI
// When getting called from GDK's timer handler we
// are no longer within GDK's grab on the GUI
@@
-45,43
+38,28
@@
static gint timeout_callback( gpointer data )
// Release lock again.
gdk_threads_leave();
// Release lock again.
gdk_threads_leave();
- if (timer->IsOneShot())
- return FALSE;
-
- return TRUE;
-}
-}
-
-void wxTimer::Init()
-{
- m_tag = -1;
- m_milli = 1000;
+ return keepGoing;
}
}
-
-wxTimer::~wxTimer()
-{
- wxTimer::Stop();
}
}
-bool wx
Timer::Start( int millisecs, bool oneShot
)
+bool wx
GTKTimerImpl::Start(int millisecs, bool oneShot
)
{
{
- (void)wxTimerBase::Start(millisecs, oneShot);
+ if ( !wxTimerImpl::Start(millisecs, oneShot) )
+ return false;
- if (m_tag != -1)
- gtk_timeout_remove( m_tag );
+ wxASSERT_MSG( m_tag == -1, wxT("shouldn't be still running") );
m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
- return
TRUE
;
+ return
true
;
}
}
-void wx
Timer
::Stop()
+void wx
GTKTimerImpl
::Stop()
{
{
- if (m_tag != -1)
- {
- gtk_timeout_remove( m_tag );
- m_tag = -1;
- }
+ wxASSERT_MSG( m_tag != -1, wxT("should be running") );
+
+ gtk_timeout_remove( m_tag );
+ m_tag = -1;
}
#endif // wxUSE_TIMER
}
#endif // wxUSE_TIMER