mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
ff6a6a0e28
commit
dfcbc92614
3 changed files with 12 additions and 4 deletions
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue