[PD-cvs] pd/src desire.tk,1.1.2.600.2.111,1.1.2.600.2.112

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
fix(temporary) on opening gop


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.111
retrieving revision 1.1.2.600.2.112
diff -C2 -d -r1.1.2.600.2.111 -r1.1.2.600.2.112
*** desire.tk	19 Dec 2006 13:20:39 -0000	1.1.2.600.2.111
--- desire.tk	19 Dec 2006 15:01:23 -0000	1.1.2.600.2.112
***************
*** 1231,1235 ****
  	if {$canvas == ""} {return ""}
  	while {![winfo exists [$canvas widget]]} {set canvas [$canvas canvas]}
! 	if {[regexp {x[0-9a-f]{6,8}} [focus] focus]} {
  		if {$focus != $canvas} {set canvas $focus}  
  	}
--- 1231,1235 ----
  	if {$canvas == ""} {return ""}
  	while {![winfo exists [$canvas widget]]} {set canvas [$canvas canvas]}
! 	if {[regexp {x[0-9a-f]{6,8}} [focus] focus] && [$@canvas gop]} {
  		if {$focus != $canvas} {set canvas $focus}  
  	}
***************
*** 2422,2425 ****
--- 2422,2426 ----
  def Canvas havewindow= {flag} {
      set was [winfo exists .$self]
+     if {$flag && $was && [$self gop]} {$self redraw}
      if {$flag && $was} {$self raise}
      if {$flag && !$was} {$self init_window}   ;#???
***************
*** 2754,2758 ****
  	# we have to figure out something.
  	set stack [lreverse $stack]
- 
  	foreach tag $stack {
  		set tags [$c gettags $tag]
--- 2755,2758 ----
***************
*** 2791,2795 ****
  				} else {
  					if {$class == "Canvas" && [$id gop]} {
! 						if {[llength $stack] == 1} { return [list "object" $id]}
  					} else {return [list "object" $id]}
  				}
--- 2791,2795 ----
  				} else {
  					if {$class == "Canvas" && [$id gop]} {
! 						return [list "object" $id]
  					} else {return [list "object" $id]}
  				}
***************
*** 3029,3036 ****
  
  def Canvas popup_open {} {
  	set @mapped 1
  	netsend [list .$self vis 1]
  	netsend [list .$self map 1]
! 	$self init_window
  	#$self redraw
  }
--- 3029,3037 ----
  
  def Canvas popup_open {} {
+ 	$self init_window
  	set @mapped 1
  	netsend [list .$self vis 1]
  	netsend [list .$self map 1]
! 	#$self init_window
  	#$self redraw
  }