Update of /cvsroot/pure-data/externals/tkwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16952
Modified Files: checkbutton.c text.c Log Message:
Fixed these: /* TODO: add size to query and save */ /* TODO: add scrollbars to query and save */ /* TODO: remove glist from _erase() args */
Index: checkbutton.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/checkbutton.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** checkbutton.c 22 Nov 2007 02:50:23 -0000 1.3 --- checkbutton.c 23 Nov 2007 23:47:00 -0000 1.4 *************** *** 121,125 **** sys_vgui("checkbutton %s\n", x->widget_id->s_name); ! tkwidgets_draw_inlets((t_object*)x, glist, x->canvas_id, x->iolets_tag, x->all_tag, x->width, x->height, TOTAL_INLETS, TOTAL_OUTLETS); --- 121,125 ---- sys_vgui("checkbutton %s\n", x->widget_id->s_name); ! tkwidgets_draw_iolets((t_object*)x, glist, x->canvas_id, x->iolets_tag, x->all_tag, x->width, x->height, TOTAL_INLETS, TOTAL_OUTLETS); *************** *** 220,224 **** x->canvas_id->s_name, x->window_tag->s_name, x->width, x->height); // erase_inlets(x); ! // tkwidgets_draw_inlets(x, x->x_glist, TOTAL_INLETS, TOTAL_OUTLETS); canvas_fixlinesfor(x->x_glist, (t_text *)x); // 2nd inlet } --- 220,224 ---- 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 }
Index: text.c =================================================================== RCS file: /cvsroot/pure-data/externals/tkwidgets/text.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** text.c 23 Nov 2007 22:44:03 -0000 1.10 --- text.c 23 Nov 2007 23:47:00 -0000 1.11 *************** *** 26,32 **** /* TODO: get Ctrl-A working to select all */ /* TODO: set message doesnt work with a loadbang */ - /* TODO: add size to query and save */ - /* TODO: add scrollbars to query and save */ - /* TODO: remove glist from _erase() args */ /* TODO: window name "handle1376fc00" already exists in parent */ /* TODO: figure out window vs. text width/height */ --- 26,29 ---- *************** *** 35,39 **** #define DEFAULT_COLOR "grey70"
! #define TEXT_DEFAULT_WIDTH 130 #define TEXT_DEFAULT_HEIGHT 60 #define TEXT_MIN_WIDTH 40 --- 32,36 ---- #define DEFAULT_COLOR "grey70"
! #define TEXT_DEFAULT_WIDTH 200 #define TEXT_DEFAULT_HEIGHT 60 #define TEXT_MIN_WIDTH 40 *************** *** 201,209 **** }
! static void textwidget_erase(t_textwidget* x,t_glist* glist) { ! DEBUG(post("textwidget_erase: canvas %lx glist %lx", x->x_canvas, glist);); ! ! set_tkwidgets_ids(x,glist_getcanvas(glist)); tkwidgets_erase_iolets(x->canvas_id, x->iolets_tag); sys_vgui("destroy %s\n", x->frame_id->s_name); --- 198,204 ---- }
! static void textwidget_erase(t_textwidget* x) { ! DEBUG(post("textwidget_erase: canvas %lx", x->x_canvas);); tkwidgets_erase_iolets(x->canvas_id, x->iolets_tag); sys_vgui("destroy %s\n", x->frame_id->s_name); *************** *** 316,320 **** else { y = glist_findrtext(glist, (t_text *)z); ! textwidget_erase(x, glist); rtext_free(y); } --- 311,315 ---- else { y = glist_findrtext(glist, (t_text *)z); ! textwidget_erase(x); rtext_free(y); }