diff options
Diffstat (limited to 'ext/tk')
| -rw-r--r-- | ext/tk/lib/tk.rb | 5 | ||||
| -rw-r--r-- | ext/tk/lib/tk/menu.rb | 2 |
2 files changed, 5 insertions, 2 deletions
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 |