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

wxCHECK for valid menu in DoPopupMenu (SF Bug# 722230)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-04-23 21:11:32 +00:00
parent 2695ce5a87
commit 376b7bd99e
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mac/carbon/window.cpp
View File

@@ -377,6 +377,8 @@ static void MacMenuBeforeDisplay( wxMenu* menu );
bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
{ {
wxCHECK_MSG( menu != NULL, FALSE, wxT("invalid popup-menu") );
menu->SetInvokingWindow(this); menu->SetInvokingWindow(this);
menu->UpdateUI(); menu->UpdateUI();
ClientToScreen( &x , &y ) ; ClientToScreen( &x , &y ) ;

2
src/mac/window.cpp
View File

@@ -377,6 +377,8 @@ static void MacMenuBeforeDisplay( wxMenu* menu );
bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
{ {
wxCHECK_MSG( menu != NULL, FALSE, wxT("invalid popup-menu") );
menu->SetInvokingWindow(this); menu->SetInvokingWindow(this);
menu->UpdateUI(); menu->UpdateUI();
ClientToScreen( &x , &y ) ; ClientToScreen( &x , &y ) ;

2
src/msw/window.cpp
View File

@@ -1899,6 +1899,8 @@ static void wxYieldForCommandsOnly()
bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y) bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y)
{ {
wxCHECK_MSG( menu != NULL, FALSE, wxT("invalid popup-menu") );
menu->SetInvokingWindow(this); menu->SetInvokingWindow(this);
menu->UpdateUI(); menu->UpdateUI();