projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug with assigning a part of the string to the same string
[wxWidgets.git]
/
src
/
gtk1
/
timer.cpp
diff --git
a/src/gtk1/timer.cpp
b/src/gtk1/timer.cpp
index 3b28f1d1c22251fc1d84e71ea59ba9556a9a4cf1..b90de7064c5aa1cfacadbc78dcf7d12af6f58662 100644
(file)
--- a/
src/gtk1/timer.cpp
+++ b/
src/gtk1/timer.cpp
@@
-7,17
+7,11
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "timer.h"
-#endif
-
-// 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"
@@
-25,20
+19,15
@@
// wxTimer
// ----------------------------------------------------------------------------
// wxTimer
// ----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-
-extern "C" gint timeout_callback( gpointer data )
+extern "C" {
+static gint timeout_callback(void *data)
{
{
- wxTimer
*timer = (wxTimer
*)data;
+ wxTimer
Impl * const timer = (wxTimerImpl
*)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();
timer->Stop();
- }
-
+
// When getting called from GDK's timer handler we
// are no longer within GDK's grab on the GUI
// thread so we must lock it here ourselves.
// When getting called from GDK's timer handler we
// are no longer within GDK's grab on the GUI
// thread so we must lock it here ourselves.
@@
-49,42
+38,28
@@
extern "C" gint timeout_callback( gpointer data )
// Release lock again.
gdk_threads_leave();
// Release lock again.
gdk_threads_leave();
- if (timer->IsOneShot())
- return FALSE;
-
- return TRUE;
+ return keepGoing;
}
}
-
-void wxTimer::Init()
-{
- m_tag = -1;
- m_milli = 1000;
-}
-
-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, _T("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, _T("should be running") );
+
+ gtk_timeout_remove( m_tag );
+ m_tag = -1;
}
#endif // wxUSE_TIMER
}
#endif // wxUSE_TIMER