* ext/tk/extconf.rb: New strategy for searching Tcl/Tk libraries.

* ext/tk/*: Support new features of Tcl/Tk8.6b1 and minor bug fixes.
     ( [KNOWN BUG] Ruby/Tk on Ruby 1.9 will not work on Cygwin. )
* ext/tk/*: Unify sources between Ruby 1.8 & 1.9.
            Improve default_widget_set handling.
* ext/tk/*: Multi-TkInterpreter (multi-tk.rb) works on Ruby 1.8 & 1.9.
     ( [KNOWN BUG] On Ruby 1.8, join to a long term Thread on Tk
       callbacks may freeze. On Ruby 1.9, cannot create a second 
       master interpreter (creating slaves are OK); supported master
       interpreter is the default master interpreter only. )
* ext/tk/lib/tkextlib/*: Update supported versions of Tk extensions.
         Tcllib 1.8/Tklib 0.4.1  ==>  Tcllib 1.11.1/Tklib 0.5
         BWidgets 1.7            ==>  BWidgets 1.8
         TkTable 2.9             ==>  TkTable 2.10
         TkTreeCtrl 2005-12-02   ==>  TkTreeCtrl 2.2.9
         Tile 0.8.0/8.5.1        ==>  Tile 0.8.3/8.6b1
         IncrTcl 2005-02-14      ==>  IncrTcl 2008-12-15
         TclX 2005-02-07         ==>  TclX 2008-12-15
         Trofs 0.4.3             ==>  Trofs 0.4.4


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 15 insertions, 5 deletions

diff --git a/ext/tk/sample/scrollframe.rb b/ext/tk/sample/scrollframe.rb
index ab7a9ce24b..6a9381d465 100644
--- a/ext/tk/sample/scrollframe.rb
+++ b/ext/tk/sample/scrollframe.rb
@@ -1,11 +1,11 @@
 #
-#  Tk::ScrollFrame class
+#  Tk::RbWidget::ScrollFrame class
 #
 #    This widget class is a frame widget with scrollbars.
 #    The ScrollFrame doesn't propagate the size of embedded widgets.
 #    When it is configured, scrollregion of the container is changed.
 #
-#    Scrollbars can be toggled by Tk::ScrollFrame#vscroll & hscroll.
+#    Scrollbars can be toggled by Tk::RbWidget::ScrollFrame#vscroll & hscroll.
 #    If horizontal or virtical scrollbar is turned off, the horizontal
 #    or virtical size of embedded widgets is propagated.
 #
@@ -13,7 +13,7 @@
 #
 require 'tk'
 
-class Tk::ScrollFrame < TkFrame
+class Tk::RbWidget::ScrollFrame < TkFrame
   include TkComposite
 
   DEFAULT_WIDTH  = 200
@@ -209,7 +209,8 @@ end
 
 # test
 if __FILE__ == $0
-  f = Tk::ScrollFrame.new(:scrollbarwidth=>10, :width=>300, :height=>200)
+  f = Tk::RbWidget::ScrollFrame.new(:scrollbarwidth=>10, 
+                                    :width=>300, :height=>200)
   f.pack(:expand=>true, :fill=>:both)
 
   TkButton.new(f, :text=>'foo button', :command=>proc{puts 'foo'}).pack
@@ -220,17 +221,26 @@ if __FILE__ == $0
 
   # f.hscroll(false)
 
+  # add a text widget
   Tk.after(3000){
     t = TkText.new(f).pack(:expand=>true, :fill=>:both)
-    t.insert(:end, 'Here is a text widget')
+    t.insert(:end, "An example of Tk::RbWidget::ScrollFrame widget.\n\n")
+    t.insert(:end, "Here is a text widget.\n")
+    t.insert(:end, "Please resize the application window, ")
+    t.insert(:end, "and try the scrollbars ")
+    t.insert(:end, "to move the view of packed widgets.\n")
   }
 
+  # remove a vertical scrollbar, and then the scrollframe is not scrollable.
   Tk.after(6000){ f.vscroll(false) }
 
+  # add a vertical scrollbar, and make the scrollframe scrollable. 
   Tk.after(9000){ f.vscroll(true) }
 
+  # remove a horizontal scrollbar, and then the scrollframe is not scrollable.
   Tk.after(12000){ f.hscroll(false) }
 
+  # add a horizontal scrollbar, and make the scrollframe scrollable. 
   Tk.after(15000){ f.hscroll(true) }
 
   Tk.mainloop