[PD-cvs] pd/src desire.tk,1.1.2.600.2.134,1.1.2.600.2.135

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
somemore gop fixes


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.134
retrieving revision 1.1.2.600.2.135
diff -C2 -d -r1.1.2.600.2.134 -r1.1.2.600.2.135
*** desire.tk	22 Dec 2006 16:57:45 -0000	1.1.2.600.2.134
--- desire.tk	22 Dec 2006 18:22:26 -0000	1.1.2.600.2.135
***************
*** 1438,1441 ****
--- 1438,1442 ----
  # to be called only from Pd side.
  def Canvas editmode= {mode} {
+     if {!$mode} {$self deselect_all}
      set @editmode $mode; $self changed editmode
  #    catch {.$self.bbar.edit configure -image icon_mode_$mode}
***************
*** 2334,2344 ****
  	#[$@canvas widget] lower ${self}BASE ${self}TEXT
  	[[$self get_canvas] widget] lower ${self}BASE ${self}TEXT
  }
  
! def ObjectBox draw {} {
! 	super
!         $self draw_io
! 	#if {$@isnew} {$self edit} ;# why this here ?
! }
  
  # this is called from the GUI; text= is reserved for server.
--- 2335,2342 ----
  	#[$@canvas widget] lower ${self}BASE ${self}TEXT
  	[[$self get_canvas] widget] lower ${self}BASE ${self}TEXT
+ 	#[[$self get_canvas] widget] lower ${self}BASE
  }
  
! def ObjectBox draw {} {super; $self draw_io}
  
  # this is called from the GUI; text= is reserved for server.
***************
*** 3430,3434 ****
  	if {$@editmode} {
  		switch $@action {
! 			edit {$id edit; set @action none; $id changed action}
  			move {$self unclick_move}
  			none {}
--- 3428,3437 ----
  	if {$@editmode} {
  		switch $@action {
! 			edit {
! 				if {[$id canvas] != $self} {
! 					set obj [$id get_parent_gop $self]
! 				} else {set obj $id}
! 				$obj edit; set @action none; $obj changed action
! 			}
  			move {$self unclick_move}
  			none {}
***************
*** 4013,4016 ****
--- 4016,4020 ----
  def Box draw {} {
  	$self draw_box
+ 	[[$self get_canvas] widget] raise $self
  	$self update_hilite_io
  #	if {[$self class] == "Canvas"} {$self restack}