Made things compile again (two pizzas).

Made timer reentry safe, I think.
  Added CVS build info.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-06-18 14:18:47 +00:00
parent a2f935bd4e
commit f6577bba75
4 changed files with 89 additions and 5 deletions

View File

@@ -70,12 +70,23 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
static gint timeout_callback( gpointer data )
{
wxTimer *timer = (wxTimer*)data;
#if (GTK_MINOR_VERSION > 0)
/* 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 ();
#endif
timer->Notify();
#if (GTK_MINOR_VERSION > 0)
/* release lock again */
GDK_THREADS_LEAVE ();
#endif
if (timer->OneShot())
{
timer->Stop();
}
return TRUE;
}