diff options
Diffstat (limited to 'src/w32menu.c')
| -rw-r--r-- | src/w32menu.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index 0cd7284c9b0..a2d39c5edfe 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -1407,7 +1407,8 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item) Windows alike. MSVC headers get it right; hopefully, MinGW headers will, too. */ eassert (STRINGP (wv->help)); - info.dwItemData = (ULONG_PTR) XUNTAG (wv->help, Lisp_String); + info.dwItemData = (ULONG_PTR) XUNTAG (wv->help, Lisp_String, + struct Lisp_String); } if (wv->button_type == BUTTON_TYPE_RADIO) { @@ -1571,7 +1572,7 @@ w32_free_menu_strings (HWND hwnd) /* The following is used by delayed window autoselection. */ DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0, - doc: /* Return t if a menu or popup dialog is active on selected frame. */) + doc: /* SKIP: real doc in xmenu.c. */) (void) { struct frame *f; @@ -1606,9 +1607,13 @@ globals_of_w32menu (void) #ifndef NTGUI_UNICODE /* See if Get/SetMenuItemInfo functions are available. */ HMODULE user32 = GetModuleHandle ("user32.dll"); - get_menu_item_info = (GetMenuItemInfoA_Proc) GetProcAddress (user32, "GetMenuItemInfoA"); - set_menu_item_info = (SetMenuItemInfoA_Proc) GetProcAddress (user32, "SetMenuItemInfoA"); - unicode_append_menu = (AppendMenuW_Proc) GetProcAddress (user32, "AppendMenuW"); - unicode_message_box = (MessageBoxW_Proc) GetProcAddress (user32, "MessageBoxW"); + get_menu_item_info = (GetMenuItemInfoA_Proc) + get_proc_addr (user32, "GetMenuItemInfoA"); + set_menu_item_info = (SetMenuItemInfoA_Proc) + get_proc_addr (user32, "SetMenuItemInfoA"); + unicode_append_menu = (AppendMenuW_Proc) + get_proc_addr (user32, "AppendMenuW"); + unicode_message_box = (MessageBoxW_Proc) + get_proc_addr (user32, "MessageBoxW"); #endif /* !NTGUI_UNICODE */ } |