Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10485
Modified Files: Tag: devel_0_39 desire.tk Log Message: moved init_window call to Canvas reinit, so that the window don't get created to early
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.485 retrieving revision 1.1.2.486 diff -C2 -d -r1.1.2.485 -r1.1.2.486 *** desire.tk 27 Sep 2006 11:43:43 -0000 1.1.2.485 --- desire.tk 27 Sep 2006 15:21:40 -0000 1.1.2.486 *************** *** 1267,1271 **** set @wires {} set @wires_pair {} ;# stores wires in the format of {0 1 1 0} id {1 1 2 0} id ! if {$@mapped} {$self init_window} ;#!@#$ @mapped can't possibly be 1 at this point set @history $history $self subscribe $manager --- 1267,1273 ---- set @wires {} set @wires_pair {} ;# stores wires in the format of {0 1 1 0} id {1 1 2 0} id ! # if {$@mapped} {$self init_window} ;#!@#$ @mapped can't possibly be 1 at this point ! # puts " mapped::: $@mapped" ! # puts " gop::: $@gop" set @history $history $self subscribe $manager *************** *** 1282,1286 **** set @keynav_tab_sel "wire" set @copy_count 0 ! $self editmode= 0 }
--- 1284,1288 ---- set @keynav_tab_sel "wire" set @copy_count 0 ! #$self editmode= 0 }
*************** *** 1327,1330 **** --- 1329,1333 ---- set @pixwidth [lindex $mess 6] set @pixheight [lindex $mess 7] + puts " pixwidth:: $@pixwidth <------------" switch [llength $mess] { 8 {set @gop 0; set @goprect 0} *************** *** 1338,1341 **** --- 1341,1346 ---- default {error "what???"} } + + if {$@mapped && !$@gop} {if {![winfo exists .$self.c]} {$self init_window}} } } *************** *** 1642,1646 **** 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}} if {!$@mapped} {return} if {$@editmode} {set bg [$self look bgedit]} else {set bg [$self look bgrun]} --- 1647,1651 ---- 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]} *************** *** 1939,1943 ****
def Canvas update_title {} { ! wm title .$self [$self make_title] }
--- 1944,1948 ----
def Canvas update_title {} { ! if {[winfo exists .$self]} {wm title .$self [$self make_title]} }