ruby-changes:12480
From: nagai <ko1@a...>
Date: Sat, 18 Jul 2009 07:09:37 +0900 (JST)
Subject: [ruby-changes:12480] Ruby:r24180 (trunk): * ext/tk/lib/tk.rb,ext/tk/lib/tk/grid.rb: Bug fix on grid_slaves().
nagai 2009-07-18 07:09:14 +0900 (Sat, 18 Jul 2009) New Revision: 24180 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24180 Log: * ext/tk/lib/tk.rb,ext/tk/lib/tk/grid.rb: Bug fix on grid_slaves(). Extend usage pattern of grid_column()/grid_row(). Modified files: trunk/ChangeLog trunk/ext/tk/lib/tk/grid.rb trunk/ext/tk/lib/tk.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 24179) +++ ChangeLog (revision 24180) @@ -1,3 +1,8 @@ +Sat Jul 18 07:06:31 2009 Hidetoshi NAGAI <nagai@a...> + + * ext/tk/lib/tk.rb,ext/tk/lib/tk/grid.rb: Bug fix on grid_slaves(). + Extend usage pattern of grid_column()/grid_row(). + Sat Jul 18 06:30:35 2009 NAKAMURA Usaku <usa@r...> * include/ruby/win32.h: include winsock headers in extern "C++" for Index: ext/tk/lib/tk.rb =================================================================== --- ext/tk/lib/tk.rb (revision 24179) +++ ext/tk/lib/tk.rb (revision 24180) @@ -5265,14 +5265,12 @@ 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 @@ 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 @@ 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 @@ #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' Index: ext/tk/lib/tk/grid.rb =================================================================== --- ext/tk/lib/tk/grid.rb (revision 24179) +++ ext/tk/lib/tk/grid.rb (revision 24180) @@ -104,14 +104,12 @@ 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 @@ 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 @@ 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))) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/