Mercurial > dwindows
comparison dw.hpp @ 2890:ab4c86ddc63a
C++: Fix a logic error reported by MSVC 2022.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Thu, 22 Dec 2022 19:34:51 +0000 |
parents | 4b075e64536c |
children | 185c1e9674a1 |
comparison
equal
deleted
inserted
replaced
2889:4b075e64536c | 2890:ab4c86ddc63a |
---|---|
277 void Default(Widget *defaultitem) { if(defaultitem) dw_window_default(hwnd, defaultitem->GetHWND()); } | 277 void Default(Widget *defaultitem) { if(defaultitem) dw_window_default(hwnd, defaultitem->GetHWND()); } |
278 void SetIcon(HICN icon) { dw_window_set_icon(hwnd, icon); } | 278 void SetIcon(HICN icon) { dw_window_set_icon(hwnd, icon); } |
279 MenuBar *MenuBarNew() { if(!menu) menu = new MenuBar(hwnd); return menu; } | 279 MenuBar *MenuBarNew() { if(!menu) menu = new MenuBar(hwnd); return menu; } |
280 void Popup(Menu *menu, int x, int y) { | 280 void Popup(Menu *menu, int x, int y) { |
281 if(menu) { | 281 if(menu) { |
282 HMENUI pmenu = menu; | 282 HMENUI pmenu = menu->GetHMENUI(); |
283 | 283 |
284 dw_menu_popup(&pmenu, hwnd, x, y); | 284 dw_menu_popup(&pmenu, hwnd, x, y); |
285 delete menu; | 285 delete menu; |
286 } | 286 } |
287 } | 287 } |
288 void Popup(Menu *menu) { | 288 void Popup(Menu *menu) { |
289 if(menu) { | 289 if(menu) { |
290 long x, y; | 290 long x, y; |
291 HMENUI pmenu = menu; | 291 HMENUI pmenu = menu->GetHMENUI(); |
292 | 292 |
293 dw_pointer_query_pos(&x, &y); | 293 dw_pointer_query_pos(&x, &y); |
294 dw_menu_popup(&pmenu, hwnd, (int)x, (int)y); | 294 dw_menu_popup(&pmenu, hwnd, (int)x, (int)y); |
295 delete menu; | 295 delete menu; |
296 } | 296 } |