Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1489
Modified Files: Tag: desiredata desire.tk Log Message: cleanup
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.242 retrieving revision 1.1.2.600.2.243 diff -C2 -d -r1.1.2.600.2.242 -r1.1.2.600.2.243 *** desire.tk 17 Jul 2007 01:09:45 -0000 1.1.2.600.2.242 --- desire.tk 17 Jul 2007 19:14:24 -0000 1.1.2.600.2.243 *************** *** 1033,1040 ****
def Client open_file_really {filename} { - global pd_opendir set i [string last / $filename] set folder [string range $filename 0 [expr $i-1]] ! set pd_opendir $folder set basename [string range $filename [expr $i+1] end] if {[string last .pd $filename] >= 0} { --- 1033,1039 ----
def Client open_file_really {filename} { set i [string last / $filename] set folder [string range $filename 0 [expr $i-1]] ! set ::pd_opendir $folder set basename [string range $filename [expr $i+1] end] if {[string last .pd $filename] >= 0} { *************** *** 1359,1368 **** } else { # for drawing opened gop ! if {[winfo exists .$@canvas.c]} { ! $self draw ! } else { ! if {[$self class] == "Array"} {$self draw; return} ! #$self delete ! } } } --- 1358,1362 ---- } else { # for drawing opened gop ! if {[winfo exists .$@canvas.c]} {$self draw} } } *************** *** 1389,1397 **** #set @mapped 0 netsend [list .$self vis 0] ! if {$@gop} { ! set @mapped 0; netsend [list .$self map 0] ! } else { ! set @mapped 0; netsend [list .$self map 0] ! } #netsend [list .$self close] return --- 1383,1387 ---- #set @mapped 0 netsend [list .$self vis 0] ! if {$@gop} {set @mapped 0; netsend [list .$self map 0]} #netsend [list .$self close] return *************** *** 1552,1557 ****
def Canvas init {mess} { ! global pd_opendir pd_tearoff cmdline manager window_list ! lappend window_list $self set @mapped 0 set @gop 0 --- 1542,1546 ----
def Canvas init {mess} { ! lappend ::window_list $self ;# wrong - should go in init_window set @mapped 0 set @gop 0 *************** *** 1577,1581 **** # if {$@mapped} {$self init_window} ;#!@#$ @mapped can't possibly be 1 at this point set @history $::command_history ! $self subscribe $manager $self changed #$self canvas= $self ;#!@#$ EEVIL --- 1566,1570 ---- # if {$@mapped} {$self init_window} ;#!@#$ @mapped can't possibly be 1 at this point set @history $::command_history ! $self subscribe $::manager $self changed #$self canvas= $self ;#!@#$ EEVIL *************** *** 1708,1713 **** def Canvas getscroll {} {}
def Canvas init_window {} { - global bar set win .$self set c [$self widget] --- 1697,1702 ---- def Canvas getscroll {} {}
+ # should be called once and only from init def Canvas init_window {} { set win .$self set c [$self widget] *************** *** 2149,2156 ****
def Menuable fix_window_menu {} { - global window_list set menu $@menubar.window $menu delete 0 end ! foreach w $window_list {$menu add command -label [wm title [$w window]] -command "$w raise"} # {"parentwindow" {menu_windowparent} ""} } --- 2138,2144 ----
def Menuable fix_window_menu {} { set menu $@menubar.window $menu delete 0 end ! foreach w $::window_list {$menu add command -label [wm title [$w window]] -command "$w raise"} # {"parentwindow" {menu_windowparent} ""} } *************** *** 2489,2493 **** set t "subpatch '$@name' of $t" } else { ! set t "$@name in $@folder" } if {[$self modified?]} {append t "(*)"} --- 2477,2482 ---- set t "subpatch '$@name' of $t" } else { ! #set t "$@name in $@folder" ! set t "$@name" } if {[$self modified?]} {append t "(*)"}