summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-15 02:41:17 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-15 02:41:17 +0000
commit2f13fea889d0a88edcfa3ab649ad9a92d8213229 (patch)
tree772b2603aedb6d917c89f529a4b0b6d4580e4540
parent7cc7f90498105065679f0ef20f2c02a22b78a9e6 (diff)
* ext/tk/lib/tk/dialog.rb: If a dialog does not show up yet,
TkDialogObj#name raises an exception. [ruby-talk:156109] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/tk/lib/tk.rb2
-rw-r--r--ext/tk/lib/tk/dialog.rb13
3 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b904f05c7..33b7f2d8c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 15 11:39:18 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/dialog.rb: If a dialog does not show up yet,
+ TkDialogObj#name raises an exception. [ruby-talk:156109]
+
Thu Sep 15 01:39:19 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/rinda/tuplespace.rb (Rinda::TemplateEntry::initialize): pull
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index c24f209703..5bde46007b 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -4437,7 +4437,7 @@ end
#Tk.freeze
module Tk
- RELEASE_DATE = '2005-09-01'.freeze
+ RELEASE_DATE = '2005-09-15'.freeze
autoload :AUTO_PATH, 'tk/variable'
autoload :TCL_PACKAGE_PATH, 'tk/variable'
diff --git a/ext/tk/lib/tk/dialog.rb b/ext/tk/lib/tk/dialog.rb
index d468c6e8b1..180da101e3 100644
--- a/ext/tk/lib/tk/dialog.rb
+++ b/ext/tk/lib/tk/dialog.rb
@@ -199,13 +199,14 @@ class TkDialogObj < TkWindow
end
def name
- @buttons[@val]
+ (@val)? @buttons[@val]: nil
end
- ######################################################
- # #
- # these methods must be overridden for each dialog #
- # #
- ######################################################
+
+ ############################################################
+ # #
+ # following methods should be overridden for each dialog #
+ # #
+ ############################################################
private
def title