[PD-cvs] pd/src desire.tk,1.1.2.415,1.1.2.416

[chunlee]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
change def Thing look to def View look


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.415
retrieving revision 1.1.2.416
diff -C2 -d -r1.1.2.415 -r1.1.2.416
*** desire.tk	28 Aug 2006 15:48:27 -0000	1.1.2.415
--- desire.tk	28 Aug 2006 22:16:19 -0000	1.1.2.416
***************
*** 554,562 ****
  set look(FutureWire:dash) #ee0012
  set look(Slider:bg) #ccebff
! set look(Completion:showcomp) 10
! set look(Completion:fg) #000000
! set look(Completion:bg) #ffffff
! set look(Completion:selectbg) #000000
! set look(Completion:selectfg) #ffffff
  
  set zoom(canned) [list 25 33 50 75 100 125 150 200 250 300 400]
--- 554,562 ----
  set look(FutureWire:dash) #ee0012
  set look(Slider:bg) #ccebff
! set look(Canvas:showcomp) 10
! set look(Canvas:compfg) #000000
! set look(Canvas:compbg) #ffffff
! set look(Canvas:compselectbg) #000000
! set look(Canvas:compselectfg) #ffffff
  
  set zoom(canned) [list 25 33 50 75 100 125 150 200 250 300 400]
***************
*** 1132,1141 ****
  def* View unclick {x y f target} {}
  def  View  motion {x y f target} {}
! #class that are not view but need to look are: completionbox, dialog
! def Thing look {k} {
  	global look
  	if {[info exists look($@_class:$k)]} {
  		return $look($@_class:$k)
  	} else {
  		foreach super [$@_class ancestors] {
  			if {[info exists look($super:$k)]} {return $look($super:$k)}
--- 1132,1142 ----
  def* View unclick {x y f target} {}
  def  View  motion {x y f target} {}
! 
! def* View look {k} {
  	global look
  	if {[info exists look($@_class:$k)]} {
  		return $look($@_class:$k)
  	} else {
+ 	        
  		foreach super [$@_class ancestors] {
  			if {[info exists look($super:$k)]} {return $look($super:$k)}
***************
*** 4778,4786 ****
  	set x1 [format %0.f $x1];set y1 [format %0.f $y1]
  	set x2 [format %0.f $x2];set y2 [format %0.f $y2]
! 	if {[$self look showcomp] <= 20} {
! 		set @height [$self look showcomp]} else {set @height 20}
  	listbox $f -width $@width -height $@height -relief flat \
! 		-bg [$self look bg] -selectbackground [$self look selectbg] \
! 		-activestyle dotbox -selectforeground [$self look selectfg] -fg [$self look fg]
  	$self fill_box [$@textbox get 1.0 1.end]
  	$f configure -width $@width
--- 4779,4788 ----
  	set x1 [format %0.f $x1];set y1 [format %0.f $y1]
  	set x2 [format %0.f $x2];set y2 [format %0.f $y2]
! 	puts " 	       --> [$canvas look showcomp]  <--"
! 	if {[$canvas look showcomp] <= 20} {
! 		set @height [$canvas look showcomp]} else {set @height 20}
  	listbox $f -width $@width -height $@height -relief flat \
! 		-bg [$canvas look compbg] -selectbackground [$canvas look compselectbg] \
! 		-activestyle dotbox -selectforeground [$canvas look compselectfg] -fg [$canvas look compfg]
  	$self fill_box [$@textbox get 1.0 1.end]
  	$f configure -width $@width
***************
*** 5151,5159 ****
      	set no_max_label 0
      	bind all <KeyPress-F1> help
!     	set @size [$self look fontsize]
! 	set @font [$self look fontfamily]
! 	set @style [$self look fontstyle]
! 	set @italic [$self look fontitalic]
! 	set @fstr [$self look fontstring]
  	puts "font:: $@font | size::: $@size | style::: $@style | italic::: $@italic"
  	set bold 0
--- 5153,5161 ----
      	set no_max_label 0
      	bind all <KeyPress-F1> help
!     	set @size $look(Thing:fontsize)
! 	set @font $look(Thing:fontfamily)
! 	set @style $look(Thing:fontstyle)
! 	set @italic $look(Thing:fontitalic)
! 	set @fstr $look(Thing:fontstring)
  	puts "font:: $@font | size::: $@size | style::: $@style | italic::: $@italic"
  	set bold 0
***************
*** 5169,5173 ****
  	
  	set fontlist [$f.font.list.box get 0 end]
! 	set find [lsearch $fontlist [$self look fontfamily]]
  	if {$find < 0} {set find 0}
  	$f.font.list.box selection set $find $find
--- 5171,5175 ----
  	
  	set fontlist [$f.font.list.box get 0 end]
! 	set find [lsearch $fontlist $@font]
  	if {$find < 0} {set find 0}
  	$f.font.list.box selection set $find $find