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

Modified Files: Tag: devel_0_39 desire.c desire.tk objective.tcl Log Message: def Thing _delete renamed to def Thing delete

Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.385 retrieving revision 1.1.2.386 diff -C2 -d -r1.1.2.385 -r1.1.2.386 *** desire.tk 20 Aug 2006 21:39:54 -0000 1.1.2.385 --- desire.tk 20 Aug 2006 21:46:58 -0000 1.1.2.386 *************** *** 1087,1092 **** def* View draw {} {}

! def View delete {} {$self _delete} ! def* View _delete {} {$self erase} def* View erase {} {$self item_delete} def View selected? {} {return $@selected?} --- 1087,1091 ---- def* View draw {} {}

! def* View delete {} {$self erase} def* View erase {} {$self item_delete} def View selected? {} {return $@selected?} *************** *** 1353,1357 **** }

! def Canvas _delete {} { global window_list set wl {} --- 1352,1356 ---- }

! def Canvas delete {} { global window_list set wl {} *************** *** 1775,1779 **** set new [lwithout $children $@children] set dead [lwithout $@children $children] ! foreach x [lreverse $dead] {$x unsubscribe $self; $x erase} ;# should use _delete instead? foreach x $new {$x subscribe $self; $x changed; $x canvas= $self} set @children $children --- 1774,1778 ---- set new [lwithout $children $@children] set dead [lwithout $@children $children] ! foreach x [lreverse $dead] {$x unsubscribe $self; $x erase} ;# should use delete instead? foreach x $new {$x subscribe $self; $x changed; $x canvas= $self} set @children $children *************** *** 1820,1828 ****

def Canvas delete_selection {} { ! #if {![llength $@selection] && ![llength $@selection_wire]} {return} foreach obj $@selection { foreach wire $_($obj:wires) { set find [lsearch $@wires_pair $wire] ! if { $find != -1} { $self disconnect [lindex $@wires_pair [expr $find - 1]] ## remove the selected wire from the @wires_pair... --- 1819,1827 ----

def Canvas delete_selection {} { ! if {![llength $@selection] && ![llength $@selection_wire]} {return} foreach obj $@selection { foreach wire $_($obj:wires) { set find [lsearch $@wires_pair $wire] ! if {$find != -1} { $self disconnect [lindex $@wires_pair [expr $find - 1]] ## remove the selected wire from the @wires_pair... *************** *** 2148,2152 **** $self copy $self paste ! $clipboard _delete set clipboard $backup } --- 2147,2151 ---- $self copy $self paste ! $clipboard delete set clipboard $backup } *************** *** 2196,2200 ****

def* Canvas end_action {} { ! $@action _delete set @action "none" } --- 2195,2199 ----

def* Canvas end_action {} { ! $@action delete set @action "none" } *************** *** 2965,2969 **** }

! def Wire _delete {} { $@obj1 delete_wire $self $@obj2 delete_wire $self --- 2964,2968 ---- }

! def Wire delete {} { $@obj1 delete_wire $self $@obj2 delete_wire $self *************** *** 4431,4436 **** def Completion init {name x y textbox} {super $name $x $y $textbox}

! def* ClassBrowser cancel {} {$self _delete} ! def* ClassBrowser _delete {} {set @exist 0; super}

def* ClassBrowser init {name x y textbox} { --- 4430,4435 ---- def Completion init {name x y textbox} {super $name $x $y $textbox}

! def* ClassBrowser cancel {} {$self delete} ! def* ClassBrowser delete {} {set @exist 0; super}

def* ClassBrowser init {name x y textbox} { *************** *** 4979,4986 ****

def Dialog ok {} {$self apply; $self cancel} ! def Dialog cancel {} {$self _delete} ! def Dialog close {} {$self _delete} def Dialog apply {} {} ! def* Dialog _delete {} {destroy .$self}

def* Dialog init {args} { --- 4978,4985 ----

def Dialog ok {} {$self apply; $self cancel} ! def Dialog cancel {} {$self delete} ! def Dialog close {} {$self delete} def Dialog apply {} {} ! def* Dialog delete {} {destroy .$self; super}

def* Dialog init {args} { *************** *** 5308,5313 **** }

- def ServerPrefsDialog _delete {} {super} - #################### ClientPrefsDialog

--- 5307,5310 ---- *************** *** 5540,5545 **** }

- def ClientPrefsDialog _delete {} {super} - ############ other stuff #########

--- 5537,5540 ---- *************** *** 5687,5691 **** }

! def ClipboardDialog _delete {} { super $@clipboard unsubscribe $self --- 5682,5686 ---- }

! def ClipboardDialog delete {} { super $@clipboard unsubscribe $self *************** *** 5719,5723 **** }

! def HistoryDialog _delete {} { super $@clipboard unsubscribe $self --- 5714,5718 ---- }

! def HistoryDialog delete {} { super $@clipboard unsubscribe $self

Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.115 retrieving revision 1.1.2.116 diff -C2 -d -r1.1.2.115 -r1.1.2.116 *** desire.c 20 Aug 2006 21:11:21 -0000 1.1.2.115 --- desire.c 20 Aug 2006 21:46:58 -0000 1.1.2.116 *************** *** 928,932 **** while ((y = x->gl_list)) glist_delete(x, y); canvas_vis(x, 0); ! sys_mgui(x,"_delete","");

if (strcmp(x->gl_name->s_name, "Pd")) --- 928,932 ---- while ((y = x->gl_list)) glist_delete(x, y); canvas_vis(x, 0); ! sys_mgui(x,"delete","");

if (strcmp(x->gl_name->s_name, "Pd")) *************** *** 3885,3889 **** if (glist_isvisible(canvas)) { /*!@#$ race condition because the queue might still contain something */ ! /*sys_mgui(y,"_delete","");*/ //??? }

--- 3885,3889 ---- if (glist_isvisible(canvas)) { /*!@#$ race condition because the queue might still contain something */ ! /*sys_mgui(y,"delete","");*/ //??? }

Index: objective.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/objective.tcl,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -C2 -d -r1.1.2.16 -r1.1.2.17 *** objective.tcl 18 Aug 2006 16:35:37 -0000 1.1.2.16 --- objective.tcl 20 Aug 2006 21:46:59 -0000 1.1.2.17 *************** *** 123,127 ****

# virtual destructor ! def Thing _delete {} {}

def Thing _vars {} { --- 123,127 ----

# virtual destructor ! def Thing delete {} {}

def Thing _vars {} {