From 6af5a79223e89ec4bb450e25efdbc18e523ac110 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 16 Feb 2009 14:30:37 +0000 Subject: merge revision(s) 20300: * 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_8_7@22357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/tk/lib/tkextlib/blt.rb | 4 ++-- ext/tk/lib/tkextlib/blt/vector.rb | 12 ++++++------ version.h | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8cf351b9ff..3f3a8df9c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Feb 16 23:30:24 2009 Hidetoshi NAGAI + + * ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb: + fix NameError bug. + Mon Feb 16 23:08:22 2009 Nobuyoshi Nakada * string.c (rb_str_s_alloc, rb_str_replace): use null_str as well as 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/version.h b/version.h index 0f7580ffdc..9f2ef0422b 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-16" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20090216 -#define RUBY_PATCHLEVEL 121 +#define RUBY_PATCHLEVEL 122 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3