Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3551
Modified Files: Tag: impd_0_37 g_dropper.c g_mycanvas.c Log Message: adjusting to iemgui_draw / iemgui_dodraw
Index: g_mycanvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.c,v retrieving revision 1.1.1.3.2.2.2.13 retrieving revision 1.1.1.3.2.2.2.14 diff -C2 -d -r1.1.1.3.2.2.2.13 -r1.1.1.3.2.2.2.14 *** g_mycanvas.c 4 May 2004 07:15:49 -0000 1.1.1.3.2.2.2.13 --- g_mycanvas.c 8 May 2004 19:54:14 -0000 1.1.1.3.2.2.2.14 *************** *** 24,31 **** static t_class *my_canvas_class;
- void my_canvas_draw(t_bng *x, t_glist *glist, int mode) { - iemgui_draw((t_iemgui *)x,glist,mode,"cnv"); - } - /* ------------------------ cnv widgetbehaviour----------------------------- */
--- 24,27 ---- *************** *** 33,37 **** { t_my_canvas *x = (t_my_canvas *)z; - *xp1 = text_xpix(&x->x_gui.x_obj, glist); *yp1 = text_ypix(&x->x_gui.x_obj, glist); --- 29,32 ---- *************** *** 77,82 **** x->x_vis_h = x->x_vis_w = MAX(1,(int)atom_getintarg(0, ac, av)); if(ac > 1) x->x_vis_h = MAX(1,(int)atom_getintarg(1, ac, av)); ! if(glist_isvisible(x->x_gui.x_glist)) ! x->x_gui.x_draw(x, x->x_gui.x_glist, 0); }
--- 72,76 ---- x->x_vis_h = x->x_vis_w = MAX(1,(int)atom_getintarg(0, ac, av)); if(ac > 1) x->x_vis_h = MAX(1,(int)atom_getintarg(1, ac, av)); ! if(glist_isvisible(x->x_gui.x_glist)) iemgui_dodraw((t_iemgui *)x); }
*************** *** 98,102 **** y->x_rcv_able = y->x_rcv!=sym_empty; if (y->x_rcv_able) pd_bind((t_pd *)x, y->x_rcv); ! if (glist_isvisible(glist_getcanvas(y->x_glist))) x->x_gui.x_draw(x, y->x_glist, 0); }
--- 92,96 ---- y->x_rcv_able = y->x_rcv!=sym_empty; if (y->x_rcv_able) pd_bind((t_pd *)x, y->x_rcv); ! if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); }
*************** *** 105,109 **** t_iemgui *y = iemgui_new(my_canvas_class); t_my_canvas *x = (t_my_canvas *)y; - y->x_draw = (t_iemfunptr)my_canvas_draw; y->x_bcol = 0xe0e0e0; y->x_fcol = 0x000000; --- 99,102 ----
Index: g_dropper.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/g_dropper.c,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -C2 -d -r1.1.2.15 -r1.1.2.16 *** g_dropper.c 4 May 2004 07:15:49 -0000 1.1.2.15 --- g_dropper.c 8 May 2004 19:54:14 -0000 1.1.2.16 *************** *** 23,30 **** static t_class *dropper_class;
- void dropper_draw(t_dropper *x, t_glist *glist, int mode) { - iemgui_draw((t_iemgui *)x,glist,mode,"dropper"); - } - /* ------------------------ dropper widgetbehaviour----------------------------- */
--- 23,26 ---- *************** *** 81,85 **** if (y->x_rcv_able) pd_bind((t_pd *)x, y->x_rcv); iemgui_constrain(y); ! if (glist_isvisible(glist_getcanvas(y->x_glist))) x->x_gui.x_draw(x, y->x_glist, 0); }
--- 77,81 ---- if (y->x_rcv_able) pd_bind((t_pd *)x, y->x_rcv); iemgui_constrain(y); ! if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); }
*************** *** 88,92 **** t_iemgui *y = iemgui_new(dropper_class); t_dropper *x = (t_dropper *)y; - y->x_draw = (t_iemfunptr)dropper_draw; y->x_locked = 0; outlet_new((t_text *)x, &s_symbol); --- 84,87 ----