Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18150
Modified Files: Tag: devel_0_39 desire.tk Log Message: some fixes on array
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.526 retrieving revision 1.1.2.527 diff -C2 -d -r1.1.2.526 -r1.1.2.527 *** desire.tk 24 Oct 2006 21:36:13 -0000 1.1.2.526 --- desire.tk 25 Oct 2006 11:50:02 -0000 1.1.2.527 *************** *** 1161,1164 **** --- 1161,1165 ---- $self draw } else { + if {[$self class] == "Array"} {$self draw; return} puts "skipping $self, don't draw it...." $self delete *************** *** 1796,1807 **** def Canvas draw {} { if {$@subpatch && $@canvas != "" && !$@gop} {if {![winfo exists [$self widget]]} {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]} [$self widget] configure -background $bg $self adjust_scrollbars ! if {$@gop} {$self gop_rect}
} --- 1797,1810 ---- def Canvas draw {} { if {$@subpatch && $@canvas != "" && !$@gop} {if {![winfo exists [$self widget]]} {super}} ;# is for the [pd] box if applicable ! if {$@gop && ![winfo exists [$self widget]]} {super; return} if {!$@mapped} {return} if {$@editmode} {set bg [$self look bgedit]} else {set bg [$self look bgrun]} [$self widget] configure -background $bg $self adjust_scrollbars ! if {$@gop} { ! if {[llength $@children] != 1 && \ ! [[lindex $@children 0] class] != "Array"} {$self gop_rect} ! # $self gop_rect ! }
} *************** *** 4967,4971 **** mset {x_off y_off} [$@canvas xy] mset {xfrom yto xto yfrom pixwidth pixheight} [$@canvas get_mess] ! if {[$@canvas mapped]} { mset {c_width c_height} [$@canvas get_dimen] set width [expr $c_width / $@length] --- 4970,4975 ---- mset {x_off y_off} [$@canvas xy] mset {xfrom yto xto yfrom pixwidth pixheight} [$@canvas get_mess] ! puts " my canvas :::: $@canvas" ! if {[winfo exists [$@canvas widget]]} { mset {c_width c_height} [$@canvas get_dimen] set width [expr $c_width / $@length] *************** *** 5006,5010 ****
def Array click {x y f target} { ! if {[$@canvas mapped]} { $@canvas focus= $self } else { --- 5010,5014 ----
def Array click {x y f target} { ! if {[winfo exists [$@canvas widget]]} { $@canvas focus= $self } else { *************** *** 5015,5019 **** } def Array unclick {x y f target} { ! if {[$@canvas mapped]} { $@canvas focus= "" } else { --- 5019,5023 ---- } def Array unclick {x y f target} { ! if {[winfo exists [$@canvas widget]]} { $@canvas focus= "" } else { *************** *** 5026,5030 **** def Array motion {x y f target} { if {!$@draw} return ! if {[$@canvas mapped]} { mset {c_width c_height} [$@canvas get_dimen] mset {xfrom yto xto yfrom pixwidth pixheight} [$@canvas get_mess] --- 5030,5034 ---- def Array motion {x y f target} { if {!$@draw} return ! if {[winfo exists [$@canvas widget]]} { mset {c_width c_height} [$@canvas get_dimen] mset {xfrom yto xto yfrom pixwidth pixheight} [$@canvas get_mess]