diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-02 12:51:14 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-02 12:51:14 +0000 |
| commit | 64296077f396b36b7708e47a0eb5aebe4148ddb5 (patch) | |
| tree | 9ace3958ee4b8e70b02b6b8cd368245e55067548 /ext/tk/sample | |
| parent | 9619b029fc09af7e2254378a9f1505a76fe08a25 (diff) | |
merge revision(s) r43923,r43925: [Backport #9181]
* ext/tk/lib/tkextlib/tktable/tktable.rb: fix bug on arguments for Proc object.
* ext/tk/sample/scrollframe.rb: forgot a Module definition.
* ext/tk/extconf.rb: check unsupported version of tclConfig.sh/tkConfig.sh. It is because current Ruby/Tk doesn't support Tcl/Tk8.6.
* ext/tk/extconf.rb: change search step of Tcl/Tk libraries.
* ext/tk/lib/tk/namespace.rb: instance_exec() cannot accept a script string.
* ext/tk/lib/tk/msgcat.rb: bug fix on treating encodings. Now, ext/tk/sample/tkmsgcat-load_rb*.rb will work.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/sample')
| -rw-r--r-- | ext/tk/sample/scrollframe.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/tk/sample/scrollframe.rb b/ext/tk/sample/scrollframe.rb index e340e1da3c..e9d8af7ebf 100644 --- a/ext/tk/sample/scrollframe.rb +++ b/ext/tk/sample/scrollframe.rb @@ -13,6 +13,8 @@ # require 'tk' +module Tk::RbWidget; end + class Tk::RbWidget::ScrollFrame < TkFrame include TkComposite |