1 files changed, 23 insertions, 2 deletions
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
index 2887b60815..d6436d202a 100644
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
@@ -37,7 +37,7 @@ class Tk::Iwidgets::Scrolledtext
   end
 
   def method_missing(id, *args)
-    if @text.methods.include?(id.id2name)
+    if @text.respond_to?(id)
       @text.__send__(id, *args)
     else
       super(id, *args)
@@ -116,7 +116,7 @@ class Tk::Iwidgets::Scrolledtext
     get('-displaychars', *index)
   end
 
-  def image_cget(index, slot)
+  def image_cget_strict(index, slot)
     case slot.to_s
     when 'text', 'label', 'show', 'data', 'file'
       _fromUTF8(tk_send_without_enc('image', 'cget', 
@@ -127,6 +127,27 @@ class Tk::Iwidgets::Scrolledtext
                                                 "-#{slot}")))
     end
   end
+  def image_cget(index, slot)
+    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
+      image_cget_strict(index, slot)
+    else
+      begin
+        image_cget_strict(index, slot)
+      rescue => e
+        begin
+          if current_image_configinfo.has_key?(slot.to_s)
+            # error on known option
+            fail e
+          else
+            # unknown option
+            nil
+          end
+        rescue
+          fail e  # tag error
+        end
+      end
+    end
+  end
 
   def image_configure(index, slot, value=None)
     if slot.kind_of? Hash