From f13aed83edee3f3dd769790aa5edb551327b9d02 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 1 Aug 2011 17:35:10 +0000 Subject: replace .x%x 32-bit only canvas id with .x%lx canvas id which supports 32-bit and 64-bit svn path=/trunk/externals/ggee/; revision=15186 --- gui/toddle.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'gui/toddle.c') diff --git a/gui/toddle.c b/gui/toddle.c index d7b9f31..24ade27 100644 --- a/gui/toddle.c +++ b/gui/toddle.c @@ -43,12 +43,12 @@ void toddle_drawbang(t_toddle *x,t_glist *glist,int on) { if (glist_isvisible(glist)) { if (on) - sys_vgui(".x%x.c create oval %d %d %d %d -fill %s -tags %xB\n",glist_getcanvas(glist), + sys_vgui(".x%lx.c create oval %d %d %d %d -fill %s -tags %xB\n",glist_getcanvas(glist), x->x_obj.te_xpos+1,x->x_obj.te_ypos+1, x->x_obj.te_xpos + x->x_width -1, x->x_obj.te_ypos + x->x_height -1,x->x_color->s_name,x); else - sys_vgui(".x%x.c delete %xB\n", + sys_vgui(".x%lx.c delete %xB\n", glist_getcanvas(glist), x); } } @@ -60,7 +60,7 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime) { if (firsttime) { #if 0 - sys_vgui(".x%x.c create line \ + sys_vgui(".x%lx.c create line \ %d %d %d %d %d %d %d %d %d %d -tags %xS\n", glist_getcanvas(glist), x->x_obj.te_xpos, x->x_obj.te_ypos, @@ -71,13 +71,13 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime) x); #endif - sys_vgui(".x%x.c create rectangle \ + sys_vgui(".x%lx.c create rectangle \ %d %d %d %d -tags %xS "BACKGROUND"\n", glist_getcanvas(glist), x->x_obj.te_xpos, x->x_obj.te_ypos, x->x_obj.te_xpos + x->x_width, x->x_obj.te_ypos + x->x_height, x); - sys_vgui(".x%x.c create oval \ + sys_vgui(".x%lx.c create oval \ %d %d %d %d -tags %xP\n",glist_getcanvas(glist), x->x_obj.te_xpos+1,x->x_obj.te_ypos+1, x->x_obj.te_xpos + x->x_width -1, @@ -86,7 +86,7 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime) } else { #if 0 - sys_vgui(".x%x.c coords %xS \ + sys_vgui(".x%lx.c coords %xS \ %d %d %d %d %d %d %d %d %d %d\n", glist_getcanvas(glist), x, x->x_obj.te_xpos, x->x_obj.te_ypos, @@ -95,14 +95,14 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime) x->x_obj.te_xpos, x->x_obj.te_ypos + x->x_height, x->x_obj.te_xpos, x->x_obj.te_ypos); #endif - sys_vgui(".x%x.c coords %xS \ + sys_vgui(".x%lx.c coords %xS \ %d %d %d %d\n", glist_getcanvas(glist), x, x->x_obj.te_xpos, x->x_obj.te_ypos, x->x_obj.te_xpos + x->x_width, x->x_obj.te_ypos + x->x_height); - sys_vgui(".x%x.c coords %xP \ + sys_vgui(".x%lx.c coords %xP \ %d %d %d %d\n",glist_getcanvas(glist),x, x->x_obj.te_xpos+1,x->x_obj.te_ypos+1, x->x_obj.te_xpos + x->x_width-1, @@ -118,13 +118,13 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime) { int onset = x->x_obj.te_xpos + (x->x_width - IOWIDTH) * i / nplus; if (firsttime) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xo%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xo%d\n", glist_getcanvas(glist), onset, x->x_obj.te_ypos + x->x_height - 1, onset + IOWIDTH, x->x_obj.te_ypos + x->x_height, x, i); else - sys_vgui(".x%x.c coords %xo%d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %xo%d %d %d %d %d\n", glist_getcanvas(glist), x, i, onset, x->x_obj.te_ypos + x->x_height - 1, onset + IOWIDTH, x->x_obj.te_ypos + x->x_height); @@ -135,13 +135,13 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime) { int onset = x->x_obj.te_xpos + (x->x_width - IOWIDTH) * i / nplus; if (firsttime) - sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xi%d\n", + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xi%d\n", glist_getcanvas(glist), onset, x->x_obj.te_ypos, onset + IOWIDTH, x->x_obj.te_ypos + 1, x, i); else - sys_vgui(".x%x.c coords %xi%d %d %d %d %d\n", + sys_vgui(".x%lx.c coords %xi%d %d %d %d %d\n", glist_getcanvas(glist), x, i, onset, x->x_obj.te_ypos, onset + IOWIDTH, x->x_obj.te_ypos + 1); @@ -157,17 +157,17 @@ void toddle_drawme(t_toddle *x, t_glist *glist, int firsttime) void toddle_erase(t_toddle* x,t_glist* glist) { int n; - sys_vgui(".x%x.c delete %xS\n", + sys_vgui(".x%lx.c delete %xS\n", glist_getcanvas(glist), x); - sys_vgui(".x%x.c delete %xP\n", + sys_vgui(".x%lx.c delete %xP\n", glist_getcanvas(glist), x); n = 1; while (n--) { - sys_vgui(".x%x.c delete %xi%d\n",glist_getcanvas(glist),x,n); - sys_vgui(".x%x.c delete %xo%d\n",glist_getcanvas(glist),x,n); + sys_vgui(".x%lx.c delete %xi%d\n",glist_getcanvas(glist),x,n); + sys_vgui(".x%lx.c delete %xo%d\n",glist_getcanvas(glist),x,n); } } @@ -204,7 +204,7 @@ static void toddle_displace(t_gobj *z, t_glist *glist, static void toddle_select(t_gobj *z, t_glist *glist, int state) { t_toddle *x = (t_toddle *)z; - sys_vgui(".x%x.c itemconfigure %xS -fill %s\n", glist, + sys_vgui(".x%lx.c itemconfigure %xS -fill %s\n", glist, x, (state? "blue" : BACKGROUNDCOLOR)); } -- cgit v1.2.1