summaryrefslogtreecommitdiffstats
path: root/ext/tk/lib/tk.rb
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-17 22:09:14 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-17 22:09:14 +0000
commitd18c64d2978ed08a756f93dde536d943dff523b7 (patch)
tree86e519d2c869ae476acd093f0a9df3a7f7bc15d4 /ext/tk/lib/tk.rb
parentbe41ba3bedef74d484bb25ce263a9ca71a8e0855 (diff)
downloadruby-d18c64d2978ed08a756f93dde536d943dff523b7.tar.gz
ruby-d18c64d2978ed08a756f93dde536d943dff523b7.tar.xz
ruby-d18c64d2978ed08a756f93dde536d943dff523b7.zip
* ext/tk/lib/tk.rb,ext/tk/lib/tk/grid.rb: Bug fix on grid_slaves().
Extend usage pattern of grid_column()/grid_row(). git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/lib/tk.rb')
-rw-r--r--ext/tk/lib/tk.rb24
1 files changed, 19 insertions, 5 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index eddc9f0b4..95c2598cf 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -5265,14 +5265,12 @@ 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
@@ -5302,6 +5300,22 @@ class TkWindow<TkObject
TkGrid.rowconfiginfo(self, index, slot)
end
+ def grid_column(index, keys=nil)
+ if keys.kind_of?(Hash)
+ grid_columnconfigure(index, keys)
+ else
+ grid_columnconfiginfo(index, keys)
+ end
+ end
+
+ def grid_row(index, keys=nil)
+ if keys.kind_of?(Hash)
+ grid_rowconfigure(index, keys)
+ else
+ grid_rowconfiginfo(index, keys)
+ end
+ end
+
def grid_info()
#list(tk_call('grid', 'info', epath))
TkGrid.info(self)
@@ -5338,9 +5352,9 @@ class TkWindow<TkObject
TkGrid.size(self)
end
- def grid_slaves(args)
+ def grid_slaves(keys = nil)
#list(tk_call('grid', 'slaves', epath, *hash_kv(args)))
- TkGrid.slaves(self, args)
+ TkGrid.slaves(self, keys)
end
def place(keys)
@@ -5639,7 +5653,7 @@ TkWidget = TkWindow
#Tk.freeze
module Tk
- RELEASE_DATE = '2009-07-16'.freeze
+ RELEASE_DATE = '2009-07-18'.freeze
autoload :AUTO_PATH, 'tk/variable'
autoload :TCL_PACKAGE_PATH, 'tk/variable'