[PD-cvs] pd/src desire.tk, 1.1.2.460, 1.1.2.461 objective.tcl, 1.1.2.20, 1.1.2.21

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.tk objective.tcl 
Log Message:
renamed _class to class, _vars to vars, _inspect to inspect


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.460
retrieving revision 1.1.2.461
diff -C2 -d -r1.1.2.460 -r1.1.2.461
*** desire.tk	5 Sep 2006 23:14:05 -0000	1.1.2.460
--- desire.tk	6 Sep 2006 00:20:22 -0000	1.1.2.461
***************
*** 1098,1111 ****
  }
  
- #def View popup_properties {} {
- #	global fields
- #	set class $@class
- #	if {![info exists fields($class)]} {set class obj}
- #	puts "this is a $@class class"
- #	puts "it has [llength $fields($class)] properties"
- #	
- #	PagedDialog new_as ${self}prefs
- #}
- 
  def View canvas  {}  {return $@canvas}
  def View canvas= {c} {set @canvas $c}
--- 1098,1101 ----
***************
*** 2053,2057 ****
          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] inherit? Box]} {
  		$obj move [expr $x-$ox] [expr $y-$oy]
  	    } else {
***************
*** 2064,2068 ****
          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] inherit? Box]} {
  			$obj backupxy= [$obj xy]
  		} else {
***************
*** 2105,2109 ****
  	    # prior to Aug 15th, Wires had lower priority as all objects together
  	    # now it's same priority, so just stacking order (and it's prolly wrong)
! 	    set class [$id _class]
  	    if {[$self == $id]} {continue}
  	    if {[$class inherit? Wire]} {return [list "wire" $id]}
--- 2095,2099 ----
  	    # prior to Aug 15th, Wires had lower priority as all objects together
  	    # now it's same priority, so just stacking order (and it's prolly wrong)
! 	    set class [$id class]
  	    if {[$self == $id]} {continue}
  	    if {[$class inherit? Wire]} {return [list "wire" $id]}
***************
*** 2438,2443 ****
  			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] inherit?  Box]} {lappend objects $id
! 				} elseif {[[$id class] inherit? Wire]} {lappend wires   $id}
  			}
  		}
***************
*** 2558,2562 ****
  	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] inherit? Box]} {
  			puts "Canvas unclick warning: trying to move non-Box explicitly"
  			continue
***************
*** 2883,2887 ****
      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] inherit? 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.20
retrieving revision 1.1.2.21
diff -C2 -d -r1.1.2.20 -r1.1.2.21
*** objective.tcl	2 Sep 2006 09:04:22 -0000	1.1.2.20
--- objective.tcl	6 Sep 2006 00:20:23 -0000	1.1.2.21
***************
*** 122,126 ****
  def Thing delete {} {}
  
! def Thing _vars {} {
  	set n [string length $self:]
  	set ks [list]
--- 122,126 ----
  def Thing delete {} {}
  
! def Thing vars {} {
  	set n [string length $self:]
  	set ks [list]
***************
*** 131,135 ****
  }
  
! def Thing _inspect {} {
  	set t [list "#<$self: "]
  	foreach k [lsort [$self _vars]] {lappend t "$k=[list $@$k] "}
--- 131,135 ----
  }
  
! def Thing inspect {} {
  	set t [list "#<$self: "]
  	foreach k [lsort [$self _vars]] {lappend t "$k=[list $@$k] "}
***************
*** 138,142 ****
  }
  
! def Thing _class {} {return $@_class}
  
  class_new Class
--- 138,142 ----
  }
  
! def Thing class {} {return $@_class}
  
  class_new Class