aboutsummaryrefslogtreecommitdiffstats
path: root/ext/tk
diff options
context:
space:
mode:
authora_matsuda <a_matsuda@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-28 15:10:25 +0000
committera_matsuda <a_matsuda@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-28 15:10:25 +0000
commit95c025fa90a96c14c5395ee960c79a8198f6cd64 (patch)
treedc9bf1146b54004daa8c7654b656ddb17d8b5ec7 /ext/tk
parent6f1b3fa9aee075f5e9c1917d8c2e1ffbb5cb7e86 (diff)
downloadruby-95c025fa90a96c14c5395ee960c79a8198f6cd64.tar.gz
:warning: key "accelerator" is duplicated and overwritten in Tk samples
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
-rw-r--r--ext/tk/sample/demos-en/menu.rb2
-rw-r--r--ext/tk/sample/demos-en/menu84.rb2
-rw-r--r--ext/tk/sample/demos-jp/menu.rb2
-rw-r--r--ext/tk/sample/demos-jp/menu84.rb2
-rw-r--r--ext/tk/sample/demos-jp/menu8x.rb2
5 files changed, 5 insertions, 5 deletions
diff --git a/ext/tk/sample/demos-en/menu.rb b/ext/tk/sample/demos-en/menu.rb
index 8b7a524bc6..db0541c608 100644
--- a/ext/tk/sample/demos-en/menu.rb
+++ b/ext/tk/sample/demos-en/menu.rb
@@ -88,7 +88,7 @@ TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
add('command', 'label'=>'Long entry that does nothing')
['A','B','C','D','E','F','G'].each{|c|
add('command', 'label'=>"Print letter \"#{c}\"",
- 'underline'=>14, 'accelerator'=>"Meta+#{c}",
+ 'underline'=>14,
'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
$menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
}
diff --git a/ext/tk/sample/demos-en/menu84.rb b/ext/tk/sample/demos-en/menu84.rb
index 572f194e13..714fb3c553 100644
--- a/ext/tk/sample/demos-en/menu84.rb
+++ b/ext/tk/sample/demos-en/menu84.rb
@@ -94,7 +94,7 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
add('command', 'label'=>'Long entry that does nothing')
['A','B','C','D','E','F','G'].each{|c|
add('command', 'label'=>"Print letter \"#{c}\"",
- 'underline'=>14, 'accelerator'=>"Meta+#{c}",
+ 'underline'=>14,
'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
$menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
}
diff --git a/ext/tk/sample/demos-jp/menu.rb b/ext/tk/sample/demos-jp/menu.rb
index 30e491d953..012e2458d2 100644
--- a/ext/tk/sample/demos-jp/menu.rb
+++ b/ext/tk/sample/demos-jp/menu.rb
@@ -91,7 +91,7 @@ TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
['A','B','C','D','E','F','G'].each{|c|
# add('command', 'label'=>"文字 \"#{c}\" を印字", 'underline'=>4,
add('command', 'label'=>"Print letter \"#{c}\" (文字 \"#{c}\" を印字)",
- 'underline'=>14, 'accelerator'=>"Meta+#{c}",
+ 'underline'=>14,
'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
$menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
}
diff --git a/ext/tk/sample/demos-jp/menu84.rb b/ext/tk/sample/demos-jp/menu84.rb
index 3fd879e4f7..ab6d1b85b4 100644
--- a/ext/tk/sample/demos-jp/menu84.rb
+++ b/ext/tk/sample/demos-jp/menu84.rb
@@ -96,7 +96,7 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
add('command', 'label'=>'Long entry that does nothing')
['A','B','C','D','E','F','G'].each{|c|
add('command', 'label'=>"Print letter \"#{c}\"",
- 'underline'=>14, 'accelerator'=>"Meta+#{c}",
+ 'underline'=>14,
'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
$menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
}
diff --git a/ext/tk/sample/demos-jp/menu8x.rb b/ext/tk/sample/demos-jp/menu8x.rb
index a1acda4c1b..c61753dd19 100644
--- a/ext/tk/sample/demos-jp/menu8x.rb
+++ b/ext/tk/sample/demos-jp/menu8x.rb
@@ -119,7 +119,7 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
['A','B','C','D','E','F','G'].each{|c|
# add('command', 'label'=>"文字 \"#{c}\" を印字", 'underline'=>4,
add('command', 'label'=>"Print letter \"#{c}\" (文字 \"#{c}\" を印字)",
- 'underline'=>14, 'accelerator'=>"Meta+#{c}",
+ 'underline'=>14,
'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
$menu8x_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
}