fxruby 1.6.13 → 1.6.14

data/ext/fox16/core_wrap.cpp

@@ -609,7 +609,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;
@@ -760,8 +760,8 @@ bool FXMemoryStream_open(FXMemoryStream *self,FXStreamDirection save_or_load,VAL
       FXuval size=0;
       FXuchar *data=0;
       if(!NIL_P(str)){
-        size=RSTRING(str)->len;
-        data=reinterpret_cast<FXuchar*>(STR2CSTR(str));
+        size=RSTRING_LEN(str);
+        data=reinterpret_cast<FXuchar*>(StringValuePtr(str));
         return self->open(save_or_load,size,data);
         }
       else{
@@ -779,7 +779,7 @@ VALUE FXMemoryStream_takeBuffer(FXMemoryStream *self){
 void FXMemoryStream_giveBuffer(FXMemoryStream *self,VALUE str){
       Check_Type(str,T_STRING);
       FXuchar* buffer=reinterpret_cast<FXuchar*>(StringValuePtr(str));
-      FXuval sp=RSTRING(str)->len;
+      FXuval sp=RSTRING_LEN(str);
       self->giveBuffer(buffer,sp);
       }
 
@@ -952,7 +952,7 @@ void FXApp_addSignal(FXApp *self,VALUE sigObj,FXObject *tgt,FXSelector sel,FXboo
       FXint sig;
       switch(TYPE(sigObj)){
         case T_STRING:
-          s=STR2CSTR(sigObj);
+          s=StringValuePtr(sigObj);
           sig=FXRbSignalNameToNumber(s);
           if(sig==0) rb_raise(rb_eArgError,"unrecognized signal name `%s'",s);
           break;
@@ -970,7 +970,7 @@ void FXApp_removeSignal(FXApp *self,VALUE sigObj){
       FXint sig;
       switch(TYPE(sigObj)){
         case T_STRING:
-          s=STR2CSTR(sigObj);
+          s=StringValuePtr(sigObj);
           sig=FXRbSignalNameToNumber(s);
           if(sig==0) rb_raise(rb_eArgError,"unrecognized signal name `%s'",s);
           break;
@@ -1405,8 +1405,8 @@ VALUE FXFont_listFonts(FXString const &face,FXuint wt,FXuint sl,FXuint sw,FXuint
     }
 FXbool FXFont_hasChar(FXFont const *self,VALUE ch){
       if(TYPE(ch)==T_STRING){
-        if(RSTRING(ch)->len==1){
-          return self->hasChar(*(STR2CSTR(ch))); // FIXME: hasChar() expects an FXwchar
+        if(RSTRING_LEN(ch)==1){
+          return self->hasChar(*(StringValuePtr(ch))); // FIXME: hasChar() expects an FXwchar
 	  }
 	else{
 	  rb_raise(rb_eArgError,"expected a string of length one");
@@ -1526,9 +1526,9 @@ VALUE FXWindow_inquireDNDTypes(FXWindow const *self,FXDNDOrigin origin){
 void FXWindow_setDNDData(FXWindow const *self,FXDNDOrigin origin,FXDragType type,VALUE str){
       Check_Type(str, T_STRING);
       FXuchar* data;
-      FXuint size = RSTRING(str)->len;
+      FXuint size = RSTRING_LEN(str);
       if (FXMALLOC(&data, FXuchar, size)) {
-        memcpy((void *) data, (void *) RSTRING(str)->ptr, size);
+        memcpy((void *) data, (void *) RSTRING_PTR(str), size);
         self->setDNDData(origin, type, data, size);
       } else {
         rb_raise(rb_eNoMemError, "couldn't copy drag-and-drop data");
@@ -1971,7 +1971,7 @@ static VALUE _wrap_FXStream_open(int argc, VALUE *argv, VALUE self) { FXStream *
     if ((argc < 1) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); arg2 = (int) NUM2INT(argv[0]); if (argc > 1) {
         arg3 = NUM2ULONG(argv[1]); }  if (argc > 2) {
-        arg4 = NIL_P(argv[2]) ? 0 : reinterpret_cast<FXuchar*>(STR2CSTR(argv[2])); } 
+        arg4 = NIL_P(argv[2]) ? 0 : reinterpret_cast<FXuchar*>(StringValuePtr(argv[2])); } 
     result = (bool)(arg1)->open((FXStreamDirection )arg2,arg3,arg4); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXStream_getSpace(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; FXuval result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -5070,7 +5070,7 @@ static VALUE _wrap_FXCURCursor_allocate(VALUE self) {
 static VALUE _wrap_new_FXCURCursor(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; void *arg2 = (void *) 0 ;
     FXCURCursor *result; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); { if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING);
-            arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); }  else { arg2 = NULL; }  }  {
+            arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }  {
         result = (FXCURCursor *)new_FXCURCursor(arg1,(void const *)arg2);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static void
@@ -5125,7 +5125,7 @@ static VALUE _wrap_new_FXGIFCursor(int argc, VALUE *argv, VALUE self) { FXApp *a
     FXint arg3 = (FXint) -1 ; FXint arg4 = (FXint) -1 ; FXGIFCursor *result; if ((argc < 2) || (argc > 4))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 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) {
+            arg2 = reinterpret_cast<void *>(RSTRING_PTR(argv[1])); }  else { arg2 = NULL; }  }  if (argc > 2) {
         arg3 = NUM2INT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  {
         result = (FXGIFCursor *)new_FXGIFCursor(arg1,(void const *)arg2,arg3,arg4);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }

data/ext/fox16/dc_wrap.cpp

@@ -566,7 +566,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;
@@ -1104,12 +1104,12 @@ static VALUE _wrap_FXDC_drawIconSunken(int argc, VALUE *argv, VALUE self) { FXDC
 static VALUE _wrap_FXDC_drawText(int argc, VALUE *argv, VALUE self) { FXDC *arg1 = (FXDC *) 0 ; FXint arg2 ; FXint arg3 ;
     FXchar *arg4 ; FXuint arg5 ; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDC, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]); {
-        Check_Type(argv[2], T_STRING); arg4 = STR2CSTR(argv[2]); arg5 = RSTRING(argv[2])->len; } 
+        Check_Type(argv[2], T_STRING); arg4 = StringValuePtr(argv[2]); arg5 = RSTRING_LEN(argv[2]); } 
     FXDC_drawText(arg1,arg2,arg3,(FXchar const *)arg4,arg5); return Qnil; }
 static VALUE _wrap_FXDC_drawImageText(int argc, VALUE *argv, VALUE self) { FXDC *arg1 = (FXDC *) 0 ; FXint arg2 ; FXint arg3 ;
     FXchar *arg4 ; FXuint arg5 ; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDC, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]); {
-        Check_Type(argv[2], T_STRING); arg4 = STR2CSTR(argv[2]); arg5 = RSTRING(argv[2])->len; } 
+        Check_Type(argv[2], T_STRING); arg4 = StringValuePtr(argv[2]); arg5 = RSTRING_LEN(argv[2]); } 
     FXDC_drawImageText(arg1,arg2,arg3,(FXchar const *)arg4,arg5); return Qnil; }
 static VALUE _wrap_FXDC_setForeground(int argc, VALUE *argv, VALUE self) { FXDC *arg1 = (FXDC *) 0 ; FXColor arg2 ;
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
@@ -1548,13 +1548,13 @@ static VALUE _wrap_FXDCWindow_drawText(int argc, VALUE *argv, VALUE self) { FXDC
     FXint arg3 ; FXchar *arg4 ; FXuint arg5 ; if ((argc < 3) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDCWindow, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]); {
-        Check_Type(argv[2], T_STRING); arg4 = STR2CSTR(argv[2]); arg5 = RSTRING(argv[2])->len; } 
+        Check_Type(argv[2], T_STRING); arg4 = StringValuePtr(argv[2]); arg5 = RSTRING_LEN(argv[2]); } 
     FXDCWindow_drawText(arg1,arg2,arg3,(FXchar const *)arg4,arg5); return Qnil; }
 static VALUE _wrap_FXDCWindow_drawImageText(int argc, VALUE *argv, VALUE self) { FXDCWindow *arg1 = (FXDCWindow *) 0 ;
     FXint arg2 ; FXint arg3 ; FXchar *arg4 ; FXuint arg5 ; if ((argc < 3) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDCWindow, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]); {
-        Check_Type(argv[2], T_STRING); arg4 = STR2CSTR(argv[2]); arg5 = RSTRING(argv[2])->len; } 
+        Check_Type(argv[2], T_STRING); arg4 = StringValuePtr(argv[2]); arg5 = RSTRING_LEN(argv[2]); } 
     FXDCWindow_drawImageText(arg1,arg2,arg3,(FXchar const *)arg4,arg5); return Qnil; }
 static VALUE _wrap_FXDCWindow_setForeground(int argc, VALUE *argv, VALUE self) { FXDCWindow *arg1 = (FXDCWindow *) 0 ;
     FXColor arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
@@ -2200,13 +2200,13 @@ static VALUE _wrap_FXDCPrint_drawText(int argc, VALUE *argv, VALUE self) { FXDCP
     FXint arg3 ; FXchar *arg4 ; FXuint arg5 ; if ((argc < 3) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDCPrint, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]); {
-        Check_Type(argv[2], T_STRING); arg4 = STR2CSTR(argv[2]); arg5 = RSTRING(argv[2])->len; } 
+        Check_Type(argv[2], T_STRING); arg4 = StringValuePtr(argv[2]); arg5 = RSTRING_LEN(argv[2]); } 
     FXDCPrint_drawText(arg1,arg2,arg3,(FXchar const *)arg4,arg5); return Qnil; }
 static VALUE _wrap_FXDCPrint_drawImageText(int argc, VALUE *argv, VALUE self) { FXDCPrint *arg1 = (FXDCPrint *) 0 ; FXint arg2 ;
     FXint arg3 ; FXchar *arg4 ; FXuint arg5 ; if ((argc < 3) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDCPrint, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]); {
-        Check_Type(argv[2], T_STRING); arg4 = STR2CSTR(argv[2]); arg5 = RSTRING(argv[2])->len; } 
+        Check_Type(argv[2], T_STRING); arg4 = StringValuePtr(argv[2]); arg5 = RSTRING_LEN(argv[2]); } 
     FXDCPrint_drawImageText(arg1,arg2,arg3,(FXchar const *)arg4,arg5); return Qnil; }
 static VALUE _wrap_FXDCPrint_setForeground(int argc, VALUE *argv, VALUE self) { FXDCPrint *arg1 = (FXDCPrint *) 0 ;
     FXColor arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);

data/ext/fox16/dialogs_wrap.cpp

@@ -580,7 +580,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;
@@ -711,13 +711,13 @@ VALUE FXFileDialog_getFilenames(FXFileDialog const *self){
 void FXFileDialog_setPatternList(FXFileDialog *self,VALUE ary){
       FXString patterns;
       if(TYPE(ary)==T_STRING){
-        patterns=FXString(STR2CSTR(ary));
+        patterns=FXString(StringValuePtr(ary));
         }
       else if(TYPE(ary)==T_ARRAY){
         for(long i=0; i<RARRAY(ary)->len; i++){
           VALUE obj=rb_ary_entry(ary,i);
           Check_Type(obj,T_STRING);
-          patterns+=FXString(STR2CSTR(obj))+FXString("\n");
+          patterns+=FXString(StringValuePtr(obj))+FXString("\n");
           }
         }
       else{
@@ -4076,7 +4076,7 @@ static VALUE _wrap_FXProgressDialog_onCmdSetStringValue(int argc, VALUE *argv, V
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXProgressDialog, 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_FXProgressDialog_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) {
     FXProgressDialog *arg1 = (FXProgressDialog *) 0 ; FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ;
@@ -5202,10 +5202,10 @@ static VALUE _wrap_new_FXChoiceBox__SWIG_0(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXWindow, 1); p2 = to_FXString(argv[1]); arg2 = &p2;
     p3 = to_FXString(argv[2]); arg3 = &p3; SWIG_ConvertPtr(argv[3], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); { arg5 = NULL;
         if(!NIL_P(argv[4])){ Check_Type(argv[4], T_ARRAY); if (FXMALLOC(&arg5, FXchar *, RARRAY(argv[4])->len)+1) {
-                for (long i = 0; i < RARRAY(argv[4])->len; i++) { arg5[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[4], i)); } 
-                arg5[RARRAY(argv[4])->len] = 0; }  }  }  if (argc > 5) { arg6 = NUM2UINT(argv[5]); }  if (argc > 6) {
-        arg7 = NUM2INT(argv[6]); }  if (argc > 7) { arg8 = NUM2INT(argv[7]); }  if (argc > 8) { arg9 = NUM2INT(argv[8]); } 
-    if (argc > 9) { arg10 = NUM2INT(argv[9]); }  {
+                for (long i = 0; i < RARRAY(argv[4])->len; i++) { VALUE e = rb_ary_entry(argv[4], i);
+                    arg5[i] = (FXchar *) StringValuePtr(e); }  arg5[RARRAY(argv[4])->len] = 0; }  }  }  if (argc > 5) {
+        arg6 = NUM2UINT(argv[5]); }  if (argc > 6) { arg7 = NUM2INT(argv[6]); }  if (argc > 7) { arg8 = NUM2INT(argv[7]); } 
+    if (argc > 8) { arg9 = NUM2INT(argv[8]); }  if (argc > 9) { arg10 = NUM2INT(argv[9]); }  {
         result = (FXChoiceBox *)new_FXChoiceBox__SWIG_0(arg1,(FXString const &)*arg2,(FXString const &)*arg3,arg4,(FXchar const **)arg5,arg6,arg7,arg8,arg9,arg10);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  FXFREE(&arg5);
     return self; }
@@ -5227,10 +5227,10 @@ static VALUE _wrap_new_FXChoiceBox__SWIG_1(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); p2 = to_FXString(argv[1]); arg2 = &p2;
     p3 = to_FXString(argv[2]); arg3 = &p3; SWIG_ConvertPtr(argv[3], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); { arg5 = NULL;
         if(!NIL_P(argv[4])){ Check_Type(argv[4], T_ARRAY); if (FXMALLOC(&arg5, FXchar *, RARRAY(argv[4])->len)+1) {
-                for (long i = 0; i < RARRAY(argv[4])->len; i++) { arg5[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[4], i)); } 
-                arg5[RARRAY(argv[4])->len] = 0; }  }  }  if (argc > 5) { arg6 = NUM2UINT(argv[5]); }  if (argc > 6) {
-        arg7 = NUM2INT(argv[6]); }  if (argc > 7) { arg8 = NUM2INT(argv[7]); }  if (argc > 8) { arg9 = NUM2INT(argv[8]); } 
-    if (argc > 9) { arg10 = NUM2INT(argv[9]); }  {
+                for (long i = 0; i < RARRAY(argv[4])->len; i++) { VALUE e = rb_ary_entry(argv[4], i);
+                    arg5[i] = (FXchar *) StringValuePtr(e); }  arg5[RARRAY(argv[4])->len] = 0; }  }  }  if (argc > 5) {
+        arg6 = NUM2UINT(argv[5]); }  if (argc > 6) { arg7 = NUM2INT(argv[6]); }  if (argc > 7) { arg8 = NUM2INT(argv[7]); } 
+    if (argc > 8) { arg9 = NUM2INT(argv[8]); }  if (argc > 9) { arg10 = NUM2INT(argv[9]); }  {
         result = (FXChoiceBox *)new_FXChoiceBox__SWIG_1(arg1,(FXString const &)*arg2,(FXString const &)*arg3,arg4,(FXchar const **)arg5,arg6,arg7,arg8,arg9,arg10);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  FXFREE(&arg5);
     return self; }
@@ -5283,8 +5283,8 @@ static VALUE _wrap_FXChoiceBox_ask__SWIG_0(int argc, VALUE *argv, VALUE self) {
     p3 = to_FXString(argv[2]); arg3 = &p3; p4 = to_FXString(argv[3]); arg4 = &p4;
     SWIG_ConvertPtr(argv[4], (void **) &arg5, SWIGTYPE_p_FXIcon, 1); { arg6 = NULL; if(!NIL_P(argv[5])){
             Check_Type(argv[5], T_ARRAY); if (FXMALLOC(&arg6, FXchar *, RARRAY(argv[5])->len)+1) {
-                for (long i = 0; i < RARRAY(argv[5])->len; i++) { arg6[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[5], i)); } 
-                arg6[RARRAY(argv[5])->len] = 0; }  }  } 
+                for (long i = 0; i < RARRAY(argv[5])->len; i++) { VALUE e = rb_ary_entry(argv[5], i);
+                    arg6[i] = (FXchar *) StringValuePtr(e); }  arg6[RARRAY(argv[5])->len] = 0; }  }  } 
     result = (FXint)FXChoiceBox::ask(arg1,arg2,(FXString const &)*arg3,(FXString const &)*arg4,arg5,(FXchar const **)arg6);
     vresult = INT2NUM(result); FXFREE(&arg6); return vresult; }
 static VALUE _wrap_FXChoiceBox_ask__SWIG_1(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXuint arg2 ;
@@ -5295,8 +5295,8 @@ static VALUE _wrap_FXChoiceBox_ask__SWIG_1(int argc, VALUE *argv, VALUE self) {
     p3 = to_FXString(argv[2]); arg3 = &p3; p4 = to_FXString(argv[3]); arg4 = &p4;
     SWIG_ConvertPtr(argv[4], (void **) &arg5, SWIGTYPE_p_FXIcon, 1); { arg6 = NULL; if(!NIL_P(argv[5])){
             Check_Type(argv[5], T_ARRAY); if (FXMALLOC(&arg6, FXchar *, RARRAY(argv[5])->len)+1) {
-                for (long i = 0; i < RARRAY(argv[5])->len; i++) { arg6[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[5], i)); } 
-                arg6[RARRAY(argv[5])->len] = 0; }  }  } 
+                for (long i = 0; i < RARRAY(argv[5])->len; i++) { VALUE e = rb_ary_entry(argv[5], i);
+                    arg6[i] = (FXchar *) StringValuePtr(e); }  arg6[RARRAY(argv[5])->len] = 0; }  }  } 
     result = (FXint)FXChoiceBox::ask(arg1,arg2,(FXString const &)*arg3,(FXString const &)*arg4,arg5,(FXchar const **)arg6);
     vresult = INT2NUM(result); FXFREE(&arg6); return vresult; }
 static VALUE _wrap_FXChoiceBox_ask(int nargs, VALUE *args, VALUE self) { int argc; VALUE argv[6]; int ii; argc = nargs;

data/ext/fox16/extconf.rb

@@ -133,6 +133,32 @@ def do_unix_setup
   find_library("GL", "glXCreateContext", "/usr/X11R6/lib")
   find_library("GLU", "gluNewQuadric", "/usr/X11R6/lib")
   $libs = append_library($libs, "FOX-1.6")
+  $libs = append_library($libs, "Xrandr")
+  $CFLAGS = $CFLAGS + " -O0 -Iinclude"
+  if is_fxscintilla_build?
+    File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak')
+    $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA -DHAVE_FOX_1_6"
+    $libs = append_library($libs, "fxscintilla")
+  else
+    File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exist?('scintilla_wrap.cpp')
+  end
+end
+
+def do_darwin_setup
+  $libs = append_library($libs, "stdc++")
+  have_header("sys/time.h")
+  have_header("signal.h")
+  have_library("png", "png_create_read_struct")
+  have_library("z", "deflate")
+  have_library("jpeg", "jpeg_mem_init")
+  have_library("tiff", "TIFFSetErrorHandler")
+  find_library("Xext", "XShmQueryVersion", "/usr/X11R6/lib")
+  find_library("X11", "XFindContext", "/usr/X11R6/lib")
+  find_library("GL", "glXCreateContext", "/usr/X11R6/lib")
+  find_library("GLU", "gluNewQuadric", "/usr/X11R6/lib")
+  $libs = append_library($libs, "FOX-1.6")
+  $libs = append_library($libs, "Xrandr")
+  $libs = append_library($libs, "png")
   $CFLAGS = $CFLAGS + " -O0 -Iinclude"
   if is_fxscintilla_build?
     File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak')
@@ -170,9 +196,14 @@ if RUBY_PLATFORM =~ /cygwin/ || RUBY_PLATFORM =~ /mingw/
   do_cygwin_setup
 elsif RUBY_PLATFORM =~ /mswin32/
   do_mswin32_setup
+elsif RUBY_PLATFORM =~ /darwin/
+  do_darwin_setup
 else
   do_unix_setup
 end
 
+# Check for Ruby 1.9
+$CFLAGS += " -DRUBY_1_9" if RUBY_VERSION =~ /1\.9\./
+
 # Last step: build the makefile
 create_makefile("fox16")

data/ext/fox16/frames_wrap.cpp

@@ -586,7 +586,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;
@@ -993,8 +993,8 @@ static VALUE _wrap_FXArrowButton_onCmdSetHelp(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_FXArrowButton, 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_FXArrowButton_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXArrowButton *arg1 = (FXArrowButton *) 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);
@@ -1006,8 +1006,8 @@ static VALUE _wrap_FXArrowButton_onCmdSetTip(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_FXArrowButton, 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_FXArrowButton_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXArrowButton *arg1 = (FXArrowButton *) 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);
@@ -1322,8 +1322,8 @@ static VALUE _wrap_FXColorBar_onCmdSetHelp(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_FXColorBar, 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_FXColorBar_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 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);
@@ -1335,8 +1335,8 @@ static VALUE _wrap_FXColorBar_onCmdSetTip(int argc, VALUE *argv, VALUE self) { F
     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_FXColorBar, 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_FXColorBar_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 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);
@@ -1641,8 +1641,8 @@ static VALUE _wrap_FXColorRing_onCmdSetHelp(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_FXColorRing, 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_FXColorRing_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXColorRing *arg1 = (FXColorRing *) 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);
@@ -1654,8 +1654,8 @@ static VALUE _wrap_FXColorRing_onCmdSetTip(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_FXColorRing, 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_FXColorRing_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXColorRing *arg1 = (FXColorRing *) 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);
@@ -1944,8 +1944,8 @@ static VALUE _wrap_FXColorWell_onCmdSetHelp(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_FXColorWell, 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_FXColorWell_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 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);
@@ -1957,8 +1957,8 @@ static VALUE _wrap_FXColorWell_onCmdSetTip(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_FXColorWell, 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_FXColorWell_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 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);
@@ -2251,8 +2251,8 @@ static VALUE _wrap_FXColorWheel_onCmdSetHelp(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_FXColorWheel, 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_FXColorWheel_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 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);
@@ -2264,8 +2264,8 @@ static VALUE _wrap_FXColorWheel_onCmdSetTip(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_FXColorWheel, 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_FXColorWheel_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 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);
@@ -2652,8 +2652,8 @@ static VALUE _wrap_FXDial_onCmdSetHelp(int argc, VALUE *argv, VALUE self) { FXDi
     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_FXDial, 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_FXDial_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 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);
@@ -2665,8 +2665,8 @@ static VALUE _wrap_FXDial_onCmdSetTip(int argc, VALUE *argv, VALUE self) { FXDia
     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_FXDial, 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_FXDial_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 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);
@@ -3230,8 +3230,8 @@ static VALUE _wrap_FXHeader_fillItems(int argc, VALUE *argv, VALUE self) { FXHea
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeader, 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) { arg4 = NUM2INT(argv[2]); } 
     if (argc > 3) { arg5 = (argv[3] == Qnil) ? NULL : (void *) argv[3]; }  if (argc > 4) { arg6 = to_FXbool(argv[4]); } 
     result = (FXint)(arg1)->fillItems((FXchar const **)arg2,arg3,arg4,arg5,arg6); vresult = INT2NUM(result); FXFREE(&arg2);
@@ -4290,8 +4290,8 @@ static VALUE _wrap_FXKnob_onCmdSetHelp(int argc, VALUE *argv, VALUE self) { FXKn
     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_FXKnob, 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_FXKnob_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXKnob *arg1 = (FXKnob *) 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);
@@ -4303,8 +4303,8 @@ static VALUE _wrap_FXKnob_onCmdSetTip(int argc, VALUE *argv, VALUE self) { FXKno
     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_FXKnob, 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_FXKnob_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXKnob *arg1 = (FXKnob *) 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);
@@ -4950,8 +4950,8 @@ static VALUE _wrap_FXRuler_onCmdSetHelp(int argc, VALUE *argv, VALUE self) { FXR
     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_FXRuler, 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_FXRuler_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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);
@@ -4963,8 +4963,8 @@ static VALUE _wrap_FXRuler_onCmdSetTip(int argc, VALUE *argv, VALUE self) { FXRu
     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_FXRuler, 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_FXRuler_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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);
@@ -6171,8 +6171,8 @@ static VALUE _wrap_FXSlider_onCmdSetHelp(int argc, VALUE *argv, VALUE self) { FX
     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_FXSlider, 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_FXSlider_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 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);
@@ -6184,8 +6184,8 @@ static VALUE _wrap_FXSlider_onCmdSetTip(int argc, VALUE *argv, VALUE self) { FXS
     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_FXSlider, 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_FXSlider_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 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);
@@ -6614,8 +6614,8 @@ static VALUE _wrap_FXRealSlider_onCmdSetHelp(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_FXRealSlider, 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_FXRealSlider_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 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);
@@ -6627,8 +6627,8 @@ static VALUE _wrap_FXRealSlider_onCmdSetTip(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_FXRealSlider, 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_FXRealSlider_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 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);
@@ -6966,7 +6966,7 @@ static VALUE _wrap_FXStatusLine_onCmdSetStringValue(int argc, VALUE *argv, VALUE
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStatusLine, 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; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXStatusLine_allocate(VALUE self) {
@@ -7262,8 +7262,8 @@ static VALUE _wrap_FXTextField_onVerify(int argc, VALUE *argv, VALUE self) { FXT
     if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTextField, 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)->onVerify(arg2,arg3,arg4); vresult = INT2NUM(result);
-    return vresult; }
+    arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onVerify(arg2,arg3,arg4);
+    vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXTextField_onMotion(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 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);
@@ -7342,7 +7342,7 @@ static VALUE _wrap_FXTextField_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_FXTextField, 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_FXTextField_onCmdSetIntValue(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; FXint value4 ;
@@ -7363,7 +7363,7 @@ static VALUE _wrap_FXTextField_onCmdSetStringValue(int argc, VALUE *argv, VALUE
     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_FXTextField, 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_FXTextField_onCmdGetIntValue(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
@@ -7503,7 +7503,7 @@ static VALUE _wrap_FXTextField_onCmdInsertString(int argc, VALUE *argv, VALUE se
     if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTextField, 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)->onCmdInsertString(arg2,arg3,arg4);
+    arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdInsertString(arg2,arg3,arg4);
     vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXTextField_onCmdBackspace(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
@@ -7560,8 +7560,8 @@ static VALUE _wrap_FXTextField_onCmdSetHelp(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_FXTextField, 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_FXTextField_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 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);
@@ -7573,8 +7573,8 @@ static VALUE _wrap_FXTextField_onCmdSetTip(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_FXTextField, 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_FXTextField_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 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);
@@ -8062,8 +8062,8 @@ static VALUE _wrap_FXToolBarTab_onCmdSetTip(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_FXToolBarTab, 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_FXToolBarTab_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 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);
@@ -8489,8 +8489,8 @@ static VALUE _wrap_FXGradientBar_onCmdSetHelp(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_FXGradientBar, 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_FXGradientBar_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXGradientBar *arg1 = (FXGradientBar *) 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);
@@ -8502,8 +8502,8 @@ static VALUE _wrap_FXGradientBar_onCmdSetTip(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_FXGradientBar, 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_FXGradientBar_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXGradientBar *arg1 = (FXGradientBar *) 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);