* ext/tk/extconf.rb: New strategy for searching Tcl/Tk libraries.

* ext/tk/*: Support new features of Tcl/Tk8.6b1 and minor bug fixes.
     ( [KNOWN BUG] Ruby/Tk on Ruby 1.9 will not work on Cygwin. )
* ext/tk/*: Unify sources between Ruby 1.8 & 1.9.
            Improve default_widget_set handling.
* ext/tk/*: Multi-TkInterpreter (multi-tk.rb) works on Ruby 1.8 & 1.9.
     ( [KNOWN BUG] On Ruby 1.8, join to a long term Thread on Tk
       callbacks may freeze. On Ruby 1.9, cannot create a second 
       master interpreter (creating slaves are OK); supported master
       interpreter is the default master interpreter only. )
* ext/tk/lib/tkextlib/*: Update supported versions of Tk extensions.
         Tcllib 1.8/Tklib 0.4.1  ==>  Tcllib 1.11.1/Tklib 0.5
         BWidgets 1.7            ==>  BWidgets 1.8
         TkTable 2.9             ==>  TkTable 2.10
         TkTreeCtrl 2005-12-02   ==>  TkTreeCtrl 2.2.9
         Tile 0.8.0/8.5.1        ==>  Tile 0.8.3/8.6b1
         IncrTcl 2005-02-14      ==>  IncrTcl 2008-12-15
         TclX 2005-02-07         ==>  TclX 2008-12-15
         Trofs 0.4.3             ==>  Trofs 0.4.4


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 52 insertions, 38 deletions

diff --git a/ext/tk/sample/tkballoonhelp.rb b/ext/tk/sample/tkballoonhelp.rb
index fc99753b81..a9bd371db6 100644
--- a/ext/tk/sample/tkballoonhelp.rb
+++ b/ext/tk/sample/tkballoonhelp.rb
@@ -7,11 +7,21 @@
 # please try to use the Tix extension of Tcl/Tk under Ruby/Tk.
 #
 # The interval time to display a balloon help is defined 'interval' option
-# (default is 1000ms).
+# (default is 750ms).
 #
 require 'tk'
 
-class TkBalloonHelp<TkLabel
+module Tk
+  module RbWidget
+    class BalloonHelp<TkLabel
+    end
+  end
+end
+class Tk::RbWidget::BalloonHelp<TkLabel
+  DEFAULT_FOREGROUND = 'black'
+  DEFAULT_BACKGROUND = 'white'
+  DEFAULT_INTERVAL   = 750
+
   def _balloon_binding(interval)
     @timer = TkAfter.new(interval, 1, proc{show})
     def @timer.interval(val)
@@ -50,10 +60,13 @@ class TkBalloonHelp<TkLabel
 
     @command = keys.delete('command')
 
-    @interval = keys.delete('interval'){1000}
+    @interval = keys.delete('interval'){DEFAULT_INTERVAL}
     _balloon_binding(@interval)
 
-    @label = TkLabel.new(@frame, 'background'=>'bisque').pack
+    # @label = TkLabel.new(@frame, 'background'=>'bisque').pack
+    @label = TkLabel.new(@frame, 
+                         'foreground'=>DEFAULT_FOREGROUND, 
+                         'background'=>DEFAULT_BACKGROUND).pack
     @label.configure(_symbolkey2str(keys)) unless keys.empty?
     @path = @label
   end
@@ -118,41 +131,42 @@ end
 if __FILE__ == $0
   TkButton.new('text'=>'This button has a balloon help') {|b|
     pack('fill'=>'x')
-    TkBalloonHelp.new(b, 'text'=>' Message ')
+    Tk::RbWidget::BalloonHelp.new(b, 'text'=>' Message ')
   }
   TkButton.new('text'=>'This button has another balloon help') {|b|
     pack('fill'=>'x')
-    TkBalloonHelp.new(b, 'text'=>'configured message',
-                      'interval'=>200, 'font'=>'courier',
-                      'background'=>'gray', 'foreground'=>'red')
+    Tk::RbWidget::BalloonHelp.new(b, 
+                        'text'=>"CONFIGURED MESSAGE\nchange colors, and so on",
+                        'interval'=>200, 'font'=>'courier',
+                        'background'=>'gray', 'foreground'=>'red')
   }
 
   sb = TkScrollbox.new.pack(:fill=>:x)
   sb.insert(:end, *%w(aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk lll mmm))
 =begin
   # CASE1 : command takes no arguemnt
-  bh = TkBalloonHelp.new(sb, :interval=>500,
-                         :relief=>:ridge, :background=>'white',
-                         :command=>proc{
-                           y = TkWinfo.pointery(sb) - TkWinfo.rooty(sb)
-                           bh.text "current index == #{sb.nearest(y)}"
-                         })
+  bh = Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
+                           :relief=>:ridge, :background=>'white',
+                           :command=>proc{
+                             y = TkWinfo.pointery(sb) - TkWinfo.rooty(sb)
+                             bh.text "current index == #{sb.nearest(y)}"
+                           })
 =end
 =begin
   # CASE2 : command takes 2 arguemnts
-  bh = TkBalloonHelp.new(sb, :interval=>500,
-                         :relief=>:ridge, :background=>'white',
-                         :command=>proc{|x, y|
-                           bh.text "current index == #{sb.nearest(y)}"
-                         })
+  bh = Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
+                           :relief=>:ridge, :background=>'white',
+                           :command=>proc{|x, y|
+                             bh.text "current index == #{sb.nearest(y)}"
+                           })
 =end
 =begin
   # CASE3 : command takes 3 arguemnts
-  TkBalloonHelp.new(sb, :interval=>500,
-                    :relief=>:ridge, :background=>'white',
-                    :command=>proc{|x, y, bhelp|
-                      bhelp.text "current index == #{sb.nearest(y)}"
-                    })
+  Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
+                      :relief=>:ridge, :background=>'white',
+                      :command=>proc{|x, y, bhelp|
+                        bhelp.text "current index == #{sb.nearest(y)}"
+                      })
 =end
 =begin
   # CASE4a : command is a Proc object and takes 4 arguemnts
@@ -160,16 +174,16 @@ if __FILE__ == $0
     bhelp.text "current index == #{parent.nearest(y)}"
   }
 
-  TkBalloonHelp.new(sb, :interval=>500,
-                    :relief=>:ridge, :background=>'white',
-                    :command=>cmd)
+  Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
+                      :relief=>:ridge, :background=>'white',
+                      :command=>cmd)
 
   sb2 = TkScrollbox.new.pack(:fill=>:x)
   sb2.insert(:end, *%w(AAA BBB CCC DDD EEE FFF GGG HHH III JJJ KKK LLL MMM))
-  TkBalloonHelp.new(sb2, :interval=>500,
-                    :padx=>5, :relief=>:raised,
-                    :background=>'gray25', :foreground=>'white',
-                    :command=>cmd)
+  Tk::RbWidget::BalloonHelp.new(sb2, :interval=>500,
+                      :padx=>5, :relief=>:raised,
+                      :background=>'gray25', :foreground=>'white',
+                      :command=>cmd)
 =end
 #=begin
   # CASE4b : command is a Method object and takes 4 arguemnts
@@ -178,16 +192,16 @@ if __FILE__ == $0
   end
   cmd = self.method(:set_msg)
 
-  TkBalloonHelp.new(sb, :interval=>500,
-                    :relief=>:ridge, :background=>'white',
-                    :command=>cmd)
+  Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
+                                :relief=>:ridge, :background=>'white',
+                                :command=>cmd)
 
   sb2 = TkScrollbox.new.pack(:fill=>:x)
   sb2.insert(:end, *%w(AAA BBB CCC DDD EEE FFF GGG HHH III JJJ KKK LLL MMM))
-  TkBalloonHelp.new(sb2, :interval=>500,
-                    :padx=>5, :relief=>:raised,
-                    :background=>'gray25', :foreground=>'white',
-                    :command=>cmd)
+  Tk::RbWidget::BalloonHelp.new(sb2, :interval=>500,
+                                :padx=>5, :relief=>:raised,
+                                :background=>'gray25', :foreground=>'white',
+                                :command=>cmd)
 #=end
 
   Tk.mainloop