4 files changed, 20 insertions, 4 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index f831dbc78a..c933f9db8b 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -2131,6 +2131,8 @@ class TkTextWin<TkWindow
 end
 
 class TkListbox<TkTextWin
+  include Scrollable
+
   WidgetClassNames['Listbox'] = self
   def TkListbox.to_eval
     'Listbox'
diff --git a/ext/tk/lib/tkcanvas.rb b/ext/tk/lib/tkcanvas.rb
index 40bfa54846..c67bc456ed 100644
--- a/ext/tk/lib/tkcanvas.rb
+++ b/ext/tk/lib/tkcanvas.rb
@@ -129,6 +129,7 @@ end
 
 class TkCanvas<TkWindow
   include TkTreatCItemFont
+  include Scrollable
 
   WidgetClassName = 'Canvas'.freeze
   WidgetClassNames[WidgetClassName] = self
diff --git a/ext/tk/lib/tkentry.rb b/ext/tk/lib/tkentry.rb
index 5822c00e53..90d5fe3b43 100644
--- a/ext/tk/lib/tkentry.rb
+++ b/ext/tk/lib/tkentry.rb
@@ -15,8 +15,8 @@ class TkEntry<TkLabel
   def create_self
     tk_call 'entry', @path
   end
-  def scrollcommand(cmd)
-    configure 'scrollcommand', cmd
+  def xscrollcommand(cmd=Proc.new)
+    configure_cmd 'xscrollcommand', cmd
   end
 
   def delete(s, e=None)
@@ -45,7 +45,7 @@ class TkEntry<TkLabel
     tk_send 'selection', 'adjust', index
   end
   def selection_clear
-    tk_send 'selection', 'clear', 'end'
+    tk_send 'selection', 'clear'
   end
   def selection_from(index)
     tk_send 'selection', 'from', index
diff --git a/ext/tk/lib/tkfont.rb b/ext/tk/lib/tkfont.rb
index c680d166e7..2683260d69 100644
--- a/ext/tk/lib/tkfont.rb
+++ b/ext/tk/lib/tkfont.rb
@@ -667,7 +667,20 @@ class TkFont
     alias measure_core        measure_core_tk8x
     alias metrics_core        metrics_core_tk8x
 
-  when /^8\.1/
+  when /^8\.[12]/
+    alias create_latinfont    create_latinfont_tk8x
+    alias create_kanjifont    create_kanjifont_tk81
+    alias create_compoundfont create_compoundfont_tk81
+    alias actual_core         actual_core_tk8x
+    alias configure_core      configure_core_tk8x
+    alias configinfo_core     configinfo_core_tk8x
+    alias delete_core         delete_core_tk8x
+    alias latin_replace_core  latin_replace_core_tk8x
+    alias kanji_replace_core  kanji_replace_core_tk81
+    alias measure_core        measure_core_tk8x
+    alias metrics_core        metrics_core_tk8x
+
+  when /^8\.*/
     alias create_latinfont    create_latinfont_tk8x
     alias create_kanjifont    create_kanjifont_tk81
     alias create_compoundfont create_compoundfont_tk81