diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-11 15:04:39 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-11 15:04:39 +0000 |
| commit | 33ce0fb5844e907d71954e4c98bde7780093cc68 (patch) | |
| tree | 922114b0f196a2435ef7231114e6ccfd1d7ff798 | |
| parent | 331ce20e8e9e1d4f26cd8202eff2418ab80cb879 (diff) | |
merges r23284 from trunk into ruby_1_9_1.
--
* ext/tk/sample/tkcombobox.rb: fix conflict with autoload definition
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23394 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/tk/sample/tkcombobox.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ext/tk/sample/tkcombobox.rb b/ext/tk/sample/tkcombobox.rb index 1840270951..cc51a2ffeb 100644 --- a/ext/tk/sample/tkcombobox.rb +++ b/ext/tk/sample/tkcombobox.rb @@ -221,6 +221,16 @@ end ################################################ +# don't use Ttk widget +Object.instance_eval{remove_const :TkCombobox} if Object.autoload? :TkCombobox + +# if you want to use the 'default_widget_set' selector, +#class TkCombobox < TkEntry; end +#Tk.__set_toplevel_aliases__(:Tk, TkCombobox, :TkCombobox) + + +################################################ + class TkCombobox < TkEntry include TkComposite |