fxruby 1.6.13 → 1.6.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (62) hide show
  1. data/doc/apes02.html +2 -2
  2. data/doc/apes03.html +1 -1
  3. data/doc/book.html +1 -1
  4. data/doc/build.html +16 -17
  5. data/doc/changes.html +40 -28
  6. data/doc/differences.html +9 -9
  7. data/doc/gems.html +6 -6
  8. data/doc/implementation.html +1 -1
  9. data/doc/infosources.html +3 -3
  10. data/doc/library.html +5 -5
  11. data/doc/opengl.html +5 -5
  12. data/doc/pt02.html +1 -1
  13. data/doc/scintilla.html +4 -4
  14. data/doc/subversion.html +1 -1
  15. data/examples/babelfish.rb +1 -1
  16. data/examples/custom_table_item.rb +170 -0
  17. data/examples/dilbert.rb +6 -7
  18. data/ext/fox16/FXRbApp.cpp +5 -1
  19. data/ext/fox16/FXRbDataTarget.cpp +2 -2
  20. data/ext/fox16/FXRuby.cpp +36 -14
  21. data/ext/fox16/core_wrap.cpp +13 -13
  22. data/ext/fox16/dc_wrap.cpp +7 -7
  23. data/ext/fox16/dialogs_wrap.cpp +16 -16
  24. data/ext/fox16/extconf.rb +31 -0
  25. data/ext/fox16/frames_wrap.cpp +59 -59
  26. data/ext/fox16/fx3d_wrap.cpp +1 -1
  27. data/ext/fox16/iconlist_wrap.cpp +10 -10
  28. data/ext/fox16/icons_wrap.cpp +25 -25
  29. data/ext/fox16/image_wrap.cpp +26 -26
  30. data/ext/fox16/include/FXRbApp.h +5 -3
  31. data/ext/fox16/include/FXRbDC.h +1 -1
  32. data/ext/fox16/label_wrap.cpp +6 -6
  33. data/ext/fox16/layout_wrap.cpp +1 -1
  34. data/ext/fox16/list_wrap.cpp +7 -7
  35. data/ext/fox16/mdi_wrap.cpp +5 -5
  36. data/ext/fox16/menu_wrap.cpp +6 -6
  37. data/ext/fox16/scintilla_wrap.cpp +3 -3
  38. data/ext/fox16/table_wrap.cpp +3 -3
  39. data/ext/fox16/text_wrap.cpp +8 -8
  40. data/ext/fox16/treelist_wrap.cpp +10 -9
  41. data/ext/fox16/ui_wrap.cpp +22 -22
  42. data/lib/fox16/kwargs.rb +11 -0
  43. data/lib/fox16/version.rb +1 -1
  44. data/rdoc-sources/FXImage.rb +12 -6
  45. data/rdoc-sources/FXToggleButton.rb +1 -0
  46. data/tests/output.ps +166 -0
  47. data/tests/stress1.rb +3 -5
  48. data/web/community.html +94 -0
  49. data/web/documentation.html +100 -0
  50. data/web/downloads.html +114 -93
  51. data/web/index.html +96 -0
  52. metadata +47 -52
  53. data/index.html +0 -14
  54. data/web/art/fxrubylogo.png +0 -0
  55. data/web/art/fxrubylogo_small.png +0 -0
  56. data/web/art/line.gif +0 -0
  57. data/web/art/oul_grey.gif +0 -0
  58. data/web/art/our.gif +0 -0
  59. data/web/home.html +0 -113
  60. data/web/menu.html +0 -50
  61. data/web/styles.css +0 -167
  62. data/web/top.html +0 -15
@@ -574,7 +574,7 @@ inline FXColor to_FXColor(VALUE obj){
574
574
  inline FXString to_FXString(VALUE obj){
575
575
  if(!NIL_P(obj)){
576
576
  Check_Type(obj,T_STRING);
577
- return FXString(STR2CSTR(obj));
577
+ return FXString(StringValuePtr(obj));
578
578
  }
579
579
  else{
580
580
  return FXString::null;
@@ -2559,28 +2559,28 @@ static VALUE _wrap_FXMDIChild_onCmdSetStringValue(int argc, VALUE *argv, VALUE s
2559
2559
  VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
2560
2560
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMDIChild, 1);
2561
2561
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
2562
- value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; }
2562
+ value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; }
2563
2563
  result = (long)(arg1)->onCmdSetStringValue(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
2564
2564
  static VALUE _wrap_FXMDIChild_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) { FXMDIChild *arg1 = (FXMDIChild *) 0 ;
2565
2565
  FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; FXString value4 ;
2566
2566
  VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
2567
2567
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMDIChild, 1);
2568
2568
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
2569
- value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; }
2569
+ value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; }
2570
2570
  result = (long)(arg1)->onCmdGetStringValue(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
2571
2571
  static VALUE _wrap_FXMDIChild_onCmdSetIconValue(int argc, VALUE *argv, VALUE self) { FXMDIChild *arg1 = (FXMDIChild *) 0 ;
2572
2572
  FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; FXString value4 ;
2573
2573
  VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
2574
2574
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMDIChild, 1);
2575
2575
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
2576
- value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; }
2576
+ value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; }
2577
2577
  result = (long)(arg1)->onCmdSetIconValue(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
2578
2578
  static VALUE _wrap_FXMDIChild_onCmdGetIconValue(int argc, VALUE *argv, VALUE self) { FXMDIChild *arg1 = (FXMDIChild *) 0 ;
2579
2579
  FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; FXString value4 ;
2580
2580
  VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
2581
2581
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMDIChild, 1);
2582
2582
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
2583
- value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; }
2583
+ value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; }
2584
2584
  result = (long)(arg1)->onCmdGetIconValue(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
2585
2585
  #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
2586
2586
  static VALUE _wrap_FXMDIChild_allocate(VALUE self) {
@@ -575,7 +575,7 @@ inline FXColor to_FXColor(VALUE obj){
575
575
  inline FXString to_FXString(VALUE obj){
576
576
  if(!NIL_P(obj)){
577
577
  Check_Type(obj,T_STRING);
578
- return FXString(STR2CSTR(obj));
578
+ return FXString(StringValuePtr(obj));
579
579
  }
580
580
  else{
581
581
  return FXString::null;
@@ -1156,7 +1156,7 @@ static VALUE _wrap_FXMenuCaption_onCmdSetStringValue(int argc, VALUE *argv, VALU
1156
1156
  rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
1157
1157
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMenuCaption, 1);
1158
1158
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
1159
- value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; }
1159
+ value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; }
1160
1160
  result = (long)(arg1)->onCmdSetStringValue(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
1161
1161
  static VALUE _wrap_FXMenuCaption_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) {
1162
1162
  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)
1185
1185
  VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
1186
1186
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMenuCaption, 1);
1187
1187
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
1188
- value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; } result = (long)(arg1)->onCmdSetHelp(arg2,arg3,arg4);
1189
- vresult = INT2NUM(result); return vresult; }
1188
+ value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; }
1189
+ result = (long)(arg1)->onCmdSetHelp(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
1190
1190
  static VALUE _wrap_FXMenuCaption_onCmdGetHelp(int argc, VALUE *argv, VALUE self) { FXMenuCaption *arg1 = (FXMenuCaption *) 0 ;
1191
1191
  FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
1192
1192
  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)
1198
1198
  VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
1199
1199
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMenuCaption, 1);
1200
1200
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
1201
- value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; } result = (long)(arg1)->onCmdSetTip(arg2,arg3,arg4);
1202
- vresult = INT2NUM(result); return vresult; }
1201
+ value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; }
1202
+ result = (long)(arg1)->onCmdSetTip(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
1203
1203
  static VALUE _wrap_FXMenuCaption_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXMenuCaption *arg1 = (FXMenuCaption *) 0 ;
1204
1204
  FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
1205
1205
  if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
@@ -563,7 +563,7 @@ inline FXColor to_FXColor(VALUE obj){
563
563
  inline FXString to_FXString(VALUE obj){
564
564
  if(!NIL_P(obj)){
565
565
  Check_Type(obj,T_STRING);
566
- return FXString(STR2CSTR(obj));
566
+ return FXString(StringValuePtr(obj));
567
567
  }
568
568
  else{
569
569
  return FXString::null;
@@ -638,7 +638,7 @@ VALUE FXScintilla_sendMessage(FXScintilla *self,unsigned int iMsg,VALUE wParam,V
638
638
  wp=static_cast<uptr_t>(NUM2UINT(wParam));
639
639
  break;
640
640
  case T_STRING:
641
- wp=static_cast<uptr_t>(reinterpret_cast<long>(RSTRING(wParam)->ptr));
641
+ wp=static_cast<uptr_t>(reinterpret_cast<long>(RSTRING_PTR(wParam)));
642
642
  break;
643
643
  case T_TRUE:
644
644
  case T_FALSE:
@@ -656,7 +656,7 @@ VALUE FXScintilla_sendMessage(FXScintilla *self,unsigned int iMsg,VALUE wParam,V
656
656
  lp=static_cast<sptr_t>(NUM2UINT(lParam));
657
657
  break;
658
658
  case T_STRING:
659
- lp=static_cast<sptr_t>(reinterpret_cast<long>(RSTRING(lParam)->ptr));
659
+ lp=static_cast<sptr_t>(reinterpret_cast<long>(RSTRING_PTR(lParam)));
660
660
  break;
661
661
  case T_TRUE:
662
662
  case T_FALSE:
@@ -567,7 +567,7 @@ inline FXColor to_FXColor(VALUE obj){
567
567
  inline FXString to_FXString(VALUE obj){
568
568
  if(!NIL_P(obj)){
569
569
  Check_Type(obj,T_STRING);
570
- return FXString(STR2CSTR(obj));
570
+ return FXString(StringValuePtr(obj));
571
571
  }
572
572
  else{
573
573
  return FXString::null;
@@ -674,8 +674,8 @@ VALUE FXTable_extractText(FXTable const *self,FXint startrow,FXint endrow,FXint
674
674
  }
675
675
  void FXTable_overlayText(FXTable *self,FXint startrow,FXint endrow,FXint startcol,FXint endcol,VALUE str,FXchar const *cs,FXchar const *rs,FXbool notify){
676
676
  if(startrow<0 || startcol<0 || self->getNumRows()<=endrow || self->getNumColumns()<=endcol) rb_raise(rb_eIndexError,"index out of bounds");
677
- const FXchar* text=reinterpret_cast<FXchar*>(STR2CSTR(str));
678
- FXint size=RSTRING(str)->len;
677
+ const FXchar* text=reinterpret_cast<FXchar*>(StringValuePtr(str));
678
+ FXint size=RSTRING_LEN(str);
679
679
  self->overlayText(startrow,endrow,startcol,endcol,text,size,cs,rs,notify);
680
680
  }
681
681
  VALUE FXTable_countText(FXTable const *self,FXString const &text,FXchar const *cs,FXchar const *rs){
@@ -563,7 +563,7 @@ inline FXColor to_FXColor(VALUE obj){
563
563
  inline FXString to_FXString(VALUE obj){
564
564
  if(!NIL_P(obj)){
565
565
  Check_Type(obj,T_STRING);
566
- return FXString(STR2CSTR(obj));
566
+ return FXString(StringValuePtr(obj));
567
567
  }
568
568
  else{
569
569
  return FXString::null;
@@ -623,7 +623,7 @@ VALUE FXText_extractStyle(FXText const *self,FXint pos,FXint n){
623
623
  }
624
624
  return str;
625
625
  }
626
- VALUE FXText_findText(FXText *self,FXString const &string,FXint start,FXuint flags,FXint npar){
626
+ VALUE FXText_findText(FXText *self,FXString const &string,FXint start,FXuint flags){
627
627
  FXint* beg;
628
628
  FXint* end;
629
629
  VALUE ary=Qnil;
@@ -1082,7 +1082,7 @@ static VALUE _wrap_FXText_onCmdSetStringValue(int argc, VALUE *argv, VALUE self)
1082
1082
  VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
1083
1083
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXText, 1);
1084
1084
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
1085
- value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; }
1085
+ value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; }
1086
1086
  result = (long)(arg1)->onCmdSetStringValue(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
1087
1087
  static VALUE _wrap_FXText_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) { FXText *arg1 = (FXText *) 0 ;
1088
1088
  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) {
1294
1294
  if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
1295
1295
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXText, 1);
1296
1296
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
1297
- arg4 = static_cast<void*>(STR2CSTR(argv[2])); result = (long)(arg1)->onCmdInsertString(arg2,arg3,arg4);
1297
+ arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdInsertString(arg2,arg3,arg4);
1298
1298
  vresult = INT2NUM(result); return vresult; }
1299
1299
  static VALUE _wrap_FXText_onCmdInsertNewline(int argc, VALUE *argv, VALUE self) { FXText *arg1 = (FXText *) 0 ;
1300
1300
  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
1704
1704
  arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]); arg4 = NUM2INT(argv[2]); if (argc > 3) { arg5 = to_FXbool(argv[3]); }
1705
1705
  result = (FXint)(arg1)->shiftText(arg2,arg3,arg4,arg5); vresult = INT2NUM(result); return vresult; }
1706
1706
  static VALUE _wrap_FXText_findText(int argc, VALUE *argv, VALUE self) { FXText *arg1 = (FXText *) 0 ; FXString *arg2 = 0 ;
1707
- FXint arg3 = (FXint) 0 ; FXuint arg4 = (FXuint) SEARCH_FORWARD|SEARCH_WRAP|SEARCH_EXACT ; FXint arg5 = (FXint) 1 ;
1708
- VALUE result; SwigValueWrapper<FXString > p2 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 4))
1707
+ FXint arg3 = (FXint) 0 ; FXuint arg4 = (FXuint) SEARCH_FORWARD|SEARCH_WRAP|SEARCH_EXACT ; VALUE result;
1708
+ SwigValueWrapper<FXString > p2 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 3))
1709
1709
  rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXText, 1);
1710
1710
  p2 = to_FXString(argv[0]); arg2 = &p2; if (argc > 1) { arg3 = NUM2INT(argv[1]); } if (argc > 2) {
1711
- arg4 = NUM2UINT(argv[2]); } if (argc > 3) { arg5 = NUM2INT(argv[3]); }
1712
- result = (VALUE)FXText_findText(arg1,(FXString const &)*arg2,arg3,arg4,arg5); vresult = result; return vresult; }
1711
+ arg4 = NUM2UINT(argv[2]); } result = (VALUE)FXText_findText(arg1,(FXString const &)*arg2,arg3,arg4); vresult = result;
1712
+ return vresult; }
1713
1713
  static VALUE _wrap_FXText_isPosSelected(int argc, VALUE *argv, VALUE self) { FXText *arg1 = (FXText *) 0 ; FXint arg2 ;
1714
1714
  FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
1715
1715
  rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXText, 1);
@@ -569,7 +569,7 @@ inline FXColor to_FXColor(VALUE obj){
569
569
  inline FXString to_FXString(VALUE obj){
570
570
  if(!NIL_P(obj)){
571
571
  Check_Type(obj,T_STRING);
572
- return FXString(STR2CSTR(obj));
572
+ return FXString(StringValuePtr(obj));
573
573
  }
574
574
  else{
575
575
  return FXString::null;
@@ -620,7 +620,8 @@ void FXFoldingList_setHeaders(FXFoldingList *self,VALUE stringArray,FXint size){
620
620
  const FXchar **strings;
621
621
  if(FXMALLOC(&strings,FXchar*,len+1)){
622
622
  for(long i=0;i<len;i++){
623
- strings[i]=STR2CSTR(rb_ary_entry(stringArray,i));
623
+ VALUE s=rb_ary_entry(stringArray,i);
624
+ strings[i]=StringValuePtr(s);
624
625
  }
625
626
  strings[len]=0;
626
627
  self->setHeaders(strings,size);
@@ -1387,8 +1388,8 @@ static VALUE _wrap_FXFoldingList_fillItems(int argc, VALUE *argv, VALUE self) {
1387
1388
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFoldingList, 1);
1388
1389
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXFoldingItem, 1); { arg3 = NULL; if(!NIL_P(argv[1])){
1389
1390
  Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY(argv[1])->len)+1) {
1390
- for (long i = 0; i < RARRAY(argv[1])->len; i++) { arg3[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[1], i)); }
1391
- arg3[RARRAY(argv[1])->len] = 0; } } } if (argc > 2) {
1391
+ for (long i = 0; i < RARRAY(argv[1])->len; i++) { VALUE e = rb_ary_entry(argv[1], i);
1392
+ arg3[i] = (FXchar *) StringValuePtr(e); } arg3[RARRAY(argv[1])->len] = 0; } } } if (argc > 2) {
1392
1393
  SWIG_ConvertPtr(argv[2], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); } if (argc > 3) {
1393
1394
  SWIG_ConvertPtr(argv[3], (void **) &arg5, SWIGTYPE_p_FXIcon, 1); } if (argc > 4) {
1394
1395
  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
2594
2595
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTreeList, 1);
2595
2596
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXTreeItem, 1); { arg3 = NULL; if(!NIL_P(argv[1])){
2596
2597
  Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY(argv[1])->len)+1) {
2597
- for (long i = 0; i < RARRAY(argv[1])->len; i++) { arg3[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[1], i)); }
2598
- arg3[RARRAY(argv[1])->len] = 0; } } } if (argc > 2) {
2598
+ for (long i = 0; i < RARRAY(argv[1])->len; i++) { VALUE e = rb_ary_entry(argv[1], i);
2599
+ arg3[i] = (FXchar *) StringValuePtr(e); } arg3[RARRAY(argv[1])->len] = 0; } } } if (argc > 2) {
2599
2600
  SWIG_ConvertPtr(argv[2], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); } if (argc > 3) {
2600
2601
  SWIG_ConvertPtr(argv[3], (void **) &arg5, SWIGTYPE_p_FXIcon, 1); } if (argc > 4) {
2601
2602
  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) {
3540
3541
  if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
3541
3542
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDirList, 1);
3542
3543
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
3543
- arg4 = static_cast<void*>(STR2CSTR(argv[2])); result = (long)(arg1)->onCmdSetValue(arg2,arg3,arg4);
3544
+ arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdSetValue(arg2,arg3,arg4);
3544
3545
  vresult = INT2NUM(result); return vresult; }
3545
3546
  static VALUE _wrap_FXDirList_onCmdSetStringValue(int argc, VALUE *argv, VALUE self) { FXDirList *arg1 = (FXDirList *) 0 ;
3546
3547
  FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; FXString value4 ;
3547
3548
  VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
3548
3549
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDirList, 1);
3549
3550
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
3550
- value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; }
3551
+ value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; }
3551
3552
  result = (long)(arg1)->onCmdSetStringValue(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
3552
3553
  static VALUE _wrap_FXDirList_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) { FXDirList *arg1 = (FXDirList *) 0 ;
3553
3554
  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)
3632
3633
  if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
3633
3634
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDirList, 1);
3634
3635
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
3635
- arg4 = static_cast<void*>(STR2CSTR(argv[2])); result = (long)(arg1)->onCmdSetPattern(arg2,arg3,arg4);
3636
+ arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdSetPattern(arg2,arg3,arg4);
3636
3637
  vresult = INT2NUM(result); return vresult; }
3637
3638
  static VALUE _wrap_FXDirList_onUpdSetPattern(int argc, VALUE *argv, VALUE self) { FXDirList *arg1 = (FXDirList *) 0 ;
3638
3639
  FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
@@ -600,7 +600,7 @@ inline FXColor to_FXColor(VALUE obj){
600
600
  inline FXString to_FXString(VALUE obj){
601
601
  if(!NIL_P(obj)){
602
602
  Check_Type(obj,T_STRING);
603
- return FXString(STR2CSTR(obj));
603
+ return FXString(StringValuePtr(obj));
604
604
  }
605
605
  else{
606
606
  return FXString::null;
@@ -951,13 +951,13 @@ VALUE FXFileSelector_getFilenames(FXFileSelector const *self){
951
951
  void FXFileSelector_setPatternList(FXFileSelector *self,VALUE ary){
952
952
  FXString patterns;
953
953
  if(TYPE(ary)==T_STRING){
954
- patterns=FXString(STR2CSTR(ary));
954
+ patterns=FXString(StringValuePtr(ary));
955
955
  }
956
956
  else if(TYPE(ary)==T_ARRAY){
957
957
  for(long i=0; i<RARRAY(ary)->len; i++){
958
958
  VALUE obj=rb_ary_entry(ary,i);
959
959
  Check_Type(obj,T_STRING);
960
- patterns+=FXString(STR2CSTR(obj))+FXString("\n");
960
+ patterns+=FXString(StringValuePtr(obj))+FXString("\n");
961
961
  }
962
962
  }
963
963
  else{
@@ -2629,7 +2629,7 @@ static VALUE _wrap_FXToolTip_onCmdSetStringValue(int argc, VALUE *argv, VALUE se
2629
2629
  VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
2630
2630
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToolTip, 1);
2631
2631
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
2632
- value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; }
2632
+ value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; }
2633
2633
  result = (long)(arg1)->onCmdSetStringValue(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
2634
2634
  #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
2635
2635
  static VALUE _wrap_FXToolTip_allocate(VALUE self) {
@@ -4780,14 +4780,14 @@ static VALUE _wrap_FXComboBox_onTextChanged(int argc, VALUE *argv, VALUE self) {
4780
4780
  if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
4781
4781
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComboBox, 1);
4782
4782
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
4783
- arg4 = static_cast<void*>(STR2CSTR(argv[2])); result = (long)(arg1)->onTextChanged(arg2,arg3,arg4);
4783
+ arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onTextChanged(arg2,arg3,arg4);
4784
4784
  vresult = INT2NUM(result); return vresult; }
4785
4785
  static VALUE _wrap_FXComboBox_onTextCommand(int argc, VALUE *argv, VALUE self) { FXComboBox *arg1 = (FXComboBox *) 0 ;
4786
4786
  FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
4787
4787
  if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
4788
4788
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComboBox, 1);
4789
4789
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
4790
- arg4 = static_cast<void*>(STR2CSTR(argv[2])); result = (long)(arg1)->onTextCommand(arg2,arg3,arg4);
4790
+ arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onTextCommand(arg2,arg3,arg4);
4791
4791
  vresult = INT2NUM(result); return vresult; }
4792
4792
  static VALUE _wrap_FXComboBox_onListClicked(int argc, VALUE *argv, VALUE self) { FXComboBox *arg1 = (FXComboBox *) 0 ;
4793
4793
  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
4918
4918
  rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
4919
4919
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComboBox, 1); { arg2 = NULL; if(!NIL_P(argv[0])){
4920
4920
  Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY(argv[0])->len)+1) {
4921
- for (long i = 0; i < RARRAY(argv[0])->len; i++) { arg2[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[0], i)); }
4922
- arg2[RARRAY(argv[0])->len] = 0; } } } result = (FXint)(arg1)->fillItems((FXchar const **)arg2);
4923
- vresult = INT2NUM(result); FXFREE(&arg2); return vresult; }
4921
+ for (long i = 0; i < RARRAY(argv[0])->len; i++) { VALUE e = rb_ary_entry(argv[0], i);
4922
+ arg2[i] = (FXchar *) StringValuePtr(e); } arg2[RARRAY(argv[0])->len] = 0; } } }
4923
+ result = (FXint)(arg1)->fillItems((FXchar const **)arg2); vresult = INT2NUM(result); FXFREE(&arg2); return vresult; }
4924
4924
  static VALUE _wrap_FXComboBox_insertItem(int argc, VALUE *argv, VALUE self) { FXComboBox *arg1 = (FXComboBox *) 0 ; FXint arg2 ;
4925
4925
  FXString *arg3 = 0 ; void *arg4 = (void *) 0 ; FXint result; SwigValueWrapper<FXString > p3 ; VALUE vresult = Qnil;
4926
4926
  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
5383
5383
  if ((argc < 1) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
5384
5384
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXListBox, 1); { arg2 = NULL; if(!NIL_P(argv[0])){
5385
5385
  Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY(argv[0])->len)+1) {
5386
- for (long i = 0; i < RARRAY(argv[0])->len; i++) { arg2[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[0], i)); }
5387
- arg2[RARRAY(argv[0])->len] = 0; } } } if (argc > 1) {
5386
+ for (long i = 0; i < RARRAY(argv[0])->len; i++) { VALUE e = rb_ary_entry(argv[0], i);
5387
+ arg2[i] = (FXchar *) StringValuePtr(e); } arg2[RARRAY(argv[0])->len] = 0; } } } if (argc > 1) {
5388
5388
  SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXIcon, 1); } if (argc > 2) {
5389
5389
  arg4 = (argv[2] == Qnil) ? NULL : (void *) argv[2]; }
5390
5390
  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) {
5842
5842
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTreeListBox, 1);
5843
5843
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXTreeItem, 1); { arg3 = NULL; if(!NIL_P(argv[1])){
5844
5844
  Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY(argv[1])->len)+1) {
5845
- for (long i = 0; i < RARRAY(argv[1])->len; i++) { arg3[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[1], i)); }
5846
- arg3[RARRAY(argv[1])->len] = 0; } } } if (argc > 2) {
5845
+ for (long i = 0; i < RARRAY(argv[1])->len; i++) { VALUE e = rb_ary_entry(argv[1], i);
5846
+ arg3[i] = (FXchar *) StringValuePtr(e); } arg3[RARRAY(argv[1])->len] = 0; } } } if (argc > 2) {
5847
5847
  SWIG_ConvertPtr(argv[2], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); } if (argc > 3) {
5848
5848
  SWIG_ConvertPtr(argv[3], (void **) &arg5, SWIGTYPE_p_FXIcon, 1); } if (argc > 4) {
5849
5849
  arg6 = (argv[4] == Qnil) ? NULL : (void *) argv[4]; }
@@ -6885,14 +6885,14 @@ static VALUE _wrap_FXDirBox_onCmdSetValue(int argc, VALUE *argv, VALUE self) { F
6885
6885
  if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
6886
6886
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDirBox, 1);
6887
6887
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
6888
- arg4 = static_cast<void*>(STR2CSTR(argv[2])); result = (long)(arg1)->onCmdSetValue(arg2,arg3,arg4);
6888
+ arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdSetValue(arg2,arg3,arg4);
6889
6889
  vresult = INT2NUM(result); return vresult; }
6890
6890
  static VALUE _wrap_FXDirBox_onCmdSetStringValue(int argc, VALUE *argv, VALUE self) { FXDirBox *arg1 = (FXDirBox *) 0 ;
6891
6891
  FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; FXString value4 ;
6892
6892
  VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
6893
6893
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDirBox, 1);
6894
6894
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
6895
- value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; }
6895
+ value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; }
6896
6896
  result = (long)(arg1)->onCmdSetStringValue(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
6897
6897
  static VALUE _wrap_FXDirBox_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) { FXDirBox *arg1 = (FXDirBox *) 0 ;
6898
6898
  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) {
7137
7137
  if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
7138
7138
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDriveBox, 1);
7139
7139
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
7140
- arg4 = static_cast<void*>(STR2CSTR(argv[2])); result = (long)(arg1)->onCmdSetValue(arg2,arg3,arg4);
7140
+ arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdSetValue(arg2,arg3,arg4);
7141
7141
  vresult = INT2NUM(result); return vresult; }
7142
7142
  static VALUE _wrap_FXDriveBox_onCmdSetStringValue(int argc, VALUE *argv, VALUE self) { FXDriveBox *arg1 = (FXDriveBox *) 0 ;
7143
7143
  FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; FXString value4 ;
7144
7144
  VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
7145
7145
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDriveBox, 1);
7146
7146
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
7147
- value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; }
7147
+ value4 = FXString(StringValuePtr(argv[2])); arg4 = (void *) &value4; }
7148
7148
  result = (long)(arg1)->onCmdSetStringValue(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
7149
7149
  static VALUE _wrap_FXDriveBox_onCmdGetStringValue(int argc, VALUE *argv, VALUE self) { FXDriveBox *arg1 = (FXDriveBox *) 0 ;
7150
7150
  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)
7736
7736
  if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
7737
7737
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileSelector, 1);
7738
7738
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
7739
- arg4 = static_cast<void*>(STR2CSTR(argv[2])); result = (long)(arg1)->onCmdFilter(arg2,arg3,arg4); vresult = INT2NUM(result);
7740
- return vresult; }
7739
+ arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdFilter(arg2,arg3,arg4);
7740
+ vresult = INT2NUM(result); return vresult; }
7741
7741
  static VALUE _wrap_FXFileSelector_onCmdItemDblClicked(int argc, VALUE *argv, VALUE self) {
7742
7742
  FXFileSelector *arg1 = (FXFileSelector *) 0 ; FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ;
7743
7743
  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
7781
7781
  rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
7782
7782
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileSelector, 1);
7783
7783
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
7784
- arg4 = static_cast<void*>(STR2CSTR(argv[2])); result = (long)(arg1)->onCmdDirTree(arg2,arg3,arg4);
7784
+ arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdDirTree(arg2,arg3,arg4);
7785
7785
  vresult = INT2NUM(result); return vresult; }
7786
7786
  static VALUE _wrap_FXFileSelector_onCmdHome(int argc, VALUE *argv, VALUE self) { FXFileSelector *arg1 = (FXFileSelector *) 0 ;
7787
7787
  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)
7807
7807
  if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
7808
7808
  SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileSelector, 1);
7809
7809
  SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
7810
- arg4 = static_cast<void*>(STR2CSTR(argv[2])); result = (long)(arg1)->onCmdVisit(arg2,arg3,arg4); vresult = INT2NUM(result);
7811
- return vresult; }
7810
+ arg4 = static_cast<void*>(StringValuePtr(argv[2])); result = (long)(arg1)->onCmdVisit(arg2,arg3,arg4);
7811
+ vresult = INT2NUM(result); return vresult; }
7812
7812
  static VALUE _wrap_FXFileSelector_onCmdNew(int argc, VALUE *argv, VALUE self) { FXFileSelector *arg1 = (FXFileSelector *) 0 ;
7813
7813
  FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
7814
7814
  if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
@@ -2402,6 +2402,17 @@ module Fox
2402
2402
  params = default_params.merge(params)
2403
2403
  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)
2404
2404
  end
2405
+ alias old_findText findText
2406
+ def findText(string, *args)
2407
+ argument_names = %w{start flags}
2408
+ default_params = { :start => 0, :flags => SEARCH_FORWARD|SEARCH_WRAP|SEARCH_EXACT }
2409
+ params = {}
2410
+ params = args.pop if args.last.is_a? Hash
2411
+ args.each_with_index { |e, i| params[argument_names[i].intern] = e }
2412
+ params.keys.each { |key| raise ArgumentError, "Unrecognized parameter #{key}" unless default_params.keys.include?(key) }
2413
+ params = default_params.merge(params)
2414
+ old_findText(string, params[:start], params[:flags])
2415
+ end
2405
2416
  end
2406
2417
 
2407
2418
  class FXTextField
@@ -3,7 +3,7 @@ module Fox
3
3
  # Returns the FXRuby version number as a string, e.g. "1.0.19".
4
4
  #
5
5
  def Fox.fxrubyversion
6
- "1.6.13"
6
+ "1.6.14"
7
7
  end
8
8
  end
9
9
 
@@ -113,7 +113,8 @@ module Fox
113
113
  def release(); end
114
114
 
115
115
  #
116
- # Rescale pixels image to the specified width and height. Note that this
116
+ # Rescale pixels image to the specified width and height and then
117
+ # re-render the server-side image from the client-side pixel buffer. Note that this
117
118
  # serves a slightly different purpose than the base class resize() method,
118
119
  # which simply resizes the client-side pixel data buffer but doesn't
119
120
  # transform the image.
@@ -132,7 +133,8 @@ module Fox
132
133
  def scale(w, h, quality=0) ; end
133
134
 
134
135
  #
135
- # Mirror image horizontally and/or vertically.
136
+ # Mirror image horizontally and/or vertically and then re-render the
137
+ # server-side image from the client-side pixel buffer.
136
138
  #
137
139
  # ==== Parameters:
138
140
  #
@@ -142,7 +144,8 @@ module Fox
142
144
  def mirror(horizontal, vertical) ; end
143
145
 
144
146
  #
145
- # Rotate image counter-clockwise by some number of degrees.
147
+ # Rotate image counter-clockwise by some number of degrees and then
148
+ # re-render the server-side image from the client-side pixel buffer.
146
149
  #
147
150
  # ==== Parameters:
148
151
  #
@@ -151,7 +154,8 @@ module Fox
151
154
  def rotate(degrees) ; end
152
155
 
153
156
  #
154
- # Crop image to given rectangle; this calls resize() to adjust the client
157
+ # Crop image to given rectangle and then re-render the server-side image
158
+ # from the client-side pixel buffer. This method calls resize() to adjust the client
155
159
  # and server side representations. The new image may be smaller or larger
156
160
  # than the old one; blank areas are filled with color. There must be at
157
161
  # least one pixel of overlap between the old and the new image.
@@ -182,7 +186,8 @@ module Fox
182
186
  def fade(color, factor=255); end
183
187
 
184
188
  #
185
- # Shear image horizontally; the number of pixels is equal to the
189
+ # Shear image horizontally and then re-render the server-side image
190
+ # from the client-side pixel buffer. The number of pixels is equal to the
186
191
  # _shear_ parameter times 256. The area outside the image is filled
187
192
  # with transparent black, unless another _color_ is specified.
188
193
  #
@@ -194,7 +199,8 @@ module Fox
194
199
  def xshear(shear, color=0); end
195
200
 
196
201
  #
197
- # Shear image vertically; the number of pixels is equal to the
202
+ # Shear image verticallyand then re-render the server-side image
203
+ # from the client-side pixel buffer. The number of pixels is equal to the
198
204
  # _shear_ parameter times 256. The area outside the image is filled
199
205
  # with transparent black, unless another _color_ is specified.
200
206
  #