[PD-cvs] pd/src desire.c,1.1.2.217.2.72,1.1.2.217.2.73

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.c 
Log Message:
removed donecanvasdialog


Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.72
retrieving revision 1.1.2.217.2.73
diff -C2 -d -r1.1.2.217.2.72 -r1.1.2.217.2.73
*** desire.c	14 Dec 2006 05:12:28 -0000	1.1.2.217.2.72
--- desire.c	14 Dec 2006 19:58:34 -0000	1.1.2.217.2.73
***************
*** 1179,1209 ****
  }
  
- /* called from the gui when "OK" is selected on the canvas properties
-    dialog.  Again we negate "y" scale. */
- static void canvas_donecanvasdialog(t_canvas *x, t_symbol *s, int argc, t_atom *argv) {
-     float xperpix, yperpix, x1, y1, x2, y2, xpix, ypix, xmargin, ymargin;
-     int graphme;
-     pd_scanargs(argc,argv,"ffiffffffff",&xperpix,&yperpix,&graphme,
- 	&x1,&y1,&x2,&y2,&xpix,&ypix,&xmargin,&ymargin);
-     SET(pixwidth,(int)xpix);    SET(pixheight,(int)ypix);
-     SET(xmargin ,(int)xmargin); SET(ymargin  ,(int)ymargin);
-     yperpix = -yperpix;
-     if (xperpix == 0) xperpix = 1;
-     if (yperpix == 0) yperpix = 1;
-     if (graphme) {
-         if (x1==x2) {x1=0;x2=1;}
- 	if (y1==y2) {y1=0;y2=1;}
- 	x->x1=x1; x->y1=y1;
- 	x->x2=x2; x->y2=y2;
-     } else {
-         if (xperpix > 0) {x->x1=0; x->x2=xperpix;}
- 	else {SET(x1,-xperpix * (x->screenx2-x->screenx1)); SET(x2,x->x1+xperpix);}
-         if (yperpix > 0) {x->y1=0; x->y2=yperpix;}
- 	else {SET(y1,-yperpix * (x->screeny2-x->screeny1)); SET(y2,x->y1+yperpix);}
-     }
-     canvas_setgraph(x, graphme, 0);
-     gobj_changed(x,0);
- }
- 
  /* keep me */
  static int canvas_isconnected (t_canvas *x, t_text *ob1, int n1, t_text *ob2, int n2) {
--- 1179,1182 ----
***************
*** 1634,1639 ****
  t_floatarg fflags, t_floatarg deleteit) {
      int flags = (int)fflags;
!     int saveit = ((flags & 1) != 0);
!     int style = ((flags & 6) >> 1);
      float stylewas = template_getfloat(
          template_findbyname(x->scalar->t), gensym("style"), x->scalar->v, 1);
--- 1607,1612 ----
  t_floatarg fflags, t_floatarg deleteit) {
      int flags = (int)fflags;
!     int saveit = (flags&1)!=0;
!     int style = (flags>>1)&3;
      float stylewas = template_getfloat(
          template_findbyname(x->scalar->t), gensym("style"), x->scalar->v, 1);
***************
*** 1652,1656 ****
          if (argname != x->realname) {
              if (x->listviewing) garray_arrayviewlist_close(x);
!             x->realname = argname;
              pd_unbind(x,x->realname);
              x->realname = canvas_realizedollar(x->canvas, argname);
--- 1625,1629 ----
          if (argname != x->realname) {
              if (x->listviewing) garray_arrayviewlist_close(x);
!             x->realname = argname; /* is this line supposed to exist? */
              pd_unbind(x,x->realname);
              x->realname = canvas_realizedollar(x->canvas, argname);
***************
*** 7465,7469 ****
      class_addmethod3(c,canvas_find_again, "findagain","");
      class_addmethod3(c,canvas_find_parent,"findparent","");
-     class_addmethod3(c,canvas_donecanvasdialog,"donecanvasdialog","*");
      class_addmethod3(c,canvas_arraydialog,"arraydialog","sfff");
      class_addmethod3(c,canvas_connect,"connect","ffff");
--- 7438,7441 ----