fxruby 1.6.16 → 1.6.17

data/ext/fox16/markfuncs.cpp

@@ -1,5 +1,5 @@
 /***********************************************************************
- * $Id: markfuncs.cpp 2479 2006-09-08 23:20:52Z lyle $
+ * $Id$
  ***********************************************************************/
 
 #include "FXRbCommon.h"
@@ -49,7 +49,7 @@ void FXRbAccelTable::markfunc(FXAccelTable* accelTable){
 
 // Mark dependencies for the GC
 void FXRbObject::markfunc(FXObject* obj){
-  FXTRACE((100,"%s::markfunc(0x%08x)\n",obj?obj->getClassName():"FXRbObject",obj));
+  FXTRACE((100,"%s::markfunc(0x%08x)\n",obj?obj->getClassName():"FXRbObject",reinterpret_cast<unsigned int>(obj)));
   }
 
 
@@ -1568,29 +1568,29 @@ void FXRbTGAImage::markfunc(FXTGAImage* self){
 
 
 void FXRbBitmapFrame::markfunc(FXBitmapFrame* self){
-  FXTRACE((100,"start FXRbBitmapFrame::markfunc(0x%08x)\n",self));
+  FXTRACE((100,"start FXRbBitmapFrame::markfunc(0x%08x)\n",reinterpret_cast<unsigned int>(self)));
   FXRbFrame::markfunc(self);
   if(self!=0){
     FXRbGcMark(self->getBitmap());
     }
-  FXTRACE((100,"end FXRbBitmapFrame::markfunc(0x%08x)\n",self));
+  FXTRACE((100,"end FXRbBitmapFrame::markfunc(0x%08x)\n",reinterpret_cast<unsigned int>(self)));
   }
 
 
 void FXRbImageFrame::markfunc(FXImageFrame* self){
-  FXTRACE((100,"start FXRbImageFrame::markfunc(0x%08x)\n",self));
+  FXTRACE((100,"start FXRbImageFrame::markfunc(0x%08x)\n",reinterpret_cast<unsigned int>(self)));
   FXRbFrame::markfunc(self);
   if(self!=0){
     FXRbGcMark(self->getImage());
     }
-  FXTRACE((100,"end FXRbImageFrame::markfunc(0x%08x)\n",self));
+  FXTRACE((100,"end FXRbImageFrame::markfunc(0x%08x)\n",reinterpret_cast<unsigned int>(self)));
   }
 
 
 void FXRbGradientBar::markfunc(FXGradientBar* self){
-  FXTRACE((100,"start FXRbGradientBar::markfunc(0x%08x)\n",self));
+  FXTRACE((100,"start FXRbGradientBar::markfunc(0x%08x)\n",reinterpret_cast<unsigned int>(self)));
   FXRbFrame::markfunc(self);
-  FXTRACE((100,"end FXRbGradientBar::markfunc(0x%08x)\n",self));
+  FXTRACE((100,"end FXRbGradientBar::markfunc(0x%08x)\n",reinterpret_cast<unsigned int>(self)));
   }
 
 #ifdef WITH_FXSCINTILLA

data/ext/fox16/table_wrap.cpp

@@ -1740,79 +1740,97 @@ static VALUE _wrap_FXTable_setColumnText(int argc, VALUE *argv, VALUE self) { FX
     FXString *arg3 = 0 ; SwigValueWrapper<FXString > p3 ; if ((argc < 2) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]);
-    p3 = to_FXString(argv[1]); arg3 = &p3; (arg1)->setColumnText(arg2,(FXString const &)*arg3); return Qnil; }
+    p3 = to_FXString(argv[1]); arg3 = &p3; { if (arg2 < 0 || arg2 >= arg1->getNumColumns()) {
+            rb_raise(rb_eIndexError, "table column out of bounds"); }  }  (arg1)->setColumnText(arg2,(FXString const &)*arg3);
+    return Qnil; }
 static VALUE _wrap_FXTable_getColumnText(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
     FXString 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_FXTable, 1); arg2 = NUM2INT(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); {
+        if (arg2 < 0 || arg2 >= arg1->getNumColumns()) { rb_raise(rb_eIndexError, "table column out of bounds"); }  } 
     result = ((FXTable const *)arg1)->getColumnText(arg2); vresult = rb_str_new2((&result)->text()); return vresult; }
 static VALUE _wrap_FXTable_setRowText(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
     FXString *arg3 = 0 ; SwigValueWrapper<FXString > p3 ; if ((argc < 2) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]);
-    p3 = to_FXString(argv[1]); arg3 = &p3; (arg1)->setRowText(arg2,(FXString const &)*arg3); return Qnil; }
+    p3 = to_FXString(argv[1]); arg3 = &p3; { if (arg2 < 0 || arg2 >= arg1->getNumRows()) {
+            rb_raise(rb_eIndexError, "table row out of bounds"); }  }  (arg1)->setRowText(arg2,(FXString const &)*arg3);
+    return Qnil; }
 static VALUE _wrap_FXTable_getRowText(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
     FXString 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_FXTable, 1); arg2 = NUM2INT(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); {
+        if (arg2 < 0 || arg2 >= arg1->getNumRows()) { rb_raise(rb_eIndexError, "table row out of bounds"); }  } 
     result = ((FXTable const *)arg1)->getRowText(arg2); vresult = rb_str_new2((&result)->text()); return vresult; }
 static VALUE _wrap_FXTable_setColumnIcon(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
     FXIcon *arg3 = (FXIcon *) 0 ; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]);
-    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXIcon, 1); (arg1)->setColumnIcon(arg2,arg3); return Qnil; }
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXIcon, 1); { if (arg2 < 0 || arg2 >= arg1->getNumColumns()) {
+            rb_raise(rb_eIndexError, "table column out of bounds"); }  }  (arg1)->setColumnIcon(arg2,arg3); return Qnil; }
 static VALUE _wrap_FXTable_getColumnIcon(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
     FXIcon *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_FXTable, 1); arg2 = NUM2INT(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); {
+        if (arg2 < 0 || arg2 >= arg1->getNumColumns()) { rb_raise(rb_eIndexError, "table column out of bounds"); }  } 
     result = (FXIcon *)((FXTable const *)arg1)->getColumnIcon(arg2); {
         swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXIcon, (void **) &result); vresult = FXRbGetRubyObj(result, ty); }
      return vresult; }
 static VALUE _wrap_FXTable_setRowIcon(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
     FXIcon *arg3 = (FXIcon *) 0 ; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]);
-    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXIcon, 1); (arg1)->setRowIcon(arg2,arg3); return Qnil; }
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXIcon, 1); { if (arg2 < 0 || arg2 >= arg1->getNumRows()) {
+            rb_raise(rb_eIndexError, "table row out of bounds"); }  }  (arg1)->setRowIcon(arg2,arg3); return Qnil; }
 static VALUE _wrap_FXTable_getRowIcon(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
     FXIcon *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_FXTable, 1); arg2 = NUM2INT(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); {
+        if (arg2 < 0 || arg2 >= arg1->getNumRows()) { rb_raise(rb_eIndexError, "table row out of bounds"); }  } 
     result = (FXIcon *)((FXTable const *)arg1)->getRowIcon(arg2); {
         swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXIcon, (void **) &result); vresult = FXRbGetRubyObj(result, ty); }
      return vresult; }
 static VALUE _wrap_FXTable_setColumnIconPosition(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ;
     FXint arg2 ; FXuint arg3 ; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2UINT(argv[1]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2UINT(argv[1]); {
+        if (arg2 < 0 || arg2 >= arg1->getNumColumns()) { rb_raise(rb_eIndexError, "table column out of bounds"); }  } 
     (arg1)->setColumnIconPosition(arg2,arg3); return Qnil; }
 static VALUE _wrap_FXTable_getColumnIconPosition(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ;
     FXint arg2 ; FXuint 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_FXTable, 1); arg2 = NUM2INT(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); {
+        if (arg2 < 0 || arg2 >= arg1->getNumColumns()) { rb_raise(rb_eIndexError, "table column out of bounds"); }  } 
     result = (FXuint)((FXTable const *)arg1)->getColumnIconPosition(arg2); vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_FXTable_setRowIconPosition(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
     FXuint arg3 ; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2UINT(argv[1]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2UINT(argv[1]); {
+        if (arg2 < 0 || arg2 >= arg1->getNumRows()) { rb_raise(rb_eIndexError, "table row out of bounds"); }  } 
     (arg1)->setRowIconPosition(arg2,arg3); return Qnil; }
 static VALUE _wrap_FXTable_getRowIconPosition(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
     FXuint 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_FXTable, 1); arg2 = NUM2INT(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); {
+        if (arg2 < 0 || arg2 >= arg1->getNumRows()) { rb_raise(rb_eIndexError, "table row out of bounds"); }  } 
     result = (FXuint)((FXTable const *)arg1)->getRowIconPosition(arg2); vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_FXTable_setColumnJustify(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
     FXuint arg3 ; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2UINT(argv[1]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2UINT(argv[1]); {
+        if (arg2 < 0 || arg2 >= arg1->getNumColumns()) { rb_raise(rb_eIndexError, "table column out of bounds"); }  } 
     (arg1)->setColumnJustify(arg2,arg3); return Qnil; }
 static VALUE _wrap_FXTable_getColumnJustify(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
     FXuint 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_FXTable, 1); arg2 = NUM2INT(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); {
+        if (arg2 < 0 || arg2 >= arg1->getNumColumns()) { rb_raise(rb_eIndexError, "table column out of bounds"); }  } 
     result = (FXuint)((FXTable const *)arg1)->getColumnJustify(arg2); vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_FXTable_setRowJustify(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
     FXuint arg3 ; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2UINT(argv[1]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2UINT(argv[1]); {
+        if (arg2 < 0 || arg2 >= arg1->getNumRows()) { rb_raise(rb_eIndexError, "table row out of bounds"); }  } 
     (arg1)->setRowJustify(arg2,arg3); return Qnil; }
 static VALUE _wrap_FXTable_getRowJustify(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
     FXuint 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_FXTable, 1); arg2 = NUM2INT(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTable, 1); arg2 = NUM2INT(argv[0]); {
+        if (arg2 < 0 || arg2 >= arg1->getNumRows()) { rb_raise(rb_eIndexError, "table row out of bounds"); }  } 
     result = (FXuint)((FXTable const *)arg1)->getRowJustify(arg2); vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_FXTable_setItemText(int argc, VALUE *argv, VALUE self) { FXTable *arg1 = (FXTable *) 0 ; FXint arg2 ;
     FXint arg3 ; FXString *arg4 = 0 ; FXbool arg5 = (FXbool) 0 ; SwigValueWrapper<FXString > p4 ; if ((argc < 3) || (argc > 4))

data/ext/fox16/text_wrap.cpp

@@ -724,7 +724,7 @@ void FXText_setHiliteStyles(FXText *self,VALUE styles){
 	  delete [] text->styles;
 	  text->numStyles=0;
 	  }
-	text->numStyles=RARRAY(styles)->len;
+	text->numStyles=RARRAY_LEN(styles);
 	if(text->numStyles>0){
           text->styles=new FXHiliteStyle[text->numStyles];
           for (long i=0; i<text->numStyles; i++){

data/ext/fox16/treelist_wrap.cpp

@@ -675,7 +675,7 @@ FXFoldingList *new_FXFoldingList(FXComposite *p,FXObject *tgt,FXSelector sel,FXu
       }
 void FXFoldingList_setHeaders(FXFoldingList *self,VALUE stringArray,FXint size){
       Check_Type(stringArray,T_ARRAY);
-      long len=RARRAY(stringArray)->len;
+      long len=RARRAY_LEN(stringArray);
       const FXchar **strings;
       if(FXMALLOC(&strings,FXchar*,len+1)){
         for(long i=0;i<len;i++){
@@ -1446,9 +1446,9 @@ static VALUE _wrap_FXFoldingList_fillItems(int argc, VALUE *argv, VALUE self) {
     if ((argc < 2) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     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++) { VALUE e = rb_ary_entry(argv[1], i);
-                    arg3[i] = (FXchar *) StringValuePtr(e); }  arg3[RARRAY(argv[1])->len] = 0; }  }  }  if (argc > 2) {
+            Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY_LEN(argv[1]))+1) {
+                for (long i = 0; i < RARRAY_LEN(argv[1]); i++) { VALUE e = rb_ary_entry(argv[1], i);
+                    arg3[i] = (FXchar *) StringValuePtr(e); }  arg3[RARRAY_LEN(argv[1])] = 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]); } 
@@ -2653,9 +2653,9 @@ static VALUE _wrap_FXTreeList_fillItems(int argc, VALUE *argv, VALUE self) { FXT
     if ((argc < 2) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     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++) { VALUE e = rb_ary_entry(argv[1], i);
-                    arg3[i] = (FXchar *) StringValuePtr(e); }  arg3[RARRAY(argv[1])->len] = 0; }  }  }  if (argc > 2) {
+            Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY_LEN(argv[1]))+1) {
+                for (long i = 0; i < RARRAY_LEN(argv[1]); i++) { VALUE e = rb_ary_entry(argv[1], i);
+                    arg3[i] = (FXchar *) StringValuePtr(e); }  arg3[RARRAY_LEN(argv[1])] = 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]); } 

data/ext/fox16/ui_wrap.cpp

@@ -1013,7 +1013,7 @@ void FXFileSelector_setPatternList(FXFileSelector *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");
@@ -4976,9 +4976,9 @@ static VALUE _wrap_FXComboBox_fillItems(int argc, VALUE *argv, VALUE self) { FXC
     FXchar **arg2 = (FXchar **) 0 ; FXint 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_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++) { VALUE e = rb_ary_entry(argv[0], i);
-                    arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY(argv[0])->len] = 0; }  }  } 
+            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; }  }  } 
     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;
@@ -5441,9 +5441,9 @@ static VALUE _wrap_FXListBox_fillItems(int argc, VALUE *argv, VALUE self) { FXLi
     FXchar **arg2 = (FXchar **) 0 ; FXIcon *arg3 = (FXIcon *) 0 ; void *arg4 = (void *) 0 ; FXint result; 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_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++) { 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 = (argv[2] == Qnil) ? NULL : (void *) argv[2]; } 
     result = (FXint)(arg1)->fillItems((FXchar const **)arg2,arg3,arg4); vresult = INT2NUM(result); FXFREE(&arg2);
@@ -5900,9 +5900,9 @@ static VALUE _wrap_FXTreeListBox_fillItems(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     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++) { VALUE e = rb_ary_entry(argv[1], i);
-                    arg3[i] = (FXchar *) StringValuePtr(e); }  arg3[RARRAY(argv[1])->len] = 0; }  }  }  if (argc > 2) {
+            Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY_LEN(argv[1]))+1) {
+                for (long i = 0; i < RARRAY_LEN(argv[1]); i++) { VALUE e = rb_ary_entry(argv[1], i);
+                    arg3[i] = (FXchar *) StringValuePtr(e); }  arg3[RARRAY_LEN(argv[1])] = 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]; } 

data/ext/fox16/unregisterOwnedObjects.cpp

@@ -1,5 +1,5 @@
 /***********************************************************************
- * $Id: unregisterOwnedObjects.cpp 2305 2005-12-09 14:38:22Z lyle $
+ * $Id$
  ***********************************************************************/
 
 /**
@@ -88,7 +88,7 @@ void FXRbScrollWindow::unregisterOwnedObjects(FXScrollWindow *self)
 
 void FXRbTable::unregisterOwnedObjects(FXTable *self)
 {
-    FXint i,r,c;
+    FXint r,c;
     FXRbScrollArea::unregisterOwnedObjects(self);
     FXRbHeader::unregisterOwnedObjects(self->getRowHeader());
     FXRbHeader::unregisterOwnedObjects(self->getColumnHeader());

data/lib/fox16/kwargs.rb

@@ -1,5 +1,7 @@
 require 'fox16'
 
+$VERBOSE = nil
+
 module Fox
 
 
@@ -2734,3 +2736,5 @@ module Fox
   end
 
 end
+
+$VERBOSE = true

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.16"
+    "1.6.17"
   end
 end
 

data/rdoc-sources/FXTable.rb

@@ -608,18 +608,10 @@ module Fox
     # Raises IndexError if _row_ is out of bounds.
     def getRowHeight(row) ; end
   
-    # Set x-coordinate for column.
-    # Raises IndexError if _column_ is out of bounds.
-    def setColumnX(column, x) ; end
-    
     # Get x-coordinate of column.
     # Raises IndexError if _column_ is out of bounds.
     def getColumnX(column) ; end
   
-    # Set y-coordinate of row.
-    # Raises IndexError if _row_ is out of bounds.
-    def setRowY(row, y) ; end
-    
     # Get y-coordinate of row.
     # Raises IndexError if _row_ is out of bounds.
     def getRowY(row) ; end
@@ -645,51 +637,67 @@ module Fox
     def fitColumnsToContents(col, nc=1); end
     
     # Set column header at _index_ to _text_.
+    # Raises IndexError if _index_ is out of bounds.
     def setColumnText(index, text); end
     
     # Return text of column header at _index_.
+    # Raises IndexError if _index_ is out of bounds.
     def getColumnText(index); end
     
     # Set row header at _index_ to _text_.
+    # Raises IndexError if _index_ is out of bounds.
     def setRowText(index, text); end
     
     # Return text of row header at _index_.
+    # Raises IndexError if _index_ is out of bounds.
     def getRowText(index); end
 
-    # Change column header icon
+    # Change column header icon.
+    # Raises IndexError if _index_ is out of bounds.
     def setColumnIcon(FXint index,FXIcon* icon);
 
-    # Return icon of column header at index
+    # Return icon of column header at _index_.
+    # Raises IndexError if _index_ is out of bounds.
     def getColumnIcon(index); end
 
-    # Change row header icon
+    # Change row header icon.
+    # Raises IndexError if _index_ is out of bounds.
     def setRowIcon(index, icon); end
     
-    # Return icon of row header at index
+    # Return icon of row header at _index_.
+    # Raises IndexError if _index_ is out of bounds.
     def getRowIcon(index); end
 
     # Change column header icon position, e.g. FXHeaderItem::BEFORE, etc.
+    # Raises IndexError if _index_ is out of bounds.
     def setColumnIconPosition(index, mode); end
 
-    # Return icon position of column header at index
+    # Return icon position of column header at _index_.
+    # Raises IndexError if _index_ is out of bounds.
     def getColumnIconPosition(index); end
 
     # Change row header icon position, e.g. FXHeaderItem::BEFORE, etc.
+    # Raises IndexError if _index_ is out of bounds.
     def setRowIconPosition(index, mode); end
 
-    # Return icon position of row header at index
+    # Return icon position of row header at _index_.
+    # Raises IndexError if _index_ is out of bounds.
     def getRowIconPosition(index); end
     
     # Change column header justify, e.g. FXHeaderItem::RIGHT, etc.
+    # Raises IndexError if _index_ is out of bounds.
     def setColumnJustify(index, justify); end
 
-    # Return justify of column header at index
+    # Return justify of column header at _index_.
+    # Raises IndexError if _index_ is out of bounds.
     def getColumnJustify(index); end
 
     # Change row header justify, e.g. FXHeaderItem::RIGHT, etc.
+    # Raises IndexError if _index_ is out of bounds.
     def setRowJustify(index, justify); end
 
-    # Return justify of row header at index
+    # Return justify of row header at _index_.
+    # Raises IndexError if _index_ is out of bounds.
     def getRowJustify(index); end
     
     #

data/tests/TC_FXRanged.rb

@@ -0,0 +1,42 @@
+require 'test/unit'
+
+require 'fox16'
+
+include Fox
+
+class TC_FXRanged < Test::Unit::TestCase
+
+  WIDTH, HEIGHT, DEPTH = 2, 4, 6
+
+  def setup
+    @range = FXRanged.new(0, WIDTH, 0, HEIGHT, 0, DEPTH)
+  end
+  
+  def test_lower_is_a_vector
+    assert_instance_of(FXVec3d, @range.lower)
+  end
+  
+  def test_upper_is_a_vector
+    assert_instance_of(FXVec3d, @range.upper)
+  end
+
+  def test_width
+    assert_equal(@range.width, WIDTH)
+  end
+  
+  def test_height
+    assert_equal(@range.height, HEIGHT)
+  end
+
+  def test_depth
+    assert_equal(@range.depth, DEPTH)
+  end
+
+  def test_longest
+    assert_equal([@range.width, @range.height, @range.depth].max, @range.longest)
+  end
+
+  def test_shortest
+    assert_equal([@range.width, @range.height, @range.depth].min, @range.shortest)
+  end
+end

data/tests/TC_FXRangef.rb

@@ -12,37 +12,31 @@ class TC_FXRangef < Test::Unit::TestCase
     @range = FXRangef.new(0, WIDTH, 0, HEIGHT, 0, DEPTH)
   end
   
+  def test_lower_is_a_vector
+    assert_instance_of(FXVec3f, @range.lower)
+  end
+  
+  def test_upper_is_a_vector
+    assert_instance_of(FXVec3f, @range.upper)
+  end
+
   def test_width
     assert_equal(@range.width, WIDTH)
   end
+  
   def test_height
     assert_equal(@range.height, HEIGHT)
   end
+
   def test_depth
     assert_equal(@range.depth, DEPTH)
   end
+
   def test_longest
     assert_equal([@range.width, @range.height, @range.depth].max, @range.longest)
   end
+
   def test_shortest
     assert_equal([@range.width, @range.height, @range.depth].min, @range.shortest)
   end
-  def test_empty?
-  end
-  def test_overlaps?
-  end
-  def test_contains?
-  end
-  def test_include
-  end
-  def test_clipTo
-  end
-  def test_corners
-  end
-  def test_intersects?
-  end
-  def test_center
-  end
-  def test_diagonal
-  end
 end