Thread: [Fxruby-commits] CVS: FXRuby/ext/fox core_wrap.cpp,1.62.2.3,1.62.2.4 dialogs_wrap.cpp,1.34.2.3,1.34.
Status: Inactive
Brought to you by:
lyle
From: Lyle J. <ly...@us...> - 2002-04-29 22:23:53
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv5321/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 ui_wrap.cpp Log Message: Fix for SF Bug #550349. For functions that have input arguments of type "const FXString&" but also specify a default argument value which is a literal string, e.g. void somefunc(const FXString& title = "Hello"); the previous typemap I had was not working properly. The new one should. Index: core_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v retrieving revision 1.62.2.3 retrieving revision 1.62.2.4 diff -C2 -d -r1.62.2.3 -r1.62.2.4 *** core_wrap.cpp 25 Apr 2002 16:48:26 -0000 1.62.2.3 --- core_wrap.cpp 29 Apr 2002 22:23:41 -0000 1.62.2.4 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020422-1501 * * 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.12u-20020429-1612 * * This file is not intended to be easily readable and contains a number of *************** *** 1631,1634 **** --- 1631,1635 ---- int arg3 ; FXbool result; + SwigValueWrapper<FXString > p2 ; VALUE vresult = Qnil; *************** *** 1639,1646 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } arg3 = (int ) NUM2INT(argv[1]); --- 1640,1648 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } arg3 = (int ) NUM2INT(argv[1]); *************** *** 1648,1652 **** vresult = result ? Qtrue : Qfalse; - delete arg2; return vresult; } --- 1650,1653 ---- *************** *** 3095,3098 **** --- 3096,3100 ---- FXbool arg3 ; FXbool result; + SwigValueWrapper<FXString > p2 ; VALUE vresult = Qnil; *************** *** 3103,3110 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } { --- 3105,3113 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } { *************** *** 3117,3121 **** vresult = result ? Qtrue : Qfalse; - delete arg2; return vresult; } --- 3120,3123 ---- *************** *** 3127,3130 **** --- 3129,3133 ---- FXString *arg2 ; FXbool result; + SwigValueWrapper<FXString > p2 ; VALUE vresult = Qnil; *************** *** 3135,3147 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } result = (FXbool )(arg1)->unparseFile((FXString const &)*arg2); vresult = result ? Qtrue : Qfalse; - delete arg2; return vresult; } --- 3138,3150 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } result = (FXbool )(arg1)->unparseFile((FXString const &)*arg2); vresult = result ? Qtrue : Qfalse; return vresult; } *************** *** 3529,3532 **** --- 3532,3538 ---- static VALUE _wrap_new_FXRegistry(int argc, VALUE *argv, VALUE self) { + SwigValueWrapper<FXString > p1 ; + SwigValueWrapper<FXString > p2 ; + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRegistry); rb_obj_call_init(vresult, argc, argv); *************** *** 3542,3545 **** --- 3548,3553 ---- FXString *arg2 = (FXString *) &arg2_defvalue ; FXRegistry *result; + SwigValueWrapper<FXString > p1 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 0) || (argc > 2)) *************** *** 3549,3556 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg1 = new FXString(STR2CSTR(argv[0])); }else { ! arg1 = new FXString; } } } --- 3557,3565 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p1 = FXString(STR2CSTR(argv[0])); }else { ! p1 = FXString::null; } + arg1 = &p1; } } *************** *** 3559,3566 **** if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[1])); }else { ! arg2 = new FXString; } } } --- 3568,3576 ---- if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! p2 = FXString(STR2CSTR(argv[1])); }else { ! p2 = FXString::null; } + arg2 = &p2; } } *************** *** 3568,3573 **** FXRbRegisterRubyObj(self, result); DATA_PTR(self) = result; - delete arg1; - delete arg2; return self; } --- 3578,3581 ---- *************** *** 4067,4070 **** --- 4075,4079 ---- FXRecentFiles *arg1 ; FXString *arg2 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1)) *************** *** 4074,4085 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } (arg1)->setGroupName((FXString const &)*arg2); - delete arg2; return Qnil; } --- 4083,4094 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } (arg1)->setGroupName((FXString const &)*arg2); return Qnil; } *************** *** 4168,4171 **** --- 4177,4181 ---- FXRecentFiles *arg1 ; FXString *arg2 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1)) *************** *** 4175,4186 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } (arg1)->appendFile((FXString const &)*arg2); - delete arg2; return Qnil; } --- 4185,4196 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } (arg1)->appendFile((FXString const &)*arg2); return Qnil; } *************** *** 4191,4194 **** --- 4201,4205 ---- FXRecentFiles *arg1 ; FXString *arg2 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1)) *************** *** 4198,4209 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } (arg1)->removeFile((FXString const &)*arg2); - delete arg2; return Qnil; } --- 4209,4220 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } (arg1)->removeFile((FXString const &)*arg2); return Qnil; } *************** *** 5528,5531 **** --- 5539,5543 ---- FXString *arg2 ; FXDragType result; + SwigValueWrapper<FXString > p2 ; VALUE vresult = Qnil; *************** *** 5536,5548 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } result = (FXDragType )((FXApp const *)arg1)->registerDragType((FXString const &)*arg2); vresult = UINT2NUM(result); - delete arg2; return vresult; } --- 5548,5560 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } result = (FXDragType )((FXApp const *)arg1)->registerDragType((FXString const &)*arg2); vresult = UINT2NUM(result); return vresult; } *************** *** 7964,7967 **** --- 7976,7980 ---- FXuint arg6 = 0 ; FXbool result; + SwigValueWrapper<FXString > p1 ; VALUE vresult = Qnil; *************** *** 7971,7978 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg1 = new FXString(STR2CSTR(argv[0])); }else { ! arg1 = new FXString; } } if (argc > 1) { --- 7984,7992 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p1 = FXString(STR2CSTR(argv[0])); }else { ! p1 = FXString::null; } + arg1 = &p1; } if (argc > 1) { *************** *** 7994,7998 **** vresult = result ? Qtrue : Qfalse; - delete arg1; return vresult; } --- 8008,8011 ---- *************** *** 16129,16132 **** --- 16142,16147 ---- static VALUE _wrap_new_FX_IconDict(int argc, VALUE *argv, VALUE self) { + SwigValueWrapper<FXString > p2 ; + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXIconDict); rb_obj_call_init(vresult, argc, argv); *************** *** 16141,16144 **** --- 16156,16160 ---- FXString *arg2 = (FXString *) &arg2_defvalue ; FXIconDict *result; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 2)) *************** *** 16149,16156 **** if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[1])); }else { ! arg2 = new FXString; } } } --- 16165,16173 ---- if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! p2 = FXString(STR2CSTR(argv[1])); }else { ! p2 = FXString::null; } + arg2 = &p2; } } *************** *** 16158,16162 **** FXRbRegisterRubyObj(self, result); DATA_PTR(self) = result; - delete arg2; return self; } --- 16175,16178 ---- *************** *** 16183,16186 **** --- 16199,16203 ---- FXIconDict *arg1 ; FXString *arg2 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1)) *************** *** 16190,16201 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } (arg1)->setIconPath((FXString const &)*arg2); - delete arg2; return Qnil; } --- 16207,16218 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } (arg1)->setIconPath((FXString const &)*arg2); return Qnil; } *************** *** 16279,16282 **** --- 16296,16301 ---- static VALUE _wrap_new_FXIconDict(int argc, VALUE *argv, VALUE self) { + SwigValueWrapper<FXString > p2 ; + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbIconDict); rb_obj_call_init(vresult, argc, argv); *************** *** 16291,16294 **** --- 16310,16314 ---- FXString *arg2 = (FXString *) &arg2_defvalue ; FXRbIconDict *result; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 2)) *************** *** 16299,16306 **** if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[1])); }else { ! arg2 = new FXString; } } } --- 16319,16327 ---- if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! p2 = FXString(STR2CSTR(argv[1])); }else { ! p2 = FXString::null; } + arg2 = &p2; } } *************** *** 16308,16312 **** FXRbRegisterRubyObj(self, result); DATA_PTR(self) = result; - delete arg2; return self; } --- 16329,16332 ---- *************** *** 16455,16458 **** --- 16475,16479 ---- FXFileDict *arg1 ; FXString *arg2 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1)) *************** *** 16462,16473 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } (arg1)->setIconPath((FXString const &)*arg2); - delete arg2; return Qnil; } --- 16483,16494 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } (arg1)->setIconPath((FXString const &)*arg2); return Qnil; } *************** *** 17360,17363 **** --- 17381,17385 ---- FXDocument *arg1 ; FXString *arg2 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1)) *************** *** 17367,17378 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } (arg1)->setTitle((FXString const &)*arg2); - delete arg2; return Qnil; } --- 17389,17400 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } (arg1)->setTitle((FXString const &)*arg2); return Qnil; } *************** *** 17399,17402 **** --- 17421,17425 ---- FXDocument *arg1 ; FXString *arg2 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1)) *************** *** 17406,17417 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } (arg1)->setFilename((FXString const &)*arg2); - delete arg2; return Qnil; } --- 17429,17440 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } (arg1)->setFilename((FXString const &)*arg2); return Qnil; } Index: dialogs_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v retrieving revision 1.34.2.3 retrieving revision 1.34.2.4 diff -C2 -d -r1.34.2.3 -r1.34.2.4 *** dialogs_wrap.cpp 25 Apr 2002 16:48:30 -0000 1.34.2.3 --- dialogs_wrap.cpp 29 Apr 2002 22:23:42 -0000 1.34.2.4 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020422-1501 * * 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.12u-20020429-1612 * [...1698 lines suppressed...] *************** *** 9730,9733 **** --- 9823,9829 ---- static VALUE _wrap_new_FX_MessageBox(int argc, VALUE *argv, VALUE self) { + SwigValueWrapper<FXString > p2 ; + SwigValueWrapper<FXString > p3 ; + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXMessageBox); rb_obj_call_init(vresult, argc, argv); *************** *** 9939,9942 **** --- 10035,10041 ---- static VALUE _wrap_new_FXMessageBox(int argc, VALUE *argv, VALUE self) { + SwigValueWrapper<FXString > p2 ; + SwigValueWrapper<FXString > p3 ; + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbMessageBox); rb_obj_call_init(vresult, argc, argv); Index: icons_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v retrieving revision 1.37.2.3 retrieving revision 1.37.2.4 diff -C2 -d -r1.37.2.3 -r1.37.2.4 *** icons_wrap.cpp 25 Apr 2002 16:48:31 -0000 1.37.2.3 --- icons_wrap.cpp 29 Apr 2002 22:23:43 -0000 1.37.2.4 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020422-1501 * * 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.12u-20020429-1612 * * 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.3 retrieving revision 1.39.2.4 diff -C2 -d -r1.39.2.3 -r1.39.2.4 *** image_wrap.cpp 25 Apr 2002 16:48:31 -0000 1.39.2.3 --- image_wrap.cpp 29 Apr 2002 22:23:43 -0000 1.39.2.4 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020422-1501 * * 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.12u-20020429-1612 * * 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.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** layout_wrap.cpp 25 Apr 2002 16:48:31 -0000 1.8.2.3 --- layout_wrap.cpp 29 Apr 2002 22:23:43 -0000 1.8.2.4 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020422-1501 * * 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.12u-20020429-1612 * * This file is not intended to be easily readable and contains a number of *************** *** 2535,2538 **** --- 2535,2540 ---- static VALUE _wrap_new_FX_GroupBox(int argc, VALUE *argv, VALUE self) { + SwigValueWrapper<FXString > p2 ; + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXGroupBox); rb_obj_call_init(vresult, argc, argv); *************** *** 2557,2560 **** --- 2559,2563 ---- FXint arg13 = 4 ; FXGroupBox *result; + SwigValueWrapper<FXString > p2 ; if ((argc < 2) || (argc > 13)) *************** *** 2564,2571 **** if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[1])); }else { ! arg2 = new FXString; } } if (argc > 2) { --- 2567,2575 ---- if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! p2 = FXString(STR2CSTR(argv[1])); }else { ! p2 = FXString::null; } + arg2 = &p2; } if (argc > 2) { *************** *** 2605,2609 **** FXRbRegisterRubyObj(self, result); DATA_PTR(self) = result; - delete arg2; return self; } --- 2609,2612 ---- *************** *** 2614,2617 **** --- 2617,2621 ---- FXGroupBox *arg1 ; FXString *arg2 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1)) *************** *** 2621,2632 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } (arg1)->setText((FXString const &)*arg2); - delete arg2; return Qnil; } --- 2625,2636 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } (arg1)->setText((FXString const &)*arg2); return Qnil; } *************** *** 2745,2748 **** --- 2749,2754 ---- static VALUE _wrap_new_FXGroupBox(int argc, VALUE *argv, VALUE self) { + SwigValueWrapper<FXString > p2 ; + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbGroupBox); rb_obj_call_init(vresult, argc, argv); *************** *** 2767,2770 **** --- 2773,2777 ---- FXint arg13 = 4 ; FXRbGroupBox *result; + SwigValueWrapper<FXString > p2 ; if ((argc < 2) || (argc > 13)) *************** *** 2774,2781 **** if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[1])); }else { ! arg2 = new FXString; } } if (argc > 2) { --- 2781,2789 ---- if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! p2 = FXString(STR2CSTR(argv[1])); }else { ! p2 = FXString::null; } + arg2 = &p2; } if (argc > 2) { *************** *** 2815,2819 **** FXRbRegisterRubyObj(self, result); DATA_PTR(self) = result; - delete arg2; return self; } --- 2823,2826 ---- *************** *** 4176,4179 **** --- 4183,4188 ---- static VALUE _wrap_new_FX_ShutterItem(int argc, VALUE *argv, VALUE self) { + SwigValueWrapper<FXString > p2 ; + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXShutterItem); rb_obj_call_init(vresult, argc, argv); *************** *** 4199,4202 **** --- 4208,4212 ---- FXint arg14 = 4 ; FXShutterItem *result; + SwigValueWrapper<FXString > p2 ; if ((argc < 2) || (argc > 14)) *************** *** 4206,4213 **** if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[1])); }else { ! arg2 = new FXString; } } if (argc > 2) { --- 4216,4224 ---- if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! p2 = FXString(STR2CSTR(argv[1])); }else { ! p2 = FXString::null; } + arg2 = &p2; } if (argc > 2) { *************** *** 4250,4254 **** FXRbRegisterRubyObj(self, result); DATA_PTR(self) = result; - delete arg2; return self; } --- 4261,4264 ---- *************** *** 4291,4294 **** --- 4301,4305 ---- FXShutterItem *arg1 ; FXString *arg2 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1)) *************** *** 4298,4309 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } (arg1)->setHelpText((FXString const &)*arg2); - delete arg2; return Qnil; } --- 4309,4320 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } (arg1)->setHelpText((FXString const &)*arg2); return Qnil; } *************** *** 4330,4333 **** --- 4341,4345 ---- FXShutterItem *arg1 ; FXString *arg2 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1)) *************** *** 4337,4348 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } (arg1)->setTipText((FXString const &)*arg2); - delete arg2; return Qnil; } --- 4349,4360 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } (arg1)->setTipText((FXString const &)*arg2); return Qnil; } *************** *** 4372,4375 **** --- 4384,4389 ---- static VALUE _wrap_new_FXShutterItem(int argc, VALUE *argv, VALUE self) { + SwigValueWrapper<FXString > p2 ; + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbShutterItem); rb_obj_call_init(vresult, argc, argv); *************** *** 4395,4398 **** --- 4409,4413 ---- FXint arg14 = 4 ; FXRbShutterItem *result; + SwigValueWrapper<FXString > p2 ; if ((argc < 2) || (argc > 14)) *************** *** 4402,4409 **** if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[1])); }else { ! arg2 = new FXString; } } if (argc > 2) { --- 4417,4425 ---- if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! p2 = FXString(STR2CSTR(argv[1])); }else { ! p2 = FXString::null; } + arg2 = &p2; } if (argc > 2) { *************** *** 4446,4450 **** FXRbRegisterRubyObj(self, result); DATA_PTR(self) = result; - delete arg2; return self; } --- 4462,4465 ---- Index: mdi_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v retrieving revision 1.36.2.3 retrieving revision 1.36.2.4 diff -C2 -d -r1.36.2.3 -r1.36.2.4 *** mdi_wrap.cpp 25 Apr 2002 16:48:31 -0000 1.36.2.3 --- mdi_wrap.cpp 29 Apr 2002 22:23:43 -0000 1.36.2.4 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020422-1501 * * 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.12u-20020429-1612 * * This file is not intended to be easily readable and contains a number of *************** *** 6247,6250 **** --- 6247,6252 ---- static VALUE _wrap_new_FX_MDIChild(int argc, VALUE *argv, VALUE self) { + SwigValueWrapper<FXString > p2 ; + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXMDIChild); rb_obj_call_init(vresult, argc, argv); *************** *** 6265,6268 **** --- 6267,6271 ---- FXint arg9 = 0 ; FXMDIChild *result; + SwigValueWrapper<FXString > p2 ; if ((argc < 2) || (argc > 9)) *************** *** 6272,6279 **** if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[1])); }else { ! arg2 = new FXString; } } if (argc > 2) { --- 6275,6283 ---- if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! p2 = FXString(STR2CSTR(argv[1])); }else { ! p2 = FXString::null; } + arg2 = &p2; } if (argc > 2) { *************** *** 6301,6305 **** FXRbRegisterRubyObj(self, result); DATA_PTR(self) = result; - delete arg2; return self; } --- 6305,6308 ---- *************** *** 6606,6609 **** --- 6609,6613 ---- FXMDIChild *arg1 ; FXString *arg2 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1)) *************** *** 6613,6624 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } (arg1)->setTitle((FXString const &)*arg2); - delete arg2; return Qnil; } --- 6617,6628 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } (arg1)->setTitle((FXString const &)*arg2); return Qnil; } *************** *** 7025,7028 **** --- 7029,7034 ---- static VALUE _wrap_new_FXMDIChild(int argc, VALUE *argv, VALUE self) { + SwigValueWrapper<FXString > p2 ; + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbMDIChild); rb_obj_call_init(vresult, argc, argv); *************** *** 7043,7046 **** --- 7049,7053 ---- FXint arg9 = 0 ; FXRbMDIChild *result; + SwigValueWrapper<FXString > p2 ; if ((argc < 2) || (argc > 9)) *************** *** 7050,7057 **** if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[1])); }else { ! arg2 = new FXString; } } if (argc > 2) { --- 7057,7065 ---- if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); ! p2 = FXString(STR2CSTR(argv[1])); }else { ! p2 = FXString::null; } + arg2 = &p2; } if (argc > 2) { *************** *** 7079,7083 **** FXRbRegisterRubyObj(self, result); DATA_PTR(self) = result; - delete arg2; return self; } --- 7087,7090 ---- Index: opengl_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v retrieving revision 1.41.2.4 retrieving revision 1.41.2.5 diff -C2 -d -r1.41.2.4 -r1.41.2.5 *** opengl_wrap.cpp 25 Apr 2002 22:29:46 -0000 1.41.2.4 --- opengl_wrap.cpp 29 Apr 2002 22:23:44 -0000 1.41.2.5 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020422-1501 * * 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.12u-20020429-1612 * * This file is not intended to be easily readable and contains a number of *************** *** 8678,8681 **** --- 8678,8682 ---- FXGLViewer *arg1 ; FXString *arg2 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1)) *************** *** 8685,8696 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } (arg1)->setHelpText((FXString const &)*arg2); - delete arg2; return Qnil; } --- 8686,8697 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } (arg1)->setHelpText((FXString const &)*arg2); return Qnil; } *************** *** 8717,8720 **** --- 8718,8722 ---- FXGLViewer *arg1 ; FXString *arg2 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1)) *************** *** 8724,8735 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } (arg1)->setTipText((FXString const &)*arg2); - delete arg2; return Qnil; } --- 8726,8737 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } (arg1)->setTipText((FXString const &)*arg2); return Qnil; } *************** *** 10959,10962 **** --- 10961,10965 ---- FXGLShape *arg1 ; FXString *arg2 ; + SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1)) *************** *** 10966,10977 **** if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! arg2 = new FXString(STR2CSTR(argv[0])); }else { ! arg2 = new FXString; } } (arg1)->setTipText((FXString const &)*arg2); - delete arg2; return Qnil; } --- 10969,10980 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } (arg1)->setTipText((FXString const &)*arg2); return Qnil; } Index: ui_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v retrieving revision 1.9.2.3 retrieving revision 1.9.2.4 diff -C2 -d -r1.9.2.3 -r1.9.2.4 *** ui_wrap.cpp 25 Apr 2002 16:48:32 -0000 1.9.2.3 --- ui_wrap.cpp 29 Apr 2002 22:23:45 -0000 1.9.2.4 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020422-1501 * * 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.12u-20020429-1612 * [...6226 lines suppressed...] } if (argc > 1) { --- 91748,91756 ---- if (argv[0] != Qnil) { Check_Type(argv[0], T_STRING); ! p2 = FXString(STR2CSTR(argv[0])); }else { ! p2 = FXString::null; } + arg2 = &p2; } if (argc > 1) { *************** *** 91519,91523 **** vresult = result ? Qtrue : Qfalse; - delete arg2; return vresult; } --- 91772,91775 ---- |