return false from Dispatch() if gtk_main_quit() was called (patch 1864846)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index bd737902388a888d7bc0efffdb0403f99273bef4..ce0a0cccbbf2735dc06cb7bb05764a649a94f75c 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -318,6 +318,11 @@ wxMSW:
 - Fix rare bug with messages delivered to wrong wxSocket (Tim Kosse)
 - Fix setting icons when they have non-default (16*16 and 32*32) sizes
 
+wxGTK:
+
+- Return false from wxEventLoop::Dispatch() if gtk_main_quit() was called and
+  so the loop should exit (Rodolfo Schulz de Lima)
+
 
 2.8.7
 -----

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index 9cfac6466afdc74e79f2a411b4ae847fe8590140..a9843d9cda15f41de6625c5c1a8217d37a31ff28 100644 (file)
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -112,7 +112,6 @@ bool wxGUIEventLoop::Dispatch()
 {
     wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );
 
-    gtk_main_iteration();
-
-    return true;
+    // gtk_main_iteration() returns TRUE only if gtk_main_quit() was called
+    return !gtk_main_iteration();
 }