1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/tk/lib/tk/font.rb: remove dependency on Ruby's version (1.8 or 1.9).

Browse Source 
* ext/tk/lib/tkextlib/ICONS/icons.rb: ditto.
* ext/tk/sample/tkextlib/treectrl/demo.rb: ditto.
* ext/tk/lib/tk.rb: update RELEASE_DATE


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2005-11-18 22:37:53 +00:00
parent a8abed1256
commit bfab52caff
6 changed files with 83 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Sat Nov 19 07:34:32 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/font.rb: remove dependency on Ruby's version (1.8
or 1.9).
* ext/tk/lib/tkextlib/ICONS/icons.rb: ditto.
* ext/tk/sample/tkextlib/treectrl/demo.rb: ditto.
Fri Nov 18 18:07:05 2005 NAKAMURA Usaku <usa@ruby-lang.org> Fri Nov 18 18:07:05 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (rb_file_s_dirname): should use skipprefix for UNC path. * file.c (rb_file_s_dirname): should use skipprefix for UNC path.

69
ext/tk/ChangeLog.tkextlib
View File

@ -1,77 +1,82 @@
2005-11-19 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* sample/tkextlib/treectrl/demo.rb: remove dependency on Ruby's
version (1.8 or 1.9).
2005-10-23 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> 2005-10-23 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/*: update to support ActiveTcl8.4.11.2 * lib/tkextlib/*: update to support ActiveTcl8.4.11.2
* ext/tk/lib/tkextlib/trofs/*: support Trofs 0.4.3 * lib/tkextlib/trofs/*: support Trofs 0.4.3
* ext/tk/lib/tkextlib/tile/*: support Tile 0.7.2 * lib/tkextlib/tile/*: support Tile 0.7.2
* ext/tk/lib/tkextlib/vu/*: support vu 2.3.0 * lib/tkextlib/vu/*: support vu 2.3.0
* ext/tk/lib/tkextlib/tcllib/*: support Tcllib 1.8 (Tklib 0.3) * lib/tkextlib/tcllib/*: support Tcllib 1.8 (Tklib 0.3 part only)
* ext/tk/lib/tkextlib/*: improve conversion of option values * lib/tkextlib/*: improve conversion of option values
2005-10-04 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> 2005-10-04 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/tktable/tktable.rb: border_* instance methods * lib/tkextlib/tktable/tktable.rb: border_* instance methods
don't call 'border' subcommands. don't call 'border' subcommands.
2005-08-10 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> 2005-08-10 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/blt/component.rb: didn't check * lib/tkextlib/blt/component.rb: didn't check
__item_ruby2val_optkeys(). __item_ruby2val_optkeys().
2005-08-09 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> 2005-08-09 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tkextlib/blt/barchart.rb: support to treat tkvariable-type * lib/tkextlib/blt/barchart.rb: support to treat tkvariable-type
configure options. configure options.
* ext/tk/lib/tkextlib/blt/component.rb: ditto. * lib/tkextlib/blt/component.rb: ditto.
* ext/tk/lib/tkextlib/blt/dragdrop.rb: ditto. * lib/tkextlib/blt/dragdrop.rb: ditto.
* ext/tk/lib/tkextlib/blt/treeview.rb: ditto. * lib/tkextlib/blt/treeview.rb: ditto.
* ext/tk/lib/tkextlib/bwidget/button.rb: ditto. * lib/tkextlib/bwidget/button.rb: ditto.
* ext/tk/lib/tkextlib/bwidget/entry.rb: ditto. * lib/tkextlib/bwidget/entry.rb: ditto.
* ext/tk/lib/tkextlib/bwidget/label.rb: ditto. * lib/tkextlib/bwidget/label.rb: ditto.
* ext/tk/lib/tkextlib/bwidget/labelentry.rb: ditto. * lib/tkextlib/bwidget/labelentry.rb: ditto.
* ext/tk/lib/tkextlib/bwidget/labelframe.rb: ditto. * lib/tkextlib/bwidget/labelframe.rb: ditto.
* ext/tk/lib/tkextlib/bwidget/mainframe.rb: ditto. * lib/tkextlib/bwidget/mainframe.rb: ditto.
* ext/tk/lib/tkextlib/bwidget/passwddlg.rb: ditto. * lib/tkextlib/bwidget/passwddlg.rb: ditto.
* ext/tk/lib/tkextlib/bwidget/spinbox.rb: ditto. * lib/tkextlib/bwidget/spinbox.rb: ditto.
* ext/tk/lib/tkextlib/bwidget/tree.rb: ditto. * lib/tkextlib/bwidget/tree.rb: ditto.
* ext/tk/lib/tkextlib/iwidgets/calendar.rb: ditto. * lib/tkextlib/iwidgets/calendar.rb: ditto.
* ext/tk/lib/tkextlib/iwidgets/entryfield.rb: ditto. * lib/tkextlib/iwidgets/entryfield.rb: ditto.
* ext/tk/lib/tkextlib/iwidgets/hierarchy.rb: ditto. * lib/tkextlib/iwidgets/hierarchy.rb: ditto.
* ext/tk/lib/tkextlib/iwidgets/labeledframe.rb: ditto. * lib/tkextlib/iwidgets/labeledframe.rb: ditto.
* ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb: ditto. * lib/tkextlib/iwidgets/labeledwidget.rb: ditto.
* ext/tk/lib/tkextlib/iwidgets/menubar.rb: ditto. * lib/tkextlib/iwidgets/menubar.rb: ditto.
* ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb: ditto. * lib/tkextlib/iwidgets/scrolledlistbox.rb: ditto.
* ext/tk/lib/tkextlib/iwidgets/spinner.rb: ditto. * lib/tkextlib/iwidgets/spinner.rb: ditto.
* ext/tk/lib/tkextlib/iwidgets/toolbar.rb: ditto. * lib/tkextlib/iwidgets/toolbar.rb: ditto.
* ext/tk/lib/tkextlib/tkimg/pixmap.rb: ditto. * lib/tkextlib/tkimg/pixmap.rb: ditto.
* ext/tk/lib/tkextlib/tktable/tktable.rb: ditto. * lib/tkextlib/tktable/tktable.rb: ditto.
2005-08-06 ocean <ocean@ruby-lang.org> 2005-08-06 ocean <ocean@ruby-lang.org>

2
ext/tk/lib/tk.rb
View File

@ -4499,7 +4499,7 @@ end
#Tk.freeze #Tk.freeze
module Tk module Tk
RELEASE_DATE = '2005-11-18'.freeze RELEASE_DATE = '2005-11-19'.freeze
autoload :AUTO_PATH, 'tk/variable' autoload :AUTO_PATH, 'tk/variable'
autoload :TCL_PACKAGE_PATH, 'tk/variable' autoload :TCL_PACKAGE_PATH, 'tk/variable'

29
ext/tk/lib/tk/font.rb
View File

@ -488,6 +488,19 @@ class TkFont
create_compoundfont(ltn, knj, keys) create_compoundfont(ltn, knj, keys)
end end
def initialize_copy(font)
unless font.kind_of?(TkFont)
fail TypeError, '"initialize_copy should take same class object'
end
if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
keys = {}
font.configinfo.each{|key,value| keys[key] = value }
initialize(font.latin_font_id, font.kanji_font_id, keys)
else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
initialize(font.latin_font_id, font.kanji_font_id, font.configinfo)
end
end
def _get_font_info_from_hash(font) def _get_font_info_from_hash(font)
font = _symbolkey2str(font) font = _symbolkey2str(font)
foundry = (info = font['foundry'] .to_s)? info: '*' foundry = (info = font['foundry'] .to_s)? info: '*'
@ -1184,24 +1197,12 @@ class TkFont
################################### ###################################
=begin =begin
def dup def dup
src = self TkFont.new(self)
obj = super()
obj.funcall(:initialize, src)
obj
end end
def clone def clone
src = self TkFont.new(self)
obj = super()
obj.funcall(:initialize, src)
obj
end end
=end =end
def dup
TkFont.new(self)
end
def clone
TkFont.new(self)
end
end end
module TkFont::CoreMethods module TkFont::CoreMethods

22
ext/tk/lib/tkextlib/ICONS/icons.rb
View File

@ -75,14 +75,26 @@ module Tk
########################################## ##########################################
def self.new(name, keys=nil) class << self
unless obj = Tk_IMGTBL["::icon::#{name}"] alias _new new
obj = allocate()
obj.funcall(:initialize, name, keys) def new(name, keys=nil)
if obj = Tk_IMGTBL["::icon::#{name}"]
if keys
keys = _symbolkey2str(keys)
unless keys.delete('without_creating')
tk_call('::icons::icons', 'create', *(hash_kv(keys) << obj.name))
end
end
else
obj = _new(name, keys)
end
obj
end end
obj
end end
##########################################
def initialize(name, keys=nil) def initialize(name, keys=nil)
if name.kind_of?(String) && name =~ /^::icon::(.+)$/ if name.kind_of?(String) && name =~ /^::icon::(.+)$/
@name = $1 @name = $1

5
ext/tk/sample/tkextlib/treectrl/demo.rb
View File

@ -709,8 +709,11 @@ class TkTreeCtrl_demo
systemHighlight = @SystemHighlight systemHighlight = @SystemHighlight
systemHighlightText = @SystemHighlightText systemHighlightText = @SystemHighlightText
def master._pub_display_styles_in_item(item)
display_styles_in_item(item)
end
proc_disp_styles_in_item = proc{|item| proc_disp_styles_in_item = proc{|item|
master.funcall(:display_styles_in_item, item) master._pub_display_styles_in_item(item)
} }
@demo_scripts.instance_eval{ @demo_scripts.instance_eval{