pd/src desire.tk,1.1.2.568,1.1.2.569 - Pd-cvs

19 Nov 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8868
Modified Files:
      Tag: devel_0_39
    desire.tk 
Log Message:
fix for subpatch objectbox wire don't update and textbox update_size
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.568
retrieving revision 1.1.2.569
diff -C2 -d -r1.1.2.568 -r1.1.2.569
*** desire.tk	19 Nov 2006 17:01:47 -0000	1.1.2.568
--- desire.tk	19 Nov 2006 22:28:13 -0000	1.1.2.569
***************
*** 2006,2015 ****
    set c [$@canvas widget]
    set t $c.${self}text
- 	#$self long_line
- 	#$t configure -width [string length [$t get $@longline.0 $@longline.end]]
    switch -- $key {
    	Tab {$self propose_completions; $widget configure -state disabled}
    	10 {$t configure -height [expr [lindex [$t configure -height] 4] + 1]}
- 		#default {lower [$@canvas widget].${self}propose $widget; set @tab_repeats 0}
    }
  }
--- 2006,2012 ----
***************
*** 2060,2064 ****
    }
    catch {
! 		mset {x1 y1 w h} [$c.${self}text bbox $@longline.$n]
    	set textlen [string length [$c.${self}text get $@longline.0 $@longline.end]]
    	set textwidth [expr ($textlen * $w / [$@canvas zoom]) + $padx*2 + 2]
--- 2057,2063 ----
    }
    catch {
! 		#ymset {x1 y1 w h} [$c.${self}text bbox $@longline.$n]
! 		set text [$c.${self}text get $@longline.0 $@longline.end]
! 		mset {x1 y1 w h} [$c.${self}text bbox 0.0]
    	set textlen [string length [$c.${self}text get $@longline.0 $@longline.end]]
    	set textwidth [expr ($textlen * $w / [$@canvas zoom]) + $padx*2 + 2]
***************
*** 3866,3872 ****
def Box init {{mess {}}} {
!     super
!     set @wires {}
!     $self reinit $mess
  }
--- 3865,3872 ----
def Box init {{mess {}}} {
! 	super
! 	# @wires2 stores the connections to and from a object
! 	set @wires2 {}
! 	$self reinit $mess
  }
***************
*** 3928,3934 ****
  def Box ioselect {} {return $@ioselect}
! def Box wires {} {return $@wires}
! def Box changed_wires {} {foreach wire $@wires {$wire changed}}
def Box delete_wire {wire} {
--- 3928,3934 ----
  def Box ioselect {} {return $@ioselect}
! def Box wires2 {} {return $@wires2}
! def Box changed_wires {} {foreach wire $@wires2 {$wire changed}}
def Box delete_wire {wire} {
***************
*** 3946,3950 ****
    #update/move the content of gop 
    if {[$self class] == "Canvas"} {
! 		if {[$self gop] && ![winfo exists .$self.c]} {$self all_changed}
    } else {
    	$self changed_wires
--- 3946,3952 ----
    #update/move the content of gop 
    if {[$self class] == "Canvas"} {
! 		if {[$self gop] && ![winfo exists .$self.c]} {
! 			$self all_changed
! 		}
    } else {
    	$self changed_wires
***************
*** 4063,4068 ****
    set @canvas $canvas
    # associate wires to its connected objects
! 	lappend _($@obj1:wires) $self
! 	lappend _($@obj2:wires) $self
    #$self subscribe $canvas
  }
--- 4065,4070 ----
    set @canvas $canvas
    # associate wires to its connected objects
! 	lappend _($@obj1:wires2) $self
! 	lappend _($@obj2:wires2) $self
    #$self subscribe $canvas
  }
***************
*** 5650,5653 ****
--- 5652,5656 ----
    Listener new .tcl "Tcl Client" tcl_eval
    Listener new .pd  " Pd Server"  pd_eval
+ 
  }