fxruby 1.2.6 → 1.4.0

data/examples/image.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'fox12'
-require 'fox12/colors'
+require 'fox14'
+require 'fox14/colors'
 
 include Fox
 

data/examples/imageviewer.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'fox12'
+require 'fox14'
 
 include Fox
 

data/examples/inputs.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'fox12'
+require 'fox14'
 
 include Fox
 

data/examples/mditest.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'fox12'
-require 'fox12/colors'
+require 'fox14'
+require 'fox14/colors'
 
 include Fox
 

data/examples/pig.rb

@@ -4,7 +4,7 @@
 # Ruby".
 #
 
-require 'fox12'
+require 'fox14'
 
 include Fox
 

data/examples/raabrowser.rb

@@ -1,9 +1,9 @@
 require 'cgi'
-require 'fox12'
+require 'fox14'
 begin
   require 'RAA'
 rescue LoadError
-  require 'fox12/missingdep'
+  require 'fox14/missingdep'
   MSG = <<EOM
   Sorry, this example depends on the SOAP4R extension. Please
   check the Ruby Application Archives for an appropriate

data/examples/ratio.rb

@@ -4,8 +4,8 @@
 # Demonstrates the use of the FXSpring method to retain size ratios between widgets when form is resized.
 #
 
-require 'fox12'
-require 'fox12/colors'
+require 'fox14'
+require 'fox14/colors'
 
 include Fox
 

data/examples/scintilla-test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'fox12'
-require 'fox12/scintilla'
+require 'fox14'
+require 'fox14/scintilla'
 
 include Fox
 

data/examples/scribble-orig.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'fox12'
-require 'fox12/responder'
-require 'fox12/colors'
+require 'fox14'
+require 'fox14/responder'
+require 'fox14/colors'
 
 include Fox
 

data/examples/scribble.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'fox12'
+require 'fox14'
 
 include Fox
 

data/examples/shutter.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'fox12'
+require 'fox14'
 
 include Fox
 

data/examples/splitter.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'fox12'
+require 'fox14'
 
 include Fox
 

data/examples/styledtext.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'fox12'
-require 'fox12/colors'
+require 'fox14'
+require 'fox14/colors'
 
 include Fox
 

data/examples/tabbook.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'fox12'
+require 'fox14'
 
 include Fox
 

data/examples/table.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'fox12'
+require 'fox14'
 require 'date'
 
 include Fox

data/ext/{fox12 → fox14}/FXRbApp.cpp

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbApp.cpp,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbApp.cpp,v 1.3 2005/08/17 01:04:21 lyle Exp $
  ***********************************************************************/
 
 #include "FXRbCommon.h"
@@ -43,10 +43,9 @@ FXDEFMAP(FXRbApp) FXRbAppMap[]={
 FXRbIMPLEMENT(FXRbApp,FXApp,FXRbAppMap,ARRAYNUMBER(FXRbAppMap))
 
 // Constructor
-FXRbApp::FXRbApp(const FXchar* appname,const FXchar* vendor) : FXApp(appname,vendor),m_bThreadsEnabled(TRUE),sleepTime(100),threadsChore(0){
+FXRbApp::FXRbApp(const FXchar* appname,const FXchar* vendor) : FXApp(appname,vendor),m_bThreadsEnabled(TRUE),sleepTime(100){
   if(m_bThreadsEnabled){
-    FXASSERT(threadsChore==0);
-    threadsChore=addChore(this,ID_CHORE_THREADS);
+    addChore(this,ID_CHORE_THREADS);
     }
   }
 
@@ -54,7 +53,7 @@ FXRbApp::FXRbApp(const FXchar* appname,const FXchar* vendor) : FXApp(appname,ven
 // Constructor that also calls FXApp::init()
 FXRbApp* FXRbApp::constructAndInit(const FXchar* appname,const FXchar* vendor){
   int argc=1;
-  static char* argv[]={0,0};
+  static char* argv[]={"",0};
   FXRbApp* app=new FXRbApp(appname,vendor);
   app->FXApp::init(argc,argv);
   return app;
@@ -66,16 +65,12 @@ void FXRbApp::setThreadsEnabled(FXbool enabled){
   if(enabled){
     if(!m_bThreadsEnabled){
       m_bThreadsEnabled=TRUE;
-      threadsChore=addChore(this,ID_CHORE_THREADS);
-      FXASSERT(threadsChore!=0);
+      addChore(this,ID_CHORE_THREADS);
       }
     }
   else{
     m_bThreadsEnabled=FALSE;
-    if(threadsChore!=0){
-      removeChore(threadsChore);
-      threadsChore=0;
-      }
+    removeChore(this,ID_CHORE_THREADS);
     }
   }
 
@@ -105,8 +100,7 @@ long FXRbApp::onChoreThreads(FXObject*,FXSelector,void*){
     rb_thread_wait_for(wait);
 
   // Re-register this chore for next time
-  threadsChore=addChore(this,ID_CHORE_THREADS);
-  FXASSERT(threadsChore!=0);
+  addChore(this,ID_CHORE_THREADS);
 
   // Back to work...
   return 1;

data/ext/{fox12 → fox14}/FXRbDataTarget.cpp

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbDataTarget.cpp,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbDataTarget.cpp,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #include "FXRbCommon.h"
@@ -92,6 +92,10 @@ VALUE FXRbDataTarget::getValue() const {
       return to_ruby(*reinterpret_cast<FXint*>(data));
     case DT_UINT:
       return to_ruby(*reinterpret_cast<FXuint*>(data));
+    case DT_LONG:
+      return to_ruby(*reinterpret_cast<FXlong*>(data));
+    case DT_ULONG:
+      return to_ruby(*reinterpret_cast<FXulong*>(data));
     case DT_FLOAT:
       return to_ruby(*reinterpret_cast<FXfloat*>(data));
     case DT_DOUBLE:

data/ext/{fox12 → fox14}/FXRbGLViewer.cpp

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbGLViewer.cpp,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbGLViewer.cpp,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #include "FXRbCommon.h"

data/ext/{fox12 → fox14}/FXRuby.cpp

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRuby.cpp,v 1.5 2005/02/27 03:15:16 lyle Exp $
+ * $Id: FXRuby.cpp,v 1.4 2005/08/17 01:04:21 lyle Exp $
  ***********************************************************************/
 
 #ifdef _MSC_VER
@@ -946,8 +946,6 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
         case FXWindow::ID_UNKNOWN:
         case FXWindow::ID_UPDATE:
         case FXWindow::ID_AUTOSCROLL:
-        case FXWindow::ID_QUERY_TIP:
-        case FXWindow::ID_QUERY_HELP:
         case FXWindow::ID_QUERY_MENU:
         case FXWindow::ID_HOTKEY:
         case FXWindow::ID_ACCEL:
@@ -1312,6 +1310,15 @@ FXTreeItem* FXRbCallTreeItemMethod(const FXTreeList* recv,ID func,FXint x,FXint
 
 //----------------------------------------------------------------------
 
+FXFoldingItem* FXRbCallFoldingItemMethod(const FXFoldingList* recv,ID func,FXint x,FXint y){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  VALUE result=rb_funcall(obj,func,2,INT2NUM(x),INT2NUM(y));
+  return NIL_P(result) ? 0 : reinterpret_cast<FXFoldingItem*>(DATA_PTR(result));
+  }
+
+//----------------------------------------------------------------------
+
 FXFileAssoc* FXRbCallFileAssocMethod(const FXFileDict* recv,ID func,const char* pathname){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
@@ -1321,6 +1328,24 @@ FXFileAssoc* FXRbCallFileAssocMethod(const FXFileDict* recv,ID func,const char*
 
 //----------------------------------------------------------------------
 
+FXIcon* FXRbCallIconMethod(const FXTableItem* recv,ID func){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  VALUE result=rb_funcall(obj,func,0,NULL);
+  return NIL_P(result) ? 0 : reinterpret_cast<FXIcon*>(DATA_PTR(result));
+  }
+
+//----------------------------------------------------------------------
+
+FXWindow* FXRbCallWindowMethod(const FXTableItem* recv,ID func,FXTable* table){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  VALUE result=rb_funcall(obj,func,1,to_ruby(table));
+  return NIL_P(result) ? 0 : reinterpret_cast<FXWindow*>(DATA_PTR(result));
+  }
+
+//----------------------------------------------------------------------
+
 // Call function with "FXRange" return value
 FXRangef FXRbCallRangeMethod(FXObject* recv,ID func){
   VALUE obj=FXRbGetRubyObj(recv,false);
@@ -1331,6 +1356,16 @@ FXRangef FXRbCallRangeMethod(FXObject* recv,ID func){
 
 //----------------------------------------------------------------------
 
+// Call functions with FXString return value
+FXString FXRbCallStringMethod(const FXObject* recv, ID func){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  VALUE result=rb_funcall(obj,func,0,NULL);
+  return FXString(STR2CSTR(result));
+  }
+
+//----------------------------------------------------------------------
+
 // Special destructors to handle order dependencies
 FXRbMenuCommand::~FXRbMenuCommand(){
   FXAccelTable *table;
@@ -1810,7 +1845,7 @@ extern "C" void Init_ui(void);
 #define REQUIRE(fname) rb_funcall(rb_mKernel,rb_intern("require"),1,rb_str_new2((fname))) 
 #endif
 
-extern "C" void Init_fox12(void) {
+extern "C" void Init_fox14(void) {
   Init_core();
   Init_dc();
   Init_frames();
@@ -1831,16 +1866,16 @@ extern "C" void Init_fox12(void) {
   Init_table();
   Init_text();
   Init_treelist();
-  REQUIRE("fox12/core");
-  REQUIRE("fox12/dict");
-  REQUIRE("fox12/settings");
-  REQUIRE("fox12/iterators");
-  REQUIRE("fox12/keys");
-  REQUIRE("fox12/aliases");
-  REQUIRE("fox12/responder2");
-  REQUIRE("fox12/glgroup");
-  REQUIRE("fox12/execute_nonmodal");
-  REQUIRE("fox12/version");
+  REQUIRE("fox14/core");
+  REQUIRE("fox14/dict");
+  REQUIRE("fox14/settings");
+  REQUIRE("fox14/iterators");
+  REQUIRE("fox14/keys");
+  REQUIRE("fox14/aliases");
+  REQUIRE("fox14/responder2");
+  REQUIRE("fox14/glgroup");
+  REQUIRE("fox14/execute_nonmodal");
+  REQUIRE("fox14/version");
   
   id_assocs=rb_intern("@assocs");
   id_backtrace=rb_intern("backtrace");

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

@@ -519,54 +519,58 @@ SWIGIMPORT(void)   SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_ty
 #define  SWIGTYPE_p_FXDict swig_types[0] 
 #define  SWIGTYPE_p_FXSettings swig_types[1] 
 #define  SWIGTYPE_p_FXAccelTable swig_types[2] 
-#define  SWIGTYPE_p_FXuchar swig_types[3] 
-#define  SWIGTYPE_p_FXComposite swig_types[4] 
-#define  SWIGTYPE_p_FXRegistry swig_types[5] 
-#define  SWIGTYPE_p_FXId swig_types[6] 
-#define  SWIGTYPE_p_FXIconDict swig_types[7] 
-#define  SWIGTYPE_p_FXShell swig_types[8] 
-#define  SWIGTYPE_p_FXPopup swig_types[9] 
-#define  SWIGTYPE_p_FXTimer 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_FXIcon swig_types[18] 
-#define  SWIGTYPE_p_FXID swig_types[19] 
-#define  SWIGTYPE_p_FXEvent swig_types[20] 
-#define  SWIGTYPE_p_FXObject swig_types[21] 
-#define  SWIGTYPE_p_FXStringDict swig_types[22] 
-#define  SWIGTYPE_p_FXRectangle swig_types[23] 
-#define  SWIGTYPE_p_FXString swig_types[24] 
-#define  SWIGTYPE_p_FXPoint swig_types[25] 
-#define  SWIGTYPE_p_FXFileDict swig_types[26] 
-#define  SWIGTYPE_p_FXDebugTarget swig_types[27] 
-#define  SWIGTYPE_p_FXDataTarget swig_types[28] 
-#define  SWIGTYPE_p_FXDelegator swig_types[29] 
-#define  SWIGTYPE_p_FXDrawable swig_types[30] 
-#define  SWIGTYPE_p_FXCursor swig_types[31] 
-#define  SWIGTYPE_p_FXCURCursor swig_types[32] 
-#define  SWIGTYPE_p_FXGIFCursor swig_types[33] 
-#define  SWIGTYPE_p_FXStream swig_types[34] 
-#define  SWIGTYPE_p_FXFontDesc swig_types[35] 
-#define  SWIGTYPE_p_FXApp swig_types[36] 
-#define  SWIGTYPE_p_FXChore swig_types[37] 
-#define  SWIGTYPE_p_FXRegion swig_types[38] 
-#define  SWIGTYPE_p_FXColor swig_types[39] 
-#define  SWIGTYPE_p_FXSize swig_types[40] 
-#define  SWIGTYPE_p_p_FXchar swig_types[41] 
-#define  SWIGTYPE_p_FXFont swig_types[42] 
-#define  SWIGTYPE_p_FXchar swig_types[43] 
-#define  SWIGTYPE_p_FXFrame swig_types[44] 
-#define  SWIGTYPE_p_FXFileAssoc swig_types[45] 
-#define  SWIGTYPE_p_FXVisual swig_types[46] 
-#define  SWIGTYPE_p_FXuint swig_types[47] 
-#define  SWIGTYPE_p_FXFileStream swig_types[48] 
-#define  SWIGTYPE_p_FXMemoryStream swig_types[49] 
-static swig_type_info *swig_types[51];
+#define  SWIGTYPE_p_FXlong swig_types[3] 
+#define  SWIGTYPE_p_FXuchar swig_types[4] 
+#define  SWIGTYPE_p_FXComposite swig_types[5] 
+#define  SWIGTYPE_p_FXRegistry swig_types[6] 
+#define  SWIGTYPE_p_FXId swig_types[7] 
+#define  SWIGTYPE_p_FXIconDict swig_types[8] 
+#define  SWIGTYPE_p_FXShell swig_types[9] 
+#define  SWIGTYPE_p_FXPopup swig_types[10] 
+#define  SWIGTYPE_p_FXTimer swig_types[11] 
+#define  SWIGTYPE_p_FXRootWindow swig_types[12] 
+#define  SWIGTYPE_p_FXWindow swig_types[13] 
+#define  SWIGTYPE_p_FXTopWindow swig_types[14] 
+#define  SWIGTYPE_p_void swig_types[15] 
+#define  SWIGTYPE_p_FXDocument swig_types[16] 
+#define  SWIGTYPE_p_FXRecentFiles swig_types[17] 
+#define  SWIGTYPE_p_FXMainWindow swig_types[18] 
+#define  SWIGTYPE_p_FXSplashWindow swig_types[19] 
+#define  SWIGTYPE_p_FXIcon swig_types[20] 
+#define  SWIGTYPE_p_FXID swig_types[21] 
+#define  SWIGTYPE_p_FXMutex swig_types[22] 
+#define  SWIGTYPE_p_FXEvent 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_FXDataTarget swig_types[31] 
+#define  SWIGTYPE_p_FXDebugTarget swig_types[32] 
+#define  SWIGTYPE_p_FXDrawable swig_types[33] 
+#define  SWIGTYPE_p_FXCursor swig_types[34] 
+#define  SWIGTYPE_p_FXDelegator 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_FXChore swig_types[41] 
+#define  SWIGTYPE_p_FXRegion swig_types[42] 
+#define  SWIGTYPE_p_FXColor swig_types[43] 
+#define  SWIGTYPE_p_FXSize swig_types[44] 
+#define  SWIGTYPE_p_p_FXchar swig_types[45] 
+#define  SWIGTYPE_p_FXFont swig_types[46] 
+#define  SWIGTYPE_p_FXchar swig_types[47] 
+#define  SWIGTYPE_p_FXFrame swig_types[48] 
+#define  SWIGTYPE_p_FXFileAssoc swig_types[49] 
+#define  SWIGTYPE_p_FXVisual swig_types[50] 
+#define  SWIGTYPE_p_FXuint swig_types[51] 
+#define  SWIGTYPE_p_FXFileStream swig_types[52] 
+#define  SWIGTYPE_p_FXMemoryStream swig_types[53] 
+static swig_type_info *swig_types[55];
 
 /* -------- TYPES TABLE (END) -------- */
 
@@ -806,11 +810,6 @@ FXRectangle FXRectangle_operator_Sm_(FXRectangle const *self,FXRectangle const &
       }
 
 swig_class cFXRectangle;
-FXRectangle FXRegion_bounds(FXRegion const *self){
-      FXRectangle r;
-      self->bounds(r);
-      return r;
-      }
 FXRegion FXRegion_operator_Sa_(FXRegion const *self,FXRegion const &other){ return (*self)+other; }
 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; }
@@ -878,6 +877,11 @@ static swig_type_info *FXObject_dynamic_cast(void **ptr) {
       *ptr=reinterpret_cast<void*>(pIconItem);
       return SWIG_TypeQuery("FXIconItem *");
       }
+    FXIconSource *pIconSource=dynamic_cast<FXIconSource*>(*ppObject);
+    if(pIconSource){
+      *ptr=reinterpret_cast<void*>(pIconSource);
+      return SWIG_TypeQuery("FXIconSource *");
+      }
     FXId *pId=dynamic_cast<FXId*>(*ppObject);
     if(pId){
       *ptr=reinterpret_cast<void*>(pId);
@@ -1131,15 +1135,6 @@ static swig_type_info *FXDict_dynamic_cast(void **ptr) {
 
 swig_class cFXFileAssoc;
 static void free_FXFileAssoc(FXFileAssoc *);
-VALUE FXIconDict_defaultIconPath(){
-      return rb_str_new2(FXIconDict::defaultIconPath);
-      }
-FXIconDict *new_FXIconDict(FXApp *a,FXString const &p){
-      return new FXRbIconDict(a,p);
-      }
-
-swig_class cFXIconDict;
-static void free_FXIconDict(FXIconDict *);
 VALUE FXFileDict_defaultExecBinding(){
       return to_ruby(FXFileDict::defaultExecBinding);
       }
@@ -1273,12 +1268,18 @@ static swig_type_info *FXCursor_dynamic_cast(void **ptr) {
     return 0;
 }
 
+VALUE FXCURCursor_fileExt(){
+      return rb_str_new2(FXCURCursor::fileExt);
+      }
 FXCURCursor *new_FXCURCursor(FXApp *a,void const *pix){
       return new FXRbCURCursor(a,pix);
       }
 
 swig_class cFXCURCursor;
 static void free_FXCURCursor(FXCURCursor *);
+VALUE FXGIFCursor_fileExt(){
+      return rb_str_new2(FXGIFCursor::fileExt);
+      }
 FXGIFCursor *new_FXGIFCursor(FXApp *a,void const *pix,FXint hx,FXint hy){
       return new FXRbGIFCursor(a,pix,hx,hy);
       }
@@ -1369,19 +1370,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);
@@ -1462,6 +1450,8 @@ VALUE FXWindow_getChildren(FXWindow const *self){
         }
       return ary;
       }
+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); }
 VALUE FXWindow_getCursorPosition(FXWindow const *self){
       FXint x, y;
       FXuint buttons;
@@ -1608,11 +1598,6 @@ static swig_type_info *FXWindow_dynamic_cast(void **ptr) {
       *ptr=reinterpret_cast<void*>(pScrollCorner);
       return SWIG_TypeQuery("FXScrollCorner *");
       }
-    FXToolBarGrip *pToolBarGrip=dynamic_cast<FXToolBarGrip*>(*ppWindow);
-    if(pToolBarGrip){
-      *ptr=reinterpret_cast<void*>(pToolBarGrip);
-      return SWIG_TypeQuery("FXToolBarGrip *");
-      }
     return 0;
 }
 
@@ -1621,10 +1606,14 @@ FXFrame *new_FXFrame(FXComposite *p,FXuint opts,FXint x,FXint y,FXint w,FXint h,
       }
 
 swig_class cFXFrame;
-static void free_FXFrame(FXFrame *);
 
 static swig_type_info *FXFrame_dynamic_cast(void **ptr) {
     FXFrame **ppFrame = reinterpret_cast<FXFrame **>(ptr);
+    FX7Segment *p7Segment=dynamic_cast<FX7Segment*>(*ppFrame);
+    if(p7Segment){
+      *ptr=reinterpret_cast<void*>(p7Segment);
+      return SWIG_TypeQuery("FX7Segment *");
+      }
     FXArrowButton *pArrowButton=dynamic_cast<FXArrowButton*>(*ppFrame);
     if(pArrowButton){
       *ptr=reinterpret_cast<void*>(pArrowButton);
@@ -1655,6 +1644,11 @@ static swig_type_info *FXFrame_dynamic_cast(void **ptr) {
       *ptr=reinterpret_cast<void*>(pDial);
       return SWIG_TypeQuery("FXDial *");
       }
+    FXDockHandler *pDockHandler=dynamic_cast<FXDockHandler*>(*ppFrame);
+    if(pDockHandler){
+      *ptr=reinterpret_cast<void*>(pDockHandler);
+      return SWIG_TypeQuery("FXDockHandler *");
+      }
     FXHeader *pHeader=dynamic_cast<FXHeader*>(*ppFrame);
     if(pHeader){
       *ptr=reinterpret_cast<void*>(pHeader);
@@ -1819,6 +1813,15 @@ FXTopWindow *new_FXTopWindow__SWIG_0(FXApp *a,FXString const &name,FXIcon *ic,FX
 FXTopWindow *new_FXTopWindow__SWIG_1(FXWindow *owner,FXString const &name,FXIcon *ic,FXIcon *mi,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs){
       return new FXRbTopWindow(owner,name,ic,mi,opts,x,y,w,h,pl,pr,pt,pb,hs,vs);
       }
+VALUE FXTopWindow_getWMBorders(FXTopWindow *self){
+      FXint left,right,top,bottom;
+      if(self->getWMBorders(left,right,top,bottom)){
+        return rb_ary_new3(4,INT2NUM(left),INT2NUM(right),INT2NUM(top),INT2NUM(bottom));
+        }
+      else{
+        return Qnil; // FIXME
+	}
+      }
 
 swig_class cFXTopWindow;
 static void free_FXTopWindow(FXTopWindow *);
@@ -1835,6 +1838,11 @@ static swig_type_info *FXTopWindow_dynamic_cast(void **ptr) {
       *ptr=reinterpret_cast<void*>(pMainWindow);
       return SWIG_TypeQuery("FXMainWindow *");
       }
+    FXSplashWindow *pSplashWindow=dynamic_cast<FXSplashWindow*>(*ppTopWindow);
+    if(pSplashWindow){
+      *ptr=reinterpret_cast<void*>(pSplashWindow);
+      return SWIG_TypeQuery("FXSplashWindow *");
+      }
     FXToolBarShell *pToolBarShell=dynamic_cast<FXToolBarShell*>(*ppTopWindow);
     if(pToolBarShell){
       *ptr=reinterpret_cast<void*>(pToolBarShell);
@@ -1849,6 +1857,9 @@ FXMainWindow *new_FXMainWindow(FXApp *a,FXString const &name,FXIcon *ic,FXIcon *
 
 swig_class cFXMainWindow;
 static void free_FXMainWindow(FXMainWindow *);
+
+swig_class cFXSplashWindow;
+static void free_FXSplashWindow(FXSplashWindow *);
 static VALUE _wrap_setIgnoreExceptions(int argc, VALUE *argv, VALUE self) { VALUE arg1 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = argv[0]; setIgnoreExceptions(arg1); return Qnil; }
 static VALUE _wrap_MKUINT(int argc, VALUE *argv, VALUE self) { FXushort arg1 ; FXushort arg2 ; FXuint result;
@@ -1993,11 +2004,11 @@ static VALUE _wrap_FXStream_container(int argc, VALUE *argv, VALUE self) { FXStr
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); result = (FXObject *)((FXStream const *)arg1)->container();
     { swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXObject, (void **) &result); vresult = FXRbGetRubyObj(result, ty); }
      return vresult; }
-static VALUE _wrap_FXStream_getPosition(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)->position(); vresult = UINT2NUM(result); return vresult; }
+static VALUE _wrap_FXStream_getPosition(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; FXlong result;
+    VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); result = ((FXStream const *)arg1)->position(); {
+        FXlong * resultptr; resultptr = new FXlong((FXlong &)result);
+        vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXlong, 1); }  return vresult; }
 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);
@@ -2016,9 +2027,14 @@ 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_isLittleEndian(int argc, VALUE *argv, VALUE self) { FXbool result; VALUE vresult = Qnil;
-    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    result = (FXbool)FXStream::isLittleEndian(); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXStream_setBigEndian(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)->setBigEndian(arg2);
+    return Qnil; }
+static VALUE _wrap_FXStream_isBigEndian(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 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_FXStream, 1); result = (FXbool)((FXStream const *)arg1)->isBigEndian();
+    vresult = result ? Qtrue : Qfalse; return vresult; }
 static void
 free_FXStream(FXStream *arg1) {
     delete arg1;
@@ -2031,10 +2047,11 @@ static VALUE _wrap_FXStream_flush(int argc, VALUE *argv, VALUE self) { FXStream
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); result = (FXbool)FXStream_flush(arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXStream_setPosition(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; long arg2 ;
+static VALUE _wrap_FXStream_position(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = (FXStream *) 0 ; FXlong arg2 ;
     int arg3 = (int) FXFromStart ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); arg2 = NUM2LONG(argv[0]); if (argc > 1) {
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStream, 1); { FXlong * ptr;
+        SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_FXlong, 1); if (ptr) arg2 = *ptr; }  if (argc > 1) {
         arg3 = (int) NUM2INT(argv[1]); }  result = (FXbool)FXStream_position(arg1,arg2,(FXWhence )arg3);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
@@ -2059,6 +2076,12 @@ static VALUE _wrap_FXFileStream_open(int argc, VALUE *argv, VALUE self) { FXFile
     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;
     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))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileStream, 1); result = ((FXFileStream const *)arg1)->position(); {
+        FXlong * resultptr; resultptr = new FXlong((FXlong &)result);
+        vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXlong, 1); }  return vresult; }
 static void
 free_FXFileStream(FXFileStream *arg1) {
     delete arg1;
@@ -2073,10 +2096,11 @@ static VALUE _wrap_FXFileStream_flush(int argc, VALUE *argv, VALUE self) { FXFil
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileStream, 1); result = (FXbool)FXFileStream_flush(arg1);
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXFileStream_setPosition(int argc, VALUE *argv, VALUE self) { FXFileStream *arg1 = (FXFileStream *) 0 ;
-    long arg2 ; int arg3 = (int) FXFromStart ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 2))
+static VALUE _wrap_FXFileStream_position(int argc, VALUE *argv, VALUE self) { FXFileStream *arg1 = (FXFileStream *) 0 ;
+    FXlong arg2 ; int arg3 = (int) FXFromStart ; FXbool result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileStream, 1); arg2 = NUM2LONG(argv[0]); if (argc > 1) {
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileStream, 1); { FXlong * ptr;
+        SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_FXlong, 1); if (ptr) arg2 = *ptr; }  if (argc > 1) {
         arg3 = (int) NUM2INT(argv[1]); }  result = (FXbool)FXFileStream_position(arg1,arg2,(FXWhence )arg3);
     vresult = result ? Qtrue : Qfalse; return vresult; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
@@ -2109,6 +2133,12 @@ static VALUE _wrap_FXMemoryStream_giveBuffer(int argc, VALUE *argv, VALUE self)
     VALUE arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMemoryStream, 1); arg2 = argv[0]; FXMemoryStream_giveBuffer(arg1,arg2);
     return Qnil; }
+static VALUE _wrap_FXMemoryStream_getPosition(int argc, VALUE *argv, VALUE self) { FXMemoryStream *arg1 = (FXMemoryStream *) 0 ;
+    FXlong result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMemoryStream, 1); result = ((FXMemoryStream const *)arg1)->position(); {
+        FXlong * resultptr; resultptr = new FXlong((FXlong &)result);
+        vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXlong, 1); }  return vresult; }
 static void
 free_FXMemoryStream(FXMemoryStream *arg1) {
     delete arg1;
@@ -2667,7 +2697,7 @@ static VALUE _wrap_FXRegion_containsq___(int nargs, VALUE *args, VALUE self) { i
     rb_raise(rb_eArgError, "No matching function for overloaded 'FXRegion_contains?'"); return Qnil; }
 static VALUE _wrap_FXRegion_bounds(int argc, VALUE *argv, VALUE self) { FXRegion *arg1 = (FXRegion *) 0 ; FXRectangle 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 = FXRegion_bounds((FXRegion const *)arg1); {
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1); result = ((FXRegion const *)arg1)->bounds(); {
         FXRectangle* resultptr = new FXRectangle(result); vresult = FXRbGetRubyObj(resultptr, "FXRectangle *"); } 
     return vresult; }
 static VALUE _wrap_FXRegion_offsetN___(int argc, VALUE *argv, VALUE self) { FXRegion *arg1 = (FXRegion *) 0 ; FXint arg2 ;
@@ -2738,6 +2768,13 @@ static VALUE _wrap_FXObject_handle(int argc, VALUE *argv, VALUE self) { FXObject
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
     arg4 = FXRbGetExpectedData(self, arg3, argv[2]); result = (long)(arg1)->handle(arg2,arg3,arg4); vresult = INT2NUM(result);
     return vresult; }
+static VALUE _wrap_FXObject_tryHandle(int argc, VALUE *argv, VALUE self) { FXObject *arg1 = (FXObject *) 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_FXObject, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
+    SWIG_ConvertPtr(argv[2], (void **) &arg4, 0, 1); result = (long)(arg1)->tryHandle(arg2,arg3,arg4);
+    vresult = INT2NUM(result); return vresult; }
 static void
 free_FXObject(FXObject *arg1) {
     delete arg1;
@@ -3019,6 +3056,12 @@ static VALUE _wrap_FXApp_onCmdDump(int argc, VALUE *argv, VALUE self) { FXApp *a
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = 0;
     result = (long)(arg1)->onCmdDump(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXApp_onCmdHover(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 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_FXApp, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = 0;
+    result = (long)(arg1)->onCmdHover(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXApp_copyright(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)FXApp_copyright(); vresult = result; return vresult; }
@@ -3037,14 +3080,16 @@ static VALUE _wrap_new_FXApp(int argc, VALUE *argv, VALUE self) { FXchar *arg1 =
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); if (argc > 0) { arg1 = StringValuePtr(argv[0]); } 
     if (argc > 1) { arg2 = StringValuePtr(argv[1]); }  { result = (FXApp *)new_FXApp((FXchar const *)arg1,(FXchar const *)arg2);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
-static VALUE _wrap_FXApp_getAppName(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXString result;
+static VALUE _wrap_FXApp_getAppName(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXString *result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); result = ((FXApp const *)arg1)->getAppName();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
-static VALUE _wrap_FXApp_getVendorName(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXString result;
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); {
+        FXString const &_result_ref = ((FXApp const *)arg1)->getAppName(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
+static VALUE _wrap_FXApp_getVendorName(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXString *result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); result = ((FXApp const *)arg1)->getVendorName();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1); {
+        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))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
@@ -3090,6 +3135,10 @@ static VALUE _wrap_FXApp_getRootWindow(int argc, VALUE *argv, VALUE self) { FXAp
     result = (FXRootWindow *)((FXApp const *)arg1)->getRootWindow(); {
         swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXRootWindow, (void **) &result);
         vresult = FXRbGetRubyObj(result, ty); }  return vresult; }
+static VALUE _wrap_FXApp_setRootWindow(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
+    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_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();
@@ -3119,95 +3168,40 @@ static VALUE _wrap_FXApp_findWindowAt(int argc, VALUE *argv, VALUE self) { FXApp
         swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXWindow, (void **) &result);
         vresult = FXRbGetRubyObj(result, ty); }  return vresult; }
 static VALUE _wrap_FXApp_addTimeout(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
-    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; FXuint arg4 = (FXuint) 1000 ; void *arg5 = (void *) 0 ; FXTimer *result;
-    VALUE vresult = Qnil; if ((argc < 2) || (argc > 4)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
+    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; FXuint arg4 = (FXuint) 1000 ; void *arg5 = (void *) 0 ;
+    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) { SWIG_ConvertPtr(argv[3], (void **) &arg5, 0, 1); } 
-    result = (FXTimer *)(arg1)->addTimeout(arg2,arg3,arg4,arg5); vresult = FXRbGetRubyObj(result, "FXTimer *"); return vresult; }
-static VALUE _wrap_FXApp_removeTimeout__SWIG_0(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
-    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; FXTimer *result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    (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]);
-    result = (FXTimer *)(arg1)->removeTimeout(arg2,arg3); vresult = FXRbGetRubyObj(result, "FXTimer *"); return vresult; }
-static VALUE _wrap_FXApp_removeTimeout__SWIG_1(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
-    FXTimer *arg2 = (FXTimer *) 0 ; FXTimer *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_FXTimer, 1); result = (FXTimer *)(arg1)->removeTimeout(arg2);
-    vresult = FXRbGetRubyObj(result, "FXTimer *"); return vresult; }
-static VALUE _wrap_FXApp_removeTimeout(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_FXApp, 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_FXTimer, 0) != -1)) ? 1 : 0; }
-             if (_v) { return _wrap_FXApp_removeTimeout__SWIG_1(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_FXApp, 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_FXObject, 0) != -1)) ? 1 : 0; }
-             if (_v) { { _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
-                    return _wrap_FXApp_removeTimeout__SWIG_0(nargs, args, self);}  }  }  } 
-    rb_raise(rb_eArgError, "No matching function for overloaded 'FXApp_removeTimeout'"); return Qnil; }
+    (arg1)->removeTimeout(arg2,arg3); return Qnil; }
 static VALUE _wrap_FXApp_hasTimeoutq___(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))
     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; }
-static VALUE _wrap_FXApp_remainingTimeout__SWIG_0(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
+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);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
-    result = (FXuint)((FXApp const *)arg1)->remainingTimeout(arg2,arg3); vresult = UINT2NUM(result); return vresult; }
-static VALUE _wrap_FXApp_remainingTimeout__SWIG_1(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
-    FXTimer *arg2 = (FXTimer *) 0 ; FXuint result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXTimer, 1);
-    result = (FXuint)((FXApp const *)arg1)->remainingTimeout(arg2); vresult = UINT2NUM(result); return vresult; }
-static VALUE _wrap_FXApp_remainingTimeout(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_FXApp, 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_FXTimer, 0) != -1)) ? 1 : 0; }
-             if (_v) { return _wrap_FXApp_remainingTimeout__SWIG_1(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_FXApp, 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_FXObject, 0) != -1)) ? 1 : 0; }
-             if (_v) { { _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
-                    return _wrap_FXApp_remainingTimeout__SWIG_0(nargs, args, self);}  }  }  } 
-    rb_raise(rb_eArgError, "No matching function for overloaded 'FXApp_remainingTimeout'"); return Qnil; }
+    result = (FXuint)(arg1)->remainingTimeout(arg2,arg3); vresult = UINT2NUM(result); return vresult; }
+static VALUE _wrap_FXApp_handleTimeouts(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)->handleTimeouts(); return Qnil; }
 static VALUE _wrap_FXApp_addChore(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
-    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; FXChore *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_FXApp, 1);
+    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) {
-        SWIG_ConvertPtr(argv[2], (void **) &arg4, 0, 1); }  result = (FXChore *)(arg1)->addChore(arg2,arg3,arg4);
-    vresult = FXRbGetRubyObj(result, "FXChore *"); return vresult; }
-static VALUE _wrap_FXApp_removeChore__SWIG_0(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
-    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; FXChore *result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+        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]);
-    result = (FXChore *)(arg1)->removeChore(arg2,arg3); vresult = FXRbGetRubyObj(result, "FXChore *"); return vresult; }
-static VALUE _wrap_FXApp_removeChore__SWIG_1(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
-    FXChore *arg2 = (FXChore *) 0 ; FXChore *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_FXChore, 1); result = (FXChore *)(arg1)->removeChore(arg2);
-    vresult = FXRbGetRubyObj(result, "FXChore *"); return vresult; }
-static VALUE _wrap_FXApp_removeChore(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_FXApp, 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_FXChore, 0) != -1)) ? 1 : 0; }
-             if (_v) { return _wrap_FXApp_removeChore__SWIG_1(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_FXApp, 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_FXObject, 0) != -1)) ? 1 : 0; }
-             if (_v) { { _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
-                    return _wrap_FXApp_removeChore__SWIG_0(nargs, args, self);}  }  }  } 
-    rb_raise(rb_eArgError, "No matching function for overloaded 'FXApp_removeChore'"); return Qnil; }
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); (arg1)->removeChore(arg2,arg3);
+    return Qnil; }
 static VALUE _wrap_FXApp_hasChoreq___(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))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXApp, 1);
@@ -3234,6 +3228,11 @@ static VALUE _wrap_FXApp_removeInput(int argc, VALUE *argv, VALUE self) { FXApp
     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);
     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;
     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();
@@ -3398,6 +3397,11 @@ 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_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_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();
@@ -3526,6 +3530,14 @@ static VALUE _wrap_FXApp_getTipbackColor(int argc, VALUE *argv, VALUE self) { FX
     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)->getTipbackColor();
     vresult = UINT2NUM(result); return vresult; }
+static VALUE _wrap_FXApp_getSelMenuTextColor(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)->getSelMenuTextColor();
+    vresult = UINT2NUM(result); return vresult; }
+static VALUE _wrap_FXApp_getSelMenuBackColor(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)->getSelMenuBackColor();
+    vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_FXApp_setBorderColor(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 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_FXApp, 1); arg2 = to_FXColor(argv[0]); (arg1)->setBorderColor(arg2);
@@ -3566,6 +3578,14 @@ static VALUE _wrap_FXApp_setTipbackColor(int argc, VALUE *argv, VALUE self) { FX
     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 = to_FXColor(argv[0]); (arg1)->setTipbackColor(arg2);
     return Qnil; }
+static VALUE _wrap_FXApp_setSelMenuTextColor(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 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_FXApp, 1); arg2 = to_FXColor(argv[0]); (arg1)->setSelMenuTextColor(arg2);
+    return Qnil; }
+static VALUE _wrap_FXApp_setSelMenuBackColor(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 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_FXApp, 1); arg2 = to_FXColor(argv[0]); (arg1)->setSelMenuBackColor(arg2);
+    return Qnil; }
 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; }
@@ -3954,76 +3974,6 @@ static void
 free_FXFileAssoc(FXFileAssoc *arg1) {
     delete arg1;
 }
-static VALUE _wrap_FXIconDict_defaultIconPath(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)FXIconDict_defaultIconPath(); vresult = result; return vresult; }
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-static VALUE _wrap_FXIconDict_allocate(VALUE self) {
-#else
-     static VALUE _wrap_FXIconDict_allocate(int argc, VALUE *argv, VALUE self) {
-#endif
-         VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXIconDict);
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-        rb_obj_call_init(vresult, argc, argv);
-#endif
-         return vresult; }
-static VALUE _wrap_new_FXIconDict(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
-    FXString const &arg2_defvalue = FXIconDict::defaultIconPath ; FXString *arg2 = (FXString *) &arg2_defvalue ;
-    FXIconDict *result; SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 2))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { p2 = to_FXString(argv[1]); arg2 = &p2; }  {
-        result = (FXIconDict *)new_FXIconDict(arg1,(FXString const &)*arg2);
-        DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
-static VALUE _wrap_FXIconDict_getApp(int argc, VALUE *argv, VALUE self) { FXIconDict *arg1 = (FXIconDict *) 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_FXIconDict, 1); result = (FXApp *)((FXIconDict const *)arg1)->getApp(); {
-        swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXApp, (void **) &result); vresult = FXRbGetRubyObj(result, ty); } 
-    return vresult; }
-static VALUE _wrap_FXIconDict_setIconPath(int argc, VALUE *argv, VALUE self) { FXIconDict *arg1 = (FXIconDict *) 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_FXIconDict, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
-    (arg1)->setIconPath((FXString const &)*arg2); return Qnil; }
-static VALUE _wrap_FXIconDict_getIconPath(int argc, VALUE *argv, VALUE self) { FXIconDict *arg1 = (FXIconDict *) 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_FXIconDict, 1); result = ((FXIconDict const *)arg1)->getIconPath();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
-static VALUE _wrap_FXIconDict_insert(int argc, VALUE *argv, VALUE self) { FXIconDict *arg1 = (FXIconDict *) 0 ; FXchar *arg2 ;
-    FXIcon *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXIconDict, 1); arg2 = StringValuePtr(argv[0]);
-    result = (FXIcon *)(arg1)->insert((FXchar const *)arg2); {
-        swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXIcon, (void **) &result); vresult = FXRbGetRubyObj(result, ty); }
-     return vresult; }
-static VALUE _wrap_FXIconDict_remove(int argc, VALUE *argv, VALUE self) { FXIconDict *arg1 = (FXIconDict *) 0 ; FXchar *arg2 ;
-    FXIcon *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXIconDict, 1); arg2 = StringValuePtr(argv[0]);
-    result = (FXIcon *)(arg1)->remove((FXchar const *)arg2); {
-        swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXIcon, (void **) &result); vresult = FXRbGetRubyObj(result, ty); }
-     return vresult; }
-static VALUE _wrap_FXIconDict_find(int argc, VALUE *argv, VALUE self) { FXIconDict *arg1 = (FXIconDict *) 0 ; FXchar *arg2 ;
-    FXIcon *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXIconDict, 1); arg2 = StringValuePtr(argv[0]);
-    result = (FXIcon *)(arg1)->find((FXchar const *)arg2); {
-        swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXIcon, (void **) &result); vresult = FXRbGetRubyObj(result, ty); }
-     return vresult; }
-static void
-free_FXIconDict(FXIconDict *arg1) {
-    delete arg1;
-}
-static VALUE _wrap_FXIconDict_save(int argc, VALUE *argv, VALUE self) { FXIconDict *arg1 = (FXIconDict *) 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_FXIconDict, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    FXIconDict_save((FXIconDict const *)arg1,*arg2); return Qnil; }
-static VALUE _wrap_FXIconDict_load(int argc, VALUE *argv, VALUE self) { FXIconDict *arg1 = (FXIconDict *) 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_FXIconDict, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
-    FXIconDict_load(arg1,*arg2); return Qnil; }
 static VALUE _wrap_FXFileDict_defaultExecBinding(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)FXFileDict_defaultExecBinding(); vresult = result; return vresult; }
@@ -4063,21 +4013,28 @@ 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_getApp(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 = (FXFileDict *) 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_FXFileDict, 1); result = (FXApp *)((FXFileDict const *)arg1)->getApp(); {
-        swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXApp, (void **) &result); vresult = FXRbGetRubyObj(result, ty); } 
-    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);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileDict, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIconDict, 1); (arg1)->setIconDict(arg2); return Qnil; }
+static VALUE _wrap_FXFileDict_getIconDict(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 = (FXFileDict *) 0 ;
+    FXIconDict *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 = (FXIconDict *)((FXFileDict const *)arg1)->getIconDict();
+    vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXIconDict,0); return vresult; }
 static VALUE _wrap_FXFileDict_setIconPath(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 = (FXFileDict *) 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_FXFileDict, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setIconPath((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXFileDict_getIconPath(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 = (FXFileDict *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXFileDict, 1); result = ((FXFileDict const *)arg1)->getIconPath();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFileDict, 1); {
+        FXString const &_result_ref = ((FXFileDict const *)arg1)->getIconPath(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXFileDict_replace(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 = (FXFileDict *) 0 ; FXchar *arg2 ;
     FXchar *arg3 ; FXFileAssoc *result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
@@ -4166,16 +4123,6 @@ static VALUE _wrap_FXStringDict_remove(int argc, VALUE *argv, VALUE self) { FXSt
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStringDict, 1); arg2 = StringValuePtr(argv[0]);
     result = (FXchar *)(arg1)->remove((FXchar const *)arg2); vresult = rb_str_new2(result); return vresult; }
-static VALUE _wrap_FXStringDict_find(int argc, VALUE *argv, VALUE self) { FXStringDict *arg1 = (FXStringDict *) 0 ;
-    FXchar *arg2 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStringDict, 1); arg2 = StringValuePtr(argv[0]);
-    result = (FXchar *)((FXStringDict const *)arg1)->find((FXchar const *)arg2); vresult = rb_str_new2(result); return vresult; }
-static VALUE _wrap_FXStringDict_data(int argc, VALUE *argv, VALUE self) { FXStringDict *arg1 = (FXStringDict *) 0 ;
-    FXuint arg2 ; FXchar *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStringDict, 1); arg2 = NUM2UINT(argv[0]);
-    result = (FXchar *)((FXStringDict const *)arg1)->data(arg2); vresult = rb_str_new2(result); return vresult; }
 static void
 free_FXStringDict(FXStringDict *arg1) {
     delete arg1;
@@ -4214,20 +4161,6 @@ static VALUE _wrap_FXSettings_unparseFile(int argc, VALUE *argv, VALUE self) { F
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     result = (FXbool)(arg1)->unparseFile((FXString const &)*arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXSettings_data(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ; FXuint arg2 ;
-    FXStringDict *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NUM2UINT(argv[0]);
-    result = (FXStringDict *)((FXSettings const *)arg1)->data(arg2); {
-        swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXStringDict, (void **) &result);
-        vresult = FXRbGetRubyObj(result, ty); }  return vresult; }
-static VALUE _wrap_FXSettings_find(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ; FXchar *arg2 ;
-    FXStringDict *result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = StringValuePtr(argv[0]);
-    result = (FXStringDict *)((FXSettings const *)arg1)->find((FXchar const *)arg2); {
-        swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXStringDict, (void **) &result);
-        vresult = FXRbGetRubyObj(result, ty); }  return vresult; }
 static VALUE _wrap_FXSettings_readStringEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; FXchar *arg4 = (FXchar *) 0 ; FXchar *result; VALUE vresult = Qnil;
     if ((argc < 2) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
@@ -4374,15 +4307,17 @@ static VALUE _wrap_FXRegistry_write(int argc, VALUE *argv, VALUE self) { FXRegis
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegistry, 1); result = (FXbool)(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))
+    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_FXRegistry, 1); result = ((FXRegistry const *)arg1)->getAppKey();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegistry, 1); {
+        FXString const &_result_ref = ((FXRegistry const *)arg1)->getAppKey(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXRegistry_getVendorKey(int argc, VALUE *argv, VALUE self) { FXRegistry *arg1 = (FXRegistry *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXRegistry, 1); result = ((FXRegistry const *)arg1)->getVendorKey();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegistry, 1); {
+        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);
@@ -4446,20 +4381,22 @@ static VALUE _wrap_FXDocument_setTitle(int argc, VALUE *argv, VALUE self) { FXDo
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDocument, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setTitle((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXDocument_getTitle(int argc, VALUE *argv, VALUE self) { FXDocument *arg1 = (FXDocument *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXDocument, 1); result = ((FXDocument const *)arg1)->getTitle();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDocument, 1); {
+        FXString const &_result_ref = ((FXDocument const *)arg1)->getTitle(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXDocument_setFilename(int argc, VALUE *argv, VALUE self) { FXDocument *arg1 = (FXDocument *) 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_FXDocument, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setFilename((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXDocument_getFilename(int argc, VALUE *argv, VALUE self) { FXDocument *arg1 = (FXDocument *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 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_FXDocument, 1); result = ((FXDocument const *)arg1)->getFilename();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDocument, 1); {
+        FXString const &_result_ref = ((FXDocument const *)arg1)->getFilename(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static void
 free_FXDocument(FXDocument *arg1) {
     delete arg1;
@@ -4728,10 +4665,18 @@ static VALUE _wrap_FXCursor_getHeight(int argc, VALUE *argv, VALUE self) { FXCur
     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)->getHeight();
     vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXCursor_setHotX(int argc, VALUE *argv, VALUE self) { FXCursor *arg1 = (FXCursor *) 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_FXCursor, 1); arg2 = NUM2INT(argv[0]); (arg1)->setHotX(arg2);
+    return Qnil; }
 static VALUE _wrap_FXCursor_getHotX(int argc, VALUE *argv, VALUE self) { FXCursor *arg1 = (FXCursor *) 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_FXCursor, 1); result = (FXint)((FXCursor const *)arg1)->getHotX();
     vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXCursor_setHotY(int argc, VALUE *argv, VALUE self) { FXCursor *arg1 = (FXCursor *) 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_FXCursor, 1); arg2 = NUM2INT(argv[0]); (arg1)->setHotY(arg2);
+    return Qnil; }
 static VALUE _wrap_FXCursor_getHotY(int argc, VALUE *argv, VALUE self) { FXCursor *arg1 = (FXCursor *) 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_FXCursor, 1); result = (FXint)((FXCursor const *)arg1)->getHotY();
@@ -4775,6 +4720,9 @@ static VALUE _wrap_FXCursor_loadPixels(int argc, VALUE *argv, VALUE self) { FXCu
     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; }
+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; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXCURCursor_allocate(VALUE self) {
 #else
@@ -4827,6 +4775,9 @@ static VALUE _wrap_FXCURCursor_loadPixels(int argc, VALUE *argv, VALUE self) { F
     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; }
+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; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXGIFCursor_allocate(VALUE self) {
 #else
@@ -4894,6 +4845,10 @@ static VALUE _wrap_fxloadGIF(int argc, VALUE *argv, VALUE self) { FXStream *arg1
     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;
+    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; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXDrawable_allocate(VALUE self) {
 #else
@@ -5178,14 +5133,16 @@ 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_getName(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXString result;
+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); result = ((FXFont const *)arg1)->getName();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
-static VALUE _wrap_FXFont_getActualName(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXString result;
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); {
+        FXString const &_result_ref = ((FXFont const *)arg1)->getName(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
+static VALUE _wrap_FXFont_getActualName(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)->getActualName();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); {
+        FXString const &_result_ref = ((FXFont const *)arg1)->getActualName(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXFont_getSize(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)->getSize();
@@ -5252,10 +5209,10 @@ static VALUE _wrap_FXFont_isFontMono(int argc, VALUE *argv, VALUE self) { FXFont
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); result = (FXbool)((FXFont const *)arg1)->isFontMono();
     vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXFont_hasChar(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; VALUE arg2 ; FXbool result;
+static VALUE _wrap_FXFont_hasChar(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXint 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; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); arg2 = NUM2INT(argv[0]);
+    result = (FXbool)((FXFont const *)arg1)->hasChar(arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXFont_getMinChar(int argc, VALUE *argv, VALUE self) { FXFont *arg1 = (FXFont *) 0 ; FXint result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFont, 1); result = (FXint)((FXFont const *)arg1)->getMinChar();
@@ -5571,6 +5528,18 @@ static VALUE _wrap_FXWindow_onDNDRequest(int argc, VALUE *argv, VALUE self) { FX
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = to_FXEvent(argv[2]);
     result = (long)(arg1)->onDNDRequest(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXWindow_onQueryHelp(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = to_FXEvent(argv[2]);
+    result = (long)(arg1)->onQueryHelp(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXWindow_onQueryTip(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = to_FXEvent(argv[2]);
+    result = (long)(arg1)->onQueryTip(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXWindow_onCmdShow(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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);
@@ -5619,6 +5588,18 @@ static VALUE _wrap_FXWindow_onCmdDisable(int argc, VALUE *argv, VALUE self) { FX
     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)->onCmdDisable(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXWindow_onUpdToggleEnabled(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = 0;
+    result = (long)(arg1)->onUpdToggleEnabled(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXWindow_onCmdToggleEnabled(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = 0;
+    result = (long)(arg1)->onCmdToggleEnabled(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXWindow_onCmdUpdate(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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);
@@ -5838,10 +5819,11 @@ static VALUE _wrap_FXWindow_setHelpTag(int argc, VALUE *argv, VALUE self) { FXWi
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXWindow, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setHelpTag((FXString const &)*arg2); return Qnil; }
-static VALUE _wrap_FXWindow_getHelpTag(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ; FXString result;
+static VALUE _wrap_FXWindow_getHelpTag(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 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_FXWindow, 1); result = ((FXWindow const *)arg1)->getHelpTag();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    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;
     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();
@@ -5909,9 +5891,37 @@ static VALUE _wrap_FXWindow_commonAncestor(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); result = (FXWindow *)FXWindow::commonAncestor(arg1,arg2);
     { 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))
+    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;
+    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))
+    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;
+    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))
+    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;
+    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))
+    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;
+    return vresult; }
 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);
@@ -5958,6 +5968,11 @@ static VALUE _wrap_FXWindow_hasFocus(int argc, VALUE *argv, VALUE self) { FXWind
     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();
     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();
+    vresult = result ? Qtrue : Qfalse; return vresult; }
 static VALUE _wrap_FXWindow_isDefault(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)->isDefault();
@@ -6102,10 +6117,10 @@ static VALUE _wrap_FXWindow_handleDrag(int argc, VALUE *argv, VALUE self) { FXWi
     if (argc > 2) { arg4 = (int) NUM2INT(argv[2]); }  result = (FXbool)(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 ; FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 1))
+    FXbool arg2 = (FXbool) 1 ; 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]); } 
-    result = (FXbool)(arg1)->endDrag(arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+    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;
     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();
@@ -6170,16 +6185,6 @@ static VALUE _wrap_FXWindow_getBackColor(int argc, VALUE *argv, VALUE self) { FX
     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 = (FXColor)((FXWindow const *)arg1)->getBackColor();
     vresult = UINT2NUM(result); return vresult; }
-static VALUE _wrap_FXWindow_linkBefore(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
-    FXWindow *arg2 = (FXWindow *) 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);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); (arg1)->linkBefore(arg2); return Qnil; }
-static VALUE _wrap_FXWindow_linkAfter(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
-    FXWindow *arg2 = (FXWindow *) 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);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); (arg1)->linkAfter(arg2); return Qnil; }
 static void
 free_FXWindow(FXWindow *arg1) {
     delete arg1;
@@ -6236,6 +6241,11 @@ static VALUE _wrap_FXWindow_setFocus(int argc, VALUE *argv, VALUE self) { FXWind
 static VALUE _wrap_FXWindow_killFocus(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_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXWindow_changeFocus(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
+    FXWindow *arg2 = (FXWindow *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXWindow_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXWindow_setDefault(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]); } 
@@ -6268,10 +6278,11 @@ static VALUE _wrap_FXWindow_recalc(int argc, VALUE *argv, VALUE self) { FXWindow
     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_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXWindow_reparent(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
-    FXComposite *arg2 = (FXComposite *) 0 ; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    FXWindow *arg2 = (FXWindow *) 0 ; FXWindow *arg3 = (FXWindow *) 0 ; 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);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXWindow_reparent(arg1,arg2); return Qnil; }
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXWindow, 1); FXWindow_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXWindow_show(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_show(arg1); return Qnil; }
@@ -6295,6 +6306,39 @@ static VALUE _wrap_FXWindow_setBackColor(int argc, VALUE *argv, VALUE self) { FX
     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_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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXWindow_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXWindow_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
+    FXBitmap *arg2 = (FXBitmap *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXWindow_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXWindow_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
+    FXIcon *arg2 = (FXIcon *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXWindow_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXWindow_setShape(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 == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXWindow, 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_FXRegion, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXWindow_setShape__SWIG_0(nargs, args, self);}  }  }  if (argc == 2) { int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXWindow, 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_FXBitmap, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXWindow_setShape__SWIG_1(nargs, args, self);}  }  }  if (argc == 2) { int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXWindow, 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_FXIcon, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXWindow_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXWindow_setShape'"); return Qnil; }
+static VALUE _wrap_FXWindow_clearShape(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_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXFrame_onPaint(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 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);
@@ -6398,10 +6442,6 @@ static VALUE _wrap_FXFrame_getBaseColor(int argc, VALUE *argv, VALUE self) { FXF
     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 = (FXColor)((FXFrame const *)arg1)->getBaseColor();
     vresult = UINT2NUM(result); return vresult; }
-static void
-free_FXFrame(FXFrame *arg1) {
-    delete arg1;
-}
 static VALUE _wrap_FXFrame_save(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 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_FXFrame, 1);
@@ -6453,6 +6493,11 @@ static VALUE _wrap_FXFrame_setFocus(int argc, VALUE *argv, VALUE self) { FXFrame
 static VALUE _wrap_FXFrame_killFocus(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_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXFrame_changeFocus(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ;
+    FXWindow *arg2 = (FXWindow *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXFrame_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXFrame_setDefault(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 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_FXFrame, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -6485,10 +6530,11 @@ static VALUE _wrap_FXFrame_recalc(int argc, VALUE *argv, VALUE self) { FXFrame *
     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_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXFrame_reparent(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ;
-    FXComposite *arg2 = (FXComposite *) 0 ; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    FXWindow *arg2 = (FXWindow *) 0 ; FXWindow *arg3 = (FXWindow *) 0 ; 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);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXFrame_reparent(arg1,arg2); return Qnil; }
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXWindow, 1); FXFrame_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXFrame_show(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_show(arg1); return Qnil; }
@@ -6512,6 +6558,39 @@ static VALUE _wrap_FXFrame_setBackColor(int argc, VALUE *argv, VALUE self) { FXF
     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_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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXFrame_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXFrame_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ;
+    FXBitmap *arg2 = (FXBitmap *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXFrame_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXFrame_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXFrame *arg1 = (FXFrame *) 0 ;
+    FXIcon *arg2 = (FXIcon *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXFrame_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXFrame_setShape(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 == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXFrame, 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_FXRegion, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXFrame_setShape__SWIG_0(nargs, args, self);}  }  }  if (argc == 2) { int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXFrame, 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_FXBitmap, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXFrame_setShape__SWIG_1(nargs, args, self);}  }  }  if (argc == 2) { int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXFrame, 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_FXIcon, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXFrame_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXFrame_setShape'"); return Qnil; }
+static VALUE _wrap_FXFrame_clearShape(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_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXComposite_onKeyPress(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 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);
@@ -6629,6 +6708,11 @@ static VALUE _wrap_FXComposite_setFocus(int argc, VALUE *argv, VALUE self) { FXC
 static VALUE _wrap_FXComposite_killFocus(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_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXComposite_changeFocus(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
+    FXWindow *arg2 = (FXWindow *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXComposite_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXComposite_setDefault(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 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_FXComposite, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -6661,10 +6745,11 @@ static VALUE _wrap_FXComposite_recalc(int argc, VALUE *argv, VALUE self) { FXCom
     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_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXComposite_reparent(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
-    FXComposite *arg2 = (FXComposite *) 0 ; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    FXWindow *arg2 = (FXWindow *) 0 ; FXWindow *arg3 = (FXWindow *) 0 ; 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);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXComposite_reparent(arg1,arg2); return Qnil; }
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXWindow, 1); FXComposite_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXComposite_show(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_show(arg1); return Qnil; }
@@ -6691,6 +6776,41 @@ static VALUE _wrap_FXComposite_setBackColor(int argc, VALUE *argv, VALUE self) {
     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_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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXComposite_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXComposite_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
+    FXBitmap *arg2 = (FXBitmap *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXComposite_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXComposite_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
+    FXIcon *arg2 = (FXIcon *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXComposite_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXComposite_setShape(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 == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXComposite, 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_FXRegion, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXComposite_setShape__SWIG_0(nargs, args, self);}  }  }  if (argc == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXComposite, 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_FXBitmap, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXComposite_setShape__SWIG_1(nargs, args, self);}  }  }  if (argc == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXComposite, 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_FXIcon, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXComposite_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXComposite_setShape'"); return Qnil; }
+static VALUE _wrap_FXComposite_clearShape(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_clearShape(arg1); return Qnil; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXRootWindow_allocate(VALUE self) {
 #else
@@ -6765,6 +6885,11 @@ static VALUE _wrap_FXRootWindow_setFocus(int argc, VALUE *argv, VALUE self) { FX
 static VALUE _wrap_FXRootWindow_killFocus(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_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXRootWindow_changeFocus(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 0 ;
+    FXWindow *arg2 = (FXWindow *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXRootWindow_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXRootWindow_setDefault(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 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_FXRootWindow, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -6797,10 +6922,11 @@ static VALUE _wrap_FXRootWindow_recalc(int argc, VALUE *argv, VALUE self) { FXRo
     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_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXRootWindow_reparent(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 0 ;
-    FXComposite *arg2 = (FXComposite *) 0 ; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    FXWindow *arg2 = (FXWindow *) 0 ; FXWindow *arg3 = (FXWindow *) 0 ; 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);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXRootWindow_reparent(arg1,arg2); return Qnil; }
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXWindow, 1); FXRootWindow_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXRootWindow_show(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_show(arg1); return Qnil; }
@@ -6827,6 +6953,41 @@ static VALUE _wrap_FXRootWindow_setBackColor(int argc, VALUE *argv, VALUE self)
     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_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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXRootWindow_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXRootWindow_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 0 ;
+    FXBitmap *arg2 = (FXBitmap *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXRootWindow_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXRootWindow_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXRootWindow *arg1 = (FXRootWindow *) 0 ;
+    FXIcon *arg2 = (FXIcon *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXRootWindow_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXRootWindow_setShape(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 == 2) {
+        int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXRootWindow, 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_FXRegion, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXRootWindow_setShape__SWIG_0(nargs, args, self);}  }  }  if (argc == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXRootWindow, 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_FXBitmap, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXRootWindow_setShape__SWIG_1(nargs, args, self);}  }  }  if (argc == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXRootWindow, 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_FXIcon, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXRootWindow_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXRootWindow_setShape'"); return Qnil; }
+static VALUE _wrap_FXRootWindow_clearShape(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_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXShell_onLayout(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 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);
@@ -6960,6 +7121,11 @@ static VALUE _wrap_FXShell_setFocus(int argc, VALUE *argv, VALUE self) { FXShell
 static VALUE _wrap_FXShell_killFocus(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_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXShell_changeFocus(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ;
+    FXWindow *arg2 = (FXWindow *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXShell_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXShell_setDefault(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 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_FXShell, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -6992,10 +7158,11 @@ static VALUE _wrap_FXShell_recalc(int argc, VALUE *argv, VALUE self) { FXShell *
     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_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXShell_reparent(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ;
-    FXComposite *arg2 = (FXComposite *) 0 ; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    FXWindow *arg2 = (FXWindow *) 0 ; FXWindow *arg3 = (FXWindow *) 0 ; 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);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXShell_reparent(arg1,arg2); return Qnil; }
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXWindow, 1); FXShell_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXShell_show(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_show(arg1); return Qnil; }
@@ -7019,6 +7186,39 @@ static VALUE _wrap_FXShell_setBackColor(int argc, VALUE *argv, VALUE self) { FXS
     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_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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXShell_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXShell_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ;
+    FXBitmap *arg2 = (FXBitmap *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXShell_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXShell_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXShell *arg1 = (FXShell *) 0 ;
+    FXIcon *arg2 = (FXIcon *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXShell_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXShell_setShape(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 == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXShell, 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_FXRegion, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXShell_setShape__SWIG_0(nargs, args, self);}  }  }  if (argc == 2) { int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXShell, 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_FXBitmap, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXShell_setShape__SWIG_1(nargs, args, self);}  }  }  if (argc == 2) { int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXShell, 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_FXIcon, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXShell_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXShell_setShape'"); return Qnil; }
+static VALUE _wrap_FXShell_clearShape(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_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXPopup_onPaint(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 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);
@@ -7276,6 +7476,11 @@ static VALUE _wrap_FXPopup_setFocus(int argc, VALUE *argv, VALUE self) { FXPopup
 static VALUE _wrap_FXPopup_killFocus(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_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXPopup_changeFocus(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ;
+    FXWindow *arg2 = (FXWindow *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXPopup_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXPopup_setDefault(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 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_FXPopup, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -7308,10 +7513,11 @@ static VALUE _wrap_FXPopup_recalc(int argc, VALUE *argv, VALUE self) { FXPopup *
     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_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXPopup_reparent(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ;
-    FXComposite *arg2 = (FXComposite *) 0 ; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    FXWindow *arg2 = (FXWindow *) 0 ; FXWindow *arg3 = (FXWindow *) 0 ; 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);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXPopup_reparent(arg1,arg2); return Qnil; }
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXWindow, 1); FXPopup_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXPopup_show(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_show(arg1); return Qnil; }
@@ -7335,6 +7541,39 @@ static VALUE _wrap_FXPopup_setBackColor(int argc, VALUE *argv, VALUE self) { FXP
     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_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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXPopup_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXPopup_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ;
+    FXBitmap *arg2 = (FXBitmap *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXPopup_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXPopup_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ;
+    FXIcon *arg2 = (FXIcon *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXPopup_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXPopup_setShape(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 == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXPopup, 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_FXRegion, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXPopup_setShape__SWIG_0(nargs, args, self);}  }  }  if (argc == 2) { int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXPopup, 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_FXBitmap, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXPopup_setShape__SWIG_1(nargs, args, self);}  }  }  if (argc == 2) { int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXPopup, 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_FXIcon, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXPopup_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXPopup_setShape'"); return Qnil; }
+static VALUE _wrap_FXPopup_clearShape(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_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXPopup_popup(int argc, VALUE *argv, VALUE self) { FXPopup *arg1 = (FXPopup *) 0 ;
     FXWindow *arg2 = (FXWindow *) 0 ; FXint arg3 ; FXint arg4 ; FXint arg5 = (FXint) 0 ; FXint arg6 = (FXint) 0 ;
     if ((argc < 3) || (argc > 5)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
@@ -7513,6 +7752,11 @@ static VALUE _wrap_new_FXTopWindow(int nargs, VALUE *args, VALUE self) { int arg
                                                                     return _wrap_new_FXTopWindow__SWIG_1(nargs, args, self);}  }
                                                              }  }  }  }  }  }  }  }  }  }  }  }  }  } 
     rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXTopWindow'"); return Qnil; }
+static VALUE _wrap_FXTopWindow_getWMBorders(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
+    VALUE 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 = (VALUE)FXTopWindow_getWMBorders(arg1);
+    vresult = result; return vresult; }
 static VALUE _wrap_FXTopWindow_place(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 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_FXTopWindow, 1); arg2 = NUM2UINT(argv[0]); (arg1)->place(arg2);
@@ -7689,6 +7933,11 @@ static VALUE _wrap_FXTopWindow_setFocus(int argc, VALUE *argv, VALUE self) { FXT
 static VALUE _wrap_FXTopWindow_killFocus(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_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXTopWindow_changeFocus(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
+    FXWindow *arg2 = (FXWindow *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXTopWindow_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXTopWindow_setDefault(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 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_FXTopWindow, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -7721,10 +7970,11 @@ static VALUE _wrap_FXTopWindow_recalc(int argc, VALUE *argv, VALUE self) { FXTop
     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_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXTopWindow_reparent(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
-    FXComposite *arg2 = (FXComposite *) 0 ; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    FXWindow *arg2 = (FXWindow *) 0 ; FXWindow *arg3 = (FXWindow *) 0 ; 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);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXTopWindow_reparent(arg1,arg2); return Qnil; }
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXWindow, 1); FXTopWindow_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXTopWindow_show__SWIG_0(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_show(arg1); return Qnil; }
@@ -7751,6 +8001,41 @@ static VALUE _wrap_FXTopWindow_setBackColor(int argc, VALUE *argv, VALUE self) {
     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_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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXTopWindow_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXTopWindow_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
+    FXBitmap *arg2 = (FXBitmap *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXTopWindow_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXTopWindow_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 0 ;
+    FXIcon *arg2 = (FXIcon *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXTopWindow_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXTopWindow_setShape(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 == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXTopWindow, 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_FXRegion, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXTopWindow_setShape__SWIG_0(nargs, args, self);}  }  }  if (argc == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXTopWindow, 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_FXBitmap, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXTopWindow_setShape__SWIG_1(nargs, args, self);}  }  }  if (argc == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXTopWindow, 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_FXIcon, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXTopWindow_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXTopWindow_setShape'"); return Qnil; }
+static VALUE _wrap_FXTopWindow_clearShape(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_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXTopWindow_show__SWIG_1(int argc, VALUE *argv, VALUE self) { FXTopWindow *arg1 = (FXTopWindow *) 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_FXTopWindow, 1); arg2 = NUM2UINT(argv[0]); FXTopWindow_show(arg1,arg2);
@@ -7868,6 +8153,11 @@ static VALUE _wrap_FXMainWindow_setFocus(int argc, VALUE *argv, VALUE self) { FX
 static VALUE _wrap_FXMainWindow_killFocus(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_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXMainWindow_changeFocus(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 0 ;
+    FXWindow *arg2 = (FXWindow *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXMainWindow_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXMainWindow_setDefault(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 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_FXMainWindow, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -7900,10 +8190,11 @@ static VALUE _wrap_FXMainWindow_recalc(int argc, VALUE *argv, VALUE self) { FXMa
     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_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXMainWindow_reparent(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 0 ;
-    FXComposite *arg2 = (FXComposite *) 0 ; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    FXWindow *arg2 = (FXWindow *) 0 ; FXWindow *arg3 = (FXWindow *) 0 ; 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);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXMainWindow_reparent(arg1,arg2); return Qnil; }
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXWindow, 1); FXMainWindow_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXMainWindow_show__SWIG_0(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_show(arg1); return Qnil; }
@@ -7930,6 +8221,41 @@ static VALUE _wrap_FXMainWindow_setBackColor(int argc, VALUE *argv, VALUE self)
     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_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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXMainWindow_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXMainWindow_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 0 ;
+    FXBitmap *arg2 = (FXBitmap *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXMainWindow_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXMainWindow_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 0 ;
+    FXIcon *arg2 = (FXIcon *) 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXMainWindow_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXMainWindow_setShape(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 == 2) {
+        int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXMainWindow, 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_FXRegion, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXMainWindow_setShape__SWIG_0(nargs, args, self);}  }  }  if (argc == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXMainWindow, 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_FXBitmap, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXMainWindow_setShape__SWIG_1(nargs, args, self);}  }  }  if (argc == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXMainWindow, 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_FXIcon, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXMainWindow_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXMainWindow_setShape'"); return Qnil; }
+static VALUE _wrap_FXMainWindow_clearShape(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_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXMainWindow_show__SWIG_1(int argc, VALUE *argv, VALUE self) { FXMainWindow *arg1 = (FXMainWindow *) 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_FXMainWindow, 1); arg2 = NUM2UINT(argv[0]); FXMainWindow_show(arg1,arg2);
@@ -7963,6 +8289,277 @@ static VALUE _wrap_FXMainWindow_close(int argc, VALUE *argv, VALUE self) { FXMai
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMainWindow, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
     result = (FXbool)FXMainWindow_close(arg1,arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXSplashWindow_onPaint(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 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_FXSplashWindow, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = to_FXEvent(argv[2]);
+    result = (long)(arg1)->onPaint(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_new_FXSplashWindow__SWIG_0(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ;
+    FXIcon *arg2 = (FXIcon *) 0 ; FXuint arg3 = (FXuint) SPLASH_SIMPLE ; FXuint arg4 = (FXuint) 5000 ; FXSplashWindow *result;
+    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);
+    SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); if (argc > 2) { arg3 = NUM2UINT(argv[2]); } 
+    if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  { result = (FXSplashWindow *)new FXSplashWindow(arg1,arg2,arg3,arg4);
+        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_FXSplashWindow_allocate(VALUE self) {
+#else
+     static VALUE _wrap_FXSplashWindow_allocate(int argc, VALUE *argv, VALUE self) {
+#endif
+         VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXSplashWindow);
+#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+        rb_obj_call_init(vresult, argc, argv);
+#endif
+         return vresult; }
+static VALUE _wrap_new_FXSplashWindow__SWIG_1(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 = (FXWindow *) 0 ;
+    FXIcon *arg2 = (FXIcon *) 0 ; FXuint arg3 = (FXuint) SPLASH_SIMPLE ; FXuint arg4 = (FXuint) 5000 ; FXSplashWindow *result;
+    if ((argc < 2) || (argc > 4)) 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_FXIcon, 1); if (argc > 2) { arg3 = NUM2UINT(argv[2]); } 
+    if (argc > 3) { arg4 = NUM2UINT(argv[3]); }  { result = (FXSplashWindow *)new FXSplashWindow(arg1,arg2,arg3,arg4);
+        DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
+static VALUE _wrap_new_FXSplashWindow(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 >= 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) { { void *ptr;
+                _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXIcon, 0) != -1)) ? 1 : 0; }
+             if (_v) { if (argc <= 2) { return _wrap_new_FXSplashWindow__SWIG_0(nargs, args, self);}  {
+                    _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { if (argc <= 3) {
+                        return _wrap_new_FXSplashWindow__SWIG_0(nargs, args, self);}  {
+                        _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
+                        return _wrap_new_FXSplashWindow__SWIG_0(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_FXWindow, 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_FXIcon, 0) != -1)) ? 1 : 0; }
+             if (_v) { if (argc <= 2) { return _wrap_new_FXSplashWindow__SWIG_1(nargs, args, self);}  {
+                    _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { if (argc <= 3) {
+                        return _wrap_new_FXSplashWindow__SWIG_1(nargs, args, self);}  {
+                        _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
+                        return _wrap_new_FXSplashWindow__SWIG_1(nargs, args, self);}  }  }  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXSplashWindow'"); return Qnil; }
+static VALUE _wrap_FXSplashWindow_icone___(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
+    FXIcon *arg2 = (FXIcon *) 0 ; 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); (arg1)->setIcon(arg2); return Qnil; }
+static VALUE _wrap_FXSplashWindow_icon(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
+    FXIcon *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 = (FXIcon *)((FXSplashWindow const *)arg1)->getIcon(); {
+        swig_type_info *ty = SWIG_TypeDynamicCast(SWIGTYPE_p_FXIcon, (void **) &result); vresult = FXRbGetRubyObj(result, ty); }
+     return vresult; }
+static VALUE _wrap_FXSplashWindow_delaye___(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 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_FXSplashWindow, 1); arg2 = NUM2UINT(argv[0]); (arg1)->setDelay(arg2);
+    return Qnil; }
+static VALUE _wrap_FXSplashWindow_delay(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 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_FXSplashWindow, 1);
+    result = (FXuint)((FXSplashWindow const *)arg1)->getDelay(); vresult = UINT2NUM(result); return vresult; }
+static void
+free_FXSplashWindow(FXSplashWindow *arg1) {
+    delete arg1;
+}
+static VALUE _wrap_FXSplashWindow_save(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 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_FXSplashWindow, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXSplashWindow_save((FXSplashWindow const *)arg1,*arg2); return Qnil; }
+static VALUE _wrap_FXSplashWindow_load(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 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_FXSplashWindow, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXSplashWindow_load(arg1,*arg2); return Qnil; }
+static VALUE _wrap_FXSplashWindow_create(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_create(arg1); return Qnil; }
+static VALUE _wrap_FXSplashWindow_detach(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_detach(arg1); return Qnil; }
+static VALUE _wrap_FXSplashWindow_destroy(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_destroy(arg1); return Qnil; }
+static VALUE _wrap_FXSplashWindow_resize(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
+    FXint arg2 ; FXint arg3 ; 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]);
+    FXSplashWindow_resize(arg1,arg2,arg3); return Qnil; }
+static VALUE _wrap_FXSplashWindow_getDefaultWidth(int argc, VALUE *argv, VALUE self) {
+    FXSplashWindow *arg1 = (FXSplashWindow *) 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_FXSplashWindow, 1); result = (FXint)FXSplashWindow_getDefaultWidth(arg1);
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXSplashWindow_getDefaultHeight(int argc, VALUE *argv, VALUE self) {
+    FXSplashWindow *arg1 = (FXSplashWindow *) 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_FXSplashWindow, 1); result = (FXint)FXSplashWindow_getDefaultHeight(arg1);
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXSplashWindow_getWidthForHeight(int argc, VALUE *argv, VALUE self) {
+    FXSplashWindow *arg1 = (FXSplashWindow *) 0 ; FXint 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_FXSplashWindow, 1); arg2 = NUM2INT(argv[0]);
+    result = (FXint)FXSplashWindow_getWidthForHeight(arg1,arg2); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXSplashWindow_getHeightForWidth(int argc, VALUE *argv, VALUE self) {
+    FXSplashWindow *arg1 = (FXSplashWindow *) 0 ; FXint 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_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))
+    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; }
+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; }
+static VALUE _wrap_FXSplashWindow_killFocus(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_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXSplashWindow_changeFocus(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
+    FXWindow *arg2 = (FXWindow *) 0 ; 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXSplashWindow_changeFocus(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSplashWindow_setDefault(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 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_FXSplashWindow, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
+    FXSplashWindow_setDefault(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSplashWindow_enable(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_enable(arg1); return Qnil; }
+static VALUE _wrap_FXSplashWindow_disable(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_disable(arg1); return Qnil; }
+static VALUE _wrap_FXSplashWindow_raiseWindow(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_raise(arg1); return Qnil; }
+static VALUE _wrap_FXSplashWindow_lower(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_lower(arg1); return Qnil; }
+static VALUE _wrap_FXSplashWindow_move(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
+    FXint arg2 ; FXint arg3 ; 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]);
+    FXSplashWindow_move(arg1,arg2,arg3); return Qnil; }
+static VALUE _wrap_FXSplashWindow_position(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
+    FXint arg2 ; FXint arg3 ; FXint arg4 ; FXint arg5 ; if ((argc < 4) || (argc > 4))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSplashWindow, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
+    arg4 = NUM2INT(argv[2]); arg5 = NUM2INT(argv[3]); FXSplashWindow_position(arg1,arg2,arg3,arg4,arg5); return Qnil; }
+static VALUE _wrap_FXSplashWindow_layout(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_layout(arg1); return Qnil; }
+static VALUE _wrap_FXSplashWindow_recalc(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_recalc(arg1); return Qnil; }
+static VALUE _wrap_FXSplashWindow_reparent(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
+    FXWindow *arg2 = (FXWindow *) 0 ; FXWindow *arg3 = (FXWindow *) 0 ; 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXWindow, 1); FXSplashWindow_reparent(arg1,arg2,arg3); return Qnil; }
+static VALUE _wrap_FXSplashWindow_show__SWIG_0(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_show(arg1); return Qnil; }
+static VALUE _wrap_FXSplashWindow_hide(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_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))
+    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; }
+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))
+    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;
+    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))
+    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;
+    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_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);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSplashWindow, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXSplashWindow_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXSplashWindow_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
+    FXSplashWindow *arg1 = (FXSplashWindow *) 0 ; FXBitmap *arg2 = (FXBitmap *) 0 ; 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXSplashWindow_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSplashWindow_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
+    FXSplashWindow *arg1 = (FXSplashWindow *) 0 ; FXIcon *arg2 = (FXIcon *) 0 ; 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);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXSplashWindow_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSplashWindow_setShape(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 == 2) {
+        int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXSplashWindow, 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_FXRegion, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXSplashWindow_setShape__SWIG_0(nargs, args, self);}  }  }  if (argc == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXSplashWindow, 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_FXBitmap, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXSplashWindow_setShape__SWIG_1(nargs, args, self);}  }  }  if (argc == 2) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXSplashWindow, 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_FXIcon, 0) != -1)) ? 1 : 0; }
+             if (_v) { return _wrap_FXSplashWindow_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXSplashWindow_setShape'"); return Qnil; }
+static VALUE _wrap_FXSplashWindow_clearShape(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_clearShape(arg1); return Qnil; }
+static VALUE _wrap_FXSplashWindow_show__SWIG_1(int argc, VALUE *argv, VALUE self) {
+    FXSplashWindow *arg1 = (FXSplashWindow *) 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_FXSplashWindow, 1); arg2 = NUM2UINT(argv[0]);
+    FXSplashWindow_show(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSplashWindow_show(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; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXSplashWindow, 0) != -1)) ? 1 : 0; }
+         if (_v) { return _wrap_FXSplashWindow_show__SWIG_0(nargs, args, self);}  }  if (argc == 2) { int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXSplashWindow, 0) != -1)) ? 1 : 0; }
+         if (_v) { { _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
+                return _wrap_FXSplashWindow_show__SWIG_1(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXSplashWindow_show'"); return Qnil; }
+static VALUE _wrap_FXSplashWindow_maximize(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
+    FXbool arg2 = (FXbool) 0 ; FXbool 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_FXSplashWindow, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
+    result = (FXbool)FXSplashWindow_maximize(arg1,arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXSplashWindow_minimize(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
+    FXbool arg2 = (FXbool) 0 ; FXbool 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_FXSplashWindow, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
+    result = (FXbool)FXSplashWindow_minimize(arg1,arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXSplashWindow_restore(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
+    FXbool arg2 = (FXbool) 0 ; FXbool 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_FXSplashWindow, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
+    result = (FXbool)FXSplashWindow_restore(arg1,arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXSplashWindow_close(int argc, VALUE *argv, VALUE self) { FXSplashWindow *arg1 = (FXSplashWindow *) 0 ;
+    FXbool arg2 = (FXbool) 0 ; FXbool 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_FXSplashWindow, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
+    result = (FXbool)FXSplashWindow_close(arg1,arg2); vresult = result ? Qtrue : Qfalse; return vresult; }
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -7984,6 +8581,9 @@ static void *_p_FXTopWindowTo_p_FXComposite(void *x) {
 static void *_p_FXMainWindowTo_p_FXComposite(void *x) {
     return (void *)((FXComposite *) (FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXComposite(void *x) {
+    return (void *)((FXComposite *) (FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
+}
 static void *_p_FXPopupTo_p_FXShell(void *x) {
     return (void *)((FXShell *)  ((FXPopup *) x));
 }
@@ -7993,6 +8593,9 @@ static void *_p_FXTopWindowTo_p_FXShell(void *x) {
 static void *_p_FXMainWindowTo_p_FXShell(void *x) {
     return (void *)((FXShell *) (FXTopWindow *) ((FXMainWindow *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXShell(void *x) {
+    return (void *)((FXShell *) (FXTopWindow *) ((FXSplashWindow *) x));
+}
 static void *_p_FXCompositeTo_p_FXWindow(void *x) {
     return (void *)((FXWindow *)  ((FXComposite *) x));
 }
@@ -8011,12 +8614,18 @@ static void *_p_FXTopWindowTo_p_FXWindow(void *x) {
 static void *_p_FXMainWindowTo_p_FXWindow(void *x) {
     return (void *)((FXWindow *) (FXComposite *)(FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXComposite *)(FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
+}
 static void *_p_FXFrameTo_p_FXWindow(void *x) {
     return (void *)((FXWindow *)  ((FXFrame *) x));
 }
 static void *_p_FXMainWindowTo_p_FXTopWindow(void *x) {
     return (void *)((FXTopWindow *)  ((FXMainWindow *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXTopWindow(void *x) {
+    return (void *)((FXTopWindow *)  ((FXSplashWindow *) x));
+}
 static void *_p_FXFrameTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *) ((FXFrame *) x));
 }
@@ -8032,9 +8641,6 @@ static void *_p_FXAccelTableTo_p_FXObject(void *x) {
 static void *_p_FXAppTo_p_FXObject(void *x) {
     return (void *)((FXObject *)  ((FXApp *) x));
 }
-static void *_p_FXIconDictTo_p_FXObject(void *x) {
-    return (void *)((FXObject *) (FXDict *) ((FXIconDict *) x));
-}
 static void *_p_FXWindowTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXId *)(FXDrawable *) ((FXWindow *) x));
 }
@@ -8050,6 +8656,9 @@ static void *_p_FXTopWindowTo_p_FXObject(void *x) {
 static void *_p_FXMainWindowTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXObject(void *x) {
+    return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
+}
 static void *_p_FXFileDictTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXDict *) ((FXFileDict *) x));
 }
@@ -8062,12 +8671,12 @@ static void *_p_FXShellTo_p_FXObject(void *x) {
 static void *_p_FXStringDictTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXDict *) ((FXStringDict *) x));
 }
-static void *_p_FXRegistryTo_p_FXObject(void *x) {
-    return (void *)((FXObject *) (FXDict *)(FXSettings *) ((FXRegistry *) x));
-}
 static void *_p_FXCursorTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXId *) ((FXCursor *) x));
 }
+static void *_p_FXRegistryTo_p_FXObject(void *x) {
+    return (void *)((FXObject *) (FXDict *)(FXSettings *) ((FXRegistry *) x));
+}
 static void *_p_FXCURCursorTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXId *)(FXCursor *) ((FXCURCursor *) x));
 }
@@ -8122,6 +8731,9 @@ static void *_p_FXTopWindowTo_p_FXDrawable(void *x) {
 static void *_p_FXMainWindowTo_p_FXDrawable(void *x) {
     return (void *)((FXDrawable *) (FXWindow *)(FXComposite *)(FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXDrawable(void *x) {
+    return (void *)((FXDrawable *) (FXWindow *)(FXComposite *)(FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
+}
 static void *_p_FXFrameTo_p_FXDrawable(void *x) {
     return (void *)((FXDrawable *) (FXWindow *) ((FXFrame *) x));
 }
@@ -8137,9 +8749,6 @@ static void *_p_FXFileStreamTo_p_FXStream(void *x) {
 static void *_p_FXMemoryStreamTo_p_FXStream(void *x) {
     return (void *)((FXStream *)  ((FXMemoryStream *) x));
 }
-static void *_p_FXIconDictTo_p_FXDict(void *x) {
-    return (void *)((FXDict *)  ((FXIconDict *) x));
-}
 static void *_p_FXFileDictTo_p_FXDict(void *x) {
     return (void *)((FXDict *)  ((FXFileDict *) x));
 }
@@ -8173,6 +8782,9 @@ static void *_p_FXWindowTo_p_FXId(void *x) {
 static void *_p_FXCompositeTo_p_FXId(void *x) {
     return (void *)((FXId *) (FXDrawable *)(FXWindow *) ((FXComposite *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
+}
 static void *_p_FXShellTo_p_FXId(void *x) {
     return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *) ((FXShell *) x));
 }
@@ -8194,38 +8806,42 @@ static void *_p_FXFontTo_p_FXId(void *x) {
 static void *_p_FXVisualTo_p_FXId(void *x) {
     return (void *)((FXId *)  ((FXVisual *) x));
 }
-static swig_type_info _swigt__p_FXDict[] = {{"_p_FXDict", 0, "FXDict *", 0, 0, 0, 0},{"_p_FXDict", 0, 0, 0, 0, 0, 0},{"_p_FXIconDict", _p_FXIconDictTo_p_FXDict, 0, 0, 0, 0, 0},{"_p_FXFileDict", _p_FXFileDictTo_p_FXDict, 0, 0, 0, 0, 0},{"_p_FXRegistry", _p_FXRegistryTo_p_FXDict, 0, 0, 0, 0, 0},{"_p_FXStringDict", _p_FXStringDictTo_p_FXDict, 0, 0, 0, 0, 0},{"_p_FXSettings", _p_FXSettingsTo_p_FXDict, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXDict[] = {{"_p_FXDict", 0, "FXDict *", 0, 0, 0, 0},{"_p_FXDict", 0, 0, 0, 0, 0, 0},{"_p_FXFileDict", _p_FXFileDictTo_p_FXDict, 0, 0, 0, 0, 0},{"_p_FXRegistry", _p_FXRegistryTo_p_FXDict, 0, 0, 0, 0, 0},{"_p_FXStringDict", _p_FXStringDictTo_p_FXDict, 0, 0, 0, 0, 0},{"_p_FXSettings", _p_FXSettingsTo_p_FXDict, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXSettings[] = {{"_p_FXSettings", 0, "FXSettings *", 0, 0, 0, 0},{"_p_FXRegistry", _p_FXRegistryTo_p_FXSettings, 0, 0, 0, 0, 0},{"_p_FXSettings", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXAccelTable[] = {{"_p_FXAccelTable", 0, "FXAccelTable *", 0, 0, 0, 0},{"_p_FXAccelTable", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXlong[] = {{"_p_FXlong", 0, "FXlong *", 0, 0, 0, 0},{"_p_FXlong", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXuchar[] = {{"_p_FXuchar", 0, "unsigned char const *|FXuchar const *", 0, 0, 0, 0},{"_p_FXuchar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXComposite[] = {{"_p_FXComposite", 0, "FXComposite *", 0, 0, 0, 0},{"_p_FXComposite", 0, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXComposite[] = {{"_p_FXComposite", 0, "FXComposite *", 0, 0, 0, 0},{"_p_FXComposite", 0, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXRegistry[] = {{"_p_FXRegistry", 0, "FXRegistry *", 0, 0, 0, 0},{"_p_FXRegistry", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXId[] = {{"_p_FXId", 0, "FXId *", 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXFont", _p_FXFontTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXId", 0, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXGIFCursor", _p_FXGIFCursorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXCursor", _p_FXCursorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXDrawable", _p_FXDrawableTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXVisual", _p_FXVisualTo_p_FXId, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXId[] = {{"_p_FXId", 0, "FXId *", 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXFont", _p_FXFontTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXId", 0, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXGIFCursor", _p_FXGIFCursorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXCursor", _p_FXCursorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXDrawable", _p_FXDrawableTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXVisual", _p_FXVisualTo_p_FXId, 0, 0, 0, 0, 0},{0, 0, 0, 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},{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_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_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},{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}};
 static swig_type_info _swigt__p_void[] = {{"_p_void", 0, "void *", 0, 0, 0, 0},{"_p_void", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXDocument[] = {{"_p_FXDocument", 0, "FXDocument *", 0, 0, 0, 0},{"_p_FXDocument", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXRecentFiles[] = {{"_p_FXRecentFiles", 0, "FXRecentFiles *", 0, 0, 0, 0},{"_p_FXRecentFiles", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXMainWindow[] = {{"_p_FXMainWindow", 0, "FXMainWindow *", 0, 0, 0, 0},{"_p_FXMainWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXSplashWindow[] = {{"_p_FXSplashWindow", 0, "FXSplashWindow *", 0, 0, 0, 0},{"_p_FXSplashWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXIcon[] = {{"_p_FXIcon", 0, "FXIcon *", 0, 0, 0, 0},{"_p_FXIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXID[] = {{"_p_FXID", 0, "FXID *", 0, 0, 0, 0},{"_p_FXID", 0, 0, 0, 0, 0, 0},{0, 0, 0, 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_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_FXIconDict", _p_FXIconDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDict", _p_FXDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_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_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_FXWindow", _p_FXWindowTo_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_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_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_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_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_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_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_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}};
@@ -8249,6 +8865,7 @@ static swig_type_info *swig_types_initial[] = {
 _swigt__p_FXDict, 
 _swigt__p_FXSettings, 
 _swigt__p_FXAccelTable, 
+_swigt__p_FXlong, 
 _swigt__p_FXuchar, 
 _swigt__p_FXComposite, 
 _swigt__p_FXRegistry, 
@@ -8264,20 +8881,23 @@ _swigt__p_void,
 _swigt__p_FXDocument, 
 _swigt__p_FXRecentFiles, 
 _swigt__p_FXMainWindow, 
+_swigt__p_FXSplashWindow, 
 _swigt__p_FXIcon, 
 _swigt__p_FXID, 
+_swigt__p_FXMutex, 
 _swigt__p_FXEvent, 
 _swigt__p_FXObject, 
 _swigt__p_FXStringDict, 
+_swigt__p_FXBitmap, 
 _swigt__p_FXRectangle, 
 _swigt__p_FXString, 
 _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_FXStream, 
@@ -8397,6 +9017,8 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_const(mFox,"SEL_IO_WRITE", INT2NUM(SEL_IO_WRITE));
     rb_define_const(mFox,"SEL_IO_EXCEPT", INT2NUM(SEL_IO_EXCEPT));
     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_LAST", INT2NUM(SEL_LAST));
     rb_define_const(mFox,"SHIFTMASK", INT2NUM(SHIFTMASK));
     rb_define_const(mFox,"CAPSLOCKMASK", INT2NUM(CAPSLOCKMASK));
@@ -8499,10 +9121,11 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXStream.klass, "container", VALUEFUNC(_wrap_FXStream_container), -1);
     rb_define_method(cFXStream.klass, "getPosition", VALUEFUNC(_wrap_FXStream_getPosition), -1);
     rb_define_method(cFXStream.klass, "swapBytes", VALUEFUNC(_wrap_FXStream_swapBytes), -1);
-    rb_define_singleton_method(cFXStream.klass, "isLittleEndian", VALUEFUNC(_wrap_FXStream_isLittleEndian), -1);
+    rb_define_method(cFXStream.klass, "setBigEndian", VALUEFUNC(_wrap_FXStream_setBigEndian), -1);
+    rb_define_method(cFXStream.klass, "isBigEndian", VALUEFUNC(_wrap_FXStream_isBigEndian), -1);
     rb_define_method(cFXStream.klass, "close", VALUEFUNC(_wrap_FXStream_close), -1);
     rb_define_method(cFXStream.klass, "flush", VALUEFUNC(_wrap_FXStream_flush), -1);
-    rb_define_method(cFXStream.klass, "setPosition", VALUEFUNC(_wrap_FXStream_setPosition), -1);
+    rb_define_method(cFXStream.klass, "position", VALUEFUNC(_wrap_FXStream_position), -1);
     cFXStream.mark = (void (*)(void *)) FXRbStream::markfunc;
     cFXStream.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
     
@@ -8511,9 +9134,10 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_alloc_func(cFXFileStream.klass, _wrap_FXFileStream_allocate);
     rb_define_method(cFXFileStream.klass, "initialize", VALUEFUNC(_wrap_new_FXFileStream), -1);
     rb_define_method(cFXFileStream.klass, "open", VALUEFUNC(_wrap_FXFileStream_open), -1);
+    rb_define_method(cFXFileStream.klass, "getPosition", VALUEFUNC(_wrap_FXFileStream_getPosition), -1);
     rb_define_method(cFXFileStream.klass, "close", VALUEFUNC(_wrap_FXFileStream_close), -1);
     rb_define_method(cFXFileStream.klass, "flush", VALUEFUNC(_wrap_FXFileStream_flush), -1);
-    rb_define_method(cFXFileStream.klass, "setPosition", VALUEFUNC(_wrap_FXFileStream_setPosition), -1);
+    rb_define_method(cFXFileStream.klass, "position", VALUEFUNC(_wrap_FXFileStream_position), -1);
     cFXFileStream.mark = (void (*)(void *)) FXRbFileStream::markfunc;
     cFXFileStream.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
     
@@ -8524,6 +9148,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXMemoryStream.klass, "open", VALUEFUNC(_wrap_FXMemoryStream_open), -1);
     rb_define_method(cFXMemoryStream.klass, "takeBuffer", VALUEFUNC(_wrap_FXMemoryStream_takeBuffer), -1);
     rb_define_method(cFXMemoryStream.klass, "giveBuffer", VALUEFUNC(_wrap_FXMemoryStream_giveBuffer), -1);
+    rb_define_method(cFXMemoryStream.klass, "getPosition", VALUEFUNC(_wrap_FXMemoryStream_getPosition), -1);
     cFXMemoryStream.mark = (void (*)(void *)) FXRbMemoryStream::markfunc;
     cFXMemoryStream.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
     
@@ -8614,6 +9239,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_alloc_func(cFXObject.klass, _wrap_FXObject_allocate);
     rb_define_method(cFXObject.klass, "initialize", VALUEFUNC(_wrap_new_FXObject), -1);
     rb_define_method(cFXObject.klass, "handle", VALUEFUNC(_wrap_FXObject_handle), -1);
+    rb_define_method(cFXObject.klass, "tryHandle", VALUEFUNC(_wrap_FXObject_tryHandle), -1);
     rb_define_method(cFXObject.klass, "save", VALUEFUNC(_wrap_FXObject_save), -1);
     rb_define_method(cFXObject.klass, "load", VALUEFUNC(_wrap_FXObject_load), -1);
     cFXObject.mark = (void (*)(void *)) FXRbObject::markfunc;
@@ -8739,8 +9365,10 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXApp.klass, "initialize", VALUEFUNC(_wrap_new_FXApp), -1);
     rb_define_method(cFXApp.klass, "onCmdQuit", VALUEFUNC(_wrap_FXApp_onCmdQuit), -1);
     rb_define_method(cFXApp.klass, "onCmdDump", VALUEFUNC(_wrap_FXApp_onCmdDump), -1);
+    rb_define_method(cFXApp.klass, "onCmdHover", VALUEFUNC(_wrap_FXApp_onCmdHover), -1);
     rb_define_const(cFXApp.klass,"ID_QUIT", INT2NUM(FXApp::ID_QUIT));
     rb_define_const(cFXApp.klass,"ID_DUMP", INT2NUM(FXApp::ID_DUMP));
+    rb_define_const(cFXApp.klass,"ID_HOVER", INT2NUM(FXApp::ID_HOVER));
     rb_define_const(cFXApp.klass,"ID_LAST", INT2NUM(FXApp::ID_LAST));
     rb_define_singleton_method(cFXApp.klass, "copyright", VALUEFUNC(_wrap_FXApp_copyright), -1);
     rb_define_method(cFXApp.klass, "getAppName", VALUEFUNC(_wrap_FXApp_getAppName), -1);
@@ -8755,6 +9383,7 @@ SWIGEXPORT(void) Init_core(void) {
     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, "getCursorWindow", VALUEFUNC(_wrap_FXApp_getCursorWindow), -1);
     rb_define_method(cFXApp.klass, "getFocusWindow", VALUEFUNC(_wrap_FXApp_getFocusWindow), -1);
     rb_define_method(cFXApp.klass, "getPopupWindow", VALUEFUNC(_wrap_FXApp_getPopupWindow), -1);
@@ -8764,6 +9393,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXApp.klass, "removeTimeout", VALUEFUNC(_wrap_FXApp_removeTimeout), -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_hasChoreq___), -1);
@@ -8771,6 +9401,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXApp.klass, "removeSignal", VALUEFUNC(_wrap_FXApp_removeSignal), -1);
     rb_define_method(cFXApp.klass, "addInput", VALUEFUNC(_wrap_FXApp_addInput), -1);
     rb_define_method(cFXApp.klass, "removeInput", VALUEFUNC(_wrap_FXApp_removeInput), -1);
+    rb_define_method(cFXApp.klass, "getKeyState", VALUEFUNC(_wrap_FXApp_getKeyState), -1);
     rb_define_method(cFXApp.klass, "peekEvent", VALUEFUNC(_wrap_FXApp_peekEvent), -1);
     rb_define_method(cFXApp.klass, "runOneEvent", VALUEFUNC(_wrap_FXApp_runOneEvent), -1);
     rb_define_method(cFXApp.klass, "run", VALUEFUNC(_wrap_FXApp_run), -1);
@@ -8804,6 +9435,7 @@ 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, "mutex", VALUEFUNC(_wrap_FXApp_mutex), -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);
@@ -8836,6 +9468,8 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXApp.klass, "getSelbackColor", VALUEFUNC(_wrap_FXApp_getSelbackColor), -1);
     rb_define_method(cFXApp.klass, "getTipforeColor", VALUEFUNC(_wrap_FXApp_getTipforeColor), -1);
     rb_define_method(cFXApp.klass, "getTipbackColor", VALUEFUNC(_wrap_FXApp_getTipbackColor), -1);
+    rb_define_method(cFXApp.klass, "getSelMenuTextColor", VALUEFUNC(_wrap_FXApp_getSelMenuTextColor), -1);
+    rb_define_method(cFXApp.klass, "getSelMenuBackColor", VALUEFUNC(_wrap_FXApp_getSelMenuBackColor), -1);
     rb_define_method(cFXApp.klass, "setBorderColor", VALUEFUNC(_wrap_FXApp_setBorderColor), -1);
     rb_define_method(cFXApp.klass, "setBaseColor", VALUEFUNC(_wrap_FXApp_setBaseColor), -1);
     rb_define_method(cFXApp.klass, "setHiliteColor", VALUEFUNC(_wrap_FXApp_setHiliteColor), -1);
@@ -8846,6 +9480,8 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXApp.klass, "setSelbackColor", VALUEFUNC(_wrap_FXApp_setSelbackColor), -1);
     rb_define_method(cFXApp.klass, "setTipforeColor", VALUEFUNC(_wrap_FXApp_setTipforeColor), -1);
     rb_define_method(cFXApp.klass, "setTipbackColor", VALUEFUNC(_wrap_FXApp_setTipbackColor), -1);
+    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, "save", VALUEFUNC(_wrap_FXApp_save), -1);
     rb_define_method(cFXApp.klass, "load", VALUEFUNC(_wrap_FXApp_load), -1);
@@ -8876,6 +9512,8 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_const(cFXDataTarget.klass,"DT_USHORT", INT2NUM(FXDataTarget::DT_USHORT));
     rb_define_const(cFXDataTarget.klass,"DT_INT", INT2NUM(FXDataTarget::DT_INT));
     rb_define_const(cFXDataTarget.klass,"DT_UINT", INT2NUM(FXDataTarget::DT_UINT));
+    rb_define_const(cFXDataTarget.klass,"DT_LONG", INT2NUM(FXDataTarget::DT_LONG));
+    rb_define_const(cFXDataTarget.klass,"DT_ULONG", INT2NUM(FXDataTarget::DT_ULONG));
     rb_define_const(cFXDataTarget.klass,"DT_FLOAT", INT2NUM(FXDataTarget::DT_FLOAT));
     rb_define_const(cFXDataTarget.klass,"DT_DOUBLE", INT2NUM(FXDataTarget::DT_DOUBLE));
     rb_define_const(cFXDataTarget.klass,"DT_STRING", INT2NUM(FXDataTarget::DT_STRING));
@@ -8966,22 +9604,6 @@ SWIGEXPORT(void) Init_core(void) {
     cFXFileAssoc.mark = 0;
     cFXFileAssoc.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
     
-    cFXIconDict.klass = rb_define_class_under(mFox, "FXIconDict", ((swig_class *) SWIGTYPE_p_FXDict->clientdata)->klass);
-    SWIG_TypeClientData(SWIGTYPE_p_FXIconDict, (void *) &cFXIconDict);
-    rb_define_alloc_func(cFXIconDict.klass, _wrap_FXIconDict_allocate);
-    rb_define_method(cFXIconDict.klass, "initialize", VALUEFUNC(_wrap_new_FXIconDict), -1);
-    rb_define_singleton_method(cFXIconDict.klass, "defaultIconPath", VALUEFUNC(_wrap_FXIconDict_defaultIconPath), -1);
-    rb_define_method(cFXIconDict.klass, "getApp", VALUEFUNC(_wrap_FXIconDict_getApp), -1);
-    rb_define_method(cFXIconDict.klass, "setIconPath", VALUEFUNC(_wrap_FXIconDict_setIconPath), -1);
-    rb_define_method(cFXIconDict.klass, "getIconPath", VALUEFUNC(_wrap_FXIconDict_getIconPath), -1);
-    rb_define_method(cFXIconDict.klass, "insert", VALUEFUNC(_wrap_FXIconDict_insert), -1);
-    rb_define_method(cFXIconDict.klass, "remove", VALUEFUNC(_wrap_FXIconDict_remove), -1);
-    rb_define_method(cFXIconDict.klass, "find", VALUEFUNC(_wrap_FXIconDict_find), -1);
-    rb_define_method(cFXIconDict.klass, "save", VALUEFUNC(_wrap_FXIconDict_save), -1);
-    rb_define_method(cFXIconDict.klass, "load", VALUEFUNC(_wrap_FXIconDict_load), -1);
-    cFXIconDict.mark = (void (*)(void *)) FXRbIconDict::markfunc;
-    cFXIconDict.destroy = (void (*)(void *)) FXRbObject::freefunc;
-    
     cFXFileDict.klass = rb_define_class_under(mFox, "FXFileDict", ((swig_class *) SWIGTYPE_p_FXDict->clientdata)->klass);
     SWIG_TypeClientData(SWIGTYPE_p_FXFileDict, (void *) &cFXFileDict);
     rb_define_alloc_func(cFXFileDict.klass, _wrap_FXFileDict_allocate);
@@ -8989,7 +9611,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, "getApp", VALUEFUNC(_wrap_FXFileDict_getApp), -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);
     rb_define_method(cFXFileDict.klass, "getIconPath", VALUEFUNC(_wrap_FXFileDict_getIconPath), -1);
     rb_define_method(cFXFileDict.klass, "replace", VALUEFUNC(_wrap_FXFileDict_replace), -1);
@@ -9011,8 +9634,6 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXStringDict.klass, "insert", VALUEFUNC(_wrap_FXStringDict_insert), -1);
     rb_define_method(cFXStringDict.klass, "replace", VALUEFUNC(_wrap_FXStringDict_replace), -1);
     rb_define_method(cFXStringDict.klass, "remove", VALUEFUNC(_wrap_FXStringDict_remove), -1);
-    rb_define_method(cFXStringDict.klass, "find", VALUEFUNC(_wrap_FXStringDict_find), -1);
-    rb_define_method(cFXStringDict.klass, "data", VALUEFUNC(_wrap_FXStringDict_data), -1);
     rb_define_method(cFXStringDict.klass, "save", VALUEFUNC(_wrap_FXStringDict_save), -1);
     rb_define_method(cFXStringDict.klass, "load", VALUEFUNC(_wrap_FXStringDict_load), -1);
     cFXStringDict.mark = (void (*)(void *)) FXRbStringDict::markfunc;
@@ -9024,8 +9645,6 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXSettings.klass, "initialize", VALUEFUNC(_wrap_new_FXSettings), -1);
     rb_define_method(cFXSettings.klass, "parseFile", VALUEFUNC(_wrap_FXSettings_parseFile), -1);
     rb_define_method(cFXSettings.klass, "unparseFile", VALUEFUNC(_wrap_FXSettings_unparseFile), -1);
-    rb_define_method(cFXSettings.klass, "data", VALUEFUNC(_wrap_FXSettings_data), -1);
-    rb_define_method(cFXSettings.klass, "find", VALUEFUNC(_wrap_FXSettings_find), -1);
     rb_define_method(cFXSettings.klass, "readStringEntry", VALUEFUNC(_wrap_FXSettings_readStringEntry), -1);
     rb_define_method(cFXSettings.klass, "readIntEntry", VALUEFUNC(_wrap_FXSettings_readIntEntry), -1);
     rb_define_method(cFXSettings.klass, "readUnsignedEntry", VALUEFUNC(_wrap_FXSettings_readUnsignedEntry), -1);
@@ -9159,7 +9778,9 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXCursor.klass, "initialize", VALUEFUNC(_wrap_new_FXCursor), -1);
     rb_define_method(cFXCursor.klass, "getWidth", VALUEFUNC(_wrap_FXCursor_getWidth), -1);
     rb_define_method(cFXCursor.klass, "getHeight", VALUEFUNC(_wrap_FXCursor_getHeight), -1);
+    rb_define_method(cFXCursor.klass, "setHotX", VALUEFUNC(_wrap_FXCursor_setHotX), -1);
     rb_define_method(cFXCursor.klass, "getHotX", VALUEFUNC(_wrap_FXCursor_getHotX), -1);
+    rb_define_method(cFXCursor.klass, "setHotY", VALUEFUNC(_wrap_FXCursor_setHotY), -1);
     rb_define_method(cFXCursor.klass, "getHotY", VALUEFUNC(_wrap_FXCursor_getHotY), -1);
     rb_define_method(cFXCursor.klass, "isColor", VALUEFUNC(_wrap_FXCursor_isColor), -1);
     rb_define_method(cFXCursor.klass, "save", VALUEFUNC(_wrap_FXCursor_save), -1);
@@ -9179,6 +9800,7 @@ SWIGEXPORT(void) Init_core(void) {
     SWIG_TypeClientData(SWIGTYPE_p_FXCURCursor, (void *) &cFXCURCursor);
     rb_define_alloc_func(cFXCURCursor.klass, _wrap_FXCURCursor_allocate);
     rb_define_method(cFXCURCursor.klass, "initialize", VALUEFUNC(_wrap_new_FXCURCursor), -1);
+    rb_define_singleton_method(cFXCURCursor.klass, "fileExt", VALUEFUNC(_wrap_FXCURCursor_fileExt), -1);
     rb_define_method(cFXCURCursor.klass, "save", VALUEFUNC(_wrap_FXCURCursor_save), -1);
     rb_define_method(cFXCURCursor.klass, "load", VALUEFUNC(_wrap_FXCURCursor_load), -1);
     rb_define_method(cFXCURCursor.klass, "create", VALUEFUNC(_wrap_FXCURCursor_create), -1);
@@ -9193,6 +9815,7 @@ SWIGEXPORT(void) Init_core(void) {
     SWIG_TypeClientData(SWIGTYPE_p_FXGIFCursor, (void *) &cFXGIFCursor);
     rb_define_alloc_func(cFXGIFCursor.klass, _wrap_FXGIFCursor_allocate);
     rb_define_method(cFXGIFCursor.klass, "initialize", VALUEFUNC(_wrap_new_FXGIFCursor), -1);
+    rb_define_singleton_method(cFXGIFCursor.klass, "fileExt", VALUEFUNC(_wrap_FXGIFCursor_fileExt), -1);
     rb_define_method(cFXGIFCursor.klass, "save", VALUEFUNC(_wrap_FXGIFCursor_save), -1);
     rb_define_method(cFXGIFCursor.klass, "load", VALUEFUNC(_wrap_FXGIFCursor_load), -1);
     rb_define_method(cFXGIFCursor.klass, "create", VALUEFUNC(_wrap_FXGIFCursor_create), -1);
@@ -9204,6 +9827,7 @@ SWIGEXPORT(void) Init_core(void) {
     cFXGIFCursor.destroy = (void (*)(void *)) FXRbGIFCursor::freefunc;
     rb_define_module_function(mFox, "fxsaveGIF", VALUEFUNC(_wrap_fxsaveGIF), -1);
     rb_define_module_function(mFox, "fxloadGIF", VALUEFUNC(_wrap_fxloadGIF), -1);
+    rb_define_module_function(mFox, "fxcheckGIF", VALUEFUNC(_wrap_fxcheckGIF), -1);
     
     cFXDrawable.klass = rb_define_class_under(mFox, "FXDrawable", ((swig_class *) SWIGTYPE_p_FXId->clientdata)->klass);
     SWIG_TypeClientData(SWIGTYPE_p_FXDrawable, (void *) &cFXDrawable);
@@ -9465,8 +10089,9 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_const(mFox,"LAYOUT_BOTTOM", INT2NUM(LAYOUT_BOTTOM));
     rb_define_const(mFox,"LAYOUT_CENTER_Y", INT2NUM(LAYOUT_CENTER_Y));
     rb_define_const(mFox,"LAYOUT_FIX_Y", INT2NUM(LAYOUT_FIX_Y));
+    rb_define_const(mFox,"LAYOUT_DOCK_SAME", INT2NUM(LAYOUT_DOCK_SAME));
+    rb_define_const(mFox,"LAYOUT_DOCK_NEXT", INT2NUM(LAYOUT_DOCK_NEXT));
     rb_define_const(mFox,"LAYOUT_RESERVED_1", INT2NUM(LAYOUT_RESERVED_1));
-    rb_define_const(mFox,"LAYOUT_RESERVED_2", INT2NUM(LAYOUT_RESERVED_2));
     rb_define_const(mFox,"LAYOUT_FIX_WIDTH", INT2NUM(LAYOUT_FIX_WIDTH));
     rb_define_const(mFox,"LAYOUT_FIX_HEIGHT", INT2NUM(LAYOUT_FIX_HEIGHT));
     rb_define_const(mFox,"LAYOUT_MIN_WIDTH", INT2NUM(LAYOUT_MIN_WIDTH));
@@ -9537,6 +10162,8 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXWindow.klass, "onDNDMotion", VALUEFUNC(_wrap_FXWindow_onDNDMotion), -1);
     rb_define_method(cFXWindow.klass, "onDNDDrop", VALUEFUNC(_wrap_FXWindow_onDNDDrop), -1);
     rb_define_method(cFXWindow.klass, "onDNDRequest", VALUEFUNC(_wrap_FXWindow_onDNDRequest), -1);
+    rb_define_method(cFXWindow.klass, "onQueryHelp", VALUEFUNC(_wrap_FXWindow_onQueryHelp), -1);
+    rb_define_method(cFXWindow.klass, "onQueryTip", VALUEFUNC(_wrap_FXWindow_onQueryTip), -1);
     rb_define_method(cFXWindow.klass, "onCmdShow", VALUEFUNC(_wrap_FXWindow_onCmdShow), -1);
     rb_define_method(cFXWindow.klass, "onCmdHide", VALUEFUNC(_wrap_FXWindow_onCmdHide), -1);
     rb_define_method(cFXWindow.klass, "onUpdToggleShown", VALUEFUNC(_wrap_FXWindow_onUpdToggleShown), -1);
@@ -9545,6 +10172,8 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXWindow.klass, "onCmdLower", VALUEFUNC(_wrap_FXWindow_onCmdLower), -1);
     rb_define_method(cFXWindow.klass, "onCmdEnable", VALUEFUNC(_wrap_FXWindow_onCmdEnable), -1);
     rb_define_method(cFXWindow.klass, "onCmdDisable", VALUEFUNC(_wrap_FXWindow_onCmdDisable), -1);
+    rb_define_method(cFXWindow.klass, "onUpdToggleEnabled", VALUEFUNC(_wrap_FXWindow_onUpdToggleEnabled), -1);
+    rb_define_method(cFXWindow.klass, "onCmdToggleEnabled", VALUEFUNC(_wrap_FXWindow_onCmdToggleEnabled), -1);
     rb_define_method(cFXWindow.klass, "onCmdUpdate", VALUEFUNC(_wrap_FXWindow_onCmdUpdate), -1);
     rb_define_method(cFXWindow.klass, "onUpdYes", VALUEFUNC(_wrap_FXWindow_onUpdYes), -1);
     rb_define_method(cFXWindow.klass, "onCmdDelete", VALUEFUNC(_wrap_FXWindow_onCmdDelete), -1);
@@ -9557,6 +10186,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_const(cFXWindow.klass,"ID_DELETE", INT2NUM(FXWindow::ID_DELETE));
     rb_define_const(cFXWindow.klass,"ID_DISABLE", INT2NUM(FXWindow::ID_DISABLE));
     rb_define_const(cFXWindow.klass,"ID_ENABLE", INT2NUM(FXWindow::ID_ENABLE));
+    rb_define_const(cFXWindow.klass,"ID_TOGGLEENABLED", INT2NUM(FXWindow::ID_TOGGLEENABLED));
     rb_define_const(cFXWindow.klass,"ID_UNCHECK", INT2NUM(FXWindow::ID_UNCHECK));
     rb_define_const(cFXWindow.klass,"ID_CHECK", INT2NUM(FXWindow::ID_CHECK));
     rb_define_const(cFXWindow.klass,"ID_UNKNOWN", INT2NUM(FXWindow::ID_UNKNOWN));
@@ -9582,8 +10212,6 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_const(cFXWindow.klass,"ID_GETHELPSTRING", INT2NUM(FXWindow::ID_GETHELPSTRING));
     rb_define_const(cFXWindow.klass,"ID_SETTIPSTRING", INT2NUM(FXWindow::ID_SETTIPSTRING));
     rb_define_const(cFXWindow.klass,"ID_GETTIPSTRING", INT2NUM(FXWindow::ID_GETTIPSTRING));
-    rb_define_const(cFXWindow.klass,"ID_QUERY_TIP", INT2NUM(FXWindow::ID_QUERY_TIP));
-    rb_define_const(cFXWindow.klass,"ID_QUERY_HELP", INT2NUM(FXWindow::ID_QUERY_HELP));
     rb_define_const(cFXWindow.klass,"ID_QUERY_MENU", INT2NUM(FXWindow::ID_QUERY_MENU));
     rb_define_const(cFXWindow.klass,"ID_HOTKEY", INT2NUM(FXWindow::ID_HOTKEY));
     rb_define_const(cFXWindow.klass,"ID_ACCEL", INT2NUM(FXWindow::ID_ACCEL));
@@ -9648,7 +10276,11 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXWindow.klass, "getChildren", VALUEFUNC(_wrap_FXWindow_getChildren), -1);
     rb_define_method(cFXWindow.klass, "childAtIndex", VALUEFUNC(_wrap_FXWindow_childAtIndex), -1);
     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, "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);
@@ -9658,6 +10290,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXWindow.klass, "isEnabled", VALUEFUNC(_wrap_FXWindow_isEnabled), -1);
     rb_define_method(cFXWindow.klass, "isActive", VALUEFUNC(_wrap_FXWindow_isActive), -1);
     rb_define_method(cFXWindow.klass, "hasFocus", VALUEFUNC(_wrap_FXWindow_hasFocus), -1);
+    rb_define_method(cFXWindow.klass, "inFocusChain?", VALUEFUNC(_wrap_FXWindow_inFocusChainq___), -1);
     rb_define_method(cFXWindow.klass, "isDefault", VALUEFUNC(_wrap_FXWindow_isDefault), -1);
     rb_define_method(cFXWindow.klass, "setInitial", VALUEFUNC(_wrap_FXWindow_setInitial), -1);
     rb_define_method(cFXWindow.klass, "isInitial", VALUEFUNC(_wrap_FXWindow_isInitial), -1);
@@ -9699,8 +10332,6 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXWindow.klass, "translateCoordinatesFrom", VALUEFUNC(_wrap_FXWindow_translateCoordinatesFrom), -1);
     rb_define_method(cFXWindow.klass, "translateCoordinatesTo", VALUEFUNC(_wrap_FXWindow_translateCoordinatesTo), -1);
     rb_define_method(cFXWindow.klass, "getBackColor", VALUEFUNC(_wrap_FXWindow_getBackColor), -1);
-    rb_define_method(cFXWindow.klass, "linkBefore", VALUEFUNC(_wrap_FXWindow_linkBefore), -1);
-    rb_define_method(cFXWindow.klass, "linkAfter", VALUEFUNC(_wrap_FXWindow_linkAfter), -1);
     rb_define_method(cFXWindow.klass, "save", VALUEFUNC(_wrap_FXWindow_save), -1);
     rb_define_method(cFXWindow.klass, "load", VALUEFUNC(_wrap_FXWindow_load), -1);
     rb_define_method(cFXWindow.klass, "create", VALUEFUNC(_wrap_FXWindow_create), -1);
@@ -9714,6 +10345,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXWindow.klass, "canFocus", VALUEFUNC(_wrap_FXWindow_canFocus), -1);
     rb_define_method(cFXWindow.klass, "setFocus", VALUEFUNC(_wrap_FXWindow_setFocus), -1);
     rb_define_method(cFXWindow.klass, "killFocus", VALUEFUNC(_wrap_FXWindow_killFocus), -1);
+    rb_define_method(cFXWindow.klass, "changeFocus", VALUEFUNC(_wrap_FXWindow_changeFocus), -1);
     rb_define_method(cFXWindow.klass, "setDefault", VALUEFUNC(_wrap_FXWindow_setDefault), -1);
     rb_define_method(cFXWindow.klass, "enable", VALUEFUNC(_wrap_FXWindow_enable), -1);
     rb_define_method(cFXWindow.klass, "disable", VALUEFUNC(_wrap_FXWindow_disable), -1);
@@ -9730,6 +10362,8 @@ 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, "setShape", VALUEFUNC(_wrap_FXWindow_setShape), -1);
+    rb_define_method(cFXWindow.klass, "clearShape", VALUEFUNC(_wrap_FXWindow_clearShape), -1);
     cFXWindow.mark = (void (*)(void *)) FXRbWindow::markfunc;
     cFXWindow.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -9783,6 +10417,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXFrame.klass, "canFocus", VALUEFUNC(_wrap_FXFrame_canFocus), -1);
     rb_define_method(cFXFrame.klass, "setFocus", VALUEFUNC(_wrap_FXFrame_setFocus), -1);
     rb_define_method(cFXFrame.klass, "killFocus", VALUEFUNC(_wrap_FXFrame_killFocus), -1);
+    rb_define_method(cFXFrame.klass, "changeFocus", VALUEFUNC(_wrap_FXFrame_changeFocus), -1);
     rb_define_method(cFXFrame.klass, "setDefault", VALUEFUNC(_wrap_FXFrame_setDefault), -1);
     rb_define_method(cFXFrame.klass, "enable", VALUEFUNC(_wrap_FXFrame_enable), -1);
     rb_define_method(cFXFrame.klass, "disable", VALUEFUNC(_wrap_FXFrame_disable), -1);
@@ -9799,6 +10434,8 @@ 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, "setShape", VALUEFUNC(_wrap_FXFrame_setShape), -1);
+    rb_define_method(cFXFrame.klass, "clearShape", VALUEFUNC(_wrap_FXFrame_clearShape), -1);
     cFXFrame.mark = (void (*)(void *)) FXRbFrame::markfunc;
     cFXFrame.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -9829,6 +10466,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXComposite.klass, "canFocus", VALUEFUNC(_wrap_FXComposite_canFocus), -1);
     rb_define_method(cFXComposite.klass, "setFocus", VALUEFUNC(_wrap_FXComposite_setFocus), -1);
     rb_define_method(cFXComposite.klass, "killFocus", VALUEFUNC(_wrap_FXComposite_killFocus), -1);
+    rb_define_method(cFXComposite.klass, "changeFocus", VALUEFUNC(_wrap_FXComposite_changeFocus), -1);
     rb_define_method(cFXComposite.klass, "setDefault", VALUEFUNC(_wrap_FXComposite_setDefault), -1);
     rb_define_method(cFXComposite.klass, "enable", VALUEFUNC(_wrap_FXComposite_enable), -1);
     rb_define_method(cFXComposite.klass, "disable", VALUEFUNC(_wrap_FXComposite_disable), -1);
@@ -9845,6 +10483,8 @@ 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, "setShape", VALUEFUNC(_wrap_FXComposite_setShape), -1);
+    rb_define_method(cFXComposite.klass, "clearShape", VALUEFUNC(_wrap_FXComposite_clearShape), -1);
     cFXComposite.mark = (void (*)(void *)) FXRbComposite::markfunc;
     cFXComposite.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -9868,6 +10508,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXRootWindow.klass, "canFocus", VALUEFUNC(_wrap_FXRootWindow_canFocus), -1);
     rb_define_method(cFXRootWindow.klass, "setFocus", VALUEFUNC(_wrap_FXRootWindow_setFocus), -1);
     rb_define_method(cFXRootWindow.klass, "killFocus", VALUEFUNC(_wrap_FXRootWindow_killFocus), -1);
+    rb_define_method(cFXRootWindow.klass, "changeFocus", VALUEFUNC(_wrap_FXRootWindow_changeFocus), -1);
     rb_define_method(cFXRootWindow.klass, "setDefault", VALUEFUNC(_wrap_FXRootWindow_setDefault), -1);
     rb_define_method(cFXRootWindow.klass, "enable", VALUEFUNC(_wrap_FXRootWindow_enable), -1);
     rb_define_method(cFXRootWindow.klass, "disable", VALUEFUNC(_wrap_FXRootWindow_disable), -1);
@@ -9884,6 +10525,8 @@ 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, "setShape", VALUEFUNC(_wrap_FXRootWindow_setShape), -1);
+    rb_define_method(cFXRootWindow.klass, "clearShape", VALUEFUNC(_wrap_FXRootWindow_clearShape), -1);
     cFXRootWindow.mark = (void (*)(void *)) FXRbRootWindow::markfunc;
     cFXRootWindow.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -9912,6 +10555,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXShell.klass, "canFocus", VALUEFUNC(_wrap_FXShell_canFocus), -1);
     rb_define_method(cFXShell.klass, "setFocus", VALUEFUNC(_wrap_FXShell_setFocus), -1);
     rb_define_method(cFXShell.klass, "killFocus", VALUEFUNC(_wrap_FXShell_killFocus), -1);
+    rb_define_method(cFXShell.klass, "changeFocus", VALUEFUNC(_wrap_FXShell_changeFocus), -1);
     rb_define_method(cFXShell.klass, "setDefault", VALUEFUNC(_wrap_FXShell_setDefault), -1);
     rb_define_method(cFXShell.klass, "enable", VALUEFUNC(_wrap_FXShell_enable), -1);
     rb_define_method(cFXShell.klass, "disable", VALUEFUNC(_wrap_FXShell_disable), -1);
@@ -9928,6 +10572,8 @@ 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, "setShape", VALUEFUNC(_wrap_FXShell_setShape), -1);
+    rb_define_method(cFXShell.klass, "clearShape", VALUEFUNC(_wrap_FXShell_clearShape), -1);
     cFXShell.mark = (void (*)(void *)) FXRbShell::markfunc;
     cFXShell.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -9992,6 +10638,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXPopup.klass, "canFocus", VALUEFUNC(_wrap_FXPopup_canFocus), -1);
     rb_define_method(cFXPopup.klass, "setFocus", VALUEFUNC(_wrap_FXPopup_setFocus), -1);
     rb_define_method(cFXPopup.klass, "killFocus", VALUEFUNC(_wrap_FXPopup_killFocus), -1);
+    rb_define_method(cFXPopup.klass, "changeFocus", VALUEFUNC(_wrap_FXPopup_changeFocus), -1);
     rb_define_method(cFXPopup.klass, "setDefault", VALUEFUNC(_wrap_FXPopup_setDefault), -1);
     rb_define_method(cFXPopup.klass, "enable", VALUEFUNC(_wrap_FXPopup_enable), -1);
     rb_define_method(cFXPopup.klass, "disable", VALUEFUNC(_wrap_FXPopup_disable), -1);
@@ -10008,6 +10655,8 @@ 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, "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);
     rb_define_method(cFXPopup.klass, "popdown", VALUEFUNC(_wrap_FXPopup_popdown), -1);
     cFXPopup.mark = (void (*)(void *)) FXRbPopup::markfunc;
@@ -10055,6 +10704,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_const(cFXTopWindow.klass,"ID_CLOSE", INT2NUM(FXTopWindow::ID_CLOSE));
     rb_define_const(cFXTopWindow.klass,"ID_QUERY_DOCK", INT2NUM(FXTopWindow::ID_QUERY_DOCK));
     rb_define_const(cFXTopWindow.klass,"ID_LAST", INT2NUM(FXTopWindow::ID_LAST));
+    rb_define_method(cFXTopWindow.klass, "getWMBorders", VALUEFUNC(_wrap_FXTopWindow_getWMBorders), -1);
     rb_define_method(cFXTopWindow.klass, "place", VALUEFUNC(_wrap_FXTopWindow_place), -1);
     rb_define_method(cFXTopWindow.klass, "isMaximized", VALUEFUNC(_wrap_FXTopWindow_isMaximized), -1);
     rb_define_method(cFXTopWindow.klass, "isMinimized", VALUEFUNC(_wrap_FXTopWindow_isMinimized), -1);
@@ -10093,6 +10743,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXTopWindow.klass, "canFocus", VALUEFUNC(_wrap_FXTopWindow_canFocus), -1);
     rb_define_method(cFXTopWindow.klass, "setFocus", VALUEFUNC(_wrap_FXTopWindow_setFocus), -1);
     rb_define_method(cFXTopWindow.klass, "killFocus", VALUEFUNC(_wrap_FXTopWindow_killFocus), -1);
+    rb_define_method(cFXTopWindow.klass, "changeFocus", VALUEFUNC(_wrap_FXTopWindow_changeFocus), -1);
     rb_define_method(cFXTopWindow.klass, "setDefault", VALUEFUNC(_wrap_FXTopWindow_setDefault), -1);
     rb_define_method(cFXTopWindow.klass, "enable", VALUEFUNC(_wrap_FXTopWindow_enable), -1);
     rb_define_method(cFXTopWindow.klass, "disable", VALUEFUNC(_wrap_FXTopWindow_disable), -1);
@@ -10108,6 +10759,8 @@ 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, "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);
     rb_define_method(cFXTopWindow.klass, "maximize", VALUEFUNC(_wrap_FXTopWindow_maximize), -1);
     rb_define_method(cFXTopWindow.klass, "minimize", VALUEFUNC(_wrap_FXTopWindow_minimize), -1);
@@ -10136,6 +10789,7 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXMainWindow.klass, "canFocus", VALUEFUNC(_wrap_FXMainWindow_canFocus), -1);
     rb_define_method(cFXMainWindow.klass, "setFocus", VALUEFUNC(_wrap_FXMainWindow_setFocus), -1);
     rb_define_method(cFXMainWindow.klass, "killFocus", VALUEFUNC(_wrap_FXMainWindow_killFocus), -1);
+    rb_define_method(cFXMainWindow.klass, "changeFocus", VALUEFUNC(_wrap_FXMainWindow_changeFocus), -1);
     rb_define_method(cFXMainWindow.klass, "setDefault", VALUEFUNC(_wrap_FXMainWindow_setDefault), -1);
     rb_define_method(cFXMainWindow.klass, "enable", VALUEFUNC(_wrap_FXMainWindow_enable), -1);
     rb_define_method(cFXMainWindow.klass, "disable", VALUEFUNC(_wrap_FXMainWindow_disable), -1);
@@ -10151,6 +10805,8 @@ 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, "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);
     rb_define_method(cFXMainWindow.klass, "maximize", VALUEFUNC(_wrap_FXMainWindow_maximize), -1);
     rb_define_method(cFXMainWindow.klass, "minimize", VALUEFUNC(_wrap_FXMainWindow_minimize), -1);
@@ -10158,5 +10814,57 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXMainWindow.klass, "close", VALUEFUNC(_wrap_FXMainWindow_close), -1);
     cFXMainWindow.mark = (void (*)(void *)) FXRbMainWindow::markfunc;
     cFXMainWindow.destroy = (void (*)(void *)) FXRbObject::freefunc;
+    rb_define_const(mFox,"SPLASH_SIMPLE", INT2NUM(SPLASH_SIMPLE));
+    rb_define_const(mFox,"SPLASH_SHAPED", INT2NUM(SPLASH_SHAPED));
+    rb_define_const(mFox,"SPLASH_OWNS_ICON", INT2NUM(SPLASH_OWNS_ICON));
+    rb_define_const(mFox,"SPLASH_DESTROY", INT2NUM(SPLASH_DESTROY));
+    
+    cFXSplashWindow.klass = rb_define_class_under(mFox, "FXSplashWindow", ((swig_class *) SWIGTYPE_p_FXTopWindow->clientdata)->klass);
+    SWIG_TypeClientData(SWIGTYPE_p_FXSplashWindow, (void *) &cFXSplashWindow);
+    rb_define_alloc_func(cFXSplashWindow.klass, _wrap_FXSplashWindow_allocate);
+    rb_define_method(cFXSplashWindow.klass, "initialize", VALUEFUNC(_wrap_new_FXSplashWindow), -1);
+    rb_define_method(cFXSplashWindow.klass, "onPaint", VALUEFUNC(_wrap_FXSplashWindow_onPaint), -1);
+    rb_define_method(cFXSplashWindow.klass, "icon=", VALUEFUNC(_wrap_FXSplashWindow_icone___), -1);
+    rb_define_method(cFXSplashWindow.klass, "icon", VALUEFUNC(_wrap_FXSplashWindow_icon), -1);
+    rb_define_method(cFXSplashWindow.klass, "delay=", VALUEFUNC(_wrap_FXSplashWindow_delaye___), -1);
+    rb_define_method(cFXSplashWindow.klass, "delay", VALUEFUNC(_wrap_FXSplashWindow_delay), -1);
+    rb_define_method(cFXSplashWindow.klass, "save", VALUEFUNC(_wrap_FXSplashWindow_save), -1);
+    rb_define_method(cFXSplashWindow.klass, "load", VALUEFUNC(_wrap_FXSplashWindow_load), -1);
+    rb_define_method(cFXSplashWindow.klass, "create", VALUEFUNC(_wrap_FXSplashWindow_create), -1);
+    rb_define_method(cFXSplashWindow.klass, "detach", VALUEFUNC(_wrap_FXSplashWindow_detach), -1);
+    rb_define_method(cFXSplashWindow.klass, "destroy", VALUEFUNC(_wrap_FXSplashWindow_destroy), -1);
+    rb_define_method(cFXSplashWindow.klass, "resize", VALUEFUNC(_wrap_FXSplashWindow_resize), -1);
+    rb_define_method(cFXSplashWindow.klass, "getDefaultWidth", VALUEFUNC(_wrap_FXSplashWindow_getDefaultWidth), -1);
+    rb_define_method(cFXSplashWindow.klass, "getDefaultHeight", VALUEFUNC(_wrap_FXSplashWindow_getDefaultHeight), -1);
+    rb_define_method(cFXSplashWindow.klass, "getWidthForHeight", VALUEFUNC(_wrap_FXSplashWindow_getWidthForHeight), -1);
+    rb_define_method(cFXSplashWindow.klass, "getHeightForWidth", VALUEFUNC(_wrap_FXSplashWindow_getHeightForWidth), -1);
+    rb_define_method(cFXSplashWindow.klass, "canFocus", VALUEFUNC(_wrap_FXSplashWindow_canFocus), -1);
+    rb_define_method(cFXSplashWindow.klass, "setFocus", VALUEFUNC(_wrap_FXSplashWindow_setFocus), -1);
+    rb_define_method(cFXSplashWindow.klass, "killFocus", VALUEFUNC(_wrap_FXSplashWindow_killFocus), -1);
+    rb_define_method(cFXSplashWindow.klass, "changeFocus", VALUEFUNC(_wrap_FXSplashWindow_changeFocus), -1);
+    rb_define_method(cFXSplashWindow.klass, "setDefault", VALUEFUNC(_wrap_FXSplashWindow_setDefault), -1);
+    rb_define_method(cFXSplashWindow.klass, "enable", VALUEFUNC(_wrap_FXSplashWindow_enable), -1);
+    rb_define_method(cFXSplashWindow.klass, "disable", VALUEFUNC(_wrap_FXSplashWindow_disable), -1);
+    rb_define_method(cFXSplashWindow.klass, "raiseWindow", VALUEFUNC(_wrap_FXSplashWindow_raiseWindow), -1);
+    rb_define_method(cFXSplashWindow.klass, "lower", VALUEFUNC(_wrap_FXSplashWindow_lower), -1);
+    rb_define_method(cFXSplashWindow.klass, "move", VALUEFUNC(_wrap_FXSplashWindow_move), -1);
+    rb_define_method(cFXSplashWindow.klass, "position", VALUEFUNC(_wrap_FXSplashWindow_position), -1);
+    rb_define_method(cFXSplashWindow.klass, "layout", VALUEFUNC(_wrap_FXSplashWindow_layout), -1);
+    rb_define_method(cFXSplashWindow.klass, "recalc", VALUEFUNC(_wrap_FXSplashWindow_recalc), -1);
+    rb_define_method(cFXSplashWindow.klass, "reparent", VALUEFUNC(_wrap_FXSplashWindow_reparent), -1);
+    rb_define_method(cFXSplashWindow.klass, "hide", VALUEFUNC(_wrap_FXSplashWindow_hide), -1);
+    rb_define_method(cFXSplashWindow.klass, "isComposite", VALUEFUNC(_wrap_FXSplashWindow_isComposite), -1);
+    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, "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);
+    rb_define_method(cFXSplashWindow.klass, "maximize", VALUEFUNC(_wrap_FXSplashWindow_maximize), -1);
+    rb_define_method(cFXSplashWindow.klass, "minimize", VALUEFUNC(_wrap_FXSplashWindow_minimize), -1);
+    rb_define_method(cFXSplashWindow.klass, "restore", VALUEFUNC(_wrap_FXSplashWindow_restore), -1);
+    rb_define_method(cFXSplashWindow.klass, "close", VALUEFUNC(_wrap_FXSplashWindow_close), -1);
+    cFXSplashWindow.mark = (void (*)(void *)) FXRbSplashWindow::markfunc;
+    cFXSplashWindow.destroy = (void (*)(void *)) FXRbObject::freefunc;
 }