Fixed these:

/* TODO: add size to query and save */
/* TODO: add scrollbars to query and save */
/* TODO: remove glist from _erase() args */

svn path=/trunk/externals/tkwidgets/; revision=9027

3 files changed, 7 insertions, 11 deletions

diff --git a/checkbutton.c b/checkbutton.c
index e4866d6..75ec581 100644
--- a/checkbutton.c
+++ b/checkbutton.c
@@ -120,7 +120,7 @@ static void checkbutton_drawme(t_checkbutton *x, t_glist *glist)
     sys_vgui("destroy %s\n", x->widget_id->s_name); /* just in case it exists */
     sys_vgui("checkbutton %s\n", 
              x->widget_id->s_name);
-    tkwidgets_draw_inlets((t_object*)x, glist, 
+    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", 
@@ -219,7 +219,7 @@ static void checkbutton_size(t_checkbutton *x, t_float width, t_float height)
         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_inlets(x, x->x_glist, TOTAL_INLETS, TOTAL_OUTLETS);
+//        tkwidgets_draw_iolets(x, x->x_glist, TOTAL_INLETS, TOTAL_OUTLETS);
         canvas_fixlinesfor(x->x_glist, (t_text *)x);  // 2nd inlet
     }
 }
diff --git a/shared/tkwidgets.c b/shared/tkwidgets.c
index cf7418d..eec524a 100644
--- a/shared/tkwidgets.c
+++ b/shared/tkwidgets.c
@@ -165,6 +165,7 @@ void tkwidgets_draw_iolets(t_object *x, t_glist *glist, t_symbol *canvas_id,
     int x_location = text_xpix(x, glist);
     int y_location = text_ypix(x, glist);
 
+/* TODO: make inlets draw on top of widget */
     for (i = 0; i < total_inlets; i++)  /* inlets */
     {
         onset = calculate_onset(x_location, width, i, total_inlets);
diff --git a/text.c b/text.c
index 63000b0..209951f 100644
--- a/text.c
+++ b/text.c
@@ -25,16 +25,13 @@
 
 /* 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 */
 
 
 #define DEFAULT_COLOR           "grey70"
 
-#define TEXT_DEFAULT_WIDTH     130
+#define TEXT_DEFAULT_WIDTH     200
 #define TEXT_DEFAULT_HEIGHT    60
 #define TEXT_MIN_WIDTH         40
 #define TEXT_MIN_HEIGHT        20
@@ -200,11 +197,9 @@ static void textwidget_drawme(t_textwidget *x, t_glist *glist)
                               x->widget_id, x->options_binbuf);
 }     
 
-static void textwidget_erase(t_textwidget* x,t_glist* glist)
+static void textwidget_erase(t_textwidget* x)
 {
-    DEBUG(post("textwidget_erase: canvas %lx glist %lx", x->x_canvas, glist););
-
-    set_tkwidgets_ids(x,glist_getcanvas(glist));
+    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);
     sys_vgui("%s delete %s\n", x->canvas_id->s_name, x->all_tag->s_name);
@@ -315,7 +310,7 @@ static void textwidget_vis(t_gobj *z, t_glist *glist, int vis)
     }
     else {
         y = glist_findrtext(glist, (t_text *)z);
-        textwidget_erase(x, glist);
+        textwidget_erase(x);
         rtext_free(y);
     }
 }