mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
e6697a6405
* 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
192 lines
4.2 KiB
Ruby
192 lines
4.2 KiB
Ruby
#
|
|
# tkextlib/bwidget/messagedlg.rb
|
|
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
|
|
#
|
|
|
|
require 'tk'
|
|
require 'tkextlib/bwidget.rb'
|
|
require 'tkextlib/bwidget/dialog.rb'
|
|
|
|
module Tk
|
|
module BWidget
|
|
class MessageDlg < TkWindow
|
|
end
|
|
end
|
|
end
|
|
|
|
class Tk::BWidget::MessageDlg
|
|
TkCommandNames = ['MessageDlg'.freeze].freeze
|
|
WidgetClassName = 'MessageDlg'.freeze
|
|
WidgetClassNames[WidgetClassName] = self
|
|
|
|
def initialize(parent=nil, keys=nil)
|
|
@relative = ''
|
|
if parent.kind_of?(Hash)
|
|
keys = _symbolkey2str(parent)
|
|
@relative = keys['parent'] if keys.key?('parent')
|
|
@relative = keys.delete('relative') if keys.key?('relative')
|
|
super(keys)
|
|
elsif keys
|
|
keys = _symbolkey2str(keys)
|
|
@relative = keys.delete('parent') if keys.key?('parent')
|
|
@relative = keys.delete('relative') if keys.key?('relative')
|
|
super(parent, keys)
|
|
else
|
|
super(parent)
|
|
end
|
|
end
|
|
|
|
def create_self(keys)
|
|
# NOT create widget.
|
|
# Because the widget no longer exist when returning from creation.
|
|
@keys = _symbolkey2str(keys).update('parent'=>@relative)
|
|
@info = nil
|
|
end
|
|
private :create_self
|
|
|
|
def __strval_optkeys
|
|
super() << 'message' << 'title'
|
|
end
|
|
private :__strval_optkeys
|
|
|
|
def __listval_optkeys
|
|
super() << 'buttons'
|
|
end
|
|
private :__listval_optkeys
|
|
|
|
def cget(slot)
|
|
slot = slot.to_s
|
|
if slot == 'relative'
|
|
slot = 'parent'
|
|
end
|
|
if winfo_exist?
|
|
val = super(slot)
|
|
@keys[slot] = val
|
|
end
|
|
@keys[slot]
|
|
end
|
|
def cget_strict(slot)
|
|
slot = slot.to_s
|
|
if slot == 'relative'
|
|
slot = 'parent'
|
|
end
|
|
if winfo_exist?
|
|
val = super(slot)
|
|
@keys[slot] = val
|
|
end
|
|
@keys[slot]
|
|
end
|
|
|
|
def configure(slot, value=None)
|
|
if winfo_exist?
|
|
super(slot, value)
|
|
end
|
|
if slot.kind_of?(Hash)
|
|
slot = _symbolkey2str(slot)
|
|
slot['parent'] = slot.delete('relative') if slot.key?('relative')
|
|
@keys.update(slot)
|
|
|
|
if @info
|
|
# update @info
|
|
slot.each{|k, v|
|
|
if TkComm::GET_CONFIGINFO_AS_ARRAY
|
|
if (inf = @info.assoc(k))
|
|
inf[-1] = v
|
|
else
|
|
@info << [k, '', '', '', v]
|
|
end
|
|
else
|
|
if (inf = @info[k])
|
|
inf[-1] = v
|
|
else
|
|
@info[k] = ['', '', '', v]
|
|
end
|
|
end
|
|
}
|
|
end
|
|
|
|
else # ! Hash
|
|
slot = slot.to_s
|
|
slot = 'parent' if slot == 'relative'
|
|
@keys[slot] = value
|
|
|
|
if @info
|
|
# update @info
|
|
if TkComm::GET_CONFIGINFO_AS_ARRAY
|
|
if (inf = @info.assoc(slot))
|
|
inf[-1] = value
|
|
else
|
|
@info << [slot, '', '', '', value]
|
|
end
|
|
else
|
|
if (inf = @info[slot])
|
|
inf[-1] = value
|
|
else
|
|
@info[slot] = ['', '', '', value]
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
self
|
|
end
|
|
|
|
def configinfo(slot=nil)
|
|
if winfo_exist?
|
|
@info = super()
|
|
if TkComm::GET_CONFIGINFO_AS_ARRAY
|
|
@info << ['relative', 'parent']
|
|
else
|
|
@info['relative'] = 'parent'
|
|
end
|
|
end
|
|
|
|
if TkComm::GET_CONFIGINFO_AS_ARRAY
|
|
if @info
|
|
if winfo_exist?
|
|
# update @keys
|
|
@info.each{|inf| @keys[inf[0]] = inf[-1] if inf.size > 2 }
|
|
end
|
|
else
|
|
@info = []
|
|
@keys.each{|k, v|
|
|
@info << [k, '', '', '', v]
|
|
}
|
|
@info << ['relative', 'parent']
|
|
end
|
|
|
|
if slot
|
|
@info.asoc(slot.to_s).dup
|
|
else
|
|
@info.dup
|
|
end
|
|
|
|
else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
|
|
if @info
|
|
if winfo_exist?
|
|
# update @keys
|
|
@info.each{|k, inf| @keys[k] = inf[-1] if inf.size > 2 }
|
|
end
|
|
else
|
|
@info = {}
|
|
@keys.each{|k, v|
|
|
@info[k] = ['', '', '', v]
|
|
}
|
|
@info['relative'] = 'parent'
|
|
end
|
|
|
|
if slot
|
|
@info[slot.to_s].dup
|
|
else
|
|
@info.dup
|
|
end
|
|
end
|
|
end
|
|
|
|
def create
|
|
# return the index of the pressed button, or nil if it is destroyed
|
|
ret = num_or_str(tk_call(self.class::TkCommandNames[0],
|
|
@path, *hash_kv(@keys)))
|
|
(ret < 0)? nil: ret
|
|
end
|
|
end
|