diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-14 04:25:11 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-14 04:25:11 +0000 |
commit | 906d408e7c2212d450af8b3be1ea30258ebe8633 (patch) | |
tree | 43212608bbabe9ee3cdb7c438e39f22cccb2a040 | |
parent | 810e7938fd12989db83b59a3c2e467f400e0480a (diff) | |
download | ruby-906d408e7c2212d450af8b3be1ea30258ebe8633.tar.gz |
* ext/tcltklib/tcltklib.c: fix (en-bugged at 2003/11/07)
* ext/tk/lib/tkdialog.rb: TkDialog.new accepts the parent widget [ruby-talk:85066]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ext/tcltklib/tcltklib.c | 4 | ||||
-rw-r--r-- | ext/tk/lib/tk.rb | 1 | ||||
-rw-r--r-- | ext/tk/lib/tkdialog.rb | 21 |
4 files changed, 21 insertions, 12 deletions
@@ -1,3 +1,10 @@ +Fri Nov 14 13:21:30 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tcltklib/tcltklib.c: fix (en-bugged at 2003/11/07) + + * ext/tk/lib/tkdialog.rb: TkDialog.new accepts a parent widget + argument [ruby-talk:85066] + Thu Nov 13 20:53:35 2003 Tanaka Akira <akr@m17n.org> * lib/open-uri.rb (Kernel[#.]open): hard coded URI schemes removed. diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c index a49bd7c7f6..d20c24eb22 100644 --- a/ext/tcltklib/tcltklib.c +++ b/ext/tcltklib/tcltklib.c @@ -461,9 +461,7 @@ lib_eventloop_core(check_root, check_var) } } - found_event = Tcl_DoOneEvent(TCL_ALL_EVENTS | TCL_DONT_WAIT); - - if (found_event) { + if (Tcl_DoOneEvent(TCL_ALL_EVENTS | TCL_DONT_WAIT)) { tick_counter++; } else { tick_counter += no_event_tick; diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index dffa918f58..9c7a0982c2 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -3943,7 +3943,6 @@ class TkWindow<TkObject def initialize(parent=nil, keys=nil) if parent.kind_of? Hash keys = _symbolkey2str(parent) - keydup = true parent = keys.delete('parent') widgetname = keys.delete('widgetname') install_win(if parent then parent.path end, widgetname) diff --git a/ext/tk/lib/tkdialog.rb b/ext/tk/lib/tkdialog.rb index febe470376..8ac598c605 100644 --- a/ext/tk/lib/tkdialog.rb +++ b/ext/tk/lib/tkdialog.rb @@ -48,9 +48,7 @@ class TkDialog2 < TkWindow private :_set_button_config # initialize tk_dialog - def initialize(keys = nil) - super() - + def create_self(keys) @var = TkVariable.new @title = title @@ -74,7 +72,6 @@ class TkDialog2 < TkWindow @command = nil if keys.kind_of? Hash - keys = _symbolkey2str(keys) @title = keys['title'] if keys.key? 'title' @message = keys['message'] if keys.key? 'message' @bitmap = keys['bitmap'] if keys.key? 'bitmap' @@ -230,8 +227,16 @@ end # dialog for warning # class TkWarning2 < TkDialog2 - def initialize(mes) - super(:message=>mes) + def initialize(parent = nil, mes = nil) + if !mes + if parent.kind_of? TkWindow + mes = "" + else + mes = parent.to_s + parent = nil + end + end + super(parent, :message=>mes) end def show(mes = nil) @@ -263,8 +268,8 @@ class TkWarning < TkWarning2 def self.show(*args) self.new(*args) end - def initialize(mes) - super(mes) + def initialize(*args) + super(*args) show end end |