Mercurial > hg > xemacs-beta
comparison src/menubar-x.c @ 325:f2b5d7006b0a r21-0-60
Import from CVS: tag r21-0-60
author | cvs |
---|---|
date | Mon, 13 Aug 2007 10:47:35 +0200 |
parents | 19dcec799385 |
children | 182f72e8cd0d |
comparison
equal
deleted
inserted
replaced
324:8f2460f6e1f6 | 325:f2b5d7006b0a |
---|---|
122 } | 122 } |
123 else | 123 else |
124 { | 124 { |
125 wv->name = string_chars; | 125 wv->name = string_chars; |
126 wv->enabled = 1; | 126 wv->enabled = 1; |
127 /* dverna Dec. 98: command_builder_operate_menu_accelerator will | |
128 manipulate the accel as a Lisp_Object if the widget has a name. | |
129 Since simple labels have a name, but no accel, we *must* set it | |
130 to nil */ | |
131 wv->accel = LISP_TO_VOID (Qnil); | |
127 } | 132 } |
128 } | 133 } |
129 else if (VECTORP (desc)) | 134 else if (VECTORP (desc)) |
130 { | 135 { |
131 if (!button_item_to_widget_value (desc, wv, 1, | 136 if (!button_item_to_widget_value (desc, wv, 1, |
253 { | 258 { |
254 widget_value *dummy; | 259 widget_value *dummy; |
255 /* Add a fake entry so the menus show up */ | 260 /* Add a fake entry so the menus show up */ |
256 wv->contents = dummy = xmalloc_widget_value (); | 261 wv->contents = dummy = xmalloc_widget_value (); |
257 dummy->name = "(inactive)"; | 262 dummy->name = "(inactive)"; |
258 dummy->accel = NULL; | 263 dummy->accel = LISP_TO_VOID (Qnil); |
259 dummy->enabled = 0; | 264 dummy->enabled = 0; |
260 dummy->selected = 0; | 265 dummy->selected = 0; |
261 dummy->value = NULL; | 266 dummy->value = NULL; |
262 dummy->type = BUTTON_TYPE; | 267 dummy->type = BUTTON_TYPE; |
263 dummy->call_data = NULL; | 268 dummy->call_data = NULL; |