X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3858bf5614fae70f1cdc11e5f187691ef2a4c4a..8e54aaedb5329a49ffd9c5d50071f9c8cdd5c59e:/src/gtk1/app.cpp?ds=sidebyside diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index dad9249bc9..53aa238e66 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -399,7 +399,6 @@ END_EVENT_TABLE() wxApp::wxApp() { - m_initialized = FALSE; #ifdef __WXDEBUG__ m_isInAssert = FALSE; #endif // __WXDEBUG__ @@ -538,40 +537,6 @@ GdkVisual *wxApp::GetGdkVisual() return visual; } -int wxApp::MainLoop() -{ - gtk_main(); - return 0; -} - -void wxApp::Exit() -{ - // VZ: no idea why is it different from ExitMainLoop() but this is what - // wxExit() used to do - gtk_main_quit(); -} - -void wxApp::ExitMainLoop() -{ - if (gtk_main_level() > 0) - gtk_main_quit(); -} - -bool wxApp::Initialized() -{ - return m_initialized; -} - -bool wxApp::Pending() -{ - return (gtk_events_pending() > 0); -} - -void wxApp::Dispatch() -{ - gtk_main_iteration(); -} - bool wxApp::Initialize(int& argc, wxChar **argv) { #if wxUSE_THREADS @@ -584,7 +549,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv) } else { - g_thread_init(NULL); + if (!g_thread_supported()) + g_thread_init(NULL); } #endif // wxUSE_THREADS