[PD-cvs] pd/src desire.tk,1.1.2.600.2.234,1.1.2.600.2.235

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
fixed some of the bugs of undo of delete of subpatch


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.234
retrieving revision 1.1.2.600.2.235
diff -C2 -d -r1.1.2.600.2.234 -r1.1.2.600.2.235
*** desire.tk	14 Jul 2007 02:22:54 -0000	1.1.2.600.2.234
--- desire.tk	14 Jul 2007 13:37:48 -0000	1.1.2.600.2.235
***************
*** 2565,2569 ****
  # for undo; calls the server
  def Canvas ins {i constructor} {
! 	netsend [concat [list .$self object_insert $i] $constructor]
  	$@history add [list $self del $i]
  }
--- 2565,2573 ----
  # for undo; calls the server
  def Canvas ins {i constructor} {
! 	set parts [pd_mess_split $constructor]
! 	set last [lindex $parts end]
! 	set parts [lrange $parts 0 end-1]
! 	foreach part $parts {netsend $part}
! 	netsend [concat [list .$self object_insert $i] $last]
  	$@history add [list $self del $i]
  }
***************
*** 2575,2591 ****
  		set @keynav_last_obj 0
  	}
  	if {[$o class] != "Canvas"} {
  		$@history add [list $self ins $i [$o deconstruct]]
  	} else {
! 		foreach wire [$o wires] {
! 			$@history add [list $self ins $i [$wire deconstruct]]
! 			$o disconnect [$wire connects]
! 			$wire delete
! 		}
! 		foreach obj [$o children] {
! 			$@history add [lisot $self ins $i [$obj deconstruct]]
! 			$o del [$o index $obj]
! 		}
! 		$@history add [list $self ins $i [$o deconstruct]]
  	}
  	netsend [list .$self object_delete $o]
--- 2579,2590 ----
  		set @keynav_last_obj 0
  	}
+ 	puts "Canvas del: [$o class]"
  	if {[$o class] != "Canvas"} {
  		$@history add [list $self ins $i [$o deconstruct]]
  	} else {
! 		set meuh [Clipboard2 new]
! 		$o deconstruct_to $meuh
! 		$@history add [list $self ins $i [$meuh value]]
! 		$meuh delete
  	}
  	netsend [list .$self object_delete $o]
***************
*** 5084,5091 ****
  	regsub -all {\\;} $y "\n" z
  	foreach mess [split $z ";"] {
! 		if {$mess != ""} {
! 			regsub -all "\n" $mess "\\;" x
! 			lappend r [string trimleft $x]
! 		}
  	}
  	return $r
--- 5083,5089 ----
  	regsub -all {\\;} $y "\n" z
  	foreach mess [split $z ";"] {
! 		regsub -all "\n" $mess "\\;" mess
! 		set mess [string trimleft $mess]
! 		if {$mess != ""} {lappend r $mess}
  	}
  	return $r