[PD-cvs] pd/src desire.tk,1.1.2.600.2.123,1.1.2.600.2.124

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
refix gop problems


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.123
retrieving revision 1.1.2.600.2.124
diff -C2 -d -r1.1.2.600.2.123 -r1.1.2.600.2.124
*** desire.tk	20 Dec 2006 01:39:13 -0000	1.1.2.600.2.123
--- desire.tk	20 Dec 2006 01:52:18 -0000	1.1.2.600.2.124
***************
*** 426,429 ****
--- 426,430 ----
  	foreach tkclass {Menu Button Checkbutton Radiobutton Entry Text Spinbox Scrollbar Canvas} {
  		option add *$tkclass*borderWidth 1
+ 		option add *$tkclass*activeBorderWidth 1
  	}
  	foreach tkclass {CheckButton RadioButton} {
***************
*** 757,762 ****
  		-variable $y -anchor w -command $z] -side left
      }
!     button .controls.clear -text [say console_clear] -command {.log.1 delete 0.0 end}         -padx 2 -pady 2
!     button .controls.dio   -text [say io_errors]     -command {netsend [list pd audiostatus]} -padx 2 -pady 2
      pack .controls.clear .controls.dio -side right
      if {$::debug} {
--- 758,763 ----
  		-variable $y -anchor w -command $z] -side left
      }
!     button .controls.clear -text [say console_clear] -command {.log.1 delete 0.0 end}         -padx 2 -pady 0
!     button .controls.dio   -text [say io_errors]     -command {netsend [list pd audiostatus]} -padx 2 -pady 0
      pack .controls.clear .controls.dio -side right
      if {$::debug} {
***************
*** 1444,1447 ****
--- 1445,1449 ----
  }
  def Canvas widget {} {return .$self.c}
+ def View  cwidget {} {return .[$self get_canvas].c}
  
  #-----------------------------------------------------------------------------------#
***************
*** 1880,1884 ****
  def Canvas get_canvas {} {
  	if {![info exists @gop]} {
! 		if {[info exists @subpatch]} {if {$@subpatch} {return [$self canvas]}}
  		if {[info exists @abs]} {if {$@abs} {return [$self canvas]}}
  		if {[winfo exists .$self.c]} {return $self}
--- 1882,1886 ----
  def Canvas get_canvas {} {
  	if {![info exists @gop]} {
! 		#if {[info exists @subpatch]} {if {$@subpatch} {return [$self canvas]}}
  		if {[info exists @abs]} {if {$@abs} {return [$self canvas]}}
  		if {[winfo exists .$self.c]} {return $self}
***************
*** 2101,2105 ****
  	mset {x1 y1} [$self xy]
  	if {$@edit} {
! 		set t [$@canvas widget].${self}text
  		if {![winfo exists $t]} {$self draw_edit}
  		$self item text window [l+ $@textoffset [$self xy]] \
--- 2103,2107 ----
  	mset {x1 y1} [$self xy]
  	if {$@edit} {
! 		set t [[$self get_canvas] widget].${self}text
  		if {![winfo exists $t]} {$self draw_edit}
  		$self item text window [l+ $@textoffset [$self xy]] \
***************
*** 2122,2126 ****
  
  def TextBox draw_edit {} {
! 	set c [$@canvas widget]
  	if {[lsearch [$@canvas selection] $self] < 0} {$@canvas selection+= $self}
  	set t $c.${self}text
--- 2124,2128 ----
  
  def TextBox draw_edit {} {
! 	set c [$self cwidget]
  	if {[lsearch [$@canvas selection] $self] < 0} {$@canvas selection+= $self}
  	set t $c.${self}text
***************
*** 2162,2166 ****
  
  def TextBox resize {key} {
! 	set c [$@canvas widget]
  	set t $c.${self}text
  	$self long_line
--- 2164,2168 ----
  
  def TextBox resize {key} {
! 	set c [$self cwidget]
  	set t $c.${self}text
  	$self long_line
***************
*** 2199,2203 ****
  #checks which line should be used as the width of the objectbox
  def TextBox long_line {} {
! 	set c [$@canvas widget]
  	set t $c.${self}text
  	set lines [lindex [$t configure -height] 4]
--- 2201,2205 ----
  #checks which line should be used as the width of the objectbox
  def TextBox long_line {} {
! 	set c [$self cwidget]
  	set t $c.${self}text
  	set lines [lindex [$t configure -height] 4]
***************
*** 2212,2216 ****
  
  def TextBox update_size {} {
- 	#
  	if {([$self class] == "FloatBox" || [$self class] == "NumBox") && $@w} {return}
  	if {[info exists @gop]} {if {$@gop} {set @xs $@pixwidth; set @ys $@pixheight; return}}
--- 2214,2217 ----
***************
*** 2220,2224 ****
  	if {$@canvas == ""} {puts "update_size: this textbox has no canvas, try again later"; return}
  	set n [string length $@text]
! 	set c [$@canvas widget]
  	set t $c.${self}text
  	set width [font measure [$self look font] W]
--- 2221,2225 ----
  	if {$@canvas == ""} {puts "update_size: this textbox has no canvas, try again later"; return}
  	set n [string length $@text]
! 	set c [$self cwidget]
  	set t $c.${self}text
  	set width [font measure [$self look font] W]
***************
*** 2333,2337 ****
  	if {!$@edit} {return}
  	set @edit 0; $self changed edit
! 	set c [$@canvas widget]
  	set t $c.${self}text
  	if {$accept} {$self setto [$t get 1.0 "end - 1 chars"]}
--- 2334,2338 ----
  	if {!$@edit} {return}
  	set @edit 0; $self changed edit
! 	set c [[$self get_canvas] widget]
  	set t $c.${self}text
  	if {$accept} {$self setto [$t get 1.0 "end - 1 chars"]}