[PD-cvs] pd/src desire.tk,1.1.2.600.2.373,1.1.2.600.2.374

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
Comment shouldn't appear on GOP


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.373
retrieving revision 1.1.2.600.2.374
diff -C2 -d -r1.1.2.600.2.373 -r1.1.2.600.2.374
*** desire.tk	15 Aug 2007 06:00:53 -0000	1.1.2.600.2.373
--- desire.tk	15 Aug 2007 16:47:10 -0000	1.1.2.600.2.374
***************
*** 1446,1461 ****
  	if {$@canvas eq ""} {return}
  	# always hide these things
! 	if {[$self class] == "Wire"}       {set @inside_box 0; return}
! 	if {[$self class] == "ObjectBox"}  {set @inside_box 0; return}
! 	if {[$self class] == "MessageBox"} {set @inside_box 0; return}
! 	if {[$self class] == "Array"} {
! 		#set @inside_box 1; return
! 		mset {x1 y1} [$@canvas xy]
! 		$@canvas visibles+= $self
! 		set @inside_box 1
! 		return
! 	} else {
! 		set x1 $@x1; set y1 $@y1
! 	}
  	if {[$@canvas gop]} {
  		set mess [$@canvas get_mess]
--- 1446,1455 ----
  	if {$@canvas eq ""} {return}
  	# always hide these things
! 	if {[$self class] == Wire}       {set @inside_box 0; return}
! 	if {[$self class] == ObjectBox}  {set @inside_box 0; return}
! 	if {[$self class] == MessageBox} {set @inside_box 0; return}
! 	if {[$self class] == Comment}    {set @inside_box 0; return}
! 	if {[$self class] == Array} {$@canvas visibles+= $self; set @inside_box 1; return}
! 	set x1 $@x1; set y1 $@y1
  	if {[$@canvas gop]} {
  		set mess [$@canvas get_mess]
***************
*** 1465,1469 ****
  			set xmargin 0; set ymargin 0
  		} else {
! 			set xmargin [lindex $mess 6];set ymargin [lindex $mess 7]
  		}
  		if {$x1 < $pixwidth +$xmargin && $x1 > $xmargin && \
--- 1459,1463 ----
  			set xmargin 0; set ymargin 0
  		} else {
! 			set xmargin [lindex $mess 6]; set ymargin [lindex $mess 7]
  		}
  		if {$x1 < $pixwidth +$xmargin && $x1 > $xmargin && \
***************
*** 1475,1481 ****
  			$@canvas visibles-= $self
  		}
! 	} else {
! 		set @inside_box 1
! 	}
  }
  
--- 1469,1473 ----
  			$@canvas visibles-= $self
  		}
! 	} else {set @inside_box 1}
  }