[PD-cvs] pd/src desire.h,1.1.2.39,1.1.2.40

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.h 
Log Message:
.


Index: desire.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v
retrieving revision 1.1.2.39
retrieving revision 1.1.2.40
diff -C2 -d -r1.1.2.39 -r1.1.2.40
*** desire.h	19 Sep 2006 16:08:47 -0000	1.1.2.39
--- desire.h	13 Oct 2006 23:39:55 -0000	1.1.2.40
***************
*** 50,54 ****
  /* ----------------------- m_imp.h ---------------------------------------------------*/
  
- /* the structure for a method handler ala Max */
  typedef struct _methodentry {
      t_symbol *me_name;
--- 50,53 ----
***************
*** 59,68 ****
  EXTERN_STRUCT _widgetbehavior;
  
! typedef void (*t_bangmethod)(t_pd *x);
  typedef void (*t_pointermethod)(t_pd *x, t_gpointer *gp);
! typedef void (*t_floatmethod)(t_pd *x, t_float f);
! typedef void (*t_symbolmethod)(t_pd *x, t_symbol *s);
! typedef void (*t_listmethod)(t_pd *x, t_symbol *s, int argc, t_atom *argv);
! typedef void (*t_anymethod)(t_pd *x, t_symbol *s, int argc, t_atom *argv);
  
  struct _class
--- 58,67 ----
  EXTERN_STRUCT _widgetbehavior;
  
! typedef void (*t_bangmethod)   (t_pd *x);
  typedef void (*t_pointermethod)(t_pd *x, t_gpointer *gp);
! typedef void (*t_floatmethod)  (t_pd *x, t_float f);
! typedef void (*t_symbolmethod) (t_pd *x, t_symbol *s);
! typedef void (*t_listmethod)   (t_pd *x, t_symbol *s, int argc, t_atom *argv);
! typedef void (*t_anymethod)    (t_pd *x, t_symbol *s, int argc, t_atom *argv);
  
  struct _class
***************
*** 74,92 ****
      t_methodentry *c_methods;           /* methods other than bang, etc below */
      int c_nmethod;                      /* number of methods */
!     t_method c_freemethod;              /* function to call before freeing */
!     t_bangmethod c_bangmethod;          /* common methods */
      t_pointermethod c_pointermethod;
!     t_floatmethod c_floatmethod;
!     t_symbolmethod c_symbolmethod;
!     t_listmethod c_listmethod;
!     t_anymethod c_anymethod;
! #ifndef DESIRE
!     struct _widgetbehavior *c_wb;       /* "gobjs" only */
! #endif
      struct _parentwidgetbehavior *c_pwb;/* widget behavior in parent */
      t_savefn c_savefn;                  /* function to call when saving */
- #ifndef DESIRE
-     t_propertiesfn c_propertiesfn;      /* function to start prop dialog */
- #endif
      int c_floatsignalin;                /* onset to float for signal input */
      char c_gobj;                        /* true if is a gobj */
--- 73,85 ----
      t_methodentry *c_methods;           /* methods other than bang, etc below */
      int c_nmethod;                      /* number of methods */
!     t_method        c_freemethod;       /* function to call before freeing */
!     t_bangmethod    c_bangmethod;       /* common methods */
      t_pointermethod c_pointermethod;
!     t_floatmethod   c_floatmethod;
!     t_symbolmethod  c_symbolmethod;
!     t_listmethod    c_listmethod;
!     t_anymethod     c_anymethod;
      struct _parentwidgetbehavior *c_pwb;/* widget behavior in parent */
      t_savefn c_savefn;                  /* function to call when saving */
      int c_floatsignalin;                /* onset to float for signal input */
      char c_gobj;                        /* true if is a gobj */
***************
*** 95,103 ****
      char c_drawcommand;             /* a drawing command for a template */
      t_symbol *c_firsttip;
- #ifdef DESIRE
      t_symbol **c_fields; /* names of fields aka attributes, and I don't mean the #V attributes. */
      int c_nfields; /* ... and how many of them */
      t_notice c_notice; /* observer method */
- #endif
  };
  
--- 88,94 ----
***************
*** 105,116 ****
  EXTERN int obj_noutlets(t_object *x);
  EXTERN int obj_ninlets(t_object *x);
! EXTERN t_outconnect *obj_starttraverseoutlet(t_object *x, t_outlet **op,
!     int nout);
! EXTERN t_outconnect *obj_nexttraverseoutlet(t_outconnect *lastconnect,
!     t_object **destp, t_inlet **inletp, int *whichp);
! EXTERN t_outconnect *obj_connect(t_object *source, int outno,
!     t_object *sink, int inno);
! EXTERN void obj_disconnect(t_object *source, int outno, t_object *sink,
!     int inno);
  EXTERN void outlet_setstacklim(void);
  EXTERN int obj_issignalinlet(t_object *x, int m);
--- 96,103 ----
  EXTERN int obj_noutlets(t_object *x);
  EXTERN int obj_ninlets(t_object *x);
! EXTERN t_outconnect *obj_starttraverseoutlet(t_object *x, t_outlet **op, int nout);
! EXTERN t_outconnect *obj_nexttraverseoutlet(t_outconnect *lastconnect, t_object **destp, t_inlet **inletp, int *whichp);
! EXTERN t_outconnect *obj_connect(t_object *source, int outno, t_object *sink, int inno);
! EXTERN void obj_disconnect(t_object *source, int outno, t_object *sink, int inno);
  EXTERN void outlet_setstacklim(void);
  EXTERN int obj_issignalinlet(t_object *x, int m);