From 08fc7edfdd32ac8d58e16ae53466e3ec85755678 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/bbogart/; revision=14153 --- popup/popup.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'popup/popup.c') diff --git a/popup/popup.c b/popup/popup.c index 9da8a94..1ea98a3 100644 --- a/popup/popup.c +++ b/popup/popup.c @@ -28,10 +28,6 @@ #pragma warning( disable : 4305 ) #endif -#if PD_MINOR_VERSION < 37 -#define t_rtext t_text -#endif - #ifndef IOWIDTH #define IOWIDTH 4 #endif @@ -268,7 +264,7 @@ static void popup_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-2); popup_drawme(x, glist, 0); - canvas_fixlinesfor(glist_getcanvas(glist),(t_text*) x); + canvas_fixlinesfor(glist,(t_text*) x); } DEBUG(post("displace end");) } @@ -320,27 +316,13 @@ static void popup_delete(t_gobj *z, t_glist *glist) static void popup_vis(t_gobj *z, t_glist *glist, int vis) { t_popup* s = (t_popup*)z; - t_rtext *y; - DEBUG(post("vis start");) + DEBUG(post("vis: %d",vis);) if (vis) { -#ifdef PD_MINOR_VERSION - /* JMZ: create an editor if there is none; - * on 0.42 there might be none IF [popup] is contained within a gop - */ -#if PD_MINOR_VERSION > 41 - canvas_create_editor(glist); -#endif - y = (t_rtext *) rtext_new(glist, (t_text *)z); -#else - y = (t_rtext *) rtext_new(glist, (t_text *)z,0,0); -#endif popup_drawme(s, glist, 1); } else { - y = glist_findrtext(glist, (t_text *)z); popup_erase(s,glist); - rtext_free(y); } DEBUG(post("vis end");) -- cgit v1.2.1