diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-22 14:52:52 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-22 14:52:52 +0000 |
commit | 3569a8ecf8f52aaebb2cdecc1754411953e8aaeb (patch) | |
tree | b4357e11c482e251d8b1fe3ef96d0846b108677b /ext/tk | |
parent | 9fd68bfe0f2d7836a854ae8cc2aa3890402d8c26 (diff) |
merges r20299 and r20303 from trunk into ruby_1_9_1.
* ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb:
fix NameError bug.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
-rw-r--r-- | ext/tk/ChangeLog.tkextlib | 5 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/blt.rb | 4 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/blt/vector.rb | 12 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/version.rb | 2 |
4 files changed, 14 insertions, 9 deletions
diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib index 8c5d01a954..415463881a 100644 --- a/ext/tk/ChangeLog.tkextlib +++ b/ext/tk/ChangeLog.tkextlib @@ -1,3 +1,8 @@ +Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb: + fix NameError bug. + 2008-05-12 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name. diff --git a/ext/tk/lib/tkextlib/blt.rb b/ext/tk/lib/tkextlib/blt.rb index 115eb927ba..8d58c1f1bc 100644 --- a/ext/tk/lib/tkextlib/blt.rb +++ b/ext/tk/lib/tkextlib/blt.rb @@ -26,14 +26,14 @@ module Tk PATCH_LEVEL = tk_call('set', 'blt_patchLevel') begin - lib = INTERP._invoke('set', 'blt_library') + lib = TkCore::INTERP._invoke('set', 'blt_library') rescue lib = '' end LIBRARY = TkVarAccess.new('blt_library', lib) begin - lib = INTERP._invoke('set', 'blt_libPath') + lib = TkCore::INTERP._invoke('set', 'blt_libPath') rescue lib = '' end diff --git a/ext/tk/lib/tkextlib/blt/vector.rb b/ext/tk/lib/tkextlib/blt/vector.rb index 76c12a24e8..97fb1b96ff 100644 --- a/ext/tk/lib/tkextlib/blt/vector.rb +++ b/ext/tk/lib/tkextlib/blt/vector.rb @@ -49,11 +49,11 @@ module Tk::BLT size = size.join(':') end if size - @id = INTERP._invoke('::blt::vector', 'create', - "#auto(#{size})", *hash_kv(keys)) + @id = TkCore::INTERP._invoke('::blt::vector', 'create', + "#auto(#{size})", *hash_kv(keys)) else - @id = INTERP._invoke('::blt::vector', 'create', - "#auto", *hash_kv(keys)) + @id = TkCore::INTERP._invoke('::blt::vector', 'create', + "#auto", *hash_kv(keys)) end TkVar_ID_TBL.mutex.synchronize{ @@ -68,7 +68,7 @@ module Tk::BLT @trace_opts = nil # teach Tk-ip that @id is global var - INTERP._invoke_without_enc('global', @id) + TkCore::INTERP._invoke_without_enc('global', @id) end def destroy @@ -250,7 +250,7 @@ module Tk::BLT @trace_opts = nil # teach Tk-ip that @id is global var - INTERP._invoke_without_enc('global', @id) + TkCore::INTERP._invoke_without_enc('global', @id) end end end diff --git a/ext/tk/lib/tkextlib/version.rb b/ext/tk/lib/tkextlib/version.rb index 434ed11a2e..42c3ceb71c 100644 --- a/ext/tk/lib/tkextlib/version.rb +++ b/ext/tk/lib/tkextlib/version.rb @@ -2,5 +2,5 @@ # release date of tkextlib # module Tk - Tkextlib_RELEASE_DATE = '2008-05-23'.freeze + Tkextlib_RELEASE_DATE = '2008-11-22'.freeze end |