mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
d73fa69935
commit
c59f1e6c90
3 changed files with 13 additions and 2 deletions
|
@ -1,3 +1,11 @@
|
|||
Thu Aug 19 16:29:45 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
|
||||
|
||||
* 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.
|
||||
|
||||
Thu Aug 19 15:15:24 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* dir.c (free_dir): fix memory leak. reported by yamamoto
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue