X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df02852424b38b483c4c072eb1df6ac35825153c..d7552cab9897db45bdf55c8ad487dcec3615dc74:/src/gtk/app.cpp?ds=sidebyside diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 60780e3d70..f66454123e 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -83,10 +83,21 @@ void wxExit() // wxYield //----------------------------------------------------------------------------- -static bool gs_inYield = FALSE; - -bool wxYield() +bool wxApp::Yield(bool onlyIfNeeded) { + // MT-FIXME + static bool s_inYield = FALSE; + + if ( s_inYield ) + { + if ( !onlyIfNeeded ) + { + wxFAIL_MSG( wxT("wxYield called recursively" ) ); + } + + return FALSE; + } + #if wxUSE_THREADS if ( !wxThread::IsMain() ) { @@ -95,19 +106,14 @@ bool wxYield() } #endif // wxUSE_THREADS -#ifdef __WXDEBUG__ - if (gs_inYield) - wxFAIL_MSG( wxT("wxYield called recursively" ) ); -#endif - - gs_inYield = TRUE; + s_inYield = TRUE; if (!g_isIdle) { // We need to remove idle callbacks or the loop will // never finish. - gtk_idle_remove( wxTheApp->m_idleTag ); - wxTheApp->m_idleTag = 0; + gtk_idle_remove( m_idleTag ); + m_idleTag = 0; g_isIdle = TRUE; } @@ -121,29 +127,18 @@ bool wxYield() /* it's necessary to call ProcessIdle() to update the frames sizes which might have been changed (it also will update other things set from OnUpdateUI() which is a nice (and desired) side effect) */ - while (wxTheApp->ProcessIdle()) { } + while ( ProcessIdle() ) + { + } // let the logs be flashed again wxLog::Resume(); - gs_inYield = FALSE; + s_inYield = FALSE; return TRUE; } -//----------------------------------------------------------------------------- -// wxYieldIfNeeded -// Like wxYield, but fails silently if the yield is recursive. -//----------------------------------------------------------------------------- - -bool wxYieldIfNeeded() -{ - if (gs_inYield) - return FALSE; - - return wxYield(); -} - //----------------------------------------------------------------------------- // wxWakeUpIdle //----------------------------------------------------------------------------- @@ -585,8 +580,6 @@ bool wxApp::Initialize() wxClassInfo::InitializeClasses(); - wxSystemSettings::Init(); - #if wxUSE_INTL wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); #endif @@ -641,8 +634,6 @@ void wxApp::CleanUp() delete wxPendingEventsLocker; #endif - wxSystemSettings::Done(); - delete[] wxBuffer; wxClassInfo::CleanUpClasses(); @@ -684,8 +675,8 @@ GtkWidget* wxGetRootWindow() // wxEntry //----------------------------------------------------------------------------- - -int wxEntryStart( int argc, char *argv[] ) +// NB: argc and argv may be changed here, pass by reference! +int wxEntryStart( int& argc, char *argv[] ) { #if wxUSE_THREADS /* GTK 1.2 up to version 1.2.3 has broken threads */