This commit was manufactured by cvs2svn to create tag

'v1_3_1_990127'.

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

2 files changed, 7 insertions, 2 deletions

diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index e32723be96..bd896639fc 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -2412,6 +2412,9 @@ class TkMenubutton<TkLabel
 end
 
 module TkComposite
+  include Tk
+  extend Tk
+
   def initialize(parent=nil, *args)
     @frame = TkFrame.new(parent)
     @path = @epath = @frame.path
diff --git a/ext/tk/lib/tkscrollbox.rb b/ext/tk/lib/tkscrollbox.rb
index 8d129b2f4b..6236430491 100644
--- a/ext/tk/lib/tkscrollbox.rb
+++ b/ext/tk/lib/tkscrollbox.rb
@@ -2,13 +2,13 @@
 #		tkscrollbox.rb - Tk Listbox with Scrollbar
 #                                 as an example of Composite Widget
 #			$Date$
-#			by Yukihiro Matsumoto <matz@caelum.co.jp>
+#			by Yukihiro Matsumoto <matz@netlab.co.jp>
 
 require 'tk.rb'
 
 class TkScrollbox<TkListbox
   include TkComposite
-  def initialize_composite
+  def initialize_composite(keys=nil)
     list = TkListbox.new(@frame)
     scroll = TkScrollbar.new(@frame)
     @path = list.path
@@ -23,5 +23,7 @@ class TkScrollbox<TkListbox
     delegate('background', list, scroll)
     delegate('borderwidth', @frame)
     delegate('relief', @frame)
+
+    configure keys if keys
   end
 end