fxruby 1.2.6 → 1.4.0

data/ext/{fox12 → fox14}/include/FXRbXPMImage.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbXPMImage.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbXPMImage.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBXPMIMAGE_H

data/ext/{fox12 → fox14}/include/FXRuby.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRuby.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRuby.h,v 1.5 2005/08/19 02:08:05 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRUBY_H
@@ -150,6 +150,10 @@ FXint FXRbSignalNameToNumber(const char* name);
 extern VALUE mFox;
 
 // Convert from FOX datatypes to Ruby objects
+inline VALUE to_ruby(const void* ptr){
+  return Qnil; // FIXME: Used for some FXIconSource methods
+  }
+
 inline VALUE to_ruby(FXchar c){
   return INT2NUM(c);
   }
@@ -182,6 +186,14 @@ inline VALUE to_ruby(FXdouble d){
   return rb_float_new(d);
   }
 
+inline VALUE to_ruby(FXlong x){
+  return LONG2NUM(x);
+  }
+
+inline VALUE to_ruby(FXulong x){
+  return ULONG2NUM(x);
+  }
+
 inline VALUE to_ruby(unsigned long l){
   return UINT2NUM(l);
   }
@@ -284,14 +296,14 @@ void FXRbCallVoidMethod(FXObject* recv,ID func);
 
 void FXRbCallVoidMethod(FXDC* recv,ID func);
 
+/* One argument */
 template<class TYPE>
-void FXRbCallVoidMethod(FXObject* recv,ID func, TYPE arg){
+void FXRbCallVoidMethod(FXObject* recv,ID func, TYPE& arg){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   rb_funcall(obj,func,1,to_ruby(arg));
   }
 
-/* One argument */
 template<class TYPE>
 void FXRbCallVoidMethod(FXDC* recv,ID func,TYPE arg){
   VALUE obj=FXRbGetRubyObj(recv,false);
@@ -300,7 +312,7 @@ void FXRbCallVoidMethod(FXDC* recv,ID func,TYPE arg){
   }
  
 template<class TYPE>
-void FXRbCallVoidMethod(const FXObject* recv, ID func, TYPE arg){
+void FXRbCallVoidMethod(const FXObject* recv, ID func, TYPE& arg){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   rb_funcall(obj,func,1,to_ruby(arg));
@@ -321,6 +333,9 @@ void FXRbCallVoidMethod(FXDC* recv,ID func,TYPE1 arg1,TYPE2 arg2){
   rb_funcall(obj,func,2,to_ruby(arg1),to_ruby(arg2));
   }
 
+FXTreeItem* FXRbCallTreeItemMethod(const FXTreeList* recv,ID func,FXint x,FXint y);
+FXFoldingItem* FXRbCallFoldingItemMethod(const FXFoldingList* recv,ID func,FXint x,FXint y);
+
 /* Three arguments */
 template<class TYPE1, class TYPE2, class TYPE3>
 void FXRbCallVoidMethod(FXObject* recv,ID func,TYPE1 arg1,TYPE2 arg2,TYPE3 arg3){
@@ -418,7 +433,7 @@ FXbool FXRbCallBoolMethod(FXStream* recv,ID func,TYPE1 arg1,TYPE2 arg2){
 FXbool FXRbCallBoolMethod(const FXObject* recv,ID func);
 
 template<class TYPE>
-FXbool FXRbCallBoolMethod(FXObject* recv, ID func, TYPE arg){
+FXbool FXRbCallBoolMethod(FXObject* recv, ID func, TYPE& arg){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   VALUE v=rb_funcall(obj,func,1,to_ruby(arg));
@@ -426,7 +441,7 @@ FXbool FXRbCallBoolMethod(FXObject* recv, ID func, TYPE arg){
   }
 
 template<class TYPE>
-FXbool FXRbCallBoolMethod(const FXObject* recv,ID func,TYPE arg){
+FXbool FXRbCallBoolMethod(const FXObject* recv,ID func,TYPE& arg){
   VALUE v=rb_funcall(FXRbGetRubyObj(recv,false),func,1,to_ruby(arg));
   return (v==Qtrue)?TRUE:FALSE;
   }
@@ -474,6 +489,14 @@ FXint FXRbCallIntMethod(const FXObject* recv, ID func, TYPE arg){
   return static_cast<FXint>(NUM2INT(v));
   }
 
+template<class TYPE1, class TYPE2>
+FXint FXRbCallIntMethod(const FXObject* recv, ID func, TYPE1 arg1, TYPE2 arg2){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  VALUE result=rb_funcall(obj,func,2,to_ruby(arg1),to_ruby(arg2));
+  return static_cast<FXint>(NUM2INT(result));
+  }
+
 template<class TYPE1, class TYPE2, class TYPE3, class TYPE4, class TYPE5>
 FXint FXRbCallIntMethod(const FXObject* recv, ID func, TYPE1 arg1, TYPE2 arg2, TYPE3 arg3, TYPE4 arg4, TYPE5 arg5){
   VALUE obj=FXRbGetRubyObj(recv,false);
@@ -500,6 +523,8 @@ FXuint FXRbCallUIntMethod(FXObject* recv, ID func, TYPE arg){
   return static_cast<FXuint>(NUM2UINT(v));
   }
 
+// Call functions with FXString return value
+FXString FXRbCallStringMethod(const FXObject* recv, ID func);
 
 
 // Call functions with "FXGLObject*" return value
@@ -516,6 +541,44 @@ FXTableItem* FXRbCallTableItemMethod(FXTable* recv,ID func,const FXString& text,
 // Call functions with "FXFileAssoc*" return value
 FXFileAssoc* FXRbCallFileAssocMethod(const FXFileDict* recv,ID func,const FXchar* pathname);
 
+// Call functions with "FXIcon*" return value
+FXIcon* FXRbCallIconMethod(const FXTableItem* recv,ID func);
+
+template<class TYPE1, class TYPE2>
+FXIcon* FXRbCallIconMethod(const FXIconSource *recv,ID func,TYPE1& arg1,const TYPE2& arg2){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  VALUE result=rb_funcall(obj,func,2,to_ruby(arg1),to_ruby(arg2));
+  return NIL_P(result) ? 0 : reinterpret_cast<FXIcon*>(DATA_PTR(result));
+  }
+
+template<class TYPE1, class TYPE2, class TYPE3, class TYPE4>
+FXIcon* FXRbCallIconMethod(const FXIconSource *recv,ID func,TYPE1& arg1,TYPE2 arg2,TYPE3 arg3,const TYPE4& arg4){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  VALUE result=rb_funcall(obj,func,4,to_ruby(arg1),to_ruby(arg2),to_ruby(arg3),to_ruby(arg4));
+  return NIL_P(result) ? 0 : reinterpret_cast<FXIcon*>(DATA_PTR(result));
+  }
+
+// Call functions with FXImage* return value
+template<class TYPE1, class TYPE2>
+FXImage* FXRbCallImageMethod(const FXIconSource *recv,ID func,TYPE1& arg1,const TYPE2& arg2){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  VALUE result=rb_funcall(obj,func,2,to_ruby(arg1),to_ruby(arg2));
+  return NIL_P(result) ? 0 : reinterpret_cast<FXImage*>(DATA_PTR(result));
+  }
+
+template<class TYPE1, class TYPE2, class TYPE3, class TYPE4>
+FXImage* FXRbCallImageMethod(const FXIconSource *recv,ID func,TYPE1& arg1,TYPE2 arg2,TYPE3 arg3,const TYPE4& arg4){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  VALUE result=rb_funcall(obj,func,4,to_ruby(arg1),to_ruby(arg2),to_ruby(arg3),to_ruby(arg4));
+  return NIL_P(result) ? 0 : reinterpret_cast<FXImage*>(DATA_PTR(result));
+  }
+
+// Call functions with "FXWindow*" return value
+FXWindow* FXRbCallWindowMethod(const FXTableItem* recv,ID func,FXTable* table);
 
 // Call functions with "FXColor" return value
 template<class TYPE1, class TYPE2>
@@ -540,7 +603,7 @@ FXRangef FXRbCallRangeMethod(FXObject* recv,ID func);
 
 #define FXRbIMPLEMENT(classname,baseclassname,mapping,nmappings) \
   FXObject* classname::manufacture(){return new classname;} \
-  const FX::FXMetaClass classname::metaClass(#classname,classname::manufacture,&baseclassname::metaClass,mapping,nmappings,sizeof(classname::FXMapEntry),sizeof(#classname)); \
+  const FX::FXMetaClass classname::metaClass(#classname,classname::manufacture,&baseclassname::metaClass,mapping,nmappings,sizeof(classname::FXMapEntry)); \
   long classname::handle(FXObject* sender,FXSelector key,void* ptr){ \
     ID func=FXRbLookupHandler(this,key); \
     if(func!=0){ \
@@ -603,6 +666,9 @@ FXRangef FXRbCallRangeMethod(FXObject* recv,ID func);
 #include "FXRbFileDict.h"
 #include "FXRbWindow.h"
 #include "FXRbFrame.h"
+#include "FXRb7Segment.h"
+#include "FXRbDockHandler.h"
+#include "FXRbDockTitle.h"
 #include "FXRbSeparator.h"
 #include "FXRbLabel.h"
 #include "FXRbDial.h"
@@ -620,6 +686,8 @@ FXRangef FXRbCallRangeMethod(FXObject* recv,ID func);
 #include "FXRbMenuButton.h"
 #include "FXRbComposite.h"
 #include "FXRbPacker.h"
+#include "FXRbDockBar.h"
+#include "FXRbDockSite.h"
 #include "FXRbSpring.h"
 #include "FXRbHorizontalFrame.h"
 #include "FXRbVerticalFrame.h"
@@ -633,6 +701,7 @@ FXRangef FXRbCallRangeMethod(FXObject* recv,ID func);
 #include "FXRbToolTip.h"
 #include "FXRbPopup.h"
 #include "FXRbTopWindow.h"
+#include "FXRbSplashWindow.h"
 #include "FXRbDialogBox.h"
 #include "FXRbMainWindow.h"
 #include "FXRbMenuPane.h"
@@ -675,6 +744,7 @@ FXRangef FXRbCallRangeMethod(FXObject* recv,ID func);
 #include "FXRbHeader.h"
 #include "FXRbShutter.h"
 #include "FXRbIconList.h"
+#include "FXRbIconSource.h"
 #include "FXRbFileList.h"
 #include "FXRbDirBox.h"
 #include "FXRbDriveBox.h"
@@ -693,6 +763,7 @@ FXRangef FXRbCallRangeMethod(FXObject* recv,ID func);
 #include "FXRbReplaceDialog.h"
 #include "FXRbInputDialog.h"
 #include "FXRbProgressDialog.h"
+#include "FXRbChoiceBox.h"
 #include "FXRbMDIButton.h"
 #include "FXRbMDIClient.h"
 #include "FXRbMDIChild.h"

data/ext/{fox12 → fox14}/include/impl.h

@@ -21,6 +21,7 @@
  ***********************************************************************/
 
 FXRbIMPLEMENT(FXRb4Splitter,FX4Splitter,NULL,0)
+FXRbIMPLEMENT(FXRb7Segment,FX7Segment,NULL,0)
 FXRbIMPLEMENT(FXRbAccelTable,FXAccelTable,NULL,0)
 FXRbIMPLEMENT(FXRbArrowButton,FXArrowButton,NULL,0)
 FXRbIMPLEMENT(FXRbBitmap,FXBitmap,NULL,0)
@@ -31,6 +32,7 @@ FXRbIMPLEMENT(FXRbBMPImage,FXBMPImage,NULL,0)
 FXRbIMPLEMENT(FXRbButton,FXButton,NULL,0)
 FXRbIMPLEMENT(FXRbCanvas,FXCanvas,NULL,0)
 FXRbIMPLEMENT(FXRbCheckButton,FXCheckButton,NULL,0)
+FXRbIMPLEMENT(FXRbChoiceBox,FXChoiceBox,NULL,0)
 FXRbIMPLEMENT(FXRbColorBar,FXColorBar,NULL,0)
 FXRbIMPLEMENT(FXRbColorDialog,FXColorDialog,NULL,0)
 FXRbIMPLEMENT(FXRbColorSelector,FXColorSelector,NULL,0)
@@ -52,6 +54,10 @@ FXRbIMPLEMENT(FXRbDirItem,FXDirItem,NULL,0)
 FXRbIMPLEMENT(FXRbDirList,FXDirList,NULL,0)
 FXRbIMPLEMENT(FXRbDirSelector,FXDirSelector,NULL,0)
 FXRbIMPLEMENT(FXRbDocument,FXDocument,NULL,0)
+FXRbIMPLEMENT(FXRbDockBar,FXDockBar,NULL,0)
+FXRbIMPLEMENT(FXRbDockHandler,FXDockHandler,NULL,0)
+FXRbIMPLEMENT(FXRbDockSite,FXDockSite,NULL,0)
+FXRbIMPLEMENT(FXRbDockTitle,FXDockTitle,NULL,0)
 FXRbIMPLEMENT(FXRbDragCorner,FXDragCorner,NULL,0)
 FXRbIMPLEMENT(FXRbDrawable,FXDrawable,NULL,0)
 FXRbIMPLEMENT(FXRbDriveBox,FXDriveBox,NULL,0)
@@ -81,6 +87,7 @@ FXRbIMPLEMENT(FXRbIcon,FXIcon,NULL,0)
 FXRbIMPLEMENT(FXRbIconDict,FXIconDict,NULL,0)
 FXRbIMPLEMENT(FXRbIconItem,FXIconItem,NULL,0)
 FXRbIMPLEMENT(FXRbIconList,FXIconList,NULL,0)
+FXRbIMPLEMENT(FXRbIconSource,FXIconSource,NULL,0)
 FXRbIMPLEMENT(FXRbId,FXId,NULL,0)
 FXRbIMPLEMENT(FXRbImage,FXImage,NULL,0)
 FXRbIMPLEMENT(FXRbImageFrame,FXImageFrame,NULL,0)

data/ext/{fox12 → fox14}/include/inlinestubs.h

@@ -6,6 +6,12 @@ DECLARE_FXID_STUBS(FX4Splitter)
 DECLARE_FXDRAWABLE_STUBS(FX4Splitter)
 DECLARE_FXWINDOW_STUBS(FX4Splitter)
 
+/* Start stub declarations for class FXRb7Segment */
+DECLARE_FXOBJECT_STUBS(FX7Segment)
+DECLARE_FXID_STUBS(FX7Segment)
+DECLARE_FXDRAWABLE_STUBS(FX7Segment)
+DECLARE_FXWINDOW_STUBS(FX7Segment)
+
 /* Start stub declarations for class FXRbAccelTable */
 DECLARE_FXOBJECT_STUBS(FXAccelTable)
 
@@ -66,6 +72,14 @@ DECLARE_FXID_STUBS(FXCheckButton)
 DECLARE_FXDRAWABLE_STUBS(FXCheckButton)
 DECLARE_FXWINDOW_STUBS(FXCheckButton)
 
+/* Start stub declarations for class FXRbChoiceBox */
+DECLARE_FXOBJECT_STUBS(FXChoiceBox)
+DECLARE_FXID_STUBS(FXChoiceBox)
+DECLARE_FXDRAWABLE_STUBS(FXChoiceBox)
+DECLARE_FXWINDOW_STUBS(FXChoiceBox)
+DECLARE_FXTOPWINDOW_STUBS(FXChoiceBox)
+DECLARE_FXDIALOGBOX_STUBS(FXChoiceBox)
+
 /* Start stub declarations for class FXRbColorBar */
 DECLARE_FXOBJECT_STUBS(FXColorBar)
 DECLARE_FXID_STUBS(FXColorBar)
@@ -155,6 +169,7 @@ DECLARE_FXOBJECT_STUBS(FXDirBox)
 DECLARE_FXID_STUBS(FXDirBox)
 DECLARE_FXDRAWABLE_STUBS(FXDirBox)
 DECLARE_FXWINDOW_STUBS(FXDirBox)
+DECLARE_FXTREELISTBOX_STUBS(FXDirBox)
 
 /* Start stub declarations for class FXRbDirDialog */
 DECLARE_FXOBJECT_STUBS(FXDirDialog)
@@ -182,6 +197,32 @@ DECLARE_FXID_STUBS(FXDirSelector)
 DECLARE_FXDRAWABLE_STUBS(FXDirSelector)
 DECLARE_FXWINDOW_STUBS(FXDirSelector)
 
+/* Start stub declarations for class FXRbDockBar */
+DECLARE_FXOBJECT_STUBS(FXDockBar)
+DECLARE_FXID_STUBS(FXDockBar)
+DECLARE_FXDRAWABLE_STUBS(FXDockBar)
+DECLARE_FXWINDOW_STUBS(FXDockBar)
+DECLARE_FXDOCKBAR_STUBS(FXDockBar)
+
+/* Start stub declarations for class FXRbDockHandler */
+DECLARE_FXOBJECT_STUBS(FXDockHandler)
+DECLARE_FXID_STUBS(FXDockHandler)
+DECLARE_FXDRAWABLE_STUBS(FXDockHandler)
+DECLARE_FXWINDOW_STUBS(FXDockHandler)
+
+/* Start stub declarations for class FXRbDockSite */
+DECLARE_FXOBJECT_STUBS(FXDockSite)
+DECLARE_FXID_STUBS(FXDockSite)
+DECLARE_FXDRAWABLE_STUBS(FXDockSite)
+DECLARE_FXWINDOW_STUBS(FXDockSite)
+DECLARE_FXDOCKSITE_STUBS(FXDockSite)
+
+/* Start stub declarations for class FXRbDockTitle */
+DECLARE_FXOBJECT_STUBS(FXDockTitle)
+DECLARE_FXID_STUBS(FXDockTitle)
+DECLARE_FXDRAWABLE_STUBS(FXDockTitle)
+DECLARE_FXWINDOW_STUBS(FXDockTitle)
+
 /* Start stub declarations for class FXRbDocument */
 DECLARE_FXOBJECT_STUBS(FXDocument)
 
@@ -201,6 +242,7 @@ DECLARE_FXOBJECT_STUBS(FXDriveBox)
 DECLARE_FXID_STUBS(FXDriveBox)
 DECLARE_FXDRAWABLE_STUBS(FXDriveBox)
 DECLARE_FXWINDOW_STUBS(FXDriveBox)
+DECLARE_FXLISTBOX_STUBS(FXDriveBox)
 
 /* Start stub declarations for class FXRbFileDialog */
 DECLARE_FXOBJECT_STUBS(FXFileDialog)
@@ -245,6 +287,7 @@ DECLARE_FXID_STUBS(FXFoldingList)
 DECLARE_FXDRAWABLE_STUBS(FXFoldingList)
 DECLARE_FXWINDOW_STUBS(FXFoldingList)
 DECLARE_FXSCROLLAREA_STUBS(FXFoldingList)
+DECLARE_FXFOLDINGLIST_STUBS(FXFoldingList)
 
 /* Start stub declarations for class FXRbFont */
 DECLARE_FXOBJECT_STUBS(FXFont)
@@ -377,6 +420,10 @@ DECLARE_FXWINDOW_STUBS(FXIconList)
 DECLARE_FXSCROLLAREA_STUBS(FXIconList)
 DECLARE_FXICONLIST_STUBS(FXIconList)
 
+/* Start stub declarations for class FXRbIconSource */
+DECLARE_FXOBJECT_STUBS(FXIconSource)
+DECLARE_FXICONSOURCE_STUBS(FXIconSource)
+
 /* Start stub declarations for class FXRbId */
 DECLARE_FXOBJECT_STUBS(FXId)
 DECLARE_FXID_STUBS(FXId)
@@ -443,6 +490,7 @@ DECLARE_FXOBJECT_STUBS(FXListBox)
 DECLARE_FXID_STUBS(FXListBox)
 DECLARE_FXDRAWABLE_STUBS(FXListBox)
 DECLARE_FXWINDOW_STUBS(FXListBox)
+DECLARE_FXLISTBOX_STUBS(FXListBox)
 
 /* Start stub declarations for class FXRbMDIDeleteButton */
 DECLARE_FXOBJECT_STUBS(FXMDIDeleteButton)
@@ -513,7 +561,7 @@ DECLARE_FXOBJECT_STUBS(FXMenuBar)
 DECLARE_FXID_STUBS(FXMenuBar)
 DECLARE_FXDRAWABLE_STUBS(FXMenuBar)
 DECLARE_FXWINDOW_STUBS(FXMenuBar)
-DECLARE_FXTOOLBAR_STUBS(FXMenuBar)
+DECLARE_FXDOCKBAR_STUBS(FXMenuBar)
 
 /* Start stub declarations for class FXRbMenuButton */
 DECLARE_FXOBJECT_STUBS(FXMenuButton)
@@ -832,6 +880,13 @@ DECLARE_FXDRAWABLE_STUBS(FXSpinner)
 DECLARE_FXWINDOW_STUBS(FXSpinner)
 DECLARE_FXSPINNER_STUBS(FXSpinner)
 
+/* Start stub declarations for class FXRbSplashWindow */
+DECLARE_FXOBJECT_STUBS(FXSplashWindow)
+DECLARE_FXID_STUBS(FXSplashWindow)
+DECLARE_FXDRAWABLE_STUBS(FXSplashWindow)
+DECLARE_FXWINDOW_STUBS(FXSplashWindow)
+DECLARE_FXTOPWINDOW_STUBS(FXSplashWindow)
+
 /* Start stub declarations for class FXRbSplitter */
 DECLARE_FXOBJECT_STUBS(FXSplitter)
 DECLARE_FXID_STUBS(FXSplitter)
@@ -955,7 +1010,7 @@ DECLARE_FXOBJECT_STUBS(FXToolBar)
 DECLARE_FXID_STUBS(FXToolBar)
 DECLARE_FXDRAWABLE_STUBS(FXToolBar)
 DECLARE_FXWINDOW_STUBS(FXToolBar)
-DECLARE_FXTOOLBAR_STUBS(FXToolBar)
+DECLARE_FXDOCKBAR_STUBS(FXToolBar)
 
 /* Start stub declarations for class FXRbToolBarGrip */
 DECLARE_FXOBJECT_STUBS(FXToolBarGrip)
@@ -1006,6 +1061,7 @@ DECLARE_FXOBJECT_STUBS(FXTreeListBox)
 DECLARE_FXID_STUBS(FXTreeListBox)
 DECLARE_FXDRAWABLE_STUBS(FXTreeListBox)
 DECLARE_FXWINDOW_STUBS(FXTreeListBox)
+DECLARE_FXTREELISTBOX_STUBS(FXTreeListBox)
 
 /* Start stub declarations for class FXRbTriStateButton */
 DECLARE_FXOBJECT_STUBS(FXTriStateButton)

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

@@ -520,25 +520,27 @@ SWIGIMPORT(void)   SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_ty
 #define  SWIGTYPE_p_FXObject swig_types[1] 
 #define  SWIGTYPE_p_FXPopup swig_types[2] 
 #define  SWIGTYPE_p_FXPicker swig_types[3] 
-#define  SWIGTYPE_p_FXMenuButton swig_types[4] 
-#define  SWIGTYPE_p_FXCheckButton swig_types[5] 
-#define  SWIGTYPE_p_FXToggleButton swig_types[6] 
-#define  SWIGTYPE_p_FXLabel swig_types[7] 
-#define  SWIGTYPE_p_FXWindow swig_types[8] 
-#define  SWIGTYPE_p_FXComposite swig_types[9] 
+#define  SWIGTYPE_p_FXToggleButton swig_types[4] 
+#define  SWIGTYPE_p_FXLabel swig_types[5] 
+#define  SWIGTYPE_p_FXWindow swig_types[6] 
+#define  SWIGTYPE_p_FXComposite swig_types[7] 
+#define  SWIGTYPE_p_FXCheckButton swig_types[8] 
+#define  SWIGTYPE_p_FXMenuButton swig_types[9] 
 #define  SWIGTYPE_p_FXRadioButton swig_types[10] 
 #define  SWIGTYPE_p_FXTriStateButton swig_types[11] 
-#define  SWIGTYPE_p_FXFont swig_types[12] 
-#define  SWIGTYPE_p_FXId swig_types[13] 
-#define  SWIGTYPE_p_FXTabBar swig_types[14] 
-#define  SWIGTYPE_p_FXButton swig_types[15] 
-#define  SWIGTYPE_p_FXStream swig_types[16] 
-#define  SWIGTYPE_p_FXDrawable swig_types[17] 
-#define  SWIGTYPE_p_FXTabItem swig_types[18] 
-#define  SWIGTYPE_p_FXIcon swig_types[19] 
-#define  SWIGTYPE_p_FXOption swig_types[20] 
-#define  SWIGTYPE_p_FXOptionMenu swig_types[21] 
-static swig_type_info *swig_types[23];
+#define  SWIGTYPE_p_FXBitmap swig_types[12] 
+#define  SWIGTYPE_p_FXFont swig_types[13] 
+#define  SWIGTYPE_p_FXId swig_types[14] 
+#define  SWIGTYPE_p_FXTabBar swig_types[15] 
+#define  SWIGTYPE_p_FXButton swig_types[16] 
+#define  SWIGTYPE_p_FXStream swig_types[17] 
+#define  SWIGTYPE_p_FXDrawable swig_types[18] 
+#define  SWIGTYPE_p_FXTabItem swig_types[19] 
+#define  SWIGTYPE_p_FXIcon swig_types[20] 
+#define  SWIGTYPE_p_FXOption swig_types[21] 
+#define  SWIGTYPE_p_FXOptionMenu swig_types[22] 
+#define  SWIGTYPE_p_FXRegion swig_types[23] 
+static swig_type_info *swig_types[25];
 
 /* -------- TYPES TABLE (END) -------- */
 
@@ -943,19 +945,21 @@ static VALUE _wrap_FXLabel_setHelpText(int argc, VALUE *argv, VALUE self) { FXLa
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXLabel, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setHelpText((FXString const &)*arg2); return Qnil; }
-static VALUE _wrap_FXLabel_getHelpText(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 0 ; FXString result;
+static VALUE _wrap_FXLabel_getHelpText(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 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_FXLabel, 1); result = ((FXLabel const *)arg1)->getHelpText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXLabel, 1); {
+        FXString const &_result_ref = ((FXLabel const *)arg1)->getHelpText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static VALUE _wrap_FXLabel_setTipText(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 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_FXLabel, 1); p2 = to_FXString(argv[0]); arg2 = &p2;
     (arg1)->setTipText((FXString const &)*arg2); return Qnil; }
-static VALUE _wrap_FXLabel_getTipText(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 0 ; FXString result;
+static VALUE _wrap_FXLabel_getTipText(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 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_FXLabel, 1); result = ((FXLabel const *)arg1)->getTipText();
-    vresult = rb_str_new2((&result)->text()); return vresult; }
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXLabel, 1); {
+        FXString const &_result_ref = ((FXLabel const *)arg1)->getTipText(); result = (FXString *) &_result_ref; } 
+    vresult = rb_str_new2(result->text()); return vresult; }
 static void
 free_FXLabel(FXLabel *arg1) {
     delete arg1;
@@ -1011,6 +1015,11 @@ static VALUE _wrap_FXLabel_setFocus(int argc, VALUE *argv, VALUE self) { FXLabel
 static VALUE _wrap_FXLabel_killFocus(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXLabel, 1); FXLabel_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXLabel_changeFocus(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 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_FXLabel, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXLabel_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXLabel_setDefault(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 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_FXLabel, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -1043,10 +1052,11 @@ static VALUE _wrap_FXLabel_recalc(int argc, VALUE *argv, VALUE self) { FXLabel *
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXLabel, 1); FXLabel_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXLabel_reparent(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 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_FXLabel, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXLabel_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); FXLabel_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXLabel_show(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXLabel, 1); FXLabel_show(arg1); return Qnil; }
@@ -1070,6 +1080,39 @@ static VALUE _wrap_FXLabel_setBackColor(int argc, VALUE *argv, VALUE self) { FXL
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXLabel, 1); arg2 = to_FXColor(argv[0]); FXLabel_setBackColor(arg1,arg2);
     return Qnil; }
+static VALUE _wrap_FXLabel_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 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_FXLabel, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXLabel_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXLabel_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 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_FXLabel, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXLabel_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXLabel_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 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_FXLabel, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXLabel_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXLabel_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_FXLabel, 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_FXLabel_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_FXLabel, 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_FXLabel_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_FXLabel, 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_FXLabel_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXLabel_setShape'"); return Qnil; }
+static VALUE _wrap_FXLabel_clearShape(int argc, VALUE *argv, VALUE self) { FXLabel *arg1 = (FXLabel *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXLabel, 1); FXLabel_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXButton_onPaint(int argc, VALUE *argv, VALUE self) { FXButton *arg1 = (FXButton *) 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,6 +1320,11 @@ static VALUE _wrap_FXButton_setFocus(int argc, VALUE *argv, VALUE self) { FXButt
 static VALUE _wrap_FXButton_killFocus(int argc, VALUE *argv, VALUE self) { FXButton *arg1 = (FXButton *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXButton, 1); FXButton_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXButton_changeFocus(int argc, VALUE *argv, VALUE self) { FXButton *arg1 = (FXButton *) 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_FXButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXButton_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXButton_setDefault(int argc, VALUE *argv, VALUE self) { FXButton *arg1 = (FXButton *) 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_FXButton, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -1309,10 +1357,11 @@ static VALUE _wrap_FXButton_recalc(int argc, VALUE *argv, VALUE self) { FXButton
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXButton, 1); FXButton_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXButton_reparent(int argc, VALUE *argv, VALUE self) { FXButton *arg1 = (FXButton *) 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_FXButton, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXButton_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); FXButton_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXButton_show(int argc, VALUE *argv, VALUE self) { FXButton *arg1 = (FXButton *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXButton, 1); FXButton_show(arg1); return Qnil; }
@@ -1336,6 +1385,39 @@ static VALUE _wrap_FXButton_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_FXButton, 1); arg2 = to_FXColor(argv[0]);
     FXButton_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXButton_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXButton *arg1 = (FXButton *) 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_FXButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXButton_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXButton_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXButton *arg1 = (FXButton *) 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_FXButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXButton_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXButton_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXButton *arg1 = (FXButton *) 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_FXButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXButton_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXButton_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_FXButton, 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_FXButton_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_FXButton, 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_FXButton_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_FXButton, 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_FXButton_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXButton_setShape'"); return Qnil; }
+static VALUE _wrap_FXButton_clearShape(int argc, VALUE *argv, VALUE self) { FXButton *arg1 = (FXButton *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXButton, 1); FXButton_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXCheckButton_onPaint(int argc, VALUE *argv, VALUE self) { FXCheckButton *arg1 = (FXCheckButton *) 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);
@@ -1581,6 +1663,11 @@ static VALUE _wrap_FXCheckButton_setFocus(int argc, VALUE *argv, VALUE self) { F
 static VALUE _wrap_FXCheckButton_killFocus(int argc, VALUE *argv, VALUE self) { FXCheckButton *arg1 = (FXCheckButton *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXCheckButton, 1); FXCheckButton_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXCheckButton_changeFocus(int argc, VALUE *argv, VALUE self) { FXCheckButton *arg1 = (FXCheckButton *) 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_FXCheckButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXCheckButton_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXCheckButton_setDefault(int argc, VALUE *argv, VALUE self) { FXCheckButton *arg1 = (FXCheckButton *) 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_FXCheckButton, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -1613,10 +1700,11 @@ static VALUE _wrap_FXCheckButton_recalc(int argc, VALUE *argv, VALUE self) { FXC
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXCheckButton, 1); FXCheckButton_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXCheckButton_reparent(int argc, VALUE *argv, VALUE self) { FXCheckButton *arg1 = (FXCheckButton *) 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_FXCheckButton, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXCheckButton_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); FXCheckButton_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXCheckButton_show(int argc, VALUE *argv, VALUE self) { FXCheckButton *arg1 = (FXCheckButton *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXCheckButton, 1); FXCheckButton_show(arg1); return Qnil; }
@@ -1644,6 +1732,43 @@ static VALUE _wrap_FXCheckButton_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_FXCheckButton, 1); arg2 = to_FXColor(argv[0]);
     FXCheckButton_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXCheckButton_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
+    FXCheckButton *arg1 = (FXCheckButton *) 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_FXCheckButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXCheckButton_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXCheckButton_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
+    FXCheckButton *arg1 = (FXCheckButton *) 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_FXCheckButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXCheckButton_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXCheckButton_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
+    FXCheckButton *arg1 = (FXCheckButton *) 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_FXCheckButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXCheckButton_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXCheckButton_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_FXCheckButton, 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_FXCheckButton_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_FXCheckButton, 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_FXCheckButton_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_FXCheckButton, 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_FXCheckButton_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXCheckButton_setShape'"); return Qnil; }
+static VALUE _wrap_FXCheckButton_clearShape(int argc, VALUE *argv, VALUE self) { FXCheckButton *arg1 = (FXCheckButton *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXCheckButton, 1); FXCheckButton_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXMenuButton_onPaint(int argc, VALUE *argv, VALUE self) { FXMenuButton *arg1 = (FXMenuButton *) 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);
@@ -1880,6 +2005,11 @@ static VALUE _wrap_FXMenuButton_setFocus(int argc, VALUE *argv, VALUE self) { FX
 static VALUE _wrap_FXMenuButton_killFocus(int argc, VALUE *argv, VALUE self) { FXMenuButton *arg1 = (FXMenuButton *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMenuButton, 1); FXMenuButton_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXMenuButton_changeFocus(int argc, VALUE *argv, VALUE self) { FXMenuButton *arg1 = (FXMenuButton *) 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_FXMenuButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXMenuButton_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXMenuButton_setDefault(int argc, VALUE *argv, VALUE self) { FXMenuButton *arg1 = (FXMenuButton *) 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_FXMenuButton, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -1912,10 +2042,11 @@ static VALUE _wrap_FXMenuButton_recalc(int argc, VALUE *argv, VALUE self) { FXMe
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMenuButton, 1); FXMenuButton_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXMenuButton_reparent(int argc, VALUE *argv, VALUE self) { FXMenuButton *arg1 = (FXMenuButton *) 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_FXMenuButton, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXMenuButton_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); FXMenuButton_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXMenuButton_show(int argc, VALUE *argv, VALUE self) { FXMenuButton *arg1 = (FXMenuButton *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMenuButton, 1); FXMenuButton_show(arg1); return Qnil; }
@@ -1942,6 +2073,41 @@ static VALUE _wrap_FXMenuButton_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_FXMenuButton, 1); arg2 = to_FXColor(argv[0]);
     FXMenuButton_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXMenuButton_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXMenuButton *arg1 = (FXMenuButton *) 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_FXMenuButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXMenuButton_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXMenuButton_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXMenuButton *arg1 = (FXMenuButton *) 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_FXMenuButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXMenuButton_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXMenuButton_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXMenuButton *arg1 = (FXMenuButton *) 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_FXMenuButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXMenuButton_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXMenuButton_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_FXMenuButton, 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_FXMenuButton_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_FXMenuButton, 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_FXMenuButton_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_FXMenuButton, 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_FXMenuButton_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXMenuButton_setShape'"); return Qnil; }
+static VALUE _wrap_FXMenuButton_clearShape(int argc, VALUE *argv, VALUE self) { FXMenuButton *arg1 = (FXMenuButton *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMenuButton, 1); FXMenuButton_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXOption_onPaint(int argc, VALUE *argv, VALUE self) { FXOption *arg1 = (FXOption *) 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);
@@ -2077,6 +2243,11 @@ static VALUE _wrap_FXOption_setFocus(int argc, VALUE *argv, VALUE self) { FXOpti
 static VALUE _wrap_FXOption_killFocus(int argc, VALUE *argv, VALUE self) { FXOption *arg1 = (FXOption *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXOption, 1); FXOption_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXOption_changeFocus(int argc, VALUE *argv, VALUE self) { FXOption *arg1 = (FXOption *) 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_FXOption, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXOption_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXOption_setDefault(int argc, VALUE *argv, VALUE self) { FXOption *arg1 = (FXOption *) 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_FXOption, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -2109,10 +2280,11 @@ static VALUE _wrap_FXOption_recalc(int argc, VALUE *argv, VALUE self) { FXOption
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXOption, 1); FXOption_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXOption_reparent(int argc, VALUE *argv, VALUE self) { FXOption *arg1 = (FXOption *) 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_FXOption, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXOption_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); FXOption_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXOption_show(int argc, VALUE *argv, VALUE self) { FXOption *arg1 = (FXOption *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXOption, 1); FXOption_show(arg1); return Qnil; }
@@ -2136,6 +2308,39 @@ static VALUE _wrap_FXOption_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_FXOption, 1); arg2 = to_FXColor(argv[0]);
     FXOption_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXOption_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXOption *arg1 = (FXOption *) 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_FXOption, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXOption_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXOption_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXOption *arg1 = (FXOption *) 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_FXOption, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXOption_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXOption_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXOption *arg1 = (FXOption *) 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_FXOption, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXOption_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXOption_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_FXOption, 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_FXOption_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_FXOption, 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_FXOption_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_FXOption, 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_FXOption_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXOption_setShape'"); return Qnil; }
+static VALUE _wrap_FXOption_clearShape(int argc, VALUE *argv, VALUE self) { FXOption *arg1 = (FXOption *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXOption, 1); FXOption_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXOptionMenu_onPaint(int argc, VALUE *argv, VALUE self) { FXOptionMenu *arg1 = (FXOptionMenu *) 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);
@@ -2354,6 +2559,11 @@ static VALUE _wrap_FXOptionMenu_setFocus(int argc, VALUE *argv, VALUE self) { FX
 static VALUE _wrap_FXOptionMenu_killFocus(int argc, VALUE *argv, VALUE self) { FXOptionMenu *arg1 = (FXOptionMenu *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXOptionMenu, 1); FXOptionMenu_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXOptionMenu_changeFocus(int argc, VALUE *argv, VALUE self) { FXOptionMenu *arg1 = (FXOptionMenu *) 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_FXOptionMenu, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXOptionMenu_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXOptionMenu_setDefault(int argc, VALUE *argv, VALUE self) { FXOptionMenu *arg1 = (FXOptionMenu *) 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_FXOptionMenu, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -2386,10 +2596,11 @@ static VALUE _wrap_FXOptionMenu_recalc(int argc, VALUE *argv, VALUE self) { FXOp
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXOptionMenu, 1); FXOptionMenu_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXOptionMenu_reparent(int argc, VALUE *argv, VALUE self) { FXOptionMenu *arg1 = (FXOptionMenu *) 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_FXOptionMenu, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXOptionMenu_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); FXOptionMenu_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXOptionMenu_show(int argc, VALUE *argv, VALUE self) { FXOptionMenu *arg1 = (FXOptionMenu *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXOptionMenu, 1); FXOptionMenu_show(arg1); return Qnil; }
@@ -2416,6 +2627,41 @@ static VALUE _wrap_FXOptionMenu_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_FXOptionMenu, 1); arg2 = to_FXColor(argv[0]);
     FXOptionMenu_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXOptionMenu_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXOptionMenu *arg1 = (FXOptionMenu *) 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_FXOptionMenu, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXOptionMenu_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXOptionMenu_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXOptionMenu *arg1 = (FXOptionMenu *) 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_FXOptionMenu, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXOptionMenu_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXOptionMenu_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXOptionMenu *arg1 = (FXOptionMenu *) 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_FXOptionMenu, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXOptionMenu_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXOptionMenu_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_FXOptionMenu, 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_FXOptionMenu_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_FXOptionMenu, 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_FXOptionMenu_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_FXOptionMenu, 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_FXOptionMenu_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXOptionMenu_setShape'"); return Qnil; }
+static VALUE _wrap_FXOptionMenu_clearShape(int argc, VALUE *argv, VALUE self) { FXOptionMenu *arg1 = (FXOptionMenu *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXOptionMenu, 1); FXOptionMenu_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXRadioButton_onPaint(int argc, VALUE *argv, VALUE self) { FXRadioButton *arg1 = (FXRadioButton *) 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);
@@ -2661,6 +2907,11 @@ static VALUE _wrap_FXRadioButton_setFocus(int argc, VALUE *argv, VALUE self) { F
 static VALUE _wrap_FXRadioButton_killFocus(int argc, VALUE *argv, VALUE self) { FXRadioButton *arg1 = (FXRadioButton *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRadioButton, 1); FXRadioButton_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXRadioButton_changeFocus(int argc, VALUE *argv, VALUE self) { FXRadioButton *arg1 = (FXRadioButton *) 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_FXRadioButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXRadioButton_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXRadioButton_setDefault(int argc, VALUE *argv, VALUE self) { FXRadioButton *arg1 = (FXRadioButton *) 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_FXRadioButton, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -2693,10 +2944,11 @@ static VALUE _wrap_FXRadioButton_recalc(int argc, VALUE *argv, VALUE self) { FXR
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRadioButton, 1); FXRadioButton_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXRadioButton_reparent(int argc, VALUE *argv, VALUE self) { FXRadioButton *arg1 = (FXRadioButton *) 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_FXRadioButton, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXRadioButton_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); FXRadioButton_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXRadioButton_show(int argc, VALUE *argv, VALUE self) { FXRadioButton *arg1 = (FXRadioButton *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRadioButton, 1); FXRadioButton_show(arg1); return Qnil; }
@@ -2724,6 +2976,43 @@ static VALUE _wrap_FXRadioButton_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_FXRadioButton, 1); arg2 = to_FXColor(argv[0]);
     FXRadioButton_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXRadioButton_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
+    FXRadioButton *arg1 = (FXRadioButton *) 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_FXRadioButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXRadioButton_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXRadioButton_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
+    FXRadioButton *arg1 = (FXRadioButton *) 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_FXRadioButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXRadioButton_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXRadioButton_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
+    FXRadioButton *arg1 = (FXRadioButton *) 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_FXRadioButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXRadioButton_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXRadioButton_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_FXRadioButton, 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_FXRadioButton_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_FXRadioButton, 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_FXRadioButton_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_FXRadioButton, 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_FXRadioButton_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXRadioButton_setShape'"); return Qnil; }
+static VALUE _wrap_FXRadioButton_clearShape(int argc, VALUE *argv, VALUE self) { FXRadioButton *arg1 = (FXRadioButton *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRadioButton, 1); FXRadioButton_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXTabItem_onPaint(int argc, VALUE *argv, VALUE self) { FXTabItem *arg1 = (FXTabItem *) 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);
@@ -2873,6 +3162,11 @@ static VALUE _wrap_FXTabItem_setFocus(int argc, VALUE *argv, VALUE self) { FXTab
 static VALUE _wrap_FXTabItem_killFocus(int argc, VALUE *argv, VALUE self) { FXTabItem *arg1 = (FXTabItem *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTabItem, 1); FXTabItem_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXTabItem_changeFocus(int argc, VALUE *argv, VALUE self) { FXTabItem *arg1 = (FXTabItem *) 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_FXTabItem, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXTabItem_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXTabItem_setDefault(int argc, VALUE *argv, VALUE self) { FXTabItem *arg1 = (FXTabItem *) 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_FXTabItem, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -2905,10 +3199,11 @@ static VALUE _wrap_FXTabItem_recalc(int argc, VALUE *argv, VALUE self) { FXTabIt
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTabItem, 1); FXTabItem_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXTabItem_reparent(int argc, VALUE *argv, VALUE self) { FXTabItem *arg1 = (FXTabItem *) 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_FXTabItem, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXTabItem_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); FXTabItem_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXTabItem_show(int argc, VALUE *argv, VALUE self) { FXTabItem *arg1 = (FXTabItem *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTabItem, 1); FXTabItem_show(arg1); return Qnil; }
@@ -2933,6 +3228,39 @@ static VALUE _wrap_FXTabItem_setBackColor(int argc, VALUE *argv, VALUE self) { F
     FXColor arg2 ; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTabItem, 1); arg2 = to_FXColor(argv[0]);
     FXTabItem_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXTabItem_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXTabItem *arg1 = (FXTabItem *) 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_FXTabItem, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXTabItem_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXTabItem_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXTabItem *arg1 = (FXTabItem *) 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_FXTabItem, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXTabItem_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXTabItem_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXTabItem *arg1 = (FXTabItem *) 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_FXTabItem, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXTabItem_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXTabItem_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_FXTabItem, 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_FXTabItem_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_FXTabItem, 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_FXTabItem_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_FXTabItem, 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_FXTabItem_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXTabItem_setShape'"); return Qnil; }
+static VALUE _wrap_FXTabItem_clearShape(int argc, VALUE *argv, VALUE self) { FXTabItem *arg1 = (FXTabItem *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTabItem, 1); FXTabItem_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXToggleButton_onPaint(int argc, VALUE *argv, VALUE self) { FXToggleButton *arg1 = (FXToggleButton *) 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);
@@ -3209,6 +3537,11 @@ static VALUE _wrap_FXToggleButton_setFocus(int argc, VALUE *argv, VALUE self) {
 static VALUE _wrap_FXToggleButton_killFocus(int argc, VALUE *argv, VALUE self) { FXToggleButton *arg1 = (FXToggleButton *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToggleButton, 1); FXToggleButton_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXToggleButton_changeFocus(int argc, VALUE *argv, VALUE self) { FXToggleButton *arg1 = (FXToggleButton *) 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_FXToggleButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXToggleButton_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXToggleButton_setDefault(int argc, VALUE *argv, VALUE self) { FXToggleButton *arg1 = (FXToggleButton *) 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_FXToggleButton, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -3241,10 +3574,11 @@ static VALUE _wrap_FXToggleButton_recalc(int argc, VALUE *argv, VALUE self) { FX
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToggleButton, 1); FXToggleButton_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXToggleButton_reparent(int argc, VALUE *argv, VALUE self) { FXToggleButton *arg1 = (FXToggleButton *) 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_FXToggleButton, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXToggleButton_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); FXToggleButton_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXToggleButton_show(int argc, VALUE *argv, VALUE self) { FXToggleButton *arg1 = (FXToggleButton *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToggleButton, 1); FXToggleButton_show(arg1); return Qnil; }
@@ -3274,6 +3608,43 @@ static VALUE _wrap_FXToggleButton_setBackColor(int argc, VALUE *argv, VALUE self
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToggleButton, 1); arg2 = to_FXColor(argv[0]);
     FXToggleButton_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXToggleButton_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
+    FXToggleButton *arg1 = (FXToggleButton *) 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_FXToggleButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXToggleButton_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXToggleButton_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
+    FXToggleButton *arg1 = (FXToggleButton *) 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_FXToggleButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXToggleButton_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXToggleButton_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
+    FXToggleButton *arg1 = (FXToggleButton *) 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_FXToggleButton, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXToggleButton_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXToggleButton_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_FXToggleButton, 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_FXToggleButton_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_FXToggleButton, 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_FXToggleButton_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_FXToggleButton, 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_FXToggleButton_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXToggleButton_setShape'"); return Qnil; }
+static VALUE _wrap_FXToggleButton_clearShape(int argc, VALUE *argv, VALUE self) { FXToggleButton *arg1 = (FXToggleButton *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXToggleButton, 1); FXToggleButton_clearShape(arg1); return Qnil; }
 static VALUE _wrap_FXTriStateButton_onPaint(int argc, VALUE *argv, VALUE self) {
     FXTriStateButton *arg1 = (FXTriStateButton *) 0 ; FXObject *arg2 = (FXObject *) 0 ; FXSelector arg3 ;
     void *arg4 = (void *) 0 ; long result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
@@ -3493,6 +3864,11 @@ static VALUE _wrap_FXPicker_setFocus(int argc, VALUE *argv, VALUE self) { FXPick
 static VALUE _wrap_FXPicker_killFocus(int argc, VALUE *argv, VALUE self) { FXPicker *arg1 = (FXPicker *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPicker, 1); FXPicker_killFocus(arg1); return Qnil; }
+static VALUE _wrap_FXPicker_changeFocus(int argc, VALUE *argv, VALUE self) { FXPicker *arg1 = (FXPicker *) 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_FXPicker, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXWindow, 1); FXPicker_changeFocus(arg1,arg2); return Qnil; }
 static VALUE _wrap_FXPicker_setDefault(int argc, VALUE *argv, VALUE self) { FXPicker *arg1 = (FXPicker *) 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_FXPicker, 1); if (argc > 0) { arg2 = to_FXbool(argv[0]); } 
@@ -3525,10 +3901,11 @@ static VALUE _wrap_FXPicker_recalc(int argc, VALUE *argv, VALUE self) { FXPicker
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPicker, 1); FXPicker_recalc(arg1); return Qnil; }
 static VALUE _wrap_FXPicker_reparent(int argc, VALUE *argv, VALUE self) { FXPicker *arg1 = (FXPicker *) 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_FXPicker, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXComposite, 1); FXPicker_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); FXPicker_reparent(arg1,arg2,arg3); return Qnil; }
 static VALUE _wrap_FXPicker_show(int argc, VALUE *argv, VALUE self) { FXPicker *arg1 = (FXPicker *) 0 ;
     if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPicker, 1); FXPicker_show(arg1); return Qnil; }
@@ -3552,6 +3929,39 @@ static VALUE _wrap_FXPicker_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_FXPicker, 1); arg2 = to_FXColor(argv[0]);
     FXPicker_setBackColor(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXPicker_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) { FXPicker *arg1 = (FXPicker *) 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_FXPicker, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1); if (arg2 == NULL) rb_raise(rb_eTypeError, "null reference");
+    FXPicker_setShape(arg1,(FXRegion const &)*arg2); return Qnil; }
+static VALUE _wrap_FXPicker_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) { FXPicker *arg1 = (FXPicker *) 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_FXPicker, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXBitmap, 1); FXPicker_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXPicker_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) { FXPicker *arg1 = (FXPicker *) 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_FXPicker, 1);
+    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXIcon, 1); FXPicker_setShape(arg1,arg2); return Qnil; }
+static VALUE _wrap_FXPicker_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_FXPicker, 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_FXPicker_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_FXPicker, 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_FXPicker_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_FXPicker, 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_FXPicker_setShape__SWIG_2(nargs, args, self);}  }  } 
+    rb_raise(rb_eArgError, "No matching function for overloaded 'FXPicker_setShape'"); return Qnil; }
+static VALUE _wrap_FXPicker_clearShape(int argc, VALUE *argv, VALUE self) { FXPicker *arg1 = (FXPicker *) 0 ;
+    if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXPicker, 1); FXPicker_clearShape(arg1); return Qnil; }
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -3675,6 +4085,9 @@ static void *_p_FXShellTo_p_FXId(void *x) {
 static void *_p_FXPopupTo_p_FXId(void *x) {
     return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *) ((FXPopup *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXId(void *x) {
+    return (void *)((FXId *) (FXDrawable *)(FXWindow *)(FXComposite *)(FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
+}
 static void *_p_FXWindowTo_p_FXId(void *x) {
     return (void *)((FXId *) (FXDrawable *) ((FXWindow *) x));
 }
@@ -3792,9 +4205,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_FXCheckButtonTo_p_FXObject(void *x) {
     return (void *)((FXObject *) (FXId *)(FXDrawable *)(FXWindow *)(FXFrame *)(FXLabel *) ((FXCheckButton *) x));
 }
@@ -3822,6 +4232,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));
 }
@@ -3987,9 +4400,6 @@ static void *_p_FXCompositeTo_p_FXWindow(void *x) {
 static void *_p_FXTextFieldTo_p_FXWindow(void *x) {
     return (void *)((FXWindow *) (FXFrame *) ((FXTextField *) x));
 }
-static void *_p_FXToggleButtonTo_p_FXWindow(void *x) {
-    return (void *)((FXWindow *) (FXFrame *)(FXLabel *) ((FXToggleButton *) x));
-}
 static void *_p_FXRadioButtonTo_p_FXWindow(void *x) {
     return (void *)((FXWindow *) (FXFrame *)(FXLabel *) ((FXRadioButton *) x));
 }
@@ -4002,6 +4412,9 @@ static void *_p_FXCheckButtonTo_p_FXWindow(void *x) {
 static void *_p_FXArrowButtonTo_p_FXWindow(void *x) {
     return (void *)((FXWindow *) (FXFrame *) ((FXArrowButton *) x));
 }
+static void *_p_FXToggleButtonTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXFrame *)(FXLabel *) ((FXToggleButton *) x));
+}
 static void *_p_FXTriStateButtonTo_p_FXWindow(void *x) {
     return (void *)((FXWindow *) (FXFrame *)(FXLabel *)(FXToggleButton *) ((FXTriStateButton *) x));
 }
@@ -4020,6 +4433,9 @@ static void *_p_FXTopWindowTo_p_FXWindow(void *x) {
 static void *_p_FXMainWindowTo_p_FXWindow(void *x) {
     return (void *)((FXWindow *) (FXComposite *)(FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXWindow(void *x) {
+    return (void *)((FXWindow *) (FXComposite *)(FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
+}
 static void *_p_FXRulerTo_p_FXWindow(void *x) {
     return (void *)((FXWindow *) (FXFrame *) ((FXRuler *) x));
 }
@@ -4101,6 +4517,9 @@ static void *_p_FXTopWindowTo_p_FXComposite(void *x) {
 static void *_p_FXMainWindowTo_p_FXComposite(void *x) {
     return (void *)((FXComposite *) (FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXComposite(void *x) {
+    return (void *)((FXComposite *) (FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
+}
 static void *_p_FXPickerTo_p_FXButton(void *x) {
     return (void *)((FXButton *)  ((FXPicker *) x));
 }
@@ -4155,6 +4574,9 @@ static void *_p_FXTopWindowTo_p_FXDrawable(void *x) {
 static void *_p_FXMainWindowTo_p_FXDrawable(void *x) {
     return (void *)((FXDrawable *) (FXWindow *)(FXComposite *)(FXShell *)(FXTopWindow *) ((FXMainWindow *) x));
 }
+static void *_p_FXSplashWindowTo_p_FXDrawable(void *x) {
+    return (void *)((FXDrawable *) (FXWindow *)(FXComposite *)(FXShell *)(FXTopWindow *) ((FXSplashWindow *) x));
+}
 static void *_p_FXRulerTo_p_FXDrawable(void *x) {
     return (void *)((FXDrawable *) (FXWindow *)(FXFrame *) ((FXRuler *) x));
 }
@@ -4222,41 +4644,44 @@ static void *_p_FXColorBarTo_p_FXDrawable(void *x) {
     return (void *)((FXDrawable *) (FXWindow *)(FXFrame *) ((FXColorBar *) 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_FXPicker", _p_FXPickerTo_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_FXCheckButton", _p_FXCheckButtonTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXTriStateButton", _p_FXTriStateButtonTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXLabel", _p_FXLabelTo_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_FXButton", _p_FXButtonTo_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_FXTabItem", _p_FXTabItemTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXOption", _p_FXOptionTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXHeader", _p_FXHeaderTo_p_FXFrame, 0, 0, 0, 0, 0},{"_p_FXOptionMenu", _p_FXOptionMenuTo_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_FXObject[] = {{"_p_FXObject", 0, "FXObject *", 0, 0, 0, 0},{"_p_FXDict", _p_FXDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXOption", _p_FXOptionTo_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_FXTriStateButton", _p_FXTriStateButtonTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXCheckButton", _p_FXCheckButtonTo_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_FXTabItem", _p_FXTabItemTo_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_FXLabel", _p_FXLabelTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFileDict", _p_FXFileDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXPicker", _p_FXPickerTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDataTarget", _p_FXDataTargetTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDebugTarget", _p_FXDebugTargetTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXOptionMenu", _p_FXOptionMenuTo_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_FXFrame", _p_FXFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFont", _p_FXFontTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSlider", _p_FXSliderTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXButton", _p_FXButtonTo_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_FXOption", _p_FXOptionTo_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_FXTextField", _p_FXTextFieldTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRegistry", _p_FXRegistryTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXId", _p_FXIdTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXTriStateButton", _p_FXTriStateButtonTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXCheckButton", _p_FXCheckButtonTo_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_FXTabItem", _p_FXTabItemTo_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_FXLabel", _p_FXLabelTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFileDict", _p_FXFileDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXPicker", _p_FXPickerTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDataTarget", _p_FXDataTargetTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDebugTarget", _p_FXDebugTargetTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXOptionMenu", _p_FXOptionMenuTo_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_FXFrame", _p_FXFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFont", _p_FXFontTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSlider", _p_FXSliderTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXButton", _p_FXButtonTo_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_FXPopup[] = {{"_p_FXPopup", 0, "FXPopup *", 0, 0, 0, 0},{"_p_FXPopup", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXPicker[] = {{"_p_FXPicker", 0, "FXPicker *", 0, 0, 0, 0},{"_p_FXPicker", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXMenuButton[] = {{"_p_FXMenuButton", 0, "FXMenuButton *", 0, 0, 0, 0},{"_p_FXMenuButton", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXCheckButton[] = {{"_p_FXCheckButton", 0, "FXCheckButton *", 0, 0, 0, 0},{"_p_FXCheckButton", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXToggleButton[] = {{"_p_FXToggleButton", 0, "FXToggleButton *", 0, 0, 0, 0},{"_p_FXToggleButton", 0, 0, 0, 0, 0, 0},{"_p_FXTriStateButton", _p_FXTriStateButtonTo_p_FXToggleButton, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXLabel[] = {{"_p_FXLabel", 0, "FXLabel *", 0, 0, 0, 0},{"_p_FXOption", _p_FXOptionTo_p_FXLabel, 0, 0, 0, 0, 0},{"_p_FXLabel", 0, 0, 0, 0, 0, 0},{"_p_FXButton", _p_FXButtonTo_p_FXLabel, 0, 0, 0, 0, 0},{"_p_FXPicker", _p_FXPickerTo_p_FXLabel, 0, 0, 0, 0, 0},{"_p_FXTabItem", _p_FXTabItemTo_p_FXLabel, 0, 0, 0, 0, 0},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXLabel, 0, 0, 0, 0, 0},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXLabel, 0, 0, 0, 0, 0},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXLabel, 0, 0, 0, 0, 0},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXLabel, 0, 0, 0, 0, 0},{"_p_FXTriStateButton", _p_FXTriStateButtonTo_p_FXLabel, 0, 0, 0, 0, 0},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXLabel, 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_FXOption", _p_FXOptionTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXTextField", _p_FXTextFieldTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXTriStateButton", _p_FXTriStateButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_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_FXRuler", _p_FXRulerTo_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_FXStatusLine", _p_FXStatusLineTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXTabItem", _p_FXTabItemTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXLabel", _p_FXLabelTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXPicker", _p_FXPickerTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXHeader", _p_FXHeaderTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXWindow, 0, 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_FXSlider", _p_FXSliderTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXButton", _p_FXButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_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_FXWindow[] = {{"_p_FXWindow", 0, "FXWindow *", 0, 0, 0, 0},{"_p_FXOption", _p_FXOptionTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXTextField", _p_FXTextFieldTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXTriStateButton", _p_FXTriStateButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_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_FXRuler", _p_FXRulerTo_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_FXStatusLine", _p_FXStatusLineTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXTabItem", _p_FXTabItemTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXLabel", _p_FXLabelTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXPicker", _p_FXPickerTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXHeader", _p_FXHeaderTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXWindow, 0, 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_FXSlider", _p_FXSliderTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXButton", _p_FXButtonTo_p_FXWindow, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_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_FXCheckButton[] = {{"_p_FXCheckButton", 0, "FXCheckButton *", 0, 0, 0, 0},{"_p_FXCheckButton", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXMenuButton[] = {{"_p_FXMenuButton", 0, "FXMenuButton *", 0, 0, 0, 0},{"_p_FXMenuButton", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXRadioButton[] = {{"_p_FXRadioButton", 0, "FXRadioButton *", 0, 0, 0, 0},{"_p_FXRadioButton", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXTriStateButton[] = {{"_p_FXTriStateButton", 0, "FXTriStateButton *", 0, 0, 0, 0},{"_p_FXTriStateButton", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_FXBitmap[] = {{"_p_FXBitmap", 0, "FXBitmap *", 0, 0, 0, 0},{"_p_FXBitmap", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXFont[] = {{"_p_FXFont", 0, "FXFont *", 0, 0, 0, 0},{"_p_FXFont", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_FXId[] = {{"_p_FXId", 0, "FXId *", 0, 0, 0, 0},{"_p_FXOption", _p_FXOptionTo_p_FXId, 0, 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_FXTriStateButton", _p_FXTriStateButtonTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXRadioButton", _p_FXRadioButtonTo_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_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_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_FXTabItem", _p_FXTabItemTo_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_FXLabel", _p_FXLabelTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXPicker", _p_FXPickerTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_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_FXColorWell", _p_FXColorWellTo_p_FXId, 0, 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_FXFont", _p_FXFontTo_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_FXButton", _p_FXButtonTo_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_FXId[] = {{"_p_FXId", 0, "FXId *", 0, 0, 0, 0},{"_p_FXOption", _p_FXOptionTo_p_FXId, 0, 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_FXTriStateButton", _p_FXTriStateButtonTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXMenuButton", _p_FXMenuButtonTo_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_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_FXSplashWindow", _p_FXSplashWindowTo_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_FXTabItem", _p_FXTabItemTo_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_FXLabel", _p_FXLabelTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXPicker", _p_FXPickerTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXId, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_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_FXColorWell", _p_FXColorWellTo_p_FXId, 0, 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_FXFont", _p_FXFontTo_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_FXButton", _p_FXButtonTo_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_FXTabBar[] = {{"_p_FXTabBar", 0, "FXTabBar *", 0, 0, 0, 0},{"_p_FXTabBar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXButton[] = {{"_p_FXButton", 0, "FXButton *", 0, 0, 0, 0},{"_p_FXButton", 0, 0, 0, 0, 0, 0},{"_p_FXPicker", _p_FXPickerTo_p_FXButton, 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_FXOption", _p_FXOptionTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTriStateButton", _p_FXTriStateButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_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_FXRuler", _p_FXRulerTo_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_FXStatusLine", _p_FXStatusLineTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTabItem", _p_FXTabItemTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXLabel", _p_FXLabelTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXPicker", _p_FXPickerTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDrawable", 0, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXDrawable, 0, 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_FXSlider", _p_FXSliderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXButton", _p_FXButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_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_FXOption", _p_FXOptionTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTriStateButton", _p_FXTriStateButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_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_FXRuler", _p_FXRulerTo_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_FXStatusLine", _p_FXStatusLineTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXTabItem", _p_FXTabItemTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXLabel", _p_FXLabelTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXPicker", _p_FXPickerTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXDrawable", 0, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXDrawable, 0, 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_FXSlider", _p_FXSliderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXButton", _p_FXButtonTo_p_FXDrawable, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_p_FXDrawable, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXTabItem[] = {{"_p_FXTabItem", 0, "FXTabItem *", 0, 0, 0, 0},{"_p_FXTabItem", 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_FXOption[] = {{"_p_FXOption", 0, "FXOption *", 0, 0, 0, 0},{"_p_FXOption", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_FXOptionMenu[] = {{"_p_FXOptionMenu", 0, "FXOptionMenu *", 0, 0, 0, 0},{"_p_FXOptionMenu", 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 *swig_types_initial[] = {
 _swigt__p_FXFrame, 
 _swigt__p_FXObject, 
 _swigt__p_FXPopup, 
 _swigt__p_FXPicker, 
-_swigt__p_FXMenuButton, 
-_swigt__p_FXCheckButton, 
 _swigt__p_FXToggleButton, 
 _swigt__p_FXLabel, 
 _swigt__p_FXWindow, 
 _swigt__p_FXComposite, 
+_swigt__p_FXCheckButton, 
+_swigt__p_FXMenuButton, 
 _swigt__p_FXRadioButton, 
 _swigt__p_FXTriStateButton, 
+_swigt__p_FXBitmap, 
 _swigt__p_FXFont, 
 _swigt__p_FXId, 
 _swigt__p_FXTabBar, 
@@ -4267,6 +4692,7 @@ _swigt__p_FXTabItem,
 _swigt__p_FXIcon, 
 _swigt__p_FXOption, 
 _swigt__p_FXOptionMenu, 
+_swigt__p_FXRegion, 
 0
 };
 
@@ -4346,6 +4772,7 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXLabel.klass, "canFocus", VALUEFUNC(_wrap_FXLabel_canFocus), -1);
     rb_define_method(cFXLabel.klass, "setFocus", VALUEFUNC(_wrap_FXLabel_setFocus), -1);
     rb_define_method(cFXLabel.klass, "killFocus", VALUEFUNC(_wrap_FXLabel_killFocus), -1);
+    rb_define_method(cFXLabel.klass, "changeFocus", VALUEFUNC(_wrap_FXLabel_changeFocus), -1);
     rb_define_method(cFXLabel.klass, "setDefault", VALUEFUNC(_wrap_FXLabel_setDefault), -1);
     rb_define_method(cFXLabel.klass, "enable", VALUEFUNC(_wrap_FXLabel_enable), -1);
     rb_define_method(cFXLabel.klass, "disable", VALUEFUNC(_wrap_FXLabel_disable), -1);
@@ -4362,6 +4789,8 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXLabel.klass, "contains", VALUEFUNC(_wrap_FXLabel_contains), -1);
     rb_define_method(cFXLabel.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXLabel_doesSaveUnder), -1);
     rb_define_method(cFXLabel.klass, "setBackColor", VALUEFUNC(_wrap_FXLabel_setBackColor), -1);
+    rb_define_method(cFXLabel.klass, "setShape", VALUEFUNC(_wrap_FXLabel_setShape), -1);
+    rb_define_method(cFXLabel.klass, "clearShape", VALUEFUNC(_wrap_FXLabel_clearShape), -1);
     cFXLabel.mark = (void (*)(void *)) FXRbLabel::markfunc;
     cFXLabel.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -4418,6 +4847,7 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXButton.klass, "canFocus", VALUEFUNC(_wrap_FXButton_canFocus), -1);
     rb_define_method(cFXButton.klass, "setFocus", VALUEFUNC(_wrap_FXButton_setFocus), -1);
     rb_define_method(cFXButton.klass, "killFocus", VALUEFUNC(_wrap_FXButton_killFocus), -1);
+    rb_define_method(cFXButton.klass, "changeFocus", VALUEFUNC(_wrap_FXButton_changeFocus), -1);
     rb_define_method(cFXButton.klass, "setDefault", VALUEFUNC(_wrap_FXButton_setDefault), -1);
     rb_define_method(cFXButton.klass, "enable", VALUEFUNC(_wrap_FXButton_enable), -1);
     rb_define_method(cFXButton.klass, "disable", VALUEFUNC(_wrap_FXButton_disable), -1);
@@ -4434,6 +4864,8 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXButton.klass, "contains", VALUEFUNC(_wrap_FXButton_contains), -1);
     rb_define_method(cFXButton.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXButton_doesSaveUnder), -1);
     rb_define_method(cFXButton.klass, "setBackColor", VALUEFUNC(_wrap_FXButton_setBackColor), -1);
+    rb_define_method(cFXButton.klass, "setShape", VALUEFUNC(_wrap_FXButton_setShape), -1);
+    rb_define_method(cFXButton.klass, "clearShape", VALUEFUNC(_wrap_FXButton_clearShape), -1);
     cFXButton.mark = (void (*)(void *)) FXRbButton::markfunc;
     cFXButton.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -4489,6 +4921,7 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXCheckButton.klass, "canFocus", VALUEFUNC(_wrap_FXCheckButton_canFocus), -1);
     rb_define_method(cFXCheckButton.klass, "setFocus", VALUEFUNC(_wrap_FXCheckButton_setFocus), -1);
     rb_define_method(cFXCheckButton.klass, "killFocus", VALUEFUNC(_wrap_FXCheckButton_killFocus), -1);
+    rb_define_method(cFXCheckButton.klass, "changeFocus", VALUEFUNC(_wrap_FXCheckButton_changeFocus), -1);
     rb_define_method(cFXCheckButton.klass, "setDefault", VALUEFUNC(_wrap_FXCheckButton_setDefault), -1);
     rb_define_method(cFXCheckButton.klass, "enable", VALUEFUNC(_wrap_FXCheckButton_enable), -1);
     rb_define_method(cFXCheckButton.klass, "disable", VALUEFUNC(_wrap_FXCheckButton_disable), -1);
@@ -4505,6 +4938,8 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXCheckButton.klass, "contains", VALUEFUNC(_wrap_FXCheckButton_contains), -1);
     rb_define_method(cFXCheckButton.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXCheckButton_doesSaveUnder), -1);
     rb_define_method(cFXCheckButton.klass, "setBackColor", VALUEFUNC(_wrap_FXCheckButton_setBackColor), -1);
+    rb_define_method(cFXCheckButton.klass, "setShape", VALUEFUNC(_wrap_FXCheckButton_setShape), -1);
+    rb_define_method(cFXCheckButton.klass, "clearShape", VALUEFUNC(_wrap_FXCheckButton_clearShape), -1);
     cFXCheckButton.mark = (void (*)(void *)) FXRbCheckButton::markfunc;
     cFXCheckButton.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"MENUBUTTON_AUTOGRAY", INT2NUM(MENUBUTTON_AUTOGRAY));
@@ -4567,6 +5002,7 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXMenuButton.klass, "canFocus", VALUEFUNC(_wrap_FXMenuButton_canFocus), -1);
     rb_define_method(cFXMenuButton.klass, "setFocus", VALUEFUNC(_wrap_FXMenuButton_setFocus), -1);
     rb_define_method(cFXMenuButton.klass, "killFocus", VALUEFUNC(_wrap_FXMenuButton_killFocus), -1);
+    rb_define_method(cFXMenuButton.klass, "changeFocus", VALUEFUNC(_wrap_FXMenuButton_changeFocus), -1);
     rb_define_method(cFXMenuButton.klass, "setDefault", VALUEFUNC(_wrap_FXMenuButton_setDefault), -1);
     rb_define_method(cFXMenuButton.klass, "enable", VALUEFUNC(_wrap_FXMenuButton_enable), -1);
     rb_define_method(cFXMenuButton.klass, "disable", VALUEFUNC(_wrap_FXMenuButton_disable), -1);
@@ -4583,6 +5019,8 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXMenuButton.klass, "contains", VALUEFUNC(_wrap_FXMenuButton_contains), -1);
     rb_define_method(cFXMenuButton.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXMenuButton_doesSaveUnder), -1);
     rb_define_method(cFXMenuButton.klass, "setBackColor", VALUEFUNC(_wrap_FXMenuButton_setBackColor), -1);
+    rb_define_method(cFXMenuButton.klass, "setShape", VALUEFUNC(_wrap_FXMenuButton_setShape), -1);
+    rb_define_method(cFXMenuButton.klass, "clearShape", VALUEFUNC(_wrap_FXMenuButton_clearShape), -1);
     cFXMenuButton.mark = (void (*)(void *)) FXRbMenuButton::markfunc;
     cFXMenuButton.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -4615,6 +5053,7 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXOption.klass, "canFocus", VALUEFUNC(_wrap_FXOption_canFocus), -1);
     rb_define_method(cFXOption.klass, "setFocus", VALUEFUNC(_wrap_FXOption_setFocus), -1);
     rb_define_method(cFXOption.klass, "killFocus", VALUEFUNC(_wrap_FXOption_killFocus), -1);
+    rb_define_method(cFXOption.klass, "changeFocus", VALUEFUNC(_wrap_FXOption_changeFocus), -1);
     rb_define_method(cFXOption.klass, "setDefault", VALUEFUNC(_wrap_FXOption_setDefault), -1);
     rb_define_method(cFXOption.klass, "enable", VALUEFUNC(_wrap_FXOption_enable), -1);
     rb_define_method(cFXOption.klass, "disable", VALUEFUNC(_wrap_FXOption_disable), -1);
@@ -4631,6 +5070,8 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXOption.klass, "contains", VALUEFUNC(_wrap_FXOption_contains), -1);
     rb_define_method(cFXOption.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXOption_doesSaveUnder), -1);
     rb_define_method(cFXOption.klass, "setBackColor", VALUEFUNC(_wrap_FXOption_setBackColor), -1);
+    rb_define_method(cFXOption.klass, "setShape", VALUEFUNC(_wrap_FXOption_setShape), -1);
+    rb_define_method(cFXOption.klass, "clearShape", VALUEFUNC(_wrap_FXOption_clearShape), -1);
     cFXOption.mark = (void (*)(void *)) FXRbOption::markfunc;
     cFXOption.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -4674,6 +5115,7 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXOptionMenu.klass, "canFocus", VALUEFUNC(_wrap_FXOptionMenu_canFocus), -1);
     rb_define_method(cFXOptionMenu.klass, "setFocus", VALUEFUNC(_wrap_FXOptionMenu_setFocus), -1);
     rb_define_method(cFXOptionMenu.klass, "killFocus", VALUEFUNC(_wrap_FXOptionMenu_killFocus), -1);
+    rb_define_method(cFXOptionMenu.klass, "changeFocus", VALUEFUNC(_wrap_FXOptionMenu_changeFocus), -1);
     rb_define_method(cFXOptionMenu.klass, "setDefault", VALUEFUNC(_wrap_FXOptionMenu_setDefault), -1);
     rb_define_method(cFXOptionMenu.klass, "enable", VALUEFUNC(_wrap_FXOptionMenu_enable), -1);
     rb_define_method(cFXOptionMenu.klass, "disable", VALUEFUNC(_wrap_FXOptionMenu_disable), -1);
@@ -4690,6 +5132,8 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXOptionMenu.klass, "contains", VALUEFUNC(_wrap_FXOptionMenu_contains), -1);
     rb_define_method(cFXOptionMenu.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXOptionMenu_doesSaveUnder), -1);
     rb_define_method(cFXOptionMenu.klass, "setBackColor", VALUEFUNC(_wrap_FXOptionMenu_setBackColor), -1);
+    rb_define_method(cFXOptionMenu.klass, "setShape", VALUEFUNC(_wrap_FXOptionMenu_setShape), -1);
+    rb_define_method(cFXOptionMenu.klass, "clearShape", VALUEFUNC(_wrap_FXOptionMenu_clearShape), -1);
     cFXOptionMenu.mark = (void (*)(void *)) FXRbOptionMenu::markfunc;
     cFXOptionMenu.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"RADIOBUTTON_AUTOGRAY", INT2NUM(RADIOBUTTON_AUTOGRAY));
@@ -4741,6 +5185,7 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXRadioButton.klass, "canFocus", VALUEFUNC(_wrap_FXRadioButton_canFocus), -1);
     rb_define_method(cFXRadioButton.klass, "setFocus", VALUEFUNC(_wrap_FXRadioButton_setFocus), -1);
     rb_define_method(cFXRadioButton.klass, "killFocus", VALUEFUNC(_wrap_FXRadioButton_killFocus), -1);
+    rb_define_method(cFXRadioButton.klass, "changeFocus", VALUEFUNC(_wrap_FXRadioButton_changeFocus), -1);
     rb_define_method(cFXRadioButton.klass, "setDefault", VALUEFUNC(_wrap_FXRadioButton_setDefault), -1);
     rb_define_method(cFXRadioButton.klass, "enable", VALUEFUNC(_wrap_FXRadioButton_enable), -1);
     rb_define_method(cFXRadioButton.klass, "disable", VALUEFUNC(_wrap_FXRadioButton_disable), -1);
@@ -4757,6 +5202,8 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXRadioButton.klass, "contains", VALUEFUNC(_wrap_FXRadioButton_contains), -1);
     rb_define_method(cFXRadioButton.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXRadioButton_doesSaveUnder), -1);
     rb_define_method(cFXRadioButton.klass, "setBackColor", VALUEFUNC(_wrap_FXRadioButton_setBackColor), -1);
+    rb_define_method(cFXRadioButton.klass, "setShape", VALUEFUNC(_wrap_FXRadioButton_setShape), -1);
+    rb_define_method(cFXRadioButton.klass, "clearShape", VALUEFUNC(_wrap_FXRadioButton_clearShape), -1);
     cFXRadioButton.mark = (void (*)(void *)) FXRbRadioButton::markfunc;
     cFXRadioButton.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"TAB_TOP", INT2NUM(TAB_TOP));
@@ -4797,6 +5244,7 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXTabItem.klass, "canFocus", VALUEFUNC(_wrap_FXTabItem_canFocus), -1);
     rb_define_method(cFXTabItem.klass, "setFocus", VALUEFUNC(_wrap_FXTabItem_setFocus), -1);
     rb_define_method(cFXTabItem.klass, "killFocus", VALUEFUNC(_wrap_FXTabItem_killFocus), -1);
+    rb_define_method(cFXTabItem.klass, "changeFocus", VALUEFUNC(_wrap_FXTabItem_changeFocus), -1);
     rb_define_method(cFXTabItem.klass, "setDefault", VALUEFUNC(_wrap_FXTabItem_setDefault), -1);
     rb_define_method(cFXTabItem.klass, "enable", VALUEFUNC(_wrap_FXTabItem_enable), -1);
     rb_define_method(cFXTabItem.klass, "disable", VALUEFUNC(_wrap_FXTabItem_disable), -1);
@@ -4813,6 +5261,8 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXTabItem.klass, "contains", VALUEFUNC(_wrap_FXTabItem_contains), -1);
     rb_define_method(cFXTabItem.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXTabItem_doesSaveUnder), -1);
     rb_define_method(cFXTabItem.klass, "setBackColor", VALUEFUNC(_wrap_FXTabItem_setBackColor), -1);
+    rb_define_method(cFXTabItem.klass, "setShape", VALUEFUNC(_wrap_FXTabItem_setShape), -1);
+    rb_define_method(cFXTabItem.klass, "clearShape", VALUEFUNC(_wrap_FXTabItem_clearShape), -1);
     cFXTabItem.mark = (void (*)(void *)) FXRbTabItem::markfunc;
     cFXTabItem.destroy = (void (*)(void *)) FXRbObject::freefunc;
     rb_define_const(mFox,"TOGGLEBUTTON_AUTOGRAY", INT2NUM(TOGGLEBUTTON_AUTOGRAY));
@@ -4870,6 +5320,7 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXToggleButton.klass, "canFocus", VALUEFUNC(_wrap_FXToggleButton_canFocus), -1);
     rb_define_method(cFXToggleButton.klass, "setFocus", VALUEFUNC(_wrap_FXToggleButton_setFocus), -1);
     rb_define_method(cFXToggleButton.klass, "killFocus", VALUEFUNC(_wrap_FXToggleButton_killFocus), -1);
+    rb_define_method(cFXToggleButton.klass, "changeFocus", VALUEFUNC(_wrap_FXToggleButton_changeFocus), -1);
     rb_define_method(cFXToggleButton.klass, "setDefault", VALUEFUNC(_wrap_FXToggleButton_setDefault), -1);
     rb_define_method(cFXToggleButton.klass, "enable", VALUEFUNC(_wrap_FXToggleButton_enable), -1);
     rb_define_method(cFXToggleButton.klass, "disable", VALUEFUNC(_wrap_FXToggleButton_disable), -1);
@@ -4886,6 +5337,8 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXToggleButton.klass, "contains", VALUEFUNC(_wrap_FXToggleButton_contains), -1);
     rb_define_method(cFXToggleButton.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXToggleButton_doesSaveUnder), -1);
     rb_define_method(cFXToggleButton.klass, "setBackColor", VALUEFUNC(_wrap_FXToggleButton_setBackColor), -1);
+    rb_define_method(cFXToggleButton.klass, "setShape", VALUEFUNC(_wrap_FXToggleButton_setShape), -1);
+    rb_define_method(cFXToggleButton.klass, "clearShape", VALUEFUNC(_wrap_FXToggleButton_clearShape), -1);
     cFXToggleButton.mark = (void (*)(void *)) FXRbToggleButton::markfunc;
     cFXToggleButton.destroy = (void (*)(void *)) FXRbObject::freefunc;
     
@@ -4933,6 +5386,7 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXPicker.klass, "canFocus", VALUEFUNC(_wrap_FXPicker_canFocus), -1);
     rb_define_method(cFXPicker.klass, "setFocus", VALUEFUNC(_wrap_FXPicker_setFocus), -1);
     rb_define_method(cFXPicker.klass, "killFocus", VALUEFUNC(_wrap_FXPicker_killFocus), -1);
+    rb_define_method(cFXPicker.klass, "changeFocus", VALUEFUNC(_wrap_FXPicker_changeFocus), -1);
     rb_define_method(cFXPicker.klass, "setDefault", VALUEFUNC(_wrap_FXPicker_setDefault), -1);
     rb_define_method(cFXPicker.klass, "enable", VALUEFUNC(_wrap_FXPicker_enable), -1);
     rb_define_method(cFXPicker.klass, "disable", VALUEFUNC(_wrap_FXPicker_disable), -1);
@@ -4949,6 +5403,8 @@ SWIGEXPORT(void) Init_label(void) {
     rb_define_method(cFXPicker.klass, "contains", VALUEFUNC(_wrap_FXPicker_contains), -1);
     rb_define_method(cFXPicker.klass, "doesSaveUnder", VALUEFUNC(_wrap_FXPicker_doesSaveUnder), -1);
     rb_define_method(cFXPicker.klass, "setBackColor", VALUEFUNC(_wrap_FXPicker_setBackColor), -1);
+    rb_define_method(cFXPicker.klass, "setShape", VALUEFUNC(_wrap_FXPicker_setShape), -1);
+    rb_define_method(cFXPicker.klass, "clearShape", VALUEFUNC(_wrap_FXPicker_clearShape), -1);
     cFXPicker.mark = (void (*)(void *)) FXRbPicker::markfunc;
     cFXPicker.destroy = (void (*)(void *)) FXRbObject::freefunc;
 }