comparison src/w32menu.c @ 30053:baccf5e9ab70

* w32menu.c (w32_menu_display_help): * xmenu.c (menu_help_callback): Use show_help_echo.

30052:324e0b1b2ac1

  HMODULE user32 = GetModuleHandle ("user32.dll");
  FARPROC get_menu_item_info = GetProcAddress (user32, "GetMenuItemInfoA");

  if (get_menu_item_info)
    {
      struct gcpro gcpro1;
      extern Lisp_Object Vshow_help_function;
      Lisp_Object msg;
      MENUITEMINFO info;

      bzero (&info, sizeof (info));
      info.cbSize = sizeof (info);
      info.fMask = MIIM_DATA;
      get_menu_item_info (menu, item, FALSE, &info);

      msg = info.dwItemData ? build_string ((char *) info.dwItemData) : Qnil;
      GCPRO1 (msg);

      if (!NILP (Vshow_help_function))
        call1 (Vshow_help_function, msg);
      else if (!MINI_WINDOW_P (XWINDOW (selected_window)))
        {
          if (STRINGP(msg))
            message3_nolog (msg, XSTRING (msg)->size, STRING_MULTIBYTE (msg));
          else
            message (0);
        }
      UNGCPRO;
    }
}

30053:baccf5e9ab70

  HMODULE user32 = GetModuleHandle ("user32.dll");
  FARPROC get_menu_item_info = GetProcAddress (user32, "GetMenuItemInfoA");

  if (get_menu_item_info)
    {
      MENUITEMINFO info;

      bzero (&info, sizeof (info));
      info.cbSize = sizeof (info);
      info.fMask = MIIM_DATA;
      get_menu_item_info (menu, item, FALSE, &info);

      show_help_echo (info.dwItemData ?
		      build_string ((char *) info.dwItemData) : Qnil);
    }
}