1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
ruby--ruby/ext/tk/lib/tkextlib/iwidgets/menubar.rb
nagai e6697a6405 * ext/tk/tcltklib.c: SEGV when tcltk-stubs is enabled.
* 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
2008-06-10 20:59:10 +00:00

211 lines
4.4 KiB
Ruby

#
# tkextlib/iwidgets/menubar.rb
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
#
require 'tk'
require 'tkextlib/iwidgets.rb'
module Tk
module Iwidgets
class Menubar < Tk::Itk::Widget
end
end
end
class Tk::Iwidgets::Menubar
TkCommandNames = ['::iwidgets::menubar'.freeze].freeze
WidgetClassName = 'Menubar'.freeze
WidgetClassNames[WidgetClassName] = self
def __strval_optkeys
super() << 'menubuttons'
end
private :__strval_optkeys
def __tkvariable_optkeys
super() << 'helpvariable'
end
private :__tkvariable_optkeys
####################################
include TkItemConfigMethod
def __item_cget_cmd(id)
[self.path, 'menucget', id]
end
private :__item_cget_cmd
def __item_config_cmd(id)
[self.path, 'menuconfigure', id]
end
private :__item_config_cmd
def __item_strval_optkeys(id)
super(id) << 'selectcolor'
end
private :__item_strval_optkeys
def __item_tkvariable_optkeys(id)
super(id) << 'helpstr'
end
private :__item_tkvariable_optkeys
def tagid(tagOrId)
if tagOrId.kind_of?(Tk::Itk::Component)
tagOrId.name
else
#_get_eval_string(tagOrId)
tagOrId
end
end
alias menucget itemcget
alias menucget_strict itemcget_strict
alias menuconfigure itemconfigure
alias menuconfiginfo itemconfiginfo
alias current_menuconfiginfo current_itemconfiginfo
private :itemcget, :itemcget_strict
private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
####################################
def __methodcall_optkeys
{'menubuttons'=>'menubuttons'}
end
def menubuttons(val = nil)
unless val
return tk_call(@path, 'cget', '-menubuttons')
end
tk_call(@path, 'configure', '-menubuttons', _parse_menu_spec(val))
self
end
def _parse_menu_spec(menu_spec)
ret = ''
menu_spec.each{|spec|
next unless spec
if spec.kind_of?(Hash)
args = [spec]
type = 'options'
else
type, *args = spec
end
type = type.to_s
case type
when 'options'
keys = args[0]
ary = [type]
ary.concat(hash_kv(keys))
ret << array2tk_list(ary) << "\n"
when 'menubutton', 'cascade'
name, keys = args
if keys
ary = [type, name]
keys = _symbolkey2str(keys)
keys['menu'] = _parse_menu_spec(keys['menu']) if keys.key?('menu')
ary.concat(hash_kv(keys))
ret << array2tk_list(ary) << "\n"
else
ret << array2tk_list([type, name]) << "\n"
end
else
name, keys = args
if keys
ary = [type, name]
ary.concat(hash_kv(keys))
ret << array2tk_list(ary) << "\n"
else
ret << array2tk_list([type, name]) << "\n"
end
end
}
ret
end
####################################
def add(type, tag=nil, keys={})
if tag.kind_of?(Hash)
keys = tag
tag = nil
end
if tag
tag = Tk::Itk::Component.new(self, tagid(tag))
else
tag = Tk::Itk::Component.new(self)
end
keys = _symbolkey2str(keys)
keys['menu'] = _parse_menu_spec(keys['menu']) if keys.key?('menu')
tk_call(@path, 'add', type, tagid(tag), *hash_kv(keys))
tag
end
def delete(path1, path2=nil)
if path2
else
tk_call(@path, 'delete', index(idx))
end
self
end
def index(idx)
number(tk_call(@path, 'index', tagid(idx)))
end
def insert(idx, type, tag=nil, keys={})
if tag.kind_of?(Hash)
keys = tag
tag = nil
end
if tag
tag = Tk::Itk::Component.new(self, tagid(tag))
else
tag = Tk::Itk::Component.new(self)
end
keys = _symbolkey2str(keys)
keys['menu'] = _parse_menu_spec(keys['menu']) if keys.key?('menu')
tk_call(@path, 'insert', index(idx), type, tagid(tag), *hash_kv(keys))
tag
end
def invoke(idx)
tk_call(@path, 'invoke', index(idx))
self
end
def menupath(pat)
if (win = tk_call(@path, 'path', pat)) == '-1'
return nil
end
window(win)
end
def menupath_glob(pat)
if (win = tk_call(@path, 'path', '-glob', pat)) == '-1'
return nil
end
window(win)
end
def menupath_tclregexp(pat)
if (win = tk_call(@path, 'path', '-regexp', pat)) == '-1'
return nil
end
window(win)
end
def type(path)
tk_call(@path, 'type', path)
end
def yposition(path)
number(tk_call(@path, 'yposition', path))
end
end