[PD-cvs] pd/src desire.c,1.1.2.148,1.1.2.149

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.c 
Log Message:
fixed glist_wire_each


Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.148
retrieving revision 1.1.2.149
diff -C2 -d -r1.1.2.148 -r1.1.2.149
*** desire.c	5 Sep 2006 23:35:13 -0000	1.1.2.148
--- desire.c	6 Sep 2006 00:16:03 -0000	1.1.2.149
***************
*** 52,57 ****
  #define glists_each(GLIST,GLISTS) for(GLIST=GLISTS; GLIST; GLIST=GLIST->gl_next)
  #define glist_wire_each(WIRE,TRAV,GLIST) \
! 	for(linetraverser_start(&TRAV,GLIST); WIRE; WIRE=linetraverser_next(&TRAV))
! 
  
  //--------------------------------------------------------------------------
--- 52,56 ----
  #define glists_each(GLIST,GLISTS) for(GLIST=GLISTS; GLIST; GLIST=GLIST->gl_next)
  #define glist_wire_each(WIRE,TRAV,GLIST) \
! 	for (linetraverser_start(&TRAV,GLIST); (WIRE=linetraverser_next(&TRAV)); )
  
  //--------------------------------------------------------------------------
***************
*** 642,654 ****
  void canvas_map(t_canvas *x, t_floatarg f) {
      if (f!=0 && !glist_isvisible(x)) {
  	t_gobj *y;
  	if (!x->gl_havewindow) {bug("canvas_map"); canvas_vis(x,1);}
  	glist_each(y,x) gobj_changed(y,0);
- 	x->gl_mapped = 1;
  	canvas_drawlines(x);
  	if (x->gl_isgraph && x->gl_goprect) canvas_drawredrect(x, 1);
      }
      if (f==0 && glist_isvisible(x)) {
- 	sys_mgui(x,"delete_window","");
  	x->gl_mapped = 0;
  	gobj_unsubscribe((t_gobj *)x,(t_gobj *)manager);
--- 641,652 ----
  void canvas_map(t_canvas *x, t_floatarg f) {
      if (f!=0 && !glist_isvisible(x)) {
+ 	x->gl_mapped = 1;
  	t_gobj *y;
  	if (!x->gl_havewindow) {bug("canvas_map"); canvas_vis(x,1);}
  	glist_each(y,x) gobj_changed(y,0);
  	canvas_drawlines(x);
  	if (x->gl_isgraph && x->gl_goprect) canvas_drawredrect(x, 1);
      }
      if (f==0 && glist_isvisible(x)) {
  	x->gl_mapped = 0;
  	gobj_unsubscribe((t_gobj *)x,(t_gobj *)manager);
***************
*** 719,722 ****
--- 717,721 ----
      }
      if (!f && x->gl_editor) {
+ 	sys_mgui(x,"delete_window","");
          canvas_create_editor(x, 0);
          if (glist_isvisible(x)) canvas_map(x, 0);