fxruby 1.6.13 → 1.6.14

data/ext/fox16/fx3d_wrap.cpp

@@ -592,7 +592,7 @@ inline FXColor to_FXColor(VALUE obj){
 inline FXString to_FXString(VALUE obj){
   if(!NIL_P(obj)){
     Check_Type(obj,T_STRING);
-    return FXString(STR2CSTR(obj));
+    return FXString(StringValuePtr(obj));
     }
   else{
     return FXString::null;

data/ext/fox16/iconlist_wrap.cpp

@@ -567,7 +567,7 @@ inline FXColor to_FXColor(VALUE obj){
 inline FXString to_FXString(VALUE obj){
   if(!NIL_P(obj)){
     Check_Type(obj,T_STRING);
-    return FXString(STR2CSTR(obj));
+    return FXString(StringValuePtr(obj));
     }
   else{
     return FXString::null;
@@ -1243,9 +1243,9 @@ static VALUE _wrap_FXIconList_setHeaders(int argc, VALUE *argv, VALUE self) { FX
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXIconList, 1); { arg2 = NULL; if(!NIL_P(argv[0])){
             Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY(argv[0])->len)+1) {
-                for (long i = 0; i < RARRAY(argv[0])->len; i++) { arg2[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[0], i)); } 
-                arg2[RARRAY(argv[0])->len] = 0; }  }  }  if (argc > 1) { arg3 = NUM2INT(argv[1]); } 
-    (arg1)->setHeaders((FXchar const **)arg2,arg3); FXFREE(&arg2); return Qnil; }
+                for (long i = 0; i < RARRAY(argv[0])->len; i++) { VALUE e = rb_ary_entry(argv[0], i);
+                    arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY(argv[0])->len] = 0; }  }  }  if (argc > 1) {
+        arg3 = NUM2INT(argv[1]); }  (arg1)->setHeaders((FXchar const **)arg2,arg3); FXFREE(&arg2); return Qnil; }
 static VALUE _wrap_FXIconList_appendHeader(int argc, VALUE *argv, VALUE self) { FXIconList *arg1 = (FXIconList *) 0 ;
     FXString *arg2 = 0 ; FXIcon *arg3 = (FXIcon *) 0 ; FXint arg4 = (FXint) 1 ; SwigValueWrapper<FXString > p2 ;
     if ((argc < 1) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
@@ -1355,8 +1355,8 @@ static VALUE _wrap_FXIconList_fillItems(int argc, VALUE *argv, VALUE self) { FXI
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXIconList, 1); { arg2 = NULL; if(!NIL_P(argv[0])){
             Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY(argv[0])->len)+1) {
-                for (long i = 0; i < RARRAY(argv[0])->len; i++) { arg2[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[0], i)); } 
-                arg2[RARRAY(argv[0])->len] = 0; }  }  }  if (argc > 1) {
+                for (long i = 0; i < RARRAY(argv[0])->len; i++) { VALUE e = rb_ary_entry(argv[0], i);
+                    arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY(argv[0])->len] = 0; }  }  }  if (argc > 1) {
         SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXIcon, 1); }  if (argc > 2) {
         SWIG_ConvertPtr(argv[2], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); }  if (argc > 3) {
         arg5 = (argv[3] == Qnil) ? NULL : (void *) argv[3]; }  if (argc > 4) { arg6 = to_FXbool(argv[4]); } 
@@ -2250,14 +2250,14 @@ static VALUE _wrap_FXFileList_onCmdSetValue(int argc, VALUE *argv, VALUE self) {
     if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileList, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
-    arg4 = static_cast<void*>(STR2CSTR(argv[2])); result = (long)(arg1)->onCmdSetValue(arg2,arg3,arg4);
+    arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdSetValue(arg2,arg3,arg4);
     vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXFileList_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) { FXFileList *arg1 = (FXFileList *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; FXString value4 ;
     VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileList, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
-        value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; } 
+        value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; } 
     result = (long)(arg1)->onCmdGetStringValue(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXFileList_onCmdSetStringValue(int argc, VALUE *argv, VALUE self) { FXFileList *arg1 = (FXFileList *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
@@ -2378,7 +2378,7 @@ static VALUE _wrap_FXFileList_onCmdSetPattern(int argc, VALUE *argv, VALUE self)
     if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileList, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
-    arg4 = static_cast<void*>(STR2CSTR(argv[2])); result = (long)(arg1)->onCmdSetPattern(arg2,arg3,arg4);
+    arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdSetPattern(arg2,arg3,arg4);
     vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXFileList_onUpdSetPattern(int argc, VALUE *argv, VALUE self) { FXFileList *arg1 = (FXFileList *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
@@ -2391,7 +2391,7 @@ static VALUE _wrap_FXFileList_onCmdSetDirectory(int argc, VALUE *argv, VALUE sel
     if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileList, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
-    arg4 = static_cast<void*>(STR2CSTR(argv[2])); result = (long)(arg1)->onCmdSetDirectory(arg2,arg3,arg4);
+    arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdSetDirectory(arg2,arg3,arg4);
     vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXFileList_onUpdSetDirectory(int argc, VALUE *argv, VALUE self) { FXFileList *arg1 = (FXFileList *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;

data/ext/fox16/icons_wrap.cpp

@@ -572,7 +572,7 @@ inline FXColor to_FXColor(VALUE obj){
 inline FXString to_FXString(VALUE obj){
   if(!NIL_P(obj)){
     Check_Type(obj,T_STRING);
-    return FXString(STR2CSTR(obj));
+    return FXString(StringValuePtr(obj));
     }
   else{
     return FXString::null;
@@ -1363,8 +1363,8 @@ static VALUE _wrap_new_FXBMPIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg
     FXColor arg3 = (FXColor) 0 ; FXuint arg4 = (FXuint) 0 ; FXint arg5 = (FXint) 1 ; FXint arg6 = (FXint) 1 ; FXBMPIcon *result;
     if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  if (argc > 5) { arg6 = NUM2INT(argv[5]); }  {
         result = (FXBMPIcon *)new_FXBMPIcon(arg1,(void const *)arg2,arg3,arg4,arg5,arg6);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
@@ -1505,8 +1505,8 @@ static VALUE _wrap_new_FXGIFIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg
     FXColor arg3 = (FXColor) 0 ; FXuint arg4 = (FXuint) 0 ; FXint arg5 = (FXint) 1 ; FXint arg6 = (FXint) 1 ; FXGIFIcon *result;
     if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  if (argc > 5) { arg6 = NUM2INT(argv[5]); }  {
         result = (FXGIFIcon *)new_FXGIFIcon(arg1,(void const *)arg2,arg3,arg4,arg5,arg6);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
@@ -1630,8 +1630,8 @@ static VALUE _wrap_new_FXICOIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg
     FXColor arg3 = (FXColor) 0 ; FXuint arg4 = (FXuint) 0 ; FXint arg5 = (FXint) 1 ; FXint arg6 = (FXint) 1 ; FXICOIcon *result;
     if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  if (argc > 5) { arg6 = NUM2INT(argv[5]); }  {
         result = (FXICOIcon *)new_FXICOIcon(arg1,(void const *)arg2,arg3,arg4,arg5,arg6);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
@@ -1776,8 +1776,8 @@ static VALUE _wrap_new_FXJPGIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg
     FXint arg7 = (FXint) 75 ; FXJPGIcon *result; if ((argc < 1) || (argc > 7))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  if (argc > 5) { arg6 = NUM2INT(argv[5]); }  if (argc > 6) { arg7 = NUM2INT(argv[6]); }  {
         result = (FXJPGIcon *)new_FXJPGIcon(arg1,(void const *)arg2,arg3,arg4,arg5,arg6,arg7);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
@@ -1926,8 +1926,8 @@ static VALUE _wrap_new_FXPCXIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg
     FXColor arg3 = (FXColor) 0 ; FXuint arg4 = (FXuint) 0 ; FXint arg5 = (FXint) 1 ; FXint arg6 = (FXint) 1 ; FXPCXIcon *result;
     if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  if (argc > 5) { arg6 = NUM2INT(argv[5]); }  {
         result = (FXPCXIcon *)new_FXPCXIcon(arg1,(void const *)arg2,arg3,arg4,arg5,arg6);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
@@ -2071,8 +2071,8 @@ static VALUE _wrap_new_FXPNGIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg
     FXColor arg3 = (FXColor) 0 ; FXuint arg4 = (FXuint) 0 ; FXint arg5 = (FXint) 1 ; FXint arg6 = (FXint) 1 ; FXPNGIcon *result;
     if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  if (argc > 5) { arg6 = NUM2INT(argv[5]); }  {
         result = (FXPNGIcon *)new_FXPNGIcon(arg1,(void const *)arg2,arg3,arg4,arg5,arg6);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
@@ -2213,8 +2213,8 @@ static VALUE _wrap_new_FXPPMIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg
     FXColor arg3 = (FXColor) FXRGB(192,192,192) ; FXuint arg4 = (FXuint) 0 ; FXint arg5 = (FXint) 1 ; FXint arg6 = (FXint) 1 ;
     FXPPMIcon *result; if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  if (argc > 5) { arg6 = NUM2INT(argv[5]); }  {
         result = (FXPPMIcon *)new_FXPPMIcon(arg1,(void const *)arg2,arg3,arg4,arg5,arg6);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
@@ -2355,8 +2355,8 @@ static VALUE _wrap_new_FXRGBIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg
     FXColor arg3 = (FXColor) 0 ; FXuint arg4 = (FXuint) 0 ; FXint arg5 = (FXint) 1 ; FXint arg6 = (FXint) 1 ; FXRGBIcon *result;
     if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  if (argc > 5) { arg6 = NUM2INT(argv[5]); }  {
         result = (FXRGBIcon *)new_FXRGBIcon(arg1,(void const *)arg2,arg3,arg4,arg5,arg6);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
@@ -2497,8 +2497,8 @@ static VALUE _wrap_new_FXTGAIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg
     FXColor arg3 = (FXColor) 0 ; FXuint arg4 = (FXuint) 0 ; FXint arg5 = (FXint) 1 ; FXint arg6 = (FXint) 1 ; FXTGAIcon *result;
     if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  if (argc > 5) { arg6 = NUM2INT(argv[5]); }  {
         result = (FXTGAIcon *)new_FXTGAIcon(arg1,(void const *)arg2,arg3,arg4,arg5,arg6);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
@@ -2642,8 +2642,8 @@ static VALUE _wrap_new_FXTIFIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg
     FXColor arg3 = (FXColor) 0 ; FXuint arg4 = (FXuint) 0 ; FXint arg5 = (FXint) 1 ; FXint arg6 = (FXint) 1 ; FXTIFIcon *result;
     if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  if (argc > 5) { arg6 = NUM2INT(argv[5]); }  {
         result = (FXTIFIcon *)new_FXTIFIcon(arg1,(void const *)arg2,arg3,arg4,arg5,arg6);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
@@ -2908,10 +2908,10 @@ static VALUE _wrap_new_FXXPMIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { arg2 = NULL; if (argv[1] != Qnil) {
                 Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY(argv[1])->len)) {
-                    for (long i = 0; i < RARRAY(argv[1])->len; i++) { arg2[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[1], i)); }
-                     }  }  }  }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); } 
-    if (argc > 4) { arg5 = NUM2INT(argv[4]); }  if (argc > 5) { arg6 = NUM2INT(argv[5]); }  {
-        result = (FXXPMIcon *)new_FXXPMIcon(arg1,(FXchar const **)arg2,arg3,arg4,arg5,arg6);
+                    for (long i = 0; i < RARRAY(argv[1])->len; i++) { VALUE e = rb_ary_entry(argv[1], i);
+                        arg2[i] = (FXchar *) StringValuePtr(e); }  }  }  }  }  if (argc > 2) { arg3 = to_FXColor(argv[2]); } 
+    if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) { arg5 = NUM2INT(argv[4]); }  if (argc > 5) {
+        arg6 = NUM2INT(argv[5]); }  { result = (FXXPMIcon *)new_FXXPMIcon(arg1,(FXchar const **)arg2,arg3,arg4,arg5,arg6);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  FXFREE(&arg2);
     return self; }
 static void

data/ext/fox16/image_wrap.cpp

@@ -572,7 +572,7 @@ inline FXColor to_FXColor(VALUE obj){
 inline FXString to_FXString(VALUE obj){
   if(!NIL_P(obj)){
     Check_Type(obj,T_STRING);
-    return FXString(STR2CSTR(obj));
+    return FXString(StringValuePtr(obj));
     }
   else{
     return FXString::null;
@@ -950,8 +950,8 @@ static VALUE _wrap_new_FXBitmap(int argc, VALUE *argv, VALUE self) { FXApp *arg1
     FXuint arg3 = (FXuint) 0 ; FXint arg4 = (FXint) 1 ; FXint arg5 = (FXint) 1 ; FXBitmap *result; if ((argc < 1) || (argc > 5))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  { result = (FXBitmap *)new_FXBitmap(arg1,(void const *)arg2,arg3,arg4,arg5);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static VALUE _wrap_FXBitmap_getData(int argc, VALUE *argv, VALUE self) { FXBitmap *arg1 = (FXBitmap *) 0 ; FXuchar *result;
@@ -1306,8 +1306,8 @@ static VALUE _wrap_new_FXBMPImage(int argc, VALUE *argv, VALUE self) { FXApp *ar
     FXuint arg3 = (FXuint) 0 ; FXint arg4 = (FXint) 1 ; FXint arg5 = (FXint) 1 ; FXBMPImage *result;
     if ((argc < 1) || (argc > 5)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  { result = (FXBMPImage *)new_FXBMPImage(arg1,(void const *)arg2,arg3,arg4,arg5);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static void
@@ -1430,8 +1430,8 @@ static VALUE _wrap_new_FXGIFImage(int argc, VALUE *argv, VALUE self) { FXApp *ar
     FXuint arg3 = (FXuint) 0 ; FXint arg4 = (FXint) 1 ; FXint arg5 = (FXint) 1 ; FXGIFImage *result;
     if ((argc < 1) || (argc > 5)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  { result = (FXGIFImage *)new_FXGIFImage(arg1,(void const *)arg2,arg3,arg4,arg5);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static void
@@ -1554,8 +1554,8 @@ static VALUE _wrap_new_FXICOImage(int argc, VALUE *argv, VALUE self) { FXApp *ar
     FXuint arg3 = (FXuint) 0 ; FXint arg4 = (FXint) 1 ; FXint arg5 = (FXint) 1 ; FXICOImage *result;
     if ((argc < 1) || (argc > 5)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  { result = (FXICOImage *)new_FXICOImage(arg1,(void const *)arg2,arg3,arg4,arg5);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static void
@@ -1681,8 +1681,8 @@ static VALUE _wrap_new_FXJPGImage(int argc, VALUE *argv, VALUE self) { FXApp *ar
     FXuint arg3 = (FXuint) 0 ; FXint arg4 = (FXint) 1 ; FXint arg5 = (FXint) 1 ; FXint arg6 = (FXint) 75 ; FXJPGImage *result;
     if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  if (argc > 5) { arg6 = NUM2INT(argv[5]); }  {
         result = (FXJPGImage *)new_FXJPGImage(arg1,(void const *)arg2,arg3,arg4,arg5,arg6);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
@@ -1815,8 +1815,8 @@ static VALUE _wrap_new_FXPCXImage(int argc, VALUE *argv, VALUE self) { FXApp *ar
     FXuint arg3 = (FXuint) 0 ; FXint arg4 = (FXint) 1 ; FXint arg5 = (FXint) 1 ; FXPCXImage *result;
     if ((argc < 1) || (argc > 5)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  { result = (FXPCXImage *)new_FXPCXImage(arg1,(void const *)arg2,arg3,arg4,arg5);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static void
@@ -1942,8 +1942,8 @@ static VALUE _wrap_new_FXPNGImage(int argc, VALUE *argv, VALUE self) { FXApp *ar
     FXuint arg3 = (FXuint) 0 ; FXint arg4 = (FXint) 1 ; FXint arg5 = (FXint) 1 ; FXPNGImage *result;
     if ((argc < 1) || (argc > 5)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  { result = (FXPNGImage *)new_FXPNGImage(arg1,(void const *)arg2,arg3,arg4,arg5);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static void
@@ -2066,8 +2066,8 @@ static VALUE _wrap_new_FXPPMImage(int argc, VALUE *argv, VALUE self) { FXApp *ar
     FXuint arg3 = (FXuint) 0 ; FXint arg4 = (FXint) 1 ; FXint arg5 = (FXint) 1 ; FXPPMImage *result;
     if ((argc < 1) || (argc > 5)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  { result = (FXPPMImage *)new_FXPPMImage(arg1,(void const *)arg2,arg3,arg4,arg5);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static void
@@ -2190,8 +2190,8 @@ static VALUE _wrap_new_FXRGBImage(int argc, VALUE *argv, VALUE self) { FXApp *ar
     FXuint arg3 = (FXuint) 0 ; FXint arg4 = (FXint) 1 ; FXint arg5 = (FXint) 1 ; FXRGBImage *result;
     if ((argc < 1) || (argc > 5)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  { result = (FXRGBImage *)new_FXRGBImage(arg1,(void const *)arg2,arg3,arg4,arg5);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static void
@@ -2314,8 +2314,8 @@ static VALUE _wrap_new_FXTGAImage(int argc, VALUE *argv, VALUE self) { FXApp *ar
     FXuint arg3 = (FXuint) 0 ; FXint arg4 = (FXint) 1 ; FXint arg5 = (FXint) 1 ; FXTGAImage *result;
     if ((argc < 1) || (argc > 5)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  { result = (FXTGAImage *)new_FXTGAImage(arg1,(void const *)arg2,arg3,arg4,arg5);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static void
@@ -2441,8 +2441,8 @@ static VALUE _wrap_new_FXTIFImage(int argc, VALUE *argv, VALUE self) { FXApp *ar
     FXuint arg3 = (FXuint) 0 ; FXint arg4 = (FXint) 1 ; FXint arg5 = (FXint) 1 ; FXTIFImage *result;
     if ((argc < 1) || (argc > 5)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }
-             }  }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
+                Check_Type(argv[1], T_STRING); arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }
+         }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
         arg5 = NUM2INT(argv[4]); }  { result = (FXTIFImage *)new_FXTIFImage(arg1,(void const *)arg2,arg3,arg4,arg5);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static VALUE _wrap_FXTIFImage_setCodec(int argc, VALUE *argv, VALUE self) { FXTIFImage *arg1 = (FXTIFImage *) 0 ; FXuint arg2 ;
@@ -2758,9 +2758,9 @@ static VALUE _wrap_new_FXXPMImage(int argc, VALUE *argv, VALUE self) { FXApp *ar
     FXXPMImage *result; if ((argc < 1) || (argc > 5)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { arg2 = NULL; if (argv[1] != Qnil) {
                 Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY(argv[1])->len)) {
-                    for (long i = 0; i < RARRAY(argv[1])->len; i++) { arg2[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[1], i)); }
-                     }  }  }  }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); } 
-    if (argc > 4) { arg5 = NUM2INT(argv[4]); }  {
+                    for (long i = 0; i < RARRAY(argv[1])->len; i++) { VALUE e = rb_ary_entry(argv[1], i);
+                        arg2[i] = (FXchar *) StringValuePtr(e); }  }  }  }  }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); } 
+    if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) { arg5 = NUM2INT(argv[4]); }  {
         result = (FXXPMImage *)new_FXXPMImage(arg1,(FXchar const **)arg2,arg3,arg4,arg5);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  FXFREE(&arg2);
     return self; }

data/ext/fox16/include/FXRbApp.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbApp.h 2335 2006-01-28 02:33:03Z lyle $
+ * $Id: FXRbApp.h 2714 2007-11-14 16:31:15Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBAPP_H
@@ -45,7 +45,8 @@ static void cls ## _init(cls* self,VALUE ary,bool connect){ \
   if(FXMALLOC(&argv,char*,argc+1)){ \
     argv[0]="foo"; \
     for(i=1;i<argc;i++){ \
-      argv[i]=STR2CSTR(RSTRING(rb_ary_entry(ary,i-1))); \
+      VALUE e=rb_ary_entry(ary,i-1); \
+      argv[i]=StringValuePtr(e); \
       } \
     argv[argc]=0; \
     self->cls::init(argc,argv,connect); \
@@ -99,7 +100,8 @@ inline void cls ## _exit(cls *self,FXint code){ \
     FXRbCallVoidMethod(this,rb_intern("init"),ary,connect); \
     argc=RARRAY(ary)->len+1; \
     for(i=1; i<argc; i++){ \
-      argv[i]=STR2CSTR(rb_ary_entry(ary,i-1)); \
+      VALUE e=rb_ary_entry(ary,i-1); \
+      argv[i]=StringValuePtr(e); \
       } \
     } \
   void cls::exit(FXint code){ \

data/ext/fox16/include/FXRbDC.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbDC.h 2372 2006-04-20 00:38:08Z lyle $
+ * $Id: FXRbDC.h 2823 2008-03-28 02:04:22Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBDC_H

data/ext/fox16/label_wrap.cpp

@@ -573,7 +573,7 @@ inline FXColor to_FXColor(VALUE obj){
 inline FXString to_FXString(VALUE obj){
   if(!NIL_P(obj)){
     Check_Type(obj,T_STRING);
-    return FXString(STR2CSTR(obj));
+    return FXString(StringValuePtr(obj));
     }
   else{
     return FXString::null;
@@ -807,7 +807,7 @@ static VALUE _wrap_FXLabel_onCmdSetStringValue(int argc, VALUE *argv, VALUE self
     VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXLabel, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
-        value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; } 
+        value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; } 
     result = (long)(arg1)->onCmdSetStringValue(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXLabel_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
@@ -833,8 +833,8 @@ static VALUE _wrap_FXLabel_onCmdSetHelp(int argc, VALUE *argv, VALUE self) { FXL
     VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXLabel, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
-        value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; }  result = (long)(arg1)->onCmdSetHelp(arg2,arg3,arg4);
-    vresult = INT2NUM(result); return vresult; }
+        value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; } 
+    result = (long)(arg1)->onCmdSetHelp(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXLabel_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
     if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
@@ -846,8 +846,8 @@ static VALUE _wrap_FXLabel_onCmdSetTip(int argc, VALUE *argv, VALUE self) { FXLa
     VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXLabel, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
-        value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; }  result = (long)(arg1)->onCmdSetTip(arg2,arg3,arg4);
-    vresult = INT2NUM(result); return vresult; }
+        value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; } 
+    result = (long)(arg1)->onCmdSetTip(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXLabel_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
     if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);

data/ext/fox16/layout_wrap.cpp

@@ -579,7 +579,7 @@ inline FXColor to_FXColor(VALUE obj){
 inline FXString to_FXString(VALUE obj){
   if(!NIL_P(obj)){
     Check_Type(obj,T_STRING);
-    return FXString(STR2CSTR(obj));
+    return FXString(StringValuePtr(obj));
     }
   else{
     return FXString::null;

data/ext/fox16/list_wrap.cpp

@@ -565,7 +565,7 @@ inline FXColor to_FXColor(VALUE obj){
 inline FXString to_FXString(VALUE obj){
   if(!NIL_P(obj)){
     Check_Type(obj,T_STRING);
-    return FXString(STR2CSTR(obj));
+    return FXString(StringValuePtr(obj));
     }
   else{
     return FXString::null;
@@ -1127,8 +1127,8 @@ static VALUE _wrap_FXList_fillItems(int argc, VALUE *argv, VALUE self) { FXList
     FXint result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 4))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXList, 1);
     { arg2 = NULL; if(!NIL_P(argv[0])){ Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY(argv[0])->len)+1) {
-                for (long i = 0; i < RARRAY(argv[0])->len; i++) { arg2[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[0], i)); } 
-                arg2[RARRAY(argv[0])->len] = 0; }  }  }  if (argc > 1) {
+                for (long i = 0; i < RARRAY(argv[0])->len; i++) { VALUE e = rb_ary_entry(argv[0], i);
+                    arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY(argv[0])->len] = 0; }  }  }  if (argc > 1) {
         SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXIcon, 1); }  if (argc > 2) {
         SWIG_ConvertPtr(argv[2], (void **) &arg4, 0, 1); }  if (argc > 3) { arg5 = to_FXbool(argv[3]); } 
     result = (FXint)(arg1)->fillItems((FXchar const **)arg2,arg3,arg4,arg5); vresult = INT2NUM(result); FXFREE(&arg2);
@@ -1806,10 +1806,10 @@ static VALUE _wrap_FXColorList_fillItems(int argc, VALUE *argv, VALUE self) { FX
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorList, 1); { arg2 = NULL; if(!NIL_P(argv[0])){
             Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY(argv[0])->len)+1) {
-                for (long i = 0; i < RARRAY(argv[0])->len; i++) { arg2[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[0], i)); } 
-                arg2[RARRAY(argv[0])->len] = 0; }  }  }  if (argc > 1) { { arg3 = NULL; if(!NIL_P(argv[1])){
-                Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXColor, RARRAY(argv[1])->len)+1) {
-                    for (long i = 0; i < RARRAY(argv[1])->len; i++) {
+                for (long i = 0; i < RARRAY(argv[0])->len; i++) { VALUE e = rb_ary_entry(argv[0], i);
+                    arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY(argv[0])->len] = 0; }  }  }  if (argc > 1) { {
+            arg3 = NULL; if(!NIL_P(argv[1])){ Check_Type(argv[1], T_ARRAY);
+                if (FXMALLOC(&arg3, FXColor, RARRAY(argv[1])->len)+1) { for (long i = 0; i < RARRAY(argv[1])->len; i++) {
                         arg3[i] = static_cast<FXColor>(NUM2ULONG(rb_ary_entry(argv[1], i))); }  arg3[RARRAY(argv[1])->len] = 0; }
                  }  }  }  if (argc > 2) { arg4 = (argv[2] == Qnil) ? NULL : (void *) argv[2]; }  if (argc > 3) {
         arg5 = to_FXbool(argv[3]); }  result = (FXint)(arg1)->fillItems((FXchar const **)arg2,arg3,arg4,arg5);