fxruby 1.6.13 → 1.6.14

data/ext/fox16/mdi_wrap.cpp

@@ -574,7 +574,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;
@@ -2559,28 +2559,28 @@ static VALUE _wrap_FXMDIChild_onCmdSetStringValue(int argc, VALUE *argv, VALUE s
     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_FXMDIChild, 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_FXMDIChild_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) { FXMDIChild *arg1 = (FXMDIChild *) 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_FXMDIChild, 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_FXMDIChild_onCmdSetIconValue(int argc, VALUE *argv, VALUE self) { FXMDIChild *arg1 = (FXMDIChild *) 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_FXMDIChild, 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)->onCmdSetIconValue(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXMDIChild_onCmdGetIconValue(int argc, VALUE *argv, VALUE self) { FXMDIChild *arg1 = (FXMDIChild *) 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_FXMDIChild, 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)->onCmdGetIconValue(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXMDIChild_allocate(VALUE self) {

data/ext/fox16/menu_wrap.cpp

@@ -575,7 +575,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;
@@ -1156,7 +1156,7 @@ static VALUE _wrap_FXMenuCaption_onCmdSetStringValue(int argc, VALUE *argv, VALU
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMenuCaption, 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_FXMenuCaption_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) {
     FXMenuCaption *arg1 = (FXMenuCaption *) 0 ; FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ;
@@ -1185,8 +1185,8 @@ static VALUE _wrap_FXMenuCaption_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_FXMenuCaption, 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_FXMenuCaption_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXMenuCaption *arg1 = (FXMenuCaption *) 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);
@@ -1198,8 +1198,8 @@ static VALUE _wrap_FXMenuCaption_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_FXMenuCaption, 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_FXMenuCaption_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXMenuCaption *arg1 = (FXMenuCaption *) 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/scintilla_wrap.cpp

@@ -563,7 +563,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;
@@ -638,7 +638,7 @@ VALUE FXScintilla_sendMessage(FXScintilla *self,unsigned int iMsg,VALUE wParam,V
           wp=static_cast<uptr_t>(NUM2UINT(wParam));
           break;
         case T_STRING:
-          wp=static_cast<uptr_t>(reinterpret_cast<long>(RSTRING(wParam)->ptr));
+          wp=static_cast<uptr_t>(reinterpret_cast<long>(RSTRING_PTR(wParam)));
           break;
         case T_TRUE:
         case T_FALSE:
@@ -656,7 +656,7 @@ VALUE FXScintilla_sendMessage(FXScintilla *self,unsigned int iMsg,VALUE wParam,V
           lp=static_cast<sptr_t>(NUM2UINT(lParam));
           break;
         case T_STRING:
-          lp=static_cast<sptr_t>(reinterpret_cast<long>(RSTRING(lParam)->ptr));
+          lp=static_cast<sptr_t>(reinterpret_cast<long>(RSTRING_PTR(lParam)));
           break;
         case T_TRUE:
         case T_FALSE:

data/ext/fox16/table_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;
@@ -674,8 +674,8 @@ VALUE FXTable_extractText(FXTable const *self,FXint startrow,FXint endrow,FXint
       }
 void FXTable_overlayText(FXTable *self,FXint startrow,FXint endrow,FXint startcol,FXint endcol,VALUE str,FXchar const *cs,FXchar const *rs,FXbool notify){
       if(startrow<0 || startcol<0 || self->getNumRows()<=endrow || self->getNumColumns()<=endcol) rb_raise(rb_eIndexError,"index out of bounds");
-      const FXchar* text=reinterpret_cast<FXchar*>(STR2CSTR(str));
-      FXint size=RSTRING(str)->len;
+      const FXchar* text=reinterpret_cast<FXchar*>(StringValuePtr(str));
+      FXint size=RSTRING_LEN(str);
       self->overlayText(startrow,endrow,startcol,endcol,text,size,cs,rs,notify);
       }
 VALUE FXTable_countText(FXTable const *self,FXString const &text,FXchar const *cs,FXchar const *rs){

data/ext/fox16/text_wrap.cpp

@@ -563,7 +563,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;
@@ -623,7 +623,7 @@ VALUE FXText_extractStyle(FXText const *self,FXint pos,FXint n){
 	}
       return str;
       }
-VALUE FXText_findText(FXText *self,FXString const &string,FXint start,FXuint flags,FXint npar){
+VALUE FXText_findText(FXText *self,FXString const &string,FXint start,FXuint flags){
       FXint* beg;
       FXint* end;
       VALUE ary=Qnil;
@@ -1082,7 +1082,7 @@ static VALUE _wrap_FXText_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_FXText, 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_FXText_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) { FXText *arg1 = (FXText *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
@@ -1294,7 +1294,7 @@ static VALUE _wrap_FXText_onCmdInsertString(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_FXText, 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_FXText_onCmdInsertNewline(int argc, VALUE *argv, VALUE self) { FXText *arg1 = (FXText *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
@@ -1704,12 +1704,12 @@ static VALUE _wrap_FXText_shiftText(int argc, VALUE *argv, VALUE self) { FXText
     arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]); arg4 = NUM2INT(argv[2]); if (argc > 3) { arg5 = to_FXbool(argv[3]); } 
     result = (FXint)(arg1)->shiftText(arg2,arg3,arg4,arg5); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXText_findText(int argc, VALUE *argv, VALUE self) { FXText *arg1 = (FXText *) 0 ; FXString *arg2 = 0 ;
-    FXint arg3 = (FXint) 0 ; FXuint arg4 = (FXuint) SEARCH_FORWARD|SEARCH_WRAP|SEARCH_EXACT ; FXint arg5 = (FXint) 1 ;
-    VALUE result; SwigValueWrapper<FXString > p2 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 4))
+    FXint arg3 = (FXint) 0 ; FXuint arg4 = (FXuint) SEARCH_FORWARD|SEARCH_WRAP|SEARCH_EXACT ; VALUE result;
+    SwigValueWrapper<FXString > p2 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXText, 1);
     p2 = to_FXString(argv[0]); arg2 = &p2; if (argc > 1) { arg3 = NUM2INT(argv[1]); }  if (argc > 2) {
-        arg4 = NUM2UINT(argv[2]); }  if (argc > 3) { arg5 = NUM2INT(argv[3]); } 
-    result = (VALUE)FXText_findText(arg1,(FXString const &)*arg2,arg3,arg4,arg5); vresult = result; return vresult; }
+        arg4 = NUM2UINT(argv[2]); }  result = (VALUE)FXText_findText(arg1,(FXString const &)*arg2,arg3,arg4); vresult = result;
+    return vresult; }
 static VALUE _wrap_FXText_isPosSelected(int argc, VALUE *argv, VALUE self) { FXText *arg1 = (FXText *) 0 ; FXint arg2 ;
     FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXText, 1);

data/ext/fox16/treelist_wrap.cpp

@@ -569,7 +569,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;
@@ -620,7 +620,8 @@ void FXFoldingList_setHeaders(FXFoldingList *self,VALUE stringArray,FXint size){
       const FXchar **strings;
       if(FXMALLOC(&strings,FXchar*,len+1)){
         for(long i=0;i<len;i++){
-	  strings[i]=STR2CSTR(rb_ary_entry(stringArray,i));
+          VALUE s=rb_ary_entry(stringArray,i);
+	  strings[i]=StringValuePtr(s);
           }
 	strings[len]=0;
         self->setHeaders(strings,size);
@@ -1387,8 +1388,8 @@ static VALUE _wrap_FXFoldingList_fillItems(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFoldingList, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXFoldingItem, 1); { arg3 = NULL; if(!NIL_P(argv[1])){
             Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY(argv[1])->len)+1) {
-                for (long i = 0; i < RARRAY(argv[1])->len; i++) { arg3[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[1], i)); } 
-                arg3[RARRAY(argv[1])->len] = 0; }  }  }  if (argc > 2) {
+                for (long i = 0; i < RARRAY(argv[1])->len; i++) { VALUE e = rb_ary_entry(argv[1], i);
+                    arg3[i] = (FXchar *) StringValuePtr(e); }  arg3[RARRAY(argv[1])->len] = 0; }  }  }  if (argc > 2) {
         SWIG_ConvertPtr(argv[2], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); }  if (argc > 3) {
         SWIG_ConvertPtr(argv[3], (void **) &arg5, SWIGTYPE_p_FXIcon, 1); }  if (argc > 4) {
         arg6 = (argv[4] == Qnil) ? NULL : (void *) argv[4]; }  if (argc > 5) { arg7 = to_FXbool(argv[5]); } 
@@ -2594,8 +2595,8 @@ static VALUE _wrap_FXTreeList_fillItems(int argc, VALUE *argv, VALUE self) { FXT
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTreeList, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXTreeItem, 1); { arg3 = NULL; if(!NIL_P(argv[1])){
             Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY(argv[1])->len)+1) {
-                for (long i = 0; i < RARRAY(argv[1])->len; i++) { arg3[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[1], i)); } 
-                arg3[RARRAY(argv[1])->len] = 0; }  }  }  if (argc > 2) {
+                for (long i = 0; i < RARRAY(argv[1])->len; i++) { VALUE e = rb_ary_entry(argv[1], i);
+                    arg3[i] = (FXchar *) StringValuePtr(e); }  arg3[RARRAY(argv[1])->len] = 0; }  }  }  if (argc > 2) {
         SWIG_ConvertPtr(argv[2], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); }  if (argc > 3) {
         SWIG_ConvertPtr(argv[3], (void **) &arg5, SWIGTYPE_p_FXIcon, 1); }  if (argc > 4) {
         arg6 = (argv[4] == Qnil) ? NULL : (void *) argv[4]; }  if (argc > 5) { arg7 = to_FXbool(argv[5]); } 
@@ -3540,14 +3541,14 @@ static VALUE _wrap_FXDirList_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_FXDirList, 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_FXDirList_onCmdSetStringValue(int argc, VALUE *argv, VALUE self) { FXDirList *arg1 = (FXDirList *) 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_FXDirList, 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_FXDirList_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) { FXDirList *arg1 = (FXDirList *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
@@ -3632,7 +3633,7 @@ static VALUE _wrap_FXDirList_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_FXDirList, 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_FXDirList_onUpdSetPattern(int argc, VALUE *argv, VALUE self) { FXDirList *arg1 = (FXDirList *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;

data/ext/fox16/ui_wrap.cpp

@@ -600,7 +600,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;
@@ -951,13 +951,13 @@ VALUE FXFileSelector_getFilenames(FXFileSelector const *self){
 void FXFileSelector_setPatternList(FXFileSelector *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{
@@ -2629,7 +2629,7 @@ static VALUE _wrap_FXToolTip_onCmdSetStringValue(int argc, VALUE *argv, VALUE se
     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_FXToolTip, 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_FXToolTip_allocate(VALUE self) {
@@ -4780,14 +4780,14 @@ static VALUE _wrap_FXComboBox_onTextChanged(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_FXComboBox, 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)->onTextChanged(arg2,arg3,arg4);
+    arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onTextChanged(arg2,arg3,arg4);
     vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXComboBox_onTextCommand(int argc, VALUE *argv, VALUE self) { FXComboBox *arg1 = (FXComboBox *) 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);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComboBox, 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)->onTextCommand(arg2,arg3,arg4);
+    arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onTextCommand(arg2,arg3,arg4);
     vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXComboBox_onListClicked(int argc, VALUE *argv, VALUE self) { FXComboBox *arg1 = (FXComboBox *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
@@ -4918,9 +4918,9 @@ static VALUE _wrap_FXComboBox_fillItems(int argc, VALUE *argv, VALUE self) { FXC
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComboBox, 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; }  }  }  result = (FXint)(arg1)->fillItems((FXchar const **)arg2);
-    vresult = INT2NUM(result); FXFREE(&arg2); return vresult; }
+                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; }  }  } 
+    result = (FXint)(arg1)->fillItems((FXchar const **)arg2); vresult = INT2NUM(result); FXFREE(&arg2); return vresult; }
 static VALUE _wrap_FXComboBox_insertItem(int argc, VALUE *argv, VALUE self) { FXComboBox *arg1 = (FXComboBox *) 0 ; FXint arg2 ;
     FXString *arg3 = 0 ; void *arg4 = (void *) 0 ; FXint result; SwigValueWrapper<FXString > p3 ; VALUE vresult = Qnil;
     if ((argc < 2) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
@@ -5383,8 +5383,8 @@ static VALUE _wrap_FXListBox_fillItems(int argc, VALUE *argv, VALUE self) { FXLi
     if ((argc < 1) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXListBox, 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 = (argv[2] == Qnil) ? NULL : (void *) argv[2]; } 
     result = (FXint)(arg1)->fillItems((FXchar const **)arg2,arg3,arg4); vresult = INT2NUM(result); FXFREE(&arg2);
@@ -5842,8 +5842,8 @@ static VALUE _wrap_FXTreeListBox_fillItems(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTreeListBox, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXTreeItem, 1); { arg3 = NULL; if(!NIL_P(argv[1])){
             Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY(argv[1])->len)+1) {
-                for (long i = 0; i < RARRAY(argv[1])->len; i++) { arg3[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[1], i)); } 
-                arg3[RARRAY(argv[1])->len] = 0; }  }  }  if (argc > 2) {
+                for (long i = 0; i < RARRAY(argv[1])->len; i++) { VALUE e = rb_ary_entry(argv[1], i);
+                    arg3[i] = (FXchar *) StringValuePtr(e); }  arg3[RARRAY(argv[1])->len] = 0; }  }  }  if (argc > 2) {
         SWIG_ConvertPtr(argv[2], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); }  if (argc > 3) {
         SWIG_ConvertPtr(argv[3], (void **) &arg5, SWIGTYPE_p_FXIcon, 1); }  if (argc > 4) {
         arg6 = (argv[4] == Qnil) ? NULL : (void *) argv[4]; } 
@@ -6885,14 +6885,14 @@ static VALUE _wrap_FXDirBox_onCmdSetValue(int argc, VALUE *argv, VALUE self) { F
     if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDirBox, 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_FXDirBox_onCmdSetStringValue(int argc, VALUE *argv, VALUE self) { FXDirBox *arg1 = (FXDirBox *) 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_FXDirBox, 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_FXDirBox_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) { FXDirBox *arg1 = (FXDirBox *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
@@ -7137,14 +7137,14 @@ static VALUE _wrap_FXDriveBox_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_FXDriveBox, 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_FXDriveBox_onCmdSetStringValue(int argc, VALUE *argv, VALUE self) { FXDriveBox *arg1 = (FXDriveBox *) 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_FXDriveBox, 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_FXDriveBox_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) { FXDriveBox *arg1 = (FXDriveBox *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
@@ -7736,8 +7736,8 @@ static VALUE _wrap_FXFileSelector_onCmdFilter(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_FXFileSelector, 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)->onCmdFilter(arg2,arg3,arg4); vresult = INT2NUM(result);
-    return vresult; }
+    arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdFilter(arg2,arg3,arg4);
+    vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXFileSelector_onCmdItemDblClicked(int argc, VALUE *argv, VALUE self) {
     FXFileSelector *arg1 = (FXFileSelector *) 0 ; FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ;
     long result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
@@ -7781,7 +7781,7 @@ static VALUE _wrap_FXFileSelector_onCmdDirTree(int argc, VALUE *argv, VALUE self
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileSelector, 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)->onCmdDirTree(arg2,arg3,arg4);
+    arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdDirTree(arg2,arg3,arg4);
     vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXFileSelector_onCmdHome(int argc, VALUE *argv, VALUE self) { FXFileSelector *arg1 = (FXFileSelector *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
@@ -7807,8 +7807,8 @@ static VALUE _wrap_FXFileSelector_onCmdVisit(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_FXFileSelector, 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)->onCmdVisit(arg2,arg3,arg4); vresult = INT2NUM(result);
-    return vresult; }
+    arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdVisit(arg2,arg3,arg4);
+    vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXFileSelector_onCmdNew(int argc, VALUE *argv, VALUE self) { FXFileSelector *arg1 = (FXFileSelector *) 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/lib/fox16/kwargs.rb

@@ -2402,6 +2402,17 @@ module Fox
       params = default_params.merge(params)
       old_initialize(p, params[:target], params[:selector], params[:opts], params[:x], params[:y], params[:width], params[:height], params[:padLeft], params[:padRight], params[:padTop], params[:padBottom], &blk)
     end
+    alias old_findText findText
+    def findText(string, *args)
+      argument_names = %w{start flags}
+      default_params = { :start => 0, :flags => SEARCH_FORWARD|SEARCH_WRAP|SEARCH_EXACT }
+      params = {}
+      params = args.pop if args.last.is_a? Hash
+      args.each_with_index { |e, i| params[argument_names[i].intern] = e }
+      params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
+      params = default_params.merge(params)
+      old_findText(string, params[:start], params[:flags])
+    end
   end
 
   class FXTextField

data/lib/fox16/version.rb

@@ -3,7 +3,7 @@ module Fox
   # Returns the FXRuby version number as a string, e.g. "1.0.19".
   #
   def Fox.fxrubyversion
-    "1.6.13"
+    "1.6.14"
   end
 end
 

data/rdoc-sources/FXImage.rb

@@ -113,7 +113,8 @@ module Fox
     def release(); end
 
     #
-    # Rescale pixels image to the specified width and height. Note that this
+    # Rescale pixels image to the specified width and height and then
+    # re-render the server-side image from the client-side pixel buffer. Note that this
     # serves a slightly different purpose than the base class resize() method,
     # which simply resizes the client-side pixel data buffer but doesn't
     # transform the image.
@@ -132,7 +133,8 @@ module Fox
     def scale(w, h, quality=0) ; end
   
     #
-    # Mirror image horizontally and/or vertically.
+    # Mirror image horizontally and/or vertically and then re-render the
+    # server-side image from the client-side pixel buffer.
     #
     # ==== Parameters:
     #
@@ -142,7 +144,8 @@ module Fox
     def mirror(horizontal, vertical) ; end
   
     #
-    # Rotate image counter-clockwise by some number of degrees.
+    # Rotate image counter-clockwise by some number of degrees and then
+    # re-render the server-side image from the client-side pixel buffer.
     #
     # ==== Parameters:
     #
@@ -151,7 +154,8 @@ module Fox
     def rotate(degrees) ; end
   
     #
-    # Crop image to given rectangle; this calls resize() to adjust the client
+    # Crop image to given rectangle and then re-render the server-side image
+    # from the client-side pixel buffer. This method calls resize() to adjust the client
     # and server side representations.  The new image may be smaller or larger
     # than the old one; blank areas are filled with color. There must be at
     # least one pixel of overlap between the old and the new image.
@@ -182,7 +186,8 @@ module Fox
     def fade(color, factor=255); end
 
     #
-    # Shear image horizontally; the number of pixels is equal to the
+    # Shear image horizontally and then re-render the server-side image
+    # from the client-side pixel buffer. The number of pixels is equal to the
     # _shear_ parameter times 256. The area outside the image is filled
     # with transparent black, unless another _color_ is specified.
     #
@@ -194,7 +199,8 @@ module Fox
     def xshear(shear, color=0); end
 
     #
-    # Shear image vertically; the number of pixels is equal to the
+    # Shear image verticallyand then re-render the server-side image
+    # from the client-side pixel buffer. The number of pixels is equal to the
     # _shear_ parameter times 256. The area outside the image is filled
     # with transparent black, unless another _color_ is specified.
     #