[PD-cvs] pd/src desire.tk,1.1.2.600.2.285,1.1.2.600.2.286

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
menubar, buttonbar, scrollbars, statusbars settings can be applied in run time


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.285
retrieving revision 1.1.2.600.2.286
diff -C2 -d -r1.1.2.600.2.285 -r1.1.2.600.2.286
*** desire.tk	5 Aug 2007 00:58:02 -0000	1.1.2.600.2.285
--- desire.tk	5 Aug 2007 05:31:35 -0000	1.1.2.600.2.286
***************
*** 1764,1767 ****
--- 1764,1768 ----
      if {[$self look statusbar]} {pack [$@statusbar widget] -side bottom -fill x}
      pack [canvas $c -width [lindex $@canvas_size 0] -height [lindex $@canvas_size 1] -background white] -side left -expand 1 -fill both
+     set @yscroll $win.yscroll; set @xscroll $win.xscroll
      $self init_scrollbars
      wm minsize $win 1 1
***************
*** 1788,1796 ****
  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]}
  }
  
  def Canvas init_scrollbars {} {
  	set win .$self
--- 1789,1799 ----
  def Canvas activate_statusbar= {val} {
  	if {$val} {
! 		if {[winfo exists $@yscroll]} {set w .$self.yscroll} else {set w .$self.c}
  		pack [$@statusbar widget] -side bottom -fill x -before $w
  	} else {pack forget [$@statusbar widget]}
  }
  
+ def Canvas activate_scrollbars= {val} {if {!$val} {$self init_scrollbars} {$self remove_scrollbars}}
+ 
  def Canvas init_scrollbars {} {
  	set win .$self
***************
*** 1814,1817 ****
--- 1817,1821 ----
  	set c [$self widget]
  	if {![winfo exists $win.yscroll]} {return}
+ 	#use destroy instead of pack forget so that it can be tested with winfo exists
  	destroy $win.yscroll
  	destroy $win.xscroll
***************
*** 7844,7852 ****
  
  class_new ClientPrefsDialog {PagedDialog}
! def ClientPrefsDialog apply {} {$self do_apply;$self write}
  def ClientPrefsDialog read {} {read_ddrc}
  
  def ClientPrefsDialog do_apply {} {
! 	
  }
  
--- 7848,7863 ----
  
  class_new ClientPrefsDialog {PagedDialog}
! def ClientPrefsDialog apply {} {$self write; $self do_apply}
  def ClientPrefsDialog read {} {read_ddrc}
  
  def ClientPrefsDialog do_apply {} {
! 	foreach canvas $::window_list {
! 		if {[$canvas class] == "Canvas"} {
! 			$canvas activate_menubar= [$canvas look menubar]
! 			$canvas activate_buttonbar= [$canvas look buttonbar]
! 			$canvas activate_statusbar= [$canvas look statusbar]
! 			$canvas activate_scrollbars= [$canvas look scrollbar]
! 		}
! 	}
  }