From 708551768795dc56e63c51658be3ed2b08630c0e Mon Sep 17 00:00:00 2001 From: Guenter Geiger Date: Thu, 24 Feb 2005 14:55:29 +0000 Subject: remove leftover svn path=/trunk/externals/ggee/; revision=2580 --- gui/slider.c | 45 +++++++++++++++++++++++---------------------- gui/sliderh.c | 10 +++++----- 2 files changed, 28 insertions(+), 27 deletions(-) (limited to 'gui') diff --git a/gui/slider.c b/gui/slider.c index 8e74a8e..a2bb293 100755 --- a/gui/slider.c +++ b/gui/slider.c @@ -9,44 +9,45 @@ static void slider_save(t_gobj *z, t_binbuf *b) { t_fatom *x = (t_fatom *)z; - binbuf_addv(b, "ssiisiii", gensym("#X"),gensym("obj"), + binbuf_addv(b, "ssiisiiisss", gensym("#X"),gensym("obj"), x->x_obj.te_xpix, x->x_obj.te_ypix , - gensym("slider"),x->x_max,x->x_min,x->x_width); + gensym("slider"),x->x_max,x->x_min,x->x_width,x->x_send,x->x_color,x->x_bgcolor); binbuf_addv(b, ";"); } -static void *slider_new(t_floatarg max, t_floatarg min, t_floatarg h) +static void *slider_new(t_symbol* s,t_int argc, t_atom* argv) { t_fatom *x = (t_fatom *)pd_new(slider_class); x->x_type = gensym("vslider"); - return fatom_new(x,max,min,h,&s_); + return fatom_new(x,argc,argv); } t_widgetbehavior slider_widgetbehavior; -void slider_setup() { +void slider_setup(void) { slider_class = class_new(gensym("slider"), (t_newmethod)slider_new, 0, - sizeof(t_fatom),0,A_DEFFLOAT,A_DEFFLOAT,A_DEFFLOAT,0); - - slider_widgetbehavior.w_getrectfn = fatom_getrect, - slider_widgetbehavior.w_displacefn = fatom_displace, - slider_widgetbehavior.w_selectfn = fatom_select, - slider_widgetbehavior.w_activatefn = fatom_activate, - slider_widgetbehavior.w_deletefn = fatom_delete, - slider_widgetbehavior.w_visfn= fatom_vis, -#if PD_MINOR_VERSION < 37 - slider_widgetbehavior.w_savefn = slider_save, - slider_widgetbehavior.w_propertiesfn = NULL, -#endif - slider_widgetbehavior.w_clickfn = NULL, - - fatom_setup_common(slider_class); + sizeof(t_fatom),0,A_GIMME,0); + + slider_widgetbehavior.w_getrectfn = fatom_getrect; + slider_widgetbehavior.w_displacefn = fatom_displace; + slider_widgetbehavior.w_selectfn = fatom_select; + slider_widgetbehavior.w_activatefn = fatom_activate; + slider_widgetbehavior.w_deletefn = fatom_delete; + slider_widgetbehavior.w_visfn= fatom_vis; + slider_widgetbehavior.w_clickfn = NULL; + + fatom_setup_common(slider_class); class_setwidget(slider_class,&slider_widgetbehavior); -#if PD_MINOR_VERSION >= 37 + +#if PD_MINOR_VERSION < 37 + slider_widgetbehavior.w_savefn = slider_save; + slider_widgetbehavior.w_propertiesfn = NULL; +#else class_setsavefn(slider_class,&slider_save); -#endif class_setpropertiesfn(slider_class,&fatom_properties); +#endif + } diff --git a/gui/sliderh.c b/gui/sliderh.c index d89b6de..5d86e5d 100644 --- a/gui/sliderh.c +++ b/gui/sliderh.c @@ -18,18 +18,18 @@ static void sliderh_save(t_gobj *z, t_binbuf *b) t_fatom *x = (t_fatom *)z; - binbuf_addv(b, "ssiisiii", gensym("#X"),gensym("obj"), + binbuf_addv(b, "ssiisiiisss", gensym("#X"),gensym("obj"), x->x_obj.te_xpix, x->x_obj.te_ypix , - gensym("sliderh"),x->x_max,x->x_min,x->x_width); + gensym("sliderh"),x->x_max,x->x_min,x->x_width,x->x_send,x->x_color,x->x_bgcolor); binbuf_addv(b, ";"); } -static void *sliderh_new(t_floatarg max, t_floatarg min,t_floatarg h) +static void *sliderh_new(t_symbol* s, int argc, t_atom* argv) { t_fatom *x = (t_fatom *)pd_new(sliderh_class); x->x_type = gensym("hslider"); - return fatom_new(x,max,min,h,&s_); + return fatom_new(x,argc,argv); } @@ -38,7 +38,7 @@ t_widgetbehavior sliderh_widgetbehavior; -void sliderh_setup() { +void sliderh_setup(void) { sliderh_class = class_new(gensym("sliderh"), (t_newmethod)sliderh_new, 0, sizeof(t_fatom),0,A_DEFFLOAT,A_DEFFLOAT,A_DEFFLOAT,0); -- cgit v1.2.1