Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27813
Modified Files: Tag: desiredata desire.tk Log Message: buttonbar, statusbar and menubar can no be switched on/off on demand
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.284 retrieving revision 1.1.2.600.2.285 diff -C2 -d -r1.1.2.600.2.284 -r1.1.2.600.2.285 *** desire.tk 4 Aug 2007 22:24:37 -0000 1.1.2.600.2.284 --- desire.tk 5 Aug 2007 00:58:02 -0000 1.1.2.600.2.285 *************** *** 1745,1749 **** # should be called once and only from init def Canvas init_window {} { ! lappend ::window_list $self ;# wrong - should go in init_window set win .$self set c [$self widget] --- 1745,1749 ---- # should be called once and only from init def Canvas init_window {} { ! lappend ::window_list $self set win .$self set c [$self widget] *************** *** 1751,1764 **** toplevel $win -menu $win.m } else { ! if {[$self look menubar]} {toplevel $win -menu $win.m} else {toplevel $win} } catch {wm iconphoto $win icon_pd} ! set butts [[ButtonBar new $self] widget] # turn buttonbar on/off ! if {[$self look buttonbar]} { ! if {[catch {pack $butts -side top -fill x -expand no}]} { ! post "Can't show ButtonBar: %s" $::errorInfo ! } ! } set @statusbar [StatusBar new $self] # turn statusbar on/off --- 1751,1763 ---- toplevel $win -menu $win.m } else { ! if {[$self look menubar]} {toplevel $win -menu $win.m} else {toplevel $win -menu ""} ! } catch {wm iconphoto $win icon_pd} ! set @menubar $win.m ! $self new_menubar # turn buttonbar on/off ! set @buttonbar [ButtonBar new $self] ! if {[$self look buttonbar]} {pack [$@buttonbar widget] -side top -fill x -expand no} set @statusbar [StatusBar new $self] # turn statusbar on/off *************** *** 1770,1778 **** wm protocol $win WM_DELETE_WINDOW "$self close" focus $c - if {$::tcl_platform(platform) == "macintosh"} { - $self new_menubar - } else { - if {[$self look menubar]} {$self new_menubar} else {set @editmode 0} - } $self new_binds $self update_title --- 1769,1772 ---- *************** *** 1782,1786 **** set @sense [Sense new $self] set @grid [Grid new $self] ! #if {[info exists @grid]} {$@grid draw} }
--- 1776,1794 ---- set @sense [Sense new $self] set @grid [Grid new $self] ! } ! ! def Canvas activate_menubar= {val} {if {$val} {.$self configure -menu $@menubar} {.$self configure -menu ""}} ! ! def Canvas activate_buttonbar= {val} { ! if {$val} { ! pack [$@buttonbar widget] -side top -fill x -expand no -before [$self widget] ! } else {pack forget [$@buttonbar widget]} ! } ! ! def Canvas activate_statusbar= {val} { ! if {$val} { ! if {[winfo exists .$self.yscroll]} {set w .$self.yscroll} else {set w .$self.c} ! pack [$@statusbar widget] -side bottom -fill x -before $w ! } else {pack forget [$@statusbar widget]} }
*************** *** 6399,6403 **** }
! class_new ButtonBar {Thing}
def ButtonBar init {canvas} { --- 6407,6411 ---- }
! class_new ButtonBar {View}
def ButtonBar init {canvas} { *************** *** 7443,7447 **** set @nbs $@nb pack .$@nb -expand 1 -fill both ! $self none_resizeable } def Notebook delete {} {super} --- 7451,7455 ---- set @nbs $@nb pack .$@nb -expand 1 -fill both ! $self none_resizable } def Notebook delete {} {super} *************** *** 7836,7842 ****
class_new ClientPrefsDialog {PagedDialog} ! def ClientPrefsDialog apply {} {$self write} def ClientPrefsDialog read {} {read_ddrc}
def ClientPrefsDialog write {} { global look key --- 7844,7854 ----
class_new ClientPrefsDialog {PagedDialog} ! def ClientPrefsDialog apply {} {$self do_apply;$self write} def ClientPrefsDialog read {} {read_ddrc}
+ def ClientPrefsDialog do_apply {} { + + } + def ClientPrefsDialog write {} { global look key