[PD-cvs] pd/src desire.tk,1.1.2.449,1.1.2.450

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
temporary fix for problem of wires being in @selection


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.449
retrieving revision 1.1.2.450
diff -C2 -d -r1.1.2.449 -r1.1.2.450
*** desire.tk	1 Sep 2006 20:50:56 -0000	1.1.2.449
--- desire.tk	1 Sep 2006 21:08:27 -0000	1.1.2.450
***************
*** 2032,2041 ****
        move {
          mset {ox oy} $oldpos
!         foreach obj $@selection {$obj move [expr $x-$ox] [expr $y-$oy]}
          return
        }
        edit {
          if {[distance [list $x $y] $@click_at] > 5} {
! 	  foreach obj $@selection {$obj backupxy= [$obj xy]}
  	  set @action move
  	  mset {ox oy} $@click_at
--- 2032,2053 ----
        move {
          mset {ox oy} $oldpos
!         foreach obj $@selection {
! 	    if {[[$obj _class] inherit? Box]} {
! 		$obj move [expr $x-$ox] [expr $y-$oy]
! 	    } else {
! 		puts "Canvas motion warning: trying to move non-Box explicitly"
! 	    }
! 	}
          return
        }
        edit {
          if {[distance [list $x $y] $@click_at] > 5} {
! 	  foreach obj $@selection {
! 		if {[[$obj _class] inherit? Box]} {
! 			$obj backupxy= [$obj xy]
! 		} else {
! 			puts "Canvas motion warning: trying to backup coordinates of non-Box"
! 		}
! 	  }
  	  set @action move
  	  mset {ox oy} $@click_at
***************
*** 2499,2502 ****
--- 2511,2518 ----
  	move {
  	  foreach obj $@selection {
+ 		if {![[$obj _class] inherit? Box]} {
+ 			puts "Canvas unclick warning: trying to move non-Box explicitly"
+ 			continue
+ 		}
  		mset {x1 y1} [$obj xy]
  		$obj position= [$obj backupxy]