projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added more wxRegion tests to erase sample.
[wxWidgets.git]
/
src
/
gtk
/
timer.cpp
diff --git
a/src/gtk/timer.cpp
b/src/gtk/timer.cpp
index 89ecf05f6d2fdca9f67d59b672b5273be9691ee3..a8514f8cd169098e08cfc5694cc2b6b332396a63 100644
(file)
--- a/
src/gtk/timer.cpp
+++ b/
src/gtk/timer.cpp
@@
-1,10
+1,10
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: timer.cpp
-// Purpose:
+// Name:
gtk/
timer.cpp
+// Purpose:
wxTimer implementation
// Author: Robert Roebling
// Author: Robert Roebling
-// Id: $
i
d$
+// Id: $
I
d$
// Copyright: (c) 1998 Robert Roebling
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
@@
-12,56
+12,71
@@
#pragma implementation "timer.h"
#endif
#pragma implementation "timer.h"
#endif
+#include "wx/defs.h"
+
+#if wxUSE_TIMER
+
#include "wx/timer.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 )
+
extern "C"
gint timeout_callback( gpointer data )
{
{
- wxTimer *timer = (wxTimer*)data;
- timer->Notify();
+ 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();
- if ( timer->OneShot() )
-
timer->Stop
();
+ /* release lock again */
+
gdk_threads_leave
();
- return TRUE;
+ if ( timer->IsOneShot() )
+ return FALSE;
+
+ return TRUE;
}
}
-
wxTimer::wxTimer
()
+
void wxTimer::Init
()
{
{
- m_tag = -1;
- m_time = 1000;
- m_oneShot = FALSE;
+ m_tag = -1;
+ 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;
+ if (m_tag != -1)
+ gtk_timeout_remove( m_tag );
-
m_tag = gtk_timeout_add( millisecs
, timeout_callback, this );
+
m_tag = gtk_timeout_add( m_milli
, timeout_callback, this );
- return TRUE;
+
return TRUE;
}
void wxTimer::Stop()
{
}
void wxTimer::Stop()
{
- if ( m_tag != -1 )
- {
- gtk_timeout_remove( m_tag );
-
- m_tag = -1;
- }
+ if (m_tag != -1)
+ {
+ gtk_timeout_remove( m_tag );
+ m_tag = -1;
+ }
}
}
+#endif // wxUSE_TIMER
+