diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 06:04:26 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 06:04:26 +0000 |
| commit | 246ffa87fd6158860aa08663bf038da57e893829 (patch) | |
| tree | 20227dbeff166d7ee291e30342861e4da3fd934e /ext | |
| parent | 0cf072abdf1fbc1c6aab7ebc1826ae3c9689e165 (diff) | |
merge revision(s) 54018: [Backport #11886]
* ext/tk/lib/tk/menubar.rb: fix a typo in font name. [ruby-core:72505]
[Bug #11886] The patch provided by Akira Matsuda.
* ext/tk/sample/*.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/tk/lib/tk/menubar.rb | 2 | ||||
| -rw-r--r-- | ext/tk/sample/menubar1.rb | 2 | ||||
| -rw-r--r-- | ext/tk/sample/menubar2.rb | 4 | ||||
| -rw-r--r-- | ext/tk/sample/menubar3.rb | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/ext/tk/lib/tk/menubar.rb b/ext/tk/lib/tk/menubar.rb index 17cb4477c9..6c5df6b1c2 100644 --- a/ext/tk/lib/tk/menubar.rb +++ b/ext/tk/lib/tk/menubar.rb @@ -77,7 +77,7 @@ # 'tearoff'=>false, # 'foreground'=>'grey40', # 'activeforeground'=>'red', -# 'font'=>'Helvetia 12 bold') +# 'font'=>'Helvetica 12 bold') # menubar.pack('side'=>'top', 'fill'=>'x') # See tk/menuspce.rb about the format of the menu_spec diff --git a/ext/tk/sample/menubar1.rb b/ext/tk/sample/menubar1.rb index 1a935d5961..a468fb6ea4 100644 --- a/ext/tk/sample/menubar1.rb +++ b/ext/tk/sample/menubar1.rb @@ -44,7 +44,7 @@ menubar = TkMenubar.new(nil, menu_spec, 'tearoff'=>false, 'foreground'=>'grey40', 'activeforeground'=>'red', - 'font'=>'Helvetia 12 bold') + 'font'=>'Helvetica 12 bold') menubar.pack('side'=>'top', 'fill'=>'x') TkText.new(:wrap=>'word').pack.insert('1.0', 'Please read the sample source, and check how to override default configure options of menu entries on a menu_spec. Maybe, on windows, this menubar does not work properly about keyboard shortcuts. Then, please use "menu" option of root/toplevel widget (see sample/menubar2.rb).') diff --git a/ext/tk/sample/menubar2.rb b/ext/tk/sample/menubar2.rb index 5930d2745f..e10a282f93 100644 --- a/ext/tk/sample/menubar2.rb +++ b/ext/tk/sample/menubar2.rb @@ -45,12 +45,12 @@ mbar = Tk.root.add_menubar(menu_spec, 'tearoff'=>'false', 'foreground'=>'grey40', 'activeforeground'=>'red', - 'font'=>'Helvetia 12 bold') + 'font'=>'Helvetica 12 bold') # This (default configure options) is NOT same the following. # # mbar = Tk.root.add_menubar(menu_spec) # mbar.configure('foreground'=>'grey40', 'activeforeground'=>'red', -# 'font'=>'Helvetia 12 bold') +# 'font'=>'Helvetica 12 bold') TkText.new(:wrap=>'word').pack.insert('1.0', 'Please read the sample source, and check how to override default configure options of menu entries on a menu_spec.') diff --git a/ext/tk/sample/menubar3.rb b/ext/tk/sample/menubar3.rb index ce70835133..f8344cc834 100644 --- a/ext/tk/sample/menubar3.rb +++ b/ext/tk/sample/menubar3.rb @@ -63,7 +63,7 @@ menubar = TkMenubar.new(nil, menu_spec, 'tearoff'=>false, 'foreground'=>'grey40', 'activeforeground'=>'red', - 'font'=>'Helvetia 12 bold') + 'font'=>'Helvetica 12 bold') menubar.pack('side'=>'left', 'fill'=>'y') TkText.new(:wrap=>'word').pack.insert('1.0', 'This sample script generates "Menu Sidebar". |