From 3a42fa9cec9904af05332e30bf3630678ce4a844 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 6 Jul 2003 23:29:03 +0000 Subject: [PATCH] backported patch 762500 (don't eas 100% of CPU when showing popup menu) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/gtk/window.cpp | 3 +-- src/gtk1/window.cpp | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index f25dede339..85ce5d783d 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -245,6 +245,7 @@ wxGTK: - implemented wxTextCtrl::Remove/Replace() for GTK2 - improved X11 ShowFullScreen - added support for GTK2 label mnemonics +- don't consume 100% CPU when showing a poup menu wxMSW: diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 098882920c..c0477b7eba 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -4239,8 +4239,7 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) while (is_waiting) { - while (gtk_events_pending()) - gtk_main_iteration(); + gtk_main_iteration(); } return TRUE; diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 098882920c..c0477b7eba 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -4239,8 +4239,7 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y ) while (is_waiting) { - while (gtk_events_pending()) - gtk_main_iteration(); + gtk_main_iteration(); } return TRUE;