mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/tk/lib/multi-tk.rb: fix typo.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d2a81a3aa3
commit
dc5a620aa0
3 changed files with 7 additions and 3 deletions
|
@ -1,3 +1,7 @@
|
|||
Fri Jun 3 14:06:12 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
|
||||
|
||||
* ext/tk/lib/multi-tk.rb: fix typo.
|
||||
|
||||
Thu Jun 2 23:42:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* parse.y: pragma support on ripper. [ruby-dev:26266]
|
||||
|
|
|
@ -734,7 +734,7 @@ class MultiTkIp
|
|||
else
|
||||
begin
|
||||
pathname = @interp._invoke('winfo', 'pathname', new_keys['use'])
|
||||
assco_display = @interp._invoke('winfo', 'screen', pathname)
|
||||
assoc_display = @interp._invoke('winfo', 'screen', pathname)
|
||||
rescue
|
||||
assoc_display = new_keys['display']
|
||||
end
|
||||
|
@ -742,7 +742,7 @@ class MultiTkIp
|
|||
|
||||
# match display?
|
||||
if assoc_display != new_keys['display']
|
||||
if optkeys.keys?(:display) || optkeys.keys?('display')
|
||||
if optkeys.key?(:display) || optkeys.key?('display')
|
||||
fail RuntimeError,
|
||||
"conflicting 'display'=>#{new_keys['display']} " +
|
||||
"and display '#{assoc_display}' on 'use'=>#{new_keys['use']}"
|
||||
|
|
|
@ -4130,7 +4130,7 @@ end
|
|||
#Tk.freeze
|
||||
|
||||
module Tk
|
||||
RELEASE_DATE = '2005-05-30'.freeze
|
||||
RELEASE_DATE = '2005-06-03'.freeze
|
||||
|
||||
autoload :AUTO_PATH, 'tk/variable'
|
||||
autoload :TCL_PACKAGE_PATH, 'tk/variable'
|
||||
|
|
Loading…
Reference in a new issue