mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00

* ext/tk/tcltklib.c: avoid error on a shared object. * ext/tk/extconf.rb: support --with-tcltkversion * ext/tk/README.tcltklib: add document about --with-tcltkversion * ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb, ext/tk/lib/remote-tk.rb: not work on $SAFE==4 * ext/tk/lib/multi-tk.rb: Object#methods returns Symbols on Ruby1.9. * ext/tk/lib/tk/timer.rb: add TkTimer#at_end(proc) to register the procedure which called at end of the timer. * ext/tk/lib/tk.rb, ext/tk/lib/tk/itemfont.rb, ext/tk/lib/font.rb: support __IGNORE_UNKNOWN_CONFIGURE_OPTION__ about font options. * ext/tk/lib/*: treat __IGNORE_UNKNOWN_CONFIGURE_OPTION__ * ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb, ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb, ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: bug fix. * ext/tk/lib/tk/text.rb: typo. call a wrong method. * ext/tk/lib/tk/itemconfig.rb: ditto. * ext/tk/lib/tk.rb, ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/canvas.rb: support alias names of option keys. * ext/tk/lib/tk/grid.rb: lack of module-method definitions. * ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase supported parameter patterns of configure method. * ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row. * ext/tk/lib/tk/wm.rb: methods of Tk::Wm_for_General module cannot pass the given block to methods of Tk::Wm module. * ext/tk/lib/tk/wm.rb: Wm#overrideredirect overwrites arguemnt to an invalid value. * ext/tk/lib/tk.rb: fix memory (object) leak bug. * ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: fix memory leak. * ext/tk/sample/demos-jp/aniwave.rb, ext/tk/sample/demos-en/aniwave.rb: bug fix. * ext/tk/lib/tkextlib/blt/component.rb, ext/tk/lib/tkextlib/tile/tentry.rb, ext/tk/lib/tkextlib/tile/treeview.rb: ditto. * ext/tk/lib/tkextlib/tile/tpaned.rb: improve TPaned#add. * ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/style.rb, ext/tk/sample/demos-en/style.rb, ext/tk/sample/demos-jp/bind.rb, ext/tk/sample/demos-en/bind.rb: bug fix. * ext/tk/sample/ttk_wrapper.rb: ditto. * ext/tk/sample/ttk_wrapper.rb: support "if __FILE__ == $0" idiom. * ext/tk/sample/tktextio.rb: add binding for 'Ctrl-u' at console mode. * ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, ext/tk/sample/ttk_wrapper.rb: improve treating and control themes. add Tk::Tile.themes and Tk::Tile.set_theme(theme). * ext/tk/lib/tkextlib/tile.rb: lack of autoload definitions. * ext/tk/lib/tkextlib/tile/tnotebook.rb: cannot use kanji (not UTF-8) characters for headings. * ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name. * ext/tk/tkutil/tkutil.c: improve handling callback-subst-keys. Now, support longnam-keys (e.g. '%CTT' on tkdnd-2.0; however, still not support tkdnd-2.0 on tkextlib), and symbols of parameters (e.g. :widget=>'%W', :keycode=>'%k', '%x'=>:x, '%X'=>:root_x, and so on; those are attributes of event object). It means that Ruby/Tk accepts not only "widget.bind(ev, '%W', '%k', ...){|w, k, ...| ... }", but also "widget.bind(ev, :widget, :keycode, ...){|w, k, ...| ... }". It is potentially incompatible, when user passes symbols to the arguments of the callback block (the block receives the symbols as strings). I think that is very rare case (probably, used by Ruby/Tk experts only). When causes such trouble, please give strings instead of such symbol parameters (e.g. call Symbol#to_s method). * ext/tk/lib/tk/event.rb, ext/tk/lib/tk/validation.rb, ext/tk/lib/tkextlib/blt/treeview.rb, ext/tk/lib/tkextlib/winico/winico.rb: ditto. * ext/tk/tkutil/tkutil.c: strings are available on subst_tables on TkUtil::CallbackSubst class (it is useful on Ruby 1.9). * ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tkextlib/iwidgets/hierarchy.rb, ext/tk/lib/tkextlib/iwidgets/spinner.rb, ext/tk/lib/tkextlib/iwidgets/entryfield.rb, ext/tk/lib/tkextlib/iwidgets/calendar.rb, ext/tk/lib/tkextlib/blt/dragdrop.rb, ext/tk/lib/tkextlib/tkDND/tkdnd.rb, ext/tk/lib/tkextlib/treectrl/tktreectrl.rb, ext/tk/lib/tkextlib/tktable/tktable.rb: disable code piece became unnecessary by reason of the changes of ext/tk/tkutil/tkutil.c. * ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb: change strategy to define the constant WITH_ENCODING. * ext/tk/lib/tk.rb: fix bug on Tk::Encoding.tk_encoding_names. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
262 lines
6.9 KiB
Ruby
262 lines
6.9 KiB
Ruby
#
|
|
# tk/toplevel.rb : treat toplevel widget
|
|
#
|
|
require 'tk'
|
|
require 'tk/wm'
|
|
require 'tk/menuspec'
|
|
|
|
class Tk::Toplevel<TkWindow
|
|
include Wm
|
|
include TkMenuSpec
|
|
|
|
TkCommandNames = ['toplevel'.freeze].freeze
|
|
WidgetClassName = 'Toplevel'.freeze
|
|
WidgetClassNames[WidgetClassName] = self
|
|
|
|
################# old version
|
|
# def initialize(parent=nil, screen=nil, classname=nil, keys=nil)
|
|
# if screen.kind_of? Hash
|
|
# keys = screen.dup
|
|
# else
|
|
# @screen = screen
|
|
# end
|
|
# @classname = classname
|
|
# if keys.kind_of? Hash
|
|
# keys = keys.dup
|
|
# @classname = keys.delete('classname') if keys.key?('classname')
|
|
# @colormap = keys.delete('colormap') if keys.key?('colormap')
|
|
# @container = keys.delete('container') if keys.key?('container')
|
|
# @screen = keys.delete('screen') if keys.key?('screen')
|
|
# @use = keys.delete('use') if keys.key?('use')
|
|
# @visual = keys.delete('visual') if keys.key?('visual')
|
|
# end
|
|
# super(parent, keys)
|
|
# end
|
|
#
|
|
# def create_self
|
|
# s = []
|
|
# s << "-class" << @classname if @classname
|
|
# s << "-colormap" << @colormap if @colormap
|
|
# s << "-container" << @container if @container
|
|
# s << "-screen" << @screen if @screen
|
|
# s << "-use" << @use if @use
|
|
# s << "-visual" << @visual if @visual
|
|
# tk_call 'toplevel', @path, *s
|
|
# end
|
|
#################
|
|
|
|
def __boolval_optkeys
|
|
super() << 'container'
|
|
end
|
|
private :__boolval_optkeys
|
|
|
|
def __strval_optkeys
|
|
super() << 'screen'
|
|
end
|
|
private :__strval_optkeys
|
|
|
|
def __val2ruby_optkeys # { key=>proc, ... }
|
|
super().update('menu'=>proc{|v| window(v)})
|
|
end
|
|
private :__val2ruby_optkeys
|
|
|
|
def __methodcall_optkeys # { key=>method, ... }
|
|
TOPLEVEL_METHODCALL_OPTKEYS
|
|
end
|
|
private :__methodcall_optkeys
|
|
|
|
def _wm_command_option_chk(keys)
|
|
keys = {} unless keys
|
|
new_keys = {}
|
|
wm_cmds = {}
|
|
|
|
conf_methods = _symbolkey2str(__methodcall_optkeys())
|
|
|
|
keys.each{|k,v| # k is a String
|
|
if conf_methods.key?(k)
|
|
wm_cmds[conf_methods[k]] = v
|
|
elsif Wm.method_defined?(k)
|
|
case k
|
|
when 'screen','class','colormap','container','use','visual'
|
|
new_keys[k] = v
|
|
else
|
|
case self.method(k).arity
|
|
when -1,1
|
|
wm_cmds[k] = v
|
|
else
|
|
new_keys[k] = v
|
|
end
|
|
end
|
|
else
|
|
new_keys[k] = v
|
|
end
|
|
}
|
|
[new_keys, wm_cmds]
|
|
end
|
|
private :_wm_command_option_chk
|
|
|
|
def initialize(parent=nil, screen=nil, classname=nil, keys=nil)
|
|
my_class_name = nil
|
|
if self.class < WidgetClassNames[WidgetClassName]
|
|
my_class_name = self.class.name
|
|
my_class_name = nil if my_class_name == ''
|
|
end
|
|
if parent.kind_of? Hash
|
|
keys = _symbolkey2str(parent)
|
|
if keys.key?('classname')
|
|
keys['class'] = keys.delete('classname')
|
|
end
|
|
@classname = keys['class']
|
|
@colormap = keys['colormap']
|
|
@container = keys['container']
|
|
@screen = keys['screen']
|
|
@use = keys['use']
|
|
@visual = keys['visual']
|
|
if !@classname && my_class_name
|
|
keys['class'] = @classname = my_class_name
|
|
end
|
|
if @classname.kind_of? TkBindTag
|
|
@db_class = @classname
|
|
keys['class'] = @classname = @classname.id
|
|
elsif @classname
|
|
@db_class = TkDatabaseClass.new(@classname)
|
|
keys['class'] = @classname
|
|
else
|
|
@db_class = self.class
|
|
@classname = @db_class::WidgetClassName
|
|
end
|
|
keys, cmds = _wm_command_option_chk(keys)
|
|
super(keys)
|
|
cmds.each{|k,v|
|
|
if v.kind_of? Array
|
|
self.__send__(k,*v)
|
|
else
|
|
self.__send__(k,v)
|
|
end
|
|
}
|
|
return
|
|
end
|
|
|
|
if screen.kind_of? Hash
|
|
keys = screen
|
|
else
|
|
@screen = screen
|
|
if classname.kind_of? Hash
|
|
keys = classname
|
|
else
|
|
@classname = classname
|
|
end
|
|
end
|
|
if keys.kind_of? Hash
|
|
keys = _symbolkey2str(keys)
|
|
if keys.key?('classname')
|
|
keys['class'] = keys.delete('classname')
|
|
end
|
|
@classname = keys['class'] unless @classname
|
|
@colormap = keys['colormap']
|
|
@container = keys['container']
|
|
@screen = keys['screen'] unless @screen
|
|
@use = keys['use']
|
|
@visual = keys['visual']
|
|
else
|
|
keys = {}
|
|
end
|
|
if !@classname && my_class_name
|
|
keys['class'] = @classname = my_class_name
|
|
end
|
|
if @classname.kind_of? TkBindTag
|
|
@db_class = @classname
|
|
keys['class'] = @classname = @classname.id
|
|
elsif @classname
|
|
@db_class = TkDatabaseClass.new(@classname)
|
|
keys['class'] = @classname
|
|
else
|
|
@db_class = self.class
|
|
@classname = @db_class::WidgetClassName
|
|
end
|
|
keys, cmds = _wm_command_option_chk(keys)
|
|
super(parent, keys)
|
|
cmds.each{|k,v|
|
|
if v.kind_of? Array
|
|
self.send(k,*v)
|
|
else
|
|
self.send(k,v)
|
|
end
|
|
}
|
|
end
|
|
|
|
#def create_self(keys)
|
|
# if keys and keys != None
|
|
# tk_call_without_enc('toplevel', @path, *hash_kv(keys, true))
|
|
# else
|
|
# tk_call_without_enc('toplevel', @path)
|
|
# end
|
|
#end
|
|
#private :create_self
|
|
|
|
def specific_class
|
|
@classname
|
|
end
|
|
|
|
def add_menu(menu_info, tearoff=false, opts=nil)
|
|
# See tk/menuspec.rb for menu_info.
|
|
# opts is a hash of default configs for all of cascade menus.
|
|
# Configs of menu_info can override it.
|
|
if tearoff.kind_of?(Hash)
|
|
opts = tearoff
|
|
tearoff = false
|
|
end
|
|
_create_menubutton(self, menu_info, tearoff, opts)
|
|
end
|
|
|
|
def add_menubar(menu_spec, tearoff=false, opts=nil)
|
|
# See tk/menuspec.rb for menu_spec.
|
|
# opts is a hash of default configs for all of cascade menus.
|
|
# Configs of menu_spec can override it.
|
|
menu_spec.each{|info| add_menu(info, tearoff, opts)}
|
|
self.menu
|
|
end
|
|
|
|
def self.database_class
|
|
if self == WidgetClassNames[WidgetClassName] || self.name == ''
|
|
self
|
|
else
|
|
TkDatabaseClass.new(self.name)
|
|
end
|
|
end
|
|
def self.database_classname
|
|
self.database_class.name
|
|
end
|
|
|
|
def self.bind(*args, &b)
|
|
if self == WidgetClassNames[WidgetClassName] || self.name == ''
|
|
super(*args, &b)
|
|
else
|
|
TkDatabaseClass.new(self.name).bind(*args, &b)
|
|
end
|
|
end
|
|
def self.bind_append(*args, &b)
|
|
if self == WidgetClassNames[WidgetClassName] || self.name == ''
|
|
super(*args, &b)
|
|
else
|
|
TkDatabaseClass.new(self.name).bind_append(*args, &b)
|
|
end
|
|
end
|
|
def self.bind_remove(*args)
|
|
if self == WidgetClassNames[WidgetClassName] || self.name == ''
|
|
super(*args)
|
|
else
|
|
TkDatabaseClass.new(self.name).bind_remove(*args)
|
|
end
|
|
end
|
|
def self.bindinfo(*args)
|
|
if self == WidgetClassNames[WidgetClassName] || self.name == ''
|
|
super(*args)
|
|
else
|
|
TkDatabaseClass.new(self.name).bindinfo(*args)
|
|
end
|
|
end
|
|
end
|
|
|
|
#TkToplevel = Tk::Toplevel unless Object.const_defined? :TkToplevel
|
|
Tk.__set_toplevel_aliases__(:Tk, Tk::Toplevel, :TkToplevel)
|