fxruby 1.6.50 → 1.6.51

data/ext/fox16_c/unregisterOwnedObjects.cpp

@@ -23,6 +23,7 @@
  * but which have somehow been "exposed" to the Ruby layer.
  */
 
+#include "swigruby.h"
 #include "FXRbCommon.h"
 
 void FXRbHeader::unregisterOwnedObjects(FXHeader *self)

data/fxruby.gemspec

@@ -50,7 +50,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions = ["ext/fox16_c/extconf.rb"]
   spec.metadata['msys2_mingw_dependencies'] = 'fox'
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.0"
+
+  # Automatic apt package installation using rubygems-requirements-system
+  spec.requirements << "system: g++: debian: g++"
+  spec.requirements << "system: libxrandr: debian: libxrandr-dev"
+  spec.requirements << "system: libfox: debian: libfox-1.6-dev"
 
   spec.add_runtime_dependency 'mini_portile2', '~> 2.1'
 

data/lib/fox16/canvas.rb

@@ -30,7 +30,7 @@ module Fox
         @draggable = false
         @x = x
         @y = y
-        @foreground = FXRGB(0, 0, 0)
+        @foreground = Fox.FXRGB(0, 0, 0)
         @target = nil
         @selector = 0
       end

data/lib/fox16/core.rb

@@ -227,12 +227,7 @@ module Fox
     end
   end
 
-  class FXVec2d
-    # Convert to array
-    def to_a
-      [x, y]
-    end
-
+  module FXVec_to_s
     # Convert to string
     def to_s
       to_a.to_s
@@ -240,56 +235,130 @@ module Fox
 
     def inspect; to_a.inspect; end
   end
+  private_constant :FXVec_to_s
+
+  class FXVec2d
+    include FXVec_to_s
+    # Convert to array
+    def to_a
+      [x, y]
+    end
+  end
 
   class FXVec2f
+    include FXVec_to_s
     # Convert to array
     def to_a; [x, y]; end
-
-    # Convert to string
-    def to_s; to_a.to_s; end
-
-    def inspect; to_a.inspect; end
   end
 
   class FXVec3d
+    include FXVec_to_s
     # Convert to array
     def to_a; [x, y, z]; end
-
-    # Convert to string
-    def to_s; to_a.to_s; end
-
-    def inspect; to_a.inspect; end
   end
 
   class FXVec3f
+    include FXVec_to_s
     # Convert to array
     def to_a; [x, y, z]; end
-
-    # Convert to string
-    def to_s; to_a.to_s; end
-
-    def inspect; to_a.inspect; end
   end
 
   class FXVec4d
+    include FXVec_to_s
     # Convert to array
     def to_a; [x, y, z, w]; end
+  end
 
-    # Convert to string
-    def to_s; to_a.to_s; end
+  class FXVec4f
+    include FXVec_to_s
+    # Convert to array
+    def to_a; [x, y, z, w]; end
+  end
 
-    def inspect; to_a.inspect; end
+  class FXVec2d
+    include FXVec_to_s
+    # Convert to array
+    def to_a
+      [x, y]
+    end
+  end
+
+  class FXVec2f
+    include FXVec_to_s
+    # Convert to array
+    def to_a; [x, y]; end
+  end
+
+  class FXVec3d
+    include FXVec_to_s
+    # Convert to array
+    def to_a; [x, y, z]; end
+  end
+
+  class FXVec3f
+    include FXVec_to_s
+    # Convert to array
+    def to_a; [x, y, z]; end
+  end
+
+  class FXVec4d
+    include FXVec_to_s
+    # Convert to array
+    def to_a; [x, y, z, w]; end
   end
 
   class FXVec4f
+    include FXVec_to_s
     # Convert to array
     def to_a; [x, y, z, w]; end
+  end
 
-    # Convert to string
-    def to_s; to_a.to_s; end
+  module Equality_to_a
+    def ==(other)
+      other.respond_to?(:to_a) &&
+          to_a == other.to_a
+    end
 
     def inspect; to_a.inspect; end
   end
+  private_constant :Equality_to_a
+
+  module FXMat3_to_a
+    include Equality_to_a
+    def to_a
+      [self[0].to_a,
+       self[1].to_a,
+       self[2].to_a]
+    end
+  end
+  private_constant :FXMat3_to_a
+
+  module FXMat4_to_a
+    include Equality_to_a
+    def to_a
+      [self[0].to_a,
+       self[1].to_a,
+       self[2].to_a,
+       self[3].to_a]
+    end
+  end
+  private_constant :FXMat4_to_a
+
+  class FXMat3d
+    include FXMat3_to_a
+  end
+
+  class FXMat3f
+    include FXMat3_to_a
+  end
+
+  class FXMat4d
+    include FXMat4_to_a
+  end
+
+  class FXMat4f
+    include FXMat4_to_a
+  end
 
   class FXWindow
     #
@@ -691,12 +760,14 @@ module Fox
 
   class FXImage
     alias initialize_without_data_string initialize
+    private :initialize_without_data_string
     def initialize(a, pix, *args)
       initialize_without_data_string(a, pix, *args)
       @data_string = (options & IMAGE_OWNED) != 0 ? nil : pix
     end
 
     alias setPixels_without_data_string setPixels
+    private :setPixels_without_data_string
     def setPixels(pix, *args)
       setPixels_without_data_string(pix, *args)
       @data_string = (options & IMAGE_OWNED) != 0 ? nil : pix

data/lib/fox16/undolist.rb

@@ -158,12 +158,12 @@ module Fox
     #
     def undo
       unless @undolist.empty?
-	command = @undolist.pop
-	@size -= command.size
-	command.undo
-	@redolist.push(command)
-	@marker = @marker - 1 unless @marker.nil?
-	return true
+        command = @undolist.pop
+        @size -= command.size
+        command.undo
+        @redolist.push(command)
+        @marker = @marker - 1 unless @marker.nil?
+        return true
       end
       return false
     end
@@ -173,12 +173,12 @@ module Fox
     #
     def redo
       unless @redolist.empty?
-	command = @redolist.pop
-	command.redo
-	@undolist.push(command)
-	@size += command.size
-	@marker = @marker + 1 unless @marker.nil?
-	return true
+        command = @redolist.pop
+        command.redo
+        @undolist.push(command)
+        @size += command.size
+        @marker = @marker + 1 unless @marker.nil?
+        return true
       end
       return false
     end
@@ -202,9 +202,9 @@ module Fox
     #
     def revert
       unless @marker.nil?
-	undo while (@marker > 0)
-	redo while (@marker < 0)
-	return true
+        undo while (@marker > 0)
+        redo while (@marker < 0)
+        return true
       end
       return false
     end
@@ -293,10 +293,10 @@ module Fox
     #
     def trimCount(nc)
       if @undolist.size > nc
-	numRemoved = @undolist.size - nc
-	@undolist[0, numRemoved].each { |command| @size -= command.size }
-	@undolist[0, numRemoved] = nil
-	@marker = nil if (@marker != nil && @marker > @undolist.size)
+        numRemoved = @undolist.size - nc
+        @undolist[0, numRemoved].each { |command| @size -= command.size }
+        @undolist[0, numRemoved] = nil
+        @marker = nil if (@marker != nil && @marker > @undolist.size)
       end
     end
 
@@ -305,14 +305,14 @@ module Fox
     #
     def trimSize(sz)
       if @size > sz
-	s = 0
-	@undolist.reverse.each_index { |i|
+        s = 0
+        @undolist.reverse.each_index { |i|
           j = @undolist.size - (i + 1)
           s += @undolist[j].size
           @undolist[j] = nil if (s > sz)
-	}
-	@undolist.compact!
-	@marker = nil if (@marker != nil && @marker > @undolist.size)
+        }
+        @undolist.compact!
+        @marker = nil if (@marker != nil && @marker > @undolist.size)
       end
     end
 
@@ -344,9 +344,9 @@ module Fox
 
     def onUpdUndo(sender, sel, ptr) # :nodoc:
       if canUndo?
-	sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
+        sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
       else
-	sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
+        sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
       end
       return 1
     end
@@ -358,9 +358,9 @@ module Fox
 
     def onUpdRedo(sender, sel, ptr) # :nodoc:
       if canRedo?
-	sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
+        sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
       else
-	sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
+        sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
       end
       return 1
     end
@@ -372,9 +372,9 @@ module Fox
 
     def onUpdClear(sender, sel, ptr) # :nodoc:
       if canUndo? || canRedo?
-	sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
+        sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
       else
-	sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
+        sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
       end
       return 1
     end
@@ -386,9 +386,9 @@ module Fox
 
     def onUpdRevert(sender, sel, ptr) # :nodoc:
       if canRevert?
-	sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
+        sender.handle(self, Fox.MKUINT(FXWindow::ID_ENABLE, SEL_COMMAND), nil)
       else
-	sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
+        sender.handle(self, Fox.MKUINT(FXWindow::ID_DISABLE, SEL_COMMAND), nil)
       end
       return 1
     end

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.50"
+    "1.6.51"
   end
 end

data/rdoc-sources/FXApp.rb

@@ -21,6 +21,18 @@ module Fox
     attr_reader :root_y
 
     # Keyboard/modifier state [Integer]
+    #
+    # Bitmask of these:
+    #   SHIFTMASK        = 0x001,           /// Shift key is down
+    #   CAPSLOCKMASK     = 0x002,           /// Caps Lock key is down
+    #   CONTROLMASK      = 0x004,           /// Ctrl key is down
+    #   ALTMASK          = 0x008,           /// Alt key is down
+    #   METAMASK         = 0x040,           /// Meta key is down
+    #   NUMLOCKMASK      = 0x010,           /// Num Lock key is down
+    #   SCROLLLOCKMASK   = 0x0E0,           /// Scroll Lock key is down (seems to vary)
+    #   LEFTBUTTONMASK   = 0x100,           /// Left mouse button is down
+    #   MIDDLEBUTTONMASK = 0x200,           /// Middle mouse button is down
+    #   RIGHTBUTTONMASK  = 0x400            /// Right mouse button is down
     attr_reader :state
 
     # Button, keysym or mode; DDE source [Integer]

data/rdoc-sources/FXFont.rb

@@ -218,6 +218,8 @@ module Fox
     attr_accessor :fontDesc
 
     # Font angle [Integer]
+    #
+    # The angle, in degrees*64 relative to positive x axis
     attr_accessor :angle
 
     # Font description as a string [String]

data/rdoc-sources/FXMDIClient.rb

@@ -16,6 +16,14 @@ module Fox
   # a menu button connected to the MDI client with the ID_MDI_OVER_X message will be
   # automatically grayed out if there are less than X MDI child windows.
   #
+  # MDI client can arrange the MDI child windows in various ways:
+  # - it may maximize one of the MDI child windows {FXMDIChild#maximize},
+  # - arrange them side-by-side {#horizontal}, {#vertical},
+  # - cascade them {#cascade},
+  # - or iconify them.
+  #
+  # MDI child windows are notified about changes in the active MDI child window by the MDI client.
+  #
   # === Events
   #
   # The following messages are sent by FXMDIClient to its target:
@@ -60,6 +68,13 @@ module Fox
     # Set active MDI child window for this MDI client to _child_.
     #
     def setActiveChild(child=nil, notify=true); end
+
+    # Arrange childs as cascade
+    def cascade(notify=false); end
+    # Arrange childs horizontal
+    def horizontal(notify=false); end
+    # Arrange childs vertical
+    def vertical(notify=false); end
   end
 end
 

data/scripts/iface.rb

@@ -373,6 +373,7 @@ def main
 
 	input = $stdin unless input
 	output = $stdout unless output
+	output.binmode
 
 	parser = IFaceParser.new(input, output)
 	iface = parser.process

data/swig-interfaces/FXScintilla.i

@@ -177,7 +177,7 @@ public:
           lp=(lParam==Qtrue) ? 1 : 0;
           break;
         case T_DATA:
-          lp=reinterpret_cast<sptr_t>(DATA_PTR(lParam));
+          lp = (sptr_t)FXRbConvertPtr(lParam, NULL, 0);
           break;
         default:
           lp=0;

data/swig-interfaces/FXText.i

@@ -722,7 +722,7 @@ public:
           text->styles=new FXHiliteStyle[text->numStyles];
           for (long i=0; i<text->numStyles; i++){
             FXHiliteStyle* ptr;
-	    SWIG_ConvertPtr(rb_ary_entry(styles,i),(void **)&ptr,SWIGTYPE_p_FXHiliteStyle,1);
+	    SWIG_ConvertPtr(rb_ary_entry(styles,i),(void **)&ptr,SWIGTYPE_p_FXHiliteStyle,SWIG_POINTER_DISOWN);
             text->styles[i]=*ptr;
             }
 	  self->setHiliteStyles(text->styles);

data/swig-interfaces/freefuncs.i

@@ -54,6 +54,7 @@
 %freefunc FXChore "FXRbUnregisterRubyObj";
 %freefunc FXDC "FXRbUnregisterRubyObj";
 %freefunc FXDCPrint "FXRbUnregisterRubyObj";
+%freefunc FXDCWindow "FXRbUnregisterRubyObj";
 %freefunc FXEvent "FXRbUnregisterRubyObj";
 %freefunc FXExtentd "FXRbUnregisterRubyObj";
 %freefunc FXExtentf "FXRbUnregisterRubyObj";

data/swig-interfaces/ruby-typemaps.i

@@ -247,7 +247,7 @@ inline void* to_FXEvent(VALUE obj){
     FXEventTypeInfo=SWIG_TypeQuery("FXEvent *");
     FXASSERT(FXEventTypeInfo!=0);
     }
-  SWIG_ConvertPtr(obj,&ptr,FXEventTypeInfo,1);
+  SWIG_ConvertPtr(obj,&ptr,FXEventTypeInfo,SWIG_POINTER_DISOWN);
   return ptr;
   }
 %}
@@ -278,7 +278,7 @@ inline void* to_FXEvent(VALUE obj){
 }
 
 /* Convert a Ruby FXDirItem instance into a pointer to a C++ FXDirItem */
-%typemap(in) void* PTR_DIRITEM "SWIG_ConvertPtr($input,&$1,SWIGTYPE_p_FXDirItem,1);";
+%typemap(in) void* PTR_DIRITEM "SWIG_ConvertPtr($input,&$1,SWIGTYPE_p_FXDirItem,SWIG_POINTER_DISOWN);";
 
 %typemap(in) void* PTR_EVENT "$1 = to_FXEvent($input);";
 
@@ -293,7 +293,7 @@ inline void* to_FXEvent(VALUE obj){
 
 /* Convert a Ruby FXIcon reference to a pointer to an FXIcon */
 %typemap(in) void* PTR_ICON(void *tmp) {
-  tmp = FXRbConvertPtr($input, FXRbTypeQuery("FXIcon *"));
+  tmp = FXRbConvertPtr($input, FXRbTypeQuery("FXIcon *"), SWIG_POINTER_DISOWN);
   $1 = (void *) &tmp;
 }
 
@@ -329,10 +329,10 @@ inline void* to_FXEvent(VALUE obj){
 %typemap(in) void* PTR_NULL "$1 = 0;";
 
 /* Convert a Ruby FXObject instance into a pointer to a C++ FXObject */
-%typemap(in) void* PTR_OBJECT "SWIG_ConvertPtr($input,&$1,SWIGTYPE_p_FXObject,1);";
+%typemap(in) void* PTR_OBJECT "SWIG_ConvertPtr($input,&$1,SWIGTYPE_p_FXObject,SWIG_POINTER_DISOWN);";
 
 /* Convert a Ruby FXPoint instance into a pointer to a C++ FXPoint */
-%typemap(in) void* PTR_POINT "$1 = FXRbConvertPtr($input, FXRbTypeQuery(\"FXPoint *\"));";
+%typemap(in) void* PTR_POINT "$1 = FXRbConvertPtr($input, FXRbTypeQuery(\"FXPoint *\"), SWIG_POINTER_DISOWN);";
 
 /* Convert a Ruby number into a pointer to an FXdouble */
 %typemap(in) void* PTR_PDOUBLE(FXdouble value) {
@@ -353,7 +353,7 @@ inline void* to_FXEvent(VALUE obj){
 }
 
 /* Convert a Ruby FXTreeItem instance into a pointer to a C++ FXTreeItem */
-%typemap(in) void* PTR_TREEITEM "SWIG_ConvertPtr($input,&$1,SWIGTYPE_p_FXTreeItem,1);";
+%typemap(in) void* PTR_TREEITEM "SWIG_ConvertPtr($input,&$1,SWIGTYPE_p_FXTreeItem,SWIG_POINTER_DISOWN);";
 
 /* Convert a Ruby number into an FXuchar */
 %typemap(in) void* PTR_UCHAR "$1 = reinterpret_cast<void*>(NUM2UINT($input));";
@@ -371,7 +371,7 @@ inline void* to_FXEvent(VALUE obj){
         $1 = new FXVec3f(NUM2DBL(rb_ary_entry($input, 0)), NUM2DBL(rb_ary_entry($input, 1)), NUM2DBL(rb_ary_entry($input, 2)));
     } else {
         FXVec3f *p;
-	SWIG_ConvertPtr($input, (void **)&p, SWIGTYPE_p_FXVec3f, 1);
+	SWIG_ConvertPtr($input, (void **)&p, SWIGTYPE_p_FXVec3f, SWIG_POINTER_DISOWN);
 	$1 = new FXVec3f(*p);
     }
 }
@@ -383,7 +383,7 @@ inline void* to_FXEvent(VALUE obj){
         tmp = FXVec3f(NUM2DBL(rb_ary_entry($input, 0)), NUM2DBL(rb_ary_entry($input, 1)), NUM2DBL(rb_ary_entry($input, 2)));
         $1 = &tmp;
     } else {
-	SWIG_ConvertPtr($input, (void **) &$1, SWIGTYPE_p_FXVec3f, 1);
+        SWIG_ConvertPtr($input, (void **) &$1, SWIGTYPE_p_FXVec3f, SWIG_POINTER_DISOWN);
     }
 }
 
@@ -397,7 +397,7 @@ inline void* to_FXEvent(VALUE obj){
         $1 = new FXVec4f(NUM2DBL(rb_ary_entry($input, 0)), NUM2DBL(rb_ary_entry($input, 1)), NUM2DBL(rb_ary_entry($input, 2)), NUM2DBL(rb_ary_entry($input, 3)));
     } else {
         FXVec4f *p;
-	SWIG_ConvertPtr($input,(void **)&p,SWIGTYPE_p_FXVec4f,1);
+	SWIG_ConvertPtr($input,(void **)&p,SWIGTYPE_p_FXVec4f,SWIG_POINTER_DISOWN);
 	$1 = new FXVec4f(*p);
     }
 }
@@ -409,7 +409,7 @@ inline void* to_FXEvent(VALUE obj){
         tmp = FXVec4f(NUM2DBL(rb_ary_entry($input, 0)), NUM2DBL(rb_ary_entry($input, 1)), NUM2DBL(rb_ary_entry($input, 2)), NUM2DBL(rb_ary_entry($input, 3)));
         $1 = &tmp;
     } else {
-	SWIG_ConvertPtr($input, (void **) &$1, SWIGTYPE_p_FXVec4f, 1);
+	SWIG_ConvertPtr($input, (void **) &$1, SWIGTYPE_p_FXVec4f, SWIG_POINTER_DISOWN);
     }
 }
 
@@ -651,8 +651,8 @@ inline void* to_FXEvent(VALUE obj){
     $1 = new FXPoint[RARRAY_LEN($input)];
     $2 = static_cast<FXuint>( RARRAY_LEN($input) );
     for (FXuint i = 0; i < $2; i++) {
-        FXPoint *pPoint;
-        Data_Get_Struct(rb_ary_entry($input, i), FXPoint, pPoint);
+        VALUE entry = rb_ary_entry($input, i);
+        FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
         $1[i] = *pPoint;
     }
 }
@@ -666,8 +666,8 @@ inline void* to_FXEvent(VALUE obj){
     $1 = new FXSegment[RARRAY_LEN($input)];
     $2 = static_cast<FXuint>( RARRAY_LEN($input) );
     for (FXuint i = 0; i < $2; i++) {
-        FXSegment *pSeg;
-        Data_Get_Struct(rb_ary_entry($input, i), FXSegment, pSeg);
+        VALUE entry = rb_ary_entry($input, i);
+        FXSegment *pSeg = (FXSegment*)FXRbConvertPtr(entry, SWIGTYPE_p_FXSegment, 0);
         $1[i] = *pSeg;
     }
 }
@@ -682,8 +682,8 @@ inline void* to_FXEvent(VALUE obj){
     $1 = new FXRectangle[RARRAY_LEN($input)];
     $2 = static_cast<FXuint>( RARRAY_LEN($input) );
     for (FXuint i = 0; i < $2; i++) {
-        FXRectangle *pRect;
-        Data_Get_Struct(rb_ary_entry($input, i), FXRectangle, pRect);
+        VALUE entry = rb_ary_entry($input, i);
+        FXRectangle *pRect = (FXRectangle*)FXRbConvertPtr(entry, SWIGTYPE_p_FXRectangle, 0);
         $1[i] = *pRect;
     }
 }
@@ -698,8 +698,8 @@ inline void* to_FXEvent(VALUE obj){
     $1 = new FXArc[RARRAY_LEN($input)];
     $2 = static_cast<FXuint>( RARRAY_LEN($input) );
     for (FXuint i = 0; i < $2; i++) {
-        FXArc *pArc;
-        Data_Get_Struct(rb_ary_entry($input, i), FXArc, pArc);
+        VALUE entry = rb_ary_entry($input, i);
+        FXArc *pArc = (FXArc*)FXRbConvertPtr(entry, SWIGTYPE_p_FXArc, 0);
         $1[i] = *pArc;
     }
 }
@@ -766,7 +766,7 @@ inline void* to_FXEvent(VALUE obj){
     if (TYPE($input) == T_FIXNUM || TYPE($input) == T_BIGNUM)) {
         $1 = reinterpret_cast<FXWindow *>(static_cast<long>(NUM2INT($input)));
     } else {
-        SWIG_ConvertPtr($input, (void **) &$1, SWIGTYPE_p_FXWindow, 1);
+        SWIG_ConvertPtr($input, (void **) &$1, SWIGTYPE_p_FXWindow, SWIG_POINTER_DISOWN);
     }
 }
 

data/test/TC_FXBMPImage.rb

@@ -15,7 +15,7 @@ class TC_FXBMPImage < Fox::TestCase
 
   def test_image_from_pixel_data
     img = FXBMPImage.new app
-    img.setPixels +"rgbaRGBA", 0, 1, 2
+    img.setPixels(+"rgbaRGBA", 0, 1, 2)
     bmp_data = FXMemoryStream.open(FXStreamSave, nil) do |outfile|
       img.savePixels(outfile)
       outfile.takeBuffer

data/test/TC_FXDC.rb

@@ -59,11 +59,23 @@ class TC_FXDC < Test::Unit::TestCase
     @dc.drawLinesRel(points)
   end
 
+  def testDrawLinesRel_TypeError
+    points = [ FXPoint.new, FXArc.new ]
+    msg = assert_raises(TypeError) { @dc.drawLinesRel(points) }
+    assert_match(/wrong.* Fox::FXArc.*expected.* Fox::FXPoint/i, msg.to_s)
+  end
+
   def testDrawLineSegments
     segments = [ FXSegment.new, FXSegment.new ]
     @dc.drawLineSegments(segments)
   end
 
+  def testDrawLineSegments_TypeError
+    segments = [ FXSegment.new, FXPoint.new ]
+    msg = assert_raises(TypeError) { @dc.drawLineSegments(segments) }
+    assert_match(/wrong.* Fox::FXPoint.*expected.* Fox::FXSegment/i, msg.to_s)
+  end
+
   def testDrawArc
     x, y, w, h, ang1, ang2 = 0, 0, 10, 10, 45, 135
     @dc.drawArc(x, y, w, h, ang1, ang2)
@@ -74,6 +86,12 @@ class TC_FXDC < Test::Unit::TestCase
     @dc.drawArcs(arcs)
   end
 
+  def testDrawArcs_TypeError
+    arcs = [ FXPoint.new, FXPoint.new ]
+    msg = assert_raises(TypeError) { @dc.drawArcs(arcs) }
+    assert_match(/wrong.* Fox::FXPoint.*expected.* Fox::FXArc/i, msg.to_s)
+  end
+
   def testFillRectangle
     x, y, w, h = 0, 0, 20, 20
     @dc.fillRectangle(x, y, w, h)
@@ -84,6 +102,12 @@ class TC_FXDC < Test::Unit::TestCase
     @dc.fillRectangles(rectangles)
   end
 
+  def testFillRectangles_TypeError
+    rectangles = [ FXRectangle.new, FXPoint.new ]
+    msg = assert_raises(TypeError) { @dc.fillRectangles(rectangles) }
+    assert_match(/wrong.* Fox::FXPoint.*expected.* Fox::FXRectangle/i, msg.to_s)
+  end
+
   def testFillArc
     x, y, w, h, ang1, ang2 = 0, 0, 10, 10, 45, 135
     @dc.fillArc(x, y, w, h, ang1, ang2)