Mercurial > hg > xemacs-beta
comparison src/gui-x.c @ 185:3d6bfa290dbd r20-3b19
Import from CVS: tag r20-3b19
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:55:28 +0200 |
parents | 9ad43877534d |
children | d44af0c54775 |
comparison
equal
deleted
inserted
replaced
184:bcd2674570bf | 185:3d6bfa290dbd |
---|---|
124 struct popup_data *pdata; | 124 struct popup_data *pdata; |
125 Lisp_Object lid = make_int (id); | 125 Lisp_Object lid = make_int (id); |
126 Lisp_Object lpdata = Qnil; | 126 Lisp_Object lpdata = Qnil; |
127 | 127 |
128 assert (NILP (assq_no_quit (lid, Vpopup_callbacks))); | 128 assert (NILP (assq_no_quit (lid, Vpopup_callbacks))); |
129 pdata = alloc_lcrecord (sizeof (struct popup_data), lrecord_popup_data); | 129 pdata = alloc_lcrecord_type (struct popup_data, lrecord_popup_data); |
130 pdata->id = id; | 130 pdata->id = id; |
131 pdata->last_menubar_buffer = Qnil; | 131 pdata->last_menubar_buffer = Qnil; |
132 pdata->menubar_contents_up_to_date = 0; | 132 pdata->menubar_contents_up_to_date = 0; |
133 XSETPOPUP_DATA (lpdata, pdata); | 133 XSETPOPUP_DATA (lpdata, pdata); |
134 Vpopup_callbacks = Fcons (Fcons (lid, lpdata), Vpopup_callbacks); | 134 Vpopup_callbacks = Fcons (Fcons (lid, lpdata), Vpopup_callbacks); |
476 wv->name = (char *) XSTRING_DATA (name); | 476 wv->name = (char *) XSTRING_DATA (name); |
477 | 477 |
478 if (NILP (accel)) | 478 if (NILP (accel)) |
479 accel = menu_name_to_accelerator (wv->name); | 479 accel = menu_name_to_accelerator (wv->name); |
480 wv->accel = LISP_TO_VOID (accel); | 480 wv->accel = LISP_TO_VOID (accel); |
481 | 481 |
482 if (!NILP (suffix)) | 482 if (!NILP (suffix)) |
483 { | 483 { |
484 CONST char *const_bogosity; | 484 CONST char *const_bogosity; |
485 CHECK_STRING (suffix); | 485 CHECK_STRING (suffix); |
486 GET_C_STRING_FILENAME_DATA_ALLOCA (suffix, const_bogosity); | 486 GET_C_STRING_FILENAME_DATA_ALLOCA (suffix, const_bogosity); |