Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32615

Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed a bug introduced by previous commit and fixed the help button

Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.470 retrieving revision 1.1.2.471 diff -C2 -d -r1.1.2.470 -r1.1.2.471 *** desire.tk 15 Sep 2006 21:34:50 -0000 1.1.2.470 --- desire.tk 16 Sep 2006 00:00:01 -0000 1.1.2.471 *************** *** 4876,4883 ****

def ClassBrowser info {listbox} { ! set i [$listbox curselection] ! if {$i == ""} {return} ! set class [string range [lindex [$listbox get $i] 0] 1 end-1] ! pd pd update-class-info $class $self info_callback }

--- 4876,4881 ----

def ClassBrowser info {listbox} { ! set class [$self current_class] ! if {$class != ""} {pd pd update-class-info $class $self info_callback} }

*************** *** 4898,4902 **** frame $f.5 ! button $f.5.help -text [say help] -command "pd pd help [$f.1 get [$f.1 curselection]]" pack $f.5.help -side top pack $f.5 -side left -fill y -expand no --- 4896,4900 ---- frame $f.5 ! button $f.5.help -text [say help] -command [list $self help] pack $f.5.help -side top pack $f.5 -side left -fill y -expand no *************** *** 4915,4926 **** $self fill_box "" #bind $f.1 <Button-1> "after 1 "$self info $f.1 "" - bind $f.1 <Button-1> "after 1 "$self key Up $b.2"" foreach w [list $f.1 $b.2] { bind $w <KeyPress> "after 1 "$self key %K 0"" bind $w <Shift-KeyPress> "after 1 "$self key %K 1"" } focus $@textbox }

def Completion list_callback {} { global class_list look --- 4913,4929 ---- $self fill_box "" #bind $f.1 <Button-1> "after 1 "$self info $f.1 "" foreach w [list $f.1 $b.2] { bind $w <KeyPress> "after 1 "$self key %K 0"" bind $w <Shift-KeyPress> "after 1 "$self key %K 1"" + bind $w <Return> [list $self help] } focus $@textbox }

+ def Browser help {} { + set f .$self.cl + pd pd help [$self current_class] + } + def Completion list_callback {} { global class_list look *************** *** 4986,4989 **** --- 4989,4998 ---- }

+ def ClassBrowser current_class {} { + set i [$@listbox curselection] + if {$i == ""} {return {}} + return [string range [lindex [$@listbox get $i] 0] 1 end-1] + } + def ClassBrowser complete {} { if {[regexp {x([0-9a-z]{6,8})text$} $@textbox obj]} { *************** *** 4991,4996 **** set obj [string range $obj 0 [expr $cut -1]] } ! set i [$@listbox curselection] ! set class [string range [lindex [$@listbox get $i] 0] 1 end-1] puts "completion:::: $class" $@textbox delete 1.0 1.end --- 5000,5004 ---- set obj [string range $obj 0 [expr $cut -1]] } ! set class [$self current_class] puts "completion:::: $class" $@textbox delete 1.0 1.end *************** *** 5071,5076 **** global class_info set f .browser.cl ! set i [$f.1 curselection] ! set class [string range [lindex [$f.1 get $i] 0] 1 end-1] $f.3 delete 0.0 end $f.3 insert end "class $class\n" --- 5079,5083 ---- global class_info set f .browser.cl ! set class [$self current_class] $f.3 delete 0.0 end $f.3 insert end "class $class\n"