merged relevant changes from Pd-extended 0.42

svn path=/trunk/externals/tof/; revision=14153

4 files changed, 7 insertions, 7 deletions

diff --git a/src/imagebang.c b/src/imagebang.c
index b140cfe..be1d43c 100644
--- a/src/imagebang.c
+++ b/src/imagebang.c
@@ -168,7 +168,7 @@ static void imagebang_displace(t_gobj *z, t_glist *glist,
 		   text_xpix(&x->x_obj, glist) + x->width, text_ypix(&x->x_obj, glist) + x->height);
 
     imagebang_drawme(x, glist, 0);
-    canvas_fixlinesfor(glist_getcanvas(glist),(t_text*) x);
+    canvas_fixlinesfor(glist,(t_text*) x);
 }
 
 static void imagebang_select(t_gobj *z, t_glist *glist, int state)
@@ -231,7 +231,7 @@ static void imagebang_imagesize_callback(t_imagebang *x, t_float w, t_float h) {
 	DEBUG(post("received w %f h %f",w,h);)
 	x->width = w;
 	x->height = h;
-	canvas_fixlinesfor(glist_getcanvas(x->glist),(t_text*) x);
+	canvas_fixlinesfor(x->glist,(t_text*) x);
 }
 	
 	
diff --git a/src/menubutton_w.h b/src/menubutton_w.h
index f683c4a..cdd223d 100644
--- a/src/menubutton_w.h
+++ b/src/menubutton_w.h
@@ -320,7 +320,7 @@ static void menubutton_w_displace(t_gobj *z, t_glist *glist,
       menubutton_w_draw_handle(x,glist,UPDATE);
       menubutton_w_draw_inlets(x, glist, UPDATE, 1,1);
       menubutton_w_drawme(x, glist, UPDATE);
-      canvas_fixlinesfor(glist_getcanvas(glist),(t_text*) x);
+      canvas_fixlinesfor(glist,(t_text*) x);
     }
     DEBUG(post("displace end");)
 }
diff --git a/src/w_breakpoints.h b/src/w_breakpoints.h
index 2b980d7..b747672 100644
--- a/src/w_breakpoints.h
+++ b/src/w_breakpoints.h
@@ -352,7 +352,7 @@ static void breakpoints_displace(t_gobj *z, t_glist *glist,
     x->x_obj.te_ypix += dy;

 

     breakpoints_drawme(x, glist, 0);

-    canvas_fixlinesfor(glist_getcanvas(glist),(t_text*) x);

+    canvas_fixlinesfor(glist,(t_text*) x);

 }

 

 static void breakpoints_select(t_gobj *z, t_glist *glist, int state)

@@ -374,7 +374,7 @@ static void breakpoints_activate(t_gobj *z, t_glist *glist, int state)
 static void breakpoints_delete(t_gobj *z, t_glist *glist)

 {

     t_text *x = (t_text *)z;

-    canvas_deletelinesfor(glist_getcanvas(glist), x);

+    canvas_deletelinesfor(glist, x);

 }

 

        

diff --git a/test/imagebutton.c b/test/imagebutton.c
index 577924a..2e2bddd 100644
--- a/test/imagebutton.c
+++ b/test/imagebutton.c
@@ -160,7 +160,7 @@ static void imagebutton_displace(t_gobj *z, t_glist *glist,
 		   text_xpix(&x->x_obj, glist) + x->width, text_ypix(&x->x_obj, glist) + x->height);
 
     imagebutton_drawme(x, glist, 0);
-    canvas_fixlinesfor(glist_getcanvas(glist),(t_text*) x);
+    canvas_fixlinesfor(glist,(t_text*) x);
 }
 
 static void imagebutton_select(t_gobj *z, t_glist *glist, int state)
@@ -264,7 +264,7 @@ static void imagebutton_imagesize_callback(t_imagebutton *x, t_float w, t_float
 	DEBUG(post("received w %f h %f",w,h);)
 	x->width = w;
 	x->height = h;
-	canvas_fixlinesfor(glist_getcanvas(x->glist),(t_text*) x);
+	canvas_fixlinesfor(x->glist,(t_text*) x);
 }