X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d8dda3216192a8b18f20c6e718dd1d52721bcb7..6f054ac5e8f4d9daf9f4d7fabfa285cb7b148d17:/src/gtk/app.cpp?ds=inline diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 8ded6a5944..21748cb2e9 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,109 +538,6 @@ GdkVisual *wxApp::GetGdkVisual() return visual; } -bool wxApp::ProcessIdle() -{ - wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); - node = wxTopLevelWindows.GetFirst(); - while (node) - { - wxWindow* win = node->GetData(); - CallInternalIdle( win ); - - node = node->GetNext(); - } - - wxIdleEvent event; - event.SetEventObject( this ); - ProcessEvent( event ); - - return event.MoreRequested(); -} - -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(); - - // Send OnIdle events to all windows - bool needMore = SendIdleEvents(); - - if (needMore) - event.RequestMore(TRUE); - - s_inOnIdle = FALSE; -} - -bool wxApp::SendIdleEvents() -{ - bool needMore = FALSE; - - wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); - while (node) - { - wxWindow* win = node->GetData(); - if (SendIdleEvents(win)) - needMore = TRUE; - - node = node->GetNext(); - } - - return needMore; -} - -bool wxApp::CallInternalIdle( wxWindow* win ) -{ - win->OnInternalIdle(); - - wxWindowList::Node *node = win->GetChildren().GetFirst(); - while (node) - { - wxWindow *win = node->GetData(); - - CallInternalIdle( win ); - node = node->GetNext(); - } - - return TRUE; -} - -bool wxApp::SendIdleEvents( wxWindow* win ) -{ - bool needMore = FALSE; - - wxIdleEvent event; - event.SetEventObject(win); - - win->GetEventHandler()->ProcessEvent(event); - - if (event.MoreRequested()) - needMore = TRUE; - - wxWindowList::Node *node = win->GetChildren().GetFirst(); - while (node) - { - wxWindow *win = node->GetData(); - - if (SendIdleEvents(win)) - needMore = TRUE; - node = node->GetNext(); - } - - return needMore; -} - int wxApp::MainLoop() { gtk_main(); @@ -666,9 +567,11 @@ bool wxApp::Pending() return (gtk_events_pending() > 0); } -void wxApp::Dispatch() +bool wxApp::Dispatch() { gtk_main_iteration(); + + return true; } bool wxApp::Initialize(int& argc, wxChar **argv) @@ -683,7 +586,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv) } else { - g_thread_init(NULL); + if (!g_thread_supported()) + g_thread_init(NULL); } #endif // wxUSE_THREADS