* ext/tk/lib/tk.rb (_callback_entry_class?): add for checking whether

  a class is available for a callback entry.
* ext/tk/lib/tk.rb (after_cancel): add Tk.after_cancel(afterID) method.
* ext/tk/lib/tk.rb (array2tk_list): change from private module method
  of TkComm to public module method.
* ext/tk/lib/tk.rb (cget): add check that slot argument is not empty string.
* ext/tk/lib/tk.rb (configinfo): ditto.
* ext/tk/lib/tk/itemconfig.rb (itemcget): add check that slot argument
  is not empty string.
* ext/tk/lib/tk/itemconfig.rb (itemconfiginfo): ditto.
* ext/tk/lib/tk/entry.rb: add TkEntry#icursor and icursor= (alias of
  cursor and cursor= method).
* ext/tk/lib/tk/font.rb: improve font treatment when the font name is
  empty string.
* ext/tk/lib/tk/variable.rb: add :variable, :window and :procedure type.
* ext/tk/lib/tk/variable.rb: improve treatment of array-type tkvariable.
* ext/tk/lib/tkextlib/blt.rb: add commands for zooming.
* ext/tk/lib/tkextlib/blt/*: bug fix.
* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix and add methods
  to call TreeCtrl commands for bindings.
* ext/tk/sample/tkextlib/blt/*: new sample scritps.
* ext/tk/sample/tkextlib/treectrl/*: ditto.


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

1 files changed, 25 insertions, 10 deletions

diff --git a/ext/tk/lib/tkextlib/blt/bitmap.rb b/ext/tk/lib/tkextlib/blt/bitmap.rb
index 11ad5883d0..31cf8d4229 100644
--- a/ext/tk/lib/tkextlib/blt/bitmap.rb
+++ b/ext/tk/lib/tkextlib/blt/bitmap.rb
@@ -42,26 +42,41 @@ module Tk::BLT
       alias _new new
 
       def new(data, keys={})
-        _new(:data, data, keys)
+        _new(:data, nil, data, keys)
       end
       alias define new
 
+      def new_with_name(name, data, keys={})
+        _new(:data, name, data, keys)
+      end
+      alias define_with_name new_with_name
+
       def compose(text, keys={})
-        _new(:text, text, keys)
+        _new(:text, nil, text, keys)
+      end
+
+      def compose_with_name(name, text, keys={})
+        _new(:text, name, text, keys)
       end
     end
 
-    def initialize(type, data, keys = {})
-      @id = BITMAP_ID.join(TkCore::INTERP._ip_id_)
-      BITMAP_ID[1].succ!
-      BITMAP_ID_TBL[@id] = self
+    def initialize(type, name, data, keys = {})
+      if name
+        @id = name
+      else
+        @id = BITMAP_ID.join(TkCore::INTERP._ip_id_)
+        BITMAP_ID[1].succ!
+        BITMAP_ID_TBL[@id] = self
+      end
 
       @path = @id
 
-      if type == :text
-        tk_call('::blt::bitmap', 'compose', @id, *hash_kv(keys))
-      else # :data
-        tk_call('::blt::bitmap', 'define', @id, *hash_kv(keys))
+      unless bool(tk_call('::blt::bitmap', 'exists', @id))
+        if type == :text
+          tk_call('::blt::bitmap', 'compose', @id, data, *hash_kv(keys))
+        else # :data
+          tk_call('::blt::bitmap', 'define', @id, data, *hash_kv(keys))
+        end
       end
     end