diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-28 14:56:42 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-28 14:56:42 +0000 |
commit | 9f2dd6a718fd8e2263b73693197e2ce914004f26 (patch) | |
tree | c0b6fc7524fec9062e4909f56ce54445b1902cc1 | |
parent | b1a5f3e4b41bca40e921ac211b7d6784f6606cf1 (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_2@54317 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 | ||||
-rw-r--r-- | version.h | 2 |
6 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,10 @@ +Mon Mar 28 23:56:17 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 28 23:20:12 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/fiddle/test_handle.rb (test_NEXT): use -test-/dln/empty diff --git a/ext/tk/lib/tk/menubar.rb b/ext/tk/lib/tk/menubar.rb index 9d5571c470..327ffeeb1a 100644 --- a/ext/tk/lib/tk/menubar.rb +++ b/ext/tk/lib/tk/menubar.rb @@ -76,7 +76,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 a233c6e088..d76dd17b83 100644 --- a/ext/tk/sample/menubar1.rb +++ b/ext/tk/sample/menubar1.rb @@ -43,7 +43,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 e3cd68eaef..076e1947a5 100644 --- a/ext/tk/sample/menubar2.rb +++ b/ext/tk/sample/menubar2.rb @@ -44,12 +44,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 4f42f81c88..246970e61c 100644 --- a/ext/tk/sample/menubar3.rb +++ b/ext/tk/sample/menubar3.rb @@ -62,7 +62,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". @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.5" #define RUBY_RELEASE_DATE "2016-03-28" -#define RUBY_PATCHLEVEL 259 +#define RUBY_PATCHLEVEL 260 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |