[PD-cvs] pd/src desire.tk,1.1.2.307,1.1.2.308

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
objectframe4,commentframe4 die


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.307
retrieving revision 1.1.2.308
diff -C2 -d -r1.1.2.307 -r1.1.2.308
*** desire.tk	9 Aug 2006 09:33:14 -0000	1.1.2.307
--- desire.tk	9 Aug 2006 14:43:45 -0000	1.1.2.308
***************
*** 184,187 ****
--- 184,197 ----
  
  #-----------------------------------------------------------------------------------#
+ # object class just to make a variable watchable...?
+ # but really, we should look at "man 3tcl trace" instead.
+ 
+ class new Variable {Observable Thing}
+ 
+ def Variable init   {value} {super; set @value $value; $self changed}
+ def Variable value= {value} {       set @value $value; $self changed}
+ def Variable value {} {return $@value}
+ 
+ #-----------------------------------------------------------------------------------#
  # adapted from matju's MetaRuby (UndoQueue.rb)
  
***************
*** 3172,3176 ****
  	set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2]
  	.$@canvas.c canvasx $x1
! 	if {[$self selected?]} {set frcol [look objectframe4]} {set frcol [look objectframe3]}
  	$self item BASE polygon $points -fill [look objectbg] -outline $frcol
  	io_draw $self
--- 3182,3186 ----
  	set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2]
  	.$@canvas.c canvasx $x1
! 	if {[$self selected?]} {set frcol [look selectframe]} {set frcol [look objectframe3]}
  	$self item BASE polygon $points -fill [look objectbg] -outline $frcol
  	io_draw $self
***************
*** 3713,3717 ****
  	}
  	io_draw $self
! 	if {[$self selected?]} {set frcol [look objectframe4]} {set frcol [look objectframe3]}
  	$c itemconfigure ${self}BASE -outline $frcol
  }
--- 3723,3727 ----
  	}
  	io_draw $self
! 	if {[$self selected?]} {set frcol [look selectframe]} {set frcol [look objectframe3]}
  	$c itemconfigure ${self}BASE -outline $frcol
  }
***************
*** 5439,5443 ****
    color objectframe2
    color objectframe3
-   color objectframe4
    color commentbg
    color commentfg
--- 5449,5452 ----
***************
*** 5445,5449 ****
    color commentframe2
    color commentframe3
!   color commentframe4
   subsection wire_color
    color wirefg
--- 5454,5458 ----
    color commentframe2
    color commentframe3
!   color selectframe
   subsection wire_color
    color wirefg