Update of /cvsroot/pure-data/externals/tkwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10569
Modified Files: checkbutton.c text.c Log Message: moved inlet/outlet counts to tkwidgets.h
Index: checkbutton.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/checkbutton.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** checkbutton.c 24 Nov 2007 00:33:42 -0000 1.5 --- checkbutton.c 24 Nov 2007 04:07:23 -0000 1.6 *************** *** 122,126 **** tkwidgets_draw_iolets((t_object*)x, glist, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height, TOTAL_INLETS, TOTAL_OUTLETS); sys_vgui("%s create window %d %d -anchor nw -window %s -tags {%s %s}\n", x->canvas_id->s_name, --- 122,126 ---- tkwidgets_draw_iolets((t_object*)x, glist, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height); sys_vgui("%s create window %d %d -anchor nw -window %s -tags {%s %s}\n", x->canvas_id->s_name, *************** *** 219,224 **** sys_vgui("%s itemconfigure %s -width %d -height %d\n", x->canvas_id->s_name, x->window_tag->s_name, x->width, x->height); - // erase_inlets(x); - // tkwidgets_draw_iolets(x, x->x_glist, TOTAL_INLETS, TOTAL_OUTLETS); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } --- 219,222 ---- *************** *** 262,266 ****
x->x_glist = canvas_getcurrent(); - set_tkwidgets_ids(x, x->x_glist); x->iolets_tag = tkwidgets_gen_iolets_tag((t_object*)x); x->all_tag = tkwidgets_gen_all_tag((t_object*)x); --- 260,263 ----
Index: text.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/text.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** text.c 24 Nov 2007 00:33:42 -0000 1.12 --- text.c 24 Nov 2007 04:07:23 -0000 1.13 *************** *** 38,44 **** #define TEXT_MIN_HEIGHT 20
- #define TOTAL_INLETS 1 - #define TOTAL_OUTLETS 2 - #define DEBUG(x) x
--- 38,41 ---- *************** *** 110,113 **** --- 107,112 ---- "width", "wrap", + // "xscrollcommand", /* problematic since it uses the canvas_id, etc. */ + // "yscrollcommand", /* problematic since it uses the canvas_id, etc. */ };
*************** *** 188,192 **** tkwidgets_draw_iolets((t_object*)x, glist, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height, TOTAL_INLETS, TOTAL_OUTLETS); if(x->have_scrollbars) draw_scrollbar(x); sys_vgui("%s create window %d %d -anchor nw -window %s \ --- 187,191 ---- tkwidgets_draw_iolets((t_object*)x, glist, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height); if(x->have_scrollbars) draw_scrollbar(x); sys_vgui("%s create window %d %d -anchor nw -window %s \ *************** *** 558,562 **** tkwidgets_draw_iolets((t_object*)x, x->x_glist, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height, TOTAL_INLETS, TOTAL_OUTLETS); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } --- 557,561 ---- tkwidgets_draw_iolets((t_object*)x, x->x_glist, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } *************** *** 606,610 **** tkwidgets_draw_iolets((t_object*)x, canvas, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height, TOTAL_INLETS, TOTAL_OUTLETS); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } --- 605,609 ---- tkwidgets_draw_iolets((t_object*)x, canvas, x->canvas_id, x->iolets_tag, x->all_tag, ! x->width, x->height); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet }