fxruby 1.6.50 → 1.6.51

data/ext/fox16_c/list_wrap.cpp

@@ -1,13 +1,13 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (https://www.swig.org).
- * Version 4.2.0
+ * Version 4.5.0
  *
  * Do not make changes to this file unless you know what you are doing - modify
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
 
-#define SWIG_VERSION 0x040200
+#define SWIG_VERSION 0x040500
 #define SWIGRUBY
 
 /* -----------------------------------------------------------------------------
@@ -134,12 +134,43 @@
 # pragma warning disable 592
 #endif
 
-#if __cplusplus >=201103L
-# define SWIG_NULLPTR nullptr
+#if defined(__cplusplus) && __cplusplus >= 201103L
+# define SWIG_NOEXCEPT noexcept
 #else
-# define SWIG_NULLPTR NULL
+# define SWIG_NOEXCEPT throw()
 #endif 
 
+#define SWIG_QUOTE_STRING(x) #x
+#define SWIG_STRINGIFY(x) SWIG_QUOTE_STRING(x)
+
+/* -----------------------------------------------------------------------------
+ * swigcompat.swg
+ *
+ * Macros to provide support compatibility with older C and C++ standards.
+ *
+ * Note that SWIG expects __cplusplus to be defined to the appropriate C++ standard.
+ * MSVC users are urged to check and examine the /Zc:__cplusplus compiler option.
+ * See https://learn.microsoft.com/en-us/cpp/build/reference/zc-cplusplus.
+ * ----------------------------------------------------------------------------- */
+
+/* C99 and C++11 should provide snprintf, but define SWIG_NO_SNPRINTF
+ * if you're missing it.
+ */
+#if ((defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) || \
+     (defined __cplusplus && __cplusplus >= 201103L) || \
+     defined SWIG_HAVE_SNPRINTF) && \
+    !defined SWIG_NO_SNPRINTF
+# define SWIG_snprintf(O,S,F,A) snprintf(O,S,F,A)
+# define SWIG_snprintf2(O,S,F,A,B) snprintf(O,S,F,A,B)
+#else
+/* Fallback versions ignore the buffer size, but most of our uses either have a
+ * fixed maximum possible size or dynamically allocate a buffer that's large
+ * enough.
+ */
+# define SWIG_snprintf(O,S,F,A) sprintf(O,F,A)
+# define SWIG_snprintf2(O,S,F,A,B) sprintf(O,F,A,B)
+#endif
+
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
  *  declarations/attributes, and other compiler dependent labels.
@@ -264,12 +295,15 @@
 # pragma warning disable 592
 #endif
 
-#if __cplusplus >=201103L
-# define SWIG_NULLPTR nullptr
+#if defined(__cplusplus) && __cplusplus >= 201103L
+# define SWIG_NOEXCEPT noexcept
 #else
-# define SWIG_NULLPTR NULL
+# define SWIG_NOEXCEPT throw()
 #endif 
 
+#define SWIG_QUOTE_STRING(x) #x
+#define SWIG_STRINGIFY(x) SWIG_QUOTE_STRING(x)
+
 /* -----------------------------------------------------------------------------
  * swigrun.swg
  *
@@ -279,13 +313,11 @@
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "4"
+#define SWIG_RUNTIME_VERSION "5"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
-# define SWIG_QUOTE_STRING(x) #x
-# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x)
-# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE)
+# define SWIG_TYPE_TABLE_NAME SWIG_STRINGIFY(SWIG_TYPE_TABLE)
 #else
 # define SWIG_TYPE_TABLE_NAME
 #endif
@@ -453,23 +485,6 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
-/* C99 and C++11 should provide snprintf, but define SWIG_NO_SNPRINTF
- * if you're missing it.
- */
-#if ((defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) || \
-     (defined __cplusplus && __cplusplus >= 201103L) || \
-     defined SWIG_HAVE_SNPRINTF) && \
-    !defined SWIG_NO_SNPRINTF
-# define SWIG_snprintf(O,S,F,A) snprintf(O,S,F,A)
-# define SWIG_snprintf2(O,S,F,A,B) snprintf(O,S,F,A,B)
-#else
-/* Fallback versions ignore the buffer size, but most of our uses either have a
- * fixed maximum possible size or dynamically allocate a buffer that's large
- * enough.
- */
-# define SWIG_snprintf(O,S,F,A) sprintf(O,F,A)
-# define SWIG_snprintf2(O,S,F,A,B) sprintf(O,F,A,B)
-#endif
 
 #include <string.h>
 
@@ -494,8 +509,8 @@ typedef struct swig_type_info {
 typedef struct swig_cast_info {
   swig_type_info         *type;			/* pointer to type that is equivalent to this type */
   swig_converter_func     converter;		/* function to cast the void pointers */
-  struct swig_cast_info  *next;			/* pointer to next cast in linked list */
-  struct swig_cast_info  *prev;			/* pointer to the previous cast */
+  struct swig_cast_info  *next;			/* pointer to next array of casts | pointer to cast hashed by value */
+  unsigned int            value;		/* index of the last valid element in the array | typename hash value */
 } swig_cast_info;
 
 /* Structure used to store module information
@@ -556,55 +571,147 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
   return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
+/*
+ * Hash function for type name strings, based on maRushPrime1Hash (http://amsoftware.narod.ru/algo2.html)
+ */
+SWIGRUNTIME unsigned int SWIG_Hash(const char *str, unsigned int len) {
+  const unsigned char *data = (const unsigned char *)str;
+  unsigned int hash = len, i = 0, k;
+  int rem = (int)len;
+
+  while (rem >= (int)sizeof(unsigned int)) {
+    memcpy(&k, data, sizeof(unsigned int));
+    k += i++;
+    hash ^= k;
+    hash *= 171717;
+    data += sizeof(unsigned int);
+    rem -= (int)sizeof(unsigned int);
+  }
+
+  switch (rem) {
+    case 3: k = (unsigned int)(data[2]) << 16;
+            k |= (unsigned int)(data[1]) << 8;
+            k |= (unsigned int)(data[0]);
+            k += i++;
+            hash ^= k;
+            hash *= 171717;
+            break;
+    case 2: k = (unsigned int)(data[1]) << 8;
+            k |= (unsigned int)(data[0]);
+            k += i++;
+            hash ^= k;
+            hash *= 171717;
+            break;
+    case 1: k = (unsigned int)(data[0]);
+            k += i++;
+            hash ^= k;
+            hash *= 171717;
+            break;
+  }
+  return hash;
+}
+
 /*
   Check the typename
 */
 SWIGRUNTIME swig_cast_info *
 SWIG_TypeCheck(const char *c, swig_type_info *ty) {
+  static const unsigned int scan_threshold = 4;
   if (ty) {
-    swig_cast_info *iter = ty->cast;
-    while (iter) {
-      if (strcmp(iter->type->name, c) == 0) {
-        if (iter == ty->cast)
-          return iter;
-        /* Move iter to the top of the linked list */
-        iter->prev->next = iter->next;
-        if (iter->next)
-          iter->next->prev = iter->prev;
-        iter->next = ty->cast;
-        iter->prev = 0;
-        if (ty->cast) ty->cast->prev = iter;
-        ty->cast = iter;
-        return iter;
+    swig_cast_info *head = ty->cast;
+    unsigned int hash_value = 0;
+    int hashed = 0;
+
+    while (head) {
+
+      if (strcmp(head->type->name, c) == 0) {
+        return head;
       }
-      iter = iter->next;
+
+      if (head->value) {
+        swig_cast_info *iter;
+        swig_cast_info *last = head + head->value;
+        swig_cast_info *first = head + 1;
+        int search = 1;
+
+        if (!hashed) {
+          if (head->value < scan_threshold) {
+            for (iter = first; iter <= last; iter++) {
+              if (strcmp(iter->type->name, c) == 0) {
+                return iter;
+              }
+            }
+            search = 0;
+          } else {
+            hashed = 1;
+            hash_value = SWIG_Hash(c, (unsigned int)strlen(c));
+          }
+        }
+
+        if (search) {
+          /* Binary search over sorted <'next'|'value'> pairs */
+          do {
+            iter = first + ((last - first) >> 1);
+            if (iter->value < hash_value) {
+              first = iter + 1;
+            } else if (iter->value == hash_value) {
+
+              if (strcmp(iter->next->type->name, c) == 0) {
+                return iter->next;
+              }
+
+              /* Hash collision check */
+              for (last = iter + 1; last->next && last->value == hash_value; last++) {
+                if (strcmp(last->next->type->name, c) == 0) {
+                  return last->next;
+                }
+              }
+              for (first = iter - 1; first != head && first->value == hash_value; first--) {
+                if (strcmp(first->next->type->name, c) == 0) {
+                  return first->next;
+                }
+              }
+              break;
+            } else
+              last = iter - 1;
+          } while (first <= last);
+        }
+      }
+      head = head->next;
     }
   }
   return 0;
 }
 
 /*
-  Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
+  Check the type by type address
 */
 SWIGRUNTIME swig_cast_info *
 SWIG_TypeCheckStruct(const swig_type_info *from, swig_type_info *ty) {
   if (ty) {
-    swig_cast_info *iter = ty->cast;
-    while (iter) {
-      if (iter->type == from) {
-        if (iter == ty->cast)
-          return iter;
-        /* Move iter to the top of the linked list */
-        iter->prev->next = iter->next;
-        if (iter->next)
-          iter->next->prev = iter->prev;
-        iter->next = ty->cast;
-        iter->prev = 0;
-        if (ty->cast) ty->cast->prev = iter;
-        ty->cast = iter;
-        return iter;
+    swig_cast_info *head = ty->cast;
+    while (head) {
+      if (head->type == from) {
+        return head;
       }
-      iter = iter->next;
+
+      if (head->value) {
+        swig_cast_info *iter;
+        swig_cast_info *last = head + head->value;
+        swig_cast_info *first = head + 1;
+
+        /* Binary search over sorted array of casts */
+        do {
+          iter = first + ((last - first) >> 1);
+          if (iter->type < from) {
+            first = iter + 1;
+          } else if (iter->type == from) {
+            return iter;
+          } else
+            last = iter - 1;
+        } while (first <= last);
+      }
+      head = head->next;
     }
   }
   return 0;
@@ -667,20 +774,24 @@ SWIG_TypePrettyName(const swig_type_info *type) {
 */
 SWIGRUNTIME void
 SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
-  swig_cast_info *cast = ti->cast;
+  swig_cast_info *head = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
 
-  while (cast) {
-    if (!cast->converter) {
-      swig_type_info *tc = cast->type;
-      if (!tc->clientdata) {
-	SWIG_TypeClientData(tc, clientdata);
+  while (head) {
+    swig_cast_info *cast;
+    for (cast = head; (unsigned int)(cast - head) <= head->value; cast++) {
+      if (!cast->converter) {
+        swig_type_info *tc = cast->type;
+        if (!tc->clientdata) {
+          SWIG_TypeClientData(tc, clientdata);
+        }
       }
     }
-    cast = cast->next;
+    head = head->next;
   }
 }
+
 SWIGRUNTIME void
 SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
@@ -819,7 +930,7 @@ SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) {
   if ((2*sizeof(void *) + 2) > bsz) return 0;
   *(r++) = '_';
   r = SWIG_PackData(r,&ptr,sizeof(void *));
-  if (strlen(name) + 1 > (bsz - (r - buff))) return 0;
+  if (strlen(name) + 1 > (bsz - (size_t)(r - buff))) return 0;
   strcpy(r,name);
   return buff;
 }
@@ -898,20 +1009,7 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 #endif
 
-      #include <ruby.h>
-
-      #if defined(RB_METHOD_DEFINITION_DECL)
-      # define RUBY_VALUE_METHOD_FUNC(func) (func)
-      # define RUBY_INT_METHOD_FUNC(func) (func)
-      # define RUBY_VOID_METHOD_FUNC(func) (func)
-      # define RUBY_VOIDP_METHOD_FUNC(func) (func)
-      #else
-      # define RUBY_VALUE_METHOD_FUNC(func) ((VALUE (*)(ANYARGS))(func))
-      # define RUBY_INT_METHOD_FUNC(func) ((int (*)(ANYARGS))(func))
-      # define RUBY_VOID_METHOD_FUNC(func) ((void (*)(ANYARGS))(func))
-      # define RUBY_VOIDP_METHOD_FUNC(func) ((void *(*)(ANYARGS))(func))
-      #endif
-
+#include <ruby.h>
 #include <ruby/version.h> /* For RUBY_API_VERSION_CODE */
 
 #if __GNUC__ >= 7
@@ -1012,7 +1110,15 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #ifndef RTYPEDDATA_P
 # define RTYPEDDATA_P(x) (TYPE(x) != T_DATA)
 #endif
+#ifndef TYPED_DATA_EMBEDDED
+# define RTYPEDDATA_GET_DATA(x) RTYPEDDATA_DATA(x)
+#endif
 
+struct ruby_wrapped_object {
+  void *data;
+  void (*dmark)(void *);
+  void (*dfree)(void *);
+};
 
 
 /*
@@ -1095,15 +1201,12 @@ static VALUE _mSWIG = Qnil;
 
 
 /* Define custom exceptions for errors that do not map to existing Ruby
-   exceptions.  Note this only works for C++ since a global cannot be
-   initialized by a function in C.  For C, fallback to rb_eRuntimeError.*/
+   exceptions. */
 
 SWIGINTERN VALUE 
 getNullReferenceError(void) {
-  static int init = 0;
-  static VALUE rb_eNullReferenceError ;
-  if (!init) {
-    init = 1;
+  static VALUE rb_eNullReferenceError = Qnil;
+  if (rb_eNullReferenceError == Qnil) {
     rb_eNullReferenceError = rb_define_class("NullReferenceError", rb_eRuntimeError);
   }
   return rb_eNullReferenceError;
@@ -1111,10 +1214,8 @@ getNullReferenceError(void) {
 
 SWIGINTERN VALUE 
 getObjectPreviouslyDeletedError(void) {
-  static int init = 0;
-  static VALUE rb_eObjectPreviouslyDeleted ;
-  if (!init) {
-    init = 1;
+  static VALUE rb_eObjectPreviouslyDeleted = Qnil;
+  if (rb_eObjectPreviouslyDeleted == Qnil) {
     rb_eObjectPreviouslyDeleted = rb_define_class("ObjectPreviouslyDeleted", rb_eRuntimeError);
   }
   return rb_eObjectPreviouslyDeleted;
@@ -1353,7 +1454,7 @@ SWIGRUNTIME void SWIG_RubyUnlinkObjects(void* ptr) {
     // object might have the T_ZOMBIE type, but that's just
     // because the GC has flagged it as such for a deferred
     // destruction. Until then, it's still a T_DATA object.
-    DATA_PTR(object) = 0;
+    ((struct ruby_wrapped_object *)RTYPEDDATA_GET_DATA(object))->data = 0;
   }
 }
 
@@ -1386,8 +1487,8 @@ extern "C" {
 #endif
 
 SWIGINTERN VALUE
-SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
-  if (NIL_P(target)) {
+SWIG_Ruby_AppendOutput(VALUE target, VALUE o, int is_void) {
+  if (NIL_P(target) && is_void) {
     target = o;
   } else {
     if (TYPE(target) != T_ARRAY) {
@@ -1485,6 +1586,7 @@ typedef struct {
   VALUE mImpl;
   void  (*mark)(void *);
   void  (*destroy)(void *);
+  rb_data_type_t cext_type;
   int trackObjects;
 } swig_class;
 
@@ -1530,10 +1632,8 @@ static ID swig_lowerthan_id = 0;
 
 SWIGRUNTIME VALUE 
 getExceptionClass(void) {
-  static int init = 0;
-  static VALUE rubyExceptionClass ;
-  if (!init) {
-    init = 1;
+  static VALUE rubyExceptionClass = Qnil;
+  if (rubyExceptionClass == Qnil) {
     rubyExceptionClass = rb_const_get(_mSWIG, rb_intern("Exception"));
   }
   return rubyExceptionClass;
@@ -1580,6 +1680,27 @@ SWIG_Ruby_define_class(swig_type_info *type)
   free((void *) klass_name);
 }
 
+static void SWIG_Ruby_mark_swig_type(void *_wrobj)
+{
+  struct ruby_wrapped_object *wrobj = (struct ruby_wrapped_object *)_wrobj;
+  if (wrobj->dmark) {
+    wrobj->dmark(wrobj->data);
+  }
+}
+
+static void SWIG_Ruby_free_swig_type(void *_wrobj)
+{
+  struct ruby_wrapped_object *wrobj = (struct ruby_wrapped_object *)_wrobj;
+  if (wrobj->dfree) {
+    wrobj->dfree(wrobj->data);
+  }
+  free(wrobj);
+}
+
+static const rb_data_type_t swig_type_type = {
+    .wrap_struct_name = "swig_type"
+};
+
 /* Create a new pointer object */
 SWIGRUNTIME VALUE
 SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
@@ -1590,6 +1711,7 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
   swig_class *sklass;
   VALUE klass;
   VALUE obj;
+  struct ruby_wrapped_object *wrobj;
 
   if (!ptr)
     return Qnil;
@@ -1617,10 +1739,11 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
     }
 
     /* Create a new Ruby object */
-    obj = Data_Wrap_Struct(sklass->klass, VOIDFUNC(sklass->mark), 
-			   ( own ? VOIDFUNC(sklass->destroy) : 
-			     (track ? VOIDFUNC(SWIG_RubyRemoveTracking) : 0 )
-			     ), ptr);
+    obj = TypedData_Make_Struct(sklass->klass, struct ruby_wrapped_object, &sklass->cext_type, wrobj);
+    wrobj->data = ptr;
+    wrobj->dmark = sklass->mark;
+    wrobj->dfree = own ? sklass->destroy:
+                  (track ? VOIDFUNC(SWIG_RubyRemoveTracking) : 0 );
 
     /* If tracking is on for this class then track this object. */
     if (track) {
@@ -1632,7 +1755,11 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
     SWIG_snprintf(klass_name, klass_len, "TYPE%s", type->name);
     klass = rb_const_get(_mSWIG, rb_intern(klass_name));
     free((void *) klass_name);
-    obj = Data_Wrap_Struct(klass, 0, 0, ptr);
+
+    obj = TypedData_Make_Struct(klass, struct ruby_wrapped_object, &swig_type_type, wrobj);
+    wrobj->data = ptr;
+    wrobj->dmark = 0;
+    wrobj->dfree = 0;
   }
   rb_iv_set(obj, "@__swigtype__", rb_str_new2(type->name));
 
@@ -1645,7 +1772,13 @@ SWIG_Ruby_NewClassInstance(VALUE klass, swig_type_info *type)
 {
   VALUE obj;
   swig_class *sklass = (swig_class *) type->clientdata;
-  obj = Data_Wrap_Struct(klass, VOIDFUNC(sklass->mark), VOIDFUNC(sklass->destroy), 0);
+  struct ruby_wrapped_object *wrobj;
+
+  obj = TypedData_Make_Struct(klass, struct ruby_wrapped_object, &sklass->cext_type, wrobj);
+  wrobj->data = 0;
+  wrobj->dmark = sklass->mark;
+  wrobj->dfree = sklass->destroy;
+
   rb_iv_set(obj, "@__swigtype__", rb_str_new2(type->name));
   return obj;
 }
@@ -1669,9 +1802,10 @@ typedef struct {
 SWIGRUNTIME swig_ruby_owntype
 SWIG_Ruby_AcquirePtr(VALUE obj, swig_ruby_owntype own) {
   swig_ruby_owntype oldown = {0, 0};
-  if (TYPE(obj) == T_DATA && !RTYPEDDATA_P(obj)) {
-    oldown.datafree = RDATA(obj)->dfree;
-    RDATA(obj)->dfree = own.datafree;
+  if (RB_TYPE_P(obj, RUBY_T_DATA) && RTYPEDDATA_P(obj)) {
+    struct ruby_wrapped_object *wrobj = (struct ruby_wrapped_object *)RTYPEDDATA_GET_DATA(obj);
+    oldown.datafree = wrobj->dfree;
+    wrobj->dfree = own.datafree;
   }
   return oldown;
 }
@@ -1683,26 +1817,27 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
   char *c;
   swig_cast_info *tc;
   void *vptr = 0;
+  struct ruby_wrapped_object *wrobj;
 
   /* Grab the pointer */
   if (NIL_P(obj)) {
     if (ptr)
       *ptr = 0;
     return (flags & SWIG_POINTER_NO_NULL) ? SWIG_NullReferenceError : SWIG_OK;
+  } else if (RB_TYPE_P(obj, RUBY_T_DATA) && RTYPEDDATA_P(obj)) {
+    wrobj = (struct ruby_wrapped_object *)RTYPEDDATA_GET_DATA(obj);
+    vptr = wrobj->data;
   } else {
-    if (TYPE(obj) != T_DATA || (TYPE(obj) == T_DATA && RTYPEDDATA_P(obj))) {
-      return SWIG_ERROR;
-    }
-    Data_Get_Struct(obj, void, vptr);
+    return SWIG_ERROR;
   }
   
   if (own) {
-    own->datafree = RDATA(obj)->dfree;
+    own->datafree = wrobj->dfree;
     own->own = 0;
   }
     
   if (((flags & SWIG_POINTER_RELEASE) == SWIG_POINTER_RELEASE)) {
-    if (!RDATA(obj)->dfree)
+    if (!wrobj->dfree)
       return SWIG_ERROR_RELEASE_NOT_OWNED;
   }
 
@@ -1725,14 +1860,14 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
        * when the Ruby object is garbage collected.  If we don't
        * do this, then it is possible we will return a reference 
        * to a Ruby object that no longer exists thereby crashing Ruby. */
-      RDATA(obj)->dfree = SWIG_RubyRemoveTracking;
+      wrobj->dfree = SWIG_RubyRemoveTracking;
     } else {    
-      RDATA(obj)->dfree = 0;
+      wrobj->dfree = 0;
     }
   }
 
   if (flags & SWIG_POINTER_CLEAR) {
-    DATA_PTR(obj) = 0;
+    wrobj->data = 0;
   }
 
   /* Do type-checking if type info was provided */
@@ -1816,6 +1951,11 @@ SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
   return SWIG_ERROR;
 }
 
+
+static const rb_data_type_t swig_runtime_data_type = {
+    .wrap_struct_name = "swig_runtime_data" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME
+};
+
 SWIGRUNTIME swig_module_info *
 SWIG_Ruby_GetModule(void *SWIGUNUSEDPARM(clientdata))
 {
@@ -1825,11 +1965,13 @@ SWIG_Ruby_GetModule(void *SWIGUNUSEDPARM(clientdata))
 
  /* temporarily disable warnings, since the pointer check causes warnings with 'ruby -w' */
   rb_gv_set("VERBOSE", Qfalse);
-  
+
   /* first check if pointer already created */
   pointer = rb_gv_get("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME);
   if (pointer != Qnil) {
-    Data_Get_Struct(pointer, swig_module_info, ret);
+    /* Can not use TypedData_Get_Struct because swig_runtime_data_type is not global, but once per file. */
+    if (!RB_TYPE_P(pointer, RUBY_T_DATA)) rb_check_typeddata(pointer, &swig_runtime_data_type);
+    ret = (swig_module_info *)RTYPEDDATA_GET_DATA(pointer);
   }
 
   /* reinstate warnings */
@@ -1841,10 +1983,10 @@ SWIGRUNTIME void
 SWIG_Ruby_SetModule(swig_module_info *pointer)
 {
   /* register a new class */
-  VALUE cl = rb_define_class("SWIG_RUNTIME_DATA", rb_cObject);rb_undef_alloc_func(cl);
+  VALUE cl = rb_define_class("swig_runtime_data", rb_cObject);
   rb_undef_alloc_func(cl);
   /* create and store the structure pointer to a global variable */
-  swig_runtime_data_type_pointer = Data_Wrap_Struct(cl, 0, 0, pointer);
+  swig_runtime_data_type_pointer = TypedData_Wrap_Struct(cl, &swig_runtime_data_type, pointer);
   rb_define_readonly_variable("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, &swig_runtime_data_type_pointer);
 }
 
@@ -1976,7 +2118,7 @@ static swig_module_info swig_module = {swig_types, 66, 0, 0, 0, 0};
 #define SWIG_init    Init_list
 #define SWIG_name    "List"
 
-
+static VALUE mList;
 
 #ifdef __cplusplus
 #include <utility>
@@ -1994,7 +2136,7 @@ template<typename T> class SwigValueWrapper {
 public:
   SwigValueWrapper() : pointer(0) { }
   SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; }
-#if __cplusplus >=201103L
+#if __cplusplus >= 201103L
   SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; }
   operator T&&() const { return std::move(*pointer.ptr); }
 #else
@@ -2017,12 +2159,18 @@ template <typename T> T SwigValueInit() {
   return T();
 }
 
-#if __cplusplus >=201103L
+#if __cplusplus >= 201103L
 # define SWIG_STD_MOVE(OBJ) std::move(OBJ)
 #else
 # define SWIG_STD_MOVE(OBJ) OBJ
 #endif
 
+#if __cplusplus >= 201103L
+# define SWIG_OVERRIDE override
+#else
+# define SWIG_OVERRIDE
+#endif
+
 #endif
 
 
@@ -2082,7 +2230,7 @@ inline void* to_FXEvent(VALUE obj){
     FXEventTypeInfo=SWIG_TypeQuery("FXEvent *");
     FXASSERT(FXEventTypeInfo!=0);
     }
-  SWIG_ConvertPtr(obj,&ptr,FXEventTypeInfo,1);
+  SWIG_ConvertPtr(obj,&ptr,FXEventTypeInfo,SWIG_POINTER_DISOWN);
   return ptr;
   }
 
@@ -2233,11 +2381,9 @@ SWIG_From_bool  (bool value)
 SWIGINTERN swig_type_info*
 SWIG_pchar_descriptor(void)
 {
-  static int init = 0;
   static swig_type_info* info = 0;
-  if (!init) {
+  if (!info) {
     info = SWIG_TypeQuery("_p_char");
-    init = 1;
   }
   return info;
 }
@@ -2252,7 +2398,7 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
     if (cptr)  {
       if (alloc) {
 	if (*alloc == SWIG_NEWOBJ) {
-	  *cptr = reinterpret_cast< char* >(memcpy(new char[size], cstr, sizeof(char)*(size)));
+	  *cptr = reinterpret_cast< char* >(memcpy(new char[size], cstr, sizeof(char)*(size_t)(size)));
 	} else {
 	  *cptr = cstr;
 	  *alloc = SWIG_OLDOBJ;
@@ -2356,8 +2502,8 @@ _wrap_FXListItem_allocate(int argc, VALUE *argv, VALUE self)
 SWIGINTERN VALUE
 _wrap_new_FXListItem(int argc, VALUE *argv, VALUE self) {
   FXString *arg1 = 0 ;
-  FXIcon *arg2 = (FXIcon *) 0 ;
-  void *arg3 = (void *) 0 ;
+  FXIcon *arg2 = 0 ;
+  void *arg3 = 0 ;
   SwigValueWrapper< FXString > p1 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
@@ -2379,7 +2525,7 @@ _wrap_new_FXListItem(int argc, VALUE *argv, VALUE self) {
   }
   {
     result = (FXListItem *)new_FXListItem((FXString const &)*arg1,arg2,arg3);
-    DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result);
+    ((struct ruby_wrapped_object *)RTYPEDDATA_GET_DATA(self))->data = result; FXRbRegisterRubyObj(self, result);
     if(rb_block_given_p()){
       rb_yield(self);
     }
@@ -2392,7 +2538,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_getText(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXString *result = 0 ;
@@ -2416,7 +2562,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_getIcon(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXIcon *result = 0 ;
@@ -2443,8 +2589,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_setData(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
-  VALUE arg2 = (VALUE) 0 ;
+  FXListItem *arg1 = 0 ;
+  VALUE arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -2466,7 +2612,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_getData(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   VALUE result;
@@ -2490,7 +2636,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_hasFocus(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -2514,7 +2660,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_isSelected(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -2538,7 +2684,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_isEnabled(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -2562,7 +2708,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_isDraggable(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -2586,7 +2732,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_save(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   FXStream *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2606,7 +2752,7 @@ _wrap_FXListItem_save(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXStream &","save", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","save", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","save", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXStream * >(argp2);
   FXListItem_save((FXListItem const *)arg1,*arg2);
@@ -2618,7 +2764,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_load(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   FXStream *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2638,7 +2784,7 @@ _wrap_FXListItem_load(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXStream &","load", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","load", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","load", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXStream * >(argp2);
   FXListItem_load(arg1,*arg2);
@@ -2650,7 +2796,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_setText(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   FXString *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2674,9 +2820,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_setIcon(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
-  FXIcon *arg2 = (FXIcon *) 0 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXListItem *arg1 = 0 ;
+  FXIcon *arg2 = 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -2707,7 +2853,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_setFocus(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   FXbool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2730,7 +2876,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_setSelected(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   FXbool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2753,7 +2899,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_setEnabled(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   FXbool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2776,7 +2922,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_setDraggable(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   FXbool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2799,8 +2945,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_getWidth(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
-  FXList *arg2 = (FXList *) 0 ;
+  FXListItem *arg1 = 0 ;
+  FXList *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -2831,8 +2977,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_getHeight(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
-  FXList *arg2 = (FXList *) 0 ;
+  FXListItem *arg1 = 0 ;
+  FXList *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -2863,7 +3009,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_create(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -2884,7 +3030,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_detach(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -2905,7 +3051,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXListItem_destroy(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -2928,10 +3074,10 @@ static swig_class SwigClassFXList;
 
 SWIGINTERN VALUE
 _wrap_FXList_onPaint(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -2964,10 +3110,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onEnter(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3000,10 +3146,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onLeave(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3036,10 +3182,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onUngrabbed(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3072,10 +3218,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onKeyPress(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3108,10 +3254,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onKeyRelease(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3144,10 +3290,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onLeftBtnPress(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3180,10 +3326,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onLeftBtnRelease(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3216,10 +3362,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onRightBtnPress(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3252,10 +3398,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onRightBtnRelease(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3288,10 +3434,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onMotion(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3324,10 +3470,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onFocusIn(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3360,10 +3506,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onFocusOut(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3396,10 +3542,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onAutoScroll(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3432,10 +3578,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onClicked(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3468,10 +3614,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onDoubleClicked(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3504,10 +3650,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onTripleClicked(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3540,10 +3686,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onCommand(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3576,10 +3722,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onQueryTip(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3612,10 +3758,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onQueryHelp(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3648,10 +3794,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onTipTimer(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3684,10 +3830,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onLookupTimer(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3720,10 +3866,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onCmdSetValue(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3756,10 +3902,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onCmdGetIntValue(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3792,10 +3938,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_onCmdSetIntValue(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
+  FXList *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
   FXSelector arg3 ;
-  void *arg4 = (void *) 0 ;
+  void *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3832,8 +3978,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_ascending(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
-  FXListItem *arg2 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
+  FXListItem *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3864,8 +4010,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_descending(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
-  FXListItem *arg2 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
+  FXListItem *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3896,8 +4042,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_ascendingCase(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
-  FXListItem *arg2 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
+  FXListItem *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3928,8 +4074,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_descendingCase(int argc, VALUE *argv, VALUE self) {
-  FXListItem *arg1 = (FXListItem *) 0 ;
-  FXListItem *arg2 = (FXListItem *) 0 ;
+  FXListItem *arg1 = 0 ;
+  FXListItem *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -3975,14 +4121,14 @@ _wrap_FXList_allocate(int argc, VALUE *argv, VALUE self)
 
 SWIGINTERN VALUE
 _wrap_new_FXList(int argc, VALUE *argv, VALUE self) {
-  FXComposite *arg1 = (FXComposite *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
-  FXSelector arg3 = (FXSelector) 0 ;
-  FXuint arg4 = (FXuint) LIST_NORMAL ;
-  FXint arg5 = (FXint) 0 ;
-  FXint arg6 = (FXint) 0 ;
-  FXint arg7 = (FXint) 0 ;
-  FXint arg8 = (FXint) 0 ;
+  FXComposite *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
+  FXSelector arg3 = 0 ;
+  FXuint arg4 = LIST_NORMAL ;
+  FXint arg5 = 0 ;
+  FXint arg6 = 0 ;
+  FXint arg7 = 0 ;
+  FXint arg8 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -4024,12 +4170,12 @@ _wrap_new_FXList(int argc, VALUE *argv, VALUE self) {
   }
   {
     if (!arg1) {
-      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+      SWIG_exception(SWIG_NullReferenceError,"Received a NULL pointer.");
     }
   }
   {
     result = (FXList *)new_FXList(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
-    DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result);
+    ((struct ruby_wrapped_object *)RTYPEDDATA_GET_DATA(self))->data = result; FXRbRegisterRubyObj(self, result);
     if(rb_block_given_p()){
       rb_yield(self);
     }
@@ -4042,7 +4188,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getNumItems(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -4066,7 +4212,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getNumVisible(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -4090,7 +4236,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setNumVisible(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4113,7 +4259,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4147,10 +4293,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setItem__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
-  FXListItem *arg3 = (FXListItem *) 0 ;
-  FXbool arg4 = (FXbool) 0 ;
+  FXListItem *arg3 = 0 ;
+  FXbool arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp3 = 0 ;
@@ -4190,12 +4336,12 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setItem__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   FXString *arg3 = 0 ;
-  FXIcon *arg4 = (FXIcon *) 0 ;
-  void *arg5 = (void *) 0 ;
-  FXbool arg6 = (FXbool) 0 ;
+  FXIcon *arg4 = 0 ;
+  void *arg5 = 0 ;
+  FXbool arg6 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   SwigValueWrapper< FXString > p3 ;
@@ -4333,11 +4479,11 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_fillItems(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXchar **arg2 = (FXchar **) 0 ;
-  FXIcon *arg3 = (FXIcon *) 0 ;
-  void *arg4 = (void *) 0 ;
-  FXbool arg5 = (FXbool) 0 ;
+  FXList *arg1 = 0 ;
+  FXchar **arg2 = 0 ;
+  FXIcon *arg3 = 0 ;
+  void *arg4 = 0 ;
+  FXbool arg5 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp3 = 0 ;
@@ -4395,10 +4541,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_insertItem__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
-  FXListItem *arg3 = (FXListItem *) 0 ;
-  FXbool arg4 = (FXbool) 0 ;
+  FXListItem *arg3 = 0 ;
+  FXbool arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp3 = 0 ;
@@ -4438,12 +4584,12 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_insertItem__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   FXString *arg3 = 0 ;
-  FXIcon *arg4 = (FXIcon *) 0 ;
-  void *arg5 = (void *) 0 ;
-  FXbool arg6 = (FXbool) 0 ;
+  FXIcon *arg4 = 0 ;
+  void *arg5 = 0 ;
+  FXbool arg6 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   SwigValueWrapper< FXString > p3 ;
@@ -4581,9 +4727,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_appendItem__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXListItem *arg2 = (FXListItem *) 0 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXList *arg1 = 0 ;
+  FXListItem *arg2 = 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -4617,11 +4763,11 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_appendItem__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXString *arg2 = 0 ;
-  FXIcon *arg3 = (FXIcon *) 0 ;
-  void *arg4 = (void *) 0 ;
-  FXbool arg5 = (FXbool) 0 ;
+  FXIcon *arg3 = 0 ;
+  void *arg4 = 0 ;
+  FXbool arg5 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   SwigValueWrapper< FXString > p2 ;
@@ -4743,9 +4889,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_prependItem__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXListItem *arg2 = (FXListItem *) 0 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXList *arg1 = 0 ;
+  FXListItem *arg2 = 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -4779,11 +4925,11 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_prependItem__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXString *arg2 = 0 ;
-  FXIcon *arg3 = (FXIcon *) 0 ;
-  void *arg4 = (void *) 0 ;
-  FXbool arg5 = (FXbool) 0 ;
+  FXIcon *arg3 = 0 ;
+  void *arg4 = 0 ;
+  FXbool arg5 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   SwigValueWrapper< FXString > p2 ;
@@ -4905,10 +5051,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_moveItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
-  FXbool arg4 = (FXbool) 0 ;
+  FXbool arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -4947,9 +5093,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_extractItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXListItem *result = 0 ;
@@ -4985,9 +5131,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_removeItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -5017,8 +5163,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_clearItems(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXbool arg2 = (FXbool) 0 ;
+  FXList *arg1 = 0 ;
+  FXbool arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -5042,7 +5188,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getItemWidth(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5073,7 +5219,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getItemHeight(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5104,7 +5250,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_hitItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -5139,10 +5285,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_findItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXString *arg2 = 0 ;
-  FXint arg3 = (FXint) -1 ;
-  FXuint arg4 = (FXuint) SEARCH_FORWARD|SEARCH_WRAP ;
+  FXint arg3 = -1 ;
+  FXuint arg4 = SEARCH_FORWARD|SEARCH_WRAP ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   SwigValueWrapper< FXString > p2 ;
@@ -5174,10 +5320,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_findItemByData(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  void *arg2 = (void *) 0 ;
-  FXint arg3 = (FXint) -1 ;
-  FXuint arg4 = (FXuint) SEARCH_FORWARD|SEARCH_WRAP ;
+  FXList *arg1 = 0 ;
+  void *arg2 = 0 ;
+  FXint arg3 = -1 ;
+  FXuint arg4 = SEARCH_FORWARD|SEARCH_WRAP ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -5208,8 +5354,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_makeItemVisible__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXListItem *arg2 = (FXListItem *) 0 ;
+  FXList *arg1 = 0 ;
+  FXListItem *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -5237,7 +5383,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setItemText(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   FXString *arg3 = 0 ;
   void *argp1 = 0 ;
@@ -5268,7 +5414,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getItemText(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5299,10 +5445,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setItemIcon(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
-  FXIcon *arg3 = (FXIcon *) 0 ;
-  FXbool arg4 = (FXbool) 0 ;
+  FXIcon *arg3 = 0 ;
+  FXbool arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp3 = 0 ;
@@ -5339,7 +5485,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getItemIcon(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5373,9 +5519,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setItemData(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
-  VALUE arg3 = (VALUE) 0 ;
+  VALUE arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -5403,7 +5549,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getItemData(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5434,7 +5580,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_isItemSelected(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5465,7 +5611,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_isItemCurrent(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5496,7 +5642,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_isItemVisible(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5527,7 +5673,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_isItemEnabled(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5558,7 +5704,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_updateItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5586,7 +5732,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getCurrentItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -5610,7 +5756,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setAnchorItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5638,7 +5784,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getAnchorItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -5662,7 +5808,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getCursorItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -5686,7 +5832,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_sortItems(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -5707,8 +5853,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setFont(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXFont *arg2 = (FXFont *) 0 ;
+  FXList *arg1 = 0 ;
+  FXFont *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -5736,7 +5882,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getFont(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXFont *result = 0 ;
@@ -5763,7 +5909,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getTextColor(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXColor result;
@@ -5787,7 +5933,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setTextColor(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXColor arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5810,7 +5956,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getSelBackColor(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXColor result;
@@ -5834,7 +5980,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setSelBackColor(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXColor arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5857,7 +6003,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getSelTextColor(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXColor result;
@@ -5881,7 +6027,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setSelTextColor(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXColor arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5904,7 +6050,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getListStyle(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXuint result;
@@ -5928,7 +6074,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setListStyle(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXuint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5951,7 +6097,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setHelpText(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXString *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5975,7 +6121,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getHelpText(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXString *result = 0 ;
@@ -5999,7 +6145,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_save(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXStream *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6019,7 +6165,7 @@ _wrap_FXList_save(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXStream &","save", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","save", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","save", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXStream * >(argp2);
   FXList_save((FXList const *)arg1,*arg2);
@@ -6031,7 +6177,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_load(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXStream *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6051,7 +6197,7 @@ _wrap_FXList_load(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXStream &","load", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","load", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","load", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXStream * >(argp2);
   FXList_load(arg1,*arg2);
@@ -6063,7 +6209,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_create(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6084,7 +6230,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_detach(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6105,7 +6251,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_destroy(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6126,7 +6272,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_resize(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   void *argp1 = 0 ;
@@ -6151,7 +6297,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getDefaultWidth(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -6175,7 +6321,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getDefaultHeight(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -6199,7 +6345,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getWidthForHeight(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6225,7 +6371,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getHeightForWidth(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6251,7 +6397,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_canFocus(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
@@ -6275,7 +6421,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setFocus(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6296,7 +6442,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_killFocus(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6317,8 +6463,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_changeFocus(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXWindow *arg2 = (FXWindow *) 0 ;
+  FXList *arg1 = 0 ;
+  FXWindow *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -6346,8 +6492,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setDefault(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXbool arg2 = (FXbool) 1 ;
+  FXList *arg1 = 0 ;
+  FXbool arg2 = 1 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6371,7 +6517,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_enable(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6392,7 +6538,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_disable(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6413,7 +6559,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_raiseWindow(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6434,7 +6580,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_lower(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6455,7 +6601,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_move(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   void *argp1 = 0 ;
@@ -6480,7 +6626,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_position__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -6509,7 +6655,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_layout(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6530,7 +6676,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_recalc(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6551,9 +6697,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_reparent(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXWindow *arg2 = (FXWindow *) 0 ;
-  FXWindow *arg3 = (FXWindow *) 0 ;
+  FXList *arg1 = 0 ;
+  FXWindow *arg2 = 0 ;
+  FXWindow *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -6588,7 +6734,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_show(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6609,7 +6755,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_hide(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6630,7 +6776,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_isComposite(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
@@ -6654,7 +6800,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_contains(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   void *argp1 = 0 ;
@@ -6682,7 +6828,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_doesSaveUnder(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
@@ -6706,7 +6852,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setBackColor(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXColor arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6729,9 +6875,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_tr(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXchar *arg2 = (FXchar *) 0 ;
-  FXchar *arg3 = (FXchar *) 0 ;
+  FXList *arg1 = 0 ;
+  FXchar *arg2 = 0 ;
+  FXchar *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXchar *result = 0 ;
@@ -6759,7 +6905,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_dropEnable(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6780,7 +6926,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_dropDisable(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6801,7 +6947,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXRegion *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6821,7 +6967,7 @@ _wrap_FXList_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXRegion const &","setShape", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXRegion const &","setShape", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXRegion const &","setShape", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXRegion * >(argp2);
   FXList_setShape(arg1,(FXRegion const &)*arg2);
@@ -6833,8 +6979,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXBitmap *arg2 = (FXBitmap *) 0 ;
+  FXList *arg1 = 0 ;
+  FXBitmap *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -6862,8 +7008,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXIcon *arg2 = (FXIcon *) 0 ;
+  FXList *arg1 = 0 ;
+  FXIcon *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -6955,7 +7101,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_clearShape(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6976,7 +7122,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getViewportHeight(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -7000,7 +7146,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getViewportWidth(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -7024,7 +7170,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getContentHeight(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -7048,7 +7194,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getContentWidth(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -7072,7 +7218,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_position__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   VALUE result;
@@ -7155,7 +7301,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_enableItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7186,7 +7332,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_disableItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7217,7 +7363,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_makeItemVisible__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7294,7 +7440,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_getItemAt(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   void *argp1 = 0 ;
@@ -7322,9 +7468,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_selectItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -7357,9 +7503,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_deselectItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -7392,9 +7538,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_toggleItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -7427,9 +7573,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_extendSelection(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -7462,8 +7608,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_killSelection(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
-  FXbool arg2 = (FXbool) 0 ;
+  FXList *arg1 = 0 ;
+  FXbool arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -7490,9 +7636,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXList_setCurrentItem(int argc, VALUE *argv, VALUE self) {
-  FXList *arg1 = (FXList *) 0 ;
+  FXList *arg1 = 0 ;
   FXint arg2 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -7541,7 +7687,7 @@ SWIGINTERN VALUE
 _wrap_new_FXColorItem(int argc, VALUE *argv, VALUE self) {
   FXString *arg1 = 0 ;
   FXColor arg2 ;
-  void *arg3 = (void *) 0 ;
+  void *arg3 = 0 ;
   SwigValueWrapper< FXString > p1 ;
   FXColorItem *result = 0 ;
   
@@ -7555,7 +7701,7 @@ _wrap_new_FXColorItem(int argc, VALUE *argv, VALUE self) {
   }
   {
     result = (FXColorItem *)new_FXColorItem((FXString const &)*arg1,arg2,arg3);
-    DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result);
+    ((struct ruby_wrapped_object *)RTYPEDDATA_GET_DATA(self))->data = result; FXRbRegisterRubyObj(self, result);
     if(rb_block_given_p()){
       rb_yield(self);
     }
@@ -7568,7 +7714,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_colore___(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
+  FXColorItem *arg1 = 0 ;
   FXColor arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7591,7 +7737,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_color(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
+  FXColorItem *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXColor result;
@@ -7615,7 +7761,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_save(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
+  FXColorItem *arg1 = 0 ;
   FXStream *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7635,7 +7781,7 @@ _wrap_FXColorItem_save(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXStream &","save", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","save", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","save", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXStream * >(argp2);
   FXColorItem_save((FXColorItem const *)arg1,*arg2);
@@ -7647,7 +7793,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_load(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
+  FXColorItem *arg1 = 0 ;
   FXStream *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7667,7 +7813,7 @@ _wrap_FXColorItem_load(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXStream &","load", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","load", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","load", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXStream * >(argp2);
   FXColorItem_load(arg1,*arg2);
@@ -7679,7 +7825,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_setText(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
+  FXColorItem *arg1 = 0 ;
   FXString *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7703,9 +7849,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_setIcon(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
-  FXIcon *arg2 = (FXIcon *) 0 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXColorItem *arg1 = 0 ;
+  FXIcon *arg2 = 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -7736,7 +7882,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_setFocus(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
+  FXColorItem *arg1 = 0 ;
   FXbool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7759,7 +7905,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_setSelected(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
+  FXColorItem *arg1 = 0 ;
   FXbool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7782,7 +7928,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_setEnabled(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
+  FXColorItem *arg1 = 0 ;
   FXbool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7805,7 +7951,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_setDraggable(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
+  FXColorItem *arg1 = 0 ;
   FXbool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7828,8 +7974,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_getWidth(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
-  FXList *arg2 = (FXList *) 0 ;
+  FXColorItem *arg1 = 0 ;
+  FXList *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -7860,8 +8006,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_getHeight(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
-  FXList *arg2 = (FXList *) 0 ;
+  FXColorItem *arg1 = 0 ;
+  FXList *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -7892,7 +8038,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_create(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
+  FXColorItem *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -7913,7 +8059,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_detach(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
+  FXColorItem *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -7934,7 +8080,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorItem_destroy(int argc, VALUE *argv, VALUE self) {
-  FXColorItem *arg1 = (FXColorItem *) 0 ;
+  FXColorItem *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -7972,14 +8118,14 @@ _wrap_FXColorList_allocate(int argc, VALUE *argv, VALUE self)
 
 SWIGINTERN VALUE
 _wrap_new_FXColorList(int argc, VALUE *argv, VALUE self) {
-  FXComposite *arg1 = (FXComposite *) 0 ;
-  FXObject *arg2 = (FXObject *) 0 ;
-  FXSelector arg3 = (FXSelector) 0 ;
-  FXuint arg4 = (FXuint) LIST_BROWSESELECT ;
-  FXint arg5 = (FXint) 0 ;
-  FXint arg6 = (FXint) 0 ;
-  FXint arg7 = (FXint) 0 ;
-  FXint arg8 = (FXint) 0 ;
+  FXComposite *arg1 = 0 ;
+  FXObject *arg2 = 0 ;
+  FXSelector arg3 = 0 ;
+  FXuint arg4 = LIST_BROWSESELECT ;
+  FXint arg5 = 0 ;
+  FXint arg6 = 0 ;
+  FXint arg7 = 0 ;
+  FXint arg8 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -8021,12 +8167,12 @@ _wrap_new_FXColorList(int argc, VALUE *argv, VALUE self) {
   }
   {
     if (!arg1) {
-      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+      SWIG_exception(SWIG_NullReferenceError,"Received a NULL pointer.");
     }
   }
   {
     result = (FXColorList *)new_FXColorList(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
-    DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result);
+    ((struct ruby_wrapped_object *)RTYPEDDATA_GET_DATA(self))->data = result; FXRbRegisterRubyObj(self, result);
     if(rb_block_given_p()){
       rb_yield(self);
     }
@@ -8039,11 +8185,11 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_fillItems(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
-  FXchar **arg2 = (FXchar **) 0 ;
-  FXColor *arg3 = (FXColor *) 0 ;
-  void *arg4 = (void *) 0 ;
-  FXbool arg5 = (FXbool) 0 ;
+  FXColorList *arg1 = 0 ;
+  FXchar **arg2 = 0 ;
+  FXColor *arg3 = 0 ;
+  void *arg4 = 0 ;
+  FXbool arg5 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -8104,12 +8250,12 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_insertItem(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
   FXString *arg3 = 0 ;
-  FXColor arg4 = (FXColor) 0 ;
-  void *arg5 = (void *) 0 ;
-  FXbool arg6 = (FXbool) 0 ;
+  FXColor arg4 = 0 ;
+  void *arg5 = 0 ;
+  FXbool arg6 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   SwigValueWrapper< FXString > p3 ;
@@ -8145,11 +8291,11 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_appendItem(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXString *arg2 = 0 ;
-  FXColor arg3 = (FXColor) 0 ;
-  void *arg4 = (void *) 0 ;
-  FXbool arg5 = (FXbool) 0 ;
+  FXColor arg3 = 0 ;
+  void *arg4 = 0 ;
+  FXbool arg5 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   SwigValueWrapper< FXString > p2 ;
@@ -8184,11 +8330,11 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_prependItem(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXString *arg2 = 0 ;
-  FXColor arg3 = (FXColor) 0 ;
-  void *arg4 = (void *) 0 ;
-  FXbool arg5 = (FXbool) 0 ;
+  FXColor arg3 = 0 ;
+  void *arg4 = 0 ;
+  FXbool arg5 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   SwigValueWrapper< FXString > p2 ;
@@ -8223,7 +8369,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_setItemColor(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
   FXColor arg3 ;
   void *argp1 = 0 ;
@@ -8248,7 +8394,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_getItemColor(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8274,7 +8420,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_save(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXStream *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8294,7 +8440,7 @@ _wrap_FXColorList_save(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXStream &","save", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","save", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","save", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXStream * >(argp2);
   FXColorList_save((FXColorList const *)arg1,*arg2);
@@ -8306,7 +8452,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_load(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXStream *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8326,7 +8472,7 @@ _wrap_FXColorList_load(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXStream &","load", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","load", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXStream &","load", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXStream * >(argp2);
   FXColorList_load(arg1,*arg2);
@@ -8338,7 +8484,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_create(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -8359,7 +8505,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_detach(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -8380,7 +8526,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_destroy(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -8401,7 +8547,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_resize(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   void *argp1 = 0 ;
@@ -8426,7 +8572,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_getDefaultWidth(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -8450,7 +8596,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_getDefaultHeight(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -8474,7 +8620,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_getWidthForHeight(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8500,7 +8646,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_getHeightForWidth(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8526,7 +8672,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_canFocus(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
@@ -8550,7 +8696,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_setFocus(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -8571,7 +8717,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_killFocus(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -8592,8 +8738,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_changeFocus(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
-  FXWindow *arg2 = (FXWindow *) 0 ;
+  FXColorList *arg1 = 0 ;
+  FXWindow *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -8621,8 +8767,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_setDefault(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
-  FXbool arg2 = (FXbool) 1 ;
+  FXColorList *arg1 = 0 ;
+  FXbool arg2 = 1 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -8646,7 +8792,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_enable(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -8667,7 +8813,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_disable(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -8688,7 +8834,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_raiseWindow(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -8709,7 +8855,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_lower(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -8730,7 +8876,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_move(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   void *argp1 = 0 ;
@@ -8755,7 +8901,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_position__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -8784,7 +8930,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_layout(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -8805,7 +8951,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_recalc(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -8826,9 +8972,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_reparent(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
-  FXWindow *arg2 = (FXWindow *) 0 ;
-  FXWindow *arg3 = (FXWindow *) 0 ;
+  FXColorList *arg1 = 0 ;
+  FXWindow *arg2 = 0 ;
+  FXWindow *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -8863,7 +9009,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_show(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -8884,7 +9030,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_hide(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -8905,7 +9051,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_isComposite(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
@@ -8929,7 +9075,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_contains(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   void *argp1 = 0 ;
@@ -8957,7 +9103,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_doesSaveUnder(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
@@ -8981,7 +9127,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_setBackColor(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXColor arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9004,9 +9150,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_tr(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
-  FXchar *arg2 = (FXchar *) 0 ;
-  FXchar *arg3 = (FXchar *) 0 ;
+  FXColorList *arg1 = 0 ;
+  FXchar *arg2 = 0 ;
+  FXchar *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXchar *result = 0 ;
@@ -9034,7 +9180,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_dropEnable(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -9055,7 +9201,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_dropDisable(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -9076,7 +9222,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXRegion *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9096,7 +9242,7 @@ _wrap_FXColorList_setShape__SWIG_0(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXRegion const &","setShape", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXRegion const &","setShape", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXRegion const &","setShape", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXRegion * >(argp2);
   FXColorList_setShape(arg1,(FXRegion const &)*arg2);
@@ -9108,8 +9254,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_setShape__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
-  FXBitmap *arg2 = (FXBitmap *) 0 ;
+  FXColorList *arg1 = 0 ;
+  FXBitmap *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -9137,8 +9283,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_setShape__SWIG_2(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
-  FXIcon *arg2 = (FXIcon *) 0 ;
+  FXColorList *arg1 = 0 ;
+  FXIcon *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -9230,7 +9376,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_clearShape(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -9251,7 +9397,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_getViewportHeight(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -9275,7 +9421,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_getViewportWidth(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -9299,7 +9445,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_getContentHeight(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -9323,7 +9469,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_getContentWidth(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -9347,7 +9493,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_position__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   VALUE result;
@@ -9430,7 +9576,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_enableItem(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9456,7 +9602,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_disableItem(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9482,7 +9628,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_makeItemVisible(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9505,7 +9651,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_getItemAt(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   void *argp1 = 0 ;
@@ -9533,9 +9679,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_selectItem(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -9563,9 +9709,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_deselectItem(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -9593,9 +9739,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_toggleItem(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -9623,9 +9769,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_extendSelection(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -9653,8 +9799,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_killSelection(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
-  FXbool arg2 = (FXbool) 0 ;
+  FXColorList *arg1 = 0 ;
+  FXbool arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -9681,9 +9827,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXColorList_setCurrentItem(int argc, VALUE *argv, VALUE self) {
-  FXColorList *arg1 = (FXColorList *) 0 ;
+  FXColorList *arg1 = 0 ;
   FXint arg2 ;
-  FXbool arg3 = (FXbool) 0 ;
+  FXbool arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -10472,7 +10618,7 @@ static swig_cast_info *swig_cast_initial[] = {
 
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic
+ * This problem is made tough by the requirement that no dynamic
  * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
  * to swig_type_info structures, we need some lookup code at initialization.
@@ -10487,15 +10633,20 @@ static swig_cast_info *swig_cast_initial[] = {
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
- * cast linked list. The cast data is initially stored in something like a
+ * cast dependencies. The cast data is initially stored in something like a
  * two-dimensional array. Each row corresponds to a type (there are the same
  * number of rows as there are in the swig_type_initial array). Each entry in
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
- * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it
- * adding the casts to the list. The one last trick we need to do is making
- * sure the type pointer in the swig_cast_info struct is correct.
+ * a variable number of columns.
+ *
+ * We loop through the cast[] array associated with the type and mark casts
+ * which have not been defined in previously loaded modules by assigning
+ * cast pointer value to cast->next. We also hash cast->type->name string
+ * and store the value in the cast->value field. If we encounter swig_cast_info
+ * structure that represents a cast to self we move it to the beginning
+ * of the cast array. One trick we need to do is making sure the type pointer
+ * in the swig_cast_info struct is correct.
  *
  * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
@@ -10507,8 +10658,71 @@ static swig_cast_info *swig_cast_initial[] = {
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
- *     swig_cast_info to the linked list (because the cast->type) pointer will
+ *     swig_cast_info to the list (because the cast->type) pointer will
  *     be correct.
+ *
+ * Once the cast array has been set up AND it does have new casts that need
+ * to be added we sort non-self cast entries to move filtered out entries
+ * to the end of the array and to arrange the rest in the increasing order
+ * of their type pointer values. We store the index of the last added entry
+ * in the cast->value field of the entry[0] (overwriting the name hash). Then
+ * we sort <next|value> fields of the remaining entries to arrange hash values
+ * in the increasing order. This way cast->next->type->name field matches
+ * the cast->value hash.
+ *
+ * Example:
+ * Array of casts for type stored at 0x5000, cast to type stored at 0x3000
+ * has already been loaded
+ *
+ *      After sweep-and-hash:   After sort-by-type:    After sort-by-hash:
+ *        ________________       ________________       ________________
+ *       |                |     |                |     |                |
+ * Entry |  type = 0x5000 |     |  type = 0x5000 |     |  type = 0x5000 |
+ *   0   |                |     |                |     |                |
+ *       |  next = Entry0 |     |  next = Entry0 |     |  next = Entry0 |
+ *       | value = 1212   |     | value = 3      |     | value = 3      |
+ *       |                |     |                |     |                |
+ *       |================|     |================|     |================|
+ *       |                |     |                |     |                |
+ * Entry |  type = 0x2000 |     |  type = 0x1000 |     |  type = 0x1000 |
+ *   1   |                |     |                |     |                |
+ *       |  next = Entry1 |     |  next = Entry1 |     |  next = Entry3 |
+ *       | value = 3434   |     | value = 4545   |     | value = 2323   |
+ *       |________________|     |________________|     |________________|
+ *       |                |     |                |     |                |
+ * Entry |  type = 0x3000 |     |  type = 0x2000 |     |  type = 0x2000 |
+ *   2   |                |     |                |     |                |
+ *       |  next = 0      |     |  next = Entry2 |     |  next = Entry2 |
+ *       | value = 0      |     | value = 3434   |     | value = 3434   |
+ *       |________________|     |________________|     |________________|
+ *       |                |     |                |     |                |
+ * Entry |  type = 0x1000 |     |  type = 0x4000 |     |  type = 0x4000 |
+ *   3   |                |     |                |     |                |
+ *       |  next = Entry3 |     |  next = Entry3 |     |  next = Entry1 |
+ *       | value = 4545   |     | value = 2323   |     | value = 4545   |
+ *       |________________|     |________________|     |________________|
+ *       |                |     |                |     |                |
+ * Entry |  type = 0x4000 |     |  type = 0x3000 |     |  type = 0x3000 |
+ *   4   |                |     |                |     |                |
+ *       |  next = Entry4 |     |  next = 0      |     |  next = 0      |
+ *       | value = 2323   |     | value = 0      |     | value = 0      |
+ *       |________________|     |________________|     |________________|
+ *
+ * Once the cast array has been initialized, we use cast[0]->next field to link
+ * it into the list of cast arrays for the type.
+ *              ____    ____    ____
+ * type->cast->|next|->|next|->|next|->0
+ *             |----|  |----|  |----|
+ *             |----|  |----|  |----|
+ *             |----|  |----|  |----|
+ *
+ * Subsequent cast resolution works as follows:
+ *
+ * 1. Check whether the type matches the first entry in the current cast array.
+ * 2. If not, then do a binary search over the (0:cast->value] interval using
+ *    either type address or the hash value of the type name.
+ * 3. If not found, then move over to the next cast array (cast[0]->next).
+ *
  * ----------------------------------------------------------------------------- */
 
 #ifdef __cplusplus
@@ -10526,6 +10740,46 @@ extern "C" {
 #define SWIG_INIT_CLIENT_DATA_TYPE void *
 #endif
 
+/*
+ * Sort function that puts cast entries with nonzero 'next' at the front
+ * of the array while ordering them by addresses of their 'type' structs.
+ */
+SWIGINTERN int SWIG_CastCmpStruct(const void *pa, const void *pb) {
+  swig_cast_info *pca = (swig_cast_info *)pa;
+  swig_cast_info *pcb = (swig_cast_info *)pb;
+  if (pca->type < pcb->type)
+    return (pca->next || pcb->next == 0) ? -1 : 1;
+  if (pca->type > pcb->type)
+    return (pcb->next || pca->next == 0) ? 1 : -1;
+  return 0;
+}
+
+/*
+ * Shell-sort 'next' and 'value' field pairs to order them by 'value'.
+ */
+SWIGINTERN void SWIG_CastHashSort(swig_cast_info *cast, int size) {
+  const int hmax = size/9;
+  int h, i;
+  for(h = 1; h <= hmax; h = 3*h+1);
+  for(; h > 0; h /= 3)
+  {
+    for(i = h; i < size; ++i)
+    {
+      swig_cast_info *p = cast[i].next;
+      unsigned int hash = cast[i].value;
+      int j = i;
+      while(j >= h && hash < cast[j-h].value)
+      {
+        cast[j].next = cast[j-h].next;
+        cast[j].value = cast[j-h].value;
+        j -= h;
+      }
+      cast[j].next = p;
+      cast[j].value = hash;
+    }
+  }
+}
+
 SWIGRUNTIME void
 SWIG_InitializeModule(SWIG_INIT_CLIENT_DATA_TYPE clientdata) {
   size_t i;
@@ -10577,8 +10831,9 @@ SWIG_InitializeModule(SWIG_INIT_CLIENT_DATA_TYPE clientdata) {
 #endif
   for (i = 0; i < swig_module.size; ++i) {
     swig_type_info *type = 0;
-    swig_type_info *ret;
-    swig_cast_info *cast;
+    swig_type_info *target_type;
+    swig_cast_info *cast, *first;
+    int num_mapped = 0;
 
 #ifdef SWIGRUNTIME_DEBUG
     printf("SWIG_InitializeModule: type %lu %s\n", (unsigned long)i, swig_module.type_initial[i]->name);
@@ -10604,49 +10859,107 @@ SWIG_InitializeModule(SWIG_INIT_CLIENT_DATA_TYPE clientdata) {
     }
 
     /* Insert casting types */
-    cast = swig_module.cast_initial[i];
+    cast = first = swig_module.cast_initial[i];
     while (cast->type) {
 
       /* Don't need to add information already in the list */
-      ret = 0;
+      target_type = 0;
 #ifdef SWIGRUNTIME_DEBUG
       printf("SWIG_InitializeModule: look cast %s\n", cast->type->name);
 #endif
       if (swig_module.next != &swig_module) {
-        ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name);
+        target_type = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name);
+        if (target_type) {
+
+          /* Target type already defined in another module */
 #ifdef SWIGRUNTIME_DEBUG
-	if (ret) printf("SWIG_InitializeModule: found cast %s\n", ret->name);
+          printf("SWIG_InitializeModule: found cast %s\n", target_type->name);
 #endif
-      }
-      if (ret) {
-	if (type == swig_module.type_initial[i]) {
+          if (type == swig_module.type_initial[i]) {
 #ifdef SWIGRUNTIME_DEBUG
-	  printf("SWIG_InitializeModule: skip old type %s\n", ret->name);
+            printf("SWIG_InitializeModule: skip old type %s\n", target_type->name);
 #endif
-	  cast->type = ret;
-	  ret = 0;
-	} else {
-	  /* Check for casting already in the list */
-	  swig_cast_info *ocast = SWIG_TypeCheck(ret->name, type);
+            cast->type = target_type;
+            target_type = 0;
+          } else {
+            /* Check if this cast is already in the list */
+            swig_cast_info *ocast = SWIG_TypeCheck(target_type->name, type);
 #ifdef SWIGRUNTIME_DEBUG
-	  if (ocast) printf("SWIG_InitializeModule: skip old cast %s\n", ret->name);
+            if (ocast) printf("SWIG_InitializeModule: skip old cast %s\n", target_type->name);
 #endif
-	  if (!ocast) ret = 0;
-	}
+            if (!ocast) {
+              cast->type = target_type;
+              target_type = 0;
+            }
+          }
+        }
       }
 
-      if (!ret) {
+      if (!target_type) {
+#ifdef SWIGRUNTIME_DEBUG
+        printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name);
+#endif
+        /* Set inclusion mark for sorting */
+        cast->next = cast;
+        num_mapped++;
+
+        if (type == cast->type) {
 #ifdef SWIGRUNTIME_DEBUG
-	printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name);
+          printf("%s : self cast at pos [%li]\n", type->name, cast - first);
 #endif
-        if (type->cast) {
-          type->cast->prev = cast;
-          cast->next = type->cast;
+          if (cast - first) {
+
+            /* Move cast to itself to the first entry in the array */
+
+            swig_cast_info tmp = *cast;
+            *cast = *first;
+            *first = tmp;
+          }
+          first++;
+
+        } else {
+          cast->value = SWIG_Hash(cast->type->name, (unsigned int)strlen(cast->type->name));
         }
-        type->cast = cast;
       }
       cast++;
     }
+
+    if (num_mapped) {
+      if (cast - first) {
+        swig_cast_info *tmp;
+
+        /* Sort casts by type address for binary search in SWIG_TypeCheckStruct */
+        qsort(first, (size_t)(cast - first), sizeof(swig_cast_info), SWIG_CastCmpStruct);
+
+        /* Remap back links for added entries */
+        cast = swig_module.cast_initial[i] + num_mapped;
+        for (tmp = first; tmp < cast; tmp++) {
+          tmp->next = tmp;
+        }
+      }
+
+      /* Set the value field of the first entry to the index of the last added entry */
+      cast = swig_module.cast_initial[i];
+      cast->value = (unsigned int)(num_mapped - 1);
+
+      num_mapped -= (int)(first - cast);
+      if (num_mapped > 1) {
+        /* Sort <'next','value'> pairs by 'value' for binary search in SWIG_TypeCheck */
+
+        SWIG_CastHashSort(first, num_mapped);
+      }
+
+      first = type->cast;
+      if (first) {
+        /* Link the current set into the list of cast arrays */
+        cast->next = first->next;
+        first->next = cast;
+      } else {
+        cast->next = 0;
+        type->cast = cast;
+      }
+    }
+
     /* Set entry in modules->types array equal to the type */
     swig_module.types[i] = type;
   }
@@ -10677,7 +10990,6 @@ SWIG_InitializeModule(SWIG_INIT_CLIENT_DATA_TYPE clientdata) {
 SWIGRUNTIME void
 SWIG_PropagateClientData(void) {
   size_t i;
-  swig_cast_info *equiv;
   static int init_run = 0;
 
   if (init_run) return;
@@ -10685,13 +10997,16 @@ SWIG_PropagateClientData(void) {
 
   for (i = 0; i < swig_module.size; i++) {
     if (swig_module.types[i]->clientdata) {
-      equiv = swig_module.types[i]->cast;
-      while (equiv) {
-        if (!equiv->converter) {
-          if (equiv->type && !equiv->type->clientdata)
-            SWIG_TypeClientData(equiv->type, swig_module.types[i]->clientdata);
+      swig_cast_info *head, *cast;
+      head = swig_module.types[i]->cast;
+      while (head) {
+        for (cast = head; (cast - head) <= head->value; cast++) {
+          if (!cast->converter) {
+            if (cast->type && !cast->type->clientdata)
+              SWIG_TypeClientData(cast->type, swig_module.types[i]->clientdata);
+          }
         }
-        equiv = equiv->next;
+        head = head->next;
       }
     }
   }
@@ -10761,8 +11076,11 @@ SWIGEXPORT void Init_list(void) {
   rb_define_method(SwigClassFXListItem.klass, "create", VALUEFUNC(_wrap_FXListItem_create), -1);
   rb_define_method(SwigClassFXListItem.klass, "detach", VALUEFUNC(_wrap_FXListItem_detach), -1);
   rb_define_method(SwigClassFXListItem.klass, "destroy", VALUEFUNC(_wrap_FXListItem_destroy), -1);
+  SwigClassFXListItem.cext_type.wrap_struct_name = "C++ class FXListItem";
   SwigClassFXListItem.mark = (void (*)(void *)) FXRbListItem::markfunc;
+  SwigClassFXListItem.cext_type.function.dmark = SWIG_Ruby_mark_swig_type;
   SwigClassFXListItem.destroy = (void (*)(void *)) FXRbListItem::freefunc;
+  SwigClassFXListItem.cext_type.function.dfree = SWIG_Ruby_free_swig_type;
   SwigClassFXListItem.trackObjects = 0;
   
   SWIGTYPE_p_FXListItem->dcast = (swig_dycast_func) FXListItem_dynamic_cast;
@@ -10899,8 +11217,11 @@ SWIGEXPORT void Init_list(void) {
   rb_define_method(SwigClassFXList.klass, "extendSelection", VALUEFUNC(_wrap_FXList_extendSelection), -1);
   rb_define_method(SwigClassFXList.klass, "killSelection", VALUEFUNC(_wrap_FXList_killSelection), -1);
   rb_define_method(SwigClassFXList.klass, "setCurrentItem", VALUEFUNC(_wrap_FXList_setCurrentItem), -1);
+  SwigClassFXList.cext_type.wrap_struct_name = "C++ class FXList";
   SwigClassFXList.mark = (void (*)(void *)) FXRbList::markfunc;
+  SwigClassFXList.cext_type.function.dmark = SWIG_Ruby_mark_swig_type;
   SwigClassFXList.destroy = (void (*)(void *)) FXRbObject::freefunc;
+  SwigClassFXList.cext_type.function.dfree = SWIG_Ruby_free_swig_type;
   SwigClassFXList.trackObjects = 0;
   
   SWIGTYPE_p_FXListItem->dcast = (swig_dycast_func) FXListItem_dynamic_cast;
@@ -10925,8 +11246,11 @@ SWIGEXPORT void Init_list(void) {
   rb_define_method(SwigClassFXColorItem.klass, "create", VALUEFUNC(_wrap_FXColorItem_create), -1);
   rb_define_method(SwigClassFXColorItem.klass, "detach", VALUEFUNC(_wrap_FXColorItem_detach), -1);
   rb_define_method(SwigClassFXColorItem.klass, "destroy", VALUEFUNC(_wrap_FXColorItem_destroy), -1);
+  SwigClassFXColorItem.cext_type.wrap_struct_name = "C++ class FXColorItem";
   SwigClassFXColorItem.mark = 0;
+  SwigClassFXColorItem.cext_type.function.dmark = SWIG_Ruby_mark_swig_type;
   SwigClassFXColorItem.destroy = (void (*)(void *)) FXRbColorItem::freefunc;
+  SwigClassFXColorItem.cext_type.function.dfree = SWIG_Ruby_free_swig_type;
   SwigClassFXColorItem.trackObjects = 0;
   
   SwigClassFXColorList.klass = rb_define_class_under(mFox, "FXColorList", ((swig_class *) SWIGTYPE_p_FXList->clientdata)->klass);
@@ -10989,8 +11313,11 @@ SWIGEXPORT void Init_list(void) {
   rb_define_method(SwigClassFXColorList.klass, "extendSelection", VALUEFUNC(_wrap_FXColorList_extendSelection), -1);
   rb_define_method(SwigClassFXColorList.klass, "killSelection", VALUEFUNC(_wrap_FXColorList_killSelection), -1);
   rb_define_method(SwigClassFXColorList.klass, "setCurrentItem", VALUEFUNC(_wrap_FXColorList_setCurrentItem), -1);
+  SwigClassFXColorList.cext_type.wrap_struct_name = "C++ class FXColorList";
   SwigClassFXColorList.mark = 0;
+  SwigClassFXColorList.cext_type.function.dmark = SWIG_Ruby_mark_swig_type;
   SwigClassFXColorList.destroy = (void (*)(void *)) FXRbObject::freefunc;
+  SwigClassFXColorList.cext_type.function.dfree = SWIG_Ruby_free_swig_type;
   SwigClassFXColorList.trackObjects = 0;
 }