X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b90a8f20dd9c1a478f755941795158c38230a80..2e1a688e3e9c6c265620e4f05d579077367e9fdb:/src/gtk1/timer.cpp?ds=inline diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp index a1a8a8126a..ac5b34cb14 100644 --- a/src/gtk1/timer.cpp +++ b/src/gtk1/timer.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -45,9 +45,9 @@ long wxGetElapsedTime( bool resetTimer ) if (g_timer) { g_timer_elapsed( g_timer, &res ); - if (resetTimer) g_timer_reset( g_timer ); + if (resetTimer) g_timer_reset( g_timer ); } - + return res; } @@ -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 FALSE; return TRUE; }