fxruby 1.4.1 → 1.4.2

data/ext/fox14/FXRuby.cpp

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRuby.cpp,v 1.4 2005/08/17 01:04:21 lyle Exp $
+ * $Id: FXRuby.cpp,v 1.5 2005/08/21 21:57:59 lyle Exp $
  ***********************************************************************/
 
 #ifdef _MSC_VER
@@ -510,7 +510,9 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
           type==SEL_MINIMIZE ||
           type==SEL_RESTORE ||
           type==SEL_MAXIMIZE ||
-          type==SEL_UPDATE){
+          type==SEL_UPDATE ||
+          type==SEL_QUERY_HELP ||
+	  type==SEL_QUERY_TIP){
     FXASSERT(ptr==0);
     return Qnil;
     }
@@ -892,6 +894,8 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
     case SEL_RESTORE:
     case SEL_MAXIMIZE:
     case SEL_UPDATE:
+    case SEL_QUERY_TIP:
+    case SEL_QUERY_HELP:
       return NULL;
     case SEL_VERIFY:
       return reinterpret_cast<void*>(STR2CSTR(value));

data/ext/fox14/core_wrap.cpp

@@ -1370,6 +1370,19 @@ FXFontDesc FXFont_getFontDesc(FXFont const *self){
       self->getFontDesc(fontdesc);
       return fontdesc;
     }
+FXbool FXFont_hasChar(FXFont const *self,VALUE ch){
+      if(TYPE(ch)==T_STRING){
+        if(RSTRING(ch)->len==1){
+          return self->hasChar(*(STR2CSTR(ch)));
+	  }
+	else{
+	  rb_raise(rb_eArgError,"expected a string of length one");
+	  }
+        }
+      else{
+        return self->hasChar(NUM2INT(ch));
+        }
+      }
 FXint FXFont_getTextWidth(FXFont const *self,VALUE str){
       Check_Type(str,T_STRING);
       return self->getTextWidth(RSTRING(str)->ptr,RSTRING(str)->len);
@@ -2006,9 +2019,8 @@ static VALUE _wrap_FXStream_container(int argc, VALUE *argv, VALUE self) { FXStr
      return vresult; }
 static VALUE _wrap_FXStream_getPosition(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; FXlong 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_FXStream, 1); result = ((FXStream const *)arg1)->position(); {
-        FXlong * resultptr; resultptr = new FXlong((FXlong &)result);
-        vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXlong, 1); }  return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); result = ((FXStream const *)arg1)->position();
+    vresult = LONG2NUM(result); return vresult; }
 static VALUE _wrap_FXStream_swapBytes__SWIG_0(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ;
     FXbool arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); arg2 = to_FXbool(argv[0]); (arg1)->swapBytes(arg2);
@@ -2047,12 +2059,11 @@ static VALUE _wrap_FXStream_flush(int argc, VALUE *argv, VALUE self) { FXStream
     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_FXStream, 1); result = (FXbool)FXStream_flush(arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXStream_position(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; FXlong arg2 ;
+static VALUE _wrap_FXStream_setPosition(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; FXlong arg2 ;
     int arg3 = (int) FXFromStart ; FXbool 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_FXStream, 1); { FXlong * ptr;
-        SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_FXlong, 1); if (ptr) arg2 = *ptr; }  if (argc > 1) {
-        arg3 = (int) NUM2INT(argv[1]); }  result = (FXbool)FXStream_position(arg1,arg2,(FXWhence )arg3);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); arg2 = static_cast<FXlong>(NUM2LONG(argv[0]));
+    if (argc > 1) { arg3 = (int) NUM2INT(argv[1]); }  result = (FXbool)FXStream_position(arg1,arg2,(FXWhence )arg3);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXFileStream_allocate(VALUE self) {
@@ -2079,9 +2090,8 @@ static VALUE _wrap_FXFileStream_open(int argc, VALUE *argv, VALUE self) { FXFile
 static VALUE _wrap_FXFileStream_getPosition(int argc, VALUE *argv, VALUE self) { FXFileStream *arg1 = (FXFileStream *) 0 ;
     FXlong 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_FXFileStream, 1); result = ((FXFileStream const *)arg1)->position(); {
-        FXlong * resultptr; resultptr = new FXlong((FXlong &)result);
-        vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXlong, 1); }  return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileStream, 1); result = ((FXFileStream const *)arg1)->position();
+    vresult = LONG2NUM(result); return vresult; }
 static void
 free_FXFileStream(FXFileStream *arg1) {
     delete arg1;
@@ -2096,12 +2106,11 @@ static VALUE _wrap_FXFileStream_flush(int argc, VALUE *argv, VALUE self) { FXFil
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileStream, 1); result = (FXbool)FXFileStream_flush(arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXFileStream_position(int argc, VALUE *argv, VALUE self) { FXFileStream *arg1 = (FXFileStream *) 0 ;
+static VALUE _wrap_FXFileStream_setPosition(int argc, VALUE *argv, VALUE self) { FXFileStream *arg1 = (FXFileStream *) 0 ;
     FXlong arg2 ; int arg3 = (int) FXFromStart ; FXbool 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_FXFileStream, 1); { FXlong * ptr;
-        SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_FXlong, 1); if (ptr) arg2 = *ptr; }  if (argc > 1) {
-        arg3 = (int) NUM2INT(argv[1]); }  result = (FXbool)FXFileStream_position(arg1,arg2,(FXWhence )arg3);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileStream, 1); arg2 = static_cast<FXlong>(NUM2LONG(argv[0]));
+    if (argc > 1) { arg3 = (int) NUM2INT(argv[1]); }  result = (FXbool)FXFileStream_position(arg1,arg2,(FXWhence )arg3);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXMemoryStream_allocate(VALUE self) {
@@ -2136,9 +2145,8 @@ static VALUE _wrap_FXMemoryStream_giveBuffer(int argc, VALUE *argv, VALUE self)
 static VALUE _wrap_FXMemoryStream_getPosition(int argc, VALUE *argv, VALUE self) { FXMemoryStream *arg1 = (FXMemoryStream *) 0 ;
     FXlong 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_FXMemoryStream, 1); result = ((FXMemoryStream const *)arg1)->position(); {
-        FXlong * resultptr; resultptr = new FXlong((FXlong &)result);
-        vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXlong, 1); }  return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMemoryStream, 1); result = ((FXMemoryStream const *)arg1)->position();
+    vresult = LONG2NUM(result); return vresult; }
 static void
 free_FXMemoryStream(FXMemoryStream *arg1) {
     delete arg1;
@@ -4123,6 +4131,16 @@ static VALUE _wrap_FXStringDict_remove(int argc, VALUE *argv, VALUE self) { FXSt
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStringDict, 1); arg2 = 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]);
+    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))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStringDict, 1); arg2 = NUM2UINT(argv[0]);
+    result = (FXchar *)((FXStringDict const *)arg1)->data(arg2); vresult = rb_str_new2(result); return vresult; }
 static void
 free_FXStringDict(FXStringDict *arg1) {
     delete arg1;
@@ -4161,6 +4179,20 @@ static VALUE _wrap_FXSettings_unparseFile(int argc, VALUE *argv, VALUE self) { F
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     result = (FXbool)(arg1)->unparseFile((FXString const &)*arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXSettings_data(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ; FXuint 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 = NUM2UINT(argv[0]);
+    result = (FXStringDict *)((FXSettings const *)arg1)->data(arg2); {
+        swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXStringDict, (void **) &result);
+        vresult = FXRbGetRubyObj(result, ty); }  return vresult; }
+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]);
+    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);
@@ -5209,10 +5241,10 @@ static VALUE _wrap_FXFont_isFontMono(int argc, VALUE *argv, VALUE self) { FXFont
     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 = (FXbool)((FXFont const *)arg1)->isFontMono();
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXFont_hasChar(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXint arg2 ; FXbool result;
+static VALUE _wrap_FXFont_hasChar(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; VALUE arg2 ; FXbool result;
     VALUE vresult = Qnil; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); arg2 = NUM2INT(argv[0]);
-    result = (FXbool)((FXFont const *)arg1)->hasChar(arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); arg2 = argv[0];
+    result = (FXbool)FXFont_hasChar((FXFont const *)arg1,arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXFont_getMinChar(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXint 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 = (FXint)((FXFont const *)arg1)->getMinChar();
@@ -9125,7 +9157,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXStream.klass, "isBigEndian", VALUEFUNC(_wrap_FXStream_isBigEndian), -1);
     rb_define_method(cFXStream.klass, "close", VALUEFUNC(_wrap_FXStream_close), -1);
     rb_define_method(cFXStream.klass, "flush", VALUEFUNC(_wrap_FXStream_flush), -1);
-    rb_define_method(cFXStream.klass, "position", VALUEFUNC(_wrap_FXStream_position), -1);
+    rb_define_method(cFXStream.klass, "setPosition", VALUEFUNC(_wrap_FXStream_setPosition), -1);
     cFXStream.mark = (void (*)(void *)) FXRbStream::markfunc;
     cFXStream.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
     
@@ -9137,7 +9169,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXFileStream.klass, "getPosition", VALUEFUNC(_wrap_FXFileStream_getPosition), -1);
     rb_define_method(cFXFileStream.klass, "close", VALUEFUNC(_wrap_FXFileStream_close), -1);
     rb_define_method(cFXFileStream.klass, "flush", VALUEFUNC(_wrap_FXFileStream_flush), -1);
-    rb_define_method(cFXFileStream.klass, "position", VALUEFUNC(_wrap_FXFileStream_position), -1);
+    rb_define_method(cFXFileStream.klass, "setPosition", VALUEFUNC(_wrap_FXFileStream_setPosition), -1);
     cFXFileStream.mark = (void (*)(void *)) FXRbFileStream::markfunc;
     cFXFileStream.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
     
@@ -9634,6 +9666,8 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXStringDict.klass, "insert", VALUEFUNC(_wrap_FXStringDict_insert), -1);
     rb_define_method(cFXStringDict.klass, "replace", VALUEFUNC(_wrap_FXStringDict_replace), -1);
     rb_define_method(cFXStringDict.klass, "remove", VALUEFUNC(_wrap_FXStringDict_remove), -1);
+    rb_define_method(cFXStringDict.klass, "find", VALUEFUNC(_wrap_FXStringDict_find), -1);
+    rb_define_method(cFXStringDict.klass, "data", VALUEFUNC(_wrap_FXStringDict_data), -1);
     rb_define_method(cFXStringDict.klass, "save", VALUEFUNC(_wrap_FXStringDict_save), -1);
     rb_define_method(cFXStringDict.klass, "load", VALUEFUNC(_wrap_FXStringDict_load), -1);
     cFXStringDict.mark = (void (*)(void *)) FXRbStringDict::markfunc;
@@ -9645,6 +9679,8 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXSettings.klass, "initialize", VALUEFUNC(_wrap_new_FXSettings), -1);
     rb_define_method(cFXSettings.klass, "parseFile", VALUEFUNC(_wrap_FXSettings_parseFile), -1);
     rb_define_method(cFXSettings.klass, "unparseFile", VALUEFUNC(_wrap_FXSettings_unparseFile), -1);
+    rb_define_method(cFXSettings.klass, "data", VALUEFUNC(_wrap_FXSettings_data), -1);
+    rb_define_method(cFXSettings.klass, "find", VALUEFUNC(_wrap_FXSettings_find), -1);
     rb_define_method(cFXSettings.klass, "readStringEntry", VALUEFUNC(_wrap_FXSettings_readStringEntry), -1);
     rb_define_method(cFXSettings.klass, "readIntEntry", VALUEFUNC(_wrap_FXSettings_readIntEntry), -1);
     rb_define_method(cFXSettings.klass, "readUnsignedEntry", VALUEFUNC(_wrap_FXSettings_readUnsignedEntry), -1);

data/ext/fox14/iconlist_wrap.cpp

@@ -531,12 +531,11 @@ SWIGIMPORT(void)   SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_ty
 #define  SWIGTYPE_p_FXIconList swig_types[12] 
 #define  SWIGTYPE_p_FXIcon swig_types[13] 
 #define  SWIGTYPE_p_FXHeader swig_types[14] 
-#define  SWIGTYPE_p_FXlong swig_types[15] 
-#define  SWIGTYPE_p_FXFileList swig_types[16] 
-#define  SWIGTYPE_p_FXIconItem swig_types[17] 
-#define  SWIGTYPE_p_FXRegion swig_types[18] 
-#define  SWIGTYPE_p_FXFileItem swig_types[19] 
-static swig_type_info *swig_types[21];
+#define  SWIGTYPE_p_FXFileList swig_types[15] 
+#define  SWIGTYPE_p_FXIconItem swig_types[16] 
+#define  SWIGTYPE_p_FXRegion swig_types[17] 
+#define  SWIGTYPE_p_FXFileItem swig_types[18] 
+static swig_type_info *swig_types[20];
 
 /* -------- TYPES TABLE (END) -------- */
 
@@ -2049,9 +2048,8 @@ static VALUE _wrap_FXFileItem_getAssoc(int argc, VALUE *argv, VALUE self) { FXFi
     return vresult; }
 static VALUE _wrap_FXFileItem_getSize(int argc, VALUE *argv, VALUE self) { FXFileItem *arg1 = (FXFileItem *) 0 ; FXlong 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_FXFileItem, 1); result = ((FXFileItem const *)arg1)->getSize(); {
-        FXlong * resultptr; resultptr = new FXlong((FXlong &)result);
-        vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXlong, 1); }  return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileItem, 1); result = ((FXFileItem const *)arg1)->getSize();
+    vresult = LONG2NUM(result); return vresult; }
 static VALUE _wrap_FXFileItem_getDate(int argc, VALUE *argv, VALUE self) { FXFileItem *arg1 = (FXFileItem *) 0 ; FXTime 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_FXFileItem, 1); result = (FXTime)((FXFileItem const *)arg1)->getDate();
@@ -3482,7 +3480,6 @@ static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable
 static swig_type_info _swigt__p_FXIconList[] = {{"_p_FXIconList", 0, "FXIconList *", 0, 0, 0, 0},{"_p_FXIconList", 0, 0, 0, 0, 0, 0},{"_p_FXFileList", _p_FXFileListTo_p_FXIconList, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXIcon[] = {{"_p_FXIcon", 0, "FXIcon *", 0, 0, 0, 0},{"_p_FXIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXHeader[] = {{"_p_FXHeader", 0, "FXHeader *", 0, 0, 0, 0},{"_p_FXHeader", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXlong[] = {{"_p_FXlong", 0, "FXlong *", 0, 0, 0, 0},{"_p_FXlong", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXFileList[] = {{"_p_FXFileList", 0, "FXFileList *", 0, 0, 0, 0},{"_p_FXFileList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXIconItem[] = {{"_p_FXIconItem", 0, "FXIconItem *", 0, 0, 0, 0},{"_p_FXIconItem", 0, 0, 0, 0, 0, 0},{"_p_FXFileItem", _p_FXFileItemTo_p_FXIconItem, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXRegion[] = {{"_p_FXRegion", 0, "FXRegion *", 0, 0, 0, 0},{"_p_FXRegion", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -3504,7 +3501,6 @@ _swigt__p_FXDrawable,
 _swigt__p_FXIconList, 
 _swigt__p_FXIcon, 
 _swigt__p_FXHeader, 
-_swigt__p_FXlong, 
 _swigt__p_FXFileList, 
 _swigt__p_FXIconItem, 
 _swigt__p_FXRegion, 

data/ext/fox14/menu_wrap.cpp

@@ -691,12 +691,22 @@ static void free_FXMenuBar(FXMenuBar *);
 FXMenuCheck *new_FXMenuCheck(FXComposite *p,FXString const &text,FXObject *tgt,FXSelector sel,FXuint opts){
       return new FXRbMenuCheck(p,text,tgt,sel,opts);
       }
+FXbool FXMenuCheck_getCheck(FXMenuCheck const *self){
+      rb_warning("FXMenuCheck#getCheck is deprecated; use checked?, unchecked? or maybe?");
+      return self->getCheck();
+      }
+FXuchar FXMenuCheck_getCheckState(FXMenuCheck const *self){ return self->getCheck(); }
 
 swig_class cFXMenuCheck;
 static void free_FXMenuCheck(FXMenuCheck *);
 FXMenuRadio *new_FXMenuRadio(FXComposite *p,FXString const &text,FXObject *tgt,FXSelector sel,FXuint opts){
       return new FXRbMenuRadio(p,text,tgt,sel,opts);
       }
+FXbool FXMenuRadio_getCheck(FXMenuRadio const *self){
+      rb_warning("FXMenuRadio#getCheck is deprecated; use checked?, unchecked? or maybe?");
+      return self->getCheck();
+      }
+FXuchar FXMenuRadio_getCheckState(FXMenuRadio const *self){ return self->getCheck(); }
 
 swig_class cFXMenuRadio;
 static void free_FXMenuRadio(FXMenuRadio *);
@@ -2903,8 +2913,13 @@ static VALUE _wrap_FXMenuCheck_setCheck(int argc, VALUE *argv, VALUE self) { FXM
 static VALUE _wrap_FXMenuCheck_getCheck(int argc, VALUE *argv, VALUE self) { FXMenuCheck *arg1 = (FXMenuCheck *) 0 ;
     FXbool 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_FXMenuCheck, 1); result = (FXbool)((FXMenuCheck const *)arg1)->getCheck();
-    vresult = result ? Qtrue : Qfalse; return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMenuCheck, 1);
+    result = (FXbool)FXMenuCheck_getCheck((FXMenuCheck const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXMenuCheck_getCheckState(int argc, VALUE *argv, VALUE self) { FXMenuCheck *arg1 = (FXMenuCheck *) 0 ;
+    FXuchar 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_FXMenuCheck, 1);
+    result = (FXuchar)FXMenuCheck_getCheckState((FXMenuCheck const *)arg1); vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_FXMenuCheck_getBoxColor(int argc, VALUE *argv, VALUE self) { FXMenuCheck *arg1 = (FXMenuCheck *) 0 ;
     FXColor result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -3186,8 +3201,13 @@ static VALUE _wrap_FXMenuRadio_setCheck(int argc, VALUE *argv, VALUE self) { FXM
 static VALUE _wrap_FXMenuRadio_getCheck(int argc, VALUE *argv, VALUE self) { FXMenuRadio *arg1 = (FXMenuRadio *) 0 ;
     FXbool 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_FXMenuRadio, 1); result = (FXbool)((FXMenuRadio const *)arg1)->getCheck();
-    vresult = result ? Qtrue : Qfalse; return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMenuRadio, 1);
+    result = (FXbool)FXMenuRadio_getCheck((FXMenuRadio const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXMenuRadio_getCheckState(int argc, VALUE *argv, VALUE self) { FXMenuRadio *arg1 = (FXMenuRadio *) 0 ;
+    FXuchar 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_FXMenuRadio, 1);
+    result = (FXuchar)FXMenuRadio_getCheckState((FXMenuRadio const *)arg1); vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_FXMenuRadio_getRadioColor(int argc, VALUE *argv, VALUE self) { FXMenuRadio *arg1 = (FXMenuRadio *) 0 ;
     FXColor result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -5149,6 +5169,7 @@ SWIGEXPORT(void) Init_menu(void) {
     rb_define_method(cFXMenuCheck.klass, "onCmdAccel", VALUEFUNC(_wrap_FXMenuCheck_onCmdAccel), -1);
     rb_define_method(cFXMenuCheck.klass, "setCheck", VALUEFUNC(_wrap_FXMenuCheck_setCheck), -1);
     rb_define_method(cFXMenuCheck.klass, "getCheck", VALUEFUNC(_wrap_FXMenuCheck_getCheck), -1);
+    rb_define_method(cFXMenuCheck.klass, "getCheckState", VALUEFUNC(_wrap_FXMenuCheck_getCheckState), -1);
     rb_define_method(cFXMenuCheck.klass, "getBoxColor", VALUEFUNC(_wrap_FXMenuCheck_getBoxColor), -1);
     rb_define_method(cFXMenuCheck.klass, "setBoxColor", VALUEFUNC(_wrap_FXMenuCheck_setBoxColor), -1);
     rb_define_method(cFXMenuCheck.klass, "save", VALUEFUNC(_wrap_FXMenuCheck_save), -1);
@@ -5206,6 +5227,7 @@ SWIGEXPORT(void) Init_menu(void) {
     rb_define_method(cFXMenuRadio.klass, "onCmdAccel", VALUEFUNC(_wrap_FXMenuRadio_onCmdAccel), -1);
     rb_define_method(cFXMenuRadio.klass, "setCheck", VALUEFUNC(_wrap_FXMenuRadio_setCheck), -1);
     rb_define_method(cFXMenuRadio.klass, "getCheck", VALUEFUNC(_wrap_FXMenuRadio_getCheck), -1);
+    rb_define_method(cFXMenuRadio.klass, "getCheckState", VALUEFUNC(_wrap_FXMenuRadio_getCheckState), -1);
     rb_define_method(cFXMenuRadio.klass, "getRadioColor", VALUEFUNC(_wrap_FXMenuRadio_getRadioColor), -1);
     rb_define_method(cFXMenuRadio.klass, "setRadioColor", VALUEFUNC(_wrap_FXMenuRadio_setRadioColor), -1);
     rb_define_method(cFXMenuRadio.klass, "save", VALUEFUNC(_wrap_FXMenuRadio_save), -1);

data/ext/fox14/treelist_wrap.cpp

@@ -533,12 +533,11 @@ SWIGIMPORT(void)   SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_ty
 #define  SWIGTYPE_p_FXTreeList swig_types[14] 
 #define  SWIGTYPE_p_FXIcon swig_types[15] 
 #define  SWIGTYPE_p_FXHeader swig_types[16] 
-#define  SWIGTYPE_p_FXlong swig_types[17] 
-#define  SWIGTYPE_p_FXFoldingListSortFunc swig_types[18] 
-#define  SWIGTYPE_p_FXFoldingList swig_types[19] 
-#define  SWIGTYPE_p_FXRegion swig_types[20] 
-#define  SWIGTYPE_p_FXTreeItem swig_types[21] 
-static swig_type_info *swig_types[23];
+#define  SWIGTYPE_p_FXFoldingListSortFunc swig_types[17] 
+#define  SWIGTYPE_p_FXFoldingList swig_types[18] 
+#define  SWIGTYPE_p_FXRegion swig_types[19] 
+#define  SWIGTYPE_p_FXTreeItem swig_types[20] 
+static swig_type_info *swig_types[22];
 
 /* -------- TYPES TABLE (END) -------- */
 
@@ -3360,9 +3359,8 @@ static VALUE _wrap_FXDirItem_getAssoc(int argc, VALUE *argv, VALUE self) { FXDir
     return vresult; }
 static VALUE _wrap_FXDirItem_getSize(int argc, VALUE *argv, VALUE self) { FXDirItem *arg1 = (FXDirItem *) 0 ; FXlong 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_FXDirItem, 1); result = ((FXDirItem const *)arg1)->getSize(); {
-        FXlong * resultptr; resultptr = new FXlong((FXlong &)result);
-        vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXlong, 1); }  return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDirItem, 1); result = ((FXDirItem const *)arg1)->getSize();
+    vresult = LONG2NUM(result); return vresult; }
 static VALUE _wrap_FXDirItem_getDate(int argc, VALUE *argv, VALUE self) { FXDirItem *arg1 = (FXDirItem *) 0 ; FXTime 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_FXDirItem, 1); result = (FXTime)((FXDirItem const *)arg1)->getDate();
@@ -5163,7 +5161,6 @@ static swig_type_info _swigt__p_FXDirItem[] = {{"_p_FXDirItem", 0, "FXDirItem *"
 static swig_type_info _swigt__p_FXTreeList[] = {{"_p_FXTreeList", 0, "FXTreeList *", 0, 0, 0, 0},{"_p_FXDirList", _p_FXDirListTo_p_FXTreeList, 0, 0, 0, 0, 0},{"_p_FXTreeList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXIcon[] = {{"_p_FXIcon", 0, "FXIcon *", 0, 0, 0, 0},{"_p_FXIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXHeader[] = {{"_p_FXHeader", 0, "FXHeader *", 0, 0, 0, 0},{"_p_FXHeader", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXlong[] = {{"_p_FXlong", 0, "FXlong *", 0, 0, 0, 0},{"_p_FXlong", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXFoldingListSortFunc[] = {{"_p_FXFoldingListSortFunc", 0, "FXFoldingListSortFunc *", 0, 0, 0, 0},{"_p_FXFoldingListSortFunc", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXFoldingList[] = {{"_p_FXFoldingList", 0, "FXFoldingList *", 0, 0, 0, 0},{"_p_FXFoldingList", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXRegion[] = {{"_p_FXRegion", 0, "FXRegion *", 0, 0, 0, 0},{"_p_FXRegion", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -5187,7 +5184,6 @@ _swigt__p_FXDirItem,
 _swigt__p_FXTreeList, 
 _swigt__p_FXIcon, 
 _swigt__p_FXHeader, 
-_swigt__p_FXlong, 
 _swigt__p_FXFoldingListSortFunc, 
 _swigt__p_FXFoldingList, 
 _swigt__p_FXRegion, 

data/lib/fox14/aliases.rb

@@ -432,15 +432,6 @@ module Fox
     def check=(*args) # :nodoc:
       setCheck(*args)
     end	# deprecated
-    def checked?
-      self.checkState == TRUE
-    end
-    def unchecked?
-      self.checkState == FALSE
-    end
-    def maybe?
-      self.checkState == MAYBE
-    end
     def checkButtonStyle=(*args) # :nodoc:
       setCheckButtonStyle(*args)
     end
@@ -1726,6 +1717,7 @@ module Fox
     def fontSpacing(*args) # :nodoc:
       getFontSpacing(*args)
     end
+    alias hasChar? hasChar
   end
   class FXFontDialog
     def fontSelection(*args) # :nodoc:
@@ -2977,20 +2969,54 @@ module Fox
     end
   end
   class FXMenuCheck
-    alias check		getCheck
-    alias check=	setCheck
-    alias boxColor	getBoxColor
-    alias boxColor=	setBoxColor
+    def checkState # :nodoc:
+      getCheckState
+    end
+    def setCheckState(*args) # :nodoc:
+      setCheck(*args)
+    end
+    def checkState=(*args) # :nodoc:
+      setCheck(*args)
+    end
+    def check # :nodoc:
+      getCheck
+    end			# deprecated
+    def check=(*args) # :nodoc:
+      setCheck(*args)
+    end	# deprecated
+    def boxColor # :nodoc:
+      getBoxColor()
+    end
+    def boxColor=(*args) # :nodoc:
+      setBoxColor(*args)
+    end
   end
   class FXMenuCommand
     alias accelText=	setAccelText
     alias accelText		getAccelText
   end
   class FXMenuRadio
-    alias check		getCheck
-    alias check=	setCheck
-    alias radioColor	getRadioColor
-    alias radioColor=	setRadioColor
+    def checkState # :nodoc:
+      getCheckState
+    end
+    def setCheckState(*args) # :nodoc:
+      setCheck(*args)
+    end
+    def checkState=(*args) # :nodoc:
+      setCheck(*args)
+    end
+    def check # :nodoc:
+      getCheck
+    end			# deprecated
+    def check=(*args) # :nodoc:
+      setCheck(*args)
+    end	# deprecated
+    def radioColor # :nodoc:
+      getRadioColor()
+    end
+    def radioColor=(*args) # :nodoc:
+      setRadioColor(*args)
+    end
   end
   class FXMenuSeparator
     def hiliteColor=(*args) # :nodoc:
@@ -3262,27 +3288,18 @@ module Fox
     def checkState # :nodoc:
       getCheckState
     end
-    def setCheckState(*args)
+    def setCheckState(*args) # :nodoc:
       setCheck(*args)
     end
-    def checkState=(*args)
+    def checkState=(*args) # :nodoc:
       setCheck(*args)
     end
     def check # :nodoc:
       getCheck
-    end	# deprecated
-    def check=(*args)		# also deprecated
+    end			# deprecated
+    def check=(*args) # :nodoc:
       setCheck(*args)
-    end
-    def checked?
-      self.checkState == TRUE
-    end
-    def unchecked?
-      self.checkState == FALSE
-    end
-    def maybe?
-      self.checkState == MAYBE
-    end
+    end	# deprecated
     def radioButtonStyle=(*args) # :nodoc:
       setRadioButtonStyle(*args)
     end
@@ -4880,8 +4897,11 @@ module Fox
     end
   end
   class FXTopWindow
-    def iconified?(*args) # :nodoc:
-      isIconified(*args)
+    def minimized? # # :nodoc:
+      isMinimized()
+    end
+    def maximized? # :nodoc:
+      isMaximized()
     end
     def title=(*args) # :nodoc:
       setTitle(*args)