Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prevent infinite loop if gtk_menu_popup() fails, fixes #15387

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-08-05 17:10:58 +00:00
parent 71d9783779
commit 4c99fdfaf4
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/window.cpp
View File

@@ -4368,6 +4368,13 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
gtk_get_current_event_time() gtk_get_current_event_time()
); );
// it is possible for gtk_menu_popup() to fail
if (!gtk_widget_get_visible(GTK_WIDGET(menu->m_menu)))
{
menu->m_popupShown = false;
return false;
}
while (menu->m_popupShown) while (menu->m_popupShown)
{ {
gtk_main_iteration(); gtk_main_iteration();