* 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/branches/ruby_1_8@6586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

16 files changed, 244 insertions, 16 deletions

diff --git a/ext/tk/lib/tkextlib/tkimg/bmp.rb b/ext/tk/lib/tkextlib/tkimg/bmp.rb
index 5bef0c7168..e6031a43ea 100644
--- a/ext/tk/lib/tkextlib/tkimg/bmp.rb
+++ b/ext/tk/lib/tkextlib/tkimg/bmp.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 #TkPackage.require('img::bmp', '1.3')
 TkPackage.require('img::bmp')
+
+module Tk
+  module Img
+    module BMP
+      def self.package_version
+	begin
+	  TkPackage.require('img::bmp')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tkimg/gif.rb b/ext/tk/lib/tkextlib/tkimg/gif.rb
index 65c3b88a50..b464434498 100644
--- a/ext/tk/lib/tkextlib/tkimg/gif.rb
+++ b/ext/tk/lib/tkextlib/tkimg/gif.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::gif', '1.3')
 TkPackage.require('img::gif')
+
+module Tk
+  module Img
+    module GIF
+      def self.package_version
+	begin
+	  TkPackage.require('img::gif')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tkimg/ico.rb b/ext/tk/lib/tkextlib/tkimg/ico.rb
index 43646ec8da..2872a621ad 100644
--- a/ext/tk/lib/tkextlib/tkimg/ico.rb
+++ b/ext/tk/lib/tkextlib/tkimg/ico.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::ico', '1.3')
 TkPackage.require('img::ico')
+
+module Tk
+  module Img
+    module ICO
+      def self.package_version
+	begin
+	  TkPackage.require('img::ico')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tkimg/jpeg.rb b/ext/tk/lib/tkextlib/tkimg/jpeg.rb
index 7b4df8c050..eac39083bc 100644
--- a/ext/tk/lib/tkextlib/tkimg/jpeg.rb
+++ b/ext/tk/lib/tkextlib/tkimg/jpeg.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::jpeg', '1.3')
 TkPackage.require('img::jpeg')
+
+module Tk
+  module Img
+    module JPEG
+      def self.package_version
+	begin
+	  TkPackage.require('img::jpeg')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tkimg/pcx.rb b/ext/tk/lib/tkextlib/tkimg/pcx.rb
index 4486ba2449..26311e5984 100644
--- a/ext/tk/lib/tkextlib/tkimg/pcx.rb
+++ b/ext/tk/lib/tkextlib/tkimg/pcx.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::pcx', '1.3')
 TkPackage.require('img::pcx')
+
+module Tk
+  module Img
+    module PCX
+      def self.package_version
+	begin
+	  TkPackage.require('img::pcx')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tkimg/pixmap.rb b/ext/tk/lib/tkextlib/tkimg/pixmap.rb
index 0c18c71408..ae8d3201cb 100644
--- a/ext/tk/lib/tkextlib/tkimg/pixmap.rb
+++ b/ext/tk/lib/tkextlib/tkimg/pixmap.rb
@@ -8,12 +8,30 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::pixmap', '1.3')
 TkPackage.require('img::pixmap')
 
+module Tk
+  module Img
+    module PIXMAP
+      def self.package_version
+	begin
+	  TkPackage.require('img::pixmap')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
+
 class TkPixmapImage<TkImage
+  def self.version
+    Tk::Img::PIXMAP.version
+  end
+
   def initialize(*args)
     @type = 'pixmap'
     super
diff --git a/ext/tk/lib/tkextlib/tkimg/png.rb b/ext/tk/lib/tkextlib/tkimg/png.rb
index 275035f47e..acdd8c536f 100644
--- a/ext/tk/lib/tkextlib/tkimg/png.rb
+++ b/ext/tk/lib/tkextlib/tkimg/png.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::png', '1.3')
 TkPackage.require('img::png')
+
+module Tk
+  module Img
+    module PNG
+      def self.package_version
+	begin
+	  TkPackage.require('img::png')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tkimg/ppm.rb b/ext/tk/lib/tkextlib/tkimg/ppm.rb
index 730978b281..f15bdb9f18 100644
--- a/ext/tk/lib/tkextlib/tkimg/ppm.rb
+++ b/ext/tk/lib/tkextlib/tkimg/ppm.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::ppm', '1.3')
 TkPackage.require('img::ppm')
+
+module Tk
+  module Img
+    module PPM
+      def self.package_version
+	begin
+	  TkPackage.require('img::ppm')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tkimg/ps.rb b/ext/tk/lib/tkextlib/tkimg/ps.rb
index edfb8dd783..7c5cab2a4f 100644
--- a/ext/tk/lib/tkextlib/tkimg/ps.rb
+++ b/ext/tk/lib/tkextlib/tkimg/ps.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::ps', '1.3')
 TkPackage.require('img::ps')
+
+module Tk
+  module Img
+    module PS
+      def self.package_version
+	begin
+	  TkPackage.require('img::ps')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tkimg/sgi.rb b/ext/tk/lib/tkextlib/tkimg/sgi.rb
index 9dcfa614b0..1cdf60e64c 100644
--- a/ext/tk/lib/tkextlib/tkimg/sgi.rb
+++ b/ext/tk/lib/tkextlib/tkimg/sgi.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::sgi', '1.3')
 TkPackage.require('img::sgi')
+
+module Tk
+  module Img
+    module SGI
+      def self.package_version
+	begin
+	  TkPackage.require('img::sgi')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tkimg/sun.rb b/ext/tk/lib/tkextlib/tkimg/sun.rb
index 4ada9c7ff1..88f9a44656 100644
--- a/ext/tk/lib/tkextlib/tkimg/sun.rb
+++ b/ext/tk/lib/tkextlib/tkimg/sun.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::sun', '1.3')
 TkPackage.require('img::sun')
+
+module Tk
+  module Img
+    module SUN
+      def self.package_version
+	begin
+	  TkPackage.require('img::sun')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tkimg/tga.rb b/ext/tk/lib/tkextlib/tkimg/tga.rb
index 221ebe5db1..c4068a729c 100644
--- a/ext/tk/lib/tkextlib/tkimg/tga.rb
+++ b/ext/tk/lib/tkextlib/tkimg/tga.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::tga', '1.3')
 TkPackage.require('img::tga')
+
+module Tk
+  module Img
+    module TGA
+      def self.package_version
+	begin
+	  TkPackage.require('img::tga')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tkimg/tiff.rb b/ext/tk/lib/tkextlib/tkimg/tiff.rb
index 1c7e940843..529999ef2d 100644
--- a/ext/tk/lib/tkextlib/tkimg/tiff.rb
+++ b/ext/tk/lib/tkextlib/tkimg/tiff.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::tiff', '1.3')
 TkPackage.require('img::tiff')
+
+module Tk
+  module Img
+    module TIFF
+      def self.package_version
+	begin
+	  TkPackage.require('img::tiff')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tkimg/window.rb b/ext/tk/lib/tkextlib/tkimg/window.rb
index 056aa8f3cf..229445dd46 100644
--- a/ext/tk/lib/tkextlib/tkimg/window.rb
+++ b/ext/tk/lib/tkextlib/tkimg/window.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::window', '1.3')
 TkPackage.require('img::window')
+
+module Tk
+  module Img
+    module WINDOW
+      def self.package_version
+	begin
+	  TkPackage.require('img::window')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tkimg/xbm.rb b/ext/tk/lib/tkextlib/tkimg/xbm.rb
index 80010c77de..3b680d9b59 100644
--- a/ext/tk/lib/tkextlib/tkimg/xbm.rb
+++ b/ext/tk/lib/tkextlib/tkimg/xbm.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::xbm', '1.3')
 TkPackage.require('img::xbm')
+
+module Tk
+  module Img
+    module XBM
+      def self.package_version
+	begin
+	  TkPackage.require('img::xbm')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tkimg/xpm.rb b/ext/tk/lib/tkextlib/tkimg/xpm.rb
index 04d56287ef..eff1e3c2b6 100644
--- a/ext/tk/lib/tkextlib/tkimg/xpm.rb
+++ b/ext/tk/lib/tkextlib/tkimg/xpm.rb
@@ -8,7 +8,21 @@ require 'tk'
 require 'tkextlib/setup.rb'
 
 # call setup script
-require File.join(File.dirname(File.expand_path(__FILE__)), 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # TkPackage.require('img::xpm', '1.3')
 TkPackage.require('img::xpm')
+
+module Tk
+  module Img
+    module XPM
+      def self.package_version
+	begin
+	  TkPackage.require('img::xpm')
+	rescue
+	  ''
+	end
+      end
+    end
+  end
+end