fxruby 1.6.40 → 1.6.41

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.40"
+    "1.6.41"
   end
 end

data/rdoc-sources/FXGLVisual.rb

@@ -83,7 +83,7 @@ module Fox
 
     # Test if OpenGL is possible.
     #
-    # Same as {FXGLVisual.supported?}, but returns the first element (true/false) only.
+    # Same as {FXGLVisual.supported}, but returns the first element (true/false) only.
     #
     def FXGLVisual.supported?(app); end
 

data/rdoc-sources/FXIconList.rb

@@ -267,6 +267,8 @@ module Fox
     # after the item is appended.
     def appendItem(text, bigIcon=nil, miniIcon=nil, data=nil, notify=false); end
 
+    alias << appendItem
+
     # Prepend a new (possibly subclassed) _item_ to the beginning of the list.
     # If _notify_ is +true+, a +SEL_INSERTED+ message is sent to the list's message target
     # after the item is prepended.

data/rdoc-sources/FXList.rb

@@ -217,6 +217,8 @@ module Fox
     # Returns the integer index of the newly appended item.
     def appendItem(text, icon=nil, data=nil, notify=false) ; end
 
+    alias << appendItem
+
     # Prepend a (possibly subclassed) _item_ to the list, e.g.
     #
     #   list.prependItem(FXListItem.new("clyde"))

data/rdoc-sources/FXListBox.rb

@@ -186,6 +186,6 @@ module Fox
     # Sort items using current sort function
     def sortItems; end
 
-    alias appendItem <<
+    alias << appendItem
   end
 end

data/rdoc-sources/FXText.rb

@@ -436,8 +436,8 @@ module Fox
     #
     # Search for _string_ in text buffer, and return the extent of
     # the string as a two-element array of arrays.
-    # The first array contains the beginning index (or indices)
-    # and the second array contains the ending index (or indices).
+    # The first array contains the beginning index (or indices if +SEARCH_REGEX+)
+    # and the second array contains the ending index (or indices if +SEARCH_REGEX+) of the first match.
     # The search starts from the given
     # _start_ position, scans forward (+SEARCH_FORWARD+) or backward
     # (+SEARCH_BACKWARD+), and wraps around if +SEARCH_WRAP+ has been
@@ -445,6 +445,8 @@ module Fox
     # case insensitive search (+SEARCH_IGNORECASE+), or regular expression
     # search (+SEARCH_REGEX+).
     #
+    # For regular expression searches, the found regex match begin and end is returned at index 0 and captures are returned as entries starting at index 1 in both beginning and ending arrays.
+    #
     def findText(string, start=0, flags=SEARCH_FORWARD|SEARCH_WRAP|SEARCH_EXACT); end
 
     # Return +true+ if position _pos_ is selected

data/swig-interfaces/FXText.i

@@ -519,6 +519,8 @@ public:
 
   %extend {
     /**
+    * TODO: Change API to return [beg, end] instead of [[beg], [end]] for non regex.
+    *
     * Search for string in text buffer, returning the extent of
     * the string in beg and end.  The search starts from the given
     * starting position, scans forward (SEARCH_FORWARD) or backward
@@ -536,23 +538,23 @@ public:
       FXint* beg;
       FXint* end;
       VALUE ary=Qnil;
-			FXint ngroups=string.contains('(')+1;  // FIXME: is this right?
+      FXint ngroups = flags&SEARCH_REGEX ? string.contains('(')+1 : 1;  // FIXME: is this right?
       if(!FXMALLOC(&beg,FXint,ngroups)){
         return Qnil;
-				}
+      }
       if(!FXMALLOC(&end,FXint,ngroups)){
         FXFREE(&beg);
-				return Qnil;
-				}
+        return Qnil;
+      }
       if(self->findText(string,beg,end,start,flags,ngroups)){
         ary=rb_ary_new();
-				rb_ary_push(ary,FXRbMakeArray(beg,ngroups));
-				rb_ary_push(ary,FXRbMakeArray(end,ngroups));
-        }
+        rb_ary_push(ary,FXRbMakeArray(beg,ngroups));
+        rb_ary_push(ary,FXRbMakeArray(end,ngroups));
+      }
       FXFREE(&beg);
       FXFREE(&end);
       return ary;
-      }
+    }
   }
 
   /// Return TRUE if position pos is selected

data/swig-interfaces/macros.i

@@ -1165,6 +1165,15 @@
 
 %define DECLARE_FXTEXT_VIRTUALS(klass)
 %extend klass {
+  virtual void eraseCursorOverhang();
+  virtual void drawCursor(FXuint state);
+  virtual FXuint style(FXint row,FXint beg,FXint end,FXint pos);
+  virtual void drawBufferText(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXint pos,FXint n,FXuint style);
+  virtual void fillBufferRect(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXuint style);
+  virtual void drawTextRow(FXDCWindow& dc,FXint line,FXint left,FXint right);
+  virtual void drawContents(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
+  virtual void drawNumbers(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
+
   virtual void setCursorPos(FXint pos,FXbool notify=FALSE);
   virtual FXbool extendSelection(FXint pos,FXTextSelectionMode mode=SELECT_CHARS,FXbool notify=FALSE);
   virtual FXbool killSelection(FXbool notify=FALSE);

data/test/TC_FXText.rb

@@ -87,6 +87,13 @@ public
     assert_equal([10], endIndex)
   end
 
+  def test_find_text_with_startpos_wrap_nocase
+    @text.text = "I came, i saw, I conquered"
+    startIndex, endIndex = @text.findText("i ", 16, SEARCH_FORWARD|SEARCH_IGNORECASE|SEARCH_WRAP)
+    assert_equal([0], startIndex)
+    assert_equal([2], endIndex)
+  end
+
   def test_find_text_with_groups
     @text.text = "I came, I saw, I conquered"
     startIndex, endIndex = @text.findText("I ([a-z]+)(, )?", 0, SEARCH_REGEX)
@@ -94,6 +101,18 @@ public
     assert_equal([8, 6, 8], endIndex)
   end
 
+  def test_find_text_with_loop
+    @text.text = "()  ()()"
+    e = Enumerator.new do |y|
+      pos = 0
+      while a=@text.findText("()", pos, SEARCH_FORWARD|SEARCH_EXACT)
+        y << a
+        pos = a[1][0]
+      end
+    end
+    assert_equal [[[0], [2]], [[4], [6]], [[6], [8]]], e.to_a
+  end
+
   if ''.respond_to?(:encoding)
     def test_encoding
       @text.text = "世界線航跡蔵"

data/test/TC_FXVec4f.rb

@@ -5,6 +5,20 @@ require 'fox16'
 class TC_FXVec4f < Test::Unit::TestCase
   include Fox
 
+  def assert_in_delta(v1, v2, delta)
+    case v1
+      when FXVec3f
+        3.times do |i|
+          super(v1[i], v2[i], delta)
+        end
+      when FXVec4f
+        4.times do |i|
+          super(v1[i], v2[i], delta)
+        end
+      else
+        super(v1, v2, delta)
+    end
+  end
 
   def test_new
     FXVec4f.new
@@ -65,37 +79,37 @@ class TC_FXVec4f < Test::Unit::TestCase
   def test_neg
     vec = FXVec4f.new(1.0, 2.0, 3.0, 4.0)
     vec = -vec
-    assert_equal(vec[0], -1.0)
-    assert_equal(vec[1], -2.0)
-    assert_equal(vec[2], -3.0)
-    assert_equal(vec[3], -4.0)
+    assert_in_delta(vec[0], -1.0, 0.001)
+    assert_in_delta(vec[1], -2.0, 0.001)
+    assert_in_delta(vec[2], -3.0, 0.001)
+    assert_in_delta(vec[3], -4.0, 0.001)
   end
 
   def test_add
     v1 = FXVec4f.new(1.0, 2.0, 3.0, 4.0)
     v2 = FXVec4f.new(2.0, 4.0, 6.0, 8.0)
     v3 = FXVec4f.new(3.0, 6.0, 9.0, 12.0)
-    assert_equal(v3, v1 + v2)
+    assert_in_delta(v3, v1 + v2, 0.001)
   end
 
   def test_sub
     v1 = FXVec4f.new(3.0, 6.0, 9.0, 12.0)
     v2 = FXVec4f.new(2.0, 4.0, 6.0, 8.0)
     v3 = FXVec4f.new(1.0, 2.0, 3.0, 4.0)
-    assert_equal(v3, v1 - v2)
+    assert_in_delta(v3, v1 - v2, 0.001)
   end
 
   def test_mul
     v1 = FXVec4f.new(3.0,  6.0,  9.0, 12.0)
     v2 = FXVec4f.new(6.0, 12.0, 18.0, 24.0)
-    assert_equal(v2, v1 * 2)
+    assert_in_delta(v2, v1 * 2, 0.001)
   end
 
   def test_mul2 # same as dot product
     v1 = FXVec4f.new(3.0, 6.0, 9.0, 12.0)
     v2 = FXVec4f.new(2.0, 4.0, 6.0, 8.0)
-    assert_equal(180.0, v1*v2)
-    assert_equal(180.0, v2*v1)
+    assert_in_delta(180.0, v1*v2, 0.001)
+    assert_in_delta(180.0, v2*v1, 0.001)
   end
 
   def test_div
@@ -110,8 +124,8 @@ class TC_FXVec4f < Test::Unit::TestCase
   def test_dot
     v1 = FXVec4f.new(3.0, 6.0, 9.0, 12.0)
     v2 = FXVec4f.new(2.0, 4.0, 6.0, 8.0)
-    assert_equal(180.0, v1.dot(v2))
-    assert_equal(180.0, v2.dot(v1))
+    assert_in_delta(180.0, v1.dot(v2), 0.001)
+    assert_in_delta(180.0, v2.dot(v1), 0.001)
   end
 
   def test_length
@@ -121,7 +135,7 @@ class TC_FXVec4f < Test::Unit::TestCase
 
   def test_normalize
     vec = FXVec4f.new(1.0, 1.0, 1.0, 1.0)
-    assert_equal(FXVec4f.new(0.5, 0.5, 0.5, 0.5), vec.normalize)
+    assert_in_delta(FXVec4f.new(0.5, 0.5, 0.5, 0.5), vec.normalize, 0.001)
   end
 
   def test_lo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.40
+  version: 1.6.41
 platform: ruby
 authors:
 - Lyle Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-28 00:00:00.000000000 Z
+date: 2020-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -978,7 +978,7 @@ files:
 - test/stress2.rb
 - test/stress3.rb
 - test/testcase.rb
-homepage: http://fxruby.org/
+homepage: https://github.com/larskanis/fxruby
 licenses:
 - LGPL-2.1
 metadata:
@@ -998,8 +998,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.