summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-16 14:26:07 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-16 14:26:07 (GMT)
commitd2f1df77dd64e5eff5ebdea951abf3625a2a4f96 (patch)
tree87a4a9909db6c95e32c29e7eb6268c6443b26861
parent1f08d9d90336a26ad203c6a868117f6bccde2448 (diff)
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_6@22355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/tk/lib/tkextlib/blt.rb4
-rw-r--r--ext/tk/lib/tkextlib/blt/vector.rb12
-rw-r--r--version.h2
4 files changed, 14 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index e5dff9d..e5b10b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 16 23:25:43 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb:
+ fix NameError bug.
+
Mon Feb 16 22:59:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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 115eb92..8d58c1f 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 540b6b9..5e17422 100644
--- a/ext/tk/lib/tkextlib/blt/vector.rb
+++ b/ext/tk/lib/tkextlib/blt/vector.rb
@@ -46,11 +46,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[@id] = self
@@ -63,7 +63,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
@@ -237,7 +237,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 06947b8..c5528b8 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-02-16"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20090216
-#define RUBY_PATCHLEVEL 335
+#define RUBY_PATCHLEVEL 336
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8