diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 480a56083d..640050428b 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -377,6 +377,8 @@ static void MacMenuBeforeDisplay( wxMenu* menu ); bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) { + wxCHECK_MSG( menu != NULL, FALSE, wxT("invalid popup-menu") ); + menu->SetInvokingWindow(this); menu->UpdateUI(); ClientToScreen( &x , &y ) ; diff --git a/src/mac/window.cpp b/src/mac/window.cpp index 480a56083d..640050428b 100644 --- a/src/mac/window.cpp +++ b/src/mac/window.cpp @@ -377,6 +377,8 @@ static void MacMenuBeforeDisplay( wxMenu* menu ); bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) { + wxCHECK_MSG( menu != NULL, FALSE, wxT("invalid popup-menu") ); + menu->SetInvokingWindow(this); menu->UpdateUI(); ClientToScreen( &x , &y ) ; diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 3eacbce049..4822d5b199 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -1899,6 +1899,8 @@ static void wxYieldForCommandsOnly() bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y) { + wxCHECK_MSG( menu != NULL, FALSE, wxT("invalid popup-menu") ); + menu->SetInvokingWindow(this); menu->UpdateUI();