* 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

1 files changed, 14 insertions, 6 deletions

diff --git a/ext/tk/lib/tkextlib/tkimg.rb b/ext/tk/lib/tkextlib/tkimg.rb
index 06184589b4..f70d76c9d1 100644
--- a/ext/tk/lib/tkextlib/tkimg.rb
+++ b/ext/tk/lib/tkextlib/tkimg.rb
@@ -8,16 +8,24 @@ require 'tk'
 # call setup script for general 'tkextlib' libraries
 require 'tkextlib/setup.rb'
 
-# library directory
-dir = File.expand_path(__FILE__).sub(/#{File.extname(__FILE__)}$/, '')
-
 # call setup script
-require File.join(dir, 'setup.rb')
+require 'tkextlib/tkimg/setup.rb'
 
 # load all image format handlers
 #TkPackage.require('Img', '1.3')
 TkPackage.require('Img')
 
+module Tk
+  module Img
+    def self.package_version
+      begin
+	TkPackage.require('Img')
+      rescue
+	''
+      end
+    end
+  end
+end
+
 # autoload
-#autoload :TkPixmapImage, 'tkextlib/tkimg/pixmap'
-autoload :TkPixmapImage, File.join(dir, 'pixmap')
+autoload :TkPixmapImage, 'tkextlib/tkimg/pixmap'