fxruby 1.6.16 → 1.6.17

data/ext/fox16/dialogs_wrap.cpp

@@ -773,7 +773,7 @@ void FXFileDialog_setPatternList(FXFileDialog *self,VALUE ary){
         patterns=FXString(StringValuePtr(ary));
         }
       else if(TYPE(ary)==T_ARRAY){
-        for(long i=0; i<RARRAY(ary)->len; i++){
+        for(long i=0; i<RARRAY_LEN(ary); i++){
           VALUE obj=rb_ary_entry(ary,i);
           Check_Type(obj,T_STRING);
           patterns+=FXString(StringValuePtr(obj))+FXString("\n");
@@ -5260,9 +5260,9 @@ static VALUE _wrap_new_FXChoiceBox__SWIG_0(int argc, VALUE *argv, VALUE self) {
     if ((argc < 5) || (argc > 10)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc);
     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++) { VALUE e = rb_ary_entry(argv[4], i);
-                    arg5[i] = (FXchar *) StringValuePtr(e); }  arg5[RARRAY(argv[4])->len] = 0; }  }  }  if (argc > 5) {
+        if(!NIL_P(argv[4])){ Check_Type(argv[4], T_ARRAY); if (FXMALLOC(&arg5, FXchar *, RARRAY_LEN(argv[4]))+1) {
+                for (long i = 0; i < RARRAY_LEN(argv[4]); i++) { VALUE e = rb_ary_entry(argv[4], i);
+                    arg5[i] = (FXchar *) StringValuePtr(e); }  arg5[RARRAY_LEN(argv[4])] = 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);
@@ -5285,9 +5285,9 @@ static VALUE _wrap_new_FXChoiceBox__SWIG_1(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc);
     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++) { VALUE e = rb_ary_entry(argv[4], i);
-                    arg5[i] = (FXchar *) StringValuePtr(e); }  arg5[RARRAY(argv[4])->len] = 0; }  }  }  if (argc > 5) {
+        if(!NIL_P(argv[4])){ Check_Type(argv[4], T_ARRAY); if (FXMALLOC(&arg5, FXchar *, RARRAY_LEN(argv[4]))+1) {
+                for (long i = 0; i < RARRAY_LEN(argv[4]); i++) { VALUE e = rb_ary_entry(argv[4], i);
+                    arg5[i] = (FXchar *) StringValuePtr(e); }  arg5[RARRAY_LEN(argv[4])] = 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);
@@ -5301,7 +5301,7 @@ static VALUE _wrap_new_FXChoiceBox(int nargs, VALUE *args, VALUE self) { int arg
                     _v = (NIL_P(argv[2]) || TYPE(argv[2]) == T_STRING) ? 1 : 0; }  if (_v) { { void *ptr;
                         _v = (NIL_P(argv[3]) || (TYPE(argv[3]) == T_DATA && SWIG_ConvertPtr(argv[3], &ptr, SWIGTYPE_p_FXIcon, 0) != -1)) ? 1 : 0; }
                      if (_v) { { _v = (TYPE(argv[4]) == T_ARRAY) ? 1 : 0; if (_v != 0) {
-                                for (long i = 0; i < RARRAY(argv[4])->len; i++) {
+                                for (long i = 0; i < RARRAY_LEN(argv[4]); i++) {
                                     if (TYPE(rb_ary_entry(argv[4], i)) != T_STRING) { _v = 0; break; }  }  }  }  if (_v) {
                             if (argc <= 5) { return _wrap_new_FXChoiceBox__SWIG_0(nargs, args, self);}  {
                                 _v = ((TYPE(argv[5]) == T_FIXNUM) || (TYPE(argv[5]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
@@ -5320,7 +5320,7 @@ static VALUE _wrap_new_FXChoiceBox(int nargs, VALUE *args, VALUE self) { int arg
                     _v = (NIL_P(argv[2]) || TYPE(argv[2]) == T_STRING) ? 1 : 0; }  if (_v) { { void *ptr;
                         _v = (NIL_P(argv[3]) || (TYPE(argv[3]) == T_DATA && SWIG_ConvertPtr(argv[3], &ptr, SWIGTYPE_p_FXIcon, 0) != -1)) ? 1 : 0; }
                      if (_v) { { _v = (TYPE(argv[4]) == T_ARRAY) ? 1 : 0; if (_v != 0) {
-                                for (long i = 0; i < RARRAY(argv[4])->len; i++) {
+                                for (long i = 0; i < RARRAY_LEN(argv[4]); i++) {
                                     if (TYPE(rb_ary_entry(argv[4], i)) != T_STRING) { _v = 0; break; }  }  }  }  if (_v) {
                             if (argc <= 5) { return _wrap_new_FXChoiceBox__SWIG_1(nargs, args, self);}  {
                                 _v = ((TYPE(argv[5]) == T_FIXNUM) || (TYPE(argv[5]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
@@ -5341,9 +5341,9 @@ static VALUE _wrap_FXChoiceBox_ask__SWIG_0(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXWindow, 1); arg2 = NUM2UINT(argv[1]);
     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++) { VALUE e = rb_ary_entry(argv[5], i);
-                    arg6[i] = (FXchar *) StringValuePtr(e); }  arg6[RARRAY(argv[5])->len] = 0; }  }  } 
+            Check_Type(argv[5], T_ARRAY); if (FXMALLOC(&arg6, FXchar *, RARRAY_LEN(argv[5]))+1) {
+                for (long i = 0; i < RARRAY_LEN(argv[5]); i++) { VALUE e = rb_ary_entry(argv[5], i);
+                    arg6[i] = (FXchar *) StringValuePtr(e); }  arg6[RARRAY_LEN(argv[5])] = 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 ;
@@ -5353,9 +5353,9 @@ static VALUE _wrap_FXChoiceBox_ask__SWIG_1(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); arg2 = NUM2UINT(argv[1]);
     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++) { VALUE e = rb_ary_entry(argv[5], i);
-                    arg6[i] = (FXchar *) StringValuePtr(e); }  arg6[RARRAY(argv[5])->len] = 0; }  }  } 
+            Check_Type(argv[5], T_ARRAY); if (FXMALLOC(&arg6, FXchar *, RARRAY_LEN(argv[5]))+1) {
+                for (long i = 0; i < RARRAY_LEN(argv[5]); i++) { VALUE e = rb_ary_entry(argv[5], i);
+                    arg6[i] = (FXchar *) StringValuePtr(e); }  arg6[RARRAY_LEN(argv[5])] = 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;
@@ -5366,7 +5366,7 @@ static VALUE _wrap_FXChoiceBox_ask(int nargs, VALUE *args, VALUE self) { int arg
                         _v = (NIL_P(argv[3]) || TYPE(argv[3]) == T_STRING) ? 1 : 0; }  if (_v) { { void *ptr;
                             _v = (NIL_P(argv[4]) || (TYPE(argv[4]) == T_DATA && SWIG_ConvertPtr(argv[4], &ptr, SWIGTYPE_p_FXIcon, 0) != -1)) ? 1 : 0; }
                          if (_v) { { _v = (TYPE(argv[5]) == T_ARRAY) ? 1 : 0; if (_v != 0) {
-                                    for (long i = 0; i < RARRAY(argv[5])->len; i++) {
+                                    for (long i = 0; i < RARRAY_LEN(argv[5]); i++) {
                                         if (TYPE(rb_ary_entry(argv[5], i)) != T_STRING) { _v = 0; break; }  }  }  }  if (_v) {
                                 return _wrap_FXChoiceBox_ask__SWIG_0(nargs, args, self);}  }  }  }  }  }  }  if (argc == 6) {
         int _v; { void *ptr;
@@ -5376,7 +5376,7 @@ static VALUE _wrap_FXChoiceBox_ask(int nargs, VALUE *args, VALUE self) { int arg
                         _v = (NIL_P(argv[3]) || TYPE(argv[3]) == T_STRING) ? 1 : 0; }  if (_v) { { void *ptr;
                             _v = (NIL_P(argv[4]) || (TYPE(argv[4]) == T_DATA && SWIG_ConvertPtr(argv[4], &ptr, SWIGTYPE_p_FXIcon, 0) != -1)) ? 1 : 0; }
                          if (_v) { { _v = (TYPE(argv[5]) == T_ARRAY) ? 1 : 0; if (_v != 0) {
-                                    for (long i = 0; i < RARRAY(argv[5])->len; i++) {
+                                    for (long i = 0; i < RARRAY_LEN(argv[5]); i++) {
                                         if (TYPE(rb_ary_entry(argv[5], i)) != T_STRING) { _v = 0; break; }  }  }  }  if (_v) {
                                 return _wrap_FXChoiceBox_ask__SWIG_1(nargs, args, self);}  }  }  }  }  }  } 
     rb_raise(rb_eArgError, "No matching function for overloaded 'FXChoiceBox_ask'"); return Qnil; }

data/ext/fox16/frames_wrap.cpp

@@ -3288,9 +3288,9 @@ static VALUE _wrap_FXHeader_fillItems(int argc, VALUE *argv, VALUE self) { FXHea
     FXbool arg6 = (FXbool) 0 ; FXint result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 5))
     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++) { VALUE e = rb_ary_entry(argv[0], i);
-                    arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY(argv[0])->len] = 0; }  }  }  if (argc > 1) {
+            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0]))+1) {
+                for (long i = 0; i < RARRAY_LEN(argv[0]); i++) { VALUE e = rb_ary_entry(argv[0], i);
+                    arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY_LEN(argv[0])] = 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);

data/ext/fox16/fx3d_wrap.cpp

@@ -1000,6 +1000,12 @@ void FXRangef___setitem__(FXRangef *self,FXint i,FXVec3f &slice){
         }
       (*self)[i]=slice;
       }
+FXVec3f FXRangef_upper(FXRangef const *self){
+      return self->upper;
+      }
+FXVec3f FXRangef_lower(FXRangef const *self){
+      return self->lower;
+      }
 bool FXRangef_overlaps(FXRangef const *self,FXRangef const &other){
       return FX::overlap(*self,other);
       }
@@ -4485,28 +4491,6 @@ static VALUE _wrap_FXMat4d_invert(int argc, VALUE *argv, VALUE self) { FXMat4d *
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMat4d, 1); result = ((FXMat4d const *)arg1)->invert(); {
         FXMat4d * resultptr; resultptr = new FXMat4d((FXMat4d &)result);
         vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXMat4d, 1); }  return vresult; }
-static VALUE _wrap_FXRangef_lower_set(int argc, VALUE *argv, VALUE self) { FXRangef *arg1 = (FXRangef *) 0 ;
-    FXVec3f *arg2 = (FXVec3f *) 0 ; FXVec3f tmp2 ; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRangef, 1); { if (TYPE(argv[0]) == T_ARRAY) {
-            tmp2 = FXVec3f(NUM2DBL(rb_ary_entry(argv[0], 0)), NUM2DBL(rb_ary_entry(argv[0], 1)), NUM2DBL(rb_ary_entry(argv[0], 2)));
-            arg2 = &tmp2; }  else { SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXVec3f, 1); }  } 
-    if (arg1) (arg1)->lower = *arg2; return Qnil; }
-static VALUE _wrap_FXRangef_lower_get(int argc, VALUE *argv, VALUE self) { FXRangef *arg1 = (FXRangef *) 0 ; FXVec3f *result;
-    VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRangef, 1); result = (FXVec3f *)& ((arg1)->lower);
-    vresult = FXRbGetRubyObj(result, "FXVec3f *"); return vresult; }
-static VALUE _wrap_FXRangef_upper_set(int argc, VALUE *argv, VALUE self) { FXRangef *arg1 = (FXRangef *) 0 ;
-    FXVec3f *arg2 = (FXVec3f *) 0 ; FXVec3f tmp2 ; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRangef, 1); { if (TYPE(argv[0]) == T_ARRAY) {
-            tmp2 = FXVec3f(NUM2DBL(rb_ary_entry(argv[0], 0)), NUM2DBL(rb_ary_entry(argv[0], 1)), NUM2DBL(rb_ary_entry(argv[0], 2)));
-            arg2 = &tmp2; }  else { SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXVec3f, 1); }  } 
-    if (arg1) (arg1)->upper = *arg2; return Qnil; }
-static VALUE _wrap_FXRangef_upper_get(int argc, VALUE *argv, VALUE self) { FXRangef *arg1 = (FXRangef *) 0 ; FXVec3f *result;
-    VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRangef, 1); result = (FXVec3f *)& ((arg1)->upper);
-    vresult = FXRbGetRubyObj(result, "FXVec3f *"); return vresult; }
 static VALUE _wrap_new_FXRangef__SWIG_0(int argc, VALUE *argv, VALUE self) { FXRangef *result; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); { result = (FXRangef *)new FXRangef();
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
@@ -4567,6 +4551,14 @@ static VALUE _wrap_FXRangef___setitem__(int argc, VALUE *argv, VALUE self) { FXR
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRangef, 1); arg2 = NUM2INT(argv[0]);
     SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXVec3f, 1); if (arg3 == NULL) rb_raise(rb_eTypeError, "null reference");
     FXRangef___setitem__(arg1,arg2,*arg3); return Qnil; }
+static VALUE _wrap_FXRangef_upper(int argc, VALUE *argv, VALUE self) { FXRangef *arg1 = (FXRangef *) 0 ; FXVec3f result;
+    VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRangef, 1); result = FXRangef_upper((FXRangef const *)arg1); {
+        FXVec3f* resultptr = new FXVec3f(result); vresult = FXRbGetRubyObj(resultptr, "FXVec3f *"); }  return vresult; }
+static VALUE _wrap_FXRangef_lower(int argc, VALUE *argv, VALUE self) { FXRangef *arg1 = (FXRangef *) 0 ; FXVec3f result;
+    VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRangef, 1); result = FXRangef_lower((FXRangef const *)arg1); {
+        FXVec3f* resultptr = new FXVec3f(result); vresult = FXRbGetRubyObj(resultptr, "FXVec3f *"); }  return vresult; }
 static VALUE _wrap_FXRangef_width(int argc, VALUE *argv, VALUE self) { FXRangef *arg1 = (FXRangef *) 0 ; FXfloat result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRangef, 1); result = (FXfloat)((FXRangef const *)arg1)->width();
@@ -7662,7 +7654,7 @@ static VALUE _wrap_FXGLObject_identify(int argc, VALUE *argv, VALUE self) { FXGL
     FXuint *arg2 = (FXuint *) 0 ; FXint arg3 ; FXGLObject *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_FXGLObject, 1); { Check_Type(argv[0], T_ARRAY);
-        FXMALLOC(&arg2,FXuint,RARRAY(argv[0])->len); arg3=static_cast<FXint>(RARRAY(argv[0])->len); for(FXint i=0; i<arg3; i++){
+        FXMALLOC(&arg2,FXuint,RARRAY_LEN(argv[0])); arg3=static_cast<FXint>(RARRAY_LEN(argv[0])); for(FXint i=0; i<arg3; i++){
             arg2[i]=NUM2UINT(rb_ary_entry(argv[0],i)); }  }  result = (FXGLObject *)FXGLObject_identify(arg1,arg2,arg3); {
         swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXGLObject, (void **) &result);
         vresult = FXRbGetRubyObj(result, ty); }  { FXFREE(&arg2); }  return vresult; }
@@ -7866,7 +7858,7 @@ static VALUE _wrap_FXGLShape_identify(int argc, VALUE *argv, VALUE self) { FXGLS
     FXuint *arg2 = (FXuint *) 0 ; FXint arg3 ; FXGLObject *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_FXGLShape, 1); { Check_Type(argv[0], T_ARRAY);
-        FXMALLOC(&arg2,FXuint,RARRAY(argv[0])->len); arg3=static_cast<FXint>(RARRAY(argv[0])->len); for(FXint i=0; i<arg3; i++){
+        FXMALLOC(&arg2,FXuint,RARRAY_LEN(argv[0])); arg3=static_cast<FXint>(RARRAY_LEN(argv[0])); for(FXint i=0; i<arg3; i++){
             arg2[i]=NUM2UINT(rb_ary_entry(argv[0],i)); }  }  result = (FXGLObject *)FXGLShape_identify(arg1,arg2,arg3); {
         swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXGLObject, (void **) &result);
         vresult = FXRbGetRubyObj(result, ty); }  { FXFREE(&arg2); }  return vresult; }
@@ -9954,12 +9946,10 @@ SWIGEXPORT(void) Init_fx3d(void) {
     SWIG_TypeClientData(SWIGTYPE_p_FXRangef, (void *) &cFXRangef);
     rb_define_alloc_func(cFXRangef.klass, _wrap_FXRangef_allocate);
     rb_define_method(cFXRangef.klass, "initialize", VALUEFUNC(_wrap_new_FXRangef), -1);
-    rb_define_method(cFXRangef.klass, "lower=", VALUEFUNC(_wrap_FXRangef_lower_set), -1);
-    rb_define_method(cFXRangef.klass, "lower", VALUEFUNC(_wrap_FXRangef_lower_get), -1);
-    rb_define_method(cFXRangef.klass, "upper=", VALUEFUNC(_wrap_FXRangef_upper_set), -1);
-    rb_define_method(cFXRangef.klass, "upper", VALUEFUNC(_wrap_FXRangef_upper_get), -1);
     rb_define_method(cFXRangef.klass, "[]", VALUEFUNC(_wrap_FXRangef___getitem__), -1);
     rb_define_method(cFXRangef.klass, "[]=", VALUEFUNC(_wrap_FXRangef___setitem__), -1);
+    rb_define_method(cFXRangef.klass, "upper", VALUEFUNC(_wrap_FXRangef_upper), -1);
+    rb_define_method(cFXRangef.klass, "lower", VALUEFUNC(_wrap_FXRangef_lower), -1);
     rb_define_method(cFXRangef.klass, "width", VALUEFUNC(_wrap_FXRangef_width), -1);
     rb_define_method(cFXRangef.klass, "height", VALUEFUNC(_wrap_FXRangef_height), -1);
     rb_define_method(cFXRangef.klass, "depth", VALUEFUNC(_wrap_FXRangef_depth), -1);

data/ext/fox16/iconlist_wrap.cpp

@@ -1301,9 +1301,9 @@ static VALUE _wrap_FXIconList_setHeaders(int argc, VALUE *argv, VALUE self) { FX
     FXchar **arg2 = (FXchar **) 0 ; FXint arg3 = (FXint) 1 ; if ((argc < 1) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXIconList, 1); { arg2 = NULL; if(!NIL_P(argv[0])){
-            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY(argv[0])->len)+1) {
-                for (long i = 0; i < RARRAY(argv[0])->len; i++) { VALUE e = rb_ary_entry(argv[0], i);
-                    arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY(argv[0])->len] = 0; }  }  }  if (argc > 1) {
+            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0]))+1) {
+                for (long i = 0; i < RARRAY_LEN(argv[0]); i++) { VALUE e = rb_ary_entry(argv[0], i);
+                    arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY_LEN(argv[0])] = 0; }  }  }  if (argc > 1) {
         arg3 = NUM2INT(argv[1]); }  (arg1)->setHeaders((FXchar const **)arg2,arg3); FXFREE(&arg2); return Qnil; }
 static VALUE _wrap_FXIconList_appendHeader(int argc, VALUE *argv, VALUE self) { FXIconList *arg1 = (FXIconList *) 0 ;
     FXString *arg2 = 0 ; FXIcon *arg3 = (FXIcon *) 0 ; FXint arg4 = (FXint) 1 ; SwigValueWrapper<FXString > p2 ;
@@ -1413,9 +1413,9 @@ static VALUE _wrap_FXIconList_fillItems(int argc, VALUE *argv, VALUE self) { FXI
     FXbool arg6 = (FXbool) 0 ; FXint result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 5))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXIconList, 1); { arg2 = NULL; if(!NIL_P(argv[0])){
-            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY(argv[0])->len)+1) {
-                for (long i = 0; i < RARRAY(argv[0])->len; i++) { VALUE e = rb_ary_entry(argv[0], i);
-                    arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY(argv[0])->len] = 0; }  }  }  if (argc > 1) {
+            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0]))+1) {
+                for (long i = 0; i < RARRAY_LEN(argv[0]); i++) { VALUE e = rb_ary_entry(argv[0], i);
+                    arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY_LEN(argv[0])] = 0; }  }  }  if (argc > 1) {
         SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXIcon, 1); }  if (argc > 2) {
         SWIG_ConvertPtr(argv[2], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); }  if (argc > 3) {
         arg5 = (argv[3] == Qnil) ? NULL : (void *) argv[3]; }  if (argc > 4) { arg6 = to_FXbool(argv[4]); } 

data/ext/fox16/icons_wrap.cpp

@@ -1101,7 +1101,7 @@ static void free_FXXPMIcon(FXXPMIcon *);
     
     // Confirm that the input is an array of strings
     Check_Type(strArray,T_ARRAY);
-    len=RARRAY(strArray)->len;
+    len=RARRAY_LEN(strArray);
     for(i=0; i<len; i++){
       str=rb_ary_entry(strArray,i);
       Check_Type(str,T_STRING);
@@ -1139,11 +1139,11 @@ static VALUE _wrap_new_FXIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 =
     FXColor arg3 = (FXColor) 0 ; FXuint arg4 = (FXuint) 0 ; FXint arg5 = (FXint) 1 ; FXint arg6 = (FXint) 1 ; FXIcon *result;
     if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { arg2=NULL; if(argv[1]!=Qnil){
-                Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
-                    for(long i=0; i<RARRAY(argv[1])->len; i++){
-                        arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }  }  }  }  if (argc > 2) {
-        arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) { arg5 = NUM2INT(argv[4]); } 
-    if (argc > 5) { arg6 = NUM2INT(argv[5]); }  { result = (FXIcon *)new_FXIcon(arg1,(FXColor const *)arg2,arg3,arg4,arg5,arg6);
+                Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY_LEN(argv[1]))){
+                    for(long i=0; i<RARRAY_LEN(argv[1]); i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }
+                     }  }  }  }  if (argc > 2) { arg3 = to_FXColor(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); } 
+    if (argc > 4) { arg5 = NUM2INT(argv[4]); }  if (argc > 5) { arg6 = NUM2INT(argv[5]); }  {
+        result = (FXIcon *)new_FXIcon(arg1,(FXColor const *)arg2,arg3,arg4,arg5,arg6);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  FXFREE(&arg2);
     return self; }
 static VALUE _wrap_FXIcon_getTransparentColor(int argc, VALUE *argv, VALUE self) { FXIcon *arg1 = (FXIcon *) 0 ; FXColor result;
@@ -1535,8 +1535,8 @@ static VALUE _wrap_fxsaveBMP(int argc, VALUE *argv, VALUE self) { FXStream *arg1
     FXint arg3 ; FXint arg4 ; bool result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 4))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
-    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
-                for(long i=0; i<RARRAY(argv[1])->len; i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
+    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY_LEN(argv[1]))){
+                for(long i=0; i<RARRAY_LEN(argv[1]); i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
              }  }  arg3 = NUM2INT(argv[2]); arg4 = NUM2INT(argv[3]);
     result = (bool)fxsaveBMP(*arg1,(FXColor const *)arg2,arg3,arg4); vresult = result ? Qtrue : Qfalse; FXFREE(&arg2);
     return vresult; }
@@ -1802,8 +1802,8 @@ static VALUE _wrap_fxsaveICO(int argc, VALUE *argv, VALUE self) { FXStream *arg1
     FXint arg3 ; FXint arg4 ; FXint arg5 = (FXint) -1 ; FXint arg6 = (FXint) -1 ; bool result; VALUE vresult = Qnil;
     if ((argc < 4) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
-    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
-                for(long i=0; i<RARRAY(argv[1])->len; i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
+    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY_LEN(argv[1]))){
+                for(long i=0; i<RARRAY_LEN(argv[1]); i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
              }  }  arg3 = NUM2INT(argv[2]); arg4 = NUM2INT(argv[3]); if (argc > 4) { arg5 = NUM2INT(argv[4]); }  if (argc > 5) {
         arg6 = NUM2INT(argv[5]); }  result = (bool)fxsaveICO(*arg1,(FXColor const *)arg2,arg3,arg4,arg5,arg6);
     vresult = result ? Qtrue : Qfalse; FXFREE(&arg2); return vresult; }
@@ -1956,8 +1956,8 @@ static VALUE _wrap_fxsaveJPG(int argc, VALUE *argv, VALUE self) { FXStream *arg1
     FXint arg3 ; FXint arg4 ; FXint arg5 ; bool result; VALUE vresult = Qnil; if ((argc < 5) || (argc > 5))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
-    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
-                for(long i=0; i<RARRAY(argv[1])->len; i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
+    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY_LEN(argv[1]))){
+                for(long i=0; i<RARRAY_LEN(argv[1]); i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
              }  }  arg3 = NUM2INT(argv[2]); arg4 = NUM2INT(argv[3]); arg5 = NUM2INT(argv[4]);
     result = (bool)fxsaveJPG(*arg1,(FXColor const *)arg2,arg3,arg4,arg5); vresult = result ? Qtrue : Qfalse; FXFREE(&arg2);
     return vresult; }
@@ -2098,8 +2098,8 @@ static VALUE _wrap_fxsavePCX(int argc, VALUE *argv, VALUE self) { FXStream *arg1
     FXint arg3 ; FXint arg4 ; bool result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 4))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
-    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
-                for(long i=0; i<RARRAY(argv[1])->len; i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
+    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY_LEN(argv[1]))){
+                for(long i=0; i<RARRAY_LEN(argv[1]); i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
              }  }  arg3 = NUM2INT(argv[2]); arg4 = NUM2INT(argv[3]);
     result = (bool)fxsavePCX(*arg1,(FXColor const *)arg2,arg3,arg4); vresult = result ? Qtrue : Qfalse; FXFREE(&arg2);
     return vresult; }
@@ -2243,8 +2243,8 @@ static VALUE _wrap_fxsavePNG(int argc, VALUE *argv, VALUE self) { FXStream *arg1
     FXint arg3 ; FXint arg4 ; bool result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 4))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
-    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
-                for(long i=0; i<RARRAY(argv[1])->len; i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
+    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY_LEN(argv[1]))){
+                for(long i=0; i<RARRAY_LEN(argv[1]); i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
              }  }  arg3 = NUM2INT(argv[2]); arg4 = NUM2INT(argv[3]);
     result = (bool)fxsavePNG(*arg1,(FXColor const *)arg2,arg3,arg4); vresult = result ? Qtrue : Qfalse; FXFREE(&arg2);
     return vresult; }
@@ -2385,8 +2385,8 @@ static VALUE _wrap_fxsavePPM(int argc, VALUE *argv, VALUE self) { FXStream *arg1
     FXint arg3 ; FXint arg4 ; bool result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 4))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
-    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
-                for(long i=0; i<RARRAY(argv[1])->len; i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
+    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY_LEN(argv[1]))){
+                for(long i=0; i<RARRAY_LEN(argv[1]); i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
              }  }  arg3 = NUM2INT(argv[2]); arg4 = NUM2INT(argv[3]);
     result = (bool)fxsavePPM(*arg1,(FXColor const *)arg2,arg3,arg4); vresult = result ? Qtrue : Qfalse; FXFREE(&arg2);
     return vresult; }
@@ -2527,8 +2527,8 @@ static VALUE _wrap_fxsaveRGB(int argc, VALUE *argv, VALUE self) { FXStream *arg1
     FXint arg3 ; FXint arg4 ; bool result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 4))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
-    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
-                for(long i=0; i<RARRAY(argv[1])->len; i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
+    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY_LEN(argv[1]))){
+                for(long i=0; i<RARRAY_LEN(argv[1]); i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
              }  }  arg3 = NUM2INT(argv[2]); arg4 = NUM2INT(argv[3]);
     result = (bool)fxsaveRGB(*arg1,(FXColor const *)arg2,arg3,arg4); vresult = result ? Qtrue : Qfalse; FXFREE(&arg2);
     return vresult; }
@@ -2669,8 +2669,8 @@ static VALUE _wrap_fxsaveTGA(int argc, VALUE *argv, VALUE self) { FXStream *arg1
     FXint arg3 ; FXint arg4 ; bool result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 4))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
-    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
-                for(long i=0; i<RARRAY(argv[1])->len; i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
+    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY_LEN(argv[1]))){
+                for(long i=0; i<RARRAY_LEN(argv[1]); i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
              }  }  arg3 = NUM2INT(argv[2]); arg4 = NUM2INT(argv[3]);
     result = (bool)fxsaveTGA(*arg1,(FXColor const *)arg2,arg3,arg4); vresult = result ? Qtrue : Qfalse; FXFREE(&arg2);
     return vresult; }
@@ -2966,8 +2966,8 @@ static VALUE _wrap_new_FXXPMIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg
     FXint arg6 = (FXint) 1 ; FXXPMIcon *result; if ((argc < 1) || (argc > 6))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { arg2 = NULL; if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY(argv[1])->len)) {
-                    for (long i = 0; i < RARRAY(argv[1])->len; i++) { VALUE e = rb_ary_entry(argv[1], i);
+                Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[1]))) {
+                    for (long i = 0; i < RARRAY_LEN(argv[1]); i++) { VALUE e = rb_ary_entry(argv[1], i);
                         arg2[i] = (FXchar *) StringValuePtr(e); }  }  }  }  }  if (argc > 2) { arg3 = to_FXColor(argv[2]); } 
     if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  if (argc > 4) { arg5 = NUM2INT(argv[4]); }  if (argc > 5) {
         arg6 = NUM2INT(argv[5]); }  { result = (FXXPMIcon *)new_FXXPMIcon(arg1,(FXchar const **)arg2,arg3,arg4,arg5,arg6);
@@ -3091,8 +3091,8 @@ static VALUE _wrap_fxsaveXPM(int argc, VALUE *argv, VALUE self) { FXStream *arg1
     FXint arg3 ; FXint arg4 ; bool arg5 = (bool) true ; bool result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 5))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
-    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
-                for(long i=0; i<RARRAY(argv[1])->len; i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
+    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY_LEN(argv[1]))){
+                for(long i=0; i<RARRAY_LEN(argv[1]); i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
              }  }  arg3 = NUM2INT(argv[2]); arg4 = NUM2INT(argv[3]); if (argc > 4) { arg5 = RTEST(argv[4]); } 
     result = (bool)fxsaveXPM(*arg1,(FXColor const *)arg2,arg3,arg4,arg5); vresult = result ? Qtrue : Qfalse; FXFREE(&arg2);
     return vresult; }

data/ext/fox16/image_wrap.cpp

@@ -694,8 +694,8 @@ FXImage *new_FXImage(FXApp *a,VALUE ary,FXuint opts,FXint w,FXint h){
       FXColor* pix=0;
       if(!NIL_P(ary)){
         Check_Type(ary,T_ARRAY);
-        if(FXMALLOC(&pix,FXColor,RARRAY(ary)->len)){
-          for(long i=0; i<RARRAY(ary)->len; i++){
+        if(FXMALLOC(&pix,FXColor,RARRAY_LEN(ary))){
+          for(long i=0; i<RARRAY_LEN(ary); i++){
             pix[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(ary,i)));
 	    }
           }
@@ -1145,8 +1145,8 @@ static VALUE _wrap_FXMemoryBuffer_allocate(VALUE self) {
          return vresult; }
 static VALUE _wrap_new_FXMemoryBuffer(int argc, VALUE *argv, VALUE self) { FXColor *arg1 = (FXColor *) 0 ; FXuint arg2 ;
     FXMemoryBuffer *result; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); {
-        Check_Type(argv[0], T_ARRAY); FXMALLOC(&arg1,FXColor,RARRAY(argv[0])->len);
-        arg2=static_cast<FXuint>(RARRAY(argv[0])->len); for(FXint i=0; i<arg2; i++){
+        Check_Type(argv[0], T_ARRAY); FXMALLOC(&arg1,FXColor,RARRAY_LEN(argv[0]));
+        arg2=static_cast<FXuint>(RARRAY_LEN(argv[0])); for(FXint i=0; i<arg2; i++){
             arg1[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[0],i))); }  } 
     result = (FXMemoryBuffer *)new FXMemoryBuffer(arg1,arg2); DATA_PTR(self) = result; { FXFREE(&arg1); }  return self; }
 static VALUE _wrap_FXMemoryBuffer_getSize(int argc, VALUE *argv, VALUE self) { FXMemoryBuffer *arg1 = (FXMemoryBuffer *) 0 ;
@@ -2620,8 +2620,8 @@ static VALUE _wrap_fxsaveTIF(int argc, VALUE *argv, VALUE self) { FXStream *arg1
     FXint arg3 ; FXint arg4 ; FXushort arg5 ; bool result; VALUE vresult = Qnil; if ((argc < 5) || (argc > 5))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
-    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
-                for(long i=0; i<RARRAY(argv[1])->len; i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
+    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY_LEN(argv[1]))){
+                for(long i=0; i<RARRAY_LEN(argv[1]); i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
              }  }  arg3 = NUM2INT(argv[2]); arg4 = NUM2INT(argv[3]); arg5 = NUM2USHRT(argv[4]);
     result = (bool)fxsaveTIF(*arg1,(FXColor const *)arg2,arg3,arg4,arg5); vresult = result ? Qtrue : Qfalse; FXFREE(&arg2);
     return vresult; }
@@ -2776,8 +2776,8 @@ static VALUE _wrap_fxsaveXBM(int argc, VALUE *argv, VALUE self) { FXStream *arg1
     FXint arg3 ; FXint arg4 ; FXint arg5 = (FXint) -1 ; FXint arg6 = (FXint) -1 ; bool result; VALUE vresult = Qnil;
     if ((argc < 4) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
-    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
-                for(long i=0; i<RARRAY(argv[1])->len; i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
+    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY_LEN(argv[1]))){
+                for(long i=0; i<RARRAY_LEN(argv[1]); i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
              }  }  arg3 = NUM2INT(argv[2]); arg4 = NUM2INT(argv[3]); if (argc > 4) { arg5 = NUM2INT(argv[4]); }  if (argc > 5) {
         arg6 = NUM2INT(argv[5]); }  result = (bool)fxsaveXBM(*arg1,(FXColor const *)arg2,arg3,arg4,arg5,arg6);
     vresult = result ? Qtrue : Qfalse; FXFREE(&arg2); return vresult; }
@@ -2786,8 +2786,8 @@ static VALUE _wrap_fxsavePS(int argc, VALUE *argv, VALUE self) { FXStream *arg1
     FXbool arg8 = (FXbool) 1 ; bool result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 8))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
-    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
-                for(long i=0; i<RARRAY(argv[1])->len; i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
+    { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY_LEN(argv[1]))){
+                for(long i=0; i<RARRAY_LEN(argv[1]); i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
              }  }  arg3 = NUM2INT(argv[2]); arg4 = NUM2INT(argv[3]); if (argc > 4) { arg5 = NUM2INT(argv[4]); }  if (argc > 5) {
         arg6 = NUM2INT(argv[5]); }  if (argc > 6) { arg7 = NUM2INT(argv[6]); }  if (argc > 7) { arg8 = to_FXbool(argv[7]); } 
     result = (bool)fxsavePS(*arg1,(FXColor const *)arg2,arg3,arg4,arg5,arg6,arg7,arg8); vresult = result ? Qtrue : Qfalse;
@@ -2816,8 +2816,8 @@ static VALUE _wrap_new_FXXPMImage(int argc, VALUE *argv, VALUE self) { FXApp *ar
     FXchar **arg2 = (FXchar **) 0 ; FXuint arg3 = (FXuint) 0 ; FXint arg4 = (FXint) 1 ; FXint arg5 = (FXint) 1 ;
     FXXPMImage *result; if ((argc < 1) || (argc > 5)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { arg2 = NULL; if (argv[1] != Qnil) {
-                Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY(argv[1])->len)) {
-                    for (long i = 0; i < RARRAY(argv[1])->len; i++) { VALUE e = rb_ary_entry(argv[1], i);
+                Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[1]))) {
+                    for (long i = 0; i < RARRAY_LEN(argv[1]); i++) { VALUE e = rb_ary_entry(argv[1], i);
                         arg2[i] = (FXchar *) StringValuePtr(e); }  }  }  }  }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); } 
     if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) { arg5 = NUM2INT(argv[4]); }  {
         result = (FXXPMImage *)new_FXXPMImage(arg1,(FXchar const **)arg2,arg3,arg4,arg5);

data/ext/fox16/include/FXMemoryBuffer.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXMemoryBuffer.h 2190 2005-08-24 07:58:47Z lyle $
+ * $Id$
  ***********************************************************************/
 
 #ifndef FXMEMORYBUFFER_H

data/ext/fox16/include/FXRb4Splitter.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRb4Splitter.h 2190 2005-08-24 07:58:47Z lyle $
+ * $Id$
  ***********************************************************************/
 
 #ifndef FXRB4SPLITTER_H

data/ext/fox16/include/FXRb7Segment.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRb7Segment.h 2190 2005-08-24 07:58:47Z lyle $
+ * $Id$
  ***********************************************************************/
 
 #ifndef FXRB7SEGMENT_H

data/ext/fox16/include/FXRbAccelTable.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbAccelTable.h 2190 2005-08-24 07:58:47Z lyle $
+ * $Id$
  ***********************************************************************/
 
 #ifndef FXRBACCELTABLE_H