[PD-cvs] pd/src desire.tk,1.1.2.600.2.416,1.1.2.600.2.417

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
fix wire_selection in SelRect unclick bug


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.416
retrieving revision 1.1.2.600.2.417
diff -C2 -d -r1.1.2.600.2.416 -r1.1.2.600.2.417
*** desire.tk	18 Oct 2007 23:10:15 -0000	1.1.2.600.2.416
--- desire.tk	19 Oct 2007 16:29:31 -0000	1.1.2.600.2.417
***************
*** 3990,3994 ****
  		}
  	}
! 	return [lsort -integer -unique $l]
  }
  
--- 3990,3995 ----
  		}
  	}
! 	#return [lsort -integer -unique $l]
! 	return [lsort -unique $l]
  }
  
***************
*** 4249,4270 ****
  	if {[llength $sel]} {
  		set objects {}
! 		set wires {}
  		foreach tag $sel {
  			if {[regexp {^[xo]?[0-9a-f]{6,8}} [$c gettags $tag] id]} {
  				if {[$@canvas == $id]} {continue}
! 				if       {[[$id class] <=  Box]} {lappend objects $id
! 				} elseif {[[$id class] <= Wire]} {lappend wires   $id}
  			}
  		}
  		set objects [lsort -unique $objects]
! 		set wires   [lsort -unique $wires]
  		set objects2 {}
  		#so that objects in gop won't get selected...
  		foreach obj $objects {if {[$obj canvas] == $@canvas} {lappend objects2 $obj}}
  		$@canvas selection+= $objects2
! 		$@canvas selection_wire+= $wires
  	}
  	set _($@canvas:keynav_tab_sel) "wire"
  	$@canvas end_action
  }
  def SelRect draw {} {
--- 4250,4273 ----
  	if {[llength $sel]} {
  		set objects {}
! 		#set wires {}
  		foreach tag $sel {
  			if {[regexp {^[xo]?[0-9a-f]{6,8}} [$c gettags $tag] id]} {
  				if {[$@canvas == $id]} {continue}
! 				if {[[$id class] <=  Box]} {lappend objects $id}
! 				#elseif {[[$id class] <= Wire]} {lappend wires   $id}
  			}
  		}
  		set objects [lsort -unique $objects]
! 		#set wires   [lsort -unique $wires]
  		set objects2 {}
  		#so that objects in gop won't get selected...
  		foreach obj $objects {if {[$obj canvas] == $@canvas} {lappend objects2 $obj}}
  		$@canvas selection+= $objects2
! 		#$@canvas selection_wire+= $wires
  	}
+ 	$@canvas selection_wire+= [$@canvas implicit_wires $objects]
  	set _($@canvas:keynav_tab_sel) "wire"
  	$@canvas end_action
+ 	
  }
  def SelRect draw {} {