fxruby 1.2.6 → 1.4.0

data/ext/{fox12 → fox14}/extconf.rb

@@ -4,9 +4,9 @@ require 'ftools'
 require 'mkmf'
 
 def find_installed_fox_version
-  stddirs = ["/usr/include/fox-1.2",
-             "/usr/local/include/fox-1.2",
-             "/sw/include/fox-1.2"]
+  stddirs = ["/usr/include/fox-1.4",
+             "/usr/local/include/fox-1.4",
+             "/sw/include/fox-1.4"]
   usrdirs = []
   ARGV.each do |arg|
     if arg =~ /--with-fox-include/
@@ -82,7 +82,7 @@ def do_cygwin_setup
   end
   have_library("jpeg", "jpeg_mem_init")
   have_library("tiff", "TIFFSetErrorHandler")
-  $libs = append_library($libs, "FOX-1.2")
+  $libs = append_library($libs, "FOX-1.4")
   $CFLAGS = $CFLAGS + " -fpermissive -DWIN32 -Iinclude"
   if is_fxscintilla_build?
     File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
@@ -107,7 +107,7 @@ def do_mswin32_setup
 # $CFLAGS = $CFLAGS + " /DWIN32 /GR /GX /DFOXDLL /Iinclude"
 # $LOCAL_LIBS = $LOCAL_LIBS + "foxdll.lib"
   $CFLAGS = $CFLAGS + " /DWIN32 /GR /GX /Iinclude"
-  $LOCAL_LIBS = $LOCAL_LIBS + "FOX-1.2.lib"
+  $LOCAL_LIBS = $LOCAL_LIBS + "FOX-1.4.lib"
   if is_fxscintilla_build?
     File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
     $CFLAGS = $CFLAGS + " /DWITH_FXSCINTILLA"
@@ -130,7 +130,7 @@ def do_unix_setup
   find_library("X11", "XFindContext", "/usr/X11R6/lib")
   find_library("GL", "glXCreateContext", "/usr/X11R6/lib")
   find_library("GLU", "gluNewQuadric", "/usr/X11R6/lib")
-  $libs = append_library($libs, "FOX-1.2")
+  $libs = append_library($libs, "FOX-1.4")
   $CFLAGS = $CFLAGS + " -O0 -Iinclude"
   if is_fxscintilla_build?
     File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
@@ -144,7 +144,7 @@ end
 # This directive processes the "--with-fox-include" and "--with-fox-lib"
 # command line switches and modifies the CFLAGS and LDFLAGS accordingly.
 
-dir_config('fox', '/usr/local/include/fox-1.2', '/usr/local/lib')
+dir_config('fox', '/usr/local/include/fox-1.4', '/usr/local/lib')
 
 # This directive processes the "--with-fxscintilla-include" and
 # "--with-fxscintilla-lib" command line switches and modifies the CFLAGS
@@ -173,4 +173,4 @@ else
 end
 
 # Last step: build the makefile
-create_makefile("fox12")
+create_makefile("fox14")

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

@@ -526,27 +526,29 @@ SWIGIMPORT(void)   SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_ty
 #define  SWIGTYPE_p_FXArrowButton swig_types[7] 
 #define  SWIGTYPE_p_FXWindow swig_types[8] 
 #define  SWIGTYPE_p_FXComposite swig_types[9] 
-#define  SWIGTYPE_p_FXColorWheel swig_types[10] 
+#define  SWIGTYPE_p_FXBitmap swig_types[10] 
 #define  SWIGTYPE_p_FXColorWell swig_types[11] 
-#define  SWIGTYPE_p_FXBitmap swig_types[12] 
+#define  SWIGTYPE_p_FXColorWheel swig_types[12] 
 #define  SWIGTYPE_p_FXProgressBar swig_types[13] 
 #define  SWIGTYPE_p_FXId swig_types[14] 
 #define  SWIGTYPE_p_FXFont swig_types[15] 
 #define  SWIGTYPE_p_FXStatusLine swig_types[16] 
 #define  SWIGTYPE_p_FXSeparator swig_types[17] 
-#define  SWIGTYPE_p_FXHorizontalSeparator swig_types[18] 
-#define  SWIGTYPE_p_FXVerticalSeparator swig_types[19] 
-#define  SWIGTYPE_p_FXStream swig_types[20] 
-#define  SWIGTYPE_p_FXDrawable swig_types[21] 
-#define  SWIGTYPE_p_FXTextField swig_types[22] 
-#define  SWIGTYPE_p_FXIcon swig_types[23] 
-#define  SWIGTYPE_p_FXHeader swig_types[24] 
-#define  SWIGTYPE_p_FXImageFrame swig_types[25] 
-#define  SWIGTYPE_p_FXSlider swig_types[26] 
-#define  SWIGTYPE_p_FXRealSlider swig_types[27] 
-#define  SWIGTYPE_p_FXImage swig_types[28] 
-#define  SWIGTYPE_p_FXDial swig_types[29] 
-static swig_type_info *swig_types[31];
+#define  SWIGTYPE_p_p_FXchar swig_types[18] 
+#define  SWIGTYPE_p_FXHorizontalSeparator swig_types[19] 
+#define  SWIGTYPE_p_FXVerticalSeparator swig_types[20] 
+#define  SWIGTYPE_p_FXStream swig_types[21] 
+#define  SWIGTYPE_p_FXDrawable swig_types[22] 
+#define  SWIGTYPE_p_FXTextField swig_types[23] 
+#define  SWIGTYPE_p_FXIcon swig_types[24] 
+#define  SWIGTYPE_p_FXHeader swig_types[25] 
+#define  SWIGTYPE_p_FXImageFrame swig_types[26] 
+#define  SWIGTYPE_p_FXRegion swig_types[27] 
+#define  SWIGTYPE_p_FXSlider swig_types[28] 
+#define  SWIGTYPE_p_FXRealSlider swig_types[29] 
+#define  SWIGTYPE_p_FXImage swig_types[30] 
+#define  SWIGTYPE_p_FXDial swig_types[31] 
+static swig_type_info *swig_types[33];
 
 /* -------- TYPES TABLE (END) -------- */
 
@@ -678,7 +680,7 @@ FXint FXHeader_setItem__SWIG_0(FXHeader *self,FXint index,FXHeaderItem *item,FXb
 
       // Done
       return result;
-      }
+    }
 FXint FXHeader_setItem__SWIG_1(FXHeader *self,FXint index,FXString const &text,FXIcon *icon,FXint size,void *ITEMDATA,FXbool notify){
       // Save pointer to the soon-to-be-destroyed item
       FXHeaderItem* oldItem=self->getItem(index);
@@ -691,22 +693,22 @@ FXint FXHeader_setItem__SWIG_1(FXHeader *self,FXint index,FXString const &text,F
 
       // Done
       return result;
-      }
+    }
 FXint FXHeader_insertItem__SWIG_0(FXHeader *self,FXint index,FXHeaderItem *item,FXbool notify){
       if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem)))
         dynamic_cast<FXRbHeaderItem*>(item)->owned=1;
       return self->insertItem(index,item,notify);
-      }
+    }
 FXint FXHeader_appendItem__SWIG_0(FXHeader *self,FXHeaderItem *item,FXbool notify){
       if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem)))
         dynamic_cast<FXRbHeaderItem*>(item)->owned=1;
       return self->appendItem(item,notify);
-      }
+    }
 FXint FXHeader_prependItem__SWIG_0(FXHeader *self,FXHeaderItem *item,FXbool notify){
       if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem)))
         dynamic_cast<FXRbHeaderItem*>(item)->owned=1;
       return self->prependItem(item,notify);
-      }
+    }
 void FXHeader_removeItem(FXHeader *self,FXint index,FXbool notify){
       // Save pointer to the soon-to-be-destroyed item
       FXHeaderItem* item=self->getItem(index);
@@ -981,20 +983,22 @@ static VALUE _wrap_FXArrowButton_setHelpText(int argc, VALUE *argv, VALUE self)
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXArrowButton, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setHelpText((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXArrowButton_getHelpText(int argc, VALUE *argv, VALUE self) { FXArrowButton *arg1 = (FXArrowButton *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXString *result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXArrowButton, 1); result = ((FXArrowButton const *)arg1)->getHelpText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXArrowButton, 1); {
+        FXString const &_result_ref = ((FXArrowButton const *)arg1)->getHelpText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXArrowButton_setTipText(int argc, VALUE *argv, VALUE self) { FXArrowButton *arg1 = (FXArrowButton *) 0 ;
     FXString *arg2 = 0 ; SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXArrowButton, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setTipText((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXArrowButton_getTipText(int argc, VALUE *argv, VALUE self) { FXArrowButton *arg1 = (FXArrowButton *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXString *result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXArrowButton, 1); result = ((FXArrowButton const *)arg1)->getTipText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXArrowButton, 1); {
+        FXString const &_result_ref = ((FXArrowButton const *)arg1)->getTipText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXArrowButton_setArrowStyle(int argc, VALUE *argv, VALUE self) { FXArrowButton *arg1 = (FXArrowButton *) 0 ;
     FXuint arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXArrowButton, 1); arg2 = NUM2UINT(argv[0]); (arg1)->setArrowStyle(arg2);
@@ -1089,6 +1093,11 @@ static VALUE _wrap_FXArrowButton_setFocus(int argc, VALUE *argv, VALUE self) { F
 static VALUE _wrap_FXArrowButton_killFocus(int argc, VALUE *argv, VALUE self) { FXArrowButton *arg1 = (FXArrowButton *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXArrowButton, 1); FXArrowButton_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXArrowButton_changeFocus(int argc, VALUE *argv, VALUE self) { FXArrowButton *arg1 = (FXArrowButton *) 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_FXArrowButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXArrowButton_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXArrowButton_setDefault(int argc, VALUE *argv, VALUE self) { FXArrowButton *arg1 = (FXArrowButton *) 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_FXArrowButton, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -1121,10 +1130,11 @@ static VALUE _wrap_FXArrowButton_recalc(int argc, VALUE *argv, VALUE self) { FXA
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXArrowButton, 1); FXArrowButton_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXArrowButton_reparent(int argc, VALUE *argv, VALUE self) { FXArrowButton *arg1 = (FXArrowButton *) 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_FXArrowButton, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXArrowButton_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); FXArrowButton_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXArrowButton_show(int argc, VALUE *argv, VALUE self) { FXArrowButton *arg1 = (FXArrowButton *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXArrowButton, 1); FXArrowButton_show(arg1); return Qnil; }
@@ -1152,6 +1162,43 @@ static VALUE _wrap_FXArrowButton_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_FXArrowButton, 1); arg2 = to_FXColor(argv[0]);
     FXArrowButton_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXArrowButton_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
+    FXArrowButton *arg1 = (FXArrowButton *) 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_FXArrowButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXArrowButton_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXArrowButton_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
+    FXArrowButton *arg1 = (FXArrowButton *) 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_FXArrowButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXArrowButton_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXArrowButton_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
+    FXArrowButton *arg1 = (FXArrowButton *) 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_FXArrowButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXArrowButton_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXArrowButton_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_FXArrowButton, 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_FXArrowButton_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_FXArrowButton, 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_FXArrowButton_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_FXArrowButton, 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_FXArrowButton_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXArrowButton_setShape'"); return Qnil; }
+static VALUE _wrap_FXArrowButton_clearShape(int argc, VALUE *argv, VALUE self) { FXArrowButton *arg1 = (FXArrowButton *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXArrowButton, 1); FXArrowButton_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXColorBar_onPaint(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 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);
@@ -1277,20 +1324,22 @@ static VALUE _wrap_FXColorBar_setHelpText(int argc, VALUE *argv, VALUE self) { F
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorBar, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setHelpText((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXColorBar_getHelpText(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXString *result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorBar, 1); result = ((FXColorBar const *)arg1)->getHelpText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorBar, 1); {
+        FXString const &_result_ref = ((FXColorBar const *)arg1)->getHelpText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXColorBar_setTipText(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 0 ;
     FXString *arg2 = 0 ; SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorBar, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setTipText((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXColorBar_getTipText(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXString *result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorBar, 1); result = ((FXColorBar const *)arg1)->getTipText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorBar, 1); {
+        FXString const &_result_ref = ((FXColorBar const *)arg1)->getTipText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static void
 free_FXColorBar(FXColorBar *arg1) {
     delete arg1;
@@ -1348,6 +1397,11 @@ static VALUE _wrap_FXColorBar_setFocus(int argc, VALUE *argv, VALUE self) { FXCo
 static VALUE _wrap_FXColorBar_killFocus(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorBar, 1); FXColorBar_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXColorBar_changeFocus(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 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_FXColorBar, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXColorBar_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXColorBar_setDefault(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 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_FXColorBar, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -1380,10 +1434,11 @@ static VALUE _wrap_FXColorBar_recalc(int argc, VALUE *argv, VALUE self) { FXColo
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorBar, 1); FXColorBar_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXColorBar_reparent(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 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_FXColorBar, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXColorBar_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); FXColorBar_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXColorBar_show(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorBar, 1); FXColorBar_show(arg1); return Qnil; }
@@ -1410,6 +1465,41 @@ static VALUE _wrap_FXColorBar_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_FXColorBar, 1); arg2 = to_FXColor(argv[0]);
     FXColorBar_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXColorBar_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 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_FXColorBar, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXColorBar_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXColorBar_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 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_FXColorBar, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXColorBar_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXColorBar_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 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_FXColorBar, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXColorBar_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXColorBar_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_FXColorBar, 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_FXColorBar_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_FXColorBar, 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_FXColorBar_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_FXColorBar, 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_FXColorBar_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXColorBar_setShape'"); return Qnil; }
+static VALUE _wrap_FXColorBar_clearShape(int argc, VALUE *argv, VALUE self) { FXColorBar *arg1 = (FXColorBar *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorBar, 1); FXColorBar_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXColorWell_onPaint(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 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);
@@ -1542,19 +1632,6 @@ static VALUE _wrap_FXColorWell_onSelectionRequest(int argc, VALUE *argv, VALUE s
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = to_FXEvent(argv[2]);
     result = (long)(arg1)->onSelectionRequest(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXColorWell_onChanged(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 0 ;
-    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
-    if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]);
-    arg4 = reinterpret_cast<void*>(NUM2UINT(argv[2])); result = (long)(arg1)->onChanged(arg2,arg3,arg4);
-    vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXColorWell_onCommand(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 0 ;
-    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
-    if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = 0;
-    result = (long)(arg1)->onCommand(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXColorWell_onClicked(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 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);
@@ -1567,12 +1644,6 @@ static VALUE _wrap_FXColorWell_onDoubleClicked(int argc, VALUE *argv, VALUE self
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = 0;
     result = (long)(arg1)->onDoubleClicked(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
-static VALUE _wrap_FXColorWell_onTripleClicked(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 0 ;
-    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
-    if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = 0;
-    result = (long)(arg1)->onTripleClicked(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
 static VALUE _wrap_FXColorWell_onCmdSetValue(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 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);
@@ -1669,9 +1740,10 @@ static VALUE _wrap_new_FXColorWell(int argc, VALUE *argv, VALUE self) { FXCompos
         result = (FXColorWell *)new_FXColorWell(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static VALUE _wrap_FXColorWell_setRGBA(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 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_FXColorWell, 1); arg2 = to_FXColor(argv[0]); (arg1)->setRGBA(arg2);
-    return Qnil; }
+    FXColor arg2 ; FXbool arg3 = (FXbool) 0 ; if ((argc < 1) || (argc > 2))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1); arg2 = to_FXColor(argv[0]); if (argc > 1) {
+        arg3 = to_FXbool(argv[1]); }  (arg1)->setRGBA(arg2,arg3); return Qnil; }
 static VALUE _wrap_FXColorWell_getRGBA(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 0 ;
     FXColor result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -1683,20 +1755,22 @@ static VALUE _wrap_FXColorWell_setHelpText(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setHelpText((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXColorWell_getHelpText(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXString *result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1); result = ((FXColorWell const *)arg1)->getHelpText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1); {
+        FXString const &_result_ref = ((FXColorWell const *)arg1)->getHelpText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXColorWell_setTipText(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 0 ;
     FXString *arg2 = 0 ; SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setTipText((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXColorWell_getTipText(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXString *result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1); result = ((FXColorWell const *)arg1)->getTipText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1); {
+        FXString const &_result_ref = ((FXColorWell const *)arg1)->getTipText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXColorWell_isOpaqueOnly(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 0 ;
     FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -1764,6 +1838,11 @@ static VALUE _wrap_FXColorWell_setFocus(int argc, VALUE *argv, VALUE self) { FXC
 static VALUE _wrap_FXColorWell_killFocus(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1); FXColorWell_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXColorWell_changeFocus(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 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_FXColorWell, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXColorWell_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXColorWell_setDefault(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 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_FXColorWell, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -1796,10 +1875,11 @@ static VALUE _wrap_FXColorWell_recalc(int argc, VALUE *argv, VALUE self) { FXCol
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1); FXColorWell_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXColorWell_reparent(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 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_FXColorWell, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXColorWell_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); FXColorWell_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXColorWell_show(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1); FXColorWell_show(arg1); return Qnil; }
@@ -1826,6 +1906,41 @@ static VALUE _wrap_FXColorWell_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_FXColorWell, 1); arg2 = to_FXColor(argv[0]);
     FXColorWell_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXColorWell_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 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_FXColorWell, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXColorWell_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXColorWell_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 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_FXColorWell, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXColorWell_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXColorWell_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 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_FXColorWell, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXColorWell_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXColorWell_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_FXColorWell, 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_FXColorWell_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_FXColorWell, 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_FXColorWell_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_FXColorWell, 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_FXColorWell_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXColorWell_setShape'"); return Qnil; }
+static VALUE _wrap_FXColorWell_clearShape(int argc, VALUE *argv, VALUE self) { FXColorWell *arg1 = (FXColorWell *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWell, 1); FXColorWell_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXColorWheel_onPaint(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 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);
@@ -1951,20 +2066,22 @@ static VALUE _wrap_FXColorWheel_setHelpText(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWheel, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setHelpText((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXColorWheel_getHelpText(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXString *result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWheel, 1); result = ((FXColorWheel const *)arg1)->getHelpText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWheel, 1); {
+        FXString const &_result_ref = ((FXColorWheel const *)arg1)->getHelpText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXColorWheel_setTipText(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 0 ;
     FXString *arg2 = 0 ; SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWheel, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setTipText((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXColorWheel_getTipText(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXString *result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWheel, 1); result = ((FXColorWheel const *)arg1)->getTipText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWheel, 1); {
+        FXString const &_result_ref = ((FXColorWheel const *)arg1)->getTipText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static void
 free_FXColorWheel(FXColorWheel *arg1) {
     delete arg1;
@@ -2023,6 +2140,11 @@ static VALUE _wrap_FXColorWheel_setFocus(int argc, VALUE *argv, VALUE self) { FX
 static VALUE _wrap_FXColorWheel_killFocus(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWheel, 1); FXColorWheel_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXColorWheel_changeFocus(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 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_FXColorWheel, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXColorWheel_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXColorWheel_setDefault(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 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_FXColorWheel, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -2055,10 +2177,11 @@ static VALUE _wrap_FXColorWheel_recalc(int argc, VALUE *argv, VALUE self) { FXCo
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWheel, 1); FXColorWheel_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXColorWheel_reparent(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 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_FXColorWheel, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXColorWheel_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); FXColorWheel_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXColorWheel_show(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWheel, 1); FXColorWheel_show(arg1); return Qnil; }
@@ -2085,6 +2208,41 @@ static VALUE _wrap_FXColorWheel_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_FXColorWheel, 1); arg2 = to_FXColor(argv[0]);
     FXColorWheel_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXColorWheel_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 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_FXColorWheel, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXColorWheel_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXColorWheel_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 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_FXColorWheel, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXColorWheel_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXColorWheel_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 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_FXColorWheel, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXColorWheel_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXColorWheel_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_FXColorWheel, 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_FXColorWheel_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_FXColorWheel, 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_FXColorWheel_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_FXColorWheel, 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_FXColorWheel_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXColorWheel_setShape'"); return Qnil; }
+static VALUE _wrap_FXColorWheel_clearShape(int argc, VALUE *argv, VALUE self) { FXColorWheel *arg1 = (FXColorWheel *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorWheel, 1); FXColorWheel_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXDial_onPaint(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 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);
@@ -2304,18 +2462,20 @@ static VALUE _wrap_FXDial_setHelpText(int argc, VALUE *argv, VALUE self) { FXDia
     SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDial, 1);
     p2 = to_FXString(argv[0]); arg2 = &p2; (arg1)->setHelpText((FXString const &)*arg2); return Qnil; }
-static VALUE _wrap_FXDial_getHelpText(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 0 ; FXString result;
+static VALUE _wrap_FXDial_getHelpText(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 0 ; FXString *result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDial, 1); result = ((FXDial const *)arg1)->getHelpText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDial, 1); {
+        FXString const &_result_ref = ((FXDial const *)arg1)->getHelpText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXDial_setTipText(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 0 ; FXString *arg2 = 0 ;
     SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDial, 1);
     p2 = to_FXString(argv[0]); arg2 = &p2; (arg1)->setTipText((FXString const &)*arg2); return Qnil; }
-static VALUE _wrap_FXDial_getTipText(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 0 ; FXString result;
+static VALUE _wrap_FXDial_getTipText(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 0 ; FXString *result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDial, 1); result = ((FXDial const *)arg1)->getTipText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDial, 1); {
+        FXString const &_result_ref = ((FXDial const *)arg1)->getTipText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static void
 free_FXDial(FXDial *arg1) {
     delete arg1;
@@ -2369,6 +2529,10 @@ static VALUE _wrap_FXDial_setFocus(int argc, VALUE *argv, VALUE self) { FXDial *
 static VALUE _wrap_FXDial_killFocus(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDial, 1); FXDial_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXDial_changeFocus(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 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_FXDial, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXDial_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXDial_setDefault(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 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_FXDial, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -2400,9 +2564,10 @@ static VALUE _wrap_FXDial_recalc(int argc, VALUE *argv, VALUE self) { FXDial *ar
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDial, 1); FXDial_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXDial_reparent(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 0 ;
-    FXComposite *arg2 = (FXComposite *) 0 ; if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDial, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXDial_reparent(arg1,arg2); return Qnil; }
+    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_FXDial, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXWindow, 1); FXDial_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXDial_show(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 0 ; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDial, 1);
     FXDial_show(arg1); return Qnil; }
@@ -2426,6 +2591,38 @@ static VALUE _wrap_FXDial_setBackColor(int argc, VALUE *argv, VALUE self) { FXDi
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDial, 1); arg2 = to_FXColor(argv[0]); FXDial_setBackColor(arg1,arg2);
     return Qnil; }
+static VALUE _wrap_FXDial_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 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_FXDial, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXDial_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXDial_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 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_FXDial, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXDial_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXDial_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 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_FXDial, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXDial_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXDial_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_FXDial, 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_FXDial_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_FXDial, 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_FXDial_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_FXDial, 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_FXDial_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXDial_setShape'"); return Qnil; }
+static VALUE _wrap_FXDial_clearShape(int argc, VALUE *argv, VALUE self) { FXDial *arg1 = (FXDial *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXDial, 1); FXDial_clearShape(arg1); return Qnil; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXHeaderItem_allocate(VALUE self) {
 #else
@@ -2493,18 +2690,20 @@ static VALUE _wrap_FXHeaderItem_getArrowDir(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeaderItem, 1);
     result = (FXuint)((FXHeaderItem const *)arg1)->getArrowDir(); vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_FXHeaderItem_setJustify(int argc, VALUE *argv, VALUE self) { FXHeaderItem *arg1 = (FXHeaderItem *) 0 ;
-    FXuint arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeaderItem, 1); arg2 = NUM2UINT(argv[0]); (arg1)->setJustify(arg2);
-    return Qnil; }
+    FXuint arg2 = (FXuint) FXHeaderItem::LEFT|FXHeaderItem::CENTER_Y ; if ((argc < 0) || (argc > 1))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeaderItem, 1); if (argc > 0) { arg2 = NUM2UINT(argv[0]); } 
+    (arg1)->setJustify(arg2); return Qnil; }
 static VALUE _wrap_FXHeaderItem_getJustify(int argc, VALUE *argv, VALUE self) { FXHeaderItem *arg1 = (FXHeaderItem *) 0 ;
     FXuint result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeaderItem, 1);
     result = (FXuint)((FXHeaderItem const *)arg1)->getJustify(); vresult = UINT2NUM(result); return vresult; }
 static VALUE _wrap_FXHeaderItem_setIconPosition(int argc, VALUE *argv, VALUE self) { FXHeaderItem *arg1 = (FXHeaderItem *) 0 ;
-    FXuint arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeaderItem, 1); arg2 = NUM2UINT(argv[0]); (arg1)->setIconPosition(arg2);
-    return Qnil; }
+    FXuint arg2 = (FXuint) FXHeaderItem::BEFORE ; if ((argc < 0) || (argc > 1))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeaderItem, 1); if (argc > 0) { arg2 = NUM2UINT(argv[0]); } 
+    (arg1)->setIconPosition(arg2); return Qnil; }
 static VALUE _wrap_FXHeaderItem_getIconPosition(int argc, VALUE *argv, VALUE self) { FXHeaderItem *arg1 = (FXHeaderItem *) 0 ;
     FXuint result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -2706,6 +2905,18 @@ static VALUE _wrap_FXHeader_setItem(int nargs, VALUE *args, VALUE self) { int ar
                                     _v = (argv[6] == Qtrue || argv[6] == Qfalse) ? 1 : 0; }  if (_v) {
                                     return _wrap_FXHeader_setItem__SWIG_1(nargs, args, self);}  }  }  }  }  }  }  } 
     rb_raise(rb_eArgError, "No matching function for overloaded 'FXHeader_setItem'"); return Qnil; }
+static VALUE _wrap_FXHeader_fillItems(int argc, VALUE *argv, VALUE self) { FXHeader *arg1 = (FXHeader *) 0 ;
+    FXchar **arg2 = (FXchar **) 0 ; FXIcon *arg3 = (FXIcon *) 0 ; FXint arg4 = (FXint) 0 ; void *arg5 = (void *) 0 ;
+    FXbool arg6 = (FXbool) 0 ; FXint result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 5))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeader, 1); { arg2 = NULL; if(!NIL_P(argv[0])){
+            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY(argv[0])->len)+1) {
+                for (long i = 0; i < RARRAY(argv[0])->len; i++) { arg2[i] = (FXchar *) STR2CSTR(rb_ary_entry(argv[0], i)); } 
+                arg2[RARRAY(argv[0])->len] = 0; }  }  }  if (argc > 1) {
+        SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXIcon, 1); }  if (argc > 2) { arg4 = NUM2INT(argv[2]); } 
+    if (argc > 3) { arg5 = (argv[3] == Qnil) ? NULL : (void *) argv[3]; }  if (argc > 4) { arg6 = to_FXbool(argv[4]); } 
+    result = (FXint)(arg1)->fillItems((FXchar const **)arg2,arg3,arg4,arg5,arg6); vresult = INT2NUM(result); FXFREE(&arg2);
+    return vresult; }
 static VALUE _wrap_FXHeader_insertItem__SWIG_0(int argc, VALUE *argv, VALUE self) { FXHeader *arg1 = (FXHeader *) 0 ;
     FXint arg2 ; FXHeaderItem *arg3 = (FXHeaderItem *) 0 ; FXbool arg4 = (FXbool) 0 ; FXint result; VALUE vresult = Qnil;
     if ((argc < 2) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
@@ -2965,10 +3176,11 @@ static VALUE _wrap_FXHeader_setHelpText(int argc, VALUE *argv, VALUE self) { FXH
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeader, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setHelpText((FXString const &)*arg2); return Qnil; }
-static VALUE _wrap_FXHeader_getHelpText(int argc, VALUE *argv, VALUE self) { FXHeader *arg1 = (FXHeader *) 0 ; FXString result;
+static VALUE _wrap_FXHeader_getHelpText(int argc, VALUE *argv, VALUE self) { FXHeader *arg1 = (FXHeader *) 0 ; FXString *result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeader, 1); result = ((FXHeader const *)arg1)->getHelpText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeader, 1); {
+        FXString const &_result_ref = ((FXHeader const *)arg1)->getHelpText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static void
 free_FXHeader(FXHeader *arg1) {
     delete arg1;
@@ -3025,6 +3237,11 @@ static VALUE _wrap_FXHeader_setFocus(int argc, VALUE *argv, VALUE self) { FXHead
 static VALUE _wrap_FXHeader_killFocus(int argc, VALUE *argv, VALUE self) { FXHeader *arg1 = (FXHeader *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeader, 1); FXHeader_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXHeader_changeFocus(int argc, VALUE *argv, VALUE self) { FXHeader *arg1 = (FXHeader *) 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_FXHeader, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXHeader_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXHeader_setDefault(int argc, VALUE *argv, VALUE self) { FXHeader *arg1 = (FXHeader *) 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_FXHeader, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -3057,10 +3274,11 @@ static VALUE _wrap_FXHeader_recalc(int argc, VALUE *argv, VALUE self) { FXHeader
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeader, 1); FXHeader_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXHeader_reparent(int argc, VALUE *argv, VALUE self) { FXHeader *arg1 = (FXHeader *) 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_FXHeader, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXHeader_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); FXHeader_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXHeader_show(int argc, VALUE *argv, VALUE self) { FXHeader *arg1 = (FXHeader *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeader, 1); FXHeader_show(arg1); return Qnil; }
@@ -3084,6 +3302,39 @@ static VALUE _wrap_FXHeader_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_FXHeader, 1); arg2 = to_FXColor(argv[0]);
     FXHeader_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXHeader_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXHeader *arg1 = (FXHeader *) 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_FXHeader, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXHeader_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXHeader_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXHeader *arg1 = (FXHeader *) 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_FXHeader, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXHeader_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXHeader_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXHeader *arg1 = (FXHeader *) 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_FXHeader, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXHeader_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXHeader_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_FXHeader, 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_FXHeader_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_FXHeader, 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_FXHeader_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_FXHeader, 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_FXHeader_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXHeader_setShape'"); return Qnil; }
+static VALUE _wrap_FXHeader_clearShape(int argc, VALUE *argv, VALUE self) { FXHeader *arg1 = (FXHeader *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHeader, 1); FXHeader_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXImageFrame_onPaint(int argc, VALUE *argv, VALUE self) { FXImageFrame *arg1 = (FXImageFrame *) 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);
@@ -3191,6 +3442,11 @@ static VALUE _wrap_FXImageFrame_setFocus(int argc, VALUE *argv, VALUE self) { FX
 static VALUE _wrap_FXImageFrame_killFocus(int argc, VALUE *argv, VALUE self) { FXImageFrame *arg1 = (FXImageFrame *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXImageFrame, 1); FXImageFrame_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXImageFrame_changeFocus(int argc, VALUE *argv, VALUE self) { FXImageFrame *arg1 = (FXImageFrame *) 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_FXImageFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXImageFrame_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXImageFrame_setDefault(int argc, VALUE *argv, VALUE self) { FXImageFrame *arg1 = (FXImageFrame *) 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_FXImageFrame, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -3223,10 +3479,11 @@ static VALUE _wrap_FXImageFrame_recalc(int argc, VALUE *argv, VALUE self) { FXIm
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXImageFrame, 1); FXImageFrame_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXImageFrame_reparent(int argc, VALUE *argv, VALUE self) { FXImageFrame *arg1 = (FXImageFrame *) 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_FXImageFrame, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXImageFrame_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); FXImageFrame_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXImageFrame_show(int argc, VALUE *argv, VALUE self) { FXImageFrame *arg1 = (FXImageFrame *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXImageFrame, 1); FXImageFrame_show(arg1); return Qnil; }
@@ -3253,6 +3510,41 @@ static VALUE _wrap_FXImageFrame_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_FXImageFrame, 1); arg2 = to_FXColor(argv[0]);
     FXImageFrame_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXImageFrame_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXImageFrame *arg1 = (FXImageFrame *) 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_FXImageFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXImageFrame_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXImageFrame_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXImageFrame *arg1 = (FXImageFrame *) 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_FXImageFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXImageFrame_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXImageFrame_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXImageFrame *arg1 = (FXImageFrame *) 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_FXImageFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXImageFrame_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXImageFrame_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_FXImageFrame, 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_FXImageFrame_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_FXImageFrame, 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_FXImageFrame_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_FXImageFrame, 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_FXImageFrame_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXImageFrame_setShape'"); return Qnil; }
+static VALUE _wrap_FXImageFrame_clearShape(int argc, VALUE *argv, VALUE self) { FXImageFrame *arg1 = (FXImageFrame *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXImageFrame, 1); FXImageFrame_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXBitmapFrame_onPaint(int argc, VALUE *argv, VALUE self) { FXBitmapFrame *arg1 = (FXBitmapFrame *) 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);
@@ -3379,6 +3671,11 @@ static VALUE _wrap_FXBitmapFrame_setFocus(int argc, VALUE *argv, VALUE self) { F
 static VALUE _wrap_FXBitmapFrame_killFocus(int argc, VALUE *argv, VALUE self) { FXBitmapFrame *arg1 = (FXBitmapFrame *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXBitmapFrame, 1); FXBitmapFrame_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXBitmapFrame_changeFocus(int argc, VALUE *argv, VALUE self) { FXBitmapFrame *arg1 = (FXBitmapFrame *) 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_FXBitmapFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXBitmapFrame_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXBitmapFrame_setDefault(int argc, VALUE *argv, VALUE self) { FXBitmapFrame *arg1 = (FXBitmapFrame *) 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_FXBitmapFrame, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -3411,10 +3708,11 @@ static VALUE _wrap_FXBitmapFrame_recalc(int argc, VALUE *argv, VALUE self) { FXB
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXBitmapFrame, 1); FXBitmapFrame_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXBitmapFrame_reparent(int argc, VALUE *argv, VALUE self) { FXBitmapFrame *arg1 = (FXBitmapFrame *) 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_FXBitmapFrame, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXBitmapFrame_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); FXBitmapFrame_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXBitmapFrame_show(int argc, VALUE *argv, VALUE self) { FXBitmapFrame *arg1 = (FXBitmapFrame *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXBitmapFrame, 1); FXBitmapFrame_show(arg1); return Qnil; }
@@ -3442,6 +3740,43 @@ static VALUE _wrap_FXBitmapFrame_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_FXBitmapFrame, 1); arg2 = to_FXColor(argv[0]);
     FXBitmapFrame_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXBitmapFrame_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
+    FXBitmapFrame *arg1 = (FXBitmapFrame *) 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_FXBitmapFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXBitmapFrame_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXBitmapFrame_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
+    FXBitmapFrame *arg1 = (FXBitmapFrame *) 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_FXBitmapFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXBitmapFrame_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXBitmapFrame_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
+    FXBitmapFrame *arg1 = (FXBitmapFrame *) 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_FXBitmapFrame, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXBitmapFrame_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXBitmapFrame_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_FXBitmapFrame, 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_FXBitmapFrame_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_FXBitmapFrame, 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_FXBitmapFrame_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_FXBitmapFrame, 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_FXBitmapFrame_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXBitmapFrame_setShape'"); return Qnil; }
+static VALUE _wrap_FXBitmapFrame_clearShape(int argc, VALUE *argv, VALUE self) { FXBitmapFrame *arg1 = (FXBitmapFrame *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXBitmapFrame, 1); FXBitmapFrame_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXProgressBar_onPaint(int argc, VALUE *argv, VALUE self) { FXProgressBar *arg1 = (FXProgressBar *) 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);
@@ -3646,6 +3981,11 @@ static VALUE _wrap_FXProgressBar_setFocus(int argc, VALUE *argv, VALUE self) { F
 static VALUE _wrap_FXProgressBar_killFocus(int argc, VALUE *argv, VALUE self) { FXProgressBar *arg1 = (FXProgressBar *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXProgressBar, 1); FXProgressBar_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXProgressBar_changeFocus(int argc, VALUE *argv, VALUE self) { FXProgressBar *arg1 = (FXProgressBar *) 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_FXProgressBar, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXProgressBar_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXProgressBar_setDefault(int argc, VALUE *argv, VALUE self) { FXProgressBar *arg1 = (FXProgressBar *) 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_FXProgressBar, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -3678,10 +4018,11 @@ static VALUE _wrap_FXProgressBar_recalc(int argc, VALUE *argv, VALUE self) { FXP
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXProgressBar, 1); FXProgressBar_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXProgressBar_reparent(int argc, VALUE *argv, VALUE self) { FXProgressBar *arg1 = (FXProgressBar *) 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_FXProgressBar, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXProgressBar_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); FXProgressBar_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXProgressBar_show(int argc, VALUE *argv, VALUE self) { FXProgressBar *arg1 = (FXProgressBar *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXProgressBar, 1); FXProgressBar_show(arg1); return Qnil; }
@@ -3709,6 +4050,43 @@ static VALUE _wrap_FXProgressBar_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_FXProgressBar, 1); arg2 = to_FXColor(argv[0]);
     FXProgressBar_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXProgressBar_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
+    FXProgressBar *arg1 = (FXProgressBar *) 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_FXProgressBar, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXProgressBar_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXProgressBar_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
+    FXProgressBar *arg1 = (FXProgressBar *) 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_FXProgressBar, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXProgressBar_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXProgressBar_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
+    FXProgressBar *arg1 = (FXProgressBar *) 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_FXProgressBar, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXProgressBar_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXProgressBar_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_FXProgressBar, 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_FXProgressBar_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_FXProgressBar, 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_FXProgressBar_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_FXProgressBar, 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_FXProgressBar_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXProgressBar_setShape'"); return Qnil; }
+static VALUE _wrap_FXProgressBar_clearShape(int argc, VALUE *argv, VALUE self) { FXProgressBar *arg1 = (FXProgressBar *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXProgressBar, 1); FXProgressBar_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXRuler_onPaint(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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);
@@ -3816,6 +4194,110 @@ static VALUE _wrap_new_FXRuler(int argc, VALUE *argv, VALUE self) { FXComposite
         arg11 = NUM2INT(argv[10]); }  if (argc > 11) { arg12 = NUM2INT(argv[11]); }  {
         result = (FXRuler *)new_FXRuler(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 VALUE _wrap_FXRuler_setPosition(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1); arg2 = NUM2INT(argv[0]); (arg1)->setPosition(arg2);
+    return Qnil; }
+static VALUE _wrap_FXRuler_getPosition(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1); result = (FXint)((FXRuler const *)arg1)->getPosition();
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXRuler_setDocumentSize(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXint arg2 ;
+    FXbool arg3 = (FXbool) 0 ; if ((argc < 1) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); arg2 = NUM2INT(argv[0]); if (argc > 1) {
+        arg3 = to_FXbool(argv[1]); }  (arg1)->setDocumentSize(arg2,arg3); return Qnil; }
+static VALUE _wrap_FXRuler_getDocumentSize(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1); result = (FXint)((FXRuler const *)arg1)->getDocumentSize();
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXRuler_setEdgeSpacing(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXint arg2 ;
+    FXbool arg3 = (FXbool) 0 ; if ((argc < 1) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); arg2 = NUM2INT(argv[0]); if (argc > 1) {
+        arg3 = to_FXbool(argv[1]); }  (arg1)->setEdgeSpacing(arg2,arg3); return Qnil; }
+static VALUE _wrap_FXRuler_getEdgeSpacing(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1); result = (FXint)((FXRuler const *)arg1)->getEdgeSpacing();
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXRuler_setMarginLower(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXint arg2 ;
+    FXbool arg3 = (FXbool) 0 ; if ((argc < 1) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); arg2 = NUM2INT(argv[0]); if (argc > 1) {
+        arg3 = to_FXbool(argv[1]); }  (arg1)->setMarginLower(arg2,arg3); return Qnil; }
+static VALUE _wrap_FXRuler_getMarginLower(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1); result = (FXint)((FXRuler const *)arg1)->getMarginLower();
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXRuler_setMarginUpper(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXint arg2 ;
+    FXbool arg3 = (FXbool) 0 ; if ((argc < 1) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); arg2 = NUM2INT(argv[0]); if (argc > 1) {
+        arg3 = to_FXbool(argv[1]); }  (arg1)->setMarginUpper(arg2,arg3); return Qnil; }
+static VALUE _wrap_FXRuler_getMarginUpper(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1); result = (FXint)((FXRuler const *)arg1)->getMarginUpper();
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXRuler_setIndentFirst(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXint arg2 ;
+    FXbool arg3 = (FXbool) 0 ; if ((argc < 1) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); arg2 = NUM2INT(argv[0]); if (argc > 1) {
+        arg3 = to_FXbool(argv[1]); }  (arg1)->setIndentFirst(arg2,arg3); return Qnil; }
+static VALUE _wrap_FXRuler_getIndentFirst(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1); result = (FXint)((FXRuler const *)arg1)->getIndentFirst();
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXRuler_setIndentLower(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXint arg2 ;
+    FXbool arg3 = (FXbool) 0 ; if ((argc < 1) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); arg2 = NUM2INT(argv[0]); if (argc > 1) {
+        arg3 = to_FXbool(argv[1]); }  (arg1)->setIndentLower(arg2,arg3); return Qnil; }
+static VALUE _wrap_FXRuler_getIndentLower(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1); result = (FXint)((FXRuler const *)arg1)->getIndentLower();
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXRuler_setIndentUpper(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXint arg2 ;
+    FXbool arg3 = (FXbool) 0 ; if ((argc < 1) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); arg2 = NUM2INT(argv[0]); if (argc > 1) {
+        arg3 = to_FXbool(argv[1]); }  (arg1)->setIndentUpper(arg2,arg3); return Qnil; }
+static VALUE _wrap_FXRuler_getIndentUpper(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1); result = (FXint)((FXRuler const *)arg1)->getIndentUpper();
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXRuler_setNumberTicks(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXint arg2 ;
+    FXbool arg3 = (FXbool) 0 ; if ((argc < 1) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); arg2 = NUM2INT(argv[0]); if (argc > 1) {
+        arg3 = to_FXbool(argv[1]); }  (arg1)->setNumberTicks(arg2,arg3); return Qnil; }
+static VALUE _wrap_FXRuler_getNumberTicks(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1); result = (FXint)((FXRuler const *)arg1)->getNumberTicks();
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXRuler_setMajorTicks(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXint arg2 ;
+    FXbool arg3 = (FXbool) 0 ; if ((argc < 1) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); arg2 = NUM2INT(argv[0]); if (argc > 1) {
+        arg3 = to_FXbool(argv[1]); }  (arg1)->setMajorTicks(arg2,arg3); return Qnil; }
+static VALUE _wrap_FXRuler_getMajorTicks(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1); result = (FXint)((FXRuler const *)arg1)->getMajorTicks();
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXRuler_setMediumTicks(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXint arg2 ;
+    FXbool arg3 = (FXbool) 0 ; if ((argc < 1) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); arg2 = NUM2INT(argv[0]); if (argc > 1) {
+        arg3 = to_FXbool(argv[1]); }  (arg1)->setMediumTicks(arg2,arg3); return Qnil; }
+static VALUE _wrap_FXRuler_getMediumTicks(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1); result = (FXint)((FXRuler const *)arg1)->getMediumTicks();
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXRuler_setTinyTicks(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXint arg2 ;
+    FXbool arg3 = (FXbool) 0 ; if ((argc < 1) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); arg2 = NUM2INT(argv[0]); if (argc > 1) {
+        arg3 = to_FXbool(argv[1]); }  (arg1)->setTinyTicks(arg2,arg3); return Qnil; }
+static VALUE _wrap_FXRuler_getTinyTicks(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1); result = (FXint)((FXRuler const *)arg1)->getTinyTicks();
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXRuler_setPixelPerTick(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXdouble arg2 ;
+    FXbool arg3 = (FXbool) 0 ; if ((argc < 1) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); arg2 = (FXdouble) NUM2DBL(argv[0]); if (argc > 1) {
+        arg3 = to_FXbool(argv[1]); }  (arg1)->setPixelPerTick(arg2,arg3); return Qnil; }
+static VALUE _wrap_FXRuler_getPixelPerTick(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXdouble 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_FXRuler, 1);
+    result = (FXdouble)((FXRuler const *)arg1)->getPixelPerTick(); vresult = rb_float_new(result); return vresult; }
 static VALUE _wrap_FXRuler_setFont(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ;
     FXFont *arg2 = (FXFont *) 0 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1);
@@ -3854,19 +4336,21 @@ static VALUE _wrap_FXRuler_setHelpText(int argc, VALUE *argv, VALUE self) { FXRu
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setHelpText((FXString const &)*arg2); return Qnil; }
-static VALUE _wrap_FXRuler_getHelpText(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXString result;
+static VALUE _wrap_FXRuler_getHelpText(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXString *result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); result = ((FXRuler const *)arg1)->getHelpText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); {
+        FXString const &_result_ref = ((FXRuler const *)arg1)->getHelpText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXRuler_setTipText(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXString *arg2 = 0 ;
     SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setTipText((FXString const &)*arg2); return Qnil; }
-static VALUE _wrap_FXRuler_getTipText(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXString result;
+static VALUE _wrap_FXRuler_getTipText(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ; FXString *result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); result = ((FXRuler const *)arg1)->getTipText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); {
+        FXString const &_result_ref = ((FXRuler const *)arg1)->getTipText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static void
 free_FXRuler(FXRuler *arg1) {
     delete arg1;
@@ -3922,6 +4406,11 @@ static VALUE _wrap_FXRuler_setFocus(int argc, VALUE *argv, VALUE self) { FXRuler
 static VALUE _wrap_FXRuler_killFocus(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); FXRuler_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXRuler_changeFocus(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXRuler_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXRuler_setDefault(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -3954,10 +4443,11 @@ static VALUE _wrap_FXRuler_recalc(int argc, VALUE *argv, VALUE self) { FXRuler *
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); FXRuler_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXRuler_reparent(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXRuler_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); FXRuler_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXRuler_show(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); FXRuler_show(arg1); return Qnil; }
@@ -3981,6 +4471,39 @@ static VALUE _wrap_FXRuler_setBackColor(int argc, VALUE *argv, VALUE self) { FXR
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); arg2 = to_FXColor(argv[0]); FXRuler_setBackColor(arg1,arg2);
     return Qnil; }
+static VALUE _wrap_FXRuler_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXRuler_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXRuler_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXRuler_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXRuler_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 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_FXRuler, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXRuler_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXRuler_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_FXRuler, 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_FXRuler_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_FXRuler, 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_FXRuler_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_FXRuler, 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_FXRuler_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXRuler_setShape'"); return Qnil; }
+static VALUE _wrap_FXRuler_clearShape(int argc, VALUE *argv, VALUE self) { FXRuler *arg1 = (FXRuler *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRuler, 1); FXRuler_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXSeparator_onPaint(int argc, VALUE *argv, VALUE self) { FXSeparator *arg1 = (FXSeparator *) 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);
@@ -4076,6 +4599,11 @@ static VALUE _wrap_FXSeparator_setFocus(int argc, VALUE *argv, VALUE self) { FXS
 static VALUE _wrap_FXSeparator_killFocus(int argc, VALUE *argv, VALUE self) { FXSeparator *arg1 = (FXSeparator *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSeparator, 1); FXSeparator_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXSeparator_changeFocus(int argc, VALUE *argv, VALUE self) { FXSeparator *arg1 = (FXSeparator *) 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_FXSeparator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXSeparator_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXSeparator_setDefault(int argc, VALUE *argv, VALUE self) { FXSeparator *arg1 = (FXSeparator *) 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_FXSeparator, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -4108,10 +4636,11 @@ static VALUE _wrap_FXSeparator_recalc(int argc, VALUE *argv, VALUE self) { FXSep
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSeparator, 1); FXSeparator_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXSeparator_reparent(int argc, VALUE *argv, VALUE self) { FXSeparator *arg1 = (FXSeparator *) 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_FXSeparator, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXSeparator_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); FXSeparator_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXSeparator_show(int argc, VALUE *argv, VALUE self) { FXSeparator *arg1 = (FXSeparator *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSeparator, 1); FXSeparator_show(arg1); return Qnil; }
@@ -4138,6 +4667,41 @@ static VALUE _wrap_FXSeparator_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_FXSeparator, 1); arg2 = to_FXColor(argv[0]);
     FXSeparator_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSeparator_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXSeparator *arg1 = (FXSeparator *) 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_FXSeparator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXSeparator_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXSeparator_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXSeparator *arg1 = (FXSeparator *) 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_FXSeparator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXSeparator_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSeparator_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXSeparator *arg1 = (FXSeparator *) 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_FXSeparator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXSeparator_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSeparator_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_FXSeparator, 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_FXSeparator_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_FXSeparator, 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_FXSeparator_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_FXSeparator, 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_FXSeparator_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXSeparator_setShape'"); return Qnil; }
+static VALUE _wrap_FXSeparator_clearShape(int argc, VALUE *argv, VALUE self) { FXSeparator *arg1 = (FXSeparator *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSeparator, 1); FXSeparator_clearShape(arg1); return Qnil; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXHorizontalSeparator_allocate(VALUE self) {
 #else
@@ -4232,6 +4796,12 @@ static VALUE _wrap_FXHorizontalSeparator_killFocus(int argc, VALUE *argv, VALUE
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHorizontalSeparator, 1); FXHorizontalSeparator_killFocus(arg1);
     return Qnil; }
+static VALUE _wrap_FXHorizontalSeparator_changeFocus(int argc, VALUE *argv, VALUE self) {
+    FXHorizontalSeparator *arg1 = (FXHorizontalSeparator *) 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_FXHorizontalSeparator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXHorizontalSeparator_changeFocus(arg1,arg2);
+    return Qnil; }
 static VALUE _wrap_FXHorizontalSeparator_setDefault(int argc, VALUE *argv, VALUE self) {
     FXHorizontalSeparator *arg1 = (FXHorizontalSeparator *) 0 ; FXbool arg2 = (FXbool) 1 ; if ((argc < 0) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -4279,10 +4849,12 @@ static VALUE _wrap_FXHorizontalSeparator_recalc(int argc, VALUE *argv, VALUE sel
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHorizontalSeparator, 1); FXHorizontalSeparator_recalc(arg1);
     return Qnil; }
 static VALUE _wrap_FXHorizontalSeparator_reparent(int argc, VALUE *argv, VALUE self) {
-    FXHorizontalSeparator *arg1 = (FXHorizontalSeparator *) 0 ; FXComposite *arg2 = (FXComposite *) 0 ;
-    if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    FXHorizontalSeparator *arg1 = (FXHorizontalSeparator *) 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_FXHorizontalSeparator, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXHorizontalSeparator_reparent(arg1,arg2);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
+    SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXWindow, 1); FXHorizontalSeparator_reparent(arg1,arg2,arg3);
     return Qnil; }
 static VALUE _wrap_FXHorizontalSeparator_show(int argc, VALUE *argv, VALUE self) {
     FXHorizontalSeparator *arg1 = (FXHorizontalSeparator *) 0 ; if ((argc < 0) || (argc > 0))
@@ -4315,6 +4887,45 @@ static VALUE _wrap_FXHorizontalSeparator_setBackColor(int argc, VALUE *argv, VAL
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHorizontalSeparator, 1); arg2 = to_FXColor(argv[0]);
     FXHorizontalSeparator_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXHorizontalSeparator_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
+    FXHorizontalSeparator *arg1 = (FXHorizontalSeparator *) 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_FXHorizontalSeparator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXHorizontalSeparator_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXHorizontalSeparator_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
+    FXHorizontalSeparator *arg1 = (FXHorizontalSeparator *) 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_FXHorizontalSeparator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXHorizontalSeparator_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXHorizontalSeparator_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
+    FXHorizontalSeparator *arg1 = (FXHorizontalSeparator *) 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_FXHorizontalSeparator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXHorizontalSeparator_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXHorizontalSeparator_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_FXHorizontalSeparator, 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_FXHorizontalSeparator_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_FXHorizontalSeparator, 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_FXHorizontalSeparator_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_FXHorizontalSeparator, 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_FXHorizontalSeparator_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXHorizontalSeparator_setShape'"); return Qnil; }
+static VALUE _wrap_FXHorizontalSeparator_clearShape(int argc, VALUE *argv, VALUE self) {
+    FXHorizontalSeparator *arg1 = (FXHorizontalSeparator *) 0 ; if ((argc < 0) || (argc > 0))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXHorizontalSeparator, 1); FXHorizontalSeparator_clearShape(arg1);
+    return Qnil; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXVerticalSeparator_allocate(VALUE self) {
 #else
@@ -4405,6 +5016,11 @@ static VALUE _wrap_FXVerticalSeparator_killFocus(int argc, VALUE *argv, VALUE se
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXVerticalSeparator, 1); FXVerticalSeparator_killFocus(arg1);
     return Qnil; }
+static VALUE _wrap_FXVerticalSeparator_changeFocus(int argc, VALUE *argv, VALUE self) {
+    FXVerticalSeparator *arg1 = (FXVerticalSeparator *) 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_FXVerticalSeparator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXVerticalSeparator_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXVerticalSeparator_setDefault(int argc, VALUE *argv, VALUE self) {
     FXVerticalSeparator *arg1 = (FXVerticalSeparator *) 0 ; FXbool arg2 = (FXbool) 1 ; if ((argc < 0) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -4445,10 +5061,12 @@ static VALUE _wrap_FXVerticalSeparator_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_FXVerticalSeparator, 1); FXVerticalSeparator_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXVerticalSeparator_reparent(int argc, VALUE *argv, VALUE self) {
-    FXVerticalSeparator *arg1 = (FXVerticalSeparator *) 0 ; FXComposite *arg2 = (FXComposite *) 0 ;
-    if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    FXVerticalSeparator *arg1 = (FXVerticalSeparator *) 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_FXVerticalSeparator, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXVerticalSeparator_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); FXVerticalSeparator_reparent(arg1,arg2,arg3);
+    return Qnil; }
 static VALUE _wrap_FXVerticalSeparator_show(int argc, VALUE *argv, VALUE self) {
     FXVerticalSeparator *arg1 = (FXVerticalSeparator *) 0 ; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -4480,6 +5098,45 @@ static VALUE _wrap_FXVerticalSeparator_setBackColor(int argc, VALUE *argv, VALUE
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXVerticalSeparator, 1); arg2 = to_FXColor(argv[0]);
     FXVerticalSeparator_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXVerticalSeparator_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
+    FXVerticalSeparator *arg1 = (FXVerticalSeparator *) 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_FXVerticalSeparator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXVerticalSeparator_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXVerticalSeparator_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
+    FXVerticalSeparator *arg1 = (FXVerticalSeparator *) 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_FXVerticalSeparator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXVerticalSeparator_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXVerticalSeparator_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
+    FXVerticalSeparator *arg1 = (FXVerticalSeparator *) 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_FXVerticalSeparator, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXVerticalSeparator_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXVerticalSeparator_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_FXVerticalSeparator, 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_FXVerticalSeparator_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_FXVerticalSeparator, 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_FXVerticalSeparator_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_FXVerticalSeparator, 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_FXVerticalSeparator_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXVerticalSeparator_setShape'"); return Qnil; }
+static VALUE _wrap_FXVerticalSeparator_clearShape(int argc, VALUE *argv, VALUE self) {
+    FXVerticalSeparator *arg1 = (FXVerticalSeparator *) 0 ; if ((argc < 0) || (argc > 0))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXVerticalSeparator, 1); FXVerticalSeparator_clearShape(arg1);
+    return Qnil; }
 static VALUE _wrap_FXSlider_onPaint(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 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);
@@ -4727,19 +5384,21 @@ static VALUE _wrap_FXSlider_setHelpText(int argc, VALUE *argv, VALUE self) { FXS
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSlider, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setHelpText((FXString const &)*arg2); return Qnil; }
-static VALUE _wrap_FXSlider_getHelpText(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 0 ; FXString result;
+static VALUE _wrap_FXSlider_getHelpText(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 0 ; FXString *result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSlider, 1); result = ((FXSlider const *)arg1)->getHelpText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSlider, 1); {
+        FXString const &_result_ref = ((FXSlider const *)arg1)->getHelpText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXSlider_setTipText(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 0 ;
     FXString *arg2 = 0 ; SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSlider, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setTipText((FXString const &)*arg2); return Qnil; }
-static VALUE _wrap_FXSlider_getTipText(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 0 ; FXString result;
+static VALUE _wrap_FXSlider_getTipText(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 0 ; FXString *result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSlider, 1); result = ((FXSlider const *)arg1)->getTipText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSlider, 1); {
+        FXString const &_result_ref = ((FXSlider const *)arg1)->getTipText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static void
 free_FXSlider(FXSlider *arg1) {
     delete arg1;
@@ -4796,6 +5455,11 @@ static VALUE _wrap_FXSlider_setFocus(int argc, VALUE *argv, VALUE self) { FXSlid
 static VALUE _wrap_FXSlider_killFocus(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSlider, 1); FXSlider_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXSlider_changeFocus(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 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_FXSlider, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXSlider_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXSlider_setDefault(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 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_FXSlider, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -4828,10 +5492,11 @@ static VALUE _wrap_FXSlider_recalc(int argc, VALUE *argv, VALUE self) { FXSlider
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSlider, 1); FXSlider_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXSlider_reparent(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 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_FXSlider, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXSlider_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); FXSlider_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXSlider_show(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSlider, 1); FXSlider_show(arg1); return Qnil; }
@@ -4855,6 +5520,39 @@ static VALUE _wrap_FXSlider_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_FXSlider, 1); arg2 = to_FXColor(argv[0]);
     FXSlider_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSlider_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 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_FXSlider, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXSlider_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXSlider_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 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_FXSlider, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXSlider_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSlider_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 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_FXSlider, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXSlider_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXSlider_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_FXSlider, 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_FXSlider_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_FXSlider, 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_FXSlider_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_FXSlider, 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_FXSlider_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXSlider_setShape'"); return Qnil; }
+static VALUE _wrap_FXSlider_clearShape(int argc, VALUE *argv, VALUE self) { FXSlider *arg1 = (FXSlider *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSlider, 1); FXSlider_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXRealSlider_onPaint(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 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);
@@ -5113,20 +5811,22 @@ static VALUE _wrap_FXRealSlider_setHelpText(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRealSlider, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setHelpText((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXRealSlider_getHelpText(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXString *result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRealSlider, 1); result = ((FXRealSlider const *)arg1)->getHelpText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRealSlider, 1); {
+        FXString const &_result_ref = ((FXRealSlider const *)arg1)->getHelpText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXRealSlider_setTipText(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 0 ;
     FXString *arg2 = 0 ; SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRealSlider, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setTipText((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXRealSlider_getTipText(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXString *result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRealSlider, 1); result = ((FXRealSlider const *)arg1)->getTipText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRealSlider, 1); {
+        FXString const &_result_ref = ((FXRealSlider const *)arg1)->getTipText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static void
 free_FXRealSlider(FXRealSlider *arg1) {
     delete arg1;
@@ -5185,6 +5885,11 @@ static VALUE _wrap_FXRealSlider_setFocus(int argc, VALUE *argv, VALUE self) { FX
 static VALUE _wrap_FXRealSlider_killFocus(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRealSlider, 1); FXRealSlider_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXRealSlider_changeFocus(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 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_FXRealSlider, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXRealSlider_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXRealSlider_setDefault(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 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_FXRealSlider, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -5217,10 +5922,11 @@ static VALUE _wrap_FXRealSlider_recalc(int argc, VALUE *argv, VALUE self) { FXRe
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRealSlider, 1); FXRealSlider_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXRealSlider_reparent(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 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_FXRealSlider, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXRealSlider_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); FXRealSlider_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXRealSlider_show(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRealSlider, 1); FXRealSlider_show(arg1); return Qnil; }
@@ -5247,6 +5953,41 @@ static VALUE _wrap_FXRealSlider_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_FXRealSlider, 1); arg2 = to_FXColor(argv[0]);
     FXRealSlider_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXRealSlider_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 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_FXRealSlider, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXRealSlider_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXRealSlider_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 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_FXRealSlider, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXRealSlider_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXRealSlider_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 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_FXRealSlider, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXRealSlider_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXRealSlider_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_FXRealSlider, 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_FXRealSlider_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_FXRealSlider, 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_FXRealSlider_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_FXRealSlider, 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_FXRealSlider_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXRealSlider_setShape'"); return Qnil; }
+static VALUE _wrap_FXRealSlider_clearShape(int argc, VALUE *argv, VALUE self) { FXRealSlider *arg1 = (FXRealSlider *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRealSlider, 1); FXRealSlider_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXStatusLine_onPaint(int argc, VALUE *argv, VALUE self) { FXStatusLine *arg1 = (FXStatusLine *) 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);
@@ -5399,6 +6140,11 @@ static VALUE _wrap_FXStatusLine_setFocus(int argc, VALUE *argv, VALUE self) { FX
 static VALUE _wrap_FXStatusLine_killFocus(int argc, VALUE *argv, VALUE self) { FXStatusLine *arg1 = (FXStatusLine *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStatusLine, 1); FXStatusLine_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXStatusLine_changeFocus(int argc, VALUE *argv, VALUE self) { FXStatusLine *arg1 = (FXStatusLine *) 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_FXStatusLine, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXStatusLine_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXStatusLine_setDefault(int argc, VALUE *argv, VALUE self) { FXStatusLine *arg1 = (FXStatusLine *) 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_FXStatusLine, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -5431,10 +6177,11 @@ static VALUE _wrap_FXStatusLine_recalc(int argc, VALUE *argv, VALUE self) { FXSt
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStatusLine, 1); FXStatusLine_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXStatusLine_reparent(int argc, VALUE *argv, VALUE self) { FXStatusLine *arg1 = (FXStatusLine *) 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_FXStatusLine, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXStatusLine_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); FXStatusLine_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXStatusLine_show(int argc, VALUE *argv, VALUE self) { FXStatusLine *arg1 = (FXStatusLine *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStatusLine, 1); FXStatusLine_show(arg1); return Qnil; }
@@ -5461,6 +6208,41 @@ static VALUE _wrap_FXStatusLine_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_FXStatusLine, 1); arg2 = to_FXColor(argv[0]);
     FXStatusLine_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXStatusLine_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXStatusLine *arg1 = (FXStatusLine *) 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_FXStatusLine, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXStatusLine_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXStatusLine_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXStatusLine *arg1 = (FXStatusLine *) 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_FXStatusLine, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXStatusLine_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXStatusLine_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXStatusLine *arg1 = (FXStatusLine *) 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_FXStatusLine, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXStatusLine_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXStatusLine_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_FXStatusLine, 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_FXStatusLine_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_FXStatusLine, 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_FXStatusLine_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_FXStatusLine, 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_FXStatusLine_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXStatusLine_setShape'"); return Qnil; }
+static VALUE _wrap_FXStatusLine_clearShape(int argc, VALUE *argv, VALUE self) { FXStatusLine *arg1 = (FXStatusLine *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXStatusLine, 1); FXStatusLine_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXTextField_onPaint(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 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);
@@ -5983,20 +6765,22 @@ static VALUE _wrap_FXTextField_setHelpText(int argc, VALUE *argv, VALUE self) {
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTextField, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setHelpText((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXTextField_getHelpText(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXString *result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTextField, 1); result = ((FXTextField const *)arg1)->getHelpText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTextField, 1); {
+        FXString const &_result_ref = ((FXTextField const *)arg1)->getHelpText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXTextField_setTipText(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 0 ;
     FXString *arg2 = 0 ; SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTextField, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setTipText((FXString const &)*arg2); return Qnil; }
 static VALUE _wrap_FXTextField_getTipText(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 0 ;
-    FXString result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    FXString *result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTextField, 1); result = ((FXTextField const *)arg1)->getTipText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTextField, 1); {
+        FXString const &_result_ref = ((FXTextField const *)arg1)->getTipText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXTextField_setTextStyle(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 0 ;
     FXuint arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTextField, 1); arg2 = NUM2UINT(argv[0]); (arg1)->setTextStyle(arg2);
@@ -6098,6 +6882,11 @@ static VALUE _wrap_FXTextField_setFocus(int argc, VALUE *argv, VALUE self) { FXT
 static VALUE _wrap_FXTextField_killFocus(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTextField, 1); FXTextField_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXTextField_changeFocus(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 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_FXTextField, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXTextField_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXTextField_setDefault(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 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_FXTextField, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -6130,10 +6919,11 @@ static VALUE _wrap_FXTextField_recalc(int argc, VALUE *argv, VALUE self) { FXTex
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTextField, 1); FXTextField_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXTextField_reparent(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 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_FXTextField, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXTextField_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); FXTextField_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXTextField_show(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTextField, 1); FXTextField_show(arg1); return Qnil; }
@@ -6160,6 +6950,41 @@ static VALUE _wrap_FXTextField_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_FXTextField, 1); arg2 = to_FXColor(argv[0]);
     FXTextField_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXTextField_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 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_FXTextField, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXTextField_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXTextField_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 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_FXTextField, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXTextField_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXTextField_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 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_FXTextField, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXTextField_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXTextField_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_FXTextField, 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_FXTextField_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_FXTextField, 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_FXTextField_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_FXTextField, 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_FXTextField_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXTextField_setShape'"); return Qnil; }
+static VALUE _wrap_FXTextField_clearShape(int argc, VALUE *argv, VALUE self) { FXTextField *arg1 = (FXTextField *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTextField, 1); FXTextField_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXToolBarTab_onPaint(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 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);
@@ -6238,6 +7063,25 @@ static VALUE _wrap_FXToolBarTab_onUpdUncollapse(int argc, VALUE *argv, VALUE sel
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToolBarTab, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = 0;
     result = (long)(arg1)->onUpdUncollapse(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXToolBarTab_onCmdSetTip(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 0 ;
+    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; FXString value4 ;
+    VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToolBarTab, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); {
+        value4 = FXString(STR2CSTR(argv[2])); arg4 = (void *) &value4; }  result = (long)(arg1)->onCmdSetTip(arg2,arg3,arg4);
+    vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXToolBarTab_onCmdGetTip(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 0 ;
+    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
+    if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToolBarTab, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = 0;
+    result = (long)(arg1)->onCmdGetTip(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
+static VALUE _wrap_FXToolBarTab_onQueryTip(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 0 ;
+    FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ; void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil;
+    if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToolBarTab, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXObject, 1); arg3 = NUM2UINT(argv[1]); arg4 = to_FXEvent(argv[2]);
+    result = (long)(arg1)->onQueryTip(arg2,arg3,arg4); vresult = INT2NUM(result); return vresult; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 static VALUE _wrap_FXToolBarTab_allocate(VALUE self) {
 #else
@@ -6259,9 +7103,10 @@ static VALUE _wrap_new_FXToolBarTab(int argc, VALUE *argv, VALUE self) { FXCompo
         result = (FXToolBarTab *)new_FXToolBarTab(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static VALUE _wrap_FXToolBarTab_collapse(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 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_FXToolBarTab, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
-    (arg1)->collapse(arg2); return Qnil; }
+    FXbool arg2 ; FXbool arg3 = (FXbool) 0 ; if ((argc < 1) || (argc > 2))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToolBarTab, 1); arg2 = to_FXbool(argv[0]); if (argc > 1) {
+        arg3 = to_FXbool(argv[1]); }  (arg1)->collapse(arg2,arg3); return Qnil; }
 static VALUE _wrap_FXToolBarTab_isCollapsed(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 0 ;
     FXbool result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
@@ -6285,6 +7130,17 @@ static VALUE _wrap_FXToolBarTab_setActiveColor(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_FXToolBarTab, 1); arg2 = to_FXColor(argv[0]);
     (arg1)->setActiveColor(arg2); return Qnil; }
+static VALUE _wrap_FXToolBarTab_setTipText(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 0 ;
+    FXString *arg2 = 0 ; SwigValueWrapper<FXString > p2 ; if ((argc < 1) || (argc > 1))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToolBarTab, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
+    (arg1)->setTipText((FXString const &)*arg2); return Qnil; }
+static VALUE _wrap_FXToolBarTab_getTipText(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 0 ;
+    FXString *result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToolBarTab, 1); {
+        FXString const &_result_ref = ((FXToolBarTab const *)arg1)->getTipText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static void
 free_FXToolBarTab(FXToolBarTab *arg1) {
     delete arg1;
@@ -6343,6 +7199,11 @@ static VALUE _wrap_FXToolBarTab_setFocus(int argc, VALUE *argv, VALUE self) { FX
 static VALUE _wrap_FXToolBarTab_killFocus(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToolBarTab, 1); FXToolBarTab_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXToolBarTab_changeFocus(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 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_FXToolBarTab, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXToolBarTab_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXToolBarTab_setDefault(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 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_FXToolBarTab, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -6375,10 +7236,11 @@ static VALUE _wrap_FXToolBarTab_recalc(int argc, VALUE *argv, VALUE self) { FXTo
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToolBarTab, 1); FXToolBarTab_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXToolBarTab_reparent(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 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_FXToolBarTab, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXToolBarTab_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); FXToolBarTab_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXToolBarTab_show(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToolBarTab, 1); FXToolBarTab_show(arg1); return Qnil; }
@@ -6405,158 +7267,145 @@ static VALUE _wrap_FXToolBarTab_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_FXToolBarTab, 1); arg2 = to_FXColor(argv[0]);
     FXToolBarTab_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXToolBarTab_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 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_FXToolBarTab, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXToolBarTab_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXToolBarTab_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 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_FXToolBarTab, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXToolBarTab_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXToolBarTab_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 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_FXToolBarTab, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXToolBarTab_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXToolBarTab_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_FXToolBarTab, 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_FXToolBarTab_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_FXToolBarTab, 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_FXToolBarTab_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_FXToolBarTab, 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_FXToolBarTab_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXToolBarTab_setShape'"); return Qnil; }
+static VALUE _wrap_FXToolBarTab_clearShape(int argc, VALUE *argv, VALUE self) { FXToolBarTab *arg1 = (FXToolBarTab *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToolBarTab, 1); FXToolBarTab_clearShape(arg1); return Qnil; }
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static void *_p_FXToolBarTabTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXToolBarTab *) x));
+static void *_p_FXShellTo_p_FXComposite(void *x) {
+    return (void *)((FXComposite *)  ((FXShell *) x));
 }
-static void *_p_FXColorBarTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXColorBar *) x));
+static void *_p_FXRootWindowTo_p_FXComposite(void *x) {
+    return (void *)((FXComposite *)  ((FXRootWindow *) x));
 }
-static void *_p_FXBitmapFrameTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXBitmapFrame *) x));
+static void *_p_FXPopupTo_p_FXComposite(void *x) {
+    return (void *)((FXComposite *) (FXShell *) ((FXPopup *) x));
 }
-static void *_p_FXDialTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXDial *) x));
+static void *_p_FXTopWindowTo_p_FXComposite(void *x) {
+    return (void *)((FXComposite *) (FXShell *) ((FXTopWindow *) x));
 }
-static void *_p_FXRulerTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXRuler *) x));
+static void *_p_FXMainWindowTo_p_FXComposite(void *x) {
+    return (void *)((FXComposite *) (FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
 }
-static void *_p_FXArrowButtonTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXArrowButton *) x));
+static void *_p_FXSplashWindowTo_p_FXComposite(void *x) {
+    return (void *)((FXComposite *) (FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
 }
-static void *_p_FXColorWheelTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXColorWheel *) x));
+static void *_p_FXFrameTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *)  ((FXFrame *) x));
 }
-static void *_p_FXProgressBarTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXProgressBar *) x));
+static void *_p_FXToolBarTabTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXToolBarTab *) x));
 }
-static void *_p_FXColorWellTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXColorWell *) x));
+static void *_p_FXColorBarTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXColorBar *) x));
 }
-static void *_p_FXStatusLineTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXStatusLine *) x));
+static void *_p_FXPopupTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXComposite *)(FXShell *) ((FXPopup *) x));
 }
-static void *_p_FXVerticalSeparatorTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *) (FXSeparator *) ((FXVerticalSeparator *) x));
+static void *_p_FXBitmapFrameTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXBitmapFrame *) x));
 }
-static void *_p_FXHorizontalSeparatorTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *) (FXSeparator *) ((FXHorizontalSeparator *) x));
+static void *_p_FXDialTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXDial *) x));
 }
-static void *_p_FXSeparatorTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXSeparator *) x));
+static void *_p_FXRulerTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXRuler *) x));
 }
-static void *_p_FXTextFieldTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXTextField *) x));
+static void *_p_FXArrowButtonTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXArrowButton *) x));
 }
-static void *_p_FXHeaderTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXHeader *) x));
+static void *_p_FXSplashWindowTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXComposite *)(FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
 }
-static void *_p_FXImageFrameTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXImageFrame *) x));
+static void *_p_FXMainWindowTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXComposite *)(FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
 }
-static void *_p_FXSliderTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXSlider *) x));
+static void *_p_FXTopWindowTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXComposite *)(FXShell *) ((FXTopWindow *) x));
 }
-static void *_p_FXRealSliderTo_p_FXFrame(void *x) {
-    return (void *)((FXFrame *)  ((FXRealSlider *) x));
+static void *_p_FXRootWindowTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXComposite *) ((FXRootWindow *) x));
 }
-static void *_p_FXFrameTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *) ((FXFrame *) x));
+static void *_p_FXCompositeTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *)  ((FXComposite *) x));
 }
-static void *_p_FXToolBarTabTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXToolBarTab *) x));
+static void *_p_FXColorWheelTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXColorWheel *) x));
 }
-static void *_p_FXPopupTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *) ((FXPopup *) x));
-}
-static void *_p_FXColorBarTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXColorBar *) x));
-}
-static void *_p_FXBitmapFrameTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXBitmapFrame *) x));
-}
-static void *_p_FXDialTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXDial *) x));
-}
-static void *_p_FXRulerTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXRuler *) x));
-}
-static void *_p_FXMainWindowTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
-}
-static void *_p_FXTopWindowTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *) ((FXTopWindow *) x));
-}
-static void *_p_FXRootWindowTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *) ((FXRootWindow *) x));
-}
-static void *_p_FXWindowTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *) ((FXWindow *) x));
-}
-static void *_p_FXCompositeTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *) ((FXComposite *) x));
-}
-static void *_p_FXArrowButtonTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXArrowButton *) x));
-}
-static void *_p_FXColorWellTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXColorWell *) x));
-}
-static void *_p_FXColorWheelTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXColorWheel *) x));
-}
-static void *_p_FXProgressBarTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXProgressBar *) x));
-}
-static void *_p_FXShellTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *) ((FXShell *) x));
-}
-static void *_p_FXStatusLineTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXStatusLine *) x));
-}
-static void *_p_FXSeparatorTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXSeparator *) x));
+static void *_p_FXColorWellTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXColorWell *) x));
 }
-static void *_p_FXHorizontalSeparatorTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *)(FXSeparator *) ((FXHorizontalSeparator *) x));
+static void *_p_FXProgressBarTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXProgressBar *) x));
 }
-static void *_p_FXVerticalSeparatorTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *)(FXSeparator *) ((FXVerticalSeparator *) x));
+static void *_p_FXShellTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXComposite *) ((FXShell *) x));
 }
-static void *_p_FXGIFCursorTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXCursor *) ((FXGIFCursor *) x));
+static void *_p_FXStatusLineTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXStatusLine *) x));
 }
-static void *_p_FXCURCursorTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXCursor *) ((FXCURCursor *) x));
+static void *_p_FXSeparatorTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXSeparator *) x));
 }
-static void *_p_FXCursorTo_p_FXId(void *x) {
-    return (void *)((FXId *)  ((FXCursor *) x));
+static void *_p_FXHorizontalSeparatorTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *)(FXSeparator *) ((FXHorizontalSeparator *) x));
 }
-static void *_p_FXDrawableTo_p_FXId(void *x) {
-    return (void *)((FXId *)  ((FXDrawable *) x));
+static void *_p_FXVerticalSeparatorTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *)(FXSeparator *) ((FXVerticalSeparator *) x));
 }
-static void *_p_FXTextFieldTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXTextField *) x));
+static void *_p_FXTextFieldTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXTextField *) x));
 }
-static void *_p_FXFontTo_p_FXId(void *x) {
-    return (void *)((FXId *)  ((FXFont *) x));
+static void *_p_FXHeaderTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXHeader *) x));
 }
-static void *_p_FXHeaderTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXHeader *) x));
+static void *_p_FXImageFrameTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXImageFrame *) x));
 }
-static void *_p_FXVisualTo_p_FXId(void *x) {
-    return (void *)((FXId *)  ((FXVisual *) x));
+static void *_p_FXSliderTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXSlider *) x));
 }
-static void *_p_FXImageFrameTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXImageFrame *) x));
+static void *_p_FXRealSliderTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *) ((FXRealSlider *) x));
 }
-static void *_p_FXSliderTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXSlider *) x));
+static void *_p_FXHorizontalSeparatorTo_p_FXSeparator(void *x) {
+    return (void *)((FXSeparator *)  ((FXHorizontalSeparator *) x));
 }
-static void *_p_FXRealSliderTo_p_FXId(void *x) {
-    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXRealSlider *) x));
+static void *_p_FXVerticalSeparatorTo_p_FXSeparator(void *x) {
+    return (void *)((FXSeparator *)  ((FXVerticalSeparator *) x));
 }
 static void *_p_FXSettingsTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXDict *) ((FXSettings *) x));
@@ -6576,9 +7425,6 @@ static void *_p_FXTextFieldTo_p_FXObject(void *x) {
 static void *_p_FXArrowButtonTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *)(FXFrame *) ((FXArrowButton *) x));
 }
-static void *_p_FXIconDictTo_p_FXObject(void *x) {
-    return (void *)((FXObject *) (FXDict *) ((FXIconDict *) x));
-}
 static void *_p_FXShellTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *)(FXComposite *) ((FXShell *) x));
 }
@@ -6591,6 +7437,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));
 }
@@ -6699,108 +7548,6 @@ static void *_p_FXColorBarTo_p_FXObject(void *x) {
 static void *_p_FXAppTo_p_FXObject(void *x) {
     return (void *)((FXObject *)  ((FXApp *) x));
 }
-static void *_p_FXFrameTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *)  ((FXFrame *) x));
-}
-static void *_p_FXToolBarTabTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXToolBarTab *) x));
-}
-static void *_p_FXColorBarTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXColorBar *) x));
-}
-static void *_p_FXPopupTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXComposite *)(FXShell *) ((FXPopup *) x));
-}
-static void *_p_FXBitmapFrameTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXBitmapFrame *) x));
-}
-static void *_p_FXDialTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXDial *) x));
-}
-static void *_p_FXRulerTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXRuler *) x));
-}
-static void *_p_FXArrowButtonTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXArrowButton *) x));
-}
-static void *_p_FXMainWindowTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXComposite *)(FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
-}
-static void *_p_FXTopWindowTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXComposite *)(FXShell *) ((FXTopWindow *) x));
-}
-static void *_p_FXRootWindowTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXComposite *) ((FXRootWindow *) x));
-}
-static void *_p_FXCompositeTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *)  ((FXComposite *) x));
-}
-static void *_p_FXColorWheelTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXColorWheel *) x));
-}
-static void *_p_FXColorWellTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXColorWell *) x));
-}
-static void *_p_FXProgressBarTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXProgressBar *) x));
-}
-static void *_p_FXShellTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXComposite *) ((FXShell *) x));
-}
-static void *_p_FXStatusLineTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXStatusLine *) x));
-}
-static void *_p_FXSeparatorTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXSeparator *) x));
-}
-static void *_p_FXHorizontalSeparatorTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *)(FXSeparator *) ((FXHorizontalSeparator *) x));
-}
-static void *_p_FXVerticalSeparatorTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *)(FXSeparator *) ((FXVerticalSeparator *) x));
-}
-static void *_p_FXTextFieldTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXTextField *) x));
-}
-static void *_p_FXHeaderTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXHeader *) x));
-}
-static void *_p_FXImageFrameTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXImageFrame *) x));
-}
-static void *_p_FXSliderTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXSlider *) x));
-}
-static void *_p_FXRealSliderTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *) ((FXRealSlider *) x));
-}
-static void *_p_FXShellTo_p_FXComposite(void *x) {
-    return (void *)((FXComposite *)  ((FXShell *) x));
-}
-static void *_p_FXRootWindowTo_p_FXComposite(void *x) {
-    return (void *)((FXComposite *)  ((FXRootWindow *) x));
-}
-static void *_p_FXPopupTo_p_FXComposite(void *x) {
-    return (void *)((FXComposite *) (FXShell *) ((FXPopup *) x));
-}
-static void *_p_FXTopWindowTo_p_FXComposite(void *x) {
-    return (void *)((FXComposite *) (FXShell *) ((FXTopWindow *) x));
-}
-static void *_p_FXMainWindowTo_p_FXComposite(void *x) {
-    return (void *)((FXComposite *) (FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
-}
-static void *_p_FXHorizontalSeparatorTo_p_FXSeparator(void *x) {
-    return (void *)((FXSeparator *)  ((FXHorizontalSeparator *) x));
-}
-static void *_p_FXVerticalSeparatorTo_p_FXSeparator(void *x) {
-    return (void *)((FXSeparator *)  ((FXVerticalSeparator *) x));
-}
-static void *_p_FXFileStreamTo_p_FXStream(void *x) {
-    return (void *)((FXStream *)  ((FXFileStream *) x));
-}
-static void *_p_FXMemoryStreamTo_p_FXStream(void *x) {
-    return (void *)((FXStream *)  ((FXMemoryStream *) x));
-}
 static void *_p_FXFrameTo_p_FXDrawable(void *x) {
     return (void *)((FXDrawable *) (FXWindow *) ((FXFrame *) x));
 }
@@ -6825,6 +7572,9 @@ static void *_p_FXRulerTo_p_FXDrawable(void *x) {
 static void *_p_FXArrowButtonTo_p_FXDrawable(void *x) {
     return (void *)((FXDrawable *) (FXWindow *)(FXFrame *) ((FXArrowButton *) 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));
 }
@@ -6879,32 +7629,193 @@ static void *_p_FXSliderTo_p_FXDrawable(void *x) {
 static void *_p_FXRealSliderTo_p_FXDrawable(void *x) {
     return (void *)((FXDrawable *) (FXWindow *)(FXFrame *) ((FXRealSlider *) x));
 }
+static void *_p_FXFileStreamTo_p_FXStream(void *x) {
+    return (void *)((FXStream *)  ((FXFileStream *) x));
+}
+static void *_p_FXMemoryStreamTo_p_FXStream(void *x) {
+    return (void *)((FXStream *)  ((FXMemoryStream *) x));
+}
+static void *_p_FXFrameTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *) ((FXFrame *) x));
+}
+static void *_p_FXToolBarTabTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXToolBarTab *) x));
+}
+static void *_p_FXPopupTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *) ((FXPopup *) x));
+}
+static void *_p_FXColorBarTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXColorBar *) x));
+}
+static void *_p_FXBitmapFrameTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXBitmapFrame *) x));
+}
+static void *_p_FXDialTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXDial *) x));
+}
+static void *_p_FXRulerTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXRuler *) x));
+}
+static void *_p_FXMainWindowTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
+}
+static void *_p_FXTopWindowTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *) ((FXTopWindow *) x));
+}
+static void *_p_FXRootWindowTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *) ((FXRootWindow *) x));
+}
+static void *_p_FXWindowTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *) ((FXWindow *) 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_FXArrowButtonTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXArrowButton *) x));
+}
+static void *_p_FXColorWellTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXColorWell *) x));
+}
+static void *_p_FXColorWheelTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXColorWheel *) x));
+}
+static void *_p_FXProgressBarTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXProgressBar *) x));
+}
+static void *_p_FXShellTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *) ((FXShell *) x));
+}
+static void *_p_FXStatusLineTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXStatusLine *) x));
+}
+static void *_p_FXSeparatorTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXSeparator *) x));
+}
+static void *_p_FXHorizontalSeparatorTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *)(FXSeparator *) ((FXHorizontalSeparator *) x));
+}
+static void *_p_FXVerticalSeparatorTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *)(FXSeparator *) ((FXVerticalSeparator *) x));
+}
+static void *_p_FXGIFCursorTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXCursor *) ((FXGIFCursor *) x));
+}
+static void *_p_FXCURCursorTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXCursor *) ((FXCURCursor *) x));
+}
+static void *_p_FXCursorTo_p_FXId(void *x) {
+    return (void *)((FXId *)  ((FXCursor *) x));
+}
+static void *_p_FXDrawableTo_p_FXId(void *x) {
+    return (void *)((FXId *)  ((FXDrawable *) x));
+}
+static void *_p_FXTextFieldTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXTextField *) x));
+}
+static void *_p_FXFontTo_p_FXId(void *x) {
+    return (void *)((FXId *)  ((FXFont *) x));
+}
+static void *_p_FXHeaderTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXHeader *) x));
+}
+static void *_p_FXVisualTo_p_FXId(void *x) {
+    return (void *)((FXId *)  ((FXVisual *) x));
+}
+static void *_p_FXImageFrameTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXImageFrame *) x));
+}
+static void *_p_FXSliderTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXSlider *) x));
+}
+static void *_p_FXRealSliderTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXFrame *) ((FXRealSlider *) x));
+}
+static void *_p_FXToolBarTabTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXToolBarTab *) x));
+}
+static void *_p_FXColorBarTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXColorBar *) x));
+}
+static void *_p_FXBitmapFrameTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXBitmapFrame *) x));
+}
+static void *_p_FXDialTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXDial *) x));
+}
+static void *_p_FXRulerTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXRuler *) x));
+}
+static void *_p_FXArrowButtonTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXArrowButton *) x));
+}
+static void *_p_FXColorWheelTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXColorWheel *) x));
+}
+static void *_p_FXProgressBarTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXProgressBar *) x));
+}
+static void *_p_FXColorWellTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXColorWell *) x));
+}
+static void *_p_FXStatusLineTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXStatusLine *) x));
+}
+static void *_p_FXVerticalSeparatorTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *) (FXSeparator *) ((FXVerticalSeparator *) x));
+}
+static void *_p_FXHorizontalSeparatorTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *) (FXSeparator *) ((FXHorizontalSeparator *) x));
+}
+static void *_p_FXSeparatorTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXSeparator *) x));
+}
+static void *_p_FXTextFieldTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXTextField *) x));
+}
+static void *_p_FXHeaderTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXHeader *) x));
+}
+static void *_p_FXImageFrameTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXImageFrame *) x));
+}
+static void *_p_FXSliderTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXSlider *) x));
+}
+static void *_p_FXRealSliderTo_p_FXFrame(void *x) {
+    return (void *)((FXFrame *)  ((FXRealSlider *) x));
+}
 static swig_type_info _swigt__p_FXFrame[] = {{"_p_FXFrame", 0, "FXFrame *", 0, 0, 0, 0},{"_p_FXToolBarTab", _p_FXToolBarTabTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXFrame", 0, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXRuler", _p_FXRulerTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXStatusLine", _p_FXStatusLineTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXTextField", _p_FXTextFieldTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXHeader", _p_FXHeaderTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXSlider", _p_FXSliderTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_p_FXFrame, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXToolBarTab[] = {{"_p_FXToolBarTab", 0, "FXToolBarTab *", 0, 0, 0, 0},{"_p_FXToolBarTab", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXColorBar[] = {{"_p_FXColorBar", 0, "FXColorBar *", 0, 0, 0, 0},{"_p_FXColorBar", 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_FXDial", _p_FXDialTo_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_FXTextField", _p_FXTextFieldTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXId", _p_FXIdTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXIconDict", _p_FXIconDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_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_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_FXRuler", _p_FXRulerTo_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_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXStatusLine", _p_FXStatusLineTo_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_FXColorWheel", _p_FXColorWheelTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFileDict", _p_FXFileDictTo_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_FXProgressBar", _p_FXProgressBarTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXGIFCursor", _p_FXGIFCursorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXCursor", _p_FXCursorTo_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_FXHeader", _p_FXHeaderTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXApp", _p_FXAppTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXHeaderItem", _p_FXHeaderItemTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXToolBarTab", _p_FXToolBarTabTo_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_FXRealSlider", _p_FXRealSliderTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSlider", _p_FXSliderTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXVisual", _p_FXVisualTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_p_FXObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXObject[] = {{"_p_FXObject", 0, "FXObject *", 0, 0, 0, 0},{"_p_FXDict", _p_FXDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_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_FXTextField", _p_FXTextFieldTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXId", _p_FXIdTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_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_FXRootWindow", _p_FXRootWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRuler", _p_FXRulerTo_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_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXStatusLine", _p_FXStatusLineTo_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_FXColorWheel", _p_FXColorWheelTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFileDict", _p_FXFileDictTo_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_FXDrawable", _p_FXDrawableTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_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_FXHeader", _p_FXHeaderTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXApp", _p_FXAppTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXHeaderItem", _p_FXHeaderItemTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXToolBarTab", _p_FXToolBarTabTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFont", _p_FXFontTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSlider", _p_FXSliderTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXVisual", _p_FXVisualTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_p_FXObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXBitmapFrame[] = {{"_p_FXBitmapFrame", 0, "FXBitmapFrame *", 0, 0, 0, 0},{"_p_FXBitmapFrame", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXHeaderItem[] = {{"_p_FXHeaderItem", 0, "FXHeaderItem *", 0, 0, 0, 0},{"_p_FXHeaderItem", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXRuler[] = {{"_p_FXRuler", 0, "FXRuler *", 0, 0, 0, 0},{"_p_FXRuler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXArrowButton[] = {{"_p_FXArrowButton", 0, "FXArrowButton *", 0, 0, 0, 0},{"_p_FXArrowButton", 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_FXToolBarTab", _p_FXToolBarTabTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXRuler", _p_FXRulerTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXWindow", 0, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXStatusLine", _p_FXStatusLineTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXTextField", _p_FXTextFieldTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXHeader", _p_FXHeaderTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXSlider", _p_FXSliderTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_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_FXComposite", 0, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXColorWheel[] = {{"_p_FXColorWheel", 0, "FXColorWheel *", 0, 0, 0, 0},{"_p_FXColorWheel", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXColorWell[] = {{"_p_FXColorWell", 0, "FXColorWell *", 0, 0, 0, 0},{"_p_FXColorWell", 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_FXToolBarTab", _p_FXToolBarTabTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXRuler", _p_FXRulerTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXWindow", 0, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXStatusLine", _p_FXStatusLineTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXTextField", _p_FXTextFieldTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXHeader", _p_FXHeaderTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXSlider", _p_FXSliderTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_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_FXComposite", 0, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXComposite, 0, 0, 0, 0, 0},{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_FXColorWell[] = {{"_p_FXColorWell", 0, "FXColorWell *", 0, 0, 0, 0},{"_p_FXColorWell", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXColorWheel[] = {{"_p_FXColorWheel", 0, "FXColorWheel *", 0, 0, 0, 0},{"_p_FXColorWheel", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXProgressBar[] = {{"_p_FXProgressBar", 0, "FXProgressBar *", 0, 0, 0, 0},{"_p_FXProgressBar", 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_FXToolBarTab", _p_FXToolBarTabTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXRuler", _p_FXRulerTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_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_FXStatusLine", _p_FXStatusLineTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXTextField", _p_FXTextFieldTo_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_FXHeader", _p_FXHeaderTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXVisual", _p_FXVisualTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSlider", _p_FXSliderTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_p_FXId, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXId[] = {{"_p_FXId", 0, "FXId *", 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXTextField", _p_FXTextFieldTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXId", 0, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXRuler", _p_FXRulerTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXStatusLine", _p_FXStatusLineTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_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_FXProgressBar", _p_FXProgressBarTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXHeader", _p_FXHeaderTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXToolBarTab", _p_FXToolBarTabTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXFont", _p_FXFontTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXSlider", _p_FXSliderTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXVisual", _p_FXVisualTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_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_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_FXSeparator[] = {{"_p_FXSeparator", 0, "FXSeparator *", 0, 0, 0, 0},{"_p_FXSeparator", 0, 0, 0, 0, 0, 0},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXSeparator, 0, 0, 0, 0, 0},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXSeparator, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_p_FXchar[] = {{"_p_p_FXchar", 0, "char const **|FXchar const **", 0, 0, 0, 0},{"_p_p_FXchar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXHorizontalSeparator[] = {{"_p_FXHorizontalSeparator", 0, "FXHorizontalSeparator *", 0, 0, 0, 0},{"_p_FXHorizontalSeparator", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXVerticalSeparator[] = {{"_p_FXVerticalSeparator", 0, "FXVerticalSeparator *", 0, 0, 0, 0},{"_p_FXVerticalSeparator", 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_FXToolBarTab", _p_FXToolBarTabTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRuler", _p_FXRulerTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXStatusLine", _p_FXStatusLineTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDrawable", 0, 0, 0, 0, 0, 0},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSlider", _p_FXSliderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_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_FXToolBarTab", _p_FXToolBarTabTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRuler", _p_FXRulerTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSplashWindow", _p_FXSplashWindowTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXStatusLine", _p_FXStatusLineTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDrawable", 0, 0, 0, 0, 0, 0},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXSlider", _p_FXSliderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_p_FXDrawable, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXTextField[] = {{"_p_FXTextField", 0, "FXTextField *", 0, 0, 0, 0},{"_p_FXTextField", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXIcon[] = {{"_p_FXIcon", 0, "FXIcon *", 0, 0, 0, 0},{"_p_FXIcon", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXHeader[] = {{"_p_FXHeader", 0, "FXHeader *", 0, 0, 0, 0},{"_p_FXHeader", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXImageFrame[] = {{"_p_FXImageFrame", 0, "FXImageFrame *", 0, 0, 0, 0},{"_p_FXImageFrame", 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_FXSlider[] = {{"_p_FXSlider", 0, "FXSlider *", 0, 0, 0, 0},{"_p_FXSlider", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXRealSlider[] = {{"_p_FXRealSlider", 0, "FXRealSlider *", 0, 0, 0, 0},{"_p_FXRealSlider", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXImage[] = {{"_p_FXImage", 0, "FXImage *", 0, 0, 0, 0},{"_p_FXImage", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -6921,14 +7832,15 @@ _swigt__p_FXRuler,
 _swigt__p_FXArrowButton, 
 _swigt__p_FXWindow, 
 _swigt__p_FXComposite, 
-_swigt__p_FXColorWheel, 
-_swigt__p_FXColorWell, 
 _swigt__p_FXBitmap, 
+_swigt__p_FXColorWell, 
+_swigt__p_FXColorWheel, 
 _swigt__p_FXProgressBar, 
 _swigt__p_FXId, 
 _swigt__p_FXFont, 
 _swigt__p_FXStatusLine, 
 _swigt__p_FXSeparator, 
+_swigt__p_p_FXchar, 
 _swigt__p_FXHorizontalSeparator, 
 _swigt__p_FXVerticalSeparator, 
 _swigt__p_FXStream, 
@@ -6937,6 +7849,7 @@ _swigt__p_FXTextField,
 _swigt__p_FXIcon, 
 _swigt__p_FXHeader, 
 _swigt__p_FXImageFrame, 
+_swigt__p_FXRegion, 
 _swigt__p_FXSlider, 
 _swigt__p_FXRealSlider, 
 _swigt__p_FXImage, 
@@ -7026,6 +7939,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXArrowButton.klass, "canFocus", VALUEFUNC(_wrap_FXArrowButton_canFocus), -1);
     rb_define_method(cFXArrowButton.klass, "setFocus", VALUEFUNC(_wrap_FXArrowButton_setFocus), -1);
     rb_define_method(cFXArrowButton.klass, "killFocus", VALUEFUNC(_wrap_FXArrowButton_killFocus), -1);
+    rb_define_method(cFXArrowButton.klass, "changeFocus", VALUEFUNC(_wrap_FXArrowButton_changeFocus), -1);
     rb_define_method(cFXArrowButton.klass, "setDefault", VALUEFUNC(_wrap_FXArrowButton_setDefault), -1);
     rb_define_method(cFXArrowButton.klass, "enable", VALUEFUNC(_wrap_FXArrowButton_enable), -1);
     rb_define_method(cFXArrowButton.klass, "disable", VALUEFUNC(_wrap_FXArrowButton_disable), -1);
@@ -7042,6 +7956,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXArrowButton.klass, "contains", VALUEFUNC(_wrap_FXArrowButton_contains), -1);
     rb_define_method(cFXArrowButton.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXArrowButton_doesSaveUnder), -1);
     rb_define_method(cFXArrowButton.klass, "setBackColor", VALUEFUNC(_wrap_FXArrowButton_setBackColor), -1);
+    rb_define_method(cFXArrowButton.klass, "setShape", VALUEFUNC(_wrap_FXArrowButton_setShape), -1);
+    rb_define_method(cFXArrowButton.klass, "clearShape", VALUEFUNC(_wrap_FXArrowButton_clearShape), -1);
     cFXArrowButton.mark = (void (*)(void *)) FXRbArrowButton::markfunc;
     cFXArrowButton.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"COLORBAR_HORIZONTAL", INT2NUM(COLORBAR_HORIZONTAL));
@@ -7086,6 +8002,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXColorBar.klass, "canFocus", VALUEFUNC(_wrap_FXColorBar_canFocus), -1);
     rb_define_method(cFXColorBar.klass, "setFocus", VALUEFUNC(_wrap_FXColorBar_setFocus), -1);
     rb_define_method(cFXColorBar.klass, "killFocus", VALUEFUNC(_wrap_FXColorBar_killFocus), -1);
+    rb_define_method(cFXColorBar.klass, "changeFocus", VALUEFUNC(_wrap_FXColorBar_changeFocus), -1);
     rb_define_method(cFXColorBar.klass, "setDefault", VALUEFUNC(_wrap_FXColorBar_setDefault), -1);
     rb_define_method(cFXColorBar.klass, "enable", VALUEFUNC(_wrap_FXColorBar_enable), -1);
     rb_define_method(cFXColorBar.klass, "disable", VALUEFUNC(_wrap_FXColorBar_disable), -1);
@@ -7102,6 +8019,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXColorBar.klass, "contains", VALUEFUNC(_wrap_FXColorBar_contains), -1);
     rb_define_method(cFXColorBar.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXColorBar_doesSaveUnder), -1);
     rb_define_method(cFXColorBar.klass, "setBackColor", VALUEFUNC(_wrap_FXColorBar_setBackColor), -1);
+    rb_define_method(cFXColorBar.klass, "setShape", VALUEFUNC(_wrap_FXColorBar_setShape), -1);
+    rb_define_method(cFXColorBar.klass, "clearShape", VALUEFUNC(_wrap_FXColorBar_clearShape), -1);
     cFXColorBar.mark = (void (*)(void *)) FXRbColorBar::markfunc;
     cFXColorBar.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"COLORWELL_OPAQUEONLY", INT2NUM(COLORWELL_OPAQUEONLY));
@@ -7134,11 +8053,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXColorWell.klass, "onSelectionLost", VALUEFUNC(_wrap_FXColorWell_onSelectionLost), -1);
     rb_define_method(cFXColorWell.klass, "onSelectionGained", VALUEFUNC(_wrap_FXColorWell_onSelectionGained), -1);
     rb_define_method(cFXColorWell.klass, "onSelectionRequest", VALUEFUNC(_wrap_FXColorWell_onSelectionRequest), -1);
-    rb_define_method(cFXColorWell.klass, "onChanged", VALUEFUNC(_wrap_FXColorWell_onChanged), -1);
-    rb_define_method(cFXColorWell.klass, "onCommand", VALUEFUNC(_wrap_FXColorWell_onCommand), -1);
     rb_define_method(cFXColorWell.klass, "onClicked", VALUEFUNC(_wrap_FXColorWell_onClicked), -1);
     rb_define_method(cFXColorWell.klass, "onDoubleClicked", VALUEFUNC(_wrap_FXColorWell_onDoubleClicked), -1);
-    rb_define_method(cFXColorWell.klass, "onTripleClicked", VALUEFUNC(_wrap_FXColorWell_onTripleClicked), -1);
     rb_define_method(cFXColorWell.klass, "onCmdSetValue", VALUEFUNC(_wrap_FXColorWell_onCmdSetValue), -1);
     rb_define_method(cFXColorWell.klass, "onCmdSetIntValue", VALUEFUNC(_wrap_FXColorWell_onCmdSetIntValue), -1);
     rb_define_method(cFXColorWell.klass, "onCmdGetIntValue", VALUEFUNC(_wrap_FXColorWell_onCmdGetIntValue), -1);
@@ -7173,6 +8089,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXColorWell.klass, "canFocus", VALUEFUNC(_wrap_FXColorWell_canFocus), -1);
     rb_define_method(cFXColorWell.klass, "setFocus", VALUEFUNC(_wrap_FXColorWell_setFocus), -1);
     rb_define_method(cFXColorWell.klass, "killFocus", VALUEFUNC(_wrap_FXColorWell_killFocus), -1);
+    rb_define_method(cFXColorWell.klass, "changeFocus", VALUEFUNC(_wrap_FXColorWell_changeFocus), -1);
     rb_define_method(cFXColorWell.klass, "setDefault", VALUEFUNC(_wrap_FXColorWell_setDefault), -1);
     rb_define_method(cFXColorWell.klass, "enable", VALUEFUNC(_wrap_FXColorWell_enable), -1);
     rb_define_method(cFXColorWell.klass, "disable", VALUEFUNC(_wrap_FXColorWell_disable), -1);
@@ -7189,6 +8106,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXColorWell.klass, "contains", VALUEFUNC(_wrap_FXColorWell_contains), -1);
     rb_define_method(cFXColorWell.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXColorWell_doesSaveUnder), -1);
     rb_define_method(cFXColorWell.klass, "setBackColor", VALUEFUNC(_wrap_FXColorWell_setBackColor), -1);
+    rb_define_method(cFXColorWell.klass, "setShape", VALUEFUNC(_wrap_FXColorWell_setShape), -1);
+    rb_define_method(cFXColorWell.klass, "clearShape", VALUEFUNC(_wrap_FXColorWell_clearShape), -1);
     cFXColorWell.mark = (void (*)(void *)) FXRbColorWell::markfunc;
     cFXColorWell.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -7230,6 +8149,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXColorWheel.klass, "canFocus", VALUEFUNC(_wrap_FXColorWheel_canFocus), -1);
     rb_define_method(cFXColorWheel.klass, "setFocus", VALUEFUNC(_wrap_FXColorWheel_setFocus), -1);
     rb_define_method(cFXColorWheel.klass, "killFocus", VALUEFUNC(_wrap_FXColorWheel_killFocus), -1);
+    rb_define_method(cFXColorWheel.klass, "changeFocus", VALUEFUNC(_wrap_FXColorWheel_changeFocus), -1);
     rb_define_method(cFXColorWheel.klass, "setDefault", VALUEFUNC(_wrap_FXColorWheel_setDefault), -1);
     rb_define_method(cFXColorWheel.klass, "enable", VALUEFUNC(_wrap_FXColorWheel_enable), -1);
     rb_define_method(cFXColorWheel.klass, "disable", VALUEFUNC(_wrap_FXColorWheel_disable), -1);
@@ -7246,6 +8166,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXColorWheel.klass, "contains", VALUEFUNC(_wrap_FXColorWheel_contains), -1);
     rb_define_method(cFXColorWheel.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXColorWheel_doesSaveUnder), -1);
     rb_define_method(cFXColorWheel.klass, "setBackColor", VALUEFUNC(_wrap_FXColorWheel_setBackColor), -1);
+    rb_define_method(cFXColorWheel.klass, "setShape", VALUEFUNC(_wrap_FXColorWheel_setShape), -1);
+    rb_define_method(cFXColorWheel.klass, "clearShape", VALUEFUNC(_wrap_FXColorWheel_clearShape), -1);
     cFXColorWheel.mark = (void (*)(void *)) FXRbColorWheel::markfunc;
     cFXColorWheel.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"DIAL_VERTICAL", INT2NUM(DIAL_VERTICAL));
@@ -7310,6 +8232,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXDial.klass, "canFocus", VALUEFUNC(_wrap_FXDial_canFocus), -1);
     rb_define_method(cFXDial.klass, "setFocus", VALUEFUNC(_wrap_FXDial_setFocus), -1);
     rb_define_method(cFXDial.klass, "killFocus", VALUEFUNC(_wrap_FXDial_killFocus), -1);
+    rb_define_method(cFXDial.klass, "changeFocus", VALUEFUNC(_wrap_FXDial_changeFocus), -1);
     rb_define_method(cFXDial.klass, "setDefault", VALUEFUNC(_wrap_FXDial_setDefault), -1);
     rb_define_method(cFXDial.klass, "enable", VALUEFUNC(_wrap_FXDial_enable), -1);
     rb_define_method(cFXDial.klass, "disable", VALUEFUNC(_wrap_FXDial_disable), -1);
@@ -7326,18 +8249,25 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXDial.klass, "contains", VALUEFUNC(_wrap_FXDial_contains), -1);
     rb_define_method(cFXDial.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXDial_doesSaveUnder), -1);
     rb_define_method(cFXDial.klass, "setBackColor", VALUEFUNC(_wrap_FXDial_setBackColor), -1);
+    rb_define_method(cFXDial.klass, "setShape", VALUEFUNC(_wrap_FXDial_setShape), -1);
+    rb_define_method(cFXDial.klass, "clearShape", VALUEFUNC(_wrap_FXDial_clearShape), -1);
     cFXDial.mark = (void (*)(void *)) FXRbDial::markfunc;
     cFXDial.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"HEADER_BUTTON", INT2NUM(HEADER_BUTTON));
     rb_define_const(mFox,"HEADER_HORIZONTAL", INT2NUM(HEADER_HORIZONTAL));
     rb_define_const(mFox,"HEADER_VERTICAL", INT2NUM(HEADER_VERTICAL));
     rb_define_const(mFox,"HEADER_TRACKING", INT2NUM(HEADER_TRACKING));
+    rb_define_const(mFox,"HEADER_RESIZE", INT2NUM(HEADER_RESIZE));
     rb_define_const(mFox,"HEADER_NORMAL", INT2NUM(HEADER_NORMAL));
     
     cFXHeaderItem.klass = rb_define_class_under(mFox, "FXHeaderItem", ((swig_class *) SWIGTYPE_p_FXObject->clientdata)->klass);
     SWIG_TypeClientData(SWIGTYPE_p_FXHeaderItem, (void *) &cFXHeaderItem);
     rb_define_alloc_func(cFXHeaderItem.klass, _wrap_FXHeaderItem_allocate);
     rb_define_method(cFXHeaderItem.klass, "initialize", VALUEFUNC(_wrap_new_FXHeaderItem), -1);
+    rb_define_const(cFXHeaderItem.klass,"ARROW_NONE", INT2NUM(FXHeaderItem::ARROW_NONE));
+    rb_define_const(cFXHeaderItem.klass,"ARROW_UP", INT2NUM(FXHeaderItem::ARROW_UP));
+    rb_define_const(cFXHeaderItem.klass,"ARROW_DOWN", INT2NUM(FXHeaderItem::ARROW_DOWN));
+    rb_define_const(cFXHeaderItem.klass,"PRESSED", INT2NUM(FXHeaderItem::PRESSED));
     rb_define_const(cFXHeaderItem.klass,"RIGHT", INT2NUM(FXHeaderItem::RIGHT));
     rb_define_const(cFXHeaderItem.klass,"LEFT", INT2NUM(FXHeaderItem::LEFT));
     rb_define_const(cFXHeaderItem.klass,"CENTER_X", INT2NUM(FXHeaderItem::CENTER_X));
@@ -7395,6 +8325,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXHeader.klass, "getItem", VALUEFUNC(_wrap_FXHeader_getItem), -1);
     rb_define_method(cFXHeader.klass, "getItemAt", VALUEFUNC(_wrap_FXHeader_getItemAt), -1);
     rb_define_method(cFXHeader.klass, "setItem", VALUEFUNC(_wrap_FXHeader_setItem), -1);
+    rb_define_method(cFXHeader.klass, "fillItems", VALUEFUNC(_wrap_FXHeader_fillItems), -1);
     rb_define_method(cFXHeader.klass, "insertItem", VALUEFUNC(_wrap_FXHeader_insertItem), -1);
     rb_define_method(cFXHeader.klass, "appendItem", VALUEFUNC(_wrap_FXHeader_appendItem), -1);
     rb_define_method(cFXHeader.klass, "prependItem", VALUEFUNC(_wrap_FXHeader_prependItem), -1);
@@ -7440,6 +8371,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXHeader.klass, "canFocus", VALUEFUNC(_wrap_FXHeader_canFocus), -1);
     rb_define_method(cFXHeader.klass, "setFocus", VALUEFUNC(_wrap_FXHeader_setFocus), -1);
     rb_define_method(cFXHeader.klass, "killFocus", VALUEFUNC(_wrap_FXHeader_killFocus), -1);
+    rb_define_method(cFXHeader.klass, "changeFocus", VALUEFUNC(_wrap_FXHeader_changeFocus), -1);
     rb_define_method(cFXHeader.klass, "setDefault", VALUEFUNC(_wrap_FXHeader_setDefault), -1);
     rb_define_method(cFXHeader.klass, "enable", VALUEFUNC(_wrap_FXHeader_enable), -1);
     rb_define_method(cFXHeader.klass, "disable", VALUEFUNC(_wrap_FXHeader_disable), -1);
@@ -7456,6 +8388,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXHeader.klass, "contains", VALUEFUNC(_wrap_FXHeader_contains), -1);
     rb_define_method(cFXHeader.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXHeader_doesSaveUnder), -1);
     rb_define_method(cFXHeader.klass, "setBackColor", VALUEFUNC(_wrap_FXHeader_setBackColor), -1);
+    rb_define_method(cFXHeader.klass, "setShape", VALUEFUNC(_wrap_FXHeader_setShape), -1);
+    rb_define_method(cFXHeader.klass, "clearShape", VALUEFUNC(_wrap_FXHeader_clearShape), -1);
     cFXHeader.mark = (void (*)(void *)) FXRbHeader::markfunc;
     cFXHeader.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -7481,6 +8415,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXImageFrame.klass, "canFocus", VALUEFUNC(_wrap_FXImageFrame_canFocus), -1);
     rb_define_method(cFXImageFrame.klass, "setFocus", VALUEFUNC(_wrap_FXImageFrame_setFocus), -1);
     rb_define_method(cFXImageFrame.klass, "killFocus", VALUEFUNC(_wrap_FXImageFrame_killFocus), -1);
+    rb_define_method(cFXImageFrame.klass, "changeFocus", VALUEFUNC(_wrap_FXImageFrame_changeFocus), -1);
     rb_define_method(cFXImageFrame.klass, "setDefault", VALUEFUNC(_wrap_FXImageFrame_setDefault), -1);
     rb_define_method(cFXImageFrame.klass, "enable", VALUEFUNC(_wrap_FXImageFrame_enable), -1);
     rb_define_method(cFXImageFrame.klass, "disable", VALUEFUNC(_wrap_FXImageFrame_disable), -1);
@@ -7497,6 +8432,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXImageFrame.klass, "contains", VALUEFUNC(_wrap_FXImageFrame_contains), -1);
     rb_define_method(cFXImageFrame.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXImageFrame_doesSaveUnder), -1);
     rb_define_method(cFXImageFrame.klass, "setBackColor", VALUEFUNC(_wrap_FXImageFrame_setBackColor), -1);
+    rb_define_method(cFXImageFrame.klass, "setShape", VALUEFUNC(_wrap_FXImageFrame_setShape), -1);
+    rb_define_method(cFXImageFrame.klass, "clearShape", VALUEFUNC(_wrap_FXImageFrame_clearShape), -1);
     cFXImageFrame.mark = (void (*)(void *)) FXRbImageFrame::markfunc;
     cFXImageFrame.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -7526,6 +8463,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXBitmapFrame.klass, "canFocus", VALUEFUNC(_wrap_FXBitmapFrame_canFocus), -1);
     rb_define_method(cFXBitmapFrame.klass, "setFocus", VALUEFUNC(_wrap_FXBitmapFrame_setFocus), -1);
     rb_define_method(cFXBitmapFrame.klass, "killFocus", VALUEFUNC(_wrap_FXBitmapFrame_killFocus), -1);
+    rb_define_method(cFXBitmapFrame.klass, "changeFocus", VALUEFUNC(_wrap_FXBitmapFrame_changeFocus), -1);
     rb_define_method(cFXBitmapFrame.klass, "setDefault", VALUEFUNC(_wrap_FXBitmapFrame_setDefault), -1);
     rb_define_method(cFXBitmapFrame.klass, "enable", VALUEFUNC(_wrap_FXBitmapFrame_enable), -1);
     rb_define_method(cFXBitmapFrame.klass, "disable", VALUEFUNC(_wrap_FXBitmapFrame_disable), -1);
@@ -7542,6 +8480,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXBitmapFrame.klass, "contains", VALUEFUNC(_wrap_FXBitmapFrame_contains), -1);
     rb_define_method(cFXBitmapFrame.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXBitmapFrame_doesSaveUnder), -1);
     rb_define_method(cFXBitmapFrame.klass, "setBackColor", VALUEFUNC(_wrap_FXBitmapFrame_setBackColor), -1);
+    rb_define_method(cFXBitmapFrame.klass, "setShape", VALUEFUNC(_wrap_FXBitmapFrame_setShape), -1);
+    rb_define_method(cFXBitmapFrame.klass, "clearShape", VALUEFUNC(_wrap_FXBitmapFrame_clearShape), -1);
     cFXBitmapFrame.mark = (void (*)(void *)) FXRbBitmapFrame::markfunc;
     cFXBitmapFrame.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"PROGRESSBAR_HORIZONTAL", INT2NUM(PROGRESSBAR_HORIZONTAL));
@@ -7592,6 +8532,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXProgressBar.klass, "canFocus", VALUEFUNC(_wrap_FXProgressBar_canFocus), -1);
     rb_define_method(cFXProgressBar.klass, "setFocus", VALUEFUNC(_wrap_FXProgressBar_setFocus), -1);
     rb_define_method(cFXProgressBar.klass, "killFocus", VALUEFUNC(_wrap_FXProgressBar_killFocus), -1);
+    rb_define_method(cFXProgressBar.klass, "changeFocus", VALUEFUNC(_wrap_FXProgressBar_changeFocus), -1);
     rb_define_method(cFXProgressBar.klass, "setDefault", VALUEFUNC(_wrap_FXProgressBar_setDefault), -1);
     rb_define_method(cFXProgressBar.klass, "enable", VALUEFUNC(_wrap_FXProgressBar_enable), -1);
     rb_define_method(cFXProgressBar.klass, "disable", VALUEFUNC(_wrap_FXProgressBar_disable), -1);
@@ -7608,6 +8549,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXProgressBar.klass, "contains", VALUEFUNC(_wrap_FXProgressBar_contains), -1);
     rb_define_method(cFXProgressBar.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXProgressBar_doesSaveUnder), -1);
     rb_define_method(cFXProgressBar.klass, "setBackColor", VALUEFUNC(_wrap_FXProgressBar_setBackColor), -1);
+    rb_define_method(cFXProgressBar.klass, "setShape", VALUEFUNC(_wrap_FXProgressBar_setShape), -1);
+    rb_define_method(cFXProgressBar.klass, "clearShape", VALUEFUNC(_wrap_FXProgressBar_clearShape), -1);
     cFXProgressBar.mark = (void (*)(void *)) FXRbProgressBar::markfunc;
     cFXProgressBar.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"RULER_NORMAL", INT2NUM(RULER_NORMAL));
@@ -7644,6 +8587,32 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXRuler.klass, "onQueryTip", VALUEFUNC(_wrap_FXRuler_onQueryTip), -1);
     rb_define_const(cFXRuler.klass,"ID_ARROW", INT2NUM(FXRuler::ID_ARROW));
     rb_define_const(cFXRuler.klass,"ID_LAST", INT2NUM(FXRuler::ID_LAST));
+    rb_define_method(cFXRuler.klass, "setPosition", VALUEFUNC(_wrap_FXRuler_setPosition), -1);
+    rb_define_method(cFXRuler.klass, "getPosition", VALUEFUNC(_wrap_FXRuler_getPosition), -1);
+    rb_define_method(cFXRuler.klass, "setDocumentSize", VALUEFUNC(_wrap_FXRuler_setDocumentSize), -1);
+    rb_define_method(cFXRuler.klass, "getDocumentSize", VALUEFUNC(_wrap_FXRuler_getDocumentSize), -1);
+    rb_define_method(cFXRuler.klass, "setEdgeSpacing", VALUEFUNC(_wrap_FXRuler_setEdgeSpacing), -1);
+    rb_define_method(cFXRuler.klass, "getEdgeSpacing", VALUEFUNC(_wrap_FXRuler_getEdgeSpacing), -1);
+    rb_define_method(cFXRuler.klass, "setMarginLower", VALUEFUNC(_wrap_FXRuler_setMarginLower), -1);
+    rb_define_method(cFXRuler.klass, "getMarginLower", VALUEFUNC(_wrap_FXRuler_getMarginLower), -1);
+    rb_define_method(cFXRuler.klass, "setMarginUpper", VALUEFUNC(_wrap_FXRuler_setMarginUpper), -1);
+    rb_define_method(cFXRuler.klass, "getMarginUpper", VALUEFUNC(_wrap_FXRuler_getMarginUpper), -1);
+    rb_define_method(cFXRuler.klass, "setIndentFirst", VALUEFUNC(_wrap_FXRuler_setIndentFirst), -1);
+    rb_define_method(cFXRuler.klass, "getIndentFirst", VALUEFUNC(_wrap_FXRuler_getIndentFirst), -1);
+    rb_define_method(cFXRuler.klass, "setIndentLower", VALUEFUNC(_wrap_FXRuler_setIndentLower), -1);
+    rb_define_method(cFXRuler.klass, "getIndentLower", VALUEFUNC(_wrap_FXRuler_getIndentLower), -1);
+    rb_define_method(cFXRuler.klass, "setIndentUpper", VALUEFUNC(_wrap_FXRuler_setIndentUpper), -1);
+    rb_define_method(cFXRuler.klass, "getIndentUpper", VALUEFUNC(_wrap_FXRuler_getIndentUpper), -1);
+    rb_define_method(cFXRuler.klass, "setNumberTicks", VALUEFUNC(_wrap_FXRuler_setNumberTicks), -1);
+    rb_define_method(cFXRuler.klass, "getNumberTicks", VALUEFUNC(_wrap_FXRuler_getNumberTicks), -1);
+    rb_define_method(cFXRuler.klass, "setMajorTicks", VALUEFUNC(_wrap_FXRuler_setMajorTicks), -1);
+    rb_define_method(cFXRuler.klass, "getMajorTicks", VALUEFUNC(_wrap_FXRuler_getMajorTicks), -1);
+    rb_define_method(cFXRuler.klass, "setMediumTicks", VALUEFUNC(_wrap_FXRuler_setMediumTicks), -1);
+    rb_define_method(cFXRuler.klass, "getMediumTicks", VALUEFUNC(_wrap_FXRuler_getMediumTicks), -1);
+    rb_define_method(cFXRuler.klass, "setTinyTicks", VALUEFUNC(_wrap_FXRuler_setTinyTicks), -1);
+    rb_define_method(cFXRuler.klass, "getTinyTicks", VALUEFUNC(_wrap_FXRuler_getTinyTicks), -1);
+    rb_define_method(cFXRuler.klass, "setPixelPerTick", VALUEFUNC(_wrap_FXRuler_setPixelPerTick), -1);
+    rb_define_method(cFXRuler.klass, "getPixelPerTick", VALUEFUNC(_wrap_FXRuler_getPixelPerTick), -1);
     rb_define_method(cFXRuler.klass, "setFont", VALUEFUNC(_wrap_FXRuler_setFont), -1);
     rb_define_method(cFXRuler.klass, "getFont", VALUEFUNC(_wrap_FXRuler_getFont), -1);
     rb_define_method(cFXRuler.klass, "setValue", VALUEFUNC(_wrap_FXRuler_setValue), -1);
@@ -7669,6 +8638,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXRuler.klass, "canFocus", VALUEFUNC(_wrap_FXRuler_canFocus), -1);
     rb_define_method(cFXRuler.klass, "setFocus", VALUEFUNC(_wrap_FXRuler_setFocus), -1);
     rb_define_method(cFXRuler.klass, "killFocus", VALUEFUNC(_wrap_FXRuler_killFocus), -1);
+    rb_define_method(cFXRuler.klass, "changeFocus", VALUEFUNC(_wrap_FXRuler_changeFocus), -1);
     rb_define_method(cFXRuler.klass, "setDefault", VALUEFUNC(_wrap_FXRuler_setDefault), -1);
     rb_define_method(cFXRuler.klass, "enable", VALUEFUNC(_wrap_FXRuler_enable), -1);
     rb_define_method(cFXRuler.klass, "disable", VALUEFUNC(_wrap_FXRuler_disable), -1);
@@ -7685,6 +8655,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXRuler.klass, "contains", VALUEFUNC(_wrap_FXRuler_contains), -1);
     rb_define_method(cFXRuler.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXRuler_doesSaveUnder), -1);
     rb_define_method(cFXRuler.klass, "setBackColor", VALUEFUNC(_wrap_FXRuler_setBackColor), -1);
+    rb_define_method(cFXRuler.klass, "setShape", VALUEFUNC(_wrap_FXRuler_setShape), -1);
+    rb_define_method(cFXRuler.klass, "clearShape", VALUEFUNC(_wrap_FXRuler_clearShape), -1);
     cFXRuler.mark = (void (*)(void *)) FXRbRuler::markfunc;
     cFXRuler.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"SEPARATOR_NONE", INT2NUM(SEPARATOR_NONE));
@@ -7712,6 +8684,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXSeparator.klass, "canFocus", VALUEFUNC(_wrap_FXSeparator_canFocus), -1);
     rb_define_method(cFXSeparator.klass, "setFocus", VALUEFUNC(_wrap_FXSeparator_setFocus), -1);
     rb_define_method(cFXSeparator.klass, "killFocus", VALUEFUNC(_wrap_FXSeparator_killFocus), -1);
+    rb_define_method(cFXSeparator.klass, "changeFocus", VALUEFUNC(_wrap_FXSeparator_changeFocus), -1);
     rb_define_method(cFXSeparator.klass, "setDefault", VALUEFUNC(_wrap_FXSeparator_setDefault), -1);
     rb_define_method(cFXSeparator.klass, "enable", VALUEFUNC(_wrap_FXSeparator_enable), -1);
     rb_define_method(cFXSeparator.klass, "disable", VALUEFUNC(_wrap_FXSeparator_disable), -1);
@@ -7728,6 +8701,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXSeparator.klass, "contains", VALUEFUNC(_wrap_FXSeparator_contains), -1);
     rb_define_method(cFXSeparator.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXSeparator_doesSaveUnder), -1);
     rb_define_method(cFXSeparator.klass, "setBackColor", VALUEFUNC(_wrap_FXSeparator_setBackColor), -1);
+    rb_define_method(cFXSeparator.klass, "setShape", VALUEFUNC(_wrap_FXSeparator_setShape), -1);
+    rb_define_method(cFXSeparator.klass, "clearShape", VALUEFUNC(_wrap_FXSeparator_clearShape), -1);
     cFXSeparator.mark = 0;
     cFXSeparator.destroy = (void (*)(void *)) free_FXSeparator;
     
@@ -7748,6 +8723,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXHorizontalSeparator.klass, "canFocus", VALUEFUNC(_wrap_FXHorizontalSeparator_canFocus), -1);
     rb_define_method(cFXHorizontalSeparator.klass, "setFocus", VALUEFUNC(_wrap_FXHorizontalSeparator_setFocus), -1);
     rb_define_method(cFXHorizontalSeparator.klass, "killFocus", VALUEFUNC(_wrap_FXHorizontalSeparator_killFocus), -1);
+    rb_define_method(cFXHorizontalSeparator.klass, "changeFocus", VALUEFUNC(_wrap_FXHorizontalSeparator_changeFocus), -1);
     rb_define_method(cFXHorizontalSeparator.klass, "setDefault", VALUEFUNC(_wrap_FXHorizontalSeparator_setDefault), -1);
     rb_define_method(cFXHorizontalSeparator.klass, "enable", VALUEFUNC(_wrap_FXHorizontalSeparator_enable), -1);
     rb_define_method(cFXHorizontalSeparator.klass, "disable", VALUEFUNC(_wrap_FXHorizontalSeparator_disable), -1);
@@ -7764,6 +8740,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXHorizontalSeparator.klass, "contains", VALUEFUNC(_wrap_FXHorizontalSeparator_contains), -1);
     rb_define_method(cFXHorizontalSeparator.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXHorizontalSeparator_doesSaveUnder), -1);
     rb_define_method(cFXHorizontalSeparator.klass, "setBackColor", VALUEFUNC(_wrap_FXHorizontalSeparator_setBackColor), -1);
+    rb_define_method(cFXHorizontalSeparator.klass, "setShape", VALUEFUNC(_wrap_FXHorizontalSeparator_setShape), -1);
+    rb_define_method(cFXHorizontalSeparator.klass, "clearShape", VALUEFUNC(_wrap_FXHorizontalSeparator_clearShape), -1);
     cFXHorizontalSeparator.mark = (void (*)(void *)) FXRbHorizontalSeparator::markfunc;
     cFXHorizontalSeparator.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -7784,6 +8762,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXVerticalSeparator.klass, "canFocus", VALUEFUNC(_wrap_FXVerticalSeparator_canFocus), -1);
     rb_define_method(cFXVerticalSeparator.klass, "setFocus", VALUEFUNC(_wrap_FXVerticalSeparator_setFocus), -1);
     rb_define_method(cFXVerticalSeparator.klass, "killFocus", VALUEFUNC(_wrap_FXVerticalSeparator_killFocus), -1);
+    rb_define_method(cFXVerticalSeparator.klass, "changeFocus", VALUEFUNC(_wrap_FXVerticalSeparator_changeFocus), -1);
     rb_define_method(cFXVerticalSeparator.klass, "setDefault", VALUEFUNC(_wrap_FXVerticalSeparator_setDefault), -1);
     rb_define_method(cFXVerticalSeparator.klass, "enable", VALUEFUNC(_wrap_FXVerticalSeparator_enable), -1);
     rb_define_method(cFXVerticalSeparator.klass, "disable", VALUEFUNC(_wrap_FXVerticalSeparator_disable), -1);
@@ -7800,6 +8779,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXVerticalSeparator.klass, "contains", VALUEFUNC(_wrap_FXVerticalSeparator_contains), -1);
     rb_define_method(cFXVerticalSeparator.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXVerticalSeparator_doesSaveUnder), -1);
     rb_define_method(cFXVerticalSeparator.klass, "setBackColor", VALUEFUNC(_wrap_FXVerticalSeparator_setBackColor), -1);
+    rb_define_method(cFXVerticalSeparator.klass, "setShape", VALUEFUNC(_wrap_FXVerticalSeparator_setShape), -1);
+    rb_define_method(cFXVerticalSeparator.klass, "clearShape", VALUEFUNC(_wrap_FXVerticalSeparator_clearShape), -1);
     cFXVerticalSeparator.mark = (void (*)(void *)) FXRbVerticalSeparator::markfunc;
     cFXVerticalSeparator.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"SLIDER_HORIZONTAL", INT2NUM(SLIDER_HORIZONTAL));
@@ -7878,6 +8859,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXSlider.klass, "canFocus", VALUEFUNC(_wrap_FXSlider_canFocus), -1);
     rb_define_method(cFXSlider.klass, "setFocus", VALUEFUNC(_wrap_FXSlider_setFocus), -1);
     rb_define_method(cFXSlider.klass, "killFocus", VALUEFUNC(_wrap_FXSlider_killFocus), -1);
+    rb_define_method(cFXSlider.klass, "changeFocus", VALUEFUNC(_wrap_FXSlider_changeFocus), -1);
     rb_define_method(cFXSlider.klass, "setDefault", VALUEFUNC(_wrap_FXSlider_setDefault), -1);
     rb_define_method(cFXSlider.klass, "enable", VALUEFUNC(_wrap_FXSlider_enable), -1);
     rb_define_method(cFXSlider.klass, "disable", VALUEFUNC(_wrap_FXSlider_disable), -1);
@@ -7894,6 +8876,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXSlider.klass, "contains", VALUEFUNC(_wrap_FXSlider_contains), -1);
     rb_define_method(cFXSlider.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXSlider_doesSaveUnder), -1);
     rb_define_method(cFXSlider.klass, "setBackColor", VALUEFUNC(_wrap_FXSlider_setBackColor), -1);
+    rb_define_method(cFXSlider.klass, "setShape", VALUEFUNC(_wrap_FXSlider_setShape), -1);
+    rb_define_method(cFXSlider.klass, "clearShape", VALUEFUNC(_wrap_FXSlider_clearShape), -1);
     cFXSlider.mark = (void (*)(void *)) FXRbSlider::markfunc;
     cFXSlider.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"REALSLIDER_HORIZONTAL", INT2NUM(REALSLIDER_HORIZONTAL));
@@ -7972,6 +8956,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXRealSlider.klass, "canFocus", VALUEFUNC(_wrap_FXRealSlider_canFocus), -1);
     rb_define_method(cFXRealSlider.klass, "setFocus", VALUEFUNC(_wrap_FXRealSlider_setFocus), -1);
     rb_define_method(cFXRealSlider.klass, "killFocus", VALUEFUNC(_wrap_FXRealSlider_killFocus), -1);
+    rb_define_method(cFXRealSlider.klass, "changeFocus", VALUEFUNC(_wrap_FXRealSlider_changeFocus), -1);
     rb_define_method(cFXRealSlider.klass, "setDefault", VALUEFUNC(_wrap_FXRealSlider_setDefault), -1);
     rb_define_method(cFXRealSlider.klass, "enable", VALUEFUNC(_wrap_FXRealSlider_enable), -1);
     rb_define_method(cFXRealSlider.klass, "disable", VALUEFUNC(_wrap_FXRealSlider_disable), -1);
@@ -7988,6 +8973,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXRealSlider.klass, "contains", VALUEFUNC(_wrap_FXRealSlider_contains), -1);
     rb_define_method(cFXRealSlider.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXRealSlider_doesSaveUnder), -1);
     rb_define_method(cFXRealSlider.klass, "setBackColor", VALUEFUNC(_wrap_FXRealSlider_setBackColor), -1);
+    rb_define_method(cFXRealSlider.klass, "setShape", VALUEFUNC(_wrap_FXRealSlider_setShape), -1);
+    rb_define_method(cFXRealSlider.klass, "clearShape", VALUEFUNC(_wrap_FXRealSlider_clearShape), -1);
     cFXRealSlider.mark = (void (*)(void *)) FXRbRealSlider::markfunc;
     cFXRealSlider.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -8022,6 +9009,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXStatusLine.klass, "canFocus", VALUEFUNC(_wrap_FXStatusLine_canFocus), -1);
     rb_define_method(cFXStatusLine.klass, "setFocus", VALUEFUNC(_wrap_FXStatusLine_setFocus), -1);
     rb_define_method(cFXStatusLine.klass, "killFocus", VALUEFUNC(_wrap_FXStatusLine_killFocus), -1);
+    rb_define_method(cFXStatusLine.klass, "changeFocus", VALUEFUNC(_wrap_FXStatusLine_changeFocus), -1);
     rb_define_method(cFXStatusLine.klass, "setDefault", VALUEFUNC(_wrap_FXStatusLine_setDefault), -1);
     rb_define_method(cFXStatusLine.klass, "enable", VALUEFUNC(_wrap_FXStatusLine_enable), -1);
     rb_define_method(cFXStatusLine.klass, "disable", VALUEFUNC(_wrap_FXStatusLine_disable), -1);
@@ -8038,6 +9026,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXStatusLine.klass, "contains", VALUEFUNC(_wrap_FXStatusLine_contains), -1);
     rb_define_method(cFXStatusLine.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXStatusLine_doesSaveUnder), -1);
     rb_define_method(cFXStatusLine.klass, "setBackColor", VALUEFUNC(_wrap_FXStatusLine_setBackColor), -1);
+    rb_define_method(cFXStatusLine.klass, "setShape", VALUEFUNC(_wrap_FXStatusLine_setShape), -1);
+    rb_define_method(cFXStatusLine.klass, "clearShape", VALUEFUNC(_wrap_FXStatusLine_clearShape), -1);
     cFXStatusLine.mark = (void (*)(void *)) FXRbStatusLine::markfunc;
     cFXStatusLine.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"TEXTFIELD_PASSWD", INT2NUM(TEXTFIELD_PASSWD));
@@ -8192,6 +9182,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXTextField.klass, "canFocus", VALUEFUNC(_wrap_FXTextField_canFocus), -1);
     rb_define_method(cFXTextField.klass, "setFocus", VALUEFUNC(_wrap_FXTextField_setFocus), -1);
     rb_define_method(cFXTextField.klass, "killFocus", VALUEFUNC(_wrap_FXTextField_killFocus), -1);
+    rb_define_method(cFXTextField.klass, "changeFocus", VALUEFUNC(_wrap_FXTextField_changeFocus), -1);
     rb_define_method(cFXTextField.klass, "setDefault", VALUEFUNC(_wrap_FXTextField_setDefault), -1);
     rb_define_method(cFXTextField.klass, "enable", VALUEFUNC(_wrap_FXTextField_enable), -1);
     rb_define_method(cFXTextField.klass, "disable", VALUEFUNC(_wrap_FXTextField_disable), -1);
@@ -8208,6 +9199,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXTextField.klass, "contains", VALUEFUNC(_wrap_FXTextField_contains), -1);
     rb_define_method(cFXTextField.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXTextField_doesSaveUnder), -1);
     rb_define_method(cFXTextField.klass, "setBackColor", VALUEFUNC(_wrap_FXTextField_setBackColor), -1);
+    rb_define_method(cFXTextField.klass, "setShape", VALUEFUNC(_wrap_FXTextField_setShape), -1);
+    rb_define_method(cFXTextField.klass, "clearShape", VALUEFUNC(_wrap_FXTextField_clearShape), -1);
     cFXTextField.mark = (void (*)(void *)) FXRbTextField::markfunc;
     cFXTextField.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"TOOLBARTAB_HORIZONTAL", INT2NUM(TOOLBARTAB_HORIZONTAL));
@@ -8230,6 +9223,9 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXToolBarTab.klass, "onUpdCollapse", VALUEFUNC(_wrap_FXToolBarTab_onUpdCollapse), -1);
     rb_define_method(cFXToolBarTab.klass, "onCmdUncollapse", VALUEFUNC(_wrap_FXToolBarTab_onCmdUncollapse), -1);
     rb_define_method(cFXToolBarTab.klass, "onUpdUncollapse", VALUEFUNC(_wrap_FXToolBarTab_onUpdUncollapse), -1);
+    rb_define_method(cFXToolBarTab.klass, "onCmdSetTip", VALUEFUNC(_wrap_FXToolBarTab_onCmdSetTip), -1);
+    rb_define_method(cFXToolBarTab.klass, "onCmdGetTip", VALUEFUNC(_wrap_FXToolBarTab_onCmdGetTip), -1);
+    rb_define_method(cFXToolBarTab.klass, "onQueryTip", VALUEFUNC(_wrap_FXToolBarTab_onQueryTip), -1);
     rb_define_const(cFXToolBarTab.klass,"ID_COLLAPSE", INT2NUM(FXToolBarTab::ID_COLLAPSE));
     rb_define_const(cFXToolBarTab.klass,"ID_UNCOLLAPSE", INT2NUM(FXToolBarTab::ID_UNCOLLAPSE));
     rb_define_const(cFXToolBarTab.klass,"ID_LAST", INT2NUM(FXToolBarTab::ID_LAST));
@@ -8239,6 +9235,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXToolBarTab.klass, "getTabStyle", VALUEFUNC(_wrap_FXToolBarTab_getTabStyle), -1);
     rb_define_method(cFXToolBarTab.klass, "getActiveColor", VALUEFUNC(_wrap_FXToolBarTab_getActiveColor), -1);
     rb_define_method(cFXToolBarTab.klass, "setActiveColor", VALUEFUNC(_wrap_FXToolBarTab_setActiveColor), -1);
+    rb_define_method(cFXToolBarTab.klass, "setTipText", VALUEFUNC(_wrap_FXToolBarTab_setTipText), -1);
+    rb_define_method(cFXToolBarTab.klass, "getTipText", VALUEFUNC(_wrap_FXToolBarTab_getTipText), -1);
     rb_define_method(cFXToolBarTab.klass, "save", VALUEFUNC(_wrap_FXToolBarTab_save), -1);
     rb_define_method(cFXToolBarTab.klass, "load", VALUEFUNC(_wrap_FXToolBarTab_load), -1);
     rb_define_method(cFXToolBarTab.klass, "create", VALUEFUNC(_wrap_FXToolBarTab_create), -1);
@@ -8252,6 +9250,7 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXToolBarTab.klass, "canFocus", VALUEFUNC(_wrap_FXToolBarTab_canFocus), -1);
     rb_define_method(cFXToolBarTab.klass, "setFocus", VALUEFUNC(_wrap_FXToolBarTab_setFocus), -1);
     rb_define_method(cFXToolBarTab.klass, "killFocus", VALUEFUNC(_wrap_FXToolBarTab_killFocus), -1);
+    rb_define_method(cFXToolBarTab.klass, "changeFocus", VALUEFUNC(_wrap_FXToolBarTab_changeFocus), -1);
     rb_define_method(cFXToolBarTab.klass, "setDefault", VALUEFUNC(_wrap_FXToolBarTab_setDefault), -1);
     rb_define_method(cFXToolBarTab.klass, "enable", VALUEFUNC(_wrap_FXToolBarTab_enable), -1);
     rb_define_method(cFXToolBarTab.klass, "disable", VALUEFUNC(_wrap_FXToolBarTab_disable), -1);
@@ -8268,6 +9267,8 @@ SWIGEXPORT(void) Init_frames(void) {
     rb_define_method(cFXToolBarTab.klass, "contains", VALUEFUNC(_wrap_FXToolBarTab_contains), -1);
     rb_define_method(cFXToolBarTab.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXToolBarTab_doesSaveUnder), -1);
     rb_define_method(cFXToolBarTab.klass, "setBackColor", VALUEFUNC(_wrap_FXToolBarTab_setBackColor), -1);
+    rb_define_method(cFXToolBarTab.klass, "setShape", VALUEFUNC(_wrap_FXToolBarTab_setShape), -1);
+    rb_define_method(cFXToolBarTab.klass, "clearShape", VALUEFUNC(_wrap_FXToolBarTab_clearShape), -1);
     cFXToolBarTab.mark = (void (*)(void *)) FXRbToolBarTab::markfunc;
     cFXToolBarTab.destroy = (void (*)(void *)) FXRbObject::freefunc;
 }