mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
1f08d9d903
commit
d2f1df77dd
4 changed files with 14 additions and 9 deletions
|
@ -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>
|
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
|
* string.c (rb_str_s_alloc, rb_str_replace): use null_str as well as
|
||||||
|
|
|
@ -26,14 +26,14 @@ module Tk
|
||||||
PATCH_LEVEL = tk_call('set', 'blt_patchLevel')
|
PATCH_LEVEL = tk_call('set', 'blt_patchLevel')
|
||||||
|
|
||||||
begin
|
begin
|
||||||
lib = INTERP._invoke('set', 'blt_library')
|
lib = TkCore::INTERP._invoke('set', 'blt_library')
|
||||||
rescue
|
rescue
|
||||||
lib = ''
|
lib = ''
|
||||||
end
|
end
|
||||||
LIBRARY = TkVarAccess.new('blt_library', lib)
|
LIBRARY = TkVarAccess.new('blt_library', lib)
|
||||||
|
|
||||||
begin
|
begin
|
||||||
lib = INTERP._invoke('set', 'blt_libPath')
|
lib = TkCore::INTERP._invoke('set', 'blt_libPath')
|
||||||
rescue
|
rescue
|
||||||
lib = ''
|
lib = ''
|
||||||
end
|
end
|
||||||
|
|
|
@ -46,11 +46,11 @@ module Tk::BLT
|
||||||
size = size.join(':')
|
size = size.join(':')
|
||||||
end
|
end
|
||||||
if size
|
if size
|
||||||
@id = INTERP._invoke('::blt::vector', 'create',
|
@id = TkCore::INTERP._invoke('::blt::vector', 'create',
|
||||||
"#auto(#{size})", *hash_kv(keys))
|
"#auto(#{size})", *hash_kv(keys))
|
||||||
else
|
else
|
||||||
@id = INTERP._invoke('::blt::vector', 'create',
|
@id = TkCore::INTERP._invoke('::blt::vector', 'create',
|
||||||
"#auto", *hash_kv(keys))
|
"#auto", *hash_kv(keys))
|
||||||
end
|
end
|
||||||
|
|
||||||
TkVar_ID_TBL[@id] = self
|
TkVar_ID_TBL[@id] = self
|
||||||
|
@ -63,7 +63,7 @@ module Tk::BLT
|
||||||
@trace_opts = nil
|
@trace_opts = nil
|
||||||
|
|
||||||
# teach Tk-ip that @id is global var
|
# teach Tk-ip that @id is global var
|
||||||
INTERP._invoke_without_enc('global', @id)
|
TkCore::INTERP._invoke_without_enc('global', @id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
|
@ -237,7 +237,7 @@ module Tk::BLT
|
||||||
@trace_opts = nil
|
@trace_opts = nil
|
||||||
|
|
||||||
# teach Tk-ip that @id is global var
|
# teach Tk-ip that @id is global var
|
||||||
INTERP._invoke_without_enc('global', @id)
|
TkCore::INTERP._invoke_without_enc('global', @id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define RUBY_RELEASE_DATE "2009-02-16"
|
#define RUBY_RELEASE_DATE "2009-02-16"
|
||||||
#define RUBY_VERSION_CODE 186
|
#define RUBY_VERSION_CODE 186
|
||||||
#define RUBY_RELEASE_CODE 20090216
|
#define RUBY_RELEASE_CODE 20090216
|
||||||
#define RUBY_PATCHLEVEL 335
|
#define RUBY_PATCHLEVEL 336
|
||||||
|
|
||||||
#define RUBY_VERSION_MAJOR 1
|
#define RUBY_VERSION_MAJOR 1
|
||||||
#define RUBY_VERSION_MINOR 8
|
#define RUBY_VERSION_MINOR 8
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue