pd/src desire.c,1.1.2.1,1.1.2.2 - Pd-cvs

8 Sep 2005


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24109
Modified Files:
      Tag: devel_0_39
    desire.c 
Log Message:
forgot to run g_text_setup.
deleted 40 lines.
Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** desire.c	8 Sep 2005 08:19:22 -0000	1.1.2.1
--- desire.c	8 Sep 2005 08:41:09 -0000	1.1.2.2
***************
*** 39,43 ****
void canvas_startmotion(t_canvas *x);
! t_widgetbehavior text_widgetbehavior;
/* ----------------- the "text" object.  ------------------ */
--- 39,43 ----
void canvas_startmotion(t_canvas *x);
! extern t_widgetbehavior text_widgetbehavior;
/* ----------------- the "text" object.  ------------------ */
***************
*** 1753,1757 ****
  }
! /*static*/ t_widgetbehavior text_widgetbehavior;
static void pd_upload(t_gobj *self, t_canvas *can) {
--- 1753,1757 ----
  }
! ///*static*/ t_widgetbehavior text_widgetbehavior;
static void pd_upload(t_gobj *self, t_canvas *can) {
***************
*** 2018,2022 ****
  }
- static t_widgetbehavior wb;
  static void g_bang_setup(void)
  {
--- 2018,2021 ----
***************
*** 2035,2045 ****
      class_addmethod(c, (t_method)bng_flashtime, gensym("flashtime"), A_GIMME, 0);
      class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0);
!     wb.w_getrectfn = iemgui_getrect;
!     wb.w_displacefn = iemgui_displace;
!     wb.w_selectfn = iemgui_select;
!     wb.w_activatefn = 0;
!     wb.w_deletefn = iemgui_delete;
!     wb.w_visfn = iemgui_vis;
!     wb.w_clickfn = 0;
      class_setwidget(c, &wb);
      class_setsavefn(c, (t_savefn)bng_savefn);
--- 2034,2040 ----
      class_addmethod(c, (t_method)bng_flashtime, gensym("flashtime"), A_GIMME, 0);
      class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0);
!     static t_widgetbehavior wb = {
! 	iemgui_getrect, iemgui_displace, iemgui_select, 0, iemgui_delete, iemgui_vis, 0
!     };
      class_setwidget(c, &wb);
      class_setsavefn(c, (t_savefn)bng_savefn);
***************
*** 2133,2137 ****
  }
- static t_widgetbehavior wb;
  static void g_toggle_setup(void)
  {
--- 2128,2131 ----
***************
*** 2148,2158 ****
      class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0);
      class_addmethod(c, (t_method)toggle_nonzero, gensym("nonzero"), A_FLOAT, 0);
!     wb.w_getrectfn = iemgui_getrect;
!     wb.w_displacefn = iemgui_displace;
!     wb.w_selectfn = iemgui_select;
!     wb.w_activatefn = 0;
!     wb.w_deletefn = iemgui_delete;
!     wb.w_visfn = iemgui_vis;
!     wb.w_clickfn = 0;
      class_setwidget(c, &wb);
      class_setsavefn(c, (t_savefn)toggle_savefn);
--- 2142,2148 ----
      class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0);
      class_addmethod(c, (t_method)toggle_nonzero, gensym("nonzero"), A_FLOAT, 0);
!     static t_widgetbehavior wb = {
! 	iemgui_getrect, iemgui_displace, iemgui_select, 0, iemgui_delete, iemgui_vis, 0
!     };
      class_setwidget(c, &wb);
      class_setsavefn(c, (t_savefn)toggle_savefn);
***************
*** 2327,2331 ****
  }
- static t_widgetbehavior wb;
  static void g_radio_setup(void)
  {
--- 2317,2320 ----
***************
*** 2345,2356 ****
      class_addmethod(c, (t_method)radio_double_change, gensym("double_change"), 0);
!     wb.w_getrectfn = radio_getrect;
!     wb.w_displacefn = iemgui_displace;
!     wb.w_selectfn = iemgui_select;
!     wb.w_activatefn = 0;
!     wb.w_deletefn = iemgui_delete;
!     wb.w_visfn = iemgui_vis;
!     wb.w_clickfn = 0;
! 
      sym_hdl    = gensym("hdl");
      sym_vdl    = gensym("vdl");
--- 2334,2340 ----
      class_addmethod(c, (t_method)radio_double_change, gensym("double_change"), 0);
!     static t_widgetbehavior wb = {
! 	radio_getrect, iemgui_displace, iemgui_select, 0, iemgui_delete, iemgui_vis, 0
!     };
      sym_hdl    = gensym("hdl");
      sym_vdl    = gensym("vdl");
***************
*** 2372,2379 ****
  #define IEM_SL_MINSIZE 2
- //static int isvert(t_slider *x) {
- //	return x->x_flavor == sym_vsl || x->x_flavor == sym_vslider;
- //}
- 
  static void slider_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2)
  {
--- 2356,2359 ----
***************
*** 2509,2513 ****
  }
- static t_widgetbehavior wb;
  static void g_slider_setup(void)
  {
--- 2489,2492 ----
***************
*** 2532,2542 ****
      class_addmethod(c, (t_method)slider_steady, gensym("steady"), A_FLOAT, 0);
!     wb.w_getrectfn =  slider_getrect;
!     wb.w_displacefn = iemgui_displace;
!     wb.w_selectfn =   iemgui_select;
!     wb.w_activatefn = NULL;
!     wb.w_deletefn =   iemgui_delete;
!     wb.w_visfn =      iemgui_vis;
!     wb.w_clickfn =    0;
      sym_vsl     = gensym("vsl");
      sym_vslider = gensym("vslider");
--- 2511,2517 ----
      class_addmethod(c, (t_method)slider_steady, gensym("steady"), A_FLOAT, 0);
!     static t_widgetbehavior wb = {
! 	slider_getrect, iemgui_displace, iemgui_select, 0, iemgui_delete, iemgui_vis, 0
!     };
      sym_vsl     = gensym("vsl");
      sym_vslider = gensym("vslider");
***************
*** 2714,2718 ****
  }
- static t_widgetbehavior wb;
  static void g_numbox_setup(void)
  {
--- 2689,2692 ----
***************
*** 2735,2745 ****
      class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0);
      class_addmethod(c, (t_method)nbx_log_height, gensym("log_height"), A_FLOAT, 0);
!     wb.w_getrectfn =  nbx_getrect;
!     wb.w_displacefn = iemgui_displace;
!     wb.w_selectfn =   iemgui_select;
!     wb.w_activatefn = NULL;
!     wb.w_deletefn =   iemgui_delete;
!     wb.w_visfn =      iemgui_vis;
!     wb.w_clickfn =    NULL;
      class_setwidget(c, &wb);
      class_setsavefn(c,(t_savefn)nbx_savefn);
--- 2709,2715 ----
      class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0);
      class_addmethod(c, (t_method)nbx_log_height, gensym("log_height"), A_FLOAT, 0);
!     static t_widgetbehavior wb = {
! 	nbx_getrect, iemgui_displace, iemgui_select, 0, iemgui_delete, iemgui_vis, 0
!     };
      class_setwidget(c, &wb);
      class_setsavefn(c,(t_savefn)nbx_savefn);
***************
*** 2871,2875 ****
  }
- static t_widgetbehavior wb;
  static void g_vumeter_setup(void)
  {
--- 2841,2844 ----
***************
*** 2883,2893 ****
      class_addmethod(c, (t_method)vu_size, gensym("size"), A_GIMME, 0);
      class_addmethod(c, (t_method)vu_scale, gensym("scale"), A_DEFFLOAT, 0);
!     wb.w_getrectfn =  vu_getrect;
!     wb.w_displacefn = iemgui_displace;
!     wb.w_selectfn =   iemgui_select;
!     wb.w_activatefn = NULL;
!     wb.w_deletefn =   iemgui_delete;
!     wb.w_visfn =      iemgui_vis;
!     wb.w_clickfn =    NULL;
      class_setwidget(c,&wb);
      class_setsavefn(c,(t_savefn)vu_savefn);
--- 2852,2858 ----
      class_addmethod(c, (t_method)vu_size, gensym("size"), A_GIMME, 0);
      class_addmethod(c, (t_method)vu_scale, gensym("scale"), A_DEFFLOAT, 0);
!     static t_widgetbehavior wb = {
! 	vu_getrect, iemgui_displace, iemgui_select, 0, iemgui_delete, iemgui_vis, 0
!     };
      class_setwidget(c,&wb);
      class_setsavefn(c,(t_savefn)vu_savefn);
***************
*** 2966,2970 ****
  }
- static t_widgetbehavior wb;
  static void g_mycanvas_setup(void)
  {
--- 2931,2934 ----
***************
*** 2977,2987 ****
      class_addmethod(c, (t_method)cnv_get_pos, gensym("get_pos"), 0);
      iemgui_subclass(c);
!     wb.w_getrectfn = iemgui_getrect;
!     wb.w_displacefn = iemgui_displace;
!     wb.w_selectfn = iemgui_select;
!     wb.w_activatefn = NULL;
!     wb.w_deletefn = iemgui_delete;
!     wb.w_visfn = iemgui_vis;
!     wb.w_clickfn = NULL;
      class_setwidget(c, &wb);
      class_setsavefn(c,(t_savefn)cnv_savefn);
--- 2941,2947 ----
      class_addmethod(c, (t_method)cnv_get_pos, gensym("get_pos"), 0);
      iemgui_subclass(c);
!     static t_widgetbehavior wb = {
! 	iemgui_getrect, iemgui_displace, iemgui_select, 0, iemgui_delete, iemgui_vis, 0
!     };
      class_setwidget(c, &wb);
      class_setsavefn(c,(t_savefn)cnv_savefn);
***************
*** 3045,3051 ****
  }
- static t_widgetbehavior wb;
  static void g_dropper_setup(void)
  {
      t_class *c = dropper_class = class_new(gensym("dropper"), (t_newmethod)dropper_new,
    (t_method)dropper_free, sizeof(t_dropper), 0, A_GIMME, 0);
--- 3005,3013 ----
  }
static void g_dropper_setup(void)
  {
+     static t_widgetbehavior wb = {
+ 	iemgui_getrect, iemgui_displace, iemgui_select, 0, iemgui_delete, iemgui_vis, 0
+     };
      t_class *c = dropper_class = class_new(gensym("dropper"), (t_newmethod)dropper_new,
    (t_method)dropper_free, sizeof(t_dropper), 0, A_GIMME, 0);
***************
*** 3054,3064 ****
      class_addsymbol(c, dropper_symbol);
      class_addmethod(c, (t_method)dropper_reload, gensym("reload"), A_GIMME, 0);
-     wb.w_getrectfn = iemgui_getrect;
-     wb.w_displacefn = iemgui_displace;
-     wb.w_selectfn = iemgui_select;
-     wb.w_activatefn = 0;
-     wb.w_deletefn = iemgui_delete;
-     wb.w_visfn = iemgui_vis;
-     wb.w_clickfn = 0;
      class_setwidget(c, &wb);
      class_setsavefn(c, (t_savefn)dropper_savefn);
--- 3016,3019 ----
***************
*** 3067,3070 ****
--- 3022,3026 ----
void desire_setup(void) {
+     g_text_setup();
      g_bang_setup();
      g_toggle_setup();