kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 54018: [Backport #11886]

Browse source 
* 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
This commit is contained in:
naruse 2016-03-29 06:04:26 +00:00
parent 0cf072abdf
commit 246ffa87fd
6 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> Tue Mar 29 15:03:03 2016 Kenta Murata <mrkn@mrkn.jp>
* ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P * ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P

2
ext/tk/lib/tk/menubar.rb
View file

@ -77,7 +77,7 @@
# 'tearoff'=>false, # 'tearoff'=>false,
# 'foreground'=>'grey40', # 'foreground'=>'grey40',
# 'activeforeground'=>'red', # 'activeforeground'=>'red',
# 'font'=>'Helvetia 12 bold') # 'font'=>'Helvetica 12 bold')
# menubar.pack('side'=>'top', 'fill'=>'x') # menubar.pack('side'=>'top', 'fill'=>'x')
# See tk/menuspce.rb about the format of the menu_spec # See tk/menuspce.rb about the format of the menu_spec

2
ext/tk/sample/menubar1.rb
View file

@ -44,7 +44,7 @@ menubar = TkMenubar.new(nil, menu_spec,
'tearoff'=>false, 'tearoff'=>false,
'foreground'=>'grey40', 'foreground'=>'grey40',
'activeforeground'=>'red', 'activeforeground'=>'red',
'font'=>'Helvetia 12 bold') 'font'=>'Helvetica 12 bold')
menubar.pack('side'=>'top', 'fill'=>'x') 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).') 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).')

4
ext/tk/sample/menubar2.rb
View file

@ -45,12 +45,12 @@ mbar = Tk.root.add_menubar(menu_spec,
'tearoff'=>'false', 'tearoff'=>'false',
'foreground'=>'grey40', 'foreground'=>'grey40',
'activeforeground'=>'red', 'activeforeground'=>'red',
'font'=>'Helvetia 12 bold') 'font'=>'Helvetica 12 bold')
# This (default configure options) is NOT same the following. # This (default configure options) is NOT same the following.
# #
# mbar = Tk.root.add_menubar(menu_spec) # mbar = Tk.root.add_menubar(menu_spec)
# mbar.configure('foreground'=>'grey40', 'activeforeground'=>'red', # 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.') 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.')

2
ext/tk/sample/menubar3.rb
View file

@ -63,7 +63,7 @@ menubar = TkMenubar.new(nil, menu_spec,
'tearoff'=>false, 'tearoff'=>false,
'foreground'=>'grey40', 'foreground'=>'grey40',
'activeforeground'=>'red', 'activeforeground'=>'red',
'font'=>'Helvetia 12 bold') 'font'=>'Helvetica 12 bold')
menubar.pack('side'=>'left', 'fill'=>'y') menubar.pack('side'=>'left', 'fill'=>'y')
TkText.new(:wrap=>'word').pack.insert('1.0', 'This sample script generates "Menu Sidebar". TkText.new(:wrap=>'word').pack.insert('1.0', 'This sample script generates "Menu Sidebar".

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.0" #define RUBY_VERSION "2.3.0"
#define RUBY_RELEASE_DATE "2016-03-29" #define RUBY_RELEASE_DATE "2016-03-29"
#define RUBY_PATCHLEVEL 22 #define RUBY_PATCHLEVEL 23
#define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3