* 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, 19 insertions, 25 deletions

diff --git a/ext/tk/lib/tkextlib/tile.rb b/ext/tk/lib/tkextlib/tile.rb
index 866cdf0644..7633981559 100644
--- a/ext/tk/lib/tkextlib/tile.rb
+++ b/ext/tk/lib/tkextlib/tile.rb
@@ -9,10 +9,7 @@ require 'tk'
 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/tile/setup.rb'
 
 # load package
 # TkPackage.require('tile', '0.4')
@@ -21,6 +18,14 @@ TkPackage.require('tile')
 # autoload
 module Tk
   module Tile
+    def self.package_version
+      begin
+	TkPackage.require('tile')
+      rescue
+	''
+      end
+    end
+
     module TileWidget
       def instate(state, script=nil, &b)
 	if script
@@ -41,33 +46,22 @@ module Tk
       end
     end
 
+    ######################################
 
-    # library directory
-    dir = File.expand_path(__FILE__).sub(/#{File.extname(__FILE__)}$/, '')
-
-    #autoload :TButton,       'tkextlib/tile/tbutton'
-    autoload :TButton,       File.join(dir, 'tbutton')
+    autoload :TButton,       'tkextlib/tile/tbutton'
 
-    #autoload :TCheckButton,  'tkextlib/tile/tcheckbutton'
-    #autoload :TCheckbutton,  'tkextlib/tile/tcheckbutton'
-    autoload :TCheckButton,  File.join(dir, 'tcheckbutton')
-    autoload :TCheckbutton,  File.join(dir, 'tcheckbutton')
+    autoload :TCheckButton,  'tkextlib/tile/tcheckbutton'
+    autoload :TCheckbutton,  'tkextlib/tile/tcheckbutton'
 
-    #autoload :TLabel,        'tkextlib/tile/tlabel'
-    autoload :TLabel,        File.join(dir, 'tlabel')
+    autoload :TLabel,        'tkextlib/tile/tlabel'
 
-    #autoload :TMenubutton,   'tkextlib/tile/tmenubutton'
-    autoload :TMenubutton,   File.join(dir, 'tmenubutton')
+    autoload :TMenubutton,   'tkextlib/tile/tmenubutton'
 
-    #autoload :TNotebook,     'tkextlib/tile/tnotebook'
-    autoload :TNotebook,     File.join(dir, 'tnotebook')
+    autoload :TNotebook,     'tkextlib/tile/tnotebook'
 
-    #autoload :TRadioButton,  'tkextlib/tile/tradiobutton'
-    #autoload :TRadiobutton,  'tkextlib/tile/tradiobutton'
-    autoload :TRadioButton,  File.join(dir, 'tradiobutton')
-    autoload :TRadiobutton,  File.join(dir, 'tradiobutton')
+    autoload :TRadioButton,  'tkextlib/tile/tradiobutton'
+    autoload :TRadiobutton,  'tkextlib/tile/tradiobutton'
 
-    #autoload :Style,         'tkextlib/tile/style'
-    autoload :Style,         File.join(dir, 'style')
+    autoload :Style,         'tkextlib/tile/style'
   end
 end