Added support for passing lambda functions into FXAccelTable#addAccel

lib/fox16/accel_table.rb

+module Fox
+  class FXAccelTable
+    alias addAccelOrig addAccel # :nodoc:
+    
+    #
+    # Add an accelerator to the table. The _hotKey_ is a code returned
+    # by the Fox.fxparseAccel method. For example, to associate the
+    # Ctrl+S keypress with sending a "save" command to a document, you
+    # might use code like this:
+    #
+    #   hotKey = fxparseAccel("Ctrl+S")
+    #   accelTable.addAccel(hotKey, doc, FXSEL(SEL_COMMAND, MyDocument::ID_SAVE))
+    #
+    # A more straightforward way is to pass one or more callable objects in:
+    #
+    #   accelTable.addAccel(hotKey, lambda { doc.save })
+    #
+    # or to trigger the event on the key "up" event,
+    #
+    #   accelTable.addAccel(hotKey, nil, lambda { doc.save })
+    #
+    def addAccel(hotKey, *args)
+      tgt, seldn, selup = nil, 0, 0
+      if args.length > 0
+        if args[0].respond_to? :call
+          tgt = FXPseudoTarget.new
+          seldn = FXSEL(SEL_KEYPRESS, 0)
+          tgt.pconnect(SEL_KEYPRESS, args[0])
+        else
+          tgt = args[0]
+          if args.length > 1
+            if args[1].respond_to? :call
+              tgt = tgt || FXPseudoTarget.new
+              selup = FXSEL(SEL_KEYRELEASE, 0)
+              tgt.pconnect(SEL_KEYRELEASE, args[1])
+            else
+              seldn = args[1]
+              selup = args[2] if args.length > 2
+            end
+          end
+        end
+      end
+      addAccelOrig(hotKey, tgt, seldn, selup)
+    end
+  end
+end
\ No newline at end of file

lib/fox16/responder2.rb

@@ -129,3 +129,4 @@ require 'fox16/timeout'
 require 'fox16/chore'
 require 'fox16/signal'
 require 'fox16/input'
+require 'fox16/accel_table'

rdoc-sources/FXAccelTable.rb

@@ -11,24 +11,6 @@ module Fox
     def initialize # :yields: acceleratorTable
     end
 
-    #
-    # Add an accelerator to the table. The _hotKey_ is a code returned
-    # by the Fox.fxparseAccel method. For example, to associate the
-    # Ctrl+S keypress with sending a "save" command to a document, you
-    # might use code like this:
-    #
-    #   hotKey = fxparseAccel("Ctrl+S")
-    #   accelTable.addAccel(hotKey, doc, FXSEL(SEL_COMMAND, MyDocument::ID_SAVE))
-    #
-    # ==== Parameters:
-    #
-    # +hotKey+::	the hotkey associated with this accelerator [Integer]
-    # +target+::		message target [FXObject]
-    # +seldn+::		selector for the +SEL_KEYPRESS+ event [Integer]
-    # +selup+::		selector for the +SEL_KEYRELEASE+ event [Integer]
-    #
-    def addAccel(hotKey, target=nil, seldn=0, selup=0) ; end
-
     #
     # Remove an accelerator from the table.
     #

tests/TC_FXAccelTable.rb

@@ -6,38 +6,52 @@ include Fox
 
 class TC_FXAccelTable < Test::Unit::TestCase
   def setup
-    @accel = FXAccelTable.new
+    @accelTable = FXAccelTable.new
+    @hotKey = fxparseHotKey('&q')
   end
 
-  def test_addAccel
-    hotkey = fxparseHotKey('&A')
-    target = FXObject.new
-    seldn, selup = 0, 0
-    @accel.addAccel(hotkey)
-    @accel.addAccel(hotkey, target)
-    @accel.addAccel(hotkey, target, seldn)
-    @accel.addAccel(hotkey, target, seldn, selup)
+  def test_add_accel_with_nil_target
+    @accelTable.addAccel(@hotKey)
+    assert @accelTable.hasAccel?(@hotKey)
+    assert_nil @accelTable.targetOfAccel(@hotKey)
   end
   
-  def test_hasAccel
-    hotkey = fxparseHotKey('&b')
-    assert(!@accel.hasAccel?(hotkey))
-    @accel.addAccel(hotkey)
-    assert(@accel.hasAccel?(hotkey))
+  def test_add_accel_with_default_seldn_selup
+    target = FXObject.new
+    @accelTable.addAccel(@hotKey, target)
+    assert_same target, @accelTable.targetOfAccel(@hotKey)
+  end
+
+  def test_add_accel_with_default_selup
+    @accelTable.addAccel(@hotKey, FXObject.new, FXSEL(SEL_COMMAND, FXWindow::ID_SHOW))
+  end
+
+  def test_add_accel_with_no_defaults
+    @accelTable.addAccel(@hotKey, FXObject.new, FXSEL(SEL_COMMAND, FXWindow::ID_SHOW), FXSEL(SEL_COMMAND, FXWindow::ID_HIDE))
   end
   
-  def test_targetOfAccel
-    hotkey = fxparseHotKey("&x")
-    target = FXObject.new
-    @accel.addAccel(hotkey, target)
-    assert_same(target, @accel.targetOfAccel(hotkey))
+  def test_add_accel_with_lambda_for_seldn
+    @accelTable.addAccel(@hotKey, lambda { puts "hello" })
+  end
+
+  def test_add_accel_with_lambda_for_selup
+    @accelTable.addAccel(@hotKey, nil, lambda { puts "goodbye" })
+  end
+
+  def test_add_accel_with_lambda_for_selup_and_seldn
+    @accelTable.addAccel(@hotKey, lambda { puts "hello" }, lambda { puts "goodbye" })
+  end
+
+  def test_has_accel
+    assert(!@accelTable.hasAccel?(@hotKey))
+    @accelTable.addAccel(@hotKey)
+    assert(@accelTable.hasAccel?(@hotKey))
   end
   
-  def test_removeAccel
-    hotkey = fxparseHotKey('&b')
-    @accel.addAccel(hotkey)
-    assert(@accel.hasAccel?(hotkey))
-    @accel.removeAccel(hotkey)
-    assert(!@accel.hasAccel?(hotkey))
+  def test_remove_accel
+    @accelTable.addAccel(@hotKey)
+    assert(@accelTable.hasAccel?(@hotKey))
+    @accelTable.removeAccel(@hotKey)
+    assert(!@accelTable.hasAccel?(@hotKey))
   end
 end