* ext/tk/lib : improve framework of developping Tcl/Tk extension wrappers

* BWidget extension support on Ruby/Tk


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

8 files changed, 77 insertions, 50 deletions

diff --git a/ext/tk/lib/tkextlib/tcllib/autoscroll.rb b/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
index 9c161d7ec9..800a70744c 100644
--- a/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
+++ b/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
@@ -26,17 +26,24 @@
 
 require 'tk'
 require 'tk/scrollbar'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tcllib.rb'
 
 # TkPackage.require('autoscroll', '1.0')
 TkPackage.require('autoscroll')
 
 module Tk
+  module Tcllib
+    module Autoscroll
+      def self.package_version
+	begin
+	  TkPackage.require('autoscroll')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+
   module Scrollable
     def autoscroll(mode = nil)
       case mode
diff --git a/ext/tk/lib/tkextlib/tcllib/ctext.rb b/ext/tk/lib/tkextlib/tcllib/ctext.rb
index 6fa3e2edda..2318235a4d 100644
--- a/ext/tk/lib/tkextlib/tcllib/ctext.rb
+++ b/ext/tk/lib/tkextlib/tcllib/ctext.rb
@@ -8,12 +8,7 @@
 
 require 'tk'
 require 'tk/text'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tcllib.rb'
 
 # TkPackage.require('ctext', '3.1')
 TkPackage.require('ctext')
@@ -21,6 +16,13 @@ TkPackage.require('ctext')
 module Tk
   module Tcllib
     class CText < TkText
+      def self.package_version
+	begin
+	  TkPackage.require('ctext')
+	rescue
+	  ''
+	end
+      end
     end
   end
 end
diff --git a/ext/tk/lib/tkextlib/tcllib/cursor.rb b/ext/tk/lib/tkextlib/tcllib/cursor.rb
index cf4f247209..119b8a143f 100644
--- a/ext/tk/lib/tkextlib/tcllib/cursor.rb
+++ b/ext/tk/lib/tkextlib/tcllib/cursor.rb
@@ -7,17 +7,24 @@
 #
 
 require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tcllib.rb'
 
 # TkPackage.require('cursor', '0.1')
 TkPackage.require('cursor')
 
 module Tk
+  module Tcllib
+    module Cursor
+      def self.package_version
+	begin
+	  TkPackage.require('ipentry')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+
   def self.cursor_display(parent=None)
     # Pops up a dialog with a listbox containing all the cursor names. 
     # Selecting a cursor name will display it in that dialog. 
diff --git a/ext/tk/lib/tkextlib/tcllib/datefield.rb b/ext/tk/lib/tkextlib/tcllib/datefield.rb
index 6d3ba4693f..4d80b06866 100644
--- a/ext/tk/lib/tkextlib/tcllib/datefield.rb
+++ b/ext/tk/lib/tkextlib/tcllib/datefield.rb
@@ -17,12 +17,7 @@
 
 require 'tk'
 require 'tk/entry'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tcllib.rb'
 
 # TkPackage.require('datefield', '0.1')
 TkPackage.require('datefield')
@@ -30,6 +25,13 @@ TkPackage.require('datefield')
 module Tk
   module Tcllib
     class Datefield < TkEntry
+      def self.package_version
+	begin
+	  TkPackage.require('datefield')
+	rescue
+	  ''
+	end
+      end
     end
     DateField = Datefield
   end
diff --git a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb b/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
index aed47da63a..748478a322 100644
--- a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
+++ b/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
@@ -11,13 +11,7 @@
 # It guarantees a valid address at all times.
 
 require 'tk'
-require 'tk/entry'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tcllib.rb'
 
 # TkPackage.require('ipentry', '0.1')
 TkPackage.require('ipentry')
@@ -25,6 +19,13 @@ TkPackage.require('ipentry')
 module Tk
   module Tcllib
     class IP_Entry < TkEntry
+      def self.package_version
+	begin
+	  TkPackage.require('ipentry')
+	rescue
+	  ''
+	end
+      end
     end
   end
 end
diff --git a/ext/tk/lib/tkextlib/tcllib/plotchart.rb b/ext/tk/lib/tkextlib/tcllib/plotchart.rb
index 108507b05b..b22a4ebbdf 100644
--- a/ext/tk/lib/tkextlib/tcllib/plotchart.rb
+++ b/ext/tk/lib/tkextlib/tcllib/plotchart.rb
@@ -58,12 +58,7 @@
 #
 
 require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tcllib.rb'
 
 # TkPackage.require('Plotchart', '0.9')
 TkPackage.require('Plotchart')
@@ -71,6 +66,13 @@ TkPackage.require('Plotchart')
 module Tk
   module Tcllib
     module Plotchart
+      def self.package_version
+	begin
+	  TkPackage.require('Plotchart')
+	rescue
+	  ''
+	end
+      end
     end
   end
 end
@@ -122,7 +124,7 @@ module Tk::Tcllib::Plotchart
 
   ############################
   module ChartMethod
-    include TkUtil
+    include TkCore
 
     def title(str)
       tk_call_without_enc(@chart, 'title', _get_eval_enc_str(str))
diff --git a/ext/tk/lib/tkextlib/tcllib/style.rb b/ext/tk/lib/tkextlib/tcllib/style.rb
index e441cd83b0..dea2962b7f 100644
--- a/ext/tk/lib/tkextlib/tcllib/style.rb
+++ b/ext/tk/lib/tkextlib/tcllib/style.rb
@@ -7,18 +7,21 @@
 #
 
 require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tcllib.rb'
 
 # TkPackage.require('style', '0.1')
 TkPackage.require('style')
 
 module Tk
   module Style
+    def self.package_version
+      begin
+	TkPackage.require('style')
+      rescue
+	''
+      end
+    end
+
     def self.names
       tk_split_simplelist(tk_call('style::names'))
     end
diff --git a/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb b/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
index 1ef49ef4f4..4665edca7e 100644
--- a/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
+++ b/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
@@ -8,12 +8,7 @@
 
 require 'tk'
 require 'tk/canvas'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tcllib.rb'
 
 # TkPackage.require('tkpiechart', '6.6')
 TkPackage.require('tkpiechart')
@@ -26,6 +21,14 @@ module Tk
 end
 
 module Tk::Tcllib::Tkpiechart
+  def self.package_version
+    begin
+      TkPackage.require('tkpiechart')
+    rescue
+      ''
+    end
+  end
+
   module ConfigMethod
     include TkConfigMethod