Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16469
Modified Files:
Tag: desiredata
desire.tk TODO
Log Message:
partial fix to deleting Canvas([pd]/gop)
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.131
retrieving revision 1.1.2.600.2.132
diff -C2 -d -r1.1.2.600.2.131 -r1.1.2.600.2.132
*** desire.tk 21 Dec 2006 14:26:50 -0000 1.1.2.600.2.131
--- desire.tk 21 Dec 2006 15:55:05 -0000 1.1.2.600.2.132
***************
*** 2434,2437 ****
--- 2434,2438 ----
$@history add [list $self del $i]
}
+
def Canvas del {i} {
set o [lindex $@children $i]
***************
*** 2439,2445 ****
$@history add [list $self ins $i [$o deconstruct]]
} else {
! #$@history add [list $self ins $i [$o deconstruct]]
! foreach wire [$o wires] {$@history add [list $o ins $i [$wire deconstruct]]}
! foreach obj [$o children] {$@history add [list $o ins $i [$obj deconstruct]]}
$@history add [list $self ins $i [$o deconstruct]]
}
--- 2440,2456 ----
$@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]]}
! #$self delete_children
! foreach wire [$o wires] {
! $@history add [list $self ins $i [$wire deconstruct]]
! $o disconnect [$wire connects]
! $wire delete
! }
! foreach obj [$o children] {
! $@history add [list $self ins $i [$obj deconstruct]]
! $o del [$o index $obj]
! }
!
$@history add [list $self ins $i [$o deconstruct]]
}
***************
*** 2451,2455 ****
set new [lwithout $wires $@wires]
set dead [lwithout $@wires $wires]
! foreach x [lreverse $dead] {$x unsubscribe $self; $x erase} ;# should use delete instead?
set @wires $wires
$self changed wires
--- 2462,2466 ----
set new [lwithout $wires $@wires]
set dead [lwithout $@wires $wires]
! #foreach x [lreverse $dead] {$x unsubscribe $self; $x erase} ;# should use delete instead?
set @wires $wires
$self changed wires
***************
*** 2471,2475 ****
set find [lsearch $@wires $x]
if {$find != -1} {$self disconnect [$x connects]}
! $x delete
}
# don't use $self selection= here, otherwise it might call changed on deleted stuff..
--- 2482,2486 ----
set find [lsearch $@wires $x]
if {$find != -1} {$self disconnect [$x connects]}
! $x delete
}
# don't use $self selection= here, otherwise it might call changed on deleted stuff..
***************
*** 4251,4254 ****
--- 4262,4266 ----
def Wire delete {} {
if {![winfo exists .$(a)canvas.c]} {return}
+ $self unsubscribe $@canvas
$@obj1 delete_wire $self
$@obj2 delete_wire $self
Index: TODO
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/TODO,v
retrieving revision 1.1.2.28.2.20
retrieving revision 1.1.2.28.2.21
diff -C2 -d -r1.1.2.28.2.20 -r1.1.2.28.2.21
*** TODO 21 Dec 2006 14:26:52 -0000 1.1.2.28.2.20
--- TODO 21 Dec 2006 15:55:07 -0000 1.1.2.28.2.21
***************
*** 9,13 ****
[ ] fix gop
[ ] gop content drawn on wrong canvas
- [ ] gop content don't delete when gop is deleted
[ ] gop drawing order
[x] gop content should not be able to move...
--- 9,12 ----
***************
*** 17,20 ****
--- 16,22 ----
[ ] FloatBox remains hilited after hit Return
[ ] gobj_changed3: no appendix in 0x807b620 (don't know how to reproduce yet)
+ [ ] fix deleteing/closing Canvas
+ [x] partically fixed (def Canvas del)
+ [ ] server sends -> x806a3b8 delete twice
---------------------------------------------------------------- 0.40.pre7-...