X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..9f7948af90ec2e3b907944e7d979f0863910c5c8:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index ab2400fc2f..53aa238e66 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -11,14 +11,15 @@ #pragma implementation "app.h" #endif -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - #ifdef __VMS -#include +// vms_jackets.h should for proper working be included before anything else +# include #undef ConnectionNumber #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/app.h" #include "wx/gdicmn.h" #include "wx/utils.h" @@ -398,7 +399,6 @@ END_EVENT_TABLE() wxApp::wxApp() { - m_initialized = FALSE; #ifdef __WXDEBUG__ m_isInAssert = FALSE; #endif // __WXDEBUG__ @@ -537,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 @@ -583,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