Mercurial > hg > xemacs-beta
comparison src/gui.c @ 371:cc15677e0335 r21-2b1
Import from CVS: tag r21-2b1
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:03:08 +0200 |
parents | 3b3709405255 |
children | d883f39b8495 |
comparison
equal
deleted
inserted
replaced
370:bd866891f083 | 371:cc15677e0335 |
---|---|
27 #include "lisp.h" | 27 #include "lisp.h" |
28 #include "gui.h" | 28 #include "gui.h" |
29 #include "bytecode.h" /* for struct Lisp_Compiled_Function */ | 29 #include "bytecode.h" /* for struct Lisp_Compiled_Function */ |
30 | 30 |
31 Lisp_Object Q_active, Q_suffix, Q_keys, Q_style, Q_selected; | 31 Lisp_Object Q_active, Q_suffix, Q_keys, Q_style, Q_selected; |
32 Lisp_Object Q_filter, Q_config, Q_included, Q_key_sequence; | 32 Lisp_Object Q_filter, Q_config, Q_included; |
33 Lisp_Object Q_accelerator, Q_label; | 33 Lisp_Object Q_accelerator; |
34 Lisp_Object Qtoggle, Qradio; | 34 Lisp_Object Qtoggle, Qradio; |
35 | 35 |
36 #ifdef HAVE_POPUPS | 36 #ifdef HAVE_POPUPS |
37 | 37 |
38 /* count of menus/dboxes currently up */ | 38 /* count of menus/dboxes currently up */ |
132 else if (EQ (key, Q_config)) pgui_item->config = val; | 132 else if (EQ (key, Q_config)) pgui_item->config = val; |
133 else if (EQ (key, Q_filter)) pgui_item->filter = val; | 133 else if (EQ (key, Q_filter)) pgui_item->filter = val; |
134 else if (EQ (key, Q_style)) pgui_item->style = val; | 134 else if (EQ (key, Q_style)) pgui_item->style = val; |
135 else if (EQ (key, Q_selected)) pgui_item->selected = val; | 135 else if (EQ (key, Q_selected)) pgui_item->selected = val; |
136 else if (EQ (key, Q_keys)) pgui_item->keys = val; | 136 else if (EQ (key, Q_keys)) pgui_item->keys = val; |
137 else if (EQ (key, Q_key_sequence)) ; /* ignored for FSF compatability */ | |
138 else if (EQ (key, Q_label)) ; /* ignored for 21.0 implement in 21.2 */ | |
139 else | 137 else |
140 signal_simple_error_2 ("Unknown keyword in gui item", key, pgui_item->name); | 138 signal_simple_error_2 ("Unknown keyword in gui item", key, pgui_item->name); |
141 } | 139 } |
142 | 140 |
143 /* | 141 /* |
297 gui_item_display_flush_right (CONST struct gui_item *pgui_item, | 295 gui_item_display_flush_right (CONST struct gui_item *pgui_item, |
298 char* buf, Bytecount buf_len) | 296 char* buf, Bytecount buf_len) |
299 { | 297 { |
300 *buf = 0; | 298 *buf = 0; |
301 | 299 |
302 #ifdef HAVE_MENUBARS | |
303 /* Have keys? */ | 300 /* Have keys? */ |
304 if (!menubar_show_keybindings) | 301 if (!menubar_show_keybindings) |
305 return 0; | 302 return 0; |
306 #endif | |
307 | 303 |
308 /* Try :keys first */ | 304 /* Try :keys first */ |
309 if (!NILP (pgui_item->keys)) | 305 if (!NILP (pgui_item->keys)) |
310 { | 306 { |
311 CHECK_STRING (pgui_item->keys); | 307 CHECK_STRING (pgui_item->keys); |
339 syms_of_gui (void) | 335 syms_of_gui (void) |
340 { | 336 { |
341 defkeyword (&Q_active, ":active"); | 337 defkeyword (&Q_active, ":active"); |
342 defkeyword (&Q_suffix, ":suffix"); | 338 defkeyword (&Q_suffix, ":suffix"); |
343 defkeyword (&Q_keys, ":keys"); | 339 defkeyword (&Q_keys, ":keys"); |
344 defkeyword (&Q_key_sequence,":key-sequence"); | |
345 defkeyword (&Q_style, ":style"); | 340 defkeyword (&Q_style, ":style"); |
346 defkeyword (&Q_selected, ":selected"); | 341 defkeyword (&Q_selected, ":selected"); |
347 defkeyword (&Q_filter, ":filter"); | 342 defkeyword (&Q_filter, ":filter"); |
348 defkeyword (&Q_config, ":config"); | 343 defkeyword (&Q_config, ":config"); |
349 defkeyword (&Q_included, ":included"); | 344 defkeyword (&Q_included, ":included"); |
350 defkeyword (&Q_accelerator, ":accelerator"); | 345 defkeyword (&Q_accelerator, ":accelerator"); |
351 defkeyword (&Q_label, ":label"); | |
352 | 346 |
353 defsymbol (&Qtoggle, "toggle"); | 347 defsymbol (&Qtoggle, "toggle"); |
354 defsymbol (&Qradio, "radio"); | 348 defsymbol (&Qradio, "radio"); |
355 | 349 |
356 #ifdef HAVE_POPUPS | 350 #ifdef HAVE_POPUPS |