From c59f1e6c900233cc3a970c9dc0bd630f33cd0463 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 19 Aug 2004 07:43:54 +0000
Subject: * ext/tk/lib/tk.rb: Fail to treat a hash value of 'font' option. *
 ext/tk/lib/tk.rb: bindinfo cannot return '%' substiturion infomation. *
 ext/tk/lib/menu.rb: typo bug.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk.rb      | 5 ++++-
 ext/tk/lib/tk/menu.rb | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'ext/tk')

diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index e91ba92df1..800031a682 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -840,7 +840,7 @@ module TkComm
   def _bindinfo(what, context=nil)
     if context
       tk_call_without_enc(*what+["<#{tk_event_sequence(context)}>"]) .collect {|cmdline|
-	if cmdline =~ /^rb_out\S* (c(_\d+_)?\d+)\s+(.*)$/
+	if cmdline =~ /^rb_out\S* (c(?:_\d+_)?\d+)\s+(.*)$/
 	  #[Tk_CMDTBL[$1], $2]
 	  [TkCore::INTERP.tk_cmd_tbl[$1], $2]
 	else
@@ -2124,6 +2124,7 @@ module TkTreatFont
 				      *(__config_cmd << {}))
 	      next
 	    else
+	      fnt = hash_kv(fnt) if fnt.kind_of?(Hash)
 	      tk_call(*(__config_cmd << "-#{optkey}" << fnt))
 	    end
 	  end
@@ -2177,6 +2178,7 @@ module TkTreatFont
       elsif Tk::JAPANIZED_TK
 	fobj = fontobj          # create a new TkFont object
       else
+	ltn = hash_kv(ltn) if ltn.kind_of?(Hash)
 	tk_call(*(__config_cmd << "-#{optkey}" << ltn))
 	next
       end
@@ -2228,6 +2230,7 @@ module TkTreatFont
       elsif Tk::JAPANIZED_TK
 	fobj = fontobj          # create a new TkFont object
       else
+	knj = hash_kv(knj) if knj.kind_of?(Hash)
 	tk_call(*(__config_cmd << "-#{optkey}" << knj))
 	next
       end
diff --git a/ext/tk/lib/tk/menu.rb b/ext/tk/lib/tk/menu.rb
index 4b94ccd915..2b4c8bcd9b 100644
--- a/ext/tk/lib/tk/menu.rb
+++ b/ext/tk/lib/tk/menu.rb
@@ -340,7 +340,7 @@ module TkSystemMenu
     #  fail ArgumentError, "parent must be a TkMenu object"
     #end
     # @path = Kernel.format("%s.%s", parent.path, self.class::SYSMENU_NAME)
-    @path = parent_path + '.' + self.class::SYSMENU_NAME
+    @path = parent.path + '.' + self.class::SYSMENU_NAME
     #TkComm::Tk_WINDOWS[@path] = self
     TkCore::INTERP.tk_windows[@path] = self
     if self.method(:create_self).arity == 0
-- 
cgit v1.2.3