fxruby 1.6.0 → 1.6.1

data/ext/fox16/FXRuby.cpp

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRuby.cpp 2387 2006-04-21 13:25:17Z lyle $
+ * $Id: FXRuby.cpp 2460 2006-07-09 23:38:59Z lyle $
  ***********************************************************************/
 
 #ifdef _MSC_VER
@@ -559,7 +559,12 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
        type==SEL_COMMAND ||
        type==SEL_CLICKED ||
        type==SEL_DOUBLECLICKED ||
-       type==SEL_TRIPLECLICKED) return to_ruby(static_cast<FXColor>(reinterpret_cast<unsigned long>(ptr)));
+       type==SEL_TRIPLECLICKED) {
+	       fprintf(stderr,"ptr=0x%08x\n",ptr);
+	       VALUE v=to_ruby(static_cast<FXColor>(reinterpret_cast<unsigned long>(ptr)));
+	       fprintf(stderr,"v=%d\n",v);
+	       return v;
+    }
     }
   else if(sender->isMemberOf(FXMETACLASS(FXColorWheel))){
     if(type==SEL_CHANGED || type==SEL_COMMAND){
@@ -1473,16 +1478,16 @@ FXString FXRbCallStringMethod(const FXObject* recv, ID func){
 const FXchar* FXRbCallCStringMethod(const FXObject* recv, ID func, const FXchar* message, const FXchar* hint){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,2,rb_str_new2(message),rb_str_new2(hint));
-  return STR2CSTR(result);
+  VALUE result=rb_funcall(obj,func,2,to_ruby(message),to_ruby(hint));
+  return NIL_P(result) ? 0 : STR2CSTR(result);
   }
 
 // Call functions with const FXchar* return value
 const FXchar* FXRbCallCStringMethod(const FXObject* recv, ID func, const FXchar* context, const FXchar* message, const FXchar* hint){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,3,rb_str_new2(context),rb_str_new2(message),rb_str_new2(hint));
-  return STR2CSTR(result);
+  VALUE result=rb_funcall(obj,func,3,to_ruby(context),to_ruby(message),to_ruby(hint));
+  return NIL_P(result) ? 0 : STR2CSTR(result);
   }
 //----------------------------------------------------------------------
 

data/ext/fox16/core_wrap.cpp

@@ -1928,8 +1928,9 @@ static VALUE _wrap_makeShadowColor(int argc, VALUE *argv, VALUE self) { FXColor
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = to_FXColor(argv[0]);
     result = (FXColor)makeShadowColor(arg1); vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_fxcolorfromname(int argc, VALUE *argv, VALUE self) { FXchar *arg1 ; FXColor result; VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = StringValuePtr(argv[0]);
-    result = (FXColor)fxcolorfromname((FXchar const *)arg1); vresult = UINT2NUM(result); return vresult; }
+    if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    arg1 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]); result = (FXColor)fxcolorfromname((FXchar const *)arg1);
+    vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_fxnamefromcolor(int argc, VALUE *argv, VALUE self) { FXColor arg1 ; FXchar *result; VALUE vresult = Qnil;
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = to_FXColor(argv[0]);
     result = (FXchar *)fxnamefromcolor(arg1); vresult = rb_str_new2(result); return vresult; }
@@ -1942,8 +1943,9 @@ static VALUE _wrap_fxhsv_to_rgb(int argc, VALUE *argv, VALUE self) { FXfloat arg
     arg1 = (FXfloat) NUM2DBL(argv[0]); arg2 = (FXfloat) NUM2DBL(argv[1]); arg3 = (FXfloat) NUM2DBL(argv[2]);
     result = (VALUE)fxhsv_to_rgb(arg1,arg2,arg3); vresult = result; return vresult; }
 static VALUE _wrap_fxisconsole(int argc, VALUE *argv, VALUE self) { FXchar *arg1 ; FXbool result; VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = StringValuePtr(argv[0]);
-    result = (FXbool)fxisconsole((FXchar const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    arg1 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]); result = (FXbool)fxisconsole((FXchar const *)arg1);
+    vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_fxversion(int argc, VALUE *argv, VALUE self) { VALUE result; VALUE vresult = Qnil;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); result = (VALUE)_fxversion();
     vresult = result; return vresult; }
@@ -3178,8 +3180,10 @@ static VALUE _wrap_FXApp_allocate(VALUE self) {
          return vresult; }
 static VALUE _wrap_new_FXApp(int argc, VALUE *argv, VALUE self) { FXchar *arg1 = (FXchar *) "Application" ;
     FXchar *arg2 = (FXchar *) "FoxDefault" ; FXApp *result; if ((argc < 0) || (argc > 2))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); if (argc > 0) { arg1 = StringValuePtr(argv[0]); } 
-    if (argc > 1) { arg2 = StringValuePtr(argv[1]); }  { result = (FXApp *)new_FXApp((FXchar const *)arg1,(FXchar const *)arg2);
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); if (argc > 0) {
+        arg1 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]); }  if (argc > 1) {
+        arg2 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); }  {
+        result = (FXApp *)new_FXApp((FXchar const *)arg1,(FXchar const *)arg2);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static VALUE _wrap_FXApp_getAppName(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXString *result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -3194,8 +3198,8 @@ static VALUE _wrap_FXApp_getVendorName(int argc, VALUE *argv, VALUE self) { FXAp
 static VALUE _wrap_FXApp_openDisplay(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
     FXchar *arg2 = (FXchar *) 0 ; bool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
-    if (argc > 0) { arg2 = StringValuePtr(argv[0]); }  result = (bool)(arg1)->openDisplay((FXchar const *)arg2);
-    vresult = result ? Qtrue : Qfalse; return vresult; }
+    if (argc > 0) { arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]); } 
+    result = (bool)(arg1)->openDisplay((FXchar const *)arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXApp_closeDisplay(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; bool 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_FXApp, 1); result = (bool)(arg1)->closeDisplay();
@@ -3994,8 +3998,8 @@ static VALUE _wrap_FXTranslator_load(int argc, VALUE *argv, VALUE self) { FXTran
 static VALUE _wrap_FXTranslator_tr(int argc, VALUE *argv, VALUE self) { FXTranslator *arg1 = (FXTranslator *) 0 ; FXchar *arg2 ;
     FXchar *arg3 ; FXchar *arg4 = (FXchar *) 0 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTranslator, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); if (argc > 2) { arg4 = StringValuePtr(argv[2]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTranslator, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); if (argc > 2) { arg4 = NIL_P(argv[2]) ? 0 : StringValuePtr(argv[2]); } 
     result = (FXchar *)FXTranslator_tr((FXTranslator const *)arg1,(FXchar const *)arg2,(FXchar const *)arg3,(FXchar const *)arg4);
     vresult = rb_str_new2(result); return vresult; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
@@ -4024,7 +4028,7 @@ static VALUE _wrap_FXDict_length(int argc, VALUE *argv, VALUE self) { FXDict *ar
     vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXDict_remove(int argc, VALUE *argv, VALUE self) { FXDict *arg1 = (FXDict *) 0 ; FXchar *arg2 ; void *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_FXDict, 1); arg2 = StringValuePtr(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDict, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
     result = (void *)(arg1)->remove((FXchar const *)arg2); vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_void,0);
     return vresult; }
 static VALUE _wrap_FXDict_key(int argc, VALUE *argv, VALUE self) { FXDict *arg1 = (FXDict *) 0 ; FXuint arg2 ; FXchar *result;
@@ -4057,8 +4061,9 @@ static VALUE _wrap_FXDict_clear(int argc, VALUE *argv, VALUE self) { FXDict *arg
 static VALUE _wrap_FXDict_has_keyq___(int argc, VALUE *argv, VALUE self) { FXDict *arg1 = (FXDict *) 0 ; FXchar *arg2 ;
     bool 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_FXDict, 1);
-    arg2 = StringValuePtr(argv[0]); result = (bool)FXDict_has_key((FXDict const *)arg1,(FXchar const *)arg2);
-    vresult = (result ? Qtrue : Qfalse); return vresult; }
+    arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    result = (bool)FXDict_has_key((FXDict const *)arg1,(FXchar const *)arg2); vresult = (result ? Qtrue : Qfalse);
+    return vresult; }
 static void
 free_FXDict(FXDict *arg1) {
     delete arg1;
@@ -4250,19 +4255,20 @@ static VALUE _wrap_FXFileDict_getIconPath(int argc, VALUE *argv, VALUE self) { F
 static VALUE _wrap_FXFileDict_replace(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 = (FXFileDict *) 0 ; FXchar *arg2 ;
     FXchar *arg3 ; FXFileAssoc *result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileDict, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); result = (FXFileAssoc *)(arg1)->replace((FXchar const *)arg2,(FXchar const *)arg3);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileDict, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]);
+    result = (FXFileAssoc *)(arg1)->replace((FXchar const *)arg2,(FXchar const *)arg3);
     vresult = FXRbGetRubyObj(result, "FXFileAssoc *"); return vresult; }
 static VALUE _wrap_FXFileDict_remove(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 = (FXFileDict *) 0 ; FXchar *arg2 ;
     FXFileAssoc *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_FXFileDict, 1); arg2 = StringValuePtr(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileDict, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
     result = (FXFileAssoc *)(arg1)->remove((FXchar const *)arg2); vresult = FXRbGetRubyObj(result, "FXFileAssoc *");
     return vresult; }
 static VALUE _wrap_FXFileDict_find(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 = (FXFileDict *) 0 ; FXchar *arg2 ;
     FXFileAssoc *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_FXFileDict, 1); arg2 = StringValuePtr(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileDict, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
     result = (FXFileAssoc *)(arg1)->find((FXchar const *)arg2); vresult = FXRbGetRubyObj(result, "FXFileAssoc *");
     return vresult; }
 static void
@@ -4282,19 +4288,19 @@ static VALUE _wrap_FXFileDict_load(int argc, VALUE *argv, VALUE self) { FXFileDi
 static VALUE _wrap_FXFileDict_findFileBinding(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 = (FXFileDict *) 0 ;
     FXchar *arg2 ; FXFileAssoc *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_FXFileDict, 1); arg2 = StringValuePtr(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileDict, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
     result = (FXFileAssoc *)FXFileDict_findFileBinding(arg1,(FXchar const *)arg2);
     vresult = FXRbGetRubyObj(result, "FXFileAssoc *"); return vresult; }
 static VALUE _wrap_FXFileDict_findDirBinding(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 = (FXFileDict *) 0 ;
     FXchar *arg2 ; FXFileAssoc *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_FXFileDict, 1); arg2 = StringValuePtr(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileDict, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
     result = (FXFileAssoc *)FXFileDict_findDirBinding(arg1,(FXchar const *)arg2);
     vresult = FXRbGetRubyObj(result, "FXFileAssoc *"); return vresult; }
 static VALUE _wrap_FXFileDict_findExecBinding(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 = (FXFileDict *) 0 ;
     FXchar *arg2 ; FXFileAssoc *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_FXFileDict, 1); arg2 = StringValuePtr(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileDict, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
     result = (FXFileAssoc *)FXFileDict_findExecBinding(arg1,(FXchar const *)arg2);
     vresult = FXRbGetRubyObj(result, "FXFileAssoc *"); return vresult; }
 static VALUE _wrap_FXIconDict_defaultIconPath(int argc, VALUE *argv, VALUE self) { VALUE result; VALUE vresult = Qnil;
@@ -4342,21 +4348,21 @@ static VALUE _wrap_FXIconDict_iconPath(int argc, VALUE *argv, VALUE self) { FXIc
 static VALUE _wrap_FXIconDict_insert(int argc, VALUE *argv, VALUE self) { FXIconDict *arg1 = (FXIconDict *) 0 ; FXchar *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_FXIconDict, 1); arg2 = StringValuePtr(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXIconDict, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
     result = (FXIcon *)(arg1)->insert((FXchar const *)arg2); {
         swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXIcon, (void **) &result); vresult = FXRbGetRubyObj(result, ty); }
      return vresult; }
 static VALUE _wrap_FXIconDict_remove(int argc, VALUE *argv, VALUE self) { FXIconDict *arg1 = (FXIconDict *) 0 ; FXchar *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_FXIconDict, 1); arg2 = StringValuePtr(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXIconDict, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
     result = (FXIcon *)(arg1)->remove((FXchar const *)arg2); {
         swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXIcon, (void **) &result); vresult = FXRbGetRubyObj(result, ty); }
      return vresult; }
 static VALUE _wrap_FXIconDict_find(int argc, VALUE *argv, VALUE self) { FXIconDict *arg1 = (FXIconDict *) 0 ; FXchar *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_FXIconDict, 1); arg2 = StringValuePtr(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXIconDict, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
     result = (FXIcon *)(arg1)->find((FXchar const *)arg2); {
         swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXIcon, (void **) &result); vresult = FXRbGetRubyObj(result, ty); }
      return vresult; }
@@ -4380,26 +4386,26 @@ static VALUE _wrap_new_FXStringDict(int argc, VALUE *argv, VALUE self) { FXStrin
 static VALUE _wrap_FXStringDict_insert(int argc, VALUE *argv, VALUE self) { FXStringDict *arg1 = (FXStringDict *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; bool arg4 = (bool) false ; FXchar *result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStringDict, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); if (argc > 2) { arg4 = RTEST(argv[2]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStringDict, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); if (argc > 2) { arg4 = RTEST(argv[2]); } 
     result = (FXchar *)(arg1)->insert((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = rb_str_new2(result);
     return vresult; }
 static VALUE _wrap_FXStringDict_replace(int argc, VALUE *argv, VALUE self) { FXStringDict *arg1 = (FXStringDict *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; bool arg4 = (bool) false ; FXchar *result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStringDict, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); if (argc > 2) { arg4 = RTEST(argv[2]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStringDict, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); if (argc > 2) { arg4 = RTEST(argv[2]); } 
     result = (FXchar *)(arg1)->replace((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = rb_str_new2(result);
     return vresult; }
 static VALUE _wrap_FXStringDict_remove(int argc, VALUE *argv, VALUE self) { FXStringDict *arg1 = (FXStringDict *) 0 ;
     FXchar *arg2 ; FXchar *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_FXStringDict, 1); arg2 = StringValuePtr(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStringDict, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
     result = (FXchar *)(arg1)->remove((FXchar const *)arg2); vresult = rb_str_new2(result); return vresult; }
 static VALUE _wrap_FXStringDict_find(int argc, VALUE *argv, VALUE self) { FXStringDict *arg1 = (FXStringDict *) 0 ;
     FXchar *arg2 ; FXchar *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_FXStringDict, 1); arg2 = StringValuePtr(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStringDict, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
     result = (FXchar *)((FXStringDict const *)arg1)->find((FXchar const *)arg2); vresult = rb_str_new2(result); return vresult; }
 static VALUE _wrap_FXStringDict_data(int argc, VALUE *argv, VALUE self) { FXStringDict *arg1 = (FXStringDict *) 0 ;
     FXuint arg2 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
@@ -4454,115 +4460,117 @@ static VALUE _wrap_FXSettings_data(int argc, VALUE *argv, VALUE self) { FXSettin
 static VALUE _wrap_FXSettings_find(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ; FXchar *arg2 ;
     FXStringDict *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_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
     result = (FXStringDict *)((FXSettings const *)arg1)->find((FXchar const *)arg2); {
         swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXStringDict, (void **) &result);
         vresult = FXRbGetRubyObj(result, ty); }  return vresult; }
 static VALUE _wrap_FXSettings_readStringEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; FXchar *arg4 = (FXchar *) 0 ; FXchar *result; VALUE vresult = Qnil;
     if ((argc < 2) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); if (argc > 2) { arg4 = StringValuePtr(argv[2]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); if (argc > 2) { arg4 = NIL_P(argv[2]) ? 0 : StringValuePtr(argv[2]); } 
     result = (FXchar *)(arg1)->readStringEntry((FXchar const *)arg2,(FXchar const *)arg3,(FXchar const *)arg4);
     vresult = rb_str_new2(result); return vresult; }
 static VALUE _wrap_FXSettings_readIntEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; FXint arg4 = (FXint) 0 ; FXint result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); if (argc > 2) { arg4 = NUM2INT(argv[2]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); if (argc > 2) { arg4 = NUM2INT(argv[2]); } 
     result = (FXint)(arg1)->readIntEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = INT2NUM(result);
     return vresult; }
 static VALUE _wrap_FXSettings_readUnsignedEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; FXuint arg4 = (FXuint) 0 ; FXuint result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); if (argc > 2) { arg4 = NUM2UINT(argv[2]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); if (argc > 2) { arg4 = NUM2UINT(argv[2]); } 
     result = (FXuint)(arg1)->readUnsignedEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = UINT2NUM(result);
     return vresult; }
 static VALUE _wrap_FXSettings_readRealEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; FXdouble arg4 = (FXdouble) 0.0 ; FXdouble result; VALUE vresult = Qnil;
     if ((argc < 2) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); if (argc > 2) { arg4 = (FXdouble) NUM2DBL(argv[2]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); if (argc > 2) { arg4 = (FXdouble) NUM2DBL(argv[2]); } 
     result = (FXdouble)(arg1)->readRealEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = rb_float_new(result);
     return vresult; }
 static VALUE _wrap_FXSettings_readColorEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; FXColor arg4 = (FXColor) 0 ; FXColor result; VALUE vresult = Qnil;
     if ((argc < 2) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); if (argc > 2) { arg4 = to_FXColor(argv[2]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); if (argc > 2) { arg4 = to_FXColor(argv[2]); } 
     result = (FXColor)(arg1)->readColorEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = UINT2NUM(result);
     return vresult; }
 static VALUE _wrap_FXSettings_readBoolEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; FXbool arg4 = (FXbool) 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); if (argc > 2) { arg4 = to_FXbool(argv[2]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); if (argc > 2) { arg4 = to_FXbool(argv[2]); } 
     result = (FXbool)(arg1)->readBoolEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXSettings_writeStringEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; FXchar *arg4 ; bool result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); arg4 = StringValuePtr(argv[2]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); arg4 = NIL_P(argv[2]) ? 0 : StringValuePtr(argv[2]);
     result = (bool)(arg1)->writeStringEntry((FXchar const *)arg2,(FXchar const *)arg3,(FXchar const *)arg4);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXSettings_writeIntEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; FXint arg4 ; bool result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); arg4 = NUM2INT(argv[2]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); arg4 = NUM2INT(argv[2]);
     result = (bool)(arg1)->writeIntEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXSettings_writeUnsignedEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; FXuint arg4 ; bool result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); arg4 = NUM2UINT(argv[2]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); arg4 = NUM2UINT(argv[2]);
     result = (bool)(arg1)->writeUnsignedEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXSettings_writeRealEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; FXdouble arg4 ; bool result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); arg4 = (FXdouble) NUM2DBL(argv[2]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); arg4 = (FXdouble) NUM2DBL(argv[2]);
     result = (bool)(arg1)->writeRealEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXSettings_writeColorEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; FXColor arg4 ; bool result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); arg4 = to_FXColor(argv[2]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); arg4 = to_FXColor(argv[2]);
     result = (bool)(arg1)->writeColorEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXSettings_writeBoolEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; FXbool arg4 ; bool result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); arg4 = to_FXbool(argv[2]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); arg4 = to_FXbool(argv[2]);
     result = (bool)(arg1)->writeBoolEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXSettings_deleteEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; bool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); result = (bool)(arg1)->deleteEntry((FXchar const *)arg2,(FXchar const *)arg3);
-    vresult = result ? Qtrue : Qfalse; return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]);
+    result = (bool)(arg1)->deleteEntry((FXchar const *)arg2,(FXchar const *)arg3); vresult = result ? Qtrue : Qfalse;
+    return vresult; }
 static VALUE _wrap_FXSettings_existingEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; bool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    arg3 = StringValuePtr(argv[1]); result = (bool)(arg1)->existingEntry((FXchar const *)arg2,(FXchar const *)arg3);
-    vresult = result ? Qtrue : Qfalse; return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]);
+    result = (bool)(arg1)->existingEntry((FXchar const *)arg2,(FXchar const *)arg3); vresult = result ? Qtrue : Qfalse;
+    return vresult; }
 static VALUE _wrap_FXSettings_deleteSection(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; bool 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_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
     result = (bool)(arg1)->deleteSection((FXchar const *)arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXSettings_existingSection(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; bool 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_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
     result = (bool)(arg1)->existingSection((FXchar const *)arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXSettings_clear(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ; FXbool result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -5532,7 +5540,7 @@ static VALUE _wrap_FXFont_angle(int argc, VALUE *argv, VALUE self) { FXFont *arg
     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_FXFont, 1); result = (FXint)((FXFont const *)arg1)->getAngle();
     vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXFont_getFont(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXString result;
+static VALUE _wrap_FXFont_font(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXString 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_FXFont, 1); result = ((FXFont const *)arg1)->getFont();
     vresult = rb_str_new2((&result)->text()); return vresult; }
@@ -6665,8 +6673,8 @@ static VALUE _wrap_FXWindow_setBackColor(int argc, VALUE *argv, VALUE self) { FX
 static VALUE _wrap_FXWindow_tr(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXchar *arg2 ;
     FXchar *arg3 = (FXchar *) 0 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); arg2 = StringValuePtr(argv[0]); if (argc > 1) {
-        arg3 = StringValuePtr(argv[1]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    if (argc > 1) { arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); } 
     result = (FXchar *)FXWindow_tr((FXWindow const *)arg1,(FXchar const *)arg2,(FXchar const *)arg3);
     vresult = rb_str_new2(result); return vresult; }
 static VALUE _wrap_FXWindow_dropEnable(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
@@ -6930,8 +6938,8 @@ static VALUE _wrap_FXFrame_setBackColor(int argc, VALUE *argv, VALUE self) { FXF
 static VALUE _wrap_FXFrame_tr(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ; FXchar *arg2 ;
     FXchar *arg3 = (FXchar *) 0 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFrame, 1); arg2 = StringValuePtr(argv[0]); if (argc > 1) {
-        arg3 = StringValuePtr(argv[1]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFrame, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    if (argc > 1) { arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); } 
     result = (FXchar *)FXFrame_tr((FXFrame const *)arg1,(FXchar const *)arg2,(FXchar const *)arg3);
     vresult = rb_str_new2(result); return vresult; }
 static VALUE _wrap_FXFrame_dropEnable(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ;
@@ -7161,8 +7169,8 @@ static VALUE _wrap_FXComposite_setBackColor(int argc, VALUE *argv, VALUE self) {
 static VALUE _wrap_FXComposite_tr(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ; FXchar *arg2 ;
     FXchar *arg3 = (FXchar *) 0 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComposite, 1); arg2 = StringValuePtr(argv[0]); if (argc > 1) {
-        arg3 = StringValuePtr(argv[1]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComposite, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    if (argc > 1) { arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); } 
     result = (FXchar *)FXComposite_tr((FXComposite const *)arg1,(FXchar const *)arg2,(FXchar const *)arg3);
     vresult = rb_str_new2(result); return vresult; }
 static VALUE _wrap_FXComposite_dropEnable(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
@@ -7351,8 +7359,8 @@ static VALUE _wrap_FXRootWindow_setBackColor(int argc, VALUE *argv, VALUE self)
 static VALUE _wrap_FXRootWindow_tr(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 0 ; FXchar *arg2 ;
     FXchar *arg3 = (FXchar *) 0 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRootWindow, 1); arg2 = StringValuePtr(argv[0]); if (argc > 1) {
-        arg3 = StringValuePtr(argv[1]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRootWindow, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    if (argc > 1) { arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); } 
     result = (FXchar *)FXRootWindow_tr((FXRootWindow const *)arg1,(FXchar const *)arg2,(FXchar const *)arg3);
     vresult = rb_str_new2(result); return vresult; }
 static VALUE _wrap_FXRootWindow_dropEnable(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 0 ;
@@ -7597,8 +7605,8 @@ static VALUE _wrap_FXShell_setBackColor(int argc, VALUE *argv, VALUE self) { FXS
 static VALUE _wrap_FXShell_tr(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ; FXchar *arg2 ;
     FXchar *arg3 = (FXchar *) 0 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShell, 1); arg2 = StringValuePtr(argv[0]); if (argc > 1) {
-        arg3 = StringValuePtr(argv[1]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShell, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    if (argc > 1) { arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); } 
     result = (FXchar *)FXShell_tr((FXShell const *)arg1,(FXchar const *)arg2,(FXchar const *)arg3);
     vresult = rb_str_new2(result); return vresult; }
 static VALUE _wrap_FXShell_dropEnable(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ;
@@ -7965,8 +7973,8 @@ static VALUE _wrap_FXPopup_setBackColor(int argc, VALUE *argv, VALUE self) { FXP
 static VALUE _wrap_FXPopup_tr(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ; FXchar *arg2 ;
     FXchar *arg3 = (FXchar *) 0 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPopup, 1); arg2 = StringValuePtr(argv[0]); if (argc > 1) {
-        arg3 = StringValuePtr(argv[1]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPopup, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    if (argc > 1) { arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); } 
     result = (FXchar *)FXPopup_tr((FXPopup const *)arg1,(FXchar const *)arg2,(FXchar const *)arg3);
     vresult = rb_str_new2(result); return vresult; }
 static VALUE _wrap_FXPopup_dropEnable(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ;
@@ -8450,8 +8458,8 @@ static VALUE _wrap_FXTopWindow_setBackColor(int argc, VALUE *argv, VALUE self) {
 static VALUE _wrap_FXTopWindow_tr(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ; FXchar *arg2 ;
     FXchar *arg3 = (FXchar *) 0 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTopWindow, 1); arg2 = StringValuePtr(argv[0]); if (argc > 1) {
-        arg3 = StringValuePtr(argv[1]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTopWindow, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    if (argc > 1) { arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); } 
     result = (FXchar *)FXTopWindow_tr((FXTopWindow const *)arg1,(FXchar const *)arg2,(FXchar const *)arg3);
     vresult = rb_str_new2(result); return vresult; }
 static VALUE _wrap_FXTopWindow_dropEnable(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
@@ -8683,8 +8691,8 @@ static VALUE _wrap_FXMainWindow_setBackColor(int argc, VALUE *argv, VALUE self)
 static VALUE _wrap_FXMainWindow_tr(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 0 ; FXchar *arg2 ;
     FXchar *arg3 = (FXchar *) 0 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMainWindow, 1); arg2 = StringValuePtr(argv[0]); if (argc > 1) {
-        arg3 = StringValuePtr(argv[1]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMainWindow, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    if (argc > 1) { arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); } 
     result = (FXchar *)FXMainWindow_tr((FXMainWindow const *)arg1,(FXchar const *)arg2,(FXchar const *)arg3);
     vresult = rb_str_new2(result); return vresult; }
 static VALUE _wrap_FXMainWindow_dropEnable(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 0 ;
@@ -8963,8 +8971,8 @@ static VALUE _wrap_FXSplashWindow_setBackColor(int argc, VALUE *argv, VALUE self
 static VALUE _wrap_FXSplashWindow_tr(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
     FXchar *arg2 ; FXchar *arg3 = (FXchar *) 0 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSplashWindow, 1); arg2 = StringValuePtr(argv[0]); if (argc > 1) {
-        arg3 = StringValuePtr(argv[1]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSplashWindow, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
+    if (argc > 1) { arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); } 
     result = (FXchar *)FXSplashWindow_tr((FXSplashWindow const *)arg1,(FXchar const *)arg2,(FXchar const *)arg3);
     vresult = rb_str_new2(result); return vresult; }
 static VALUE _wrap_FXSplashWindow_dropEnable(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
@@ -10623,7 +10631,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXFont.klass, "flags", VALUEFUNC(_wrap_FXFont_flags), -1);
     rb_define_method(cFXFont.klass, "getFontDesc", VALUEFUNC(_wrap_FXFont_getFontDesc), -1);
     rb_define_method(cFXFont.klass, "angle", VALUEFUNC(_wrap_FXFont_angle), -1);
-    rb_define_method(cFXFont.klass, "getFont", VALUEFUNC(_wrap_FXFont_getFont), -1);
+    rb_define_method(cFXFont.klass, "font", VALUEFUNC(_wrap_FXFont_font), -1);
     rb_define_singleton_method(cFXFont.klass, "listFonts", VALUEFUNC(_wrap_FXFont_listFonts), -1);
     rb_define_method(cFXFont.klass, "save", VALUEFUNC(_wrap_FXFont_save), -1);
     rb_define_method(cFXFont.klass, "load", VALUEFUNC(_wrap_FXFont_load), -1);