fxruby 1.4.7 → 1.6.0

data/ext/{fox14 → fox16}/core_wrap.cpp

@@ -527,49 +527,55 @@ SWIGIMPORT(void)   SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_ty
 #define  SWIGTYPE_p_FXIconDict swig_types[8] 
 #define  SWIGTYPE_p_FXShell swig_types[9] 
 #define  SWIGTYPE_p_FXPopup swig_types[10] 
-#define  SWIGTYPE_p_FXRootWindow swig_types[11] 
-#define  SWIGTYPE_p_FXWindow swig_types[12] 
-#define  SWIGTYPE_p_FXTopWindow swig_types[13] 
-#define  SWIGTYPE_p_void swig_types[14] 
-#define  SWIGTYPE_p_FXDocument swig_types[15] 
-#define  SWIGTYPE_p_FXRecentFiles swig_types[16] 
-#define  SWIGTYPE_p_FXMainWindow swig_types[17] 
-#define  SWIGTYPE_p_FXSplashWindow swig_types[18] 
-#define  SWIGTYPE_p_FXIcon swig_types[19] 
-#define  SWIGTYPE_p_FXID swig_types[20] 
-#define  SWIGTYPE_p_FXMutex swig_types[21] 
-#define  SWIGTYPE_p_FXEvent swig_types[22] 
-#define  SWIGTYPE_p_FXIconSource swig_types[23] 
-#define  SWIGTYPE_p_FXObject swig_types[24] 
-#define  SWIGTYPE_p_FXStringDict swig_types[25] 
-#define  SWIGTYPE_p_FXBitmap swig_types[26] 
-#define  SWIGTYPE_p_FXRectangle swig_types[27] 
-#define  SWIGTYPE_p_FXString swig_types[28] 
-#define  SWIGTYPE_p_FXPoint swig_types[29] 
-#define  SWIGTYPE_p_FXFileDict swig_types[30] 
-#define  SWIGTYPE_p_FXDebugTarget swig_types[31] 
-#define  SWIGTYPE_p_FXDataTarget swig_types[32] 
-#define  SWIGTYPE_p_FXDelegator swig_types[33] 
-#define  SWIGTYPE_p_FXDrawable swig_types[34] 
-#define  SWIGTYPE_p_FXCursor swig_types[35] 
-#define  SWIGTYPE_p_FXCURCursor swig_types[36] 
-#define  SWIGTYPE_p_FXGIFCursor swig_types[37] 
-#define  SWIGTYPE_p_FXStream swig_types[38] 
-#define  SWIGTYPE_p_FXFontDesc swig_types[39] 
-#define  SWIGTYPE_p_FXApp swig_types[40] 
-#define  SWIGTYPE_p_FXRegion swig_types[41] 
-#define  SWIGTYPE_p_FXColor swig_types[42] 
-#define  SWIGTYPE_p_FXSize swig_types[43] 
-#define  SWIGTYPE_p_p_FXchar swig_types[44] 
-#define  SWIGTYPE_p_FXFont swig_types[45] 
-#define  SWIGTYPE_p_FXchar swig_types[46] 
-#define  SWIGTYPE_p_FXFrame swig_types[47] 
-#define  SWIGTYPE_p_FXFileAssoc swig_types[48] 
-#define  SWIGTYPE_p_FXVisual swig_types[49] 
-#define  SWIGTYPE_p_FXuint swig_types[50] 
-#define  SWIGTYPE_p_FXFileStream swig_types[51] 
-#define  SWIGTYPE_p_FXMemoryStream swig_types[52] 
-static swig_type_info *swig_types[54];
+#define  SWIGTYPE_p_FXTimer swig_types[11] 
+#define  SWIGTYPE_p_p_FXWindow swig_types[12] 
+#define  SWIGTYPE_p_FXRootWindow swig_types[13] 
+#define  SWIGTYPE_p_FXWindow swig_types[14] 
+#define  SWIGTYPE_p_FXTopWindow swig_types[15] 
+#define  SWIGTYPE_p_void swig_types[16] 
+#define  SWIGTYPE_p_FXDocument swig_types[17] 
+#define  SWIGTYPE_p_FXRecentFiles swig_types[18] 
+#define  SWIGTYPE_p_FXMainWindow swig_types[19] 
+#define  SWIGTYPE_p_FXSplashWindow swig_types[20] 
+#define  SWIGTYPE_p_FXIcon swig_types[21] 
+#define  SWIGTYPE_p_FXID swig_types[22] 
+#define  SWIGTYPE_p_FXMutex swig_types[23] 
+#define  SWIGTYPE_p_FXEvent swig_types[24] 
+#define  SWIGTYPE_p_FXIconSource swig_types[25] 
+#define  SWIGTYPE_p_FXObject swig_types[26] 
+#define  SWIGTYPE_p_FXStringDict swig_types[27] 
+#define  SWIGTYPE_p_FXBitmap swig_types[28] 
+#define  SWIGTYPE_p_FXRectangle swig_types[29] 
+#define  SWIGTYPE_p_FXString swig_types[30] 
+#define  SWIGTYPE_p_FXTextCodec swig_types[31] 
+#define  SWIGTYPE_p_FXComposeContext swig_types[32] 
+#define  SWIGTYPE_p_FXPoint swig_types[33] 
+#define  SWIGTYPE_p_FXFileDict swig_types[34] 
+#define  SWIGTYPE_p_FXDataTarget swig_types[35] 
+#define  SWIGTYPE_p_FXDebugTarget swig_types[36] 
+#define  SWIGTYPE_p_FXDrawable swig_types[37] 
+#define  SWIGTYPE_p_FXCursor swig_types[38] 
+#define  SWIGTYPE_p_FXDelegator swig_types[39] 
+#define  SWIGTYPE_p_FXCURCursor swig_types[40] 
+#define  SWIGTYPE_p_FXGIFCursor swig_types[41] 
+#define  SWIGTYPE_p_FXTranslator swig_types[42] 
+#define  SWIGTYPE_p_FXStream swig_types[43] 
+#define  SWIGTYPE_p_FXFontDesc swig_types[44] 
+#define  SWIGTYPE_p_FXApp swig_types[45] 
+#define  SWIGTYPE_p_FXChore swig_types[46] 
+#define  SWIGTYPE_p_FXRegion swig_types[47] 
+#define  SWIGTYPE_p_FXColor swig_types[48] 
+#define  SWIGTYPE_p_FXSize swig_types[49] 
+#define  SWIGTYPE_p_p_FXchar swig_types[50] 
+#define  SWIGTYPE_p_FXFont swig_types[51] 
+#define  SWIGTYPE_p_FXchar swig_types[52] 
+#define  SWIGTYPE_p_FXFrame swig_types[53] 
+#define  SWIGTYPE_p_FXFileAssoc swig_types[54] 
+#define  SWIGTYPE_p_FXVisual swig_types[55] 
+#define  SWIGTYPE_p_FXuint swig_types[56] 
+#define  SWIGTYPE_p_FXFileStream swig_types[57] 
+#define  SWIGTYPE_p_FXMemoryStream swig_types[58] 
+static swig_type_info *swig_types[60];
 
 /* -------- TYPES TABLE (END) -------- */
 
@@ -750,8 +756,8 @@ static void free_FXFileStream(FXFileStream *);
 FXMemoryStream *new_FXMemoryStream(FXObject const *cont){
       return new FXRbMemoryStream(cont);
       }
-FXbool FXMemoryStream_open(FXMemoryStream *self,FXStreamDirection save_or_load,VALUE str){
-      unsigned long size=0;
+bool FXMemoryStream_open(FXMemoryStream *self,FXStreamDirection save_or_load,VALUE str){
+      FXuval size=0;
       FXuchar *data=0;
       if(!NIL_P(str)){
         size=RSTRING(str)->len;
@@ -764,7 +770,7 @@ FXbool FXMemoryStream_open(FXMemoryStream *self,FXStreamDirection save_or_load,V
       }
 VALUE FXMemoryStream_takeBuffer(FXMemoryStream *self){
       FXuchar* buffer;
-      unsigned long sp;
+      FXuval sp;
       self->takeBuffer(buffer,sp);
       VALUE result=rb_str_new(const_cast<const char *>(reinterpret_cast<char*>(buffer)),sp);
       FXFREE(&buffer);
@@ -773,20 +779,20 @@ VALUE FXMemoryStream_takeBuffer(FXMemoryStream *self){
 void FXMemoryStream_giveBuffer(FXMemoryStream *self,VALUE str){
       Check_Type(str,T_STRING);
       FXuchar* buffer=reinterpret_cast<FXuchar*>(StringValuePtr(str));
-      unsigned long sp=RSTRING(str)->len;
+      FXuval sp=RSTRING(str)->len;
       self->giveBuffer(buffer,sp);
       }
 
 swig_class cFXMemoryStream;
 static void free_FXMemoryStream(FXMemoryStream *);
-FXbool FXSize_operator_Se__Se_(FXSize const *self,FXSize const &s){ return (*self == s); }
+bool FXSize_operator_Se__Se_(FXSize const *self,FXSize const &s){ return (*self == s); }
 FXSize FXSize_operator_Sa_(FXSize const *self,FXSize const &s){ return *self + s; }
 FXSize FXSize_operator_Ss_(FXSize const *self,FXSize const &s){ return *self - s; }
 FXSize FXSize_operator_Sm_(FXSize const *self,FXshort c){ return *self * c; }
 FXSize FXSize_operator_Sd_(FXSize const *self,FXshort c){ return *self / c; }
 
 swig_class cFXSize;
-FXbool FXPoint_operator_Se__Se_(FXPoint const *self,FXPoint const &p){ return *self == p; }
+bool FXPoint_operator_Se__Se_(FXPoint const *self,FXPoint const &p){ return *self == p; }
 FXPoint FXPoint_operator_Sa___SWIG_0(FXPoint const *self,FXPoint const &p){ return *self + p; }
 FXPoint FXPoint_operator_Sa___SWIG_1(FXPoint const *self,FXSize const &s){ return *self + s; }
 FXPoint FXPoint_operator_Ss___SWIG_0(FXPoint const *self,FXPoint const &p){ return *self - p; }
@@ -795,10 +801,10 @@ FXPoint FXPoint_operator_Sm_(FXPoint const *self,FXshort c){ return *self * c; }
 FXPoint FXPoint_operator_Sd_(FXPoint const *self,FXshort c){ return *self / c; }
 
 swig_class cFXPoint;
-FXbool FXRectangle_operator_Se__Se_(FXRectangle const *self,FXRectangle const &p){
+bool FXRectangle_operator_Se__Se_(FXRectangle const *self,FXRectangle const &p){
       return *self == p;
       }
-FXbool FXRectangle_overlap(FXRectangle const *self,FXRectangle const &p){
+bool FXRectangle_overlap(FXRectangle const *self,FXRectangle const &p){
       return overlap(*self,p);
       }
 FXRectangle FXRectangle_operator_Sa_(FXRectangle const *self,FXRectangle const &p){
@@ -813,7 +819,7 @@ FXRegion FXRegion_operator_Sa_(FXRegion const *self,FXRegion const &other){ retu
 FXRegion FXRegion_operator_Sm_(FXRegion const *self,FXRegion const &other){ return (*self)*other; }
 FXRegion FXRegion_operator_Ss_(FXRegion const *self,FXRegion const &other){ return (*self)-other; }
 FXRegion FXRegion_operator_Sx_(FXRegion const *self,FXRegion const &other){ return (*self)^other; }
-FXbool FXRegion_operator_Se__Se_(FXRegion const *self,FXRegion const &other){ return (*self)==other; }
+bool FXRegion_operator_Se__Se_(FXRegion const *self,FXRegion const &other){ return (*self)==other; }
 
 swig_class cFXRegion;
 static void free_FXRegion(FXRegion *);
@@ -918,6 +924,10 @@ static void free_FXAccelTable(FXAccelTable *);
 
 swig_class cFXEvent;
 static void free_FXEvent(FXEvent *);
+
+swig_class cFXChore;
+
+swig_class cFXTimer;
 VALUE FXApp_copyright(){
       return rb_str_new2((const char *) FXApp::copyright);
     }
@@ -973,7 +983,7 @@ void FXApp_removeSignal(FXApp *self,VALUE sigObj){
         }
       self->removeSignal(sig);
       }
-FXbool FXApp_addInput(FXApp *self,VALUE obj,FXuint mode,FXObject *tgt,FXSelector sel){
+bool FXApp_addInput(FXApp *self,VALUE obj,FXuint mode,FXObject *tgt,FXSelector sel){
       FXInputHandle fd;
       FXuint m;
       if(mode&INPUT_READ){
@@ -988,9 +998,9 @@ FXbool FXApp_addInput(FXApp *self,VALUE obj,FXuint mode,FXObject *tgt,FXSelector
         fd=FXRbGetWriteFileHandle(obj);
 	self->addInput(fd,m,tgt,sel);
         }
-      return 1;
+      return true;
       }
-FXbool FXApp_removeInput(FXApp *self,VALUE obj,FXuint mode){
+bool FXApp_removeInput(FXApp *self,VALUE obj,FXuint mode){
       FXInputHandle fd;
       FXuint m;
       if(mode&INPUT_READ){
@@ -1005,7 +1015,7 @@ FXbool FXApp_removeInput(FXApp *self,VALUE obj,FXuint mode){
         fd=FXRbGetWriteFileHandle(obj);
 	self->removeInput(fd,m);
         }
-      return 1;
+      return true;
       }
 void FXApp_setNormalFont(FXApp *self,FXFont *font){
       FXASSERT(font);
@@ -1040,6 +1050,11 @@ void FXApp_setDefaultCursor(FXApp *self,FXDefaultCursor which,FXCursor *cur){
 	}
       self->setDefaultCursor(which,cur);
       }
+FXWindow *FXApp_readWindow(FXApp *self,FXStream &store,FXWindow *&window,FXWindow *father,FXWindow *owner){
+      window=0;
+      self->readWindow(store,window,father,owner);
+      return window;
+      }
 void FXApp_setThreadsEnabled(FXApp *self,FXbool enabled){
     FXASSERT(self->isMemberOf(FXMETACLASS(FXRbApp)));
     dynamic_cast<FXRbApp*>(self)->setThreadsEnabled(enabled);
@@ -1092,10 +1107,14 @@ FXDelegator *new_FXDelegator(FXObject *target){
 
 swig_class cFXDelegator;
 static void free_FXDelegator(FXDelegator *);
+FXTranslator *new_FXTranslator(FXApp *a){ return new FXRbTranslator(a); }
+
+swig_class cFXTranslator;
+static void free_FXTranslator(FXTranslator *);
 FXDict *new_FXDict(){
       return new FXRbDict();
       }
-FXbool FXDict_has_key(FXDict const *self,FXchar const *ky){
+bool FXDict_has_key(FXDict const *self,FXchar const *ky){
       return (self->find(ky) != 0);
     }
 
@@ -1192,11 +1211,10 @@ FXDocument *new_FXDocument(){
 
 swig_class cFXDocument;
 static void free_FXDocument(FXDocument *);
-FXRecentFiles *new_FXRecentFiles__SWIG_0(){
-      return new FXRbRecentFiles();
-      }
-FXRecentFiles *new_FXRecentFiles__SWIG_1(FXString const &gp,FXObject *tgt,FXSelector sel){
-      return new FXRbRecentFiles(gp,tgt,sel);
+FXRecentFiles *new_FXRecentFiles__SWIG_0(){ return new FXRbRecentFiles(); }
+FXRecentFiles *new_FXRecentFiles__SWIG_1(FXApp *a){ return new FXRbRecentFiles(a); }
+FXRecentFiles *new_FXRecentFiles__SWIG_2(FXApp *a,FXString const &gp,FXObject *tgt,FXSelector sel){
+      return new FXRbRecentFiles(a,gp,tgt,sel);
       }
 
 swig_class cFXRecentFiles;
@@ -1363,8 +1381,8 @@ static void free_FXFontDesc(FXFontDesc *);
 FXFont *new_FXFont__SWIG_0(FXApp *a,FXString const &string){
       return new FXRbFont(a,string);
       }
-FXFont *new_FXFont__SWIG_1(FXApp *a,FXString const &face,FXuint sz,FXuint wt,FXuint sl,FXuint enc,FXuint setw,FXuint h){
-      return new FXRbFont(a,face,sz,wt,sl,enc,setw,h);
+FXFont *new_FXFont__SWIG_1(FXApp *a,FXString const &face,FXuint sz,FXuint wt,FXuint slant,FXuint encoding,FXuint setwidth,FXuint h){
+      return new FXRbFont(a,face,sz,wt,slant,encoding,setwidth,h);
       }
 FXFont *new_FXFont__SWIG_2(FXApp *a,FXFontDesc const &fontdesc){
       return new FXRbFont(a,fontdesc);
@@ -1374,27 +1392,6 @@ 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);
-      }
-FXint FXFont_getTextHeight(FXFont const *self,VALUE str){
-      Check_Type(str,T_STRING);
-      return self->getTextHeight(RSTRING(str)->ptr,RSTRING(str)->len);
-      }
 VALUE FXFont_listFonts(FXString const &face,FXuint wt,FXuint sl,FXuint sw,FXuint en,FXuint h){
       FXFontDesc* fonts;
       FXuint numfonts;
@@ -1406,30 +1403,25 @@ VALUE FXFont_listFonts(FXString const &face,FXuint wt,FXuint sl,FXuint sw,FXuint
       }
       return results;
     }
+FXbool FXFont_hasChar(FXFont const *self,VALUE ch){
+      if(TYPE(ch)==T_STRING){
+        if(RSTRING(ch)->len==1){
+          return self->hasChar(*(STR2CSTR(ch))); // FIXME: hasChar() expects an FXwchar
+	  }
+	else{
+	  rb_raise(rb_eArgError,"expected a string of length one");
+	  }
+        }
+      else{
+        return self->hasChar(NUM2INT(ch)); // FIXME: hasChar() expects an FXwchar
+        }
+      }
 
 swig_class cFXFont;
 static void free_FXFont(FXFont *);
-
-/// Parse font description from a string
-FXFontDesc* fxparsefontdesc2(const FXchar* string){
-  FXFontDesc* fontdesc=new FXFontDesc;
-  if(fxparsefontdesc(*fontdesc,string))
-    return fontdesc;
-  else{
-    delete fontdesc;
-    return 0;
-    } 
-  }
-
-/// Unparse font description into a string
-FXString fxunparsefontdesc2(const FXFontDesc& fontdesc){
-  FXchar s[1024];
-  if(fxunparsefontdesc(s,fontdesc))
-    return FXString(s);
-  else
-    return FXString::null;
-  }
-
+VALUE FXWindow_octetTypeName(){
+      return to_ruby(FXWindow::octetTypeName);
+    }
 VALUE FXWindow_deleteTypeName(){
       return to_ruby(FXWindow::deleteTypeName);
     }
@@ -1442,6 +1434,12 @@ VALUE FXWindow_colorTypeName(){
 VALUE FXWindow_urilistTypeName(){
       return to_ruby(FXWindow::urilistTypeName);
     }
+VALUE FXWindow_utf8TypeName(){
+      return to_ruby(FXWindow::utf8TypeName);
+    }
+VALUE FXWindow_utf16TypeName(){
+      return to_ruby(FXWindow::utf16TypeName);
+    }
 FXWindow *new_FXWindow__SWIG_0(FXComposite *p,FXuint opts,FXint x,FXint y,FXint w,FXint h){
       return new FXRbWindow(p,opts,x,y,w,h);
       }
@@ -1460,8 +1458,8 @@ FXbool FXWindow_removeChild(FXWindow *self,FXWindow *child){
         return 0;
         }
       }
-FXbool FXWindow_before(FXWindow const *self,FXWindow const *other){ return FXWindow::before(self, other); }
-FXbool FXWindow_after(FXWindow const *self,FXWindow const *other){ return FXWindow::after(self, other); }
+bool FXWindow_before(FXWindow const *self,FXWindow const *other){ return FXWindow::before(self, other); }
+bool FXWindow_after(FXWindow const *self,FXWindow const *other){ return FXWindow::after(self, other); }
 VALUE FXWindow_getCursorPosition(FXWindow const *self){
       FXint x, y;
       FXuint buttons;
@@ -1472,7 +1470,7 @@ VALUE FXWindow_getCursorPosition(FXWindow const *self){
       rb_ary_push(arr, UINT2NUM(buttons));
       return arr;
     }
-FXbool FXWindow_acquireSelection(FXWindow *self,VALUE typesArray){
+bool FXWindow_acquireSelection(FXWindow *self,VALUE typesArray){
       Check_Type(typesArray,T_ARRAY);
       FXDragType *types=0;
       FXuint numtypes=RARRAY(typesArray)->len;
@@ -1482,11 +1480,11 @@ FXbool FXWindow_acquireSelection(FXWindow *self,VALUE typesArray){
           types[i]=(FXDragType) NUM2USHRT(rb_ary_entry(typesArray,i));
           }
       }
-      FXbool result=self->acquireSelection(types,numtypes);
+      bool result=self->acquireSelection(types,numtypes);
       delete [] types;
       return result;
       }
-FXbool FXWindow_acquireClipboard(FXWindow *self,VALUE typesArray){
+bool FXWindow_acquireClipboard(FXWindow *self,VALUE typesArray){
       Check_Type(typesArray,T_ARRAY);
       FXDragType *types=0;
       FXuint numtypes=RARRAY(typesArray)->len;
@@ -1496,11 +1494,11 @@ FXbool FXWindow_acquireClipboard(FXWindow *self,VALUE typesArray){
           types[i]=(FXDragType) NUM2USHRT(rb_ary_entry(typesArray,i));
           }
       }
-      FXbool result=self->acquireClipboard(types,numtypes);
+      bool result=self->acquireClipboard(types,numtypes);
       delete [] types;
       return result;
       }
-FXbool FXWindow_beginDrag(FXWindow *self,VALUE typesArray){
+bool FXWindow_beginDrag(FXWindow *self,VALUE typesArray){
       Check_Type(typesArray,T_ARRAY);
       FXDragType *types=0;
       FXuint numtypes=RARRAY(typesArray)->len;
@@ -1510,7 +1508,7 @@ FXbool FXWindow_beginDrag(FXWindow *self,VALUE typesArray){
           types[i]=(FXDragType) NUM2USHRT(rb_ary_entry(typesArray,i));
           }
       }
-      FXbool result=self->beginDrag(types,numtypes);
+      bool result=self->beginDrag(types,numtypes);
       delete [] types;
       return result;
       }
@@ -1639,6 +1637,11 @@ static swig_type_info *FXFrame_dynamic_cast(void **ptr) {
       *ptr=reinterpret_cast<void*>(pColorBar);
       return SWIG_TypeQuery("FXColorBar *");
       }
+    FXColorRing *pColorRing=dynamic_cast<FXColorRing*>(*ppFrame);
+    if(pColorRing){
+      *ptr=reinterpret_cast<void*>(pColorRing);
+      return SWIG_TypeQuery("FXColorRing *");
+      }
     FXColorWell *pColorWell=dynamic_cast<FXColorWell*>(*ppFrame);
     if(pColorWell){
       *ptr=reinterpret_cast<void*>(pColorWell);
@@ -1669,6 +1672,11 @@ static swig_type_info *FXFrame_dynamic_cast(void **ptr) {
       *ptr=reinterpret_cast<void*>(pImageFrame);
       return SWIG_TypeQuery("FXImageFrame *");
       }
+    FXKnob *pKnob=dynamic_cast<FXKnob*>(*ppFrame);
+    if(pKnob){
+      *ptr=reinterpret_cast<void*>(pKnob);
+      return SWIG_TypeQuery("FXKnob *");
+      }
     FXLabel *pLabel=dynamic_cast<FXLabel*>(*ppFrame);
     if(pLabel){
       *ptr=reinterpret_cast<void*>(pLabel);
@@ -1941,22 +1949,6 @@ static VALUE _wrap_fxversion(int argc, VALUE *argv, VALUE self) { VALUE result;
     vresult = result; return vresult; }
 static VALUE fxTraceLevel_get(VALUE self) { VALUE _val; _val = UINT2NUM(fxTraceLevel);    return _val; }
 static VALUE fxTraceLevel_set(VALUE self, VALUE _val) { fxTraceLevel = NUM2UINT(_val); return _val; }
-static VALUE _wrap_fxparseAccel(int argc, VALUE *argv, VALUE self) { FXString *arg1 = 0 ; FXHotKey result;
-    SwigValueWrapper<FXString > p1 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); p1 = to_FXString(argv[0]); arg1 = &p1;
-    result = (FXHotKey)fxparseAccel((FXString const &)*arg1); vresult = UINT2NUM(result); return vresult; }
-static VALUE _wrap_fxparseHotKey(int argc, VALUE *argv, VALUE self) { FXString *arg1 = 0 ; FXHotKey result;
-    SwigValueWrapper<FXString > p1 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); p1 = to_FXString(argv[0]); arg1 = &p1;
-    result = (FXHotKey)fxparseHotKey((FXString const &)*arg1); vresult = UINT2NUM(result); return vresult; }
-static VALUE _wrap_fxfindHotKey(int argc, VALUE *argv, VALUE self) { FXString *arg1 = 0 ; FXint result;
-    SwigValueWrapper<FXString > p1 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); p1 = to_FXString(argv[0]); arg1 = &p1;
-    result = (FXint)fxfindHotKey((FXString const &)*arg1); vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_fxstripHotKey(int argc, VALUE *argv, VALUE self) { FXString *arg1 = 0 ; FXString result;
-    SwigValueWrapper<FXString > p1 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); p1 = to_FXString(argv[0]); arg1 = &p1;
-    result = fxstripHotKey((FXString const &)*arg1); vresult = rb_str_new2((&result)->text()); return vresult; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXStream_allocate(VALUE self) {
 #else
@@ -1973,18 +1965,17 @@ static VALUE _wrap_new_FXStream(int argc, VALUE *argv, VALUE self) { FXObject *a
         result = (FXStream *)new_FXStream((FXObject const *)arg1); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result);
         if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static VALUE _wrap_FXStream_open(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; int arg2 ;
-    unsigned long arg3 = (unsigned long) 8192 ; FXuchar *arg4 = (FXuchar *) 0 ; FXbool result; VALUE vresult = Qnil;
+    FXuval arg3 = (FXuval) 8192 ; FXuchar *arg4 = (FXuchar *) 0 ; bool 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_FXStream, 1); arg2 = (int) NUM2INT(argv[0]); if (argc > 1) {
         arg3 = NUM2ULONG(argv[1]); }  if (argc > 2) {
         arg4 = NIL_P(argv[2]) ? 0 : reinterpret_cast<FXuchar*>(STR2CSTR(argv[2])); } 
-    result = (FXbool)(arg1)->open((FXStreamDirection )arg2,arg3,arg4); vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXStream_getSpace(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ;
-    unsigned long 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 = (unsigned long)((FXStream const *)arg1)->getSpace(); vresult = UINT2NUM(result); return vresult; }
-static VALUE _wrap_FXStream_setSpace(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; unsigned long arg2 ;
+    result = (bool)(arg1)->open((FXStreamDirection )arg2,arg3,arg4); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXStream_getSpace(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; FXuval 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 = (FXuval)((FXStream const *)arg1)->getSpace();
+    vresult = UINT2NUM(result); return vresult; }
+static VALUE _wrap_FXStream_setSpace(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; FXuval 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 = NUM2ULONG(argv[0]); (arg1)->setSpace(arg2);
     return Qnil; }
@@ -1992,9 +1983,9 @@ static VALUE _wrap_FXStream_status(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 = (int)((FXStream const *)arg1)->status();
     vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXStream_eofq___(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; FXbool result;
+static VALUE _wrap_FXStream_eofq___(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 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_FXStream, 1); result = (FXbool)((FXStream const *)arg1)->eof();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); result = (bool)((FXStream const *)arg1)->eof();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXStream_setError(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; int arg2 ;
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
@@ -2013,14 +2004,14 @@ static VALUE _wrap_FXStream_getPosition(int argc, VALUE *argv, VALUE self) { FXS
     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();
     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);
+static VALUE _wrap_FXStream_swapBytes__SWIG_0(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; bool 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 = RTEST(argv[0]); (arg1)->swapBytes(arg2);
     return Qnil; }
 static VALUE _wrap_FXStream_swapBytes__SWIG_1(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXStream, 1); result = (FXbool)((FXStream const *)arg1)->swapBytes();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); result = (bool)((FXStream const *)arg1)->swapBytes();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXStream_swapBytes(int nargs, VALUE *args, VALUE self) { int argc; VALUE argv[3]; int ii; argc = nargs + 1;
     argv[0] = self; for (ii = 1; (ii < argc) && (ii < 2); ii++) { argv[ii] = args[ii-1]; }  if (argc == 1) { int _v; {
@@ -2031,31 +2022,31 @@ static VALUE _wrap_FXStream_swapBytes(int nargs, VALUE *args, VALUE self) { int
          if (_v) { { _v = (argv[1] == Qtrue || argv[1] == Qfalse) ? 1 : 0; }  if (_v) {
                 return _wrap_FXStream_swapBytes__SWIG_0(nargs, args, self);}  }  } 
     rb_raise(rb_eArgError, "No matching function for overloaded 'FXStream_swapBytes'"); return Qnil; }
-static VALUE _wrap_FXStream_setBigEndian(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; FXbool arg2 ;
+static VALUE _wrap_FXStream_setBigEndian(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; bool 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)->setBigEndian(arg2);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); arg2 = RTEST(argv[0]); (arg1)->setBigEndian(arg2);
     return Qnil; }
-static VALUE _wrap_FXStream_isBigEndian(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; FXbool result;
+static VALUE _wrap_FXStream_isBigEndian(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 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_FXStream, 1); result = (FXbool)((FXStream const *)arg1)->isBigEndian();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); result = (bool)((FXStream const *)arg1)->isBigEndian();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static void
 free_FXStream(FXStream *arg1) {
     delete arg1;
 }
-static VALUE _wrap_FXStream_close(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; FXbool result;
+static VALUE _wrap_FXStream_close(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 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_FXStream, 1); result = (FXbool)FXStream_close(arg1);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); result = (bool)FXStream_close(arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXStream_flush(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; FXbool result;
+static VALUE _wrap_FXStream_flush(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 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_FXStream, 1); result = (FXbool)FXStream_flush(arg1);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); result = (bool)FXStream_flush(arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 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))
+    int arg3 = (int) FXFromStart ; bool 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); arg2 = static_cast<FXlong>(NUM2LONG(argv[0]));
-    if (argc > 1) { arg3 = (int) NUM2INT(argv[1]); }  result = (FXbool)FXStream_position(arg1,arg2,(FXWhence )arg3);
+    if (argc > 1) { arg3 = (int) NUM2INT(argv[1]); }  result = (bool)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) {
@@ -2073,11 +2064,11 @@ static VALUE _wrap_new_FXFileStream(int argc, VALUE *argv, VALUE self) { FXObjec
         result = (FXFileStream *)new_FXFileStream((FXObject const *)arg1);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static VALUE _wrap_FXFileStream_open(int argc, VALUE *argv, VALUE self) { FXFileStream *arg1 = (FXFileStream *) 0 ;
-    FXString *arg2 = 0 ; int arg3 ; unsigned long arg4 = (unsigned long) 8192 ; FXbool result; SwigValueWrapper<FXString > p2 ;
+    FXString *arg2 = 0 ; int arg3 ; FXuval arg4 = (FXuval) 8192 ; bool result; SwigValueWrapper<FXString > p2 ;
     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_FXFileStream, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     arg3 = (int) NUM2INT(argv[1]); if (argc > 2) { arg4 = NUM2ULONG(argv[2]); } 
-    result = (FXbool)(arg1)->open((FXString const &)*arg2,(FXStreamDirection )arg3,arg4); vresult = result ? Qtrue : Qfalse;
+    result = (bool)(arg1)->open((FXString const &)*arg2,(FXStreamDirection )arg3,arg4); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 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))
@@ -2089,20 +2080,20 @@ free_FXFileStream(FXFileStream *arg1) {
     delete arg1;
 }
 static VALUE _wrap_FXFileStream_close(int argc, VALUE *argv, VALUE self) { FXFileStream *arg1 = (FXFileStream *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXFileStream, 1); result = (FXbool)FXFileStream_close(arg1);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileStream, 1); result = (bool)FXFileStream_close(arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXFileStream_flush(int argc, VALUE *argv, VALUE self) { FXFileStream *arg1 = (FXFileStream *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXFileStream, 1); result = (FXbool)FXFileStream_flush(arg1);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileStream, 1); result = (bool)FXFileStream_flush(arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 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))
+    FXlong arg2 ; int arg3 = (int) FXFromStart ; bool 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); arg2 = static_cast<FXlong>(NUM2LONG(argv[0]));
-    if (argc > 1) { arg3 = (int) NUM2INT(argv[1]); }  result = (FXbool)FXFileStream_position(arg1,arg2,(FXWhence )arg3);
+    if (argc > 1) { arg3 = (int) NUM2INT(argv[1]); }  result = (bool)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) {
@@ -2120,11 +2111,10 @@ static VALUE _wrap_new_FXMemoryStream(int argc, VALUE *argv, VALUE self) { FXObj
         result = (FXMemoryStream *)new_FXMemoryStream((FXObject const *)arg1);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static VALUE _wrap_FXMemoryStream_open(int argc, VALUE *argv, VALUE self) { FXMemoryStream *arg1 = (FXMemoryStream *) 0 ;
-    int arg2 ; VALUE arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    int arg2 ; VALUE 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_FXMemoryStream, 1); arg2 = (int) NUM2INT(argv[0]); arg3 = argv[1];
-    result = (FXbool)FXMemoryStream_open(arg1,(FXStreamDirection )arg2,arg3); vresult = result ? Qtrue : Qfalse;
-    return vresult; }
+    result = (bool)FXMemoryStream_open(arg1,(FXStreamDirection )arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXMemoryStream_takeBuffer(int argc, VALUE *argv, VALUE self) { FXMemoryStream *arg1 = (FXMemoryStream *) 0 ;
     VALUE result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -2190,17 +2180,89 @@ static VALUE _wrap_new_FXSize(int nargs, VALUE *args, VALUE self) { int argc; VA
                 _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
                 return _wrap_new_FXSize__SWIG_2(nargs, args, self);}  }  } 
     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXSize'"); return Qnil; }
+static VALUE _wrap_FXSize_emptyq___(int argc, VALUE *argv, VALUE self) { FXSize *arg1 = (FXSize *) 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_FXSize, 1); result = (bool)((FXSize const *)arg1)->empty();
+    vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXSize___eq__(int argc, VALUE *argv, VALUE self) { FXSize *arg1 = (FXSize *) 0 ; FXSize *arg2 = 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    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_FXSize, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXSize, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = (FXbool)FXSize_operator_Se__Se_((FXSize const *)arg1,(FXSize const &)*arg2); vresult = result ? Qtrue : Qfalse;
+    result = (bool)FXSize_operator_Se__Se_((FXSize const *)arg1,(FXSize const &)*arg2); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXSize___neg__(int argc, VALUE *argv, VALUE self) { FXSize *arg1 = (FXSize *) 0 ; FXSize 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_FXSize, 1); result = (arg1)->operator -(); { FXSize * resultptr;
         resultptr = new FXSize((FXSize &)result); vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXSize, 1); } 
     return vresult; }
+static VALUE _wrap_FXSize_growN_____SWIG_0(int argc, VALUE *argv, VALUE self) { FXSize *arg1 = (FXSize *) 0 ; FXshort arg2 ;
+    FXSize *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_FXSize, 1);
+    arg2 = NUM2SHRT(argv[0]); { FXSize &_result_ref = (arg1)->grow(arg2); result = (FXSize *) &_result_ref; } 
+    vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXSize,0); return vresult; }
+static VALUE _wrap_FXSize_growN_____SWIG_1(int argc, VALUE *argv, VALUE self) { FXSize *arg1 = (FXSize *) 0 ; FXshort arg2 ;
+    FXshort arg3 ; FXSize *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_FXSize, 1);
+    arg2 = NUM2SHRT(argv[0]); arg3 = NUM2SHRT(argv[1]); { FXSize &_result_ref = (arg1)->grow(arg2,arg3);
+        result = (FXSize *) &_result_ref; }  vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXSize,0);
+    return vresult; }
+static VALUE _wrap_FXSize_growN_____SWIG_2(int argc, VALUE *argv, VALUE self) { FXSize *arg1 = (FXSize *) 0 ; FXshort arg2 ;
+    FXshort arg3 ; FXshort arg4 ; FXshort arg5 ; FXSize *result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 4))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSize, 1);
+    arg2 = NUM2SHRT(argv[0]); arg3 = NUM2SHRT(argv[1]); arg4 = NUM2SHRT(argv[2]); arg5 = NUM2SHRT(argv[3]); {
+        FXSize &_result_ref = (arg1)->grow(arg2,arg3,arg4,arg5); result = (FXSize *) &_result_ref; } 
+    vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXSize,0); return vresult; }
+static VALUE _wrap_FXSize_growN___(int nargs, VALUE *args, VALUE self) { int argc; VALUE argv[6]; int ii; argc = nargs + 1;
+    argv[0] = self; for (ii = 1; (ii < argc) && (ii < 5); ii++) { argv[ii] = args[ii-1]; }  if (argc == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXSize, 0) != -1)) ? 1 : 0; }
+         if (_v) { { _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
+                return _wrap_FXSize_growN_____SWIG_0(nargs, args, self);}  }  }  if (argc == 3) { int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXSize, 0) != -1)) ? 1 : 0; }
+         if (_v) { { _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { {
+                    _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
+                    return _wrap_FXSize_growN_____SWIG_1(nargs, args, self);}  }  }  }  if (argc == 5) { int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXSize, 0) != -1)) ? 1 : 0; }
+         if (_v) { { _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { {
+                    _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { {
+                        _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { {
+                            _v = ((TYPE(argv[4]) == T_FIXNUM) || (TYPE(argv[4]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
+                            return _wrap_FXSize_growN_____SWIG_2(nargs, args, self);}  }  }  }  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXSize_grow!'"); return Qnil; }
+static VALUE _wrap_FXSize_shrinkN_____SWIG_0(int argc, VALUE *argv, VALUE self) { FXSize *arg1 = (FXSize *) 0 ; FXshort arg2 ;
+    FXSize *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_FXSize, 1);
+    arg2 = NUM2SHRT(argv[0]); { FXSize &_result_ref = (arg1)->shrink(arg2); result = (FXSize *) &_result_ref; } 
+    vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXSize,0); return vresult; }
+static VALUE _wrap_FXSize_shrinkN_____SWIG_1(int argc, VALUE *argv, VALUE self) { FXSize *arg1 = (FXSize *) 0 ; FXshort arg2 ;
+    FXshort arg3 ; FXSize *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_FXSize, 1);
+    arg2 = NUM2SHRT(argv[0]); arg3 = NUM2SHRT(argv[1]); { FXSize &_result_ref = (arg1)->shrink(arg2,arg3);
+        result = (FXSize *) &_result_ref; }  vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXSize,0);
+    return vresult; }
+static VALUE _wrap_FXSize_shrinkN_____SWIG_2(int argc, VALUE *argv, VALUE self) { FXSize *arg1 = (FXSize *) 0 ; FXshort arg2 ;
+    FXshort arg3 ; FXshort arg4 ; FXshort arg5 ; FXSize *result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 4))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSize, 1);
+    arg2 = NUM2SHRT(argv[0]); arg3 = NUM2SHRT(argv[1]); arg4 = NUM2SHRT(argv[2]); arg5 = NUM2SHRT(argv[3]); {
+        FXSize &_result_ref = (arg1)->shrink(arg2,arg3,arg4,arg5); result = (FXSize *) &_result_ref; } 
+    vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXSize,0); return vresult; }
+static VALUE _wrap_FXSize_shrinkN___(int nargs, VALUE *args, VALUE self) { int argc; VALUE argv[6]; int ii; argc = nargs + 1;
+    argv[0] = self; for (ii = 1; (ii < argc) && (ii < 5); ii++) { argv[ii] = args[ii-1]; }  if (argc == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXSize, 0) != -1)) ? 1 : 0; }
+         if (_v) { { _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
+                return _wrap_FXSize_shrinkN_____SWIG_0(nargs, args, self);}  }  }  if (argc == 3) { int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXSize, 0) != -1)) ? 1 : 0; }
+         if (_v) { { _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { {
+                    _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
+                    return _wrap_FXSize_shrinkN_____SWIG_1(nargs, args, self);}  }  }  }  if (argc == 5) { int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXSize, 0) != -1)) ? 1 : 0; }
+         if (_v) { { _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { {
+                    _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { {
+                        _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { {
+                            _v = ((TYPE(argv[4]) == T_FIXNUM) || (TYPE(argv[4]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
+                            return _wrap_FXSize_shrinkN_____SWIG_2(nargs, args, self);}  }  }  }  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXSize_shrink!'"); return Qnil; }
 static VALUE _wrap_FXSize___add__(int argc, VALUE *argv, VALUE self) { FXSize *arg1 = (FXSize *) 0 ; FXSize *arg2 = 0 ;
     FXSize 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_FXSize, 1);
@@ -2282,11 +2344,11 @@ static VALUE _wrap_new_FXPoint(int nargs, VALUE *args, VALUE self) { int argc; V
                 return _wrap_new_FXPoint__SWIG_3(nargs, args, self);}  }  } 
     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXPoint'"); return Qnil; }
 static VALUE _wrap_FXPoint___eq__(int argc, VALUE *argv, VALUE self) { FXPoint *arg1 = (FXPoint *) 0 ; FXPoint *arg2 = 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    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_FXPoint, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXPoint, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = (FXbool)FXPoint_operator_Se__Se_((FXPoint const *)arg1,(FXPoint const &)*arg2); vresult = result ? Qtrue : Qfalse;
+    result = (bool)FXPoint_operator_Se__Se_((FXPoint const *)arg1,(FXPoint const &)*arg2); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXPoint___neg__(int argc, VALUE *argv, VALUE self) { FXPoint *arg1 = (FXPoint *) 0 ; FXPoint result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -2448,30 +2510,30 @@ static VALUE _wrap_new_FXRectangle(int nargs, VALUE *args, VALUE self) { int arg
                         return _wrap_new_FXRectangle__SWIG_1(nargs, args, self);}  }  }  }  } 
     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXRectangle'"); return Qnil; }
 static VALUE _wrap_FXRectangle___eq__(int argc, VALUE *argv, VALUE self) { FXRectangle *arg1 = (FXRectangle *) 0 ;
-    FXRectangle *arg2 = 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXRectangle *arg2 = 0 ; 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_FXRectangle, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRectangle, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = (FXbool)FXRectangle_operator_Se__Se_((FXRectangle const *)arg1,(FXRectangle const &)*arg2);
+    result = (bool)FXRectangle_operator_Se__Se_((FXRectangle const *)arg1,(FXRectangle const &)*arg2);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXRectangle_containsq_____SWIG_0(int argc, VALUE *argv, VALUE self) { FXRectangle *arg1 = (FXRectangle *) 0 ;
-    FXPoint *arg2 = 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXPoint *arg2 = 0 ; 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_FXRectangle, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXPoint, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = (FXbool)((FXRectangle const *)arg1)->contains((FXPoint const &)*arg2); vresult = result ? Qtrue : Qfalse;
+    result = (bool)((FXRectangle const *)arg1)->contains((FXPoint const &)*arg2); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXRectangle_containsq_____SWIG_1(int argc, VALUE *argv, VALUE self) { FXRectangle *arg1 = (FXRectangle *) 0 ;
-    FXshort arg2 ; FXshort arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    FXshort arg2 ; FXshort 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_FXRectangle, 1); arg2 = NUM2SHRT(argv[0]); arg3 = NUM2SHRT(argv[1]);
-    result = (FXbool)((FXRectangle const *)arg1)->contains(arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)((FXRectangle const *)arg1)->contains(arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXRectangle_containsq_____SWIG_2(int argc, VALUE *argv, VALUE self) { FXRectangle *arg1 = (FXRectangle *) 0 ;
-    FXRectangle *arg2 = 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXRectangle *arg2 = 0 ; 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_FXRectangle, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRectangle, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = (FXbool)((FXRectangle const *)arg1)->contains((FXRectangle const &)*arg2); vresult = result ? Qtrue : Qfalse;
+    result = (bool)((FXRectangle const *)arg1)->contains((FXRectangle const &)*arg2); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXRectangle_containsq___(int nargs, VALUE *args, VALUE self) { int argc; VALUE argv[4]; int ii;
     argc = nargs + 1; argv[0] = self; for (ii = 1; (ii < argc) && (ii < 3); ii++) { argv[ii] = args[ii-1]; }  if (argc == 2) {
@@ -2492,18 +2554,38 @@ static VALUE _wrap_FXRectangle_containsq___(int nargs, VALUE *args, VALUE self)
                     return _wrap_FXRectangle_containsq_____SWIG_1(nargs, args, self);}  }  }  } 
     rb_raise(rb_eArgError, "No matching function for overloaded 'FXRectangle_contains?'"); return Qnil; }
 static VALUE _wrap_FXRectangle_overlapsq___(int argc, VALUE *argv, VALUE self) { FXRectangle *arg1 = (FXRectangle *) 0 ;
-    FXRectangle *arg2 = 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXRectangle *arg2 = 0 ; 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_FXRectangle, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRectangle, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = (FXbool)FXRectangle_overlap((FXRectangle const *)arg1,(FXRectangle const &)*arg2);
-    vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXRectangle_moveN___(int argc, VALUE *argv, VALUE self) { FXRectangle *arg1 = (FXRectangle *) 0 ;
+    result = (bool)FXRectangle_overlap((FXRectangle const *)arg1,(FXRectangle const &)*arg2); vresult = result ? Qtrue : Qfalse;
+    return vresult; }
+static VALUE _wrap_FXRectangle_moveN_____SWIG_0(int argc, VALUE *argv, VALUE self) { FXRectangle *arg1 = (FXRectangle *) 0 ;
+    FXPoint *arg2 = 0 ; FXRectangle *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_FXRectangle, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXPoint, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    { FXRectangle &_result_ref = (arg1)->move((FXPoint const &)*arg2); result = (FXRectangle *) &_result_ref; } 
+    vresult = FXRbGetRubyObj(result, "FXRectangle *"); return vresult; }
+static VALUE _wrap_FXRectangle_moveN_____SWIG_1(int argc, VALUE *argv, VALUE self) { FXRectangle *arg1 = (FXRectangle *) 0 ;
     FXshort arg2 ; FXshort arg3 ; FXRectangle *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_FXRectangle, 1); arg2 = NUM2SHRT(argv[0]); arg3 = NUM2SHRT(argv[1]); {
         FXRectangle &_result_ref = (arg1)->move(arg2,arg3); result = (FXRectangle *) &_result_ref; } 
     vresult = FXRbGetRubyObj(result, "FXRectangle *"); return vresult; }
+static VALUE _wrap_FXRectangle_moveN___(int nargs, VALUE *args, VALUE self) { int argc; VALUE argv[4]; int ii; argc = nargs + 1;
+    argv[0] = self; for (ii = 1; (ii < argc) && (ii < 3); ii++) { argv[ii] = args[ii-1]; }  if (argc == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXRectangle, 0) != -1)) ? 1 : 0; }
+         if (_v) { { void *ptr;
+                _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXPoint, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXRectangle_moveN_____SWIG_0(nargs, args, self);}  }  }  if (argc == 3) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXRectangle, 0) != -1)) ? 1 : 0; }
+         if (_v) { { _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { {
+                    _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
+                    return _wrap_FXRectangle_moveN_____SWIG_1(nargs, args, self);}  }  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXRectangle_move!'"); return Qnil; }
 static VALUE _wrap_FXRectangle_growN_____SWIG_0(int argc, VALUE *argv, VALUE self) { FXRectangle *arg1 = (FXRectangle *) 0 ;
     FXshort arg2 ; FXRectangle *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
@@ -2641,11 +2723,11 @@ static VALUE _wrap_FXRegion_allocate(VALUE self) {
 #endif
          return vresult; }
 static VALUE _wrap_new_FXRegion__SWIG_4(int argc, VALUE *argv, VALUE self) { FXPoint *arg1 = (FXPoint *) 0 ; FXuint arg2 ;
-    FXbool arg3 = (FXbool) 0 ; FXRegion *result; if ((argc < 1) || (argc > 2))
+    bool arg3 = (bool) 0 ; FXRegion *result; if ((argc < 1) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); { Check_Type(argv[0], T_ARRAY);
         arg1 = new FXPoint[RARRAY(argv[0])->len]; arg2 = static_cast<FXuint>( RARRAY(argv[0])->len );
         for (FXuint i = 0; i < arg2; i++) { FXPoint *pPoint; Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
-            arg1[i] = *pPoint; }  }  if (argc > 1) { arg3 = to_FXbool(argv[1]); }  {
+            arg1[i] = *pPoint; }  }  if (argc > 1) { arg3 = RTEST(argv[1]); }  {
         result = (FXRegion *)new FXRegion((FXPoint const *)arg1,arg2,arg3);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  {
         delete [] arg1; }  return self; }
@@ -2665,20 +2747,20 @@ static VALUE _wrap_new_FXRegion(int nargs, VALUE *args, VALUE self) { int argc;
                         _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
                         return _wrap_new_FXRegion__SWIG_3(nargs, args, self);}  }  }  }  } 
     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXRegion'"); return Qnil; }
-static VALUE _wrap_FXRegion_emptyq___(int argc, VALUE *argv, VALUE self) { FXRegion *arg1 = (FXRegion *) 0 ; FXbool result;
+static VALUE _wrap_FXRegion_emptyq___(int argc, VALUE *argv, VALUE self) { FXRegion *arg1 = (FXRegion *) 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_FXRegion, 1); result = (FXbool)((FXRegion const *)arg1)->empty();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1); result = (bool)((FXRegion const *)arg1)->empty();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXRegion_containsq_____SWIG_0(int argc, VALUE *argv, VALUE self) { FXRegion *arg1 = (FXRegion *) 0 ;
-    FXint arg2 ; FXint arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    FXint arg2 ; FXint 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_FXRegion, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
-    result = (FXbool)((FXRegion const *)arg1)->contains(arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)((FXRegion const *)arg1)->contains(arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXRegion_containsq_____SWIG_1(int argc, VALUE *argv, VALUE self) { FXRegion *arg1 = (FXRegion *) 0 ;
-    FXint arg2 ; FXint arg3 ; FXint arg4 ; FXint arg5 ; FXbool result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 4))
+    FXint arg2 ; FXint arg3 ; FXint arg4 ; FXint arg5 ; bool result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 4))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
-    arg4 = NUM2INT(argv[2]); arg5 = NUM2INT(argv[3]); result = (FXbool)((FXRegion const *)arg1)->contains(arg2,arg3,arg4,arg5);
+    arg4 = NUM2INT(argv[2]); arg5 = NUM2INT(argv[3]); result = (bool)((FXRegion const *)arg1)->contains(arg2,arg3,arg4,arg5);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXRegion_containsq___(int nargs, VALUE *args, VALUE self) { int argc; VALUE argv[6]; int ii;
     argc = nargs + 1; argv[0] = self; for (ii = 1; (ii < argc) && (ii < 5); ii++) { argv[ii] = args[ii-1]; }  if (argc == 3) {
@@ -2735,12 +2817,12 @@ static VALUE _wrap_FXRegion___xor__(int argc, VALUE *argv, VALUE self) { FXRegio
     result = FXRegion_operator_Sx_((FXRegion const *)arg1,(FXRegion const &)*arg2); {
         FXRegion* resultptr = new FXRegion(result); vresult = FXRbGetRubyObj(resultptr, "FXRegion *"); }  return vresult; }
 static VALUE _wrap_FXRegion___eq__(int argc, VALUE *argv, VALUE self) { FXRegion *arg1 = (FXRegion *) 0 ; FXRegion *arg2 = 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    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_FXRegion, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = (FXbool)FXRegion_operator_Se__Se_((FXRegion const *)arg1,(FXRegion const &)*arg2);
-    vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXRegion_operator_Se__Se_((FXRegion const *)arg1,(FXRegion const &)*arg2); vresult = result ? Qtrue : Qfalse;
+    return vresult; }
 static VALUE _wrap_FXRegion_reset(int argc, VALUE *argv, VALUE self) { FXRegion *arg1 = (FXRegion *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1); (arg1)->reset(); return Qnil; }
@@ -2825,10 +2907,10 @@ static VALUE _wrap_FXAccelTable_removeAccel(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXAccelTable, 1); arg2 = NUM2UINT(argv[0]); (arg1)->removeAccel(arg2);
     return Qnil; }
 static VALUE _wrap_FXAccelTable_hasAccel(int argc, VALUE *argv, VALUE self) { FXAccelTable *arg1 = (FXAccelTable *) 0 ;
-    FXHotKey arg2 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXHotKey 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_FXAccelTable, 1); arg2 = NUM2UINT(argv[0]);
-    result = (FXbool)((FXAccelTable const *)arg1)->hasAccel(arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)((FXAccelTable const *)arg1)->hasAccel(arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXAccelTable_targetOfAccel(int argc, VALUE *argv, VALUE self) { FXAccelTable *arg1 = (FXAccelTable *) 0 ;
     FXHotKey arg2 ; FXObject *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
@@ -2850,6 +2932,25 @@ static VALUE _wrap_FXAccelTable_load(int argc, VALUE *argv, VALUE self) { FXAcce
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXAccelTable, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
     FXAccelTable_load(arg1,*arg2); return Qnil; }
+static VALUE _wrap_parseAccel(int argc, VALUE *argv, VALUE self) { FXString *arg1 = 0 ; FXHotKey result;
+    SwigValueWrapper<FXString > p1 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); p1 = to_FXString(argv[0]); arg1 = &p1;
+    result = (FXHotKey)parseAccel((FXString const &)*arg1); vresult = UINT2NUM(result); return vresult; }
+static VALUE _wrap_unparseAccel(int argc, VALUE *argv, VALUE self) { FXHotKey arg1 ; FXString result; VALUE vresult = Qnil;
+    if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = NUM2UINT(argv[0]);
+    result = unparseAccel(arg1); vresult = rb_str_new2((&result)->text()); return vresult; }
+static VALUE _wrap_parseHotKey(int argc, VALUE *argv, VALUE self) { FXString *arg1 = 0 ; FXHotKey result;
+    SwigValueWrapper<FXString > p1 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); p1 = to_FXString(argv[0]); arg1 = &p1;
+    result = (FXHotKey)parseHotKey((FXString const &)*arg1); vresult = UINT2NUM(result); return vresult; }
+static VALUE _wrap_findHotKey(int argc, VALUE *argv, VALUE self) { FXString *arg1 = 0 ; FXint result;
+    SwigValueWrapper<FXString > p1 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); p1 = to_FXString(argv[0]); arg1 = &p1;
+    result = (FXint)findHotKey((FXString const &)*arg1); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_stripHotKey(int argc, VALUE *argv, VALUE self) { FXString *arg1 = 0 ; FXString result;
+    SwigValueWrapper<FXString > p1 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); p1 = to_FXString(argv[0]); arg1 = &p1;
+    result = stripHotKey((FXString const &)*arg1); vresult = rb_str_new2((&result)->text()); return vresult; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXEvent_allocate(VALUE self) {
 #else
@@ -3091,21 +3192,21 @@ static VALUE _wrap_FXApp_getVendorName(int argc, VALUE *argv, VALUE self) { FXAp
         FXString const &_result_ref = ((FXApp const *)arg1)->getVendorName(); result = (FXString *) &_result_ref; } 
     vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXApp_openDisplay(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
-    FXchar *arg2 = (FXchar *) 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 1))
+    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 = (FXbool)(arg1)->openDisplay((FXchar const *)arg2);
+    if (argc > 0) { arg2 = 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 ; FXbool result;
+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 = (FXbool)(arg1)->closeDisplay();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); result = (bool)(arg1)->closeDisplay();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXApp_getDisplay(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; unsigned long 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 = (unsigned long)FXApp_getDisplay((FXApp const *)arg1);
     vresult = UINT2NUM(result); return vresult; }
-static VALUE _wrap_FXApp_isInitialized(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXbool result;
+static VALUE _wrap_FXApp_isInitialized(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 = (FXbool)((FXApp const *)arg1)->isInitialized();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); result = (bool)((FXApp const *)arg1)->isInitialized();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXApp_getArgc(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXint result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -3115,6 +3216,10 @@ static VALUE _wrap_FXApp_getArgv(int argc, VALUE *argv, VALUE self) { FXApp *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_FXApp, 1); result = (FXchar **)((FXApp const *)arg1)->getArgv();
     vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_p_FXchar,0); return vresult; }
+static VALUE _wrap_FXApp_hasInputMethodq___(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)((FXApp const *)arg1)->hasInputMethod();
+    vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXApp_getDefaultVisual(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXVisual *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 = (FXVisual *)((FXApp const *)arg1)->getDefaultVisual();
@@ -3139,16 +3244,21 @@ static VALUE _wrap_FXApp_setRootWindow(int argc, VALUE *argv, VALUE self) { FXAp
     FXRootWindow *arg2 = (FXRootWindow *) 0 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRootWindow, 1); (arg1)->setRootWindow(arg2); return Qnil; }
+static VALUE _wrap_FXApp_focusWindow(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXWindow *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 = (FXWindow *)((FXApp const *)arg1)->getFocusWindow(); {
+        swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXWindow, (void **) &result);
+        vresult = FXRbGetRubyObj(result, ty); }  return vresult; }
 static VALUE _wrap_FXApp_getCursorWindow(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXWindow *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 = (FXWindow *)((FXApp const *)arg1)->getCursorWindow();
     { swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXWindow, (void **) &result); vresult = FXRbGetRubyObj(result, ty); }
      return vresult; }
-static VALUE _wrap_FXApp_getFocusWindow(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXWindow *result;
+static VALUE _wrap_FXApp_activeWindow(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXWindow *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 = (FXWindow *)((FXApp const *)arg1)->getFocusWindow(); {
-        swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXWindow, (void **) &result);
-        vresult = FXRbGetRubyObj(result, ty); }  return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); result = (FXWindow *)((FXApp const *)arg1)->getActiveWindow();
+    { swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXWindow, (void **) &result); vresult = FXRbGetRubyObj(result, ty); }
+     return vresult; }
 static VALUE _wrap_FXApp_getPopupWindow(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXPopup *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 = (FXPopup *)((FXApp const *)arg1)->getPopupWindow(); {
@@ -3172,18 +3282,18 @@ static VALUE _wrap_FXApp_addTimeout(int argc, VALUE *argv, VALUE self) { FXApp *
     if ((argc < 2) || (argc > 4)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); if (argc > 2) {
-        arg4 = NUM2UINT(argv[2]); }  if (argc > 3) { arg5 = (argv[3] == Qnil) ? NULL : (void *) argv[3]; } 
+        arg4 = NUM2UINT(argv[2]); }  if (argc > 3) { SWIG_ConvertPtr(argv[3], (void **) &arg5, 0, 1); } 
     (arg1)->addTimeout(arg2,arg3,arg4,arg5); return Qnil; }
 static VALUE _wrap_FXApp_removeTimeout(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; if ((argc < 2) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
     (arg1)->removeTimeout(arg2,arg3); return Qnil; }
-static VALUE _wrap_FXApp_hasTimeout(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
-    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+static VALUE _wrap_FXApp_hasTimeoutq___(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
+    FXObject *arg2 = (FXObject *) 0 ; FXSelector 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_FXApp, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
-    result = (FXbool)((FXApp const *)arg1)->hasTimeout(arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)((FXApp const *)arg1)->hasTimeout(arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXApp_remainingTimeout(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; FXuint 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_FXApp, 1);
@@ -3196,17 +3306,17 @@ static VALUE _wrap_FXApp_addChore(int argc, VALUE *argv, VALUE self) { FXApp *ar
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; if ((argc < 2) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); if (argc > 2) {
-        arg4 = (argv[2] == Qnil) ? NULL : (void *) argv[2]; }  (arg1)->addChore(arg2,arg3,arg4); return Qnil; }
+        SWIG_ConvertPtr(argv[2], (void **) &arg4, 0, 1); }  (arg1)->addChore(arg2,arg3,arg4); return Qnil; }
 static VALUE _wrap_FXApp_removeChore(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; if ((argc < 2) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); (arg1)->removeChore(arg2,arg3);
     return Qnil; }
-static VALUE _wrap_FXApp_hasChore(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
-    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+static VALUE _wrap_FXApp_hasChoreq___(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
+    FXObject *arg2 = (FXObject *) 0 ; FXSelector 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_FXApp, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
-    result = (FXbool)((FXApp const *)arg1)->hasChore(arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)((FXApp const *)arg1)->hasChore(arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXApp_addSignal(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; VALUE arg2 ;
     FXObject *arg3 = (FXObject *) 0 ; FXSelector arg4 ; FXbool arg5 = (FXbool) 0 ; FXuint arg6 = (FXuint) 0 ;
     if ((argc < 3) || (argc > 5)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
@@ -3218,29 +3328,29 @@ static VALUE _wrap_FXApp_removeSignal(int argc, VALUE *argv, VALUE self) { FXApp
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); arg2 = argv[0]; FXApp_removeSignal(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXApp_addInput(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; VALUE arg2 ; FXuint arg3 ;
-    FXObject *arg4 = (FXObject *) 0 ; FXSelector arg5 ; FXbool result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 4))
+    FXObject *arg4 = (FXObject *) 0 ; FXSelector arg5 ; bool result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 4))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
     arg2 = argv[0]; arg3 = NUM2UINT(argv[1]); SWIG_ConvertPtr(argv[2], (void **) &arg4, SWIGTYPE_p_FXObject, 1);
-    arg5 = NUM2UINT(argv[3]); result = (FXbool)FXApp_addInput(arg1,arg2,arg3,arg4,arg5); vresult = result ? Qtrue : Qfalse;
+    arg5 = NUM2UINT(argv[3]); result = (bool)FXApp_addInput(arg1,arg2,arg3,arg4,arg5); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXApp_removeInput(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; VALUE arg2 ; FXuint arg3 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    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_FXApp, 1);
-    arg2 = argv[0]; arg3 = NUM2UINT(argv[1]); result = (FXbool)FXApp_removeInput(arg1,arg2,arg3);
+    arg2 = argv[0]; arg3 = NUM2UINT(argv[1]); result = (bool)FXApp_removeInput(arg1,arg2,arg3);
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXApp_getKeyState(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXuint 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_FXApp, 1);
-    arg2 = NUM2UINT(argv[0]); result = (FXbool)((FXApp const *)arg1)->getKeyState(arg2); vresult = result ? Qtrue : Qfalse;
-    return vresult; }
-static VALUE _wrap_FXApp_peekEvent(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXbool result;
+static VALUE _wrap_FXApp_getKeyState(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXuint 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_FXApp, 1); arg2 = NUM2UINT(argv[0]);
+    result = (bool)((FXApp const *)arg1)->getKeyState(arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXApp_peekEvent(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 = (FXbool)(arg1)->peekEvent();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); result = (bool)(arg1)->peekEvent();
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXApp_runOneEvent(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXbool arg2 = (FXbool) 1 ;
-    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 = to_FXbool(argv[0]); } 
-    (arg1)->runOneEvent(arg2); return Qnil; }
+static VALUE _wrap_FXApp_runOneEvent(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; bool arg2 = (bool) true ;
+    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 = RTEST(argv[0]); }  result = (bool)(arg1)->runOneEvent(arg2); vresult = result ? Qtrue : Qfalse;
+    return vresult; }
 static VALUE _wrap_FXApp_run(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 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_FXApp, 1); result = (FXint)(arg1)->run(); vresult = INT2NUM(result);
@@ -3279,9 +3389,9 @@ static VALUE _wrap_FXApp_runPopup(int argc, VALUE *argv, VALUE self) { FXApp *ar
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); result = (FXint)(arg1)->runPopup(arg2);
     vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXApp_isModal(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
-    FXWindow *arg2 = (FXWindow *) 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXWindow *arg2 = (FXWindow *) 0 ; 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_FXApp, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); result = (FXbool)((FXApp const *)arg1)->isModal(arg2);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXApp const *)arg1)->isModal(arg2);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXApp_getModalWindow(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXWindow *result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -3326,10 +3436,10 @@ static VALUE _wrap_FXApp_forceRefresh(int argc, VALUE *argv, VALUE self) { FXApp
 static VALUE _wrap_FXApp_refresh(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; 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);
     (arg1)->refresh(); return Qnil; }
-static VALUE _wrap_FXApp_flush(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXbool arg2 = (FXbool) 0 ;
+static VALUE _wrap_FXApp_flush(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; bool arg2 = (bool) false ;
     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 = to_FXbool(argv[0]); } 
-    (arg1)->flush(arg2); return Qnil; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 0) { arg2 = RTEST(argv[0]); }  (arg1)->flush(arg2);
+    return Qnil; }
 static VALUE _wrap_FXApp_repaint(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; 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);
     (arg1)->repaint(); return Qnil; }
@@ -3397,11 +3507,37 @@ static VALUE _wrap_FXApp_setDefaultCursor(int argc, VALUE *argv, VALUE self) { F
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
     arg2 = (int) NUM2INT(argv[0]); SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXCursor, 1);
     FXApp_setDefaultCursor(arg1,(FXDefaultCursor )arg2,arg3); return Qnil; }
+static VALUE _wrap_FXApp_writeWindow(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXStream *arg2 = 0 ;
+    FXWindow *arg3 = (FXWindow *) 0 ; FXbool 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_FXApp, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXWindow, 1); result = (FXbool)(arg1)->writeWindow(*arg2,arg3);
+    vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXApp_readWindow(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXStream *arg2 = 0 ;
+    FXWindow **arg3 = 0 ; FXWindow *arg4 = (FXWindow *) 0 ; FXWindow *arg5 = (FXWindow *) 0 ; FXWindow *result;
+    VALUE vresult = Qnil; if ((argc < 4) || (argc > 4)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_p_FXWindow, 1); if (arg3 == NULL) rb_raise(rb_eTypeError, "null reference");
+    SWIG_ConvertPtr(argv[2], (void **) &arg4, SWIGTYPE_p_FXWindow, 1);
+    SWIG_ConvertPtr(argv[3], (void **) &arg5, SWIGTYPE_p_FXWindow, 1);
+    result = (FXWindow *)FXApp_readWindow(arg1,*arg2,*arg3,arg4,arg5); {
+        swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXWindow, (void **) &result);
+        vresult = FXRbGetRubyObj(result, ty); }  return vresult; }
 static VALUE _wrap_FXApp_mutex(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXMutex *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); { FXMutex &_result_ref = (arg1)->mutex();
         result = (FXMutex *) &_result_ref; }  vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXMutex,0);
     return vresult; }
+static VALUE _wrap_FXApp_setTranslator(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
+    FXTranslator *arg2 = (FXTranslator *) 0 ; if ((argc < 1) || (argc > 1))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXTranslator, 1); (arg1)->setTranslator(arg2); return Qnil; }
+static VALUE _wrap_FXApp_getTranslator(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXTranslator *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 = (FXTranslator *)((FXApp const *)arg1)->getTranslator();
+    vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXTranslator,0); return vresult; }
 static VALUE _wrap_FXApp_getTypingSpeed(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXuint 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 = (FXuint)((FXApp const *)arg1)->getTypingSpeed();
@@ -3446,6 +3582,10 @@ static VALUE _wrap_FXApp_getWheelLines(int argc, VALUE *argv, VALUE self) { FXAp
     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 = (FXint)((FXApp const *)arg1)->getWheelLines();
     vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXApp_scrollBarSize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 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_FXApp, 1); result = (FXint)((FXApp const *)arg1)->getScrollBarSize();
+    vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXApp_setTypingSpeed(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXuint arg2 ;
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); arg2 = NUM2UINT(argv[0]); (arg1)->setTypingSpeed(arg2);
@@ -3490,6 +3630,10 @@ static VALUE _wrap_FXApp_setWheelLines(int argc, VALUE *argv, VALUE self) { FXAp
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); arg2 = NUM2INT(argv[0]); (arg1)->setWheelLines(arg2);
     return Qnil; }
+static VALUE _wrap_FXApp_scrollBarSizee___(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXint arg2 ;
+    if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); arg2 = NUM2INT(argv[0]); (arg1)->setScrollBarSize(arg2);
+    return Qnil; }
 static VALUE _wrap_FXApp_getBorderColor(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXColor 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 = (FXColor)((FXApp const *)arg1)->getBorderColor();
@@ -3589,6 +3733,10 @@ static VALUE _wrap_FXApp_setSelMenuBackColor(int argc, VALUE *argv, VALUE self)
 static VALUE _wrap_FXApp_dumpWidgets(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
     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); ((FXApp const *)arg1)->dumpWidgets(); return Qnil; }
+static VALUE _wrap_FXApp_getWindowCount(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXuint 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 = (FXuint)((FXApp const *)arg1)->getWindowCount();
+    vresult = UINT2NUM(result); return vresult; }
 static void
 free_FXApp(FXApp *arg1) {
     delete arg1;
@@ -3613,8 +3761,8 @@ static VALUE _wrap_FXApp_detach(int argc, VALUE *argv, VALUE self) { FXApp *arg1
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
     FXApp_detach(arg1); return Qnil; }
 static VALUE _wrap_FXApp_init(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; VALUE arg2 ;
-    FXbool arg3 = (FXbool) 1 ; if ((argc < 1) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); arg2 = argv[0]; if (argc > 1) { arg3 = to_FXbool(argv[1]); } 
+    bool arg3 = (bool) true ; if ((argc < 1) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); arg2 = argv[0]; if (argc > 1) { arg3 = RTEST(argv[1]); } 
     FXApp_init(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXApp_exit(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXint arg2 = (FXint) 0 ;
     if ((argc < 0) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -3798,6 +3946,59 @@ static VALUE _wrap_FXDelegator_load(int argc, VALUE *argv, VALUE self) { FXDeleg
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
     FXDelegator_load(arg1,*arg2); return Qnil; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
+static VALUE _wrap_FXTranslator_allocate(VALUE self) {
+#else
+     static VALUE _wrap_FXTranslator_allocate(int argc, VALUE *argv, VALUE self) {
+#endif
+         VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXTranslator);
+#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+        rb_obj_call_init(vresult, argc, argv);
+#endif
+         return vresult; }
+static VALUE _wrap_new_FXTranslator(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXTranslator *result;
+    if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); { result = (FXTranslator *)new_FXTranslator(arg1);
+        DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
+static VALUE _wrap_FXTranslator_getApp(int argc, VALUE *argv, VALUE self) { FXTranslator *arg1 = (FXTranslator *) 0 ;
+    FXApp *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_FXTranslator, 1);
+    result = (FXApp *)((FXTranslator const *)arg1)->getApp(); {
+        swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXApp, (void **) &result); vresult = FXRbGetRubyObj(result, ty); } 
+    return vresult; }
+static VALUE _wrap_FXTranslator_setTextCodec(int argc, VALUE *argv, VALUE self) { FXTranslator *arg1 = (FXTranslator *) 0 ;
+    FXTextCodec *arg2 = (FXTextCodec *) 0 ; if ((argc < 1) || (argc > 1))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTranslator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXTextCodec, 1); (arg1)->setTextCodec(arg2); return Qnil; }
+static VALUE _wrap_FXTranslator_getTextCodec(int argc, VALUE *argv, VALUE self) { FXTranslator *arg1 = (FXTranslator *) 0 ;
+    FXTextCodec *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_FXTranslator, 1);
+    result = (FXTextCodec *)((FXTranslator const *)arg1)->getTextCodec();
+    vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXTextCodec,0); return vresult; }
+static void
+free_FXTranslator(FXTranslator *arg1) {
+    delete arg1;
+}
+static VALUE _wrap_FXTranslator_save(int argc, VALUE *argv, VALUE self) { FXTranslator *arg1 = (FXTranslator *) 0 ;
+    FXStream *arg2 = 0 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTranslator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXTranslator_save((FXTranslator const *)arg1,*arg2); return Qnil; }
+static VALUE _wrap_FXTranslator_load(int argc, VALUE *argv, VALUE self) { FXTranslator *arg1 = (FXTranslator *) 0 ;
+    FXStream *arg2 = 0 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTranslator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXTranslator_load(arg1,*arg2); return Qnil; }
+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]); } 
+    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
 static VALUE _wrap_FXDict_allocate(VALUE self) {
 #else
      static VALUE _wrap_FXDict_allocate(int argc, VALUE *argv, VALUE self) {
@@ -3830,10 +4031,10 @@ static VALUE _wrap_FXDict_key(int argc, VALUE *argv, VALUE self) { FXDict *arg1
     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 = NUM2UINT(argv[0]);
     result = (FXchar *)((FXDict const *)arg1)->key(arg2); vresult = rb_str_new2(result); return vresult; }
-static VALUE _wrap_FXDict_mark(int argc, VALUE *argv, VALUE self) { FXDict *arg1 = (FXDict *) 0 ; FXuint arg2 ; FXbool result;
+static VALUE _wrap_FXDict_mark(int argc, VALUE *argv, VALUE self) { FXDict *arg1 = (FXDict *) 0 ; FXuint 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 = NUM2UINT(argv[0]);
-    result = (FXbool)((FXDict const *)arg1)->mark(arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)((FXDict const *)arg1)->mark(arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXDict_first(int argc, VALUE *argv, VALUE self) { FXDict *arg1 = (FXDict *) 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_FXDict, 1); result = (FXint)((FXDict const *)arg1)->first();
@@ -3854,9 +4055,9 @@ static VALUE _wrap_FXDict_clear(int argc, VALUE *argv, VALUE self) { FXDict *arg
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDict, 1);
     (arg1)->clear(); return Qnil; }
 static VALUE _wrap_FXDict_has_keyq___(int argc, VALUE *argv, VALUE self) { FXDict *arg1 = (FXDict *) 0 ; FXchar *arg2 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    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 = (FXbool)FXDict_has_key((FXDict const *)arg1,(FXchar const *)arg2);
+    arg2 = 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) {
@@ -4013,6 +4214,17 @@ static VALUE _wrap_new_FXFileDict(int nargs, VALUE *args, VALUE self) { int argc
                 _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXSettings, 0) != -1)) ? 1 : 0; }
              if (_v) { return _wrap_new_FXFileDict__SWIG_1(nargs, args, self);}  }  } 
     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXFileDict'"); return Qnil; }
+static VALUE _wrap_FXFileDict_setSettings(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 = (FXFileDict *) 0 ;
+    FXSettings *arg2 = (FXSettings *) 0 ; 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXSettings, 1); (arg1)->setSettings(arg2); return Qnil; }
+static VALUE _wrap_FXFileDict_getSettings(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 = (FXFileDict *) 0 ;
+    FXSettings *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_FXFileDict, 1);
+    result = (FXSettings *)((FXFileDict const *)arg1)->getSettings();
+    vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXSettings,0); return vresult; }
 static VALUE _wrap_FXFileDict_setIconDict(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 = (FXFileDict *) 0 ;
     FXIconDict *arg2 = (FXIconDict *) 0 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
@@ -4053,12 +4265,6 @@ static VALUE _wrap_FXFileDict_find(int argc, VALUE *argv, VALUE self) { FXFileDi
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileDict, 1); arg2 = StringValuePtr(argv[0]);
     result = (FXFileAssoc *)(arg1)->find((FXchar const *)arg2); vresult = FXRbGetRubyObj(result, "FXFileAssoc *");
     return vresult; }
-static VALUE _wrap_FXFileDict_associate(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]);
-    result = (FXFileAssoc *)(arg1)->associate((FXchar const *)arg2); vresult = FXRbGetRubyObj(result, "FXFileAssoc *");
-    return vresult; }
 static void
 free_FXFileDict(FXFileDict *arg1) {
     delete arg1;
@@ -4172,17 +4378,17 @@ static VALUE _wrap_new_FXStringDict(int argc, VALUE *argv, VALUE self) { FXStrin
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); { result = (FXStringDict *)new_FXStringDict();
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static VALUE _wrap_FXStringDict_insert(int argc, VALUE *argv, VALUE self) { FXStringDict *arg1 = (FXStringDict *) 0 ;
-    FXchar *arg2 ; FXchar *arg3 ; FXbool arg4 = (FXbool) 0 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 3))
+    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 = to_FXbool(argv[2]); } 
+    arg3 = 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 ; FXbool arg4 = (FXbool) 0 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 3))
+    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 = to_FXbool(argv[2]); } 
+    arg3 = 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 ;
@@ -4228,16 +4434,16 @@ static VALUE _wrap_new_FXSettings(int argc, VALUE *argv, VALUE self) { FXSetting
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); { result = (FXSettings *)new_FXSettings();
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static VALUE _wrap_FXSettings_parseFile(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
-    FXString *arg2 = 0 ; FXbool arg3 ; FXbool result; SwigValueWrapper<FXString > p2 ; VALUE vresult = Qnil;
+    FXString *arg2 = 0 ; bool arg3 ; bool result; SwigValueWrapper<FXString > p2 ; 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); p2 = to_FXString(argv[0]); arg2 = &p2;
-    arg3 = to_FXbool(argv[1]); result = (FXbool)(arg1)->parseFile((FXString const &)*arg2,arg3);
-    vresult = result ? Qtrue : Qfalse; return vresult; }
+    arg3 = RTEST(argv[1]); result = (bool)(arg1)->parseFile((FXString const &)*arg2,arg3); vresult = result ? Qtrue : Qfalse;
+    return vresult; }
 static VALUE _wrap_FXSettings_unparseFile(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
-    FXString *arg2 = 0 ; FXbool result; SwigValueWrapper<FXString > p2 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXString *arg2 = 0 ; bool result; SwigValueWrapper<FXString > p2 ; 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); p2 = to_FXString(argv[0]); arg2 = &p2;
-    result = (FXbool)(arg1)->unparseFile((FXString const &)*arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)(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);
@@ -4287,75 +4493,88 @@ static VALUE _wrap_FXSettings_readColorEntry(int argc, VALUE *argv, VALUE self)
     arg3 = 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]); } 
+    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 ; FXbool result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
+    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]);
-    result = (FXbool)(arg1)->writeStringEntry((FXchar const *)arg2,(FXchar const *)arg3,(FXchar const *)arg4);
+    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 ; FXbool result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
+    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]);
-    result = (FXbool)(arg1)->writeIntEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = result ? Qtrue : Qfalse;
+    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 ; FXbool result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
+    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]);
-    result = (FXbool)(arg1)->writeUnsignedEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4);
+    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 ; FXbool result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
+    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]);
-    result = (FXbool)(arg1)->writeRealEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = result ? Qtrue : Qfalse;
+    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 ; FXbool result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
+    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]);
-    result = (FXbool)(arg1)->writeColorEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = result ? Qtrue : Qfalse;
+    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]);
+    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 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    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 = (FXbool)(arg1)->deleteEntry((FXchar const *)arg2,(FXchar const *)arg3);
+    arg3 = 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 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    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 = (FXbool)(arg1)->existingEntry((FXchar const *)arg2,(FXchar const *)arg3);
+    arg3 = 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 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    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]);
-    result = (FXbool)(arg1)->deleteSection((FXchar const *)arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+    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 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    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]);
-    result = (FXbool)(arg1)->existingSection((FXchar const *)arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+    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);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); result = (FXbool)(arg1)->clear();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXSettings_setModified(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
-    FXbool arg2 = (FXbool) 1 ; if ((argc < 0) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
+    bool arg2 = (bool) true ; if ((argc < 0) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); if (argc > 0) { arg2 = RTEST(argv[0]); } 
     (arg1)->setModified(arg2); return Qnil; }
-static VALUE _wrap_FXSettings_isModified(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);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); result = (FXbool)((FXSettings const *)arg1)->isModified();
+static VALUE _wrap_FXSettings_isModified(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 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_FXSettings, 1); result = (bool)((FXSettings const *)arg1)->isModified();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static void
 free_FXSettings(FXSettings *arg1) {
@@ -4389,13 +4608,13 @@ static VALUE _wrap_new_FXRegistry(int argc, VALUE *argv, VALUE self) { FXString
     if (argc > 1) { p2 = to_FXString(argv[1]); arg2 = &p2; }  {
         result = (FXRegistry *)new_FXRegistry((FXString const &)*arg1,(FXString const &)*arg2);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
-static VALUE _wrap_FXRegistry_read(int argc, VALUE *argv, VALUE self) { FXRegistry *arg1 = (FXRegistry *) 0 ; FXbool result;
+static VALUE _wrap_FXRegistry_read(int argc, VALUE *argv, VALUE self) { FXRegistry *arg1 = (FXRegistry *) 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_FXRegistry, 1); result = (FXbool)(arg1)->read();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegistry, 1); result = (bool)(arg1)->read();
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXRegistry_write(int argc, VALUE *argv, VALUE self) { FXRegistry *arg1 = (FXRegistry *) 0 ; FXbool result;
+static VALUE _wrap_FXRegistry_write(int argc, VALUE *argv, VALUE self) { FXRegistry *arg1 = (FXRegistry *) 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_FXRegistry, 1); result = (FXbool)(arg1)->write();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegistry, 1); result = (bool)(arg1)->write();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXRegistry_getAppKey(int argc, VALUE *argv, VALUE self) { FXRegistry *arg1 = (FXRegistry *) 0 ;
     FXString *result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
@@ -4410,14 +4629,14 @@ static VALUE _wrap_FXRegistry_getVendorKey(int argc, VALUE *argv, VALUE self) {
         FXString const &_result_ref = ((FXRegistry const *)arg1)->getVendorKey(); result = (FXString *) &_result_ref; } 
     vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXRegistry_setAsciiMode(int argc, VALUE *argv, VALUE self) { FXRegistry *arg1 = (FXRegistry *) 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_FXRegistry, 1); arg2 = to_FXbool(argv[0]); (arg1)->setAsciiMode(arg2);
+    bool arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegistry, 1); arg2 = RTEST(argv[0]); (arg1)->setAsciiMode(arg2);
     return Qnil; }
 static VALUE _wrap_FXRegistry_getAsciiMode(int argc, VALUE *argv, VALUE self) { FXRegistry *arg1 = (FXRegistry *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXRegistry, 1);
-    result = (FXbool)((FXRegistry const *)arg1)->getAsciiMode(); vresult = result ? Qtrue : Qfalse; return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegistry, 1); result = (bool)((FXRegistry const *)arg1)->getAsciiMode();
+    vresult = result ? Qtrue : Qfalse; return vresult; }
 static void
 free_FXRegistry(FXRegistry *arg1) {
     delete arg1;
@@ -4530,6 +4749,10 @@ static VALUE _wrap_new_FXRecentFiles__SWIG_0(int argc, VALUE *argv, VALUE self)
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); {
         result = (FXRecentFiles *)new_FXRecentFiles__SWIG_0(); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result);
         if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
+static VALUE _wrap_new_FXRecentFiles__SWIG_1(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
+    FXRecentFiles *result; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); { result = (FXRecentFiles *)new_FXRecentFiles__SWIG_1(arg1);
+        DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXRecentFiles_allocate(VALUE self) {
 #else
@@ -4540,23 +4763,35 @@ static VALUE _wrap_FXRecentFiles_allocate(VALUE self) {
         rb_obj_call_init(vresult, argc, argv);
 #endif
          return vresult; }
-static VALUE _wrap_new_FXRecentFiles__SWIG_1(int argc, VALUE *argv, VALUE self) { FXString *arg1 = 0 ;
-    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 = (FXSelector) 0 ; FXRecentFiles *result; SwigValueWrapper<FXString > p1 ;
-    if ((argc < 1) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    p1 = to_FXString(argv[0]); arg1 = &p1; if (argc > 1) { SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXObject, 1); } 
-    if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  {
-        result = (FXRecentFiles *)new_FXRecentFiles__SWIG_1((FXString const &)*arg1,arg2,arg3);
+static VALUE _wrap_new_FXRecentFiles__SWIG_2(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
+    FXString *arg2 = 0 ; FXObject *arg3 = (FXObject *) 0 ; FXSelector arg4 = (FXSelector) 0 ; FXRecentFiles *result;
+    SwigValueWrapper<FXString > p2 ; if ((argc < 2) || (argc > 4))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
+    SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); p2 = to_FXString(argv[1]); arg2 = &p2; if (argc > 2) {
+        SWIG_ConvertPtr(argv[2], (void **) &arg3, SWIGTYPE_p_FXObject, 1); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  {
+        result = (FXRecentFiles *)new_FXRecentFiles__SWIG_2(arg1,(FXString const &)*arg2,arg3,arg4);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
-static VALUE _wrap_new_FXRecentFiles(int nargs, VALUE *args, VALUE self) { int argc; VALUE argv[3]; int ii; argc = nargs;
-    for (ii = 0; (ii < argc) && (ii < 3); ii++) { argv[ii] = args[ii]; }  if (argc == 0) {
-        return _wrap_new_FXRecentFiles__SWIG_0(nargs, args, self);}  if ((argc >= 1) && (argc <= 3)) { int _v; {
-            _v = (NIL_P(argv[0]) || TYPE(argv[0]) == T_STRING) ? 1 : 0; }  if (_v) { if (argc <= 1) {
-                return _wrap_new_FXRecentFiles__SWIG_1(nargs, args, self);}  { void *ptr;
-                _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXObject, 0) != -1)) ? 1 : 0; }
-             if (_v) { if (argc <= 2) { return _wrap_new_FXRecentFiles__SWIG_1(nargs, args, self);}  {
-                    _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
-                    return _wrap_new_FXRecentFiles__SWIG_1(nargs, args, self);}  }  }  } 
+static VALUE _wrap_new_FXRecentFiles(int nargs, VALUE *args, VALUE self) { int argc; VALUE argv[4]; int ii; argc = nargs;
+    for (ii = 0; (ii < argc) && (ii < 4); ii++) { argv[ii] = args[ii]; }  if (argc == 0) {
+        return _wrap_new_FXRecentFiles__SWIG_0(nargs, args, self);}  if (argc == 1) { int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0; }
+         if (_v) { return _wrap_new_FXRecentFiles__SWIG_1(nargs, args, self);}  }  if ((argc >= 2) && (argc <= 4)) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0; }
+         if (_v) { { _v = (NIL_P(argv[1]) || TYPE(argv[1]) == T_STRING) ? 1 : 0; }  if (_v) { if (argc <= 2) {
+                    return _wrap_new_FXRecentFiles__SWIG_2(nargs, args, self);}  { void *ptr;
+                    _v = (NIL_P(argv[2]) || (TYPE(argv[2]) == T_DATA && SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_FXObject, 0) != -1)) ? 1 : 0; }
+                 if (_v) { if (argc <= 3) { return _wrap_new_FXRecentFiles__SWIG_2(nargs, args, self);}  {
+                        _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
+                        return _wrap_new_FXRecentFiles__SWIG_2(nargs, args, self);}  }  }  }  } 
     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXRecentFiles'"); return Qnil; }
+static VALUE _wrap_FXRecentFiles_app(int argc, VALUE *argv, VALUE self) { FXRecentFiles *arg1 = (FXRecentFiles *) 0 ;
+    FXApp *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_FXRecentFiles, 1);
+    result = (FXApp *)((FXRecentFiles const *)arg1)->getApp(); {
+        swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXApp, (void **) &result); vresult = FXRbGetRubyObj(result, ty); } 
+    return vresult; }
 static VALUE _wrap_FXRecentFiles_setMaxFiles(int argc, VALUE *argv, VALUE self) { FXRecentFiles *arg1 = (FXRecentFiles *) 0 ;
     FXint arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRecentFiles, 1); arg2 = NUM2INT(argv[0]); (arg1)->setMaxFiles(arg2);
@@ -4772,9 +5007,9 @@ static VALUE _wrap_FXCursor_getHotY(int argc, VALUE *argv, VALUE self) { FXCurso
     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_FXCursor, 1); result = (FXint)((FXCursor const *)arg1)->getHotY();
     vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXCursor_isColor(int argc, VALUE *argv, VALUE self) { FXCursor *arg1 = (FXCursor *) 0 ; FXbool result;
+static VALUE _wrap_FXCursor_isColor(int argc, VALUE *argv, VALUE self) { FXCursor *arg1 = (FXCursor *) 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_FXCursor, 1); result = (FXbool)((FXCursor const *)arg1)->isColor();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXCursor, 1); result = (bool)((FXCursor const *)arg1)->isColor();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static void
 free_FXCursor(FXCursor *arg1) {
@@ -4800,17 +5035,17 @@ static VALUE _wrap_FXCursor_destroy(int argc, VALUE *argv, VALUE self) { FXCurso
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXCursor, 1); FXCursor_destroy(arg1); return Qnil; }
 static VALUE _wrap_FXCursor_savePixels(int argc, VALUE *argv, VALUE self) { FXCursor *arg1 = (FXCursor *) 0 ;
-    FXStream *arg2 = 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXStream *arg2 = 0 ; 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_FXCursor, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = (FXbool)FXCursor_savePixels((FXCursor const *)arg1,*arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXCursor_savePixels((FXCursor const *)arg1,*arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXCursor_loadPixels(int argc, VALUE *argv, VALUE self) { FXCursor *arg1 = (FXCursor *) 0 ;
-    FXStream *arg2 = 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXStream *arg2 = 0 ; 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_FXCursor, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = (FXbool)FXCursor_loadPixels(arg1,*arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXCursor_loadPixels(arg1,*arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXCURCursor_fileExt(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)FXCURCursor_fileExt(); vresult = result; return vresult; }
@@ -4854,18 +5089,17 @@ static VALUE _wrap_FXCURCursor_destroy(int argc, VALUE *argv, VALUE self) { FXCU
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXCURCursor, 1); FXCURCursor_destroy(arg1); return Qnil; }
 static VALUE _wrap_FXCURCursor_savePixels(int argc, VALUE *argv, VALUE self) { FXCURCursor *arg1 = (FXCURCursor *) 0 ;
-    FXStream *arg2 = 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXStream *arg2 = 0 ; 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_FXCURCursor, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = (FXbool)FXCURCursor_savePixels((FXCURCursor const *)arg1,*arg2); vresult = result ? Qtrue : Qfalse;
-    return vresult; }
+    result = (bool)FXCURCursor_savePixels((FXCURCursor const *)arg1,*arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXCURCursor_loadPixels(int argc, VALUE *argv, VALUE self) { FXCURCursor *arg1 = (FXCURCursor *) 0 ;
-    FXStream *arg2 = 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXStream *arg2 = 0 ; 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_FXCURCursor, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = (FXbool)FXCURCursor_loadPixels(arg1,*arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXCURCursor_loadPixels(arg1,*arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXGIFCursor_fileExt(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)FXGIFCursor_fileExt(); vresult = result; return vresult; }
@@ -4911,35 +5145,34 @@ static VALUE _wrap_FXGIFCursor_destroy(int argc, VALUE *argv, VALUE self) { FXGI
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXGIFCursor, 1); FXGIFCursor_destroy(arg1); return Qnil; }
 static VALUE _wrap_FXGIFCursor_savePixels(int argc, VALUE *argv, VALUE self) { FXGIFCursor *arg1 = (FXGIFCursor *) 0 ;
-    FXStream *arg2 = 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXStream *arg2 = 0 ; 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_FXGIFCursor, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = (FXbool)FXGIFCursor_savePixels((FXGIFCursor const *)arg1,*arg2); vresult = result ? Qtrue : Qfalse;
-    return vresult; }
+    result = (bool)FXGIFCursor_savePixels((FXGIFCursor const *)arg1,*arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXGIFCursor_loadPixels(int argc, VALUE *argv, VALUE self) { FXGIFCursor *arg1 = (FXGIFCursor *) 0 ;
-    FXStream *arg2 = 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXStream *arg2 = 0 ; 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_FXGIFCursor, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = (FXbool)FXGIFCursor_loadPixels(arg1,*arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXGIFCursor_loadPixels(arg1,*arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_fxsaveGIF(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = 0 ; FXColor *arg2 = (FXColor *) 0 ;
-    FXint arg3 ; FXint arg4 ; FXbool arg5 = (FXbool) 1 ; FXbool result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 5))
+    FXint arg3 ; FXint arg4 ; FXbool arg5 = (FXbool) 1 ; bool result; VALUE vresult = Qnil; if ((argc < 4) || (argc > 5))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
     { arg2=NULL; if(argv[1]!=Qnil){ Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
                 for(long i=0; i<RARRAY(argv[1])->len; i++){ arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }
              }  }  arg3 = NUM2INT(argv[2]); arg4 = NUM2INT(argv[3]); if (argc > 4) { arg5 = to_FXbool(argv[4]); } 
-    result = (FXbool)fxsaveGIF(*arg1,(FXColor const *)arg2,arg3,arg4,arg5); vresult = result ? Qtrue : Qfalse; FXFREE(&arg2);
+    result = (bool)fxsaveGIF(*arg1,(FXColor const *)arg2,arg3,arg4,arg5); vresult = result ? Qtrue : Qfalse; FXFREE(&arg2);
     return vresult; }
 static VALUE _wrap_fxloadGIF(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = 0 ; VALUE result; VALUE vresult = Qnil;
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
     result = (VALUE)fxloadGIF(*arg1); vresult = result; return vresult; }
-static VALUE _wrap_fxcheckGIF(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = 0 ; FXbool result; VALUE vresult = Qnil;
+static VALUE _wrap_fxcheckGIF(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = 0 ; bool result; VALUE vresult = Qnil;
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = (FXbool)fxcheckGIF(*arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)fxcheckGIF(*arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXDrawable_allocate(VALUE self) {
 #else
@@ -5103,64 +5336,65 @@ static VALUE _wrap_new_FXFontDesc(int argc, VALUE *argv, VALUE self) { FXFontDes
 static VALUE _wrap_FXFontDesc_face_set(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ; FXchar *arg2 ;
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); arg2 = StringValuePtr(argv[0]); {
-        if (arg2) strncpy(arg1->face,arg2,104); else arg1->face[0] = 0; }  return Qnil; }
+        if (arg2) strncpy(arg1->face,arg2,116); else arg1->face[0] = 0; }  return Qnil; }
 static VALUE _wrap_FXFontDesc_face_get(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ;
     FXchar *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_FXFontDesc, 1); result = (FXchar *)(FXchar *) ((arg1)->face);
     vresult = rb_str_new2(result); return vresult; }
-static VALUE _wrap_FXFontDesc_size_set(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ; FXuint arg2 ;
-    if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); arg2 = NUM2UINT(argv[0]); if (arg1) (arg1)->size = arg2;
+static VALUE _wrap_FXFontDesc_size_set(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ;
+    FXushort arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); arg2 = NUM2USHRT(argv[0]); if (arg1) (arg1)->size = arg2;
     return Qnil; }
-static VALUE _wrap_FXFontDesc_size_get(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ; FXuint 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_FXFontDesc, 1); result = (FXuint) ((arg1)->size);
+static VALUE _wrap_FXFontDesc_size_get(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ;
+    FXushort 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_FXFontDesc, 1); result = (FXushort) ((arg1)->size);
     vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_FXFontDesc_weight_set(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ;
-    FXuint arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); arg2 = NUM2UINT(argv[0]); if (arg1) (arg1)->weight = arg2;
-    return Qnil; }
+    FXushort arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); arg2 = NUM2USHRT(argv[0]);
+    if (arg1) (arg1)->weight = arg2; return Qnil; }
 static VALUE _wrap_FXFontDesc_weight_get(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ;
-    FXuint result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXushort 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_FXFontDesc, 1); result = (FXuint) ((arg1)->weight);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); result = (FXushort) ((arg1)->weight);
     vresult = UINT2NUM(result); return vresult; }
-static VALUE _wrap_FXFontDesc_slant_set(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ; FXuint arg2 ;
-    if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); arg2 = NUM2UINT(argv[0]); if (arg1) (arg1)->slant = arg2;
+static VALUE _wrap_FXFontDesc_slant_set(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ;
+    FXushort arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); arg2 = NUM2USHRT(argv[0]); if (arg1) (arg1)->slant = arg2;
     return Qnil; }
 static VALUE _wrap_FXFontDesc_slant_get(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ;
-    FXuint result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXushort 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_FXFontDesc, 1); result = (FXuint) ((arg1)->slant);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); result = (FXushort) ((arg1)->slant);
     vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_FXFontDesc_setwidth_set(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ;
-    FXuint arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); arg2 = NUM2UINT(argv[0]);
+    FXushort arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); arg2 = NUM2USHRT(argv[0]);
     if (arg1) (arg1)->setwidth = arg2; return Qnil; }
 static VALUE _wrap_FXFontDesc_setwidth_get(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ;
-    FXuint result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXushort 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_FXFontDesc, 1); result = (FXuint) ((arg1)->setwidth);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); result = (FXushort) ((arg1)->setwidth);
     vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_FXFontDesc_encoding_set(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ;
-    FXuint arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); arg2 = NUM2UINT(argv[0]);
+    FXushort arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); arg2 = NUM2USHRT(argv[0]);
     if (arg1) (arg1)->encoding = arg2; return Qnil; }
 static VALUE _wrap_FXFontDesc_encoding_get(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ;
-    FXuint result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXushort 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_FXFontDesc, 1); result = (FXuint) ((arg1)->encoding);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); result = (FXushort) ((arg1)->encoding);
     vresult = UINT2NUM(result); return vresult; }
-static VALUE _wrap_FXFontDesc_flags_set(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ; FXuint arg2 ;
-    if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); arg2 = NUM2UINT(argv[0]); if (arg1) (arg1)->flags = arg2;
+static VALUE _wrap_FXFontDesc_flags_set(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ;
+    FXushort arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); arg2 = NUM2USHRT(argv[0]); if (arg1) (arg1)->flags = arg2;
     return Qnil; }
 static VALUE _wrap_FXFontDesc_flags_get(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = (FXFontDesc *) 0 ;
-    FXuint result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXushort 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_FXFontDesc, 1); result = (FXuint) ((arg1)->flags);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); result = (FXushort) ((arg1)->flags);
     vresult = UINT2NUM(result); return vresult; }
 static void
 free_FXFontDesc(FXFontDesc *arg1) {
@@ -5173,8 +5407,8 @@ static VALUE _wrap_new_FXFont__SWIG_0(int argc, VALUE *argv, VALUE self) { FXApp
         result = (FXFont *)new_FXFont__SWIG_0(arg1,(FXString const &)*arg2);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static VALUE _wrap_new_FXFont__SWIG_1(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXString *arg2 = 0 ;
-    FXuint arg3 ; FXuint arg4 = (FXuint) FONTWEIGHT_NORMAL ; FXuint arg5 = (FXuint) FONTSLANT_REGULAR ;
-    FXuint arg6 = (FXuint) FONTENCODING_DEFAULT ; FXuint arg7 = (FXuint) FONTSETWIDTH_DONTCARE ; FXuint arg8 = (FXuint) 0 ;
+    FXuint arg3 ; FXuint arg4 = (FXuint) FXFont::Normal ; FXuint arg5 = (FXuint) FXFont::Straight ;
+    FXuint arg6 = (FXuint) FONTENCODING_DEFAULT ; FXuint arg7 = (FXuint) FXFont::NonExpanded ; FXuint arg8 = (FXuint) 0 ;
     FXFont *result; SwigValueWrapper<FXString > p2 ; if ((argc < 3) || (argc > 8))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); p2 = to_FXString(argv[1]); arg2 = &p2;
@@ -5224,6 +5458,14 @@ static VALUE _wrap_new_FXFont(int nargs, VALUE *args, VALUE self) { int argc; VA
                                         _v = ((TYPE(argv[7]) == T_FIXNUM) || (TYPE(argv[7]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
                                         return _wrap_new_FXFont__SWIG_1(nargs, args, self);}  }  }  }  }  }  }  }  } 
     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXFont'"); return Qnil; }
+static VALUE _wrap_FXFont_family(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)->getFamily();
+    vresult = rb_str_new2((&result)->text()); return vresult; }
+static VALUE _wrap_FXFont_foundry(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)->getFoundry();
+    vresult = rb_str_new2((&result)->text()); return vresult; }
 static VALUE _wrap_FXFont_getName(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); {
@@ -5278,125 +5520,140 @@ static VALUE _wrap_FXFont_getHints(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 = (FXuint)((FXFont const *)arg1)->getHints();
     vresult = UINT2NUM(result); return vresult; }
-static VALUE _wrap_FXFont_setFontDesc(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXFontDesc *arg2 = 0 ;
-    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);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXFontDesc, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    (arg1)->setFontDesc((FXFontDesc const &)*arg2); return Qnil; }
+static VALUE _wrap_FXFont_flags(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXuint 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 = (FXuint)((FXFont const *)arg1)->getFlags();
+    vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_FXFont_getFontDesc(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXFontDesc 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_getFontDesc((FXFont const *)arg1); {
         FXFontDesc* resultptr = new FXFontDesc(result); vresult = FXRbGetRubyObj(resultptr, "FXFontDesc *"); }  return vresult; }
-static VALUE _wrap_FXFont_setFont(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXString *arg2 = 0 ;
-    FXbool result; SwigValueWrapper<FXString > p2 ; 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);
-    p2 = to_FXString(argv[0]); arg2 = &p2; result = (FXbool)(arg1)->setFont((FXString const &)*arg2);
-    vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXFont_angle(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)->getAngle();
+    vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXFont_getFont(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; }
+static VALUE _wrap_FXFont_listFonts(int argc, VALUE *argv, VALUE self) { FXString *arg1 = 0 ; FXuint arg2 = (FXuint) 0 ;
+    FXuint arg3 = (FXuint) 0 ; FXuint arg4 = (FXuint) 0 ; FXuint arg5 = (FXuint) 0 ; FXuint arg6 = (FXuint) 0 ; VALUE result;
+    SwigValueWrapper<FXString > p1 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 6))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); p1 = to_FXString(argv[0]); arg1 = &p1; if (argc > 1) {
+        arg2 = NUM2UINT(argv[1]); }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); } 
+    if (argc > 4) { arg5 = NUM2UINT(argv[4]); }  if (argc > 5) { arg6 = NUM2UINT(argv[5]); } 
+    result = (VALUE)FXFont_listFonts((FXString const &)*arg1,arg2,arg3,arg4,arg5,arg6); vresult = result; return vresult; }
+static void
+free_FXFont(FXFont *arg1) {
+    delete arg1;
+}
+static VALUE _wrap_FXFont_save(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXStream *arg2 = 0 ;
+    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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXFont_save((FXFont const *)arg1,*arg2); return Qnil; }
+static VALUE _wrap_FXFont_load(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXStream *arg2 = 0 ;
+    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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXFont_load(arg1,*arg2); return Qnil; }
+static VALUE _wrap_FXFont_create(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ;
+    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); FXFont_create(arg1); return Qnil; }
+static VALUE _wrap_FXFont_detach(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ;
+    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); FXFont_detach(arg1); return Qnil; }
+static VALUE _wrap_FXFont_destroy(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ;
+    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); FXFont_destroy(arg1); return Qnil; }
+static VALUE _wrap_FXFont_setFontDesc(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXFontDesc *arg2 = 0 ;
+    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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXFontDesc, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXFont_setFontDesc(arg1,(FXFontDesc const &)*arg2); return Qnil; }
+static VALUE _wrap_FXFont_setAngle(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXint arg2 ;
+    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]); FXFont_setAngle(arg1,arg2);
+    return Qnil; }
+static VALUE _wrap_FXFont_setFont(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXString *arg2 = 0 ;
+    SwigValueWrapper<FXString > p2 ; 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);
+    p2 = to_FXString(argv[0]); arg2 = &p2; FXFont_setFont(arg1,(FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXFont_isFontMono(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 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_FXFont, 1); result = (FXbool)((FXFont const *)arg1)->isFontMono();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); result = (FXbool)FXFont_isFontMono((FXFont const *)arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 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 = 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;
+static VALUE _wrap_FXFont_getMinChar(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXwchar 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();
-    vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXFont_getMaxChar(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXint result;
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); result = (FXwchar)FXFont_getMinChar((FXFont const *)arg1);
+    vresult = UINT2NUM(result); return vresult; }
+static VALUE _wrap_FXFont_getMaxChar(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXwchar 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)->getMaxChar();
-    vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXFont_leftBearing(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXchar arg2 ;
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); result = (FXwchar)FXFont_getMaxChar((FXFont const *)arg1);
+    vresult = UINT2NUM(result); return vresult; }
+static VALUE _wrap_FXFont_leftBearing(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXwchar arg2 ;
     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_FXFont, 1);
-    arg2 = NUM2CHR(argv[0]); result = (FXint)((FXFont const *)arg1)->leftBearing(arg2); vresult = INT2NUM(result);
+    arg2 = NUM2UINT(argv[0]); result = (FXint)FXFont_leftBearing((FXFont const *)arg1,arg2); vresult = INT2NUM(result);
     return vresult; }
-static VALUE _wrap_FXFont_rightBearing(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXchar arg2 ;
+static VALUE _wrap_FXFont_rightBearing(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXwchar arg2 ;
     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_FXFont, 1);
-    arg2 = NUM2CHR(argv[0]); result = (FXint)((FXFont const *)arg1)->rightBearing(arg2); vresult = INT2NUM(result);
+    arg2 = NUM2UINT(argv[0]); result = (FXint)FXFont_rightBearing((FXFont const *)arg1,arg2); vresult = INT2NUM(result);
     return vresult; }
 static VALUE _wrap_FXFont_getFontWidth(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)->getFontWidth();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); result = (FXint)FXFont_getFontWidth((FXFont const *)arg1);
     vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXFont_getFontHeight(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)->getFontHeight();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); result = (FXint)FXFont_getFontHeight((FXFont const *)arg1);
     vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXFont_getFontAscent(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)->getFontAscent();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); result = (FXint)FXFont_getFontAscent((FXFont const *)arg1);
     vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXFont_getFontDescent(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)->getFontDescent();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); result = (FXint)FXFont_getFontDescent((FXFont const *)arg1);
     vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXFont_getFontLeading(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)->getFontLeading();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); result = (FXint)FXFont_getFontLeading((FXFont const *)arg1);
     vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXFont_getFontSpacing(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)->getFontSpacing();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); result = (FXint)FXFont_getFontSpacing((FXFont const *)arg1);
     vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXFont_getTextWidth(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; VALUE arg2 ;
-    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_FXFont, 1);
-    arg2 = argv[0]; result = (FXint)FXFont_getTextWidth((FXFont const *)arg1,arg2); vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXFont_getTextHeight(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; VALUE arg2 ;
+static VALUE _wrap_FXFont_getCharWidth(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXwchar arg2 ;
     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_FXFont, 1);
-    arg2 = argv[0]; result = (FXint)FXFont_getTextHeight((FXFont const *)arg1,arg2); vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXFont_listFonts(int argc, VALUE *argv, VALUE self) { FXString *arg1 = 0 ;
-    FXuint arg2 = (FXuint) FONTWEIGHT_DONTCARE ; FXuint arg3 = (FXuint) FONTSLANT_DONTCARE ;
-    FXuint arg4 = (FXuint) FONTSETWIDTH_DONTCARE ; FXuint arg5 = (FXuint) FONTENCODING_DEFAULT ; FXuint arg6 = (FXuint) 0 ;
-    VALUE result; SwigValueWrapper<FXString > p1 ; VALUE vresult = Qnil; if ((argc < 1) || (argc > 6))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); p1 = to_FXString(argv[0]); arg1 = &p1; if (argc > 1) {
-        arg2 = NUM2UINT(argv[1]); }  if (argc > 2) { arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2UINT(argv[3]); } 
-    if (argc > 4) { arg5 = NUM2UINT(argv[4]); }  if (argc > 5) { arg6 = NUM2UINT(argv[5]); } 
-    result = (VALUE)FXFont_listFonts((FXString const &)*arg1,arg2,arg3,arg4,arg5,arg6); vresult = result; return vresult; }
-static void
-free_FXFont(FXFont *arg1) {
-    delete arg1;
-}
-static VALUE _wrap_FXFont_save(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXStream *arg2 = 0 ;
-    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);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    FXFont_save((FXFont const *)arg1,*arg2); return Qnil; }
-static VALUE _wrap_FXFont_load(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXStream *arg2 = 0 ;
-    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);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    FXFont_load(arg1,*arg2); return Qnil; }
-static VALUE _wrap_FXFont_create(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ;
-    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); FXFont_create(arg1); return Qnil; }
-static VALUE _wrap_FXFont_detach(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ;
-    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); FXFont_detach(arg1); return Qnil; }
-static VALUE _wrap_FXFont_destroy(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ;
-    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); FXFont_destroy(arg1); return Qnil; }
-static VALUE _wrap_fxparsefontdesc(int argc, VALUE *argv, VALUE self) { FXchar *arg1 ; FXFontDesc *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 = (FXFontDesc *)fxparsefontdesc2((FXchar const *)arg1); vresult = FXRbGetRubyObj(result, "FXFontDesc *");
+    arg2 = NUM2UINT(argv[0]); result = (FXint)FXFont_getCharWidth((FXFont const *)arg1,arg2); vresult = INT2NUM(result);
     return vresult; }
-static VALUE _wrap_fxunparsefontdesc(int argc, VALUE *argv, VALUE self) { FXFontDesc *arg1 = 0 ; FXString result;
-    VALUE vresult = Qnil; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXFontDesc, 1); if (arg1 == NULL) rb_raise(rb_eTypeError, "null reference");
-    result = fxunparsefontdesc2((FXFontDesc const &)*arg1); vresult = rb_str_new2((&result)->text()); return vresult; }
+static VALUE _wrap_FXFont_getTextWidth(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXString *arg2 = 0 ;
+    FXint result; SwigValueWrapper<FXString > p2 ; 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);
+    p2 = to_FXString(argv[0]); arg2 = &p2; result = (FXint)FXFont_getTextWidth((FXFont const *)arg1,(FXString const &)*arg2);
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXFont_getTextHeight(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXString *arg2 = 0 ;
+    FXint result; SwigValueWrapper<FXString > p2 ; 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);
+    p2 = to_FXString(argv[0]); arg2 = &p2; result = (FXint)FXFont_getTextHeight((FXFont const *)arg1,(FXString const &)*arg2);
+    vresult = INT2NUM(result); return vresult; }
+static VALUE FXWindow_octetType_get(VALUE self) { VALUE _val; _val = UINT2NUM(FXWindow::octetType);    return _val; }
+static VALUE FXWindow_octetType_set(VALUE self, VALUE _val) { FXWindow::octetType = NUM2UINT(_val); return _val; }
 static VALUE FXWindow_deleteType_get(VALUE self) { VALUE _val; _val = UINT2NUM(FXWindow::deleteType);    return _val; }
 static VALUE FXWindow_deleteType_set(VALUE self, VALUE _val) { FXWindow::deleteType = NUM2UINT(_val); return _val; }
 static VALUE FXWindow_textType_get(VALUE self) { VALUE _val; _val = UINT2NUM(FXWindow::textType);    return _val; }
 static VALUE FXWindow_textType_set(VALUE self, VALUE _val) { FXWindow::textType = NUM2UINT(_val); return _val; }
+static VALUE FXWindow_utf8Type_get(VALUE self) { VALUE _val; _val = UINT2NUM(FXWindow::utf8Type);    return _val; }
+static VALUE FXWindow_utf8Type_set(VALUE self, VALUE _val) { FXWindow::utf8Type = NUM2UINT(_val); return _val; }
+static VALUE FXWindow_utf16Type_get(VALUE self) { VALUE _val; _val = UINT2NUM(FXWindow::utf16Type);    return _val; }
+static VALUE FXWindow_utf16Type_set(VALUE self, VALUE _val) { FXWindow::utf16Type = NUM2UINT(_val); return _val; }
 static VALUE FXWindow_colorType_get(VALUE self) { VALUE _val; _val = UINT2NUM(FXWindow::colorType);    return _val; }
 static VALUE FXWindow_colorType_set(VALUE self, VALUE _val) { FXWindow::colorType = NUM2UINT(_val); return _val; }
 static VALUE FXWindow_urilistType_get(VALUE self) { VALUE _val; _val = UINT2NUM(FXWindow::urilistType);    return _val; }
@@ -5709,6 +5966,9 @@ static VALUE _wrap_FXWindow_onCmdDelete(int argc, VALUE *argv, VALUE self) { FXW
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = 0;
     result = (long)(arg1)->onCmdDelete(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXWindow_octetTypeName(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)FXWindow_octetTypeName(); vresult = result; return vresult; }
 static VALUE _wrap_FXWindow_deleteTypeName(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)FXWindow_deleteTypeName(); vresult = result; return vresult; }
@@ -5721,6 +5981,12 @@ static VALUE _wrap_FXWindow_colorTypeName(int argc, VALUE *argv, VALUE self) { V
 static VALUE _wrap_FXWindow_urilistTypeName(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)FXWindow_urilistTypeName(); vresult = result; return vresult; }
+static VALUE _wrap_FXWindow_utf8TypeName(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)FXWindow_utf8TypeName(); vresult = result; return vresult; }
+static VALUE _wrap_FXWindow_utf16TypeName(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)FXWindow_utf16TypeName(); vresult = result; return vresult; }
 static VALUE _wrap_new_FXWindow__SWIG_0(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
     FXuint arg2 = (FXuint) 0 ; FXint arg3 = (FXint) 0 ; FXint arg4 = (FXint) 0 ; FXint arg5 = (FXint) 0 ;
     FXint arg6 = (FXint) 0 ; FXWindow *result; if ((argc < 1) || (argc > 6))
@@ -5915,30 +6181,30 @@ static VALUE _wrap_FXWindow_getHelpTag(int argc, VALUE *argv, VALUE self) { FXWi
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); {
         FXString const &_result_ref = ((FXWindow const *)arg1)->getHelpTag(); result = (FXString *) &_result_ref; } 
     vresult = rb_str_new2(result->text()); return vresult; }
-static VALUE _wrap_FXWindow_isShell(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_isShell(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->isShell();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->isShell();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXWindow_isOwnerOf(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
-    FXWindow *arg2 = (FXWindow *) 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXWindow *arg2 = (FXWindow *) 0 ; 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_FXWindow, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
-    result = (FXbool)((FXWindow const *)arg1)->isOwnerOf((FXWindow const *)arg2); vresult = result ? Qtrue : Qfalse;
+    result = (bool)((FXWindow const *)arg1)->isOwnerOf((FXWindow const *)arg2); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXWindow_isChildOf(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
-    FXWindow *arg2 = (FXWindow *) 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXWindow *arg2 = (FXWindow *) 0 ; 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_FXWindow, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
-    result = (FXbool)((FXWindow const *)arg1)->isChildOf((FXWindow const *)arg2); vresult = result ? Qtrue : Qfalse;
+    result = (bool)((FXWindow const *)arg1)->isChildOf((FXWindow const *)arg2); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXWindow_containsChild(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
-    FXWindow *arg2 = (FXWindow *) 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXWindow *arg2 = (FXWindow *) 0 ; 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_FXWindow, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
-    result = (FXbool)((FXWindow const *)arg1)->containsChild((FXWindow const *)arg2); vresult = result ? Qtrue : Qfalse;
+    result = (bool)((FXWindow const *)arg1)->containsChild((FXWindow const *)arg2); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXWindow_getChildAt(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXint arg2 ;
     FXint arg3 ; FXWindow *result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
@@ -5979,36 +6245,45 @@ static VALUE _wrap_FXWindow_commonAncestor(int argc, VALUE *argv, VALUE self) {
     { swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXWindow, (void **) &result); vresult = FXRbGetRubyObj(result, ty); }
      return vresult; }
 static VALUE _wrap_FXWindow_beforeq___(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
-    FXWindow *arg2 = (FXWindow *) 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    FXWindow *arg2 = (FXWindow *) 0 ; bool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXWindow, 1);
     SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
-    result = (FXbool)FXWindow::before((FXWindow const *)arg1,(FXWindow const *)arg2); vresult = result ? Qtrue : Qfalse;
+    result = (bool)FXWindow::before((FXWindow const *)arg1,(FXWindow const *)arg2); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXWindow_afterq___(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
-    FXWindow *arg2 = (FXWindow *) 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    FXWindow *arg2 = (FXWindow *) 0 ; bool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXWindow, 1);
     SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
-    result = (FXbool)FXWindow::after((FXWindow const *)arg1,(FXWindow const *)arg2); vresult = result ? Qtrue : Qfalse;
+    result = (bool)FXWindow::after((FXWindow const *)arg1,(FXWindow const *)arg2); vresult = result ? Qtrue : Qfalse;
     return vresult; }
-static VALUE _wrap_FXWindow_windowCount(int argc, VALUE *argv, VALUE self) { FXint result; VALUE vresult = Qnil;
-    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    result = (FXint)FXWindow::getWindowCount(); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXWindow_before(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
-    FXWindow *arg2 = (FXWindow *) 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXWindow *arg2 = (FXWindow *) 0 ; 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_FXWindow, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
-    result = (FXbool)FXWindow_before((FXWindow const *)arg1,(FXWindow const *)arg2); vresult = result ? Qtrue : Qfalse;
+    result = (bool)FXWindow_before((FXWindow const *)arg1,(FXWindow const *)arg2); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXWindow_after(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
-    FXWindow *arg2 = (FXWindow *) 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    FXWindow *arg2 = (FXWindow *) 0 ; 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_FXWindow, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
-    result = (FXbool)FXWindow_after((FXWindow const *)arg1,(FXWindow const *)arg2); vresult = result ? Qtrue : Qfalse;
+    result = (bool)FXWindow_after((FXWindow const *)arg1,(FXWindow const *)arg2); vresult = result ? Qtrue : Qfalse;
     return vresult; }
+static VALUE _wrap_FXWindow_composeContext(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
+    FXComposeContext *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_FXWindow, 1);
+    result = (FXComposeContext *)((FXWindow const *)arg1)->getComposeContext();
+    vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXComposeContext,0); return vresult; }
+static VALUE _wrap_FXWindow_createComposeContext(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); (arg1)->createComposeContext(); return Qnil; }
+static VALUE _wrap_FXWindow_destroyComposeContext(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); (arg1)->destroyComposeContext(); return Qnil; }
 static VALUE _wrap_FXWindow_setDefaultCursor(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
     FXCursor *arg2 = (FXCursor *) 0 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
@@ -6043,34 +6318,33 @@ static VALUE _wrap_FXWindow_setCursorPosition(int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
     result = (FXint)(arg1)->setCursorPosition(arg2,arg3); vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXWindow_isEnabled(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_isEnabled(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->isEnabled();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->isEnabled();
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXWindow_isActive(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_isActive(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->isActive();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->isActive();
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXWindow_hasFocus(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_hasFocus(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->hasFocus();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->hasFocus();
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXWindow_inFocusChainq___(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->inFocusChain();
+static VALUE _wrap_FXWindow_inFocusChainq___(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->inFocusChain();
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXWindow_isDefault(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_isDefault(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->isDefault();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->isDefault();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXWindow_setInitial(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
-    FXbool arg2 = (FXbool) 1 ; if ((argc < 0) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
+    bool arg2 = (bool) true ; if ((argc < 0) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); if (argc > 0) { arg2 = RTEST(argv[0]); } 
     (arg1)->setInitial(arg2); return Qnil; }
-static VALUE _wrap_FXWindow_isInitial(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_isInitial(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->isInitial();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->isInitial();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXWindow_forceRefresh(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -6127,9 +6401,9 @@ static VALUE _wrap_FXWindow_grab(int argc, VALUE *argv, VALUE self) { FXWindow *
 static VALUE _wrap_FXWindow_ungrab(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); (arg1)->ungrab(); return Qnil; }
-static VALUE _wrap_FXWindow_grabbed(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_grabbed(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->grabbed();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->grabbed();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXWindow_grabKeyboard(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -6137,86 +6411,77 @@ static VALUE _wrap_FXWindow_grabKeyboard(int argc, VALUE *argv, VALUE self) { FX
 static VALUE _wrap_FXWindow_ungrabKeyboard(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); (arg1)->ungrabKeyboard(); return Qnil; }
-static VALUE _wrap_FXWindow_grabbedKeyboard(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1);
-    result = (FXbool)((FXWindow const *)arg1)->grabbedKeyboard(); vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXWindow_shown(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_grabbedKeyboard(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->shown();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->grabbedKeyboard();
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXWindow_underCursor(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_shown(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->underCursor();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->shown();
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXWindow_hasSelection(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_underCursor(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->hasSelection();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->underCursor();
+    vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXWindow_hasSelection(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->hasSelection();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXWindow_acquireSelection(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; VALUE arg2 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    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_FXWindow, 1); arg2 = argv[0];
-    result = (FXbool)FXWindow_acquireSelection(arg1,arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXWindow_releaseSelection(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)(arg1)->releaseSelection();
+    result = (bool)FXWindow_acquireSelection(arg1,arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXWindow_releaseSelection(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (bool)(arg1)->releaseSelection();
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXWindow_hasClipboard(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_hasClipboard(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->hasClipboard();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->hasClipboard();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXWindow_acquireClipboard(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; VALUE arg2 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    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_FXWindow, 1); arg2 = argv[0];
-    result = (FXbool)FXWindow_acquireClipboard(arg1,arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXWindow_releaseClipboard(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)(arg1)->releaseClipboard();
+    result = (bool)FXWindow_acquireClipboard(arg1,arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXWindow_releaseClipboard(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (bool)(arg1)->releaseClipboard();
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXWindow_dropEnable(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
-    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); (arg1)->dropEnable(); return Qnil; }
-static VALUE _wrap_FXWindow_dropDisable(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
-    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); (arg1)->dropDisable(); return Qnil; }
-static VALUE _wrap_FXWindow_isDropEnabled(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_isDropEnabled(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->isDropEnabled();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->isDropEnabled();
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXWindow_isDragging(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_isDragging(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->isDragging();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->isDragging();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXWindow_beginDrag(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; VALUE arg2 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
+    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_FXWindow, 1); arg2 = argv[0];
-    result = (FXbool)FXWindow_beginDrag(arg1,arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXWindow_beginDrag(arg1,arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXWindow_handleDrag(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXint arg2 ;
-    FXint arg3 ; int arg4 = (int) DRAG_COPY ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 3))
+    FXint arg3 ; int arg4 = (int) DRAG_COPY ; bool 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_FXWindow, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
-    if (argc > 2) { arg4 = (int) NUM2INT(argv[2]); }  result = (FXbool)(arg1)->handleDrag(arg2,arg3,(FXDragAction )arg4);
+    if (argc > 2) { arg4 = (int) NUM2INT(argv[2]); }  result = (bool)(arg1)->handleDrag(arg2,arg3,(FXDragAction )arg4);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXWindow_endDrag(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
-    FXbool arg2 = (FXbool) 1 ; int result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 1))
+    bool arg2 = (bool) true ; int 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_FXWindow, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); if (argc > 0) { arg2 = RTEST(argv[0]); } 
     result = (int)(arg1)->endDrag(arg2); vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXWindow_isDropTarget(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_isDropTarget(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)((FXWindow const *)arg1)->isDropTarget();
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)((FXWindow const *)arg1)->isDropTarget();
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXWindow_setDragRectangle(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXint arg2 ;
-    FXint arg3 ; FXint arg4 ; FXint arg5 ; FXbool arg6 = (FXbool) 1 ; if ((argc < 4) || (argc > 5))
+    FXint arg3 ; FXint arg4 ; FXint arg5 ; bool arg6 = (bool) true ; if ((argc < 4) || (argc > 5))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
-    arg4 = NUM2INT(argv[2]); arg5 = NUM2INT(argv[3]); if (argc > 4) { arg6 = to_FXbool(argv[4]); } 
+    arg4 = NUM2INT(argv[2]); arg5 = NUM2INT(argv[3]); if (argc > 4) { arg6 = RTEST(argv[4]); } 
     ((FXWindow const *)arg1)->setDragRectangle(arg2,arg3,arg4,arg5,arg6); return Qnil; }
 static VALUE _wrap_FXWindow_clearDragRectangle(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -6230,16 +6495,20 @@ static VALUE _wrap_FXWindow_didAccept(int argc, VALUE *argv, VALUE self) { FXWin
     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_FXWindow, 1); result = (int)((FXWindow const *)arg1)->didAccept();
     vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXWindow_dropFinished(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
+    int arg2 = (int) DRAG_REJECT ; if ((argc < 0) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); if (argc > 0) { arg2 = (int) NUM2INT(argv[0]); } 
+    ((FXWindow const *)arg1)->dropFinished((FXDragAction )arg2); return Qnil; }
 static VALUE _wrap_FXWindow_inquireDNDTypes(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; int arg2 ;
     VALUE 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_FXWindow, 1); arg2 = (int) NUM2INT(argv[0]);
     result = (VALUE)FXWindow_inquireDNDTypes((FXWindow const *)arg1,(FXDNDOrigin )arg2); vresult = result; return vresult; }
 static VALUE _wrap_FXWindow_offeredDNDType(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; int arg2 ;
-    FXDragType arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    FXDragType 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_FXWindow, 1); arg2 = (int) NUM2INT(argv[0]); arg3 = NUM2UINT(argv[1]);
-    result = (FXbool)((FXWindow const *)arg1)->offeredDNDType((FXDNDOrigin )arg2,arg3); vresult = result ? Qtrue : Qfalse;
+    result = (bool)((FXWindow const *)arg1)->offeredDNDType((FXDNDOrigin )arg2,arg3); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXWindow_inquireDNDAction(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; int result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -6318,9 +6587,9 @@ static VALUE _wrap_FXWindow_getHeightForWidth(int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); arg2 = NUM2INT(argv[0]);
     result = (FXint)FXWindow_getHeightForWidth(arg1,arg2); vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXWindow_canFocus(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_canFocus(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = (FXbool)FXWindow_canFocus((FXWindow const *)arg1);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)FXWindow_canFocus((FXWindow const *)arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXWindow_setFocus(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -6376,23 +6645,36 @@ static VALUE _wrap_FXWindow_show(int argc, VALUE *argv, VALUE self) { FXWindow *
 static VALUE _wrap_FXWindow_hide(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); FXWindow_hide(arg1); return Qnil; }
-static VALUE _wrap_FXWindow_isComposite(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+static VALUE _wrap_FXWindow_isComposite(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1);
-    result = (FXbool)FXWindow_isComposite((FXWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); result = (bool)FXWindow_isComposite((FXWindow const *)arg1);
+    vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXWindow_contains(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXint arg2 ;
-    FXint arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    FXint 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_FXWindow, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
-    result = (FXbool)FXWindow_contains((FXWindow const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXWindow_doesSaveUnder(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXbool result;
+    result = (bool)FXWindow_contains((FXWindow const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXWindow_doesSaveUnder(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1);
-    result = (FXbool)FXWindow_doesSaveUnder((FXWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXWindow_doesSaveUnder((FXWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXWindow_setBackColor(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXColor arg2 ;
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); arg2 = to_FXColor(argv[0]);
     FXWindow_setBackColor(arg1,arg2); return Qnil; }
+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]); } 
+    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 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); FXWindow_dropEnable(arg1); return Qnil; }
+static VALUE _wrap_FXWindow_dropDisable(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); FXWindow_dropDisable(arg1); return Qnil; }
 static VALUE _wrap_FXWindow_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
     FXRegion *arg2 = 0 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1);
@@ -6570,9 +6852,9 @@ static VALUE _wrap_FXFrame_getHeightForWidth(int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFrame, 1); arg2 = NUM2INT(argv[0]);
     result = (FXint)FXFrame_getHeightForWidth(arg1,arg2); vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXFrame_canFocus(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ; FXbool result;
+static VALUE _wrap_FXFrame_canFocus(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 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_FXFrame, 1); result = (FXbool)FXFrame_canFocus((FXFrame const *)arg1);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFrame, 1); result = (bool)FXFrame_canFocus((FXFrame const *)arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXFrame_setFocus(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -6628,23 +6910,36 @@ static VALUE _wrap_FXFrame_show(int argc, VALUE *argv, VALUE self) { FXFrame *ar
 static VALUE _wrap_FXFrame_hide(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFrame, 1); FXFrame_hide(arg1); return Qnil; }
-static VALUE _wrap_FXFrame_isComposite(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ; FXbool result;
+static VALUE _wrap_FXFrame_isComposite(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 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_FXFrame, 1); result = (FXbool)FXFrame_isComposite((FXFrame const *)arg1);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFrame, 1); result = (bool)FXFrame_isComposite((FXFrame const *)arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXFrame_contains(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ; FXint arg2 ;
-    FXint arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    FXint 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_FXFrame, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
-    result = (FXbool)FXFrame_contains((FXFrame const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXFrame_doesSaveUnder(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ; FXbool result;
+    result = (bool)FXFrame_contains((FXFrame const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXFrame_doesSaveUnder(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 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_FXFrame, 1);
-    result = (FXbool)FXFrame_doesSaveUnder((FXFrame const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFrame, 1); result = (bool)FXFrame_doesSaveUnder((FXFrame const *)arg1);
+    vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXFrame_setBackColor(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ; FXColor arg2 ;
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFrame, 1); arg2 = to_FXColor(argv[0]); FXFrame_setBackColor(arg1,arg2);
     return Qnil; }
+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]); } 
+    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 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFrame, 1); FXFrame_dropEnable(arg1); return Qnil; }
+static VALUE _wrap_FXFrame_dropDisable(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFrame, 1); FXFrame_dropDisable(arg1); return Qnil; }
 static VALUE _wrap_FXFrame_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ;
     FXRegion *arg2 = 0 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFrame, 1);
@@ -6785,10 +7080,10 @@ static VALUE _wrap_FXComposite_getHeightForWidth(int argc, VALUE *argv, VALUE se
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComposite, 1); arg2 = NUM2INT(argv[0]);
     result = (FXint)FXComposite_getHeightForWidth(arg1,arg2); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXComposite_canFocus(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXComposite, 1);
-    result = (FXbool)FXComposite_canFocus((FXComposite const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXComposite_canFocus((FXComposite const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXComposite_setFocus(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComposite, 1); FXComposite_setFocus(arg1); return Qnil; }
@@ -6844,25 +7139,38 @@ static VALUE _wrap_FXComposite_hide(int argc, VALUE *argv, VALUE self) { FXCompo
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComposite, 1); FXComposite_hide(arg1); return Qnil; }
 static VALUE _wrap_FXComposite_isComposite(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXComposite, 1);
-    result = (FXbool)FXComposite_isComposite((FXComposite const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXComposite_isComposite((FXComposite const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXComposite_contains(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
-    FXint arg2 ; FXint arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    FXint arg2 ; FXint 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_FXComposite, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
-    result = (FXbool)FXComposite_contains((FXComposite const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse;
+    result = (bool)FXComposite_contains((FXComposite const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXComposite_doesSaveUnder(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXComposite, 1);
-    result = (FXbool)FXComposite_doesSaveUnder((FXComposite const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXComposite_doesSaveUnder((FXComposite const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXComposite_setBackColor(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
     FXColor arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComposite, 1); arg2 = to_FXColor(argv[0]);
     FXComposite_setBackColor(arg1,arg2); return Qnil; }
+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]); } 
+    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 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComposite, 1); FXComposite_dropEnable(arg1); return Qnil; }
+static VALUE _wrap_FXComposite_dropDisable(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComposite, 1); FXComposite_dropDisable(arg1); return Qnil; }
 static VALUE _wrap_FXComposite_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
     FXRegion *arg2 = 0 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComposite, 1);
@@ -6962,10 +7270,10 @@ static VALUE _wrap_FXRootWindow_getHeightForWidth(int argc, VALUE *argv, VALUE s
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRootWindow, 1); arg2 = NUM2INT(argv[0]);
     result = (FXint)FXRootWindow_getHeightForWidth(arg1,arg2); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXRootWindow_canFocus(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXRootWindow, 1);
-    result = (FXbool)FXRootWindow_canFocus((FXRootWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXRootWindow_canFocus((FXRootWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXRootWindow_setFocus(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRootWindow, 1); FXRootWindow_setFocus(arg1); return Qnil; }
@@ -7021,25 +7329,38 @@ static VALUE _wrap_FXRootWindow_hide(int argc, VALUE *argv, VALUE self) { FXRoot
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRootWindow, 1); FXRootWindow_hide(arg1); return Qnil; }
 static VALUE _wrap_FXRootWindow_isComposite(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXRootWindow, 1);
-    result = (FXbool)FXRootWindow_isComposite((FXRootWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXRootWindow_isComposite((FXRootWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXRootWindow_contains(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 0 ;
-    FXint arg2 ; FXint arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    FXint arg2 ; FXint 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_FXRootWindow, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
-    result = (FXbool)FXRootWindow_contains((FXRootWindow const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse;
+    result = (bool)FXRootWindow_contains((FXRootWindow const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXRootWindow_doesSaveUnder(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXRootWindow, 1);
-    result = (FXbool)FXRootWindow_doesSaveUnder((FXRootWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXRootWindow_doesSaveUnder((FXRootWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXRootWindow_setBackColor(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 0 ;
     FXColor arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRootWindow, 1); arg2 = to_FXColor(argv[0]);
     FXRootWindow_setBackColor(arg1,arg2); return Qnil; }
+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]); } 
+    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 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRootWindow, 1); FXRootWindow_dropEnable(arg1); return Qnil; }
+static VALUE _wrap_FXRootWindow_dropDisable(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRootWindow, 1); FXRootWindow_dropDisable(arg1); return Qnil; }
 static VALUE _wrap_FXRootWindow_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 0 ;
     FXRegion *arg2 = 0 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRootWindow, 1);
@@ -7198,9 +7519,9 @@ static VALUE _wrap_FXShell_getHeightForWidth(int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShell, 1); arg2 = NUM2INT(argv[0]);
     result = (FXint)FXShell_getHeightForWidth(arg1,arg2); vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXShell_canFocus(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ; FXbool result;
+static VALUE _wrap_FXShell_canFocus(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 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_FXShell, 1); result = (FXbool)FXShell_canFocus((FXShell const *)arg1);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShell, 1); result = (bool)FXShell_canFocus((FXShell const *)arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXShell_setFocus(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -7256,23 +7577,36 @@ static VALUE _wrap_FXShell_show(int argc, VALUE *argv, VALUE self) { FXShell *ar
 static VALUE _wrap_FXShell_hide(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShell, 1); FXShell_hide(arg1); return Qnil; }
-static VALUE _wrap_FXShell_isComposite(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ; FXbool result;
+static VALUE _wrap_FXShell_isComposite(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 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_FXShell, 1); result = (FXbool)FXShell_isComposite((FXShell const *)arg1);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShell, 1); result = (bool)FXShell_isComposite((FXShell const *)arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXShell_contains(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ; FXint arg2 ;
-    FXint arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    FXint 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_FXShell, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
-    result = (FXbool)FXShell_contains((FXShell const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXShell_doesSaveUnder(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ; FXbool result;
+    result = (bool)FXShell_contains((FXShell const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXShell_doesSaveUnder(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 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_FXShell, 1);
-    result = (FXbool)FXShell_doesSaveUnder((FXShell const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShell, 1); result = (bool)FXShell_doesSaveUnder((FXShell const *)arg1);
+    vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXShell_setBackColor(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ; FXColor arg2 ;
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShell, 1); arg2 = to_FXColor(argv[0]); FXShell_setBackColor(arg1,arg2);
     return Qnil; }
+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]); } 
+    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 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShell, 1); FXShell_dropEnable(arg1); return Qnil; }
+static VALUE _wrap_FXShell_dropDisable(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShell, 1); FXShell_dropDisable(arg1); return Qnil; }
 static VALUE _wrap_FXShell_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ;
     FXRegion *arg2 = 0 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShell, 1);
@@ -7553,9 +7887,9 @@ static VALUE _wrap_FXPopup_getHeightForWidth(int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPopup, 1); arg2 = NUM2INT(argv[0]);
     result = (FXint)FXPopup_getHeightForWidth(arg1,arg2); vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXPopup_canFocus(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ; FXbool result;
+static VALUE _wrap_FXPopup_canFocus(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 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_FXPopup, 1); result = (FXbool)FXPopup_canFocus((FXPopup const *)arg1);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPopup, 1); result = (bool)FXPopup_canFocus((FXPopup const *)arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXPopup_setFocus(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -7611,23 +7945,36 @@ static VALUE _wrap_FXPopup_show(int argc, VALUE *argv, VALUE self) { FXPopup *ar
 static VALUE _wrap_FXPopup_hide(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPopup, 1); FXPopup_hide(arg1); return Qnil; }
-static VALUE _wrap_FXPopup_isComposite(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ; FXbool result;
+static VALUE _wrap_FXPopup_isComposite(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 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_FXPopup, 1); result = (FXbool)FXPopup_isComposite((FXPopup const *)arg1);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPopup, 1); result = (bool)FXPopup_isComposite((FXPopup const *)arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXPopup_contains(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ; FXint arg2 ;
-    FXint arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    FXint 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_FXPopup, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
-    result = (FXbool)FXPopup_contains((FXPopup const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXPopup_doesSaveUnder(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ; FXbool result;
+    result = (bool)FXPopup_contains((FXPopup const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXPopup_doesSaveUnder(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 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_FXPopup, 1);
-    result = (FXbool)FXPopup_doesSaveUnder((FXPopup const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPopup, 1); result = (bool)FXPopup_doesSaveUnder((FXPopup const *)arg1);
+    vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXPopup_setBackColor(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ; FXColor arg2 ;
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPopup, 1); arg2 = to_FXColor(argv[0]); FXPopup_setBackColor(arg1,arg2);
     return Qnil; }
+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]); } 
+    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 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPopup, 1); FXPopup_dropEnable(arg1); return Qnil; }
+static VALUE _wrap_FXPopup_dropDisable(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPopup, 1); FXPopup_dropDisable(arg1); return Qnil; }
 static VALUE _wrap_FXPopup_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ;
     FXRegion *arg2 = 0 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPopup, 1);
@@ -7695,6 +8042,18 @@ static VALUE _wrap_FXTopWindow_onFocusRight(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTopWindow, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = to_FXEvent(argv[2]);
     result = (long)(arg1)->onFocusRight(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXTopWindow_onSessionNotify(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
+    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long 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_FXTopWindow, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = to_FXEvent(argv[2]);
+    result = (long)(arg1)->onSessionNotify(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXTopWindow_onSessionClosed(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
+    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long 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_FXTopWindow, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = to_FXEvent(argv[2]);
+    result = (long)(arg1)->onSessionClosed(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXTopWindow_onCmdMaximize(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
     FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
     if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
@@ -8010,10 +8369,10 @@ static VALUE _wrap_FXTopWindow_getHeightForWidth(int argc, VALUE *argv, VALUE se
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTopWindow, 1); arg2 = NUM2INT(argv[0]);
     result = (FXint)FXTopWindow_getHeightForWidth(arg1,arg2); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXTopWindow_canFocus(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXTopWindow, 1);
-    result = (FXbool)FXTopWindow_canFocus((FXTopWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXTopWindow_canFocus((FXTopWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXTopWindow_setFocus(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTopWindow, 1); FXTopWindow_setFocus(arg1); return Qnil; }
@@ -8069,25 +8428,38 @@ static VALUE _wrap_FXTopWindow_hide(int argc, VALUE *argv, VALUE self) { FXTopWi
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTopWindow, 1); FXTopWindow_hide(arg1); return Qnil; }
 static VALUE _wrap_FXTopWindow_isComposite(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXTopWindow, 1);
-    result = (FXbool)FXTopWindow_isComposite((FXTopWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXTopWindow_isComposite((FXTopWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXTopWindow_contains(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
-    FXint arg2 ; FXint arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    FXint arg2 ; FXint 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_FXTopWindow, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
-    result = (FXbool)FXTopWindow_contains((FXTopWindow const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse;
+    result = (bool)FXTopWindow_contains((FXTopWindow const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXTopWindow_doesSaveUnder(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXTopWindow, 1);
-    result = (FXbool)FXTopWindow_doesSaveUnder((FXTopWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXTopWindow_doesSaveUnder((FXTopWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXTopWindow_setBackColor(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
     FXColor arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTopWindow, 1); arg2 = to_FXColor(argv[0]);
     FXTopWindow_setBackColor(arg1,arg2); return Qnil; }
+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]); } 
+    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 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTopWindow, 1); FXTopWindow_dropEnable(arg1); return Qnil; }
+static VALUE _wrap_FXTopWindow_dropDisable(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTopWindow, 1); FXTopWindow_dropDisable(arg1); return Qnil; }
 static VALUE _wrap_FXTopWindow_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
     FXRegion *arg2 = 0 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTopWindow, 1);
@@ -8230,10 +8602,10 @@ static VALUE _wrap_FXMainWindow_getHeightForWidth(int argc, VALUE *argv, VALUE s
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMainWindow, 1); arg2 = NUM2INT(argv[0]);
     result = (FXint)FXMainWindow_getHeightForWidth(arg1,arg2); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXMainWindow_canFocus(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXMainWindow, 1);
-    result = (FXbool)FXMainWindow_canFocus((FXMainWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXMainWindow_canFocus((FXMainWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXMainWindow_setFocus(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMainWindow, 1); FXMainWindow_setFocus(arg1); return Qnil; }
@@ -8289,25 +8661,38 @@ static VALUE _wrap_FXMainWindow_hide(int argc, VALUE *argv, VALUE self) { FXMain
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMainWindow, 1); FXMainWindow_hide(arg1); return Qnil; }
 static VALUE _wrap_FXMainWindow_isComposite(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXMainWindow, 1);
-    result = (FXbool)FXMainWindow_isComposite((FXMainWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXMainWindow_isComposite((FXMainWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXMainWindow_contains(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 0 ;
-    FXint arg2 ; FXint arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    FXint arg2 ; FXint 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_FXMainWindow, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
-    result = (FXbool)FXMainWindow_contains((FXMainWindow const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse;
+    result = (bool)FXMainWindow_contains((FXMainWindow const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXMainWindow_doesSaveUnder(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXMainWindow, 1);
-    result = (FXbool)FXMainWindow_doesSaveUnder((FXMainWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXMainWindow_doesSaveUnder((FXMainWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXMainWindow_setBackColor(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 0 ;
     FXColor arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMainWindow, 1); arg2 = to_FXColor(argv[0]);
     FXMainWindow_setBackColor(arg1,arg2); return Qnil; }
+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]); } 
+    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 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMainWindow, 1); FXMainWindow_dropEnable(arg1); return Qnil; }
+static VALUE _wrap_FXMainWindow_dropDisable(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMainWindow, 1); FXMainWindow_dropDisable(arg1); return Qnil; }
 static VALUE _wrap_FXMainWindow_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 0 ;
     FXRegion *arg2 = 0 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMainWindow, 1);
@@ -8494,10 +8879,10 @@ static VALUE _wrap_FXSplashWindow_getHeightForWidth(int argc, VALUE *argv, VALUE
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSplashWindow, 1); arg2 = NUM2INT(argv[0]);
     result = (FXint)FXSplashWindow_getHeightForWidth(arg1,arg2); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXSplashWindow_canFocus(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXSplashWindow, 1);
-    result = (FXbool)FXSplashWindow_canFocus((FXSplashWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+    result = (bool)FXSplashWindow_canFocus((FXSplashWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXSplashWindow_setFocus(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSplashWindow, 1); FXSplashWindow_setFocus(arg1); return Qnil; }
@@ -8554,28 +8939,40 @@ static VALUE _wrap_FXSplashWindow_hide(int argc, VALUE *argv, VALUE self) { FXSp
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSplashWindow, 1); FXSplashWindow_hide(arg1); return Qnil; }
 static VALUE _wrap_FXSplashWindow_isComposite(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
-    FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXSplashWindow, 1);
-    result = (FXbool)FXSplashWindow_isComposite((FXSplashWindow const *)arg1); vresult = result ? Qtrue : Qfalse;
-    return vresult; }
+    result = (bool)FXSplashWindow_isComposite((FXSplashWindow const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXSplashWindow_contains(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
-    FXint arg2 ; FXint arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    FXint arg2 ; FXint 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_FXSplashWindow, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
-    result = (FXbool)FXSplashWindow_contains((FXSplashWindow const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse;
+    result = (bool)FXSplashWindow_contains((FXSplashWindow const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXSplashWindow_doesSaveUnder(int argc, VALUE *argv, VALUE self) {
-    FXSplashWindow *arg1 = (FXSplashWindow *) 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXSplashWindow *arg1 = (FXSplashWindow *) 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_FXSplashWindow, 1);
-    result = (FXbool)FXSplashWindow_doesSaveUnder((FXSplashWindow const *)arg1); vresult = result ? Qtrue : Qfalse;
+    result = (bool)FXSplashWindow_doesSaveUnder((FXSplashWindow const *)arg1); vresult = result ? Qtrue : Qfalse;
     return vresult; }
 static VALUE _wrap_FXSplashWindow_setBackColor(int argc, VALUE *argv, VALUE self) {
     FXSplashWindow *arg1 = (FXSplashWindow *) 0 ; FXColor arg2 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSplashWindow, 1); arg2 = to_FXColor(argv[0]);
     FXSplashWindow_setBackColor(arg1,arg2); return Qnil; }
+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]); } 
+    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 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSplashWindow, 1); FXSplashWindow_dropEnable(arg1); return Qnil; }
+static VALUE _wrap_FXSplashWindow_dropDisable(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSplashWindow, 1); FXSplashWindow_dropDisable(arg1); return Qnil; }
 static VALUE _wrap_FXSplashWindow_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
     FXSplashWindow *arg1 = (FXSplashWindow *) 0 ; FXRegion *arg2 = 0 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
@@ -8713,6 +9110,30 @@ static void *_p_FXMainWindowTo_p_FXTopWindow(void *x) {
 static void *_p_FXSplashWindowTo_p_FXTopWindow(void *x) {
     return (void *)((FXTopWindow *)  ((FXSplashWindow *) x));
 }
+static void *_p_p_FXCompositeTo_p_p_FXWindow(void *x) {
+    return (void *)((FXWindow **)  ((FXComposite **) x));
+}
+static void *_p_p_FXShellTo_p_p_FXWindow(void *x) {
+    return (void *)((FXWindow **) (FXComposite *) ((FXShell **) x));
+}
+static void *_p_p_FXRootWindowTo_p_p_FXWindow(void *x) {
+    return (void *)((FXWindow **) (FXComposite *) ((FXRootWindow **) x));
+}
+static void *_p_p_FXPopupTo_p_p_FXWindow(void *x) {
+    return (void *)((FXWindow **) (FXComposite *)(FXShell *) ((FXPopup **) x));
+}
+static void *_p_p_FXTopWindowTo_p_p_FXWindow(void *x) {
+    return (void *)((FXWindow **) (FXComposite *)(FXShell *) ((FXTopWindow **) x));
+}
+static void *_p_p_FXMainWindowTo_p_p_FXWindow(void *x) {
+    return (void *)((FXWindow **) (FXComposite *)(FXShell *)(FXTopWindow *) ((FXMainWindow **) x));
+}
+static void *_p_p_FXSplashWindowTo_p_p_FXWindow(void *x) {
+    return (void *)((FXWindow **) (FXComposite *)(FXShell *)(FXTopWindow *) ((FXSplashWindow **) x));
+}
+static void *_p_p_FXFrameTo_p_p_FXWindow(void *x) {
+    return (void *)((FXWindow **)  ((FXFrame **) x));
+}
 static void *_p_FXFrameTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *) ((FXFrame *) x));
 }
@@ -8800,6 +9221,9 @@ static void *_p_FXDebugTargetTo_p_FXObject(void *x) {
 static void *_p_FXDataTargetTo_p_FXObject(void *x) {
     return (void *)((FXObject *)  ((FXDataTarget *) x));
 }
+static void *_p_FXTranslatorTo_p_FXObject(void *x) {
+    return (void *)((FXObject *)  ((FXTranslator *) x));
+}
 static void *_p_FXCompositeTo_p_FXDrawable(void *x) {
     return (void *)((FXDrawable *) (FXWindow *) ((FXComposite *) x));
 }
@@ -8910,6 +9334,8 @@ static swig_type_info _swigt__p_FXId[] = {{"_p_FXId", 0, "FXId *", 0, 0, 0, 0},{
 static swig_type_info _swigt__p_FXIconDict[] = {{"_p_FXIconDict", 0, "FXIconDict *", 0, 0, 0, 0},{"_p_FXIconDict", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXShell[] = {{"_p_FXShell", 0, "FXShell *", 0, 0, 0, 0},{"_p_FXShell", 0, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXShell, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXShell, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXShell, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXShell, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXPopup[] = {{"_p_FXPopup", 0, "FXPopup *", 0, 0, 0, 0},{"_p_FXPopup", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXTimer[] = {{"_p_FXTimer", 0, "FXTimer *", 0, 0, 0, 0},{"_p_FXTimer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_p_FXWindow[] = {{"_p_p_FXWindow", 0, "FXWindow **", 0, 0, 0, 0},{"_p_p_FXComposite", _p_p_FXCompositeTo_p_p_FXWindow, 0, 0, 0, 0, 0},{"_p_p_FXShell", _p_p_FXShellTo_p_p_FXWindow, 0, 0, 0, 0, 0},{"_p_p_FXWindow", 0, 0, 0, 0, 0, 0},{"_p_p_FXRootWindow", _p_p_FXRootWindowTo_p_p_FXWindow, 0, 0, 0, 0, 0},{"_p_p_FXPopup", _p_p_FXPopupTo_p_p_FXWindow, 0, 0, 0, 0, 0},{"_p_p_FXTopWindow", _p_p_FXTopWindowTo_p_p_FXWindow, 0, 0, 0, 0, 0},{"_p_p_FXMainWindow", _p_p_FXMainWindowTo_p_p_FXWindow, 0, 0, 0, 0, 0},{"_p_p_FXSplashWindow", _p_p_FXSplashWindowTo_p_p_FXWindow, 0, 0, 0, 0, 0},{"_p_p_FXFrame", _p_p_FXFrameTo_p_p_FXWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXRootWindow[] = {{"_p_FXRootWindow", 0, "FXRootWindow *", 0, 0, 0, 0},{"_p_FXRootWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXWindow[] = {{"_p_FXWindow", 0, "FXWindow *", 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXWindow", 0, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXTopWindow[] = {{"_p_FXTopWindow", 0, "FXTopWindow *", 0, 0, 0, 0},{"_p_FXTopWindow", 0, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXTopWindow, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXTopWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -8923,29 +9349,33 @@ static swig_type_info _swigt__p_FXID[] = {{"_p_FXID", 0, "FXID *", 0, 0, 0, 0},{
 static swig_type_info _swigt__p_FXMutex[] = {{"_p_FXMutex", 0, "FXMutex *", 0, 0, 0, 0},{"_p_FXMutex", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXEvent[] = {{"_p_FXEvent", 0, "FXEvent *", 0, 0, 0, 0},{"_p_FXEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXIconSource[] = {{"_p_FXIconSource", 0, "FXIconSource *", 0, 0, 0, 0},{"_p_FXIconSource", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXObject[] = {{"_p_FXObject", 0, "FXObject *", 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXObject", 0, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXAccelTable", _p_FXAccelTableTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDict", _p_FXDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXIconDict", _p_FXIconDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFileDict", _p_FXFileDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXId", _p_FXIdTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFont", _p_FXFontTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXStringDict", _p_FXStringDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRegistry", _p_FXRegistryTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXCursor", _p_FXCursorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXGIFCursor", _p_FXGIFCursorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDrawable", _p_FXDrawableTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDelegator", _p_FXDelegatorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSettings", _p_FXSettingsTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXVisual", _p_FXVisualTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXApp", _p_FXAppTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDocument", _p_FXDocumentTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRecentFiles", _p_FXRecentFilesTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDebugTarget", _p_FXDebugTargetTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDataTarget", _p_FXDataTargetTo_p_FXObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXObject[] = {{"_p_FXObject", 0, "FXObject *", 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXObject", 0, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXAccelTable", _p_FXAccelTableTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDict", _p_FXDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXIconDict", _p_FXIconDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFileDict", _p_FXFileDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXId", _p_FXIdTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFont", _p_FXFontTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXStringDict", _p_FXStringDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRegistry", _p_FXRegistryTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXCursor", _p_FXCursorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXGIFCursor", _p_FXGIFCursorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDrawable", _p_FXDrawableTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDelegator", _p_FXDelegatorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSettings", _p_FXSettingsTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXVisual", _p_FXVisualTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXApp", _p_FXAppTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDocument", _p_FXDocumentTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRecentFiles", _p_FXRecentFilesTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDebugTarget", _p_FXDebugTargetTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDataTarget", _p_FXDataTargetTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXTranslator", _p_FXTranslatorTo_p_FXObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXStringDict[] = {{"_p_FXStringDict", 0, "FXStringDict *", 0, 0, 0, 0},{"_p_FXStringDict", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXBitmap[] = {{"_p_FXBitmap", 0, "FXBitmap *", 0, 0, 0, 0},{"_p_FXBitmap", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXRectangle[] = {{"_p_FXRectangle", 0, "FXRectangle *", 0, 0, 0, 0},{"_p_FXRectangle", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXString[] = {{"_p_FXString", 0, "FXString *", 0, 0, 0, 0},{"_p_FXString", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXTextCodec[] = {{"_p_FXTextCodec", 0, "FXTextCodec *", 0, 0, 0, 0},{"_p_FXTextCodec", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXComposeContext[] = {{"_p_FXComposeContext", 0, "FXComposeContext *", 0, 0, 0, 0},{"_p_FXComposeContext", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXPoint[] = {{"_p_FXPoint", 0, "FXPoint *", 0, 0, 0, 0},{"_p_FXPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXFileDict[] = {{"_p_FXFileDict", 0, "FXFileDict *", 0, 0, 0, 0},{"_p_FXFileDict", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXDebugTarget[] = {{"_p_FXDebugTarget", 0, "FXDebugTarget *", 0, 0, 0, 0},{"_p_FXDebugTarget", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXDataTarget[] = {{"_p_FXDataTarget", 0, "FXDataTarget *", 0, 0, 0, 0},{"_p_FXDataTarget", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXDelegator[] = {{"_p_FXDelegator", 0, "FXDelegator *", 0, 0, 0, 0},{"_p_FXDelegator", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXDebugTarget[] = {{"_p_FXDebugTarget", 0, "FXDebugTarget *", 0, 0, 0, 0},{"_p_FXDebugTarget", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable *", 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDrawable", 0, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXCursor[] = {{"_p_FXCursor", 0, "FXCursor *", 0, 0, 0, 0},{"_p_FXCursor", 0, 0, 0, 0, 0, 0},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXCursor, 0, 0, 0, 0, 0},{"_p_FXGIFCursor", _p_FXGIFCursorTo_p_FXCursor, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXDelegator[] = {{"_p_FXDelegator", 0, "FXDelegator *", 0, 0, 0, 0},{"_p_FXDelegator", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXCURCursor[] = {{"_p_FXCURCursor", 0, "FXCURCursor *", 0, 0, 0, 0},{"_p_FXCURCursor", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXGIFCursor[] = {{"_p_FXGIFCursor", 0, "FXGIFCursor *", 0, 0, 0, 0},{"_p_FXGIFCursor", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXTranslator[] = {{"_p_FXTranslator", 0, "FXTranslator *", 0, 0, 0, 0},{"_p_FXTranslator", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *", 0, 0, 0, 0},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream, 0, 0, 0, 0, 0},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream, 0, 0, 0, 0, 0},{"_p_FXStream", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXFontDesc[] = {{"_p_FXFontDesc", 0, "FXFontDesc *", 0, 0, 0, 0},{"_p_FXFontDesc", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXApp[] = {{"_p_FXApp", 0, "FXApp *", 0, 0, 0, 0},{"_p_FXApp", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXChore[] = {{"_p_FXChore", 0, "FXChore *", 0, 0, 0, 0},{"_p_FXChore", 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}};
 static swig_type_info _swigt__p_FXColor[] = {{"_p_FXColor", 0, "unsigned int const *|FXColor const *", 0, 0, 0, 0},{"_p_FXuint", 0, 0, 0, 0, 0, 0},{"_p_FXColor", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXSize[] = {{"_p_FXSize", 0, "FXSize *", 0, 0, 0, 0},{"_p_FXSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_p_FXchar[] = {{"_p_p_FXchar", 0, "char const *const *|FXchar const *const *", 0, 0, 0, 0},{"_p_p_FXchar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXFont[] = {{"_p_FXFont", 0, "FXFont *", 0, 0, 0, 0},{"_p_FXFont", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXchar[] = {{"_p_FXchar", 0, "char [104]|FXchar [104]", 0, 0, 0, 0},{"_p_FXchar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXchar[] = {{"_p_FXchar", 0, "char [116]|FXchar [116]", 0, 0, 0, 0},{"_p_FXchar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXFrame[] = {{"_p_FXFrame", 0, "FXFrame *", 0, 0, 0, 0},{"_p_FXFrame", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXFileAssoc[] = {{"_p_FXFileAssoc", 0, "FXFileAssoc *", 0, 0, 0, 0},{"_p_FXFileAssoc", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXVisual[] = {{"_p_FXVisual", 0, "FXVisual *", 0, 0, 0, 0},{"_p_FXVisual", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -8965,6 +9395,8 @@ _swigt__p_FXId,
 _swigt__p_FXIconDict, 
 _swigt__p_FXShell, 
 _swigt__p_FXPopup, 
+_swigt__p_FXTimer, 
+_swigt__p_p_FXWindow, 
 _swigt__p_FXRootWindow, 
 _swigt__p_FXWindow, 
 _swigt__p_FXTopWindow, 
@@ -8983,18 +9415,22 @@ _swigt__p_FXStringDict,
 _swigt__p_FXBitmap, 
 _swigt__p_FXRectangle, 
 _swigt__p_FXString, 
+_swigt__p_FXTextCodec, 
+_swigt__p_FXComposeContext, 
 _swigt__p_FXPoint, 
 _swigt__p_FXFileDict, 
-_swigt__p_FXDebugTarget, 
 _swigt__p_FXDataTarget, 
-_swigt__p_FXDelegator, 
+_swigt__p_FXDebugTarget, 
 _swigt__p_FXDrawable, 
 _swigt__p_FXCursor, 
+_swigt__p_FXDelegator, 
 _swigt__p_FXCURCursor, 
 _swigt__p_FXGIFCursor, 
+_swigt__p_FXTranslator, 
 _swigt__p_FXStream, 
 _swigt__p_FXFontDesc, 
 _swigt__p_FXApp, 
+_swigt__p_FXChore, 
 _swigt__p_FXRegion, 
 _swigt__p_FXColor, 
 _swigt__p_FXSize, 
@@ -9110,6 +9546,10 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_const(mFox,"SEL_PICKED", INT2NUM(SEL_PICKED));
     rb_define_const(mFox,"SEL_QUERY_TIP", INT2NUM(SEL_QUERY_TIP));
     rb_define_const(mFox,"SEL_QUERY_HELP", INT2NUM(SEL_QUERY_HELP));
+    rb_define_const(mFox,"SEL_DOCKED", INT2NUM(SEL_DOCKED));
+    rb_define_const(mFox,"SEL_FLOATED", INT2NUM(SEL_FLOATED));
+    rb_define_const(mFox,"SEL_SESSION_NOTIFY", INT2NUM(SEL_SESSION_NOTIFY));
+    rb_define_const(mFox,"SEL_SESSION_CLOSED", INT2NUM(SEL_SESSION_CLOSED));
     rb_define_const(mFox,"SEL_LAST", INT2NUM(SEL_LAST));
     rb_define_const(mFox,"SHIFTMASK", INT2NUM(SHIFTMASK));
     rb_define_const(mFox,"CAPSLOCKMASK", INT2NUM(CAPSLOCKMASK));
@@ -9178,10 +9618,6 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_module_function(mFox, "fxversion", VALUEFUNC(_wrap_fxversion), -1);
     rb_define_singleton_method(mFox, "fxTraceLevel", VALUEFUNC(fxTraceLevel_get), 0);
     rb_define_singleton_method(mFox, "fxTraceLevel=", VALUEFUNC(fxTraceLevel_set), 1);
-    rb_define_module_function(mFox, "fxparseAccel", VALUEFUNC(_wrap_fxparseAccel), -1);
-    rb_define_module_function(mFox, "fxparseHotKey", VALUEFUNC(_wrap_fxparseHotKey), -1);
-    rb_define_module_function(mFox, "fxfindHotKey", VALUEFUNC(_wrap_fxfindHotKey), -1);
-    rb_define_module_function(mFox, "fxstripHotKey", VALUEFUNC(_wrap_fxstripHotKey), -1);
     rb_define_const(mFox,"FXStreamDead", INT2NUM(FXStreamDead));
     rb_define_const(mFox,"FXStreamSave", INT2NUM(FXStreamSave));
     rb_define_const(mFox,"FXStreamLoad", INT2NUM(FXStreamLoad));
@@ -9251,8 +9687,11 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXSize.klass, "w", VALUEFUNC(_wrap_FXSize_w_get), -1);
     rb_define_method(cFXSize.klass, "h=", VALUEFUNC(_wrap_FXSize_h_set), -1);
     rb_define_method(cFXSize.klass, "h", VALUEFUNC(_wrap_FXSize_h_get), -1);
+    rb_define_method(cFXSize.klass, "empty?", VALUEFUNC(_wrap_FXSize_emptyq___), -1);
     rb_define_method(cFXSize.klass, "==", VALUEFUNC(_wrap_FXSize___eq__), -1);
     rb_define_method(cFXSize.klass, "-@", VALUEFUNC(_wrap_FXSize___neg__), -1);
+    rb_define_method(cFXSize.klass, "grow!", VALUEFUNC(_wrap_FXSize_growN___), -1);
+    rb_define_method(cFXSize.klass, "shrink!", VALUEFUNC(_wrap_FXSize_shrinkN___), -1);
     rb_define_method(cFXSize.klass, "+", VALUEFUNC(_wrap_FXSize___add__), -1);
     rb_define_method(cFXSize.klass, "-", VALUEFUNC(_wrap_FXSize___sub__), -1);
     rb_define_method(cFXSize.klass, "*", VALUEFUNC(_wrap_FXSize___mul__), -1);
@@ -9353,6 +9792,11 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXAccelTable.klass, "load", VALUEFUNC(_wrap_FXAccelTable_load), -1);
     cFXAccelTable.mark = (void (*)(void *)) FXRbAccelTable::markfunc;
     cFXAccelTable.destroy = (void (*)(void *)) FXRbObject::freefunc;
+    rb_define_module_function(mFox, "parseAccel", VALUEFUNC(_wrap_parseAccel), -1);
+    rb_define_module_function(mFox, "unparseAccel", VALUEFUNC(_wrap_unparseAccel), -1);
+    rb_define_module_function(mFox, "parseHotKey", VALUEFUNC(_wrap_parseHotKey), -1);
+    rb_define_module_function(mFox, "findHotKey", VALUEFUNC(_wrap_findHotKey), -1);
+    rb_define_module_function(mFox, "stripHotKey", VALUEFUNC(_wrap_stripHotKey), -1);
     rb_define_const(mFox,"INPUT_NONE", INT2NUM(INPUT_NONE));
     rb_define_const(mFox,"INPUT_READ", INT2NUM(INPUT_READ));
     rb_define_const(mFox,"INPUT_WRITE", INT2NUM(INPUT_WRITE));
@@ -9386,6 +9830,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_const(mFox,"DEF_HELP_CURSOR", INT2NUM(DEF_HELP_CURSOR));
     rb_define_const(mFox,"DEF_HAND_CURSOR", INT2NUM(DEF_HAND_CURSOR));
     rb_define_const(mFox,"DEF_ROTATE_CURSOR", INT2NUM(DEF_ROTATE_CURSOR));
+    rb_define_const(mFox,"DEF_WAIT_CURSOR", INT2NUM(DEF_WAIT_CURSOR));
     
     cFXEvent.klass = rb_define_class_under(mFox, "FXEvent", rb_cObject);
     SWIG_TypeClientData(SWIGTYPE_p_FXEvent, (void *) &cFXEvent);
@@ -9438,6 +9883,18 @@ SWIGEXPORT(void) Init_core(void) {
     cFXEvent.mark = 0;
     cFXEvent.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
     
+    cFXChore.klass = rb_define_class_under(mFox, "FXChore", rb_cObject);
+    SWIG_TypeClientData(SWIGTYPE_p_FXChore, (void *) &cFXChore);
+    rb_undef_alloc_func(cFXChore.klass);
+    cFXChore.mark = 0;
+    cFXChore.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
+    
+    cFXTimer.klass = rb_define_class_under(mFox, "FXTimer", rb_cObject);
+    SWIG_TypeClientData(SWIGTYPE_p_FXTimer, (void *) &cFXTimer);
+    rb_undef_alloc_func(cFXTimer.klass);
+    cFXTimer.mark = 0;
+    cFXTimer.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
+    
     cFXApp.klass = rb_define_class_under(mFox, "FXApp", ((swig_class *) SWIGTYPE_p_FXObject->clientdata)->klass);
     SWIG_TypeClientData(SWIGTYPE_p_FXApp, (void *) &cFXApp);
     rb_define_alloc_func(cFXApp.klass, _wrap_FXApp_allocate);
@@ -9458,24 +9915,26 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXApp.klass, "isInitialized", VALUEFUNC(_wrap_FXApp_isInitialized), -1);
     rb_define_method(cFXApp.klass, "getArgc", VALUEFUNC(_wrap_FXApp_getArgc), -1);
     rb_define_method(cFXApp.klass, "getArgv", VALUEFUNC(_wrap_FXApp_getArgv), -1);
+    rb_define_method(cFXApp.klass, "hasInputMethod?", VALUEFUNC(_wrap_FXApp_hasInputMethodq___), -1);
     rb_define_method(cFXApp.klass, "getDefaultVisual", VALUEFUNC(_wrap_FXApp_getDefaultVisual), -1);
     rb_define_method(cFXApp.klass, "setDefaultVisual", VALUEFUNC(_wrap_FXApp_setDefaultVisual), -1);
     rb_define_method(cFXApp.klass, "getMonoVisual", VALUEFUNC(_wrap_FXApp_getMonoVisual), -1);
     rb_define_method(cFXApp.klass, "getRootWindow", VALUEFUNC(_wrap_FXApp_getRootWindow), -1);
     rb_define_method(cFXApp.klass, "setRootWindow", VALUEFUNC(_wrap_FXApp_setRootWindow), -1);
+    rb_define_method(cFXApp.klass, "focusWindow", VALUEFUNC(_wrap_FXApp_focusWindow), -1);
     rb_define_method(cFXApp.klass, "getCursorWindow", VALUEFUNC(_wrap_FXApp_getCursorWindow), -1);
-    rb_define_method(cFXApp.klass, "getFocusWindow", VALUEFUNC(_wrap_FXApp_getFocusWindow), -1);
+    rb_define_method(cFXApp.klass, "activeWindow", VALUEFUNC(_wrap_FXApp_activeWindow), -1);
     rb_define_method(cFXApp.klass, "getPopupWindow", VALUEFUNC(_wrap_FXApp_getPopupWindow), -1);
     rb_define_method(cFXApp.klass, "findWindowWithId", VALUEFUNC(_wrap_FXApp_findWindowWithId), -1);
     rb_define_method(cFXApp.klass, "findWindowAt", VALUEFUNC(_wrap_FXApp_findWindowAt), -1);
     rb_define_method(cFXApp.klass, "addTimeout", VALUEFUNC(_wrap_FXApp_addTimeout), -1);
     rb_define_method(cFXApp.klass, "removeTimeout", VALUEFUNC(_wrap_FXApp_removeTimeout), -1);
-    rb_define_method(cFXApp.klass, "hasTimeout", VALUEFUNC(_wrap_FXApp_hasTimeout), -1);
+    rb_define_method(cFXApp.klass, "hasTimeout?", VALUEFUNC(_wrap_FXApp_hasTimeoutq___), -1);
     rb_define_method(cFXApp.klass, "remainingTimeout", VALUEFUNC(_wrap_FXApp_remainingTimeout), -1);
     rb_define_method(cFXApp.klass, "handleTimeouts", VALUEFUNC(_wrap_FXApp_handleTimeouts), -1);
     rb_define_method(cFXApp.klass, "addChore", VALUEFUNC(_wrap_FXApp_addChore), -1);
     rb_define_method(cFXApp.klass, "removeChore", VALUEFUNC(_wrap_FXApp_removeChore), -1);
-    rb_define_method(cFXApp.klass, "hasChore", VALUEFUNC(_wrap_FXApp_hasChore), -1);
+    rb_define_method(cFXApp.klass, "hasChore?", VALUEFUNC(_wrap_FXApp_hasChoreq___), -1);
     rb_define_method(cFXApp.klass, "addSignal", VALUEFUNC(_wrap_FXApp_addSignal), -1);
     rb_define_method(cFXApp.klass, "removeSignal", VALUEFUNC(_wrap_FXApp_removeSignal), -1);
     rb_define_method(cFXApp.klass, "addInput", VALUEFUNC(_wrap_FXApp_addInput), -1);
@@ -9514,7 +9973,11 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXApp.klass, "getWaitCursor", VALUEFUNC(_wrap_FXApp_getWaitCursor), -1);
     rb_define_method(cFXApp.klass, "getDefaultCursor", VALUEFUNC(_wrap_FXApp_getDefaultCursor), -1);
     rb_define_method(cFXApp.klass, "setDefaultCursor", VALUEFUNC(_wrap_FXApp_setDefaultCursor), -1);
+    rb_define_method(cFXApp.klass, "writeWindow", VALUEFUNC(_wrap_FXApp_writeWindow), -1);
+    rb_define_method(cFXApp.klass, "readWindow", VALUEFUNC(_wrap_FXApp_readWindow), -1);
     rb_define_method(cFXApp.klass, "mutex", VALUEFUNC(_wrap_FXApp_mutex), -1);
+    rb_define_method(cFXApp.klass, "setTranslator", VALUEFUNC(_wrap_FXApp_setTranslator), -1);
+    rb_define_method(cFXApp.klass, "getTranslator", VALUEFUNC(_wrap_FXApp_getTranslator), -1);
     rb_define_method(cFXApp.klass, "getTypingSpeed", VALUEFUNC(_wrap_FXApp_getTypingSpeed), -1);
     rb_define_method(cFXApp.klass, "getClickSpeed", VALUEFUNC(_wrap_FXApp_getClickSpeed), -1);
     rb_define_method(cFXApp.klass, "getScrollSpeed", VALUEFUNC(_wrap_FXApp_getScrollSpeed), -1);
@@ -9526,6 +9989,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXApp.klass, "getTooltipTime", VALUEFUNC(_wrap_FXApp_getTooltipTime), -1);
     rb_define_method(cFXApp.klass, "getDragDelta", VALUEFUNC(_wrap_FXApp_getDragDelta), -1);
     rb_define_method(cFXApp.klass, "getWheelLines", VALUEFUNC(_wrap_FXApp_getWheelLines), -1);
+    rb_define_method(cFXApp.klass, "scrollBarSize", VALUEFUNC(_wrap_FXApp_scrollBarSize), -1);
     rb_define_method(cFXApp.klass, "setTypingSpeed", VALUEFUNC(_wrap_FXApp_setTypingSpeed), -1);
     rb_define_method(cFXApp.klass, "setClickSpeed", VALUEFUNC(_wrap_FXApp_setClickSpeed), -1);
     rb_define_method(cFXApp.klass, "setScrollSpeed", VALUEFUNC(_wrap_FXApp_setScrollSpeed), -1);
@@ -9537,6 +10001,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXApp.klass, "setTooltipTime", VALUEFUNC(_wrap_FXApp_setTooltipTime), -1);
     rb_define_method(cFXApp.klass, "setDragDelta", VALUEFUNC(_wrap_FXApp_setDragDelta), -1);
     rb_define_method(cFXApp.klass, "setWheelLines", VALUEFUNC(_wrap_FXApp_setWheelLines), -1);
+    rb_define_method(cFXApp.klass, "scrollBarSize=", VALUEFUNC(_wrap_FXApp_scrollBarSizee___), -1);
     rb_define_method(cFXApp.klass, "getBorderColor", VALUEFUNC(_wrap_FXApp_getBorderColor), -1);
     rb_define_method(cFXApp.klass, "getBaseColor", VALUEFUNC(_wrap_FXApp_getBaseColor), -1);
     rb_define_method(cFXApp.klass, "getHiliteColor", VALUEFUNC(_wrap_FXApp_getHiliteColor), -1);
@@ -9562,6 +10027,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXApp.klass, "setSelMenuTextColor", VALUEFUNC(_wrap_FXApp_setSelMenuTextColor), -1);
     rb_define_method(cFXApp.klass, "setSelMenuBackColor", VALUEFUNC(_wrap_FXApp_setSelMenuBackColor), -1);
     rb_define_method(cFXApp.klass, "dumpWidgets", VALUEFUNC(_wrap_FXApp_dumpWidgets), -1);
+    rb_define_method(cFXApp.klass, "getWindowCount", VALUEFUNC(_wrap_FXApp_getWindowCount), -1);
     rb_define_method(cFXApp.klass, "save", VALUEFUNC(_wrap_FXApp_save), -1);
     rb_define_method(cFXApp.klass, "load", VALUEFUNC(_wrap_FXApp_load), -1);
     rb_define_method(cFXApp.klass, "create", VALUEFUNC(_wrap_FXApp_create), -1);
@@ -9634,6 +10100,19 @@ SWIGEXPORT(void) Init_core(void) {
     cFXDelegator.mark = (void (*)(void *)) FXRbDelegator::markfunc;
     cFXDelegator.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
+    cFXTranslator.klass = rb_define_class_under(mFox, "FXTranslator", ((swig_class *) SWIGTYPE_p_FXObject->clientdata)->klass);
+    SWIG_TypeClientData(SWIGTYPE_p_FXTranslator, (void *) &cFXTranslator);
+    rb_define_alloc_func(cFXTranslator.klass, _wrap_FXTranslator_allocate);
+    rb_define_method(cFXTranslator.klass, "initialize", VALUEFUNC(_wrap_new_FXTranslator), -1);
+    rb_define_method(cFXTranslator.klass, "getApp", VALUEFUNC(_wrap_FXTranslator_getApp), -1);
+    rb_define_method(cFXTranslator.klass, "setTextCodec", VALUEFUNC(_wrap_FXTranslator_setTextCodec), -1);
+    rb_define_method(cFXTranslator.klass, "getTextCodec", VALUEFUNC(_wrap_FXTranslator_getTextCodec), -1);
+    rb_define_method(cFXTranslator.klass, "save", VALUEFUNC(_wrap_FXTranslator_save), -1);
+    rb_define_method(cFXTranslator.klass, "load", VALUEFUNC(_wrap_FXTranslator_load), -1);
+    rb_define_method(cFXTranslator.klass, "tr", VALUEFUNC(_wrap_FXTranslator_tr), -1);
+    cFXTranslator.mark = 0;
+    cFXTranslator.destroy = (void (*)(void *)) FXRbObject::freefunc;
+    
     cFXDict.klass = rb_define_class_under(mFox, "FXDict", ((swig_class *) SWIGTYPE_p_FXObject->clientdata)->klass);
     SWIG_TypeClientData(SWIGTYPE_p_FXDict, (void *) &cFXDict);
     rb_define_alloc_func(cFXDict.klass, _wrap_FXDict_allocate);
@@ -9690,6 +10169,8 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_singleton_method(cFXFileDict.klass, "defaultExecBinding", VALUEFUNC(_wrap_FXFileDict_defaultExecBinding), -1);
     rb_define_singleton_method(cFXFileDict.klass, "defaultDirBinding", VALUEFUNC(_wrap_FXFileDict_defaultDirBinding), -1);
     rb_define_singleton_method(cFXFileDict.klass, "defaultFileBinding", VALUEFUNC(_wrap_FXFileDict_defaultFileBinding), -1);
+    rb_define_method(cFXFileDict.klass, "setSettings", VALUEFUNC(_wrap_FXFileDict_setSettings), -1);
+    rb_define_method(cFXFileDict.klass, "getSettings", VALUEFUNC(_wrap_FXFileDict_getSettings), -1);
     rb_define_method(cFXFileDict.klass, "setIconDict", VALUEFUNC(_wrap_FXFileDict_setIconDict), -1);
     rb_define_method(cFXFileDict.klass, "getIconDict", VALUEFUNC(_wrap_FXFileDict_getIconDict), -1);
     rb_define_method(cFXFileDict.klass, "setIconPath", VALUEFUNC(_wrap_FXFileDict_setIconPath), -1);
@@ -9697,7 +10178,6 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXFileDict.klass, "replace", VALUEFUNC(_wrap_FXFileDict_replace), -1);
     rb_define_method(cFXFileDict.klass, "remove", VALUEFUNC(_wrap_FXFileDict_remove), -1);
     rb_define_method(cFXFileDict.klass, "find", VALUEFUNC(_wrap_FXFileDict_find), -1);
-    rb_define_method(cFXFileDict.klass, "associate", VALUEFUNC(_wrap_FXFileDict_associate), -1);
     rb_define_method(cFXFileDict.klass, "save", VALUEFUNC(_wrap_FXFileDict_save), -1);
     rb_define_method(cFXFileDict.klass, "load", VALUEFUNC(_wrap_FXFileDict_load), -1);
     rb_define_method(cFXFileDict.klass, "findFileBinding", VALUEFUNC(_wrap_FXFileDict_findFileBinding), -1);
@@ -9748,11 +10228,13 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXSettings.klass, "readUnsignedEntry", VALUEFUNC(_wrap_FXSettings_readUnsignedEntry), -1);
     rb_define_method(cFXSettings.klass, "readRealEntry", VALUEFUNC(_wrap_FXSettings_readRealEntry), -1);
     rb_define_method(cFXSettings.klass, "readColorEntry", VALUEFUNC(_wrap_FXSettings_readColorEntry), -1);
+    rb_define_method(cFXSettings.klass, "readBoolEntry", VALUEFUNC(_wrap_FXSettings_readBoolEntry), -1);
     rb_define_method(cFXSettings.klass, "writeStringEntry", VALUEFUNC(_wrap_FXSettings_writeStringEntry), -1);
     rb_define_method(cFXSettings.klass, "writeIntEntry", VALUEFUNC(_wrap_FXSettings_writeIntEntry), -1);
     rb_define_method(cFXSettings.klass, "writeUnsignedEntry", VALUEFUNC(_wrap_FXSettings_writeUnsignedEntry), -1);
     rb_define_method(cFXSettings.klass, "writeRealEntry", VALUEFUNC(_wrap_FXSettings_writeRealEntry), -1);
     rb_define_method(cFXSettings.klass, "writeColorEntry", VALUEFUNC(_wrap_FXSettings_writeColorEntry), -1);
+    rb_define_method(cFXSettings.klass, "writeBoolEntry", VALUEFUNC(_wrap_FXSettings_writeBoolEntry), -1);
     rb_define_method(cFXSettings.klass, "deleteEntry", VALUEFUNC(_wrap_FXSettings_deleteEntry), -1);
     rb_define_method(cFXSettings.klass, "existingEntry", VALUEFUNC(_wrap_FXSettings_existingEntry), -1);
     rb_define_method(cFXSettings.klass, "deleteSection", VALUEFUNC(_wrap_FXSettings_deleteSection), -1);
@@ -9823,6 +10305,8 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_const(cFXRecentFiles.klass,"ID_FILE_8", INT2NUM(FXRecentFiles::ID_FILE_8));
     rb_define_const(cFXRecentFiles.klass,"ID_FILE_9", INT2NUM(FXRecentFiles::ID_FILE_9));
     rb_define_const(cFXRecentFiles.klass,"ID_FILE_10", INT2NUM(FXRecentFiles::ID_FILE_10));
+    rb_define_const(cFXRecentFiles.klass,"ID_LAST", INT2NUM(FXRecentFiles::ID_LAST));
+    rb_define_method(cFXRecentFiles.klass, "app", VALUEFUNC(_wrap_FXRecentFiles_app), -1);
     rb_define_method(cFXRecentFiles.klass, "setMaxFiles", VALUEFUNC(_wrap_FXRecentFiles_setMaxFiles), -1);
     rb_define_method(cFXRecentFiles.klass, "getMaxFiles", VALUEFUNC(_wrap_FXRecentFiles_getMaxFiles), -1);
     rb_define_method(cFXRecentFiles.klass, "setGroupName", VALUEFUNC(_wrap_FXRecentFiles_setGroupName), -1);
@@ -9988,25 +10472,6 @@ SWIGEXPORT(void) Init_core(void) {
     
     SWIGTYPE_p_FXVisual->dcast = (swig_dycast_func) FXVisual_dynamic_cast;
     
-    rb_define_const(mFox,"FONTPITCH_DEFAULT", INT2NUM(FONTPITCH_DEFAULT));
-    rb_define_const(mFox,"FONTPITCH_FIXED", INT2NUM(FONTPITCH_FIXED));
-    rb_define_const(mFox,"FONTPITCH_VARIABLE", INT2NUM(FONTPITCH_VARIABLE));
-    rb_define_const(mFox,"FONTHINT_DONTCARE", INT2NUM(FONTHINT_DONTCARE));
-    rb_define_const(mFox,"FONTHINT_DECORATIVE", INT2NUM(FONTHINT_DECORATIVE));
-    rb_define_const(mFox,"FONTHINT_MODERN", INT2NUM(FONTHINT_MODERN));
-    rb_define_const(mFox,"FONTHINT_ROMAN", INT2NUM(FONTHINT_ROMAN));
-    rb_define_const(mFox,"FONTHINT_SCRIPT", INT2NUM(FONTHINT_SCRIPT));
-    rb_define_const(mFox,"FONTHINT_SWISS", INT2NUM(FONTHINT_SWISS));
-    rb_define_const(mFox,"FONTHINT_SYSTEM", INT2NUM(FONTHINT_SYSTEM));
-    rb_define_const(mFox,"FONTHINT_X11", INT2NUM(FONTHINT_X11));
-    rb_define_const(mFox,"FONTHINT_SCALABLE", INT2NUM(FONTHINT_SCALABLE));
-    rb_define_const(mFox,"FONTHINT_POLYMORPHIC", INT2NUM(FONTHINT_POLYMORPHIC));
-    rb_define_const(mFox,"FONTSLANT_DONTCARE", INT2NUM(FONTSLANT_DONTCARE));
-    rb_define_const(mFox,"FONTSLANT_REGULAR", INT2NUM(FONTSLANT_REGULAR));
-    rb_define_const(mFox,"FONTSLANT_ITALIC", INT2NUM(FONTSLANT_ITALIC));
-    rb_define_const(mFox,"FONTSLANT_OBLIQUE", INT2NUM(FONTSLANT_OBLIQUE));
-    rb_define_const(mFox,"FONTSLANT_REVERSE_ITALIC", INT2NUM(FONTSLANT_REVERSE_ITALIC));
-    rb_define_const(mFox,"FONTSLANT_REVERSE_OBLIQUE", INT2NUM(FONTSLANT_REVERSE_OBLIQUE));
     rb_define_const(mFox,"FONTENCODING_DEFAULT", INT2NUM(FONTENCODING_DEFAULT));
     rb_define_const(mFox,"FONTENCODING_ISO_8859_1", INT2NUM(FONTENCODING_ISO_8859_1));
     rb_define_const(mFox,"FONTENCODING_ISO_8859_2", INT2NUM(FONTENCODING_ISO_8859_2));
@@ -10053,6 +10518,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_const(mFox,"FONTENCODING_CP1257", INT2NUM(FONTENCODING_CP1257));
     rb_define_const(mFox,"FONTENCODING_CP1258", INT2NUM(FONTENCODING_CP1258));
     rb_define_const(mFox,"FONTENCODING_CP874", INT2NUM(FONTENCODING_CP874));
+    rb_define_const(mFox,"FONTENCODING_UNICODE", INT2NUM(FONTENCODING_UNICODE));
     rb_define_const(mFox,"FONTENCODING_LATIN1", INT2NUM(FONTENCODING_LATIN1));
     rb_define_const(mFox,"FONTENCODING_LATIN2", INT2NUM(FONTENCODING_LATIN2));
     rb_define_const(mFox,"FONTENCODING_LATIN3", INT2NUM(FONTENCODING_LATIN3));
@@ -10078,33 +10544,6 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_const(mFox,"FONTENCODING_THAI", INT2NUM(FONTENCODING_THAI));
     rb_define_const(mFox,"FONTENCODING_BALTIC", INT2NUM(FONTENCODING_BALTIC));
     rb_define_const(mFox,"FONTENCODING_CELTIC", INT2NUM(FONTENCODING_CELTIC));
-    rb_define_const(mFox,"FONTWEIGHT_DONTCARE", INT2NUM(FONTWEIGHT_DONTCARE));
-    rb_define_const(mFox,"FONTWEIGHT_THIN", INT2NUM(FONTWEIGHT_THIN));
-    rb_define_const(mFox,"FONTWEIGHT_EXTRALIGHT", INT2NUM(FONTWEIGHT_EXTRALIGHT));
-    rb_define_const(mFox,"FONTWEIGHT_LIGHT", INT2NUM(FONTWEIGHT_LIGHT));
-    rb_define_const(mFox,"FONTWEIGHT_NORMAL", INT2NUM(FONTWEIGHT_NORMAL));
-    rb_define_const(mFox,"FONTWEIGHT_REGULAR", INT2NUM(FONTWEIGHT_REGULAR));
-    rb_define_const(mFox,"FONTWEIGHT_MEDIUM", INT2NUM(FONTWEIGHT_MEDIUM));
-    rb_define_const(mFox,"FONTWEIGHT_DEMIBOLD", INT2NUM(FONTWEIGHT_DEMIBOLD));
-    rb_define_const(mFox,"FONTWEIGHT_BOLD", INT2NUM(FONTWEIGHT_BOLD));
-    rb_define_const(mFox,"FONTWEIGHT_EXTRABOLD", INT2NUM(FONTWEIGHT_EXTRABOLD));
-    rb_define_const(mFox,"FONTWEIGHT_HEAVY", INT2NUM(FONTWEIGHT_HEAVY));
-    rb_define_const(mFox,"FONTWEIGHT_BLACK", INT2NUM(FONTWEIGHT_BLACK));
-    rb_define_const(mFox,"FONTSETWIDTH_DONTCARE", INT2NUM(FONTSETWIDTH_DONTCARE));
-    rb_define_const(mFox,"FONTSETWIDTH_ULTRACONDENSED", INT2NUM(FONTSETWIDTH_ULTRACONDENSED));
-    rb_define_const(mFox,"FONTSETWIDTH_EXTRACONDENSED", INT2NUM(FONTSETWIDTH_EXTRACONDENSED));
-    rb_define_const(mFox,"FONTSETWIDTH_CONDENSED", INT2NUM(FONTSETWIDTH_CONDENSED));
-    rb_define_const(mFox,"FONTSETWIDTH_NARROW", INT2NUM(FONTSETWIDTH_NARROW));
-    rb_define_const(mFox,"FONTSETWIDTH_COMPRESSED", INT2NUM(FONTSETWIDTH_COMPRESSED));
-    rb_define_const(mFox,"FONTSETWIDTH_SEMICONDENSED", INT2NUM(FONTSETWIDTH_SEMICONDENSED));
-    rb_define_const(mFox,"FONTSETWIDTH_MEDIUM", INT2NUM(FONTSETWIDTH_MEDIUM));
-    rb_define_const(mFox,"FONTSETWIDTH_NORMAL", INT2NUM(FONTSETWIDTH_NORMAL));
-    rb_define_const(mFox,"FONTSETWIDTH_REGULAR", INT2NUM(FONTSETWIDTH_REGULAR));
-    rb_define_const(mFox,"FONTSETWIDTH_SEMIEXPANDED", INT2NUM(FONTSETWIDTH_SEMIEXPANDED));
-    rb_define_const(mFox,"FONTSETWIDTH_EXPANDED", INT2NUM(FONTSETWIDTH_EXPANDED));
-    rb_define_const(mFox,"FONTSETWIDTH_WIDE", INT2NUM(FONTSETWIDTH_WIDE));
-    rb_define_const(mFox,"FONTSETWIDTH_EXTRAEXPANDED", INT2NUM(FONTSETWIDTH_EXTRAEXPANDED));
-    rb_define_const(mFox,"FONTSETWIDTH_ULTRAEXPANDED", INT2NUM(FONTSETWIDTH_ULTRAEXPANDED));
     
     cFXFontDesc.klass = rb_define_class_under(mFox, "FXFontDesc", rb_cObject);
     SWIG_TypeClientData(SWIGTYPE_p_FXFontDesc, (void *) &cFXFontDesc);
@@ -10131,6 +10570,43 @@ SWIGEXPORT(void) Init_core(void) {
     SWIG_TypeClientData(SWIGTYPE_p_FXFont, (void *) &cFXFont);
     rb_define_alloc_func(cFXFont.klass, _wrap_FXFont_allocate);
     rb_define_method(cFXFont.klass, "initialize", VALUEFUNC(_wrap_new_FXFont), -1);
+    rb_define_const(cFXFont.klass,"Fixed", INT2NUM(FXFont::Fixed));
+    rb_define_const(cFXFont.klass,"Variable", INT2NUM(FXFont::Variable));
+    rb_define_const(cFXFont.klass,"Decorative", INT2NUM(FXFont::Decorative));
+    rb_define_const(cFXFont.klass,"Modern", INT2NUM(FXFont::Modern));
+    rb_define_const(cFXFont.klass,"Roman", INT2NUM(FXFont::Roman));
+    rb_define_const(cFXFont.klass,"Script", INT2NUM(FXFont::Script));
+    rb_define_const(cFXFont.klass,"Swiss", INT2NUM(FXFont::Swiss));
+    rb_define_const(cFXFont.klass,"System", INT2NUM(FXFont::System));
+    rb_define_const(cFXFont.klass,"X11", INT2NUM(FXFont::X11));
+    rb_define_const(cFXFont.klass,"Scalable", INT2NUM(FXFont::Scalable));
+    rb_define_const(cFXFont.klass,"Polymorphic", INT2NUM(FXFont::Polymorphic));
+    rb_define_const(cFXFont.klass,"Rotatable", INT2NUM(FXFont::Rotatable));
+    rb_define_const(cFXFont.klass,"ReverseOblique", INT2NUM(FXFont::ReverseOblique));
+    rb_define_const(cFXFont.klass,"ReverseItalic", INT2NUM(FXFont::ReverseItalic));
+    rb_define_const(cFXFont.klass,"Straight", INT2NUM(FXFont::Straight));
+    rb_define_const(cFXFont.klass,"Italic", INT2NUM(FXFont::Italic));
+    rb_define_const(cFXFont.klass,"Oblique", INT2NUM(FXFont::Oblique));
+    rb_define_const(cFXFont.klass,"Thin", INT2NUM(FXFont::Thin));
+    rb_define_const(cFXFont.klass,"ExtraLight", INT2NUM(FXFont::ExtraLight));
+    rb_define_const(cFXFont.klass,"Light", INT2NUM(FXFont::Light));
+    rb_define_const(cFXFont.klass,"Normal", INT2NUM(FXFont::Normal));
+    rb_define_const(cFXFont.klass,"Medium", INT2NUM(FXFont::Medium));
+    rb_define_const(cFXFont.klass,"DemiBold", INT2NUM(FXFont::DemiBold));
+    rb_define_const(cFXFont.klass,"Bold", INT2NUM(FXFont::Bold));
+    rb_define_const(cFXFont.klass,"ExtraBold", INT2NUM(FXFont::ExtraBold));
+    rb_define_const(cFXFont.klass,"Black", INT2NUM(FXFont::Black));
+    rb_define_const(cFXFont.klass,"UltraCondensed", INT2NUM(FXFont::UltraCondensed));
+    rb_define_const(cFXFont.klass,"ExtraCondensed", INT2NUM(FXFont::ExtraCondensed));
+    rb_define_const(cFXFont.klass,"Condensed", INT2NUM(FXFont::Condensed));
+    rb_define_const(cFXFont.klass,"SemiCondensed", INT2NUM(FXFont::SemiCondensed));
+    rb_define_const(cFXFont.klass,"NonExpanded", INT2NUM(FXFont::NonExpanded));
+    rb_define_const(cFXFont.klass,"SemiExpanded", INT2NUM(FXFont::SemiExpanded));
+    rb_define_const(cFXFont.klass,"Expanded", INT2NUM(FXFont::Expanded));
+    rb_define_const(cFXFont.klass,"ExtraExpanded", INT2NUM(FXFont::ExtraExpanded));
+    rb_define_const(cFXFont.klass,"UltraExpanded", INT2NUM(FXFont::UltraExpanded));
+    rb_define_method(cFXFont.klass, "family", VALUEFUNC(_wrap_FXFont_family), -1);
+    rb_define_method(cFXFont.klass, "foundry", VALUEFUNC(_wrap_FXFont_foundry), -1);
     rb_define_method(cFXFont.klass, "getName", VALUEFUNC(_wrap_FXFont_getName), -1);
     rb_define_method(cFXFont.klass, "getActualName", VALUEFUNC(_wrap_FXFont_getActualName), -1);
     rb_define_method(cFXFont.klass, "getSize", VALUEFUNC(_wrap_FXFont_getSize), -1);
@@ -10144,10 +10620,19 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXFont.klass, "getSetWidth", VALUEFUNC(_wrap_FXFont_getSetWidth), -1);
     rb_define_method(cFXFont.klass, "getActualSetWidth", VALUEFUNC(_wrap_FXFont_getActualSetWidth), -1);
     rb_define_method(cFXFont.klass, "getHints", VALUEFUNC(_wrap_FXFont_getHints), -1);
-    rb_define_method(cFXFont.klass, "setFontDesc", VALUEFUNC(_wrap_FXFont_setFontDesc), -1);
+    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, "setFont", VALUEFUNC(_wrap_FXFont_setFont), -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_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);
+    rb_define_method(cFXFont.klass, "create", VALUEFUNC(_wrap_FXFont_create), -1);
+    rb_define_method(cFXFont.klass, "detach", VALUEFUNC(_wrap_FXFont_detach), -1);
+    rb_define_method(cFXFont.klass, "destroy", VALUEFUNC(_wrap_FXFont_destroy), -1);
+    rb_define_method(cFXFont.klass, "setFontDesc", VALUEFUNC(_wrap_FXFont_setFontDesc), -1);
+    rb_define_method(cFXFont.klass, "setAngle", VALUEFUNC(_wrap_FXFont_setAngle), -1);
+    rb_define_method(cFXFont.klass, "setFont", VALUEFUNC(_wrap_FXFont_setFont), -1);
     rb_define_method(cFXFont.klass, "isFontMono", VALUEFUNC(_wrap_FXFont_isFontMono), -1);
     rb_define_method(cFXFont.klass, "hasChar", VALUEFUNC(_wrap_FXFont_hasChar), -1);
     rb_define_method(cFXFont.klass, "getMinChar", VALUEFUNC(_wrap_FXFont_getMinChar), -1);
@@ -10160,18 +10645,11 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXFont.klass, "getFontDescent", VALUEFUNC(_wrap_FXFont_getFontDescent), -1);
     rb_define_method(cFXFont.klass, "getFontLeading", VALUEFUNC(_wrap_FXFont_getFontLeading), -1);
     rb_define_method(cFXFont.klass, "getFontSpacing", VALUEFUNC(_wrap_FXFont_getFontSpacing), -1);
+    rb_define_method(cFXFont.klass, "getCharWidth", VALUEFUNC(_wrap_FXFont_getCharWidth), -1);
     rb_define_method(cFXFont.klass, "getTextWidth", VALUEFUNC(_wrap_FXFont_getTextWidth), -1);
     rb_define_method(cFXFont.klass, "getTextHeight", VALUEFUNC(_wrap_FXFont_getTextHeight), -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);
-    rb_define_method(cFXFont.klass, "create", VALUEFUNC(_wrap_FXFont_create), -1);
-    rb_define_method(cFXFont.klass, "detach", VALUEFUNC(_wrap_FXFont_detach), -1);
-    rb_define_method(cFXFont.klass, "destroy", VALUEFUNC(_wrap_FXFont_destroy), -1);
     cFXFont.mark = (void (*)(void *)) FXRbFont::markfunc;
     cFXFont.destroy = (void (*)(void *)) FXRbFont::freefunc;
-    rb_define_module_function(mFox, "fxparsefontdesc", VALUEFUNC(_wrap_fxparsefontdesc), -1);
-    rb_define_module_function(mFox, "fxunparsefontdesc", VALUEFUNC(_wrap_fxunparsefontdesc), -1);
     rb_define_const(mFox,"LAYOUT_NORMAL", INT2NUM(LAYOUT_NORMAL));
     rb_define_const(mFox,"LAYOUT_SIDE_TOP", INT2NUM(LAYOUT_SIDE_TOP));
     rb_define_const(mFox,"LAYOUT_SIDE_BOTTOM", INT2NUM(LAYOUT_SIDE_BOTTOM));
@@ -10214,10 +10692,16 @@ SWIGEXPORT(void) Init_core(void) {
     SWIG_TypeClientData(SWIGTYPE_p_FXWindow, (void *) &cFXWindow);
     rb_define_alloc_func(cFXWindow.klass, _wrap_FXWindow_allocate);
     rb_define_method(cFXWindow.klass, "initialize", VALUEFUNC(_wrap_new_FXWindow), -1);
+    rb_define_singleton_method(cFXWindow.klass, "octetType", VALUEFUNC(FXWindow_octetType_get), 0);
+    rb_define_singleton_method(cFXWindow.klass, "octetType=", VALUEFUNC(FXWindow_octetType_set), 1);
     rb_define_singleton_method(cFXWindow.klass, "deleteType", VALUEFUNC(FXWindow_deleteType_get), 0);
     rb_define_singleton_method(cFXWindow.klass, "deleteType=", VALUEFUNC(FXWindow_deleteType_set), 1);
     rb_define_singleton_method(cFXWindow.klass, "textType", VALUEFUNC(FXWindow_textType_get), 0);
     rb_define_singleton_method(cFXWindow.klass, "textType=", VALUEFUNC(FXWindow_textType_set), 1);
+    rb_define_singleton_method(cFXWindow.klass, "utf8Type", VALUEFUNC(FXWindow_utf8Type_get), 0);
+    rb_define_singleton_method(cFXWindow.klass, "utf8Type=", VALUEFUNC(FXWindow_utf8Type_set), 1);
+    rb_define_singleton_method(cFXWindow.klass, "utf16Type", VALUEFUNC(FXWindow_utf16Type_get), 0);
+    rb_define_singleton_method(cFXWindow.klass, "utf16Type=", VALUEFUNC(FXWindow_utf16Type_set), 1);
     rb_define_singleton_method(cFXWindow.klass, "colorType", VALUEFUNC(FXWindow_colorType_get), 0);
     rb_define_singleton_method(cFXWindow.klass, "colorType=", VALUEFUNC(FXWindow_colorType_set), 1);
     rb_define_singleton_method(cFXWindow.klass, "urilistType", VALUEFUNC(FXWindow_urilistType_get), 0);
@@ -10330,10 +10814,13 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_const(cFXWindow.klass,"ID_MDI_NEXT", INT2NUM(FXWindow::ID_MDI_NEXT));
     rb_define_const(cFXWindow.klass,"ID_MDI_PREV", INT2NUM(FXWindow::ID_MDI_PREV));
     rb_define_const(cFXWindow.klass,"ID_LAST", INT2NUM(FXWindow::ID_LAST));
+    rb_define_singleton_method(cFXWindow.klass, "octetTypeName", VALUEFUNC(_wrap_FXWindow_octetTypeName), -1);
     rb_define_singleton_method(cFXWindow.klass, "deleteTypeName", VALUEFUNC(_wrap_FXWindow_deleteTypeName), -1);
     rb_define_singleton_method(cFXWindow.klass, "textTypeName", VALUEFUNC(_wrap_FXWindow_textTypeName), -1);
     rb_define_singleton_method(cFXWindow.klass, "colorTypeName", VALUEFUNC(_wrap_FXWindow_colorTypeName), -1);
     rb_define_singleton_method(cFXWindow.klass, "urilistTypeName", VALUEFUNC(_wrap_FXWindow_urilistTypeName), -1);
+    rb_define_singleton_method(cFXWindow.klass, "utf8TypeName", VALUEFUNC(_wrap_FXWindow_utf8TypeName), -1);
+    rb_define_singleton_method(cFXWindow.klass, "utf16TypeName", VALUEFUNC(_wrap_FXWindow_utf16TypeName), -1);
     rb_define_method(cFXWindow.klass, "getParent", VALUEFUNC(_wrap_FXWindow_getParent), -1);
     rb_define_method(cFXWindow.klass, "getOwner", VALUEFUNC(_wrap_FXWindow_getOwner), -1);
     rb_define_method(cFXWindow.klass, "getShell", VALUEFUNC(_wrap_FXWindow_getShell), -1);
@@ -10375,9 +10862,11 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_singleton_method(cFXWindow.klass, "commonAncestor", VALUEFUNC(_wrap_FXWindow_commonAncestor), -1);
     rb_define_singleton_method(cFXWindow.klass, "before?", VALUEFUNC(_wrap_FXWindow_beforeq___), -1);
     rb_define_singleton_method(cFXWindow.klass, "after?", VALUEFUNC(_wrap_FXWindow_afterq___), -1);
-    rb_define_singleton_method(cFXWindow.klass, "windowCount", VALUEFUNC(_wrap_FXWindow_windowCount), -1);
     rb_define_method(cFXWindow.klass, "before", VALUEFUNC(_wrap_FXWindow_before), -1);
     rb_define_method(cFXWindow.klass, "after", VALUEFUNC(_wrap_FXWindow_after), -1);
+    rb_define_method(cFXWindow.klass, "composeContext", VALUEFUNC(_wrap_FXWindow_composeContext), -1);
+    rb_define_method(cFXWindow.klass, "createComposeContext", VALUEFUNC(_wrap_FXWindow_createComposeContext), -1);
+    rb_define_method(cFXWindow.klass, "destroyComposeContext", VALUEFUNC(_wrap_FXWindow_destroyComposeContext), -1);
     rb_define_method(cFXWindow.klass, "setDefaultCursor", VALUEFUNC(_wrap_FXWindow_setDefaultCursor), -1);
     rb_define_method(cFXWindow.klass, "getDefaultCursor", VALUEFUNC(_wrap_FXWindow_getDefaultCursor), -1);
     rb_define_method(cFXWindow.klass, "setDragCursor", VALUEFUNC(_wrap_FXWindow_setDragCursor), -1);
@@ -10402,6 +10891,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXWindow.klass, "ungrabKeyboard", VALUEFUNC(_wrap_FXWindow_ungrabKeyboard), -1);
     rb_define_method(cFXWindow.klass, "grabbedKeyboard", VALUEFUNC(_wrap_FXWindow_grabbedKeyboard), -1);
     rb_define_method(cFXWindow.klass, "shown", VALUEFUNC(_wrap_FXWindow_shown), -1);
+    rb_define_alias(cFXWindow.klass, "visible?", "shown");
     rb_define_method(cFXWindow.klass, "underCursor", VALUEFUNC(_wrap_FXWindow_underCursor), -1);
     rb_define_method(cFXWindow.klass, "hasSelection", VALUEFUNC(_wrap_FXWindow_hasSelection), -1);
     rb_define_method(cFXWindow.klass, "acquireSelection", VALUEFUNC(_wrap_FXWindow_acquireSelection), -1);
@@ -10409,8 +10899,6 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXWindow.klass, "hasClipboard", VALUEFUNC(_wrap_FXWindow_hasClipboard), -1);
     rb_define_method(cFXWindow.klass, "acquireClipboard", VALUEFUNC(_wrap_FXWindow_acquireClipboard), -1);
     rb_define_method(cFXWindow.klass, "releaseClipboard", VALUEFUNC(_wrap_FXWindow_releaseClipboard), -1);
-    rb_define_method(cFXWindow.klass, "dropEnable", VALUEFUNC(_wrap_FXWindow_dropEnable), -1);
-    rb_define_method(cFXWindow.klass, "dropDisable", VALUEFUNC(_wrap_FXWindow_dropDisable), -1);
     rb_define_method(cFXWindow.klass, "isDropEnabled", VALUEFUNC(_wrap_FXWindow_isDropEnabled), -1);
     rb_define_method(cFXWindow.klass, "isDragging", VALUEFUNC(_wrap_FXWindow_isDragging), -1);
     rb_define_method(cFXWindow.klass, "beginDrag", VALUEFUNC(_wrap_FXWindow_beginDrag), -1);
@@ -10421,6 +10909,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXWindow.klass, "clearDragRectangle", VALUEFUNC(_wrap_FXWindow_clearDragRectangle), -1);
     rb_define_method(cFXWindow.klass, "acceptDrop", VALUEFUNC(_wrap_FXWindow_acceptDrop), -1);
     rb_define_method(cFXWindow.klass, "didAccept", VALUEFUNC(_wrap_FXWindow_didAccept), -1);
+    rb_define_method(cFXWindow.klass, "dropFinished", VALUEFUNC(_wrap_FXWindow_dropFinished), -1);
     rb_define_method(cFXWindow.klass, "inquireDNDTypes", VALUEFUNC(_wrap_FXWindow_inquireDNDTypes), -1);
     rb_define_method(cFXWindow.klass, "offeredDNDType", VALUEFUNC(_wrap_FXWindow_offeredDNDType), -1);
     rb_define_method(cFXWindow.klass, "inquireDNDAction", VALUEFUNC(_wrap_FXWindow_inquireDNDAction), -1);
@@ -10459,6 +10948,9 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXWindow.klass, "contains", VALUEFUNC(_wrap_FXWindow_contains), -1);
     rb_define_method(cFXWindow.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXWindow_doesSaveUnder), -1);
     rb_define_method(cFXWindow.klass, "setBackColor", VALUEFUNC(_wrap_FXWindow_setBackColor), -1);
+    rb_define_method(cFXWindow.klass, "tr", VALUEFUNC(_wrap_FXWindow_tr), -1);
+    rb_define_method(cFXWindow.klass, "dropEnable", VALUEFUNC(_wrap_FXWindow_dropEnable), -1);
+    rb_define_method(cFXWindow.klass, "dropDisable", VALUEFUNC(_wrap_FXWindow_dropDisable), -1);
     rb_define_method(cFXWindow.klass, "setShape", VALUEFUNC(_wrap_FXWindow_setShape), -1);
     rb_define_method(cFXWindow.klass, "clearShape", VALUEFUNC(_wrap_FXWindow_clearShape), -1);
     cFXWindow.mark = (void (*)(void *)) FXRbWindow::markfunc;
@@ -10531,6 +11023,9 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXFrame.klass, "contains", VALUEFUNC(_wrap_FXFrame_contains), -1);
     rb_define_method(cFXFrame.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXFrame_doesSaveUnder), -1);
     rb_define_method(cFXFrame.klass, "setBackColor", VALUEFUNC(_wrap_FXFrame_setBackColor), -1);
+    rb_define_method(cFXFrame.klass, "tr", VALUEFUNC(_wrap_FXFrame_tr), -1);
+    rb_define_method(cFXFrame.klass, "dropEnable", VALUEFUNC(_wrap_FXFrame_dropEnable), -1);
+    rb_define_method(cFXFrame.klass, "dropDisable", VALUEFUNC(_wrap_FXFrame_dropDisable), -1);
     rb_define_method(cFXFrame.klass, "setShape", VALUEFUNC(_wrap_FXFrame_setShape), -1);
     rb_define_method(cFXFrame.klass, "clearShape", VALUEFUNC(_wrap_FXFrame_clearShape), -1);
     cFXFrame.mark = (void (*)(void *)) FXRbFrame::markfunc;
@@ -10580,6 +11075,9 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXComposite.klass, "contains", VALUEFUNC(_wrap_FXComposite_contains), -1);
     rb_define_method(cFXComposite.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXComposite_doesSaveUnder), -1);
     rb_define_method(cFXComposite.klass, "setBackColor", VALUEFUNC(_wrap_FXComposite_setBackColor), -1);
+    rb_define_method(cFXComposite.klass, "tr", VALUEFUNC(_wrap_FXComposite_tr), -1);
+    rb_define_method(cFXComposite.klass, "dropEnable", VALUEFUNC(_wrap_FXComposite_dropEnable), -1);
+    rb_define_method(cFXComposite.klass, "dropDisable", VALUEFUNC(_wrap_FXComposite_dropDisable), -1);
     rb_define_method(cFXComposite.klass, "setShape", VALUEFUNC(_wrap_FXComposite_setShape), -1);
     rb_define_method(cFXComposite.klass, "clearShape", VALUEFUNC(_wrap_FXComposite_clearShape), -1);
     cFXComposite.mark = (void (*)(void *)) FXRbComposite::markfunc;
@@ -10622,6 +11120,9 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXRootWindow.klass, "contains", VALUEFUNC(_wrap_FXRootWindow_contains), -1);
     rb_define_method(cFXRootWindow.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXRootWindow_doesSaveUnder), -1);
     rb_define_method(cFXRootWindow.klass, "setBackColor", VALUEFUNC(_wrap_FXRootWindow_setBackColor), -1);
+    rb_define_method(cFXRootWindow.klass, "tr", VALUEFUNC(_wrap_FXRootWindow_tr), -1);
+    rb_define_method(cFXRootWindow.klass, "dropEnable", VALUEFUNC(_wrap_FXRootWindow_dropEnable), -1);
+    rb_define_method(cFXRootWindow.klass, "dropDisable", VALUEFUNC(_wrap_FXRootWindow_dropDisable), -1);
     rb_define_method(cFXRootWindow.klass, "setShape", VALUEFUNC(_wrap_FXRootWindow_setShape), -1);
     rb_define_method(cFXRootWindow.klass, "clearShape", VALUEFUNC(_wrap_FXRootWindow_clearShape), -1);
     cFXRootWindow.mark = (void (*)(void *)) FXRbRootWindow::markfunc;
@@ -10669,6 +11170,9 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXShell.klass, "contains", VALUEFUNC(_wrap_FXShell_contains), -1);
     rb_define_method(cFXShell.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXShell_doesSaveUnder), -1);
     rb_define_method(cFXShell.klass, "setBackColor", VALUEFUNC(_wrap_FXShell_setBackColor), -1);
+    rb_define_method(cFXShell.klass, "tr", VALUEFUNC(_wrap_FXShell_tr), -1);
+    rb_define_method(cFXShell.klass, "dropEnable", VALUEFUNC(_wrap_FXShell_dropEnable), -1);
+    rb_define_method(cFXShell.klass, "dropDisable", VALUEFUNC(_wrap_FXShell_dropDisable), -1);
     rb_define_method(cFXShell.klass, "setShape", VALUEFUNC(_wrap_FXShell_setShape), -1);
     rb_define_method(cFXShell.klass, "clearShape", VALUEFUNC(_wrap_FXShell_clearShape), -1);
     cFXShell.mark = (void (*)(void *)) FXRbShell::markfunc;
@@ -10752,6 +11256,9 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXPopup.klass, "contains", VALUEFUNC(_wrap_FXPopup_contains), -1);
     rb_define_method(cFXPopup.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXPopup_doesSaveUnder), -1);
     rb_define_method(cFXPopup.klass, "setBackColor", VALUEFUNC(_wrap_FXPopup_setBackColor), -1);
+    rb_define_method(cFXPopup.klass, "tr", VALUEFUNC(_wrap_FXPopup_tr), -1);
+    rb_define_method(cFXPopup.klass, "dropEnable", VALUEFUNC(_wrap_FXPopup_dropEnable), -1);
+    rb_define_method(cFXPopup.klass, "dropDisable", VALUEFUNC(_wrap_FXPopup_dropDisable), -1);
     rb_define_method(cFXPopup.klass, "setShape", VALUEFUNC(_wrap_FXPopup_setShape), -1);
     rb_define_method(cFXPopup.klass, "clearShape", VALUEFUNC(_wrap_FXPopup_clearShape), -1);
     rb_define_method(cFXPopup.klass, "popup", VALUEFUNC(_wrap_FXPopup_popup), -1);
@@ -10787,6 +11294,8 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXTopWindow.klass, "onFocusDown", VALUEFUNC(_wrap_FXTopWindow_onFocusDown), -1);
     rb_define_method(cFXTopWindow.klass, "onFocusLeft", VALUEFUNC(_wrap_FXTopWindow_onFocusLeft), -1);
     rb_define_method(cFXTopWindow.klass, "onFocusRight", VALUEFUNC(_wrap_FXTopWindow_onFocusRight), -1);
+    rb_define_method(cFXTopWindow.klass, "onSessionNotify", VALUEFUNC(_wrap_FXTopWindow_onSessionNotify), -1);
+    rb_define_method(cFXTopWindow.klass, "onSessionClosed", VALUEFUNC(_wrap_FXTopWindow_onSessionClosed), -1);
     rb_define_method(cFXTopWindow.klass, "onCmdMaximize", VALUEFUNC(_wrap_FXTopWindow_onCmdMaximize), -1);
     rb_define_method(cFXTopWindow.klass, "onCmdMinimize", VALUEFUNC(_wrap_FXTopWindow_onCmdMinimize), -1);
     rb_define_method(cFXTopWindow.klass, "onCmdRestore", VALUEFUNC(_wrap_FXTopWindow_onCmdRestore), -1);
@@ -10856,6 +11365,9 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXTopWindow.klass, "contains", VALUEFUNC(_wrap_FXTopWindow_contains), -1);
     rb_define_method(cFXTopWindow.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXTopWindow_doesSaveUnder), -1);
     rb_define_method(cFXTopWindow.klass, "setBackColor", VALUEFUNC(_wrap_FXTopWindow_setBackColor), -1);
+    rb_define_method(cFXTopWindow.klass, "tr", VALUEFUNC(_wrap_FXTopWindow_tr), -1);
+    rb_define_method(cFXTopWindow.klass, "dropEnable", VALUEFUNC(_wrap_FXTopWindow_dropEnable), -1);
+    rb_define_method(cFXTopWindow.klass, "dropDisable", VALUEFUNC(_wrap_FXTopWindow_dropDisable), -1);
     rb_define_method(cFXTopWindow.klass, "setShape", VALUEFUNC(_wrap_FXTopWindow_setShape), -1);
     rb_define_method(cFXTopWindow.klass, "clearShape", VALUEFUNC(_wrap_FXTopWindow_clearShape), -1);
     rb_define_method(cFXTopWindow.klass, "show", VALUEFUNC(_wrap_FXTopWindow_show), -1);
@@ -10902,6 +11414,9 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXMainWindow.klass, "contains", VALUEFUNC(_wrap_FXMainWindow_contains), -1);
     rb_define_method(cFXMainWindow.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXMainWindow_doesSaveUnder), -1);
     rb_define_method(cFXMainWindow.klass, "setBackColor", VALUEFUNC(_wrap_FXMainWindow_setBackColor), -1);
+    rb_define_method(cFXMainWindow.klass, "tr", VALUEFUNC(_wrap_FXMainWindow_tr), -1);
+    rb_define_method(cFXMainWindow.klass, "dropEnable", VALUEFUNC(_wrap_FXMainWindow_dropEnable), -1);
+    rb_define_method(cFXMainWindow.klass, "dropDisable", VALUEFUNC(_wrap_FXMainWindow_dropDisable), -1);
     rb_define_method(cFXMainWindow.klass, "setShape", VALUEFUNC(_wrap_FXMainWindow_setShape), -1);
     rb_define_method(cFXMainWindow.klass, "clearShape", VALUEFUNC(_wrap_FXMainWindow_clearShape), -1);
     rb_define_method(cFXMainWindow.klass, "show", VALUEFUNC(_wrap_FXMainWindow_show), -1);
@@ -10954,6 +11469,9 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXSplashWindow.klass, "contains", VALUEFUNC(_wrap_FXSplashWindow_contains), -1);
     rb_define_method(cFXSplashWindow.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXSplashWindow_doesSaveUnder), -1);
     rb_define_method(cFXSplashWindow.klass, "setBackColor", VALUEFUNC(_wrap_FXSplashWindow_setBackColor), -1);
+    rb_define_method(cFXSplashWindow.klass, "tr", VALUEFUNC(_wrap_FXSplashWindow_tr), -1);
+    rb_define_method(cFXSplashWindow.klass, "dropEnable", VALUEFUNC(_wrap_FXSplashWindow_dropEnable), -1);
+    rb_define_method(cFXSplashWindow.klass, "dropDisable", VALUEFUNC(_wrap_FXSplashWindow_dropDisable), -1);
     rb_define_method(cFXSplashWindow.klass, "setShape", VALUEFUNC(_wrap_FXSplashWindow_setShape), -1);
     rb_define_method(cFXSplashWindow.klass, "clearShape", VALUEFUNC(_wrap_FXSplashWindow_clearShape), -1);
     rb_define_method(cFXSplashWindow.klass, "show", VALUEFUNC(_wrap_FXSplashWindow_show), -1);