Mercurial > hg > xemacs-beta
comparison src/gui-x.c @ 444:576fb035e263 r21-2-37
Import from CVS: tag r21-2-37
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:36:19 +0200 |
parents | abe6d1db359e |
children | e9a3f8b4de53 |
comparison
equal
deleted
inserted
replaced
443:a8296e22da4e | 444:576fb035e263 |
---|---|
287 XEVENT (event)->event.eval.object = arg; | 287 XEVENT (event)->event.eval.object = arg; |
288 } | 288 } |
289 } | 289 } |
290 | 290 |
291 /* This is the timestamp used for asserting focus so we need to get an | 291 /* This is the timestamp used for asserting focus so we need to get an |
292 up-to-date value event if no events has been dispatched to emacs | 292 up-to-date value event if no events have been dispatched to emacs |
293 */ | 293 */ |
294 #if defined(HAVE_MENUBARS) | 294 #if defined(HAVE_MENUBARS) |
295 DEVICE_X_MOUSE_TIMESTAMP (d) = x_focus_timestamp_really_sucks_fix_me_better; | 295 DEVICE_X_MOUSE_TIMESTAMP (d) = x_focus_timestamp_really_sucks_fix_me_better; |
296 #else | 296 #else |
297 DEVICE_X_MOUSE_TIMESTAMP (d) = DEVICE_X_GLOBAL_MOUSE_TIMESTAMP (d); | 297 DEVICE_X_MOUSE_TIMESTAMP (d) = DEVICE_X_GLOBAL_MOUSE_TIMESTAMP (d); |
487 | 487 |
488 CHECK_SYMBOL (pgui->style); | 488 CHECK_SYMBOL (pgui->style); |
489 if (NILP (pgui->style)) | 489 if (NILP (pgui->style)) |
490 { | 490 { |
491 Bufbyte *intname; | 491 Bufbyte *intname; |
492 Bytecount intlen; | |
492 /* If the callback is nil, treat this item like unselectable text. | 493 /* If the callback is nil, treat this item like unselectable text. |
493 This way, dashes will show up as a separator. */ | 494 This way, dashes will show up as a separator. */ |
494 if (!wv->enabled) | 495 if (!wv->enabled) |
495 wv->type = BUTTON_TYPE; | 496 wv->type = BUTTON_TYPE; |
496 EXTERNAL_TO_C_STRING (wv->name, intname, Qlwlib_encoding); | 497 TO_INTERNAL_FORMAT (C_STRING, wv->name, |
498 ALLOCA, (intname, intlen), | |
499 Qlwlib_encoding); | |
497 if (separator_string_p (intname)) | 500 if (separator_string_p (intname)) |
498 { | 501 { |
499 wv->type = SEPARATOR_TYPE; | 502 wv->type = SEPARATOR_TYPE; |
500 wv->value = menu_separator_style_and_to_external (intname); | 503 wv->value = menu_separator_style_and_to_external (intname); |
501 } | 504 } |