nagachika	2016-03-08 00:15:59 +0900 (Tue, 08 Mar 2016)

  New Revision: 54018

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54018

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/ext/tk/lib/tk/menubar.rb
    trunk/ext/tk/sample/menubar1.rb
    trunk/ext/tk/sample/menubar2.rb
    trunk/ext/tk/sample/menubar3.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 54017)
+++ ChangeLog	(revision 54018)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Mar  8 00:11:47 2016  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* 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@r...>
 
 	* class.c (rb_define_class, rb_define_class_id_under): raise
Index: ext/tk/sample/menubar2.rb
===================================================================
--- ext/tk/sample/menubar2.rb	(revision 54017)
+++ ext/tk/sample/menubar2.rb	(revision 54018)
@@ -45,12 +45,12 @@ mbar = Tk.root.add_menubar(menu_spec, https://github.com/ruby/ruby/blob/trunk/ext/tk/sample/menubar2.rb#L45
                            '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.')
 
Index: ext/tk/sample/menubar1.rb
===================================================================
--- ext/tk/sample/menubar1.rb	(revision 54017)
+++ ext/tk/sample/menubar1.rb	(revision 54018)
@@ -44,7 +44,7 @@ menubar = TkMenubar.new(nil, menu_spec, https://github.com/ruby/ruby/blob/trunk/ext/tk/sample/menubar1.rb#L44
                        '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).')
Index: ext/tk/sample/menubar3.rb
===================================================================
--- ext/tk/sample/menubar3.rb	(revision 54017)
+++ ext/tk/sample/menubar3.rb	(revision 54018)
@@ -63,7 +63,7 @@ menubar = TkMenubar.new(nil, menu_spec, https://github.com/ruby/ruby/blob/trunk/ext/tk/sample/menubar3.rb#L63
                         '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".
Index: ext/tk/lib/tk/menubar.rb
===================================================================
--- ext/tk/lib/tk/menubar.rb	(revision 54017)
+++ ext/tk/lib/tk/menubar.rb	(revision 54018)
@@ -77,7 +77,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/tk/lib/tk/menubar.rb#L77
 #                        '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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/