fxruby 1.2.2 → 1.2.3

data/ext/fox12/FXRuby.cpp

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRuby.cpp,v 1.2 2004/08/07 12:02:03 lyle Exp $
+ * $Id: FXRuby.cpp,v 1.3 2005/01/15 20:02:42 lyle Exp $
  ***********************************************************************/
 
 #ifdef _MSC_VER
@@ -1803,6 +1803,7 @@ extern "C" void Init_fox12(void) {
   REQUIRE("fox12/aliases");
   REQUIRE("fox12/responder2");
   REQUIRE("fox12/glgroup");
+  REQUIRE("fox12/execute_nonmodal");
   REQUIRE("fox12/version");
   
   id_assocs=rb_intern("@assocs");

data/ext/fox12/core_wrap.cpp

@@ -86,13 +86,16 @@ private:
  
 #ifdef __cplusplus
 #  ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
+#    define PROTECTFUNC(f) ((VALUE (*)()) f)
 #    define VALUEFUNC(f) ((VALUE (*)()) f)
 #    define VOIDFUNC(f)  ((void (*)()) f)
 #  else
 #    ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
+#      define PROTECTFUNC(f) ((VALUE (*)()) f)
 #      define VALUEFUNC(f) ((VALUE (*)()) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
-#    else /* These definitions should work for Ruby 1.7 */
+#    else /* These definitions should work for Ruby 1.7+ */
+#      define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
 #      define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
 #    endif
@@ -265,13 +268,14 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 #else
 
 static swig_type_info *swig_type_list = 0;
+static swig_type_info **swig_type_list_handle = &swig_type_list;
 
 /* Register a type mapping with the type-checking */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeRegister(swig_type_info *ti) {
   swig_type_info *tc, *head, *ret, *next;
   /* Check to see if this type has already been registered */
-  tc = swig_type_list;
+  tc = *swig_type_list_handle;
   while (tc) {
     if (strcmp(tc->name, ti->name) == 0) {
       /* Already exists in the table.  Just add additional types to the list */
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
   next = 0;
 
   /* Place in list */
-  ti->prev = swig_type_list;
-  swig_type_list = ti;
+  ti->prev = *swig_type_list_handle;
+  *swig_type_list_handle = ti;
 
   /* Build linked lists */
   l1:
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 /* Search for a swig_type_info structure */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeQuery(const char *name) {
-  swig_type_info *ty = swig_type_list;
+  swig_type_info *ty = *swig_type_list_handle;
   while (ty) {
     if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
     if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   equiv = ti->next;
   while (equiv) {
     if (!equiv->converter) {
-      tc = swig_type_list;
+      tc = *swig_type_list_handle;
       while (tc) {
         if ((strcmp(tc->name, equiv->name) == 0))
           SWIG_TypeClientData(tc,clientdata);
@@ -571,6 +575,12 @@ static swig_type_info *swig_types[51];
 
 VALUE mFox;
 
+static void SWIG_AsVal(VALUE obj, int *val)
+{
+    *val = (int) NUM2INT(obj);
+}
+
+
 #include "FXRbCommon.h"
 
 

data/ext/fox12/dc_wrap.cpp

@@ -86,13 +86,16 @@ private:
  
 #ifdef __cplusplus
 #  ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
+#    define PROTECTFUNC(f) ((VALUE (*)()) f)
 #    define VALUEFUNC(f) ((VALUE (*)()) f)
 #    define VOIDFUNC(f)  ((void (*)()) f)
 #  else
 #    ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
+#      define PROTECTFUNC(f) ((VALUE (*)()) f)
 #      define VALUEFUNC(f) ((VALUE (*)()) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
-#    else /* These definitions should work for Ruby 1.7 */
+#    else /* These definitions should work for Ruby 1.7+ */
+#      define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
 #      define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
 #    endif
@@ -265,13 +268,14 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 #else
 
 static swig_type_info *swig_type_list = 0;
+static swig_type_info **swig_type_list_handle = &swig_type_list;
 
 /* Register a type mapping with the type-checking */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeRegister(swig_type_info *ti) {
   swig_type_info *tc, *head, *ret, *next;
   /* Check to see if this type has already been registered */
-  tc = swig_type_list;
+  tc = *swig_type_list_handle;
   while (tc) {
     if (strcmp(tc->name, ti->name) == 0) {
       /* Already exists in the table.  Just add additional types to the list */
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
   next = 0;
 
   /* Place in list */
-  ti->prev = swig_type_list;
-  swig_type_list = ti;
+  ti->prev = *swig_type_list_handle;
+  *swig_type_list_handle = ti;
 
   /* Build linked lists */
   l1:
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 /* Search for a swig_type_info structure */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeQuery(const char *name) {
-  swig_type_info *ty = swig_type_list;
+  swig_type_info *ty = *swig_type_list_handle;
   while (ty) {
     if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
     if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   equiv = ti->next;
   while (equiv) {
     if (!equiv->converter) {
-      tc = swig_type_list;
+      tc = *swig_type_list_handle;
       while (tc) {
         if ((strcmp(tc->name, equiv->name) == 0))
           SWIG_TypeClientData(tc,clientdata);
@@ -537,6 +541,12 @@ static swig_type_info *swig_types[18];
 #define SWIG_name    "Dc"
 
 
+static void SWIG_AsVal(VALUE obj, int *val)
+{
+    *val = (int) NUM2INT(obj);
+}
+
+
 #include "FXRbCommon.h"
 
 

data/ext/fox12/dialogs_wrap.cpp

@@ -86,13 +86,16 @@ private:
  
 #ifdef __cplusplus
 #  ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
+#    define PROTECTFUNC(f) ((VALUE (*)()) f)
 #    define VALUEFUNC(f) ((VALUE (*)()) f)
 #    define VOIDFUNC(f)  ((void (*)()) f)
 #  else
 #    ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
+#      define PROTECTFUNC(f) ((VALUE (*)()) f)
 #      define VALUEFUNC(f) ((VALUE (*)()) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
-#    else /* These definitions should work for Ruby 1.7 */
+#    else /* These definitions should work for Ruby 1.7+ */
+#      define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
 #      define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
 #    endif
@@ -265,13 +268,14 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 #else
 
 static swig_type_info *swig_type_list = 0;
+static swig_type_info **swig_type_list_handle = &swig_type_list;
 
 /* Register a type mapping with the type-checking */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeRegister(swig_type_info *ti) {
   swig_type_info *tc, *head, *ret, *next;
   /* Check to see if this type has already been registered */
-  tc = swig_type_list;
+  tc = *swig_type_list_handle;
   while (tc) {
     if (strcmp(tc->name, ti->name) == 0) {
       /* Already exists in the table.  Just add additional types to the list */
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
   next = 0;
 
   /* Place in list */
-  ti->prev = swig_type_list;
-  swig_type_list = ti;
+  ti->prev = *swig_type_list_handle;
+  *swig_type_list_handle = ti;
 
   /* Build linked lists */
   l1:
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 /* Search for a swig_type_info structure */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeQuery(const char *name) {
-  swig_type_info *ty = swig_type_list;
+  swig_type_info *ty = *swig_type_list_handle;
   while (ty) {
     if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
     if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   equiv = ti->next;
   while (equiv) {
     if (!equiv->converter) {
-      tc = swig_type_list;
+      tc = *swig_type_list_handle;
       while (tc) {
         if ((strcmp(tc->name, equiv->name) == 0))
           SWIG_TypeClientData(tc,clientdata);
@@ -548,6 +552,12 @@ static swig_type_info *swig_types[29];
 #define SWIG_name    "Dialogs"
 
 
+static void SWIG_AsVal(VALUE obj, int *val)
+{
+    *val = (int) NUM2INT(obj);
+}
+
+
 #include "FXRbCommon.h"
 
 

data/ext/fox12/frames_wrap.cpp

@@ -86,13 +86,16 @@ private:
  
 #ifdef __cplusplus
 #  ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
+#    define PROTECTFUNC(f) ((VALUE (*)()) f)
 #    define VALUEFUNC(f) ((VALUE (*)()) f)
 #    define VOIDFUNC(f)  ((void (*)()) f)
 #  else
 #    ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
+#      define PROTECTFUNC(f) ((VALUE (*)()) f)
 #      define VALUEFUNC(f) ((VALUE (*)()) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
-#    else /* These definitions should work for Ruby 1.7 */
+#    else /* These definitions should work for Ruby 1.7+ */
+#      define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
 #      define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
 #    endif
@@ -265,13 +268,14 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 #else
 
 static swig_type_info *swig_type_list = 0;
+static swig_type_info **swig_type_list_handle = &swig_type_list;
 
 /* Register a type mapping with the type-checking */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeRegister(swig_type_info *ti) {
   swig_type_info *tc, *head, *ret, *next;
   /* Check to see if this type has already been registered */
-  tc = swig_type_list;
+  tc = *swig_type_list_handle;
   while (tc) {
     if (strcmp(tc->name, ti->name) == 0) {
       /* Already exists in the table.  Just add additional types to the list */
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
   next = 0;
 
   /* Place in list */
-  ti->prev = swig_type_list;
-  swig_type_list = ti;
+  ti->prev = *swig_type_list_handle;
+  *swig_type_list_handle = ti;
 
   /* Build linked lists */
   l1:
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 /* Search for a swig_type_info structure */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeQuery(const char *name) {
-  swig_type_info *ty = swig_type_list;
+  swig_type_info *ty = *swig_type_list_handle;
   while (ty) {
     if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
     if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   equiv = ti->next;
   while (equiv) {
     if (!equiv->converter) {
-      tc = swig_type_list;
+      tc = *swig_type_list_handle;
       while (tc) {
         if ((strcmp(tc->name, equiv->name) == 0))
           SWIG_TypeClientData(tc,clientdata);
@@ -550,6 +554,12 @@ static swig_type_info *swig_types[31];
 #define SWIG_name    "Frames"
 
 
+static void SWIG_AsVal(VALUE obj, int *val)
+{
+    *val = (int) NUM2INT(obj);
+}
+
+
 #include "FXRbCommon.h"
 
 

data/ext/fox12/fx3d_wrap.cpp

@@ -86,13 +86,16 @@ private:
  
 #ifdef __cplusplus
 #  ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
+#    define PROTECTFUNC(f) ((VALUE (*)()) f)
 #    define VALUEFUNC(f) ((VALUE (*)()) f)
 #    define VOIDFUNC(f)  ((void (*)()) f)
 #  else
 #    ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
+#      define PROTECTFUNC(f) ((VALUE (*)()) f)
 #      define VALUEFUNC(f) ((VALUE (*)()) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
-#    else /* These definitions should work for Ruby 1.7 */
+#    else /* These definitions should work for Ruby 1.7+ */
+#      define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
 #      define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
 #    endif
@@ -265,13 +268,14 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 #else
 
 static swig_type_info *swig_type_list = 0;
+static swig_type_info **swig_type_list_handle = &swig_type_list;
 
 /* Register a type mapping with the type-checking */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeRegister(swig_type_info *ti) {
   swig_type_info *tc, *head, *ret, *next;
   /* Check to see if this type has already been registered */
-  tc = swig_type_list;
+  tc = *swig_type_list_handle;
   while (tc) {
     if (strcmp(tc->name, ti->name) == 0) {
       /* Already exists in the table.  Just add additional types to the list */
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
   next = 0;
 
   /* Place in list */
-  ti->prev = swig_type_list;
-  swig_type_list = ti;
+  ti->prev = *swig_type_list_handle;
+  *swig_type_list_handle = ti;
 
   /* Build linked lists */
   l1:
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 /* Search for a swig_type_info structure */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeQuery(const char *name) {
-  swig_type_info *ty = swig_type_list;
+  swig_type_info *ty = *swig_type_list_handle;
   while (ty) {
     if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
     if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   equiv = ti->next;
   while (equiv) {
     if (!equiv->converter) {
-      tc = swig_type_list;
+      tc = *swig_type_list_handle;
       while (tc) {
         if ((strcmp(tc->name, equiv->name) == 0))
           SWIG_TypeClientData(tc,clientdata);
@@ -557,6 +561,12 @@ static swig_type_info *swig_types[38];
 #define SWIG_name    "Fx3d"
 
 
+static void SWIG_AsVal(VALUE obj, int *val)
+{
+    *val = (int) NUM2INT(obj);
+}
+
+
 #include "FXRbCommon.h"
 
 

data/ext/fox12/iconlist_wrap.cpp

@@ -86,13 +86,16 @@ private:
  
 #ifdef __cplusplus
 #  ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
+#    define PROTECTFUNC(f) ((VALUE (*)()) f)
 #    define VALUEFUNC(f) ((VALUE (*)()) f)
 #    define VOIDFUNC(f)  ((void (*)()) f)
 #  else
 #    ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
+#      define PROTECTFUNC(f) ((VALUE (*)()) f)
 #      define VALUEFUNC(f) ((VALUE (*)()) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
-#    else /* These definitions should work for Ruby 1.7 */
+#    else /* These definitions should work for Ruby 1.7+ */
+#      define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
 #      define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
 #    endif
@@ -265,13 +268,14 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 #else
 
 static swig_type_info *swig_type_list = 0;
+static swig_type_info **swig_type_list_handle = &swig_type_list;
 
 /* Register a type mapping with the type-checking */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeRegister(swig_type_info *ti) {
   swig_type_info *tc, *head, *ret, *next;
   /* Check to see if this type has already been registered */
-  tc = swig_type_list;
+  tc = *swig_type_list_handle;
   while (tc) {
     if (strcmp(tc->name, ti->name) == 0) {
       /* Already exists in the table.  Just add additional types to the list */
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
   next = 0;
 
   /* Place in list */
-  ti->prev = swig_type_list;
-  swig_type_list = ti;
+  ti->prev = *swig_type_list_handle;
+  *swig_type_list_handle = ti;
 
   /* Build linked lists */
   l1:
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 /* Search for a swig_type_info structure */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeQuery(const char *name) {
-  swig_type_info *ty = swig_type_list;
+  swig_type_info *ty = *swig_type_list_handle;
   while (ty) {
     if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
     if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   equiv = ti->next;
   while (equiv) {
     if (!equiv->converter) {
-      tc = swig_type_list;
+      tc = *swig_type_list_handle;
       while (tc) {
         if ((strcmp(tc->name, equiv->name) == 0))
           SWIG_TypeClientData(tc,clientdata);
@@ -536,6 +540,12 @@ static swig_type_info *swig_types[17];
 #define SWIG_name    "Iconlist"
 
 
+static void SWIG_AsVal(VALUE obj, int *val)
+{
+    *val = (int) NUM2INT(obj);
+}
+
+
 #include "FXRbCommon.h"
 
 

data/ext/fox12/icons_wrap.cpp

@@ -86,13 +86,16 @@ private:
  
 #ifdef __cplusplus
 #  ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
+#    define PROTECTFUNC(f) ((VALUE (*)()) f)
 #    define VALUEFUNC(f) ((VALUE (*)()) f)
 #    define VOIDFUNC(f)  ((void (*)()) f)
 #  else
 #    ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
+#      define PROTECTFUNC(f) ((VALUE (*)()) f)
 #      define VALUEFUNC(f) ((VALUE (*)()) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
-#    else /* These definitions should work for Ruby 1.7 */
+#    else /* These definitions should work for Ruby 1.7+ */
+#      define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
 #      define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
 #    endif
@@ -265,13 +268,14 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 #else
 
 static swig_type_info *swig_type_list = 0;
+static swig_type_info **swig_type_list_handle = &swig_type_list;
 
 /* Register a type mapping with the type-checking */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeRegister(swig_type_info *ti) {
   swig_type_info *tc, *head, *ret, *next;
   /* Check to see if this type has already been registered */
-  tc = swig_type_list;
+  tc = *swig_type_list_handle;
   while (tc) {
     if (strcmp(tc->name, ti->name) == 0) {
       /* Already exists in the table.  Just add additional types to the list */
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
   next = 0;
 
   /* Place in list */
-  ti->prev = swig_type_list;
-  swig_type_list = ti;
+  ti->prev = *swig_type_list_handle;
+  *swig_type_list_handle = ti;
 
   /* Build linked lists */
   l1:
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 /* Search for a swig_type_info structure */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeQuery(const char *name) {
-  swig_type_info *ty = swig_type_list;
+  swig_type_info *ty = *swig_type_list_handle;
   while (ty) {
     if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
     if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   equiv = ti->next;
   while (equiv) {
     if (!equiv->converter) {
-      tc = swig_type_list;
+      tc = *swig_type_list_handle;
       while (tc) {
         if ((strcmp(tc->name, equiv->name) == 0))
           SWIG_TypeClientData(tc,clientdata);
@@ -542,6 +546,12 @@ static swig_type_info *swig_types[23];
 #define SWIG_name    "Icons"
 
 
+static void SWIG_AsVal(VALUE obj, int *val)
+{
+    *val = (int) NUM2INT(obj);
+}
+
+
 #include "FXRbCommon.h"
 
 
@@ -2545,7 +2555,8 @@ static VALUE _wrap_fxloadXPM__SWIG_1(int argc, VALUE *argv, VALUE self) { VALUE
 static VALUE _wrap_fxloadXPM(int nargs, VALUE *args, VALUE self) { int argc; VALUE argv[1]; int ii; argc = nargs;
     for (ii = 0; (ii < argc) && (ii < 1); ii++) { argv[ii] = args[ii]; }  if (argc == 1) { int _v; { void *ptr;
             _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXStream, 0) != -1)) ? 1 : 0; }
-         if (_v) { return _wrap_fxloadXPM__SWIG_0(nargs, args, self);}  }  if (argc == 1) { int _v; _v = 1; if (_v) {
+         if (_v) { return _wrap_fxloadXPM__SWIG_0(nargs, args, self);}  }  if (argc == 1) { int _v; {
+            _v = ((TYPE(argv[0]) == T_FIXNUM) || (TYPE(argv[0]) == T_BIGNUM)) ? 1 : 0; }  if (_v) {
             return _wrap_fxloadXPM__SWIG_1(nargs, args, self);}  } 
     rb_raise(rb_eArgError, "No matching function for overloaded 'fxloadXPM'"); return Qnil; }
 static VALUE _wrap_fxsaveXPM(int argc, VALUE *argv, VALUE self) { FXStream *arg1 = 0 ; FXColor *arg2 = (FXColor *) 0 ;

data/ext/fox12/image_wrap.cpp

@@ -86,13 +86,16 @@ private:
  
 #ifdef __cplusplus
 #  ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
+#    define PROTECTFUNC(f) ((VALUE (*)()) f)
 #    define VALUEFUNC(f) ((VALUE (*)()) f)
 #    define VOIDFUNC(f)  ((void (*)()) f)
 #  else
 #    ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
+#      define PROTECTFUNC(f) ((VALUE (*)()) f)
 #      define VALUEFUNC(f) ((VALUE (*)()) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
-#    else /* These definitions should work for Ruby 1.7 */
+#    else /* These definitions should work for Ruby 1.7+ */
+#      define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
 #      define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
 #      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
 #    endif
@@ -265,13 +268,14 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 #else
 
 static swig_type_info *swig_type_list = 0;
+static swig_type_info **swig_type_list_handle = &swig_type_list;
 
 /* Register a type mapping with the type-checking */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeRegister(swig_type_info *ti) {
   swig_type_info *tc, *head, *ret, *next;
   /* Check to see if this type has already been registered */
-  tc = swig_type_list;
+  tc = *swig_type_list_handle;
   while (tc) {
     if (strcmp(tc->name, ti->name) == 0) {
       /* Already exists in the table.  Just add additional types to the list */
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
   next = 0;
 
   /* Place in list */
-  ti->prev = swig_type_list;
-  swig_type_list = ti;
+  ti->prev = *swig_type_list_handle;
+  *swig_type_list_handle = ti;
 
   /* Build linked lists */
   l1:
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 /* Search for a swig_type_info structure */
 SWIGRUNTIME(swig_type_info *)
 SWIG_TypeQuery(const char *name) {
-  swig_type_info *ty = swig_type_list;
+  swig_type_info *ty = *swig_type_list_handle;
   while (ty) {
     if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
     if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   equiv = ti->next;
   while (equiv) {
     if (!equiv->converter) {
-      tc = swig_type_list;
+      tc = *swig_type_list_handle;
       while (tc) {
         if ((strcmp(tc->name, equiv->name) == 0))
           SWIG_TypeClientData(tc,clientdata);
@@ -543,6 +547,12 @@ static swig_type_info *swig_types[24];
 #define SWIG_name    "Image"
 
 
+static void SWIG_AsVal(VALUE obj, int *val)
+{
+    *val = (int) NUM2INT(obj);
+}
+
+
 #include "FXRbCommon.h"