fxruby 1.6.10 → 1.6.11

data/lib/fox16/aliases.rb

@@ -4764,6 +4764,7 @@ module Fox
     def editable?(*args) # :nodoc:
       isEditable(*args)
     end
+    alias :editable :editable?
     def editable=(*args) # :nodoc:
       setEditable(*args)
     end

data/lib/fox16/core.rb

@@ -263,15 +263,32 @@ module Fox
   class FXWindow
     #
     # Iterate over the child windows for this window.
+    # Note that this only reaches the direct child windows for this window
+    # and no deeper descendants. To traverse the entire widget tree,
+    # use #each_child_recursive.
     #
-    def each_child
+    def each_child # :yields: child
       child = self.first
       while child
         next_child = child.next
         yield child
-	child = next_child
+        child = next_child
       end
     end
+    
+    #
+    # Traverse the widget tree starting from this window
+    # using depth-first traversal.
+    # 
+    def each_child_recursive # :yields: child
+      each_child do |child|
+        yield child
+        child.each_child_recursive do |subchild|
+          yield subchild
+        end
+      end
+    end
+    
 
     # Returns an array containing all child windows of this window
     def children
@@ -607,6 +624,41 @@ module Fox
     def selectItem(row, col, notify=false)
       selectRange(row, row, col, col, notify)
     end
+
+=begin
+
+    # Deselect cell at (_row_, _col_).
+    # If _notify_ is +true+, a +SEL_DESELECTED+ message is sent to the table's message target
+    # after the item is deselected.
+    # Raises IndexError if either _row_ or _col_ is out of bounds.
+    #
+    def deselectItem(row, col, notify=false)
+      raise IndexError, "row index out of bounds" if row < 0 || row >= numRows
+      raise IndexError, "column index out of bounds" if col < 0 || col >= numColumns
+      deselectRange(row, row, col, col, notify)
+    end
+
+    # Deselect range.
+    # If _notify_ is +true+, a +SEL_DESELECTED+ message is sent to the table's message
+    # target for each previously selected cell that becomes deselected as a result of
+    # this operation.
+    # Raises IndexError if _startRow_, _endRow_, _startColumn_ or _endColumn_ is out of bounds.
+    def deselectRange(startRow, endRow, startColumn, endColumn, notify=false)
+      raise IndexError, "starting row index out of bounds"    if startRow < 0 || startRow >= numRows
+      raise IndexError, "ending row index out of bounds"      if endRow < 0 || endRow >= numRows
+      raise IndexError, "starting column index out of bounds" if startColumn < 0 || startColumn >= numColumns
+      raise IndexError, "ending column index out of bounds"   if endColumn < 0 || endColumn >= numColumns
+      changes = false
+      for row in startRow..endRow
+        for col in startColumn..endColumn
+          changes |= deselectItem(row, col, notify)
+        end
+      end
+      changes
+    end
+    
+=end
+
   end
 end
 

data/lib/fox16/iterators.rb

@@ -25,7 +25,7 @@ module Fox
     # reference to that item as a parameter.
     #
     def each # :yields: aFoldingItem
-      current = first
+      current = firstItem
       while current != nil
         next_current = current.next
         yield current
@@ -183,7 +183,7 @@ module Fox
     # reference to that item as a parameter.
     #
     def each # :yields: aTreeItem
-      current = first
+      current = firstItem
       while current != nil
         next_current = current.next
         yield current
@@ -202,7 +202,7 @@ module Fox
     # reference to that item as a parameter.
     #
     def each # :yields: aTreeItem
-      current = first
+      current = firstItem
       while current != nil
         next_current = current.next
         yield current

data/lib/fox16/kwargs.rb

@@ -1104,7 +1104,7 @@ module Fox
     alias old_initialize initialize
     def initialize(app, *args, &blk)
       argument_names = %w{path}
-      default_params = { :path => defaultIconPath }
+      default_params = { :path => FXIconDict.defaultIconPath }
       params = {}
       params = args.pop if args.last.is_a? Hash
       args.each_with_index { |e, i| params[argument_names[i].intern] = e }
@@ -2580,34 +2580,6 @@ module Fox
     end
   end
 
-  class FXVec4d
-    alias old_initialize initialize
-    def initialize(xx, yy, zz, *args, &blk)
-      argument_names = %w{ww}
-      default_params = { :ww => 1.0 }
-      params = {}
-      params = args.pop if args.last.is_a? Hash
-      args.each_with_index { |e, i| params[argument_names[i].intern] = e }
-      params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
-      params = default_params.merge(params)
-      old_initialize(xx, yy, zz, params[:ww], &blk)
-    end
-  end
-
-  class FXVec4f
-    alias old_initialize initialize
-    def initialize(xx, yy, zz, *args, &blk)
-      argument_names = %w{ww}
-      default_params = { :ww => 1.0 }
-      params = {}
-      params = args.pop if args.last.is_a? Hash
-      args.each_with_index { |e, i| params[argument_names[i].intern] = e }
-      params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
-      params = default_params.merge(params)
-      old_initialize(xx, yy, zz, params[:ww], &blk)
-    end
-  end
-
   class FXVerticalFrame
     alias old_initialize initialize
     def initialize(p, *args, &blk)

data/lib/fox16/pseudokeyboard.rb

@@ -1,11 +1,17 @@
 module Fox
   #
-  # Based on a suggestion from Hugh Sasse on the fxruby-users mailing list,
-  # an FXPseudoKeyboard object provides a simple means to operate widgets
+  # An FXPseudoKeyboard object provides a simple means to operate widgets
   # programmatically, to aid test driven design. An FXPseudoKeyboard instance
   # can be pointed at an FXObject and will manage the sending of events to
   # it.
   #
+  # For example:
+  #
+  #   textfield = FXTextField.new(...)
+  #   pk = FXPseudoKeyboard.new(textfield)
+  #   pk.doKeyPress     # sends a SEL_KEYPRESS message to the textfield
+  #   pk.doKeyRelease   # sends a SEL_KEYRELEASE message to the textfield
+  #
   class FXPseudoKeyboard
 
     attr_accessor :target
@@ -17,16 +23,16 @@ module Fox
     def doKeyPress
       unless @target.nil?
         evt = FXEvent.new
-	evt.type = Fox::SEL_KEYPRESS
-        @target.handle(self, Fox.MKUINT(0, Fox::SEL_KEYPRESS), evt)
+        evt.type = Fox::SEL_KEYPRESS
+        @target.handle(self, Fox.FXSEL(Fox::SEL_KEYPRESS, 0), evt)
       end
     end
 
     def doKeyRelease
       unless @target.nil?
         evt = FXEvent.new
-	evt.type = Fox::SEL_KEYRELEASE
-        @target.handle(self, Fox.MKUINT(0, Fox::SEL_KEYRELEASE), evt)
+        evt.type = Fox::SEL_KEYRELEASE
+        @target.handle(self, Fox.FXSEL(Fox::SEL_KEYRELEASE, 0), evt)
       end
     end
   end

data/lib/fox16/pseudomouse.rb

@@ -1,11 +1,16 @@
 module Fox
   #
-  # Based on a suggestion from Hugh Sasse on the fxruby-users mailing list,
-  # an FXPseudoMouse object provides a simple means to operate widgets
+  # An FXPseudoMouse object provides a simple means to operate widgets
   # programmatically, to aid test driven design. An FXPseudoMouse instance
   # can be pointed at an FXObject and will manage the sending of events to
   # it.
   #
+  # For example:
+  #
+  #   canvas = FXCanvas.new(...)
+  #   pm = FXPseudoMouse.new(canvas)
+  #   pm.doLeftButtonPress # sends a SEL_LEFTBUTTONPRESS message to the canvas
+  #
   class FXPseudoMouse < FXObject
 
     attr_accessor :target
@@ -18,7 +23,7 @@ module Fox
       unless @target.nil?
         evt = FXEvent.new
         evt.type = Fox::SEL_MOTION
-        @target.handle(self, Fox.MKUINT(0, Fox::SEL_MOTION), evt)
+        @target.handle(self, Fox.FXSEL(Fox::SEL_MOTION, 0), evt)
       end
     end
 
@@ -26,7 +31,7 @@ module Fox
       unless @target.nil?
         evt = FXEvent.new
         evt.type = Fox::SEL_MOUSEWHEEL
-        @target.handle(self, Fox.MKUINT(0, Fox::SEL_MOUSEWHEEL), evt)
+        @target.handle(self, Fox.FXSEL(Fox::SEL_MOUSEWHEEL, 0), evt)
       end
     end
 
@@ -34,7 +39,7 @@ module Fox
       unless @target.nil?
         evt = FXEvent.new
         evt.type = Fox::SEL_LEFTBUTTONPRESS
-        @target.handle(self, Fox.MKUINT(0, Fox::SEL_LEFTBUTTONPRESS), evt)
+        @target.handle(self, Fox.FXSEL(Fox::SEL_LEFTBUTTONPRESS, 0), evt)
       end
     end
 
@@ -42,7 +47,7 @@ module Fox
       unless @target.nil?
        evt = FXEvent.new
         evt.type = Fox::SEL_LEFTBUTTONRELEASE
-       @target.handle(self, Fox.MKUINT(0, Fox::SEL_LEFTBUTTONRELEASE), evt)
+       @target.handle(self, Fox.FXSEL(Fox::SEL_LEFTBUTTONRELEASE, 0), evt)
       end
     end
 
@@ -50,7 +55,7 @@ module Fox
       unless @target.nil?
         evt = FXEvent.new
         evt.type = Fox::SEL_MIDDLEBUTTONPRESS
-        @target.handle(self, Fox.MKUINT(0, Fox::SEL_MIDDLEBUTTONPRESS), evt)
+        @target.handle(self, Fox.FXSEL(Fox::SEL_MIDDLEBUTTONPRESS, 0), evt)
       end
     end
 
@@ -58,7 +63,7 @@ module Fox
       unless @target.nil?
         evt = FXEvent.new
         evt.type = Fox::SEL_MIDDLEBUTTONRELEASE
-        @target.handle(self, Fox.MKUINT(0, Fox::SEL_MIDDLEBUTTONRELEASE), evt)
+        @target.handle(self, Fox.FXSEL(Fox::SEL_MIDDLEBUTTONRELEASE, 0), evt)
       end
     end
 
@@ -66,7 +71,7 @@ module Fox
       unless @target.nil?
         evt = FXEvent.new
         evt.type = Fox::SEL_RIGHTBUTTONPRESS
-        @target.handle(self, Fox.MKUINT(0, Fox::SEL_RIGHTBUTTONPRESS), evt)
+        @target.handle(self, Fox.FXSEL(Fox::SEL_RIGHTBUTTONPRESS, 0), evt)
       end
     end
 
@@ -74,7 +79,7 @@ module Fox
       unless @target.nil?
         evt = FXEvent.new
         evt.type = Fox::SEL_RIGHTBUTTONRELEASE
-        @target.handle(self, Fox.MKUINT(0, Fox::SEL_RIGHTBUTTONRELEASE), evt)
+        @target.handle(self, Fox.FXSEL(Fox::SEL_RIGHTBUTTONRELEASE, 0), evt)
       end
     end
   end

data/lib/fox16/version.rb

@@ -3,7 +3,7 @@ module Fox
   # Returns the FXRuby version number as a string, e.g. "1.0.19".
   #
   def Fox.fxrubyversion
-    "1.6.10"
+    "1.6.11"
   end
 end
 

data/rdoc-sources/FXIconDict.rb

@@ -21,7 +21,7 @@ module Fox
     # Construct icon dictionary, and set initial search path; also
     # creates a default icon source object.
     #
-    def initialize(app, path=defaultIconPath);
+    def initialize(app, path=FXIconDict.defaultIconPath);
 
     # Change icon source to _src_ (an FXIconSource instance).
     def iconSource=(src); end

data/tests/TC_FXFoldingList.rb

@@ -0,0 +1,32 @@
+require 'test/unit'
+require 'testcase'
+require 'fox16'
+
+include Fox
+
+class TC_FXFoldingList < TestCase
+  
+  def setup
+    super(self.class.name)
+    @foldingList = FXFoldingList.new(mainWindow)
+  end
+
+  def test_each_for_empty_list
+    count = 0
+    @foldingList.each { |item| count += 1 }
+    assert_equal(0, count, "count for empty list should be zero")
+  end
+  
+  def test_each
+    @foldingList.appendItem(nil, "1")
+    @foldingList.appendItem(nil, "2")
+    @foldingList.appendItem(nil, "3")
+    @foldingList.appendItem(nil, "4")
+    @foldingList.appendItem(nil, "5")
+    count = 0
+    @foldingList.each { |item| count += 1 }
+    assert_equal(5, count, "count didn't match expected number of items")
+  end
+  
+end
+

data/tests/TC_FXTreeList.rb

@@ -80,4 +80,21 @@ class TC_FXTreeList < TestCase
     @treeList.removeItem(theItem, true)
     assert_same(theItem, anItem)
   end
+
+  def test_each_for_empty_list
+    count = 0
+    @treeList.each { |item| count += 1 }
+    assert_equal(0, count, "count for empty list should be zero")
+  end
+  
+  def test_each
+    @treeList.appendItem(nil, "1")
+    @treeList.appendItem(nil, "2")
+    @treeList.appendItem(nil, "3")
+    @treeList.appendItem(nil, "4")
+    count = 0
+    @treeList.each { |item| count += 1 }
+    assert_equal(4, count, "count didn't match expected number of items")
+  end
+  
 end

data/tests/TC_FXTreeListBox.rb

@@ -5,6 +5,7 @@ require 'fox16'
 include Fox
 
 class TC_FXTreeListBox < TestCase
+  
   def setup
     super(self.class.name)
     @treeListBox = FXTreeListBox.new(mainWindow)
@@ -19,5 +20,22 @@ class TC_FXTreeListBox < TestCase
     assert_equal("B", @treeListBox.firstItem.next.text)
     assert_equal("C", @treeListBox.lastItem.text)
   end
+
+  def test_each_for_empty_list
+    count = 0
+    @treeListBox.each { |item| count += 1 }
+    assert_equal(0, count, "count for empty list should be zero")
+  end
+  
+  def test_each
+    @treeListBox.appendItem(nil, "1")
+    @treeListBox.appendItem(nil, "2")
+    @treeListBox.appendItem(nil, "3")
+    @treeListBox.appendItem(nil, "4")
+    count = 0
+    @treeListBox.each { |item| count += 1 }
+    assert_equal(4, count, "count didn't match expected number of items")
+  end
+  
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: fxruby
 version: !ruby/object:Gem::Version 
-  version: 1.6.10
-date: 2007-04-09 00:00:00 -05:00
+  version: 1.6.11
+date: 2007-04-18 00:00:00 -05:00
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.
 require_paths: 
 - ext/fox16
@@ -260,6 +260,7 @@ files:
 - tests/TC_FXDirList.rb
 - tests/TC_FXFileAssoc.rb
 - tests/TC_FXFileStream.rb
+- tests/TC_FXFoldingList.rb
 - tests/TC_FXFont.rb
 - tests/TC_FXFontDesc.rb
 - tests/TC_FXGLGroup.rb
@@ -782,6 +783,8 @@ rdoc_options:
 - rdoc-sources/README.rdoc
 - --exclude
 - ext/fox16
+- --exclude
+- !ruby/regexp /acceltable|aliases|bitmapview|canvas|html|kwargs|missingdep|responder|tkcompat/
 extra_rdoc_files: 
 - rdoc-sources
 - rdoc-sources/README.rdoc