[PD-cvs] pd/src desire.c, 1.1.2.136, 1.1.2.137 desire.h, 1.1.2.12, 1.1.2.13

[Mathieu Bouchard]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30853

Modified Files:
      Tag: devel_0_39
	desire.c desire.h 
Log Message:
killing t_widgetbehavior. finally.


Index: desire.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -d -r1.1.2.12 -r1.1.2.13
*** desire.h	2 Sep 2006 08:13:32 -0000	1.1.2.12
--- desire.h	2 Sep 2006 09:01:40 -0000	1.1.2.13
***************
*** 274,287 ****
  
          /* Call this to get a gobj's bounding rectangle in pixels */
! typedef void (*t_getrectfn)(t_gobj *x, struct _glist *glist,
!     int *x1, int *y1, int *x2, int *y2);
          /* and this to displace a gobj: */
! typedef void (*t_displacefn)(t_gobj *x, struct _glist *glist, int dx, int dy);
          /* change color to show selection: */
! typedef void (*t_selectfn)(t_gobj *x, struct _glist *glist, int state);
          /* change appearance to show activation/deactivation: */
! typedef void (*t_activatefn)(t_gobj *x, struct _glist *glist, int state);
          /* warn a gobj it's about to be deleted */
! typedef void (*t_deletefn)(t_gobj *x, struct _glist *glist);
          /* making visible or invisible */
  typedef void (*t_visfn)(t_gobj *x, struct _glist *glist, int flag);
--- 274,287 ----
  
          /* Call this to get a gobj's bounding rectangle in pixels */
! /*typedef void (*t_getrectfn)(t_gobj *x, struct _glist *glist,
!     int *x1, int *y1, int *x2, int *y2);*/
          /* and this to displace a gobj: */
! /*typedef void (*t_displacefn)(t_gobj *x, struct _glist *glist, int dx, int dy);*/
          /* change color to show selection: */
! /*typedef void (*t_selectfn)(t_gobj *x, struct _glist *glist, int state);*/
          /* change appearance to show activation/deactivation: */
! /*typedef void (*t_activatefn)(t_gobj *x, struct _glist *glist, int state);*/
          /* warn a gobj it's about to be deleted */
! /*typedef void (*t_deletefn)(t_gobj *x, struct _glist *glist);*/
          /* making visible or invisible */
  typedef void (*t_visfn)(t_gobj *x, struct _glist *glist, int flag);
***************
*** 293,301 ****
  struct _widgetbehavior
  {
!     t_getrectfn w_getrectfn;
      t_displacefn w_displacefn;
      t_selectfn w_selectfn;
      t_activatefn w_activatefn;
!     t_deletefn w_deletefn;
      t_visfn w_visfn;
      t_clickfn w_clickfn;
--- 293,301 ----
  struct _widgetbehavior
  {
! /*  t_getrectfn w_getrectfn;
      t_displacefn w_displacefn;
      t_selectfn w_selectfn;
      t_activatefn w_activatefn;
!     t_deletefn w_deletefn;*/
      t_visfn w_visfn;
      t_clickfn w_clickfn;
***************
*** 374,379 ****
  EXTERN void gobj_select(t_gobj *x, t_glist *owner, int state);
  EXTERN void gobj_activate(t_gobj *x, t_glist *owner, int state);
- */
  EXTERN void gobj_delete(t_gobj *x, t_glist *owner);
  EXTERN void gobj_vis(t_gobj *x, t_glist *glist, int flag);
  EXTERN int gobj_click(t_gobj *x, struct _glist *glist,
--- 374,379 ----
  EXTERN void gobj_select(t_gobj *x, t_glist *owner, int state);
  EXTERN void gobj_activate(t_gobj *x, t_glist *owner, int state);
  EXTERN void gobj_delete(t_gobj *x, t_glist *owner);
+ */
  EXTERN void gobj_vis(t_gobj *x, t_glist *glist, int flag);
  EXTERN int gobj_click(t_gobj *x, struct _glist *glist,

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.136
retrieving revision 1.1.2.137
diff -C2 -d -r1.1.2.136 -r1.1.2.137
*** desire.c	2 Sep 2006 08:13:32 -0000	1.1.2.136
--- desire.c	2 Sep 2006 09:01:39 -0000	1.1.2.137
***************
*** 1208,1213 ****
      for (g = gl->gl_list; g; g = g->g_next) {
          if (vis && g->g_pd == scalar_class) {
!             if      (action == 1) {if (glist_isvisible(gl)) gobj_vis(g, gl, 1);}
!             else if (action == 2) {if (glist_isvisible(gl)) gobj_vis(g, gl, 0);}
              else scalar_redraw((t_scalar *)g, gl);
          } else if (g->g_pd == canvas_class) glist_redrawall((t_glist *)g, action);
--- 1208,1213 ----
      for (g = gl->gl_list; g; g = g->g_next) {
          if (vis && g->g_pd == scalar_class) {
!             if      (action == 1) {/*if (glist_isvisible(gl)) gobj_vis(g, gl, 1);*/}
[...1471 lines suppressed...]
      t_text *x = (t_text *)z;
--- 8151,8154 ----
***************
*** 8528,8534 ****
  }
  
- /* this one is for everyone but "gatoms"; it's imposed in m_class.c */
- t_widgetbehavior text_widgetbehavior = {0, 0, 0, 0, text_delete, text_vis, 0};
- 
  void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize) {
      if (x->te_type == T_OBJECT) {
--- 8205,8208 ----
***************
*** 9974,9978 ****
      class_addmethod3(c,canvas_saveto,    "saveto","!");
  
-     class_setwidget(c, &graph_widgetbehavior);
      class_addmethod3(c,graph_bounds,"bounds","ffff");
      class_addmethod3(c,graph_xticks,"xticks","fff");
--- 9648,9651 ----