merges r23284 from trunk into ruby_1_9_1.

--
* ext/tk/sample/tkcombobox.rb: fix conflict with autoload definition

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23394 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 0 deletions

diff --git a/ext/tk/sample/tkcombobox.rb b/ext/tk/sample/tkcombobox.rb
index 184027095..cc51a2ffe 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