ffi-tk 2010.03 → 2010.06

data/AUTHORS

@@ -1,6 +1,6 @@
 Following persons have contributed to ffi-tk.
 (Sorted by number of submitted patches, then alphabetically)
 
-   225 Michael Fellinger <m.fellinger@gmail.com>
+   239 Michael Fellinger <m.fellinger@gmail.com>
     19 Julian Langschaedel <meta.rb@gmail.com>
      1 unknown <manveru@.(none)>

data/CHANGELOG

@@ -1,3 +1,59 @@
+[8d78da8 | 2010-06-02 16:15:20 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2010.06
+
+[c2d350b | 2010-06-02 16:13:10 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * ComboBox is not an Entry
+
+[ff17848 | 2010-06-02 16:12:59 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix pathname generation
+
+[0747bc3 | 2010-03-12 05:14:57 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add tcl/tk 8.6 as working versions
+
+[80c4cb4 | 2010-03-10 16:07:57 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Name the mysterious eval flag
+
+[28aff12 | 2010-03-10 16:07:41 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Use better array retrieval
+
+[4916cfb | 2010-03-10 15:53:06 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Let other function calls panic too
+
+[2caf7a1 | 2010-03-10 15:52:51 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Don't try to convert event data if it's ??
+
+[77dce01 | 2010-03-10 15:52:30 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Improve EvalResult::map_list_core
+
+[6f328f6 | 2010-03-10 08:03:10 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Handle the % sequence in events
+
+[795e77d | 2010-03-09 07:36:38 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Rename Event::Data.sequence to Event::Data.pattern
+
+[bc3f560 | 2010-03-07 16:04:59 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Split up the LIBPATH Hash into two constant Arrays, fix bug on osx
+
+[c98168e | 2010-03-07 15:59:15 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * A little bit of restructure, don't require the 'Apple_PubSub_Socket_Render' env to be set, but allow TK_LIBPATH and TCL_LIBPATH to be
+
+[865fd4b | 2010-03-05 17:41:38 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Working implementation of WM::protocol
+
 [920e7c5 | 2010-03-02 05:07:40 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2010.03

data/ffi-tk.gemspec

@@ -2,24 +2,24 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi-tk}
-  s.version = "2010.03"
+  s.version = "2010.06"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.3") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = %q{2010-03-02}
+  s.date = %q{2010-06-03}
   s.description = %q{Pure Ruby FFI wrapper for the Tk GUI toolkit.}
   s.email = %q{m.fellinger@gmail.com}
   s.files = [".gitignore", "AUTHORS", "CHANGELOG", "MANIFEST", "README.md", "Rakefile", "TODO.md", "bin/rwish", "doc/MIT_LICENSE", "doc/TCL_LICENSE", "example/choose_color.rb", "example/choose_directory.rb", "example/dialog.rb", "example/hello.rb", "example/message_box.rb", "example/option_menu.rb", "example/popup.rb", "example/set_palette.rb", "example/text.rb", "example/tile/kroc_demo_small.rb", "example/tile/kroc_rb_demo.rb", "example/tile/notebook.rb", "example/tile/theme_hello.rb", "example/tile/themes.rb", "example/tile/treeview.rb", "example/tkgo.rb", "example/various.rb", "example/wait.rb", "ffi-tk.gemspec", "lib/ffi-tk.rb", "lib/ffi-tk/command.rb", "lib/ffi-tk/command/after.rb", "lib/ffi-tk/command/bell.rb", "lib/ffi-tk/command/bind.rb", "lib/ffi-tk/command/bindtags.rb", "lib/ffi-tk/command/cget.rb", "lib/ffi-tk/command/choose_color.rb", "lib/ffi-tk/command/choose_directory.rb", "lib/ffi-tk/command/clipboard.rb", "lib/ffi-tk/command/configure.rb", "lib/ffi-tk/command/destroy.rb", "lib/ffi-tk/command/dialog.rb", "lib/ffi-tk/command/event.rb", "lib/ffi-tk/command/focus.rb", "lib/ffi-tk/command/font.rb", "lib/ffi-tk/command/get_open_file.rb", "lib/ffi-tk/command/get_save_file.rb", "lib/ffi-tk/command/grab.rb", "lib/ffi-tk/command/grid.rb", "lib/ffi-tk/command/image.rb", "lib/ffi-tk/command/lower.rb", "lib/ffi-tk/command/message_box.rb", "lib/ffi-tk/command/option_menu.rb", "lib/ffi-tk/command/pack.rb", "lib/ffi-tk/command/place.rb", "lib/ffi-tk/command/popup.rb", "lib/ffi-tk/command/raise.rb", "lib/ffi-tk/command/scrollable.rb", "lib/ffi-tk/command/selection.rb", "lib/ffi-tk/command/set_palette.rb", "lib/ffi-tk/command/tk_cmd.rb", "lib/ffi-tk/command/vars.rb", "lib/ffi-tk/command/wait.rb", "lib/ffi-tk/command/winfo.rb", "lib/ffi-tk/command/wm.rb", "lib/ffi-tk/core_extensions.rb", "lib/ffi-tk/event/data.rb", "lib/ffi-tk/event/handler.rb", "lib/ffi-tk/ffi/tcl.rb", "lib/ffi-tk/ffi/tcl/cmd_proc.rb", "lib/ffi-tk/ffi/tcl/eval_result.rb", "lib/ffi-tk/ffi/tcl/interp.rb", "lib/ffi-tk/ffi/tcl/obj.rb", "lib/ffi-tk/ffi/tcl/time.rb", "lib/ffi-tk/ffi/tk.rb", "lib/ffi-tk/geometry.rb", "lib/ffi-tk/thread_sender.rb", "lib/ffi-tk/tk.rb", "lib/ffi-tk/variable.rb", "lib/ffi-tk/version.rb", "lib/ffi-tk/widget.rb", "lib/ffi-tk/widget/button.rb", "lib/ffi-tk/widget/canvas.rb", "lib/ffi-tk/widget/canvas/arc.rb", "lib/ffi-tk/widget/canvas/bitmap.rb", "lib/ffi-tk/widget/canvas/image.rb", "lib/ffi-tk/widget/canvas/item.rb", "lib/ffi-tk/widget/canvas/line.rb", "lib/ffi-tk/widget/canvas/oval.rb", "lib/ffi-tk/widget/canvas/polygon.rb", "lib/ffi-tk/widget/canvas/rectangle.rb", "lib/ffi-tk/widget/canvas/text.rb", "lib/ffi-tk/widget/canvas/window.rb", "lib/ffi-tk/widget/checkbutton.rb", "lib/ffi-tk/widget/entry.rb", "lib/ffi-tk/widget/frame.rb", "lib/ffi-tk/widget/label.rb", "lib/ffi-tk/widget/labelframe.rb", "lib/ffi-tk/widget/listbox.rb", "lib/ffi-tk/widget/menu.rb", "lib/ffi-tk/widget/menubutton.rb", "lib/ffi-tk/widget/message.rb", "lib/ffi-tk/widget/panedwindow.rb", "lib/ffi-tk/widget/radiobutton.rb", "lib/ffi-tk/widget/root.rb", "lib/ffi-tk/widget/scale.rb", "lib/ffi-tk/widget/scrollbar.rb", "lib/ffi-tk/widget/spinbox.rb", "lib/ffi-tk/widget/text.rb", "lib/ffi-tk/widget/text/peer.rb", "lib/ffi-tk/widget/tile.rb", "lib/ffi-tk/widget/tile/button.rb", "lib/ffi-tk/widget/tile/checkbutton.rb", "lib/ffi-tk/widget/tile/combobox.rb", "lib/ffi-tk/widget/tile/entry.rb", "lib/ffi-tk/widget/tile/frame.rb", "lib/ffi-tk/widget/tile/label.rb", "lib/ffi-tk/widget/tile/labelframe.rb", "lib/ffi-tk/widget/tile/menubutton.rb", "lib/ffi-tk/widget/tile/notebook.rb", "lib/ffi-tk/widget/tile/panedwindow.rb", "lib/ffi-tk/widget/tile/progressbar.rb", "lib/ffi-tk/widget/tile/radiobutton.rb", "lib/ffi-tk/widget/tile/scale.rb", "lib/ffi-tk/widget/tile/scrollbar.rb", "lib/ffi-tk/widget/tile/separator.rb", "lib/ffi-tk/widget/tile/sizegrip.rb", "lib/ffi-tk/widget/tile/style.rb", "lib/ffi-tk/widget/tile/treeview.rb", "lib/ffi-tk/widget/toplevel.rb", "spec/ffi-tk/command/bind.rb", "spec/ffi-tk/command/bindtags.rb", "spec/ffi-tk/command/clipboard.rb", "spec/ffi-tk/command/font.rb", "spec/ffi-tk/command/grid.rb", "spec/ffi-tk/command/image.rb", "spec/ffi-tk/command/pack.rb", "spec/ffi-tk/command/place.rb", "spec/ffi-tk/command/selection.rb", "spec/ffi-tk/command/vars.rb", "spec/ffi-tk/command/winfo.rb", "spec/ffi-tk/command/wm.rb", "spec/ffi-tk/event.rb", "spec/ffi-tk/tile/button.rb", "spec/ffi-tk/tile/checkbutton.rb", "spec/ffi-tk/tile/combobox.rb", "spec/ffi-tk/tile/entry.rb", "spec/ffi-tk/tile/frame.rb", "spec/ffi-tk/tile/label.rb", "spec/ffi-tk/tile/labelframe.rb", "spec/ffi-tk/tile/menubutton.rb", "spec/ffi-tk/tile/notebook.rb", "spec/ffi-tk/tile/panedwindow.rb", "spec/ffi-tk/tile/progressbar.rb", "spec/ffi-tk/tile/radiobutton.rb", "spec/ffi-tk/tile/scale.rb", "spec/ffi-tk/tile/scrollbar.rb", "spec/ffi-tk/tile/separator.rb", "spec/ffi-tk/tile/sizegrip.rb", "spec/ffi-tk/tile/style.rb", "spec/ffi-tk/tile/treeview.rb", "spec/ffi-tk/variable.rb", "spec/ffi-tk/widget/button.rb", "spec/ffi-tk/widget/canvas.rb", "spec/ffi-tk/widget/checkbutton.rb", "spec/ffi-tk/widget/entry.rb", "spec/ffi-tk/widget/frame.rb", "spec/ffi-tk/widget/label.rb", "spec/ffi-tk/widget/labelframe.rb", "spec/ffi-tk/widget/listbox.rb", "spec/ffi-tk/widget/menu.rb", "spec/ffi-tk/widget/menubutton.rb", "spec/ffi-tk/widget/message.rb", "spec/ffi-tk/widget/panedwindow.rb", "spec/ffi-tk/widget/radiobutton.rb", "spec/ffi-tk/widget/root.rb", "spec/ffi-tk/widget/scale.rb", "spec/ffi-tk/widget/scrollbar.rb", "spec/ffi-tk/widget/spinbox.rb", "spec/ffi-tk/widget/text.rb", "spec/ffi-tk/widget/toplevel.rb", "spec/helper.rb", "tasks/authors.rake", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/gem.rake", "tasks/gem_setup.rake", "tasks/grancher.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/ycov.rake"]
   s.homepage = %q{http://github.com/manveru/ffi-tk}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Pure Ruby FFI wrapper for the Tk GUI toolkit.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ffi>, ["= 0.6.2"])
       s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
     else

data/lib/ffi-tk.rb

@@ -4,27 +4,41 @@ require 'ffi'
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
 module Tk
-  LIBPATH = { tcl: [], tk: [] }
-
-  if ENV['Apple_PubSub_Socket_Render']
-    RUN_EVENTLOOP_ON_MAIN_THREAD = true
+  TCL_LIBPATH = ENV['TCL_LIBPATH'].to_s.split(':')
+  TK_LIBPATH  = ENV[ 'TK_LIBPATH'].to_s.split(':')
 
+  if FFI::Platform.mac?
     if ENV['NO_AQUA'] || ENV['USE_X11'] # macports-x11 libtk
-      LIBPATH[:tcl] << '/opt/local/lib/libtcl8.5.dylib'
-      LIBPATH[:tk] << '/opt/local/lib/libtk8.5.dylib'
+      TCL_LIBPATH << '/opt/local/lib/libtcl8.5.dylib'
+      TK_LIBPATH  << '/opt/local/lib/libtk8.5.dylib'
     else # Tcl/Tk Aqua >= 8.5
-      LIBPATH[:tcl] << '/Library/Frameworks/Tcl.framework/Tcl'
-      LIBPATH[:tk] << '/Library/Frameworks/Tk.framework/Tk'
+      TCL_LIBPATH << '/Library/Frameworks/Tcl.framework/Tcl'
+      TK_LIBPATH  << '/Library/Frameworks/Tk.framework/Tk'
     end
   end
-end
 
-require 'ffi-tk/thread_sender'
-require 'ffi-tk/ffi/tcl'
-require 'ffi-tk/ffi/tk'
+  TCL_LIBPATH << 'tcl' << 'tcl86' << 'tcl85' << 'tcl8.6' << 'tcl8.5'
+  TK_LIBPATH  <<  'tk' <<  'tk86' <<  'tk85' <<  'tk8.6' <<  'tk8.5'
 
-module Tk
-  Error = Class.new(RuntimeError)
+  unless const_defined?(:RUN_EVENTLOOP_ON_MAIN_THREAD)
+    if FFI::Platform.mac?
+      # In some cases Tk has trouble running, this seems to happen on windows and
+      # OSX/TkAqua mostly.
+      # In these cases please use:
+      #   module Tk; RUN_EVENTLOOP_ON_MAIN_THREAD = true; end
+      # before you require 'tk'
+      RUN_EVENTLOOP_ON_MAIN_THREAD = true
+    else
+      RUN_EVENTLOOP_ON_MAIN_THREAD = false
+    end
+  end
+
+  DONT_WAIT     = 1 << 1
+  WINDOW_EVENTS = 1 << 2
+  FILE_EVENTS   = 1 << 3
+  TIMER_EVENTS  = 1 << 4
+  IDLE_EVENTS   = 1 << 5
+  ALL_EVENTS    = ~DONT_WAIT
 
   OK       = 0
   ERROR    = 1
@@ -32,6 +46,7 @@ module Tk
   BREAK    = 3
   CONTINUE = 4
 
+  Error = Class.new(RuntimeError)
   None = Object.new
 
   class << None
@@ -40,7 +55,13 @@ module Tk
     def to_tcl_option?; self; end
     def inspect; '#<None>'; end
   end
+end
+
+require 'ffi-tk/thread_sender'
+require 'ffi-tk/ffi/tcl'
+require 'ffi-tk/ffi/tk'
 
+module Tk
   autoload :Button,      'ffi-tk/widget/button'
   autoload :Canvas,      'ffi-tk/widget/canvas'
   autoload :CheckButton, 'ffi-tk/widget/checkbutton'

data/lib/ffi-tk/command/wm.rb

@@ -887,16 +887,29 @@ module Tk
     # received.
     def protocol(window, name = None, command = None, &block)
       command = block if block && !command.nil?
+      @commands ||= {}
+      key = [window, name]
 
       if name == None
         Tk.execute(:wm, :protocol, window).to_a
       elsif name != None && command == None
-        Tk.execute(:wm, :protocol, name)
+        Tk.execute(:wm, :protocol, window, name)
       elsif name != None && command.nil?
-        Tk.execute_only(:wm, :protocol, name, '')
+        if id = @commands[key]
+          Tk.unregister_proc(id)
+          @commands.delete(key)
+        end
+
+        Tk.execute_only(:wm, :protocol, window, name, '')
       elsif name != None && command
-        command = register_command(:wm_protocol, &command)
-        Tk.execute_only(:wm, :protocol, name, command)
+        if id = @commands[key]
+          Tk.unregister_proc(id)
+        end
+
+        id, tcl_command = Tk.register_proc(command, '')
+        @commands[key] = id
+
+        Tk.execute_only(:wm, :protocol, window, name, tcl_command)
       else
         raise ArgumentError
       end

data/lib/ffi-tk/event/data.rb

@@ -1,11 +1,11 @@
 module Tk
   module Event
     Data = Struct.new(
-      :id, :sequence, :border_width, :button, :count, :detail, :focus, :height,
+      :id, :pattern, :border_width, :button, :count, :detail, :focus, :height,
       :keycode, :keysym, :keysym_number, :mode, :mousewheel_delta,
-      :override_redirect, :place, :property, :root, :send_event, :serial, :state,
-      :subwindow, :time, :type, :unicode, :width, :window, :window_path, :x,
-      :x_root, :y, :y_root
+      :override_redirect, :place, :property, :root, :send_event, :serial,
+      :state, :subwindow, :time, :type, :unicode, :width, :window,
+      :window_path, :x, :x_root, :y, :y_root
     )
 
     class Data
@@ -41,13 +41,14 @@ module Tk
         ['%Y', :Integer, :y_root            ],
       ]
 
-      def initialize(id, sequence, *properties)
-        super id, sequence
+      def initialize(id, pattern, *properties)
+        super id, pattern
 
         PROPERTIES.each do |code, conv, name|
           value = properties.shift
-          converted = __send__(conv, value)
+          converted = String(value)
           next if converted == '??'
+          converted = __send__(conv, value)
           self[name] = converted
         end
       end
@@ -64,7 +65,7 @@ module Tk
           value = self[name]
 
           case name
-          when :id, :sequence, :border_width, :button, :count, :focus, :height,
+          when :id, :pattern, :border_width, :button, :count, :focus, :height,
             :keycode, :keysym, :keysym_number, :mode, :mousewheel_delta,
             :override_redirect, :place, :property, :root, :send_event,
             :subwindow, :type, :unicode, :width, :window, :window_path
@@ -85,6 +86,11 @@ module Tk
       def widget
         Tk.widgets[window_path]
       end
+
+      def sequence
+        Kernel.warn("#{self.class}.sequence deprecated, use #{self.class}.pattern")
+        pattern
+      end
     end
   end
 end

data/lib/ffi-tk/event/handler.rb

@@ -27,7 +27,15 @@ module Tk
 
       def register(tag, sequence, &block)
         id = register_block(block)
-        Tk.interp.eval(@callback % [tag, sequence, id, sequence])
+        if sequence.to_s == '%'
+          Tk.interp.eval(
+            @callback % [tag, '%%'.to_tcl, id, '%%'.to_tcl]
+          )
+        else
+          Tk.interp.eval(
+            @callback % [tag, sequence.to_tcl, id, sequence.to_tcl]
+          )
+        end
         @bound[[tag, sequence]] = block
         id
       end

data/lib/ffi-tk/ffi/tcl.rb

@@ -7,7 +7,7 @@ require 'ffi-tk/ffi/tcl/eval_result'
 module FFI
   module Tcl
     extend FFI::Library
-    ffi_lib [*::Tk::LIBPATH[:tcl], 'libtcl', 'tcl85', 'libtcl8.5']
+    ffi_lib ::Tk::TCL_LIBPATH
 
     attach_function :Tcl_AppendAllObjTypes, [Interp, Obj], :int
     attach_function :Tcl_CreateInterp, [], Interp

data/lib/ffi-tk/ffi/tcl/eval_result.rb

@@ -9,19 +9,22 @@ module FFI
         list = Tcl.new_list_obj(0, nil)
         Tcl.append_all_obj_types(interp, list)
 
-        result_pointer = MemoryPointer.new(:pointer)
-        count_pointer  = MemoryPointer.new(:int)
-        length_pointer = MemoryPointer.new(:int)
-
-        Tcl.list_obj_length(interp, list, count_pointer)
-        count = count_pointer.get_int(0)
-
-        (0...count).each do |idx|
-          Tcl.list_obj_index(interp, list, idx, result_pointer)
-          element_pointer = result_pointer.get_pointer(0)
-          name = Tcl.get_string_from_obj(element_pointer, length_pointer)
-          type = Tcl.get_obj_type(name)
-          TYPES[type.to_i] = name.to_sym
+        objc_ptr = MemoryPointer.new(:int)
+        objv_ptr = MemoryPointer.new(:pointer)
+
+        string_length_ptr = MemoryPointer.new(:int)
+
+        if Tcl.list_obj_get_elements(interp, list, objc_ptr, objv_ptr) == 0
+          array_ptr = objv_ptr.get_pointer(0)
+          array_length = objc_ptr.get_int(0)
+          array = array_ptr.read_array_of_pointer(array_length)
+          array.each do |type_ptr|
+            name = Tcl.get_string_from_obj(type_ptr, string_length_ptr)
+            type = Tcl.get_obj_type(name)
+            TYPES[type.to_i] = name.to_sym
+          end
+        else
+          panic 'Tcl_ListObjGetElements'
         end
       end
 
@@ -65,38 +68,56 @@ module FFI
         end
       end
 
-      def self.map_list_core(interp, obj)
-        result_pointer = MemoryPointer.new(:pointer)
-        count_pointer  = MemoryPointer.new(:int)
-        length_pointer = MemoryPointer.new(:int)
-
-        Tcl.list_obj_length(interp, obj, count_pointer)
-        count = count_pointer.get_int(0)
+      def self.map_list_core(interp, obj, &block)
+        objc_ptr = MemoryPointer.new(:int)
+        objv_ptr = MemoryPointer.new(:pointer)
 
-        (0...count).map do |idx|
-          Tcl.list_obj_index(interp, obj, idx, result_pointer)
-          yield result_pointer.get_pointer(0)
+        if Tcl.list_obj_get_elements(interp, obj, objc_ptr, objv_ptr) == 0
+          objv_ptr.get_pointer(0).
+            read_array_of_pointer(objc_ptr.get_int(0)).
+            map(&block)
+        else
+          panic(interp, 'Tcl_ListObjGetElements')
         end
       end
 
       def self.to_boolean(interp, obj)
         boolean_pointer = MemoryPointer.new(:int)
-        Tcl.get_boolean_from_obj(interp, obj, boolean_pointer)
-        boolean_pointer.get_int(0) == 1
+
+        if Tcl.get_boolean_from_obj(interp, obj, boolean_pointer) == 0
+          boolean_pointer.get_int(0) == 1
+        else
+          panic(interp, 'Tcl_GetBooleanFromObj')
+        end
       end
 
       def self.to_int(interp, obj)
         int_pointer = MemoryPointer.new(:int)
-        Tcl.get_int_from_obj(interp, obj, int_pointer)
-        int_pointer.get_int(0)
+
+        if Tcl.get_int_from_obj(interp, obj, int_pointer) == 0
+          int_pointer.get_int(0)
+        else
+          panic(interp, 'Tcl_GetIntFromObj')
+        end
       end
 
       def self.to_string(interp, obj)
         length_pointer = MemoryPointer.new(:int)
+
         string = Tcl.get_string_from_obj(obj, length_pointer)
         string.force_encoding(Encoding.default_external)
       end
 
+      def self.panic(interp, function)
+        message = guess(interp, Obj.new(Tcl.get_obj_result(interp))).to_s
+
+        if message.empty?
+          raise 'Failure during call of: %p' % [function]
+        else
+          raise '%s during call of: %p' % [message, function]
+        end
+      end
+
       def to_a(&block)
         self.class.to_list(interp, obj, &block)
       end

data/lib/ffi-tk/ffi/tcl/interp.rb

@@ -7,6 +7,9 @@ module FFI
         :errorLine, :int
       )
 
+      EVAL_GLOBAL = 0x20000
+      EVAL_DIRECT = 0x40000
+
       def inspect
         "Interp"
       end
@@ -82,7 +85,7 @@ module FFI
           end
         end
 
-        code = Tcl.eval_ex(self, string, string.bytesize, 0x40000)
+        code = Tcl.eval_ex(self, string, string.bytesize, EVAL_DIRECT)
         return true if code == 0
 
         message = guess_result.to_s

data/lib/ffi-tk/ffi/tk.rb

@@ -1,7 +1,7 @@
 module FFI
   module Tk
     extend FFI::Library
-    ffi_lib [*::Tk::LIBPATH[:tk], 'libtk', 'tk85', 'libtk8.5']
+    ffi_lib ::Tk::TK_LIBPATH
 
     class XColor < FFI::Struct
       layout(

data/lib/ffi-tk/tk.rb

@@ -14,21 +14,6 @@ module Tk
 
   module_function
 
-  unless const_defined?(:RUN_EVENTLOOP_ON_MAIN_THREAD)
-    # In some cases Tk has trouble running, this seems to happen on windows and
-    # OSX/TkAqua mostly.
-    # In these cases please use:
-    #   module Tk; RUN_EVENTLOOP_ON_MAIN_THREAD = true; end
-    # before you require 'tk'
-    RUN_EVENTLOOP_ON_MAIN_THREAD = false
-  end
-
-  DONT_WAIT     = 1 << 1
-  WINDOW_EVENTS = 1 << 2
-  FILE_EVENTS   = 1 << 3
-  TIMER_EVENTS  = 1 << 4
-  IDLE_EVENTS   = 1 << 5
-  ALL_EVENTS    = ~DONT_WAIT
 
   def init
     if RUN_EVENTLOOP_ON_MAIN_THREAD
@@ -184,7 +169,7 @@ module Tk
     parent_name = parent.respond_to?(:tk_pathname) ? parent.tk_pathname : parent
     cmd = object.class.tk_command
 
-    id = "#{cmd}#{uuid(cmd)}"
+    id = "#{cmd}#{uuid(cmd)}".gsub('::', '__') # :: is namespace convention.
     pathname = [parent_name, id].join('.').squeeze('.')
     @widgets[pathname] = object
 

data/lib/ffi-tk/version.rb

@@ -1,3 +1,3 @@
 module FFI::Tk
-  VERSION = "2010.03"
+  VERSION = "2010.06"
 end

data/lib/ffi-tk/widget/tile/combobox.rb

@@ -2,10 +2,15 @@ module Tk
   module Tile
     # combobox combines a text field with a pop-down list of values.
     # the user may select the value of the text field from among the values in the list.
-    class ComboBox < Tile::Entry
+    class ComboBox < Widget
       def self.tk_command; 'ttk::combobox'; end
+
       include TileWidget
-      # include Cget, Configure
+      include Cget, Configure
+
+      def initialize(parent = Tk.root, options = {})
+        super
+      end
 
       def postcommand(&block)
         configure(:postcommand => block) if block

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-tk
 version: !ruby/object:Gem::Version 
+  hash: 8047
   prerelease: false
   segments: 
   - 2010
-  - 3
-  version: "2010.03"
+  - 6
+  version: "2010.06"
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -13,16 +14,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 +09:00
+date: 2010-06-03 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 6
@@ -34,9 +37,11 @@ dependencies:
   name: bacon
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -257,16 +262,20 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 29
       segments: 
       - 1
       - 3
@@ -275,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Pure Ruby FFI wrapper for the Tk GUI toolkit.