comparison src/menubar-x.c @ 2:ac2d302a0011 r19-15b2

Import from CVS: tag r19-15b2
author cvs
date Mon, 13 Aug 2007 08:46:35 +0200
parents 376386a54a3c
children 0293115a14e9
comparison
equal deleted inserted replaced
1:c0c6a60d29db 2:ac2d302a0011
226 prev = sep_wv; 226 prev = sep_wv;
227 } 227 }
228 } 228 }
229 else if (menubar_root_p) 229 else if (menubar_root_p)
230 { 230 {
231 wv->name = "menubar"; 231 wv->name = (char *) "menubar";
232 wv->type = CASCADE_TYPE; /* Well, nothing else seems to fit and 232 wv->type = CASCADE_TYPE; /* Well, nothing else seems to fit and
233 this is ignored anyway... */ 233 this is ignored anyway... */
234 } 234 }
235 else 235 else
236 { 236 {
365 wv = xmalloc_widget_value (); 365 wv = xmalloc_widget_value ();
366 wv->type = CASCADE_TYPE; 366 wv->type = CASCADE_TYPE;
367 wv->next = NULL; 367 wv->next = NULL;
368 wv->contents = xmalloc_widget_value (); 368 wv->contents = xmalloc_widget_value ();
369 wv->contents->type = TEXT_TYPE; 369 wv->contents->type = TEXT_TYPE;
370 wv->contents->name = "No menu"; 370 wv->contents->name = (char *) "No menu";
371 wv->contents->next = NULL; 371 wv->contents->next = NULL;
372 } 372 }
373 assert (wv && wv->type == CASCADE_TYPE && wv->contents); 373 assert (wv && wv->type == CASCADE_TYPE && wv->contents);
374 replace_widget_value_tree (hack_wv, wv->contents); 374 replace_widget_value_tree (hack_wv, wv->contents);
375 free_popup_widget_value_tree (wv); 375 free_popup_widget_value_tree (wv);