don't east 100% of CPU when showing popup menu (patch 762500)

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

diff --git a/docs/changes.txt b/docs/changes.txt
index dc85504f0135691773628a9d111600145c50ba22..d1703b0c8eb4881ad84a1f90672cb607e539ce0f 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -117,7 +117,9 @@ wxGTK:
 - added wxEVT_MENU_OPEN event generation
 - fixed bug in generic file selector causing incomplete file extensions to
   be appended to filenames with no extension
 - added wxEVT_MENU_OPEN event generation
 - fixed bug in generic file selector causing incomplete file extensions to
   be appended to filenames with no extension

-- added SetSelection implementation for GTK+ 2
+- added wxTextCtrl::SetSelection implementation for GTK+ 2
+- fixed wxTextCtrl::IsEditable() for GTK+ 2
+- don't consume 100% CPU when showing a poup menu

 
 wxMac:
 
 
 wxMac:
 

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index a3283de88354fcd155599d9d9d8e05c63960bad1..0bc4aafc66324a4eb99b9783554881dca136e8d7 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -4214,8 +4214,7 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 
     while (is_waiting)
     {
 
     while (is_waiting)
     {

-        while (gtk_events_pending())
-            gtk_main_iteration();
+        gtk_main_iteration();

     }
 
     return TRUE;
     }
 
     return TRUE;

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index a3283de88354fcd155599d9d9d8e05c63960bad1..0bc4aafc66324a4eb99b9783554881dca136e8d7 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -4214,8 +4214,7 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 
     while (is_waiting)
     {
 
     while (is_waiting)
     {

-        while (gtk_events_pending())
-            gtk_main_iteration();
+        gtk_main_iteration();

     }
 
     return TRUE;
     }
 
     return TRUE;