[Fxruby-commits] CVS: FXRuby/ext/fox image_wrap.cpp,1.39.2.10,1.39.2.11 icons_wrap.cpp,1.37.2.10,1.3
Status: Inactive
Brought to you by:
lyle
From: Lyle J. <ly...@us...> - 2002-05-10 20:12:41
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv3253/ext/fox Modified Files: Tag: release10 image_wrap.cpp icons_wrap.cpp core_wrap.cpp Log Message: Corrected input typemaps for "const void *pix" and "const FXuchar *PIXELS"; these should not in fact accept FXMemoryBuffer instances as inputs. But modified the constructors for FXIcon and FXImage to accept this. Index: image_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v retrieving revision 1.39.2.10 retrieving revision 1.39.2.11 diff -C2 -d -r1.39.2.10 -r1.39.2.11 *** image_wrap.cpp 9 May 2002 20:22:37 -0000 1.39.2.10 --- image_wrap.cpp 10 May 2002 20:12:30 -0000 1.39.2.11 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1438 * * 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-20020510-1423 * * This file is not intended to be easily readable and contains a number of *************** *** 551,561 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 551,556 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 780,790 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 775,780 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 1779,1789 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 1769,1774 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 1835,1845 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 1820,1825 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 2135,2145 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 2115,2120 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 2191,2201 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 2166,2171 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 2491,2501 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 2461,2466 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 2547,2557 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 2512,2517 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 2847,2857 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 2807,2812 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 2934,2944 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 2889,2894 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 3276,3286 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 3226,3231 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 3332,3342 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 3277,3282 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 3632,3642 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 3572,3577 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 3718,3728 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 3653,3658 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 4018,4028 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 3948,3953 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 4074,4084 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 3999,4004 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 4382,4392 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 4302,4307 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 4426,4436 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 4341,4346 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 4482,4492 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 4392,4397 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 4790,4800 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 4695,4700 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 4834,4844 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 4734,4739 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 4951,4961 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 4846,4851 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 5260,5270 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 5150,5155 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; Index: icons_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v retrieving revision 1.37.2.10 retrieving revision 1.37.2.11 diff -C2 -d -r1.37.2.10 -r1.37.2.11 *** icons_wrap.cpp 9 May 2002 20:22:37 -0000 1.37.2.10 --- icons_wrap.cpp 10 May 2002 20:12:30 -0000 1.37.2.11 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1438 * * 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-20020510-1423 * * This file is not intended to be easily readable and contains a number of *************** *** 997,1007 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 997,1002 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 1057,1067 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 1052,1057 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 1368,1378 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 1358,1363 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 1413,1423 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 1398,1403 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 1473,1483 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 1453,1458 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 1777,1787 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 1752,1757 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 1837,1847 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 1807,1812 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 2148,2158 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 2113,2118 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 2193,2203 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 2153,2158 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 2284,2294 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 2239,2244 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 2588,2598 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 2538,2543 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 2648,2658 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 2593,2598 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 2959,2969 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 2899,2904 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 3004,3014 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 2939,2944 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 3094,3104 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 3024,3029 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 3405,3415 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 3330,3335 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 3450,3460 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 3370,3375 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 3510,3520 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 3425,3430 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 3814,3824 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 3724,3729 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 3874,3884 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 3779,3784 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 4178,4188 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 4078,4083 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 4269,4279 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 4164,4169 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 4942,4952 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 4832,4837 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; Index: core_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v retrieving revision 1.62.2.11 retrieving revision 1.62.2.12 diff -C2 -d -r1.62.2.11 -r1.62.2.12 *** core_wrap.cpp 9 May 2002 20:22:28 -0000 1.62.2.11 --- core_wrap.cpp 10 May 2002 20:12:31 -0000 1.62.2.12 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1438 * * 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-20020510-1423 * * This file is not intended to be easily readable and contains a number of *************** *** 8632,8642 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 8632,8637 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 8674,8684 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 8669,8674 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 8867,8877 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 8857,8862 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 8913,8923 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 8898,8903 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; *************** *** 9090,9100 **** { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; --- 9070,9075 ---- { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); }else { arg2 = NULL; |