[PD-cvs] pd/src desire.tk,1.1.2.462,1.1.2.463

[chunlee]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
fix to [pd]


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.462
retrieving revision 1.1.2.463
diff -C2 -d -r1.1.2.462 -r1.1.2.463
*** desire.tk	6 Sep 2006 00:51:26 -0000	1.1.2.462
--- desire.tk	6 Sep 2006 01:24:43 -0000	1.1.2.463
***************
*** 1105,1108 ****
--- 1105,1115 ----
  
  def Canvas close {} {
+ 	if {$@subpatch} {
+ 		#can't wait till @mapped get updated till the update_object
+ 		set @mapped 0 
+ 		pd .$self map 0
+ 		pd .$self close
+ 		return
+ 	}
    switch [tk_messageBox -message [say save_changes?] -icon question -type yesnocancel -default cancel] {
      yes    {$self save; pd .$self close}
***************
*** 1380,1383 ****
--- 1387,1398 ----
  }
  
+ def Canvas delete_window {} {
+ 	global window_list
+ 	set wl {}
+ 	foreach w $window_list {if {$w != $self} {lappend wl $w}}
+ 	set window_list $wl
+ 	destroy .$self
+ }
+ 
  def Canvas delete {} {
  	global window_list
***************
*** 2457,2461 ****
--- 2472,2478 ----
  		puts "$self is a subpatch and is mapped --> $@mapped"
  			if {!$@mapped} {
+ 			#can't wait till @mapped get updated till the update_object
  			set @mapped 1
+ 			pd .$self map 1
  			$self init_window
  			$self redraw
***************
*** 2464,2468 ****
  				set c [$self widget]
  				focus $c
! 				return
  			}
  	       	}
--- 2481,2485 ----
  				set c [$self widget]
  				focus $c
! 				if {$id == $self} {return}
  			}
  	       	}