[Fxruby-commits] CVS: FXRuby/ext/fox core_wrap.cpp,1.62.2.10,1.62.2.11 icons_wrap.cpp,1.37.2.9,1.37.
Status: Inactive
Brought to you by:
lyle
Menu
▾
▴
[Fxruby-commits] CVS: FXRuby/ext/fox core_wrap.cpp,1.62.2.10,1.62.2.11 icons_wrap.cpp,1.37.2.9,1.37.2.10 image_wrap.cpp,1.39.2.9,1.39.2.10
|
From: Lyle J. <ly...@us...> - 2002-05-09 20:22:41
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv14569/ext/fox
Modified Files:
Tag: release10
core_wrap.cpp icons_wrap.cpp image_wrap.cpp
Log Message:
Modified the input typemaps for "const void *pix" and "const FXuchar*
PIXELS" so that the constructors for icons and images can accept either
strings (as before) or MemoryBuffer instances (see SF Bug #550996).
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62.2.10
retrieving revision 1.62.2.11
diff -C2 -d -r1.62.2.10 -r1.62.2.11
*** core_wrap.cpp 8 May 2002 21:43:41 -0000 1.62.2.10
--- core_wrap.cpp 9 May 2002 20:22:28 -0000 1.62.2.11
***************
*** 8632,8637 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (void*) RSTRING(argv[1])->ptr;
}else {
arg2 = NULL;
--- 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;
***************
*** 8669,8674 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 8857,8862 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 8898,8903 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 9070,9075 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (FXuchar *) 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;
Index: icons_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v
retrieving revision 1.37.2.9
retrieving revision 1.37.2.10
diff -C2 -d -r1.37.2.9 -r1.37.2.10
*** icons_wrap.cpp 8 May 2002 21:32:14 -0000 1.37.2.9
--- icons_wrap.cpp 9 May 2002 20:22:37 -0000 1.37.2.10
***************
*** 533,538 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (void*) RSTRING(argv[1])->ptr;
}else {
arg2 = NULL;
--- 533,543 ----
{
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;
***************
*** 688,693 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (void*) RSTRING(argv[1])->ptr;
}else {
arg2 = NULL;
--- 693,703 ----
{
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;
***************
*** 987,992 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (void*) RSTRING(argv[1])->ptr;
}else {
arg2 = NULL;
--- 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;
***************
*** 1042,1047 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 1348,1353 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (FXuchar *) 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;
***************
*** 1388,1393 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (void*) 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;
***************
*** 1443,1448 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 1742,1747 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 1797,1802 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 2103,2108 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (FXuchar *) 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;
***************
*** 2143,2148 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (void*) 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;
***************
*** 2229,2234 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 2528,2533 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 2583,2588 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 2889,2894 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (FXuchar *) 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;
***************
*** 2929,2934 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (void*) 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;
***************
*** 3014,3019 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 3320,3325 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (FXuchar *) 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;
***************
*** 3360,3365 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (void*) 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;
***************
*** 3415,3420 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 3714,3719 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 3769,3774 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 4068,4073 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 4154,4159 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 4822,4827 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (FXuchar *) 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;
Index: image_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v
retrieving revision 1.39.2.9
retrieving revision 1.39.2.10
diff -C2 -d -r1.39.2.9 -r1.39.2.10
*** image_wrap.cpp 8 May 2002 21:32:14 -0000 1.39.2.9
--- image_wrap.cpp 9 May 2002 20:22:37 -0000 1.39.2.10
***************
*** 551,556 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (void*) RSTRING(argv[1])->ptr;
}else {
arg2 = NULL;
--- 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;
***************
*** 775,780 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 1089,1094 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (void*) RSTRING(argv[1])->ptr;
}else {
arg2 = NULL;
--- 1099,1109 ----
{
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;
***************
*** 1464,1469 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (void*) RSTRING(argv[1])->ptr;
}else {
arg2 = NULL;
--- 1479,1489 ----
{
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;
***************
*** 1759,1764 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 1810,1815 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 2105,2110 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 2156,2161 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 2451,2456 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 2502,2507 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 2797,2802 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 2879,2884 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 3216,3221 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 3267,3272 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 3562,3567 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 3643,3648 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 3938,3943 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 3989,3994 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 4292,4297 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (FXuchar *) 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;
***************
*** 4331,4336 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (void*) 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;
***************
*** 4382,4387 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 4685,4690 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (FXuchar *) 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;
***************
*** 4724,4729 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (void*) 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;
***************
*** 4836,4841 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (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;
***************
*** 5140,5145 ****
{
if (argv[1] != Qnil) {
! Check_Type(argv[1], T_STRING);
! arg2 = (FXuchar *) 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;
|
