X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5109ae5d178fb4025c6b92bb2f840c07dae99a82..86351e4a9d12822b31f2052fe299fc6be6d5f44d:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 3235c6fbe5..e58a9c8e97 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -7,15 +7,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "app.h" #endif #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" @@ -390,7 +394,7 @@ GtkWidget* wxGetRootWindow() IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) + EVT_IDLE(wxAppBase::OnIdle) END_EVENT_TABLE() wxApp::wxApp() @@ -534,35 +538,6 @@ GdkVisual *wxApp::GetGdkVisual() return visual; } -void wxApp::OnIdle( wxIdleEvent &event ) -{ - static bool s_inOnIdle = FALSE; - - // Avoid recursion (via ProcessEvent default case) - if (s_inOnIdle) - return; - - s_inOnIdle = TRUE; - - // Resend in the main thread events which have been prepared in other - // threads - ProcessPendingEvents(); - - // 'Garbage' collection of windows deleted with Close() - DeletePendingObjects(); - - // Now done in ProcessIdle() -#if 0 - // Send OnIdle events to all windows - bool needMore = SendIdleEvents(); - - if (needMore) - event.RequestMore(TRUE); -#endif - - s_inOnIdle = FALSE; -} - int wxApp::MainLoop() { gtk_main(); @@ -609,7 +584,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv) } else { - g_thread_init(NULL); + if (!g_thread_supported()) + g_thread_init(NULL); } #endif // wxUSE_THREADS