projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed wxTaskBarIcon compilation
[wxWidgets.git]
/
src
/
gtk1
/
timer.cpp
diff --git
a/src/gtk1/timer.cpp
b/src/gtk1/timer.cpp
index 36aada6e6fc9c92920245527a2b1ca33c5c45163..f8531ba81c3ffe82d0142ec5c83ef1a20080cd9b 100644
(file)
--- a/
src/gtk1/timer.cpp
+++ b/
src/gtk1/timer.cpp
@@
-1,10
+1,10
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: timer.cpp
-// Purpose:
+// Name:
gtk/
timer.cpp
+// Purpose:
wxTimer implementation
// 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
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
@@
-12,51
+12,56
@@
#pragma implementation "timer.h"
#endif
#pragma implementation "timer.h"
#endif
+#include "wx/defs.h"
+
+#if wxUSE_TIMER
+
#include "wx/timer.h"
#include "gtk/gtk.h"
#include "wx/timer.h"
#include "gtk/gtk.h"
-//
-
----------------------------------------------------------------------------
+//
----------------------------------------------------------------------------
// wxTimer
// wxTimer
-//
-
----------------------------------------------------------------------------
+//
----------------------------------------------------------------------------
-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;
}
-
wxTimer::wxTimer
()
+
void wxTimer::Init
()
{
m_tag = -1;
{
m_tag = -1;
- m_time = 1000;
- m_oneShot = FALSE;
+ m_milli = 1000;
}
wxTimer::~wxTimer()
{
}
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;
- }
+ (void)wxTimerBase::Start(millisecs, oneShot);
- m_oneShot = oneShot;
-
- m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+ m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
return TRUE;
}
return TRUE;
}
@@
-70,3
+75,5
@@
void wxTimer::Stop()
}
}
}
}
+#endif // wxUSE_TIMER
+