From 51b729af920a5eb8f4e9a149892f2c772d538d63 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 30 Sep 2010 14:33:53 +0000 Subject: [PATCH] Add default value for GetPopupMenuSelectionFromUser() position argument. Let the menu be popped up at the system-determined position, just as it can already be done with PopupMenu() itself. Closes #12530. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/window.h | 3 ++- interface/wx/window.h | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/wx/window.h b/include/wx/window.h index 6c7930a209..2260f8fe3d 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -1147,7 +1147,8 @@ public: // simply return the id of the selected item or wxID_NONE without // generating any events - int GetPopupMenuSelectionFromUser(wxMenu& menu, const wxPoint& pos) + int GetPopupMenuSelectionFromUser(wxMenu& menu, + const wxPoint& pos = wxDefaultPosition) { return DoGetPopupMenuSelectionFromUser(menu, pos.x, pos.y); } int GetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y) { return DoGetPopupMenuSelectionFromUser(menu, x, y); } diff --git a/interface/wx/window.h b/interface/wx/window.h index 180aef5b63..ac715f76f7 100644 --- a/interface/wx/window.h +++ b/interface/wx/window.h @@ -2375,6 +2375,10 @@ public: The parameter @a menu is the menu to show. The parameter @a pos (or the parameters @a x and @a y) is the position at which to show the menu in client coordinates. + It is recommended to not explicitly specify coordinates when + calling this method in response to mouse click, because some of + the ports (namely, wxGTK) can do a better job of positioning + the menu in that case. @return The selected menu item id or @c wxID_NONE if none selected or an @@ -2382,7 +2386,8 @@ public: @since 2.9.0 */ - int GetPopupMenuSelectionFromUser(wxMenu& menu, const wxPoint& pos); + int GetPopupMenuSelectionFromUser(wxMenu& menu, + const wxPoint& pos = wxDefaultPosition); /** @overload