[Fxruby-commits] CVS: FXRuby/ext/fox core_wrap.cpp,1.62.2.23,1.62.2.24 opengl_wrap.cpp,1.41.2.21,1.41.2.22 ui_wrap.cpp,1.9.2.20,1.9.2.21

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

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

Modified Files:
      Tag: release10
	core_wrap.cpp opengl_wrap.cpp ui_wrap.cpp 
Log Message:
Enabled a lot more overloaded constructors since SWIG supports this now.


Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62.2.23
retrieving revision 1.62.2.24
diff -C2 -d -r1.62.2.23 -r1.62.2.24
*** core_wrap.cpp	8 Jul 2002 13:27:17 -0000	1.62.2.23
--- core_wrap.cpp	8 Jul 2002 14:28:25 -0000	1.62.2.24
***************
*** 1733,1737 ****
  
  static VALUE
! _wrap_FX_MemoryStream_open(int argc, VALUE *argv, VALUE self) {
      FXMemoryStream *arg1 ;
      FXuchar *arg2 ;
--- 1733,1737 ----
  
  static VALUE
! _wrap_FX_MemoryStream_open__SWIG_0(int argc, VALUE *argv, VALUE self) {
      FXMemoryStream *arg1 ;
      FXuchar *arg2 ;
***************
*** 1753,1756 ****
--- 1753,1840 ----
  
  static VALUE
+ _wrap_FX_MemoryStream_open__SWIG_1(int argc, VALUE *argv, VALUE self) {
+     FXMemoryStream *arg1 ;
+     FXuchar *arg2 ;
+     FXuint arg3 ;
+     int arg4 ;
+     FXbool result;
+     VALUE vresult = Qnil;
+     
+     if ((argc < 3) || (argc > 3))
+     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
+     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMemoryStream, 1);
+     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXuchar, 1);
+     arg3 = NUM2UINT(argv[1]);
+     arg4 = (int) NUM2INT(argv[2]);
+     result = (FXbool)(arg1)->open(arg2,arg3,(FXStreamDirection )arg4);
+     
+     vresult = result ? Qtrue : Qfalse;
+     return vresult;
+ }
+ 
+ 
+ static VALUE _wrap_FX_MemoryStream_open(int nargs, VALUE *args, VALUE self) {
+     int argc;
+     VALUE argv[5];
+     int ii;
+     
+     argc = nargs + 1;
+     argv[0] = self;
+     for (ii = 1; (ii < argc) && (ii < 4); ii++) {
+         argv[ii] = args[ii-1];
+     }
+     if ((argc >= 3) && (argc <= 3)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXMemoryStream, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXuchar, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         if (_m) {
+             return _wrap_FX_MemoryStream_open__SWIG_0(nargs, args, self);
+         }
+     }
+     if ((argc >= 4) && (argc <= 4)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXMemoryStream, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXuchar, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         if (_m) {
+             return _wrap_FX_MemoryStream_open__SWIG_1(nargs, args, self);
+         }
+     }
+     
+     rb_raise(rb_eArgError, "No matching function for overloaded 'FX_MemoryStream_open'");
+     return Qnil;
+ }
+ 
+ 
+ static VALUE
  _wrap_FX_MemoryStream_getSpace(int argc, VALUE *argv, VALUE self) {
      FXMemoryStream *arg1 ;
***************
*** 3922,3926 ****
--- 4006,4025 ----
  
  static VALUE
+ _wrap_new_FX_RecentFiles__SWIG_0(int argc, VALUE *argv, VALUE self) {
+     FXRecentFiles *result;
+     
+     if ((argc < 0) || (argc > 0))
+     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+     result = (FXRecentFiles *)new FXRecentFiles();
+     FXRbRegisterRubyObj(self, result);
+     DATA_PTR(self) = result;
+     return self;
+ }
+ 
+ 
+ static VALUE
  _wrap_FX_RecentFiles_allocate(int argc, VALUE *argv, VALUE self) {
+     SwigValueWrapper<FXString > p1 ;
+     
      VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRecentFiles);
      rb_obj_call_init(vresult, argc, argv);
***************
*** 3930,3939 ****
  
  static VALUE
! _wrap_new_FX_RecentFiles(int argc, VALUE *argv, VALUE self) {
      FXRecentFiles *result;
      
!     if ((argc < 0) || (argc > 0))
!     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
!     result = (FXRecentFiles *)new FXRecentFiles();
      FXRbRegisterRubyObj(self, result);
      DATA_PTR(self) = result;
--- 4029,4057 ----
  
  static VALUE
! _wrap_new_FX_RecentFiles__SWIG_1(int argc, VALUE *argv, VALUE self) {
!     FXString *arg1 ;
!     FXObject *arg2 = 0 ;
!     FXSelector arg3 = 0 ;
      FXRecentFiles *result;
+     SwigValueWrapper<FXString > p1 ;
      
!     if ((argc < 1) || (argc > 3))
!     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
!     {
!         if (argv[0] != Qnil) {
!             Check_Type(argv[0], T_STRING);
!             p1 = FXString(STR2CSTR(argv[0]));
!         }else {
!             p1 = FXString::null;
!         }
!         arg1 = &p1;
!     }
!     if (argc > 1) {
!         SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXObject, 1);
!     }
!     if (argc > 2) {
!         arg3 = NUM2UINT(argv[2]);
!     }
!     result = (FXRecentFiles *)new FXRecentFiles((FXString const &)*arg1,arg2,arg3);
      FXRbRegisterRubyObj(self, result);
      DATA_PTR(self) = result;
***************
*** 3942,3945 ****
--- 4060,4109 ----
  
  
+ static VALUE _wrap_new_FX_RecentFiles(int nargs, VALUE *args, VALUE self) {
+     int argc;
+     VALUE argv[3];
+     int ii;
+     
+     argc = nargs;
+     for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+         argv[ii] = args[ii];
+     }
+     if ((argc >= 0) && (argc <= 0)) {
+         int _m = 1;
+         int _v = 1;
+         if (_m) {
+             return _wrap_new_FX_RecentFiles__SWIG_0(nargs, args, self);
+         }
+     }
+     if ((argc >= 1) && (argc <= 3)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             _v = (NIL_P(argv[0]) || TYPE(argv[0]) == T_STRING) ? 1 : 0;
+         }
+         _m &= _v;
+         if (argc > 1) {
+             {
+                 void *ptr;
+                 _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXObject, 0) != -1)) ? 1 : 0;
+             }
+             _m &= _v;
+         }
+         if (argc > 2) {
+             {
+                 _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0;
+             }
+             _m &= _v;
+         }
+         if (_m) {
+             return _wrap_new_FX_RecentFiles__SWIG_1(nargs, args, self);
+         }
+     }
+     
+     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FX_RecentFiles'");
+     return Qnil;
+ }
+ 
+ 
  static VALUE
  _wrap_FX_RecentFiles_setMaxFiles(int argc, VALUE *argv, VALUE self) {
***************
*** 4141,4145 ****
--- 4305,4324 ----
  }
  static VALUE
+ _wrap_new_FXRecentFiles__SWIG_0(int argc, VALUE *argv, VALUE self) {
+     FXRbRecentFiles *result;
+     
+     if ((argc < 0) || (argc > 0))
+     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+     result = (FXRbRecentFiles *)new FXRbRecentFiles();
+     FXRbRegisterRubyObj(self, result);
+     DATA_PTR(self) = result;
+     return self;
+ }
+ 
+ 
+ static VALUE
  _wrap_FXRecentFiles_allocate(int argc, VALUE *argv, VALUE self) {
+     SwigValueWrapper<FXString > p1 ;
+     
      VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbRecentFiles);
      rb_obj_call_init(vresult, argc, argv);
***************
*** 4149,4158 ****
  
  static VALUE
! _wrap_new_FXRecentFiles(int argc, VALUE *argv, VALUE self) {
      FXRbRecentFiles *result;
      
!     if ((argc < 0) || (argc > 0))
!     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
!     result = (FXRbRecentFiles *)new FXRbRecentFiles();
      FXRbRegisterRubyObj(self, result);
      DATA_PTR(self) = result;
--- 4328,4356 ----
  
  static VALUE
! _wrap_new_FXRecentFiles__SWIG_1(int argc, VALUE *argv, VALUE self) {
!     FXString *arg1 ;
!     FXObject *arg2 = 0 ;
!     FXSelector arg3 = 0 ;
      FXRbRecentFiles *result;
+     SwigValueWrapper<FXString > p1 ;
      
!     if ((argc < 1) || (argc > 3))
!     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
!     {
!         if (argv[0] != Qnil) {
!             Check_Type(argv[0], T_STRING);
!             p1 = FXString(STR2CSTR(argv[0]));
!         }else {
!             p1 = FXString::null;
!         }
!         arg1 = &p1;
!     }
!     if (argc > 1) {
!         SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXObject, 1);
!     }
!     if (argc > 2) {
!         arg3 = NUM2UINT(argv[2]);
!     }
!     result = (FXRbRecentFiles *)new FXRbRecentFiles((FXString const &)*arg1,arg2,arg3);
      FXRbRegisterRubyObj(self, result);
      DATA_PTR(self) = result;
***************
*** 4161,4164 ****
--- 4359,4408 ----
  
  
+ static VALUE _wrap_new_FXRecentFiles(int nargs, VALUE *args, VALUE self) {
+     int argc;
+     VALUE argv[3];
+     int ii;
+     
+     argc = nargs;
+     for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+         argv[ii] = args[ii];
+     }
+     if ((argc >= 0) && (argc <= 0)) {
+         int _m = 1;
+         int _v = 1;
+         if (_m) {
+             return _wrap_new_FXRecentFiles__SWIG_0(nargs, args, self);
+         }
+     }
+     if ((argc >= 1) && (argc <= 3)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             _v = (NIL_P(argv[0]) || TYPE(argv[0]) == T_STRING) ? 1 : 0;
+         }
+         _m &= _v;
+         if (argc > 1) {
+             {
+                 void *ptr;
+                 _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXObject, 0) != -1)) ? 1 : 0;
+             }
+             _m &= _v;
+         }
+         if (argc > 2) {
+             {
+                 _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0;
+             }
+             _m &= _v;
+         }
+         if (_m) {
+             return _wrap_new_FXRecentFiles__SWIG_1(nargs, args, self);
+         }
+     }
+     
+     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXRecentFiles'");
+     return Qnil;
+ }
+ 
+ 
  static void
  free_FXRbRecentFiles(FXRbRecentFiles *arg1) {
***************
*** 8393,8396 ****
--- 8637,8659 ----
  
  static VALUE
+ _wrap_new_FX_Cursor__SWIG_0(int argc, VALUE *argv, VALUE self) {
+     FXApp *arg1 ;
+     int arg2 = CURSOR_ARROW ;
+     FXCursor *result;
+     
+     if ((argc < 1) || (argc > 2))
+     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
+     if (argc > 1) {
+         arg2 = (int) NUM2INT(argv[1]);
+     }
+     result = (FXCursor *)new FXCursor(arg1,(FXStockCursor )arg2);
+     FXRbRegisterRubyObj(self, result);
+     DATA_PTR(self) = result;
+     return self;
+ }
+ 
+ 
+ static VALUE
  _wrap_FX_Cursor_allocate(int argc, VALUE *argv, VALUE self) {
      VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXCursor);
***************
*** 8401,8416 ****
  
  static VALUE
! _wrap_new_FX_Cursor(int argc, VALUE *argv, VALUE self) {
      FXApp *arg1 ;
!     int arg2 = CURSOR_ARROW ;
      FXCursor *result;
      
!     if ((argc < 1) || (argc > 2))
!     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
      SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
!     if (argc > 1) {
!         arg2 = (int) NUM2INT(argv[1]);
!     }
!     result = (FXCursor *)new FXCursor(arg1,(FXStockCursor )arg2);
      FXRbRegisterRubyObj(self, result);
      DATA_PTR(self) = result;
--- 8664,8687 ----
  
  static VALUE
! _wrap_new_FX_Cursor__SWIG_1(int argc, VALUE *argv, VALUE self) {
      FXApp *arg1 ;
!     void *arg2 ;
!     void *arg3 ;
!     FXint arg4 ;
!     FXint arg5 ;
!     FXint arg6 ;
!     FXint arg7 ;
      FXCursor *result;
      
!     if ((argc < 7) || (argc > 7))
!     rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc);
      SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
!     SWIG_ConvertPtr(argv[1], &arg2, 0, 1);
!     SWIG_ConvertPtr(argv[2], &arg3, 0, 1);
!     arg4 = NUM2INT(argv[3]);
!     arg5 = NUM2INT(argv[4]);
!     arg6 = NUM2INT(argv[5]);
!     arg7 = NUM2INT(argv[6]);
!     result = (FXCursor *)new FXCursor(arg1,(void const *)arg2,(void const *)arg3,arg4,arg5,arg6,arg7);
      FXRbRegisterRubyObj(self, result);
      DATA_PTR(self) = result;
***************
*** 8419,8422 ****
--- 8690,8764 ----
  
  
+ static VALUE _wrap_new_FX_Cursor(int nargs, VALUE *args, VALUE self) {
+     int argc;
+     VALUE argv[7];
+     int ii;
+     
+     argc = nargs;
+     for (ii = 0; (ii < argc) && (ii < 7); ii++) {
+         argv[ii] = args[ii];
+     }
+     if ((argc >= 1) && (argc <= 2)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         if (argc > 1) {
+             {
+                 _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0;
+             }
+             _m &= _v;
+         }
+         if (_m) {
+             return _wrap_new_FX_Cursor__SWIG_0(nargs, args, self);
+         }
+     }
+     if ((argc >= 7) && (argc <= 7)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, 0, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[2]) || (TYPE(argv[2]) == T_DATA && SWIG_ConvertPtr(argv[2], &ptr, 0, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[4]) == T_FIXNUM) || (TYPE(argv[4]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[5]) == T_FIXNUM) || (TYPE(argv[5]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[6]) == T_FIXNUM) || (TYPE(argv[6]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         if (_m) {
+             return _wrap_new_FX_Cursor__SWIG_1(nargs, args, self);
+         }
+     }
+     
+     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FX_Cursor'");
+     return Qnil;
+ }
+ 
+ 
  static VALUE
  _wrap_FX_Cursor_getWidth(int argc, VALUE *argv, VALUE self) {
***************
*** 8587,8590 ****
--- 8929,8951 ----
  }
  static VALUE
+ _wrap_new_FXCursor__SWIG_0(int argc, VALUE *argv, VALUE self) {
+     FXApp *arg1 ;
+     int arg2 = CURSOR_ARROW ;
+     FXRbCursor *result;
+     
+     if ((argc < 1) || (argc > 2))
+     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
+     if (argc > 1) {
+         arg2 = (int) NUM2INT(argv[1]);
+     }
+     result = (FXRbCursor *)new FXRbCursor(arg1,(FXStockCursor )arg2);
+     FXRbRegisterRubyObj(self, result);
+     DATA_PTR(self) = result;
+     return self;
+ }
+ 
+ 
+ static VALUE
  _wrap_FXCursor_allocate(int argc, VALUE *argv, VALUE self) {
      VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbCursor);
***************
*** 8595,8610 ****
  
  static VALUE
! _wrap_new_FXCursor(int argc, VALUE *argv, VALUE self) {
      FXApp *arg1 ;
!     int arg2 = CURSOR_ARROW ;
      FXRbCursor *result;
      
!     if ((argc < 1) || (argc > 2))
!     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
      SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
!     if (argc > 1) {
!         arg2 = (int) NUM2INT(argv[1]);
!     }
!     result = (FXRbCursor *)new FXRbCursor(arg1,(FXStockCursor )arg2);
      FXRbRegisterRubyObj(self, result);
      DATA_PTR(self) = result;
--- 8956,8979 ----
  
  static VALUE
! _wrap_new_FXCursor__SWIG_1(int argc, VALUE *argv, VALUE self) {
      FXApp *arg1 ;
!     void *arg2 ;
!     void *arg3 ;
!     FXint arg4 ;
!     FXint arg5 ;
!     FXint arg6 ;
!     FXint arg7 ;
      FXRbCursor *result;
      
!     if ((argc < 7) || (argc > 7))
!     rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc);
      SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
!     SWIG_ConvertPtr(argv[1], &arg2, 0, 1);
!     SWIG_ConvertPtr(argv[2], &arg3, 0, 1);
!     arg4 = NUM2INT(argv[3]);
!     arg5 = NUM2INT(argv[4]);
!     arg6 = NUM2INT(argv[5]);
!     arg7 = NUM2INT(argv[6]);
!     result = (FXRbCursor *)new FXRbCursor(arg1,(void const *)arg2,(void const *)arg3,arg4,arg5,arg6,arg7);
      FXRbRegisterRubyObj(self, result);
      DATA_PTR(self) = result;
***************
*** 8613,8616 ****
--- 8982,9056 ----
  
  
+ static VALUE _wrap_new_FXCursor(int nargs, VALUE *args, VALUE self) {
+     int argc;
+     VALUE argv[7];
+     int ii;
+     
+     argc = nargs;
+     for (ii = 0; (ii < argc) && (ii < 7); ii++) {
+         argv[ii] = args[ii];
+     }
+     if ((argc >= 1) && (argc <= 2)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         if (argc > 1) {
+             {
+                 _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0;
+             }
+             _m &= _v;
+         }
+         if (_m) {
+             return _wrap_new_FXCursor__SWIG_0(nargs, args, self);
+         }
+     }
+     if ((argc >= 7) && (argc <= 7)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, 0, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[2]) || (TYPE(argv[2]) == T_DATA && SWIG_ConvertPtr(argv[2], &ptr, 0, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[4]) == T_FIXNUM) || (TYPE(argv[4]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[5]) == T_FIXNUM) || (TYPE(argv[5]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[6]) == T_FIXNUM) || (TYPE(argv[6]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         if (_m) {
+             return _wrap_new_FXCursor__SWIG_1(nargs, args, self);
+         }
+     }
+     
+     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXCursor'");
+     return Qnil;
+ }
+ 
+ 
  static void
  free_FXRbCursor(FXRbCursor *arg1) {
***************
*** 16795,16798 ****
--- 17235,17253 ----
  
  static VALUE
+ _wrap_new_FX_FileDict__SWIG_0(int argc, VALUE *argv, VALUE self) {
+     FXApp *arg1 ;
+     FXFileDict *result;
+     
+     if ((argc < 1) || (argc > 1))
+     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
+     result = (FXFileDict *)new FXFileDict(arg1);
+     FXRbRegisterRubyObj(self, result);
+     DATA_PTR(self) = result;
+     return self;
+ }
+ 
+ 
+ static VALUE
  _wrap_FX_FileDict_allocate(int argc, VALUE *argv, VALUE self) {
      VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXFileDict);
***************
*** 16803,16814 ****
  
  static VALUE
! _wrap_new_FX_FileDict(int argc, VALUE *argv, VALUE self) {
      FXApp *arg1 ;
      FXFileDict *result;
      
!     if ((argc < 1) || (argc > 1))
!     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
      SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
!     result = (FXFileDict *)new FXFileDict(arg1);
      FXRbRegisterRubyObj(self, result);
      DATA_PTR(self) = result;
--- 17258,17271 ----
  
  static VALUE
! _wrap_new_FX_FileDict__SWIG_1(int argc, VALUE *argv, VALUE self) {
      FXApp *arg1 ;
+     FXSettings *arg2 ;
      FXFileDict *result;
      
!     if ((argc < 2) || (argc > 2))
!     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
      SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
!     SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXSettings, 1);
!     result = (FXFileDict *)new FXFileDict(arg1,arg2);
      FXRbRegisterRubyObj(self, result);
      DATA_PTR(self) = result;
***************
*** 16817,16820 ****
--- 17274,17321 ----
  
  
+ static VALUE _wrap_new_FX_FileDict(int nargs, VALUE *args, VALUE self) {
+     int argc;
+     VALUE argv[2];
+     int ii;
+     
+     argc = nargs;
+     for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+         argv[ii] = args[ii];
+     }
+     if ((argc >= 1) && (argc <= 1)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         if (_m) {
+             return _wrap_new_FX_FileDict__SWIG_0(nargs, args, self);
+         }
+     }
+     if ((argc >= 2) && (argc <= 2)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXSettings, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         if (_m) {
+             return _wrap_new_FX_FileDict__SWIG_1(nargs, args, self);
+         }
+     }
+     
+     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FX_FileDict'");
+     return Qnil;
+ }
+ 
+ 
  static VALUE
  _wrap_FX_FileDict_getApp(int argc, VALUE *argv, VALUE self) {
***************
*** 17018,17021 ****
--- 17519,17537 ----
  }
  static VALUE
+ _wrap_new_FXFileDict__SWIG_0(int argc, VALUE *argv, VALUE self) {
+     FXApp *arg1 ;
+     FXRbFileDict *result;
+     
+     if ((argc < 1) || (argc > 1))
+     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
+     result = (FXRbFileDict *)new FXRbFileDict(arg1);
+     FXRbRegisterRubyObj(self, result);
+     DATA_PTR(self) = result;
+     return self;
+ }
+ 
+ 
+ static VALUE
  _wrap_FXFileDict_allocate(int argc, VALUE *argv, VALUE self) {
      VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbFileDict);
***************
*** 17026,17040 ****
  
  static VALUE
! _wrap_new_FXFileDict(int argc, VALUE *argv, VALUE self) {
      FXApp *arg1 ;
      FXRbFileDict *result;
      
!     if ((argc < 1) || (argc > 1))
!     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
      SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
!     result = (FXRbFileDict *)new FXRbFileDict(arg1);
      FXRbRegisterRubyObj(self, result);
      DATA_PTR(self) = result;
      return self;
  }
  
--- 17542,17602 ----
  
  static VALUE
! _wrap_new_FXFileDict__SWIG_1(int argc, VALUE *argv, VALUE self) {
      FXApp *arg1 ;
+     FXSettings *arg2 ;
      FXRbFileDict *result;
      
!     if ((argc < 2) || (argc > 2))
!     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
      SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
!     SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXSettings, 1);
!     result = (FXRbFileDict *)new FXRbFileDict(arg1,arg2);
      FXRbRegisterRubyObj(self, result);
      DATA_PTR(self) = result;
      return self;
+ }
+ 
+ 
+ static VALUE _wrap_new_FXFileDict(int nargs, VALUE *args, VALUE self) {
+     int argc;
+     VALUE argv[2];
+     int ii;
+     
+     argc = nargs;
+     for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+         argv[ii] = args[ii];
+     }
+     if ((argc >= 1) && (argc <= 1)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         if (_m) {
+             return _wrap_new_FXFileDict__SWIG_0(nargs, args, self);
+         }
+     }
+     if ((argc >= 2) && (argc <= 2)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXSettings, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         if (_m) {
+             return _wrap_new_FXFileDict__SWIG_1(nargs, args, self);
+         }
+     }
+     
+     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXFileDict'");
+     return Qnil;
  }
  

Index: opengl_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v
retrieving revision 1.41.2.21
retrieving revision 1.41.2.22
diff -C2 -d -r1.41.2.21 -r1.41.2.22
*** opengl_wrap.cpp	8 Jul 2002 13:27:27 -0000	1.41.2.21
--- opengl_wrap.cpp	8 Jul 2002 14:28:29 -0000	1.41.2.22
***************
*** 1289,1292 ****
--- 1289,1305 ----
  static VALUE
  _wrap_new_FXHVec__SWIG_0(int argc, VALUE *argv, VALUE self) {
+     FXHVec *result;
+     
+     if ((argc < 0) || (argc > 0))
+     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+     result = (FXHVec *)new FXHVec();
+     FXRbRegisterRubyObj(self, result);
+     DATA_PTR(self) = result;
[...1738 lines suppressed...]
+         _m &= _v;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[4]) || (TYPE(argv[4]) == T_DATA && SWIG_ConvertPtr(argv[4], &ptr, SWIGTYPE_p_FXMaterial, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[5]) || (TYPE(argv[5]) == T_DATA && SWIG_ConvertPtr(argv[5], &ptr, SWIGTYPE_p_FXMaterial, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         if (_m) {
+             return _wrap_new_FXGLShape__SWIG_1(nargs, args, self);
+         }
+     }
+     
+     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXGLShape'");
+     return Qnil;
  }
  

Index: ui_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v
retrieving revision 1.9.2.20
retrieving revision 1.9.2.21
diff -C2 -d -r1.9.2.20 -r1.9.2.21
*** ui_wrap.cpp	8 Jul 2002 13:27:28 -0000	1.9.2.20
--- ui_wrap.cpp	8 Jul 2002 14:28:30 -0000	1.9.2.21
***************
*** 5123,5135 ****
  }
  static VALUE
! _wrap_FXWindow_allocate(int argc, VALUE *argv, VALUE self) {
!     VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbWindow);
!     rb_obj_call_init(vresult, argc, argv);
!     return vresult;
! }
! 
! 
! static VALUE
! _wrap_new_FXWindow(int argc, VALUE *argv, VALUE self) {
      FXComposite *arg1 ;
      FXuint arg2 = 0 ;
--- 5123,5127 ----
  }
  static VALUE
! _wrap_new_FXWindow__SWIG_0(int argc, VALUE *argv, VALUE self) {
      FXComposite *arg1 ;
      FXuint arg2 = 0 ;
***************
*** 5162,5165 ****
--- 5154,5320 ----
      DATA_PTR(self) = result;
      return self;
+ }
+ 
+ 
+ static VALUE
+ _wrap_new_FXWindow__SWIG_1(int argc, VALUE *argv, VALUE self) {
+     FXApp *arg1 ;
+     FXVisual *arg2 ;
+     FXRbWindow *result;
+     
+     if ((argc < 2) || (argc > 2))
+     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
+     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
+     SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXVisual, 1);
+     result = (FXRbWindow *)new FXRbWindow(arg1,arg2);
+     FXRbRegisterRubyObj(self, result);
+     DATA_PTR(self) = result;
+     return self;
+ }
+ 
+ 
+ static VALUE
+ _wrap_FXWindow_allocate(int argc, VALUE *argv, VALUE self) {
+     VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbWindow);
+     rb_obj_call_init(vresult, argc, argv);
+     return vresult;
+ }
+ 
+ 
+ static VALUE
+ _wrap_new_FXWindow__SWIG_2(int argc, VALUE *argv, VALUE self) {
+     FXApp *arg1 ;
+     FXWindow *arg2 ;
+     FXuint arg3 ;
+     FXint arg4 ;
+     FXint arg5 ;
+     FXint arg6 ;
+     FXint arg7 ;
+     FXRbWindow *result;
+     
+     if ((argc < 7) || (argc > 7))
+     rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc);
+     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
+     SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
+     arg3 = NUM2UINT(argv[2]);
+     arg4 = NUM2INT(argv[3]);
+     arg5 = NUM2INT(argv[4]);
+     arg6 = NUM2INT(argv[5]);
+     arg7 = NUM2INT(argv[6]);
+     result = (FXRbWindow *)new FXRbWindow(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+     FXRbRegisterRubyObj(self, result);
+     DATA_PTR(self) = result;
+     return self;
+ }
+ 
+ 
+ static VALUE _wrap_new_FXWindow(int nargs, VALUE *args, VALUE self) {
+     int argc;
+     VALUE argv[7];
+     int ii;
+     
+     argc = nargs;
+     for (ii = 0; (ii < argc) && (ii < 7); ii++) {
+         argv[ii] = args[ii];
+     }
+     if ((argc >= 1) && (argc <= 6)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXComposite, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         if (argc > 1) {
+             {
+                 _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0;
+             }
+             _m &= _v;
+         }
+         if (argc > 2) {
+             {
+                 _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0;
+             }
+             _m &= _v;
+         }
+         if (argc > 3) {
+             {
+                 _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0;
+             }
+             _m &= _v;
+         }
+         if (argc > 4) {
+             {
+                 _v = ((TYPE(argv[4]) == T_FIXNUM) || (TYPE(argv[4]) == T_BIGNUM)) ? 1 : 0;
+             }
+             _m &= _v;
+         }
+         if (argc > 5) {
+             {
+                 _v = ((TYPE(argv[5]) == T_FIXNUM) || (TYPE(argv[5]) == T_BIGNUM)) ? 1 : 0;
+             }
+             _m &= _v;
+         }
+         if (_m) {
+             return _wrap_new_FXWindow__SWIG_0(nargs, args, self);
+         }
+     }
+     if ((argc >= 2) && (argc <= 2)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXVisual, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         if (_m) {
+             return _wrap_new_FXWindow__SWIG_1(nargs, args, self);
+         }
+     }
+     if ((argc >= 7) && (argc <= 7)) {
+         int _m = 1;
+         int _v = 1;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             void *ptr;
+             _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXWindow, 0) != -1)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[4]) == T_FIXNUM) || (TYPE(argv[4]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[5]) == T_FIXNUM) || (TYPE(argv[5]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         {
+             _v = ((TYPE(argv[6]) == T_FIXNUM) || (TYPE(argv[6]) == T_BIGNUM)) ? 1 : 0;
+         }
+         _m &= _v;
+         if (_m) {
+             return _wrap_new_FXWindow__SWIG_2(nargs, args, self);
+         }
+     }
+     
+     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXWindow'");
+     return Qnil;
  }