fxruby 1.2.2 → 1.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/ChangeLog +199 -0
- data/doc/apes02.html +2 -2
- data/doc/apes03.html +1 -1
- data/doc/book.html +1 -1
- data/doc/changes.html +48 -3
- data/doc/cvs.html +2 -2
- data/doc/differences.html +3 -3
- data/doc/gems.html +43 -43
- data/doc/implementation.html +1 -1
- data/doc/library.html +5 -5
- data/doc/opengl.html +5 -5
- data/doc/pt02.html +1 -1
- data/doc/scintilla.html +4 -4
- data/examples/browser.rb +1 -1
- data/examples/button.rb +59 -48
- data/examples/groupbox.rb +5 -4
- data/examples/ratio.rb +70 -0
- data/examples/table.rb +1 -1
- data/ext/fox12/FXRuby.cpp +2 -1
- data/ext/fox12/core_wrap.cpp +16 -6
- data/ext/fox12/dc_wrap.cpp +16 -6
- data/ext/fox12/dialogs_wrap.cpp +16 -6
- data/ext/fox12/frames_wrap.cpp +16 -6
- data/ext/fox12/fx3d_wrap.cpp +16 -6
- data/ext/fox12/iconlist_wrap.cpp +16 -6
- data/ext/fox12/icons_wrap.cpp +18 -7
- data/ext/fox12/image_wrap.cpp +16 -6
- data/ext/fox12/label_wrap.cpp +16 -6
- data/ext/fox12/layout_wrap.cpp +16 -6
- data/ext/fox12/librb.c +18 -7
- data/ext/fox12/list_wrap.cpp +16 -6
- data/ext/fox12/mdi_wrap.cpp +16 -6
- data/ext/fox12/menu_wrap.cpp +16 -6
- data/ext/fox12/scintilla_wrap.cpp +19 -12
- data/ext/fox12/table_wrap.cpp +16 -6
- data/ext/fox12/text_wrap.cpp +16 -6
- data/ext/fox12/treelist_wrap.cpp +16 -6
- data/ext/fox12/ui_wrap.cpp +16 -6
- data/lib/fox12/aliases.rb +32 -11
- data/lib/fox12/dialogs.rb +72 -0
- data/lib/fox12/execute_nonmodal.rb +70 -0
- data/lib/fox12/iterators.rb +3 -3
- data/lib/fox12/splashscreen.rb +83 -0
- data/lib/fox12/version.rb +1 -1
- data/rdoc-sources/FXDC.rb +14 -13
- data/rdoc-sources/FXDataTarget.rb +30 -5
- data/rdoc-sources/FXFileDialog.rb +50 -5
- data/rdoc-sources/FXList.rb +13 -13
- data/rdoc-sources/FXMemoryBuffer.rb +15 -10
- data/rdoc-sources/FXTable.rb +193 -107
- data/rdoc-sources/FXText.rb +2 -2
- data/rdoc-sources/FXToolBarTab.rb +69 -0
- data/rdoc-sources/FXToolTip.rb +1 -1
- data/tests/TC_FXMaterial.rb +14 -0
- metadata +10 -4
data/ext/fox12/label_wrap.cpp
CHANGED
|
@@ -86,13 +86,16 @@ private:
|
|
|
86
86
|
|
|
87
87
|
#ifdef __cplusplus
|
|
88
88
|
# ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
|
|
89
|
+
# define PROTECTFUNC(f) ((VALUE (*)()) f)
|
|
89
90
|
# define VALUEFUNC(f) ((VALUE (*)()) f)
|
|
90
91
|
# define VOIDFUNC(f) ((void (*)()) f)
|
|
91
92
|
# else
|
|
92
93
|
# ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
|
|
94
|
+
# define PROTECTFUNC(f) ((VALUE (*)()) f)
|
|
93
95
|
# define VALUEFUNC(f) ((VALUE (*)()) f)
|
|
94
96
|
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
|
|
95
|
-
# else /* These definitions should work for Ruby 1.7 */
|
|
97
|
+
# else /* These definitions should work for Ruby 1.7+ */
|
|
98
|
+
# define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
|
|
96
99
|
# define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
|
|
97
100
|
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
|
|
98
101
|
# endif
|
|
@@ -265,13 +268,14 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int);
|
|
|
265
268
|
#else
|
|
266
269
|
|
|
267
270
|
static swig_type_info *swig_type_list = 0;
|
|
271
|
+
static swig_type_info **swig_type_list_handle = &swig_type_list;
|
|
268
272
|
|
|
269
273
|
/* Register a type mapping with the type-checking */
|
|
270
274
|
SWIGRUNTIME(swig_type_info *)
|
|
271
275
|
SWIG_TypeRegister(swig_type_info *ti) {
|
|
272
276
|
swig_type_info *tc, *head, *ret, *next;
|
|
273
277
|
/* Check to see if this type has already been registered */
|
|
274
|
-
tc =
|
|
278
|
+
tc = *swig_type_list_handle;
|
|
275
279
|
while (tc) {
|
|
276
280
|
if (strcmp(tc->name, ti->name) == 0) {
|
|
277
281
|
/* Already exists in the table. Just add additional types to the list */
|
|
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
|
|
|
286
290
|
next = 0;
|
|
287
291
|
|
|
288
292
|
/* Place in list */
|
|
289
|
-
ti->prev =
|
|
290
|
-
|
|
293
|
+
ti->prev = *swig_type_list_handle;
|
|
294
|
+
*swig_type_list_handle = ti;
|
|
291
295
|
|
|
292
296
|
/* Build linked lists */
|
|
293
297
|
l1:
|
|
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
|
|
|
416
420
|
/* Search for a swig_type_info structure */
|
|
417
421
|
SWIGRUNTIME(swig_type_info *)
|
|
418
422
|
SWIG_TypeQuery(const char *name) {
|
|
419
|
-
swig_type_info *ty =
|
|
423
|
+
swig_type_info *ty = *swig_type_list_handle;
|
|
420
424
|
while (ty) {
|
|
421
425
|
if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
|
|
422
426
|
if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
|
|
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
|
|
|
434
438
|
equiv = ti->next;
|
|
435
439
|
while (equiv) {
|
|
436
440
|
if (!equiv->converter) {
|
|
437
|
-
tc =
|
|
441
|
+
tc = *swig_type_list_handle;
|
|
438
442
|
while (tc) {
|
|
439
443
|
if ((strcmp(tc->name, equiv->name) == 0))
|
|
440
444
|
SWIG_TypeClientData(tc,clientdata);
|
|
@@ -542,6 +546,12 @@ static swig_type_info *swig_types[23];
|
|
|
542
546
|
#define SWIG_name "Label"
|
|
543
547
|
|
|
544
548
|
|
|
549
|
+
static void SWIG_AsVal(VALUE obj, int *val)
|
|
550
|
+
{
|
|
551
|
+
*val = (int) NUM2INT(obj);
|
|
552
|
+
}
|
|
553
|
+
|
|
554
|
+
|
|
545
555
|
#include "FXRbCommon.h"
|
|
546
556
|
|
|
547
557
|
|
data/ext/fox12/layout_wrap.cpp
CHANGED
|
@@ -86,13 +86,16 @@ private:
|
|
|
86
86
|
|
|
87
87
|
#ifdef __cplusplus
|
|
88
88
|
# ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
|
|
89
|
+
# define PROTECTFUNC(f) ((VALUE (*)()) f)
|
|
89
90
|
# define VALUEFUNC(f) ((VALUE (*)()) f)
|
|
90
91
|
# define VOIDFUNC(f) ((void (*)()) f)
|
|
91
92
|
# else
|
|
92
93
|
# ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
|
|
94
|
+
# define PROTECTFUNC(f) ((VALUE (*)()) f)
|
|
93
95
|
# define VALUEFUNC(f) ((VALUE (*)()) f)
|
|
94
96
|
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
|
|
95
|
-
# else /* These definitions should work for Ruby 1.7 */
|
|
97
|
+
# else /* These definitions should work for Ruby 1.7+ */
|
|
98
|
+
# define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
|
|
96
99
|
# define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
|
|
97
100
|
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
|
|
98
101
|
# endif
|
|
@@ -265,13 +268,14 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int);
|
|
|
265
268
|
#else
|
|
266
269
|
|
|
267
270
|
static swig_type_info *swig_type_list = 0;
|
|
271
|
+
static swig_type_info **swig_type_list_handle = &swig_type_list;
|
|
268
272
|
|
|
269
273
|
/* Register a type mapping with the type-checking */
|
|
270
274
|
SWIGRUNTIME(swig_type_info *)
|
|
271
275
|
SWIG_TypeRegister(swig_type_info *ti) {
|
|
272
276
|
swig_type_info *tc, *head, *ret, *next;
|
|
273
277
|
/* Check to see if this type has already been registered */
|
|
274
|
-
tc =
|
|
278
|
+
tc = *swig_type_list_handle;
|
|
275
279
|
while (tc) {
|
|
276
280
|
if (strcmp(tc->name, ti->name) == 0) {
|
|
277
281
|
/* Already exists in the table. Just add additional types to the list */
|
|
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
|
|
|
286
290
|
next = 0;
|
|
287
291
|
|
|
288
292
|
/* Place in list */
|
|
289
|
-
ti->prev =
|
|
290
|
-
|
|
293
|
+
ti->prev = *swig_type_list_handle;
|
|
294
|
+
*swig_type_list_handle = ti;
|
|
291
295
|
|
|
292
296
|
/* Build linked lists */
|
|
293
297
|
l1:
|
|
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
|
|
|
416
420
|
/* Search for a swig_type_info structure */
|
|
417
421
|
SWIGRUNTIME(swig_type_info *)
|
|
418
422
|
SWIG_TypeQuery(const char *name) {
|
|
419
|
-
swig_type_info *ty =
|
|
423
|
+
swig_type_info *ty = *swig_type_list_handle;
|
|
420
424
|
while (ty) {
|
|
421
425
|
if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
|
|
422
426
|
if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
|
|
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
|
|
|
434
438
|
equiv = ti->next;
|
|
435
439
|
while (equiv) {
|
|
436
440
|
if (!equiv->converter) {
|
|
437
|
-
tc =
|
|
441
|
+
tc = *swig_type_list_handle;
|
|
438
442
|
while (tc) {
|
|
439
443
|
if ((strcmp(tc->name, equiv->name) == 0))
|
|
440
444
|
SWIG_TypeClientData(tc,clientdata);
|
|
@@ -546,6 +550,12 @@ static swig_type_info *swig_types[27];
|
|
|
546
550
|
#define SWIG_name "Layout"
|
|
547
551
|
|
|
548
552
|
|
|
553
|
+
static void SWIG_AsVal(VALUE obj, int *val)
|
|
554
|
+
{
|
|
555
|
+
*val = (int) NUM2INT(obj);
|
|
556
|
+
}
|
|
557
|
+
|
|
558
|
+
|
|
549
559
|
#include "FXRbCommon.h"
|
|
550
560
|
|
|
551
561
|
|
data/ext/fox12/librb.c
CHANGED
|
@@ -63,17 +63,28 @@
|
|
|
63
63
|
#include <string.h>
|
|
64
64
|
|
|
65
65
|
#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
|
|
66
|
-
# if
|
|
67
|
-
#
|
|
66
|
+
# if defined(_MSC_VER) || defined(__GNUC__)
|
|
67
|
+
# if defined(STATIC_LINKED)
|
|
68
|
+
# define SWIGEXPORT(a) a
|
|
69
|
+
# define SWIGIMPORT(a) extern a
|
|
70
|
+
# else
|
|
71
|
+
# define SWIGEXPORT(a) __declspec(dllexport) a
|
|
72
|
+
# define SWIGIMPORT(a) extern a
|
|
73
|
+
# endif
|
|
68
74
|
# else
|
|
69
|
-
#
|
|
75
|
+
# if defined(__BORLANDC__)
|
|
76
|
+
# define SWIGEXPORT(a) a _export
|
|
77
|
+
# define SWIGIMPORT(a) a _export
|
|
78
|
+
# else
|
|
79
|
+
# define SWIGEXPORT(a) a
|
|
80
|
+
# define SWIGIMPORT(a) a
|
|
81
|
+
# endif
|
|
70
82
|
# endif
|
|
71
83
|
#else
|
|
72
84
|
# define SWIGEXPORT(a) a
|
|
85
|
+
# define SWIGIMPORT(a) a
|
|
73
86
|
#endif
|
|
74
87
|
|
|
75
|
-
#define SWIGIMPORT(a) a
|
|
76
|
-
|
|
77
88
|
#ifdef SWIG_GLOBAL
|
|
78
89
|
# define SWIGRUNTIME(a) SWIGEXPORT(a)
|
|
79
90
|
#else
|
|
@@ -296,7 +307,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
|
|
|
296
307
|
|
|
297
308
|
/* Pack binary data into a string */
|
|
298
309
|
SWIGRUNTIME(char *)
|
|
299
|
-
SWIG_PackData(char *c, void *ptr,
|
|
310
|
+
SWIG_PackData(char *c, void *ptr, int sz) {
|
|
300
311
|
static char hex[17] = "0123456789abcdef";
|
|
301
312
|
unsigned char *u = (unsigned char *) ptr;
|
|
302
313
|
const unsigned char *eu = u + sz;
|
|
@@ -311,7 +322,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
|
|
|
311
322
|
|
|
312
323
|
/* Unpack binary data from a string */
|
|
313
324
|
SWIGRUNTIME(char *)
|
|
314
|
-
SWIG_UnpackData(char *c, void *ptr,
|
|
325
|
+
SWIG_UnpackData(char *c, void *ptr, int sz) {
|
|
315
326
|
register unsigned char uu = 0;
|
|
316
327
|
register int d;
|
|
317
328
|
unsigned char *u = (unsigned char *) ptr;
|
data/ext/fox12/list_wrap.cpp
CHANGED
|
@@ -86,13 +86,16 @@ private:
|
|
|
86
86
|
|
|
87
87
|
#ifdef __cplusplus
|
|
88
88
|
# ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
|
|
89
|
+
# define PROTECTFUNC(f) ((VALUE (*)()) f)
|
|
89
90
|
# define VALUEFUNC(f) ((VALUE (*)()) f)
|
|
90
91
|
# define VOIDFUNC(f) ((void (*)()) f)
|
|
91
92
|
# else
|
|
92
93
|
# ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
|
|
94
|
+
# define PROTECTFUNC(f) ((VALUE (*)()) f)
|
|
93
95
|
# define VALUEFUNC(f) ((VALUE (*)()) f)
|
|
94
96
|
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
|
|
95
|
-
# else /* These definitions should work for Ruby 1.7 */
|
|
97
|
+
# else /* These definitions should work for Ruby 1.7+ */
|
|
98
|
+
# define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
|
|
96
99
|
# define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
|
|
97
100
|
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
|
|
98
101
|
# endif
|
|
@@ -265,13 +268,14 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int);
|
|
|
265
268
|
#else
|
|
266
269
|
|
|
267
270
|
static swig_type_info *swig_type_list = 0;
|
|
271
|
+
static swig_type_info **swig_type_list_handle = &swig_type_list;
|
|
268
272
|
|
|
269
273
|
/* Register a type mapping with the type-checking */
|
|
270
274
|
SWIGRUNTIME(swig_type_info *)
|
|
271
275
|
SWIG_TypeRegister(swig_type_info *ti) {
|
|
272
276
|
swig_type_info *tc, *head, *ret, *next;
|
|
273
277
|
/* Check to see if this type has already been registered */
|
|
274
|
-
tc =
|
|
278
|
+
tc = *swig_type_list_handle;
|
|
275
279
|
while (tc) {
|
|
276
280
|
if (strcmp(tc->name, ti->name) == 0) {
|
|
277
281
|
/* Already exists in the table. Just add additional types to the list */
|
|
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
|
|
|
286
290
|
next = 0;
|
|
287
291
|
|
|
288
292
|
/* Place in list */
|
|
289
|
-
ti->prev =
|
|
290
|
-
|
|
293
|
+
ti->prev = *swig_type_list_handle;
|
|
294
|
+
*swig_type_list_handle = ti;
|
|
291
295
|
|
|
292
296
|
/* Build linked lists */
|
|
293
297
|
l1:
|
|
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
|
|
|
416
420
|
/* Search for a swig_type_info structure */
|
|
417
421
|
SWIGRUNTIME(swig_type_info *)
|
|
418
422
|
SWIG_TypeQuery(const char *name) {
|
|
419
|
-
swig_type_info *ty =
|
|
423
|
+
swig_type_info *ty = *swig_type_list_handle;
|
|
420
424
|
while (ty) {
|
|
421
425
|
if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
|
|
422
426
|
if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
|
|
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
|
|
|
434
438
|
equiv = ti->next;
|
|
435
439
|
while (equiv) {
|
|
436
440
|
if (!equiv->converter) {
|
|
437
|
-
tc =
|
|
441
|
+
tc = *swig_type_list_handle;
|
|
438
442
|
while (tc) {
|
|
439
443
|
if ((strcmp(tc->name, equiv->name) == 0))
|
|
440
444
|
SWIG_TypeClientData(tc,clientdata);
|
|
@@ -531,6 +535,12 @@ static swig_type_info *swig_types[12];
|
|
|
531
535
|
#define SWIG_name "List"
|
|
532
536
|
|
|
533
537
|
|
|
538
|
+
static void SWIG_AsVal(VALUE obj, int *val)
|
|
539
|
+
{
|
|
540
|
+
*val = (int) NUM2INT(obj);
|
|
541
|
+
}
|
|
542
|
+
|
|
543
|
+
|
|
534
544
|
#include "FXRbCommon.h"
|
|
535
545
|
|
|
536
546
|
|
data/ext/fox12/mdi_wrap.cpp
CHANGED
|
@@ -86,13 +86,16 @@ private:
|
|
|
86
86
|
|
|
87
87
|
#ifdef __cplusplus
|
|
88
88
|
# ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
|
|
89
|
+
# define PROTECTFUNC(f) ((VALUE (*)()) f)
|
|
89
90
|
# define VALUEFUNC(f) ((VALUE (*)()) f)
|
|
90
91
|
# define VOIDFUNC(f) ((void (*)()) f)
|
|
91
92
|
# else
|
|
92
93
|
# ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
|
|
94
|
+
# define PROTECTFUNC(f) ((VALUE (*)()) f)
|
|
93
95
|
# define VALUEFUNC(f) ((VALUE (*)()) f)
|
|
94
96
|
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
|
|
95
|
-
# else /* These definitions should work for Ruby 1.7 */
|
|
97
|
+
# else /* These definitions should work for Ruby 1.7+ */
|
|
98
|
+
# define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
|
|
96
99
|
# define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
|
|
97
100
|
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
|
|
98
101
|
# endif
|
|
@@ -265,13 +268,14 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int);
|
|
|
265
268
|
#else
|
|
266
269
|
|
|
267
270
|
static swig_type_info *swig_type_list = 0;
|
|
271
|
+
static swig_type_info **swig_type_list_handle = &swig_type_list;
|
|
268
272
|
|
|
269
273
|
/* Register a type mapping with the type-checking */
|
|
270
274
|
SWIGRUNTIME(swig_type_info *)
|
|
271
275
|
SWIG_TypeRegister(swig_type_info *ti) {
|
|
272
276
|
swig_type_info *tc, *head, *ret, *next;
|
|
273
277
|
/* Check to see if this type has already been registered */
|
|
274
|
-
tc =
|
|
278
|
+
tc = *swig_type_list_handle;
|
|
275
279
|
while (tc) {
|
|
276
280
|
if (strcmp(tc->name, ti->name) == 0) {
|
|
277
281
|
/* Already exists in the table. Just add additional types to the list */
|
|
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
|
|
|
286
290
|
next = 0;
|
|
287
291
|
|
|
288
292
|
/* Place in list */
|
|
289
|
-
ti->prev =
|
|
290
|
-
|
|
293
|
+
ti->prev = *swig_type_list_handle;
|
|
294
|
+
*swig_type_list_handle = ti;
|
|
291
295
|
|
|
292
296
|
/* Build linked lists */
|
|
293
297
|
l1:
|
|
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
|
|
|
416
420
|
/* Search for a swig_type_info structure */
|
|
417
421
|
SWIGRUNTIME(swig_type_info *)
|
|
418
422
|
SWIG_TypeQuery(const char *name) {
|
|
419
|
-
swig_type_info *ty =
|
|
423
|
+
swig_type_info *ty = *swig_type_list_handle;
|
|
420
424
|
while (ty) {
|
|
421
425
|
if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
|
|
422
426
|
if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
|
|
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
|
|
|
434
438
|
equiv = ti->next;
|
|
435
439
|
while (equiv) {
|
|
436
440
|
if (!equiv->converter) {
|
|
437
|
-
tc =
|
|
441
|
+
tc = *swig_type_list_handle;
|
|
438
442
|
while (tc) {
|
|
439
443
|
if ((strcmp(tc->name, equiv->name) == 0))
|
|
440
444
|
SWIG_TypeClientData(tc,clientdata);
|
|
@@ -543,6 +547,12 @@ static swig_type_info *swig_types[24];
|
|
|
543
547
|
#define SWIG_name "Mdi"
|
|
544
548
|
|
|
545
549
|
|
|
550
|
+
static void SWIG_AsVal(VALUE obj, int *val)
|
|
551
|
+
{
|
|
552
|
+
*val = (int) NUM2INT(obj);
|
|
553
|
+
}
|
|
554
|
+
|
|
555
|
+
|
|
546
556
|
#include "FXRbCommon.h"
|
|
547
557
|
|
|
548
558
|
|
data/ext/fox12/menu_wrap.cpp
CHANGED
|
@@ -86,13 +86,16 @@ private:
|
|
|
86
86
|
|
|
87
87
|
#ifdef __cplusplus
|
|
88
88
|
# ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
|
|
89
|
+
# define PROTECTFUNC(f) ((VALUE (*)()) f)
|
|
89
90
|
# define VALUEFUNC(f) ((VALUE (*)()) f)
|
|
90
91
|
# define VOIDFUNC(f) ((void (*)()) f)
|
|
91
92
|
# else
|
|
92
93
|
# ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
|
|
94
|
+
# define PROTECTFUNC(f) ((VALUE (*)()) f)
|
|
93
95
|
# define VALUEFUNC(f) ((VALUE (*)()) f)
|
|
94
96
|
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
|
|
95
|
-
# else /* These definitions should work for Ruby 1.7 */
|
|
97
|
+
# else /* These definitions should work for Ruby 1.7+ */
|
|
98
|
+
# define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
|
|
96
99
|
# define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
|
|
97
100
|
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
|
|
98
101
|
# endif
|
|
@@ -265,13 +268,14 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int);
|
|
|
265
268
|
#else
|
|
266
269
|
|
|
267
270
|
static swig_type_info *swig_type_list = 0;
|
|
271
|
+
static swig_type_info **swig_type_list_handle = &swig_type_list;
|
|
268
272
|
|
|
269
273
|
/* Register a type mapping with the type-checking */
|
|
270
274
|
SWIGRUNTIME(swig_type_info *)
|
|
271
275
|
SWIG_TypeRegister(swig_type_info *ti) {
|
|
272
276
|
swig_type_info *tc, *head, *ret, *next;
|
|
273
277
|
/* Check to see if this type has already been registered */
|
|
274
|
-
tc =
|
|
278
|
+
tc = *swig_type_list_handle;
|
|
275
279
|
while (tc) {
|
|
276
280
|
if (strcmp(tc->name, ti->name) == 0) {
|
|
277
281
|
/* Already exists in the table. Just add additional types to the list */
|
|
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
|
|
|
286
290
|
next = 0;
|
|
287
291
|
|
|
288
292
|
/* Place in list */
|
|
289
|
-
ti->prev =
|
|
290
|
-
|
|
293
|
+
ti->prev = *swig_type_list_handle;
|
|
294
|
+
*swig_type_list_handle = ti;
|
|
291
295
|
|
|
292
296
|
/* Build linked lists */
|
|
293
297
|
l1:
|
|
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
|
|
|
416
420
|
/* Search for a swig_type_info structure */
|
|
417
421
|
SWIGRUNTIME(swig_type_info *)
|
|
418
422
|
SWIG_TypeQuery(const char *name) {
|
|
419
|
-
swig_type_info *ty =
|
|
423
|
+
swig_type_info *ty = *swig_type_list_handle;
|
|
420
424
|
while (ty) {
|
|
421
425
|
if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
|
|
422
426
|
if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
|
|
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
|
|
|
434
438
|
equiv = ti->next;
|
|
435
439
|
while (equiv) {
|
|
436
440
|
if (!equiv->converter) {
|
|
437
|
-
tc =
|
|
441
|
+
tc = *swig_type_list_handle;
|
|
438
442
|
while (tc) {
|
|
439
443
|
if ((strcmp(tc->name, equiv->name) == 0))
|
|
440
444
|
SWIG_TypeClientData(tc,clientdata);
|
|
@@ -542,6 +546,12 @@ static swig_type_info *swig_types[23];
|
|
|
542
546
|
#define SWIG_name "Menu"
|
|
543
547
|
|
|
544
548
|
|
|
549
|
+
static void SWIG_AsVal(VALUE obj, int *val)
|
|
550
|
+
{
|
|
551
|
+
*val = (int) NUM2INT(obj);
|
|
552
|
+
}
|
|
553
|
+
|
|
554
|
+
|
|
545
555
|
#include "FXRbCommon.h"
|
|
546
556
|
|
|
547
557
|
|
|
@@ -86,13 +86,16 @@ private:
|
|
|
86
86
|
|
|
87
87
|
#ifdef __cplusplus
|
|
88
88
|
# ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
|
|
89
|
+
# define PROTECTFUNC(f) ((VALUE (*)()) f)
|
|
89
90
|
# define VALUEFUNC(f) ((VALUE (*)()) f)
|
|
90
91
|
# define VOIDFUNC(f) ((void (*)()) f)
|
|
91
92
|
# else
|
|
92
93
|
# ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
|
|
94
|
+
# define PROTECTFUNC(f) ((VALUE (*)()) f)
|
|
93
95
|
# define VALUEFUNC(f) ((VALUE (*)()) f)
|
|
94
96
|
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
|
|
95
|
-
# else /* These definitions should work for Ruby 1.7 */
|
|
97
|
+
# else /* These definitions should work for Ruby 1.7+ */
|
|
98
|
+
# define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
|
|
96
99
|
# define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
|
|
97
100
|
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
|
|
98
101
|
# endif
|
|
@@ -265,13 +268,14 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int);
|
|
|
265
268
|
#else
|
|
266
269
|
|
|
267
270
|
static swig_type_info *swig_type_list = 0;
|
|
271
|
+
static swig_type_info **swig_type_list_handle = &swig_type_list;
|
|
268
272
|
|
|
269
273
|
/* Register a type mapping with the type-checking */
|
|
270
274
|
SWIGRUNTIME(swig_type_info *)
|
|
271
275
|
SWIG_TypeRegister(swig_type_info *ti) {
|
|
272
276
|
swig_type_info *tc, *head, *ret, *next;
|
|
273
277
|
/* Check to see if this type has already been registered */
|
|
274
|
-
tc =
|
|
278
|
+
tc = *swig_type_list_handle;
|
|
275
279
|
while (tc) {
|
|
276
280
|
if (strcmp(tc->name, ti->name) == 0) {
|
|
277
281
|
/* Already exists in the table. Just add additional types to the list */
|
|
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
|
|
|
286
290
|
next = 0;
|
|
287
291
|
|
|
288
292
|
/* Place in list */
|
|
289
|
-
ti->prev =
|
|
290
|
-
|
|
293
|
+
ti->prev = *swig_type_list_handle;
|
|
294
|
+
*swig_type_list_handle = ti;
|
|
291
295
|
|
|
292
296
|
/* Build linked lists */
|
|
293
297
|
l1:
|
|
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
|
|
|
416
420
|
/* Search for a swig_type_info structure */
|
|
417
421
|
SWIGRUNTIME(swig_type_info *)
|
|
418
422
|
SWIG_TypeQuery(const char *name) {
|
|
419
|
-
swig_type_info *ty =
|
|
423
|
+
swig_type_info *ty = *swig_type_list_handle;
|
|
420
424
|
while (ty) {
|
|
421
425
|
if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
|
|
422
426
|
if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
|
|
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
|
|
|
434
438
|
equiv = ti->next;
|
|
435
439
|
while (equiv) {
|
|
436
440
|
if (!equiv->converter) {
|
|
437
|
-
tc =
|
|
441
|
+
tc = *swig_type_list_handle;
|
|
438
442
|
while (tc) {
|
|
439
443
|
if ((strcmp(tc->name, equiv->name) == 0))
|
|
440
444
|
SWIG_TypeClientData(tc,clientdata);
|
|
@@ -521,10 +525,9 @@ SWIGIMPORT(void) SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_ty
|
|
|
521
525
|
#define SWIGTYPE_p_FXObject swig_types[6]
|
|
522
526
|
#define SWIGTYPE_p_FXScrollArea swig_types[7]
|
|
523
527
|
#define SWIGTYPE_p_NotifyHeader swig_types[8]
|
|
524
|
-
#define
|
|
525
|
-
#define
|
|
526
|
-
|
|
527
|
-
static swig_type_info *swig_types[13];
|
|
528
|
+
#define SWIGTYPE_p_FXScintilla swig_types[9]
|
|
529
|
+
#define SWIGTYPE_p_FXStream swig_types[10]
|
|
530
|
+
static swig_type_info *swig_types[12];
|
|
528
531
|
|
|
529
532
|
/* -------- TYPES TABLE (END) -------- */
|
|
530
533
|
|
|
@@ -532,6 +535,12 @@ static swig_type_info *swig_types[13];
|
|
|
532
535
|
#define SWIG_name "Scintilla"
|
|
533
536
|
|
|
534
537
|
|
|
538
|
+
static void SWIG_AsVal(VALUE obj, int *val)
|
|
539
|
+
{
|
|
540
|
+
*val = (int) NUM2INT(obj);
|
|
541
|
+
}
|
|
542
|
+
|
|
543
|
+
|
|
535
544
|
#include "FXRbCommon.h"
|
|
536
545
|
|
|
537
546
|
|
|
@@ -2097,7 +2106,6 @@ static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable
|
|
|
2097
2106
|
static swig_type_info _swigt__p_FXObject[] = {{"_p_FXObject", 0, "FXObject *", 0, 0, 0, 0},{"_p_FXDocument", _p_FXDocumentTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRegistry", _p_FXRegistryTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXHeaderItem", _p_FXHeaderItemTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXShutterItem", _p_FXShutterItemTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXColorBar", _p_FXColorBarTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXTabBar", _p_FXTabBarTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSwitcher", _p_FXSwitcherTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXTextField", _p_FXTextFieldTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXToolBarTab", _p_FXToolBarTabTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXIconDict", _p_FXIconDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXMatrix", _p_FXMatrixTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFileDict", _p_FXFileDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRecentFiles", _p_FXRecentFilesTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXPopup", _p_FXPopupTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDrawable", _p_FXDrawableTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFont", _p_FXFontTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXHeader", _p_FXHeaderTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FX4Splitter", _p_FX4SplitterTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSplitter", _p_FXSplitterTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSpring", _p_FXSpringTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXApp", _p_FXAppTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXPacker", _p_FXPackerTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXTabBook", _p_FXTabBookTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXImageFrame", _p_FXImageFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXShutter", _p_FXShutterTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXToolTip", _p_FXToolTipTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXComposite", _p_FXCompositeTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDict", _p_FXDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXBitmapFrame", _p_FXBitmapFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRealSlider", _p_FXRealSliderTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSlider", _p_FXSliderTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXScintilla", _p_FXScintillaTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSettings", _p_FXSettingsTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXGroupBox", _p_FXGroupBoxTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDataTarget", _p_FXDataTargetTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDebugTarget", _p_FXDebugTargetTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXListBox", _p_FXListBoxTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXCanvas", _p_FXCanvasTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXId", _p_FXIdTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDial", _p_FXDialTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXToolBarGrip", _p_FXToolBarGripTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXScrollBar", _p_FXScrollBarTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXVisual", _p_FXVisualTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFrame", _p_FXFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXStatusBar", _p_FXStatusBarTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXStringDict", _p_FXStringDictTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDelegator", _p_FXDelegatorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXAccelTable", _p_FXAccelTableTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXObject", 0, 0, 0, 0, 0, 0},{"_p_FXCursor", _p_FXCursorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXGIFCursor", _p_FXGIFCursorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRealSpinner", _p_FXRealSpinnerTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXStatusLine", _p_FXStatusLineTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXWindow", _p_FXWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXShell", _p_FXShellTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXColorWell", _p_FXColorWellTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXRuler", _p_FXRulerTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXHorizontalFrame", _p_FXHorizontalFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXVerticalFrame", _p_FXVerticalFrameTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXImageView", _p_FXImageViewTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXToolBarShell", _p_FXToolBarShellTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXToolBar", _p_FXToolBarTo_p_FXObject, 0, 0, 0, 0, 0},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
|
|
2098
2107
|
static swig_type_info _swigt__p_FXScrollArea[] = {{"_p_FXScrollArea", 0, "FXScrollArea *", 0, 0, 0, 0},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXScrollArea, 0, 0, 0, 0, 0},{"_p_FXScrollArea", 0, 0, 0, 0, 0, 0},{"_p_FXImageView", _p_FXImageViewTo_p_FXScrollArea, 0, 0, 0, 0, 0},{"_p_FXScintilla", _p_FXScintillaTo_p_FXScrollArea, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
|
|
2099
2108
|
static swig_type_info _swigt__p_NotifyHeader[] = {{"_p_NotifyHeader", 0, "NotifyHeader *", 0, 0, 0, 0},{"_p_NotifyHeader", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
|
|
2100
|
-
static swig_type_info _swigt__p_size_t[] = {{"_p_size_t", 0, "size_t *", 0, 0, 0, 0},{"_p_size_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
|
|
2101
2109
|
static swig_type_info _swigt__p_FXScintilla[] = {{"_p_FXScintilla", 0, "FXScintilla *", 0, 0, 0, 0},{"_p_FXScintilla", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
|
|
2102
2110
|
static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *", 0, 0, 0, 0},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream, 0, 0, 0, 0, 0},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream, 0, 0, 0, 0, 0},{"_p_FXStream", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
|
|
2103
2111
|
|
|
@@ -2111,7 +2119,6 @@ _swigt__p_FXDrawable,
|
|
|
2111
2119
|
_swigt__p_FXObject,
|
|
2112
2120
|
_swigt__p_FXScrollArea,
|
|
2113
2121
|
_swigt__p_NotifyHeader,
|
|
2114
|
-
_swigt__p_size_t,
|
|
2115
2122
|
_swigt__p_FXScintilla,
|
|
2116
2123
|
_swigt__p_FXStream,
|
|
2117
2124
|
0
|
data/ext/fox12/table_wrap.cpp
CHANGED
|
@@ -86,13 +86,16 @@ private:
|
|
|
86
86
|
|
|
87
87
|
#ifdef __cplusplus
|
|
88
88
|
# ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
|
|
89
|
+
# define PROTECTFUNC(f) ((VALUE (*)()) f)
|
|
89
90
|
# define VALUEFUNC(f) ((VALUE (*)()) f)
|
|
90
91
|
# define VOIDFUNC(f) ((void (*)()) f)
|
|
91
92
|
# else
|
|
92
93
|
# ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
|
|
94
|
+
# define PROTECTFUNC(f) ((VALUE (*)()) f)
|
|
93
95
|
# define VALUEFUNC(f) ((VALUE (*)()) f)
|
|
94
96
|
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
|
|
95
|
-
# else /* These definitions should work for Ruby 1.7 */
|
|
97
|
+
# else /* These definitions should work for Ruby 1.7+ */
|
|
98
|
+
# define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
|
|
96
99
|
# define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
|
|
97
100
|
# define VOIDFUNC(f) ((RUBY_DATA_FUNC) f)
|
|
98
101
|
# endif
|
|
@@ -265,13 +268,14 @@ SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int);
|
|
|
265
268
|
#else
|
|
266
269
|
|
|
267
270
|
static swig_type_info *swig_type_list = 0;
|
|
271
|
+
static swig_type_info **swig_type_list_handle = &swig_type_list;
|
|
268
272
|
|
|
269
273
|
/* Register a type mapping with the type-checking */
|
|
270
274
|
SWIGRUNTIME(swig_type_info *)
|
|
271
275
|
SWIG_TypeRegister(swig_type_info *ti) {
|
|
272
276
|
swig_type_info *tc, *head, *ret, *next;
|
|
273
277
|
/* Check to see if this type has already been registered */
|
|
274
|
-
tc =
|
|
278
|
+
tc = *swig_type_list_handle;
|
|
275
279
|
while (tc) {
|
|
276
280
|
if (strcmp(tc->name, ti->name) == 0) {
|
|
277
281
|
/* Already exists in the table. Just add additional types to the list */
|
|
@@ -286,8 +290,8 @@ SWIG_TypeRegister(swig_type_info *ti) {
|
|
|
286
290
|
next = 0;
|
|
287
291
|
|
|
288
292
|
/* Place in list */
|
|
289
|
-
ti->prev =
|
|
290
|
-
|
|
293
|
+
ti->prev = *swig_type_list_handle;
|
|
294
|
+
*swig_type_list_handle = ti;
|
|
291
295
|
|
|
292
296
|
/* Build linked lists */
|
|
293
297
|
l1:
|
|
@@ -416,7 +420,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
|
|
|
416
420
|
/* Search for a swig_type_info structure */
|
|
417
421
|
SWIGRUNTIME(swig_type_info *)
|
|
418
422
|
SWIG_TypeQuery(const char *name) {
|
|
419
|
-
swig_type_info *ty =
|
|
423
|
+
swig_type_info *ty = *swig_type_list_handle;
|
|
420
424
|
while (ty) {
|
|
421
425
|
if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
|
|
422
426
|
if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
|
|
@@ -434,7 +438,7 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
|
|
|
434
438
|
equiv = ti->next;
|
|
435
439
|
while (equiv) {
|
|
436
440
|
if (!equiv->converter) {
|
|
437
|
-
tc =
|
|
441
|
+
tc = *swig_type_list_handle;
|
|
438
442
|
while (tc) {
|
|
439
443
|
if ((strcmp(tc->name, equiv->name) == 0))
|
|
440
444
|
SWIG_TypeClientData(tc,clientdata);
|
|
@@ -537,6 +541,12 @@ static swig_type_info *swig_types[18];
|
|
|
537
541
|
#define SWIG_name "Table"
|
|
538
542
|
|
|
539
543
|
|
|
544
|
+
static void SWIG_AsVal(VALUE obj, int *val)
|
|
545
|
+
{
|
|
546
|
+
*val = (int) NUM2INT(obj);
|
|
547
|
+
}
|
|
548
|
+
|
|
549
|
+
|
|
540
550
|
#include "FXRbCommon.h"
|
|
541
551
|
|
|
542
552
|
|