Branch: Tag:

2005-12-17

2005-12-17 23:25:58 by Marcus Comstedt <marcus@mc.pp.se>

More UTF-8 fixes.

Rev: src/post_modules/GTK2/source/common_draw.inc:1.3
Rev: src/post_modules/GTK2/source/gnomedruidpagestandard.pre:1.5
Rev: src/post_modules/GTK2/source/gtkaction.pre:1.4
Rev: src/post_modules/GTK2/source/gtkaspectframe.pre:1.4
Rev: src/post_modules/GTK2/source/gtkcellview.pre:1.5
Rev: src/post_modules/GTK2/source/gtkcheckmenuitem.pre:1.4
Rev: src/post_modules/GTK2/source/gtkcolorselectiondialog.pre:1.4
Rev: src/post_modules/GTK2/source/gtkeditable.inc:1.4
Rev: src/post_modules/GTK2/source/gtkexpander.pre:1.4
Rev: src/post_modules/GTK2/source/gtkfilechooserbutton.pre:1.5
Rev: src/post_modules/GTK2/source/gtkfilechooserdialog.pre:1.4
Rev: src/post_modules/GTK2/source/gtkfileselection.pre:1.4
Rev: src/post_modules/GTK2/source/gtkfontselectiondialog.pre:1.4
Rev: src/post_modules/GTK2/source/gtkimagemenuitem.pre:1.4
Rev: src/post_modules/GTK2/source/gtkmenuitem.pre:1.5
Rev: src/post_modules/GTK2/source/gtkradioaction.pre:1.5

29:   {    pgtk_verify_not_inited();    pgtk_verify_setup(); -  if (args==4) { -  char *name,*label,*tooltip,*stock_id; +  if (args>0 && Pike_sp[-args].type==PIKE_T_STRING) { +  char *name, *stock_id=NULL; +  struct pike_string *label=NULL,*tooltip=NULL; +  char *label2=NULL, *tooltip2=NULL;    GtkAction *ga; -  get_all_args("create",args,"%s%s%s%s",&name,&label,&tooltip,&stock_id); -  ga=gtk_action_new(name,label,tooltip,stock_id); +  get_all_args("create",args,"%s.%t%t%s",&name,&label,&tooltip,&stock_id); +  if(label) { +  ref_push_string(label); +  f_string_to_utf8(1); +  label2 = STR0(Pike_sp[-1].u.string); +  } +  if(tooltip) { +  ref_push_string(tooltip); +  f_string_to_utf8(1); +  tooltip2 = STR0(Pike_sp[-1].u.string); +  } +  ga=gtk_action_new(name,label2,tooltip2,stock_id); +  if(tooltip) pop_stack(); +  if(label) pop_stack();    THIS->obj=G_OBJECT(ga);    } else {    INIT_WITH_PROPS(GTK_TYPE_ACTION);