From 023a34526bed14f11d66b1e0998de061e34e8a3b Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 31 Jan 2010 22:50:43 +0000
Subject: * ext/tk/tkutil/tkutil.c: fix SEGV on
 TkUtil::CallbackSubst._setup_subst_table. * ext/tk/lib/tk.rb: [ruby1.9] fix
 freeze at exit. * ext/tk/lib/tk.rb: [POTENTIAL INCOMPATIBLE] return
 NoMethodError   for TkWindow#to_ary and to_str. *
 ext/tk/lib/tkextlib/tcllib/plotchart.rb: wrong arguments. *
 ext/tk/sampel/tkballoonhelp.rb: fail to support TkEntry widgets.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/sample/tkballoonhelp.rb | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'ext/tk/sample/tkballoonhelp.rb')

diff --git a/ext/tk/sample/tkballoonhelp.rb b/ext/tk/sample/tkballoonhelp.rb
index a9bd371db6..a9c00d230d 100644
--- a/ext/tk/sample/tkballoonhelp.rb
+++ b/ext/tk/sample/tkballoonhelp.rb
@@ -111,12 +111,24 @@ class Tk::RbWidget::BalloonHelp<TkLabel
     @frame.deiconify
     @frame.raise
 
-    @org_cursor = @parent['cursor']
-    @parent.cursor('crosshair')
+    begin
+      @org_cursor = @parent.cget('cursor')
+    rescue
+      @org_cursor = @parent['cursor']
+    end
+    begin
+      @parent.configure('cursor', 'crosshair')
+    rescue
+      @parent.cursor('crosshair')
+    end
   end
 
   def erase
-    @parent.cursor(@org_cursor)
+    begin
+      @parent.configure('cursor', @org_cursor)
+    rescue
+      @parent.cursor(@org_cursor)
+    end
     @frame.withdraw
   end
 
-- 
cgit v1.2.3