diff options
| -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 @@ +Tue Mar 29 15:04:19 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. + Tue Mar 29 15:03:03 2016 Kenta Murata <mrkn@mrkn.jp> * ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P 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". @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-03-29" -#define RUBY_PATCHLEVEL 22 +#define RUBY_PATCHLEVEL 23 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |