* ext/tk/lib/tk.rb, ext/tk/lib/*: make default widget set

  switchable between Tk (standard Tcl/Tk widget set) and 
  Ttk (Tile). Initial default widget set is Tk. Now, toplevel 
  widget classes are removed and defined as aliases. 
  For example, "TkButton" is an alias of the "Tk::Button" class. 
  Those aliases are replaced when switching default widget set. 
  "Tk.default_widget_set=" is the method for switching default 
  widget set. "Tk.default_widget_set = :Ttk" defines Ttk (Tile) 
  widget set as default. It means that "TkButton" denotes 
  "Tk::Tile::Button" class. And then, "TkButton.new" creates 
  a Tk::Tile::Button widget. Of course, you can back to use 
  standard Tk widgets as the default widget set by calling 
  "Tk.default_widget_set = :Tk", whenever you want. Based on 
  thie feature, you can use Ttk widget styling engine on your 
  old Ruby/Tk application without modifying its source, if you 
  don'tuse widget options unsupported on Ttk widgets (At first, 
  call "Tk.default_widget_set = :Ttk", and next load and run 
  your application). 
  This is one step for supporting Tcl/Tk8.5 features.


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

1 files changed, 26 insertions, 2 deletions

diff --git a/ext/tk/lib/tkextlib/tile/style.rb b/ext/tk/lib/tkextlib/tile/style.rb
index b319d24d54..e01011cb21 100644
--- a/ext/tk/lib/tkextlib/tile/style.rb
+++ b/ext/tk/lib/tkextlib/tile/style.rb
@@ -52,11 +52,29 @@ class << Tk::Tile::Style
     style = '.' unless style
 
     if keys && keys != None
-      tk_call(TkCommandNames[0], 'map', style, *hash_kv(keys))
+      if keys.kind_of?(Hash)
+        tk_call(TkCommandNames[0], 'map', style, *hash_kv(keys))
+      else
+        simplelist(tk_call(TkCommandNames[0], 'map', style, '-' << keys.to_s))
+      end
     else
-      tk_call(TkCommandNames[0], 'map', style)
+      ret = {}
+      Hash[*(simplelist(tk_call(TkCommandNames[0], 'map', style)))].each{|k, v|
+        ret[k[1..-1]] = list(v)
+      }
+      ret
     end
   end
+  alias map_configure map
+
+  def map_configinfo(style=nil, key=None)
+    style = '.' unless style
+    map(style, key)
+  end
+
+  def map_default_configinfo(key=None)
+    map('.', key)
+  end
 
   def lookup(style, opt, state=None, fallback_value=None)
     tk_call(TkCommandNames[0], 'lookup', style, 
@@ -92,16 +110,20 @@ class << Tk::Tile::Style
   end
 
   def theme_create(name, keys=nil)
+    name = name.to_s
     if keys && keys != None
       tk_call(TkCommandNames[0], 'theme', 'create', name, *hash_kv(keys))
     else
       tk_call(TkCommandNames[0], 'theme', 'create', name)
     end
+    name
   end
 
   def theme_settings(name, cmd=nil, &b)
+    name = name.to_s
     cmd = Proc.new(&b) if !cmd && b
     tk_call(TkCommandNames[0], 'theme', 'settings', name, cmd)
+    name
   end
 
   def theme_names()
@@ -109,6 +131,8 @@ class << Tk::Tile::Style
   end
 
   def theme_use(name)
+    name = name.to_s
     tk_call(TkCommandNames[0], 'theme', 'use', name)
+    name
   end
 end