/[emacs]/emacs/src/w32menu.c
ViewVC logotype

Diff of /emacs/src/w32menu.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.55.4.3 by uid65618, Sun Dec 28 05:20:02 2003 UTC revision 1.55.4.4 by miles, Tue Jul 6 09:24:08 2004 UTC
# Line 2225  add_menu_item (HMENU menu, widget_value Line 2225  add_menu_item (HMENU menu, widget_value
2225            /* Set help string for menu item.  Leave it as a Lisp_Object            /* Set help string for menu item.  Leave it as a Lisp_Object
2226               until it is ready to be displayed, since GC can happen while               until it is ready to be displayed, since GC can happen while
2227               menus are active.  */               menus are active.  */
2228            if (wv->help)            if (!NILP (wv->help))
2229              info.dwItemData = (DWORD) wv->help;  #ifdef USE_LISP_UNION_TYPE
2230                info.dwItemData = (DWORD) (wv->help).i;
2231    #else
2232                info.dwItemData = (DWORD) (wv->help);
2233    #endif
2234            if (wv->button_type == BUTTON_TYPE_RADIO)            if (wv->button_type == BUTTON_TYPE_RADIO)
2235              {              {
2236                /* CheckMenuRadioItem allows us to differentiate TOGGLE and                /* CheckMenuRadioItem allows us to differentiate TOGGLE and
# Line 2307  w32_menu_display_help (HWND owner, HMENU Line 2310  w32_menu_display_help (HWND owner, HMENU
2310            info.fMask = MIIM_DATA;            info.fMask = MIIM_DATA;
2311            get_menu_item_info (menu, item, FALSE, &info);            get_menu_item_info (menu, item, FALSE, &info);
2312    
2313    #ifdef USE_LISP_UNION_TYPE
2314              help = info.dwItemData ? (Lisp_Object) ((EMACS_INT) info.dwItemData)
2315                                     : Qnil;
2316    #else
2317            help = info.dwItemData ? (Lisp_Object) info.dwItemData : Qnil;            help = info.dwItemData ? (Lisp_Object) info.dwItemData : Qnil;
2318    #endif
2319          }          }
2320    
2321        /* Store the help echo in the keyboard buffer as the X toolkit        /* Store the help echo in the keyboard buffer as the X toolkit

Legend:
Removed from v.1.55.4.3  
changed lines
  Added in v.1.55.4.4

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26