[PD-cvs] pd/src desire.tk,1.1.2.600.2.166,1.1.2.600.2.167

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
fix wire deletion


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.166
retrieving revision 1.1.2.600.2.167
diff -C2 -d -r1.1.2.600.2.166 -r1.1.2.600.2.167
*** desire.tk	12 Jan 2007 22:47:13 -0000	1.1.2.600.2.166
--- desire.tk	16 Jan 2007 12:06:28 -0000	1.1.2.600.2.167
***************
*** 923,926 ****
--- 923,927 ----
  def Menuable raise {} {
  	set w [$self window]
+ 	set w $w.c
  	raise $w
  	focus -force $w
***************
*** 1944,1948 ****
  	mset {obj1 outlet obj2 inlet} [$wire report]
  	$self disconnect [$wire connects]
! 	$wire delete
  	set obj1_idx [$self children_idx $obj1]
  	set obj2_idx [$self children_idx $obj2]
--- 1945,1949 ----
  	mset {obj1 outlet obj2 inlet} [$wire report]
  	$self disconnect [$wire connects]
! 	#$wire delete
  	set obj1_idx [$self children_idx $obj1]
  	set obj2_idx [$self children_idx $obj2]
***************
*** 2475,2480 ****
  		$@history add [list $self ins $i [$o deconstruct]]
  	} else {
- 		#foreach wire [$o wires] {$@history add [list $o ins $i [$wire deconstruct]]}
- 		#foreach obj [$o children] {$@history add [list $o ins $i [$obj deconstruct]]}
  		foreach wire [$o wires] {
  			$@history add [list $self ins $i [$wire deconstruct]]
--- 2476,2479 ----
***************
*** 2516,2520 ****
  				$self disconnect [$wire connects]
  				lappend del_wire $wire
! 				$wire delete
  			}
  		}
--- 2515,2519 ----
  				$self disconnect [$wire connects]
  				lappend del_wire $wire
! 				#$wire delete
  			}
  		}
***************
*** 2526,2530 ****
  		if {$find != -1 && $find2 < 0} {
  			$self disconnect [$x connects]
! 			$x delete
  		}
  	}
--- 2525,2529 ----
  		if {$find != -1 && $find2 < 0} {
  			$self disconnect [$x connects]
! 			#$x delete
  		}
  	}
***************
*** 3306,3310 ****
  				}
  			}
! 			$wire delete
  		}
  	}
--- 3305,3309 ----
  				}
  			}
! 			#$wire delete
  		}
  	}