Update of /cvsroot/pure-data/externals/ggee/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21118
Modified Files:
button.c envgen.c fatom.h image.c slider.c sliderh.c ticker.c
w_envgen.h
Log Message:
fixed widgetbehaviour for MS compiler
Index: button.c
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/button.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** button.c 27 Oct 2003 18:23:10 -0000 1.12
--- button.c 6 Feb 2004 17:03:34 -0000 1.13
***************
*** 260,278 ****
static void button_save(t_gobj *z, t_binbuf *b);
! t_widgetbehavior button_widgetbehavior = {
! w_getrectfn: button_getrect,
! w_displacefn: button_displace,
! w_selectfn: button_select,
! w_activatefn: button_activate,
! w_deletefn: button_delete,
! w_visfn: button_vis,
! #if PD_MINOR_VERSION < 37
! w_savefn: button_save,
! #endif
! w_clickfn: NULL,
! #if PD_MINOR_VERSION < 37
! w_propertiesfn: NULL,
! #endif
! };
--- 260,265 ----
static void button_save(t_gobj *z, t_binbuf *b);
! t_widgetbehavior button_widgetbehavior;
!
***************
*** 354,357 ****
--- 341,357 ----
class_addmethod(button_class, (t_method)button_b,gensym("b"),0);
+ button_widgetbehavior.w_getrectfn= button_getrect,
+ button_widgetbehavior.w_displacefn= button_displace,
+ button_widgetbehavior.w_selectfn= button_select,
+ button_widgetbehavior.w_activatefn= button_activate,
+ button_widgetbehavior.w_deletefn= button_delete,
+ button_widgetbehavior.w_visfn= button_vis,
+ #if PD_MINOR_VERSION < 37
+ button_widgetbehavior.w_savefn= button_save,
+ #endif
+ button_widgetbehavior.w_clickfn= NULL,
+ #if PD_MINOR_VERSION < 37
+ button_widgetbehavior.w_propertiesfn= NULL,
+ #endif
class_setwidget(button_class,&button_widgetbehavior);
#if PD_MINOR_VERSION >= 37
Index: envgen.c
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/envgen.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** envgen.c 27 Oct 2003 18:23:10 -0000 1.7
--- envgen.c 6 Feb 2004 17:03:34 -0000 1.8
***************
*** 297,313 ****
void envgen_key(t_envgen *x, t_floatarg f);
! t_widgetbehavior envgen_widgetbehavior = {
! w_getrectfn: envgen_getrect,
! w_displacefn: envgen_displace,
! w_selectfn: envgen_select,
! w_activatefn: envgen_activate,
! w_deletefn: envgen_delete,
! w_visfn: envgen_vis,
! w_clickfn: envgen_newclick,
! #if PD_MINOR_VERSION < 37
! w_propertiesfn: NULL,
! w_savefn: envgen_save
! #endif
! };
--- 297,302 ----
void envgen_key(t_envgen *x, t_floatarg f);
! t_widgetbehavior envgen_widgetbehavior;
!
***************
*** 335,338 ****
--- 324,339 ----
class_addmethod(envgen_class,(t_method)envgen_setresize,gensym("resize"),A_FLOAT,A_NULL);
+ envgen_widgetbehavior.w_getrectfn = envgen_getrect;
+ envgen_widgetbehavior.w_displacefn = envgen_displace;
+ envgen_widgetbehavior.w_selectfn = envgen_select;
+ envgen_widgetbehavior.w_activatefn = envgen_activate;
+ envgen_widgetbehavior.w_deletefn = envgen_delete;
+ envgen_widgetbehavior.w_visfn = envgen_vis;
+ envgen_widgetbehavior.w_clickfn = envgen_newclick;
+ #if PD_MINOR_VERSION < 37
+ envgen_widgetbehavior.w_propertiesfn = NULL;
+ envgen_widgetbehavior.w_savefn = envgen_save;
+ #endif
+
class_setwidget(envgen_class,&envgen_widgetbehavior);
#if PD_MINOR_VERSION >= 37
***************
*** 340,342 ****
--- 341,345 ----
#endif
class_addmethod(envgen_class,(t_method)envgen_dump,gensym("dump"),A_NULL);
+
+
}
Index: fatom.h
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/fatom.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** fatom.h 5 Nov 2003 09:22:51 -0000 1.11
--- fatom.h 6 Feb 2004 17:03:34 -0000 1.12
***************
*** 94,98 ****
if (!strcmp(x->x_type->s_name,"vslider")) {
x->x_rect_width = x->x_width+15;
! x->x_rect_height = x->x_max-x->x_min+24;
sys_vgui("scale .x%x.c.s%x \
--- 94,98 ----
if (!strcmp(x->x_type->s_name,"vslider")) {
x->x_rect_width = x->x_width+15;
! x->x_rect_height = x->x_max-x->x_min+26;
sys_vgui("scale .x%x.c.s%x \
***************
*** 313,329 ****
static void fatom_save(t_gobj *z, t_binbuf *b);
! t_widgetbehavior fatom_widgetbehavior = {
! w_getrectfn: fatom_getrect,
! w_displacefn: fatom_displace,
! w_selectfn: fatom_select,
! w_activatefn: fatom_activate,
! w_deletefn: fatom_delete,
! w_visfn: fatom_vis,
! #if PD_MINOR_VERSION < 37
! w_savefn: fatom_save,
! w_propertiesfn: NULL,
! #endif
! w_clickfn: NULL,
! };
--- 313,319 ----
static void fatom_save(t_gobj *z, t_binbuf *b);
! t_widgetbehavior fatom_widgetbehavior;
!
!
***************
*** 421,424 ****
--- 411,426 ----
{
+ fatom_widgetbehavior.w_getrectfn = fatom_getrect;
+ fatom_widgetbehavior.w_displacefn = fatom_displace;
+ fatom_widgetbehavior.w_selectfn = fatom_select;
+ fatom_widgetbehavior.w_activatefn = fatom_activate;
+ fatom_widgetbehavior.w_deletefn = fatom_delete;
+ fatom_widgetbehavior.w_visfn = fatom_vis;
+ #if PD_MINOR_VERSION < 37
+ fatom_widgetbehavior.w_savefn = fatom_save;
+ fatom_widgetbehavior.w_propertiesfn = NULL,
+ #endif
+ fatom_widgetbehavior.w_clickfn = NULL,
+
class_addfloat(class, (t_method)fatom_float);
class_addbang(class, (t_method)fatom_bang);
Index: image.c
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/image.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** image.c 27 Oct 2003 18:23:10 -0000 1.7
--- image.c 6 Feb 2004 17:03:34 -0000 1.8
***************
*** 211,215 ****
class_setwidget(image_class,&image_widgetbehavior);
#if PD_MINOR_VERSION >= 37
! class_setsavefn(image_class,&image_widgetbehavior);
#endif
}
--- 211,215 ----
class_setwidget(image_class,&image_widgetbehavior);
#if PD_MINOR_VERSION >= 37
! class_setsavefn(image_class,&image_save);
#endif
}
Index: slider.c
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/slider.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** slider.c 5 Nov 2003 09:22:51 -0000 1.7
--- slider.c 6 Feb 2004 17:03:34 -0000 1.8
***************
*** 25,41 ****
! t_widgetbehavior slider_widgetbehavior = {
! w_getrectfn: fatom_getrect,
! w_displacefn: fatom_displace,
! w_selectfn: fatom_select,
! w_activatefn: fatom_activate,
! w_deletefn: fatom_delete,
! w_visfn: fatom_vis,
! #if PD_MINOR_VERSION < 37
! w_savefn: slider_save,
! w_propertiesfn: NULL,
! #endif
! w_clickfn: NULL,
! };
void slider_setup() {
--- 25,30 ----
! t_widgetbehavior slider_widgetbehavior;
!
void slider_setup() {
***************
*** 43,47 ****
sizeof(t_fatom),0,A_DEFFLOAT,A_DEFFLOAT,A_DEFFLOAT,0);
! fatom_setup_common(slider_class);
class_setwidget(slider_class,&slider_widgetbehavior);
#if PD_MINOR_VERSION >= 37
--- 32,48 ----
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);
class_setwidget(slider_class,&slider_widgetbehavior);
#if PD_MINOR_VERSION >= 37
Index: sliderh.c
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/sliderh.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sliderh.c 27 Oct 2003 18:23:10 -0000 1.3
--- sliderh.c 6 Feb 2004 17:03:34 -0000 1.4
***************
*** 34,50 ****
! t_widgetbehavior sliderh_widgetbehavior = {
! w_getrectfn: fatom_getrect,
! w_displacefn: fatom_displace,
! w_selectfn: fatom_select,
! w_activatefn: fatom_activate,
! w_deletefn: fatom_delete,
! w_visfn: fatom_vis,
! #if PD_MINOR_VERSION < 37
! w_savefn: sliderh_save,
! w_propertiesfn: NULL,
! #endif
! w_clickfn: NULL,
! };
--- 34,40 ----
! t_widgetbehavior sliderh_widgetbehavior;
!
!
***************
*** 54,58 ****
fatom_setup_common(sliderh_class);
! class_setwidget(sliderh_class,&sliderh_widgetbehavior);
#if PD_MINOR_VERSION >= 37
class_setsavefn(sliderh_class,&sliderh_save);
--- 44,61 ----
fatom_setup_common(sliderh_class);
!
! sliderh_widgetbehavior.w_getrectfn = fatom_getrect;
! sliderh_widgetbehavior.w_displacefn= fatom_displace;
! sliderh_widgetbehavior.w_selectfn= fatom_select;
! sliderh_widgetbehavior.w_activatefn=fatom_activate;
! sliderh_widgetbehavior.w_deletefn= fatom_delete;
! sliderh_widgetbehavior.w_visfn= fatom_vis;
! #if PD_MINOR_VERSION < 37
! sliderh_widgetbehavior.w_savefn= sliderh_save;
! sliderh_widgetbehavior.w_propertiesfn= NULL;
! #endif
! sliderh_widgetbehavior.w_clickfn= NULL;
!
! class_setwidget(sliderh_class,&sliderh_widgetbehavior);
#if PD_MINOR_VERSION >= 37
class_setsavefn(sliderh_class,&sliderh_save);
Index: ticker.c
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/ticker.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ticker.c 27 Oct 2003 18:23:10 -0000 1.6
--- ticker.c 6 Feb 2004 17:03:34 -0000 1.7
***************
*** 39,55 ****
! t_widgetbehavior ticker_widgetbehavior = {
! w_getrectfn: fatom_getrect,
! w_displacefn: fatom_displace,
! w_selectfn: fatom_select,
! w_activatefn: fatom_activate,
! w_deletefn: fatom_delete,
! w_visfn: fatom_vis,
! #if PD_MINOR_VERSION < 37
! w_savefn: ticker_save,
! w_propertiesfn: NULL,
! #endif
! w_clickfn: NULL,
! };
void ticker_setup() {
--- 39,44 ----
! t_widgetbehavior ticker_widgetbehavior;
!
void ticker_setup() {
***************
*** 58,64 ****
class_addbang(ticker_class,ticker_bang);
! fatom_setup_common(ticker_class);
class_addbang(ticker_class, (t_method)ticker_bang);
! class_setwidget(ticker_class,&ticker_widgetbehavior);
#if PD_MINOR_VERSION >= 37
class_setsavefn(ticker_class,&ticker_save);
--- 47,67 ----
class_addbang(ticker_class,ticker_bang);
! fatom_setup_common(ticker_class);
class_addbang(ticker_class, (t_method)ticker_bang);
!
! ticker_widgetbehavior.w_getrectfn= fatom_getrect;
! ticker_widgetbehavior.w_displacefn= fatom_displace;
! ticker_widgetbehavior.w_selectfn= fatom_select;
! ticker_widgetbehavior.w_activatefn= fatom_activate;
! ticker_widgetbehavior.w_deletefn= fatom_delete;
! ticker_widgetbehavior.w_visfn= fatom_vis;
! #if PD_MINOR_VERSION < 37
! ticker_widgetbehavior.w_savefn= ticker_save;
! ticker_widgetbehavior.w_propertiesfn= NULL;
! #endif
! ticker_widgetbehavior.w_clickfn= NULL;
!
!
! class_setwidget(ticker_class,&ticker_widgetbehavior);
#if PD_MINOR_VERSION >= 37
class_setsavefn(ticker_class,&ticker_save);
Index: w_envgen.h
===================================================================
RCS file: /cvsroot/pure-data/externals/ggee/gui/w_envgen.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** w_envgen.h 27 Oct 2003 18:23:10 -0000 1.10
--- w_envgen.h 6 Feb 2004 17:03:34 -0000 1.11
***************
*** 309,313 ****
t_envgen* s = (t_envgen*)z;
-
width = s->w.width + 2*BORDER;
height = s->w.height + 2*BORDER;
--- 309,312 ----
***************
*** 403,407 ****
void envgen_motion(t_envgen *x, t_floatarg dx, t_floatarg dy)
{
! if (x->w.shift) {
x->w.pointerx+=dx/1000.f;
x->w.pointery+=dy/1000.f;
--- 402,406 ----
void envgen_motion(t_envgen *x, t_floatarg dx, t_floatarg dy)
{
! if (x->w.shift) {
x->w.pointerx+=dx/1000.f;
x->w.pointery+=dy/1000.f;