pd/src desire.tk,1.1.2.523,1.1.2.524 - Pd-cvs

23 Oct 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26756
Modified Files:
      Tag: devel_0_39
    desire.tk 
Log Message:
somemore small fixes
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.523
retrieving revision 1.1.2.524
diff -C2 -d -r1.1.2.523 -r1.1.2.524
*** desire.tk	23 Oct 2006 16:06:34 -0000	1.1.2.523
--- desire.tk	23 Oct 2006 19:24:37 -0000	1.1.2.524
***************
*** 1775,1779 ****
  def Canvas draw {} {
    if {$@subpatch && $@canvas != "" && !$@gop} {super} ;# is for the [pd] box if applicable
! 	if {[info exists @gop]} {if {$@gop} {super; $self draw_gop; return}}
    if {!$@mapped} {return}
    if {$@editmode} {set bg [$self look bgedit]} else {set bg [$self look bgrun]}
--- 1775,1781 ----
  def Canvas draw {} {
    if {$@subpatch && $@canvas != "" && !$@gop} {super} ;# is for the [pd] box if applicable
! 	if {[info exists @gop]} {
! 		if {$@gop && ![winfo exists [$self widget]]} {super; $self draw_gop; return}
! 	}
    if {!$@mapped} {return}
    if {$@editmode} {set bg [$self look bgedit]} else {set bg [$self look bgrun]}
***************
*** 2339,2343 ****
    if {[llength $@selection] == 1} {set obj $@selection} else {return}
    if {[[$obj class] <= Box]} {
! 		[$self widget] raise $obj
    	mset {type id detail} [$self identify_target $x $y 0]
    	if {$type == "wire"} {
--- 2341,2349 ----
    if {[llength $@selection] == 1} {set obj $@selection} else {return}
    if {[[$obj class] <= Box]} {
! 		if {[$obj class] == "Canvas"} {
! 			if {[$obj gop]} {[$self widget] raise [list $obj [$obj visible_children]]}
! 		} else {
! 			[$self widget] raise $obj
! 		}
    	mset {type id detail} [$self identify_target $x $y 0]
    	if {$type == "wire"} {
***************
*** 2437,2443 ****
    				foreach tag $stack {
    					set tags2 [$c gettags $tag]
! 						if {[regexp {^[xo][0-9a-f]{6,8}} $tags2 id]} {
! 							set class [$id class]
! 							if {[$class <= Wire]} {return [list "wire" $id]}
    					}
    				}
--- 2443,2449 ----
    				foreach tag $stack {
    					set tags2 [$c gettags $tag]
! 						if {[regexp {^[xo][0-9a-f]{6,8}} $tags2 id2]} {
! 							set class [$id2 class]
! 							if {[$class == Wire]} {return [list "wire" $id2]}
    					}
    				}