diff --git a/ChangeLog b/ChangeLog
index d19f99270f..63416dc5d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Fri Jan 26 12:03:39 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb (TkConfigMethod#__confinfo_cmd,
+	  __conv_keyonly_optkeys): make them private [ruby-dev:30074].
+
+	* ext/tk/lib/tk/txtwin_abst.rb: fix typo [ruby-dev:30073].
+
+	* ext/tk/lib/tk/canvas.rb (TkCanvas#scan_dragto): lack of an argument.
+
+	* ext/tk/lib/tk/canvas.rb: clarify the including module name
+	  [ruby-dev:30080].
+
+	* ext/tk/lib/tk/scrollable.rb: change primary name of modules
+	  [ruby-dev:30080].
+
 Fri Jan 26 07:48:57 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* enumerator.c (enumerator_init_copy): need to copy internal
diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib
index 40977b4776..33bec9fb6e 100644
--- a/ext/tk/ChangeLog.tkextlib
+++ b/ext/tk/ChangeLog.tkextlib
@@ -1,3 +1,14 @@
+2007-01-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/tk/lib/tkextlib/iwidgets/checkbox.rb: wrong number of arguments 
+	  [ruby-Bugs-7776].
+
+	* ext/tk/lib/tkextlib/iwidgets/radiobox.rb: ditto.
+
+	* ext/tk/lib/tkextlib/blt/tile/checkbutton.rb: change primary name 
+	  of class [ruby-dev:30080].
+
+	* ext/tk/lib/tkextlib/blt/tile/radiobutton.rb: ditto.
+
 2006-11-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* lib/tkextlib/tile/treeview.rb : minor bug fix.
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 071d60237c..0a83cb301a 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -2829,7 +2829,7 @@ module TkConfigMethod
   def __confinfo_cmd
     __config_cmd
   end
-  private :__config_cmd
+  private :__configinfo_cmd
 
   def __configinfo_struct
     {:key=>0, :alias=>1, :db_name=>1, :db_class=>2, 
@@ -2926,6 +2926,7 @@ module TkConfigMethod
     }
     keys2
   end
+  private :__conv_keyonly_optkeys
 
   def config_hash_kv(keys, enc_mode = nil, conf = nil)
     hash_kv(__conv_keyonly_opts(keys), enc_mode, conf)
@@ -4597,7 +4598,7 @@ end
 #Tk.freeze
 
 module Tk
-  RELEASE_DATE = '2006-11-07'.freeze
+  RELEASE_DATE = '2007-01-26'.freeze
 
   autoload :AUTO_PATH,        'tk/variable'
   autoload :TCL_PACKAGE_PATH, 'tk/variable'
diff --git a/ext/tk/lib/tk/canvas.rb b/ext/tk/lib/tk/canvas.rb
index 02b4a8cb20..c30fd79bb9 100644
--- a/ext/tk/lib/tk/canvas.rb
+++ b/ext/tk/lib/tk/canvas.rb
@@ -42,7 +42,7 @@ end
 
 class TkCanvas<TkWindow
   include TkCanvasItemConfig
-  include Scrollable
+  include Tk::Scrollable
 
   TkCommandNames = ['canvas'.freeze].freeze
   WidgetClassName = 'Canvas'.freeze
@@ -543,8 +543,8 @@ class TkCanvas<TkWindow
     tk_send_without_enc('scan', 'mark', x, y)
     self
   end
-  def scan_dragto(x, y)
-    tk_send_without_enc('scan', 'dragto', x, y)
+  def scan_dragto(x, y, gain=None)
+    tk_send_without_enc('scan', 'dragto', x, y, gain)
     self
   end
 
diff --git a/ext/tk/lib/tk/scrollable.rb b/ext/tk/lib/tk/scrollable.rb
index ec27b76467..96959b7a4b 100644
--- a/ext/tk/lib/tk/scrollable.rb
+++ b/ext/tk/lib/tk/scrollable.rb
@@ -4,7 +4,7 @@
 require 'tk'
 
 module Tk
-  module X_Scrollable
+  module XScrollable
     def xscrollcommand(cmd=Proc.new)
       configure_cmd 'xscrollcommand', cmd
       # Tk.update  # avoid scrollbar trouble
@@ -38,7 +38,7 @@ module Tk
     end
   end
 
-  module Y_Scrollable
+  module YScrollable
     def yscrollcommand(cmd=Proc.new)
       configure_cmd 'yscrollcommand', cmd
       # Tk.update  # avoid scrollbar trouble
@@ -72,8 +72,11 @@ module Tk
     end
   end
 
+  X_Scrollable = XScrollable
+  Y_Scrollable = YScrollable
+
   module Scrollable
-    include X_Scrollable
-    include Y_Scrollable
+    include XScrollable
+    include YScrollable
   end
 end
diff --git a/ext/tk/lib/tk/txtwin_abst.rb b/ext/tk/lib/tk/txtwin_abst.rb
index 5520360eab..540f806d17 100644
--- a/ext/tk/lib/tk/txtwin_abst.rb
+++ b/ext/tk/lib/tk/txtwin_abst.rb
@@ -4,7 +4,7 @@
 require 'tk'
 
 class TkTextWin<TkWindow
-  TkCommnadNames = [].freeze
+  TkCommandNames = [].freeze
   #def create_self
   #  fail RuntimeError, "TkTextWin is an abstract class"
   #end
diff --git a/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb b/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
index ebe79179a5..ad58999d86 100644
--- a/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
+++ b/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
@@ -9,9 +9,9 @@ require 'tkextlib/blt/tile.rb'
 
 module Tk::BLT
   module Tile
-    class Checkbutton < TkCheckbutton
+    class CheckButton < TkCheckButton
       TkCommandNames = ['::blt::tile::checkbutton'.freeze].freeze
     end
-    CheckButton = Checkbutton
+    Checkbutton = CheckButton
   end
 end
diff --git a/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb b/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
index 7573aa08d6..2316923b19 100644
--- a/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
+++ b/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
@@ -9,9 +9,9 @@ require 'tkextlib/blt/tile.rb'
 
 module Tk::BLT
   module Tile
-    class Radiobutton < TkRadiobutton
+    class RadioButton < TkRadioButton
       TkCommandNames = ['::blt::tile::radiobutton'.freeze].freeze
     end
-    RadioButton = Radiobutton
+    Radiobutton = RadioButton
   end
 end
diff --git a/ext/tk/lib/tkextlib/iwidgets/checkbox.rb b/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
index abd23299a8..46ca389db2 100644
--- a/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
@@ -87,7 +87,7 @@ class Tk::Iwidgets::Checkbox
 
   def get(idx)
     simplelist(tk_call(@path, 'get', index(idx))).collect{|id|
-      Tk::Itk::Component.id2obj(id)
+      Tk::Itk::Component.id2obj(self, id)
     }
   end
 
diff --git a/ext/tk/lib/tkextlib/iwidgets/radiobox.rb b/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
index d4316754f2..1a2821bd6a 100644
--- a/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
@@ -87,7 +87,7 @@ class Tk::Iwidgets::Radiobox
 
   def get(idx)
     simplelist(tk_call(@path, 'get', index(idx))).collect{|id|
-      Tk::Itk::Component.id2obj(id)
+      Tk::Itk::Component.id2obj(self, id)
     }
   end
 
diff --git a/ext/tk/lib/tkextlib/version.rb b/ext/tk/lib/tkextlib/version.rb
index 3f2f83027e..3d6995043a 100644
--- a/ext/tk/lib/tkextlib/version.rb
+++ b/ext/tk/lib/tkextlib/version.rb
@@ -2,5 +2,5 @@
 # release date of tkextlib
 #
 module Tk
-  Tkextlib_RELEASE_DATE = '2006-11-07'.freeze
+  Tkextlib_RELEASE_DATE = '2007-01-26'.freeze
 end