[Fxruby-commits] CVS: FXRuby/ext/fox core_wrap.cpp,1.62.2.22,1.62.2.23 dialogs_wrap.cpp,1.34.2.19,1.
Status: Inactive
Brought to you by:
lyle
From: Lyle J. <ly...@us...> - 2002-07-08 13:28:22
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv15718/ext/fox Modified Files: Tag: release10 core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp layout_wrap.cpp mdi_wrap.cpp opengl_wrap.cpp scintilla_wrap.cpp ui_wrap.cpp Log Message: Removed a lot of scaffolding that we were using to make overloaded methods work properly. This is now supported directly by SWIG 1.3.14 and so we don't have to do it anymore. Index: core_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v retrieving revision 1.62.2.22 retrieving revision 1.62.2.23 diff -C2 -d -r1.62.2.22 -r1.62.2.23 *** core_wrap.cpp 5 Jul 2002 22:10:51 -0000 1.62.2.22 --- core_wrap.cpp 8 Jul 2002 13:27:17 -0000 1.62.2.23 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020705-1358 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020706-1721 * [...1124 lines suppressed...] --- 18929,18933 ---- rb_define_method(cFX_App.klass, "modalModality", VALUEFUNC(_wrap_FX_App_modalModality), -1); rb_define_method(cFX_App.klass, "stop", VALUEFUNC(_wrap_FX_App_stop), -1); ! rb_define_method(cFX_App.klass, "stopModal", VALUEFUNC(_wrap_FX_App_stopModal), -1); rb_define_method(cFX_App.klass, "forceRefresh", VALUEFUNC(_wrap_FX_App_forceRefresh), -1); rb_define_method(cFX_App.klass, "refresh", VALUEFUNC(_wrap_FX_App_refresh), -1); *************** *** 18979,18984 **** rb_define_method(cFXRegion.klass, "initialize", VALUEFUNC(_wrap_new_FXRegion), -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); --- 19367,19371 ---- rb_define_method(cFXRegion.klass, "initialize", VALUEFUNC(_wrap_new_FXRegion), -1); rb_define_method(cFXRegion.klass, "empty?", VALUEFUNC(_wrap_FXRegion_emptyq___), -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); Index: dialogs_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v retrieving revision 1.34.2.19 retrieving revision 1.34.2.20 diff -C2 -d -r1.34.2.19 -r1.34.2.20 *** dialogs_wrap.cpp 5 Jul 2002 22:10:57 -0000 1.34.2.19 --- dialogs_wrap.cpp 8 Jul 2002 13:27:24 -0000 1.34.2.20 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020705-1358 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020706-1721 * [...1350 lines suppressed...] static swig_type_info *swig_types_initial[] = { - _swigt__p_FXMessageBox, _swigt__p_FXRbMessageBox, _swigt__p_FXComposite, _swigt__p_FXRbProgressDialog, --- 13907,13912 ---- static swig_type_info *swig_types_initial[] = { _swigt__p_FXRbMessageBox, + _swigt__p_FXMessageBox, _swigt__p_FXComposite, _swigt__p_FXRbProgressDialog, *************** *** 13382,13386 **** _swigt__p_FXDialogBox, _swigt__p_FXObject, - _swigt__p_FXString, _swigt__p_FXDrawable, _swigt__p_FXFontDesc, --- 13924,13927 ---- Index: icons_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v retrieving revision 1.37.2.20 retrieving revision 1.37.2.21 diff -C2 -d -r1.37.2.20 -r1.37.2.21 *** icons_wrap.cpp 5 Jul 2002 22:10:57 -0000 1.37.2.20 --- icons_wrap.cpp 8 Jul 2002 13:27:25 -0000 1.37.2.21 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020705-1358 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020706-1721 * * This file is not intended to be easily readable and contains a number of Index: image_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v retrieving revision 1.39.2.20 retrieving revision 1.39.2.21 diff -C2 -d -r1.39.2.20 -r1.39.2.21 *** image_wrap.cpp 5 Jul 2002 22:10:58 -0000 1.39.2.20 --- image_wrap.cpp 8 Jul 2002 13:27:25 -0000 1.39.2.21 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020705-1358 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020706-1721 * * This file is not intended to be easily readable and contains a number of Index: layout_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v retrieving revision 1.8.2.19 retrieving revision 1.8.2.20 diff -C2 -d -r1.8.2.19 -r1.8.2.20 *** layout_wrap.cpp 5 Jul 2002 22:10:58 -0000 1.8.2.19 --- layout_wrap.cpp 8 Jul 2002 13:27:26 -0000 1.8.2.20 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020705-1358 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020706-1721 * * This file is not intended to be easily readable and contains a number of *************** *** 319,332 **** #define SWIGTYPE_p_FXRbHorizontalFrame swig_types[19] #define SWIGTYPE_p_FXRbVerticalFrame swig_types[20] ! #define SWIGTYPE_p_FXString swig_types[21] ! #define SWIGTYPE_p_FXRbShutter swig_types[22] ! #define SWIGTYPE_p_FXIcon swig_types[23] ! #define SWIGTYPE_p_FXStatusbar swig_types[24] ! #define SWIGTYPE_p_FXRbStatusbar swig_types[25] ! #define SWIGTYPE_p_FXMatrix swig_types[26] ! #define SWIGTYPE_p_FXRbMatrix swig_types[27] ! #define SWIGTYPE_p_FXSwitcher swig_types[28] ! #define SWIGTYPE_p_FXRbSwitcher swig_types[29] ! static swig_type_info *swig_types[31]; /* -------- TYPES TABLE (END) -------- */ --- 319,331 ---- #define SWIGTYPE_p_FXRbHorizontalFrame swig_types[19] #define SWIGTYPE_p_FXRbVerticalFrame swig_types[20] ! #define SWIGTYPE_p_FXRbShutter swig_types[21] ! #define SWIGTYPE_p_FXIcon swig_types[22] ! #define SWIGTYPE_p_FXStatusbar swig_types[23] ! #define SWIGTYPE_p_FXRbStatusbar swig_types[24] ! #define SWIGTYPE_p_FXMatrix swig_types[25] ! #define SWIGTYPE_p_FXRbMatrix swig_types[26] ! #define SWIGTYPE_p_FXSwitcher swig_types[27] ! #define SWIGTYPE_p_FXRbSwitcher swig_types[28] ! static swig_type_info *swig_types[30]; /* -------- TYPES TABLE (END) -------- */ *************** *** 6079,6091 **** static VALUE ! _wrap_FX_Splitter_allocate(int argc, VALUE *argv, VALUE self) { ! VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXSplitter); ! rb_obj_call_init(vresult, argc, argv); ! return vresult; ! } ! ! ! static VALUE ! _wrap_new_FX_Splitter_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = SPLITTER_NORMAL ; --- 6078,6082 ---- static VALUE ! _wrap_new_FX_Splitter__SWIG_0(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = SPLITTER_NORMAL ; *************** *** 6115,6126 **** } result = (FXSplitter *)new FXSplitter(arg1,arg2,arg3,arg4,arg5,arg6); - - DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE ! _wrap_new_FX_Splitter_2(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 ; --- 6106,6125 ---- } result = (FXSplitter *)new FXSplitter(arg1,arg2,arg3,arg4,arg5,arg6); FXRbRegisterRubyObj(self, result); + DATA_PTR(self) = result; return self; } + static VALUE ! _wrap_FX_Splitter_allocate(int argc, VALUE *argv, VALUE self) { ! VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXSplitter); ! rb_obj_call_init(vresult, argc, argv); ! return vresult; ! } ! ! ! static VALUE ! _wrap_new_FX_Splitter__SWIG_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 ; *************** *** 6154,6173 **** } result = (FXSplitter *)new FXSplitter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); - - DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } ! static VALUE ! _wrap_new_FX_Splitter(int argc, VALUE *argv, VALUE self) { ! if (argc == 1) { ! return _wrap_new_FX_Splitter_1(argc, argv, self); ! } else { ! if (!rb_obj_is_kind_of(argv[1], ((swig_class *) SWIGTYPE_p_FXObject->clientdata)->klass)) ! return _wrap_new_FX_Splitter_1(argc, argv, self); ! else ! return _wrap_new_FX_Splitter_2(argc, argv, self); } } --- 6153,6267 ---- } result = (FXSplitter *)new FXSplitter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); FXRbRegisterRubyObj(self, result); + DATA_PTR(self) = result; return self; } ! ! static VALUE _wrap_new_FX_Splitter(int nargs, VALUE *args, VALUE self) { ! int argc; ! VALUE argv[8]; ! int ii; ! ! argc = nargs; ! for (ii = 0; (ii < argc) && (ii < 8); 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_FX_Splitter__SWIG_0(nargs, args, self); ! } ! } ! if ((argc >= 3) && (argc <= 8)) { ! 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; ! { ! 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; ! { ! _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 (argc > 6) { ! { ! _v = ((TYPE(argv[6]) == T_FIXNUM) || (TYPE(argv[6]) == T_BIGNUM)) ? 1 : 0; ! } ! _m &= _v; ! } ! if (argc > 7) { ! { ! _v = ((TYPE(argv[7]) == T_FIXNUM) || (TYPE(argv[7]) == T_BIGNUM)) ? 1 : 0; ! } ! _m &= _v; ! } ! if (_m) { ! return _wrap_new_FX_Splitter__SWIG_1(nargs, args, self); ! } } + + rb_raise(rb_eArgError, "No matching function for overloaded 'new_FX_Splitter'"); + return Qnil; } *************** *** 6240,6252 **** } static VALUE ! _wrap_FXSplitter_allocate(int argc, VALUE *argv, VALUE self) { ! VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbSplitter); ! rb_obj_call_init(vresult, argc, argv); ! return vresult; ! } ! ! ! static VALUE ! _wrap_new_FXSplitter_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = SPLITTER_NORMAL ; --- 6334,6338 ---- } static VALUE ! _wrap_new_FXSplitter__SWIG_0(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = SPLITTER_NORMAL ; *************** *** 6276,6287 **** } result = (FXRbSplitter *)new FXRbSplitter(arg1,arg2,arg3,arg4,arg5,arg6); - - DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE ! _wrap_new_FXSplitter_2(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 ; --- 6362,6381 ---- } result = (FXRbSplitter *)new FXRbSplitter(arg1,arg2,arg3,arg4,arg5,arg6); FXRbRegisterRubyObj(self, result); + DATA_PTR(self) = result; return self; } + static VALUE ! _wrap_FXSplitter_allocate(int argc, VALUE *argv, VALUE self) { ! VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbSplitter); ! rb_obj_call_init(vresult, argc, argv); ! return vresult; ! } ! ! ! static VALUE ! _wrap_new_FXSplitter__SWIG_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 ; *************** *** 6315,6334 **** } result = (FXRbSplitter *)new FXRbSplitter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); - - DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } ! static VALUE ! _wrap_new_FXSplitter(int argc, VALUE *argv, VALUE self) { ! if (argc == 1) { ! return _wrap_new_FXSplitter_1(argc, argv, self); ! } else { ! if (!rb_obj_is_kind_of(argv[1], ((swig_class *) SWIGTYPE_p_FXObject->clientdata)->klass)) ! return _wrap_new_FXSplitter_1(argc, argv, self); ! else ! return _wrap_new_FXSplitter_2(argc, argv, self); } } --- 6409,6523 ---- } result = (FXRbSplitter *)new FXRbSplitter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); FXRbRegisterRubyObj(self, result); + DATA_PTR(self) = result; return self; } ! ! static VALUE _wrap_new_FXSplitter(int nargs, VALUE *args, VALUE self) { ! int argc; ! VALUE argv[8]; ! int ii; ! ! argc = nargs; ! for (ii = 0; (ii < argc) && (ii < 8); 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_FXSplitter__SWIG_0(nargs, args, self); + } + } + if ((argc >= 3) && (argc <= 8)) { + 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; + { + 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; + { + _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 (argc > 6) { + { + _v = ((TYPE(argv[6]) == T_FIXNUM) || (TYPE(argv[6]) == T_BIGNUM)) ? 1 : 0; + } + _m &= _v; + } + if (argc > 7) { + { + _v = ((TYPE(argv[7]) == T_FIXNUM) || (TYPE(argv[7]) == T_BIGNUM)) ? 1 : 0; + } + _m &= _v; + } + if (_m) { + return _wrap_new_FXSplitter__SWIG_1(nargs, args, self); + } + } + + rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXSplitter'"); + return Qnil; } *************** *** 7057,7069 **** static VALUE ! _wrap_FX_4Splitter_allocate(int argc, VALUE *argv, VALUE self) { ! VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FX4Splitter); ! rb_obj_call_init(vresult, argc, argv); ! return vresult; ! } ! ! ! static VALUE ! _wrap_new_FX_4Splitter_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = FOURSPLITTER_NORMAL ; --- 7246,7250 ---- static VALUE ! _wrap_new_FX_4Splitter__SWIG_0(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = FOURSPLITTER_NORMAL ; *************** *** 7093,7104 **** } result = (FX4Splitter *)new FX4Splitter(arg1,arg2,arg3,arg4,arg5,arg6); - - DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE ! _wrap_new_FX_4Splitter_2(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 ; --- 7274,7293 ---- } result = (FX4Splitter *)new FX4Splitter(arg1,arg2,arg3,arg4,arg5,arg6); FXRbRegisterRubyObj(self, result); + DATA_PTR(self) = result; return self; } + static VALUE ! _wrap_FX_4Splitter_allocate(int argc, VALUE *argv, VALUE self) { ! VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FX4Splitter); ! rb_obj_call_init(vresult, argc, argv); ! return vresult; ! } ! ! ! static VALUE ! _wrap_new_FX_4Splitter__SWIG_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 ; *************** *** 7132,7151 **** } result = (FX4Splitter *)new FX4Splitter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); - - DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } ! static VALUE ! _wrap_new_FX_4Splitter(int argc, VALUE *argv, VALUE self) { ! if (argc == 1) { ! return _wrap_new_FX_4Splitter_1(argc, argv, self); ! } else { ! if (!rb_obj_is_kind_of(argv[1], ((swig_class *) SWIGTYPE_p_FXObject->clientdata)->klass)) ! return _wrap_new_FX_4Splitter_1(argc, argv, self); ! else ! return _wrap_new_FX_4Splitter_2(argc, argv, self); } } --- 7321,7435 ---- } result = (FX4Splitter *)new FX4Splitter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); FXRbRegisterRubyObj(self, result); + DATA_PTR(self) = result; return self; } ! ! static VALUE _wrap_new_FX_4Splitter(int nargs, VALUE *args, VALUE self) { ! int argc; ! VALUE argv[8]; ! int ii; ! ! argc = nargs; ! for (ii = 0; (ii < argc) && (ii < 8); 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_FX_4Splitter__SWIG_0(nargs, args, self); ! } ! } ! if ((argc >= 3) && (argc <= 8)) { ! 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; ! { ! 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; ! { ! _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 (argc > 6) { ! { ! _v = ((TYPE(argv[6]) == T_FIXNUM) || (TYPE(argv[6]) == T_BIGNUM)) ? 1 : 0; ! } ! _m &= _v; ! } ! if (argc > 7) { ! { ! _v = ((TYPE(argv[7]) == T_FIXNUM) || (TYPE(argv[7]) == T_BIGNUM)) ? 1 : 0; ! } ! _m &= _v; ! } ! if (_m) { ! return _wrap_new_FX_4Splitter__SWIG_1(nargs, args, self); ! } } + + rb_raise(rb_eArgError, "No matching function for overloaded 'new_FX_4Splitter'"); + return Qnil; } *************** *** 7371,7383 **** static VALUE ! _wrap_FX4Splitter_allocate(int argc, VALUE *argv, VALUE self) { ! VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRb4Splitter); ! rb_obj_call_init(vresult, argc, argv); ! return vresult; ! } ! ! ! static VALUE ! _wrap_new_FX4Splitter_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = FOURSPLITTER_NORMAL ; --- 7655,7659 ---- static VALUE ! _wrap_new_FX4Splitter__SWIG_0(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = FOURSPLITTER_NORMAL ; *************** *** 7407,7418 **** } result = (FXRb4Splitter *)new FXRb4Splitter(arg1,arg2,arg3,arg4,arg5,arg6); - - DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE ! _wrap_new_FX4Splitter_2(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 ; --- 7683,7702 ---- } result = (FXRb4Splitter *)new FXRb4Splitter(arg1,arg2,arg3,arg4,arg5,arg6); FXRbRegisterRubyObj(self, result); + DATA_PTR(self) = result; return self; } + static VALUE ! _wrap_FX4Splitter_allocate(int argc, VALUE *argv, VALUE self) { ! VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRb4Splitter); ! rb_obj_call_init(vresult, argc, argv); ! return vresult; ! } ! ! ! static VALUE ! _wrap_new_FX4Splitter__SWIG_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 ; *************** *** 7446,7465 **** } result = (FXRb4Splitter *)new FXRb4Splitter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); - - DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } ! static VALUE ! _wrap_new_FX4Splitter(int argc, VALUE *argv, VALUE self) { ! if (argc == 1) { ! return _wrap_new_FX4Splitter_1(argc, argv, self); ! } else { ! if (!rb_obj_is_kind_of(argv[1], ((swig_class *) SWIGTYPE_p_FXObject->clientdata)->klass)) ! return _wrap_new_FX4Splitter_1(argc, argv, self); ! else ! return _wrap_new_FX4Splitter_2(argc, argv, self); } } --- 7730,7844 ---- } result = (FXRb4Splitter *)new FXRb4Splitter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); FXRbRegisterRubyObj(self, result); + DATA_PTR(self) = result; return self; } ! ! static VALUE _wrap_new_FX4Splitter(int nargs, VALUE *args, VALUE self) { ! int argc; ! VALUE argv[8]; ! int ii; ! ! argc = nargs; ! for (ii = 0; (ii < argc) && (ii < 8); 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_FX4Splitter__SWIG_0(nargs, args, self); ! } } + if ((argc >= 3) && (argc <= 8)) { + 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; + { + 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; + { + _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 (argc > 6) { + { + _v = ((TYPE(argv[6]) == T_FIXNUM) || (TYPE(argv[6]) == T_BIGNUM)) ? 1 : 0; + } + _m &= _v; + } + if (argc > 7) { + { + _v = ((TYPE(argv[7]) == T_FIXNUM) || (TYPE(argv[7]) == T_BIGNUM)) ? 1 : 0; + } + _m &= _v; + } + if (_m) { + return _wrap_new_FX4Splitter__SWIG_1(nargs, args, self); + } + } + + rb_raise(rb_eArgError, "No matching function for overloaded 'new_FX4Splitter'"); + return Qnil; } *************** *** 11185,11189 **** static swig_type_info _swigt__p_FXRbHorizontalFrame[] = {{"_p_FXRbHorizontalFrame", 0, "FXRbHorizontalFrame *"},{"_p_FXRbHorizontalFrame"},{0}}; static swig_type_info _swigt__p_FXRbVerticalFrame[] = {{"_p_FXRbVerticalFrame", 0, "FXRbVerticalFrame *"},{"_p_FXRbVerticalFrame"},{0}}; - static swig_type_info _swigt__p_FXString[] = {{"_p_FXString", 0, "FXString *"},{"_p_FXString"},{0}}; static swig_type_info _swigt__p_FXRbShutter[] = {{"_p_FXRbShutter", 0, "FXRbShutter *"},{"_p_FXRbShutter"},{0}}; static swig_type_info _swigt__p_FXIcon[] = {{"_p_FXIcon", 0, "FXIcon *"},{"_p_FXIcon"},{0}}; --- 11564,11567 ---- *************** *** 11217,11221 **** _swigt__p_FXRbHorizontalFrame, _swigt__p_FXRbVerticalFrame, - _swigt__p_FXString, _swigt__p_FXRbShutter, _swigt__p_FXIcon, --- 11595,11598 ---- Index: mdi_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v retrieving revision 1.36.2.19 retrieving revision 1.36.2.20 diff -C2 -d -r1.36.2.19 -r1.36.2.20 *** mdi_wrap.cpp 5 Jul 2002 22:10:58 -0000 1.36.2.19 --- mdi_wrap.cpp 8 Jul 2002 13:27:26 -0000 1.36.2.20 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020705-1358 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020706-1721 * * This file is not intended to be easily readable and contains a number of *************** *** 328,335 **** #define SWIGTYPE_p_FXDrawable swig_types[28] #define SWIGTYPE_p_FXStream swig_types[29] ! #define SWIGTYPE_p_FXString swig_types[30] ! #define SWIGTYPE_p_FXIcon swig_types[31] ! #define SWIGTYPE_p_FXMenuPane swig_types[32] ! static swig_type_info *swig_types[34]; /* -------- TYPES TABLE (END) -------- */ --- 328,334 ---- #define SWIGTYPE_p_FXDrawable swig_types[28] #define SWIGTYPE_p_FXStream swig_types[29] ! #define SWIGTYPE_p_FXIcon swig_types[30] ! #define SWIGTYPE_p_FXMenuPane swig_types[31] ! static swig_type_info *swig_types[33]; /* -------- TYPES TABLE (END) -------- */ *************** *** 10381,10385 **** static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable *"},{"_p_FXColorBar", _p_FXColorBarTo_p_FXDrawable},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXDrawable},{"_p_FXMDIChild", _p_FXMDIChildTo_p_FXDrawable},{"_p_FXRbMDIChild", _p_FXRbMDIChildTo_p_FXDrawable},{"_p_FXTreeList", _p_FXTreeListTo_p_FXDrawable},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXDrawable},{"_p_FXTabBar", _p_FXTabBarTo_p_FXDrawable},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXDrawable},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXDrawable},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXDrawable},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXDrawable},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXDrawable},{"_p_FXDirList", _p_FXDirListTo_p_FXDrawable},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXDrawable},{"_p_FXMDIMenu", _p_FXMDIMenuTo_p_FXDrawable},{"_p_FXRbMDIMenu", _p_FXRbMDIMenuTo_p_FXDrawable},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXDrawable},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXDrawable},{"_p_FXList", _p_FXListTo_p_FXDrawable},{"_p_FXMDIRestoreButton", _p_FXMDIRestoreButtonTo_p_FXDrawable},{"_p_FXRbMDIDeleteButton", _p_FXRbMDIDeleteButtonTo_p_FXDrawable},{"_p_FXMDIDeleteButton", _p_FXMDIDeleteButtonTo_p_FXDrawable},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXDrawable},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXDrawable},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable},{"_p_FXRbMDIWindowButton", _p_FXRbMDIWindowButtonTo_p_FXDrawable},{"_p_FXMDIWindowButton", _p_FXMDIWindowButtonTo_p_FXDrawable},{"_p_FXRbMDIMinimizeButton", _p_FXRbMDIMinimizeButtonTo_p_FXDrawable},{"_p_FXMDIMinimizeButton", _p_FXMDIMinimizeButtonTo_p_FXDrawable},{"_p_FXRbMDIMaximizeButton", _p_FXRbMDIMaximizeButtonTo_p_FXDrawable},{"_p_FXMDIMaximizeButton", _p_FXMDIMaximizeButtonTo_p_FXDrawable},{"_p_FXRbMDIRestoreButton", _p_FXRbMDIRestoreButtonTo_p_FXDrawable},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXDrawable},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXDrawable},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXDrawable},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXDrawable},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXDrawable},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXDrawable},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXDrawable},{"_p_FXPicker", _p_FXPickerTo_p_FXDrawable},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXDrawable},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXDrawable},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXDrawable},{"_p_FXTooltip", _p_FXTooltipTo_p_FXDrawable},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXDrawable},{"_p_FXDrawable"},{"_p_FXRbShell", _p_FXRbShellTo_p_FXDrawable},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXDrawable},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXDrawable},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXDrawable},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXDrawable},{"_p_FXPacker", _p_FXPackerTo_p_FXDrawable},{"_p_FXTabBook", _p_FXTabBookTo_p_FXDrawable},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXDrawable},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXDrawable},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXDrawable},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXDrawable},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXDrawable},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXDrawable},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXDrawable},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXDrawable},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXDrawable},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXDrawable},{"_p_FXRbList", _p_FXRbListTo_p_FXDrawable},{"_p_FXTable", _p_FXTableTo_p_FXDrawable},{"_p_FXMDIClient", _p_FXMDIClientTo_p_FXDrawable},{"_p_FXRbMDIClient", _p_FXRbMDIClientTo_p_FXDrawable},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXDrawable},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable},{"_p_FXSlider", _p_FXSliderTo_p_FXDrawable},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXDrawable},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXDrawable},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXDrawable},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXDrawable},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXDrawable},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXDrawable},{"_p_FXListBox", _p_FXListBoxTo_p_FXDrawable},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXDrawable},{"_p_FXCanvas", _p_FXCanvasTo_p_FXDrawable},{"_p_FXMenubar", _p_FXMenubarTo_p_FXDrawable},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXDrawable},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXDrawable},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXDrawable},{"_p_FXDial", _p_FXDialTo_p_FXDrawable},{"_p_FXButton", _p_FXButtonTo_p_FXDrawable},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXDrawable},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXDrawable},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXDrawable},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXDrawable},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXDrawable},{"_p_FXTabItem", _p_FXTabItemTo_p_FXDrawable},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXDrawable},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable},{"_p_FXText", _p_FXTextTo_p_FXDrawable},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXDrawable},{"_p_FXToolbar", _p_FXToolbarTo_p_FXDrawable},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXDrawable},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXDrawable},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXDrawable},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXDrawable},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXDrawable},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXDrawable},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXDrawable},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXDrawable},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXDrawable},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXDrawable},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXDrawable},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXDrawable},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXDrawable},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXDrawable},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXDrawable},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXDrawable},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXDrawable},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXDrawable},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXDrawable},{"_p_FXWindow", _p_FXWindowTo_p_FXDrawable},{"_p_FXRbDial", _p_FXRbDialTo_p_FXDrawable},{"_p_FXLabel", _p_FXLabelTo_p_FXDrawable},{"_p_FXShell", _p_FXShellTo_p_FXDrawable},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXDrawable},{"_p_FXOption", _p_FXOptionTo_p_FXDrawable},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXDrawable},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXDrawable},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXDrawable},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXDrawable},{"_p_FXColorWell", _p_FXColorWellTo_p_FXDrawable},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXDrawable},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXDrawable},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXDrawable},{"_p_FXIconList", _p_FXIconListTo_p_FXDrawable},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXDrawable},{"_p_FXStatusline", _p_FXStatuslineTo_p_FXDrawable},{"_p_FXRbStatusline", _p_FXRbStatuslineTo_p_FXDrawable},{"_p_FXImageView", _p_FXImageViewTo_p_FXDrawable},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXDrawable},{"_p_FXRbText", _p_FXRbTextTo_p_FXDrawable},{"_p_FXRbTable", _p_FXRbTableTo_p_FXDrawable},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXDrawable},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXDrawable},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXDrawable},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXDrawable},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXDrawable},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXDrawable},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXDrawable},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXDrawable},{"_p_FXFileList", _p_FXFileListTo_p_FXDrawable},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXDrawable},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXDrawable},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXDrawable},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXDrawable},{" _p_FXDirBox", _p_FXDirBoxTo_p_FXDrawable},{0}}; static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *"},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream},{"_p_FXRbFileStream", _p_FXRbFileStreamTo_p_FXStream},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream},{"_p_FXRbMemoryStream", _p_FXRbMemoryStreamTo_p_FXStream},{"_p_FXStream"},{"_p_FXRbStream", _p_FXRbStreamTo_p_FXStream},{0}}; - static swig_type_info _swigt__p_FXString[] = {{"_p_FXString", 0, "FXString *"},{"_p_FXString"},{0}}; static swig_type_info _swigt__p_FXIcon[] = {{"_p_FXIcon", 0, "FXIcon *"},{"_p_FXIcon"},{0}}; static swig_type_info _swigt__p_FXMenuPane[] = {{"_p_FXMenuPane", 0, "FXMenuPane *"},{"_p_FXMenuPane"},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXMenuPane},{"_p_FXMDIMenu", _p_FXMDIMenuTo_p_FXMenuPane},{"_p_FXRbMDIMenu", _p_FXRbMDIMenuTo_p_FXMenuPane},{0}}; --- 10380,10383 ---- *************** *** 10416,10420 **** _swigt__p_FXDrawable, _swigt__p_FXStream, - _swigt__p_FXString, _swigt__p_FXIcon, _swigt__p_FXMenuPane, --- 10414,10417 ---- Index: opengl_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v retrieving revision 1.41.2.20 retrieving revision 1.41.2.21 diff -C2 -d -r1.41.2.20 -r1.41.2.21 *** opengl_wrap.cpp 5 Jul 2002 22:10:59 -0000 1.41.2.20 --- opengl_wrap.cpp 8 Jul 2002 13:27:27 -0000 1.41.2.21 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020705-1358 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020706-1721 * [...1230 lines suppressed...] rb_define_method(cFXHMat.klass, "look", VALUEFUNC(_wrap_FXHMat_look), -1); ! rb_define_method(cFXHMat.klass, "trans", VALUEFUNC(_wrap_FXHMat_trans), -1); ! rb_define_method(cFXHMat.klass, "scale", VALUEFUNC(_wrap_FXHMat_scale), -1); cFXHMat.mark = 0; cFXHMat.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; *************** *** 13966,13972 **** rb_define_method(cFXRange.klass, "[]", VALUEFUNC(_wrap_FXRange___getitem__), -1); rb_define_method(cFXRange.klass, "[]=", VALUEFUNC(_wrap_FXRange___setitem__), -1); ! rb_define_method(cFXRange.klass, "includeRange", VALUEFUNC(_wrap_FXRange_includeRange), -1); ! rb_define_method(cFXRange.klass, "includePoint", VALUEFUNC(_wrap_FXRange_includePoint), -1); ! rb_define_method(cFXRange.klass, "includeVec", VALUEFUNC(_wrap_FXRange_includeVec), -1); rb_define_method(cFXRange.klass, "clipTo", VALUEFUNC(_wrap_FXRange_clipTo), -1); rb_define_method(cFXRange.klass, "corners", VALUEFUNC(_wrap_FXRange_corners), -1); --- 14596,14600 ---- rb_define_method(cFXRange.klass, "[]", VALUEFUNC(_wrap_FXRange___getitem__), -1); rb_define_method(cFXRange.klass, "[]=", VALUEFUNC(_wrap_FXRange___setitem__), -1); ! rb_define_method(cFXRange.klass, "include", VALUEFUNC(_wrap_FXRange_include), -1); rb_define_method(cFXRange.klass, "clipTo", VALUEFUNC(_wrap_FXRange_clipTo), -1); rb_define_method(cFXRange.klass, "corners", VALUEFUNC(_wrap_FXRange_corners), -1); Index: scintilla_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/scintilla_wrap.cpp,v retrieving revision 1.16.2.14 retrieving revision 1.16.2.15 diff -C2 -d -r1.16.2.14 -r1.16.2.15 *** scintilla_wrap.cpp 5 Jul 2002 22:10:59 -0000 1.16.2.14 --- scintilla_wrap.cpp 8 Jul 2002 13:27:27 -0000 1.16.2.15 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020705-1358 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020706-1721 * * This file is not intended to be easily readable and contains a number of Index: ui_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v retrieving revision 1.9.2.19 retrieving revision 1.9.2.20 diff -C2 -d -r1.9.2.19 -r1.9.2.20 *** ui_wrap.cpp 5 Jul 2002 22:11:00 -0000 1.9.2.19 --- ui_wrap.cpp 8 Jul 2002 13:27:28 -0000 1.9.2.20 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020705-1358 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020706-1721 * [...5302 lines suppressed...] rb_define_method(cFX_IconList.klass, "retrieveItem", VALUEFUNC(_wrap_FX_IconList_retrieveItem), -1); ! rb_define_method(cFX_IconList.klass, "replaceItem1", VALUEFUNC(_wrap_FX_IconList_replaceItem1), -1); ! rb_define_method(cFX_IconList.klass, "replaceItem2", VALUEFUNC(_wrap_FX_IconList_replaceItem2), -1); ! rb_define_method(cFX_IconList.klass, "insertItem1", VALUEFUNC(_wrap_FX_IconList_insertItem1), -1); ! rb_define_method(cFX_IconList.klass, "insertItem2", VALUEFUNC(_wrap_FX_IconList_insertItem2), -1); ! rb_define_method(cFX_IconList.klass, "appendItem1", VALUEFUNC(_wrap_FX_IconList_appendItem1), -1); ! rb_define_method(cFX_IconList.klass, "appendItem2", VALUEFUNC(_wrap_FX_IconList_appendItem2), -1); ! rb_define_method(cFX_IconList.klass, "prependItem1", VALUEFUNC(_wrap_FX_IconList_prependItem1), -1); ! rb_define_method(cFX_IconList.klass, "prependItem2", VALUEFUNC(_wrap_FX_IconList_prependItem2), -1); rb_define_method(cFX_IconList.klass, "removeItem", VALUEFUNC(_wrap_FX_IconList_removeItem), -1); rb_define_method(cFX_IconList.klass, "clearItems", VALUEFUNC(_wrap_FX_IconList_clearItems), -1); --- 107921,107928 ---- rb_define_method(cFX_IconList.klass, "getNumHeaders", VALUEFUNC(_wrap_FX_IconList_getNumHeaders), -1); rb_define_method(cFX_IconList.klass, "retrieveItem", VALUEFUNC(_wrap_FX_IconList_retrieveItem), -1); ! rb_define_method(cFX_IconList.klass, "replaceItem", VALUEFUNC(_wrap_FX_IconList_replaceItem), -1); ! rb_define_method(cFX_IconList.klass, "insertItem", VALUEFUNC(_wrap_FX_IconList_insertItem), -1); ! rb_define_method(cFX_IconList.klass, "appendItem", VALUEFUNC(_wrap_FX_IconList_appendItem), -1); ! rb_define_method(cFX_IconList.klass, "prependItem", VALUEFUNC(_wrap_FX_IconList_prependItem), -1); rb_define_method(cFX_IconList.klass, "removeItem", VALUEFUNC(_wrap_FX_IconList_removeItem), -1); rb_define_method(cFX_IconList.klass, "clearItems", VALUEFUNC(_wrap_FX_IconList_clearItems), -1); |