From ea81398ba75a8190ca0583266904ac30b9ac77f0 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 15 Apr 2008 07:59:56 +0000
Subject: * ext/tk/lib/tk/menuspec.rb: option check will fail when  
 TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__ is true.

* ext/tk/lib/tk/palette.rb: bug fix.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk.rb          |  2 +-
 ext/tk/lib/tk/menuspec.rb | 14 +++++---------
 ext/tk/lib/tk/palette.rb  |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'ext/tk')

diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 5f6bb2dbc1..a5cb8cb67d 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -5341,7 +5341,7 @@ TkWidget = TkWindow
 #Tk.freeze
 
 module Tk
-  RELEASE_DATE = '2008-04-13'.freeze
+  RELEASE_DATE = '2008-04-15'.freeze
 
   autoload :AUTO_PATH,        'tk/variable'
   autoload :TCL_PACKAGE_PATH, 'tk/variable'
diff --git a/ext/tk/lib/tk/menuspec.rb b/ext/tk/lib/tk/menuspec.rb
index d9322c9986..2a2eb9ba3c 100644
--- a/ext/tk/lib/tk/menuspec.rb
+++ b/ext/tk/lib/tk/menuspec.rb
@@ -155,15 +155,12 @@ module TkMenuSpec
   def _use_menubar?(parent)
     use_menubar = false
     if parent.kind_of?(Tk::Root) || parent.kind_of?(Tk::Toplevel)
-      return true 
+      true 
+    elsif parent.current_configinfo.has_key?('menu')
+      true
     else
-      begin
-        parent.cget('menu')
-        return true 
-      rescue
-      end
+      false
     end
-    false
   end
   private :_use_menubar?
 
@@ -171,7 +168,7 @@ module TkMenuSpec
     #unless (mbar = parent.menu).kind_of?(TkMenu)
     # --> use current TkMenu class
     mbar = parent.menu
-    unless parent.menu.kind_of?(Tk::Menu) || parent.menu.kind_of?(TkMenu)
+    unless mbar.kind_of?(Tk::Menu) || mbar.kind_of?(TkMenu)
       #mbar = Tk::Menu.new(parent, :tearoff=>false)
       mbar = TkMenu.new(parent, :tearoff=>false)
       parent.menu(mbar)
@@ -198,7 +195,6 @@ module TkMenuSpec
 
     if _use_menubar?(parent)
       # menubar by menu entries
-
       mbar = _create_menu_for_menubar(parent)
 
       menu_name = nil
diff --git a/ext/tk/lib/tk/palette.rb b/ext/tk/lib/tk/palette.rb
index 2b6fdf5d90..2d08d50f6a 100644
--- a/ext/tk/lib/tk/palette.rb
+++ b/ext/tk/lib/tk/palette.rb
@@ -15,7 +15,7 @@ module TkPalette
   ].freeze
 
   def TkPalette.set(*args)
-    args = args.to_a.flatten if args.kind_of? Hash
+    args = args[0].to_a.flatten if args[0].kind_of? Hash
     tk_call('tk_setPalette', *args)
   end
   def TkPalette.setPalette(*args)
-- 
cgit v1.2.3