From dfcbc92614bdaff1c16feb1d34c5bfeae810f024 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 6 Dec 2005 16:24:22 +0000
Subject: * ext/tk/tcltklib.c: forgot to update RELEASE_DATE. *
 ext/tk/lib/tk.rb: ditto. * ext/tk/sample/demos-en/menu.rb: commit miss.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9652 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk.rb               |  2 +-
 ext/tk/sample/demos-en/menu.rb | 12 ++++++++++--
 ext/tk/tcltklib.c              |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 4afaaecf88..55408dda2f 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -4555,7 +4555,7 @@ end
 #Tk.freeze
 
 module Tk
-  RELEASE_DATE = '2005-11-23'.freeze
+  RELEASE_DATE = '2005-12-07'.freeze
 
   autoload :AUTO_PATH,        'tk/variable'
   autoload :TCL_PACKAGE_PATH, 'tk/variable'
diff --git a/ext/tk/sample/demos-en/menu.rb b/ext/tk/sample/demos-en/menu.rb
index d835d145eb..8370d2f5f0 100644
--- a/ext/tk/sample/demos-en/menu.rb
+++ b/ext/tk/sample/demos-en/menu.rb
@@ -19,9 +19,16 @@ $menu_demo = TkToplevel.new {|w|
 $menu_frame = TkFrame.new($menu_demo, 'relief'=>'raised', 'bd'=>2)
 $menu_frame.pack('side'=>'top', 'fill'=>'x')
 
+begin
+  windowingsystem = Tk.windowingsystem()
+rescue
+  windowingsystem = ""
+end
+
 # label
 TkLabel.new($menu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh'
+  if $tk_platform['platform'] == 'macintosh' ||
+      windowingsystem == "classic" || windowingsystem == "aqua"
     text("This window contains a menubar with cascaded menus.  You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by dragging outside of its bounds and releasing the mouse.")
   else
     text("This window contains a menubar with cascaded menus.  You can post a menu from the keyboard by typing Alt+x, where \"x\" is the character underlined on the menu.  You can then traverse among the menus using the arrow keys.  When a menu is posted, you can invoke the current entry by typing space, or you can invoke any entry by typing its underlined character.  If a menu entry has an accelerator, you can invoke the entry without posting the menu just by typing the accelerator. The rightmost menu can be torn off into a palette by selecting the first item in the menu.")
@@ -62,7 +69,8 @@ TkMenubutton.new($menu_frame, 'text'=>'File', 'underline'=>0) {|m|
   }
 }
 
-if $tk_platform['platform'] == 'macintosh'
+if $tk_platform['platform'] == 'macintosh' ||
+    windowingsystem == "classic" || windowingsystem == "aqua"
   modifier = 'Command'
 elsif $tk_platform['platform'] == 'windows'
   modifier = 'Control'
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index a4a0d20ca5..ac5d4fe7be 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -4,7 +4,7 @@
  *              Oct. 24, 1997   Y. Matsumoto
  */
 
-#define TCLTKLIB_RELEASE_DATE "2005-11-18"
+#define TCLTKLIB_RELEASE_DATE "2005-12-07"
 
 #include "ruby.h"
 #include "rubysig.h"
-- 
cgit v1.2.3