diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-26 15:31:55 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-26 15:31:55 +0000 |
commit | 7e7ff077da51d885a49f7de153eb6d850f921de7 (patch) | |
tree | f80f6bdeb464f3e0e077db6201b1e03658d4d533 /ext | |
parent | 6e4aa0c61ea35ccfe0af41b52c6d4b3115cbfb5f (diff) |
merges r24180 from trunk into ruby_1_9_1.
--
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24288 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/tk/lib/tk.rb | 22 | ||||
-rw-r--r-- | ext/tk/lib/tk/grid.rb | 20 |
2 files changed, 35 insertions, 7 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 85c1e76f83..b3f889a988 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -5177,14 +5177,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 @@ -5214,6 +5212,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) @@ -5250,9 +5264,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) diff --git a/ext/tk/lib/tk/grid.rb b/ext/tk/lib/tk/grid.rb index 0dfd7263a7..24d7a790d3 100644 --- a/ext/tk/lib/tk/grid.rb +++ b/ext/tk/lib/tk/grid.rb @@ -104,14 +104,12 @@ module TkGrid tk_call_without_enc("grid", 'columnconfigure', master, index, *hash_kv(args)) end - alias column columnconfigure def rowconfigure(master, index, args) # master = master.epath if master.kind_of?(TkObject) master = _epath(master) tk_call_without_enc("grid", 'rowconfigure', master, index, *hash_kv(args)) end - alias row rowconfigure def columnconfiginfo(master, index, slot=nil) # master = master.epath if master.kind_of?(TkObject) @@ -171,6 +169,22 @@ module TkGrid end end + def column(master, index, keys=nil) + if keys.kind_of?(Hash) + columnconfigure(master, index, keys) + else + columnconfiginfo(master, index, keys) + end + end + + def row(master, index, keys=nil) + if keys.kind_of?(Hash) + rowconfigure(master, index, keys) + else + rowconfiginfo(master, index, keys) + end + end + def add(widget, *args) configure(widget, *args) end @@ -228,7 +242,7 @@ module TkGrid list(tk_call_without_enc('grid', 'size', master)) end - def slaves(master, args) + def slaves(master, keys=nil) # master = master.epath if master.kind_of?(TkObject) master = _epath(master) list(tk_call_without_enc('grid', 'slaves', master, *hash_kv(args))) |