# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1671737691 0 # Node ID ab4c86ddc63ad0bcecec0e67cbb840f556352c56 # Parent 4b075e64536c9de1a115fa833f89118513b790f3 C++: Fix a logic error reported by MSVC 2022. diff -r 4b075e64536c -r ab4c86ddc63a dw.hpp --- a/dw.hpp Thu Dec 22 19:20:39 2022 +0000 +++ b/dw.hpp Thu Dec 22 19:34:51 2022 +0000 @@ -279,7 +279,7 @@ MenuBar *MenuBarNew() { if(!menu) menu = new MenuBar(hwnd); return menu; } void Popup(Menu *menu, int x, int y) { if(menu) { - HMENUI pmenu = menu; + HMENUI pmenu = menu->GetHMENUI(); dw_menu_popup(&pmenu, hwnd, x, y); delete menu; @@ -288,7 +288,7 @@ void Popup(Menu *menu) { if(menu) { long x, y; - HMENUI pmenu = menu; + HMENUI pmenu = menu->GetHMENUI(); dw_pointer_query_pos(&x, &y); dw_menu_popup(&pmenu, hwnd, (int)x, (int)y);