fxruby-commits Mailing List for FXRuby (Page 8)
Status: Inactive
Brought to you by:
lyle
Menu
▾
▴
fxruby-commits — All commits to FXRuby's CVS repository
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
(39) |
Apr
(69) |
May
(117) |
Jun
(22) |
Jul
(57) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: Lyle J. <ly...@us...> - 2002-05-08 20:08:04
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv31707
Modified Files:
Tag: release10
FXScintilla.i
Log Message:
Incorporated Gilles' stuff for Scintilla TextRange struct.
Index: FXScintilla.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXScintilla.i,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -C2 -d -r1.9.2.3 -r1.9.2.4
*** FXScintilla.i 6 May 2002 19:16:29 -0000 1.9.2.3
--- FXScintilla.i 8 May 2002 19:53:18 -0000 1.9.2.4
***************
*** 71,74 ****
--- 71,96 ----
};
+ struct TextRange {
+ %immutable;
+ char *lpstrText;
+ %mutable;
+ %extend {
+ // "Construct" a TextRange instance
+ TextRange(int start,int last,size_t size){
+ TextRange *tr=new TextRange;
+ tr->chrg.cpMin=start;
+ tr->chrg.cpMax=last;
+ tr->lpstrText=ALLOC_N(char,size);
+ return tr;
+ }
+
+ // Destructor
+ ~TextRange(){
+ free(self->lpstrText);
+ delete self;
+ }
+ }
+ };
+
%exception FXScintilla::FXScintilla "$action FXRbRegisterRubyObj(self, result);";
|
|
From: Lyle J. <ly...@us...> - 2002-05-08 16:51:11
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv9072
Modified Files:
Tag: release10
core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp
layout_wrap.cpp mdi_wrap.cpp opengl_wrap.cpp
scintilla_wrap.cpp ui_wrap.cpp
Log Message:
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62.2.7
retrieving revision 1.62.2.8
diff -C2 -d -r1.62.2.7 -r1.62.2.8
*** core_wrap.cpp 6 May 2002 19:16:01 -0000 1.62.2.7
--- core_wrap.cpp 8 May 2002 16:50:33 -0000 1.62.2.8
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020508-1104
*
* This file is not intended to be easily readable and contains a number of
***************
*** 8848,8857 ****
FXApp *arg1 ;
void *arg2 ;
! FXint arg3 = -1 ;
! FXint arg4 = -1 ;
FXGIFCursor *result;
! if ((argc < 2) || (argc > 4))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
arg1 = (FXApp *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXApp);
{
--- 8848,8857 ----
FXApp *arg1 ;
void *arg2 ;
! FXint arg3 ;
! FXint arg4 ;
FXGIFCursor *result;
! if ((argc < 4) || (argc > 4))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
arg1 = (FXApp *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXApp);
{
***************
*** 8863,8872 ****
}
}
! if (argc > 2) {
! arg3 = NUM2INT(argv[2]);
! }
! if (argc > 3) {
! arg4 = NUM2INT(argv[3]);
! }
result = (FXGIFCursor *)new FXGIFCursor(arg1,(void const *)arg2,arg3,arg4);
FXRbRegisterRubyObj(self, result);
--- 8863,8868 ----
}
}
! arg3 = NUM2INT(argv[2]);
! arg4 = NUM2INT(argv[3]);
result = (FXGIFCursor *)new FXGIFCursor(arg1,(void const *)arg2,arg3,arg4);
FXRbRegisterRubyObj(self, result);
***************
*** 8893,8902 ****
FXApp *arg1 ;
void *arg2 ;
! FXint arg3 = -1 ;
! FXint arg4 = -1 ;
FXRbGIFCursor *result;
! if ((argc < 2) || (argc > 4))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
arg1 = (FXApp *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXApp);
{
--- 8889,8898 ----
FXApp *arg1 ;
void *arg2 ;
! FXint arg3 ;
! FXint arg4 ;
FXRbGIFCursor *result;
! if ((argc < 4) || (argc > 4))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
arg1 = (FXApp *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXApp);
{
***************
*** 8908,8917 ****
}
}
! if (argc > 2) {
! arg3 = NUM2INT(argv[2]);
! }
! if (argc > 3) {
! arg4 = NUM2INT(argv[3]);
! }
result = (FXRbGIFCursor *)new FXRbGIFCursor(arg1,(void const *)arg2,arg3,arg4);
FXRbRegisterRubyObj(self, result);
--- 8904,8909 ----
}
}
! arg3 = NUM2INT(argv[2]);
! arg4 = NUM2INT(argv[3]);
result = (FXRbGIFCursor *)new FXRbGIFCursor(arg1,(void const *)arg2,arg3,arg4);
FXRbRegisterRubyObj(self, result);
Index: dialogs_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v
retrieving revision 1.34.2.7
retrieving revision 1.34.2.8
diff -C2 -d -r1.34.2.7 -r1.34.2.8
*** dialogs_wrap.cpp 6 May 2002 19:16:07 -0000 1.34.2.7
--- dialogs_wrap.cpp 8 May 2002 16:50:42 -0000 1.34.2.8
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020508-1104
*
* This file is not intended to be easily readable and contains a number of
Index: icons_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v
retrieving revision 1.37.2.7
retrieving revision 1.37.2.8
diff -C2 -d -r1.37.2.7 -r1.37.2.8
*** icons_wrap.cpp 6 May 2002 19:16:08 -0000 1.37.2.7
--- icons_wrap.cpp 8 May 2002 16:50:43 -0000 1.37.2.8
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020508-1104
*
* This file is not intended to be easily readable and contains a number of
Index: image_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v
retrieving revision 1.39.2.7
retrieving revision 1.39.2.8
diff -C2 -d -r1.39.2.7 -r1.39.2.8
*** image_wrap.cpp 6 May 2002 19:16:08 -0000 1.39.2.7
--- image_wrap.cpp 8 May 2002 16:50:43 -0000 1.39.2.8
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020508-1104
*
* This file is not intended to be easily readable and contains a number of
***************
*** 302,331 ****
#define SWIGTYPE_p_FXRbImage swig_types[2]
#define SWIGTYPE_p_FXRbRGBImage swig_types[3]
! #define SWIGTYPE_p_FXBitmap swig_types[4]
! #define SWIGTYPE_p_FXRbBitmap swig_types[5]
! #define SWIGTYPE_p_FXId swig_types[6]
! #define SWIGTYPE_p_FXDrawable swig_types[7]
! #define SWIGTYPE_p_FXTIFImage swig_types[8]
! #define SWIGTYPE_p_FXGIFImage swig_types[9]
! #define SWIGTYPE_p_FXStream swig_types[10]
! #define SWIGTYPE_p_FXRbGIFImage swig_types[11]
! #define SWIGTYPE_p_FXRbTIFImage swig_types[12]
! #define SWIGTYPE_p_FXICOImage swig_types[13]
! #define SWIGTYPE_p_FXXPMImage swig_types[14]
! #define SWIGTYPE_p_FXRbICOImage swig_types[15]
! #define SWIGTYPE_p_FXRbXPMImage swig_types[16]
! #define SWIGTYPE_p_FXPCXImage swig_types[17]
! #define SWIGTYPE_p_FXRbPCXImage swig_types[18]
! #define SWIGTYPE_p_FXBMPImage swig_types[19]
! #define SWIGTYPE_p_FXRbBMPImage swig_types[20]
! #define SWIGTYPE_p_FXApp swig_types[21]
! #define SWIGTYPE_p_FXPNGImage swig_types[22]
! #define SWIGTYPE_p_FXJPGImage swig_types[23]
! #define SWIGTYPE_p_FXImage swig_types[24]
! #define SWIGTYPE_p_FXRbJPGImage swig_types[25]
! #define SWIGTYPE_p_FXRbPNGImage swig_types[26]
! #define SWIGTYPE_p_FXTGAImage swig_types[27]
! #define SWIGTYPE_p_FXRbTGAImage swig_types[28]
! static swig_type_info *swig_types[30];
/* -------- TYPES TABLE (END) -------- */
--- 302,333 ----
#define SWIGTYPE_p_FXRbImage swig_types[2]
#define SWIGTYPE_p_FXRbRGBImage swig_types[3]
! #define SWIGTYPE_p_FXuchar swig_types[4]
! #define SWIGTYPE_p_FXBitmap swig_types[5]
! #define SWIGTYPE_p_FXRbBitmap swig_types[6]
! #define SWIGTYPE_p_FXId swig_types[7]
! #define SWIGTYPE_p_FXDrawable swig_types[8]
! #define SWIGTYPE_p_FXTIFImage swig_types[9]
! #define SWIGTYPE_p_FXGIFImage swig_types[10]
! #define SWIGTYPE_p_FXStream swig_types[11]
! #define SWIGTYPE_p_FXRbGIFImage swig_types[12]
! #define SWIGTYPE_p_FXRbTIFImage swig_types[13]
! #define SWIGTYPE_p_FXICOImage swig_types[14]
! #define SWIGTYPE_p_FXXPMImage swig_types[15]
! #define SWIGTYPE_p_FXRbICOImage swig_types[16]
! #define SWIGTYPE_p_FXRbXPMImage swig_types[17]
! #define SWIGTYPE_p_FXPCXImage swig_types[18]
! #define SWIGTYPE_p_FXRbPCXImage swig_types[19]
! #define SWIGTYPE_p_FXBMPImage swig_types[20]
! #define SWIGTYPE_p_FXRbBMPImage swig_types[21]
! #define SWIGTYPE_p_FXApp swig_types[22]
! #define SWIGTYPE_p_FXPNGImage swig_types[23]
! #define SWIGTYPE_p_FXJPGImage swig_types[24]
! #define SWIGTYPE_p_FXImage swig_types[25]
! #define SWIGTYPE_p_FXRbJPGImage swig_types[26]
! #define SWIGTYPE_p_FXRbPNGImage swig_types[27]
! #define SWIGTYPE_p_FXTGAImage swig_types[28]
! #define SWIGTYPE_p_FXMemoryBuffer swig_types[29]
! #define SWIGTYPE_p_FXRbTGAImage swig_types[30]
! static swig_type_info *swig_types[32];
/* -------- TYPES TABLE (END) -------- */
***************
*** 345,360 ****
swig_class cFXBitmap;
static void free_FXRbBitmap(FXRbBitmap *);
! VALUE FXImage_getData(FXImage const *self){
! FXuchar* data=self->getData();
! if(data){
! FXuint options=self->getOptions();
! FXuint channels=3;
! if(options&IMAGE_ALPHA) channels=4;
! long len=3*channels*self->getWidth()*self->getHeight();
! return rb_str_new((const char*)data,len);
! }
else{
! return Qnil;
! }
}
--- 347,371 ----
swig_class cFXBitmap;
static void free_FXRbBitmap(FXRbBitmap *);
! FXuchar FXMemoryBuffer___getitem__(FXMemoryBuffer const *self,FXuint i){
! return self->getData()[i];
! }
! void FXMemoryBuffer___setitem__(FXMemoryBuffer *self,FXuint i,FXuchar value){
! self->getData()[i] = value;
! }
! VALUE FXMemoryBuffer_to_s(FXMemoryBuffer const *self){
! if(self->getSize()>0){
! const char *str=const_cast<const char*>(reinterpret_cast<char*>(self->getData()));
! long len=static_cast<long>(self->getSize());
! return rb_str_new(str,len);
! }
else{
! return rb_str_new2("");
! }
! }
!
! swig_class cFXMemoryBuffer;
! static void free_FXMemoryBuffer(FXMemoryBuffer *);
! FXMemoryBuffer *FXImage_getData(FXImage const *self){
! return new FXMemoryBuffer(self->getData(),self->getChannels()*self->getWidth()*self->getHeight());
}
***************
*** 944,947 ****
--- 955,1070 ----
extern swig_class cFX_Bitmap;
static VALUE
+ _wrap_new_FXMemoryBuffer(int argc, VALUE *argv, VALUE self) {
+ VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXMemoryBuffer);
+ rb_obj_call_init(vresult, argc, argv);
+ return vresult;
+ }
+
+
+ static VALUE
+ _wrap_FXMemoryBuffer_initialize(int argc, VALUE *argv, VALUE self) {
+ FXuchar *arg1 ;
+ FXuint arg2 ;
+ FXMemoryBuffer *result;
+
+ if ((argc < 2) || (argc > 2))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
+ arg1 = (FXuchar *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXuchar);
+ arg2 = NUM2UINT(argv[1]);
+ result = (FXMemoryBuffer *)new FXMemoryBuffer(arg1,arg2);
+
+ DATA_PTR(self) = result;
+ return self;
+ }
+
+
+ static VALUE
+ _wrap_FXMemoryBuffer_getData(int argc, VALUE *argv, VALUE self) {
+ FXMemoryBuffer *arg1 ;
+ FXuchar *result;
+ VALUE vresult = Qnil;
+
+ if ((argc < 0) || (argc > 0))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+ arg1 = (FXMemoryBuffer *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXMemoryBuffer);
+ result = (FXuchar *)((FXMemoryBuffer const *)arg1)->getData();
+
+ vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXuchar,0);
+ return vresult;
+ }
+
+
+ static VALUE
+ _wrap_FXMemoryBuffer_getSize(int argc, VALUE *argv, VALUE self) {
+ FXMemoryBuffer *arg1 ;
+ FXuint result;
+ VALUE vresult = Qnil;
+
+ if ((argc < 0) || (argc > 0))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+ arg1 = (FXMemoryBuffer *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXMemoryBuffer);
+ result = (FXuint)((FXMemoryBuffer const *)arg1)->getSize();
+
+ vresult = UINT2NUM(result);
+ return vresult;
+ }
+
+
+ static VALUE
+ _wrap_FXMemoryBuffer___getitem__(int argc, VALUE *argv, VALUE self) {
+ FXMemoryBuffer *arg1 ;
+ FXuint arg2 ;
+ FXuchar result;
+ VALUE vresult = Qnil;
+
+ if ((argc < 1) || (argc > 1))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+ arg1 = (FXMemoryBuffer *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXMemoryBuffer);
+ arg2 = NUM2UINT(argv[0]);
+ result = (FXuchar)FXMemoryBuffer___getitem__((FXMemoryBuffer const *)arg1,arg2);
+
+ vresult = UINT2NUM(result);
+ return vresult;
+ }
+
+
+ static VALUE
+ _wrap_FXMemoryBuffer___setitem__(int argc, VALUE *argv, VALUE self) {
+ FXMemoryBuffer *arg1 ;
+ FXuint arg2 ;
+ FXuchar arg3 ;
+
+ if ((argc < 2) || (argc > 2))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
+ arg1 = (FXMemoryBuffer *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXMemoryBuffer);
+ arg2 = NUM2UINT(argv[0]);
+ arg3 = (unsigned char) NUM2INT(argv[1]);
+ FXMemoryBuffer___setitem__(arg1,arg2,arg3);
+
+ return Qnil;
+ }
+
+
+ static VALUE
+ _wrap_FXMemoryBuffer_to_s(int argc, VALUE *argv, VALUE self) {
+ FXMemoryBuffer *arg1 ;
+ VALUE result;
+ VALUE vresult = Qnil;
+
+ if ((argc < 0) || (argc > 0))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+ arg1 = (FXMemoryBuffer *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXMemoryBuffer);
+ result = (VALUE)FXMemoryBuffer_to_s((FXMemoryBuffer const *)arg1);
+
+ vresult = result;
+ return vresult;
+ }
+
+
+ static void
+ free_FXMemoryBuffer(FXMemoryBuffer *arg1) {
+ delete arg1;
+ }
+ static VALUE
_wrap_new_FX_Image(int argc, VALUE *argv, VALUE self) {
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXImage);
***************
*** 992,996 ****
_wrap_FX_Image_getData(int argc, VALUE *argv, VALUE self) {
FXImage *arg1 ;
! VALUE result;
VALUE vresult = Qnil;
--- 1115,1119 ----
_wrap_FX_Image_getData(int argc, VALUE *argv, VALUE self) {
FXImage *arg1 ;
! FXMemoryBuffer *result;
VALUE vresult = Qnil;
***************
*** 998,1004 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXImage *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXImage);
! result = (VALUE)FXImage_getData((FXImage const *)arg1);
! vresult = result;
return vresult;
}
--- 1121,1127 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXImage *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXImage);
! result = (FXMemoryBuffer *)FXImage_getData((FXImage const *)arg1);
! vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXMemoryBuffer,0);
return vresult;
}
***************
*** 7168,7171 ****
--- 7291,7295 ----
static swig_type_info _swigt__p_FXRbImage[] = {{"_p_FXRbImage", 0, "FXRbImage *"},{"_p_FXRbImage"},{0}};
static swig_type_info _swigt__p_FXRbRGBImage[] = {{"_p_FXRbRGBImage", 0, "FXRbRGBImage *"},{"_p_FXRbRGBImage"},{0}};
+ static swig_type_info _swigt__p_FXuchar[] = {{"_p_FXuchar", 0, "FXuchar *"},{"_p_FXuchar"},{0}};
static swig_type_info _swigt__p_FXBitmap[] = {{"_p_FXBitmap", 0, "FXBitmap *"},{"_p_FXBitmap"},{"_p_FXRbBitmap", _p_FXRbBitmapTo_p_FXBitmap},{0}};
static swig_type_info _swigt__p_FXRbBitmap[] = {{"_p_FXRbBitmap", 0, "FXRbBitmap *"},{"_p_FXRbBitmap"},{0}};
***************
*** 7192,7195 ****
--- 7316,7320 ----
static swig_type_info _swigt__p_FXRbPNGImage[] = {{"_p_FXRbPNGImage", 0, "FXRbPNGImage *"},{"_p_FXRbPNGImage"},{0}};
static swig_type_info _swigt__p_FXTGAImage[] = {{"_p_FXTGAImage", 0, "FXTGAImage *"},{"_p_FXTGAImage"},{"_p_FXRbTGAImage", _p_FXRbTGAImageTo_p_FXTGAImage},{0}};
+ static swig_type_info _swigt__p_FXMemoryBuffer[] = {{"_p_FXMemoryBuffer", 0, "FXMemoryBuffer *"},{"_p_FXMemoryBuffer"},{0}};
static swig_type_info _swigt__p_FXRbTGAImage[] = {{"_p_FXRbTGAImage", 0, "FXRbTGAImage *"},{"_p_FXRbTGAImage"},{0}};
***************
*** 7199,7202 ****
--- 7324,7328 ----
_swigt__p_FXRbImage,
_swigt__p_FXRbRGBImage,
+ _swigt__p_FXuchar,
_swigt__p_FXBitmap,
_swigt__p_FXRbBitmap,
***************
*** 7223,7226 ****
--- 7349,7353 ----
_swigt__p_FXRbPNGImage,
_swigt__p_FXTGAImage,
+ _swigt__p_FXMemoryBuffer,
_swigt__p_FXRbTGAImage,
0
***************
*** 7283,7286 ****
--- 7410,7425 ----
cFXBitmap.mark = (void (*)(void *)) FXRbBitmap::markfunc;
cFXBitmap.destroy = (void (*)(void *)) free_FXRbBitmap;
+
+ cFXMemoryBuffer.klass = rb_define_class_under(mFox, "FXMemoryBuffer", rb_cObject);
+ SWIG_TypeClientData(SWIGTYPE_p_FXMemoryBuffer, (void *) &cFXMemoryBuffer);
+ rb_define_singleton_method(cFXMemoryBuffer.klass, "new", VALUEFUNC(_wrap_new_FXMemoryBuffer), -1);
+ rb_define_method(cFXMemoryBuffer.klass, "initialize", VALUEFUNC(_wrap_FXMemoryBuffer_initialize), -1);
+ rb_define_method(cFXMemoryBuffer.klass, "getData", VALUEFUNC(_wrap_FXMemoryBuffer_getData), -1);
+ rb_define_method(cFXMemoryBuffer.klass, "getSize", VALUEFUNC(_wrap_FXMemoryBuffer_getSize), -1);
+ rb_define_method(cFXMemoryBuffer.klass, "[]", VALUEFUNC(_wrap_FXMemoryBuffer___getitem__), -1);
+ rb_define_method(cFXMemoryBuffer.klass, "[]=", VALUEFUNC(_wrap_FXMemoryBuffer___setitem__), -1);
+ rb_define_method(cFXMemoryBuffer.klass, "to_s", VALUEFUNC(_wrap_FXMemoryBuffer_to_s), -1);
+ cFXMemoryBuffer.mark = 0;
+ cFXMemoryBuffer.destroy = (void (*)(void *)) free_FXMemoryBuffer;
rb_define_const(mFox,"IMAGE_KEEP", INT2NUM(IMAGE_KEEP));
rb_define_const(mFox,"IMAGE_OWNED", INT2NUM(IMAGE_OWNED));
Index: layout_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v
retrieving revision 1.8.2.7
retrieving revision 1.8.2.8
diff -C2 -d -r1.8.2.7 -r1.8.2.8
*** layout_wrap.cpp 6 May 2002 19:16:09 -0000 1.8.2.7
--- layout_wrap.cpp 8 May 2002 16:50:44 -0000 1.8.2.8
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020508-1104
*
* This file is not intended to be easily readable and contains a number of
Index: mdi_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v
retrieving revision 1.36.2.7
retrieving revision 1.36.2.8
diff -C2 -d -r1.36.2.7 -r1.36.2.8
*** mdi_wrap.cpp 6 May 2002 19:16:09 -0000 1.36.2.7
--- mdi_wrap.cpp 8 May 2002 16:50:44 -0000 1.36.2.8
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020508-1104
*
* This file is not intended to be easily readable and contains a number of
Index: opengl_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v
retrieving revision 1.41.2.8
retrieving revision 1.41.2.9
diff -C2 -d -r1.41.2.8 -r1.41.2.9
*** opengl_wrap.cpp 6 May 2002 19:16:12 -0000 1.41.2.8
--- opengl_wrap.cpp 8 May 2002 16:50:47 -0000 1.41.2.9
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020508-1104
*
* This file is not intended to be easily readable and contains a number of
***************
*** 8976,8980 ****
_wrap_FX_GLViewer_getBackgroundColor(int argc, VALUE *argv, VALUE self) {
FXGLViewer *arg1 ;
! SwigValueWrapper< FXHVec > result;
VALUE vresult = Qnil;
--- 8976,8980 ----
_wrap_FX_GLViewer_getBackgroundColor(int argc, VALUE *argv, VALUE self) {
FXGLViewer *arg1 ;
! FXHVec result;
VALUE vresult = Qnil;
***************
*** 9018,9022 ****
_wrap_FX_GLViewer_getAmbientColor(int argc, VALUE *argv, VALUE self) {
FXGLViewer *arg1 ;
! SwigValueWrapper< FXHVec > result;
VALUE vresult = Qnil;
--- 9018,9022 ----
_wrap_FX_GLViewer_getAmbientColor(int argc, VALUE *argv, VALUE self) {
FXGLViewer *arg1 ;
! FXHVec result;
VALUE vresult = Qnil;
Index: scintilla_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/scintilla_wrap.cpp,v
retrieving revision 1.16.2.3
retrieving revision 1.16.2.4
diff -C2 -d -r1.16.2.3 -r1.16.2.4
*** scintilla_wrap.cpp 6 May 2002 19:16:16 -0000 1.16.2.3
--- scintilla_wrap.cpp 8 May 2002 16:50:48 -0000 1.16.2.4
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020508-1104
*
* This file is not intended to be easily readable and contains a number of
Index: ui_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v
retrieving revision 1.9.2.7
retrieving revision 1.9.2.8
diff -C2 -d -r1.9.2.7 -r1.9.2.8
*** ui_wrap.cpp 6 May 2002 19:16:17 -0000 1.9.2.7
--- ui_wrap.cpp 8 May 2002 16:50:48 -0000 1.9.2.8
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020508-1104
*
* This file is not intended to be easily readable and contains a number of
|
|
From: Lyle J. <ly...@us...> - 2002-05-08 16:49:32
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv8854
Modified Files:
Tag: release10
image.i
Log Message:
Make sure that FXMemoryBuffer.i gets wrapped along with image.i.
Index: image.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/image.i,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** image.i 2 Apr 2002 03:44:27 -0000 1.15
--- image.i 8 May 2002 16:49:29 -0000 1.15.2.1
***************
*** 42,45 ****
--- 42,46 ----
%include FXBitmap.i
+ %include FXMemoryBuffer.i
%include FXImage.i
%include FXBMPImage.i
|
|
From: Lyle J. <ly...@us...> - 2002-05-08 16:49:02
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv8628
Modified Files:
Tag: release10
Makefile
Log Message:
Marked "clean" as a .PHONY target.
Index: Makefile
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/Makefile,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C2 -d -r1.20 -r1.20.2.1
*** Makefile 14 Mar 2002 18:48:14 -0000 1.20
--- Makefile 8 May 2002 16:48:59 -0000 1.20.2.1
***************
*** 6,9 ****
--- 6,11 ----
#
+ .PHONY: clean
+
SWIG = swig
CFLAGS = -c -c++ -ruby -no_default
|
|
From: Lyle J. <ly...@us...> - 2002-05-08 16:45:12
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv5170/swig-interfaces
Modified Files:
Tag: release10
FXImage.i
Added Files:
Tag: release10
FXMemoryBuffer.i
Log Message:
Modified the interface to FXImage#data so that it returns an
FXMemoryBuffer instance instead of a string (See SF Bug #550996).
The primary difference is that FXMemoryBuffer wraps the actual
data pointer stored by the FXImage instead of making a copy; this
way you should be able to modify the buffer and re-render the image
as you can in C++.
--- NEW FILE: FXMemoryBuffer.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
/***********************************************************************
* $Id: FXMemoryBuffer.i,v 1.1.2.1 2002/05/08 16:45:09 lyle Exp $
***********************************************************************/
class FXMemoryBuffer {
public:
// Create an memory buffer object
FXMemoryBuffer(FXuchar *data,FXuint size);
// Returns a pointer to the data
FXuchar* getData() const;
// Returns the size (in bytes)
FXuint getSize() const;
%extend {
// Indexed access
FXuchar __getitem__(FXuint i) const {
return self->getData()[i];
}
void __setitem__(FXuint i,FXuchar value){
self->getData()[i] = value;
}
// Convert it to a Ruby string
VALUE to_s() const {
if(self->getSize()>0){
const char *str=const_cast<const char*>(reinterpret_cast<char*>(self->getData()));
long len=static_cast<long>(self->getSize());
return rb_str_new(str,len);
}
else{
return rb_str_new2("");
}
}
}
// Destructor
~FXMemoryBuffer();
};
Index: FXImage.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXImage.i,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -d -r1.15.2.1 -r1.15.2.2
*** FXImage.i 6 May 2002 19:16:29 -0000 1.15.2.1
--- FXImage.i 8 May 2002 16:45:09 -0000 1.15.2.2
***************
*** 74,89 ****
/// To get to the pixel data
%extend {
! VALUE getData() const {
! FXuchar* data=self->getData();
! if(data){
! FXuint options=self->getOptions();
! FXuint channels=3;
! if(options&IMAGE_ALPHA) channels=4;
! long len=3*channels*self->getWidth()*self->getHeight();
! return rb_str_new((const char*)data,len);
! }
! else{
! return Qnil;
! }
}
}
--- 74,79 ----
/// To get to the pixel data
%extend {
! FXMemoryBuffer *getData() const {
! return new FXMemoryBuffer(self->getData(),self->getChannels()*self->getWidth()*self->getHeight());
}
}
|
|
From: Lyle J. <ly...@us...> - 2002-05-08 16:45:12
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv5170/ext/fox/include
Modified Files:
Tag: release10
FXRuby.h
Added Files:
Tag: release10
FXMemoryBuffer.h
Log Message:
Modified the interface to FXImage#data so that it returns an
FXMemoryBuffer instance instead of a string (See SF Bug #550996).
The primary difference is that FXMemoryBuffer wraps the actual
data pointer stored by the FXImage instead of making a copy; this
way you should be able to modify the buffer and re-render the image
as you can in C++.
--- NEW FILE: FXMemoryBuffer.h ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
/***********************************************************************
* $Id: FXMemoryBuffer.h,v 1.1.2.1 2002/05/08 16:45:09 lyle Exp $
***********************************************************************/
#ifndef FXMEMORYBUFFER_H
#define FXMEMORYBUFFER_H
class FXMemoryBuffer {
protected:
FXMemoryBuffer();
FXMemoryBuffer(const FXMemoryBuffer&);
FXMemoryBuffer& operator=(const FXMemoryBuffer&);
private:
FXuchar *buffer;
FXuint size;
public:
// Create an memory buffer object
FXMemoryBuffer(FXuchar *data,FXuint sz) : buffer(data),size(sz){}
// Returns a pointer to the data
FXuchar* getData() const { return buffer; }
// Returns the size (in bytes)
FXuint getSize() const { return size; }
// Destructor
~FXMemoryBuffer(){}
};
#endif
Index: FXRuby.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRuby.h,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -C2 -d -r1.21.2.1 -r1.21.2.2
*** FXRuby.h 30 Apr 2002 01:54:47 -0000 1.21.2.1
--- FXRuby.h 8 May 2002 16:45:09 -0000 1.21.2.2
***************
*** 439,442 ****
--- 439,443 ----
#include "FXRbDrawable.h"
#include "FXRbBitmap.h"
+ #include "FXMemoryBuffer.h"
#include "FXRbImage.h"
#include "FXRbBMPImage.h"
|
|
From: Lyle J. <ly...@us...> - 2002-05-08 16:45:12
|
Update of /cvsroot/fxruby/FXRuby/examples
In directory usw-pr-cvs1:/tmp/cvs-serv5170/examples
Modified Files:
Tag: release10
image.rb
Log Message:
Modified the interface to FXImage#data so that it returns an
FXMemoryBuffer instance instead of a string (See SF Bug #550996).
The primary difference is that FXMemoryBuffer wraps the actual
data pointer stored by the FXImage instead of making a copy; this
way you should be able to modify the buffer and re-render the image
as you can in C++.
Index: image.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/image.rb,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -d -r1.11.2.1 -r1.11.2.2
*** image.rb 8 May 2002 16:32:41 -0000 1.11.2.1
--- image.rb 8 May 2002 16:45:09 -0000 1.11.2.2
***************
*** 117,138 ****
(0...512).each { |x|
(0...50).each { |y|
! @grey_ramp[3*(y*512+x) ] = (x/2)
! @grey_ramp[3*(y*512+x)+1] = (x/2)
! @grey_ramp[3*(y*512+x)+2] = (x/2)
}
(0...50).each { |y|
! @red_ramp[3*(y*512+x) ] = (x/2)
! @red_ramp[3*(y*512+x)+1] = 0
! @red_ramp[3*(y*512+x)+2] = 0
}
(0...50).each { |y|
! @green_ramp[3*(y*512+x) ] = 0
! @green_ramp[3*(y*512+x)+1] = (x/2)
! @green_ramp[3*(y*512+x)+2] = 0
}
(0...50).each { |y|
! @blue_ramp[3*(y*512+x) ] = 0
! @blue_ramp[3*(y*512+x)+1] = 0
! @blue_ramp[3*(y*512+x)+2] = (x/2)
}
}
--- 117,138 ----
(0...512).each { |x|
(0...50).each { |y|
! @grey.data[3*(y*512+x) ] = (x/2)
! @grey.data[3*(y*512+x)+1] = (x/2)
! @grey.data[3*(y*512+x)+2] = (x/2)
}
(0...50).each { |y|
! @red.data[3*(y*512+x) ] = (x/2)
! @red.data[3*(y*512+x)+1] = 0
! @red.data[3*(y*512+x)+2] = 0
}
(0...50).each { |y|
! @green.data[3*(y*512+x) ] = 0
! @green.data[3*(y*512+x)+1] = (x/2)
! @green.data[3*(y*512+x)+2] = 0
}
(0...50).each { |y|
! @blue.data[3*(y*512+x) ] = 0
! @blue.data[3*(y*512+x)+1] = 0
! @blue.data[3*(y*512+x)+2] = (x/2)
}
}
|
|
From: Lyle J. <ly...@us...> - 2002-05-08 16:35:08
|
Update of /cvsroot/fxruby/FXRuby/lib/fox
In directory usw-pr-cvs1:/tmp/cvs-serv354
Modified Files:
Tag: release10
aliases.rb
Log Message:
Added aliases:
FXDC#tile= (for FXDC#setTile)
FXDC#stipple= (for FXDC#setStipple)
FXDC#clipRegion= (for FXDC#setClipRegion)
FXDC#clipRectangle= (for FXDC#setClipRectangle)
Index: aliases.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/lib/fox/aliases.rb,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -C2 -d -r1.24.2.2 -r1.24.2.3
*** aliases.rb 8 May 2002 16:24:31 -0000 1.24.2.2
--- aliases.rb 8 May 2002 16:35:05 -0000 1.24.2.3
***************
*** 209,216 ****
alias function getFunction
alias function= setFunction
alias tile getTile
alias stippleBitmap getStippleBitmap
alias stipplePattern getStipplePattern
! alias clipRegion setClipRegion
alias clipRectangle getClipRectangle
alias clipX getClipX
--- 209,219 ----
alias function getFunction
alias function= setFunction
+ alias tile= setTile
alias tile getTile
+ alias stipple= setStipple
alias stippleBitmap getStippleBitmap
alias stipplePattern getStipplePattern
! alias clipRegion= setClipRegion
! alias clipRectangle= setClipRectangle
alias clipRectangle getClipRectangle
alias clipX getClipX
|
|
From: Lyle J. <ly...@us...> - 2002-05-08 16:33:25
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv32169
Modified Files:
Tag: release10
FXRuby.cpp
Log Message:
Modified order of requires so that aliases.rb is loaded after overloads.rb.
Index: FXRuby.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRuby.cpp,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -C2 -d -r1.40.2.1 -r1.40.2.2
*** FXRuby.cpp 25 Apr 2002 02:44:26 -0000 1.40.2.1
--- FXRuby.cpp 8 May 2002 16:33:22 -0000 1.40.2.2
***************
*** 1157,1165 ****
Init_scintilla();
#endif
- rb_f_require(Qnil, rb_str_new2("fox/aliases"));
rb_f_require(Qnil, rb_str_new2("fox/core"));
rb_f_require(Qnil, rb_str_new2("fox/iterators"));
rb_f_require(Qnil, rb_str_new2("fox/keys"));
rb_f_require(Qnil, rb_str_new2("fox/overloads"));
rb_f_require(Qnil, rb_str_new2("fox/responder2"));
}
--- 1157,1165 ----
Init_scintilla();
#endif
rb_f_require(Qnil, rb_str_new2("fox/core"));
rb_f_require(Qnil, rb_str_new2("fox/iterators"));
rb_f_require(Qnil, rb_str_new2("fox/keys"));
rb_f_require(Qnil, rb_str_new2("fox/overloads"));
+ rb_f_require(Qnil, rb_str_new2("fox/aliases"));
rb_f_require(Qnil, rb_str_new2("fox/responder2"));
}
|
|
From: Lyle J. <ly...@us...> - 2002-05-08 16:32:44
|
Update of /cvsroot/fxruby/FXRuby/examples
In directory usw-pr-cvs1:/tmp/cvs-serv31524
Modified Files:
Tag: release10
image.rb
Log Message:
Minor updates to the image.rb example to replace calls with shorter
aliases, e.g. replacing @canvas.getWidth() and @canvas.getHeight()
with @canvas.width and @canvas.height.
Index: image.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/image.rb,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** image.rb 5 Nov 2001 23:12:22 -0000 1.11
--- image.rb 8 May 2002 16:32:41 -0000 1.11.2.1
***************
*** 176,182 ****
# Erase the canvas, color comes from well
! dc.setForeground(@backwell.getRGBA())
! dc.fillRectangle(0, 0, @picture.getWidth(), @picture.getHeight())
# Draw images
--- 176,182 ----
# Erase the canvas, color comes from well
! dc.foreground = @backwell.rgba
! dc.fillRectangle(0, 0, @picture.width, @picture.height)
# Draw images
***************
*** 191,205 ****
# Draw patterns
! dc.setFillStyle(FILL_OPAQUESTIPPLED)
! dc.setForeground(FXColor::Black)
! dc.setBackground(FXColor::White)
(STIPPLE_0..STIPPLE_16).each { |pat|
! dc.setStipple(pat)
dc.fillRectangle(10 + (512*pat)/17, 490, 31, 50)
}
! dc.setFillStyle(FILL_SOLID)
# Draw borders
! dc.setForeground(@borderwell.getRGBA())
dc.drawRectangle(10, 10, 512, 50)
dc.drawRectangle(10, 60, 512, 50)
--- 191,205 ----
# Draw patterns
! dc.fillStyle = FILL_OPAQUESTIPPLED
! dc.foreground = FXColor::Black
! dc.background = FXColor::White
(STIPPLE_0..STIPPLE_16).each { |pat|
! dc.stipple = pat
dc.fillRectangle(10 + (512*pat)/17, 490, 31, 50)
}
! dc.fillStyle = FILL_SOLID
# Draw borders
! dc.foreground = @borderwell.rgba
dc.drawRectangle(10, 10, 512, 50)
dc.drawRectangle(10, 60, 512, 50)
***************
*** 217,227 ****
# Draw text
! dc.setTextFont(@font)
! dc.setForeground(@textwell.getRGBA())
! dc.drawText(540, 60, "Grey", 4)
! dc.drawText(540, 180, "Red", 3)
! dc.drawText(540, 300, "Green", 5)
! dc.drawText(540, 420, "Blue", 4)
! dc.drawText(540, 540, "Patterns", 8)
# Don't wait for the GC to catch up, do it now!
--- 217,227 ----
# Draw text
! dc.textFont = @font
! dc.foreground = @textwell.rgba
! dc.drawText(540, 60, "Grey")
! dc.drawText(540, 180, "Red")
! dc.drawText(540, 300, "Green")
! dc.drawText(540, 420, "Blue")
! dc.drawText(540, 540, "Patterns")
# Don't wait for the GC to catch up, do it now!
***************
*** 234,239 ****
# Clear whole thing
! sdc.setForeground(@backwell.getRGBA())
! sdc.fillRectangle(0, 0, @canvas.getWidth(), @canvas.getHeight())
# Paint image
--- 234,239 ----
# Clear whole thing
! sdc.foreground = @backwell.rgba
! sdc.fillRectangle(0, 0, @canvas.width, @canvas.height)
# Paint image
***************
*** 254,261 ****
saveDialog = FXFileDialog.new(self, "Save as BMP")
if saveDialog.execute != 0
! FXFileStream.open(saveDialog.filename, FXStreamSave) { |outfile|
@picture.restore
@picture.savePixels(outfile)
! }
end
return 1
--- 254,261 ----
saveDialog = FXFileDialog.new(self, "Save as BMP")
if saveDialog.execute != 0
! FXFileStream.open(saveDialog.filename, FXStreamSave) do |outfile|
@picture.restore
@picture.savePixels(outfile)
! end
end
return 1
|
|
From: Lyle J. <ly...@us...> - 2002-05-08 16:24:34
|
Update of /cvsroot/fxruby/FXRuby/lib/fox
In directory usw-pr-cvs1:/tmp/cvs-serv27523
Modified Files:
Tag: release10
aliases.rb
Log Message:
Corrected a typo; the alias for FXColorWell#getRGBA was supposed to be
"rgba" but was actually "rbga". This has been fixed!
Index: aliases.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/lib/fox/aliases.rb,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -C2 -d -r1.24.2.1 -r1.24.2.2
*** aliases.rb 25 Apr 2002 21:07:58 -0000 1.24.2.1
--- aliases.rb 8 May 2002 16:24:31 -0000 1.24.2.2
***************
*** 125,129 ****
class FX_ColorWell
alias rgba= setRGBA
! alias rbga getRGBA
alias opaqueOnly= setOpaqueOnly
alias opaqueOnly? isOpaqueOnly
--- 125,129 ----
class FX_ColorWell
alias rgba= setRGBA
! alias rgba getRGBA
alias opaqueOnly= setOpaqueOnly
alias opaqueOnly? isOpaqueOnly
|
|
From: Lyle J. <ly...@us...> - 2002-05-08 15:25:43
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv30306/ext/fox/include
Modified Files:
Tag: release10
FXRbGIFCursor.h
Log Message:
Modified the constructors for FXCursor and FXGIFCursor so that the hot
spot coordinates (hx and hy) no longer have default values of -1. Although
FOX allows this, it's not correct for Windows where you *must* specify
a reasonable value for those arguments; so I'm removing the temptation
for FXRuby ;)
Index: FXRbGIFCursor.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbGIFCursor.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** FXRbGIFCursor.h 12 Jul 2001 19:44:17 -0000 1.1
--- FXRbGIFCursor.h 8 May 2002 15:25:39 -0000 1.1.2.1
***************
*** 37,41 ****
public:
/// Construct a cursor from memory stream formatted as CompuServe GIF format
! FXRbGIFCursor(FXApp* a,const void* pix,FXint hx=-1,FXint hy=-1):FXGIFCursor(a,pix,hx,hy){
FXRbRegisterAppSensitiveObject(this);
}
--- 37,41 ----
public:
/// Construct a cursor from memory stream formatted as CompuServe GIF format
! FXRbGIFCursor(FXApp* a,const void* pix,FXint hx,FXint hy):FXGIFCursor(a,pix,hx,hy){
FXRbRegisterAppSensitiveObject(this);
}
|
|
From: Lyle J. <ly...@us...> - 2002-05-08 15:25:43
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv30306/swig-interfaces
Modified Files:
Tag: release10
FXCursor.i FXGIFCursor.i
Log Message:
Modified the constructors for FXCursor and FXGIFCursor so that the hot
spot coordinates (hx and hy) no longer have default values of -1. Although
FOX allows this, it's not correct for Windows where you *must* specify
a reasonable value for those arguments; so I'm removing the temptation
for FXRuby ;)
Index: FXCursor.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXCursor.i,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** FXCursor.i 19 Mar 2002 23:18:40 -0000 1.11
--- FXCursor.i 8 May 2002 15:25:39 -0000 1.11.2.1
***************
*** 55,59 ****
/// Make cursor from source and mask; cursor size should at most 32x32 for portability!
! FXCursor(FXApp* a,const void* src,const void* msk,FXint w=32,FXint h=32,FXint hx=-1,FXint hy=-1);
/// Width of cursor
--- 55,59 ----
/// Make cursor from source and mask; cursor size should at most 32x32 for portability!
! FXCursor(FXApp* a,const void* src,const void* msk,FXint w,FXint h,FXint hx,FXint hy);
/// Width of cursor
***************
*** 94,97 ****
--- 94,98 ----
};
+ %ignore FXRbCursor::FXRbCursor(FXApp* a,const void* src,const void* msk,FXint w,FXint h,FXint hx,FXint hy);
%exception FXRbCursor::FXRbCursor "$action FXRbRegisterRubyObj(self, result);";
***************
*** 100,103 ****
--- 101,107 ----
// Constructor
FXRbCursor(FXApp* a,FXStockCursor curid=CURSOR_ARROW);
+
+ // Construct from source and mask
+ FXRbCursor(FXApp* a,const void* src,const void* msk,FXint w,FXint h,FXint hx,FXint hy);
// Destructor
Index: FXGIFCursor.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGIFCursor.i,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** FXGIFCursor.i 19 Mar 2002 23:18:40 -0000 1.11
--- FXGIFCursor.i 8 May 2002 15:25:40 -0000 1.11.2.1
***************
*** 30,34 ****
/// Construct a cursor from memory stream formatted as CompuServe GIF format
! FXGIFCursor(FXApp* a,const void* pix,FXint hx=-1,FXint hy=-1);
/// Destroy
--- 30,34 ----
/// Construct a cursor from memory stream formatted as CompuServe GIF format
! FXGIFCursor(FXApp* a,const void* pix,FXint hx,FXint hy);
/// Destroy
***************
*** 41,45 ****
public:
// Constructor
! FXRbGIFCursor(FXApp* a,const void* pix,FXint hx=-1,FXint hy=-1);
// Destructor
--- 41,45 ----
public:
// Constructor
! FXRbGIFCursor(FXApp* a,const void* pix,FXint hx,FXint hy);
// Destructor
|
|
From: Lyle J. <ly...@us...> - 2002-05-08 02:08:32
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv4114
Modified Files:
Tag: release10
markfuncs.cpp
Log Message:
Revert to previous version of markfuncs.cpp.
Index: markfuncs.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/markfuncs.cpp,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -C2 -d -r1.13.2.2 -r1.13.2.3
*** markfuncs.cpp 6 May 2002 20:16:40 -0000 1.13.2.2
--- markfuncs.cpp 8 May 2002 02:08:27 -0000 1.13.2.3
***************
*** 304,316 ****
FXRbObject::markfunc(self);
if(self){
! // FXRbGcMark(self->getParent());
! // FXRbGcMark(self->getNext());
! // FXRbGcMark(self->getPrev());
for(FXTreeItem* item=self->getFirst(); item; item=item->getNext()){
! // FXRbGcMark(item);
FXRbTreeItem::markfunc(item);
}
! // FXRbGcMark(self->getBelow());
! // FXRbGcMark(self->getAbove());
FXRbGcMark(self->getOpenIcon());
FXRbGcMark(self->getClosedIcon());
--- 304,316 ----
FXRbObject::markfunc(self);
if(self){
! FXRbGcMark(self->getParent());
! FXRbGcMark(self->getNext());
! FXRbGcMark(self->getPrev());
for(FXTreeItem* item=self->getFirst(); item; item=item->getNext()){
! FXRbGcMark(item);
FXRbTreeItem::markfunc(item);
}
! FXRbGcMark(self->getBelow());
! FXRbGcMark(self->getAbove());
FXRbGcMark(self->getOpenIcon());
FXRbGcMark(self->getClosedIcon());
***************
*** 332,336 ****
if(self){
for(FXTreeItem* item=self->getFirstItem(); item; item=item->getNext()){
! // FXRbGcMark(item);
FXRbTreeItem::markfunc(item);
}
--- 332,336 ----
if(self){
for(FXTreeItem* item=self->getFirstItem(); item; item=item->getNext()){
! FXRbGcMark(item);
FXRbTreeItem::markfunc(item);
}
***************
*** 363,367 ****
for(FXint i=0;i<self->getNumItems();i++){
FXListItem* item=self->retrieveItem(i);
! // FXRbGcMark(item);
FXRbListItem::markfunc(item);
if(self->getItemData(i))
--- 363,367 ----
for(FXint i=0;i<self->getNumItems();i++){
FXListItem* item=self->retrieveItem(i);
! FXRbGcMark(item);
FXRbListItem::markfunc(item);
if(self->getItemData(i))
***************
*** 429,433 ****
for(FXint i=0;i<self->getNumItems();i++){
FXHeaderItem* item=self->retrieveItem(i);
! // FXRbGcMark(item);
FXRbHeaderItem::markfunc(item);
if(item->getData())
--- 429,433 ----
for(FXint i=0;i<self->getNumItems();i++){
FXHeaderItem* item=self->retrieveItem(i);
! FXRbGcMark(item);
FXRbHeaderItem::markfunc(item);
if(item->getData())
***************
*** 464,468 ****
for(FXint i=0;i<self->getNumItems();i++){
FXIconItem* item=self->retrieveItem(i);
! // FXRbGcMark(item);
FXRbIconItem::markfunc(item);
if(self->getItemData(i))
--- 464,468 ----
for(FXint i=0;i<self->getNumItems();i++){
FXIconItem* item=self->retrieveItem(i);
! FXRbGcMark(item);
FXRbIconItem::markfunc(item);
if(self->getItemData(i))
***************
*** 763,767 ****
FXRbGcMark(self->getFont());
for(FXTreeItem* item=self->getFirstItem();item!=0;item=item->getNext()){
! // FXRbGcMark(item);
FXRbTreeItem::markfunc(item);
}
--- 763,767 ----
FXRbGcMark(self->getFont());
for(FXTreeItem* item=self->getFirstItem();item!=0;item=item->getNext()){
! FXRbGcMark(item);
FXRbTreeItem::markfunc(item);
}
|
|
From: Lyle J. <ly...@us...> - 2002-05-06 20:16:44
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv16391
Modified Files:
Tag: release10
markfuncs.cpp
Log Message:
Commented out what are (I think) some unnecessary calls to FXRbGcMark()
for things like tree items and the like (see SourceForge Bug #534365).
But I'm not sure this fixes Gilles' problem with stack overflow (if that
is indeed the problem).
Index: markfuncs.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/markfuncs.cpp,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -d -r1.13.2.1 -r1.13.2.2
*** markfuncs.cpp 25 Apr 2002 02:44:26 -0000 1.13.2.1
--- markfuncs.cpp 6 May 2002 20:16:40 -0000 1.13.2.2
***************
*** 304,316 ****
FXRbObject::markfunc(self);
if(self){
! FXRbGcMark(self->getParent());
! FXRbGcMark(self->getNext());
! FXRbGcMark(self->getPrev());
for(FXTreeItem* item=self->getFirst(); item; item=item->getNext()){
! FXRbGcMark(item);
FXRbTreeItem::markfunc(item);
}
! FXRbGcMark(self->getBelow());
! FXRbGcMark(self->getAbove());
FXRbGcMark(self->getOpenIcon());
FXRbGcMark(self->getClosedIcon());
--- 304,316 ----
FXRbObject::markfunc(self);
if(self){
! // FXRbGcMark(self->getParent());
! // FXRbGcMark(self->getNext());
! // FXRbGcMark(self->getPrev());
for(FXTreeItem* item=self->getFirst(); item; item=item->getNext()){
! // FXRbGcMark(item);
FXRbTreeItem::markfunc(item);
}
! // FXRbGcMark(self->getBelow());
! // FXRbGcMark(self->getAbove());
FXRbGcMark(self->getOpenIcon());
FXRbGcMark(self->getClosedIcon());
***************
*** 332,336 ****
if(self){
for(FXTreeItem* item=self->getFirstItem(); item; item=item->getNext()){
! FXRbGcMark(item);
FXRbTreeItem::markfunc(item);
}
--- 332,336 ----
if(self){
for(FXTreeItem* item=self->getFirstItem(); item; item=item->getNext()){
! // FXRbGcMark(item);
FXRbTreeItem::markfunc(item);
}
***************
*** 363,367 ****
for(FXint i=0;i<self->getNumItems();i++){
FXListItem* item=self->retrieveItem(i);
! FXRbGcMark(item);
FXRbListItem::markfunc(item);
if(self->getItemData(i))
--- 363,367 ----
for(FXint i=0;i<self->getNumItems();i++){
FXListItem* item=self->retrieveItem(i);
! // FXRbGcMark(item);
FXRbListItem::markfunc(item);
if(self->getItemData(i))
***************
*** 429,433 ****
for(FXint i=0;i<self->getNumItems();i++){
FXHeaderItem* item=self->retrieveItem(i);
! FXRbGcMark(item);
FXRbHeaderItem::markfunc(item);
if(item->getData())
--- 429,433 ----
for(FXint i=0;i<self->getNumItems();i++){
FXHeaderItem* item=self->retrieveItem(i);
! // FXRbGcMark(item);
FXRbHeaderItem::markfunc(item);
if(item->getData())
***************
*** 464,468 ****
for(FXint i=0;i<self->getNumItems();i++){
FXIconItem* item=self->retrieveItem(i);
! FXRbGcMark(item);
FXRbIconItem::markfunc(item);
if(self->getItemData(i))
--- 464,468 ----
for(FXint i=0;i<self->getNumItems();i++){
FXIconItem* item=self->retrieveItem(i);
! // FXRbGcMark(item);
FXRbIconItem::markfunc(item);
if(self->getItemData(i))
***************
*** 763,767 ****
FXRbGcMark(self->getFont());
for(FXTreeItem* item=self->getFirstItem();item!=0;item=item->getNext()){
! FXRbGcMark(item);
FXRbTreeItem::markfunc(item);
}
--- 763,767 ----
FXRbGcMark(self->getFont());
for(FXTreeItem* item=self->getFirstItem();item!=0;item=item->getNext()){
! // FXRbGcMark(item);
FXRbTreeItem::markfunc(item);
}
|
|
From: Lyle J. <ly...@us...> - 2002-05-06 19:16:50
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv29682/ext/fox
Modified Files:
Tag: release10
core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp
layout_wrap.cpp mdi_wrap.cpp opengl_wrap.cpp
scintilla_wrap.cpp ui_wrap.cpp
Log Message:
Replaced %addmethods directives with %extend in a number of SWIG
interface files.
Fixed the default argument values for FXIconDict and FXRbIconDict
constructors (in FXFileDict.i) from "FXIconDict::defaultIconPath" to
just "defaultIconPath"; otherwise SWIG expands this incorrectly.
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62.2.6
retrieving revision 1.62.2.7
diff -C2 -d -r1.62.2.6 -r1.62.2.7
*** core_wrap.cpp 30 Apr 2002 19:02:41 -0000 1.62.2.6
--- core_wrap.cpp 6 May 2002 19:16:01 -0000 1.62.2.7
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
[...4326 lines suppressed...]
vresult = INT2NUM(result);
--- 17512,17516 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 18678,18682 ****
rb_define_const(cFXApp.klass,"ID_LAST", INT2NUM(FXRbApp::ID_LAST));
rb_define_method(cFXApp.klass, "onChoreThreads", VALUEFUNC(_wrap_FXApp_onChoreThreads), -1);
! rb_define_method(cFXApp.klass, "setThreadsEnabled", VALUEFUNC(_wrap_FXApp_setThreadsEnabled), -1);
rb_define_method(cFXApp.klass, "threadsEnabled?", VALUEFUNC(_wrap_FXApp_threadsEnabledq___), -1);
rb_define_method(cFXApp.klass, "setSleepTime", VALUEFUNC(_wrap_FXApp_setSleepTime), -1);
--- 18678,18682 ----
rb_define_const(cFXApp.klass,"ID_LAST", INT2NUM(FXRbApp::ID_LAST));
rb_define_method(cFXApp.klass, "onChoreThreads", VALUEFUNC(_wrap_FXApp_onChoreThreads), -1);
! rb_define_method(cFXApp.klass, "threadsEnabled=", VALUEFUNC(_wrap_FXApp_threadsEnablede___), -1);
rb_define_method(cFXApp.klass, "threadsEnabled?", VALUEFUNC(_wrap_FXApp_threadsEnabledq___), -1);
rb_define_method(cFXApp.klass, "setSleepTime", VALUEFUNC(_wrap_FXApp_setSleepTime), -1);
Index: dialogs_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v
retrieving revision 1.34.2.6
retrieving revision 1.34.2.7
diff -C2 -d -r1.34.2.6 -r1.34.2.7
*** dialogs_wrap.cpp 30 Apr 2002 19:02:52 -0000 1.34.2.6
--- dialogs_wrap.cpp 6 May 2002 19:16:07 -0000 1.34.2.7
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
[...2606 lines suppressed...]
vresult = result ? Qtrue : Qfalse;
--- 10582,10586 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbMessageBox *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbMessageBox);
! result = (FXbool)((FXRbMessageBox const *)arg1)->_doesSaveUnder();
vresult = result ? Qtrue : Qfalse;
***************
*** 10656,10660 ****
arg2 = NUM2UINT(argv[0]);
}
! result = (FXuint )(arg1)->_execute(arg2);
vresult = UINT2NUM(result);
--- 10656,10660 ----
arg2 = NUM2UINT(argv[0]);
}
! result = (FXuint)(arg1)->_execute(arg2);
vresult = UINT2NUM(result);
Index: icons_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v
retrieving revision 1.37.2.6
retrieving revision 1.37.2.7
diff -C2 -d -r1.37.2.6 -r1.37.2.7
*** icons_wrap.cpp 30 Apr 2002 19:02:54 -0000 1.37.2.6
--- icons_wrap.cpp 6 May 2002 19:16:08 -0000 1.37.2.7
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
* This file is not intended to be easily readable and contains a number of
***************
*** 637,641 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXIcon *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXIcon);
! result = (FXColor )((FXIcon const *)arg1)->getTransparentColor();
vresult = UINT2NUM(result);
--- 637,641 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXIcon *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXIcon);
! result = (FXColor)((FXIcon const *)arg1)->getTransparentColor();
vresult = UINT2NUM(result);
***************
*** 733,737 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 733,737 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1087,1091 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1087,1091 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1326,1330 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE )fxloadBMP(*arg1);
vresult = result;
--- 1326,1330 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE)fxloadBMP(*arg1);
vresult = result;
***************
*** 1357,1361 ****
arg4 = NUM2INT(argv[3]);
arg5 = NUM2INT(argv[4]);
! result = (FXbool )fxsaveBMP(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
vresult = result ? Qtrue : Qfalse;
--- 1357,1361 ----
arg4 = NUM2INT(argv[3]);
arg5 = NUM2INT(argv[4]);
! result = (FXbool)fxsaveBMP(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
vresult = result ? Qtrue : Qfalse;
***************
*** 1488,1492 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1488,1492 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1842,1846 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1842,1846 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 2081,2085 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE )fxloadICO(*arg1);
vresult = result;
--- 2081,2085 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE)fxloadICO(*arg1);
vresult = result;
***************
*** 2112,2116 ****
arg4 = NUM2INT(argv[3]);
arg5 = NUM2INT(argv[4]);
! result = (FXbool )fxsaveICO(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
vresult = result ? Qtrue : Qfalse;
--- 2112,2116 ----
arg4 = NUM2INT(argv[3]);
arg5 = NUM2INT(argv[4]);
! result = (FXbool)fxsaveICO(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
vresult = result ? Qtrue : Qfalse;
***************
*** 2193,2197 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXJPGIcon *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXJPGIcon);
! result = (FXint )((FXJPGIcon const *)arg1)->getQuality();
vresult = INT2NUM(result);
--- 2193,2197 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXJPGIcon *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXJPGIcon);
! result = (FXint)((FXJPGIcon const *)arg1)->getQuality();
vresult = INT2NUM(result);
***************
*** 2274,2278 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 2274,2278 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 2628,2632 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 2628,2632 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 2867,2871 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE )fxloadPCX(*arg1);
vresult = result;
--- 2867,2871 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE)fxloadPCX(*arg1);
vresult = result;
***************
*** 2898,2902 ****
arg4 = NUM2INT(argv[3]);
arg5 = NUM2INT(argv[4]);
! result = (FXbool )fxsavePCX(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
vresult = result ? Qtrue : Qfalse;
--- 2898,2902 ----
arg4 = NUM2INT(argv[3]);
arg5 = NUM2INT(argv[4]);
! result = (FXbool)fxsavePCX(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
vresult = result ? Qtrue : Qfalse;
***************
*** 3059,3063 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 3059,3063 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 3298,3302 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE )fxloadPNG(*arg1);
vresult = result;
--- 3298,3302 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE)fxloadPNG(*arg1);
vresult = result;
***************
*** 3329,3333 ****
arg4 = NUM2INT(argv[3]);
arg5 = NUM2INT(argv[4]);
! result = (FXbool )fxsavePNG(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
vresult = result ? Qtrue : Qfalse;
--- 3329,3333 ----
arg4 = NUM2INT(argv[3]);
arg5 = NUM2INT(argv[4]);
! result = (FXbool)fxsavePNG(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
vresult = result ? Qtrue : Qfalse;
***************
*** 3460,3464 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 3460,3464 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 3814,3818 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 3814,3818 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 4118,4122 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXTIFIcon *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXTIFIcon);
! result = (FXuint )((FXTIFIcon const *)arg1)->getCodec();
vresult = UINT2NUM(result);
--- 4118,4122 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXTIFIcon *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXTIFIcon);
! result = (FXuint)((FXTIFIcon const *)arg1)->getCodec();
vresult = UINT2NUM(result);
***************
*** 4199,4203 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 4199,4203 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 4561,4565 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 4561,4565 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 4800,4804 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE )fxloadXPM(*arg1);
vresult = result;
--- 4800,4804 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE)fxloadXPM(*arg1);
vresult = result;
***************
*** 4831,4835 ****
arg4 = NUM2INT(argv[3]);
arg5 = NUM2INT(argv[4]);
! result = (FXbool )fxsaveXPM(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
vresult = result ? Qtrue : Qfalse;
--- 4831,4835 ----
arg4 = NUM2INT(argv[3]);
arg5 = NUM2INT(argv[4]);
! result = (FXbool)fxsaveXPM(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
vresult = result ? Qtrue : Qfalse;
Index: image_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v
retrieving revision 1.39.2.6
retrieving revision 1.39.2.7
diff -C2 -d -r1.39.2.6 -r1.39.2.7
*** image_wrap.cpp 30 Apr 2002 19:02:54 -0000 1.39.2.6
--- image_wrap.cpp 6 May 2002 19:16:08 -0000 1.39.2.7
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
* This file is not intended to be easily readable and contains a number of
***************
*** 628,632 ****
arg2 = NUM2INT(argv[0]);
arg3 = NUM2INT(argv[1]);
! result = (FXbool )((FXBitmap const *)arg1)->getPixel(arg2,arg3);
vresult = result ? Qtrue : Qfalse;
--- 628,632 ----
arg2 = NUM2INT(argv[0]);
arg3 = NUM2INT(argv[1]);
! result = (FXbool)((FXBitmap const *)arg1)->getPixel(arg2,arg3);
vresult = result ? Qtrue : Qfalse;
***************
*** 806,810 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 806,810 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 998,1002 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXImage *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXImage);
! result = (VALUE )FXImage_getData((FXImage const *)arg1);
vresult = result;
--- 998,1002 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXImage *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXImage);
! result = (VALUE)FXImage_getData((FXImage const *)arg1);
vresult = result;
***************
*** 1014,1018 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXImage *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXImage);
! result = (FXuint )((FXImage const *)arg1)->getOptions();
vresult = UINT2NUM(result);
--- 1014,1018 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXImage *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXImage);
! result = (FXuint)((FXImage const *)arg1)->getOptions();
vresult = UINT2NUM(result);
***************
*** 1045,1049 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXImage *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXImage);
! result = (FXint )((FXImage const *)arg1)->getChannels();
vresult = INT2NUM(result);
--- 1045,1049 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXImage *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXImage);
! result = (FXint)((FXImage const *)arg1)->getChannels();
vresult = INT2NUM(result);
***************
*** 1065,1069 ****
arg2 = NUM2INT(argv[0]);
arg3 = NUM2INT(argv[1]);
! result = (FXColor )((FXImage const *)arg1)->getPixel(arg2,arg3);
vresult = UINT2NUM(result);
--- 1065,1069 ----
arg2 = NUM2INT(argv[0]);
arg3 = NUM2INT(argv[1]);
! result = (FXColor)((FXImage const *)arg1)->getPixel(arg2,arg3);
vresult = UINT2NUM(result);
***************
*** 1383,1387 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1383,1387 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1729,1733 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1729,1733 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 2075,2079 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 2075,2079 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 2421,2425 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 2421,2425 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 2721,2725 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXJPGImage *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXJPGImage);
! result = (FXint )((FXJPGImage const *)arg1)->getQuality();
vresult = INT2NUM(result);
--- 2721,2725 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXJPGImage *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXJPGImage);
! result = (FXint)((FXJPGImage const *)arg1)->getQuality();
vresult = INT2NUM(result);
***************
*** 2798,2802 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 2798,2802 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 3037,3041 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE )fxloadJPG(*arg1);
vresult = result;
--- 3037,3041 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE)fxloadJPG(*arg1);
vresult = result;
***************
*** 3063,3067 ****
arg5 = NUM2INT(argv[4]);
arg6 = NUM2INT(argv[5]);
! result = (FXbool )fxsaveJPG(*arg1,arg2,arg3,arg4,arg5,arg6);
vresult = result ? Qtrue : Qfalse;
--- 3063,3067 ----
arg5 = NUM2INT(argv[4]);
arg6 = NUM2INT(argv[5]);
! result = (FXbool)fxsaveJPG(*arg1,arg2,arg3,arg4,arg5,arg6);
vresult = result ? Qtrue : Qfalse;
***************
*** 3186,3190 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 3186,3190 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 3562,3566 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 3562,3566 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 3908,3912 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 3908,3912 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 4147,4151 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE )fxloadRGB(*arg1);
vresult = result;
--- 4147,4151 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE)fxloadRGB(*arg1);
vresult = result;
***************
*** 4178,4182 ****
arg4 = NUM2INT(argv[3]);
arg5 = NUM2INT(argv[4]);
! result = (FXbool )fxsaveRGB(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
vresult = result ? Qtrue : Qfalse;
--- 4178,4182 ----
arg4 = NUM2INT(argv[3]);
arg5 = NUM2INT(argv[4]);
! result = (FXbool)fxsaveRGB(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
vresult = result ? Qtrue : Qfalse;
***************
*** 4301,4305 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 4301,4305 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 4540,4544 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE )fxloadTGA(*arg1);
vresult = result;
--- 4540,4544 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE)fxloadTGA(*arg1);
vresult = result;
***************
*** 4571,4575 ****
arg4 = NUM2INT(argv[3]);
arg5 = NUM2INT(argv[4]);
! result = (FXbool )fxsaveTGA(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
vresult = result ? Qtrue : Qfalse;
--- 4571,4575 ----
arg4 = NUM2INT(argv[3]);
arg5 = NUM2INT(argv[4]);
! result = (FXbool)fxsaveTGA(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
vresult = result ? Qtrue : Qfalse;
***************
*** 4648,4652 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXTIFImage *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXTIFImage);
! result = (FXuint )((FXTIFImage const *)arg1)->getCodec();
vresult = UINT2NUM(result);
--- 4648,4652 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXTIFImage *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXTIFImage);
! result = (FXuint)((FXTIFImage const *)arg1)->getCodec();
vresult = UINT2NUM(result);
***************
*** 4755,4759 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 4755,4759 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 4994,4998 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE )fxloadTIF(*arg1);
vresult = result;
--- 4994,4998 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXStream *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXStream);
! result = (VALUE)fxloadTIF(*arg1);
vresult = result;
***************
*** 5027,5031 ****
arg5 = NUM2INT(argv[4]);
arg6 = NUM2USHRT(argv[5]);
! result = (FXbool )fxsaveTIF(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5,arg6);
vresult = result ? Qtrue : Qfalse;
--- 5027,5031 ----
arg5 = NUM2INT(argv[4]);
arg6 = NUM2USHRT(argv[5]);
! result = (FXbool)fxsaveTIF(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5,arg6);
vresult = result ? Qtrue : Qfalse;
***************
*** 5158,5162 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 5158,5162 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
Index: layout_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -C2 -d -r1.8.2.6 -r1.8.2.7
*** layout_wrap.cpp 30 Apr 2002 19:02:55 -0000 1.8.2.6
--- layout_wrap.cpp 6 May 2002 19:16:09 -0000 1.8.2.7
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
[...1931 lines suppressed...]
vresult = result ? Qtrue : Qfalse;
--- 8578,8582 ----
arg2 = NUM2INT(argv[0]);
arg3 = NUM2INT(argv[1]);
! result = (FXbool)((FXRbStatusbar const *)arg1)->_contains(arg2,arg3);
vresult = result ? Qtrue : Qfalse;
***************
*** 8594,8598 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbStatusbar *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbStatusbar);
! result = (FXbool )((FXRbStatusbar const *)arg1)->_doesSaveUnder();
vresult = result ? Qtrue : Qfalse;
--- 8594,8598 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbStatusbar *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbStatusbar);
! result = (FXbool)((FXRbStatusbar const *)arg1)->_doesSaveUnder();
vresult = result ? Qtrue : Qfalse;
Index: mdi_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v
retrieving revision 1.36.2.6
retrieving revision 1.36.2.7
diff -C2 -d -r1.36.2.6 -r1.36.2.7
*** mdi_wrap.cpp 30 Apr 2002 19:02:55 -0000 1.36.2.6
--- mdi_wrap.cpp 6 May 2002 19:16:09 -0000 1.36.2.7
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
[...2113 lines suppressed...]
vresult = result ? Qtrue : Qfalse;
--- 7508,7512 ----
arg2 = NUM2INT(argv[0]);
arg3 = NUM2INT(argv[1]);
! result = (FXbool)((FXRbMDIChild const *)arg1)->_contains(arg2,arg3);
vresult = result ? Qtrue : Qfalse;
***************
*** 7524,7528 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbMDIChild *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbMDIChild);
! result = (FXbool )((FXRbMDIChild const *)arg1)->_doesSaveUnder();
vresult = result ? Qtrue : Qfalse;
--- 7524,7528 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbMDIChild *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbMDIChild);
! result = (FXbool)((FXRbMDIChild const *)arg1)->_doesSaveUnder();
vresult = result ? Qtrue : Qfalse;
Index: opengl_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v
retrieving revision 1.41.2.7
retrieving revision 1.41.2.8
diff -C2 -d -r1.41.2.7 -r1.41.2.8
*** opengl_wrap.cpp 30 Apr 2002 19:02:55 -0000 1.41.2.7
--- opengl_wrap.cpp 6 May 2002 19:16:12 -0000 1.41.2.8
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
[...3889 lines suppressed...]
vresult = result ? Qtrue : Qfalse;
--- 11237,11241 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbGLShape *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbGLShape);
! result = (FXbool)((FXRbGLShape const *)arg1)->_canDelete();
vresult = result ? Qtrue : Qfalse;
***************
*** 11263,11267 ****
arg5 = NUM2INT(argv[3]);
arg6 = NUM2INT(argv[4]);
! result = (FXbool )(arg1)->_drag(arg2,arg3,arg4,arg5,arg6);
vresult = result ? Qtrue : Qfalse;
--- 11263,11267 ----
arg5 = NUM2INT(argv[3]);
arg6 = NUM2INT(argv[4]);
! result = (FXbool)(arg1)->_drag(arg2,arg3,arg4,arg5,arg6);
vresult = result ? Qtrue : Qfalse;
Index: scintilla_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/scintilla_wrap.cpp,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -C2 -d -r1.16.2.2 -r1.16.2.3
*** scintilla_wrap.cpp 30 Apr 2002 02:12:42 -0000 1.16.2.2
--- scintilla_wrap.cpp 6 May 2002 19:16:16 -0000 1.16.2.3
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020506-1331
*
* This file is not intended to be easily readable and contains a number of
***************
*** 395,399 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (NotifyHeader *) SWIG_ConvertPtr(self, SWIGTYPE_p_NotifyHeader);
! result = (unsigned int ) (arg1->idFrom);
vresult = UINT2NUM(result);
--- 395,399 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (NotifyHeader *) SWIG_ConvertPtr(self, SWIGTYPE_p_NotifyHeader);
! result = (unsigned int) (arg1->idFrom);
vresult = UINT2NUM(result);
***************
*** 411,415 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (NotifyHeader *) SWIG_ConvertPtr(self, SWIGTYPE_p_NotifyHeader);
! result = (unsigned int ) (arg1->code);
vresult = UINT2NUM(result);
--- 411,415 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (NotifyHeader *) SWIG_ConvertPtr(self, SWIGTYPE_p_NotifyHeader);
! result = (unsigned int) (arg1->code);
vresult = UINT2NUM(result);
***************
*** 431,435 ****
{
struct NotifyHeader * resultptr;
! resultptr = new struct NotifyHeader (result);
vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_NotifyHeader, 1);
}
--- 431,435 ----
{
struct NotifyHeader * resultptr;
! resultptr = new struct NotifyHeader(result);
vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_NotifyHeader, 1);
}
***************
*** 447,451 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int ) (arg1->position);
vresult = INT2NUM(result);
--- 447,451 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int) (arg1->position);
vresult = INT2NUM(result);
***************
*** 463,467 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int ) (arg1->ch);
vresult = INT2NUM(result);
--- 463,467 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int) (arg1->ch);
vresult = INT2NUM(result);
***************
*** 479,483 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int ) (arg1->modifiers);
vresult = INT2NUM(result);
--- 479,483 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int) (arg1->modifiers);
vresult = INT2NUM(result);
***************
*** 495,499 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int ) (arg1->modificationType);
vresult = INT2NUM(result);
--- 495,499 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int) (arg1->modificationType);
vresult = INT2NUM(result);
***************
*** 511,515 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (VALUE )SCNotification_text((SCNotification const *)arg1);
vresult = result;
--- 511,515 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (VALUE)SCNotification_text((SCNotification const *)arg1);
vresult = result;
***************
*** 527,531 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int ) (arg1->length);
vresult = INT2NUM(result);
--- 527,531 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int) (arg1->length);
vresult = INT2NUM(result);
***************
*** 543,547 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int ) (arg1->linesAdded);
vresult = INT2NUM(result);
--- 543,547 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int) (arg1->linesAdded);
vresult = INT2NUM(result);
***************
*** 559,563 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int ) (arg1->message);
vresult = INT2NUM(result);
--- 559,563 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int) (arg1->message);
vresult = INT2NUM(result);
***************
*** 575,579 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int ) (arg1->line);
vresult = INT2NUM(result);
--- 575,579 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int) (arg1->line);
vresult = INT2NUM(result);
***************
*** 591,595 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int ) (arg1->foldLevelNow);
vresult = INT2NUM(result);
--- 591,595 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int) (arg1->foldLevelNow);
vresult = INT2NUM(result);
***************
*** 607,611 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int ) (arg1->foldLevelPrev);
vresult = INT2NUM(result);
--- 607,611 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int) (arg1->foldLevelPrev);
vresult = INT2NUM(result);
***************
*** 623,627 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int ) (arg1->margin);
vresult = INT2NUM(result);
--- 623,627 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int) (arg1->margin);
vresult = INT2NUM(result);
***************
*** 639,643 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int ) (arg1->listType);
vresult = INT2NUM(result);
--- 639,643 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int) (arg1->listType);
vresult = INT2NUM(result);
***************
*** 655,659 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int ) (arg1->x);
vresult = INT2NUM(result);
--- 655,659 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int) (arg1->x);
vresult = INT2NUM(result);
***************
*** 671,675 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int ) (arg1->y);
vresult = INT2NUM(result);
--- 671,675 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (int) (arg1->y);
vresult = INT2NUM(result);
***************
*** 687,691 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (VALUE )SCNotification_wParam((SCNotification const *)arg1);
vresult = result;
--- 687,691 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (VALUE)SCNotification_wParam((SCNotification const *)arg1);
vresult = result;
***************
*** 703,707 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (VALUE )SCNotification_lParam((SCNotification const *)arg1);
vresult = result;
--- 703,707 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (VALUE)SCNotification_lParam((SCNotification const *)arg1);
vresult = result;
***************
*** 725,729 ****
arg3 = NUM2UINT(argv[1]);
arg4 = 0;
! result = (long )(arg1)->onScintillaCommand(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 725,729 ----
arg3 = NUM2UINT(argv[1]);
arg4 = 0;
! result = (long)(arg1)->onScintillaCommand(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 755,759 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onPaint(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 755,759 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onPaint(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 785,789 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onConfigure(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 785,789 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onConfigure(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 807,811 ****
arg3 = NUM2UINT(argv[1]);
arg4 = 0;
! result = (long )(arg1)->onTimeoutTicking(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 807,811 ----
arg3 = NUM2UINT(argv[1]);
arg4 = 0;
! result = (long)(arg1)->onTimeoutTicking(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 837,841 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onFocusIn(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 837,841 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onFocusIn(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 867,871 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onFocusOut(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 867,871 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onFocusOut(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 897,901 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onMotion(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 897,901 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onMotion(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 927,931 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onLeftBtnPress(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 927,931 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onLeftBtnPress(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 957,961 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onLeftBtnRelease(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 957,961 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onLeftBtnRelease(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 987,991 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onRightBtnPress(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 987,991 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onRightBtnPress(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1017,1021 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onMiddleBtnPress(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1017,1021 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onMiddleBtnPress(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1047,1051 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onBeginDrag(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1047,1051 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onBeginDrag(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1077,1081 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onDragged(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1077,1081 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onDragged(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1107,1111 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onEndDrag(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1107,1111 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onEndDrag(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1137,1141 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onDNDEnter(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1137,1141 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onDNDEnter(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1167,1171 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onDNDLeave(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1167,1171 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onDNDLeave(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1197,1201 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onDNDMotion(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1197,1201 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onDNDMotion(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1227,1231 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onDNDDrop(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1227,1231 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onDNDDrop(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1257,1261 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onDNDRequest(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1257,1261 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onDNDRequest(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1287,1291 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onSelectionLost(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1287,1291 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onSelectionLost(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1317,1321 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onSelectionRequest(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1317,1321 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onSelectionRequest(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1347,1351 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onClipboardLost(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1347,1351 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onClipboardLost(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1377,1381 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onClipboardRequest(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1377,1381 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onClipboardRequest(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1407,1411 ****
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long )(arg1)->onKeyPress(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1407,1411 ----
arg4 = static_cast<void*>(SWIG_ConvertPtr(argv[2], ty4));
}
! result = (long)(arg1)->onKeyPress(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1499,1503 ****
arg4 = argv[2];
}
! result = (VALUE )FXScintilla_sendMessage(arg1,arg2,arg3,arg4);
vresult = result;
--- 1499,1503 ----
arg4 = argv[2];
}
! result = (VALUE)FXScintilla_sendMessage(arg1,arg2,arg3,arg4);
vresult = result;
***************
*** 1581,1585 ****
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long )(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
--- 1581,1585 ----
arg3 = NUM2UINT(argv[1]);
arg4 = (void *) SWIG_ConvertPtr(argv[2], 0);
! result = (long)(arg1)->_onDefault(arg2,arg3,arg4);
vresult = INT2NUM(result);
***************
*** 1683,1687 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
! result = (FXint )(arg1)->_getDefaultWidth();
vresult = INT2NUM(result);
--- 1683,1687 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
! result = (FXint)(arg1)->_getDefaultWidth();
vresult = INT2NUM(result);
***************
*** 1699,1703 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
! result = (FXint )(arg1)->_getDefaultHeight();
vresult = INT2NUM(result);
--- 1699,1703 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
! result = (FXint)(arg1)->_getDefaultHeight();
vresult = INT2NUM(result);
***************
*** 1717,1721 ****
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
arg2 = NUM2INT(argv[0]);
! result = (FXint )(arg1)->_getWidthForHeight(arg2);
vresult = INT2NUM(result);
--- 1717,1721 ----
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
arg2 = NUM2INT(argv[0]);
! result = (FXint)(arg1)->_getWidthForHeight(arg2);
vresult = INT2NUM(result);
***************
*** 1735,1739 ****
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
arg2 = NUM2INT(argv[0]);
! result = (FXint )(arg1)->_getHeightForWidth(arg2);
vresult = INT2NUM(result);
--- 1735,1739 ----
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
arg2 = NUM2INT(argv[0]);
! result = (FXint)(arg1)->_getHeightForWidth(arg2);
vresult = INT2NUM(result);
***************
*** 1751,1755 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
! result = (FXbool )((FXRbScintilla const *)arg1)->_canFocus();
vresult = result ? Qtrue : Qfalse;
--- 1751,1755 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
! result = (FXbool)((FXRbScintilla const *)arg1)->_canFocus();
vresult = result ? Qtrue : Qfalse;
***************
*** 1959,1963 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
! result = (FXbool )((FXRbScintilla const *)arg1)->_isComposite();
vresult = result ? Qtrue : Qfalse;
--- 1959,1963 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
! result = (FXbool)((FXRbScintilla const *)arg1)->_isComposite();
vresult = result ? Qtrue : Qfalse;
***************
*** 1979,1983 ****
arg2 = NUM2INT(argv[0]);
arg3 = NUM2INT(argv[1]);
! result = (FXbool )((FXRbScintilla const *)arg1)->_contains(arg2,arg3);
vresult = result ? Qtrue : Qfalse;
--- 1979,1983 ----
arg2 = NUM2INT(argv[0]);
arg3 = NUM2INT(argv[1]);
! result = (FXbool)((FXRbScintilla const *)arg1)->_contains(arg2,arg3);
vresult = result ? Qtrue : Qfalse;
***************
*** 1995,1999 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
! result = (FXbool )((FXRbScintilla const *)arg1)->_doesSaveUnder();
vresult = result ? Qtrue : Qfalse;
--- 1995,1999 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
! result = (FXbool)((FXRbScintilla const *)arg1)->_doesSaveUnder();
vresult = result ? Qtrue : Qfalse;
***************
*** 2039,2043 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
! result = (FXint )(arg1)->_getViewportHeight();
vresult = INT2NUM(result);
--- 2039,2043 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
! result = (FXint)(arg1)->_getViewportHeight();
vresult = INT2NUM(result);
***************
*** 2055,2059 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbScintilla *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbScintilla);
! result = (FXint )(arg1)->_getViewportWidth();
vresult = INT2NUM(result);
--- 2055,2059 ----
...
[truncated message content] |
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv29682/swig-interfaces
Modified Files:
Tag: release10
FXApp.i FXColorSelector.i FXComboBox.i FXDC.i FXDebugTarget.i
FXDial.i FXDict.i FXFileDialog.i FXFileDict.i FXFileSelector.i
FXFont.i FXFontDialog.i FXFontSelector.i FXGLObject.i
FXGLShape.i FXGLViewer.i FXHMat.i FXHVec.i FXHeader.i
FXIconList.i FXId.i FXImage.i FXInputDialog.i FXList.i
FXListBox.i FXPrintDialog.i FXQuat.i FXRange.i FXRegion.i
FXScintilla.i FXScrollArea.i FXSlider.i FXSpinner.i
FXStatusline.i FXStream.i FXTable.i FXText.i FXTreeList.i
FXTreeListBox.i FXVec.i FXWindow.i
Log Message:
Replaced %addmethods directives with %extend in a number of SWIG
interface files.
Fixed the default argument values for FXIconDict and FXRbIconDict
constructors (in FXFileDict.i) from "FXIconDict::defaultIconPath" to
just "defaultIconPath"; otherwise SWIG expands this incorrectly.
Index: FXApp.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXApp.i,v
retrieving revision 1.38.2.4
retrieving revision 1.38.2.5
diff -C2 -d -r1.38.2.4 -r1.38.2.5
*** FXApp.i 1 May 2002 14:18:06 -0000 1.38.2.4
--- FXApp.i 6 May 2002 19:16:29 -0000 1.38.2.5
***************
*** 145,149 ****
#ifdef SWIGRUBY
! %addmethods {
// Copyright notice for library
static VALUE copyright() {
--- 145,149 ----
#ifdef SWIGRUBY
! %extend {
// Copyright notice for library
static VALUE copyright() {
***************
*** 221,225 ****
FXChore* removeChore(FXChore *c);
! %addmethods {
/**
* Add signal processing message to be sent to target object when
--- 221,225 ----
FXChore* removeChore(FXChore *c);
! %extend {
/**
* Add signal processing message to be sent to target object when
***************
*** 390,394 ****
*/
// virtual void init(int& argc,char** argv,FXbool connect=TRUE);
! %addmethods {
void init(VALUE arr,FXbool connect=TRUE) {
int i;
--- 390,394 ----
*/
// virtual void init(int& argc,char** argv,FXbool connect=TRUE);
! %extend {
void init(VALUE arr,FXbool connect=TRUE) {
int i;
Index: FXColorSelector.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXColorSelector.i,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** FXColorSelector.i 19 Mar 2002 23:18:40 -0000 1.15
--- FXColorSelector.i 6 May 2002 19:16:29 -0000 1.15.2.1
***************
*** 61,65 ****
protected:
#ifdef 0
! %addmethods {
// Returns a read-only array of the names, which isn't quite right :(
static VALUE wellname() {
--- 61,65 ----
protected:
#ifdef 0
! %extend {
// Returns a read-only array of the names, which isn't quite right :(
static VALUE wellname() {
Index: FXComboBox.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXComboBox.i,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -d -r1.23 -r1.23.2.1
*** FXComboBox.i 19 Mar 2002 23:18:40 -0000 1.23
--- FXComboBox.i 6 May 2002 19:16:29 -0000 1.23.2.1
***************
*** 134,138 ****
FXString getItemText(FXint index) const;
! %addmethods {
/// Set data pointer for specified item
void setItemData(FXint index, VALUE ptr) {
--- 134,138 ----
FXString getItemText(FXint index) const;
! %extend {
/// Set data pointer for specified item
void setItemData(FXint index, VALUE ptr) {
Index: FXDC.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDC.i,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -d -r1.21 -r1.21.2.1
*** FXDC.i 3 Apr 2002 21:40:57 -0000 1.21
--- FXDC.i 6 May 2002 19:16:29 -0000 1.21.2.1
***************
*** 204,208 ****
virtual void drawLine(FXint x1,FXint y1,FXint x2,FXint y2);
#ifdef SWIGPYTHON
! %addmethods {
// points is assumed to be a list of (x, y) tuples
void drawLines(PyObject* pointlist){
--- 204,208 ----
virtual void drawLine(FXint x1,FXint y1,FXint x2,FXint y2);
#ifdef SWIGPYTHON
! %extend {
// points is assumed to be a list of (x, y) tuples
void drawLines(PyObject* pointlist){
***************
*** 312,316 ****
virtual void setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength);
! %addmethods {
/// Get dash pattern
VALUE getDashPattern() const {
--- 312,316 ----
virtual void setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength);
! %extend {
/// Get dash pattern
VALUE getDashPattern() const {
Index: FXDebugTarget.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDebugTarget.i,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** FXDebugTarget.i 19 Mar 2002 23:18:40 -0000 1.12
--- FXDebugTarget.i 6 May 2002 19:16:29 -0000 1.12.2.1
***************
*** 35,39 ****
public:
#ifdef SWIGRUBY
! %addmethods {
static VALUE messageTypeName() {
VALUE messageTypeNames = rb_ary_new();
--- 35,39 ----
public:
#ifdef SWIGRUBY
! %extend {
static VALUE messageTypeName() {
VALUE messageTypeNames = rb_ary_new();
Index: FXDial.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDial.i,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** FXDial.i 19 Mar 2002 23:18:40 -0000 1.17
--- FXDial.i 6 May 2002 19:16:29 -0000 1.17.2.1
***************
*** 81,85 ****
#ifdef SWIGRUBY
! %addmethods {
/// Obtain the current range of the dial
VALUE getRange() const {
--- 81,85 ----
#ifdef SWIGRUBY
! %extend {
/// Obtain the current range of the dial
VALUE getRange() const {
***************
*** 94,98 ****
#endif
#ifdef SWIGPYTHON
! %addmethods {
PyObject* getRange() const {
FXint lo,hi;
--- 94,98 ----
#endif
#ifdef SWIGPYTHON
! %extend {
PyObject* getRange() const {
FXint lo,hi;
Index: FXDict.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDict.i,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** FXDict.i 19 Mar 2002 23:18:40 -0000 1.17
--- FXDict.i 6 May 2002 19:16:29 -0000 1.17.2.1
***************
*** 110,114 ****
#ifdef SWIGRUBY
! %addmethods {
// Returns a new array populated with the keys from this hash
VALUE keys() const {
--- 110,114 ----
#ifdef SWIGRUBY
! %extend {
// Returns a new array populated with the keys from this hash
VALUE keys() const {
***************
*** 118,122 ****
}
! %addmethods {
// Returns true if the given key is present
FXbool has_key(const FXchar* ky) {
--- 118,122 ----
}
! %extend {
// Returns true if the given key is present
FXbool has_key(const FXchar* ky) {
***************
*** 125,129 ****
}
! %addmethods {
// Returns true if hash contains no key-value pairs
FXbool empty() const {
--- 125,129 ----
}
! %extend {
// Returns true if hash contains no key-value pairs
FXbool empty() const {
Index: FXFileDialog.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileDialog.i,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -d -r1.16 -r1.16.2.1
*** FXFileDialog.i 19 Mar 2002 23:18:40 -0000 1.16
--- FXFileDialog.i 6 May 2002 19:16:29 -0000 1.16.2.1
***************
*** 43,47 ****
#ifdef SWIGRUBY
! %addmethods {
// Return list of selected file names.
VALUE getFilenames() const {
--- 43,47 ----
#ifdef SWIGRUBY
! %extend {
// Return list of selected file names.
VALUE getFilenames() const {
***************
*** 60,64 ****
}
#else
! %addmethods {
PyObject* getFilenames() const {
FXString* filenames=self->getFilenames();
--- 60,64 ----
}
#else
! %extend {
PyObject* getFilenames() const {
FXString* filenames=self->getFilenames();
***************
*** 104,108 ****
*/
#ifdef SWIGRUBY
! %addmethods {
// Takes an array of strings as described above
void setPatternList(VALUE ary) {
--- 104,108 ----
*/
#ifdef SWIGRUBY
! %extend {
// Takes an array of strings as described above
void setPatternList(VALUE ary) {
***************
*** 189,193 ****
#ifdef SWIGRUBY
! %addmethods {
// Open multiple existing files
static VALUE getOpenFilenames(FXWindow* owner,
--- 189,193 ----
#ifdef SWIGRUBY
! %extend {
// Open multiple existing files
static VALUE getOpenFilenames(FXWindow* owner,
Index: FXFileDict.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileDict.i,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -C2 -d -r1.19 -r1.19.2.1
*** FXFileDict.i 28 Mar 2002 16:32:52 -0000 1.19
--- FXFileDict.i 6 May 2002 19:16:29 -0000 1.19.2.1
***************
*** 45,49 ****
virtual void deleteData(void*);
public:
! %addmethods {
/// Default icon search path
static VALUE defaultIconPath(){
--- 45,49 ----
virtual void deleteData(void*);
public:
! %extend {
/// Default icon search path
static VALUE defaultIconPath(){
***************
*** 55,59 ****
/// Construct an icon dictionary, with given path
! FXIconDict(FXApp* a,const FXString& p=FXIconDict::defaultIconPath);
/// Get application
--- 55,60 ----
/// Construct an icon dictionary, with given path
! // FXIconDict(FXApp* a,const FXString& p=FXIconDict::defaultIconPath);
! FXIconDict(FXApp* a,const FXString& p=defaultIconPath);
/// Get application
***************
*** 84,88 ****
public:
// Construct an icon dictionary, with given path
! FXRbIconDict(FXApp* a,const FXString& p=FXIconDict::defaultIconPath);
// Destructor
--- 85,90 ----
public:
// Construct an icon dictionary, with given path
! // FXRbIconDict(FXApp* a,const FXString& p=FXIconDict::defaultIconPath);
! FXRbIconDict(FXApp* a,const FXString& p=defaultIconPath);
// Destructor
***************
*** 106,110 ****
public:
#ifdef SWIGRUBY
! %addmethods {
/// Registry key used to find fallback executable icons
static VALUE defaultExecBinding(){
--- 108,112 ----
public:
#ifdef SWIGRUBY
! %extend {
/// Registry key used to find fallback executable icons
static VALUE defaultExecBinding(){
Index: FXFileSelector.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileSelector.i,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -C2 -d -r1.19 -r1.19.2.1
*** FXFileSelector.i 19 Mar 2002 23:18:40 -0000 1.19
--- FXFileSelector.i 6 May 2002 19:16:29 -0000 1.19.2.1
***************
*** 131,135 ****
#ifdef SWIGRUBY
! %addmethods {
// Return list of selected file names.
VALUE getFilenames() const {
--- 131,135 ----
#ifdef SWIGRUBY
! %extend {
// Return list of selected file names.
VALUE getFilenames() const {
***************
*** 149,153 ****
#endif
#ifdef SWIGPYTHON
! %addmethods {
PyObject* getFilenames() const {
FXString* filenames=self->getFilenames();
--- 149,153 ----
#endif
#ifdef SWIGPYTHON
! %extend {
PyObject* getFilenames() const {
FXString* filenames=self->getFilenames();
***************
*** 193,197 ****
*/
#ifdef SWIGRUBY
! %addmethods {
// Takes an array of strings as described above
void setPatternList(VALUE ary) {
--- 193,197 ----
*/
#ifdef SWIGRUBY
! %extend {
// Takes an array of strings as described above
void setPatternList(VALUE ary) {
Index: FXFont.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFont.i,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** FXFont.i 19 Mar 2002 23:18:40 -0000 1.15
--- FXFont.i 6 May 2002 19:16:29 -0000 1.15.2.1
***************
*** 207,211 ****
FXuint getHints() const;
! %addmethods {
// Get font description
FXFontDesc getFontDesc() const {
--- 207,211 ----
FXuint getHints() const;
! %extend {
// Get font description
FXFontDesc getFontDesc() const {
***************
*** 255,259 ****
FXint getFontSpacing() const;
! %addmethods {
// Calculate width of given text in this font
FXint getTextWidth(const FXchar *text) const {
--- 255,259 ----
FXint getFontSpacing() const;
! %extend {
// Calculate width of given text in this font
FXint getTextWidth(const FXchar *text) const {
***************
*** 269,273 ****
#ifdef SWIGRUBY
! %addmethods {
// List all fonts matching hints (returns an array of FXFontDesc objects)
static FXbool listFonts(const FXString& face,
--- 269,273 ----
#ifdef SWIGRUBY
! %extend {
// List all fonts matching hints (returns an array of FXFontDesc objects)
static FXbool listFonts(const FXString& face,
Index: FXFontDialog.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFontDialog.i,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** FXFontDialog.i 19 Mar 2002 23:18:40 -0000 1.12
--- FXFontDialog.i 6 May 2002 19:16:29 -0000 1.12.2.1
***************
*** 39,43 ****
#ifdef SWIGRUBY
! %addmethods {
/// Get the current font selection
FXFontDesc getFontSelection() const {
--- 39,43 ----
#ifdef SWIGRUBY
! %extend {
/// Get the current font selection
FXFontDesc getFontSelection() const {
***************
*** 48,52 ****
}
#else
! %addmethods {
%new FXFontDesc* getFontSelection() const {
FXFontDesc* fontdesc = new FXFontDesc;
--- 48,52 ----
}
#else
! %extend {
%new FXFontDesc* getFontSelection() const {
FXFontDesc* fontdesc = new FXFontDesc;
Index: FXFontSelector.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFontSelector.i,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** FXFontSelector.i 19 Mar 2002 23:18:40 -0000 1.12
--- FXFontSelector.i 6 May 2002 19:16:29 -0000 1.12.2.1
***************
*** 106,110 ****
#ifdef SWIGRUBY
! %addmethods {
/// Get font selection
FXFontDesc getFontSelection() const {
--- 106,110 ----
#ifdef SWIGRUBY
! %extend {
/// Get font selection
FXFontDesc getFontSelection() const {
***************
*** 115,119 ****
}
#else
! %addmethods {
%new FXFontDesc* getFontSelection() const {
FXFontDesc* fontdesc = new FXFontDesc;
--- 115,119 ----
}
#else
! %extend {
%new FXFontDesc* getFontSelection() const {
FXFontDesc* fontdesc = new FXFontDesc;
Index: FXGLObject.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLObject.i,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -d -r1.23 -r1.23.2.1
*** FXGLObject.i 2 Apr 2002 03:44:27 -0000 1.23
--- FXGLObject.i 6 May 2002 19:16:29 -0000 1.23.2.1
***************
*** 43,47 ****
#ifdef SWIGRUBY
/// Called by the viewer to get bounds for this object
! %addmethods {
FXRange bounds() {
FXRange box;
--- 43,47 ----
#ifdef SWIGRUBY
/// Called by the viewer to get bounds for this object
! %extend {
FXRange bounds() {
FXRange box;
***************
*** 51,55 ****
}
#else
! %addmethods {
// Called by the viewer to get bounds for this object
FXRange* bounds(FXRange& box) {
--- 51,55 ----
}
#else
! %extend {
// Called by the viewer to get bounds for this object
FXRange* bounds(FXRange& box) {
***************
*** 131,135 ****
FXGLObject* child(FXint pos) const;
! %addmethods {
/// Insert child object at given position
void insert(FXint pos,FXGLObject* obj){
--- 131,135 ----
FXGLObject* child(FXint pos) const;
! %extend {
/// Insert child object at given position
void insert(FXint pos,FXGLObject* obj){
Index: FXGLShape.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLShape.i,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** FXGLShape.i 2 Apr 2002 03:44:27 -0000 1.17
--- FXGLShape.i 6 May 2002 19:16:29 -0000 1.17.2.1
***************
*** 107,111 ****
#ifdef SWIGRUBY
! %addmethods {
// Get the material for specified side (where side = 0 or 1)
FXMaterial getMaterial(FXint side) const {
--- 107,111 ----
#ifdef SWIGRUBY
! %extend {
// Get the material for specified side (where side = 0 or 1)
FXMaterial getMaterial(FXint side) const {
***************
*** 116,120 ****
}
#else
! %addmethods {
%new FXMaterial* getMaterial(FXint side) const {
FXMaterial *mtl = new FXMaterial;
--- 116,120 ----
}
#else
! %extend {
%new FXMaterial* getMaterial(FXint side) const {
FXMaterial *mtl = new FXMaterial;
Index: FXGLViewer.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLViewer.i,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -d -r1.25 -r1.25.2.1
*** FXGLViewer.i 19 Mar 2002 23:18:40 -0000 1.25
--- FXGLViewer.i 6 May 2002 19:16:29 -0000 1.25.2.1
***************
*** 328,332 ****
// Common DND type names
! %addmethods {
static VALUE objectTypeName(){
return to_ruby(FXGLViewer::objectTypeName);
--- 328,332 ----
// Common DND type names
! %extend {
static VALUE objectTypeName(){
return to_ruby(FXGLViewer::objectTypeName);
***************
*** 349,353 ****
#ifdef SWIGRUBY
! %addmethods {
// Return a list of all objects in the given rectangle
VALUE lasso(FXint x1,FXint y1,FXint x2,FXint y2) {
--- 349,353 ----
#ifdef SWIGRUBY
! %extend {
// Return a list of all objects in the given rectangle
VALUE lasso(FXint x1,FXint y1,FXint x2,FXint y2) {
***************
*** 366,370 ****
}
#else
! %addmethods {
PyObject* lasso(FXint x1,FXint y1,FXint x2,FXint y2) {
FXGLObject **items = self->lasso(x1,y1,x2,y2);
--- 366,370 ----
}
#else
! %extend {
PyObject* lasso(FXint x1,FXint y1,FXint x2,FXint y2) {
FXGLObject **items = self->lasso(x1,y1,x2,y2);
***************
*** 436,440 ****
#ifdef SWIGRUBY
! %addmethods {
// Return a list of all objects in the given rectangle
VALUE select(FXint x,FXint y,FXint w,FXint h) {
--- 436,440 ----
#ifdef SWIGRUBY
! %extend {
// Return a list of all objects in the given rectangle
VALUE select(FXint x,FXint y,FXint w,FXint h) {
***************
*** 465,469 ****
#ifdef SWIGRUBY
! %addmethods {
/// Return the viewer's viewport
FXViewport getViewport() const {
--- 465,469 ----
#ifdef SWIGRUBY
! %extend {
/// Return the viewer's viewport
FXViewport getViewport() const {
***************
*** 485,489 ****
#else
! %addmethods {
// void getViewport(FXViewport& v) const;
%new FXViewport* getViewport() const {
--- 485,489 ----
#else
! %extend {
// void getViewport(FXViewport& v) const;
%new FXViewport* getViewport() const {
***************
*** 541,545 ****
#ifdef SWIGRUBY
! %addmethods {
/// Return default object material setting
FXMaterial getMaterial() const {
--- 541,545 ----
#ifdef SWIGRUBY
! %extend {
/// Return default object material setting
FXMaterial getMaterial() const {
***************
*** 550,554 ****
}
#else
! %addmethods {
/// Return default object material setting
%new FXMaterial* getMaterial() const {
--- 550,554 ----
}
#else
! %extend {
/// Return default object material setting
%new FXMaterial* getMaterial() const {
***************
*** 600,604 ****
#ifdef SWIGRUBY
! %addmethods {
/// Return boresight vector (an array of two arrays)
VALUE getBoreVector(FXint sx,FXint sy) {
--- 600,604 ----
#ifdef SWIGRUBY
! %extend {
/// Return boresight vector (an array of two arrays)
VALUE getBoreVector(FXint sx,FXint sy) {
***************
*** 624,628 ****
}
#else
! %addmethods {
/// Return boresight vector (a tuple of two lists)
PyObject* getBoreVector(FXint sx,FXint sy) {
--- 624,628 ----
}
#else
! %extend {
/// Return boresight vector (a tuple of two lists)
PyObject* getBoreVector(FXint sx,FXint sy) {
***************
*** 751,755 ****
#ifdef SWIGRUBY
! %addmethods {
// Read the pixels off the screen as R,G,B tuples.
VALUE readPixels(FXint x, FXint y, FXint w, FXint h) {
--- 751,755 ----
#ifdef SWIGRUBY
! %extend {
// Read the pixels off the screen as R,G,B tuples.
VALUE readPixels(FXint x, FXint y, FXint w, FXint h) {
***************
*** 782,786 ****
}
#else
! %addmethods {
PyObject *readPixels(FXint x,FXint y,FXint w,FXint h) {
FXuchar *buffer;
--- 782,786 ----
}
#else
! %extend {
PyObject *readPixels(FXint x,FXint y,FXint w,FXint h) {
FXuchar *buffer;
***************
*** 851,855 ****
* This can be used for move/draw printed output depth sorting.
*/
! %addmethods {
void setZSortFunc(VALUE proc){
}
--- 851,855 ----
* This can be used for move/draw printed output depth sorting.
*/
! %extend {
void setZSortFunc(VALUE proc){
}
***************
*** 859,863 ****
#ifdef SWIGRUBY
/// Return hidden surface sorting function.
! %addmethods {
VALUE getZSortFunc() const {
return Qnil;
--- 859,863 ----
#ifdef SWIGRUBY
/// Return hidden surface sorting function.
! %extend {
VALUE getZSortFunc() const {
return Qnil;
***************
*** 890,894 ****
#ifdef SWIGRUBY
! %addmethods {
// Return light source settings
FXLight getLight() const {
--- 890,894 ----
#ifdef SWIGRUBY
! %extend {
// Return light source settings
FXLight getLight() const {
***************
*** 899,903 ****
}
#else
! %addmethods {
// Return light source settings
%new FXLight* getLight() const {
--- 899,903 ----
}
#else
! %extend {
// Return light source settings
%new FXLight* getLight() const {
Index: FXHMat.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHMat.i,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** FXHMat.i 19 Mar 2002 23:18:40 -0000 1.9
--- FXHMat.i 6 May 2002 19:16:29 -0000 1.9.2.1
***************
*** 62,66 ****
// Operators
! %addmethods {
// Add matrices
FXHMat __add__(const FXHMat& other) {
--- 62,66 ----
// Operators
! %extend {
// Add matrices
FXHMat __add__(const FXHMat& other) {
Index: FXHVec.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHVec.i,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** FXHVec.i 19 Mar 2002 23:18:40 -0000 1.6
--- FXHVec.i 6 May 2002 19:16:29 -0000 1.6.2.1
***************
*** 46,50 ****
// Other good stuff
! %addmethods {
FXfloat __getitem__(FXint i){
if(i<0||i>3){
--- 46,50 ----
// Other good stuff
! %extend {
FXfloat __getitem__(FXint i){
if(i<0||i>3){
Index: FXHeader.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHeader.i,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C2 -d -r1.30 -r1.30.2.1
*** FXHeader.i 2 Apr 2002 03:44:27 -0000 1.30
--- FXHeader.i 6 May 2002 19:16:29 -0000 1.30.2.1
***************
*** 67,71 ****
#ifdef SWIGRUBY
! %addmethods {
/// Change item's user data
void setData(VALUE ptr) {
--- 67,71 ----
#ifdef SWIGRUBY
! %extend {
/// Change item's user data
void setData(VALUE ptr) {
***************
*** 80,84 ****
#endif
#ifdef SWIGPYTHON
! %addmethods {
void setData(PyObject* ptr) {
FXPySetData(self, ptr);
--- 80,84 ----
#endif
#ifdef SWIGPYTHON
! %extend {
void setData(PyObject* ptr) {
FXPySetData(self, ptr);
***************
*** 188,192 ****
#ifdef SWIGRUBY
! %addmethods {
/// Replace the item with a [possibly subclassed] item
FXint replaceItem1(FXint index,FXHeaderItem* item,FXbool notify=FALSE){
--- 188,192 ----
#ifdef SWIGRUBY
! %extend {
/// Replace the item with a [possibly subclassed] item
FXint replaceItem1(FXint index,FXHeaderItem* item,FXbool notify=FALSE){
***************
*** 223,227 ****
! %addmethods {
/// Insert a new [possibly subclassed] item at the given index
FXint insertItem1(FXint index,FXHeaderItem* item,FXbool notify=FALSE){
--- 223,227 ----
! %extend {
/// Insert a new [possibly subclassed] item at the given index
FXint insertItem1(FXint index,FXHeaderItem* item,FXbool notify=FALSE){
***************
*** 235,239 ****
%name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Append a [possibly subclassed] item to the list
FXint appendItem1(FXHeaderItem* item,FXbool notify=FALSE){
--- 235,239 ----
%name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Append a [possibly subclassed] item to the list
FXint appendItem1(FXHeaderItem* item,FXbool notify=FALSE){
***************
*** 247,251 ****
%name(appendItem2) FXint appendItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Prepend a [possibly subclassed] item to the list
FXint prependItem1(FXHeaderItem* item,FXbool notify=FALSE){
--- 247,251 ----
%name(appendItem2) FXint appendItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Prepend a [possibly subclassed] item to the list
FXint prependItem1(FXHeaderItem* item,FXbool notify=FALSE){
***************
*** 286,290 ****
#endif
! %addmethods {
/// Remove item at index
void removeItem(FXint index,FXbool notify=FALSE){
--- 286,290 ----
#endif
! %extend {
/// Remove item at index
void removeItem(FXint index,FXbool notify=FALSE){
***************
*** 348,352 ****
#ifdef SWIGRUBY
! %addmethods {
/// Change data of item at index
void setItemData(FXint index, VALUE ptr){
--- 348,352 ----
#ifdef SWIGRUBY
! %extend {
/// Change data of item at index
void setItemData(FXint index, VALUE ptr){
Index: FXIconList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXIconList.i,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -C2 -d -r1.34 -r1.34.2.1
*** FXIconList.i 2 Apr 2002 03:44:27 -0000 1.34
--- FXIconList.i 6 May 2002 19:16:29 -0000 1.34.2.1
***************
*** 83,87 ****
FXIcon* getMiniIcon() const;
! %addmethods {
void setData(VALUE ptr){
self->setData((void*) ptr);
--- 83,87 ----
FXIcon* getMiniIcon() const;
! %extend {
void setData(VALUE ptr){
self->setData((void*) ptr);
***************
*** 279,283 ****
FXIconItem *retrieveItem(FXint index) const;
! %addmethods {
/// Replace the item with a [possibly subclassed] item
FXint replaceItem1(FXint index,FXIconItem* item,FXbool notify=FALSE){
--- 279,283 ----
FXIconItem *retrieveItem(FXint index) const;
! %extend {
/// Replace the item with a [possibly subclassed] item
FXint replaceItem1(FXint index,FXIconItem* item,FXbool notify=FALSE){
***************
*** 314,318 ****
! %addmethods {
/// Insert a new [possibly subclassed] item at the give index
FXint insertItem1(FXint index,FXIconItem* item,FXbool notify=FALSE){
--- 314,318 ----
! %extend {
/// Insert a new [possibly subclassed] item at the give index
FXint insertItem1(FXint index,FXIconItem* item,FXbool notify=FALSE){
***************
*** 326,330 ****
%name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Append a [possibly subclassed] item to the end of the list
FXint appendItem1(FXIconItem* item,FXbool notify=FALSE){
--- 326,330 ----
%name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Append a [possibly subclassed] item to the end of the list
FXint appendItem1(FXIconItem* item,FXbool notify=FALSE){
***************
*** 338,342 ****
%name(appendItem2) FXint appendItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Append a [possibly subclassed] item to the end of the list
FXint prependItem1(FXIconItem* item,FXbool notify=FALSE){
--- 338,342 ----
%name(appendItem2) FXint appendItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Append a [possibly subclassed] item to the end of the list
FXint prependItem1(FXIconItem* item,FXbool notify=FALSE){
***************
*** 350,354 ****
%name(prependItem2) FXint prependItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Remove item from list
void removeItem(FXint index,FXbool notify=FALSE){
--- 350,354 ----
%name(prependItem2) FXint prependItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Remove item from list
void removeItem(FXint index,FXbool notify=FALSE){
***************
*** 423,427 ****
FXIcon* getItemMiniIcon(FXint index) const;
! %addmethods {
/// Change item user-data pointer
void setItemData(FXint index, VALUE ptr){
--- 423,427 ----
FXIcon* getItemMiniIcon(FXint index) const;
! %extend {
/// Change item user-data pointer
void setItemData(FXint index, VALUE ptr){
Index: FXId.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXId.i,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** FXId.i 19 Mar 2002 23:18:40 -0000 1.13
--- FXId.i 6 May 2002 19:16:29 -0000 1.13.2.1
***************
*** 51,55 ****
virtual void destroy();
! %addmethods {
/// Set user data pointer
void setUserData(VALUE ptr){
--- 51,55 ----
virtual void destroy();
! %extend {
/// Set user data pointer
void setUserData(VALUE ptr){
Index: FXImage.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXImage.i,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** FXImage.i 19 Mar 2002 23:18:40 -0000 1.15
--- FXImage.i 6 May 2002 19:16:29 -0000 1.15.2.1
***************
*** 73,77 ****
/// To get to the pixel data
! %addmethods {
VALUE getData() const {
FXuchar* data=self->getData();
--- 73,77 ----
/// To get to the pixel data
! %extend {
VALUE getData() const {
FXuchar* data=self->getData();
Index: FXInputDialog.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXInputDialog.i,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** FXInputDialog.i 19 Mar 2002 23:18:40 -0000 1.17
--- FXInputDialog.i 6 May 2002 19:16:29 -0000 1.17.2.1
***************
*** 72,76 ****
#ifdef SWIGRUBY
! %addmethods {
// Return limits
VALUE getLimits() {
--- 72,76 ----
#ifdef SWIGRUBY
! %extend {
// Return limits
VALUE getLimits() {
***************
*** 84,88 ****
}
#else
! %addmethods {
PyObject* getLimits() const {
FXdouble lo,hi;
--- 84,88 ----
}
#else
! %extend {
PyObject* getLimits() const {
FXdouble lo,hi;
***************
*** 105,109 ****
* Return TRUE if the new value is accepted, and false otherwise.
*/
! %addmethods {
static VALUE getString(const FXString& initial,FXWindow* owner,const FXString& caption,const FXString& label,FXIcon* ic=NULL){
FXString result(initial);
--- 105,109 ----
* Return TRUE if the new value is accepted, and false otherwise.
*/
! %extend {
static VALUE getString(const FXString& initial,FXWindow* owner,const FXString& caption,const FXString& label,FXIcon* ic=NULL){
FXString result(initial);
***************
*** 123,127 ****
* case the input can be any number.
*/
! %addmethods {
static VALUE getInteger(FXint initial,FXWindow* owner,const FXString& caption,const FXString& label,FXIcon* ic=NULL,FXint lo=1,FXint hi=0){
FXint result=initial;
--- 123,127 ----
* case the input can be any number.
*/
! %extend {
static VALUE getInteger(FXint initial,FXWindow* owner,const FXString& caption,const FXString& label,FXIcon* ic=NULL,FXint lo=1,FXint hi=0){
FXint result=initial;
***************
*** 141,145 ****
* case the input can be any number.
*/
! %addmethods {
static VALUE getReal(FXdouble initial,FXWindow* owner,const FXString& caption,const FXString& label,FXIcon* ic=NULL,FXdouble lo=1.0,FXdouble hi=0.0){
FXdouble result=initial;
--- 141,145 ----
* case the input can be any number.
*/
! %extend {
static VALUE getReal(FXdouble initial,FXWindow* owner,const FXString& caption,const FXString& label,FXIcon* ic=NULL,FXdouble lo=1.0,FXdouble hi=0.0){
FXdouble result=initial;
Index: FXList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXList.i,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -C2 -d -r1.36 -r1.36.2.1
*** FXList.i 2 Apr 2002 03:44:27 -0000 1.36
--- FXList.i 6 May 2002 19:16:29 -0000 1.36.2.1
***************
*** 67,71 ****
#ifdef SWIGRUBY
! %addmethods {
void setData(VALUE ptr){
self->setData((void*) ptr);
--- 67,71 ----
#ifdef SWIGRUBY
! %extend {
void setData(VALUE ptr){
self->setData((void*) ptr);
***************
*** 79,83 ****
#ifdef SWIGPYTHON
! %addmethods {
void setData(PyObject* ptr) {
FXPySetData(self, ptr);
--- 79,83 ----
#ifdef SWIGPYTHON
! %extend {
void setData(PyObject* ptr) {
FXPySetData(self, ptr);
***************
*** 214,218 ****
#ifdef SWIGRUBY
! %addmethods {
/// Replace the item with a [possibly subclassed] item
FXint replaceItem1(FXint index,FXListItem* item,FXbool notify=FALSE){
--- 214,218 ----
#ifdef SWIGRUBY
! %extend {
/// Replace the item with a [possibly subclassed] item
FXint replaceItem1(FXint index,FXListItem* item,FXbool notify=FALSE){
***************
*** 248,252 ****
}
! %addmethods {
/// Insert a new [possibly subclassed] item at the give index
FXint insertItem1(FXint index,FXListItem* item,FXbool notify=FALSE){
--- 248,252 ----
}
! %extend {
/// Insert a new [possibly subclassed] item at the give index
FXint insertItem1(FXint index,FXListItem* item,FXbool notify=FALSE){
***************
*** 260,264 ****
%name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Append a [possibly subclassed] item to the list
FXint appendItem1(FXListItem* item,FXbool notify=FALSE){
--- 260,264 ----
%name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Append a [possibly subclassed] item to the list
FXint appendItem1(FXListItem* item,FXbool notify=FALSE){
***************
*** 272,276 ****
%name(appendItem2) FXint appendItem(const FXString& text,FXIcon *icon=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Prepend a [possibly subclassed] item to the list
FXint prependItem1(FXListItem* item,FXbool notify=FALSE){
--- 272,276 ----
%name(appendItem2) FXint appendItem(const FXString& text,FXIcon *icon=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Prepend a [possibly subclassed] item to the list
FXint prependItem1(FXListItem* item,FXbool notify=FALSE){
***************
*** 299,303 ****
#endif
! %addmethods {
/// Remove item from list
void removeItem(FXint index,FXbool notify=FALSE){
--- 299,303 ----
#endif
! %extend {
/// Remove item from list
void removeItem(FXint index,FXbool notify=FALSE){
***************
*** 370,374 ****
#ifdef SWIGRUBY
! %addmethods {
/// Change item user-data pointer
void setItemData(FXint index, VALUE ptr){
--- 370,374 ----
#ifdef SWIGRUBY
! %extend {
/// Change item user-data pointer
void setItemData(FXint index, VALUE ptr){
Index: FXListBox.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXListBox.i,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -d -r1.23 -r1.23.2.1
*** FXListBox.i 19 Mar 2002 23:18:40 -0000 1.23
--- FXListBox.i 6 May 2002 19:16:29 -0000 1.23.2.1
***************
*** 122,126 ****
#ifdef SWIGRUBY
! %addmethods {
/// Set data pointer for specified item
void setItemData(FXint index,VALUE ptr) {
--- 122,126 ----
#ifdef SWIGRUBY
! %extend {
/// Set data pointer for specified item
void setItemData(FXint index,VALUE ptr) {
Index: FXPrintDialog.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXPrintDialog.i,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -d -r1.14 -r1.14.2.1
*** FXPrintDialog.i 19 Mar 2002 23:18:40 -0000 1.14
--- FXPrintDialog.i 6 May 2002 19:16:29 -0000 1.14.2.1
***************
*** 130,134 ****
#ifdef SWIGRUBY
! %addmethods {
// Returns information about the selected printer
FXPrinter getPrinter() {
--- 130,134 ----
#ifdef SWIGRUBY
! %extend {
// Returns information about the selected printer
FXPrinter getPrinter() {
***************
*** 139,143 ****
}
#else
! %addmethods {
/// Get printer info
%new FXPrinter* getPrinter() const {
--- 139,143 ----
}
#else
! %extend {
/// Get printer info
%new FXPrinter* getPrinter() const {
Index: FXQuat.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXQuat.i,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** FXQuat.i 19 Mar 2002 23:18:40 -0000 1.9
--- FXQuat.i 6 May 2002 19:16:29 -0000 1.9.2.1
***************
*** 49,53 ****
void setRollPitchYaw(FXfloat roll,FXfloat pitch,FXfloat yaw);
! %addmethods {
#ifdef SWIGRUBY
// Obtain yaw, pitch, and roll
--- 49,53 ----
void setRollPitchYaw(FXfloat roll,FXfloat pitch,FXfloat yaw);
! %extend {
#ifdef SWIGRUBY
// Obtain yaw, pitch, and roll
Index: FXRange.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXRange.i,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** FXRange.i 19 Mar 2002 23:18:40 -0000 1.11
--- FXRange.i 6 May 2002 19:16:29 -0000 1.11.2.1
***************
*** 41,45 ****
FXRangeSlice(FXRange& r,FXint s);
! %addmethods {
FXfloat __getitem__(FXint i) const {
return (*self)[i];
--- 41,45 ----
FXRangeSlice(FXRange& r,FXint s);
! %extend {
FXfloat __getitem__(FXint i) const {
return (*self)[i];
***************
*** 89,93 ****
FXbool contains(FXfloat x,FXfloat y,FXfloat z) const;
! %addmethods {
FXRangeSlice __getitem__(FXint i){
return FXRangeSlice(*self,i);
--- 89,93 ----
FXbool contains(FXfloat x,FXfloat y,FXfloat z) const;
! %extend {
FXRangeSlice __getitem__(FXint i){
return FXRangeSlice(*self,i);
***************
*** 116,120 ****
FXRange& clipTo(const FXRange& box);
! %addmethods {
#ifdef SWIGRUBY
/// Get corners of box
--- 116,120 ----
FXRange& clipTo(const FXRange& box);
! %extend {
#ifdef SWIGRUBY
/// Get corners of box
Index: FXRegion.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXRegion.i,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** FXRegion.i 19 Mar 2002 23:18:40 -0000 1.6
--- FXRegion.i 6 May 2002 19:16:29 -0000 1.6.2.1
***************
*** 54,58 ****
FXbool contains(FXint x,FXint y,FXint w,FXint h) const;
! %addmethods {
// Return bounding box
FXRectangle bounds() const {
--- 54,58 ----
FXbool contains(FXint x,FXint y,FXint w,FXint h) const;
! %extend {
// Return bounding box
FXRectangle bounds() const {
***************
*** 66,70 ****
FXRegion& offset(FXint dx,FXint dy);
! %addmethods {
/// Union region r with this one
FXRegion __add__(const FXRegion& other) {
--- 66,70 ----
FXRegion& offset(FXint dx,FXint dy);
! %extend {
/// Union region r with this one
FXRegion __add__(const FXRegion& other) {
***************
*** 94,98 ****
#ifdef SWIGPYTHON
! %addmethods {
FXbool __ne__(const FXRegion& other) {
return (*self) != other;
--- 94,98 ----
#ifdef SWIGPYTHON
! %extend {
FXbool __ne__(const FXRegion& other) {
return (*self) != other;
Index: FXScintilla.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXScintilla.i,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -C2 -d -r1.9.2.2 -r1.9.2.3
*** FXScintilla.i 24 Apr 2002 03:04:43 -0000 1.9.2.2
--- FXScintilla.i 6 May 2002 19:16:29 -0000 1.9.2.3
***************
*** 37,41 ****
int modifiers; // SCN_KEY
int modificationType; // SCN_MODIFIED
! %addmethods {
// Need to be careful about when this field's value is actually defined
VALUE text() const {
--- 37,41 ----
int modifiers; // SCN_KEY
int modificationType; // SCN_MODIFIED
! %extend {
// Need to be careful about when this field's value is actually defined
VALUE text() const {
***************
*** 61,65 ****
int y; // SCN_DWELLSTART, SCN_DWELLEND
%mutable;
! %addmethods {
VALUE wParam() const {
return INT2NUM(self->wParam);
--- 61,65 ----
int y; // SCN_DWELLSTART, SCN_DWELLEND
%mutable;
! %extend {
VALUE wParam() const {
return INT2NUM(self->wParam);
***************
*** 110,114 ****
void setScintillaID(int id);
! %addmethods {
VALUE sendMessage(unsigned int iMsg, VALUE wParam = Qnil, VALUE lParam = Qnil){
// Convert wParam argument
--- 110,114 ----
void setScintillaID(int id);
! %extend {
VALUE sendMessage(unsigned int iMsg, VALUE wParam = Qnil, VALUE lParam = Qnil){
// Convert wParam argument
Index: FXScrollArea.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXScrollArea.i,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** FXScrollArea.i 19 Mar 2002 23:18:40 -0000 1.17
--- FXScrollArea.i 6 May 2002 19:16:29 -0000 1.17.2.1
***************
*** 120,124 ****
#ifdef SWIGRUBY
/// Get the current position
! %addmethods {
VALUE getPosition() const {
FXint x, y;
--- 120,124 ----
#ifdef SWIGRUBY
/// Get the current position
! %extend {
VALUE getPosition() const {
FXint x, y;
***************
*** 132,136 ****
#endif
#ifdef SWIGPYTHON
! %addmethods {
PyObject* getPosition() const {
FXint x, y;
--- 132,136 ----
#endif
#ifdef SWIGPYTHON
! %extend {
PyObject* getPosition() const {
FXint x, y;
Index: FXSlider.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXSlider.i,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C2 -d -r1.18 -r1.18.2.1
*** FXSlider.i 19 Mar 2002 23:18:40 -0000 1.18
--- FXSlider.i 6 May 2002 19:16:29 -0000 1.18.2.1
***************
*** 104,108 ****
#ifdef SWIGRUBY
! %addmethods {
/// Get the slider's current range
VALUE getRange() const {
--- 104,108 ----
#ifdef SWIGRUBY
! %extend {
/// Get the slider's current range
VALUE getRange() const {
***************
*** 117,121 ****
#endif
#ifdef SWIGPYTHON
! %addmethods {
PyObject* getRange() const {
FXint lo,hi;
--- 117,121 ----
#endif
#ifdef SWIGPYTHON
! %extend {
PyObject* getRange() const {
FXint lo,hi;
Index: FXSpinner.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXSpinner.i,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C2 -d -r1.20 -r1.20.2.1
*** FXSpinner.i 19 Mar 2002 23:18:40 -0000 1.20
--- FXSpinner.i 6 May 2002 19:16:29 -0000 1.20.2.1
***************
*** 103,107 ****
#ifdef SWIGRUBY
! %addmethods {
/// Get the spinner's current range
VALUE getRange() const {
--- 103,107 ----
#ifdef SWIGRUBY
! %extend {
/// Get the spinner's current range
VALUE getRange() const {
***************
*** 116,120 ****
#endif
#ifdef SWIGPYTHON
! %addmethods {
PyObject* getRange() const {
FXint lo,hi;
--- 116,120 ----
#endif
#ifdef SWIGPYTHON
! %extend {
PyObject* getRange() const {
FXint lo,hi;
Index: FXStatusline.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXStatusline.i,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** FXStatusline.i 19 Mar 2002 23:18:40 -0000 1.17
--- FXStatusline.i 6 May 2002 19:16:29 -0000 1.17.2.1
***************
*** 47,51 ****
FXStatusline();
#ifdef 0
! %addmethods {
static VALUE defaultMessage(){
return to_ruby(FXStatusline::defaultMessage);
--- 47,51 ----
FXStatusline();
#ifdef 0
! %extend {
static VALUE defaultMessage(){
return to_ruby(FXStatusline::defaultMessage);
Index: FXStream.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXStream.i,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -d -r1.10.2.1 -r1.10.2.2
*** FXStream.i 25 Apr 2002 16:48:34 -0000 1.10.2.1
--- FXStream.i 6 May 2002 19:16:29 -0000 1.10.2.2
***************
*** 193,197 ****
#ifdef SWIGRUBY
! %addmethods {
// Take buffer away from stream
VALUE takeBuffer() {
--- 193,197 ----
#ifdef SWIGRUBY
! %extend {
// Take buffer away from stream
VALUE takeBuffer() {
Index: FXTable.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTable.i,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -C2 -d -r1.28 -r1.28.2.1
*** FXTable.i 2 Apr 2002 03:44:27 -0000 1.28
--- FXTable.i 6 May 2002 19:16:29 -0000 1.28.2.1
***************
*** 101,105 ****
virtual void setIcon(FXIcon* icn);
FXIcon* getIcon() const;
! %addmethods {
void setData(VALUE ptr){
self->setData((void*) ptr);
--- 101,105 ----
virtual void setIcon(FXIcon* icn);
FXIcon* getIcon() const;
! %extend {
void setData(VALUE ptr){
self->setData((void*) ptr);
***************
*** 358,362 ****
void showVertGrid(FXbool on=TRUE);
! %addmethods {
/// Resize the table content to nr rows and nc columns
void setTableSize(FXint nr,FXint nc,FXbool notify=FALSE){
--- 358,362 ----
void showVertGrid(FXbool on=TRUE);
! %extend {
/// Resize the table content to nr rows and nc columns
void setTableSize(FXint nr,FXint nc,FXbool notify=FALSE){
***************
*** 428,432 ****
virtual void insertColumns(FXint col,FXint nc=1,FXbool notify=FALSE);
! %addmethods {
/// Remove row(s) of cells
virtual void removeRows(FXint row,FXint nr=1,FXbool notify=FALSE){
--- 428,432 ----
virtual void insertColumns(FXint col,FXint nc=1,FXbool notify=FALSE);
! %extend {
/// Remove row(s) of cells
virtual void removeRows(FXint row,FXint nr=1,FXbool notify=FALSE){
***************
*** 515,519 ****
FXIcon* getItemIcon(FXint r,FXint c) const;
! %addmethods {
/// Modify cell user-data
void setItemData(FXint r,FXint c,VALUE ptr){
--- 515,519 ----
FXIcon* getItemIcon(FXint r,FXint c) const;
! %extend {
/// Modify cell user-data
void setItemData(FXint r,FXint c,VALUE ptr){
Index: FXText.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXText.i,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -C2 -d -r1.29 -r1.29.2.1
*** FXText.i 19 Mar 2002 23:18:40 -0000 1.29
--- FXText.i 6 May 2002 19:16:29 -0000 1.29.2.1
***************
*** 436,440 ****
FXbool isStyled() const;
! %addmethods {
/// Change delimiters of words
void setDelimiters(const FXString& delims){
--- 436,440 ----
FXbool isStyled() const;
! %extend {
/// Change delimiters of words
void setDelimiters(const FXString& delims){
***************
*** 529,533 ****
#ifdef SWIGRUBY
! %addmethods {
// Extract n characters of text from position pos
VALUE extractText(FXint pos,FXint n) const {
--- 529,533 ----
#ifdef SWIGRUBY
! %extend {
// Extract n characters of text from position pos
VALUE extractText(FXint pos,FXint n) const {
***************
*** 549,553 ****
#endif
! %addmethods {
/// Replace m characters at pos by n characters
void replaceText(FXint pos,FXint m,const FXString& text,FXbool notify=FALSE){
--- 549,553 ----
#endif
! %extend {
/// Replace m characters at pos by n characters
void replaceText(FXint pos,FXint m,const FXString& text,FXbool notify=FALSE){
***************
*** 584,588 ****
void removeText(FXint pos,FXint n,FXbool notify=FALSE);
! %addmethods {
/// Change style of text range (overloaded)
void changeStyle(FXint pos,FXint n,VALUE vStyle){
--- 584,588 ----
void removeText(FXint pos,FXint n,FXbool notify=FALSE);
! %extend {
/// Change style of text range (overloaded)
void changeStyle(FXint pos,FXint n,VALUE vStyle){
Index: FXTreeList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTreeList.i,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -C2 -d -r1.33 -r1.33.2.1
*** FXTreeList.i 2 Apr 2002 03:44:27 -0000 1.33
--- FXTreeList.i 6 May 2002 19:16:29 -0000 1.33.2.1
***************
*** 101,105 ****
FXIcon* getClosedIcon() const;
! %addmethods {
void setData(VALUE ptr){
self->setData((void*) ptr);
--- 101,105 ----
FXIcon* getClosedIcon() const;
! %extend {
void setData(VALUE ptr){
self->setData((void*) ptr);
***************
*** 256,260 ****
FXTreeItem* getLastItem() const;
! %addmethods {
/// Prepend new [possibly subclassed] item as first child of p
FXTreeItem* addItemFirst1(FXTreeItem* p,FXTreeItem* item,FXbool notify=FALSE){
--- 256,260 ----
FXTreeItem* getLastItem() const;
! %extend {
/// Prepend new [possibly subclassed] item as first child of p
FXTreeItem* addItemFirst1(FXTreeItem* p,FXTreeItem* item,FXbool notify=FALSE){
***************
*** 268,272 ****
FXTreeItem* addItemFirst(FXTreeItem* p,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Append new [possibly subclassed] item as last child of p
FXTreeItem* addItemLast1(FXTreeItem* p,FXTreeItem* item,FXbool notify=FALSE){
--- 268,272 ----
FXTreeItem* addItemFirst(FXTreeItem* p,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Append new [possibly subclassed] item as last child of p
FXTreeItem* addItemLast1(FXTreeItem* p,FXTreeItem* item,FXbool notify=FALSE){
***************
*** 280,284 ****
FXTreeItem* addItemLast(FXTreeItem* p,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Append new [possibly subclassed] item after to other item
FXTreeItem* addItemAfter1(FXTreeItem* other,FXTreeItem* item,FXbool notify=FALSE){
--- 280,284 ----
FXTreeItem* addItemLast(FXTreeItem* p,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Append new [possibly subclassed] item after to other item
FXTreeItem* addItemAfter1(FXTreeItem* other,FXTreeItem* item,FXbool notify=FALSE){
***************
*** 292,296 ****
FXTreeItem* addItemAfter(FXTreeItem* other,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Prepend new [possibly subclassed] item prior to other item
FXTreeItem* addItemBefore1(FXTreeItem* other,FXTreeItem* item,FXbool notify=FALSE){
--- 292,296 ----
FXTreeItem* addItemAfter(FXTreeItem* other,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Prepend new [possibly subclassed] item prior to other item
FXTreeItem* addItemBefore1(FXTreeItem* other,FXTreeItem* item,FXbool notify=FALSE){
***************
*** 304,308 ****
FXTreeItem* addItemBefore(FXTreeItem* other,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Remove item
void removeItem(FXTreeItem* item,FXbool notify=FALSE){
--- 304,308 ----
FXTreeItem* addItemBefore(FXTreeItem* other,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Remove item
void removeItem(FXTreeItem* item,FXbool notify=FALSE){
***************
*** 387,391 ****
FXIcon* getItemClosedIcon(const FXTreeItem* item) const;
! %addmethods {
/// Change item user-data pointer
void setItemData(FXTreeItem* item,VALUE ptr){
--- 387,391 ----
FXIcon* getItemClosedIcon(const FXTreeItem* item) const;
! %extend {
/// Change item user-data pointer
void setItemData(FXTreeItem* item,VALUE ptr){
Index: FXTreeListBox.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTreeListBox.i,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -C2 -d -r1.27 -r1.27.2.1
*** FXTreeListBox.i 19 Mar 2002 23:18:40 -0000 1.27
--- FXTreeListBox.i 6 May 2002 19:16:29 -0000 1.27.2.1
***************
*** 79,83 ****
FXTreeItem* getLastItem() const;
! %addmethods {
/// Add item as first child of parent p
FXTreeItem* addItemFirst1(FXTreeItem* p,FXTreeItem* item,void* dummy=NULL){
--- 79,83 ----
FXTreeItem* getLastItem() const;
! %extend {
/// Add item as first child of parent p
FXTreeItem* addItemFirst1(FXTreeItem* p,FXTreeItem* item,void* dummy=NULL){
***************
*** 172,176 ****
FXIcon* getItemClosedIcon(const FXTreeItem* item) const;
! %addmethods {
/// Change item's user data
void setItemData(FXTreeItem* item,VALUE ptr){
--- 172,176 ----
FXIcon* getItemClosedIcon(const FXTreeItem* item) const;
! %extend {
/// Change item's user data
void setItemData(FXTreeItem* item,VALUE ptr){
Index: FXVec.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXVec.i,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** FXVec.i 19 Mar 2002 23:18:40 -0000 1.4
--- FXVec.i 6 May 2002 19:16:29 -0000 1.4.2.1
***************
*** 29,33 ****
// Other good stuff
! %addmethods {
FXfloat __getitem__(FXint i){
if(i<0||i>2){
--- 29,33 ----
// Other good stuff
! %extend {
FXfloat __getitem__(FXint i){
if(i<0||i>2){
Index: FXWindow.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXWindow.i,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -C2 -d -r1.32 -r1.32.2.1
*** FXWindow.i 26 Mar 2002 21:49:50 -0000 1.32
--- FXWindow.i 6 May 2002 19:16:29 -0000 1.32.2.1
***************
*** 265,269 ****
// Common DND type names
! %addmethods {
static VALUE deleteTypeName() {
return to_ruby(FXWindow::deleteTypeName);
--- 265,269 ----
// Common DND type names
! %extend {
static VALUE deleteTypeName() {
return to_ruby(FXWindow::deleteTypeName);
***************
*** 404,408 ****
FXint indexOfChild(const FXWindow *window) const;
! %addmethods {
// Remove specified child window
FXbool removeChild(FXWindow* child){
--- 404,408 ----
FXint indexOfChild(const FXWindow *window) const;
! %extend {
// Remove specified child window
FXbool removeChild(FXWindow* child){
***************
*** 449,453 ****
#ifdef SWIGRUBY
! %addmethods {
/// Return the cursor position and mouse button-state
VALUE getCursorPosition() const {
--- 449,453 ----
#ifdef SWIGRUBY
! %extend {
/// Return the cursor position and mouse button-state
VALUE getCursorPosition() const {
***************
*** 597,601 ****
FXbool hasSelection() const;
! %addmethods {
/// Try to acquire the primary selection, given a list of drag types
FXbool acquireSelection(VALUE typesArray){
--- 597,601 ----
FXbool hasSelection() const;
! %extend {
/// Try to acquire the primary selection, given a list of drag types
FXbool acquireSelection(VALUE typesArray){
***************
*** 621,625 ****
FXbool hasClipboard() const;
! %addmethods {
/// Try to acquire the clipboard, given a list of drag types
FXbool acquireClipboard(VALUE typesArray){
--- 621,625 ----
FXbool hasClipboard() const;
! %extend {
/// Try to acquire the clipboard, given a list of drag types
FXbool acquireClipboard(VALUE typesArray){
***************
*** 654,658 ****
FXbool isDragging() const;
! %addmethods {
/// Initiate a drag operation with a list of previously registered drag types
FXbool beginDrag(VALUE typesArray){
--- 654,658 ----
FXbool isDragging() const;
! %extend {
/// Initiate a drag operation with a list of previously registered drag types
FXbool beginDrag(VALUE typesArray){
***************
*** 704,708 ****
#ifdef SWIGRUBY
! %addmethods {
// When being dragged over, inquire the drag types which are being offered
VALUE inquireDNDTypes(FXDNDOrigin origin) {
--- 704,708 ----
...
[truncated message content] |
|
From: Lyle J. <ly...@us...> - 2002-05-06 16:22:41
|
Update of /cvsroot/fxruby/FXRuby
In directory usw-pr-cvs1:/tmp/cvs-serv6051
Modified Files:
Tag: release10
FXRuby.iss
Log Message:
Updated Inno Setup script for the Windows installer.
Index: FXRuby.iss
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/FXRuby.iss,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** FXRuby.iss 21 Mar 2002 23:04:10 -0000 1.17
--- FXRuby.iss 6 May 2002 16:22:38 -0000 1.17.2.1
***************
*** 4,11 ****
[Setup]
AppName=FXRuby
! AppVerName=FXRuby 1.0.3
! AppPublisherURL=http://fxruby.sourceforge.net
! AppSupportURL=http://fxruby.sourceforge.net
! AppUpdatesURL=http://fxruby.sourceforge.net
DefaultDirName=C:\ruby
DefaultGroupName=FXRuby
--- 4,11 ----
[Setup]
AppName=FXRuby
! AppVerName=FXRuby 1.0.10
! AppPublisherURL=http://www.fxruby.org
! AppSupportURL=http://www.fxruby.org
! AppUpdatesURL=http://www.fxruby.org
DefaultDirName=C:\ruby
DefaultGroupName=FXRuby
***************
*** 14,18 ****
InfoBeforeFile=C:\src\FXRuby\README.win32.txt
OutputDir=.
! OutputBaseFilename=FXRuby-1.0.3-win32
; uncomment the following line if you want your installation to run on NT 3.51 too.
; MinVersion=4,3.51
--- 14,18 ----
InfoBeforeFile=C:\src\FXRuby\README.win32.txt
OutputDir=.
! OutputBaseFilename=FXRuby-1.0.10-win32
; uncomment the following line if you want your installation to run on NT 3.51 too.
; MinVersion=4,3.51
***************
*** 45,49 ****
Source: "doc\images\foursplit.png"; DestDir: "{app}\doc\ruby\FXRuby\doc\images"; CopyMode: alwaysoverwrite
Source: "doc\images\gltest.png"; DestDir: "{app}\doc\ruby\FXRuby\doc\images"; CopyMode: alwaysoverwrite
! Source: "doc\images\glviewer.gif"; DestDir: "{app}\doc\ruby\FXRuby\doc\images"; CopyMode: alwaysoverwrite
Source: "doc\images\groupbox.png"; DestDir: "{app}\doc\ruby\FXRuby\doc\images"; CopyMode: alwaysoverwrite
Source: "doc\images\header.png"; DestDir: "{app}\doc\ruby\FXRuby\doc\images"; CopyMode: alwaysoverwrite
--- 45,49 ----
Source: "doc\images\foursplit.png"; DestDir: "{app}\doc\ruby\FXRuby\doc\images"; CopyMode: alwaysoverwrite
Source: "doc\images\gltest.png"; DestDir: "{app}\doc\ruby\FXRuby\doc\images"; CopyMode: alwaysoverwrite
! Source: "doc\images\glviewer.png"; DestDir: "{app}\doc\ruby\FXRuby\doc\images"; CopyMode: alwaysoverwrite
Source: "doc\images\groupbox.png"; DestDir: "{app}\doc\ruby\FXRuby\doc\images"; CopyMode: alwaysoverwrite
Source: "doc\images\header.png"; DestDir: "{app}\doc\ruby\FXRuby\doc\images"; CopyMode: alwaysoverwrite
***************
*** 62,66 ****
--- 62,69 ----
Source: "tests\README"; DestDir: "{app}\doc\ruby\FXRuby\tests"; CopyMode: alwaysoverwrite
Source: "tests\TS_All.rb"; DestDir: "{app}\doc\ruby\FXRuby\tests"; CopyMode: alwaysoverwrite
+ Source: "tests\TC_FXAccelTable.rb"; DestDir: "{app}\doc\ruby\FXRuby\tests"; CopyMode: alwaysoverwrite
Source: "tests\TC_FXButton.rb"; DestDir: "{app}\doc\ruby\FXRuby\tests"; CopyMode: alwaysoverwrite
+ Source: "tests\TC_FXDC.rb"; DestDir: "{app}\doc\ruby\FXRuby\tests"; CopyMode: alwaysoverwrite
+ Source: "tests\TC_FXFileStream.rb"; DestDir: "{app}\doc\ruby\FXRuby\tests"; CopyMode: alwaysoverwrite
Source: "tests\TC_FXFont.rb"; DestDir: "{app}\doc\ruby\FXRuby\tests"; CopyMode: alwaysoverwrite
Source: "tests\TC_FXHMat.rb"; DestDir: "{app}\doc\ruby\FXRuby\tests"; CopyMode: alwaysoverwrite
***************
*** 129,180 ****
Source: "examples\icons\RedMacOS.ico"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
Source: "examples\icons\SawBlade.ico"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\backview.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\bigfolder.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\bigpenguin.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\big_gif.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\bottomview.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\camera.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\colorpal.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\copy.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\cut.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\delimit.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\filenew.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\fileopen.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\filesave.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\filesaveas.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\fonts.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\fox.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\foxicon.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\frontview.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\hello2.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\help_gif.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\indent.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\kill.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\leftview.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\light.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\minidoc.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\minifolder.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\minifolderopen.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\newfolder.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\nolight.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\palette.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\parallel.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\paste.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\pattern.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\penguin.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\perspective.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\printicon.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\prop.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\redo_gif.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\rightview.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\saveas.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\shutter1.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\shutter2.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\small_gif.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\smoothlight.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\tbuplevel.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\topview.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\undo_gif.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\winapp.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\zoom.gif"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
--- 132,183 ----
Source: "examples\icons\RedMacOS.ico"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
Source: "examples\icons\SawBlade.ico"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\backview.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\bigfolder.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\bigpenguin.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\big.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\bottomview.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\camera.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\colorpal.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\copy.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\cut.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\delimit.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\filenew.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\fileopen.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\filesave.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\filesaveas.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\fonts.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\fox.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\foxicon.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\frontview.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\hello2.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\help.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\indent.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\kill.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\leftview.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\light.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\minidoc.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\minifolder.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\minifolderopen.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\newfolder.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\nolight.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\palette.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\parallel.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\paste.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\pattern.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\penguin.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\perspective.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\printicon.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\prop.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\redo.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\rightview.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\saveas.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\shutter1.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\shutter2.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\small.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\smoothlight.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\tbuplevel.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\topview.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\undo.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\winapp.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
! Source: "examples\icons\zoom.png"; DestDir: "{app}\samples\FXRuby\icons"; CopyMode: alwaysoverwrite
|
|
From: Lyle J. <ly...@us...> - 2002-05-06 16:10:01
|
Update of /cvsroot/fxruby/FXRuby/tests
In directory usw-pr-cvs1:/tmp/cvs-serv2435
Modified Files:
Tag: release10
TC_FXFileStream.rb
Log Message:
Index: TC_FXFileStream.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/tests/Attic/TC_FXFileStream.rb,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** TC_FXFileStream.rb 25 Apr 2002 21:08:50 -0000 1.1.2.1
--- TC_FXFileStream.rb 6 May 2002 16:09:57 -0000 1.1.2.2
***************
*** 16,20 ****
def test_openNonExisting
assert_equal(FXStreamDead, @filestream.direction)
! status = @filestream.open("goobers", FXStreamLoad)
assert(!status)
assert_equal(FXStreamDead, @filestream.direction)
--- 16,20 ----
def test_openNonExisting
assert_equal(FXStreamDead, @filestream.direction)
! status = @filestream.open("goobers2", FXStreamLoad)
assert(!status)
assert_equal(FXStreamDead, @filestream.direction)
***************
*** 39,43 ****
assert(status)
assert_equal(FXStreamDead, @filestream.direction)
! File.delete("goobers")
end
--- 39,43 ----
assert(status)
assert_equal(FXStreamDead, @filestream.direction)
! # File.delete("goobers")
end
|
|
From: Lyle J. <ly...@us...> - 2002-05-06 15:58:55
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv30981
Modified Files:
Tag: release10
extconf.rb extconf.rb.tmpl
Log Message:
Reversed order of have_library() calls for libpng and zlib so that libs
are picked up properly (has this changed for Ruby 1.7?)
Index: extconf.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/extconf.rb,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -C2 -d -r1.27.2.1 -r1.27.2.2
*** extconf.rb 30 Apr 2002 19:05:50 -0000 1.27.2.1
--- extconf.rb 6 May 2002 15:58:52 -0000 1.27.2.2
***************
*** 102,107 ****
have_header("sys/time.h")
have_header("signal.h")
- have_library("libpng", "png_create_read_struct")
have_library("zlib", "deflate")
have_library("libjpeg", "jpeg_mem_init")
have_library("libtiff", "TIFFSetErrorHandler")
--- 102,107 ----
have_header("sys/time.h")
have_header("signal.h")
have_library("zlib", "deflate")
+ have_library("libpng", "png_create_read_struct")
have_library("libjpeg", "jpeg_mem_init")
have_library("libtiff", "TIFFSetErrorHandler")
Index: extconf.rb.tmpl
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/extconf.rb.tmpl,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** extconf.rb.tmpl 21 Mar 2002 23:00:40 -0000 1.17
--- extconf.rb.tmpl 6 May 2002 15:58:52 -0000 1.17.2.1
***************
*** 102,107 ****
have_header("sys/time.h")
have_header("signal.h")
- have_library("libpng", "png_create_read_struct")
have_library("zlib", "deflate")
have_library("libjpeg", "jpeg_mem_init")
have_library("libtiff", "TIFFSetErrorHandler")
--- 102,107 ----
have_header("sys/time.h")
have_header("signal.h")
have_library("zlib", "deflate")
+ have_library("libpng", "png_create_read_struct")
have_library("libjpeg", "jpeg_mem_init")
have_library("libtiff", "TIFFSetErrorHandler")
|
|
From: Lyle J. <ly...@us...> - 2002-05-01 14:18:11
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv18291
Modified Files:
Tag: release10
FXApp.i
Log Message:
Corrected the %rename directive for FXRbApp::setThreadsEnabled().
Index: FXApp.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXApp.i,v
retrieving revision 1.38.2.3
retrieving revision 1.38.2.4
diff -C2 -d -r1.38.2.3 -r1.38.2.4
*** FXApp.i 30 Apr 2002 19:02:41 -0000 1.38.2.3
--- FXApp.i 1 May 2002 14:18:06 -0000 1.38.2.4
***************
*** 521,525 ****
%exception FXRbApp::FXRbApp "$action FXRbRegisterRubyObj(self, result);";
! %rename("threadsEnabled=") FXRbApp::setThreadsEnabled();
%rename("threadsEnabled?") FXRbApp::threadsEnabled() const;
--- 521,525 ----
%exception FXRbApp::FXRbApp "$action FXRbRegisterRubyObj(self, result);";
! %rename("threadsEnabled=") FXRbApp::setThreadsEnabled(FXbool);
%rename("threadsEnabled?") FXRbApp::threadsEnabled() const;
|
|
From: Lyle J. <ly...@us...> - 2002-04-30 22:12:06
|
Update of /cvsroot/fxruby/FXRuby/tests
In directory usw-pr-cvs1:/tmp/cvs-serv30847
Added Files:
Tag: release10
TC_FXAccelTable.rb
Log Message:
Added a test case for FXAccelTable.
--- NEW FILE: TC_FXAccelTable.rb ---
require 'test/unit'
require 'fox'
include Fox
class TC_FXAccelTable < Test::Unit::TestCase
def set_up
@accel = FXAccelTable.new
end
def test_addAccel
hotkey = fxparsehotkey('&A')
target = FXObject.new
seldn, selup = 0, 0
@accel.addAccel(hotkey)
@accel.addAccel(hotkey, target)
@accel.addAccel(hotkey, target, seldn)
@accel.addAccel(hotkey, target, seldn, selup)
end
def test_hasAccel
hotkey = fxparsehotkey('&b')
assert(!@accel.hasAccel?(hotkey))
@accel.addAccel(hotkey)
assert(@accel.hasAccel?(hotkey))
end
def test_targetOfAccel
hotkey = fxparsehotkey("&x")
target = FXObject.new
@accel.addAccel(hotkey, target)
assert_same(target, @accel.targetOfAccel(hotkey))
end
def test_removeAccel
hotkey = fxparsehotkey('&b')
@accel.addAccel(hotkey)
assert(@accel.hasAccel?(hotkey))
@accel.removeAccel(hotkey)
assert(!@accel.hasAccel?(hotkey))
end
end
|
|
From: Lyle J. <ly...@us...> - 2002-04-30 19:42:30
|
Update of /cvsroot/fxruby/FXRuby/doc
In directory usw-pr-cvs1:/tmp/cvs-serv3907/doc
Modified Files:
Tag: release10
Makefile book.html build.html changes.html changes.xml
differences.html differences.xml events.html examples.html
goals.html library.html opengl.html scintilla.html todo.html
tutorial1.html
Added Files:
Tag: release10
custom.xsl
Log Message:
Updated change history.
--- NEW FILE: custom.xsl ---
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version='1.0'
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
<xsl:import href="../../../docbook/docbook-xsl-1.50.0/html/chunk.xsl"/>
<xsl:variable name="root.filename">book</xsl:variable>
<xsl:variable name="shade.verbatim">1</xsl:variable>
<xsl:attribute-set name="shade.verbatim.style">
<xsl:attribute name="width">100%</xsl:attribute>
</xsl:attribute-set>
<xsl:variable name="use.id.as.filename">1</xsl:variable>
</xsl:stylesheet>
Index: Makefile
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/doc/Makefile,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** Makefile 22 Mar 2002 01:53:30 -0000 1.7
--- Makefile 30 Apr 2002 19:42:23 -0000 1.7.2.1
***************
*** 5,10 ****
########################################################################
! SAXON = java -jar C:\saxon-6.5.1\saxon.jar
! DOCBOOK_XSL = C:\docbook\docbook-xsl-customized\html\chunk.xsl
all: xml
--- 5,11 ----
########################################################################
! SAXON = java -jar /home/jlj/saxon-6.5.2/saxon.jar
! #DOCBOOK_XSL = /home/jlj/docbook/docbook-xsl-1.50.0/html/chunk.xsl
! DOCBOOK_XSL = custom.xsl
all: xml
***************
*** 12,16 ****
xml:
$(SAXON) book.xml $(DOCBOOK_XSL)
- move /y index.html book.html
clean:
--- 13,16 ----
Index: book.html
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/doc/book.html,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -C2 -d -r1.35 -r1.35.2.1
*** book.html 22 Mar 2002 01:53:30 -0000 1.35
--- book.html 30 Apr 2002 19:42:23 -0000 1.35.2.1
***************
*** 1,3 ****
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
! <title>Developing Graphical User Interfaces with FXRuby</title><meta name="generator" content="DocBook XSL Stylesheets V1.50.0"><link rel="home" href="index.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="next" href="goals.html" title="History and Goals"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Developing Graphical User Interfaces with FXRuby</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="goals.html">Next</a></td></tr></table><hr></div><div class="book"><div class="titlepage"><div><h1 class="title"><a name="book"></a>Developing Graphical User Interfaces with FXRuby</h1></div><div><div class="author"><h3 class="author">Lyle Johnson</h3></div></div><div><p class="copyright">Copyright © 2001 J. Lyle Johnson</p></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="goals.html">History and Goals</a></dt><dt>1. <a href="build.html">Building from Source Code</a></dt><dt>2. <a href="examples.html">Examples</a></dt><dt>3. <a href="tutorial1.html">Hello, World!</a></dt><dt>4. <a href="opengl.html">Using OpenGL with FXRuby</a></dt><dt>5. <a href="scintilla.html">Using Scintilla with FXRuby</a></dt><dt>6. <a href="differences.html">Differences between FOX and FXRuby</a></dt><dt>7. <a href="events.html">FXRuby's Message-Target System</a></dt><dt>8. <a href="library.html">The FXRuby Standard Library</a></dt><dt>9. <a href="todo.html">To-do list</a></dt><dt>10. <a href="changes.html">Change History</a></dt></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="goals.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"> </td><td width="40%" align="right" valign="top"> History and Goals</td></tr></table></div></body></html>
\ No newline at end of file
--- 1,3 ----
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
! <title>Developing Graphical User Interfaces with FXRuby</title><meta name="generator" content="DocBook XSL Stylesheets V1.50.0"><link rel="home" href="book.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="next" href="goals.html" title="History and Goals"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Developing Graphical User Interfaces with FXRuby</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="goals.html">Next</a></td></tr></table><hr></div><div class="book"><div class="titlepage"><div><h1 class="title"><a name="book"></a>Developing Graphical User Interfaces with FXRuby</h1></div><div><div class="author"><h3 class="author">Lyle Johnson</h3></div></div><div><p class="copyright">Copyright © 2001 J. Lyle Johnson</p></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="goals.html">History and Goals</a></dt><dt>1. <a href="build.html">Building from Source Code</a></dt><dt>2. <a href="examples.html">Examples</a></dt><dt>3. <a href="tutorial1.html">Hello, World!</a></dt><dt>4. <a href="opengl.html">Using OpenGL with FXRuby</a></dt><dt>5. <a href="scintilla.html">Using Scintilla with FXRuby</a></dt><dt>6. <a href="differences.html">Differences between FOX and FXRuby</a></dt><dt>7. <a href="events.html">FXRuby's Message-Target System</a></dt><dt>8. <a href="library.html">The FXRuby Standard Library</a></dt><dt>9. <a href="todo.html">To-do list</a></dt><dt>10. <a href="changes.html">Change History</a></dt></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="goals.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"> </td><td width="40%" align="right" valign="top"> History and Goals</td></tr></table></div></body></html>
\ No newline at end of file
Index: build.html
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/doc/build.html,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -d -r1.23 -r1.23.2.1
*** build.html 22 Mar 2002 01:53:30 -0000 1.23
--- build.html 30 Apr 2002 19:42:23 -0000 1.23.2.1
***************
*** 1,5 ****
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
! <title>Chapter 1. Building from Source Code</title><meta name="generator" content="DocBook XSL Stylesheets V1.50.0"><link rel="home" href="index.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="up" href="index.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="previous" href="goals.html" title="History and Goals"><link rel="next" href="examples.html" title="Chapter 2. Examples"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 1. Building from Source Code</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="goals.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="examples.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="build"></a>Chapter 1. Building from Source Code</h2></div></div><p>If you're planning to use FXRuby on Windows, with the Pragmatic Programmers' Ruby installer for Windows, you may wish to just download the pre-compiled FXRuby binaries. Otherwise, you will need to compile the shared library for FXRuby from the source code.</p><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e59"></a>The Basics</h2></div></div><p>These instructions assume that you've already downloaded, compiled and installed FOX. Next, you'll need to download the FXRuby source code tarball and unpack it by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>tar xzf FXRuby-1.0.3.tar.gz</b></pre></td></tr></table><p>This will create a new directory called <tt>FXRuby-1.0.3</tt>. Change to the top-level directory and configure the build by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb config</b></pre></td></tr></table><p>By default, the <tt>install.rb</tt> script will look for the FOX include files and library in the standard <tt>/usr/local/include/fox</tt> and <tt>/usr/local/lib</tt> directories, respectively. You can override these locations by passing a few additional arguments to <tt>install.rb</tt> during this step, e.g.</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb config -- \
--with-fox-include=/home/lyle/fox-1.0.3/include \
--with-fox-lib=/home/lyle/fox-1.0.3/src/.libs</b></pre></td></tr></table><p>Once the build has been configured, you can start the build by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb setup</b></pre></td></tr></table><p>It will take quite awhile to build FXRuby, even on a fast machine, so this might be a good time to take a coffee break. If you run into problems during the compilation, please check the <a href="build.html#tragedies" title="Things That Can Go Wrong">list of things that can go wrong</a> for workarounds for those problems.</p><p>Once it's finished compiling, install FXRuby by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb install</b></pre></td></tr></table><p>As a quick sanity check, to make sure that all is well, you should probably fire up <tt>irb</tt> and try to import FXRuby:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>irb</b>
--- 1,5 ----
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
! <title>Chapter 1. Building from Source Code</title><meta name="generator" content="DocBook XSL Stylesheets V1.50.0"><link rel="home" href="book.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="up" href="book.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="previous" href="goals.html" title="History and Goals"><link rel="next" href="examples.html" title="Chapter 2. Examples"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 1. Building from Source Code</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="goals.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="examples.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="build"></a>Chapter 1. Building from Source Code</h2></div></div><p>If you're planning to use FXRuby on Windows, with the Pragmatic Programmers' Ruby installer for Windows, you may wish to just download the pre-compiled FXRuby binaries. Otherwise, you will need to compile the shared library for FXRuby from the source code.</p><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e59"></a>The Basics</h2></div></div><p>These instructions assume that you've already downloaded, compiled and installed FOX. Next, you'll need to download the FXRuby source code tarball and unpack it by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>tar xzf FXRuby-1.0.3.tar.gz</b></pre></td></tr></table><p>This will create a new directory called <tt>FXRuby-1.0.3</tt>. Change to the top-level directory and configure the build by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb config</b></pre></td></tr></table><p>By default, the <tt>install.rb</tt> script will look for the FOX include files and library in the standard <tt>/usr/local/include/fox</tt> and <tt>/usr/local/lib</tt> directories, respectively. You can override these locations by passing a few additional arguments to <tt>install.rb</tt> during this step, e.g.</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb config -- \
--with-fox-include=/home/lyle/fox-1.0.3/include \
--with-fox-lib=/home/lyle/fox-1.0.3/src/.libs</b></pre></td></tr></table><p>Once the build has been configured, you can start the build by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb setup</b></pre></td></tr></table><p>It will take quite awhile to build FXRuby, even on a fast machine, so this might be a good time to take a coffee break. If you run into problems during the compilation, please check the <a href="build.html#tragedies" title="Things That Can Go Wrong">list of things that can go wrong</a> for workarounds for those problems.</p><p>Once it's finished compiling, install FXRuby by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb install</b></pre></td></tr></table><p>As a quick sanity check, to make sure that all is well, you should probably fire up <tt>irb</tt> and try to import FXRuby:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>irb</b>
***************
*** 18,22 ****
make: *** [FXRbApp.o] Error 1</pre></td></tr></table><p>while the error message from Microsoft's Visual C++ compiler looks something like this:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">FXRbApp.cpp(109): error C2660: 'rb_thread_wait_for' : function does not take 1 parameters
NMAKE : fatal error U1077: 'cl' : return code '0x2'
! Stop.</pre></td></tr></table><p>This problem with the Ruby header files appears to have been corrected for Ruby 1.7, but for the time being you should probably do one of two things to work around the problem:</p><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>If you're using gcc version 2.95 or earlier, try modifying the compiler flags (<tt>CFLAGS</tt>) in the FXRuby <tt>Makefile</tt> to include the <tt>-fno-strict-prototype</tt> option; this should instruct the compiler to allow these kinds of discrepancies. Unfortunately, this flag is not supported in more recent versions of gcc (most notably, the questionable "2.96" version shipped with some popular Linux distributions).</p></li><li style="list-style-type: disc"><p>A more direct approach is to just fix the offending declarations in the Ruby include file(s), i.e. change the declaration for <tt>rb_thread_wait_for()</tt> in <tt>intern.h</tt> to read:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">void rb_thread_wait_for(struct timeval);</pre></td></tr></table><p>and change the declaration for <tt>rb_gc_mark()</tt> in <tt>intern.h</tt> to read:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">void rb_gc_mark(VALUE);</pre></td></tr></table></li></ul></div><p><span class="emphasis"><em>"Virtual Memory Exhausted"</em></span></p><p>For FXRuby releases earlier than version 0.99.173 it was common for the compiler to run out of memory trying to compile <tt>core_wrap.cpp</tt>, with an error message like:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">core_wrap.cpp: In function 'void Init_core()':
core_wrap.cpp:108596: virtual memory exhausted</pre></td></tr></table><p>This failure was due to the use of optimizations by the compiler; the FXRuby source code makes heavy use of C++ templates and some versions of gcc require a lot of memory to process these. Starting with FXRuby version 0.99.173, the <tt>extconf.rb</tt> script <span class="emphasis"><em>should</em></span> disable compiler optimizations when it generates the FXRuby <tt>Makefile</tt>. If you suspect that it's not disabling optimizations (or can see this by watching the compile command lines), try modifying the compiler flags (<tt>CFLAGS</tt>) in the <tt>Makefile</tt> by hand to do so.</p><p><span class="emphasis"><em>"Cannot load library"</em></span></p><p>On Linux and other Unix systems that support shared libraries, FOX is typically installed as a shared library named <tt>libFOX.so</tt>. After all of the source files for FXRuby are compiled, the last step is to link all of the FXRuby object files together with the FOX library (and possibly other system libraries) to produce a new shared library, named <tt>fox.so</tt>, that Ruby can import as an extension module.</p><p>There are a few things that can go wrong when you try to import this extension into Ruby. A common problem is that the operating system cannot locate the FOX shared library (<tt>libFOX.so</tt>) when it tries to dynamically load the FXRuby extension module; when this happens, the error message will look something like:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>irb</b>
irb(main):001:0> <b><tt>require 'fox'</tt></b>
--- 18,22 ----
make: *** [FXRbApp.o] Error 1</pre></td></tr></table><p>while the error message from Microsoft's Visual C++ compiler looks something like this:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">FXRbApp.cpp(109): error C2660: 'rb_thread_wait_for' : function does not take 1 parameters
NMAKE : fatal error U1077: 'cl' : return code '0x2'
! Stop.</pre></td></tr></table><p>This problem with the Ruby header files appears to have been corrected for Ruby 1.7, but for the time being you should probably do one of two things to work around the problem:</p><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>If you're using gcc version 2.95 or earlier, try modifying the compiler flags (<tt>CFLAGS</tt>) in the FXRuby <tt>Makefile</tt> to include the <tt>-fno-strict-prototype</tt> option; this should instruct the compiler to allow these kinds of discrepancies. Unfortunately, this flag is not supported in more recent versions of gcc (most notably, the questionable "2.96" version shipped with some popular Linux distributions).</p></li><li style="list-style-type: disc"><p>A more direct approach is to just fix the offending declarations in the Ruby include file(s), i.e. change the declaration for <tt>rb_thread_wait_for()</tt> in <tt>intern.h</tt> to read:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">void rb_thread_wait_for(struct timeval);</pre></td></tr></table><p>and change the declaration for <tt>rb_gc_mark()</tt> in <tt>intern.h</tt> to read:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">void rb_gc_mark(void *);</pre></td></tr></table></li></ul></div><p><span class="emphasis"><em>"Virtual Memory Exhausted"</em></span></p><p>For FXRuby releases earlier than version 0.99.173 it was common for the compiler to run out of memory trying to compile <tt>core_wrap.cpp</tt>, with an error message like:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">core_wrap.cpp: In function 'void Init_core()':
core_wrap.cpp:108596: virtual memory exhausted</pre></td></tr></table><p>This failure was due to the use of optimizations by the compiler; the FXRuby source code makes heavy use of C++ templates and some versions of gcc require a lot of memory to process these. Starting with FXRuby version 0.99.173, the <tt>extconf.rb</tt> script <span class="emphasis"><em>should</em></span> disable compiler optimizations when it generates the FXRuby <tt>Makefile</tt>. If you suspect that it's not disabling optimizations (or can see this by watching the compile command lines), try modifying the compiler flags (<tt>CFLAGS</tt>) in the <tt>Makefile</tt> by hand to do so.</p><p><span class="emphasis"><em>"Cannot load library"</em></span></p><p>On Linux and other Unix systems that support shared libraries, FOX is typically installed as a shared library named <tt>libFOX.so</tt>. After all of the source files for FXRuby are compiled, the last step is to link all of the FXRuby object files together with the FOX library (and possibly other system libraries) to produce a new shared library, named <tt>fox.so</tt>, that Ruby can import as an extension module.</p><p>There are a few things that can go wrong when you try to import this extension into Ruby. A common problem is that the operating system cannot locate the FOX shared library (<tt>libFOX.so</tt>) when it tries to dynamically load the FXRuby extension module; when this happens, the error message will look something like:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>irb</b>
irb(main):001:0> <b><tt>require 'fox'</tt></b>
***************
*** 27,29 ****
$ <b>irb</b>
irb(main):001:0> <b><tt>require 'fox'</tt></b>
! </pre></td></tr></table><p>If this works, you can of course permanently add the <tt>LD_LIBRARY_PATH</tt> setting to your login file(s) so that you don't have to remember to type it each time. Another approach that should work for Linux is to modify your <tt>/etc/ld.so.conf</tt> file to include the installation directory (e.g. <tt>/usr/local/lib</tt>). If you'd like to do this instead, you'll need to (as root):</p><div class="orderedlist"><ol type="1" compact=""><li><p>Edit your <tt>/etc/ld.so.conf</tt> file and add the directory where <tt>libFOX.so</tt> is installed; and,</p></li><li><p>At the shell prompt, type <b>ldconfig</b> to reload the linker configuration.</p></li></ol></div><p>Another problem that has been reported by users of both Debian GNU/Linux and NetBSD 1.5 is an error message along the lines of:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">/usr/lib/libstdc++.so.2: Undefined symbol "__vt_9exception"...</pre></td></tr></table><p>The fix for this problem is reported to be to modify the FXRuby <tt>Makefile</tt> and add <tt>-lgcc</tt> to the <tt>LIBS</tt> line.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="goals.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="index.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="examples.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">History and Goals </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 2. Examples</td></tr></table></div></body></html>
\ No newline at end of file
--- 27,29 ----
$ <b>irb</b>
irb(main):001:0> <b><tt>require 'fox'</tt></b>
! </pre></td></tr></table><p>If this works, you can of course permanently add the <tt>LD_LIBRARY_PATH</tt> setting to your login file(s) so that you don't have to remember to type it each time. Another approach that should work for Linux is to modify your <tt>/etc/ld.so.conf</tt> file to include the installation directory (e.g. <tt>/usr/local/lib</tt>). If you'd like to do this instead, you'll need to (as root):</p><div class="orderedlist"><ol type="1" compact=""><li><p>Edit your <tt>/etc/ld.so.conf</tt> file and add the directory where <tt>libFOX.so</tt> is installed; and,</p></li><li><p>At the shell prompt, type <b>ldconfig</b> to reload the linker configuration.</p></li></ol></div><p>Another problem that has been reported by users of both Debian GNU/Linux and NetBSD 1.5 is an error message along the lines of:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">/usr/lib/libstdc++.so.2: Undefined symbol "__vt_9exception"...</pre></td></tr></table><p>The fix for this problem is reported to be to modify the FXRuby <tt>Makefile</tt> and add <tt>-lgcc</tt> to the <tt>LIBS</tt> line.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="goals.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="book.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="examples.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">History and Goals </td><td width="20%" align="center"><a accesskey="h" href="book.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 2. Examples</td></tr></table></div></body></html>
\ No newline at end of file
Index: changes.html
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/doc/changes.html,v
retrieving revision 1.42
retrieving revision 1.42.2.1
diff -C2 -d -r1.42 -r1.42.2.1
*** changes.html 22 Mar 2002 01:53:30 -0000 1.42
--- changes.html 30 Apr 2002 19:42:23 -0000 1.42.2.1
***************
*** 1,3 ****
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
! <title>Chapter 10. Change History</title><meta name="generator" content="DocBook XSL Stylesheets V1.50.0"><link rel="home" href="index.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="up" href="index.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="previous" href="todo.html" title="Chapter 9. To-do list"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 10. Change History</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="todo.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> </td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="changes"></a>Chapter 10. Change History</h2></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e1798"></a>Changes Since Version 0.99.189</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Upgraded to the latest version of Minero Aoki's <tt>install.rb</tt> script.</p></li><li style="list-style-type: disc"><p>Switched from using DocBook/SGML to DocBook/XML for the FXRuby documentation. This is mainly a maintenance issue; it's just much less complicated to "publish" documents using DocBook/XML as compared to DocBook/SGML. You should see few (if any) differences in the resulting HTML pages, but let me know if you notice anything squirrely.</p></li><li style="list-style-type: disc"><p>Improved support for customized sorting of list items for the <tt>FXComboBox</tt>, <tt>FXIconList</tt>, <tt>FXList</tt>, <tt>FXListBox</tt>, <tt>FXTreeList</tt> and <tt>FXTreeListBox</tt> classes. The model is different from that used in the C++ FOX library, where you set a global sorting function for each list instance. For FXRuby, you instead just override the list item's <tt><=></tt> method to compare one list item to another. Thanks to Martin Stannard for prompting me to resolve this problem.</p></li><li style="list-style-type: disc"><p>Added instructions about how to modify your <tt>/etc/ld.so.conf</tt> file (on Linux) to include the <tt>libFOX.so</tt> installation directory. Thanks to Giuseppe Cacopardo for providing this information.</p></li><li style="list-style-type: disc"><p>Updated the test cases (again) for use with Nathaniel Talbott's <a href="http://testunit.talbott.ws" target="_top">TestUnit</a>, which is apparently the successor to Lapidary.</p></li><li style="list-style-type: disc"><p>Added support for the <tt>FXCURCursor</tt>, <tt>FXRGBIcon</tt>, <tt>FXRGBImage</tt> classes.</p></li><li style="list-style-type: disc"><p>Fixed a longstanding bug related to the ownership (for garbage collection purposes) of <tt>FXGLGroup</tt> and <tt>FXGLShape</tt> instances. This is the bug that was causing the <tt>glviewer.rb</tt> example program to crash on exit.</p></li><li style="list-style-type: disc"><p>Fixed a different (but also longstanding) bug related to FXRuby's hanging on to "stale" Ruby object references after those Ruby objects had already been garbage-collected. This bug manifested itself in a number of ways, but the most common symptom would be for an object (like an <tt>FXEvent</tt> instance) to suddenly lose its mind and believe it was some other object. Oh, and your program would usually crash at that point. I think this problem is now fixed.</p></li><li style="list-style-type: disc"><p>Added some safeguards for "destructive" functions like <tt>FXList#clearItems</tt>, which can destroy the C++ objects backing-up Ruby objects in FXRuby, so that any outstanding Ruby references to those destroyed C++ objects are left in a safe state when accessed by Ruby's garbage collector.</p></li><li style="list-style-type: disc"><p>Performed a major overhaul on the <tt>shutter.rb</tt> example program, which still demonstrates the <tt>FXShutter</tt> widget but otherwise doesn't resemble its previous incarnation at all.</p></li><li style="list-style-type: disc"><p>Added a new example program (<tt>raabrowser.rb</tt>) that allows you to browse the Ruby Application Archive via its SOAP interface. Requires the <a href="http://www.jin.gr.jp/~nahi/Ruby/SOAP4R" target="_top">SOAP4R</a> extension.</p></li><li style="list-style-type: disc"><p>Added a new example program (<tt>babelfish.rb</tt>) that allows you to use the Babelfish translator web service via its SOAP interface. Requires the <a href="http://www.jin.gr.jp/~nahi/Ruby/SOAP4R" target="_top">SOAP4R</a> extension.</p></li><li style="list-style-type: disc"><p>Added a new page to the documentation to briefly describe each of the example programs (including screenshots).</p></li><li style="list-style-type: disc"><p>The CVS repository for FXRuby is now hosted at the SourceForge site. For those who would like access to the latest version of FXRuby (in-between official releases) this is now an option. For more details, see the instructions at the <a href="http://sourceforge.net/cvs/?group_id=20243" target="_top">SourceForge project CVS page</a>.</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="http://www.fox-toolkit.org/ftp/fox-1.0.3.tar.gz" target="_top">fox-1.0.3</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e1928"></a>Changes Since Version 0.99.188</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Fixed a big bug related to the <tt>FXApp#addSignal</tt> and <tt>FXApp#removeSignal</tt> functions, which should accept a string signal name as an argument. The list of recognized signal names was not constructed properly and as a result most any call to these methods with a string signal name would fail. This has been corrected, and the methods now throw exceptions like those thrown from <tt>Process::kill</tt> when the signal name is unrecognized or the argument type is wrong.</p></li><li style="list-style-type: disc"><p>The <tt>imageviewer.rb</tt> example program now supports loading TARGA, ICO and TIFF image files.</p></li><li style="list-style-type: disc"><p>The configuration process on Windows should now detect the presence of <tt>libtiff.lib</tt> properly.</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="http://www.fox-toolkit.org/ftp/fox-0.99.189.tar.gz" target="_top">fox-0.99.189</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e1962"></a>Changes Since Version 0.99.181</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Removed the <tt>-fno-strict-prototype</tt> and <tt>-fpermissive</tt> flags from the <tt>CFLAGS</tt> for Linux builds, since these two flags are no longer supported for more recent versions of gcc. Thanks to Thomas Lundqvist for reporting this.</p></li><li style="list-style-type: disc"><p>Some of the source files included in the previous release had DOS-style line endings and this caused gcc to choke while compiling them; this has been fixed. Thanks to Thomas Lundqvist for reporting this.</p></li><li style="list-style-type: disc"><p>Updated the FXRuby test cases (such as they are) to use Nathaniel Talbott's <a href="http://lapidary.sourceforge.net" target="_top">Lapidary</a> unit testing framework.</p></li><li style="list-style-type: disc"><p>Migrated yet more code from the C++ extension to pure Ruby versions. Most of the code for the <tt>FXPoint</tt>, <tt>FXRectangle</tt> and <tt>FXSize</tt> classes is now implemented in Ruby.</p></li><li style="list-style-type: disc"><p>Fixed a bug in the <tt>browser.rb</tt> example. I had meant for the methods and constants lists to be sorted but had failed to use the in-place <tt>sort!</tt> method. Thanks to Robert Gustavsson for reporting this.</p></li><li style="list-style-type: disc"><p>Completed a lot of the initial work for integrating the FXScint
illa widget into FXRuby. This is not usable yet, but I'm working with Rich Kilmer and others to try to make this happen.</p></li><li style="list-style-type: disc"><p>Updated the build instructions to provide more information about building the Visual C++ version of FXRuby (i.e. for use with the Visual C++ build of Ruby) on Windows. Thanks to a final tip from Martin Stannard we now have a working build for this compiler.</p></li><li style="list-style-type: disc"><p>For fun, added a new example program that downloads today's Dilbert cartoon from the <a href="http://www.dilbertzone.com" target="_top">DilbertZone</a> web site and displays it in an <tt>FXImageViewer</tt> widget. Requires the <tt>html-parser</tt> module, listed in the <a href="http://www.ruby-lang.org/en/raa.html" target="_top">Ruby Application Archive</a>.</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="http://www.fox-toolkit.org/ftp/fox-0.99.188.tar.gz" target="_top">fox-0.99.188</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2035"></a>Changes Since Version 0.99.180</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Added <tt>slices</tt>, <tt>stacks</tt> and <tt>loops</tt> accessors for the <tt>FXGLCone</tt> and <tt>FXGLCylinder</tt> classes, to provide finer control over the rendering fidelity for these shapes (this was already done for <tt>FXGLSphere</tt> in the previous release).</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="ftp://ftp.fox-toolkit.org/pub/fox-0.99.181.tar.gz" target="_top">fox-0.99.181</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2066"></a>Changes Since Version 0.99.174</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Moved the class definitions for <tt>FXGLPoint</tt>, <tt>FXGLLine</tt>, <tt>FXGLCube</tt>, <tt>FXGLCylinder</tt>, <tt>FXGLSphere</tt> and <tt>FXGLCone</tt> to a new library module <tt>fox/glshapes.rb</tt>. The interfaces are the same as the C++ versions of these classes, this is just a "pure Ruby" implementation of the classes instead of wrappers around the C++ classes. See <tt>examples/glviewer.rb</tt> for an example of their use.</p></li><li style="list-style-type: disc"><p>Fixed a bug related to object ownership for GL objects added to a <tt>FXGLGroup</tt>.</p></li><li style="list-style-type: disc"><p>Added support for overriding the virtual <tt>layout</tt> method in classes derived from <tt>FXWindow</tt>. This will allow developers to, for example, develop new kinds of layout managers.</p></li><li style="list-style-type: disc"><p>Replaced the previous WISE-based installer for the Windows version with an Inno Setup-based installer and reorganized things to better reflect the organization used in the standard Ruby installer.</p></li><li style="list-style-type: disc"><p>Updated the setup and build script to the latest version of Minero Aoki's scripts (version 3.0.2). The main change for FXRuby end-users is that the name of the build script is now <tt>install.rb</tt> instead of <tt>setup.rb</tt>.</p></li><li style="list-style-type: disc"><p>Added the <tt>colors.rb</tt> library file, for predefined color names in the <tt>FXColor</tt> namespace. The use of this module allows you to use symbolic names like <tt>FXColor::Red</tt> instead of an RGB constant like FXRGB(255, 0, 0). Many thanks to Jeff Heard for this suggestion and the contributed file.</p></li><li style="list-style-type: disc"><p>The <tt>FXRegion</tt> was accidentally being renamed to <tt>FX_Region</tt> (a little behind-the-scenes magic I'm doing in FXRuby) and as a result you couldn't use this class. Thanks to Steven Grady for catching this bug.</p></li><li style="list-style-type: disc"><p>The <tt>FXFileStream</tt> class now supports a Ruby-style <tt>open</tt> singleton method that provides transactional control for closing the file stream when it's done. See the <tt>image.rb</tt> and <tt>imageviewer.rb</tt> examples for how this works.</p></li><li style="list-style-type: disc"><p>After some discussions at RubyConf and follow-up discussions on the comp.lang.ruby newsgroup, the procedure for attaching events handlers to FXRuby widgets has been greatly simplified. Most of the example programs have been updated to reflect these changes, and a new documentation section has been added to describe how it works. For some of the background, please see <a href="http://www.rubygarden.org/ruby?FXRubyComments" target="_top">this page</a> on the RubyGarden Wiki.</p></li><li style="list-style-type: disc"><p>Added support for the <tt>each_row</tt> and <tt>each_column</tt> iterators for the <tt>FXTable</tt> class. These iterators yield an array of references to <tt>FXTableItem</tt> instances, one per row or column, respectively. Note that the <tt>each</tt> method is just an alias for <tt>each_row</tt>.</p></li><li style="list-style-type: disc"><p>Removed the interfaces for <tt>fxrandom</tt>, <tt>fxmalloc</tt>, <tt>fxcalloc</tt>, <tt>fxresize</tt>, <tt>fxmemdump</tt>, and <tt>fxfree</tt>. These utility functions are not relevant for FXRuby.</p></li><li style="list-style-type: disc"><p>Corrected interfaces for <tt>fxhsv_to_rgb</tt> and <tt>fxrgb_to_hsv</tt> so that they return three-element arrays of the converted color components.</p></li><li style="list-style-type: disc"><p>Corrected interfaces for <tt>FXWindow#acquireSelection</tt>, <tt>FXWindow#acquireClipboard</tt> and <tt>FXWindow#beginDrag</tt> to take an array of drag types.</p></li><li style="list-style-type: disc"><p>Corrected interfaces for <tt>fxsaveBMP</tt>, <tt>fxsaveGIF</tt>, <tt>fxsaveICO</tt>, <tt>fxsavePCX</tt>, <tt>fxsavePNG</tt>, <tt>fxsaveTIF</tt> and <tt>fxsaveXPM</tt> so that they expect a Ruby string (containing the image pixel data) as their second argument.</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="ftp://ftp.fox-toolkit.org/pub/fox-0.99.180.tar.gz" target="_top">fox-0.99.180</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2259"></a>Changes Since Version 0.99.173</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Moved all of the method name aliases out of the C interface code and into a new library file (<tt>fox/aliases.rb</tt>). This file is loaded automatically so you don't need to change your code. Similarly, moved all of the iterator methods out of the C code and into a library file (<tt>fox/iterators.rb</tt>). The main purpose of these changes is to reduce the size of the C++ code (especially <tt>core_wrap.cpp</tt>) where possible. Obviously, compared to recompiling the C++ source code, it's also much more efficient to quickly patch the Ruby files and re-run when there are problems.</p></li><li style="list-style-type: disc"><p>A few errors made it into the <tt>undolist.rb</tt> library module and the <tt>textedit.rb</tt> example last time; I think these have been fixed.</p></li><li style="list-style-type: disc"><p>I meant to add support for the new <tt>FXPCXIcon</tt> and <tt>FXPCXImage</tt> classes with the last release, but somehow I overlooked those. They are now supported, along with the other new classes introduced by FOX version 0.99.174: <tt>FXTIFIcon</tt>, <tt>FXTIFImage</tt> and <tt>FXProgressDialog</tt>.</p></li><li style="list-style-type: disc"><p>Fixed a bug in the GC-related code for "marking" C++ objects. I had not accounted for the possibility that the pointer passed to my mark functions could be a <tt>NULL</tt> pointer, and as a result the code would seg fault during garbage collection, under some circumstances. Many thanks to Ralf Canis for catching this bug.</p></li><li style="list-style-type: disc"><p>Updated the source code and <tt>extconf.rb</tt> files so that FXRuby configures and builds correctly for the "mswin32" builds. Thanks very much to Lorien
Dunn for prompting me to get this stuff up-to-date!</p></li><li style="list-style-type: disc"><p>Fixed things so that the <tt>FXApp#addInput</tt> and <tt>FXApp#removeInput</tt> instance methods work properly for generating input messages. The first argument to both of these methods should be an <tt>IO</tt> object of some kind (specifically, an object that implements a <tt>fileno</tt> method). For more information about how this works, see the "Timers, Chores, Signals and Input Messages" section of the FOX documentation. Also see the new <tt>inputs.rb</tt> program in the <tt>examples</tt> directory for an example of how this works. Thanks to Ralf Canis for reminding me that I left this broken!</p></li><li style="list-style-type: disc"><p>Completed the basic code changes required for <tt>FXObject#handle</tt> to properly convert its message data into something that the C++ objects recognize (see the first item in the FXRuby To-Do List for more information). A lot of message types and identifiers are now handled correctly, especially those that are common to all <tt>FXWindow</tt>s. Most of the more widget-specific messages are not handled yet, and this is going to take awhile to complete; it's just a tedious process.</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="ftp://ftp.cfdrc.com/pub/FOX/fox-0.99.174.tar.gz" target="_top">fox-0.99.174</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2350"></a>Changes Since Version 0.99.172</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Changed the build and installation process to use Minero Aoki's <tt>setup.rb</tt> tools. Looking ahead I can see that FXRuby will probably consist of a core C++ extension module and a collection of Ruby library scripts, and so now was the right time to make that transition.</p><p>If you have previously installed FXRuby (and written programs with the same) there are a few changes that may affect you. First, <tt>setup.rb</tt> will install the shared library (<tt>fox.so</tt>) in your <tt>site_ruby</tt> directory instead of the "core" libraries directory, where it was previously installed. So you should be sure to remove the old version of <tt>fox.so</tt> before installing and using this one.</p><p>The other change to be aware of is that there is now a <tt>fox</tt> directory containing FXRuby library scripts, and the <tt>responder.rb</tt> module is the first entry for this directory. You can import this file into your Ruby scripts with the line:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">require 'fox/responder'</pre></td></tr></table><p>and it's no longer necessary to drag copies of that file around.</p></li><li style="list-style-type: disc"><p>Aliased the <tt>getText</tt> instance method to <tt>to_s</tt> for a number of classes. This change should make things a little more convenient when inspecting the contents of widgets whose primary purpose is text entry or display. Thanks to Barry Shultz for this suggestion.</p></li><li style="list-style-type: disc"><p>Added the <tt>FXWindow#removeChild</tt> method for removing child widgets from a container window. This method doesn't exist for the C++ <tt>FXWindow</tt> class because it isn't needed; in C++ programs you simply delete the C++ object and it automatically gets removed from its parent. Note that after you call <tt>FXWindow#removeChild</tt> any outstanding references to the recently deceased child widget are invalid and should be set to <tt>nil</tt> or otherwise disposed of. Thanks to Ted Meng for noticing this omission.</p></li><li style="list-style-type: disc"><p>Modified some of the OpenGL method calls in <tt>gltest.rb</tt> for compatibility with Ruby/OpenGL 0.32. You should now be able to use Ruby/OpenGL with FXRuby unmodified.</p></li><li style="list-style-type: disc"><p>Added <tt>each()</tt> instance methods for <tt>FXComboBox</tt>, <tt>FXGLGroup</tt>, <tt>FXHeader</tt>, <tt>FXIconList</tt>, <tt>FXList</tt>, <tt>FXListBox</tt>, <tt>FXTreeItem</tt>, <tt>FXTreeList</tt> and <tt>FXTreeListBox</tt> in support of iterating over their sub-items. Also mixed the <tt>Enumerable</tt> module into all of these classes.</p></li><li style="list-style-type: disc"><p>Corrected the implementations of <tt>getData()</tt> and <tt>setData()</tt> for a variety of classes. You should now be able to attach arbitrary (application-defined) data to any FOX object that supports these APIs.</p></li><li style="list-style-type: disc"><p>As a debugging tool, you can now optionally catch exceptions raised in message handlers. To turn on this feature, call the <tt>setIgnoreExceptions(true)</tt> module method. When this is enabled, any exceptions raised in message handler functions will cause a standard stack trace to be dumped to the standard output, but then your application will, for better or worse, proceed normally. Thanks to Ted Meng for this suggestion.</p></li><li style="list-style-type: disc"><p>Extended the interfaces for <tt>FXApp#addSignal</tt> and <tt>FXApp#removeSignal</tt> to accept either a string or integer as their first argument. If it's a string (e.g. "SIGINT" or just "INT") the code will determine the corresponding signal number for you (similar to the <tt>Process.kill</tt> module method). For examples of how to use this, see the <tt>datatarget.rb</tt> or <tt>imageviewer.rb</tt> example programs.</p></li><li style="list-style-type: disc"><p>Corrected the implementations of <tt>fxparsefontdesc()</tt> and <tt>fxunparsefontdesc()</tt> module methods.</p></li><li style="list-style-type: disc"><p>Added a pure Ruby implementation of the standard <tt>FXCommand</tt> and <tt>FXUndoList</tt> classes from the standard FOX library.</p></li><li style="list-style-type: disc"><p>Added the <tt>splitter.rb</tt> example, to demonstrate the <tt>FXSplitter</tt> class and its options.</p></li><li style="list-style-type: disc"><p>Completed the initial version of <tt>browser.rb</tt>, which is just a simple tool to inspect the methods and constants exposed by different FOX classes. Thanks to Albert Wagner for pointing out some bugs in this one and providing me with the motivation to complete it. I don't know how useful it is, but it seems to be a required utility for every GUI toolkit for Ruby ;) If you'd like to suggest further improvements, please feel free!</p></li><li style="list-style-type: disc"><p>Corrected the constructors for <tt>FXXPMIcon</tt> and <tt>FXXPMImage</tt> so that they accept a list of strings as their second argument. The list of strings should be an XPM format image file. You can also pass <tt>nil</tt> to construct an initially-empty icon or image.</p></li><li style="list-style-type: disc"><p>Corrected the message data sent by <tt>FXList</tt> to its message target for the <tt>SEL_SELECTED</tt>, <tt>SEL_DESELECTED</tt>, <tt>SEL_INSERTED</tt>, <tt>SEL_DELETED</tt>, and <tt>SEL_REPLACED</tt> messages. For each of these messages, the data should be an integer indicating the affected list item's index.</p></li><li style="list-style-type: disc"><p>Added typemaps to convert Ruby message data back into C++ void pointers when calling the base class versions of message handlers. Please see the to-do list for a brief discussion of the issues that this fix addressed, and what remains to be done.</p></li><li style="list-style-type: disc"><p>Fixed a subtle GC bug related to object ownership. I'll use the <tt>FXList</tt> and <tt>FXListItem</tt> classes to describe the problem, but it's also relevant for several other FOX classes.</p><p>There are two ways to add a new list item to an <tt>FXList</tt> instance. One of those ways involves creating a new <tt>FXListItem</tt> instance explicitly (i.e. using <tt>FXListItem.new</tt>) and then passing it into an <tt>FXList</tt> instance method like <tt>FXList#appendItem</tt>. Before you add the item to the list, the item is "self-owned"; in other words, if Ruby's garbage collector decides to kill off that <tt>FXListItem</tt> instance, it is appropriate to also destroy the underlyi
ng C++ object. After the list item has been added to an <tt>FXList</tt>, however, the <tt>FXList</tt> owns that list item and is responsible for destroying it.</p><p>This bug became an issue when you added <tt>FXListItem</tt> instances to a list, because the code didn't properly recognize the fact that "ownership" of the list item had been transferred from the <tt>FXListItem</tt> instance to the <tt>FXList</tt>. More to the point, Ruby's garbage collector assumed that it was still OK to destroy the <tt>FXListItem</tt> instances that it knew about, and so objects could get deleted twice. This would usually result in a core dump.</p><p>Many thanks to Albert Wagner for submitting an example program that demonstrated this problem.</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="ftp://ftp.fox-toolkit.org/pub/fox-0.99.173.tar.gz" target="_top">fox-0.99.173</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2614"></a>Changes Since Version 0.99.167</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Completed the coding for "safe" coexistence with Ruby's garbage collector; it should no longer be necessary to call <tt>GC.disable</tt> at the top of your FXRuby programs. Although all of the example programs now work correctly without disabling the garbage collector, this doesn't mean that there aren't still some bugs lurking. If your FXRuby program(s) crash mysteriously, try adding <tt>GC.disable</tt> to the top to see if it fixes things. If this does make a difference, <span class="emphasis"><em>please</em></span> send me the program (or another that reproduces the problem) so I can track down what's going wrong.</p></li><li style="list-style-type: disc"><p>Added aliases for all classes' accessor functions so that the related properties can be accessed more directly; for example, <tt>FXLabel#getText</tt> is aliased to <tt>FXLabel#text</tt> and <tt>FXLabel#setText</tt> is aliased to <tt>FXLabel#text=</tt>. Although the different forms are functionally equivalent, the new form is often easier to read. For example, consider this snippet of code that modifies a label's text:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">aLabel.setText(aLabel.getText() + " (modified)")</pre></td></tr></table><p>and this version of the same, now using the propery accessor functions:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">aLabel.text += " (modified)"</pre></td></tr></table><p>None of the standard FOX class APIs have been removed, so you shouldn't need to modify any already-working code.</p></li><li style="list-style-type: disc"><p>Corrected the message data sent from the <tt>FXText</tt> widget to its message target for the <tt>SEL_SELECTED</tt>, <tt>SEL_DESELECTED</tt>, <tt>SEL_INSERTED</tt>, <tt>SEL_DELETED</tt> and <tt>SEL_REPLACED</tt> message types. For the first four messages, the associated message data sent to the target will be an array of two integers indicating the starting position in the text buffer and text length for the affected text. For the <tt>SEL_REPLACED</tt> message type, the message data will be an array of three integers, indicating the starting position in the text buffer, the length of the old (replaced) text, and the length of the new text.</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="ftp://ftp.fox-toolkit.org/pub/fox-0.99.172.tar.gz" target="_top">fox-0.99.172</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2683"></a>Changes Since Version 0.99.166-1</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Corrected the interfaces for <tt>FXInputDialog.getString</tt>, <tt>FXInputDialog.getReal</tt> and <tt>FXInputDialog.getInteger</tt> to either return the requested type or <tt>nil</tt> if the user cancels the dialog.</p></li><li style="list-style-type: disc"><p>Added code at the top of all the examples to disable Ruby's garbage collector, until the issues with GC are resolved.</p></li><li style="list-style-type: disc"><p>Corrected implementations for the overloaded versions of <tt>FXWindow#update</tt>. This method can be invoke with no arguments (in which case it updates the entire window) or with four arguments indicating the x, y, w and h of the client area to be updated.</p></li><li style="list-style-type: disc"><p>Modified how the return values from Ruby message handler functions are interpreted, to make things a little more convenient for programmers. If the result is a numeric type (<tt>Fixnum</tt>, <tt>Bignum</tt> or <tt>Float</tt>) we try to cast it to a long integer but also trap the value to either zero or one. If it's a boolean result we map <tt>false</tt> and <tt>true</tt> to zero and one, respectively. For any other return type (<tt>nil</tt>, strings, etc.) we just assume they meant to return 1. Thanks to Ted Meng for this suggestion.</p></li><li style="list-style-type: disc"><p>Modified the interfaces for <tt>FXFileDialog#getPatternList</tt>, <tt>FXFileSelector#getPatternList</tt>, <tt>FXFileDialog#setPatternList</tt> and <tt>FXFileSelector#setPatternList</tt> to take (or return) an array of strings (one array item per pattern) of the form "C/C++ Files (*.cpp)". This is sort-of a compromise between the currently available overloaded C++ versions of these functions, both of which look pretty awkward in Ruby. For an example of how this works now, see the <tt>imageviewer.rb</tt> example program.</p></li><li style="list-style-type: disc"><p>Added the FOX key cap definitions (i.e. the symbols from <tt>fxkeys.h</tt>) into FXRuby. Thanks to Benedikt Grundmann for pointing out this omission.</p></li><li style="list-style-type: disc"><p>Added initial support for multithreaded FXRuby applications. The current implementation does what is also done in Ruby/GTK; it turns over some idle processing time to the Ruby thread scheduler to let other threads do their thing. As I learn more about Ruby's threading implementation I may try something different, but this seems to work OK for now. As a simple example, I modified the <tt>groupbox.rb</tt> example program so that the clock label that appears in the lower right-hand corner is continuously updated (by a separate thread) instead of just displaying static text.</p><p>If you suspect that FXRuby's threads support is interfering with your application's performance, you may want to try tweaking the amount of time that the main application thread "sleeps" during idle processing; do this by setting the <tt>FXApp</tt> object's <i><tt>sleepTime</tt></i> attribute. The default value for <i><tt>FXApp#sleepTime</tt></i> is 100 milliseconds. You can also disable the threads support completely by calling <tt>FXApp#disableThreads</tt> (and subsequently re-enable it with <tt>FXApp#enableThreads</tt>.</p></li><li style="list-style-type: disc"><p>Started adding <a href="http://homepage1.nifty.com/markey/ruby/rubyunit/index_e.html" target="_top">RubyUnit</a>-style test cases to the <tt>tests</tt> subdirectory. There's not much there yet but we've got to start somewhere!</p></li><li style="list-style-type: disc"><p>Converted most of the documentation over to <a href="http://www.docbook.org" target="_top">DocBook</a> format and reorganized the web page accordingly.</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="ftp://ftp.cfdrc.com/pub/FOX/fox-0.99.167.tar.gz" target="_top">fox-0.99.167</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2800"></a>Changes Since Version 0.99.166</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Corrected a problem with the binary distribution (i.e. the <tt>fox.so</tt> file) for Windows, which made it unusable on most Windows installations. This problem was related to
an incompatibility between the versions of Cygwin that I was using to compile FOX and FXRuby, and the version used to compile the standard Ruby 1.6.2 distribution for Windows. Many, many thanks to Pete, Bene and Robert for helping me to test and resolve this issue!</p></li><li style="list-style-type: disc"><p>Added support for FOX data targets, as demonstrated by the new <tt>datatarget.rb</tt> example in the <tt>examples</tt> directory. A data target is a special kind of FOX object that can be designated as the message target of any widget that has an associated "value", and then the value of the data target and that widget become automatically linked to each other. For example, you can create a data target with a string value and then make it the message target for an <tt>FXTextField</tt> widget. From then on, changes made to the text field will be automatically reflected in the data target's value and vice versa. (For those familiar with Tk, this is the same principal as its <tt>TkVariable</tt> class.)</p></li><li style="list-style-type: disc"><p>Made the <tt>extconf.rb</tt> script a lot more intelligent and robust. Now, if you don't explicitly specify the <tt>--with-fox-include</tt> and <tt>--with-fox-lib</tt> arguments it will look in the standard FOX installation locations (<tt>/usr/local/include/fox</tt> and <tt>/usr/local/lib</tt>, respectively). If it doesn't find the appropriate files there either, it will stop with an error message. The new <tt>extconf.rb</tt> script also compares the FOX version number from the FOX's <tt>fxver.h</tt> file to be sure it's consistent with the version of FXRuby that you're building.</p></li><li style="list-style-type: disc"><p>Re...
[truncated message content] |
|
From: Lyle J. <ly...@us...> - 2002-04-30 19:42:28
|
Update of /cvsroot/fxruby/FXRuby
In directory usw-pr-cvs1:/tmp/cvs-serv3907
Modified Files:
Tag: release10
ChangeLog
Log Message:
Updated change history.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ChangeLog,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -C2 -d -r1.24.2.1 -r1.24.2.2
*** ChangeLog 29 Apr 2002 22:34:38 -0000 1.24.2.1
--- ChangeLog 30 Apr 2002 19:42:23 -0000 1.24.2.2
***************
*** 1,2 ****
--- 1,52 ----
+ 2002-04-30 14:05 lyle
+
+ * setversions.rb, ANNOUNCE, ext/fox/extconf.rb: Updated the FXRuby
+ home page URL to http://www.fxruby.org in the setversions.rb
+ script.
+
+ 2002-04-30 14:02 lyle
+
+ * ext/fox/FXRbApp.cpp, ext/fox/core_wrap.cpp,
+ swig-interfaces/FXApp.i, ext/fox/dialogs_wrap.cpp,
+ ext/fox/icons_wrap.cpp, ext/fox/image_wrap.cpp,
+ ext/fox/layout_wrap.cpp, ext/fox/mdi_wrap.cpp,
+ ext/fox/opengl_wrap.cpp, ext/fox/ui_wrap.cpp,
+ ext/fox/include/FXRbApp.h: Removed the FXApp#enableThreads and
+ FXApp#disableThreads instance methods and replaced with a single
+ method, FXApp#threadsEnabled=, which accepts true or false. This
+ makes the API more consistent with the recently added
+ FXApp#threadsEnabled? instance method.
+
+ 2002-04-30 12:23 lyle
+
+ * fox-includes/fxver.h: Copied latest version of fxver.h (from the
+ FOX 1.0.10 distribution).
+
+ 2002-04-29 21:12 lyle
+
+ * doc/changes.xml, ext/fox/FXRbApp.cpp, ext/fox/core_wrap.cpp,
+ ext/fox/dialogs_wrap.cpp, ext/fox/icons_wrap.cpp,
+ ext/fox/image_wrap.cpp, ext/fox/layout_wrap.cpp,
+ ext/fox/mdi_wrap.cpp, ext/fox/opengl_wrap.cpp,
+ ext/fox/scintilla_wrap.cpp, ext/fox/ui_wrap.cpp,
+ ext/fox/include/FXRbApp.h, rdoc-sources/FXApp.rb,
+ swig-interfaces/FXApp.i: Added the FXApp#threadsEnabled? instance
+ method, to see if they are.
+
+ 2002-04-29 20:54 lyle
+
+ * ext/fox/include/FXRuby.h: Fixed the bug in overloaded to_ruby()
+ functions:
+
+ VALUE to_ruby(FXObject*);
+ VALUE to_ruby(const FXObject*);
+
+ for the case where the input pointer is NULL. Should return Qnil in
+ those cases. See SF Bug #550417.
+
+ 2002-04-29 17:34 lyle
+
+ * ChangeLog: [no log message]
+
2002-04-29 17:23 lyle
|
|
From: Lyle J. <ly...@us...> - 2002-04-30 19:08:03
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv25348/ext/fox
Modified Files:
Tag: release10
extconf.rb
Log Message:
Updated the FXRuby home page URL to http://www.fxruby.org in the
setversions.rb script.
Index: extconf.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/extconf.rb,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -C2 -d -r1.27 -r1.27.2.1
*** extconf.rb 21 Mar 2002 23:00:40 -0000 1.27
--- extconf.rb 30 Apr 2002 19:05:50 -0000 1.27.2.1
***************
*** 56,63 ****
# Verify version number for FOX from the installed header files
installedVer = getInstalledFOXVersion().split('.')
! thisVer = "1.0.3".split('.')
if (installedVer[0] != thisVer[0]) || (installedVer[1] != thisVer[1])
puts "The version number for this installation of FOX appears to be inconsistent"
! puts "with this release of FXRuby (1.0.3)."
exit
end
--- 56,63 ----
# Verify version number for FOX from the installed header files
installedVer = getInstalledFOXVersion().split('.')
! thisVer = "1.0.10".split('.')
if (installedVer[0] != thisVer[0]) || (installedVer[1] != thisVer[1])
puts "The version number for this installation of FOX appears to be inconsistent"
! puts "with this release of FXRuby (1.0.10)."
exit
end
|
