* 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, 11 insertions, 4 deletions

diff --git a/ext/tk/lib/tk/font.rb b/ext/tk/lib/tk/font.rb
index da6482c122..03db850f96 100644
--- a/ext/tk/lib/tk/font.rb
+++ b/ext/tk/lib/tk/font.rb
@@ -11,7 +11,7 @@ class TkFont
 
   TkCommandNames = ['font'.freeze].freeze
 
-  (Tk_FontID = ["@font".freeze, "00000".taint]).instance_eval{
+  (Tk_FontID = ["@font".freeze, TkUtil.untrust("00000")]).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze
@@ -211,7 +211,7 @@ class TkFont
     end
   end
   def TkFont.actual_hash(fnt, option=nil)
-    Hash[TkFont.actual_hash(fnt, option)]
+    Hash[TkFont.actual(fnt, option)]
   end
 
   def TkFont.actual_displayof(fnt, win, option=nil)
@@ -224,7 +224,7 @@ class TkFont
     end
   end
   def TkFont.actual_hash_displayof(fnt, option=nil)
-    Hash[TkFont.actual_hash_displayof(fnt, option)]
+    Hash[TkFont.actual_displayof(fnt, option)]
   end
 
   def TkFont.configure(fnt, slot, value=None)
@@ -2199,7 +2199,7 @@ module TkFont::CoreMethods
     alias measure_core            measure_core_tk4x
     alias metrics_core            metrics_core_tk4x
 
-  when /^8\.[0-5]/
+  when /^8\.[0-9]/
     alias actual_core             actual_core_tk8x
     alias configure_core          configure_core_tk8x
     alias configinfo_core         configinfo_core_tk8x
@@ -2342,3 +2342,10 @@ if Tk::TCL_MAJOR_VERSION > 8 ||
     'systemDetailSystemFont', 'systemDetailEmphasizedSystemFont'
   ]
 end
+
+#######################################
+# autoload
+#######################################
+class TkFont
+  autoload :Chooser, 'tk/fontchooser'
+end