summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-10 17:55:24 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-10 17:55:24 +0000
commit2309a819f431ce91dee8fa736a9e4fbcb4f00bd7 (patch)
tree593ad6056a90c83df5e320101a5cc6da52bcd806 /ext
parent7f9f8d381e8ff2ed6fd98cafef74c64544094562 (diff)
* 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
Diffstat (limited to 'ext')
-rw-r--r--ext/tk/lib/tk.rb13
-rw-r--r--ext/tk/lib/tk/grid.rb2
-rw-r--r--ext/tk/lib/tk/pack.rb2
3 files changed, 14 insertions, 3 deletions
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 = []