fxruby 1.2.6 → 1.4.0

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

@@ -516,33 +516,37 @@ SWIGIMPORT(void)   SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_ty
 
 /* -------- TYPES TABLE (BEGIN) -------- */
 
-#define  SWIGTYPE_p_FXObject swig_types[0] 
-#define  SWIGTYPE_p_FXScrollArea swig_types[1] 
-#define  SWIGTYPE_p_FXShutterItem swig_types[2] 
-#define  SWIGTYPE_p_FXStatusBar swig_types[3] 
-#define  SWIGTYPE_p_FXScrollBar swig_types[4] 
-#define  SWIGTYPE_p_FXWindow swig_types[5] 
-#define  SWIGTYPE_p_FXComposite swig_types[6] 
-#define  SWIGTYPE_p_FXScrollWindow swig_types[7] 
-#define  SWIGTYPE_p_FXFont swig_types[8] 
-#define  SWIGTYPE_p_FXId swig_types[9] 
-#define  SWIGTYPE_p_FXStatusLine swig_types[10] 
-#define  SWIGTYPE_p_FXGroupBox swig_types[11] 
-#define  SWIGTYPE_p_FXButton swig_types[12] 
-#define  SWIGTYPE_p_FXStream swig_types[13] 
-#define  SWIGTYPE_p_FXDrawable swig_types[14] 
-#define  SWIGTYPE_p_FXSplitter swig_types[15] 
-#define  SWIGTYPE_p_FX4Splitter swig_types[16] 
-#define  SWIGTYPE_p_FXPacker swig_types[17] 
-#define  SWIGTYPE_p_FXHorizontalFrame swig_types[18] 
-#define  SWIGTYPE_p_FXVerticalFrame swig_types[19] 
-#define  SWIGTYPE_p_FXShutter swig_types[20] 
-#define  SWIGTYPE_p_FXIcon swig_types[21] 
-#define  SWIGTYPE_p_FXDragCorner swig_types[22] 
-#define  SWIGTYPE_p_FXMatrix swig_types[23] 
-#define  SWIGTYPE_p_FXSpring swig_types[24] 
-#define  SWIGTYPE_p_FXSwitcher swig_types[25] 
-static swig_type_info *swig_types[27];
+#define  SWIGTYPE_p_FXDockSite swig_types[0] 
+#define  SWIGTYPE_p_FXObject swig_types[1] 
+#define  SWIGTYPE_p_FXScrollArea swig_types[2] 
+#define  SWIGTYPE_p_FXShutterItem swig_types[3] 
+#define  SWIGTYPE_p_FXDockBar swig_types[4] 
+#define  SWIGTYPE_p_FXStatusBar swig_types[5] 
+#define  SWIGTYPE_p_FXScrollBar swig_types[6] 
+#define  SWIGTYPE_p_FXWindow swig_types[7] 
+#define  SWIGTYPE_p_FXComposite swig_types[8] 
+#define  SWIGTYPE_p_FXScrollWindow swig_types[9] 
+#define  SWIGTYPE_p_FXBitmap swig_types[10] 
+#define  SWIGTYPE_p_FXId swig_types[11] 
+#define  SWIGTYPE_p_FXFont swig_types[12] 
+#define  SWIGTYPE_p_FXStatusLine swig_types[13] 
+#define  SWIGTYPE_p_FXGroupBox swig_types[14] 
+#define  SWIGTYPE_p_FXButton swig_types[15] 
+#define  SWIGTYPE_p_FXStream swig_types[16] 
+#define  SWIGTYPE_p_FXDrawable swig_types[17] 
+#define  SWIGTYPE_p_FXSplitter swig_types[18] 
+#define  SWIGTYPE_p_FX4Splitter swig_types[19] 
+#define  SWIGTYPE_p_FXPacker swig_types[20] 
+#define  SWIGTYPE_p_FXHorizontalFrame swig_types[21] 
+#define  SWIGTYPE_p_FXVerticalFrame swig_types[22] 
+#define  SWIGTYPE_p_FXShutter swig_types[23] 
+#define  SWIGTYPE_p_FXIcon swig_types[24] 
+#define  SWIGTYPE_p_FXDragCorner swig_types[25] 
+#define  SWIGTYPE_p_FXMatrix swig_types[26] 
+#define  SWIGTYPE_p_FXRegion swig_types[27] 
+#define  SWIGTYPE_p_FXSpring swig_types[28] 
+#define  SWIGTYPE_p_FXSwitcher swig_types[29] 
+static swig_type_info *swig_types[31];
 
 /* -------- TYPES TABLE (END) -------- */
 
@@ -629,6 +633,16 @@ static swig_type_info *FXPacker_dynamic_cast(void **ptr) {
       *ptr=reinterpret_cast<void*>(pDirSelector);
       return SWIG_TypeQuery("FXDirSelector *");
       }
+    FXDockBar *pDockBar=dynamic_cast<FXDockBar*>(*ppPacker);
+    if(pDockBar){
+      *ptr=reinterpret_cast<void*>(pDockBar);
+      return SWIG_TypeQuery("FXDockBar *");
+      }
+    FXDockSite *pDockSite=dynamic_cast<FXDockSite*>(*ppPacker);
+    if(pDockSite){
+      *ptr=reinterpret_cast<void*>(pDockSite);
+      return SWIG_TypeQuery("FXDockSite *");
+      }
     FXFileSelector *pFileSelector=dynamic_cast<FXFileSelector*>(*ppPacker);
     if(pFileSelector){
       *ptr=reinterpret_cast<void*>(pFileSelector);
@@ -679,11 +693,6 @@ static swig_type_info *FXPacker_dynamic_cast(void **ptr) {
       *ptr=reinterpret_cast<void*>(pTabBar);
       return SWIG_TypeQuery("FXTabBar *");
       }
-    FXToolBar *pToolBar=dynamic_cast<FXToolBar*>(*ppPacker);
-    if(pToolBar){
-      *ptr=reinterpret_cast<void*>(pToolBar);
-      return SWIG_TypeQuery("FXToolBar *");
-      }
     FXTreeListBox *pTreeListBox=dynamic_cast<FXTreeListBox*>(*ppPacker);
     if(pTreeListBox){
       *ptr=reinterpret_cast<void*>(pTreeListBox);
@@ -697,6 +706,12 @@ static swig_type_info *FXPacker_dynamic_cast(void **ptr) {
     return 0;
 }
 
+FXDockSite *new_FXDockSite(FXComposite *p,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs){
+      return new FXRbDockSite(p,opts,x,y,w,h,pl,pr,pt,pb,hs,vs);
+      }
+
+swig_class cFXDockSite;
+static void free_FXDockSite(FXDockSite *);
 FXSpring *new_FXSpring(FXComposite *p,FXuint opts,FXint relw,FXint relh,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs){
       return new FXRbSpring(p,opts,relw,relh,x,y,w,h,pl,pr,pt,pb,hs,vs);
       }
@@ -1091,6 +1106,11 @@ static VALUE _wrap_FXPacker_setFocus(int argc, VALUE *argv, VALUE self) { FXPack
 static VALUE _wrap_FXPacker_killFocus(int argc, VALUE *argv, VALUE self) { FXPacker *arg1 = (FXPacker *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPacker, 1); FXPacker_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXPacker_changeFocus(int argc, VALUE *argv, VALUE self) { FXPacker *arg1 = (FXPacker *) 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_FXPacker, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXPacker_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXPacker_setDefault(int argc, VALUE *argv, VALUE self) { FXPacker *arg1 = (FXPacker *) 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_FXPacker, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -1123,10 +1143,11 @@ static VALUE _wrap_FXPacker_recalc(int argc, VALUE *argv, VALUE self) { FXPacker
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPacker, 1); FXPacker_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXPacker_reparent(int argc, VALUE *argv, VALUE self) { FXPacker *arg1 = (FXPacker *) 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_FXPacker, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXPacker_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); FXPacker_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXPacker_show(int argc, VALUE *argv, VALUE self) { FXPacker *arg1 = (FXPacker *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPacker, 1); FXPacker_show(arg1); return Qnil; }
@@ -1150,6 +1171,261 @@ static VALUE _wrap_FXPacker_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_FXPacker, 1); arg2 = to_FXColor(argv[0]);
     FXPacker_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXPacker_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXPacker *arg1 = (FXPacker *) 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_FXPacker, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXPacker_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXPacker_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXPacker *arg1 = (FXPacker *) 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_FXPacker, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXPacker_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXPacker_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXPacker *arg1 = (FXPacker *) 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_FXPacker, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXPacker_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXPacker_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_FXPacker, 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_FXPacker_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_FXPacker, 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_FXPacker_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_FXPacker, 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_FXPacker_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXPacker_setShape'"); return Qnil; }
+static VALUE _wrap_FXPacker_clearShape(int argc, VALUE *argv, VALUE self) { FXPacker *arg1 = (FXPacker *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPacker, 1); FXPacker_clearShape(arg1); return Qnil; }
+#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
+static VALUE _wrap_FXDockSite_allocate(VALUE self) {
+#else
+     static VALUE _wrap_FXDockSite_allocate(int argc, VALUE *argv, VALUE self) {
+#endif
+         VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXDockSite);
+#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+        rb_obj_call_init(vresult, argc, argv);
+#endif
+         return vresult; }
+static VALUE _wrap_new_FXDockSite(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 = (FXComposite *) 0 ;
+    FXuint arg2 = (FXuint) 0 ; FXint arg3 = (FXint) 0 ; FXint arg4 = (FXint) 0 ; FXint arg5 = (FXint) 0 ;
+    FXint arg6 = (FXint) 0 ; FXint arg7 = (FXint) 0 ; FXint arg8 = (FXint) 0 ; FXint arg9 = (FXint) 0 ;
+    FXint arg10 = (FXint) 0 ; FXint arg11 = (FXint) 0 ; FXint arg12 = (FXint) 0 ; FXDockSite *result;
+    if ((argc < 1) || (argc > 12)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXComposite, 1); if (argc > 1) { arg2 = NUM2UINT(argv[1]); } 
+    if (argc > 2) { arg3 = NUM2INT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) {
+        arg5 = NUM2INT(argv[4]); }  if (argc > 5) { arg6 = NUM2INT(argv[5]); }  if (argc > 6) { arg7 = NUM2INT(argv[6]); } 
+    if (argc > 7) { arg8 = NUM2INT(argv[7]); }  if (argc > 8) { arg9 = NUM2INT(argv[8]); }  if (argc > 9) {
+        arg10 = NUM2INT(argv[9]); }  if (argc > 10) { arg11 = NUM2INT(argv[10]); }  if (argc > 11) { arg12 = NUM2INT(argv[11]); }
+     { result = (FXDockSite *)new_FXDockSite(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
+        DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
+static void
+free_FXDockSite(FXDockSite *arg1) {
+    delete arg1;
+}
+static VALUE _wrap_FXDockSite_save(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXDockSite_save((FXDockSite const *)arg1,*arg2); return Qnil; }
+static VALUE _wrap_FXDockSite_load(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXStream, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXDockSite_load(arg1,*arg2); return Qnil; }
+static VALUE _wrap_FXDockSite_create(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1); FXDockSite_create(arg1); return Qnil; }
+static VALUE _wrap_FXDockSite_detach(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1); FXDockSite_detach(arg1); return Qnil; }
+static VALUE _wrap_FXDockSite_destroy(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1); FXDockSite_destroy(arg1); return Qnil; }
+static VALUE _wrap_FXDockSite_resize(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
+    FXDockSite_resize(arg1,arg2,arg3); return Qnil; }
+static VALUE _wrap_FXDockSite_getDefaultWidth(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1); result = (FXint)FXDockSite_getDefaultWidth(arg1);
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXDockSite_getDefaultHeight(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1); result = (FXint)FXDockSite_getDefaultHeight(arg1);
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXDockSite_getWidthForHeight(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1); arg2 = NUM2INT(argv[0]);
+    result = (FXint)FXDockSite_getWidthForHeight(arg1,arg2); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXDockSite_getHeightForWidth(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1); arg2 = NUM2INT(argv[0]);
+    result = (FXint)FXDockSite_getHeightForWidth(arg1,arg2); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXDockSite_canFocus(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1);
+    result = (FXbool)FXDockSite_canFocus((FXDockSite const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXDockSite_setFocus(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1); FXDockSite_setFocus(arg1); return Qnil; }
+static VALUE _wrap_FXDockSite_killFocus(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1); FXDockSite_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXDockSite_changeFocus(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXDockSite_changeFocus(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXDockSite_setDefault(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
+    FXDockSite_setDefault(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXDockSite_enable(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1); FXDockSite_enable(arg1); return Qnil; }
+static VALUE _wrap_FXDockSite_disable(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1); FXDockSite_disable(arg1); return Qnil; }
+static VALUE _wrap_FXDockSite_raiseWindow(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1); FXDockSite_raise(arg1); return Qnil; }
+static VALUE _wrap_FXDockSite_lower(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1); FXDockSite_lower(arg1); return Qnil; }
+static VALUE _wrap_FXDockSite_move(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
+    FXDockSite_move(arg1,arg2,arg3); return Qnil; }
+static VALUE _wrap_FXDockSite_position(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
+    arg4 = NUM2INT(argv[2]); arg5 = NUM2INT(argv[3]); FXDockSite_position(arg1,arg2,arg3,arg4,arg5); return Qnil; }
+static VALUE _wrap_FXDockSite_layout(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1); FXDockSite_layout(arg1); return Qnil; }
+static VALUE _wrap_FXDockSite_recalc(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1); FXDockSite_recalc(arg1); return Qnil; }
+static VALUE _wrap_FXDockSite_reparent(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXWindow, 1); FXDockSite_reparent(arg1,arg2,arg3); return Qnil; }
+static VALUE _wrap_FXDockSite_show(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1); FXDockSite_show(arg1); return Qnil; }
+static VALUE _wrap_FXDockSite_hide(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1); FXDockSite_hide(arg1); return Qnil; }
+static VALUE _wrap_FXDockSite_isComposite(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1);
+    result = (FXbool)FXDockSite_isComposite((FXDockSite const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXDockSite_contains(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1); arg2 = NUM2INT(argv[0]); arg3 = NUM2INT(argv[1]);
+    result = (FXbool)FXDockSite_contains((FXDockSite const *)arg1,arg2,arg3); vresult = result ? Qtrue : Qfalse;
+    return vresult; }
+static VALUE _wrap_FXDockSite_doesSaveUnder(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1);
+    result = (FXbool)FXDockSite_doesSaveUnder((FXDockSite const *)arg1); vresult = result ? Qtrue : Qfalse; return vresult; }
+static VALUE _wrap_FXDockSite_setBackColor(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1); arg2 = to_FXColor(argv[0]);
+    FXDockSite_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXDockSite_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXDockSite_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXDockSite_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXDockSite_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXDockSite_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 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_FXDockSite, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXDockSite_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXDockSite_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_FXDockSite, 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_FXDockSite_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_FXDockSite, 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_FXDockSite_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_FXDockSite, 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_FXDockSite_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXDockSite_setShape'"); return Qnil; }
+static VALUE _wrap_FXDockSite_clearShape(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1); FXDockSite_clearShape(arg1); return Qnil; }
+static VALUE _wrap_FXDockSite_moveToolBar(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    FXDockBar *arg2 = (FXDockBar *) 0 ; FXint arg3 ; FXint arg4 ; if ((argc < 3) || (argc > 3))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXDockBar, 1); arg3 = NUM2INT(argv[1]); arg4 = NUM2INT(argv[2]);
+    FXDockSite_moveToolBar(arg1,arg2,arg3,arg4); return Qnil; }
+static VALUE _wrap_FXDockSite_dockToolBar__SWIG_0(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    FXDockBar *arg2 = (FXDockBar *) 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_FXDockSite, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXDockBar, 1);
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXWindow, 1); FXDockSite_dockToolBar(arg1,arg2,arg3); return Qnil; }
+static VALUE _wrap_FXDockSite_dockToolBar__SWIG_1(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    FXDockBar *arg2 = (FXDockBar *) 0 ; FXint arg3 ; FXint arg4 ; if ((argc < 3) || (argc > 3))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXDockBar, 1); arg3 = NUM2INT(argv[1]); arg4 = NUM2INT(argv[2]);
+    FXDockSite_dockToolBar(arg1,arg2,arg3,arg4); return Qnil; }
+static VALUE _wrap_FXDockSite_dockToolBar(int nargs, VALUE *args, VALUE self) { int argc; VALUE argv[5]; int ii;
+    argc = nargs + 1; argv[0] = self; for (ii = 1; (ii < argc) && (ii < 4); ii++) { argv[ii] = args[ii-1]; }  if (argc == 3) {
+        int _v; { void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXDockSite, 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_FXDockBar, 0) != -1)) ? 1 : 0; }
+             if (_v) { { void *ptr;
+                    _v = (NIL_P(argv[2]) || (TYPE(argv[2]) == T_DATA && SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_FXWindow, 0) != -1)) ? 1 : 0; }
+                 if (_v) { return _wrap_FXDockSite_dockToolBar__SWIG_0(nargs, args, self);}  }  }  }  if (argc == 4) { int _v; {
+            void *ptr;
+            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXDockSite, 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_FXDockBar, 0) != -1)) ? 1 : 0; }
+             if (_v) { { _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { {
+                        _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
+                        return _wrap_FXDockSite_dockToolBar__SWIG_1(nargs, args, self);}  }  }  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXDockSite_dockToolBar'"); return Qnil; }
+static VALUE _wrap_FXDockSite_undockToolBar(int argc, VALUE *argv, VALUE self) { FXDockSite *arg1 = (FXDockSite *) 0 ;
+    FXDockBar *arg2 = (FXDockBar *) 0 ; if ((argc < 1) || (argc > 1))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDockSite, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXDockBar, 1); FXDockSite_undockToolBar(arg1,arg2); return Qnil; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXSpring_allocate(VALUE self) {
 #else
@@ -1244,6 +1520,11 @@ static VALUE _wrap_FXSpring_setFocus(int argc, VALUE *argv, VALUE self) { FXSpri
 static VALUE _wrap_FXSpring_killFocus(int argc, VALUE *argv, VALUE self) { FXSpring *arg1 = (FXSpring *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSpring, 1); FXSpring_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXSpring_changeFocus(int argc, VALUE *argv, VALUE self) { FXSpring *arg1 = (FXSpring *) 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_FXSpring, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXSpring_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXSpring_setDefault(int argc, VALUE *argv, VALUE self) { FXSpring *arg1 = (FXSpring *) 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_FXSpring, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -1276,10 +1557,11 @@ static VALUE _wrap_FXSpring_recalc(int argc, VALUE *argv, VALUE self) { FXSpring
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSpring, 1); FXSpring_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXSpring_reparent(int argc, VALUE *argv, VALUE self) { FXSpring *arg1 = (FXSpring *) 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_FXSpring, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXSpring_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); FXSpring_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXSpring_show(int argc, VALUE *argv, VALUE self) { FXSpring *arg1 = (FXSpring *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSpring, 1); FXSpring_show(arg1); return Qnil; }
@@ -1303,6 +1585,39 @@ static VALUE _wrap_FXSpring_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_FXSpring, 1); arg2 = to_FXColor(argv[0]);
     FXSpring_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSpring_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXSpring *arg1 = (FXSpring *) 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_FXSpring, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXSpring_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXSpring_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXSpring *arg1 = (FXSpring *) 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_FXSpring, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXSpring_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSpring_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXSpring *arg1 = (FXSpring *) 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_FXSpring, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXSpring_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSpring_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_FXSpring, 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_FXSpring_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_FXSpring, 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_FXSpring_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_FXSpring, 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_FXSpring_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXSpring_setShape'"); return Qnil; }
+static VALUE _wrap_FXSpring_clearShape(int argc, VALUE *argv, VALUE self) { FXSpring *arg1 = (FXSpring *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSpring, 1); FXSpring_clearShape(arg1); return Qnil; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXHorizontalFrame_allocate(VALUE self) {
 #else
@@ -1389,6 +1704,11 @@ static VALUE _wrap_FXHorizontalFrame_killFocus(int argc, VALUE *argv, VALUE self
     FXHorizontalFrame *arg1 = (FXHorizontalFrame *) 0 ; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHorizontalFrame, 1); FXHorizontalFrame_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXHorizontalFrame_changeFocus(int argc, VALUE *argv, VALUE self) {
+    FXHorizontalFrame *arg1 = (FXHorizontalFrame *) 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_FXHorizontalFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXHorizontalFrame_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXHorizontalFrame_setDefault(int argc, VALUE *argv, VALUE self) {
     FXHorizontalFrame *arg1 = (FXHorizontalFrame *) 0 ; FXbool arg2 = (FXbool) 1 ; if ((argc < 0) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -1429,10 +1749,11 @@ static VALUE _wrap_FXHorizontalFrame_recalc(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHorizontalFrame, 1); FXHorizontalFrame_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXHorizontalFrame_reparent(int argc, VALUE *argv, VALUE self) {
-    FXHorizontalFrame *arg1 = (FXHorizontalFrame *) 0 ; FXComposite *arg2 = (FXComposite *) 0 ; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    FXHorizontalFrame *arg1 = (FXHorizontalFrame *) 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_FXHorizontalFrame, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXHorizontalFrame_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); FXHorizontalFrame_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXHorizontalFrame_show(int argc, VALUE *argv, VALUE self) {
     FXHorizontalFrame *arg1 = (FXHorizontalFrame *) 0 ; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -1464,6 +1785,44 @@ static VALUE _wrap_FXHorizontalFrame_setBackColor(int argc, VALUE *argv, VALUE s
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHorizontalFrame, 1); arg2 = to_FXColor(argv[0]);
     FXHorizontalFrame_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXHorizontalFrame_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
+    FXHorizontalFrame *arg1 = (FXHorizontalFrame *) 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_FXHorizontalFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXHorizontalFrame_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXHorizontalFrame_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
+    FXHorizontalFrame *arg1 = (FXHorizontalFrame *) 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_FXHorizontalFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXHorizontalFrame_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXHorizontalFrame_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
+    FXHorizontalFrame *arg1 = (FXHorizontalFrame *) 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_FXHorizontalFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXHorizontalFrame_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXHorizontalFrame_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_FXHorizontalFrame, 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_FXHorizontalFrame_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_FXHorizontalFrame, 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_FXHorizontalFrame_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_FXHorizontalFrame, 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_FXHorizontalFrame_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXHorizontalFrame_setShape'"); return Qnil; }
+static VALUE _wrap_FXHorizontalFrame_clearShape(int argc, VALUE *argv, VALUE self) {
+    FXHorizontalFrame *arg1 = (FXHorizontalFrame *) 0 ; if ((argc < 0) || (argc > 0))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHorizontalFrame, 1); FXHorizontalFrame_clearShape(arg1); return Qnil; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXVerticalFrame_allocate(VALUE self) {
 #else
@@ -1547,6 +1906,11 @@ static VALUE _wrap_FXVerticalFrame_killFocus(int argc, VALUE *argv, VALUE self)
     FXVerticalFrame *arg1 = (FXVerticalFrame *) 0 ; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXVerticalFrame, 1); FXVerticalFrame_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXVerticalFrame_changeFocus(int argc, VALUE *argv, VALUE self) {
+    FXVerticalFrame *arg1 = (FXVerticalFrame *) 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_FXVerticalFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXVerticalFrame_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXVerticalFrame_setDefault(int argc, VALUE *argv, VALUE self) {
     FXVerticalFrame *arg1 = (FXVerticalFrame *) 0 ; FXbool arg2 = (FXbool) 1 ; if ((argc < 0) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -1581,10 +1945,11 @@ static VALUE _wrap_FXVerticalFrame_recalc(int argc, VALUE *argv, VALUE self) { F
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXVerticalFrame, 1); FXVerticalFrame_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXVerticalFrame_reparent(int argc, VALUE *argv, VALUE self) { FXVerticalFrame *arg1 = (FXVerticalFrame *) 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_FXVerticalFrame, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXVerticalFrame_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); FXVerticalFrame_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXVerticalFrame_show(int argc, VALUE *argv, VALUE self) { FXVerticalFrame *arg1 = (FXVerticalFrame *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXVerticalFrame, 1); FXVerticalFrame_show(arg1); return Qnil; }
@@ -1614,6 +1979,44 @@ static VALUE _wrap_FXVerticalFrame_setBackColor(int argc, VALUE *argv, VALUE sel
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXVerticalFrame, 1); arg2 = to_FXColor(argv[0]);
     FXVerticalFrame_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXVerticalFrame_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
+    FXVerticalFrame *arg1 = (FXVerticalFrame *) 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_FXVerticalFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXVerticalFrame_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXVerticalFrame_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
+    FXVerticalFrame *arg1 = (FXVerticalFrame *) 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_FXVerticalFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXVerticalFrame_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXVerticalFrame_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
+    FXVerticalFrame *arg1 = (FXVerticalFrame *) 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_FXVerticalFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXVerticalFrame_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXVerticalFrame_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_FXVerticalFrame, 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_FXVerticalFrame_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_FXVerticalFrame, 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_FXVerticalFrame_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_FXVerticalFrame, 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_FXVerticalFrame_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXVerticalFrame_setShape'"); return Qnil; }
+static VALUE _wrap_FXVerticalFrame_clearShape(int argc, VALUE *argv, VALUE self) {
+    FXVerticalFrame *arg1 = (FXVerticalFrame *) 0 ; if ((argc < 0) || (argc > 0))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXVerticalFrame, 1); FXVerticalFrame_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXMatrix_onFocusUp(int argc, VALUE *argv, VALUE self) { FXMatrix *arg1 = (FXMatrix *) 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);
@@ -1761,6 +2164,11 @@ static VALUE _wrap_FXMatrix_setFocus(int argc, VALUE *argv, VALUE self) { FXMatr
 static VALUE _wrap_FXMatrix_killFocus(int argc, VALUE *argv, VALUE self) { FXMatrix *arg1 = (FXMatrix *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMatrix, 1); FXMatrix_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXMatrix_changeFocus(int argc, VALUE *argv, VALUE self) { FXMatrix *arg1 = (FXMatrix *) 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_FXMatrix, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXMatrix_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXMatrix_setDefault(int argc, VALUE *argv, VALUE self) { FXMatrix *arg1 = (FXMatrix *) 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_FXMatrix, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -1793,10 +2201,11 @@ static VALUE _wrap_FXMatrix_recalc(int argc, VALUE *argv, VALUE self) { FXMatrix
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMatrix, 1); FXMatrix_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXMatrix_reparent(int argc, VALUE *argv, VALUE self) { FXMatrix *arg1 = (FXMatrix *) 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_FXMatrix, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXMatrix_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); FXMatrix_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXMatrix_show(int argc, VALUE *argv, VALUE self) { FXMatrix *arg1 = (FXMatrix *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMatrix, 1); FXMatrix_show(arg1); return Qnil; }
@@ -1820,6 +2229,39 @@ static VALUE _wrap_FXMatrix_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_FXMatrix, 1); arg2 = to_FXColor(argv[0]);
     FXMatrix_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXMatrix_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXMatrix *arg1 = (FXMatrix *) 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_FXMatrix, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXMatrix_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXMatrix_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXMatrix *arg1 = (FXMatrix *) 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_FXMatrix, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXMatrix_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXMatrix_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXMatrix *arg1 = (FXMatrix *) 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_FXMatrix, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXMatrix_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXMatrix_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_FXMatrix, 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_FXMatrix_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_FXMatrix, 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_FXMatrix_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_FXMatrix, 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_FXMatrix_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXMatrix_setShape'"); return Qnil; }
+static VALUE _wrap_FXMatrix_clearShape(int argc, VALUE *argv, VALUE self) { FXMatrix *arg1 = (FXMatrix *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMatrix, 1); FXMatrix_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXGroupBox_onPaint(int argc, VALUE *argv, VALUE self) { FXGroupBox *arg1 = (FXGroupBox *) 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);
@@ -1945,6 +2387,11 @@ static VALUE _wrap_FXGroupBox_setFocus(int argc, VALUE *argv, VALUE self) { FXGr
 static VALUE _wrap_FXGroupBox_killFocus(int argc, VALUE *argv, VALUE self) { FXGroupBox *arg1 = (FXGroupBox *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXGroupBox, 1); FXGroupBox_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXGroupBox_changeFocus(int argc, VALUE *argv, VALUE self) { FXGroupBox *arg1 = (FXGroupBox *) 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_FXGroupBox, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXGroupBox_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXGroupBox_setDefault(int argc, VALUE *argv, VALUE self) { FXGroupBox *arg1 = (FXGroupBox *) 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_FXGroupBox, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -1977,10 +2424,11 @@ static VALUE _wrap_FXGroupBox_recalc(int argc, VALUE *argv, VALUE self) { FXGrou
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXGroupBox, 1); FXGroupBox_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXGroupBox_reparent(int argc, VALUE *argv, VALUE self) { FXGroupBox *arg1 = (FXGroupBox *) 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_FXGroupBox, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXGroupBox_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); FXGroupBox_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXGroupBox_show(int argc, VALUE *argv, VALUE self) { FXGroupBox *arg1 = (FXGroupBox *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXGroupBox, 1); FXGroupBox_show(arg1); return Qnil; }
@@ -2007,6 +2455,41 @@ static VALUE _wrap_FXGroupBox_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_FXGroupBox, 1); arg2 = to_FXColor(argv[0]);
     FXGroupBox_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXGroupBox_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXGroupBox *arg1 = (FXGroupBox *) 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_FXGroupBox, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXGroupBox_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXGroupBox_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXGroupBox *arg1 = (FXGroupBox *) 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_FXGroupBox, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXGroupBox_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXGroupBox_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXGroupBox *arg1 = (FXGroupBox *) 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_FXGroupBox, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXGroupBox_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXGroupBox_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_FXGroupBox, 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_FXGroupBox_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_FXGroupBox, 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_FXGroupBox_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_FXGroupBox, 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_FXGroupBox_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXGroupBox_setShape'"); return Qnil; }
+static VALUE _wrap_FXGroupBox_clearShape(int argc, VALUE *argv, VALUE self) { FXGroupBox *arg1 = (FXGroupBox *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXGroupBox, 1); FXGroupBox_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXSwitcher_onPaint(int argc, VALUE *argv, VALUE self) { FXSwitcher *arg1 = (FXSwitcher *) 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);
@@ -2143,6 +2626,11 @@ static VALUE _wrap_FXSwitcher_setFocus(int argc, VALUE *argv, VALUE self) { FXSw
 static VALUE _wrap_FXSwitcher_killFocus(int argc, VALUE *argv, VALUE self) { FXSwitcher *arg1 = (FXSwitcher *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSwitcher, 1); FXSwitcher_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXSwitcher_changeFocus(int argc, VALUE *argv, VALUE self) { FXSwitcher *arg1 = (FXSwitcher *) 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_FXSwitcher, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXSwitcher_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXSwitcher_setDefault(int argc, VALUE *argv, VALUE self) { FXSwitcher *arg1 = (FXSwitcher *) 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_FXSwitcher, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -2175,10 +2663,11 @@ static VALUE _wrap_FXSwitcher_recalc(int argc, VALUE *argv, VALUE self) { FXSwit
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSwitcher, 1); FXSwitcher_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXSwitcher_reparent(int argc, VALUE *argv, VALUE self) { FXSwitcher *arg1 = (FXSwitcher *) 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_FXSwitcher, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXSwitcher_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); FXSwitcher_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXSwitcher_show(int argc, VALUE *argv, VALUE self) { FXSwitcher *arg1 = (FXSwitcher *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSwitcher, 1); FXSwitcher_show(arg1); return Qnil; }
@@ -2205,6 +2694,41 @@ static VALUE _wrap_FXSwitcher_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_FXSwitcher, 1); arg2 = to_FXColor(argv[0]);
     FXSwitcher_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSwitcher_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXSwitcher *arg1 = (FXSwitcher *) 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_FXSwitcher, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXSwitcher_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXSwitcher_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXSwitcher *arg1 = (FXSwitcher *) 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_FXSwitcher, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXSwitcher_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSwitcher_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXSwitcher *arg1 = (FXSwitcher *) 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_FXSwitcher, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXSwitcher_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSwitcher_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_FXSwitcher, 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_FXSwitcher_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_FXSwitcher, 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_FXSwitcher_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_FXSwitcher, 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_FXSwitcher_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXSwitcher_setShape'"); return Qnil; }
+static VALUE _wrap_FXSwitcher_clearShape(int argc, VALUE *argv, VALUE self) { FXSwitcher *arg1 = (FXSwitcher *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSwitcher, 1); FXSwitcher_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXShutterItem_onFocusUp(int argc, VALUE *argv, VALUE self) { FXShutterItem *arg1 = (FXShutterItem *) 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);
@@ -2341,6 +2865,11 @@ static VALUE _wrap_FXShutterItem_setFocus(int argc, VALUE *argv, VALUE self) { F
 static VALUE _wrap_FXShutterItem_killFocus(int argc, VALUE *argv, VALUE self) { FXShutterItem *arg1 = (FXShutterItem *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShutterItem, 1); FXShutterItem_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXShutterItem_changeFocus(int argc, VALUE *argv, VALUE self) { FXShutterItem *arg1 = (FXShutterItem *) 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_FXShutterItem, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXShutterItem_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXShutterItem_setDefault(int argc, VALUE *argv, VALUE self) { FXShutterItem *arg1 = (FXShutterItem *) 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_FXShutterItem, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -2373,10 +2902,11 @@ static VALUE _wrap_FXShutterItem_recalc(int argc, VALUE *argv, VALUE self) { FXS
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShutterItem, 1); FXShutterItem_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXShutterItem_reparent(int argc, VALUE *argv, VALUE self) { FXShutterItem *arg1 = (FXShutterItem *) 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_FXShutterItem, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXShutterItem_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); FXShutterItem_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXShutterItem_show(int argc, VALUE *argv, VALUE self) { FXShutterItem *arg1 = (FXShutterItem *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShutterItem, 1); FXShutterItem_show(arg1); return Qnil; }
@@ -2404,6 +2934,43 @@ static VALUE _wrap_FXShutterItem_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_FXShutterItem, 1); arg2 = to_FXColor(argv[0]);
     FXShutterItem_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXShutterItem_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
+    FXShutterItem *arg1 = (FXShutterItem *) 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_FXShutterItem, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXShutterItem_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXShutterItem_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
+    FXShutterItem *arg1 = (FXShutterItem *) 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_FXShutterItem, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXShutterItem_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXShutterItem_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
+    FXShutterItem *arg1 = (FXShutterItem *) 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_FXShutterItem, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXShutterItem_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXShutterItem_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_FXShutterItem, 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_FXShutterItem_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_FXShutterItem, 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_FXShutterItem_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_FXShutterItem, 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_FXShutterItem_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXShutterItem_setShape'"); return Qnil; }
+static VALUE _wrap_FXShutterItem_clearShape(int argc, VALUE *argv, VALUE self) { FXShutterItem *arg1 = (FXShutterItem *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShutterItem, 1); FXShutterItem_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXShutter_onFocusUp(int argc, VALUE *argv, VALUE self) { FXShutter *arg1 = (FXShutter *) 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);
@@ -2546,6 +3113,11 @@ static VALUE _wrap_FXShutter_setFocus(int argc, VALUE *argv, VALUE self) { FXShu
 static VALUE _wrap_FXShutter_killFocus(int argc, VALUE *argv, VALUE self) { FXShutter *arg1 = (FXShutter *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShutter, 1); FXShutter_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXShutter_changeFocus(int argc, VALUE *argv, VALUE self) { FXShutter *arg1 = (FXShutter *) 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_FXShutter, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXShutter_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXShutter_setDefault(int argc, VALUE *argv, VALUE self) { FXShutter *arg1 = (FXShutter *) 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_FXShutter, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -2578,10 +3150,11 @@ static VALUE _wrap_FXShutter_recalc(int argc, VALUE *argv, VALUE self) { FXShutt
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShutter, 1); FXShutter_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXShutter_reparent(int argc, VALUE *argv, VALUE self) { FXShutter *arg1 = (FXShutter *) 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_FXShutter, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXShutter_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); FXShutter_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXShutter_show(int argc, VALUE *argv, VALUE self) { FXShutter *arg1 = (FXShutter *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShutter, 1); FXShutter_show(arg1); return Qnil; }
@@ -2606,6 +3179,39 @@ static VALUE _wrap_FXShutter_setBackColor(int argc, VALUE *argv, VALUE self) { F
     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_FXShutter, 1); arg2 = to_FXColor(argv[0]);
     FXShutter_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXShutter_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXShutter *arg1 = (FXShutter *) 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_FXShutter, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXShutter_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXShutter_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXShutter *arg1 = (FXShutter *) 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_FXShutter, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXShutter_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXShutter_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXShutter *arg1 = (FXShutter *) 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_FXShutter, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXShutter_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXShutter_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_FXShutter, 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_FXShutter_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_FXShutter, 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_FXShutter_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_FXShutter, 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_FXShutter_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXShutter_setShape'"); return Qnil; }
+static VALUE _wrap_FXShutter_clearShape(int argc, VALUE *argv, VALUE self) { FXShutter *arg1 = (FXShutter *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXShutter, 1); FXShutter_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXShutter_setCurrent(int argc, VALUE *argv, VALUE self) { FXShutter *arg1 = (FXShutter *) 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_FXShutter, 1); arg2 = NUM2INT(argv[0]); FXShutter_setCurrent(arg1,arg2);
@@ -2810,6 +3416,11 @@ static VALUE _wrap_FXSplitter_setFocus(int argc, VALUE *argv, VALUE self) { FXSp
 static VALUE _wrap_FXSplitter_killFocus(int argc, VALUE *argv, VALUE self) { FXSplitter *arg1 = (FXSplitter *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSplitter, 1); FXSplitter_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXSplitter_changeFocus(int argc, VALUE *argv, VALUE self) { FXSplitter *arg1 = (FXSplitter *) 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_FXSplitter, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXSplitter_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXSplitter_setDefault(int argc, VALUE *argv, VALUE self) { FXSplitter *arg1 = (FXSplitter *) 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_FXSplitter, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -2842,10 +3453,11 @@ static VALUE _wrap_FXSplitter_recalc(int argc, VALUE *argv, VALUE self) { FXSpli
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSplitter, 1); FXSplitter_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXSplitter_reparent(int argc, VALUE *argv, VALUE self) { FXSplitter *arg1 = (FXSplitter *) 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_FXSplitter, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXSplitter_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); FXSplitter_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXSplitter_show(int argc, VALUE *argv, VALUE self) { FXSplitter *arg1 = (FXSplitter *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSplitter, 1); FXSplitter_show(arg1); return Qnil; }
@@ -2872,6 +3484,41 @@ static VALUE _wrap_FXSplitter_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_FXSplitter, 1); arg2 = to_FXColor(argv[0]);
     FXSplitter_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSplitter_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXSplitter *arg1 = (FXSplitter *) 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_FXSplitter, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXSplitter_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXSplitter_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXSplitter *arg1 = (FXSplitter *) 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_FXSplitter, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXSplitter_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSplitter_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXSplitter *arg1 = (FXSplitter *) 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_FXSplitter, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXSplitter_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSplitter_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_FXSplitter, 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_FXSplitter_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_FXSplitter, 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_FXSplitter_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_FXSplitter, 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_FXSplitter_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXSplitter_setShape'"); return Qnil; }
+static VALUE _wrap_FXSplitter_clearShape(int argc, VALUE *argv, VALUE self) { FXSplitter *arg1 = (FXSplitter *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSplitter, 1); FXSplitter_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FX4Splitter_onLeftBtnPress(int argc, VALUE *argv, VALUE self) { FX4Splitter *arg1 = (FX4Splitter *) 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);
@@ -3119,6 +3766,11 @@ static VALUE _wrap_FX4Splitter_setFocus(int argc, VALUE *argv, VALUE self) { FX4
 static VALUE _wrap_FX4Splitter_killFocus(int argc, VALUE *argv, VALUE self) { FX4Splitter *arg1 = (FX4Splitter *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FX4Splitter, 1); FX4Splitter_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FX4Splitter_changeFocus(int argc, VALUE *argv, VALUE self) { FX4Splitter *arg1 = (FX4Splitter *) 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_FX4Splitter, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FX4Splitter_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FX4Splitter_setDefault(int argc, VALUE *argv, VALUE self) { FX4Splitter *arg1 = (FX4Splitter *) 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_FX4Splitter, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -3151,10 +3803,11 @@ static VALUE _wrap_FX4Splitter_recalc(int argc, VALUE *argv, VALUE self) { FX4Sp
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FX4Splitter, 1); FX4Splitter_recalc(arg1); return Qnil; }
 static VALUE _wrap_FX4Splitter_reparent(int argc, VALUE *argv, VALUE self) { FX4Splitter *arg1 = (FX4Splitter *) 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_FX4Splitter, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FX4Splitter_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); FX4Splitter_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FX4Splitter_show(int argc, VALUE *argv, VALUE self) { FX4Splitter *arg1 = (FX4Splitter *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FX4Splitter, 1); FX4Splitter_show(arg1); return Qnil; }
@@ -3181,6 +3834,41 @@ static VALUE _wrap_FX4Splitter_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_FX4Splitter, 1); arg2 = to_FXColor(argv[0]);
     FX4Splitter_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FX4Splitter_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FX4Splitter *arg1 = (FX4Splitter *) 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_FX4Splitter, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FX4Splitter_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FX4Splitter_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FX4Splitter *arg1 = (FX4Splitter *) 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_FX4Splitter, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FX4Splitter_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FX4Splitter_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FX4Splitter *arg1 = (FX4Splitter *) 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_FX4Splitter, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FX4Splitter_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FX4Splitter_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_FX4Splitter, 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_FX4Splitter_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_FX4Splitter, 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_FX4Splitter_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_FX4Splitter, 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_FX4Splitter_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FX4Splitter_setShape'"); return Qnil; }
+static VALUE _wrap_FX4Splitter_clearShape(int argc, VALUE *argv, VALUE self) { FX4Splitter *arg1 = (FX4Splitter *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FX4Splitter, 1); FX4Splitter_clearShape(arg1); return Qnil; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXStatusBar_allocate(VALUE self) {
 #else
@@ -3284,6 +3972,11 @@ static VALUE _wrap_FXStatusBar_setFocus(int argc, VALUE *argv, VALUE self) { FXS
 static VALUE _wrap_FXStatusBar_killFocus(int argc, VALUE *argv, VALUE self) { FXStatusBar *arg1 = (FXStatusBar *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStatusBar, 1); FXStatusBar_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXStatusBar_changeFocus(int argc, VALUE *argv, VALUE self) { FXStatusBar *arg1 = (FXStatusBar *) 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_FXStatusBar, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXStatusBar_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXStatusBar_setDefault(int argc, VALUE *argv, VALUE self) { FXStatusBar *arg1 = (FXStatusBar *) 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_FXStatusBar, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -3316,10 +4009,11 @@ static VALUE _wrap_FXStatusBar_recalc(int argc, VALUE *argv, VALUE self) { FXSta
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStatusBar, 1); FXStatusBar_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXStatusBar_reparent(int argc, VALUE *argv, VALUE self) { FXStatusBar *arg1 = (FXStatusBar *) 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_FXStatusBar, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXStatusBar_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); FXStatusBar_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXStatusBar_show(int argc, VALUE *argv, VALUE self) { FXStatusBar *arg1 = (FXStatusBar *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStatusBar, 1); FXStatusBar_show(arg1); return Qnil; }
@@ -3346,6 +4040,41 @@ static VALUE _wrap_FXStatusBar_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_FXStatusBar, 1); arg2 = to_FXColor(argv[0]);
     FXStatusBar_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXStatusBar_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXStatusBar *arg1 = (FXStatusBar *) 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_FXStatusBar, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXStatusBar_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXStatusBar_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXStatusBar *arg1 = (FXStatusBar *) 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_FXStatusBar, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXStatusBar_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXStatusBar_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXStatusBar *arg1 = (FXStatusBar *) 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_FXStatusBar, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXStatusBar_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXStatusBar_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_FXStatusBar, 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_FXStatusBar_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_FXStatusBar, 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_FXStatusBar_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_FXStatusBar, 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_FXStatusBar_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXStatusBar_setShape'"); return Qnil; }
+static VALUE _wrap_FXStatusBar_clearShape(int argc, VALUE *argv, VALUE self) { FXStatusBar *arg1 = (FXStatusBar *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStatusBar, 1); FXStatusBar_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXScrollArea_onHMouseWheel(int argc, VALUE *argv, VALUE self) { FXScrollArea *arg1 = (FXScrollArea *) 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);
@@ -3520,6 +4249,11 @@ static VALUE _wrap_FXScrollArea_setFocus(int argc, VALUE *argv, VALUE self) { FX
 static VALUE _wrap_FXScrollArea_killFocus(int argc, VALUE *argv, VALUE self) { FXScrollArea *arg1 = (FXScrollArea *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXScrollArea, 1); FXScrollArea_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXScrollArea_changeFocus(int argc, VALUE *argv, VALUE self) { FXScrollArea *arg1 = (FXScrollArea *) 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_FXScrollArea, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXScrollArea_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXScrollArea_setDefault(int argc, VALUE *argv, VALUE self) { FXScrollArea *arg1 = (FXScrollArea *) 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_FXScrollArea, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -3552,10 +4286,11 @@ static VALUE _wrap_FXScrollArea_recalc(int argc, VALUE *argv, VALUE self) { FXSc
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXScrollArea, 1); FXScrollArea_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXScrollArea_reparent(int argc, VALUE *argv, VALUE self) { FXScrollArea *arg1 = (FXScrollArea *) 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_FXScrollArea, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXScrollArea_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); FXScrollArea_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXScrollArea_show(int argc, VALUE *argv, VALUE self) { FXScrollArea *arg1 = (FXScrollArea *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXScrollArea, 1); FXScrollArea_show(arg1); return Qnil; }
@@ -3582,6 +4317,41 @@ static VALUE _wrap_FXScrollArea_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_FXScrollArea, 1); arg2 = to_FXColor(argv[0]);
     FXScrollArea_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXScrollArea_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXScrollArea *arg1 = (FXScrollArea *) 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_FXScrollArea, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXScrollArea_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXScrollArea_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXScrollArea *arg1 = (FXScrollArea *) 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_FXScrollArea, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXScrollArea_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXScrollArea_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXScrollArea *arg1 = (FXScrollArea *) 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_FXScrollArea, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXScrollArea_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXScrollArea_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_FXScrollArea, 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_FXScrollArea_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_FXScrollArea, 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_FXScrollArea_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_FXScrollArea, 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_FXScrollArea_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXScrollArea_setShape'"); return Qnil; }
+static VALUE _wrap_FXScrollArea_clearShape(int argc, VALUE *argv, VALUE self) { FXScrollArea *arg1 = (FXScrollArea *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXScrollArea, 1); FXScrollArea_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXScrollArea_getViewportHeight(int argc, VALUE *argv, VALUE self) { FXScrollArea *arg1 = (FXScrollArea *) 0 ;
     FXint result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -3722,6 +4492,11 @@ static VALUE _wrap_FXScrollWindow_setFocus(int argc, VALUE *argv, VALUE self) {
 static VALUE _wrap_FXScrollWindow_killFocus(int argc, VALUE *argv, VALUE self) { FXScrollWindow *arg1 = (FXScrollWindow *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXScrollWindow, 1); FXScrollWindow_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXScrollWindow_changeFocus(int argc, VALUE *argv, VALUE self) { FXScrollWindow *arg1 = (FXScrollWindow *) 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_FXScrollWindow, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXScrollWindow_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXScrollWindow_setDefault(int argc, VALUE *argv, VALUE self) { FXScrollWindow *arg1 = (FXScrollWindow *) 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_FXScrollWindow, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -3754,10 +4529,11 @@ static VALUE _wrap_FXScrollWindow_recalc(int argc, VALUE *argv, VALUE self) { FX
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXScrollWindow, 1); FXScrollWindow_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXScrollWindow_reparent(int argc, VALUE *argv, VALUE self) { FXScrollWindow *arg1 = (FXScrollWindow *) 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_FXScrollWindow, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXScrollWindow_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); FXScrollWindow_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXScrollWindow_show(int argc, VALUE *argv, VALUE self) { FXScrollWindow *arg1 = (FXScrollWindow *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXScrollWindow, 1); FXScrollWindow_show(arg1); return Qnil; }
@@ -3787,6 +4563,43 @@ static VALUE _wrap_FXScrollWindow_setBackColor(int argc, VALUE *argv, VALUE self
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXScrollWindow, 1); arg2 = to_FXColor(argv[0]);
     FXScrollWindow_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXScrollWindow_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
+    FXScrollWindow *arg1 = (FXScrollWindow *) 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_FXScrollWindow, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXScrollWindow_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXScrollWindow_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
+    FXScrollWindow *arg1 = (FXScrollWindow *) 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_FXScrollWindow, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXScrollWindow_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXScrollWindow_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
+    FXScrollWindow *arg1 = (FXScrollWindow *) 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_FXScrollWindow, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXScrollWindow_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXScrollWindow_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_FXScrollWindow, 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_FXScrollWindow_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_FXScrollWindow, 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_FXScrollWindow_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_FXScrollWindow, 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_FXScrollWindow_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXScrollWindow_setShape'"); return Qnil; }
+static VALUE _wrap_FXScrollWindow_clearShape(int argc, VALUE *argv, VALUE self) { FXScrollWindow *arg1 = (FXScrollWindow *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXScrollWindow, 1); FXScrollWindow_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXScrollWindow_getViewportHeight(int argc, VALUE *argv, VALUE self) {
     FXScrollWindow *arg1 = (FXScrollWindow *) 0 ; FXint result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -3830,6 +4643,9 @@ static VALUE _wrap_FXScrollWindow_position(int nargs, VALUE *args, VALUE self) {
 static void *_p_FXFrameTo_p_FXId(void *x) {
     return (void *)((FXId *) (FXDrawable *)(FXWindow *) ((FXFrame *) x));
 }
+static void *_p_FXDockSiteTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *)(FXPacker *) ((FXDockSite *) x));
+}
 static void *_p_FXPopupTo_p_FXId(void *x) {
     return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *) ((FXPopup *) x));
 }
@@ -3857,6 +4673,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_FXScrollWindowTo_p_FXId(void *x) {
     return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *)(FXScrollArea *) ((FXScrollWindow *) x));
 }
@@ -3923,18 +4742,15 @@ static void *_p_FXCompositeTo_p_FXObject(void *x) {
 static void *_p_FXRegistryTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXDict *)(FXSettings *) ((FXRegistry *) x));
 }
-static void *_p_FXIconDictTo_p_FXObject(void *x) {
-    return (void *)((FXObject *) (FXDict *) ((FXIconDict *) x));
-}
-static void *_p_FXGroupBoxTo_p_FXObject(void *x) {
-    return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *)(FXComposite *)(FXPacker *) ((FXGroupBox *) x));
-}
 static void *_p_FXShellTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *)(FXComposite *) ((FXShell *) x));
 }
 static void *_p_FXPopupTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *) ((FXPopup *) x));
 }
+static void *_p_FXGroupBoxTo_p_FXObject(void *x) {
+    return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *)(FXComposite *)(FXPacker *) ((FXGroupBox *) x));
+}
 static void *_p_FXStatusBarTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *)(FXComposite *)(FXPacker *)(FXHorizontalFrame *) ((FXStatusBar *) x));
 }
@@ -3947,6 +4763,9 @@ static void *_p_FXRecentFilesTo_p_FXObject(void *x) {
 static void *_p_FXDocumentTo_p_FXObject(void *x) {
     return (void *)((FXObject *)  ((FXDocument *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXObject(void *x) {
+    return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
+}
 static void *_p_FXMainWindowTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
 }
@@ -4013,6 +4832,9 @@ static void *_p_FXCURCursorTo_p_FXObject(void *x) {
 static void *_p_FXCursorTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXId *) ((FXCursor *) x));
 }
+static void *_p_FXDockSiteTo_p_FXObject(void *x) {
+    return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *)(FXComposite *)(FXPacker *) ((FXDockSite *) x));
+}
 static void *_p_FXDictTo_p_FXObject(void *x) {
     return (void *)((FXObject *)  ((FXDict *) x));
 }
@@ -4040,6 +4862,9 @@ static void *_p_FXAppTo_p_FXObject(void *x) {
 static void *_p_FXScrollWindowTo_p_FXScrollArea(void *x) {
     return (void *)((FXScrollArea *)  ((FXScrollWindow *) x));
 }
+static void *_p_FXDockSiteTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXComposite *)(FXPacker *) ((FXDockSite *) x));
+}
 static void *_p_FXFrameTo_p_FXWindow(void *x) {
     return (void *)((FXWindow *)  ((FXFrame *) x));
 }
@@ -4055,6 +4880,9 @@ static void *_p_FXScrollAreaTo_p_FXWindow(void *x) {
 static void *_p_FXStatusBarTo_p_FXWindow(void *x) {
     return (void *)((FXWindow *) (FXComposite *)(FXPacker *)(FXHorizontalFrame *) ((FXStatusBar *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXComposite *)(FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
+}
 static void *_p_FXMainWindowTo_p_FXWindow(void *x) {
     return (void *)((FXWindow *) (FXComposite *)(FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
 }
@@ -4103,6 +4931,9 @@ static void *_p_FXSpringTo_p_FXWindow(void *x) {
 static void *_p_FXSwitcherTo_p_FXWindow(void *x) {
     return (void *)((FXWindow *) (FXComposite *)(FXPacker *) ((FXSwitcher *) x));
 }
+static void *_p_FXDockSiteTo_p_FXComposite(void *x) {
+    return (void *)((FXComposite *) (FXPacker *) ((FXDockSite *) x));
+}
 static void *_p_FXPopupTo_p_FXComposite(void *x) {
     return (void *)((FXComposite *) (FXShell *) ((FXPopup *) x));
 }
@@ -4115,6 +4946,9 @@ static void *_p_FXScrollAreaTo_p_FXComposite(void *x) {
 static void *_p_FXStatusBarTo_p_FXComposite(void *x) {
     return (void *)((FXComposite *) (FXPacker *)(FXHorizontalFrame *) ((FXStatusBar *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXComposite(void *x) {
+    return (void *)((FXComposite *) (FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
+}
 static void *_p_FXMainWindowTo_p_FXComposite(void *x) {
     return (void *)((FXComposite *) (FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
 }
@@ -4139,9 +4973,6 @@ static void *_p_FXSplitterTo_p_FXComposite(void *x) {
 static void *_p_FX4SplitterTo_p_FXComposite(void *x) {
     return (void *)((FXComposite *)  ((FX4Splitter *) x));
 }
-static void *_p_FXShutterTo_p_FXComposite(void *x) {
-    return (void *)((FXComposite *) (FXPacker *)(FXVerticalFrame *) ((FXShutter *) x));
-}
 static void *_p_FXPackerTo_p_FXComposite(void *x) {
     return (void *)((FXComposite *)  ((FXPacker *) x));
 }
@@ -4151,6 +4982,9 @@ static void *_p_FXVerticalFrameTo_p_FXComposite(void *x) {
 static void *_p_FXHorizontalFrameTo_p_FXComposite(void *x) {
     return (void *)((FXComposite *) (FXPacker *) ((FXHorizontalFrame *) x));
 }
+static void *_p_FXShutterTo_p_FXComposite(void *x) {
+    return (void *)((FXComposite *) (FXPacker *)(FXVerticalFrame *) ((FXShutter *) x));
+}
 static void *_p_FXMatrixTo_p_FXComposite(void *x) {
     return (void *)((FXComposite *) (FXPacker *) ((FXMatrix *) x));
 }
@@ -4166,6 +5000,9 @@ static void *_p_FXFileStreamTo_p_FXStream(void *x) {
 static void *_p_FXMemoryStreamTo_p_FXStream(void *x) {
     return (void *)((FXStream *)  ((FXMemoryStream *) x));
 }
+static void *_p_FXDockSiteTo_p_FXDrawable(void *x) {
+    return (void *)((FXDrawable *) (FXWindow *)(FXComposite *)(FXPacker *) ((FXDockSite *) x));
+}
 static void *_p_FXFrameTo_p_FXDrawable(void *x) {
     return (void *)((FXDrawable *) (FXWindow *) ((FXFrame *) x));
 }
@@ -4181,6 +5018,9 @@ static void *_p_FXScrollAreaTo_p_FXDrawable(void *x) {
 static void *_p_FXStatusBarTo_p_FXDrawable(void *x) {
     return (void *)((FXDrawable *) (FXWindow *)(FXComposite *)(FXPacker *)(FXHorizontalFrame *) ((FXStatusBar *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXDrawable(void *x) {
+    return (void *)((FXDrawable *) (FXWindow *)(FXComposite *)(FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
+}
 static void *_p_FXMainWindowTo_p_FXDrawable(void *x) {
     return (void *)((FXDrawable *) (FXWindow *)(FXComposite *)(FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
 }
@@ -4244,6 +5084,9 @@ static void *_p_FXSpringTo_p_FXPacker(void *x) {
 static void *_p_FXMatrixTo_p_FXPacker(void *x) {
     return (void *)((FXPacker *)  ((FXMatrix *) x));
 }
+static void *_p_FXDockSiteTo_p_FXPacker(void *x) {
+    return (void *)((FXPacker *)  ((FXDockSite *) x));
+}
 static void *_p_FXShutterItemTo_p_FXPacker(void *x) {
     return (void *)((FXPacker *) (FXVerticalFrame *) ((FXShutterItem *) x));
 }
@@ -4268,44 +5111,51 @@ static void *_p_FXShutterItemTo_p_FXVerticalFrame(void *x) {
 static void *_p_FXShutterTo_p_FXVerticalFrame(void *x) {
     return (void *)((FXVerticalFrame *)  ((FXShutter *) x));
 }
-static swig_type_info _swigt__p_FXObject[] = {{"_p_FXObject", 0, "FXObject *", 0, 0, 0, 0},{"_p_FXDict", _p_FXDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSettings", _p_FXSettingsTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXAccelTable", _p_FXAccelTableTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRegistry", _p_FXRegistryTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXId", _p_FXIdTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXIconDict", _p_FXIconDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXGroupBox", _p_FXGroupBoxTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXScrollWindow", _p_FXScrollWindowTo_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_FXRecentFiles", _p_FXRecentFilesTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDocument", _p_FXDocumentTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSplitter", _p_FXSplitterTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FX4Splitter", _p_FX4SplitterTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXObject", 0, 0, 0, 0, 0, 0},{"_p_FXStringDict", _p_FXStringDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXPacker", _p_FXPackerTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFileDict", _p_FXFileDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDebugTarget", _p_FXDebugTargetTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDataTarget", _p_FXDataTargetTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDrawable", _p_FXDrawableTo_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_FXDelegator", _p_FXDelegatorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXApp", _p_FXAppTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFont", _p_FXFontTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXVisual", _p_FXVisualTo_p_FXObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXDockSite[] = {{"_p_FXDockSite", 0, "FXDockSite *", 0, 0, 0, 0},{"_p_FXDockSite", 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_FXDict", _p_FXDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSettings", _p_FXSettingsTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXAccelTable", _p_FXAccelTableTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRegistry", _p_FXRegistryTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXId", _p_FXIdTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXGroupBox", _p_FXGroupBoxTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXScrollWindow", _p_FXScrollWindowTo_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_FXRecentFiles", _p_FXRecentFilesTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDocument", _p_FXDocumentTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FX4Splitter", _p_FX4SplitterTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSplitter", _p_FXSplitterTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXObject", 0, 0, 0, 0, 0, 0},{"_p_FXStringDict", _p_FXStringDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXPacker", _p_FXPackerTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFileDict", _p_FXFileDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDebugTarget", _p_FXDebugTargetTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDataTarget", _p_FXDataTargetTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_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_FXDockSite", _p_FXDockSiteTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXApp", _p_FXAppTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFont", _p_FXFontTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXVisual", _p_FXVisualTo_p_FXObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXScrollArea[] = {{"_p_FXScrollArea", 0, "FXScrollArea *", 0, 0, 0, 0},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXScrollArea, 0, 0, 0, 0, 0},{"_p_FXScrollArea", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXShutterItem[] = {{"_p_FXShutterItem", 0, "FXShutterItem *", 0, 0, 0, 0},{"_p_FXShutterItem", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXDockBar[] = {{"_p_FXDockBar", 0, "FXDockBar *", 0, 0, 0, 0},{"_p_FXDockBar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXStatusBar[] = {{"_p_FXStatusBar", 0, "FXStatusBar *", 0, 0, 0, 0},{"_p_FXStatusBar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXScrollBar[] = {{"_p_FXScrollBar", 0, "FXScrollBar *", 0, 0, 0, 0},{"_p_FXScrollBar", 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_FXFrame", _p_FXFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXWindow", 0, 0, 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_FXGroupBox", _p_FXGroupBoxTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FX4Splitter", _p_FX4SplitterTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXSplitter", _p_FXSplitterTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXPacker", _p_FXPackerTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXWindow, 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_FXPopup", _p_FXPopupTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXComposite", 0, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXGroupBox", _p_FXGroupBoxTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXSplitter", _p_FXSplitterTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FX4Splitter", _p_FX4SplitterTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXPacker", _p_FXPackerTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXComposite, 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_FXDockSite", _p_FXDockSiteTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXWindow", 0, 0, 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_FXGroupBox", _p_FXGroupBoxTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXSplitter", _p_FXSplitterTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FX4Splitter", _p_FX4SplitterTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXPacker", _p_FXPackerTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXWindow, 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_FXDockSite", _p_FXDockSiteTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXComposite", 0, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXGroupBox", _p_FXGroupBoxTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXSplitter", _p_FXSplitterTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FX4Splitter", _p_FX4SplitterTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXPacker", _p_FXPackerTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXComposite, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXScrollWindow[] = {{"_p_FXScrollWindow", 0, "FXScrollWindow *", 0, 0, 0, 0},{"_p_FXScrollWindow", 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_FXId[] = {{"_p_FXId", 0, "FXId *", 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXDockSite", _p_FXDockSiteTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_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_FXRootWindow", _p_FXRootWindowTo_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_FXScrollWindow", _p_FXScrollWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXId", 0, 0, 0, 0, 0, 0},{"_p_FXFont", _p_FXFontTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXGroupBox", _p_FXGroupBoxTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSplitter", _p_FXSplitterTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FX4Splitter", _p_FX4SplitterTo_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_FXPacker", _p_FXPackerTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXVisual", _p_FXVisualTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXId, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXFont[] = {{"_p_FXFont", 0, "FXFont *", 0, 0, 0, 0},{"_p_FXFont", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_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_FXShutterItem", _p_FXShutterItemTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_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_FXRootWindow", _p_FXRootWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXId", 0, 0, 0, 0, 0, 0},{"_p_FXFont", _p_FXFontTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXGroupBox", _p_FXGroupBoxTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FX4Splitter", _p_FX4SplitterTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSplitter", _p_FXSplitterTo_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_FXShutter", _p_FXShutterTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXPacker", _p_FXPackerTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXVisual", _p_FXVisualTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXId, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXStatusLine[] = {{"_p_FXStatusLine", 0, "FXStatusLine *", 0, 0, 0, 0},{"_p_FXStatusLine", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXGroupBox[] = {{"_p_FXGroupBox", 0, "FXGroupBox *", 0, 0, 0, 0},{"_p_FXGroupBox", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXButton[] = {{"_p_FXButton", 0, "FXButton *", 0, 0, 0, 0},{"_p_FXButton", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *", 0, 0, 0, 0},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream, 0, 0, 0, 0, 0},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream, 0, 0, 0, 0, 0},{"_p_FXStream", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable *", 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_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_FXScrollWindow", _p_FXScrollWindowTo_p_FXDrawable, 0, 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_FXGroupBox", _p_FXGroupBoxTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDrawable", 0, 0, 0, 0, 0, 0},{"_p_FX4Splitter", _p_FX4SplitterTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSplitter", _p_FXSplitterTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXPacker", _p_FXPackerTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXDrawable, 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_FXDockSite", _p_FXDockSiteTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_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_FXScrollWindow", _p_FXScrollWindowTo_p_FXDrawable, 0, 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_FXGroupBox", _p_FXGroupBoxTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDrawable", 0, 0, 0, 0, 0, 0},{"_p_FXSplitter", _p_FXSplitterTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FX4Splitter", _p_FX4SplitterTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXPacker", _p_FXPackerTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXDrawable, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXSplitter[] = {{"_p_FXSplitter", 0, "FXSplitter *", 0, 0, 0, 0},{"_p_FXSplitter", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FX4Splitter[] = {{"_p_FX4Splitter", 0, "FX4Splitter *", 0, 0, 0, 0},{"_p_FX4Splitter", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXPacker[] = {{"_p_FXPacker", 0, "FXPacker *", 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXPacker", 0, 0, 0, 0, 0, 0},{"_p_FXGroupBox", _p_FXGroupBoxTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXPacker, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXPacker[] = {{"_p_FXPacker", 0, "FXPacker *", 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXDockSite", _p_FXDockSiteTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXPacker", 0, 0, 0, 0, 0, 0},{"_p_FXGroupBox", _p_FXGroupBoxTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXPacker, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXPacker, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXHorizontalFrame[] = {{"_p_FXHorizontalFrame", 0, "FXHorizontalFrame *", 0, 0, 0, 0},{"_p_FXHorizontalFrame", 0, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXHorizontalFrame, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXVerticalFrame[] = {{"_p_FXVerticalFrame", 0, "FXVerticalFrame *", 0, 0, 0, 0},{"_p_FXVerticalFrame", 0, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXVerticalFrame, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXVerticalFrame, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXShutter[] = {{"_p_FXShutter", 0, "FXShutter *", 0, 0, 0, 0},{"_p_FXShutter", 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_FXDragCorner[] = {{"_p_FXDragCorner", 0, "FXDragCorner *", 0, 0, 0, 0},{"_p_FXDragCorner", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXMatrix[] = {{"_p_FXMatrix", 0, "FXMatrix *", 0, 0, 0, 0},{"_p_FXMatrix", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXRegion[] = {{"_p_FXRegion", 0, "FXRegion *", 0, 0, 0, 0},{"_p_FXRegion", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXSpring[] = {{"_p_FXSpring", 0, "FXSpring *", 0, 0, 0, 0},{"_p_FXSpring", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXSwitcher[] = {{"_p_FXSwitcher", 0, "FXSwitcher *", 0, 0, 0, 0},{"_p_FXSwitcher", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 
 static swig_type_info *swig_types_initial[] = {
+_swigt__p_FXDockSite, 
 _swigt__p_FXObject, 
 _swigt__p_FXScrollArea, 
 _swigt__p_FXShutterItem, 
+_swigt__p_FXDockBar, 
 _swigt__p_FXStatusBar, 
 _swigt__p_FXScrollBar, 
 _swigt__p_FXWindow, 
 _swigt__p_FXComposite, 
 _swigt__p_FXScrollWindow, 
-_swigt__p_FXFont, 
+_swigt__p_FXBitmap, 
 _swigt__p_FXId, 
+_swigt__p_FXFont, 
 _swigt__p_FXStatusLine, 
 _swigt__p_FXGroupBox, 
 _swigt__p_FXButton, 
@@ -4320,6 +5170,7 @@ _swigt__p_FXShutter,
 _swigt__p_FXIcon, 
 _swigt__p_FXDragCorner, 
 _swigt__p_FXMatrix, 
+_swigt__p_FXRegion, 
 _swigt__p_FXSpring, 
 _swigt__p_FXSwitcher, 
 0
@@ -4391,6 +5242,7 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXPacker.klass, "canFocus", VALUEFUNC(_wrap_FXPacker_canFocus), -1);
     rb_define_method(cFXPacker.klass, "setFocus", VALUEFUNC(_wrap_FXPacker_setFocus), -1);
     rb_define_method(cFXPacker.klass, "killFocus", VALUEFUNC(_wrap_FXPacker_killFocus), -1);
+    rb_define_method(cFXPacker.klass, "changeFocus", VALUEFUNC(_wrap_FXPacker_changeFocus), -1);
     rb_define_method(cFXPacker.klass, "setDefault", VALUEFUNC(_wrap_FXPacker_setDefault), -1);
     rb_define_method(cFXPacker.klass, "enable", VALUEFUNC(_wrap_FXPacker_enable), -1);
     rb_define_method(cFXPacker.klass, "disable", VALUEFUNC(_wrap_FXPacker_disable), -1);
@@ -4407,12 +5259,56 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXPacker.klass, "contains", VALUEFUNC(_wrap_FXPacker_contains), -1);
     rb_define_method(cFXPacker.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXPacker_doesSaveUnder), -1);
     rb_define_method(cFXPacker.klass, "setBackColor", VALUEFUNC(_wrap_FXPacker_setBackColor), -1);
+    rb_define_method(cFXPacker.klass, "setShape", VALUEFUNC(_wrap_FXPacker_setShape), -1);
+    rb_define_method(cFXPacker.klass, "clearShape", VALUEFUNC(_wrap_FXPacker_clearShape), -1);
     cFXPacker.mark = (void (*)(void *)) FXRbPacker::markfunc;
     cFXPacker.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
     SWIGTYPE_p_FXPacker->dcast = (swig_dycast_func) FXPacker_dynamic_cast;
     
     
+    cFXDockSite.klass = rb_define_class_under(mFox, "FXDockSite", ((swig_class *) SWIGTYPE_p_FXPacker->clientdata)->klass);
+    SWIG_TypeClientData(SWIGTYPE_p_FXDockSite, (void *) &cFXDockSite);
+    rb_define_alloc_func(cFXDockSite.klass, _wrap_FXDockSite_allocate);
+    rb_define_method(cFXDockSite.klass, "initialize", VALUEFUNC(_wrap_new_FXDockSite), -1);
+    rb_define_method(cFXDockSite.klass, "save", VALUEFUNC(_wrap_FXDockSite_save), -1);
+    rb_define_method(cFXDockSite.klass, "load", VALUEFUNC(_wrap_FXDockSite_load), -1);
+    rb_define_method(cFXDockSite.klass, "create", VALUEFUNC(_wrap_FXDockSite_create), -1);
+    rb_define_method(cFXDockSite.klass, "detach", VALUEFUNC(_wrap_FXDockSite_detach), -1);
+    rb_define_method(cFXDockSite.klass, "destroy", VALUEFUNC(_wrap_FXDockSite_destroy), -1);
+    rb_define_method(cFXDockSite.klass, "resize", VALUEFUNC(_wrap_FXDockSite_resize), -1);
+    rb_define_method(cFXDockSite.klass, "getDefaultWidth", VALUEFUNC(_wrap_FXDockSite_getDefaultWidth), -1);
+    rb_define_method(cFXDockSite.klass, "getDefaultHeight", VALUEFUNC(_wrap_FXDockSite_getDefaultHeight), -1);
+    rb_define_method(cFXDockSite.klass, "getWidthForHeight", VALUEFUNC(_wrap_FXDockSite_getWidthForHeight), -1);
+    rb_define_method(cFXDockSite.klass, "getHeightForWidth", VALUEFUNC(_wrap_FXDockSite_getHeightForWidth), -1);
+    rb_define_method(cFXDockSite.klass, "canFocus", VALUEFUNC(_wrap_FXDockSite_canFocus), -1);
+    rb_define_method(cFXDockSite.klass, "setFocus", VALUEFUNC(_wrap_FXDockSite_setFocus), -1);
+    rb_define_method(cFXDockSite.klass, "killFocus", VALUEFUNC(_wrap_FXDockSite_killFocus), -1);
+    rb_define_method(cFXDockSite.klass, "changeFocus", VALUEFUNC(_wrap_FXDockSite_changeFocus), -1);
+    rb_define_method(cFXDockSite.klass, "setDefault", VALUEFUNC(_wrap_FXDockSite_setDefault), -1);
+    rb_define_method(cFXDockSite.klass, "enable", VALUEFUNC(_wrap_FXDockSite_enable), -1);
+    rb_define_method(cFXDockSite.klass, "disable", VALUEFUNC(_wrap_FXDockSite_disable), -1);
+    rb_define_method(cFXDockSite.klass, "raiseWindow", VALUEFUNC(_wrap_FXDockSite_raiseWindow), -1);
+    rb_define_method(cFXDockSite.klass, "lower", VALUEFUNC(_wrap_FXDockSite_lower), -1);
+    rb_define_method(cFXDockSite.klass, "move", VALUEFUNC(_wrap_FXDockSite_move), -1);
+    rb_define_method(cFXDockSite.klass, "position", VALUEFUNC(_wrap_FXDockSite_position), -1);
+    rb_define_method(cFXDockSite.klass, "layout", VALUEFUNC(_wrap_FXDockSite_layout), -1);
+    rb_define_method(cFXDockSite.klass, "recalc", VALUEFUNC(_wrap_FXDockSite_recalc), -1);
+    rb_define_method(cFXDockSite.klass, "reparent", VALUEFUNC(_wrap_FXDockSite_reparent), -1);
+    rb_define_method(cFXDockSite.klass, "show", VALUEFUNC(_wrap_FXDockSite_show), -1);
+    rb_define_method(cFXDockSite.klass, "hide", VALUEFUNC(_wrap_FXDockSite_hide), -1);
+    rb_define_method(cFXDockSite.klass, "isComposite", VALUEFUNC(_wrap_FXDockSite_isComposite), -1);
+    rb_define_method(cFXDockSite.klass, "contains", VALUEFUNC(_wrap_FXDockSite_contains), -1);
+    rb_define_method(cFXDockSite.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXDockSite_doesSaveUnder), -1);
+    rb_define_method(cFXDockSite.klass, "setBackColor", VALUEFUNC(_wrap_FXDockSite_setBackColor), -1);
+    rb_define_method(cFXDockSite.klass, "setShape", VALUEFUNC(_wrap_FXDockSite_setShape), -1);
+    rb_define_method(cFXDockSite.klass, "clearShape", VALUEFUNC(_wrap_FXDockSite_clearShape), -1);
+    rb_define_method(cFXDockSite.klass, "moveToolBar", VALUEFUNC(_wrap_FXDockSite_moveToolBar), -1);
+    rb_define_method(cFXDockSite.klass, "dockToolBar", VALUEFUNC(_wrap_FXDockSite_dockToolBar), -1);
+    rb_define_method(cFXDockSite.klass, "undockToolBar", VALUEFUNC(_wrap_FXDockSite_undockToolBar), -1);
+    cFXDockSite.mark = (void (*)(void *)) FXRbDockSite::markfunc;
+    cFXDockSite.destroy = (void (*)(void *)) FXRbObject::freefunc;
+    
     cFXSpring.klass = rb_define_class_under(mFox, "FXSpring", ((swig_class *) SWIGTYPE_p_FXPacker->clientdata)->klass);
     SWIG_TypeClientData(SWIGTYPE_p_FXSpring, (void *) &cFXSpring);
     rb_define_alloc_func(cFXSpring.klass, _wrap_FXSpring_allocate);
@@ -4434,6 +5330,7 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXSpring.klass, "canFocus", VALUEFUNC(_wrap_FXSpring_canFocus), -1);
     rb_define_method(cFXSpring.klass, "setFocus", VALUEFUNC(_wrap_FXSpring_setFocus), -1);
     rb_define_method(cFXSpring.klass, "killFocus", VALUEFUNC(_wrap_FXSpring_killFocus), -1);
+    rb_define_method(cFXSpring.klass, "changeFocus", VALUEFUNC(_wrap_FXSpring_changeFocus), -1);
     rb_define_method(cFXSpring.klass, "setDefault", VALUEFUNC(_wrap_FXSpring_setDefault), -1);
     rb_define_method(cFXSpring.klass, "enable", VALUEFUNC(_wrap_FXSpring_enable), -1);
     rb_define_method(cFXSpring.klass, "disable", VALUEFUNC(_wrap_FXSpring_disable), -1);
@@ -4450,6 +5347,8 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXSpring.klass, "contains", VALUEFUNC(_wrap_FXSpring_contains), -1);
     rb_define_method(cFXSpring.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXSpring_doesSaveUnder), -1);
     rb_define_method(cFXSpring.klass, "setBackColor", VALUEFUNC(_wrap_FXSpring_setBackColor), -1);
+    rb_define_method(cFXSpring.klass, "setShape", VALUEFUNC(_wrap_FXSpring_setShape), -1);
+    rb_define_method(cFXSpring.klass, "clearShape", VALUEFUNC(_wrap_FXSpring_clearShape), -1);
     cFXSpring.mark = (void (*)(void *)) FXRbSpring::markfunc;
     cFXSpring.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -4470,6 +5369,7 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXHorizontalFrame.klass, "canFocus", VALUEFUNC(_wrap_FXHorizontalFrame_canFocus), -1);
     rb_define_method(cFXHorizontalFrame.klass, "setFocus", VALUEFUNC(_wrap_FXHorizontalFrame_setFocus), -1);
     rb_define_method(cFXHorizontalFrame.klass, "killFocus", VALUEFUNC(_wrap_FXHorizontalFrame_killFocus), -1);
+    rb_define_method(cFXHorizontalFrame.klass, "changeFocus", VALUEFUNC(_wrap_FXHorizontalFrame_changeFocus), -1);
     rb_define_method(cFXHorizontalFrame.klass, "setDefault", VALUEFUNC(_wrap_FXHorizontalFrame_setDefault), -1);
     rb_define_method(cFXHorizontalFrame.klass, "enable", VALUEFUNC(_wrap_FXHorizontalFrame_enable), -1);
     rb_define_method(cFXHorizontalFrame.klass, "disable", VALUEFUNC(_wrap_FXHorizontalFrame_disable), -1);
@@ -4486,6 +5386,8 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXHorizontalFrame.klass, "contains", VALUEFUNC(_wrap_FXHorizontalFrame_contains), -1);
     rb_define_method(cFXHorizontalFrame.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXHorizontalFrame_doesSaveUnder), -1);
     rb_define_method(cFXHorizontalFrame.klass, "setBackColor", VALUEFUNC(_wrap_FXHorizontalFrame_setBackColor), -1);
+    rb_define_method(cFXHorizontalFrame.klass, "setShape", VALUEFUNC(_wrap_FXHorizontalFrame_setShape), -1);
+    rb_define_method(cFXHorizontalFrame.klass, "clearShape", VALUEFUNC(_wrap_FXHorizontalFrame_clearShape), -1);
     cFXHorizontalFrame.mark = (void (*)(void *)) FXRbHorizontalFrame::markfunc;
     cFXHorizontalFrame.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -4509,6 +5411,7 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXVerticalFrame.klass, "canFocus", VALUEFUNC(_wrap_FXVerticalFrame_canFocus), -1);
     rb_define_method(cFXVerticalFrame.klass, "setFocus", VALUEFUNC(_wrap_FXVerticalFrame_setFocus), -1);
     rb_define_method(cFXVerticalFrame.klass, "killFocus", VALUEFUNC(_wrap_FXVerticalFrame_killFocus), -1);
+    rb_define_method(cFXVerticalFrame.klass, "changeFocus", VALUEFUNC(_wrap_FXVerticalFrame_changeFocus), -1);
     rb_define_method(cFXVerticalFrame.klass, "setDefault", VALUEFUNC(_wrap_FXVerticalFrame_setDefault), -1);
     rb_define_method(cFXVerticalFrame.klass, "enable", VALUEFUNC(_wrap_FXVerticalFrame_enable), -1);
     rb_define_method(cFXVerticalFrame.klass, "disable", VALUEFUNC(_wrap_FXVerticalFrame_disable), -1);
@@ -4525,6 +5428,8 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXVerticalFrame.klass, "contains", VALUEFUNC(_wrap_FXVerticalFrame_contains), -1);
     rb_define_method(cFXVerticalFrame.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXVerticalFrame_doesSaveUnder), -1);
     rb_define_method(cFXVerticalFrame.klass, "setBackColor", VALUEFUNC(_wrap_FXVerticalFrame_setBackColor), -1);
+    rb_define_method(cFXVerticalFrame.klass, "setShape", VALUEFUNC(_wrap_FXVerticalFrame_setShape), -1);
+    rb_define_method(cFXVerticalFrame.klass, "clearShape", VALUEFUNC(_wrap_FXVerticalFrame_clearShape), -1);
     cFXVerticalFrame.mark = (void (*)(void *)) FXRbVerticalFrame::markfunc;
     cFXVerticalFrame.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -4563,6 +5468,7 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXMatrix.klass, "canFocus", VALUEFUNC(_wrap_FXMatrix_canFocus), -1);
     rb_define_method(cFXMatrix.klass, "setFocus", VALUEFUNC(_wrap_FXMatrix_setFocus), -1);
     rb_define_method(cFXMatrix.klass, "killFocus", VALUEFUNC(_wrap_FXMatrix_killFocus), -1);
+    rb_define_method(cFXMatrix.klass, "changeFocus", VALUEFUNC(_wrap_FXMatrix_changeFocus), -1);
     rb_define_method(cFXMatrix.klass, "setDefault", VALUEFUNC(_wrap_FXMatrix_setDefault), -1);
     rb_define_method(cFXMatrix.klass, "enable", VALUEFUNC(_wrap_FXMatrix_enable), -1);
     rb_define_method(cFXMatrix.klass, "disable", VALUEFUNC(_wrap_FXMatrix_disable), -1);
@@ -4579,6 +5485,8 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXMatrix.klass, "contains", VALUEFUNC(_wrap_FXMatrix_contains), -1);
     rb_define_method(cFXMatrix.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXMatrix_doesSaveUnder), -1);
     rb_define_method(cFXMatrix.klass, "setBackColor", VALUEFUNC(_wrap_FXMatrix_setBackColor), -1);
+    rb_define_method(cFXMatrix.klass, "setShape", VALUEFUNC(_wrap_FXMatrix_setShape), -1);
+    rb_define_method(cFXMatrix.klass, "clearShape", VALUEFUNC(_wrap_FXMatrix_clearShape), -1);
     cFXMatrix.mark = (void (*)(void *)) FXRbMatrix::markfunc;
     cFXMatrix.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"GROUPBOX_TITLE_LEFT", INT2NUM(GROUPBOX_TITLE_LEFT));
@@ -4612,6 +5520,7 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXGroupBox.klass, "canFocus", VALUEFUNC(_wrap_FXGroupBox_canFocus), -1);
     rb_define_method(cFXGroupBox.klass, "setFocus", VALUEFUNC(_wrap_FXGroupBox_setFocus), -1);
     rb_define_method(cFXGroupBox.klass, "killFocus", VALUEFUNC(_wrap_FXGroupBox_killFocus), -1);
+    rb_define_method(cFXGroupBox.klass, "changeFocus", VALUEFUNC(_wrap_FXGroupBox_changeFocus), -1);
     rb_define_method(cFXGroupBox.klass, "setDefault", VALUEFUNC(_wrap_FXGroupBox_setDefault), -1);
     rb_define_method(cFXGroupBox.klass, "enable", VALUEFUNC(_wrap_FXGroupBox_enable), -1);
     rb_define_method(cFXGroupBox.klass, "disable", VALUEFUNC(_wrap_FXGroupBox_disable), -1);
@@ -4628,6 +5537,8 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXGroupBox.klass, "contains", VALUEFUNC(_wrap_FXGroupBox_contains), -1);
     rb_define_method(cFXGroupBox.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXGroupBox_doesSaveUnder), -1);
     rb_define_method(cFXGroupBox.klass, "setBackColor", VALUEFUNC(_wrap_FXGroupBox_setBackColor), -1);
+    rb_define_method(cFXGroupBox.klass, "setShape", VALUEFUNC(_wrap_FXGroupBox_setShape), -1);
+    rb_define_method(cFXGroupBox.klass, "clearShape", VALUEFUNC(_wrap_FXGroupBox_clearShape), -1);
     cFXGroupBox.mark = (void (*)(void *)) FXRbGroupBox::markfunc;
     cFXGroupBox.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"SWITCHER_HCOLLAPSE", INT2NUM(SWITCHER_HCOLLAPSE));
@@ -4672,6 +5583,7 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXSwitcher.klass, "canFocus", VALUEFUNC(_wrap_FXSwitcher_canFocus), -1);
     rb_define_method(cFXSwitcher.klass, "setFocus", VALUEFUNC(_wrap_FXSwitcher_setFocus), -1);
     rb_define_method(cFXSwitcher.klass, "killFocus", VALUEFUNC(_wrap_FXSwitcher_killFocus), -1);
+    rb_define_method(cFXSwitcher.klass, "changeFocus", VALUEFUNC(_wrap_FXSwitcher_changeFocus), -1);
     rb_define_method(cFXSwitcher.klass, "setDefault", VALUEFUNC(_wrap_FXSwitcher_setDefault), -1);
     rb_define_method(cFXSwitcher.klass, "enable", VALUEFUNC(_wrap_FXSwitcher_enable), -1);
     rb_define_method(cFXSwitcher.klass, "disable", VALUEFUNC(_wrap_FXSwitcher_disable), -1);
@@ -4688,6 +5600,8 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXSwitcher.klass, "contains", VALUEFUNC(_wrap_FXSwitcher_contains), -1);
     rb_define_method(cFXSwitcher.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXSwitcher_doesSaveUnder), -1);
     rb_define_method(cFXSwitcher.klass, "setBackColor", VALUEFUNC(_wrap_FXSwitcher_setBackColor), -1);
+    rb_define_method(cFXSwitcher.klass, "setShape", VALUEFUNC(_wrap_FXSwitcher_setShape), -1);
+    rb_define_method(cFXSwitcher.klass, "clearShape", VALUEFUNC(_wrap_FXSwitcher_clearShape), -1);
     cFXSwitcher.mark = (void (*)(void *)) FXRbSwitcher::markfunc;
     cFXSwitcher.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -4719,6 +5633,7 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXShutterItem.klass, "canFocus", VALUEFUNC(_wrap_FXShutterItem_canFocus), -1);
     rb_define_method(cFXShutterItem.klass, "setFocus", VALUEFUNC(_wrap_FXShutterItem_setFocus), -1);
     rb_define_method(cFXShutterItem.klass, "killFocus", VALUEFUNC(_wrap_FXShutterItem_killFocus), -1);
+    rb_define_method(cFXShutterItem.klass, "changeFocus", VALUEFUNC(_wrap_FXShutterItem_changeFocus), -1);
     rb_define_method(cFXShutterItem.klass, "setDefault", VALUEFUNC(_wrap_FXShutterItem_setDefault), -1);
     rb_define_method(cFXShutterItem.klass, "enable", VALUEFUNC(_wrap_FXShutterItem_enable), -1);
     rb_define_method(cFXShutterItem.klass, "disable", VALUEFUNC(_wrap_FXShutterItem_disable), -1);
@@ -4735,6 +5650,8 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXShutterItem.klass, "contains", VALUEFUNC(_wrap_FXShutterItem_contains), -1);
     rb_define_method(cFXShutterItem.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXShutterItem_doesSaveUnder), -1);
     rb_define_method(cFXShutterItem.klass, "setBackColor", VALUEFUNC(_wrap_FXShutterItem_setBackColor), -1);
+    rb_define_method(cFXShutterItem.klass, "setShape", VALUEFUNC(_wrap_FXShutterItem_setShape), -1);
+    rb_define_method(cFXShutterItem.klass, "clearShape", VALUEFUNC(_wrap_FXShutterItem_clearShape), -1);
     cFXShutterItem.mark = (void (*)(void *)) FXRbShutterItem::markfunc;
     cFXShutterItem.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -4770,6 +5687,7 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXShutter.klass, "canFocus", VALUEFUNC(_wrap_FXShutter_canFocus), -1);
     rb_define_method(cFXShutter.klass, "setFocus", VALUEFUNC(_wrap_FXShutter_setFocus), -1);
     rb_define_method(cFXShutter.klass, "killFocus", VALUEFUNC(_wrap_FXShutter_killFocus), -1);
+    rb_define_method(cFXShutter.klass, "changeFocus", VALUEFUNC(_wrap_FXShutter_changeFocus), -1);
     rb_define_method(cFXShutter.klass, "setDefault", VALUEFUNC(_wrap_FXShutter_setDefault), -1);
     rb_define_method(cFXShutter.klass, "enable", VALUEFUNC(_wrap_FXShutter_enable), -1);
     rb_define_method(cFXShutter.klass, "disable", VALUEFUNC(_wrap_FXShutter_disable), -1);
@@ -4786,6 +5704,8 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXShutter.klass, "contains", VALUEFUNC(_wrap_FXShutter_contains), -1);
     rb_define_method(cFXShutter.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXShutter_doesSaveUnder), -1);
     rb_define_method(cFXShutter.klass, "setBackColor", VALUEFUNC(_wrap_FXShutter_setBackColor), -1);
+    rb_define_method(cFXShutter.klass, "setShape", VALUEFUNC(_wrap_FXShutter_setShape), -1);
+    rb_define_method(cFXShutter.klass, "clearShape", VALUEFUNC(_wrap_FXShutter_clearShape), -1);
     rb_define_method(cFXShutter.klass, "setCurrent", VALUEFUNC(_wrap_FXShutter_setCurrent), -1);
     cFXShutter.mark = (void (*)(void *)) FXRbShutter::markfunc;
     cFXShutter.destroy = (void (*)(void *)) FXRbObject::freefunc;
@@ -4827,6 +5747,7 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXSplitter.klass, "canFocus", VALUEFUNC(_wrap_FXSplitter_canFocus), -1);
     rb_define_method(cFXSplitter.klass, "setFocus", VALUEFUNC(_wrap_FXSplitter_setFocus), -1);
     rb_define_method(cFXSplitter.klass, "killFocus", VALUEFUNC(_wrap_FXSplitter_killFocus), -1);
+    rb_define_method(cFXSplitter.klass, "changeFocus", VALUEFUNC(_wrap_FXSplitter_changeFocus), -1);
     rb_define_method(cFXSplitter.klass, "setDefault", VALUEFUNC(_wrap_FXSplitter_setDefault), -1);
     rb_define_method(cFXSplitter.klass, "enable", VALUEFUNC(_wrap_FXSplitter_enable), -1);
     rb_define_method(cFXSplitter.klass, "disable", VALUEFUNC(_wrap_FXSplitter_disable), -1);
@@ -4843,6 +5764,8 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXSplitter.klass, "contains", VALUEFUNC(_wrap_FXSplitter_contains), -1);
     rb_define_method(cFXSplitter.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXSplitter_doesSaveUnder), -1);
     rb_define_method(cFXSplitter.klass, "setBackColor", VALUEFUNC(_wrap_FXSplitter_setBackColor), -1);
+    rb_define_method(cFXSplitter.klass, "setShape", VALUEFUNC(_wrap_FXSplitter_setShape), -1);
+    rb_define_method(cFXSplitter.klass, "clearShape", VALUEFUNC(_wrap_FXSplitter_clearShape), -1);
     cFXSplitter.mark = (void (*)(void *)) FXRbSplitter::markfunc;
     cFXSplitter.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"FOURSPLITTER_TRACKING", INT2NUM(FOURSPLITTER_TRACKING));
@@ -4894,6 +5817,7 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFX4Splitter.klass, "canFocus", VALUEFUNC(_wrap_FX4Splitter_canFocus), -1);
     rb_define_method(cFX4Splitter.klass, "setFocus", VALUEFUNC(_wrap_FX4Splitter_setFocus), -1);
     rb_define_method(cFX4Splitter.klass, "killFocus", VALUEFUNC(_wrap_FX4Splitter_killFocus), -1);
+    rb_define_method(cFX4Splitter.klass, "changeFocus", VALUEFUNC(_wrap_FX4Splitter_changeFocus), -1);
     rb_define_method(cFX4Splitter.klass, "setDefault", VALUEFUNC(_wrap_FX4Splitter_setDefault), -1);
     rb_define_method(cFX4Splitter.klass, "enable", VALUEFUNC(_wrap_FX4Splitter_enable), -1);
     rb_define_method(cFX4Splitter.klass, "disable", VALUEFUNC(_wrap_FX4Splitter_disable), -1);
@@ -4910,6 +5834,8 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFX4Splitter.klass, "contains", VALUEFUNC(_wrap_FX4Splitter_contains), -1);
     rb_define_method(cFX4Splitter.klass, "doesSaveUnder", VALUEFUNC(_wrap_FX4Splitter_doesSaveUnder), -1);
     rb_define_method(cFX4Splitter.klass, "setBackColor", VALUEFUNC(_wrap_FX4Splitter_setBackColor), -1);
+    rb_define_method(cFX4Splitter.klass, "setShape", VALUEFUNC(_wrap_FX4Splitter_setShape), -1);
+    rb_define_method(cFX4Splitter.klass, "clearShape", VALUEFUNC(_wrap_FX4Splitter_clearShape), -1);
     cFX4Splitter.mark = (void (*)(void *)) FXRb4Splitter::markfunc;
     cFX4Splitter.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"STATUSBAR_WITH_DRAGCORNER", INT2NUM(STATUSBAR_WITH_DRAGCORNER));
@@ -4935,6 +5861,7 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXStatusBar.klass, "canFocus", VALUEFUNC(_wrap_FXStatusBar_canFocus), -1);
     rb_define_method(cFXStatusBar.klass, "setFocus", VALUEFUNC(_wrap_FXStatusBar_setFocus), -1);
     rb_define_method(cFXStatusBar.klass, "killFocus", VALUEFUNC(_wrap_FXStatusBar_killFocus), -1);
+    rb_define_method(cFXStatusBar.klass, "changeFocus", VALUEFUNC(_wrap_FXStatusBar_changeFocus), -1);
     rb_define_method(cFXStatusBar.klass, "setDefault", VALUEFUNC(_wrap_FXStatusBar_setDefault), -1);
     rb_define_method(cFXStatusBar.klass, "enable", VALUEFUNC(_wrap_FXStatusBar_enable), -1);
     rb_define_method(cFXStatusBar.klass, "disable", VALUEFUNC(_wrap_FXStatusBar_disable), -1);
@@ -4951,6 +5878,8 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXStatusBar.klass, "contains", VALUEFUNC(_wrap_FXStatusBar_contains), -1);
     rb_define_method(cFXStatusBar.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXStatusBar_doesSaveUnder), -1);
     rb_define_method(cFXStatusBar.klass, "setBackColor", VALUEFUNC(_wrap_FXStatusBar_setBackColor), -1);
+    rb_define_method(cFXStatusBar.klass, "setShape", VALUEFUNC(_wrap_FXStatusBar_setShape), -1);
+    rb_define_method(cFXStatusBar.klass, "clearShape", VALUEFUNC(_wrap_FXStatusBar_clearShape), -1);
     cFXStatusBar.mark = (void (*)(void *)) FXRbStatusBar::markfunc;
     cFXStatusBar.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"SCROLLERS_NORMAL", INT2NUM(SCROLLERS_NORMAL));
@@ -4998,6 +5927,7 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXScrollArea.klass, "canFocus", VALUEFUNC(_wrap_FXScrollArea_canFocus), -1);
     rb_define_method(cFXScrollArea.klass, "setFocus", VALUEFUNC(_wrap_FXScrollArea_setFocus), -1);
     rb_define_method(cFXScrollArea.klass, "killFocus", VALUEFUNC(_wrap_FXScrollArea_killFocus), -1);
+    rb_define_method(cFXScrollArea.klass, "changeFocus", VALUEFUNC(_wrap_FXScrollArea_changeFocus), -1);
     rb_define_method(cFXScrollArea.klass, "setDefault", VALUEFUNC(_wrap_FXScrollArea_setDefault), -1);
     rb_define_method(cFXScrollArea.klass, "enable", VALUEFUNC(_wrap_FXScrollArea_enable), -1);
     rb_define_method(cFXScrollArea.klass, "disable", VALUEFUNC(_wrap_FXScrollArea_disable), -1);
@@ -5013,6 +5943,8 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXScrollArea.klass, "contains", VALUEFUNC(_wrap_FXScrollArea_contains), -1);
     rb_define_method(cFXScrollArea.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXScrollArea_doesSaveUnder), -1);
     rb_define_method(cFXScrollArea.klass, "setBackColor", VALUEFUNC(_wrap_FXScrollArea_setBackColor), -1);
+    rb_define_method(cFXScrollArea.klass, "setShape", VALUEFUNC(_wrap_FXScrollArea_setShape), -1);
+    rb_define_method(cFXScrollArea.klass, "clearShape", VALUEFUNC(_wrap_FXScrollArea_clearShape), -1);
     rb_define_method(cFXScrollArea.klass, "getViewportHeight", VALUEFUNC(_wrap_FXScrollArea_getViewportHeight), -1);
     rb_define_method(cFXScrollArea.klass, "getViewportWidth", VALUEFUNC(_wrap_FXScrollArea_getViewportWidth), -1);
     rb_define_method(cFXScrollArea.klass, "getContentHeight", VALUEFUNC(_wrap_FXScrollArea_getContentHeight), -1);
@@ -5045,6 +5977,7 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXScrollWindow.klass, "canFocus", VALUEFUNC(_wrap_FXScrollWindow_canFocus), -1);
     rb_define_method(cFXScrollWindow.klass, "setFocus", VALUEFUNC(_wrap_FXScrollWindow_setFocus), -1);
     rb_define_method(cFXScrollWindow.klass, "killFocus", VALUEFUNC(_wrap_FXScrollWindow_killFocus), -1);
+    rb_define_method(cFXScrollWindow.klass, "changeFocus", VALUEFUNC(_wrap_FXScrollWindow_changeFocus), -1);
     rb_define_method(cFXScrollWindow.klass, "setDefault", VALUEFUNC(_wrap_FXScrollWindow_setDefault), -1);
     rb_define_method(cFXScrollWindow.klass, "enable", VALUEFUNC(_wrap_FXScrollWindow_enable), -1);
     rb_define_method(cFXScrollWindow.klass, "disable", VALUEFUNC(_wrap_FXScrollWindow_disable), -1);
@@ -5060,6 +5993,8 @@ SWIGEXPORT(void) Init_layout(void) {
     rb_define_method(cFXScrollWindow.klass, "contains", VALUEFUNC(_wrap_FXScrollWindow_contains), -1);
     rb_define_method(cFXScrollWindow.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXScrollWindow_doesSaveUnder), -1);
     rb_define_method(cFXScrollWindow.klass, "setBackColor", VALUEFUNC(_wrap_FXScrollWindow_setBackColor), -1);
+    rb_define_method(cFXScrollWindow.klass, "setShape", VALUEFUNC(_wrap_FXScrollWindow_setShape), -1);
+    rb_define_method(cFXScrollWindow.klass, "clearShape", VALUEFUNC(_wrap_FXScrollWindow_clearShape), -1);
     rb_define_method(cFXScrollWindow.klass, "getViewportHeight", VALUEFUNC(_wrap_FXScrollWindow_getViewportHeight), -1);
     rb_define_method(cFXScrollWindow.klass, "getViewportWidth", VALUEFUNC(_wrap_FXScrollWindow_getViewportWidth), -1);
     rb_define_method(cFXScrollWindow.klass, "getContentHeight", VALUEFUNC(_wrap_FXScrollWindow_getContentHeight), -1);