kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r24180 from trunk into ruby_1_9_1.

Browse source 
--
* 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
This commit is contained in:
yugui 2009-07-26 15:31:55 +00:00
parent 6e4aa0c61e
commit 7e7ff077da
4 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Jul 18 07:06:31 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* 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@ruby-lang.org>
* include/ruby/win32.h: include winsock headers in extern "C++" for

22
ext/tk/lib/tk.rb
View file

@ -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)

20
ext/tk/lib/tk/grid.rb
View file

@ -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)))

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 245
#define RUBY_PATCHLEVEL 246
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1