diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-04 08:55:28 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-04 08:55:28 +0000 |
| commit | 638d844b1c33b27ca7610fee61ba90744710e9b2 (patch) | |
| tree | 9c821b4218e839c9d00aa9a7ad093a3956ece990 /ext/tk | |
| parent | 7580da68860930ec74d2f2d91a16f4e0ee89be97 (diff) | |
merges r20475 from trunk into ruby_1_9_1.
* ext/tk/lib/tk.rb: bug fix. use ::RubyVM instead of ::VM [ruby-list:45676]
* ext/tk/tcltklib.c: update RELEASE_DATE
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20503 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
| -rw-r--r-- | ext/tk/lib/tk.rb | 4 | ||||
| -rw-r--r-- | ext/tk/tcltklib.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 67069abc32..6bc0ea63e3 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -1109,7 +1109,7 @@ module TkCore include TkComm extend TkComm - WITH_RUBY_VM = Object.const_defined?(:VM) && ::VM.class == Class + WITH_RUBY_VM = Object.const_defined?(:RubyVM) && ::RubyVM.class == Class WITH_ENCODING = defined?(::Encoding.default_external) && true #WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class #if TclTkLib::WINDOWING_SYSTEM == 'aqua' @@ -5529,7 +5529,7 @@ TkWidget = TkWindow #Tk.freeze module Tk - RELEASE_DATE = '2008-10-20'.freeze + RELEASE_DATE = '2008-12-04'.freeze autoload :AUTO_PATH, 'tk/variable' autoload :TCL_PACKAGE_PATH, 'tk/variable' diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index dadab2f221..22287e8c65 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -4,7 +4,7 @@ * Oct. 24, 1997 Y. Matsumoto */ -#define TCLTKLIB_RELEASE_DATE "2008-10-20" +#define TCLTKLIB_RELEASE_DATE "2008-12-03" #include "ruby.h" |