diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-07 15:15:59 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-07 15:15:59 +0000 |
| commit | fea0595635b6aeb7629c7d56db6eef07bbaf8ff0 (patch) | |
| tree | e8ae9a791864ad07fdc5c16f43ad341e88e8af0f | |
| parent | 43c3e415e14dc7fbc9d929dea6b73dc977deddf3 (diff) | |
* 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/trunk@54018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -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 |
5 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,10 @@ +Tue Mar 8 00:11:47 2016 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> + + * 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. + Mon Mar 7 13:32:58 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * class.c (rb_define_class, rb_define_class_id_under): raise diff --git a/ext/tk/lib/tk/menubar.rb b/ext/tk/lib/tk/menubar.rb index e27fc4914c..73f8801d98 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/menuspec.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 43447b86c5..740f9d3b5e 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". |