[PD-cvs] pd/src desire.tk,1.1.2.600.2.193,1.1.2.600.2.194

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
fix right click on canvas


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.193
retrieving revision 1.1.2.600.2.194
diff -C2 -d -r1.1.2.600.2.193 -r1.1.2.600.2.194
*** desire.tk	30 Jun 2007 01:54:31 -0000	1.1.2.600.2.193
--- desire.tk	30 Jun 2007 10:54:05 -0000	1.1.2.600.2.194
***************
*** 3548,3552 ****
  	catch {destroy $p}
  	menu $p -tearoff false
! 	if {$id == ""} {
  		$self populate_menu $p {popup_properties popup_help}
  	} elseif {[$id class] == "Wire"} {
--- 3548,3552 ----
  	catch {destroy $p}
  	menu $p -tearoff false
! 	if {$id == $self} {
  		$self populate_menu $p {popup_properties popup_help}
  	} elseif {[$id class] == "Wire"} {
***************
*** 4087,4096 ****
  
  def Canvas right_click {id x y} {
  	set c [$self widget]
  	set @insert_x $x; set @insert_y $y
! 	if {[$id class] != "Canvas"} {
! 		if {![winfo exists [[$id canvas] widget]]} {set id [$id canvas]}
! 	}
! 	if {[$id class] == "Canvas"} {set obj [$id get_parent_gop $self]} else {set obj $id}
  	$self popup $obj [winfo pointerx $c] [winfo pointery $c]
  }
--- 4087,4098 ----
  
  def Canvas right_click {id x y} {
+ 	if {!$@editmode} return
  	set c [$self widget]
  	set @insert_x $x; set @insert_y $y
! 	#if {[$id class] != "Canvas"} {
! 	#	if {![winfo exists [[$id canvas] widget]]} {set id [$id canvas]}
! 	#}
! 	#if {[$id class] == "Canvas"} {set obj [$id get_parent_gop $self]} else {set obj $id}
! 	set obj $id
  	$self popup $obj [winfo pointerx $c] [winfo pointery $c]
  }