projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed resize line drawing
[wxWidgets.git]
/
src
/
gtk
/
timer.cpp
diff --git
a/src/gtk/timer.cpp
b/src/gtk/timer.cpp
index 36aada6e6fc9c92920245527a2b1ca33c5c45163..175c92aa12168af15f1b170d51d12b7eeef18c67 100644
(file)
--- a/
src/gtk/timer.cpp
+++ b/
src/gtk/timer.cpp
@@
-4,7
+4,7
@@
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
@@
-22,15
+22,22
@@
IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
-gint timeout_callback( gpointer data )
+
static
gint timeout_callback( gpointer data )
{
wxTimer *timer = (wxTimer*)data;
{
wxTimer *timer = (wxTimer*)data;
+
+ /* 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 */
+ gdk_threads_enter();
+
timer->Notify();
timer->Notify();
- if (timer->OneShot())
- {
- timer->Stop();
- }
+ /* release lock again */
+ gdk_threads_leave();
+
+ if ( timer->IsOneShot() )
+ return FALSE;
return TRUE;
}
return TRUE;
}
@@
-38,25
+45,20
@@
gint timeout_callback( gpointer data )
wxTimer::wxTimer()
{
m_tag = -1;
wxTimer::wxTimer()
{
m_tag = -1;
- m_
time
= 1000;
+ m_
milli
= 1000;
m_oneShot = FALSE;
}
wxTimer::~wxTimer()
{
m_oneShot = FALSE;
}
wxTimer::~wxTimer()
{
- Stop();
+
wxTimer::
Stop();
}
bool wxTimer::Start( int millisecs, bool oneShot )
{
}
bool wxTimer::Start( int millisecs, bool oneShot )
{
- if (millisecs != -1)
- {
- m_time = millisecs;
- }
-
- m_oneShot = oneShot;
+ (void)wxTimerBase::Start(millisecs, oneShot);
- m_tag = gtk_timeout_add( m
illisecs
, timeout_callback, this );
+ m_tag = gtk_timeout_add( m
_milli
, timeout_callback, this );
return TRUE;
}
return TRUE;
}