pd/src desire.tk, 1.1.2.461, 1.1.2.462 objective.tcl, 1.1.2.21, 1.1.2.22 - Pd-cvs

6 Sep 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6965
Modified Files:
      Tag: devel_0_39
    desire.tk objective.tcl 
Log Message:
renamed def Class inherit? to <=
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.461
retrieving revision 1.1.2.462
diff -C2 -d -r1.1.2.461 -r1.1.2.462
*** desire.tk	6 Sep 2006 00:20:22 -0000	1.1.2.461
--- desire.tk	6 Sep 2006 00:51:26 -0000	1.1.2.462
***************
*** 2043,2047 ****
          mset {ox oy} $oldpos
          foreach obj $@selection {
! 	    if {[[$obj class] inherit? Box]} {
    	$obj move [expr $x-$ox] [expr $y-$oy]
        } else {
--- 2043,2047 ----
          mset {ox oy} $oldpos
          foreach obj $@selection {
! 	    if {[[$obj class] <= Box]} {
    	$obj move [expr $x-$ox] [expr $y-$oy]
        } else {
***************
*** 2054,2058 ****
          if {[distance [list $x $y] $@click_at] > 5} {
      foreach obj $@selection {
! 		if {[[$obj class] inherit? Box]} {
    		$obj backupxy= [$obj xy]
    	} else {
--- 2054,2058 ----
          if {[distance [list $x $y] $@click_at] > 5} {
      foreach obj $@selection {
! 		if {[[$obj class] <= Box]} {
    		$obj backupxy= [$obj xy]
    	} else {
***************
*** 2097,2102 ****
        set class [$id class]
        if {[$self == $id]} {continue}
! 	    if {[$class inherit? Wire]} {return [list "wire" $id]}
! 	    if {[$class inherit? Box]} {
          mset {x1 y1 x2 y2} [$id bbox]
          set outs [$id noutlets]
--- 2097,2102 ----
        set class [$id class]
        if {[$self == $id]} {continue}
! 	    if {[$class <= Wire]} {return [list "wire" $id]}
! 	    if {[$class <= Box]} {
          mset {x1 y1 x2 y2} [$id bbox]
          set outs [$id noutlets]
***************
*** 2428,2433 ****
    		if {[regexp {^[xo]?[0-9a-f]{6,8}} [$c gettags $tag] id]} {
    			if {[$@canvas == $id]} {continue}
! 				if       {[[$id class] inherit?  Box]} {lappend objects $id
! 				} elseif {[[$id class] inherit? Wire]} {lappend wires   $id}
    		}
    	}
--- 2428,2433 ----
    		if {[regexp {^[xo]?[0-9a-f]{6,8}} [$c gettags $tag] id]} {
    			if {[$@canvas == $id]} {continue}
! 				if       {[[$id class] <=  Box]} {lappend objects $id
! 				} elseif {[[$id class] <= Wire]} {lappend wires   $id}
    		}
    	}
***************
*** 2548,2552 ****
    move {
      foreach obj $@selection {
! 		if {![[$obj class] inherit? Box]} {
    		puts "Canvas unclick warning: trying to move non-Box explicitly"
    		continue
--- 2548,2552 ----
    move {
      foreach obj $@selection {
! 		if {![[$obj class] <= Box]} {
    		puts "Canvas unclick warning: trying to move non-Box explicitly"
    		continue
***************
*** 2873,2877 ****
      foreach o $@selection {
    mset {x1 y1} [$o xy]
! 	if {[[$o class] inherit? Box]} {
    	$o moveto [expr $x1+$dx] [expr $y1+$dy]
    } else {
--- 2873,2877 ----
      foreach o $@selection {
    mset {x1 y1} [$o xy]
! 	if {[[$o class] <= Box]} {
    	$o moveto [expr $x1+$dx] [expr $y1+$dy]
    } else {
Index: objective.tcl
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/objective.tcl,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -C2 -d -r1.1.2.21 -r1.1.2.22
*** objective.tcl	6 Sep 2006 00:20:23 -0000	1.1.2.21
--- objective.tcl	6 Sep 2006 00:51:27 -0000	1.1.2.22
***************
*** 142,146 ****
  class_new Class
  def Class subclasses {} {return $@subclasses}
! def Class inherit? {class} {
    return [expr [lsearch [$self ancestors] $class]>=0]
  }
--- 142,146 ----
  class_new Class
  def Class subclasses {} {return $@subclasses}
! def Class <= {class} {
    return [expr [lsearch [$self ancestors] $class]>=0]
  }