From 14529fe9a07b7fd57f3f1e00d3547c93f9b6aee9 Mon Sep 17 00:00:00 2001 From: nagai Date: Wed, 30 Jul 2003 07:15:00 +0000 Subject: * bug fix * fix lack of methods for TkEntry * fix reference of uninitialized variables git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/tk/lib/multi-tk.rb | 1 + ext/tk/lib/tk.rb | 5 +++++ ext/tk/lib/tkdialog.rb | 4 ++++ ext/tk/lib/tkentry.rb | 7 +++++++ 4 files changed, 17 insertions(+) (limited to 'ext/tk/lib') diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb index 00d018247..06d21d2f0 100644 --- a/ext/tk/lib/multi-tk.rb +++ b/ext/tk/lib/multi-tk.rb @@ -27,6 +27,7 @@ MultiTkIp_OK.freeze class MultiTkIp # ignore exception on the mainloop + #TclTkLib.mainloop_abort_on_exception = false TclTkLib.mainloop_abort_on_exception = nil ###################################### diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 13e41ece4..7b7b116a1 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -1693,6 +1693,11 @@ class TkVariable @id = Tk_VARIABLE_ID.join Tk_VARIABLE_ID[1].succ! TkVar_ID_TBL[@id] = self + + @trace_var = nil + @trace_elem = nil + @trace_opts = nil + if val == [] INTERP._eval(format('global %s; set %s(0) 0; unset %s(0)', @id, @id, @id)) diff --git a/ext/tk/lib/tkdialog.rb b/ext/tk/lib/tkdialog.rb index b15b79421..febe47037 100644 --- a/ext/tk/lib/tkdialog.rb +++ b/ext/tk/lib/tkdialog.rb @@ -57,6 +57,7 @@ class TkDialog2 < TkWindow @message = message @message_config = message_config + @msgframe_config = msgframe_config @bitmap = bitmap @bitmap_config = message_config @@ -65,10 +66,13 @@ class TkDialog2 < TkWindow @buttons = buttons @button_configs = proc{|num| button_configs(num)} + @btnframe_config = btnframe_config #@config = "puts [winfo children .w0000];" @config = "" + @command = nil + if keys.kind_of? Hash keys = _symbolkey2str(keys) @title = keys['title'] if keys.key? 'title' diff --git a/ext/tk/lib/tkentry.rb b/ext/tk/lib/tkentry.rb index 62b6535ef..ccfb7928a 100644 --- a/ext/tk/lib/tkentry.rb +++ b/ext/tk/lib/tkentry.rb @@ -140,6 +140,9 @@ class TkEntry