Mercurial > hg > xemacs-beta

comparison src/gui-x.c @ 436:080151679be2 r21-2-26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-26
author cvs
date Mon, 13 Aug 2007 11:31:24 +0200
parents 3ecd8885ac67
children 8de8e3f6228a
comparison
equal deleted inserted replaced
435:53cf74a9db44 436:080151679be2
141 widget_value_unwind (Lisp_Object closure) 141 widget_value_unwind (Lisp_Object closure)
142 { 142 {
143 widget_value *wv = (widget_value *) get_opaque_ptr (closure); 143 widget_value *wv = (widget_value *) get_opaque_ptr (closure);
144 free_opaque_ptr (closure); 144 free_opaque_ptr (closure);
145 if (wv) 145 if (wv)
146 free_widget_value (wv); 146 free_widget_value_tree (wv);
147 return Qnil; 147 return Qnil;
148 } 148 }
149 149
150 #if 0 150 #if 0
151 static void 151 static void
184 free_popup_widget_value_tree (widget_value *wv) 184 free_popup_widget_value_tree (widget_value *wv)
185 { 185 {
186 if (! wv) return; 186 if (! wv) return;
187 if (wv->key) xfree (wv->key); 187 if (wv->key) xfree (wv->key);
188 if (wv->value) xfree (wv->value); 188 if (wv->value) xfree (wv->value);
189 if (wv->name) xfree (wv->name);
189 190
190 wv->name = wv->value = wv->key = (char *) 0xDEADBEEF; 191 wv->name = wv->value = wv->key = (char *) 0xDEADBEEF;
191 192
192 if (wv->contents && (wv->contents != (widget_value*)1)) 193 if (wv->contents && (wv->contents != (widget_value*)1))
193 { 194 {
467 parent->contents = wv; 468 parent->contents = wv;
468 else 469 else
469 prev->next = wv; 470 prev->next = wv;
470 if (!button_item_to_widget_value (items, wv, 0, 1)) 471 if (!button_item_to_widget_value (items, wv, 0, 1))
471 { 472 {
472 free_widget_value (wv); 473 free_widget_value_tree (wv);
473 if (parent) 474 if (parent)
474 parent->contents = 0; 475 parent->contents = 0;
475 else 476 else
476 prev->next = 0; 477 prev->next = 0;
477 } 478 }
544 /* mess about getting the data we really want */ 545 /* mess about getting the data we really want */
545 tmp = control; 546 tmp = control;
546 control = control->contents; 547 control = control->contents;
547 tmp->next = 0; 548 tmp->next = 0;
548 tmp->contents = 0; 549 tmp->contents = 0;
549 free_widget_value (tmp); 550 free_widget_value_tree (tmp);
550 551
551 /* No more need to free the half-filled-in structures. */ 552 /* No more need to free the half-filled-in structures. */
552 set_opaque_ptr (wv_closure, 0); 553 set_opaque_ptr (wv_closure, 0);
553 unbind_to (count, Qnil); 554 unbind_to (count, Qnil);
554 555