Mercurial > dwindows
changeset 2146:d38c3aa33c3f
Win: Don't set the menuinfo on the menubar when operating in popup (dark) mode.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 17 Jul 2020 02:55:38 +0000 |
parents | 821f7d3a2e90 |
children | dfc64135adb6 |
files | win/dw.c |
diffstat | 1 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/win/dw.c Fri Jul 17 02:28:59 2020 +0000 +++ b/win/dw.c Fri Jul 17 02:55:38 2020 +0000 @@ -6261,7 +6261,6 @@ HMENUI API dw_menubar_new(HWND location) { HMENUI tmp; - MENUINFO mi; ColorInfo *cinfo = _dw_window_get_cinfo(location); if(!cinfo) @@ -6272,13 +6271,17 @@ tmp = (HMENUI)CreatePopupMenu(); else #endif - tmp = (HMENUI)CreateMenu(); - - mi.cbSize = sizeof(MENUINFO); - mi.fMask = MIM_MENUDATA; - mi.dwMenuData = (ULONG_PTR)1; - - SetMenuInfo((HMENU)tmp, &mi); + { + MENUINFO mi; + + tmp = (HMENUI)CreateMenu(); + + mi.cbSize = sizeof(MENUINFO); + mi.fMask = MIM_MENUDATA; + mi.dwMenuData = (ULONG_PTR)1; + + SetMenuInfo((HMENU)tmp, &mi); + } cinfo->hmenu = (HMENU)tmp;