fxruby 1.2.4 → 1.2.5

data/ext/fox12/unregisterOwnedObjects.cpp

@@ -0,0 +1,112 @@
+/***********************************************************************
+ * $Id: unregisterOwnedObjects.cpp,v 1.2 2005/03/01 03:14:59 lyle Exp $
+ ***********************************************************************/
+
+/**
+ * The purpose of an unregisterOwnedObjects() function for a particular
+ * class is to call FXRbUnregisterRubyObj() on any objects that this object
+ * created itself, and which it "owns" and will destroy in its destructor.
+ * This includes not only child widgets, like the horizontal and vertical
+ * scrollbars managed by an FXScrollArea, but other non-widget objects
+ * like list items.
+ *
+ * You don't need to worry about objects that the user created himself
+ * using Ruby code, because those should get unregistered automatically
+ * when they're destroyed. So, for example, if I create a button as a child
+ * of a frame, e.g.
+ *
+ *     FXButton.new(parentFrame, ...)
+ *
+ * that Ruby object's peer is an FXRbButton instance, and the destructor for
+ * the FXRbButton class calls FXRbUnregisterRubyObj(this). We only need to
+ * worry about the C++ objects that aren't subclasses of regular FOX classes,
+ * but which have somehow been "exposed" to the Ruby layer.
+ */
+ 
+#include "FXRbCommon.h"
+
+void FXRbHeader::unregisterOwnedObjects(FXHeader *self)
+{
+    // FXRbFrame::unregisterOwnedObjects(self);
+    for (FXint i = 0; i < self->getNumItems(); i++) FXRbUnregisterRubyObj(self->getItem(i));
+}
+
+void FXRbScrollArea::unregisterOwnedObjects(FXScrollArea *self)
+{
+    // FXRbComposite::unregisterOwnedObjects(self);
+    FXRbUnregisterRubyObj(self->horizontalScrollBar());
+    FXRbUnregisterRubyObj(self->verticalScrollBar());
+}
+
+/*
+void FXRbBitmapView::unregisterOwnedObjects(FXBitmapView *self)
+{
+    FXRbScrollArea::unregisterOwnedObjects(self);
+}
+*/
+
+void FXRbFoldingList::unregisterOwnedObjects(FXFoldingList *self)
+{
+    FXRbScrollArea::unregisterOwnedObjects(self);
+    FXRbUnregisterRubyObj(self->getHeader());
+    
+    // Save pointer(s) to the soon-to-be-destroyed items
+    FXObjectListOf<FXFoldingItem> items;
+    FXRbFoldingList::enumerateItems(self->getFirstItem(),self->getLastItem(),items);
+
+    // Now zero-out pointers held by still-alive Ruby objects
+    for (FXint i = 0; i <items.no(); i++) FXRbUnregisterRubyObj(items[i]);
+}
+
+void FXRbIconList::unregisterOwnedObjects(FXIconList *self)
+{
+    FXRbScrollArea::unregisterOwnedObjects(self);
+    FXRbUnregisterRubyObj(self->getHeader());
+    for (FXint i = 0; i <self->getNumItems(); i++) FXRbUnregisterRubyObj(self->getItem(i));
+}
+
+void FXRbImageView::unregisterOwnedObjects(FXImageView *self)
+{
+    FXRbScrollArea::unregisterOwnedObjects(self);
+}
+
+void FXRbList::unregisterOwnedObjects(FXList *self)
+{
+    FXRbScrollArea::unregisterOwnedObjects(self);
+    for (FXint i = 0; i < self->getNumItems(); i++) FXRbUnregisterRubyObj(self->getItem(i));
+}
+
+void FXRbScrollWindow::unregisterOwnedObjects(FXScrollWindow *self)
+{
+    FXRbScrollArea::unregisterOwnedObjects(self);
+}
+
+void FXRbTable::unregisterOwnedObjects(FXTable *self)
+{
+    FXRbScrollArea::unregisterOwnedObjects(self);
+    FXRbUnregisterRubyObj(self->getColumnHeader());
+    FXRbUnregisterRubyObj(self->getRowHeader());
+    for(FXint r=0; r<self->getNumRows(); r++){
+      for(FXint c=0; c<self->getNumColumns(); c++){
+	FXRbUnregisterRubyObj(self->getItem(r,c));
+        }
+      }
+}
+
+void FXRbText::unregisterOwnedObjects(FXText *self)
+{
+    FXRbScrollArea::unregisterOwnedObjects(self);
+}
+
+void FXRbTreeList::unregisterOwnedObjects(FXTreeList *self)
+{
+    FXRbScrollArea::unregisterOwnedObjects(self);
+    
+    // Save pointer(s) to the soon-to-be-destroyed items
+    FXObjectListOf<FXTreeItem> items;
+    FXRbTreeList::enumerateItems(self->getFirstItem(), self->getLastItem(), items);
+
+    // Now zero-out pointers held by still-alive Ruby objects
+    for (FXint i = 0; i < items.no(); i++) FXRbUnregisterRubyObj(items[i]);
+}
+

data/lib/fox12/core.rb

@@ -271,6 +271,15 @@ module Fox
     def appendRows(numRows=1, notify=false)
       insertRows(self.numRows, numRows, notify)
     end
+    
+    # Select cell at (_row_, _col_).
+    # If _notify_ is +true+, a +SEL_SELECTED+ message is sent to the table's message target
+    # after the item is selected.
+    # Raises IndexError if either _row_ or _col_ is out of bounds.
+    #
+    def selectItem(row, col, notify=false)
+      selectRange(row, row, col, col, notify)
+    end
   end
 end
 

data/lib/fox12/version.rb

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

data/rdoc-sources/FXTable.rb

@@ -430,6 +430,9 @@ module Fox
     #   indicating which cells (if any) were added as a result of the resize; and,
     # * a +SEL_CHANGED+ message will be sent to the table's message target
     #   indicating the new current cell.
+    #
+    # Raises ArgError if either _numRows_ or _numCols_ is less than zero.
+    #
     def setTableSize(numRows, numCols, notify=false) ; end
   
     #
@@ -578,10 +581,49 @@ module Fox
     # Raises IndexError if either _row_ or _column_ is out of bounds.
     def getItemData(row, column) ; end
 
-    # Extract cells from given range as text.
+    #
+    # Extract the text from all the cells in the specified range and
+    # return the result as a string.
+    # Within the result string, each column's text is delimited by
+    # the character specified by _cs_, and each row is delimited by
+    # the character specified by _rs_.
+    # To reverse this operation (i.e. set the table cells' text
+    # from a string), see #overlayText.
+    # Raises IndexError if any of _startrow_, _endrow_, _startcol_
+    # or _endcol_ is out of bounds.
+    #
+    # ==== Parameters:
+    #
+    # +startrow+::	the starting row for the range [Integer]
+    # +endrow+::	the ending row for the range [Integer]
+    # +startcol+::	the starting column for the range [Integer]
+    # +endcol+::	the ending column for the range [Integer]
+    # +cs+::		the character to insert at each column break [String]
+    # +rs+::		the character to insert at each row break [String]
+    #
     def extractText(startrow, endrow, startcol, endcol, cs='\t', rs='\n'); end
     
-    # Overlay text over given cell range.
+    #
+    # Overlay the text for the cells in the specified range with
+    # the fields specified in _text_.
+    # Within the _text_ string, each column's text should delimited by
+    # the character specified by _cs_, and each row should be delimited by
+    # the character specified by _rs_.
+    # To reverse this operation (i.e. extract the table cells' text
+    # into a string), see #extractText.
+    # Raises IndexError if any of _startrow_, _endrow_, _startcol_
+    # or _endcol_ is out of bounds.
+    #
+    # ==== Parameters:
+    #
+    # +startrow+::	the starting row for the range [Integer]
+    # +endrow+::	the ending row for the range [Integer]
+    # +startcol+::	the starting column for the range [Integer]
+    # +endcol+::	the ending column for the range [Integer]
+    # +text+::		the text containing the new cell text [String]
+    # +cs+::		the character to insert at each column break [String]
+    # +rs+::		the character to insert at each row break [String]
+    #
     def overlayText(startrow, endrow, startcol, endcol, text, cs='\t', rs='\n'); end
     
     # Return +true+ if the cell at position (_r_, _c_) is a spanning cell.

data/tests/TC_FXTable.rb

@@ -164,14 +164,16 @@ public
   
   def setup
     super(self.class.name)
-    @table = FXTable.new(mainWindow, 0, 0)
-    @customTable = CustomTable.new(mainWindow, 0, 0)
+    @table = FXTable.new(mainWindow)
+    @customTable = CustomTable.new(mainWindow)
     populateTable
   end
-  
+
+=begin
   def test_setTableSize
     100.times { loadLog } # this should be enough to do it
   end
+=end
   
   def test_getCellColor
     assert_nothing_raised {
@@ -234,19 +236,19 @@ public
   def test_updateRange
     @table.setTableSize(5, 5)
     assert_nothing_raised {
-      @table.updateRange(0, 5, 0, 5)
+      @table.updateRange(0, 4, 0, 4)
     }
     assert_raises(IndexError) {
-      @table.updateRange(-1, 5, 0, 5) # startRow < 0
+      @table.updateRange(-1, 0, 0, 0) # startRow < 0
     }
     assert_raises(IndexError) {
-      @table.updateRange(0, 6, 0, 5) # endRow > numRows
+      @table.updateRange(0, 5, 0, 0) # endRow >= numRows
     }
     assert_raises(IndexError) {
-      @table.updateRange(0, 5, -1, 5) # startCol < 0
+      @table.updateRange(0, 0, -1, 0) # startCol < 0
     }
     assert_raises(IndexError) {
-      @table.updateRange(0, 5, 0, 6) # endCol > numColumns
+      @table.updateRange(0, 0, 0, 5) # endCol >= numColumns
     }
   end
   
@@ -313,7 +315,7 @@ public
       @table.removeColumns(@table.numColumns)
     }
   end
-  
+
   def test_getColumnX
     @table.setTableSize(5, 5)
     assert_raises(IndexError) {
@@ -323,10 +325,10 @@ public
       @table.getColumnX(0)
     }
     assert_nothing_raised {
-      @table.getColumnX(5)
+      @table.getColumnX(4)
     }
     assert_raises(IndexError) {
-      @table.getColumnX(6)
+      @table.getColumnX(5)
     }
   end
   
@@ -355,114 +357,44 @@ public
       @table.getRowY(0)
     }
     assert_nothing_raised {
-      @table.getRowY(5)
+      @table.getRowY(4)
     }
     assert_raises(IndexError) {
-      @table.getRowY(6)
+      @table.getRowY(5)
     }
   end
-  
+
   def test_setRowY
     @table.setTableSize(5, 5)
     assert_raises(IndexError) {
-      @table.setRowY(-1, 0)
+      @table.setRowY(-1, 0) # out of bounds
     }
     assert_nothing_raised {
-      @table.setRowY(0, 0)
+      @table.setRowY(0, 0) # top edge
     }
     assert_nothing_raised {
-      @table.setRowY(5, 0)
-    }
-    assert_raises(IndexError) {
-      @table.setRowY(6, 0)
+      @table.setRowY(5, 0) # bottom edge
     }
-  end
-  
-  def test_setLeadingRows
-    @table.setTableSize(5, 5)
-    @table.trailingRows = 2
     assert_raises(IndexError) {
-      @table.leadingRows = -1
+      @table.setRowY(6, 0) # out of bounds
     }
-    assert_nothing_raised {
-      @table.leadingRows = 0
-    }
-    assert_nothing_raised {
-      @table.leadingRows = @table.numRows - @table.trailingRows
-    }
-    assert_raises(IndexError) {
-      @table.leadingRows = @table.numRows - @table.trailingRows + 1
-    }
-  end
-  
-  def test_setLeadingCols
-    @table.setTableSize(5, 5)
-    @table.trailingColumns = 2
-    assert_raises(IndexError) {
-      @table.leadingColumns = -1
-    }
-    assert_nothing_raised {
-      @table.leadingColumns = 0
-    }
-    assert_nothing_raised {
-      @table.leadingColumns = @table.numColumns - @table.trailingColumns
-    }
-    assert_raises(IndexError) {
-      @table.leadingColumns = @table.numColumns - @table.trailingColumns + 1
-    }
-  end
-  
-  def test_setTrailingRows
-    @table.setTableSize(5, 5)
-    @table.leadingRows = 2
-    assert_raises(IndexError) {
-      @table.trailingRows = -1
-    }
-    assert_nothing_raised {
-      @table.trailingRows = 0
-    }
-    assert_nothing_raised {
-      @table.trailingRows = @table.numRows - @table.leadingRows
-    }
-    assert_raises(IndexError) {
-      @table.trailingRows = @table.numRows - @table.leadingRows + 1
-    }
-  end
-  
-  def test_setTrailingCols
-    @table.setTableSize(5, 5)
-    @table.leadingColumns = 2
-    assert_raises(IndexError) {
-      @table.trailingColumns = -1
-    }
-    assert_nothing_raised {
-      @table.trailingColumns = 0
-    }
-    assert_nothing_raised {
-      @table.trailingColumns = @table.numColumns - @table.leadingColumns
-    }
-    assert_raises(IndexError) {
-      @table.trailingColumns = @table.numColumns - @table.leadingColumns + 1
-    }
-  end
-
-  def test_overridden_setColumnWidth
-    # What can we do to simulate a call to setColumnWidth?
-  end
+  end  
 
-  def test_overridden_setRowHeight
-    # What can we do to simulate a call to setRowHeight?
+  def test_extractText
+    @table.setTableSize(2, 2)
+    @table.setItemText(0, 0, "(0, 0)")
+    @table.setItemText(0, 1, "(0, 1)")
+    @table.setItemText(1, 0, "(1, 0)")
+    @table.setItemText(1, 1, "(1, 1)")
+    assert_equal("(0, 0)\t(0, 1)\n(1, 0)\t(1, 1)\n", @table.extractText(0, 1, 0, 1))
   end
-
-  def test_overridden_setColumnX
-#   assert_raises(OverrideError) {
-#     @customTable.handle(nil, FXSEL(SEL_MOTION, 0), event)
-#   }
-  end
-
-  def test_overridden_setRowY
-#   assert_raises(OverrideError) {
-#     @customTable.handle(nil, FXSEL(SEL_MOTION, 0), event)
-#   }
+  
+  def test_overlayText
+    @table.setTableSize(2, 2)
+    @table.overlayText(0, 1, 0, 1, "(0, 0)\t(0, 1)\n(1, 0)\t(1, 1)\n")
+    assert_equal("(0, 0)", @table.getItemText(0, 0))
+    assert_equal("(0, 1)", @table.getItemText(0, 1))
+    assert_equal("(1, 0)", @table.getItemText(1, 0))
+    assert_equal("(1, 1)", @table.getItemText(1, 1))
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.6
 specification_version: 1
 name: fxruby
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
-date: 2005-02-23
+  version: 1.2.5
+date: 2005-03-01
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.
 require_paths: 
   - ext/fox12
@@ -265,6 +265,7 @@ files:
   - ext/fox12/text_wrap.cpp
   - ext/fox12/treelist_wrap.cpp
   - ext/fox12/ui_wrap.cpp
+  - ext/fox12/unregisterOwnedObjects.cpp
   - ext/fox12/include/FXMemoryBuffer.h
   - ext/fox12/include/FXRb4Splitter.h
   - ext/fox12/include/FXRbAccelTable.h