fxruby 1.6.50 → 1.6.51

data/ext/fox16_c/dc_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);
 }
 
@@ -1946,7 +2088,7 @@ static swig_module_info swig_module = {swig_types, 36, 0, 0, 0, 0};
 #define SWIG_init    Init_dc
 #define SWIG_name    "Dc"
 
-
+static VALUE mDc;
 
 #ifdef __cplusplus
 #include <utility>
@@ -1964,7 +2106,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
@@ -1987,12 +2129,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
 
 
@@ -2052,7 +2200,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;
   }
 
@@ -2117,11 +2265,9 @@ SWIGINTERN VALUE FXDC_getDashPattern(FXDC const *self){
 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;
 }
@@ -2136,7 +2282,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;
@@ -2171,7 +2317,6 @@ SWIG_ruby_failed(VALUE SWIGUNUSEDPARM(arg1), VALUE SWIGUNUSEDPARM(arg2))
 } 
 
 
-/*@SWIG:/usr/share/swig4.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;
@@ -2181,7 +2326,6 @@ SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE arg)
   *res = type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj);
   return obj;
 }
-/*@SWIG@*/
 
 SWIGINTERN int
 SWIG_AsVal_long (VALUE obj, long* val)
@@ -2223,7 +2367,6 @@ SWIGINTERN FXDCWindow *new_FXDCWindow__SWIG_1(FXDrawable *drawable){
       return new FXRbDCWindow(drawable);
       }
 
-/*@SWIG:/usr/share/swig4.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE arg)
 {
   VALUE *args = (VALUE *)arg;
@@ -2233,7 +2376,6 @@ SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE arg)
   *res = NUM2DBL(obj); (void)type;
   return obj;
 }
-/*@SWIG@*/
 
 SWIGINTERN int
 SWIG_AsVal_double (VALUE obj, double *val)
@@ -2277,10 +2419,10 @@ _wrap_FXSegment_allocate(int argc, VALUE *argv, VALUE self)
 
 SWIGINTERN VALUE
 _wrap_new_FXSegment(int argc, VALUE *argv, VALUE self) {
-  FXshort arg1 = (FXshort) 0 ;
-  FXshort arg2 = (FXshort) 0 ;
-  FXshort arg3 = (FXshort) 0 ;
-  FXshort arg4 = (FXshort) 0 ;
+  FXshort arg1 = 0 ;
+  FXshort arg2 = 0 ;
+  FXshort arg3 = 0 ;
+  FXshort arg4 = 0 ;
   FXSegment *result = 0 ;
   
   if ((argc < 0) || (argc > 4)) {
@@ -2299,7 +2441,7 @@ _wrap_new_FXSegment(int argc, VALUE *argv, VALUE self) {
     arg4 = NUM2INT(argv[3]);
   }
   result = (FXSegment *)new_FXSegment(arg1,arg2,arg3,arg4);
-  DATA_PTR(self) = result;
+  ((struct ruby_wrapped_object *)RTYPEDDATA_GET_DATA(self))->data = result;
   return self;
 fail:
   return Qnil;
@@ -2308,7 +2450,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXSegment_x1_set(int argc, VALUE *argv, VALUE self) {
-  FXSegment *arg1 = (FXSegment *) 0 ;
+  FXSegment *arg1 = 0 ;
   FXshort arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2331,7 +2473,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXSegment_x1_get(int argc, VALUE *argv, VALUE self) {
-  FXSegment *arg1 = (FXSegment *) 0 ;
+  FXSegment *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXshort result;
@@ -2355,7 +2497,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXSegment_y1_set(int argc, VALUE *argv, VALUE self) {
-  FXSegment *arg1 = (FXSegment *) 0 ;
+  FXSegment *arg1 = 0 ;
   FXshort arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2378,7 +2520,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXSegment_y1_get(int argc, VALUE *argv, VALUE self) {
-  FXSegment *arg1 = (FXSegment *) 0 ;
+  FXSegment *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXshort result;
@@ -2402,7 +2544,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXSegment_x2_set(int argc, VALUE *argv, VALUE self) {
-  FXSegment *arg1 = (FXSegment *) 0 ;
+  FXSegment *arg1 = 0 ;
   FXshort arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2425,7 +2567,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXSegment_x2_get(int argc, VALUE *argv, VALUE self) {
-  FXSegment *arg1 = (FXSegment *) 0 ;
+  FXSegment *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXshort result;
@@ -2449,7 +2591,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXSegment_y2_set(int argc, VALUE *argv, VALUE self) {
-  FXSegment *arg1 = (FXSegment *) 0 ;
+  FXSegment *arg1 = 0 ;
   FXshort arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2472,7 +2614,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXSegment_y2_get(int argc, VALUE *argv, VALUE self) {
-  FXSegment *arg1 = (FXSegment *) 0 ;
+  FXSegment *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXshort result;
@@ -2519,12 +2661,12 @@ _wrap_FXArc_allocate(int argc, VALUE *argv, VALUE self)
 
 SWIGINTERN VALUE
 _wrap_new_FXArc(int argc, VALUE *argv, VALUE self) {
-  FXshort arg1 = (FXshort) 0 ;
-  FXshort arg2 = (FXshort) 0 ;
-  FXshort arg3 = (FXshort) 0 ;
-  FXshort arg4 = (FXshort) 0 ;
-  FXshort arg5 = (FXshort) 0 ;
-  FXshort arg6 = (FXshort) 0 ;
+  FXshort arg1 = 0 ;
+  FXshort arg2 = 0 ;
+  FXshort arg3 = 0 ;
+  FXshort arg4 = 0 ;
+  FXshort arg5 = 0 ;
+  FXshort arg6 = 0 ;
   FXArc *result = 0 ;
   
   if ((argc < 0) || (argc > 6)) {
@@ -2549,7 +2691,7 @@ _wrap_new_FXArc(int argc, VALUE *argv, VALUE self) {
     arg6 = NUM2INT(argv[5]);
   }
   result = (FXArc *)new_FXArc(arg1,arg2,arg3,arg4,arg5,arg6);
-  DATA_PTR(self) = result;
+  ((struct ruby_wrapped_object *)RTYPEDDATA_GET_DATA(self))->data = result;
   return self;
 fail:
   return Qnil;
@@ -2558,7 +2700,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXArc_x_set(int argc, VALUE *argv, VALUE self) {
-  FXArc *arg1 = (FXArc *) 0 ;
+  FXArc *arg1 = 0 ;
   FXshort arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2581,7 +2723,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXArc_x_get(int argc, VALUE *argv, VALUE self) {
-  FXArc *arg1 = (FXArc *) 0 ;
+  FXArc *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXshort result;
@@ -2605,7 +2747,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXArc_y_set(int argc, VALUE *argv, VALUE self) {
-  FXArc *arg1 = (FXArc *) 0 ;
+  FXArc *arg1 = 0 ;
   FXshort arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2628,7 +2770,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXArc_y_get(int argc, VALUE *argv, VALUE self) {
-  FXArc *arg1 = (FXArc *) 0 ;
+  FXArc *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXshort result;
@@ -2652,7 +2794,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXArc_w_set(int argc, VALUE *argv, VALUE self) {
-  FXArc *arg1 = (FXArc *) 0 ;
+  FXArc *arg1 = 0 ;
   FXshort arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2675,7 +2817,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXArc_w_get(int argc, VALUE *argv, VALUE self) {
-  FXArc *arg1 = (FXArc *) 0 ;
+  FXArc *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXshort result;
@@ -2699,7 +2841,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXArc_h_set(int argc, VALUE *argv, VALUE self) {
-  FXArc *arg1 = (FXArc *) 0 ;
+  FXArc *arg1 = 0 ;
   FXshort arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2722,7 +2864,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXArc_h_get(int argc, VALUE *argv, VALUE self) {
-  FXArc *arg1 = (FXArc *) 0 ;
+  FXArc *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXshort result;
@@ -2746,7 +2888,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXArc_a_set(int argc, VALUE *argv, VALUE self) {
-  FXArc *arg1 = (FXArc *) 0 ;
+  FXArc *arg1 = 0 ;
   FXshort arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2769,7 +2911,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXArc_a_get(int argc, VALUE *argv, VALUE self) {
-  FXArc *arg1 = (FXArc *) 0 ;
+  FXArc *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXshort result;
@@ -2793,7 +2935,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXArc_b_set(int argc, VALUE *argv, VALUE self) {
-  FXArc *arg1 = (FXArc *) 0 ;
+  FXArc *arg1 = 0 ;
   FXshort arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2816,7 +2958,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXArc_b_get(int argc, VALUE *argv, VALUE self) {
-  FXArc *arg1 = (FXArc *) 0 ;
+  FXArc *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXshort result;
@@ -2863,7 +3005,7 @@ _wrap_FXDC_allocate(int argc, VALUE *argv, VALUE self)
 
 SWIGINTERN VALUE
 _wrap_new_FXDC(int argc, VALUE *argv, VALUE self) {
-  FXApp *arg1 = (FXApp *) 0 ;
+  FXApp *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXDC *result = 0 ;
@@ -2878,12 +3020,12 @@ _wrap_new_FXDC(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< FXApp * >(argp1);
   {
     if (!arg1) {
-      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+      SWIG_exception(SWIG_NullReferenceError,"Received a NULL pointer.");
     }
   }
   {
     result = (FXDC *)new_FXDC(arg1);
-    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);
     }
@@ -2896,7 +3038,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getApp(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXApp *result = 0 ;
@@ -2923,7 +3065,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getForeground(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXColor result;
@@ -2947,7 +3089,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getBackground(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXColor result;
@@ -2971,7 +3113,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getDashPattern(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   VALUE result;
@@ -2995,7 +3137,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getDashOffset(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXuint result;
@@ -3019,7 +3161,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getLineWidth(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXuint result;
@@ -3043,7 +3185,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getLineCap(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXCapStyle result;
@@ -3067,7 +3209,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getLineJoin(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXJoinStyle result;
@@ -3091,7 +3233,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getLineStyle(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXLineStyle result;
@@ -3115,7 +3257,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getFillStyle(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXFillStyle result;
@@ -3139,7 +3281,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getFillRule(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXFillRule result;
@@ -3163,7 +3305,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getFunction(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXFunction result;
@@ -3187,7 +3329,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getTile(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXImage *result = 0 ;
@@ -3214,7 +3356,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getStippleBitmap(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXBitmap *result = 0 ;
@@ -3241,7 +3383,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getStipplePattern(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXStipplePattern result;
@@ -3265,7 +3407,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getClipRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXRectangle *result = 0 ;
@@ -3289,7 +3431,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getClipX(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -3313,7 +3455,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getClipY(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -3337,7 +3479,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getClipWidth(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -3361,7 +3503,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getClipHeight(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXint result;
@@ -3385,7 +3527,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_getFont(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXFont *result = 0 ;
@@ -3412,7 +3554,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_readPixel(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   void *argp1 = 0 ;
@@ -3440,7 +3582,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawPoint(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   void *argp1 = 0 ;
@@ -3465,8 +3607,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawPoints(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -3484,8 +3626,8 @@ _wrap_FXDC_drawPoints(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -3504,8 +3646,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawPointsRel(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -3523,8 +3665,8 @@ _wrap_FXDC_drawPointsRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -3543,7 +3685,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawLine(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -3572,8 +3714,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawLines(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -3591,8 +3733,8 @@ _wrap_FXDC_drawLines(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -3611,8 +3753,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawLinesRel(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -3630,8 +3772,8 @@ _wrap_FXDC_drawLinesRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -3650,8 +3792,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawLineSegments(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXSegment *arg2 = (FXSegment *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXSegment *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -3669,8 +3811,8 @@ _wrap_FXDC_drawLineSegments(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXSegment[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXSegment *pSeg;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXSegment, pSeg);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXSegment *pSeg = (FXSegment*)FXRbConvertPtr(entry, SWIGTYPE_p_FXSegment, 0);
       arg2[i] = *pSeg;
     }
   }
@@ -3689,7 +3831,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -3718,8 +3860,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawRectangles(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXRectangle *arg2 = (FXRectangle *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXRectangle *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -3737,8 +3879,8 @@ _wrap_FXDC_drawRectangles(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXRectangle[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXRectangle *pRect;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXRectangle, pRect);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXRectangle *pRect = (FXRectangle*)FXRbConvertPtr(entry, SWIGTYPE_p_FXRectangle, 0);
       arg2[i] = *pRect;
     }
   }
@@ -3757,7 +3899,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawRoundRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -3790,7 +3932,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawArc(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -3823,8 +3965,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawArcs(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXArc *arg2 = (FXArc *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXArc *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -3842,8 +3984,8 @@ _wrap_FXDC_drawArcs(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXArc[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXArc *pArc;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXArc, pArc);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXArc *pArc = (FXArc*)FXRbConvertPtr(entry, SWIGTYPE_p_FXArc, 0);
       arg2[i] = *pArc;
     }
   }
@@ -3856,7 +3998,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawEllipse(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -3885,7 +4027,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_fillRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -3914,8 +4056,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_fillRectangles(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXRectangle *arg2 = (FXRectangle *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXRectangle *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -3933,8 +4075,8 @@ _wrap_FXDC_fillRectangles(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXRectangle[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXRectangle *pRect;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXRectangle, pRect);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXRectangle *pRect = (FXRectangle*)FXRbConvertPtr(entry, SWIGTYPE_p_FXRectangle, 0);
       arg2[i] = *pRect;
     }
   }
@@ -3953,7 +4095,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_fillRoundRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -3986,7 +4128,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_fillChord(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -4019,8 +4161,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_fillChords(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXArc *arg2 = (FXArc *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXArc *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4050,7 +4192,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_fillArc(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -4083,8 +4225,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_fillArcs(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXArc *arg2 = (FXArc *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXArc *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4102,8 +4244,8 @@ _wrap_FXDC_fillArcs(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXArc[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXArc *pArc;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXArc, pArc);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXArc *pArc = (FXArc*)FXRbConvertPtr(entry, SWIGTYPE_p_FXArc, 0);
       arg2[i] = *pArc;
     }
   }
@@ -4116,8 +4258,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_fillPolygon(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4135,8 +4277,8 @@ _wrap_FXDC_fillPolygon(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -4155,8 +4297,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_fillConcavePolygon(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4174,8 +4316,8 @@ _wrap_FXDC_fillConcavePolygon(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -4194,8 +4336,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_fillComplexPolygon(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4213,8 +4355,8 @@ _wrap_FXDC_fillComplexPolygon(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -4233,8 +4375,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_fillPolygonRel(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4252,8 +4394,8 @@ _wrap_FXDC_fillPolygonRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -4272,8 +4414,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_fillConcavePolygonRel(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4291,8 +4433,8 @@ _wrap_FXDC_fillConcavePolygonRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -4311,8 +4453,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_fillComplexPolygonRel(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4330,8 +4472,8 @@ _wrap_FXDC_fillComplexPolygonRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -4350,12 +4492,12 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawHashBox(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
   FXint arg5 ;
-  FXint arg6 = (FXint) 1 ;
+  FXint arg6 = 1 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -4383,7 +4525,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawFocusRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -4412,8 +4554,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawArea__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXDrawable *arg2 = (FXDrawable *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXDrawable *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   FXint arg5 ;
@@ -4453,8 +4595,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawArea__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXDrawable *arg2 = (FXDrawable *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXDrawable *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   FXint arg5 ;
@@ -4617,8 +4759,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawImage(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXImage *arg2 = (FXImage *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXImage *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -4650,8 +4792,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawBitmap(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXBitmap *arg2 = (FXBitmap *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXBitmap *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -4683,8 +4825,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawIcon(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXIcon *arg2 = (FXIcon *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXIcon *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -4716,8 +4858,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawIconShaded(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXIcon *arg2 = (FXIcon *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXIcon *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -4749,8 +4891,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawIconSunken(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXIcon *arg2 = (FXIcon *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXIcon *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -4782,10 +4924,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawText(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
-  FXchar *arg4 = (FXchar *) 0 ;
+  FXchar *arg4 = 0 ;
   FXuint arg5 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4814,10 +4956,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_drawImageText(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
-  FXchar *arg4 = (FXchar *) 0 ;
+  FXchar *arg4 = 0 ;
   FXuint arg5 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4846,7 +4988,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setForeground(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXColor arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4869,7 +5011,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setBackground(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXColor arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4892,9 +5034,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setDashes(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXuint arg2 ;
-  FXchar *arg3 = (FXchar *) 0 ;
+  FXchar *arg3 = 0 ;
   FXuint arg4 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4931,8 +5073,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setLineWidth(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXuint arg2 = (FXuint) 0 ;
+  FXDC *arg1 = 0 ;
+  FXuint arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -4956,8 +5098,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setLineCap(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXCapStyle arg2 = (FXCapStyle) CAP_BUTT ;
+  FXDC *arg1 = 0 ;
+  FXCapStyle arg2 = CAP_BUTT ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -4987,8 +5129,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setLineJoin(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXJoinStyle arg2 = (FXJoinStyle) JOIN_MITER ;
+  FXDC *arg1 = 0 ;
+  FXJoinStyle arg2 = JOIN_MITER ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -5018,8 +5160,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setLineStyle(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXLineStyle arg2 = (FXLineStyle) LINE_SOLID ;
+  FXDC *arg1 = 0 ;
+  FXLineStyle arg2 = LINE_SOLID ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -5049,8 +5191,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setFillStyle(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXFillStyle arg2 = (FXFillStyle) FILL_SOLID ;
+  FXDC *arg1 = 0 ;
+  FXFillStyle arg2 = FILL_SOLID ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -5080,8 +5222,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setFillRule(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXFillRule arg2 = (FXFillRule) RULE_EVEN_ODD ;
+  FXDC *arg1 = 0 ;
+  FXFillRule arg2 = RULE_EVEN_ODD ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -5111,8 +5253,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setFunction(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXFunction arg2 = (FXFunction) BLT_SRC ;
+  FXDC *arg1 = 0 ;
+  FXFunction arg2 = BLT_SRC ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -5142,10 +5284,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setTile(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXImage *arg2 = (FXImage *) 0 ;
-  FXint arg3 = (FXint) 0 ;
-  FXint arg4 = (FXint) 0 ;
+  FXDC *arg1 = 0 ;
+  FXImage *arg2 = 0 ;
+  FXint arg3 = 0 ;
+  FXint arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -5179,10 +5321,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setStipple__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXBitmap *arg2 = (FXBitmap *) 0 ;
-  FXint arg3 = (FXint) 0 ;
-  FXint arg4 = (FXint) 0 ;
+  FXDC *arg1 = 0 ;
+  FXBitmap *arg2 = 0 ;
+  FXint arg3 = 0 ;
+  FXint arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -5216,10 +5358,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setStipple__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXStipplePattern arg2 ;
-  FXint arg3 = (FXint) 0 ;
-  FXint arg4 = (FXint) 0 ;
+  FXint arg3 = 0 ;
+  FXint arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -5335,7 +5477,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setClipRegion(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXRegion *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5355,7 +5497,7 @@ _wrap_FXDC_setClipRegion(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXRegion const &","setClipRegion", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXRegion const &","setClipRegion", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXRegion const &","setClipRegion", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXRegion * >(argp2);
   FXDC_setClipRegion(arg1,(FXRegion const &)*arg2);
@@ -5367,7 +5509,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setClipRectangle__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -5396,7 +5538,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setClipRectangle__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXRectangle *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5416,7 +5558,7 @@ _wrap_FXDC_setClipRectangle__SWIG_1(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXRectangle const &","setClipRectangle", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXRectangle const &","setClipRectangle", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXRectangle const &","setClipRectangle", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXRectangle * >(argp2);
   FXDC_setClipRectangle(arg1,(FXRectangle const &)*arg2);
@@ -5492,7 +5634,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_clearClipRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -5513,10 +5655,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setClipMask(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXBitmap *arg2 = (FXBitmap *) 0 ;
-  FXint arg3 = (FXint) 0 ;
-  FXint arg4 = (FXint) 0 ;
+  FXDC *arg1 = 0 ;
+  FXBitmap *arg2 = 0 ;
+  FXint arg3 = 0 ;
+  FXint arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -5550,7 +5692,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_clearClipMask(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -5571,8 +5713,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_setFont(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
-  FXFont *arg2 = (FXFont *) 0 ;
+  FXDC *arg1 = 0 ;
+  FXFont *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -5600,7 +5742,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDC_clipChildren(int argc, VALUE *argv, VALUE self) {
-  FXDC *arg1 = (FXDC *) 0 ;
+  FXDC *arg1 = 0 ;
   FXbool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5625,8 +5767,8 @@ static swig_class SwigClassFXDCWindow;
 
 SWIGINTERN VALUE
 _wrap_new_FXDCWindow__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXDrawable *arg1 = (FXDrawable *) 0 ;
-  FXEvent *arg2 = (FXEvent *) 0 ;
+  FXDrawable *arg1 = 0 ;
+  FXEvent *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -5648,9 +5790,9 @@ _wrap_new_FXDCWindow__SWIG_0(int argc, VALUE *argv, VALUE self) {
   arg2 = reinterpret_cast< FXEvent * >(argp2);
   {
     result = (FXDCWindow *)new_FXDCWindow__SWIG_0(arg1,arg2);
-    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_ensure(RUBY_VALUE_METHOD_FUNC(rb_yield), self, RUBY_VALUE_METHOD_FUNC(FXRbDCWindow::endit), self);
+      rb_ensure(VALUEFUNC(rb_yield), self, VALUEFUNC(FXRbDCWindow::endit), self);
     }
   }
   return self;
@@ -5676,7 +5818,7 @@ _wrap_FXDCWindow_allocate(int argc, VALUE *argv, VALUE self)
 
 SWIGINTERN VALUE
 _wrap_new_FXDCWindow__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXDrawable *arg1 = (FXDrawable *) 0 ;
+  FXDrawable *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXDCWindow *result = 0 ;
@@ -5691,9 +5833,9 @@ _wrap_new_FXDCWindow__SWIG_1(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< FXDrawable * >(argp1);
   {
     result = (FXDCWindow *)new_FXDCWindow__SWIG_1(arg1);
-    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_ensure(RUBY_VALUE_METHOD_FUNC(rb_yield), self, RUBY_VALUE_METHOD_FUNC(FXRbDCWindow::endit), self);
+      rb_ensure(VALUEFUNC(rb_yield), self, VALUEFUNC(FXRbDCWindow::endit), self);
     }
   }
   return self;
@@ -5747,8 +5889,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_begin(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXDrawable *arg2 = (FXDrawable *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXDrawable *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -5776,7 +5918,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_end(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -5795,15 +5937,9 @@ fail:
 }
 
 
-SWIGINTERN void
-free_FXDCWindow(void *self) {
-    FXDCWindow *arg1 = (FXDCWindow *)self;
-    delete arg1;
-}
-
 SWIGINTERN VALUE
 _wrap_FXDCWindow_readPixel(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   void *argp1 = 0 ;
@@ -5831,7 +5967,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawPoint(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   void *argp1 = 0 ;
@@ -5856,8 +5992,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawPoints(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5875,8 +6011,8 @@ _wrap_FXDCWindow_drawPoints(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -5895,8 +6031,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawPointsRel(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5914,8 +6050,8 @@ _wrap_FXDCWindow_drawPointsRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -5934,7 +6070,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawLine(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -5963,8 +6099,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawLines(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5982,8 +6118,8 @@ _wrap_FXDCWindow_drawLines(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -6002,8 +6138,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawLinesRel(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6021,8 +6157,8 @@ _wrap_FXDCWindow_drawLinesRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -6041,8 +6177,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawLineSegments(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXSegment *arg2 = (FXSegment *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXSegment *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6060,8 +6196,8 @@ _wrap_FXDCWindow_drawLineSegments(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXSegment[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXSegment *pSeg;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXSegment, pSeg);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXSegment *pSeg = (FXSegment*)FXRbConvertPtr(entry, SWIGTYPE_p_FXSegment, 0);
       arg2[i] = *pSeg;
     }
   }
@@ -6080,7 +6216,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -6109,8 +6245,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawRectangles(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXRectangle *arg2 = (FXRectangle *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXRectangle *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6128,8 +6264,8 @@ _wrap_FXDCWindow_drawRectangles(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXRectangle[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXRectangle *pRect;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXRectangle, pRect);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXRectangle *pRect = (FXRectangle*)FXRbConvertPtr(entry, SWIGTYPE_p_FXRectangle, 0);
       arg2[i] = *pRect;
     }
   }
@@ -6148,7 +6284,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawRoundRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -6181,7 +6317,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawArc(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -6214,8 +6350,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawArcs(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXArc *arg2 = (FXArc *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXArc *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6233,8 +6369,8 @@ _wrap_FXDCWindow_drawArcs(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXArc[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXArc *pArc;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXArc, pArc);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXArc *pArc = (FXArc*)FXRbConvertPtr(entry, SWIGTYPE_p_FXArc, 0);
       arg2[i] = *pArc;
     }
   }
@@ -6247,7 +6383,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawEllipse(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -6276,7 +6412,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_fillRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -6305,8 +6441,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_fillRectangles(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXRectangle *arg2 = (FXRectangle *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXRectangle *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6324,8 +6460,8 @@ _wrap_FXDCWindow_fillRectangles(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXRectangle[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXRectangle *pRect;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXRectangle, pRect);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXRectangle *pRect = (FXRectangle*)FXRbConvertPtr(entry, SWIGTYPE_p_FXRectangle, 0);
       arg2[i] = *pRect;
     }
   }
@@ -6344,7 +6480,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_fillRoundRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -6377,7 +6513,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_fillChord(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -6410,8 +6546,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_fillChords(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXArc *arg2 = (FXArc *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXArc *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6441,7 +6577,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_fillArc(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -6474,8 +6610,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_fillArcs(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXArc *arg2 = (FXArc *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXArc *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6493,8 +6629,8 @@ _wrap_FXDCWindow_fillArcs(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXArc[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXArc *pArc;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXArc, pArc);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXArc *pArc = (FXArc*)FXRbConvertPtr(entry, SWIGTYPE_p_FXArc, 0);
       arg2[i] = *pArc;
     }
   }
@@ -6507,8 +6643,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_fillPolygon(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6526,8 +6662,8 @@ _wrap_FXDCWindow_fillPolygon(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -6546,8 +6682,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_fillConcavePolygon(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6565,8 +6701,8 @@ _wrap_FXDCWindow_fillConcavePolygon(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -6585,8 +6721,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_fillComplexPolygon(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6604,8 +6740,8 @@ _wrap_FXDCWindow_fillComplexPolygon(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -6624,8 +6760,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_fillPolygonRel(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6643,8 +6779,8 @@ _wrap_FXDCWindow_fillPolygonRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -6663,8 +6799,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_fillConcavePolygonRel(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6682,8 +6818,8 @@ _wrap_FXDCWindow_fillConcavePolygonRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -6702,8 +6838,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_fillComplexPolygonRel(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6721,8 +6857,8 @@ _wrap_FXDCWindow_fillComplexPolygonRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -6741,12 +6877,12 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawHashBox(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
   FXint arg5 ;
-  FXint arg6 = (FXint) 1 ;
+  FXint arg6 = 1 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -6774,7 +6910,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawFocusRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -6803,8 +6939,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawArea__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXDrawable *arg2 = (FXDrawable *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXDrawable *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   FXint arg5 ;
@@ -6844,8 +6980,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawArea__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXDrawable *arg2 = (FXDrawable *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXDrawable *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   FXint arg5 ;
@@ -7008,8 +7144,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawImage(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXImage *arg2 = (FXImage *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXImage *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -7041,8 +7177,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawBitmap(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXBitmap *arg2 = (FXBitmap *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXBitmap *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -7074,8 +7210,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawIcon(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXIcon *arg2 = (FXIcon *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXIcon *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -7107,8 +7243,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawIconShaded(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXIcon *arg2 = (FXIcon *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXIcon *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -7140,8 +7276,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawIconSunken(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXIcon *arg2 = (FXIcon *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXIcon *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -7173,10 +7309,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawText(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
-  FXchar *arg4 = (FXchar *) 0 ;
+  FXchar *arg4 = 0 ;
   FXuint arg5 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7205,10 +7341,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_drawImageText(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
-  FXchar *arg4 = (FXchar *) 0 ;
+  FXchar *arg4 = 0 ;
   FXuint arg5 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7237,7 +7373,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setForeground(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXColor arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7260,7 +7396,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setBackground(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXColor arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7283,9 +7419,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setDashes(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXuint arg2 ;
-  FXchar *arg3 = (FXchar *) 0 ;
+  FXchar *arg3 = 0 ;
   FXuint arg4 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7322,8 +7458,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setLineWidth(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXuint arg2 = (FXuint) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXuint arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -7347,8 +7483,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setLineCap(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXCapStyle arg2 = (FXCapStyle) CAP_BUTT ;
+  FXDCWindow *arg1 = 0 ;
+  FXCapStyle arg2 = CAP_BUTT ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -7378,8 +7514,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setLineJoin(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXJoinStyle arg2 = (FXJoinStyle) JOIN_MITER ;
+  FXDCWindow *arg1 = 0 ;
+  FXJoinStyle arg2 = JOIN_MITER ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -7409,8 +7545,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setLineStyle(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXLineStyle arg2 = (FXLineStyle) LINE_SOLID ;
+  FXDCWindow *arg1 = 0 ;
+  FXLineStyle arg2 = LINE_SOLID ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -7440,8 +7576,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setFillStyle(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXFillStyle arg2 = (FXFillStyle) FILL_SOLID ;
+  FXDCWindow *arg1 = 0 ;
+  FXFillStyle arg2 = FILL_SOLID ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -7471,8 +7607,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setFillRule(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXFillRule arg2 = (FXFillRule) RULE_EVEN_ODD ;
+  FXDCWindow *arg1 = 0 ;
+  FXFillRule arg2 = RULE_EVEN_ODD ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -7502,8 +7638,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setFunction(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXFunction arg2 = (FXFunction) BLT_SRC ;
+  FXDCWindow *arg1 = 0 ;
+  FXFunction arg2 = BLT_SRC ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -7533,10 +7669,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setTile(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXImage *arg2 = (FXImage *) 0 ;
-  FXint arg3 = (FXint) 0 ;
-  FXint arg4 = (FXint) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXImage *arg2 = 0 ;
+  FXint arg3 = 0 ;
+  FXint arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -7570,10 +7706,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setStipple__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXBitmap *arg2 = (FXBitmap *) 0 ;
-  FXint arg3 = (FXint) 0 ;
-  FXint arg4 = (FXint) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXBitmap *arg2 = 0 ;
+  FXint arg3 = 0 ;
+  FXint arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -7607,10 +7743,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setStipple__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXStipplePattern arg2 ;
-  FXint arg3 = (FXint) 0 ;
-  FXint arg4 = (FXint) 0 ;
+  FXint arg3 = 0 ;
+  FXint arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -7726,7 +7862,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setClipRegion(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXRegion *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7746,7 +7882,7 @@ _wrap_FXDCWindow_setClipRegion(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXRegion const &","setClipRegion", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXRegion const &","setClipRegion", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXRegion const &","setClipRegion", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXRegion * >(argp2);
   FXDCWindow_setClipRegion(arg1,(FXRegion const &)*arg2);
@@ -7758,7 +7894,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setClipRectangle__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -7787,7 +7923,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setClipRectangle__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXRectangle *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7807,7 +7943,7 @@ _wrap_FXDCWindow_setClipRectangle__SWIG_1(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXRectangle const &","setClipRectangle", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXRectangle const &","setClipRectangle", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXRectangle const &","setClipRectangle", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXRectangle * >(argp2);
   FXDCWindow_setClipRectangle(arg1,(FXRectangle const &)*arg2);
@@ -7883,7 +8019,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_clearClipRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -7904,10 +8040,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setClipMask(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXBitmap *arg2 = (FXBitmap *) 0 ;
-  FXint arg3 = (FXint) 0 ;
-  FXint arg4 = (FXint) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXBitmap *arg2 = 0 ;
+  FXint arg3 = 0 ;
+  FXint arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -7941,7 +8077,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_clearClipMask(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -7962,8 +8098,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_setFont(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
-  FXFont *arg2 = (FXFont *) 0 ;
+  FXDCWindow *arg1 = 0 ;
+  FXFont *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -7991,7 +8127,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCWindow_clipChildren(int argc, VALUE *argv, VALUE self) {
-  FXDCWindow *arg1 = (FXDCWindow *) 0 ;
+  FXDCWindow *arg1 = 0 ;
   FXbool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8037,7 +8173,7 @@ _wrap_new_FXPSBounds(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
   result = (FXPSBounds *)new FXPSBounds();
-  DATA_PTR(self) = result;
+  ((struct ruby_wrapped_object *)RTYPEDDATA_GET_DATA(self))->data = result;
   return self;
 fail:
   return Qnil;
@@ -8046,7 +8182,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPSBounds_xmin_set(int argc, VALUE *argv, VALUE self) {
-  FXPSBounds *arg1 = (FXPSBounds *) 0 ;
+  FXPSBounds *arg1 = 0 ;
   FXdouble arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8075,7 +8211,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPSBounds_xmin_get(int argc, VALUE *argv, VALUE self) {
-  FXPSBounds *arg1 = (FXPSBounds *) 0 ;
+  FXPSBounds *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXdouble result;
@@ -8099,7 +8235,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPSBounds_xmax_set(int argc, VALUE *argv, VALUE self) {
-  FXPSBounds *arg1 = (FXPSBounds *) 0 ;
+  FXPSBounds *arg1 = 0 ;
   FXdouble arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8128,7 +8264,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPSBounds_xmax_get(int argc, VALUE *argv, VALUE self) {
-  FXPSBounds *arg1 = (FXPSBounds *) 0 ;
+  FXPSBounds *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXdouble result;
@@ -8152,7 +8288,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPSBounds_ymin_set(int argc, VALUE *argv, VALUE self) {
-  FXPSBounds *arg1 = (FXPSBounds *) 0 ;
+  FXPSBounds *arg1 = 0 ;
   FXdouble arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8181,7 +8317,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPSBounds_ymin_get(int argc, VALUE *argv, VALUE self) {
-  FXPSBounds *arg1 = (FXPSBounds *) 0 ;
+  FXPSBounds *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXdouble result;
@@ -8205,7 +8341,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPSBounds_ymax_set(int argc, VALUE *argv, VALUE self) {
-  FXPSBounds *arg1 = (FXPSBounds *) 0 ;
+  FXPSBounds *arg1 = 0 ;
   FXdouble arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8234,7 +8370,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPSBounds_ymax_get(int argc, VALUE *argv, VALUE self) {
-  FXPSBounds *arg1 = (FXPSBounds *) 0 ;
+  FXPSBounds *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXdouble result;
@@ -8287,7 +8423,7 @@ _wrap_new_FXPrinter(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
   result = (FXPrinter *)new FXPrinter();
-  DATA_PTR(self) = result;
+  ((struct ruby_wrapped_object *)RTYPEDDATA_GET_DATA(self))->data = result;
   return self;
 fail:
   return Qnil;
@@ -8296,7 +8432,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_name_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXString arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8319,7 +8455,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_name_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXString result;
@@ -8343,7 +8479,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_firstpage_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXuint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8366,7 +8502,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_firstpage_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXuint result;
@@ -8390,7 +8526,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_lastpage_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXuint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8413,7 +8549,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_lastpage_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXuint result;
@@ -8437,7 +8573,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_currentpage_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXuint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8460,7 +8596,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_currentpage_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXuint result;
@@ -8484,7 +8620,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_frompage_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXuint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8507,7 +8643,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_frompage_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXuint result;
@@ -8531,7 +8667,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_topage_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXuint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8554,7 +8690,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_topage_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXuint result;
@@ -8578,7 +8714,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_mediasize_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXuint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8601,7 +8737,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_mediasize_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXuint result;
@@ -8625,7 +8761,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_mediawidth_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXdouble arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8654,7 +8790,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_mediawidth_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXdouble result;
@@ -8678,7 +8814,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_mediaheight_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXdouble arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8707,7 +8843,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_mediaheight_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXdouble result;
@@ -8731,7 +8867,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_leftmargin_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXdouble arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8760,7 +8896,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_leftmargin_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXdouble result;
@@ -8784,7 +8920,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_rightmargin_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXdouble arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8813,7 +8949,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_rightmargin_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXdouble result;
@@ -8837,7 +8973,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_topmargin_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXdouble arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8866,7 +9002,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_topmargin_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXdouble result;
@@ -8890,7 +9026,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_bottommargin_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXdouble arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8919,7 +9055,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_bottommargin_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXdouble result;
@@ -8943,7 +9079,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_numcopies_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXuint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8966,7 +9102,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_numcopies_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXuint result;
@@ -8990,7 +9126,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_flags_set(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   FXuint arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9013,7 +9149,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXPrinter_flags_get(int argc, VALUE *argv, VALUE self) {
-  FXPrinter *arg1 = (FXPrinter *) 0 ;
+  FXPrinter *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXuint result;
@@ -9054,7 +9190,7 @@ _wrap_FXDCPrint_allocate(int argc, VALUE *argv, VALUE self)
 
 SWIGINTERN VALUE
 _wrap_new_FXDCPrint(int argc, VALUE *argv, VALUE self) {
-  FXApp *arg1 = (FXApp *) 0 ;
+  FXApp *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXDCPrint *result = 0 ;
@@ -9069,12 +9205,12 @@ _wrap_new_FXDCPrint(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< FXApp * >(argp1);
   {
     if (!arg1) {
-      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+      SWIG_exception(SWIG_NullReferenceError,"Received a NULL pointer.");
     }
   }
   {
     result = (FXDCPrint *)new_FXDCPrint(arg1);
-    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);
     }
@@ -9087,7 +9223,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_beginPrint(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXPrinter *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9109,7 +9245,7 @@ _wrap_FXDCPrint_beginPrint(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXPrinter &","beginPrint", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXPrinter &","beginPrint", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXPrinter &","beginPrint", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXPrinter * >(argp2);
   result = (FXbool)(arg1)->beginPrint(*arg2);
@@ -9122,7 +9258,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_endPrint(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -9146,8 +9282,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_beginPage(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXuint arg2 = (FXuint) 1 ;
+  FXDCPrint *arg1 = 0 ;
+  FXuint arg2 = 1 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -9174,7 +9310,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_endPage(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   FXbool result;
@@ -9198,7 +9334,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setContentRange(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -9230,7 +9366,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_readPixel(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   void *argp1 = 0 ;
@@ -9258,7 +9394,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawPoint(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   void *argp1 = 0 ;
@@ -9283,8 +9419,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawPoints(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9302,8 +9438,8 @@ _wrap_FXDCPrint_drawPoints(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -9322,8 +9458,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawPointsRel(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9341,8 +9477,8 @@ _wrap_FXDCPrint_drawPointsRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -9361,7 +9497,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawLine(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -9390,8 +9526,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawLines(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9409,8 +9545,8 @@ _wrap_FXDCPrint_drawLines(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -9429,8 +9565,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawLinesRel(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9448,8 +9584,8 @@ _wrap_FXDCPrint_drawLinesRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -9468,8 +9604,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawLineSegments(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXSegment *arg2 = (FXSegment *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXSegment *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9487,8 +9623,8 @@ _wrap_FXDCPrint_drawLineSegments(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXSegment[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXSegment *pSeg;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXSegment, pSeg);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXSegment *pSeg = (FXSegment*)FXRbConvertPtr(entry, SWIGTYPE_p_FXSegment, 0);
       arg2[i] = *pSeg;
     }
   }
@@ -9507,7 +9643,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -9536,8 +9672,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawRectangles(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXRectangle *arg2 = (FXRectangle *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXRectangle *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9555,8 +9691,8 @@ _wrap_FXDCPrint_drawRectangles(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXRectangle[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXRectangle *pRect;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXRectangle, pRect);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXRectangle *pRect = (FXRectangle*)FXRbConvertPtr(entry, SWIGTYPE_p_FXRectangle, 0);
       arg2[i] = *pRect;
     }
   }
@@ -9575,7 +9711,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawRoundRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -9608,7 +9744,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawArc(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -9641,8 +9777,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawArcs(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXArc *arg2 = (FXArc *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXArc *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9660,8 +9796,8 @@ _wrap_FXDCPrint_drawArcs(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXArc[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXArc *pArc;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXArc, pArc);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXArc *pArc = (FXArc*)FXRbConvertPtr(entry, SWIGTYPE_p_FXArc, 0);
       arg2[i] = *pArc;
     }
   }
@@ -9674,7 +9810,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawEllipse(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -9703,7 +9839,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_fillRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -9732,8 +9868,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_fillRectangles(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXRectangle *arg2 = (FXRectangle *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXRectangle *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9751,8 +9887,8 @@ _wrap_FXDCPrint_fillRectangles(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXRectangle[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXRectangle *pRect;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXRectangle, pRect);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXRectangle *pRect = (FXRectangle*)FXRbConvertPtr(entry, SWIGTYPE_p_FXRectangle, 0);
       arg2[i] = *pRect;
     }
   }
@@ -9771,7 +9907,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_fillRoundRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -9804,7 +9940,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_fillChord(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -9837,8 +9973,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_fillChords(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXArc *arg2 = (FXArc *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXArc *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9868,7 +10004,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_fillArc(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -9901,8 +10037,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_fillArcs(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXArc *arg2 = (FXArc *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXArc *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9920,8 +10056,8 @@ _wrap_FXDCPrint_fillArcs(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXArc[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXArc *pArc;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXArc, pArc);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXArc *pArc = (FXArc*)FXRbConvertPtr(entry, SWIGTYPE_p_FXArc, 0);
       arg2[i] = *pArc;
     }
   }
@@ -9934,8 +10070,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_fillPolygon(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9953,8 +10089,8 @@ _wrap_FXDCPrint_fillPolygon(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -9973,8 +10109,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_fillConcavePolygon(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9992,8 +10128,8 @@ _wrap_FXDCPrint_fillConcavePolygon(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -10012,8 +10148,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_fillComplexPolygon(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10031,8 +10167,8 @@ _wrap_FXDCPrint_fillComplexPolygon(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -10051,8 +10187,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_fillPolygonRel(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10070,8 +10206,8 @@ _wrap_FXDCPrint_fillPolygonRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -10090,8 +10226,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_fillConcavePolygonRel(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10109,8 +10245,8 @@ _wrap_FXDCPrint_fillConcavePolygonRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -10129,8 +10265,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_fillComplexPolygonRel(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXPoint *arg2 = (FXPoint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXPoint *arg2 = 0 ;
   FXuint arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10148,8 +10284,8 @@ _wrap_FXDCPrint_fillComplexPolygonRel(int argc, VALUE *argv, VALUE self) {
     arg2 = new FXPoint[RARRAY_LEN(argv[0])];
     arg3 = static_cast<FXuint>( RARRAY_LEN(argv[0]) );
     for (FXuint i = 0; i < arg3; i++) {
-      FXPoint *pPoint;
-      Data_Get_Struct(rb_ary_entry(argv[0], i), FXPoint, pPoint);
+      VALUE entry = rb_ary_entry(argv[0], i);
+      FXPoint *pPoint = (FXPoint*)FXRbConvertPtr(entry, FXRbTypeQuery("FXPoint *"), 0);
       arg2[i] = *pPoint;
     }
   }
@@ -10168,12 +10304,12 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawHashBox(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
   FXint arg5 ;
-  FXint arg6 = (FXint) 1 ;
+  FXint arg6 = 1 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -10201,7 +10337,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawFocusRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -10230,8 +10366,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawArea__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXDrawable *arg2 = (FXDrawable *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXDrawable *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   FXint arg5 ;
@@ -10271,8 +10407,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawArea__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXDrawable *arg2 = (FXDrawable *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXDrawable *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   FXint arg5 ;
@@ -10435,8 +10571,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawImage(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXImage *arg2 = (FXImage *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXImage *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -10468,8 +10604,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawBitmap(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXBitmap *arg2 = (FXBitmap *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXBitmap *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -10501,8 +10637,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawIcon(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXIcon *arg2 = (FXIcon *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXIcon *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -10534,8 +10670,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawIconShaded(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXIcon *arg2 = (FXIcon *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXIcon *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -10567,8 +10703,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawIconSunken(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXIcon *arg2 = (FXIcon *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXIcon *arg2 = 0 ;
   FXint arg3 ;
   FXint arg4 ;
   void *argp1 = 0 ;
@@ -10600,10 +10736,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawText(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
-  FXchar *arg4 = (FXchar *) 0 ;
+  FXchar *arg4 = 0 ;
   FXuint arg5 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10632,10 +10768,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_drawImageText(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
-  FXchar *arg4 = (FXchar *) 0 ;
+  FXchar *arg4 = 0 ;
   FXuint arg5 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10664,7 +10800,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setForeground(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXColor arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10687,7 +10823,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setBackground(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXColor arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10710,9 +10846,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setDashes(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXuint arg2 ;
-  FXchar *arg3 = (FXchar *) 0 ;
+  FXchar *arg3 = 0 ;
   FXuint arg4 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10749,8 +10885,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setLineWidth(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXuint arg2 = (FXuint) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXuint arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -10774,8 +10910,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setLineCap(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXCapStyle arg2 = (FXCapStyle) CAP_BUTT ;
+  FXDCPrint *arg1 = 0 ;
+  FXCapStyle arg2 = CAP_BUTT ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -10805,8 +10941,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setLineJoin(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXJoinStyle arg2 = (FXJoinStyle) JOIN_MITER ;
+  FXDCPrint *arg1 = 0 ;
+  FXJoinStyle arg2 = JOIN_MITER ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -10836,8 +10972,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setLineStyle(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXLineStyle arg2 = (FXLineStyle) LINE_SOLID ;
+  FXDCPrint *arg1 = 0 ;
+  FXLineStyle arg2 = LINE_SOLID ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -10867,8 +11003,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setFillStyle(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXFillStyle arg2 = (FXFillStyle) FILL_SOLID ;
+  FXDCPrint *arg1 = 0 ;
+  FXFillStyle arg2 = FILL_SOLID ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -10898,8 +11034,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setFillRule(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXFillRule arg2 = (FXFillRule) RULE_EVEN_ODD ;
+  FXDCPrint *arg1 = 0 ;
+  FXFillRule arg2 = RULE_EVEN_ODD ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -10929,8 +11065,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setFunction(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXFunction arg2 = (FXFunction) BLT_SRC ;
+  FXDCPrint *arg1 = 0 ;
+  FXFunction arg2 = BLT_SRC ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -10960,10 +11096,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setTile(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXImage *arg2 = (FXImage *) 0 ;
-  FXint arg3 = (FXint) 0 ;
-  FXint arg4 = (FXint) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXImage *arg2 = 0 ;
+  FXint arg3 = 0 ;
+  FXint arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -10997,10 +11133,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setStipple__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXBitmap *arg2 = (FXBitmap *) 0 ;
-  FXint arg3 = (FXint) 0 ;
-  FXint arg4 = (FXint) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXBitmap *arg2 = 0 ;
+  FXint arg3 = 0 ;
+  FXint arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11034,10 +11170,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setStipple__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXStipplePattern arg2 ;
-  FXint arg3 = (FXint) 0 ;
-  FXint arg4 = (FXint) 0 ;
+  FXint arg3 = 0 ;
+  FXint arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -11153,7 +11289,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setClipRegion(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXRegion *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11173,7 +11309,7 @@ _wrap_FXDCPrint_setClipRegion(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXRegion const &","setClipRegion", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXRegion const &","setClipRegion", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXRegion const &","setClipRegion", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXRegion * >(argp2);
   FXDCPrint_setClipRegion(arg1,(FXRegion const &)*arg2);
@@ -11185,7 +11321,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setClipRectangle__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXint arg2 ;
   FXint arg3 ;
   FXint arg4 ;
@@ -11214,7 +11350,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setClipRectangle__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXRectangle *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11234,7 +11370,7 @@ _wrap_FXDCPrint_setClipRectangle__SWIG_1(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "FXRectangle const &","setClipRectangle", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "FXRectangle const &","setClipRectangle", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_NullReferenceError, Ruby_Format_TypeError("invalid null reference ", "FXRectangle const &","setClipRectangle", 2, argv[0])); 
   }
   arg2 = reinterpret_cast< FXRectangle * >(argp2);
   FXDCPrint_setClipRectangle(arg1,(FXRectangle const &)*arg2);
@@ -11310,7 +11446,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_clearClipRectangle(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -11331,10 +11467,10 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setClipMask(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXBitmap *arg2 = (FXBitmap *) 0 ;
-  FXint arg3 = (FXint) 0 ;
-  FXint arg4 = (FXint) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXBitmap *arg2 = 0 ;
+  FXint arg3 = 0 ;
+  FXint arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11368,7 +11504,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_clearClipMask(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   
@@ -11389,8 +11525,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_setFont(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
-  FXFont *arg2 = (FXFont *) 0 ;
+  FXDCPrint *arg1 = 0 ;
+  FXFont *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11418,7 +11554,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FXDCPrint_clipChildren(int argc, VALUE *argv, VALUE self) {
-  FXDCPrint *arg1 = (FXDCPrint *) 0 ;
+  FXDCPrint *arg1 = 0 ;
   FXbool arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11632,7 +11768,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.
@@ -11647,15 +11783,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:
@@ -11667,8 +11808,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
@@ -11686,6 +11890,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;
@@ -11737,8 +11981,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);
@@ -11764,49 +12009,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);
+        printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name);
 #endif
-        if (type->cast) {
-          type->cast->prev = cast;
-          cast->next = type->cast;
+        /* Set inclusion mark for sorting */
+        cast->next = cast;
+        num_mapped++;
+
+        if (type == cast->type) {
+#ifdef SWIGRUNTIME_DEBUG
+          printf("%s : self cast at pos [%li]\n", type->name, cast - first);
+#endif
+          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;
   }
@@ -11837,7 +12140,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;
@@ -11845,13 +12147,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;
       }
     }
   }
@@ -11955,8 +12260,11 @@ SWIGEXPORT void Init_dc(void) {
   rb_define_method(SwigClassFXSegment.klass, "x2", VALUEFUNC(_wrap_FXSegment_x2_get), -1);
   rb_define_method(SwigClassFXSegment.klass, "y2=", VALUEFUNC(_wrap_FXSegment_y2_set), -1);
   rb_define_method(SwigClassFXSegment.klass, "y2", VALUEFUNC(_wrap_FXSegment_y2_get), -1);
+  SwigClassFXSegment.cext_type.wrap_struct_name = "C++ class FXSegment";
   SwigClassFXSegment.mark = 0;
+  SwigClassFXSegment.cext_type.function.dmark = SWIG_Ruby_mark_swig_type;
   SwigClassFXSegment.destroy = (void (*)(void *)) free_FXSegment;
+  SwigClassFXSegment.cext_type.function.dfree = SWIG_Ruby_free_swig_type;
   SwigClassFXSegment.trackObjects = 0;
   
   SwigClassFXArc.klass = rb_define_class_under(mFox, "FXArc", rb_cObject);
@@ -11975,8 +12283,11 @@ SWIGEXPORT void Init_dc(void) {
   rb_define_method(SwigClassFXArc.klass, "a", VALUEFUNC(_wrap_FXArc_a_get), -1);
   rb_define_method(SwigClassFXArc.klass, "b=", VALUEFUNC(_wrap_FXArc_b_set), -1);
   rb_define_method(SwigClassFXArc.klass, "b", VALUEFUNC(_wrap_FXArc_b_get), -1);
+  SwigClassFXArc.cext_type.wrap_struct_name = "C++ class FXArc";
   SwigClassFXArc.mark = 0;
+  SwigClassFXArc.cext_type.function.dmark = SWIG_Ruby_mark_swig_type;
   SwigClassFXArc.destroy = (void (*)(void *)) free_FXArc;
+  SwigClassFXArc.cext_type.function.dfree = SWIG_Ruby_free_swig_type;
   SwigClassFXArc.trackObjects = 0;
   
   SwigClassFXDC.klass = rb_define_class_under(mFox, "FXDC", rb_cObject);
@@ -12060,8 +12371,11 @@ SWIGEXPORT void Init_dc(void) {
   rb_define_method(SwigClassFXDC.klass, "clearClipMask", VALUEFUNC(_wrap_FXDC_clearClipMask), -1);
   rb_define_method(SwigClassFXDC.klass, "setFont", VALUEFUNC(_wrap_FXDC_setFont), -1);
   rb_define_method(SwigClassFXDC.klass, "clipChildren", VALUEFUNC(_wrap_FXDC_clipChildren), -1);
+  SwigClassFXDC.cext_type.wrap_struct_name = "C++ class FXDC";
   SwigClassFXDC.mark = (void (*)(void *)) FXRbDC::markfunc;
+  SwigClassFXDC.cext_type.function.dmark = SWIG_Ruby_mark_swig_type;
   SwigClassFXDC.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
+  SwigClassFXDC.cext_type.function.dfree = SWIG_Ruby_free_swig_type;
   SwigClassFXDC.trackObjects = 0;
   
   SwigClassFXDCWindow.klass = rb_define_class_under(mFox, "FXDCWindow", ((swig_class *) SWIGTYPE_p_FXDC->clientdata)->klass);
@@ -12126,8 +12440,11 @@ SWIGEXPORT void Init_dc(void) {
   rb_define_method(SwigClassFXDCWindow.klass, "clearClipMask", VALUEFUNC(_wrap_FXDCWindow_clearClipMask), -1);
   rb_define_method(SwigClassFXDCWindow.klass, "setFont", VALUEFUNC(_wrap_FXDCWindow_setFont), -1);
   rb_define_method(SwigClassFXDCWindow.klass, "clipChildren", VALUEFUNC(_wrap_FXDCWindow_clipChildren), -1);
+  SwigClassFXDCWindow.cext_type.wrap_struct_name = "C++ class FXDCWindow";
   SwigClassFXDCWindow.mark = (void (*)(void *)) FXRbDCWindow::markfunc;
-  SwigClassFXDCWindow.destroy = (void (*)(void *)) free_FXDCWindow;
+  SwigClassFXDCWindow.cext_type.function.dmark = SWIG_Ruby_mark_swig_type;
+  SwigClassFXDCWindow.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
+  SwigClassFXDCWindow.cext_type.function.dfree = SWIG_Ruby_free_swig_type;
   SwigClassFXDCWindow.trackObjects = 0;
   rb_define_const(mFox, "PRINT_DEST_PAPER", SWIG_From_int(static_cast< int >(PRINT_DEST_PAPER)));
   rb_define_const(mFox, "PRINT_DEST_FILE", SWIG_From_int(static_cast< int >(PRINT_DEST_FILE)));
@@ -12160,8 +12477,11 @@ SWIGEXPORT void Init_dc(void) {
   rb_define_method(SwigClassFXPSBounds.klass, "ymin", VALUEFUNC(_wrap_FXPSBounds_ymin_get), -1);
   rb_define_method(SwigClassFXPSBounds.klass, "ymax=", VALUEFUNC(_wrap_FXPSBounds_ymax_set), -1);
   rb_define_method(SwigClassFXPSBounds.klass, "ymax", VALUEFUNC(_wrap_FXPSBounds_ymax_get), -1);
+  SwigClassFXPSBounds.cext_type.wrap_struct_name = "C++ class FXPSBounds";
   SwigClassFXPSBounds.mark = 0;
+  SwigClassFXPSBounds.cext_type.function.dmark = SWIG_Ruby_mark_swig_type;
   SwigClassFXPSBounds.destroy = (void (*)(void *)) free_FXPSBounds;
+  SwigClassFXPSBounds.cext_type.function.dfree = SWIG_Ruby_free_swig_type;
   SwigClassFXPSBounds.trackObjects = 0;
   
   SwigClassFXPrinter.klass = rb_define_class_under(mFox, "FXPrinter", rb_cObject);
@@ -12198,8 +12518,11 @@ SWIGEXPORT void Init_dc(void) {
   rb_define_method(SwigClassFXPrinter.klass, "numcopies", VALUEFUNC(_wrap_FXPrinter_numcopies_get), -1);
   rb_define_method(SwigClassFXPrinter.klass, "flags=", VALUEFUNC(_wrap_FXPrinter_flags_set), -1);
   rb_define_method(SwigClassFXPrinter.klass, "flags", VALUEFUNC(_wrap_FXPrinter_flags_get), -1);
+  SwigClassFXPrinter.cext_type.wrap_struct_name = "C++ class FXPrinter";
   SwigClassFXPrinter.mark = 0;
+  SwigClassFXPrinter.cext_type.function.dmark = SWIG_Ruby_mark_swig_type;
   SwigClassFXPrinter.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
+  SwigClassFXPrinter.cext_type.function.dfree = SWIG_Ruby_free_swig_type;
   SwigClassFXPrinter.trackObjects = 0;
   
   SwigClassFXDCPrint.klass = rb_define_class_under(mFox, "FXDCPrint", ((swig_class *) SWIGTYPE_p_FXDC->clientdata)->klass);
@@ -12267,8 +12590,11 @@ SWIGEXPORT void Init_dc(void) {
   rb_define_method(SwigClassFXDCPrint.klass, "clearClipMask", VALUEFUNC(_wrap_FXDCPrint_clearClipMask), -1);
   rb_define_method(SwigClassFXDCPrint.klass, "setFont", VALUEFUNC(_wrap_FXDCPrint_setFont), -1);
   rb_define_method(SwigClassFXDCPrint.klass, "clipChildren", VALUEFUNC(_wrap_FXDCPrint_clipChildren), -1);
+  SwigClassFXDCPrint.cext_type.wrap_struct_name = "C++ class FXDCPrint";
   SwigClassFXDCPrint.mark = (void (*)(void *)) FXRbDCPrint::markfunc;
+  SwigClassFXDCPrint.cext_type.function.dmark = SWIG_Ruby_mark_swig_type;
   SwigClassFXDCPrint.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
+  SwigClassFXDCPrint.cext_type.function.dfree = SWIG_Ruby_free_swig_type;
   SwigClassFXDCPrint.trackObjects = 0;
 }