tkmenubar

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@40 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 5 deletions

diff --git a/lib/tk.rb b/lib/tk.rb
index 1a3ae2933d..8bb6c7f842 100644
--- a/lib/tk.rb
+++ b/lib/tk.rb
@@ -972,6 +972,7 @@ class TkRoot<TkWindow
     return ROOT[0] if ROOT[0]
     new = super
     ROOT[0] = new
+    Tk_WINDOWS["."] = new
   end
   def create_self
     @path = '.'
@@ -1229,12 +1230,12 @@ module TkComposite
       @delegates = {} 
       @delegates['DEFAULT'] = @frame
     end
-    if option.kind_of?(String)
-      @delegates[option] = wins
-    else
-      for i in option
-	@delegates[i] = wins
+    if @delegates[option].kind_of?(Array)
+      for i in wins
+	@delegates[option].push(i)
       end
+    else
+      @delegates[option] = wins
     end
   end
 
@@ -1261,3 +1262,5 @@ autoload :TkBitmapImage, 'tkcanvas'
 autoload :TkPhotoImage, 'tkcanvas'
 autoload :TkEntry, 'tkentry'
 autoload :TkText, 'tktext'
+autoload :TkDialog, 'tkdialog'
+autoload :TkMenubar, 'tkmenubar'