From 77ba1c5c22800eddd11166109147f8f4e873dae2 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 17 Sep 2010 17:11:34 +0000 Subject: merged relevant changes from Pd-extended 0.42 svn path=/trunk/externals/ggee/; revision=14153 --- gui/fatom.h | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'gui/fatom.h') diff --git a/gui/fatom.h b/gui/fatom.h index 61d86dd..9f2dbac 100644 --- a/gui/fatom.h +++ b/gui/fatom.h @@ -272,7 +272,7 @@ static void fatom_displace(t_gobj *z, t_glist *glist, text_xpix(&x->x_obj, glist) + x->x_rect_width, text_ypix(&x->x_obj, glist) + x->x_rect_height); fatom_drawme(x, glist, 0); - canvas_fixlinesfor(glist_getcanvas(glist),(t_text*) x); + canvas_fixlinesfor(glist,(t_text*) x); } DEBUG(post("displace end");) } @@ -308,27 +308,19 @@ static void fatom_activate(t_gobj *z, t_glist *glist, int state) static void fatom_delete(t_gobj *z, t_glist *glist) { t_text *x = (t_text *)z; - canvas_deletelinesfor(glist_getcanvas(glist), x); + canvas_deletelinesfor(glist, x); } static void fatom_vis(t_gobj *z, t_glist *glist, int vis) { - t_fatom* s = (t_fatom*)z; - t_rtext *y; + t_fatom* x = (t_fatom*)z; DEBUG(post("vis: %d",vis);) if (vis) { -#ifdef PD_MINOR_VERSION - y = (t_rtext *) rtext_new(glist, (t_text *)z); -#else - y = (t_rtext *) rtext_new(glist, (t_text *)z,0,0); -#endif - fatom_drawme(s, glist, 1); + fatom_drawme(x, glist, 1); } else { - y = glist_findrtext(glist, (t_text *)z); - fatom_erase(s,glist); - rtext_free(y); + fatom_erase(x,glist); } } -- cgit v1.2.1