Set the menu itself as event object for EVT_MENU_{OPEN,CLOSED} in wxMSW.

Make wxMSW consistent with the other ports and set the menu itself, not the
window it is attached to, as the event object for the menu open/close events.

See #1595.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index bb0a2ba45c180514c5cd2774243e10f1800896fc..3319dd013bca196904917acd085f33b8bef1b0d2 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -207,6 +207,10 @@ Changes in behaviour not resulting in compilation errors, please read this!
   behaved differently in wxMSW and wxGTK/wxOSX before) if more than one item
   is selected in a control with wxDV_MULTIPLE style.
 
+- wxEVT_COMMAND_MENU_SELECTED, MENU_OPEN and CLOSE events returned a menu from
+  GetEventObject() in all ports but the frame the menu was attached to in wxMSW.
+  Now all ports return the menu that was opened or closed as the event object.
+
 
 Changes in behaviour which may result in compilation errors
 -----------------------------------------------------------

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 40babb6805eb27a3027c0c1a60e3f61192a0f4da..f61c8f5f0cbda0cd63003e6027e284d205da5072 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -854,7 +854,7 @@ bool
 wxFrame::DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu, bool popup)
 {
     wxMenuEvent event(evtType, popup ? wxID_ANY : 0, menu);
-    event.SetEventObject(this);
+    event.SetEventObject(menu);
 
     return HandleWindowEvent(event);
 }