Branch: Tag:

2006-02-27

2006-02-27 12:23:19 by Martin Stjernholm <mast@lysator.liu.se>

Properly (hopefully) fixed naming to not conflict with the GTK module.

Rev: src/post_modules/GTK2/build_pgtk.pike:1.11
Rev: src/post_modules/GTK2/output/split.pike:1.10
Rev: src/post_modules/GTK2/output/util.pike:1.3
Rev: src/post_modules/GTK2/pgtk.h:1.14
Rev: src/post_modules/GTK2/pgtk2_symbol_remap.h:1.5(DEAD)
Rev: src/post_modules/GTK2/source/common_draw.inc:1.6
Rev: src/post_modules/GTK2/source/encode_truecolor.c:1.3
Rev: src/post_modules/GTK2/source/gdkatom.pre:1.3
Rev: src/post_modules/GTK2/source/gdkbitmap.pre:1.6
Rev: src/post_modules/GTK2/source/gdkcolor.pre:1.4
Rev: src/post_modules/GTK2/source/gdkdisplay.pre:1.5
Rev: src/post_modules/GTK2/source/gdkdragcontext.pre:1.4
Rev: src/post_modules/GTK2/source/gdkdrawable.pre:1.5
Rev: src/post_modules/GTK2/source/gdkevent.pre:1.7
Rev: src/post_modules/GTK2/source/gdkgc.pre:1.6
Rev: src/post_modules/GTK2/source/gdkimage.pre:1.3
Rev: src/post_modules/GTK2/source/gdkpixbuf.pre:1.14
Rev: src/post_modules/GTK2/source/gdkpixbufanimation.pre:1.5
Rev: src/post_modules/GTK2/source/gdkpixbufanimationiter.pre:1.5
Rev: src/post_modules/GTK2/source/gdkpixmap.pre:1.4
Rev: src/post_modules/GTK2/source/gdkrectangle.pre:1.7
Rev: src/post_modules/GTK2/source/gdkregion.pre:1.3
Rev: src/post_modules/GTK2/source/gdkwindow.pre:1.6
Rev: src/post_modules/GTK2/source/gladexml.pre:1.7
Rev: src/post_modules/GTK2/source/global.pre:1.12
Rev: src/post_modules/GTK2/source/gnome/gnomeapp.pre:1.2
Rev: src/post_modules/GTK2/source/gnome/gnomecanvas.pre:1.3
Rev: src/post_modules/GTK2/source/gnome/gnomecanvasgroup.pre:1.3
Rev: src/post_modules/GTK2/source/gnome/gnomecanvasitem.pre:1.3
Rev: src/post_modules/GTK2/source/gnome/gnomecanvasline.pre:1.3
Rev: src/post_modules/GTK2/source/gnome/gnomedialog.pre:1.3
Rev: src/post_modules/GTK2/source/gnome/gnomemessagebox.pre:1.3
Rev: src/post_modules/GTK2/source/gnomecanvas.pre:1.6
Rev: src/post_modules/GTK2/source/gnomeclient.pre:1.5
Rev: src/post_modules/GTK2/source/gnomedruidpageedge.pre:1.7
Rev: src/post_modules/GTK2/source/gnomedruidpagestandard.pre:1.7
Rev: src/post_modules/GTK2/source/gobject.pre:1.6
Rev: src/post_modules/GTK2/source/gtkaboutdialog.pre:1.6
Rev: src/post_modules/GTK2/source/gtkaccelgroup.pre:1.4
Rev: src/post_modules/GTK2/source/gtkaccellabel.pre:1.4
Rev: src/post_modules/GTK2/source/gtkaction.pre:1.6
Rev: src/post_modules/GTK2/source/gtkactiongroup.pre:1.5
Rev: src/post_modules/GTK2/source/gtkadjustment.pre:1.5
Rev: src/post_modules/GTK2/source/gtkalignment.pre:1.4
Rev: src/post_modules/GTK2/source/gtkarrow.pre:1.5
Rev: src/post_modules/GTK2/source/gtkaspectframe.pre:1.7
Rev: src/post_modules/GTK2/source/gtkbox.pre:1.4
Rev: src/post_modules/GTK2/source/gtkbutton.pre:1.10
Rev: src/post_modules/GTK2/source/gtkcalendar.pre:1.4
Rev: src/post_modules/GTK2/source/gtkcelleditable.pre:1.2
Rev: src/post_modules/GTK2/source/gtkcellrenderer.pre:1.7
Rev: src/post_modules/GTK2/source/gtkcellrenderercombo.pre:1.4
Rev: src/post_modules/GTK2/source/gtkcellrendererpixbuf.pre:1.4
Rev: src/post_modules/GTK2/source/gtkcellrendererprogress.pre:1.4
Rev: src/post_modules/GTK2/source/gtkcellrenderertext.pre:1.4
Rev: src/post_modules/GTK2/source/gtkcellrenderertoggle.pre:1.4
Rev: src/post_modules/GTK2/source/gtkcellview.pre:1.9
Rev: src/post_modules/GTK2/source/gtkcheckbutton.pre:1.7
Rev: src/post_modules/GTK2/source/gtkcheckmenuitem.pre:1.6
Rev: src/post_modules/GTK2/source/gtkclipboard.pre:1.3
Rev: src/post_modules/GTK2/source/gtkcolorbutton.pre:1.8
Rev: src/post_modules/GTK2/source/gtkcolorselection.pre:1.8
Rev: src/post_modules/GTK2/source/gtkcolorselectiondialog.pre:1.6
Rev: src/post_modules/GTK2/source/gtkcombobox.pre:1.6
Rev: src/post_modules/GTK2/source/gtkcomboboxentry.pre:1.6
Rev: src/post_modules/GTK2/source/gtkcontainer.pre:1.4
Rev: src/post_modules/GTK2/source/gtkdatabox.pre:1.8
Rev: src/post_modules/GTK2/source/gtkdialog.pre:1.4
Rev: src/post_modules/GTK2/source/gtkdrawingarea.pre:1.4
Rev: src/post_modules/GTK2/source/gtkeditable.pre:1.2
Rev: src/post_modules/GTK2/source/gtkentry.pre:1.7
Rev: src/post_modules/GTK2/source/gtkentrycompletion.pre:1.7
Rev: src/post_modules/GTK2/source/gtkeventbox.pre:1.4
Rev: src/post_modules/GTK2/source/gtkexpander.pre:1.6
Rev: src/post_modules/GTK2/source/gtkfilechooser.pre:1.3
Rev: src/post_modules/GTK2/source/gtkfilechooserbutton.pre:1.7
Rev: src/post_modules/GTK2/source/gtkfilechooserdialog.pre:1.10
Rev: src/post_modules/GTK2/source/gtkfilechooserwidget.pre:1.6
Rev: src/post_modules/GTK2/source/gtkfileselection.pre:1.6
Rev: src/post_modules/GTK2/source/gtkfixed.pre:1.5
Rev: src/post_modules/GTK2/source/gtkfontbutton.pre:1.4
Rev: src/post_modules/GTK2/source/gtkfontselection.pre:1.4
Rev: src/post_modules/GTK2/source/gtkfontselectiondialog.pre:1.6
Rev: src/post_modules/GTK2/source/gtkframe.pre:1.7
Rev: src/post_modules/GTK2/source/gtkhandlebox.pre:1.4
Rev: src/post_modules/GTK2/source/gtkhbox.pre:1.5
Rev: src/post_modules/GTK2/source/gtkhbuttonbox.pre:1.4
Rev: src/post_modules/GTK2/source/gtkhpaned.pre:1.4
Rev: src/post_modules/GTK2/source/gtkhscale.pre:1.5
Rev: src/post_modules/GTK2/source/gtkhscrollbar.pre:1.6
Rev: src/post_modules/GTK2/source/gtkhseparator.pre:1.4
Rev: src/post_modules/GTK2/source/gtkiconfactory.pre:1.4
Rev: src/post_modules/GTK2/source/gtkiconinfo.pre:1.4
Rev: src/post_modules/GTK2/source/gtkiconset.pre:1.5
Rev: src/post_modules/GTK2/source/gtkiconsize.pre:1.5
Rev: src/post_modules/GTK2/source/gtkiconsource.pre:1.5
Rev: src/post_modules/GTK2/source/gtkicontheme.pre:1.5
Rev: src/post_modules/GTK2/source/gtkiconview.pre:1.5
Rev: src/post_modules/GTK2/source/gtkimage.pre:1.7
Rev: src/post_modules/GTK2/source/gtkimagemenuitem.pre:1.6
Rev: src/post_modules/GTK2/source/gtkinvisible.pre:1.4
Rev: src/post_modules/GTK2/source/gtkkeywordlisttag.pre:1.4
Rev: src/post_modules/GTK2/source/gtklabel.pre:1.7
Rev: src/post_modules/GTK2/source/gtklayout.pre:1.5
Rev: src/post_modules/GTK2/source/gtkliststore.pre:1.13
Rev: src/post_modules/GTK2/source/gtkmenu.pre:1.3
Rev: src/post_modules/GTK2/source/gtkmenubar.pre:1.5
Rev: src/post_modules/GTK2/source/gtkmenuitem.pre:1.7
Rev: src/post_modules/GTK2/source/gtkmenushell.pre:1.4
Rev: src/post_modules/GTK2/source/gtkmenutoolbutton.pre:1.5
Rev: src/post_modules/GTK2/source/gtkmessagedialog.pre:1.2
Rev: src/post_modules/GTK2/source/gtkmisc.pre:1.5
Rev: src/post_modules/GTK2/source/gtknotebook.pre:1.5
Rev: src/post_modules/GTK2/source/gtkobject.pre:1.2
Rev: src/post_modules/GTK2/source/gtkplug.pre:1.5
Rev: src/post_modules/GTK2/source/gtkprogressbar.pre:1.5
Rev: src/post_modules/GTK2/source/gtkradioaction.pre:1.7
Rev: src/post_modules/GTK2/source/gtkradiobutton.pre:1.8
Rev: src/post_modules/GTK2/source/gtkradiomenuitem.pre:1.5
Rev: src/post_modules/GTK2/source/gtkradiotoolbutton.pre:1.4
Rev: src/post_modules/GTK2/source/gtkrcstyle.pre:1.4
Rev: src/post_modules/GTK2/source/gtkscale.pre:1.4
Rev: src/post_modules/GTK2/source/gtkscrolledwindow.pre:1.7
Rev: src/post_modules/GTK2/source/gtkseparatormenuitem.pre:1.4
Rev: src/post_modules/GTK2/source/gtkseparatortoolitem.pre:1.4
Rev: src/post_modules/GTK2/source/gtksettings.pre:1.4
Rev: src/post_modules/GTK2/source/gtksizegroup.pre:1.5
Rev: src/post_modules/GTK2/source/gtksocket.pre:1.4
Rev: src/post_modules/GTK2/source/gtksourcebuffer.pre:1.5
Rev: src/post_modules/GTK2/source/gtksourceiter.pre:1.5
Rev: src/post_modules/GTK2/source/gtksourcelanguage.pre:1.7
Rev: src/post_modules/GTK2/source/gtksourcelanguagesmanager.pre:1.5
Rev: src/post_modules/GTK2/source/gtksourceprintjob.pre:1.6
Rev: src/post_modules/GTK2/source/gtksourcestylescheme.pre:1.5
Rev: src/post_modules/GTK2/source/gtksourcetag.pre:1.6
Rev: src/post_modules/GTK2/source/gtksourcetagtable.pre:1.3
Rev: src/post_modules/GTK2/source/gtksourceview.pre:1.3
Rev: src/post_modules/GTK2/source/gtkspinbutton.pre:1.7
Rev: src/post_modules/GTK2/source/gtkstatusbar.pre:1.4
Rev: src/post_modules/GTK2/source/gtkstyle.pre:1.5
Rev: src/post_modules/GTK2/source/gtktable.pre:1.5
Rev: src/post_modules/GTK2/source/gtktearoffmenuitem.pre:1.4
Rev: src/post_modules/GTK2/source/gtktextattributes.pre:1.5
Rev: src/post_modules/GTK2/source/gtktextbuffer.pre:1.9
Rev: src/post_modules/GTK2/source/gtktextchildanchor.pre:1.3
Rev: src/post_modules/GTK2/source/gtktextiter.pre:1.8
Rev: src/post_modules/GTK2/source/gtktextmark.pre:1.5
Rev: src/post_modules/GTK2/source/gtktexttag.pre:1.4
Rev: src/post_modules/GTK2/source/gtktextview.pre:1.7
Rev: src/post_modules/GTK2/source/gtktoggleaction.pre:1.4
Rev: src/post_modules/GTK2/source/gtktogglebutton.pre:1.6
Rev: src/post_modules/GTK2/source/gtktoggletoolbutton.pre:1.4
Rev: src/post_modules/GTK2/source/gtktoolbar.pre:1.5
Rev: src/post_modules/GTK2/source/gtktoolbutton.pre:1.5
Rev: src/post_modules/GTK2/source/gtktoolitem.pre:1.4
Rev: src/post_modules/GTK2/source/gtktreedragdest.pre:1.2
Rev: src/post_modules/GTK2/source/gtktreedragsource.pre:1.2
Rev: src/post_modules/GTK2/source/gtktreeiter.pre:1.4
Rev: src/post_modules/GTK2/source/gtktreemodel.pre:1.4
Rev: src/post_modules/GTK2/source/gtktreepath.pre:1.6
Rev: src/post_modules/GTK2/source/gtktreerowreference.pre:1.5
Rev: src/post_modules/GTK2/source/gtktreeselection.pre:1.7
Rev: src/post_modules/GTK2/source/gtktreesortable.pre:1.2
Rev: src/post_modules/GTK2/source/gtktreestore.pre:1.12
Rev: src/post_modules/GTK2/source/gtktreeview.pre:1.7
Rev: src/post_modules/GTK2/source/gtktreeviewcolumn.pre:1.8
Rev: src/post_modules/GTK2/source/gtkuimanager.pre:1.5
Rev: src/post_modules/GTK2/source/gtkvbox.pre:1.5
Rev: src/post_modules/GTK2/source/gtkvbuttonbox.pre:1.4
Rev: src/post_modules/GTK2/source/gtkviewport.pre:1.5
Rev: src/post_modules/GTK2/source/gtkvpaned.pre:1.4
Rev: src/post_modules/GTK2/source/gtkvscale.pre:1.4
Rev: src/post_modules/GTK2/source/gtkvscrollbar.pre:1.6
Rev: src/post_modules/GTK2/source/gtkvseparator.pre:1.4
Rev: src/post_modules/GTK2/source/gtkwidget.pre:1.10
Rev: src/post_modules/GTK2/source/gtkwindow.pre:1.7
Rev: src/post_modules/GTK2/source/pangoattrlist.pre:1.5
Rev: src/post_modules/GTK2/source/pangocontext.pre:1.5
Rev: src/post_modules/GTK2/source/pangofontdescription.pre:1.6
Rev: src/post_modules/GTK2/source/pangolayout.pre:1.7
Rev: src/post_modules/GTK2/source/pangolayoutiter.pre:1.5
Rev: src/post_modules/GTK2/source/pangolayoutline.pre:1.6
Rev: src/post_modules/GTK2/source/pangotabarray.pre:1.5
Rev: src/post_modules/GTK2/source/support.c:1.11

52:   static void build_protos( Class cls, int lvl )   {    if( cls->name != "global" ) -  protos+=(" "*lvl)+"EXTPRG struct program *p"+cls->c_name()+"_program;\n"; +  protos+=(" "*lvl)+"EXTPRG struct program *"+glue_c_name(cls->c_name())+"_program;\n";    foreach( sort( indices( cls->functions ) ), string f )    protos += (" "*lvl)+ " extern "+cls->functions[ f ]->c_prototype();    foreach( sort( indices( cls->members ) ), string f )
77:       if( cls->name != "_global" )    { -  exitfun += " free_program( p"+cls->c_name()+"_program );\n"; +  exitfun += " free_program( "+glue_c_name(cls->c_name())+"_program );\n";    if( !cls->mixin_for )    type_switch =    "#ifdef "+cls->c_type_define()+"\n"    " if(PGTK_CHECK_TYPE(widget, "+cls->c_type_define()+"))\n" -  " return p"+cls->c_name()+"_program;\n" +  " return "+glue_c_name(cls->c_name())+"_program;\n"    "#endif\n"+type_switch;    }    res = "static void _"+init_n+"()\n{\n";
93:    " start_new_program(); /* "+cls->name+" */\n";    if( sizeof(cls->inherits) )    foreach( cls->inherits, Class c ) -  res += " low_inherit( p"+c->c_name()+ +  res += " low_inherit( "+glue_c_name(c->c_name())+    "_program,0,0,0,0,0);\n";    else    {
109:    output_thing( cls->members[ f ] );    if( cls->name != "_global" )    { -  res += (" p"+cls->c_name()+"_program = end_program();\n" -  " p"+cls->c_name()+"_program->id = "+cls->class_id()+";\n"); +  res += (" "+glue_c_name(cls->c_name())+"_program = end_program();\n" +  " "+glue_c_name(cls->c_name())+"_program->id = "+cls->class_id()+";\n");    res += (" add_program_constant("+S(cls->pike_name(),1,0,26)+",\n" -  " p"+cls->c_name()+"_program, 0);\n"); +  " "+glue_c_name(cls->c_name())+"_program, 0);\n");   // predef::write("pike_name==%s\n",cls->pike_name());   /*    string str=S(cls->pike_name(),1,0,26);
129:    if( cls->name == "_global" )    {    if(sizeof(cls->init)) -  initfun += " pgtk__init();\n"; +  initfun += " pgtk2__init();\n";    if(sizeof(cls->exit)) -  exitfun += " pgtk__exit();\n"; +  exitfun += " pgtk2__exit();\n";    }    } )    werror(cls->file+":"+cls->line+": Error: "+
209:       if(sizeof(strings))    { -  pre += "struct pike_string * pstr_vector["+sizeof(strings)+"];\n\n"; +  pre += "struct pike_string * pgtk2_pstr_vector["+sizeof(strings)+"];\n\n";    foreach( strings; string str; int idx )    {    initfun += sprintf("\n /* %O */\n", str); -  initfun += " pstr_vector[" + idx + "] = make_shared_binary_string(" + +  initfun += " pgtk2_pstr_vector[" + idx + "] = make_shared_binary_string(" +    S(str,0,2) + "," + sizeof(str) + ");\n";    }    exitfun += #"    {    int i; -  for( i=0; i<NELEM(pstr_vector); i++ ) -  free_string( pstr_vector[i] ); +  for( i=0; i<NELEM(pgtk2_pstr_vector); i++ ) +  free_string( pgtk2_pstr_vector[i] );    }   ";    }
232:    pre + toplevel +    "PIKE_MODULE_INIT {\n"+make_initfun()+initfun+"}\n\n"    "PIKE_MODULE_EXIT {\n"+exitfun+"}\n\n" -  "struct program *pgtk_type_to_program(GObject *widget)\n" +  "struct program *pgtk2_type_to_program(GObject *widget)\n"    "{\n"    +type_switch+ -  " return pg_object_program;\n}\n\n" ); +  " return pg2_object_program;\n}\n\n" );       return files;   }