[PD-cvs] pd/src desire.tk,1.1.2.236,1.1.2.237

[chunlee]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
integrated object_delete in desire.tk, should worx, but need more 
testing



Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.236
retrieving revision 1.1.2.237
diff -C2 -d -r1.1.2.236 -r1.1.2.237
*** desire.tk	13 Jun 2006 07:31:25 -0000	1.1.2.236
--- desire.tk	13 Jun 2006 07:56:08 -0000	1.1.2.237
***************
*** 925,929 ****
  }
  
! def View item_delete {{suffix all}} {
    switch -- $suffix {
      all     {.$@canvas.c delete $self       }
--- 925,929 ----
  }
  
! def* View item_delete {{suffix all}} {
    switch -- $suffix {
      all     {.$@canvas.c delete $self       }
***************
*** 1733,1744 ****
  def* Canvas wires {} {return $@wires}
  
! def Canvas delete_selection {} {
  	global _
  	set c .$self.c
  	foreach obj $@selection {
  	    puts "wire to erase: $_($obj:wires)"
  	    foreach wire $_($obj:wires) {
  	    	set find [lsearch $@wires_pair $wire]
  		if { $find != -1} {
  		## remove the selected wire from the @wires_pair...
  		set @wires_pair [lreplace $@wires_pair $find $find]
--- 1733,1746 ----
  def* Canvas wires {} {return $@wires}
  
! def* Canvas delete_selection {} {
  	global _
  	set c .$self.c
  	foreach obj $@selection {
+ 	#pd .$self object_delete !$obj
  	    puts "wire to erase: $_($obj:wires)"
  	    foreach wire $_($obj:wires) {
  	    	set find [lsearch $@wires_pair $wire]
  		if { $find != -1} {
+ 		pd .$self disconnect [lindex $@wires_pair [expr $find - 1]]
  		## remove the selected wire from the @wires_pair...
  		set @wires_pair [lreplace $@wires_pair $find $find]
***************
*** 1749,1753 ****
  	    } 
  	
! 	$obj erase
  	
  	}
--- 1751,1756 ----
  	    } 
  	
! 	#$obj erase
! 	pd .$self object_delete !$obj
  	
  	}
***************
*** 2383,2387 ****
  	if {[llength $@selection_wire] > 0} {
  		puts "delete this $self :: $@selection_wire"
! 		puts "wires: $@wires_pair"
  		
  		foreach x $@selection_wire {  
--- 2386,2390 ----
  	if {[llength $@selection_wire] > 0} {
  		puts "delete this $self :: $@selection_wire"
! 		#puts "wires: $@wires_pair"
  		
  		foreach x $@selection_wire {  
***************
*** 2474,2478 ****
  
  def Box draw_wires {} {
!     puts "wires:$@wires"
      foreach wire $@wires {$wire draw}
  }
--- 2477,2481 ----
  
  def Box draw_wires {} {
!     #puts "wires:$@wires"
      foreach wire $@wires {$wire draw}
  }
***************
*** 2483,2487 ****
  }
  
! def* Box move {dx dy} {
    super $dx $dy
    $self draw_wires
--- 2486,2490 ----
  }
  
! def Box move {dx dy} {
    super $dx $dy
    $self draw_wires
***************
*** 2564,2568 ****
  }
  
! def* Wire draw {} {
  	global look
  	#set thick 2
--- 2567,2571 ----
  }
  
! def Wire draw {} {
  	global look
  	#set thick 2
***************
*** 2619,2622 ****
--- 2622,2626 ----
  	$@obj1 delete_wire $self
  	$@obj2 delete_wire $self
+ 	#super
  	# i don't know why wires are taged as 00000000WIRE...
  	# not sure why $self erase don't work, look later...
***************
*** 3264,3270 ****
  }
  
! def Labeled erase {} {
  #	$@canvas delete ${self}LABEL
! }
  
  #-----------------------------------------------------------------------------------#
--- 3268,3274 ----
  }
  
! #def Labeled erase {} {
  #	$@canvas delete ${self}LABEL
! #}
  
  #-----------------------------------------------------------------------------------#
***************
*** 3347,3354 ****
  }
  
! def Toggle erase {} {
  #	io_erase $self
  #	$@canvas delete ${self}BUT ${self}LABEL ${self}X1 ${self}X2
! }
  
  def* Toggle click {x y b f} {
--- 3351,3358 ----
  }
  
! #def Toggle erase {} {
  #	io_erase $self
  #	$@canvas delete ${self}BUT ${self}LABEL ${self}X1 ${self}X2
! #}
  
  def* Toggle click {x y b f} {