3 files changed, 12 insertions, 5 deletions
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
index 4a4c2e7eb7..e2b4eec6bc 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
@@ -4,7 +4,11 @@
 #  set $KCODE to 'utf' for a utf8 charecter
 #
 #########################################################
-$KCODE='utf'
+unless defined?(::Encoding.default_external)
+  $KCODE='utf'
+else
+  DEFAULT_TK_ENCODING = 'UTF-8'
+end
 
 require 'tk'
 require 'tkextlib/iwidgets'
diff --git a/ext/tk/sample/tkextlib/tile/demo.rb b/ext/tk/sample/tkextlib/tile/demo.rb
index 1a9c029701..633a072460 100644
--- a/ext/tk/sample/tkextlib/tile/demo.rb
+++ b/ext/tk/sample/tkextlib/tile/demo.rb
@@ -24,7 +24,9 @@ end
 Tk::Tile.__define_LoadImages_proc_for_compatibility__!
 Tk::Tile::Style.__define_wrapper_proc_for_compatibility__!
 
-Tk::Tile::Style.theme_create('step')
+unless Tk::Tile::Style.theme_names.include?('step')
+  Tk::Tile::Style.theme_create('step')
+end
 
 Tk.load_tclscript(File.join(demodir, 'toolbutton.tcl'))
 Tk.load_tclscript(File.join(demodir, 'repeater.tcl'))
diff --git a/ext/tk/sample/tkextlib/treectrl/demo.rb b/ext/tk/sample/tkextlib/treectrl/demo.rb
index 50ecde91f0..eed95d0e1c 100644
--- a/ext/tk/sample/tkextlib/treectrl/demo.rb
+++ b/ext/tk/sample/tkextlib/treectrl/demo.rb
@@ -9,11 +9,12 @@ $HasColumnCreate = Tk::TreeCtrl::HasColumnCreateCommand
 
 $Version_1_1_OrLater = (TkPackage.vcompare(Tk::TreeCtrl.package_version, '1.1') >= 0)
 
-if Hash.instance_methods.include?('key')
-  # probably ruby 1.9.x --> use Hash#key
+#if Hash.instance_methods.include?(:key)
+if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
+  # ruby 1.9.x --> use Hash#key
   # Because Hash#index show warning "Hash#index is deprecated; use Hash#key".
 else
-  # probably ruby 1.8.x --> use Hash#index
+  # ruby 1.8.x --> use Hash#index
   class Hash
     alias key index
   end