Fixed premature exit of helpview sample and utility

[wxWidgets.git] / src / gtk / evtloop.cpp

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index d684ccb0eb167877e416b8f85a6350b41a30b8be..2b2bfa91c4f4c7c6a051e6e4f09f524e0d8ca4c0 100644 (file)
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/evtloop.cpp
+// Name:        src/gtk/evtloop.cpp
 // Purpose:     implements wxEventLoop for GTK+
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -25,7 +25,10 @@
 #endif
 
 #include "wx/evtloop.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
 
 #include <gtk/gtk.h>
 
@@ -72,6 +75,8 @@ int wxEventLoop::Run()
 
     gtk_main();
 
+    OnExit();
+
     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;
@@ -98,7 +103,7 @@ bool wxEventLoop::Pending() const
     {
         // We need to remove idle callbacks or gtk_events_pending will
         // never return false.
-        wxTheApp->RemoveIdleTag();
+        wxTheApp->SuspendIdleCallback();
     }
 
     return gtk_events_pending();
@@ -106,10 +111,9 @@ bool wxEventLoop::Pending() const
 
 bool wxEventLoop::Dispatch()
 {
-    wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") );
+    wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );
 
     gtk_main_iteration();
 
-    return TRUE;
+    return true;
 }
-