fxruby-commits

[Lyle J. <ly...@us...>]

Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv25300/ext/fox

Modified Files:
      Tag: release10
	core_wrap.cpp 
Log Message:
Updates to test cases TC_FXHVec.rb and TC_FXHMat.rb to test the new clone
instance methods for these classes.
Added support for overloaded FXRegion#contains? and a new test case for
this class.


Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62.2.9
retrieving revision 1.62.2.10
diff -C2 -d -r1.62.2.9 -r1.62.2.10
*** core_wrap.cpp	8 May 2002 21:32:12 -0000	1.62.2.9
--- core_wrap.cpp	8 May 2002 21:43:41 -0000	1.62.2.10
***************
*** 9330,9334 ****
  
  static VALUE
! _wrap_FXRegion_empty(int argc, VALUE *argv, VALUE self) {
      FXRegion *arg1 ;
      FXbool result;
--- 9330,9334 ----
  
  static VALUE
! _wrap_FXRegion_emptyq___(int argc, VALUE *argv, VALUE self) {
      FXRegion *arg1 ;
      FXbool result;
***************
*** 9346,9350 ****
  
  static VALUE
! _wrap_FXRegion_contains(int argc, VALUE *argv, VALUE self) {
      FXRegion *arg1 ;
      FXint arg2 ;
--- 9346,9350 ----
  
  static VALUE
! _wrap_FXRegion_containsPointq___(int argc, VALUE *argv, VALUE self) {
      FXRegion *arg1 ;
      FXint arg2 ;
***************
*** 9366,9369 ****
--- 9366,9393 ----
  
  static VALUE
+ _wrap_FXRegion_containsRectangleq___(int argc, VALUE *argv, VALUE self) {
+     FXRegion *arg1 ;
+     FXint arg2 ;
+     FXint arg3 ;
+     FXint arg4 ;
+     FXint arg5 ;
+     FXbool result;
+     VALUE vresult = Qnil;
+     
+     if ((argc < 4) || (argc > 4))
+     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
+     arg1 = (FXRegion *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRegion);
+     arg2 = NUM2INT(argv[0]);
+     arg3 = NUM2INT(argv[1]);
+     arg4 = NUM2INT(argv[2]);
+     arg5 = NUM2INT(argv[3]);
+     result = (FXbool)((FXRegion const *)arg1)->contains(arg2,arg3,arg4,arg5);
+     
+     vresult = result ? Qtrue : Qfalse;
+     return vresult;
+ }
+ 
+ 
+ static VALUE
  _wrap_FXRegion_bounds(int argc, VALUE *argv, VALUE self) {
      FXRegion *arg1 ;
***************
*** 19050,19055 ****
      rb_define_method(cFXRegion.klass, "initialize", VALUEFUNC(_wrap_FXRegion_initialize), -1);
      rb_define_method(cFXRegion.klass, "clone", VALUEFUNC(_wrap_FXRegion_clone), -1);
!     rb_define_method(cFXRegion.klass, "empty", VALUEFUNC(_wrap_FXRegion_empty), -1);
!     rb_define_method(cFXRegion.klass, "contains", VALUEFUNC(_wrap_FXRegion_contains), -1);
      rb_define_method(cFXRegion.klass, "bounds", VALUEFUNC(_wrap_FXRegion_bounds), -1);
      rb_define_method(cFXRegion.klass, "offset", VALUEFUNC(_wrap_FXRegion_offset), -1);
--- 19074,19080 ----
      rb_define_method(cFXRegion.klass, "initialize", VALUEFUNC(_wrap_FXRegion_initialize), -1);
      rb_define_method(cFXRegion.klass, "clone", VALUEFUNC(_wrap_FXRegion_clone), -1);
!     rb_define_method(cFXRegion.klass, "empty?", VALUEFUNC(_wrap_FXRegion_emptyq___), -1);
!     rb_define_method(cFXRegion.klass, "containsPoint?", VALUEFUNC(_wrap_FXRegion_containsPointq___), -1);
!     rb_define_method(cFXRegion.klass, "containsRectangle?", VALUEFUNC(_wrap_FXRegion_containsRectangleq___), -1);
      rb_define_method(cFXRegion.klass, "bounds", VALUEFUNC(_wrap_FXRegion_bounds), -1);
      rb_define_method(cFXRegion.klass, "offset", VALUEFUNC(_wrap_FXRegion_offset), -1);