[PD-cvs] pd/src desire.tk,1.1.2.600.2.352,1.1.2.600.2.353

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
revert previous commit, using Canvas focus instead


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.352
retrieving revision 1.1.2.600.2.353
diff -C2 -d -r1.1.2.600.2.352 -r1.1.2.600.2.353
*** desire.tk	12 Aug 2007 16:31:49 -0000	1.1.2.600.2.352
--- desire.tk	12 Aug 2007 17:26:42 -0000	1.1.2.600.2.353
***************
*** 78,82 ****
  }
  
! # add or substract two lists
  proc l+   {   al bl} {set r {}; foreach a $al b $bl {lappend r [expr {$a+$b}]}; return $r}
  proc l-   {   al bl} {set r {}; foreach a $al b $bl {lappend r [expr {$a-$b}]}; return $r}
--- 78,82 ----
  }
  
! #  or substract two lists
  proc l+   {   al bl} {set r {}; foreach a $al b $bl {lappend r [expr {$a+$b}]}; return $r}
  proc l-   {   al bl} {set r {}; foreach a $al b $bl {lappend r [expr {$a-$b}]}; return $r}
***************
*** 1663,1669 ****
  def Canvas editmodeswitch {args} {$self editmode= [expr !$@editmode]}
  
- def Canvas edit_obj {} {return $@edit_obj}
- def Canvas edit_obj= {val} {set @edit_obj $val}
- 
  def Canvas window {} {
  	#if {$@gop && $@canvas != ""} {return [$@canvas window]}
--- 1663,1666 ----
***************
*** 1727,1731 ****
      set @macro_q {}
      set @macro_delay 200
-     set @edit_obj ""    
  }
  
--- 1724,1727 ----
***************
*** 2535,2539 ****
  }
  def TextBox edit {} {
! 	if {$@edit} {return}; set @edit 1;$@canvas edit_obj= $self; $self changed edit
  	if {[[$self class] <= AtomBox]} {set @clear 1}
  }
--- 2531,2535 ----
  }
  def TextBox edit {} {
! 	if {$@edit} {return}; set @edit 1; $self changed edit
  	if {[[$self class] <= AtomBox]} {set @clear 1}
  }
***************
*** 2771,2775 ****
  def TextBox unedit {{accept 1}} {
  	if {!$@edit} {return}
! 	set @edit 0; $@canvas edit_obj= ""
  	$self changed edit
  	set c [[$self get_canvas] widget]
--- 2767,2771 ----
  def TextBox unedit {{accept 1}} {
  	if {!$@edit} {return}
! 	set @edit 0
  	$self changed edit
  	set c [[$self get_canvas] widget]
***************
*** 4301,4306 ****
  				} else {set obj $id}
  				if {[$id class] == "Canvas"} {if {[$id text] == "graph"} {set @action none; return}}
! 				set obj_in_edit [$self edit_obj]
! 				if {$obj_in_edit != ""} {$obj_in_edit unedit}
  				$obj edit; set @action none; $obj changed action
  			}
--- 4297,4302 ----
  				} else {set obj $id}
  				if {[$id class] == "Canvas"} {if {[$id text] == "graph"} {set @action none; return}}
! 				set focus [$self focus]
! 				if {$focus != ""} {if {[[$focus class] <= TextBox]} {$focus unedit}}
  				$obj edit; set @action none; $obj changed action
  			}
***************
*** 6660,6663 ****
--- 6656,6661 ----
  def Grid update {h w} {set @width $w; set @height $h}
  def Grid size= {size} {set @size $size}
+ def Canvas snap_grid {} {return [$self look snap_grid]}
+ def Canvas snap_grid= {val} {set ::look(Canvas:snap_grid) $val}
  
  def Grid draw {} {