* ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: fix serious bug on the

  last commit. It fails to do pack/grid without options.

* ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 23 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 06247638f9..2d3cb1c858 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,18 @@
+Sun May 11 02:48:13 2008    <nagai@orca16.orcabay.ddo.jp>
+
+	* ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: fail to do pack/grid 
+	  without options.
+
+	* ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row.
+
 Sat May 10 18:19:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_each_line): RDoc updated.  [ruby-dev:34586]
 
 Sat May 10 13:17:56 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase parameter
-	  patterns of configure method.
+	* ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase supported
+	  parameter patterns of configure method.
 
 Sat May 10 09:16:13 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 58038e874e..0467e6a642 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -4947,6 +4947,15 @@ class TkWindow<TkObject
     self
   end
 
+  def grid_anchor(anchor=None)
+    if anchor == None
+      TkGrid.anchor(self)
+    else
+      TkGrid.anchor(self, anchor)
+      self
+    end
+  end
+
   def grid_forget
     #tk_call('grid', 'forget', epath)
     TkGrid.forget(self)
@@ -4978,12 +4987,14 @@ class TkWindow<TkObject
     TkGrid.columnconfigure(self, index, keys)
   end
   alias grid_columnconfigure grid_columnconfig
+  alias grid_column grid_columnconfig
 
   def grid_rowconfig(index, keys)
     #tk_call('grid', 'rowconfigure', epath, index, *hash_kv(keys))
     TkGrid.rowconfigure(self, index, keys)
   end
   alias grid_rowconfigure grid_rowconfig
+  alias grid_row grid_rowconfig
 
   def grid_columnconfiginfo(index, slot=nil)
     #if slot
@@ -5348,7 +5359,7 @@ TkWidget = TkWindow
 #Tk.freeze
 
 module Tk
-  RELEASE_DATE = '2008-05-10'.freeze
+  RELEASE_DATE = '2008-05-11'.freeze
 
   autoload :AUTO_PATH,        'tk/variable'
   autoload :TCL_PACKAGE_PATH, 'tk/variable'
diff --git a/ext/tk/lib/tk/grid.rb b/ext/tk/lib/tk/grid.rb
index dd253a65d7..0dfd7263a7 100644
--- a/ext/tk/lib/tk/grid.rb
+++ b/ext/tk/lib/tk/grid.rb
@@ -59,7 +59,7 @@ module TkGrid
     if args[-1].kind_of?(Hash)
       opts = args.pop
     else
-      opts = nil
+      opts = {}
     end
     fail ArgumentError, 'no widget is given' if args.empty?
     params = []
diff --git a/ext/tk/lib/tk/pack.rb b/ext/tk/lib/tk/pack.rb
index 1d50dc7440..220a38e524 100644
--- a/ext/tk/lib/tk/pack.rb
+++ b/ext/tk/lib/tk/pack.rb
@@ -35,7 +35,7 @@ module TkPack
     if args[-1].kind_of?(Hash)
       opts = args.pop
     else
-      opts = nil
+      opts = {}
     end
     fail ArgumentError, 'no widget is given' if args.empty?
     params = []