fxruby-commits Mailing List for FXRuby (Page 10)
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-04-24 03:31:01
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv14639a
Modified Files:
Tag: release10
core_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
retrieving revision 1.62.2.1
diff -C2 -d -r1.62 -r1.62.2.1
*** core_wrap.cpp 3 Apr 2002 21:40:27 -0000 1.62
--- core_wrap.cpp 24 Apr 2002 03:30:52 -0000 1.62.2.1
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
***************
*** 330,372 ****
#define SWIGTYPE_p_FXBitmap swig_types[30]
#define SWIGTYPE_p_FXRectangle swig_types[31]
! #define SWIGTYPE_p_FXString swig_types[32]
! #define SWIGTYPE_p_FXPoint swig_types[33]
! #define SWIGTYPE_p_FXFileDict swig_types[34]
! #define SWIGTYPE_p_FXDCWindow swig_types[35]
! #define SWIGTYPE_p_FXRbDCWindow swig_types[36]
! #define SWIGTYPE_p_FXRbFileDict swig_types[37]
! #define SWIGTYPE_p_FXDebugTarget swig_types[38]
! #define SWIGTYPE_p_FXDataTarget swig_types[39]
! #define SWIGTYPE_p_FXRbDataTarget swig_types[40]
! #define SWIGTYPE_p_FXRbDebugTarget swig_types[41]
! #define SWIGTYPE_p_FXRbDelegator swig_types[42]
! #define SWIGTYPE_p_FXDelegator swig_types[43]
! #define SWIGTYPE_p_FXDrawable swig_types[44]
! #define SWIGTYPE_p_FXGIFCursor swig_types[45]
! #define SWIGTYPE_p_FXCursor swig_types[46]
! #define SWIGTYPE_p_FXCURCursor swig_types[47]
! #define SWIGTYPE_p_FXRbCursor swig_types[48]
! #define SWIGTYPE_p_FXRbCURCursor swig_types[49]
! #define SWIGTYPE_p_FXRbGIFCursor swig_types[50]
! #define SWIGTYPE_p_FXRbDrawable swig_types[51]
! #define SWIGTYPE_p_FXStream swig_types[52]
! #define SWIGTYPE_p_FXFontDesc swig_types[53]
! #define SWIGTYPE_p_FXApp swig_types[54]
! #define SWIGTYPE_p_FXChore swig_types[55]
! #define SWIGTYPE_p_FXRegion swig_types[56]
! #define SWIGTYPE_p_FXSize swig_types[57]
! #define SWIGTYPE_p_FXFont swig_types[58]
! #define SWIGTYPE_p_FXRbApp swig_types[59]
! #define SWIGTYPE_p_FXSegment swig_types[60]
! #define SWIGTYPE_p_FXRbDC swig_types[61]
! #define SWIGTYPE_p_FXFileAssoc swig_types[62]
! #define SWIGTYPE_p_FXPrinter swig_types[63]
! #define SWIGTYPE_p_FXVisual swig_types[64]
! #define SWIGTYPE_p_FXRbVisual swig_types[65]
! #define SWIGTYPE_p_FXRbFont swig_types[66]
! #define SWIGTYPE_p_FXMemoryStream swig_types[67]
! #define SWIGTYPE_p_FXFileStream swig_types[68]
! #define SWIGTYPE_p_FXDC swig_types[69]
! #define SWIGTYPE_p_FXuint swig_types[70]
static swig_type_info *swig_types[71];
--- 330,371 ----
#define SWIGTYPE_p_FXBitmap swig_types[30]
#define SWIGTYPE_p_FXRectangle swig_types[31]
! #define SWIGTYPE_p_FXPoint swig_types[32]
! #define SWIGTYPE_p_FXFileDict swig_types[33]
! #define SWIGTYPE_p_FXDCWindow swig_types[34]
! #define SWIGTYPE_p_FXRbDCWindow swig_types[35]
! #define SWIGTYPE_p_FXRbFileDict swig_types[36]
! #define SWIGTYPE_p_FXDebugTarget swig_types[37]
! #define SWIGTYPE_p_FXDataTarget swig_types[38]
! #define SWIGTYPE_p_FXRbDataTarget swig_types[39]
! #define SWIGTYPE_p_FXRbDebugTarget swig_types[40]
! #define SWIGTYPE_p_FXRbDelegator swig_types[41]
! #define SWIGTYPE_p_FXDelegator swig_types[42]
! #define SWIGTYPE_p_FXDrawable swig_types[43]
! #define SWIGTYPE_p_FXGIFCursor swig_types[44]
! #define SWIGTYPE_p_FXCursor swig_types[45]
! #define SWIGTYPE_p_FXCURCursor swig_types[46]
! #define SWIGTYPE_p_FXRbCursor swig_types[47]
! #define SWIGTYPE_p_FXRbCURCursor swig_types[48]
! #define SWIGTYPE_p_FXRbGIFCursor swig_types[49]
! #define SWIGTYPE_p_FXRbDrawable swig_types[50]
! #define SWIGTYPE_p_FXStream swig_types[51]
! #define SWIGTYPE_p_FXFontDesc swig_types[52]
! #define SWIGTYPE_p_FXApp swig_types[53]
! #define SWIGTYPE_p_FXChore swig_types[54]
! #define SWIGTYPE_p_FXRegion swig_types[55]
! #define SWIGTYPE_p_FXSize swig_types[56]
! #define SWIGTYPE_p_FXFont swig_types[57]
! #define SWIGTYPE_p_FXRbApp swig_types[58]
! #define SWIGTYPE_p_FXSegment swig_types[59]
! #define SWIGTYPE_p_FXRbDC swig_types[60]
! #define SWIGTYPE_p_FXFileAssoc swig_types[61]
! #define SWIGTYPE_p_FXPrinter swig_types[62]
! #define SWIGTYPE_p_FXVisual swig_types[63]
! #define SWIGTYPE_p_FXRbVisual swig_types[64]
! #define SWIGTYPE_p_FXRbFont swig_types[65]
! #define SWIGTYPE_p_FXMemoryStream swig_types[66]
! #define SWIGTYPE_p_FXFileStream swig_types[67]
! #define SWIGTYPE_p_FXDC swig_types[68]
! #define SWIGTYPE_p_FXuint swig_types[69]
static swig_type_info *swig_types[71];
***************
*** 3418,3423 ****
static VALUE
_wrap_FXRegistry_initialize(int argc, VALUE *argv, VALUE self) {
! FXString *arg1 = (FXString *) &FXString::null ;
! FXString *arg2 = (FXString *) &FXString::null ;
FXRegistry *result;
--- 3417,3424 ----
static VALUE
_wrap_FXRegistry_initialize(int argc, VALUE *argv, VALUE self) {
! FXString const &arg1_defvalue = FXString::null ;
! FXString *arg1 = (FXString *) &arg1_defvalue ;
! FXString const &arg2_defvalue = FXString::null ;
! FXString *arg2 = (FXString *) &arg2_defvalue ;
FXRegistry *result;
***************
*** 4316,4320 ****
_wrap_FXEvent_text_get(int argc, VALUE *argv, VALUE self) {
FXEvent *arg1 ;
! FXString *result;
VALUE vresult = Qnil;
--- 4317,4321 ----
_wrap_FXEvent_text_get(int argc, VALUE *argv, VALUE self) {
FXEvent *arg1 ;
! FXString result;
VALUE vresult = Qnil;
***************
*** 4322,4328 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXEvent *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXEvent);
! result = (FXString *)& (arg1->text);
! vresult = rb_str_new2(result->text());
return vresult;
}
--- 4323,4329 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXEvent *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXEvent);
! result = (arg1->text);
! vresult = rb_str_new2((&result)->text());
return vresult;
}
***************
*** 9257,9261 ****
FXRegion *arg1 ;
FXRegion *arg2 ;
! SwigValueWrapper<FXRegion> result;
VALUE vresult = Qnil;
--- 9258,9262 ----
FXRegion *arg1 ;
FXRegion *arg2 ;
! SwigValueWrapper< FXRegion > result;
VALUE vresult = Qnil;
***************
*** 9278,9282 ****
FXRegion *arg1 ;
FXRegion *arg2 ;
! SwigValueWrapper<FXRegion> result;
VALUE vresult = Qnil;
--- 9279,9283 ----
FXRegion *arg1 ;
FXRegion *arg2 ;
! SwigValueWrapper< FXRegion > result;
VALUE vresult = Qnil;
***************
*** 9299,9303 ****
FXRegion *arg1 ;
FXRegion *arg2 ;
! SwigValueWrapper<FXRegion> result;
VALUE vresult = Qnil;
--- 9300,9304 ----
FXRegion *arg1 ;
FXRegion *arg2 ;
! SwigValueWrapper< FXRegion > result;
VALUE vresult = Qnil;
***************
*** 9320,9324 ****
FXRegion *arg1 ;
FXRegion *arg2 ;
! SwigValueWrapper<FXRegion> result;
VALUE vresult = Qnil;
--- 9321,9325 ----
FXRegion *arg1 ;
FXRegion *arg2 ;
! SwigValueWrapper< FXRegion > result;
VALUE vresult = Qnil;
***************
*** 13907,13917 ****
_wrap_FXPrinter_name_set(int argc, VALUE *argv, VALUE self) {
FXPrinter *arg1 ;
! FXString *arg2 ;
if ((argc < 1) || (argc > 1))
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXPrinter *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXPrinter);
! arg2 = (FXString *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXString);
! if (arg1) arg1->name = *arg2;
return Qnil;
--- 13908,13925 ----
_wrap_FXPrinter_name_set(int argc, VALUE *argv, VALUE self) {
FXPrinter *arg1 ;
! FXString arg2 ;
if ((argc < 1) || (argc > 1))
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXPrinter *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXPrinter);
! {
! if (argv[0] != Qnil) {
! Check_Type(argv[0], T_STRING);
! arg2 = FXString(STR2CSTR(argv[0]));
! }else {
! arg2 = FXString::null;
! }
! }
! if (arg1) arg1->name = arg2;
return Qnil;
***************
*** 13922,13926 ****
_wrap_FXPrinter_name_get(int argc, VALUE *argv, VALUE self) {
FXPrinter *arg1 ;
! FXString *result;
VALUE vresult = Qnil;
--- 13930,13934 ----
_wrap_FXPrinter_name_get(int argc, VALUE *argv, VALUE self) {
FXPrinter *arg1 ;
! FXString result;
VALUE vresult = Qnil;
***************
*** 13928,13934 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXPrinter *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXPrinter);
! result = (FXString *)& (arg1->name);
! vresult = rb_str_new2(result->text());
return vresult;
}
--- 13936,13942 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXPrinter *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXPrinter);
! result = (arg1->name);
! vresult = rb_str_new2((&result)->text());
return vresult;
}
***************
*** 15684,15694 ****
_wrap_FXFileAssoc_command_set(int argc, VALUE *argv, VALUE self) {
FXFileAssoc *arg1 ;
! FXString *arg2 ;
if ((argc < 1) || (argc > 1))
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXFileAssoc *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXFileAssoc);
! arg2 = (FXString *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXString);
! if (arg1) arg1->command = *arg2;
return Qnil;
--- 15692,15709 ----
_wrap_FXFileAssoc_command_set(int argc, VALUE *argv, VALUE self) {
FXFileAssoc *arg1 ;
! FXString arg2 ;
if ((argc < 1) || (argc > 1))
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXFileAssoc *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXFileAssoc);
! {
! if (argv[0] != Qnil) {
! Check_Type(argv[0], T_STRING);
! arg2 = FXString(STR2CSTR(argv[0]));
! }else {
! arg2 = FXString::null;
! }
! }
! if (arg1) arg1->command = arg2;
return Qnil;
***************
*** 15699,15703 ****
_wrap_FXFileAssoc_command_get(int argc, VALUE *argv, VALUE self) {
FXFileAssoc *arg1 ;
! FXString *result;
VALUE vresult = Qnil;
--- 15714,15718 ----
_wrap_FXFileAssoc_command_get(int argc, VALUE *argv, VALUE self) {
FXFileAssoc *arg1 ;
! FXString result;
VALUE vresult = Qnil;
***************
*** 15705,15711 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXFileAssoc *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXFileAssoc);
! result = (FXString *)& (arg1->command);
! vresult = rb_str_new2(result->text());
return vresult;
}
--- 15720,15726 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXFileAssoc *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXFileAssoc);
! result = (arg1->command);
! vresult = rb_str_new2((&result)->text());
return vresult;
}
***************
*** 15715,15725 ****
_wrap_FXFileAssoc_extension_set(int argc, VALUE *argv, VALUE self) {
FXFileAssoc *arg1 ;
! FXString *arg2 ;
if ((argc < 1) || (argc > 1))
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXFileAssoc *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXFileAssoc);
! arg2 = (FXString *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXString);
! if (arg1) arg1->extension = *arg2;
return Qnil;
--- 15730,15747 ----
_wrap_FXFileAssoc_extension_set(int argc, VALUE *argv, VALUE self) {
FXFileAssoc *arg1 ;
! FXString arg2 ;
if ((argc < 1) || (argc > 1))
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXFileAssoc *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXFileAssoc);
! {
! if (argv[0] != Qnil) {
! Check_Type(argv[0], T_STRING);
! arg2 = FXString(STR2CSTR(argv[0]));
! }else {
! arg2 = FXString::null;
! }
! }
! if (arg1) arg1->extension = arg2;
return Qnil;
***************
*** 15730,15734 ****
_wrap_FXFileAssoc_extension_get(int argc, VALUE *argv, VALUE self) {
FXFileAssoc *arg1 ;
! FXString *result;
VALUE vresult = Qnil;
--- 15752,15756 ----
_wrap_FXFileAssoc_extension_get(int argc, VALUE *argv, VALUE self) {
FXFileAssoc *arg1 ;
! FXString result;
VALUE vresult = Qnil;
***************
*** 15736,15742 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXFileAssoc *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXFileAssoc);
! result = (FXString *)& (arg1->extension);
! vresult = rb_str_new2(result->text());
return vresult;
}
--- 15758,15764 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXFileAssoc *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXFileAssoc);
! result = (arg1->extension);
! vresult = rb_str_new2((&result)->text());
return vresult;
}
***************
*** 15746,15756 ****
_wrap_FXFileAssoc_mimetype_set(int argc, VALUE *argv, VALUE self) {
FXFileAssoc *arg1 ;
! FXString *arg2 ;
if ((argc < 1) || (argc > 1))
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXFileAssoc *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXFileAssoc);
! arg2 = (FXString *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXString);
! if (arg1) arg1->mimetype = *arg2;
return Qnil;
--- 15768,15785 ----
_wrap_FXFileAssoc_mimetype_set(int argc, VALUE *argv, VALUE self) {
FXFileAssoc *arg1 ;
! FXString arg2 ;
if ((argc < 1) || (argc > 1))
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXFileAssoc *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXFileAssoc);
! {
! if (argv[0] != Qnil) {
! Check_Type(argv[0], T_STRING);
! arg2 = FXString(STR2CSTR(argv[0]));
! }else {
! arg2 = FXString::null;
! }
! }
! if (arg1) arg1->mimetype = arg2;
return Qnil;
***************
*** 15761,15765 ****
_wrap_FXFileAssoc_mimetype_get(int argc, VALUE *argv, VALUE self) {
FXFileAssoc *arg1 ;
! FXString *result;
VALUE vresult = Qnil;
--- 15790,15794 ----
_wrap_FXFileAssoc_mimetype_get(int argc, VALUE *argv, VALUE self) {
FXFileAssoc *arg1 ;
! FXString result;
VALUE vresult = Qnil;
***************
*** 15767,15773 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXFileAssoc *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXFileAssoc);
! result = (FXString *)& (arg1->mimetype);
! vresult = rb_str_new2(result->text());
return vresult;
}
--- 15796,15802 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXFileAssoc *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXFileAssoc);
! result = (arg1->mimetype);
! vresult = rb_str_new2((&result)->text());
return vresult;
}
***************
*** 15989,15993 ****
_wrap_FX_IconDict_initialize(int argc, VALUE *argv, VALUE self) {
FXApp *arg1 ;
! FXString *arg2 = (FXString *) &FXIconDict::defaultIconPath ;
FXIconDict *result;
--- 16018,16023 ----
_wrap_FX_IconDict_initialize(int argc, VALUE *argv, VALUE self) {
FXApp *arg1 ;
! FXString const &arg2_defvalue = FXIconDict::defaultIconPath ;
! FXString *arg2 = (FXString *) &arg2_defvalue ;
FXIconDict *result;
***************
*** 16138,16142 ****
_wrap_FXIconDict_initialize(int argc, VALUE *argv, VALUE self) {
FXApp *arg1 ;
! FXString *arg2 = (FXString *) &FXIconDict::defaultIconPath ;
FXRbIconDict *result;
--- 16168,16173 ----
_wrap_FXIconDict_initialize(int argc, VALUE *argv, VALUE self) {
FXApp *arg1 ;
! FXString const &arg2_defvalue = FXIconDict::defaultIconPath ;
! FXString *arg2 = (FXString *) &arg2_defvalue ;
FXRbIconDict *result;
***************
*** 17674,17678 ****
static swig_type_info _swigt__p_FXBitmap[] = {{"_p_FXBitmap", 0, "FXBitmap *"},{"_p_FXBitmap"},{0}};
static swig_type_info _swigt__p_FXRectangle[] = {{"_p_FXRectangle", 0, "FXRectangle *"},{"_p_FXRectangle"},{0}};
- static swig_type_info _swigt__p_FXString[] = {{"_p_FXString", 0, "FXString *"},{"_p_FXString"},{0}};
static swig_type_info _swigt__p_FXPoint[] = {{"_p_FXPoint", 0, "FXPoint *"},{"_p_FXPoint"},{0}};
static swig_type_info _swigt__p_FXFileDict[] = {{"_p_FXFileDict", 0, "FXFileDict *"},{"_p_FXFileDict"},{"_p_FXRbFileDict", _p_FXRbFileDictTo_p_FXFileDict},{0}};
--- 17705,17708 ----
***************
*** 17747,17751 ****
_swigt__p_FXBitmap,
_swigt__p_FXRectangle,
- _swigt__p_FXString,
_swigt__p_FXPoint,
_swigt__p_FXFileDict,
--- 17777,17780 ----
Index: scintilla_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/scintilla_wrap.cpp,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -d -r1.16 -r1.16.2.1
*** scintilla_wrap.cpp 2 Apr 2002 23:30:45 -0000 1.16
--- scintilla_wrap.cpp 24 Apr 2002 03:30:57 -0000 1.16.2.1
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
***************
*** 309,313 ****
#define SWIGTYPE_p_FXRbScintilla swig_types[9]
#define SWIGTYPE_p_FXStream swig_types[10]
! static swig_type_info *swig_types[11];
/* -------- TYPES TABLE (END) -------- */
--- 309,313 ----
#define SWIGTYPE_p_FXRbScintilla swig_types[9]
#define SWIGTYPE_p_FXStream swig_types[10]
! static swig_type_info *swig_types[12];
/* -------- TYPES TABLE (END) -------- */
***************
*** 421,425 ****
_wrap_SCNotification_nmhdr_get(int argc, VALUE *argv, VALUE self) {
SCNotification *arg1 ;
! struct NotifyHeader *result;
VALUE vresult = Qnil;
--- 421,425 ----
_wrap_SCNotification_nmhdr_get(int argc, VALUE *argv, VALUE self) {
SCNotification *arg1 ;
! struct NotifyHeader result;
VALUE vresult = Qnil;
***************
*** 427,433 ****
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (struct NotifyHeader *)& (arg1->nmhdr);
! vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_NotifyHeader,0);
return vresult;
}
--- 427,437 ----
rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (SCNotification *) SWIG_ConvertPtr(self, SWIGTYPE_p_SCNotification);
! result = (arg1->nmhdr);
! {
! struct NotifyHeader * resultptr;
! resultptr = new struct NotifyHeader (result);
! vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_NotifyHeader, 1);
! }
return vresult;
}
Index: ui_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** ui_wrap.cpp 2 Apr 2002 23:30:45 -0000 1.9
--- ui_wrap.cpp 24 Apr 2002 03:30:57 -0000 1.9.2.1
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
***************
*** 467,471 ****
#define SWIGTYPE_p_FXProgressBar swig_types[167]
#define SWIGTYPE_p_FXRbProgressBar swig_types[168]
! static swig_type_info *swig_types[169];
/* -------- TYPES TABLE (END) -------- */
--- 467,471 ----
#define SWIGTYPE_p_FXProgressBar swig_types[167]
#define SWIGTYPE_p_FXRbProgressBar swig_types[168]
! static swig_type_info *swig_types[170];
/* -------- TYPES TABLE (END) -------- */
|
|
From: Lyle J. <ly...@us...> - 2002-04-24 03:23:20
|
Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv13375
Modified Files:
Tag: release10
fxver.h
Log Message:
Index: fxver.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/fxver.h,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -d -r1.24 -r1.24.2.1
*** fxver.h 3 Apr 2002 23:24:07 -0000 1.24
--- fxver.h 24 Apr 2002 03:23:16 -0000 1.24.2.1
***************
*** 6,10 ****
#define FOX_MAJOR 1
#define FOX_MINOR 0
! #define FOX_LEVEL 5
--- 6,10 ----
#define FOX_MAJOR 1
#define FOX_MINOR 0
! #define FOX_LEVEL 8
|
|
From: Lyle J. <ly...@us...> - 2002-04-24 03:04:46
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv9872
Modified Files:
Tag: release10
FXScintilla.i
Log Message:
Replaced %readonly and %readwrite directives with %immutable and
%mutable.
Index: FXScintilla.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXScintilla.i,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** FXScintilla.i 24 Apr 2002 02:55:21 -0000 1.9.2.1
--- FXScintilla.i 24 Apr 2002 03:04:43 -0000 1.9.2.2
***************
*** 31,35 ****
// Struct definition from Scintilla.h
struct SCNotification {
! %readonly
struct NotifyHeader nmhdr;
int position; // SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND
--- 31,35 ----
// Struct definition from Scintilla.h
struct SCNotification {
! %immutable;
struct NotifyHeader nmhdr;
int position; // SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND
***************
*** 60,64 ****
int x; // SCN_DWELLSTART, SCN_DWELLEND
int y; // SCN_DWELLSTART, SCN_DWELLEND
! %readwrite
%addmethods {
VALUE wParam() const {
--- 60,64 ----
int x; // SCN_DWELLSTART, SCN_DWELLEND
int y; // SCN_DWELLSTART, SCN_DWELLEND
! %mutable;
%addmethods {
VALUE wParam() const {
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv9750
Modified Files:
Tag: release10
dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp layout_wrap.cpp
mdi_wrap.cpp opengl_wrap.cpp
Log Message:
Index: dialogs_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -C2 -d -r1.34 -r1.34.2.1
*** dialogs_wrap.cpp 2 Apr 2002 23:30:43 -0000 1.34
--- dialogs_wrap.cpp 24 Apr 2002 03:03:53 -0000 1.34.2.1
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
***************
*** 332,336 ****
#define SWIGTYPE_p_FXFontDialog swig_types[32]
#define SWIGTYPE_p_FXSearchDialog swig_types[33]
! static swig_type_info *swig_types[34];
/* -------- TYPES TABLE (END) -------- */
--- 332,336 ----
#define SWIGTYPE_p_FXFontDialog swig_types[32]
#define SWIGTYPE_p_FXSearchDialog swig_types[33]
! static swig_type_info *swig_types[35];
/* -------- TYPES TABLE (END) -------- */
***************
*** 2615,2619 ****
FXString *arg2 ;
FXString *arg3 ;
! FXString *arg4 = (FXString *) &"*" ;
FXint arg5 = 0 ;
FXString result;
--- 2615,2620 ----
FXString *arg2 ;
FXString *arg3 ;
! FXString const &arg4_defvalue = "*" ;
! FXString *arg4 = (FXString *) &arg4_defvalue ;
FXint arg5 = 0 ;
FXString result;
***************
*** 2667,2671 ****
FXString *arg2 ;
FXString *arg3 ;
! FXString *arg4 = (FXString *) &"*" ;
FXint arg5 = 0 ;
VALUE result;
--- 2668,2673 ----
FXString *arg2 ;
FXString *arg3 ;
! FXString const &arg4_defvalue = "*" ;
! FXString *arg4 = (FXString *) &arg4_defvalue ;
FXint arg5 = 0 ;
VALUE result;
***************
*** 2719,2723 ****
FXString *arg2 ;
FXString *arg3 ;
! FXString *arg4 = (FXString *) &"*" ;
FXint arg5 = 0 ;
FXString result;
--- 2721,2726 ----
FXString *arg2 ;
FXString *arg3 ;
! FXString const &arg4_defvalue = "*" ;
! FXString *arg4 = (FXString *) &arg4_defvalue ;
FXint arg5 = 0 ;
FXString result;
Index: icons_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -C2 -d -r1.37 -r1.37.2.1
*** icons_wrap.cpp 2 Apr 2002 23:30:43 -0000 1.37
--- icons_wrap.cpp 24 Apr 2002 03:03:54 -0000 1.37.2.1
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
***************
*** 326,330 ****
#define SWIGTYPE_p_FXRbPNGIcon swig_types[26]
#define SWIGTYPE_p_FXImage swig_types[27]
! static swig_type_info *swig_types[28];
/* -------- TYPES TABLE (END) -------- */
--- 326,330 ----
#define SWIGTYPE_p_FXRbPNGIcon swig_types[26]
#define SWIGTYPE_p_FXImage swig_types[27]
! static swig_type_info *swig_types[29];
/* -------- TYPES TABLE (END) -------- */
Index: image_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -C2 -d -r1.39 -r1.39.2.1
*** image_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.39
--- image_wrap.cpp 24 Apr 2002 03:03:55 -0000 1.39.2.1
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
***************
*** 327,331 ****
#define SWIGTYPE_p_FXTGAImage swig_types[27]
#define SWIGTYPE_p_FXRbTGAImage swig_types[28]
! static swig_type_info *swig_types[29];
/* -------- TYPES TABLE (END) -------- */
--- 327,331 ----
#define SWIGTYPE_p_FXTGAImage swig_types[27]
#define SWIGTYPE_p_FXRbTGAImage swig_types[28]
! static swig_type_info *swig_types[30];
/* -------- TYPES TABLE (END) -------- */
Index: layout_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** layout_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.8
--- layout_wrap.cpp 24 Apr 2002 03:03:56 -0000 1.8.2.1
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
***************
*** 327,331 ****
#define SWIGTYPE_p_FXSwitcher swig_types[27]
#define SWIGTYPE_p_FXRbSwitcher swig_types[28]
! static swig_type_info *swig_types[29];
/* -------- TYPES TABLE (END) -------- */
--- 327,331 ----
#define SWIGTYPE_p_FXSwitcher swig_types[27]
#define SWIGTYPE_p_FXRbSwitcher swig_types[28]
! static swig_type_info *swig_types[30];
/* -------- TYPES TABLE (END) -------- */
Index: mdi_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -C2 -d -r1.36 -r1.36.2.1
*** mdi_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.36
--- mdi_wrap.cpp 24 Apr 2002 03:03:57 -0000 1.36.2.1
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
***************
*** 330,334 ****
#define SWIGTYPE_p_FXIcon swig_types[30]
#define SWIGTYPE_p_FXMenuPane swig_types[31]
! static swig_type_info *swig_types[32];
/* -------- TYPES TABLE (END) -------- */
--- 330,334 ----
#define SWIGTYPE_p_FXIcon swig_types[30]
#define SWIGTYPE_p_FXMenuPane swig_types[31]
! static swig_type_info *swig_types[33];
/* -------- TYPES TABLE (END) -------- */
Index: opengl_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -C2 -d -r1.41 -r1.41.2.1
*** opengl_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.41
--- opengl_wrap.cpp 24 Apr 2002 03:03:57 -0000 1.41.2.1
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
***************
*** 332,336 ****
#define SWIGTYPE_p_FXHVec swig_types[32]
#define SWIGTYPE_p_FXuint swig_types[33]
! static swig_type_info *swig_types[34];
/* -------- TYPES TABLE (END) -------- */
--- 332,336 ----
#define SWIGTYPE_p_FXHVec swig_types[32]
#define SWIGTYPE_p_FXuint swig_types[33]
! static swig_type_info *swig_types[35];
/* -------- TYPES TABLE (END) -------- */
***************
*** 859,863 ****
_wrap_FXVec___neg__(int argc, VALUE *argv, VALUE self) {
FXVec *arg1 ;
! FXVec result;
VALUE vresult = Qnil;
--- 859,863 ----
_wrap_FXVec___neg__(int argc, VALUE *argv, VALUE self) {
FXVec *arg1 ;
! SwigValueWrapper< FXVec > result;
VALUE vresult = Qnil;
***************
*** 879,883 ****
FXVec *arg1 ;
FXVec *arg2 ;
! FXVec result;
VALUE vresult = Qnil;
--- 879,883 ----
FXVec *arg1 ;
FXVec *arg2 ;
! SwigValueWrapper< FXVec > result;
VALUE vresult = Qnil;
***************
*** 900,904 ****
FXVec *arg1 ;
FXVec *arg2 ;
! FXVec result;
VALUE vresult = Qnil;
--- 900,904 ----
FXVec *arg1 ;
FXVec *arg2 ;
! SwigValueWrapper< FXVec > result;
VALUE vresult = Qnil;
***************
*** 921,925 ****
FXVec *arg1 ;
FXfloat arg2 ;
! FXVec result;
VALUE vresult = Qnil;
--- 921,925 ----
FXVec *arg1 ;
FXfloat arg2 ;
! SwigValueWrapper< FXVec > result;
VALUE vresult = Qnil;
***************
*** 942,946 ****
FXVec *arg1 ;
FXfloat arg2 ;
! FXVec result;
VALUE vresult = Qnil;
--- 942,946 ----
FXVec *arg1 ;
FXfloat arg2 ;
! SwigValueWrapper< FXVec > result;
VALUE vresult = Qnil;
***************
*** 981,985 ****
FXVec *arg1 ;
FXVec *arg2 ;
! FXVec result;
VALUE vresult = Qnil;
--- 981,985 ----
FXVec *arg1 ;
FXVec *arg2 ;
! SwigValueWrapper< FXVec > result;
VALUE vresult = Qnil;
***************
*** 1017,1021 ****
_wrap_FXVec_normalize(int argc, VALUE *argv, VALUE self) {
FXVec *arg1 ;
! FXVec result;
VALUE vresult = Qnil;
--- 1017,1021 ----
_wrap_FXVec_normalize(int argc, VALUE *argv, VALUE self) {
FXVec *arg1 ;
! SwigValueWrapper< FXVec > result;
VALUE vresult = Qnil;
***************
*** 1037,1041 ****
FXVec *arg1 ;
FXVec *arg2 ;
! FXVec result;
VALUE vresult = Qnil;
--- 1037,1041 ----
FXVec *arg1 ;
FXVec *arg2 ;
! SwigValueWrapper< FXVec > result;
VALUE vresult = Qnil;
***************
*** 1058,1062 ****
FXVec *arg1 ;
FXVec *arg2 ;
! FXVec result;
VALUE vresult = Qnil;
--- 1058,1062 ----
FXVec *arg1 ;
FXVec *arg2 ;
! SwigValueWrapper< FXVec > result;
VALUE vresult = Qnil;
***************
*** 1178,1182 ****
_wrap_FXHVec___neg__(int argc, VALUE *argv, VALUE self) {
FXHVec *arg1 ;
! SwigValueWrapper<FXHVec> result;
VALUE vresult = Qnil;
--- 1178,1182 ----
_wrap_FXHVec___neg__(int argc, VALUE *argv, VALUE self) {
FXHVec *arg1 ;
! SwigValueWrapper< FXHVec > result;
VALUE vresult = Qnil;
***************
*** 1198,1202 ****
FXHVec *arg1 ;
FXHVec *arg2 ;
! SwigValueWrapper<FXHVec> result;
VALUE vresult = Qnil;
--- 1198,1202 ----
FXHVec *arg1 ;
FXHVec *arg2 ;
! SwigValueWrapper< FXHVec > result;
VALUE vresult = Qnil;
***************
*** 1219,1223 ****
FXHVec *arg1 ;
FXHVec *arg2 ;
! SwigValueWrapper<FXHVec> result;
VALUE vresult = Qnil;
--- 1219,1223 ----
FXHVec *arg1 ;
FXHVec *arg2 ;
! SwigValueWrapper< FXHVec > result;
VALUE vresult = Qnil;
***************
*** 1240,1244 ****
FXHVec *arg1 ;
FXfloat arg2 ;
! SwigValueWrapper<FXHVec> result;
VALUE vresult = Qnil;
--- 1240,1244 ----
FXHVec *arg1 ;
FXfloat arg2 ;
! SwigValueWrapper< FXHVec > result;
VALUE vresult = Qnil;
***************
*** 1261,1265 ****
FXHVec *arg1 ;
FXfloat arg2 ;
! SwigValueWrapper<FXHVec> result;
VALUE vresult = Qnil;
--- 1261,1265 ----
FXHVec *arg1 ;
FXfloat arg2 ;
! SwigValueWrapper< FXHVec > result;
VALUE vresult = Qnil;
***************
*** 1300,1304 ****
FXHVec *arg1 ;
FXHVec *arg2 ;
! SwigValueWrapper<FXHVec> result;
VALUE vresult = Qnil;
--- 1300,1304 ----
FXHVec *arg1 ;
FXHVec *arg2 ;
! SwigValueWrapper< FXHVec > result;
VALUE vresult = Qnil;
***************
*** 1336,1340 ****
_wrap_FXHVec_normalize(int argc, VALUE *argv, VALUE self) {
FXHVec *arg1 ;
! SwigValueWrapper<FXHVec> result;
VALUE vresult = Qnil;
--- 1336,1340 ----
_wrap_FXHVec_normalize(int argc, VALUE *argv, VALUE self) {
FXHVec *arg1 ;
! SwigValueWrapper< FXHVec > result;
VALUE vresult = Qnil;
***************
*** 1356,1360 ****
FXHVec *arg1 ;
FXHVec *arg2 ;
! SwigValueWrapper<FXHVec> result;
VALUE vresult = Qnil;
--- 1356,1360 ----
FXHVec *arg1 ;
FXHVec *arg2 ;
! SwigValueWrapper< FXHVec > result;
VALUE vresult = Qnil;
***************
*** 1377,1381 ****
FXHVec *arg1 ;
FXHVec *arg2 ;
! SwigValueWrapper<FXHVec> result;
VALUE vresult = Qnil;
--- 1377,1381 ----
FXHVec *arg1 ;
FXHVec *arg2 ;
! SwigValueWrapper< FXHVec > result;
VALUE vresult = Qnil;
***************
*** 1502,1506 ****
_wrap_FXQuat_exp(int argc, VALUE *argv, VALUE self) {
FXQuat *arg1 ;
! FXQuat result;
VALUE vresult = Qnil;
--- 1502,1506 ----
_wrap_FXQuat_exp(int argc, VALUE *argv, VALUE self) {
FXQuat *arg1 ;
! SwigValueWrapper< FXQuat > result;
VALUE vresult = Qnil;
***************
*** 1521,1525 ****
_wrap_FXQuat_log(int argc, VALUE *argv, VALUE self) {
FXQuat *arg1 ;
! FXQuat result;
VALUE vresult = Qnil;
--- 1521,1525 ----
_wrap_FXQuat_log(int argc, VALUE *argv, VALUE self) {
FXQuat *arg1 ;
! SwigValueWrapper< FXQuat > result;
VALUE vresult = Qnil;
***************
*** 1540,1544 ****
_wrap_FXQuat_invert(int argc, VALUE *argv, VALUE self) {
FXQuat *arg1 ;
! FXQuat result;
VALUE vresult = Qnil;
--- 1540,1544 ----
_wrap_FXQuat_invert(int argc, VALUE *argv, VALUE self) {
FXQuat *arg1 ;
! SwigValueWrapper< FXQuat > result;
VALUE vresult = Qnil;
***************
*** 1559,1563 ****
_wrap_FXQuat_conj(int argc, VALUE *argv, VALUE self) {
FXQuat *arg1 ;
! FXQuat result;
VALUE vresult = Qnil;
--- 1559,1563 ----
_wrap_FXQuat_conj(int argc, VALUE *argv, VALUE self) {
FXQuat *arg1 ;
! SwigValueWrapper< FXQuat > result;
VALUE vresult = Qnil;
***************
*** 1579,1583 ****
FXQuat *arg1 ;
FXQuat *arg2 ;
! FXQuat result;
VALUE vresult = Qnil;
--- 1579,1583 ----
FXQuat *arg1 ;
FXQuat *arg2 ;
! SwigValueWrapper< FXQuat > result;
VALUE vresult = Qnil;
***************
*** 1600,1604 ****
FXVec *arg1 ;
FXVec *arg2 ;
! FXQuat result;
VALUE vresult = Qnil;
--- 1600,1604 ----
FXVec *arg1 ;
FXVec *arg2 ;
! SwigValueWrapper< FXQuat > result;
VALUE vresult = Qnil;
***************
*** 1622,1626 ****
FXQuat *arg2 ;
FXfloat arg3 ;
! FXQuat result;
VALUE vresult = Qnil;
--- 1622,1626 ----
FXQuat *arg2 ;
FXfloat arg3 ;
! SwigValueWrapper< FXQuat > result;
VALUE vresult = Qnil;
***************
*** 1698,1702 ****
FXHMat *arg1 ;
FXHMat *arg2 ;
! SwigValueWrapper<FXHMat> result;
VALUE vresult = Qnil;
--- 1698,1702 ----
FXHMat *arg1 ;
FXHMat *arg2 ;
! SwigValueWrapper< FXHMat > result;
VALUE vresult = Qnil;
***************
*** 1719,1723 ****
FXHMat *arg1 ;
FXHMat *arg2 ;
! SwigValueWrapper<FXHMat> result;
VALUE vresult = Qnil;
--- 1719,1723 ----
FXHMat *arg1 ;
FXHMat *arg2 ;
! SwigValueWrapper< FXHMat > result;
VALUE vresult = Qnil;
***************
*** 1740,1744 ****
FXHMat *arg1 ;
FXHMat *arg2 ;
! SwigValueWrapper<FXHMat> result;
VALUE vresult = Qnil;
--- 1740,1744 ----
FXHMat *arg1 ;
FXHMat *arg2 ;
! SwigValueWrapper< FXHMat > result;
VALUE vresult = Qnil;
***************
*** 1795,1799 ****
_wrap_FXHMat_transpose(int argc, VALUE *argv, VALUE self) {
FXHMat *arg1 ;
! SwigValueWrapper<FXHMat> result;
VALUE vresult = Qnil;
--- 1795,1799 ----
_wrap_FXHMat_transpose(int argc, VALUE *argv, VALUE self) {
FXHMat *arg1 ;
! SwigValueWrapper< FXHMat > result;
VALUE vresult = Qnil;
***************
*** 1814,1818 ****
_wrap_FXHMat_invert(int argc, VALUE *argv, VALUE self) {
FXHMat *arg1 ;
! SwigValueWrapper<FXHMat> result;
VALUE vresult = Qnil;
--- 1814,1818 ----
_wrap_FXHMat_invert(int argc, VALUE *argv, VALUE self) {
FXHMat *arg1 ;
! SwigValueWrapper< FXHMat > result;
VALUE vresult = Qnil;
***************
*** 2526,2530 ****
FXRange *arg1 ;
FXint arg2 ;
! SwigValueWrapper<FXRangeSlice> result;
VALUE vresult = Qnil;
--- 2526,2530 ----
FXRange *arg1 ;
FXint arg2 ;
! SwigValueWrapper< FXRangeSlice > result;
VALUE vresult = Qnil;
***************
*** 8438,8442 ****
_wrap_FX_GLViewer_getBackgroundColor(int argc, VALUE *argv, VALUE self) {
FXGLViewer *arg1 ;
! SwigValueWrapper<FXHVec> result;
VALUE vresult = Qnil;
--- 8438,8442 ----
_wrap_FX_GLViewer_getBackgroundColor(int argc, VALUE *argv, VALUE self) {
FXGLViewer *arg1 ;
! SwigValueWrapper< FXHVec > result;
VALUE vresult = Qnil;
***************
*** 8472,8476 ****
_wrap_FX_GLViewer_getAmbientColor(int argc, VALUE *argv, VALUE self) {
FXGLViewer *arg1 ;
! SwigValueWrapper<FXHVec> result;
VALUE vresult = Qnil;
--- 8472,8476 ----
_wrap_FX_GLViewer_getAmbientColor(int argc, VALUE *argv, VALUE self) {
FXGLViewer *arg1 ;
! SwigValueWrapper< FXHVec > result;
VALUE vresult = Qnil;
|
|
From: Lyle J. <ly...@us...> - 2002-04-24 02:55:24
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv7727
Modified Files:
Tag: release10
FXApp.i FXScintilla.i
Log Message:
Replaced %readonly and %readwrite directives in SWIG interface files
with new %mutable and %immutable features.
Index: FXApp.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXApp.i,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -C2 -d -r1.38 -r1.38.2.1
*** FXApp.i 26 Mar 2002 21:38:50 -0000 1.38
--- FXApp.i 24 Apr 2002 02:55:21 -0000 1.38.2.1
***************
*** 74,78 ****
/// FOX Event
struct FXEvent {
! %readonly
FXuint type; /// Event type
FXuint time; /// Time of last event
--- 74,78 ----
/// FOX Event
struct FXEvent {
! %immutable;
FXuint type; /// Event type
FXuint time; /// Time of last event
***************
*** 97,101 ****
FXbool synthetic; /// True if synthetic expose event
FXDragType target; /// Target drag type being requested
! %readwrite
};
--- 97,101 ----
FXbool synthetic; /// True if synthetic expose event
FXDragType target; /// Target drag type being requested
! %mutable;
};
Index: FXScintilla.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXScintilla.i,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** FXScintilla.i 19 Mar 2002 23:18:40 -0000 1.9
--- FXScintilla.i 24 Apr 2002 02:55:21 -0000 1.9.2.1
***************
*** 23,30 ****
// Struct definition from Scintilla.h
struct NotifyHeader {
! %readonly
unsigned int idFrom;
unsigned int code;
! %readwrite
};
--- 23,30 ----
// Struct definition from Scintilla.h
struct NotifyHeader {
! %immutable;
unsigned int idFrom;
unsigned int code;
! %mutable;
};
|
|
From: Lyle J. <ly...@us...> - 2002-04-24 02:01:20
|
Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv29490
Modified Files:
Tag: release10
README
Log Message:
Corrected the name of the package in fox-includes/README; it's FXRuby,
not Ruby/FOX.
Index: README
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/README,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** README 12 Jan 2001 18:04:13 -0000 1.1
--- README 24 Apr 2002 02:01:18 -0000 1.1.2.1
***************
*** 1,4 ****
This directory just contains an archived copy of the include files from the
! standard FOX distribution on which this release of Ruby/FOX is based. This
gives the maintainer a good frame of reference for comparing against newer
FOX releases, to see what's changed in the API.
--- 1,4 ----
This directory just contains an archived copy of the include files from the
! standard FOX distribution on which this release of FXRuby is based. This
gives the maintainer a good frame of reference for comparing against newer
FOX releases, to see what's changed in the API.
|
|
From: Lyle J. <ly...@us...> - 2002-04-04 16:44:27
|
Update of /cvsroot/fxruby/FXRuby/examples
In directory usw-pr-cvs1:/tmp/cvs-serv11544
Added Files:
Tag: release10
gdchart.rb
Log Message:
Added a new example that uses the Ruby/GDChart module to create a
chart image and then display it in an FXImageView widget.
--- NEW FILE: gdchart.rb ---
require 'fox'
require 'GDChart'
require 'tempfile'
include Fox
class GDChartViewer < FXMainWindow
def initialize(app)
# Invoke base class initialize first
super(app, "GDChart Viewer", nil, nil, DECOR_ALL,
0, 0, 850, 600, 0, 0)
# Sunken border for image widget
imagebox = FXHorizontalFrame.new(self,
FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y)
# Make image widget
@imageview = FXImageView.new(imagebox, nil, nil, 0,
LAYOUT_FILL_X|LAYOUT_FILL_Y|HSCROLLER_NEVER|VSCROLLER_NEVER)
# Construct a PNG image and store it in the image viewer
@imageview.image = createChart
# Resize main window client area to fit image size
resize(@imageview.contentWidth, @imageview.contentHeight)
end
def createChart
# Create a simple chart
GDChart.title = "A Chart"
GDChart.xtitle = "X-axis"
GDChart.ytitle = "Y-axis"
data = [1, 2, 3, 4, 5, 6]
labels = ["label 1", "label 2", "label 3", "label 4", "label 5", "label 6"]
# Write chart data out as GIF to a temporary file
File.open('gdchart.gif', 'w') do |f|
GDChart.out_graph(200, 200, f, GDChart::LINE, labels.length, labels, 1, data)
end
# Reopen it and construct image
img = nil
File.open('gdchart.gif', 'rb') do |f|
img = FXGIFIcon.new(getApp(), f.read)
end
img
end
def create
super
show(PLACEMENT_SCREEN)
end
end
if __FILE__ == $0
# Make application
application = FXApp.new("GDChart Viewer", "FoxTest")
# Open display
application.init(ARGV)
# Make window
window = GDChartViewer.new(application)
# Create it
application.create
# Run
application.run
end
|
|
From: Lyle J. <ly...@us...> - 2002-04-04 02:14:18
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include In directory usw-pr-cvs1:/tmp/cvs-serv21545 Modified Files: impl.h Log Message: Index: impl.h =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/impl.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** impl.h 25 Feb 2002 22:50:10 -0000 1.7 --- impl.h 4 Apr 2002 02:14:11 -0000 1.8 *************** *** 66,69 **** --- 66,70 ---- FXRbIMPLEMENT(FXRbGIFIcon,FXGIFIcon,NULL,0) FXRbIMPLEMENT(FXRbGIFImage,FXGIFImage,NULL,0) + FXRbIMPLEMENT(FXRbGradientBar,FXGradientBar,NULL,0) FXRbIMPLEMENT(FXRbGroupBox,FXGroupBox,NULL,0) FXRbIMPLEMENT(FXRbHeader,FXHeader,NULL,0) *************** *** 97,101 **** FXRbIMPLEMENT(FXRbMainWindow,FXMainWindow,NULL,0) FXRbIMPLEMENT(FXRbMatrix,FXMatrix,NULL,0) ! FXRbIMPLEMENT(FXRbMenubar,FXMenubar,NULL,0) FXRbIMPLEMENT(FXRbMenuButton,FXMenuButton,NULL,0) FXRbIMPLEMENT(FXRbMenuCaption,FXMenuCaption,NULL,0) --- 98,102 ---- FXRbIMPLEMENT(FXRbMainWindow,FXMainWindow,NULL,0) FXRbIMPLEMENT(FXRbMatrix,FXMatrix,NULL,0) ! FXRbIMPLEMENT(FXRbMenuBar,FXMenuBar,NULL,0) FXRbIMPLEMENT(FXRbMenuButton,FXMenuButton,NULL,0) FXRbIMPLEMENT(FXRbMenuCaption,FXMenuCaption,NULL,0) *************** *** 131,135 **** FXRbIMPLEMENT(FXRbScrollCorner,FXScrollCorner,NULL,0) FXRbIMPLEMENT(FXRbScrollWindow,FXScrollWindow,NULL,0) ! FXRbIMPLEMENT(FXRbScrollbar,FXScrollbar,NULL,0) FXRbIMPLEMENT(FXRbSearchDialog,FXSearchDialog,NULL,0) FXRbIMPLEMENT(FXRbShell,FXShell,NULL,0) --- 132,136 ---- FXRbIMPLEMENT(FXRbScrollCorner,FXScrollCorner,NULL,0) FXRbIMPLEMENT(FXRbScrollWindow,FXScrollWindow,NULL,0) ! FXRbIMPLEMENT(FXRbScrollBar,FXScrollBar,NULL,0) FXRbIMPLEMENT(FXRbSearchDialog,FXSearchDialog,NULL,0) FXRbIMPLEMENT(FXRbShell,FXShell,NULL,0) *************** *** 139,144 **** FXRbIMPLEMENT(FXRbSpinner,FXSpinner,NULL,0) FXRbIMPLEMENT(FXRbSplitter,FXSplitter,NULL,0) ! FXRbIMPLEMENT(FXRbStatusbar,FXStatusbar,NULL,0) ! FXRbIMPLEMENT(FXRbStatusline,FXStatusline,NULL,0) FXRbIMPLEMENT(FXRbStringDict,FXStringDict,NULL,0) FXRbIMPLEMENT(FXRbSwitcher,FXSwitcher,NULL,0) --- 140,145 ---- FXRbIMPLEMENT(FXRbSpinner,FXSpinner,NULL,0) FXRbIMPLEMENT(FXRbSplitter,FXSplitter,NULL,0) ! FXRbIMPLEMENT(FXRbStatusBar,FXStatusBar,NULL,0) ! FXRbIMPLEMENT(FXRbStatusLine,FXStatusLine,NULL,0) FXRbIMPLEMENT(FXRbStringDict,FXStringDict,NULL,0) FXRbIMPLEMENT(FXRbSwitcher,FXSwitcher,NULL,0) *************** *** 155,163 **** FXRbIMPLEMENT(FXRbTIFImage,FXTIFImage,NULL,0) FXRbIMPLEMENT(FXRbToggleButton,FXToggleButton,NULL,0) ! FXRbIMPLEMENT(FXRbToolbar,FXToolbar,NULL,0) ! FXRbIMPLEMENT(FXRbToolbarGrip,FXToolbarGrip,NULL,0) ! FXRbIMPLEMENT(FXRbToolbarShell,FXToolbarShell,NULL,0) ! FXRbIMPLEMENT(FXRbToolbarTab,FXToolbarTab,NULL,0) ! FXRbIMPLEMENT(FXRbTooltip,FXTooltip,NULL,0) FXRbIMPLEMENT(FXRbTopWindow,FXTopWindow,NULL,0) FXRbIMPLEMENT(FXRbTreeItem,FXTreeItem,NULL,0) --- 156,164 ---- FXRbIMPLEMENT(FXRbTIFImage,FXTIFImage,NULL,0) FXRbIMPLEMENT(FXRbToggleButton,FXToggleButton,NULL,0) ! FXRbIMPLEMENT(FXRbToolBar,FXToolBar,NULL,0) ! FXRbIMPLEMENT(FXRbToolBarGrip,FXToolBarGrip,NULL,0) ! FXRbIMPLEMENT(FXRbToolBarShell,FXToolBarShell,NULL,0) ! FXRbIMPLEMENT(FXRbToolBarTab,FXToolBarTab,NULL,0) ! FXRbIMPLEMENT(FXRbToolTip,FXToolTip,NULL,0) FXRbIMPLEMENT(FXRbTopWindow,FXTopWindow,NULL,0) FXRbIMPLEMENT(FXRbTreeItem,FXTreeItem,NULL,0) |
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv20910
Modified Files:
FXRuby.h
Added Files:
FXRbGradientBar.h FXRbMenuBar.h FXRbScrollBar.h
FXRbStatusBar.h FXRbStatusLine.h FXRbToolBar.h
FXRbToolBarGrip.h FXRbToolBarShell.h FXRbToolBarTab.h
FXRbToolBarVirtuals.h FXRbToolTip.h
Removed Files:
FXRbMenubar.h FXRbScrollbar.h FXRbStatusbar.h FXRbStatusline.h
FXRbToolbar.h FXRbToolbarGrip.h FXRbToolbarShell.h
FXRbToolbarTab.h FXRbToolbarVirtuals.h FXRbTooltip.h
Log Message:
Renamed classes like FXRbMenubar => FXRbMenuBar, etc.
Added header file for FXRbGradientBar.
--- NEW FILE: FXRbGradientBar.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: FXRbGradientBar.h,v 1.1 2002/04/04 02:10:48 lyle Exp $
***********************************************************************/
#ifndef FXRBGRADIENTBAR_H
#define FXRBGRADIENTBAR_H
class FXRbGradientBar : public FXGradientBar {
FXDECLARE(FXRbGradientBar)
protected:
FXRbGradientBar(){}
#include "FXRbObjectVirtuals.h"
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
public:
/// Construct a gradient bar
FXRbGradientBar(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=FRAME_NORMAL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=DEFAULT_PAD,FXint pr=DEFAULT_PAD,FXint pt=DEFAULT_PAD,FXint pb=DEFAULT_PAD) : FXGradientBar(p,tgt,sel,opts,x,y,w,h,pl,pr,pt,pb){}
// Mark dependencies for the GC
static void markfunc(FXGradientBar* self);
// Destructor
virtual ~FXRbGradientBar(){
FXRbUnregisterRubyObj(this);
}
};
#endif
--- NEW FILE: FXRbMenuBar.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: FXRbMenuBar.h,v 1.1 2002/04/04 02:10:48 lyle Exp $
***********************************************************************/
#ifndef FXRBMENUBAR_H
#define FXRBMENUBAR_H
class FXRbMenuBar : public FXMenuBar {
FXDECLARE(FXRbMenuBar)
protected:
FXRbMenuBar(){}
#include "FXRbObjectVirtuals.h"
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
#include "FXRbToolbarVirtuals.h"
public:
/**
* Construct a floatable menubar
* Normally, the menubar is docked under window p.
* When floated, the menubar can be docked under window q, which is
* typically an FXToolbarShell window.
*/
FXRbMenuBar(FXComposite* p,FXComposite* q,FXuint opts=LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=3,FXint pr=3,FXint pt=2,FXint pb=2,FXint hs=DEFAULT_SPACING,FXint vs=DEFAULT_SPACING) : FXMenuBar(p,q,opts,x,y,w,h,pl,pr,pt,pb,hs,vs){}
/**
* Construct a non-floatable menubar.
* The menubar can not be undocked.
*/
FXRbMenuBar(FXComposite* p,FXuint opts=LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=3,FXint pr=3,FXint pt=2,FXint pb=2,FXint hs=DEFAULT_SPACING,FXint vs=DEFAULT_SPACING) : FXMenuBar(p,opts,x,y,w,h,pl,pr,pt,pb,hs,vs){}
// Destructor
virtual ~FXRbMenuBar(){
FXRbUnregisterRubyObj(this);
}
// Mark dependencies for the GC
static void markfunc(FXMenuBar* self);
};
#endif
--- NEW FILE: FXRbScrollBar.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: FXRbScrollBar.h,v 1.1 2002/04/04 02:10:48 lyle Exp $
***********************************************************************/
#ifndef FXRBSCROLLBAR_H
#define FXRBSCROLLBAR_H
class FXRbScrollBar : public FXScrollBar {
FXDECLARE(FXRbScrollBar)
protected:
FXRbScrollBar(){}
#include "FXRbObjectVirtuals.h"
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
public:
/// Construct scroll bar
FXRbScrollBar(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=SCROLLBAR_VERTICAL,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXScrollBar(p,tgt,sel,opts,x,y,w,h){}
// Destructor
virtual ~FXRbScrollBar(){
FXRbUnregisterRubyObj(this);
}
// Mark dependencies for the GC
static void markfunc(FXScrollBar* self);
};
class FXRbScrollCorner : public FXScrollCorner {
FXDECLARE(FXRbScrollCorner)
protected:
FXRbScrollCorner(){}
#include "FXRbObjectVirtuals.h"
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
public:
/// Constructor
FXRbScrollCorner(FXComposite* p) : FXScrollCorner(p){}
// Destructor
virtual ~FXRbScrollCorner(){
FXRbUnregisterRubyObj(this);
}
// Mark dependencies for the GC
static void markfunc(FXScrollCorner* self);
};
#endif
--- NEW FILE: FXRbStatusBar.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: FXRbStatusBar.h,v 1.1 2002/04/04 02:10:48 lyle Exp $
***********************************************************************/
#ifndef FXRBSTATUSBAR_H
#define FXRBSTATUSBAR_H
class FXRbStatusBar : public FXStatusBar {
FXDECLARE(FXRbStatusBar)
protected:
FXRbStatusBar(){}
#include "FXRbObjectVirtuals.h"
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
public:
/// Construct status bar with or without a drag corner
FXRbStatusBar(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=3,FXint pr=3,FXint pt=2,FXint pb=2,FXint hs=4,FXint vs=0) : FXStatusBar(p,opts,x,y,w,h,pl,pr,pt,pb,hs,vs){}
// Destructor
virtual ~FXRbStatusBar(){
FXRbUnregisterRubyObj(this);
}
// Mark dependencies for the GC
static void markfunc(FXStatusBar* self);
};
#endif
--- NEW FILE: FXRbStatusLine.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: FXRbStatusLine.h,v 1.1 2002/04/04 02:10:48 lyle Exp $
***********************************************************************/
#ifndef FXRBSTATUSLINE_H
#define FXRBSTATUSLINE_H
class FXRbStatusLine : public FXStatusLine {
FXDECLARE(FXRbStatusLine)
protected:
FXRbStatusLine(){}
#include "FXRbObjectVirtuals.h"
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
public:
/// Constructor
FXRbStatusLine(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0) : FXStatusLine(p,tgt,sel){}
// Destructor
virtual ~FXRbStatusLine(){
FXRbUnregisterRubyObj(this);
}
// Mark dependencies for the GC
static void markfunc(FXStatusLine* self);
};
#endif
--- NEW FILE: FXRbToolBar.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: FXRbToolBar.h,v 1.1 2002/04/04 02:10:48 lyle Exp $
***********************************************************************/
#ifndef FXRBTOOLBAR_H
#define FXRBTOOLBAR_H
#define IMPLEMENT_FXTOOLBAR_STUBS(cls,baseclass) \
void cls::_dock(FXuint side,FXWindow* after){ \
baseclass::dock(side,after); \
} \
void cls::dock(FXuint side,FXWindow* after){ \
FXRbCallVoidMethod(this,"dock",side,after); \
} \
void cls::_undock(){ \
baseclass::undock(); \
} \
void cls::undock(){ \
FXRbCallVoidMethod(this,"undock"); \
}
class FXRbToolBar : public FXToolBar {
FXDECLARE(FXRbToolBar)
protected:
FXRbToolBar(){}
#include "FXRbObjectVirtuals.h"
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
#include "FXRbToolBarVirtuals.h"
public:
/**
* Construct a floatable toolbar
* Normally, the toolbar is docked under window p.
* When floated, the toolbar can be docked under window q, which is
* typically an FXToolBarShell window.
*/
FXRbToolBar(FXComposite* p,FXComposite* q,FXuint opts=LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=3,FXint pr=3,FXint pt=2,FXint pb=2,FXint hs=DEFAULT_SPACING,FXint vs=DEFAULT_SPACING) : FXToolBar(p,q,opts,x,y,w,h,pl,pr,pt,pb,hs,vs){}
/**
* Construct a non-floatable toolbar.
* The toolbar can not be undocked.
*/
FXRbToolBar(FXComposite* p,FXuint opts=LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=2,FXint pr=3,FXint pt=3,FXint pb=2,FXint hs=DEFAULT_SPACING,FXint vs=DEFAULT_SPACING) : FXToolBar(p,opts,x,y,w,h,pl,pr,pt,pb,hs,vs){}
// Destructor
virtual ~FXRbToolBar(){
FXRbUnregisterRubyObj(this);
}
// Mark dependencies for the GC
static void markfunc(FXToolBar* self);
};
#endif
--- NEW FILE: FXRbToolBarGrip.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: FXRbToolBarGrip.h,v 1.1 2002/04/04 02:10:48 lyle Exp $
***********************************************************************/
#ifndef FXRBTOOLBARGRIP_H
#define FXRBTOOLBARGRIP_H
class FXRbToolBarGrip : public FXToolBarGrip {
FXDECLARE(FXRbToolBarGrip)
protected:
FXRbToolBarGrip(){}
#include "FXRbObjectVirtuals.h"
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
public:
/// Construct toolbar grip
FXRbToolBarGrip(FXToolbar* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=TOOLBARGRIP_SINGLE,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXToolBarGrip(p,tgt,sel,opts,x,y,w,h){}
// Destructor
virtual ~FXRbToolBarGrip(){
FXRbUnregisterRubyObj(this);
}
// Mark dependencies for the GC
static void markfunc(FXToolBarGrip* self);
};
#endif
--- NEW FILE: FXRbToolBarShell.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: FXRbToolBarShell.h,v 1.1 2002/04/04 02:10:48 lyle Exp $
***********************************************************************/
#ifndef FXRBTOOLBARSHELL_H
#define FXRBTOOLBARSHELL_H
class FXRbToolBarShell : public FXToolBarShell {
FXDECLARE(FXRbToolBarShell)
protected:
FXRbToolBarShell(){}
#include "FXRbObjectVirtuals.h"
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
#include "FXRbTopWindowVirtuals.h"
public:
/// Construct a toolbar shell
FXRbToolBarShell(FXWindow* owner,FXuint opts=FRAME_RAISED|FRAME_THICK,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint hs=4,FXint vs=4) : FXToolBarShell(owner,opts,x,y,w,h){}
// Destructor
virtual ~FXRbToolBarShell(){
FXRbUnregisterRubyObj(this);
}
// Mark dependencies for the GC
static void markfunc(FXToolBarShell* self);
};
#endif
--- NEW FILE: FXRbToolBarTab.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: FXRbToolBarTab.h,v 1.1 2002/04/04 02:10:48 lyle Exp $
***********************************************************************/
#ifndef FXRBTOOLBARTAB_H
#define FXRBTOOLBARTAB_H
class FXRbToolBarTab : public FXToolBarTab {
FXDECLARE(FXRbToolBarTab)
protected:
FXRbToolBarTab(){}
#include "FXRbObjectVirtuals.h"
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
public:
/// Construct toolbar tab
FXRbToolBarTab(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=FRAME_RAISED,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXToolBarTab(p,tgt,sel,opts,x,y,w,h){}
// Destructor
virtual ~FXRbToolBarTab(){
FXRbUnregisterRubyObj(this);
}
// Mark dependencies for the GC
static void markfunc(FXToolBarTab* self);
};
#endif
--- NEW FILE: FXRbToolBarVirtuals.h ---
public:
// Calls the base class version of dock()
void _dock(FXuint side,FXWindow* after);
// Overrides the base class version of dock()
virtual void dock(FXuint side,FXWindow* after);
// Calls the base class version of undock()
void _undock();
// Overrides the base class version of undock()
virtual void undock();
--- NEW FILE: FXRbToolTip.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: FXRbToolTip.h,v 1.1 2002/04/04 02:10:48 lyle Exp $
***********************************************************************/
#ifndef FXRBTOOLTIP_H
#define FXRBTOOLTIP_H
class FXRbToolTip : public FXToolTip {
FXDECLARE(FXRbToolTip)
protected:
FXRbToolTip(){}
#include "FXRbObjectVirtuals.h"
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
public:
/// Construct a tool tip
FXRbToolTip(FXApp* a,FXuint opts=TOOLTIP_NORMAL,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXToolTip(a,opts,x,y,w,h){}
// Mark dependencies for the GC
static void markfunc(FXToolTip* self);
// Destructor
virtual ~FXRbToolTip(){
FXRbUnregisterRubyObj(this);
}
};
#endif
Index: FXRuby.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRuby.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FXRuby.h 3 Apr 2002 21:40:57 -0000 1.21
--- FXRuby.h 4 Apr 2002 02:10:48 -0000 1.22
***************
*** 483,487 ****
#include "FXRbGroupBox.h"
#include "FXRbShell.h"
! #include "FXRbTooltip.h"
#include "FXRbPopup.h"
#include "FXRbTopWindow.h"
--- 483,487 ----
#include "FXRbGroupBox.h"
#include "FXRbShell.h"
! #include "FXRbToolTip.h"
#include "FXRbPopup.h"
#include "FXRbTopWindow.h"
***************
*** 494,499 ****
#include "FXRbMenuCascade.h"
#include "FXRbMenuCommand.h"
! #include "FXRbToolbar.h"
! #include "FXRbMenubar.h"
#include "FXRbOptionMenu.h"
#include "FXRbSwitcher.h"
--- 494,499 ----
#include "FXRbMenuCascade.h"
#include "FXRbMenuCommand.h"
! #include "FXRbToolBar.h"
! #include "FXRbMenuBar.h"
#include "FXRbOptionMenu.h"
#include "FXRbSwitcher.h"
***************
*** 501,505 ****
#include "FXRbTabBook.h"
#include "FXRbTabItem.h"
! #include "FXRbScrollbar.h"
#include "FXRbScrollArea.h"
#include "FXRbScrollWindow.h"
--- 501,505 ----
#include "FXRbTabBook.h"
#include "FXRbTabItem.h"
! #include "FXRbScrollBar.h"
#include "FXRbScrollArea.h"
#include "FXRbScrollWindow.h"
***************
*** 512,517 ****
#include "FXRbTable.h"
#include "FXRbDragCorner.h"
! #include "FXRbStatusbar.h"
! #include "FXRbStatusline.h"
#include "FXRbMessageBox.h"
#include "FXRbDirList.h"
--- 512,517 ----
#include "FXRbTable.h"
#include "FXRbDragCorner.h"
! #include "FXRbStatusBar.h"
! #include "FXRbStatusLine.h"
#include "FXRbMessageBox.h"
#include "FXRbDirList.h"
***************
*** 544,550 ****
#include "FXRbMDIChild.h"
#include "FXRbDocument.h"
! #include "FXRbToolbarGrip.h"
! #include "FXRbToolbarShell.h"
! #include "FXRbToolbarTab.h"
#include "FXRbPrintDialog.h"
#include "FXRbDebugTarget.h"
--- 544,550 ----
#include "FXRbMDIChild.h"
#include "FXRbDocument.h"
! #include "FXRbToolBarGrip.h"
! #include "FXRbToolBarShell.h"
! #include "FXRbToolBarTab.h"
#include "FXRbPrintDialog.h"
#include "FXRbDebugTarget.h"
--- FXRbMenubar.h DELETED ---
--- FXRbScrollbar.h DELETED ---
--- FXRbStatusbar.h DELETED ---
--- FXRbStatusline.h DELETED ---
--- FXRbToolbar.h DELETED ---
--- FXRbToolbarGrip.h DELETED ---
--- FXRbToolbarShell.h DELETED ---
--- FXRbToolbarTab.h DELETED ---
--- FXRbToolbarVirtuals.h DELETED ---
--- FXRbTooltip.h DELETED ---
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 23:24:11
|
Update of /cvsroot/fxruby/FXRuby/fox-includes In directory usw-pr-cvs1:/tmp/cvs-serv10814 Modified Files: fxver.h Log Message: Index: fxver.h =================================================================== RCS file: /cvsroot/fxruby/FXRuby/fox-includes/fxver.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** fxver.h 13 Mar 2002 18:08:28 -0000 1.23 --- fxver.h 3 Apr 2002 23:24:07 -0000 1.24 *************** *** 6,10 **** #define FOX_MAJOR 1 #define FOX_MINOR 0 ! #define FOX_LEVEL 3 --- 6,10 ---- #define FOX_MAJOR 1 #define FOX_MINOR 0 ! #define FOX_LEVEL 5 |
|
From: Lyle J. <ly...@us...> - 2002-04-03 21:41:06
|
Update of /cvsroot/fxruby/FXRuby/tests
In directory usw-pr-cvs1:/tmp/cvs-serv13377/tests
Added Files:
TC_FXDC.rb
Removed Files:
TC_FXDCWindow.rb
Log Message:
Added typemaps and supporting code to get FXDC#setDashes working properly.
Fixed other bugs in the FXDC test case.
--- NEW FILE: TC_FXDC.rb ---
require 'test/unit'
require 'fox'
include Fox
class TC_FXDC < Test::Unit::TestCase
def set_up
if FXApp.instance.nil?
@app = FXApp.new('TC_FXDC', 'FXRuby')
@app.init([])
else
@app = FXApp.instance
end
@dc = FXDC.new(@app)
end
def testGetApp
app = @dc.app
assert_not_nil(app)
assert_kind_of(FX_App, app)
assert_same(@app, app)
end
def testReadPixel
x, y = 0, 0
pixel = @dc.readPixel(x, y)
assert_not_nil(pixel)
end
def testDrawPoint
@dc.drawPoint(0, 0)
end
def testDrawPoints
p1 = FXPoint.new
p2 = FXPoint.new
@dc.drawPoints([p1, p2])
end
def testDrawPointsRel
p1 = FXPoint.new
p2 = FXPoint.new
@dc.drawPointsRel([p1, p2])
end
def testDrawLine
x1, y1, x2, y2 = 0, 0, 5, 5
@dc.drawLine(x1, y1, x2, y2)
end
def testDrawLines
points = [ FXPoint.new, FXPoint.new ]
@dc.drawLines(points)
end
def testDrawLinesRel
points = [ FXPoint.new, FXPoint.new ]
@dc.drawLinesRel(points)
end
def testDrawLineSegments
segments = [ FXSegment.new, FXSegment.new ]
@dc.drawLineSegments(segments)
end
def testDrawArc
x, y, w, h, ang1, ang2 = 0, 0, 10, 10, 45, 135
@dc.drawArc(x, y, w, h, ang1, ang2)
end
def testDrawArcs
arcs = [ FXArc.new, FXArc.new ]
@dc.drawArcs(arcs)
end
def testFillRectangle
x, y, w, h = 0, 0, 20, 20
@dc.fillRectangle(x, y, w, h)
end
def testFillRectangles(rectangles)
rectangles = [ FXRectangle.new, FXRectangle.new ]
@dc.fillRectangles(rectangles)
end
def testFillArc
x, y, w, h, ang1, ang2 = 0, 0, 10, 10, 45, 135
@dc.fillArc(x, y, w, h, ang1, ang2)
end
def testFillArcs
arcs = [ FXArc.new, FXArc.new ]
@dc.fillArcs(arcs)
end
def testFillPolygon
points = [ FXPoint.new, FXPoint.new ]
@dc.fillPolygon(points)
end
def testFillConcavePolygon
points = [ FXPoint.new, FXPoint.new ]
@dc.fillConcavePolygon(points)
end
def testFillComplexPolygon
points = [ FXPoint.new, FXPoint.new ]
@dc.fillComplexPolygon(points)
end
def testFillPolygonRel
points = [ FXPoint.new, FXPoint.new ]
@dc.fillPolygonRel(points)
end
def testFillConcavePolygonRel
points = [ FXPoint.new, FXPoint.new ]
@dc.fillConcavePolygonRel(points)
end
def testFillComplexPolygonRel
points = [ FXPoint.new, FXPoint.new ]
@dc.fillComplexPolygonRel(points)
end
def testDrawHashBox
x, y, w, h, b = 0, 0, 20, 20, 2
@dc.drawHashBox(x, y, w, h)
@dc.drawHashBox(x, y, w, h, b)
end
def testDrawFocusRectangle
x, y, w, h = 0, 0, 5, 5
@dc.drawFocusRectangle(x, y, w, h)
end
def testDrawArea
source = FXImage.new(@app)
sx, sy, sw, sh = 0, 0, 10, 10
dx, dy = 0, 0
@dc.drawArea(source, sx, sy, sw, sh, dx, dy)
end
def testDrawImage
image, dx, dy = FXImage.new(@app), 0, 0
@dc.drawImage(image, dx, dy)
end
def testDrawBitmap
bitmap, dx, dy = FXBitmap.new(@app), 0, 0
@dc.drawBitmap(bitmap, dx, dy)
end
def testDrawIcon
icon, dx, dy = FXIcon.new(@app), 0, 0
@dc.drawIcon(icon, dx, dy)
end
def testDrawIconSunken
icon, dx, dy = FXIcon.new(@app), 0, 0
@dc.drawIconSunken(icon, dx, dy)
end
def testDrawIconShaded
icon, dx, dy = FXIcon.new(@app), 0, 0
@dc.drawIconShaded(icon, dx, dy)
end
def testDrawText
x, y, str = 0, 0, "Hello"
@dc.drawText(x, y, str)
end
def testDrawImageText
x, y, str = 0, 0, "Hello"
@dc.drawImageText(x, y, str)
end
def testForeground
fg = FXRGB(192, 192, 192)
@dc.setForeground(fg)
assert_equal(fg, @dc.foreground)
assert_equal(fg, @dc.getForeground)
@dc.foreground = fg
assert_equal(fg, @dc.foreground)
assert_equal(fg, @dc.getForeground)
end
def testBackground
bg = FXRGB(192, 192, 192)
@dc.setBackground(bg)
assert_equal(bg, @dc.background)
assert_equal(bg, @dc.getBackground)
@dc.background = bg
assert_equal(bg, @dc.background)
assert_equal(bg, @dc.getBackground)
end
def testDashes
dashOffset, dashPattern = 0, [1, 2, 3, 4]
@dc.setDashes(dashOffset, dashPattern)
assert_equal(dashPattern, @dc.dashPattern)
assert_equal(dashPattern, @dc.getDashPattern())
assert_equal(dashOffset, @dc.dashOffset)
assert_equal(dashOffset, @dc.getDashOffset())
end
def testLineWidth
lineWidth = 2
@dc.setLineWidth(lineWidth)
assert_equal(lineWidth, @dc.lineWidth)
assert_equal(lineWidth, @dc.getLineWidth())
@dc.lineWidth = lineWidth
assert_equal(lineWidth, @dc.lineWidth)
assert_equal(lineWidth, @dc.getLineWidth())
end
def testLineCap
for lineCap in [CAP_NOT_LAST, CAP_BUTT, CAP_ROUND, CAP_PROJECTING]
@dc.setLineCap(lineCap)
assert_equal(lineCap, @dc.lineCap)
assert_equal(lineCap, @dc.getLineCap())
@dc.lineCap = lineCap
assert_equal(lineCap, @dc.lineCap)
assert_equal(lineCap, @dc.getLineCap())
end
end
def testLineJoin
for lineJoin in [JOIN_MITER, JOIN_ROUND, JOIN_BEVEL]
@dc.setLineJoin(lineJoin)
assert_equal(lineJoin, @dc.lineJoin)
assert_equal(lineJoin, @dc.getLineJoin())
@dc.lineJoin = lineJoin
assert_equal(lineJoin, @dc.lineJoin)
assert_equal(lineJoin, @dc.getLineJoin())
end
end
def testLineStyle
for lineStyle in [LINE_SOLID, LINE_ONOFF_DASH, LINE_DOUBLE_DASH]
@dc.setLineStyle(lineStyle)
assert_equal(lineStyle, @dc.lineStyle)
assert_equal(lineStyle, @dc.getLineStyle())
@dc.lineStyle = lineStyle
assert_equal(lineStyle, @dc.lineStyle)
assert_equal(lineStyle, @dc.getLineStyle())
end
end
def testFillStyle
for fillStyle in [FILL_SOLID, FILL_TILED, FILL_STIPPLED, FILL_OPAQUESTIPPLED]
@dc.setFillStyle(fillStyle)
assert_equal(fillStyle, @dc.fillStyle)
assert_equal(fillStyle, @dc.getFillStyle())
@dc.fillStyle = fillStyle
assert_equal(fillStyle, @dc.fillStyle)
assert_equal(fillStyle, @dc.getFillStyle())
end
end
def testFillRule
for fillRule in [RULE_EVEN_ODD, RULE_WINDING]
@dc.setFillRule(fillRule)
assert_equal(fillRule, @dc.fillRule)
assert_equal(fillRule, @dc.getFillRule())
@dc.fillRule = fillRule
assert_equal(fillRule, @dc.fillRule)
assert_equal(fillRule, @dc.getFillRule())
end
end
def testFunction
for func in [BLT_CLR, BLT_SRC_AND_DST, BLT_SRC_AND_NOT_DST, BLT_SRC,
BLT_NOT_SRC_AND_DST, BLT_DST, BLT_SRC_XOR_DST, BLT_SRC_OR_DST,
BLT_NOT_SRC_AND_NOT_DST, BLT_NOT_SRC_XOR_DST, BLT_NOT_DST,
BLT_SRC_OR_NOT_DST, BLT_NOT_SRC, BLT_NOT_SRC_OR_DST,
BLT_NOT_SRC_OR_NOT_DST, BLT_SET]
@dc.setFunction(func)
assert_equal(func, @dc.function)
assert_equal(func, @dc.getFunction())
@dc.function = func
assert_equal(func, @dc.function)
assert_equal(func, @dc.getFunction())
end
end
def testTile
image, dx, dy = FXImage.new(@app), 0, 0
@dc.setTile(image)
@dc.setTile(image, dx)
@dc.setTile(image, dx, dy)
assert_same(image, @dc.tile)
assert_same(image, @dc.getTile())
end
def testStippleBitmap
bitmap, dx, dy = FXBitmap.new(@app), 0, 0
@dc.setStipple(bitmap)
@dc.setStipple(bitmap, dx)
@dc.setStipple(bitmap, dx, dy)
assert_same(bitmap, @dc.stippleBitmap)
assert_same(bitmap, @dc.getStippleBitmap())
end
def testStipplePattern
dx, dy = 0, 0
patterns = [STIPPLE_0, STIPPLE_NONE, STIPPLE_BLACK, STIPPLE_1,
STIPPLE_2, STIPPLE_3, STIPPLE_4, STIPPLE_5, STIPPLE_6,
STIPPLE_7, STIPPLE_8, STIPPLE_GRAY, STIPPLE_9, STIPPLE_10,
STIPPLE_11, STIPPLE_12, STIPPLE_13, STIPPLE_14, STIPPLE_15,
STIPPLE_16, STIPPLE_WHITE, STIPPLE_HORZ, STIPPLE_VERT, STIPPLE_CROSS,
STIPPLE_DIAG, STIPPLE_REVDIAG, STIPPLE_CROSSDIAG]
for pat in patterns
@dc.setStipple(pat)
@dc.setStipple(pat, dx)
@dc.setStipple(pat, dx, dy)
assert_equal(pat, @dc.stipplePattern)
assert_equal(pat, @dc.getStipplePattern())
end
end
def testClipRegion
region = FXRegion.new(0, 0, 10, 10)
@dc.setClipRegion(region)
end
def testClipRectangle
clipX, clipY, clipWidth, clipHeight = 0, 0, 10, 20
clipRectangle = FXRectangle.new(clipX, clipY, clipWidth, clipHeight)
@dc.setClipRectangle(clipX, clipY, clipWidth, clipHeight)
assert_equal(clipX, @dc.clipX)
assert_equal(clipY, @dc.clipY)
assert_equal(clipWidth, @dc.clipWidth)
assert_equal(clipHeight, @dc.clipHeight)
assert_equal(clipRectangle, @dc.clipRectangle)
@dc.setClipRectangle(clipRectangle)
assert_equal(clipX, @dc.clipX)
assert_equal(clipY, @dc.clipY)
assert_equal(clipWidth, @dc.clipWidth)
assert_equal(clipHeight, @dc.clipHeight)
assert_equal(clipRectangle, @dc.clipRectangle)
@dc.clearClipRectangle
end
def testClipMask
bitmap, dx, dy = FXBitmap.new(@app), 0, 0
@dc.setClipMask(bitmap)
@dc.setClipMask(bitmap, dx)
@dc.setClipMask(bitmap, dx, dy)
@dc.clearClipMask
end
def testTextFont
textFont = @app.normalFont
@dc.setTextFont(textFont)
assert_same(textFont, @dc.textFont)
assert_same(textFont, @dc.getTextFont())
@dc.textFont = textFont
assert_same(textFont, @dc.textFont)
assert_same(textFont, @dc.getTextFont())
end
def testClipChildren
@dc.clipChildren(true)
@dc.clipChildren(false)
end
end
--- TC_FXDCWindow.rb DELETED ---
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 21:41:05
|
Update of /cvsroot/fxruby/FXRuby/lib/fox
In directory usw-pr-cvs1:/tmp/cvs-serv13377/lib/fox
Modified Files:
aliases.rb overloads.rb
Log Message:
Added typemaps and supporting code to get FXDC#setDashes working properly.
Fixed other bugs in the FXDC test case.
Index: aliases.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/lib/fox/aliases.rb,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** aliases.rb 3 Apr 2002 17:32:58 -0000 1.23
--- aliases.rb 3 Apr 2002 21:40:57 -0000 1.24
***************
*** 195,199 ****
alias dashPattern getDashPattern
alias dashOffset getDashOffset
- alias dashLength getDashLength
alias lineWidth getLineWidth
alias lineWidth= setLineWidth
--- 195,198 ----
Index: overloads.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/lib/fox/overloads.rb,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** overloads.rb 3 Apr 2002 17:32:20 -0000 1.6
--- overloads.rb 3 Apr 2002 21:40:57 -0000 1.7
***************
*** 26,32 ****
def setStipple(*args)
if args[0].kind_of? FXBitmap
! setStippleFromBitmap(args[0], args[1], args[2])
else
! setStippleFromPattern(args[0], args[1], args[2])
end
end
--- 26,32 ----
def setStipple(*args)
if args[0].kind_of? FXBitmap
! setStippleFromBitmap(*args)
else
! setStippleFromPattern(*args)
end
end
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 21:41:05
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv13377/ext/fox
Modified Files:
FXRuby.cpp core_wrap.cpp
Log Message:
Added typemaps and supporting code to get FXDC#setDashes working properly.
Fixed other bugs in the FXDC test case.
Index: FXRuby.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRuby.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** FXRuby.cpp 3 Apr 2002 00:18:12 -0000 1.39
--- FXRuby.cpp 3 Apr 2002 21:40:27 -0000 1.40
***************
*** 214,217 ****
--- 214,257 ----
}
+ // Returns a Ruby array of integers
+ VALUE FXRbMakeArray(const FXchar* dashpattern,FXuint dashlength){
+ VALUE result=rb_ary_new();
+ for(FXuint i=0; i<dashlength; i++)
+ rb_ary_push(result,INT2NUM(dashpattern[i]));
+ return result;
+ }
+
+ // Returns a Ruby array of FXArcs
+ VALUE FXRbMakeArray(const FXArc* arcs,FXuint narcs){
+ VALUE result=rb_ary_new();
+ for(FXuint i=0; i<narcs; i++)
+ rb_ary_push(result,FXRbGetRubyObj(&arcs[i],"FXArc *"));
+ return result;
+ }
+
+ // Returns a Ruby array of FXPoints
+ VALUE FXRbMakeArray(const FXPoint* points,FXuint npoints){
+ VALUE result=rb_ary_new();
+ for(FXuint i=0; i<npoints; i++)
+ rb_ary_push(result,FXRbGetRubyObj(&points[i],"FXPoint *"));
+ return result;
+ }
+
+ // Returns a Ruby array of FXRectangles
+ VALUE FXRbMakeArray(const FXRectangle* rectangles,FXuint nrectangles){
+ VALUE result=rb_ary_new();
+ for(FXuint i=0; i<nrectangles; i++)
+ rb_ary_push(result,FXRbGetRubyObj(&rectangles[i],"FXRectangle *"));
+ return result;
+ }
+
+ // Returns a Ruby array of FXSegments
+ VALUE FXRbMakeArray(const FXSegment* segments,FXuint nsegments){
+ VALUE result=rb_ary_new();
+ for(FXuint i=0; i<nsegments; i++)
+ rb_ary_push(result,FXRbGetRubyObj(&segments[i],"FXSegment *"));
+ return result;
+ }
+
//----------------------------------------------------------------------
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** core_wrap.cpp 3 Apr 2002 17:36:27 -0000 1.61
--- core_wrap.cpp 3 Apr 2002 21:40:27 -0000 1.62
***************
*** 756,759 ****
--- 756,762 ----
swig_class cFXArc;
static void free_FXArc(FXArc *);
+ VALUE FXDC_getDashPattern(FXDC const *self){
+ return FXRbMakeArray(self->getDashPattern(), self->getDashLength());
+ }
swig_class cFX_DC;
***************
*** 9806,9812 ****
[...1203 lines suppressed...]
! arg4 = static_cast<FXuint>( RARRAY(argv[1])->len );
! for (FXuint i = 0; i < arg4; i++) {
! arg3[i] = NUM2INT(rb_ary_entry(argv[1], i));
! }
! }
(arg1)->_setDashes(arg2,(FXchar const *)arg3,arg4);
+ {
+ delete [] arg3;
+ }
return Qnil;
}
***************
*** 18942,18946 ****
rb_define_method(cFX_DC.klass, "getDashPattern", VALUEFUNC(_wrap_FX_DC_getDashPattern), -1);
rb_define_method(cFX_DC.klass, "getDashOffset", VALUEFUNC(_wrap_FX_DC_getDashOffset), -1);
- rb_define_method(cFX_DC.klass, "getDashLength", VALUEFUNC(_wrap_FX_DC_getDashLength), -1);
rb_define_method(cFX_DC.klass, "setLineWidth", VALUEFUNC(_wrap_FX_DC_setLineWidth), -1);
rb_define_method(cFX_DC.klass, "getLineWidth", VALUEFUNC(_wrap_FX_DC_getLineWidth), -1);
--- 18965,18968 ----
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 21:41:05
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv13377/swig-interfaces
Modified Files:
FXDC.i typemaps.i
Log Message:
Added typemaps and supporting code to get FXDC#setDashes working properly.
Fixed other bugs in the FXDC test case.
Index: FXDC.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDC.i,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** FXDC.i 3 Apr 2002 17:36:27 -0000 1.20
--- FXDC.i 3 Apr 2002 21:40:57 -0000 1.21
***************
*** 145,148 ****
--- 145,150 ----
%rename(setClipRectangle4) FXDC::setClipRectangle(FXint x,FXint y,FXint w,FXint h);
+ %ignore FXDC::getDashLength() const;
+
%exception FXDC::FXDC "$action FXRbRegisterRubyObj(self, result);";
***************
*** 310,315 ****
virtual void setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength);
! /// Get dash pattern
! const FXchar* getDashPattern() const;
/// Get dash offset
--- 312,321 ----
virtual void setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength);
! %addmethods {
! /// Get dash pattern
! VALUE getDashPattern() const {
! return FXRbMakeArray(self->getDashPattern(), self->getDashLength());
! }
! }
/// Get dash offset
Index: typemaps.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/typemaps.i,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** typemaps.i 3 Apr 2002 17:36:27 -0000 1.34
--- typemaps.i 3 Apr 2002 21:40:57 -0000 1.35
***************
*** 473,479 ****
$2 = static_cast<FXuint>( RARRAY($input)->len );
for (FXuint i = 0; i < $2; i++) {
! FXPoint *p;
! Data_Get_Struct(rb_ary_entry($input, i), FXPoint, p);
! $1[i] = p;
}
}
--- 473,479 ----
$2 = static_cast<FXuint>( RARRAY($input)->len );
for (FXuint i = 0; i < $2; i++) {
! FXPoint *pPoint;
! Data_Get_Struct(rb_ary_entry($input, i), FXPoint, pPoint);
! $1[i] = *pPoint;
}
}
***************
*** 489,495 ****
$2 = static_cast<FXuint>( RARRAY($input)->len );
for (FXuint i = 0; i < $2; i++) {
! FXSegment *s;
! Data_Get_Struct(rb_ary_entry($input, i), FXSegment, s);
! $1[i] = s;
}
}
--- 489,495 ----
$2 = static_cast<FXuint>( RARRAY($input)->len );
for (FXuint i = 0; i < $2; i++) {
! FXSegment *pSeg;
! Data_Get_Struct(rb_ary_entry($input, i), FXSegment, pSeg);
! $1[i] = *pSeg;
}
}
***************
*** 505,511 ****
$2 = static_cast<FXuint>( RARRAY($input)->len );
for (FXuint i = 0; i < $2; i++) {
! FXRectangle *r;
! Data_Get_Struct(rb_ary_entry($input, i), FXRectangle, r);
! $1[i] = r;
}
}
--- 505,511 ----
$2 = static_cast<FXuint>( RARRAY($input)->len );
for (FXuint i = 0; i < $2; i++) {
! FXRectangle *pRect;
! Data_Get_Struct(rb_ary_entry($input, i), FXRectangle, pRect);
! $1[i] = *pRect;
}
}
***************
*** 521,527 ****
$2 = static_cast<FXuint>( RARRAY($input)->len );
for (FXuint i = 0; i < $2; i++) {
! FXArc *arc;
! Data_Get_Struct(rb_ary_entry($input, i), FXArc, arc);
! $1[i] = arc;
}
}
--- 521,527 ----
$2 = static_cast<FXuint>( RARRAY($input)->len );
for (FXuint i = 0; i < $2; i++) {
! FXArc *pArc;
! Data_Get_Struct(rb_ary_entry($input, i), FXArc, pArc);
! $1[i] = *pArc;
}
}
***************
*** 537,538 ****
--- 537,552 ----
$2 = RSTRING($input)->len;
}
+
+ // Extract a C array (dashpattern) and its length (dashlength) from a Ruby array of Fixnums
+ %typemap(in) (const FXchar* dashpattern, FXuint dashlength) {
+ Check_Type($input, T_ARRAY);
+ $1 = new FXchar[RARRAY($input)->len];
+ $2 = static_cast<FXuint>( RARRAY($input)->len );
+ for (FXuint i = 0; i < $2; i++) {
+ $1[i] = NUM2INT(rb_ary_entry($input, i));
+ }
+ }
+
+ %typemap(freearg) (const FXchar* dashpattern, FXuint dashlength) {
+ delete [] $1;
+ }
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 21:41:04
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv13377/ext/fox/include
Modified Files:
FXRbDC.h FXRbDCVirtuals.h FXRuby.h
Log Message:
Added typemaps and supporting code to get FXDC#setDashes working properly.
Fixed other bugs in the FXDC test case.
Index: FXRbDC.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbDC.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXRbDC.h 2 Jan 2002 22:23:55 -0000 1.2
--- FXRbDC.h 3 Apr 2002 21:40:57 -0000 1.3
***************
*** 45,49 ****
} \
void cls::drawPoints(const FXPoint* points,FXuint npoints){ \
! FXRbCallVoidMethod(this,"drawPoints",points,npoints); \
} \
void cls::_drawPointsRel(const FXPoint* points,FXuint npoints){ \
--- 45,49 ----
} \
void cls::drawPoints(const FXPoint* points,FXuint npoints){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("drawPoints"),1,FXRbMakeArray(points,npoints)); \
} \
void cls::_drawPointsRel(const FXPoint* points,FXuint npoints){ \
***************
*** 51,55 ****
} \
void cls::drawPointsRel(const FXPoint* points,FXuint npoints){ \
! FXRbCallVoidMethod(this,"drawPointsRel",points,npoints); \
} \
void cls::_drawLine(FXint x1,FXint y1,FXint x2,FXint y2){ \
--- 51,55 ----
} \
void cls::drawPointsRel(const FXPoint* points,FXuint npoints){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("drawPointsRel"),1,FXRbMakeArray(points,npoints)); \
} \
void cls::_drawLine(FXint x1,FXint y1,FXint x2,FXint y2){ \
***************
*** 63,67 ****
} \
void cls::drawLines(const FXPoint* points,FXuint npoints){ \
! FXRbCallVoidMethod(this,"drawLines",points,npoints); \
} \
void cls::_drawLinesRel(const FXPoint* points,FXuint npoints){ \
--- 63,67 ----
} \
void cls::drawLines(const FXPoint* points,FXuint npoints){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("drawLines"),1,FXRbMakeArray(points,npoints)); \
} \
void cls::_drawLinesRel(const FXPoint* points,FXuint npoints){ \
***************
*** 69,73 ****
} \
void cls::drawLinesRel(const FXPoint* points,FXuint npoints){ \
! FXRbCallVoidMethod(this,"drawLinesRel",points,npoints); \
} \
void cls::_drawLineSegments(const FXSegment* segments,FXuint nsegments){ \
--- 69,73 ----
} \
void cls::drawLinesRel(const FXPoint* points,FXuint npoints){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("drawLinesRel"),1,FXRbMakeArray(points,npoints)); \
} \
void cls::_drawLineSegments(const FXSegment* segments,FXuint nsegments){ \
***************
*** 75,79 ****
} \
void cls::drawLineSegments(const FXSegment* segments,FXuint nsegments){ \
! FXRbCallVoidMethod(this,"drawLineSegments",segments,nsegments); \
} \
void cls::_drawRectangle(FXint x,FXint y,FXint w,FXint h){ \
--- 75,79 ----
} \
void cls::drawLineSegments(const FXSegment* segments,FXuint nsegments){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("drawLineSegments"),1,FXRbMakeArray(segments,nsegments)); \
} \
void cls::_drawRectangle(FXint x,FXint y,FXint w,FXint h){ \
***************
*** 87,91 ****
} \
void cls::drawRectangles(const FXRectangle* rectangles,FXuint nrectangles){ \
! FXRbCallVoidMethod(this,"drawRectangles",rectangles,nrectangles); \
} \
void cls::_drawArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2){ \
--- 87,91 ----
} \
void cls::drawRectangles(const FXRectangle* rectangles,FXuint nrectangles){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("drawRectangles"),1,FXRbMakeArray(rectangles,nrectangles)); \
} \
void cls::_drawArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2){ \
***************
*** 99,103 ****
} \
void cls::drawArcs(const FXArc* arcs,FXuint narcs){ \
! FXRbCallVoidMethod(this,"drawArcs",arcs,narcs); \
} \
void cls::_fillRectangle(FXint x,FXint y,FXint w,FXint h){ \
--- 99,103 ----
} \
void cls::drawArcs(const FXArc* arcs,FXuint narcs){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("drawArcs"),1,FXRbMakeArray(arcs,narcs)); \
} \
void cls::_fillRectangle(FXint x,FXint y,FXint w,FXint h){ \
***************
*** 111,115 ****
} \
void cls::fillRectangles(const FXRectangle* rectangles,FXuint nrectangles){ \
! FXRbCallVoidMethod(this,"fillRectangles",rectangles,nrectangles); \
} \
void cls::_fillArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2){ \
--- 111,115 ----
} \
void cls::fillRectangles(const FXRectangle* rectangles,FXuint nrectangles){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("fillRectangles"),1,FXRbMakeArray(rectangles,nrectangles)); \
} \
void cls::_fillArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2){ \
***************
*** 123,127 ****
} \
void cls::fillArcs(const FXArc* arcs,FXuint narcs){ \
! FXRbCallVoidMethod(this,"fillArcs",arcs,narcs); \
} \
void cls::_fillPolygon(const FXPoint* points,FXuint npoints){ \
--- 123,127 ----
} \
void cls::fillArcs(const FXArc* arcs,FXuint narcs){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("fillArcs"),1,FXRbMakeArray(arcs,narcs)); \
} \
void cls::_fillPolygon(const FXPoint* points,FXuint npoints){ \
***************
*** 129,133 ****
} \
void cls::fillPolygon(const FXPoint* points,FXuint npoints){ \
! FXRbCallVoidMethod(this,"fillPolygon",points,npoints); \
} \
void cls::_fillConcavePolygon(const FXPoint* points,FXuint npoints){ \
--- 129,133 ----
} \
void cls::fillPolygon(const FXPoint* points,FXuint npoints){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("fillPolygon"),1,FXRbMakeArray(points,npoints)); \
} \
void cls::_fillConcavePolygon(const FXPoint* points,FXuint npoints){ \
***************
*** 135,139 ****
} \
void cls::fillConcavePolygon(const FXPoint* points,FXuint npoints){ \
! FXRbCallVoidMethod(this,"fillConcavePolygon",points,npoints); \
} \
void cls::_fillComplexPolygon(const FXPoint* points,FXuint npoints){ \
--- 135,139 ----
} \
void cls::fillConcavePolygon(const FXPoint* points,FXuint npoints){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("fillConcavePolygon"),1,FXRbMakeArray(points,npoints)); \
} \
void cls::_fillComplexPolygon(const FXPoint* points,FXuint npoints){ \
***************
*** 141,145 ****
} \
void cls::fillComplexPolygon(const FXPoint* points,FXuint npoints){ \
! FXRbCallVoidMethod(this,"fillComplexPolygon",points,npoints); \
} \
void cls::_fillPolygonRel(const FXPoint* points,FXuint npoints){ \
--- 141,145 ----
} \
void cls::fillComplexPolygon(const FXPoint* points,FXuint npoints){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("fillComplexPolygon"),1,FXRbMakeArray(points,npoints)); \
} \
void cls::_fillPolygonRel(const FXPoint* points,FXuint npoints){ \
***************
*** 147,151 ****
} \
void cls::fillPolygonRel(const FXPoint* points,FXuint npoints){ \
! FXRbCallVoidMethod(this,"fillPolygonRel",points,npoints); \
} \
void cls::_fillConcavePolygonRel(const FXPoint* points,FXuint npoints){ \
--- 147,151 ----
} \
void cls::fillPolygonRel(const FXPoint* points,FXuint npoints){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("fillPolygonRel"),1,FXRbMakeArray(points,npoints)); \
} \
void cls::_fillConcavePolygonRel(const FXPoint* points,FXuint npoints){ \
***************
*** 153,157 ****
} \
void cls::fillConcavePolygonRel(const FXPoint* points,FXuint npoints){ \
! FXRbCallVoidMethod(this,"fillConcavePolygonRel",points,npoints); \
} \
void cls::_fillComplexPolygonRel(const FXPoint* points,FXuint npoints){ \
--- 153,157 ----
} \
void cls::fillConcavePolygonRel(const FXPoint* points,FXuint npoints){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("fillConcavePolygonRel"),1,FXRbMakeArray(points,npoints)); \
} \
void cls::_fillComplexPolygonRel(const FXPoint* points,FXuint npoints){ \
***************
*** 159,163 ****
} \
void cls::fillComplexPolygonRel(const FXPoint* points,FXuint npoints){ \
! FXRbCallVoidMethod(this,"fillComplexPolygonRel",points,npoints); \
} \
void cls::_drawHashBox(FXint x,FXint y,FXint w,FXint h,FXint b){ \
--- 159,163 ----
} \
void cls::fillComplexPolygonRel(const FXPoint* points,FXuint npoints){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("fillComplexPolygonRel"),1,FXRbMakeArray(points,npoints)); \
} \
void cls::_drawHashBox(FXint x,FXint y,FXint w,FXint h,FXint b){ \
***************
*** 213,217 ****
} \
void cls::drawText(FXint x,FXint y,const FXchar* string,FXuint length){ \
! FXRbCallVoidMethod(this,"drawText",x,y,string,length); \
} \
void cls::_drawImageText(FXint x,FXint y,const FXchar* string,FXuint length){ \
--- 213,217 ----
} \
void cls::drawText(FXint x,FXint y,const FXchar* string,FXuint length){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("drawText"),3,to_ruby(x),to_ruby(y),rb_str_new(string,length)); \
} \
void cls::_drawImageText(FXint x,FXint y,const FXchar* string,FXuint length){ \
***************
*** 219,223 ****
} \
void cls::drawImageText(FXint x,FXint y,const FXchar* string,FXuint length){ \
! FXRbCallVoidMethod(this,"drawImageText",x,y,string,length); \
} \
void cls::_setForeground(FXColor clr){ \
--- 219,223 ----
} \
void cls::drawImageText(FXint x,FXint y,const FXchar* string,FXuint length){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("drawImageText"),3,to_ruby(x),to_ruby(y),rb_str_new(string,length)); \
} \
void cls::_setForeground(FXColor clr){ \
***************
*** 233,241 ****
FXRbCallVoidMethod(this,"setBackground",clr); \
} \
! void cls::_setDashes(FXuint dashoffset,const FXchar *dashlist,FXuint n){ \
! baseclass::setDashes(dashoffset,dashlist,n); \
} \
! void cls::setDashes(FXuint dashoffset,const FXchar *dashlist,FXuint n){ \
! FXRbCallVoidMethod(this,"setDashes",dashoffset,dashlist,n); \
} \
void cls::_setLineWidth(FXuint linewidth){ \
--- 233,241 ----
FXRbCallVoidMethod(this,"setBackground",clr); \
} \
! void cls::_setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength){ \
! baseclass::setDashes(dashoffset,dashpattern,dashlength); \
} \
! void cls::setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength){ \
! rb_funcall(FXRbGetRubyObj(this),rb_intern("setDashes"),2,to_ruby(dashoffset),FXRbMakeArray(dashpattern,dashlength)); \
} \
void cls::_setLineWidth(FXuint linewidth){ \
Index: FXRbDCVirtuals.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbDCVirtuals.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXRbDCVirtuals.h 2 Jan 2002 22:23:55 -0000 1.2
--- FXRbDCVirtuals.h 3 Apr 2002 21:40:57 -0000 1.3
***************
*** 205,212 ****
// Calls the base class version of setDashes()
! void _setDashes(FXuint dashoffset,const FXchar *dashlist,FXuint n);
// Overrides the base class version of setDashes()
! virtual void setDashes(FXuint dashoffset,const FXchar *dashlist,FXuint n);
// Calls the base class version of setLineWidth()
--- 205,212 ----
// Calls the base class version of setDashes()
! void _setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength);
// Overrides the base class version of setDashes()
! virtual void setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength);
// Calls the base class version of setLineWidth()
Index: FXRuby.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRuby.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** FXRuby.h 1 Apr 2002 23:15:39 -0000 1.20
--- FXRuby.h 3 Apr 2002 21:40:57 -0000 1.21
***************
*** 101,104 ****
--- 101,119 ----
extern VALUE FXRbMakeArray(const FXint* values,FXint size);
+ // Returns a Ruby array of integers
+ extern VALUE FXRbMakeArray(const FXchar* dashpattern,FXuint dashlength);
+
+ // Returns a Ruby array of FXArcs
+ extern VALUE FXRbMakeArray(const FXArc* arcs,FXuint narcs);
+
+ // Returns a Ruby array of FXPoints
+ extern VALUE FXRbMakeArray(const FXPoint* points,FXuint npoints);
+
+ // Returns a Ruby array of FXRectangles
+ extern VALUE FXRbMakeArray(const FXRectangle* rectangles,FXuint nrectangles);
+
+ // Returns a Ruby array of FXSegments
+ extern VALUE FXRbMakeArray(const FXSegment* segments,FXuint nsegments);
+
extern void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE data);
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 19:04:32
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv32356/swig-interfaces
Modified Files:
FXDC.i stubs.i typemaps.i
Log Message:
Added some new typemaps to fix the call signatures for a number of
FXDC instance methods which take arrays as their inputs.
Index: FXDC.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDC.i,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** FXDC.i 19 Mar 2002 23:18:40 -0000 1.19
--- FXDC.i 3 Apr 2002 17:36:27 -0000 1.20
***************
*** 139,143 ****
class FXRegion;
! %rename(setClipRectangle2) FXDC::setClipRectangle(const FXRectangle& rectangle);
%exception FXDC::FXDC "$action FXRbRegisterRubyObj(self, result);";
--- 139,147 ----
class FXRegion;
! %rename(setStippleFromBitmap) FXDC::setStipple(FXBitmap *bitmap,FXint dx,FXint dy);
! %rename(setStippleFromPattern) FXDC::setStipple(FXStipplePattern pat,FXint dx,FXint dy);
!
! %rename(setClipRectangle1) FXDC::setClipRectangle(const FXRectangle& rectangle);
! %rename(setClipRectangle4) FXDC::setClipRectangle(FXint x,FXint y,FXint w,FXint h);
%exception FXDC::FXDC "$action FXRbRegisterRubyObj(self, result);";
***************
*** 364,368 ****
/// Set the stipple pattern
! // virtual void setStipple(FXBitmap *bitmap,FXint dx=0,FXint dy=0); OVERLOAD
/// Get stipple bitmap
--- 368,372 ----
/// Set the stipple pattern
! virtual void setStipple(FXBitmap *bitmap,FXint dx=0,FXint dy=0);
/// Get stipple bitmap
Index: stubs.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/stubs.i,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** stubs.i 12 Feb 2002 17:51:26 -0000 1.22
--- stubs.i 3 Apr 2002 17:36:27 -0000 1.23
***************
*** 81,88 ****
%name(setFunction) void _setFunction(FXFunction func=BLT_SRC); \
%name(setTile) void _setTile(FXImage* image,FXint dx=0,FXint dy=0); \
! %name(setStipple) void _setStipple(FXStipplePattern stipple,FXint dx=0,FXint dy=0); \
%name(setClipRegion) void _setClipRegion(const FXRegion& region); \
! %name(setClipRectangle) void _setClipRectangle(FXint x,FXint y,FXint w,FXint h); \
! %name(setClipRectangle2) void _setClipRectangle(const FXRectangle& rectangle); \
%name(clearClipRectangle) void _clearClipRectangle(); \
%name(setClipMask) void _setClipMask(FXBitmap* bitmap,FXint dx=0,FXint dy=0); \
--- 81,89 ----
%name(setFunction) void _setFunction(FXFunction func=BLT_SRC); \
%name(setTile) void _setTile(FXImage* image,FXint dx=0,FXint dy=0); \
! %name(setStippleFromBitmap) void _setStipple(FXBitmap* bitmap,FXint dx=0,FXint dy=0); \
! %name(setStippleFromPattern) void _setStipple(FXStipplePattern stipple,FXint dx=0,FXint dy=0); \
%name(setClipRegion) void _setClipRegion(const FXRegion& region); \
! %name(setClipRectangle4) void _setClipRectangle(FXint x,FXint y,FXint w,FXint h); \
! %name(setClipRectangle1) void _setClipRectangle(const FXRectangle& rectangle); \
%name(clearClipRectangle) void _clearClipRectangle(); \
%name(setClipMask) void _setClipMask(FXBitmap* bitmap,FXint dx=0,FXint dy=0); \
Index: typemaps.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/typemaps.i,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** typemaps.i 1 Apr 2002 21:29:39 -0000 1.33
--- typemaps.i 3 Apr 2002 17:36:27 -0000 1.34
***************
*** 466,467 ****
--- 466,538 ----
*/
}
+
+ // Extract a C array (points) and its length (npoints) from a Ruby array of FXPoint instances
+ %typemap(in) (const FXPoint* points, FXuint npoints) {
+ Check_Type($input, T_ARRAY);
+ $1 = new FXPoint[RARRAY($input)->len];
+ $2 = static_cast<FXuint>( RARRAY($input)->len );
+ for (FXuint i = 0; i < $2; i++) {
+ FXPoint *p;
+ Data_Get_Struct(rb_ary_entry($input, i), FXPoint, p);
+ $1[i] = p;
+ }
+ }
+
+ %typemap(freearg) (const FXPoint* points, FXuint npoints) {
+ delete [] $1;
+ }
+
+ // Extract a C array (segments) and its length (nsegments) from a Ruby array of FXSegment instances
+ %typemap(in) (const FXSegment* segments, FXuint nsegments) {
+ Check_Type($input, T_ARRAY);
+ $1 = new FXSegment[RARRAY($input)->len];
+ $2 = static_cast<FXuint>( RARRAY($input)->len );
+ for (FXuint i = 0; i < $2; i++) {
+ FXSegment *s;
+ Data_Get_Struct(rb_ary_entry($input, i), FXSegment, s);
+ $1[i] = s;
+ }
+ }
+
+ %typemap(freearg) (const FXSegment* segments, FXuint nsegments) {
+ delete [] $1;
+ }
+
+ // Extract a C array (rectangles) and its length (nrectangles) from a Ruby array of FXRectangle instances
+ %typemap(in) (const FXRectangle* rectangles, FXuint nrectangles) {
+ Check_Type($input, T_ARRAY);
+ $1 = new FXRectangle[RARRAY($input)->len];
+ $2 = static_cast<FXuint>( RARRAY($input)->len );
+ for (FXuint i = 0; i < $2; i++) {
+ FXRectangle *r;
+ Data_Get_Struct(rb_ary_entry($input, i), FXRectangle, r);
+ $1[i] = r;
+ }
+ }
+
+ %typemap(freearg) (const FXRectangle* rectangles, FXuint nrectangles) {
+ delete [] $1;
+ }
+
+ // Extract a C array (arcs) and its length (narcs) from a Ruby array of FXArc instances
+ %typemap(in) (const FXArc* arcs, FXuint narcs) {
+ Check_Type($input, T_ARRAY);
+ $1 = new FXArc[RARRAY($input)->len];
+ $2 = static_cast<FXuint>( RARRAY($input)->len );
+ for (FXuint i = 0; i < $2; i++) {
+ FXArc *arc;
+ Data_Get_Struct(rb_ary_entry($input, i), FXArc, arc);
+ $1[i] = arc;
+ }
+ }
+
+ %typemap(freearg) (const FXArc* rectangles, FXuint narcs) {
+ delete [] $1;
+ }
+
+ // Extract the C string pointer and string length from a Ruby string
+ %typemap(in) (const FXchar* string, FXuint length) {
+ Check_Type($input, T_STRING);
+ $1 = STR2CSTR($input);
+ $2 = RSTRING($input)->len;
+ }
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 18:59:36
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv32356/ext/fox
Modified Files:
core_wrap.cpp
Log Message:
Added some new typemaps to fix the call signatures for a number of
FXDC instance methods which take arrays as their inputs.
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** core_wrap.cpp 2 Apr 2002 23:30:41 -0000 1.60
--- core_wrap.cpp 3 Apr 2002 17:36:27 -0000 1.61
***************
*** 9798,9808 ****
FXuint arg3 ;
! if ((argc < 2) || (argc > 2))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
arg1 = (FXDC *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXDC);
! arg2 = (FXPoint *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXPoint);
! arg3 = NUM2UINT(argv[1]);
(arg1)->drawPoints((FXPoint const *)arg2,arg3);
return Qnil;
[...2635 lines suppressed...]
***************
*** 18482,18489 ****
rb_define_method(cFXDCPrint.klass, "setFunction", VALUEFUNC(_wrap_FXDCPrint_setFunction), -1);
rb_define_method(cFXDCPrint.klass, "setTile", VALUEFUNC(_wrap_FXDCPrint_setTile), -1);
! rb_define_method(cFXDCPrint.klass, "setStipple", VALUEFUNC(_wrap_FXDCPrint_setStipple), -1);
rb_define_method(cFXDCPrint.klass, "setClipRegion", VALUEFUNC(_wrap_FXDCPrint_setClipRegion), -1);
! rb_define_method(cFXDCPrint.klass, "setClipRectangle", VALUEFUNC(_wrap_FXDCPrint_setClipRectangle), -1);
! rb_define_method(cFXDCPrint.klass, "setClipRectangle2", VALUEFUNC(_wrap_FXDCPrint_setClipRectangle2), -1);
rb_define_method(cFXDCPrint.klass, "clearClipRectangle", VALUEFUNC(_wrap_FXDCPrint_clearClipRectangle), -1);
rb_define_method(cFXDCPrint.klass, "setClipMask", VALUEFUNC(_wrap_FXDCPrint_setClipMask), -1);
--- 19237,19245 ----
rb_define_method(cFXDCPrint.klass, "setFunction", VALUEFUNC(_wrap_FXDCPrint_setFunction), -1);
rb_define_method(cFXDCPrint.klass, "setTile", VALUEFUNC(_wrap_FXDCPrint_setTile), -1);
! rb_define_method(cFXDCPrint.klass, "setStippleFromBitmap", VALUEFUNC(_wrap_FXDCPrint_setStippleFromBitmap), -1);
! rb_define_method(cFXDCPrint.klass, "setStippleFromPattern", VALUEFUNC(_wrap_FXDCPrint_setStippleFromPattern), -1);
rb_define_method(cFXDCPrint.klass, "setClipRegion", VALUEFUNC(_wrap_FXDCPrint_setClipRegion), -1);
! rb_define_method(cFXDCPrint.klass, "setClipRectangle4", VALUEFUNC(_wrap_FXDCPrint_setClipRectangle4), -1);
! rb_define_method(cFXDCPrint.klass, "setClipRectangle1", VALUEFUNC(_wrap_FXDCPrint_setClipRectangle1), -1);
rb_define_method(cFXDCPrint.klass, "clearClipRectangle", VALUEFUNC(_wrap_FXDCPrint_clearClipRectangle), -1);
rb_define_method(cFXDCPrint.klass, "setClipMask", VALUEFUNC(_wrap_FXDCPrint_setClipMask), -1);
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 18:59:33
|
Update of /cvsroot/fxruby/FXRuby/tests
In directory usw-pr-cvs1:/tmp/cvs-serv11404
Added Files:
TC_FXDCWindow.rb
Log Message:
Added a test case (unfinished) for FXDC.
--- NEW FILE: TC_FXDCWindow.rb ---
require 'test/unit'
require 'fox'
include Fox
class TC_FXDCWindow < Test::Unit::TestCase
def set_up
if FXApp.instance.nil?
@app = FXApp.new('TC_FXDCWindow', 'FXRuby')
@app.init([])
@mainwin = FXMainWindow.new(@app, 'TC_FXDCWindow')
else
@app = FXApp.instance
@mainwin = @app.mainWindow
end
end
def testGetApp
app = @dc.app
assert_not_nil(app)
assert_kind_of?(FX_App, app)
end
def testReadPixel
p = @dc.readPixel(x, y)
end
def testDrawPoint
@dc.drawPoint(x, y)
end
def testDrawPoints
p1 = FXPoint.new
p2 = FXPoint.new
@dc.drawPoints([p1, p2])
end
def testDrawPointsRel
p1 = FXPoint.new
p2 = FXPoint.new
@dc.drawPointsRel([p1, p2])
end
def testDrawLine
@dc.drawLine(x1, y1, x2, y2)
end
def testDrawLines
@dc.drawLines(points)
end
def testDrawLinesRel
@dc.drawLinesRel(points)
end
def testDrawLineSegments
@dc.drawLineSegments(segments)
end
def testDrawArc
@dc.drawArc(x, y, w, h, ang1, ang2)
end
def testDrawArcs
@dc.drawArcs(arcs)
end
def testFillRectangle
@dc.fillRectangle(x, y, w, h)
end
def testFillRectangles(rectangles)
@dc.fillRectangles(rectangles)
end
def testFillArc
@dc.fillArc(x, y, w, h, ang1, ang2)
end
def testFillArcs
@dc.fillArcs(arcs)
end
def testFillPolygon
@dc.fillPolygon(points)
end
def testFillConcavePolygon
@dc.fillConcavePolygon(points)
end
def testFillComplexPolygon
@dc.fillComplexPolygon(points)
end
def testFillPolygonRel
@dc.fillPolygonRel(points)
end
def testFillConcavePolygonRel
@dc.fillConcavePolygonRel(points)
end
def testFillComplexPolygonRel
@dc.fillComplexPolygonRel(points)
end
def testDrawHashBox
@dc.drawHashBox(x, y, w, h)
@dc.drawHashBox(x, y, w, h, b)
end
def testDrawFocusRectangle
@dc.drawFocusRectangle(x, y, w, h)
end
def testDrawArea
@dc.drawArea(source, sx, sy, sw, sh, dx, dy)
end
def testDrawImage
@dc.drawImage(image, dx, dy)
end
def testDrawBitmap
@dc.drawBitmap(bitmap, dx, dy)
end
def testDrawIcon
@dc.drawIcon(icon, dx, dy)
end
def testDrawIconSunken
@dc.drawIconSunken(icon, dx, dy)
end
def testDrawIconShaded
@dc.drawIconShaded(icon, dx, dy)
end
def testDrawText
@dc.drawText(x, y, str)
end
def testDrawImageText
@dc.drawImageText(x, y, str)
end
def testForeground
@dc.setForeground(fg)
@dc.foreground = fg
assert_equal(fg, @dc.foreground)
assert_equal(fg, @dc.getForeground)
end
def testBackground
@dc.setBackground(fg)
@dc.background = bg
assert_equal(bg, @dc.background)
assert_equal(bg, @dc.getBackground)
end
def testDashes
@dc.setDashPattern(dashoffset, dashpattern, dashlength)
@dc.dashPattern
@dc.dashOffset
@dc.dashLength
end
def testLineWidth
@dc.setLineWidth(linewidth)
@dc.lineWidth = linewidth
assert_equal(linewidth, @dc.lineWidth)
assert_equal(linewidth, @dc.getLineWidth())
end
def testLineCap
@dc.setLineCap(lineCap)
@dc.lineCap = lineCap
assert_equal(lineCap, @dc.lineCap)
assert_equal(lineCap, @dc.getLineCap())
end
def testLineJoin
@dc.setLineJoin(lineJoin)
@dc.lineJoin = lineJoin
assert_equal(lineJoin, @dc.lineJoin)
assert_equal(lineJoin, @dc.getLineJoin())
end
def testLineStyle
@dc.setLineStyle(lineStyle)
@dc.lineStyle = lineStyle
assert_equal(lineStyle, @dc.lineStyle)
assert_equal(lineStyle, @dc.getLineStyle())
end
def testFillStyle
@dc.setFillStyle(fillStyle)
@dc.fillStyle = fillStyle
assert_equal(fillStyle, @dc.fillStyle)
assert_equal(fillStyle, @dc.getFillStyle())
end
def testFillRule
@dc.setFillRule(fillRule)
@dc.fillRule = fillRule
assert_equal(fillRule, @dc.fillRule)
assert_equal(fillRule, @dc.getFillRule())
end
def testFunction
@dc.setFunction(func)
@dc.function = func
assert_equal(func, @dc.function)
assert_equal(func, @dc.getFunction())
end
def testTile
image = nil
@dc.setTile(image)
@dc.setTile(image, dx)
@dc.setTile(image, dx, dy)
assert_same(image, @dc.tile)
assert_same(image, @dc.getTile())
end
def testStippleBitmap
bitmap = nil
@dc.setStipple(bitmap)
@dc.setStipple(bitmap, dx)
@dc.setStipple(bitmap, dx, dy)
assert_same(bitmap, @dc.stippleBitmap)
assert_same(bitmap, @dc.getStippleBitmap())
end
def testStipplePattern
for pat in patterns
@dc.setStipple(pat)
@dc.setStipple(pat, dx)
@dc.setStipple(pat, dx, dy)
assert_equal(pat, @dc.stipplePattern)
assert_equal(pat, @dc.getStipplePattern())
end
end
def testClipRegion
@dc.setClipRegion(region)
end
def testClipRectangle
clipX, clipY, clipWidth, clipHeight = 0, 0, 10, 20
clipRectangle = FXRectangle.new(clipX, clipY, clipWidth, clipHeight)
@dc.setClipRectangle(clipX, clipY, clipWidth, clipHeight)
assert_equal(clipX, @dc.clipX)
assert_equal(clipY, @dc.clipY)
assert_equal(clipWidth, @dc.clipWidth)
assert_equal(clipHeight, @dc.clipHeight)
assert_equal(clipRectangle, @dc.clipRectangle)
@dc.setClipRectangle(clipRectangle)
assert_equal(clipX, @dc.clipX)
assert_equal(clipY, @dc.clipY)
assert_equal(clipWidth, @dc.clipWidth)
assert_equal(clipHeight, @dc.clipHeight)
assert_equal(clipRectangle, @dc.clipRectangle)
@dc.clearClipRectangle
end
def testClipMask
@dc.setClipMask(bitmap)
@dc.setClipMask(bitmap, dx)
@dc.setClipMask(bitmap, dx, dy)
@dc.clearClipMask
end
def testTextFont
textFont = nil
@dc.setTextFont(textFont)
assert_same(textFont, @dc.textFont)
assert_same(textFont, @dc.getTextFont())
@dc.textFont = textFont
assert_same(textFont, @dc.textFont)
assert_same(textFont, @dc.getTextFont())
end
def testClipChildren
@dc.clipChildren(true)
@dc.clipChildren(false)
end
end
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 18:59:27
|
Update of /cvsroot/fxruby/FXRuby/lib/fox
In directory usw-pr-cvs1:/tmp/cvs-serv31065
Modified Files:
aliases.rb
Log Message:
Added hasAccel? as an alias for FXAccelTable#hasAccel.
Index: aliases.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/lib/fox/aliases.rb,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** aliases.rb 27 Mar 2002 18:05:04 -0000 1.22
--- aliases.rb 3 Apr 2002 17:32:58 -0000 1.23
***************
*** 2,5 ****
--- 2,9 ----
module Fox
+ class FX_AccelTable
+ alias hasAccel? hasAccel
+ end
+
class FX_App
alias appName getAppName
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 18:59:21
|
Update of /cvsroot/fxruby/FXRuby/lib/fox
In directory usw-pr-cvs1:/tmp/cvs-serv30893
Modified Files:
overloads.rb
Log Message:
Added support for the overloaded FXDC#setStipple and FXDC#setClipRectangle
methods.
Index: overloads.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/lib/fox/overloads.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** overloads.rb 5 Mar 2002 20:41:13 -0000 1.5
--- overloads.rb 3 Apr 2002 17:32:20 -0000 1.6
***************
*** 22,25 ****
--- 22,42 ----
end
end
+
+ class FX_DC
+ def setStipple(*args)
+ if args[0].kind_of? FXBitmap
+ setStippleFromBitmap(args[0], args[1], args[2])
+ else
+ setStippleFromPattern(args[0], args[1], args[2])
+ end
+ end
+ def setClipRectangle(*args)
+ if args.length == 1
+ setClipRectangle1(args[0])
+ else
+ setClipRectangle4(args[0], args[1], args[2], args[3])
+ end
+ end
+ end
class FXFileStream
|
Update of /cvsroot/fxruby/FXRuby/rdoc-sources
In directory usw-pr-cvs1:/tmp/cvs-serv20269
Added Files:
FXAccelTable.rb FXArrowButton.rb FXBMPIcon.rb FXBMPImage.rb
FXBitmap.rb FXCanvas.rb FXCheckButton.rb FXDC.rb
Log Message:
Updated RDoc documentation files.
--- NEW FILE: FXAccelTable.rb ---
module Fox
# The accelerator table sends a message to a specific
# target object when the indicated key and modifier combination
# is pressed.
class FXAccelTable < FXObject
# Handles the SEL_KEYPRESS event
def onKeyPress(sender, sel, event) ; end
# Handles the SEL_KEYRELEASE event
def onKeyRelease(sender, sel, event) ; end
# Construct empty accelerator table
def initialize() ; end
# Add an accelerator to the table
def addAccel(hotkey, target=nil, seldn=0, selup=0) ; end
# Return true if accelerator specified
def hasAccel?(hotkey) ; end
# Return target object of the given accelerator
def targetOfAccel(hotkey) ; end
# Remove mapping for specified hot key
def removeAccel(hotkey) ; end
end
end
--- NEW FILE: FXArrowButton.rb ---
module Fox
# Button with an arrow; the arrow can point in any direction.
# When clicked, the arrow button sends a SEL_COMMAND to its target.
# When ARROW_REPEAT is passed, the arrow button sends a SEL_COMMAND
# repeatedly while the button is pressed.
#
# = Arrow style options
#
# ARROW_NONE:: No arrow
# ARROW_UP:: Arrow points up
# ARROW_DOWN:: Arrow points down
# ARROW_LEFT:: Arrow points left
# ARROW_RIGHT:: Arrow points right
# ARROW_REPEAT:: Button repeats if held down
# ARROW_AUTOGRAY:: Automatically gray out when not updated
# ARROW_AUTOHIDE:: Automatically hide when not updated
# ARROW_TOOLBAR:: Button is toolbar-style
# ARROW_NORMAL:: FRAME_RAISED|FRAME_THICK|ARROW_UP
#
# = Message identifiers
#
# ID_REPEAT::
# ID_LAST::
#
class FXArrowButton < FXFrame
# Handles the SEL_PAINT message
def onPaint(sender, selector, event) ; end
# Handles the SEL_UPDATE message
def onUpdate(sender, selector, event) ; end
# Handles the SEL_ENTER message
def onEnter(sender, selector, event) ; end
# Handles the SEL_LEAVE message
def onLeave(sender, selector, event) ; end
# Handles the SEL_LEFTBUTTONPRESS message
def onLeftBtnPress(sender, selector, event) ; end
# Handles the SEL_LEFTBUTTONRELEASE message
def onLeftBtnRelease(sender, selector, event) ; end
# Handles the SEL_UNGRABBED message
def onUngrabbed(sender, selector, event) ; end
def onRepeat(sender, selector, event) ; end
# Handles the SEL_KEYPRESS message
def onKeyPress(sender, selector, event) ; end
# Handles the SEL_KEYRELEASE message
def onKeyRelease(sender, selector, event) ; end
def onHotKeyPress(sender, selector, event) ; end
def onHotKeyRelease(sender, selector, event) ; end
def onQueryHelp(sender, selector, event) ; end
def onQueryTip(sender, selector, event) ; end
# Construct arrow button
def initialize(p, tgt=nil, sel=0, opts=ARROW_NORMAL, x=0, y=0, w=0, h=0, pl=DEFAULT_PAD, pr=DEFAULT_PAD, pt=DEFAULT_PAD, pb=DEFAULT_PAD) ; end
# Set the button state (where +true+ means the button is down)
def state=(s) ; end
# Get the button state (where +true+ means the button is down)
def state() ; end
# Set status line help text for this arrow button
def helpText=(text) ; end
# Get status line help text for this arrow button
def helpText() ; end
# Set tool tip message for this arrow button
def tipText=(text) ; end
# Get tool tip message for this arrow button
def tipText() ; end
# Set the arrow style flags
def arrowStyle=(style) ; end
# Get the arrow style flags
def arrowStyle() ; end
# Set the default arrow size
def arrowSize=(size) ; end
# Get the default arrow size
def arrowSize() ; end
# Set the current justification mode.
def justify=(mode) ; end
# Get the current justification mode.
def justify() ; end
# Get the fill color for the arrow
def arrowColor() ; end
# Set the fill color for the arrow
def arrowColor=(clr) ; end
end
end
--- NEW FILE: FXBMPIcon.rb ---
module Fox
# Microsoft Bitmap icon
class FXBMPIcon < FXIcon
# Construct icon from memory stream formatted in Microsoft BMP format
def initialize(app, pix=nil, clr=FXRGB(192,192,192), opts=0, w=1, h=1) ; end
end
end
--- NEW FILE: FXBMPImage.rb ---
module Fox
# Microsoft Bitmap image
class FXBMPImage < FXImage
# Construct image from memory stream formatted in Microsoft BMP format
def initialize(app, pix=nil, opts=0, w=1, h=1) ; end
end
end
--- NEW FILE: FXBitmap.rb ---
module Fox
#
# Bitmap is a one bit/pixel image used for patterning and
# stippling operations.
#
# = Image rendering hints
#
# BITMAP_KEEP:: Keep pixel data in client
# BITMAP_OWNED:: Pixel data is owned by image
# BITMAP_SHMI:: Using shared memory image
# BITMAP_SHMP:: Using shared memory pixmap
#
class FXBitmap < FXDrawable
# Create an image
def initialize(app, pix=nil, opts=0, w=1, h=1) ; end
# Render pixels
def render() ; end
# Get pixel at x,y
def getPixel(x, y) ; end
# Change pixel at x,y
def setPixel(x, y, color) ; end
# Save pixel data only
def savePixels(store) ; end
# Load pixel data only
def loadPixels(store) ; end
end
end
--- NEW FILE: FXCanvas.rb ---
module Fox
# Canvas, an area drawn by another object
class FXCanvas < FXWindow
# Handles the SEL_PAINT message
def onPaint(sender, selector, event) ; end
# Handles the SEL_MOTION message
def onMotion(sender, selector, event) ; end
# Handles the SEL_KEYPRESS message
def onKeyPress(sender, selector, event) ; end
# Handles the SEL_KEYRELEASE message
def onKeyRelease(sender, selector, event) ; end
# Construct new drawing canvas widget
def initialize(p, tgt=nil, sel=0, opts=FRAME_NORMAL, x=0, y=0, w=0, h=0) ; end
end
end
--- NEW FILE: FXCheckButton.rb ---
module Fox
# A check button is a tri-state button. Normally, it is either
# TRUE or FALSE, and toggles between TRUE or FALSE whenever it is pressed.
# A third state MAYBE may be set to indicate that no selection has been made yet
# by the user, or that the state is ambiguous.
# When pressed, the check button sends a SEL_COMMAND to its target, and the
# message data represents the state of the check button.
#
# = CheckButton styles
#
# CHECKBUTTON_AUTOGRAY:: Automatically gray out when not updated
# CHECKBUTTON_AUTOHIDE:: Automatically hide when not updated
# CHECKBUTTON_NORMAL:: JUSTIFY_NORMAL|ICON_BEFORE_TEXT
class FXCheckButton < FXLabel
# Handles the SEL_PAINT message
def onPaint(sender, selector, event) ; end
# Handles the SEL_UPDATE message
def onUpdate(sender, selector, event) ; end
# Handles the SEL_ENTER message
def onEnter(sender, selector, event) ; end
# Handles the SEL_LEAVE message
def onLeave(sender, selector, event) ; end
def onFocusIn(sender, selector, event) ; end
def onFocusOut(sender, selector, event) ; end
def onUngrabbed(sender, selector, event) ; end
# Handles the SEL_LEFTBUTTONPRESS message
def onLeftBtnPress(sender, selector, event) ; end
# Handles the SEL_LEFTBUTTONRELEASE message
def onLeftBtnRelease(sender, selector, event) ; end
# Handles the SEL_KEYPRESS message
def onKeyPress(sender, selector, event) ; end
# Handles the SEL_KEYRELEASE message
def onKeyRelease(sender, selector, event) ; end
def onHotKeyPress(sender, selector, event) ; end
def onHotKeyRelease(sender, selector, event) ; end
def onCheck(sender, selector, event) ; end
def onUncheck(sender, selector, event) ; end
def onUnknown(sender, selector, event) ; end
def onCmdSetValue(sender, selector, event) ; end
def onCmdSetIntValue(sender, selector, event) ; end
def onCmdGetIntValue(sender, selector, event) ; end
# Construct new check button
def initialize(p, text, tgt=nil, sel=0, opts=CHECKBUTTON_NORMAL, x=0, y=0, w=0, h=0, pl=DEFAULT_PAD, pr=DEFAULT_PAD, pt=DEFAULT_PAD, pb=DEFAULT_PAD) ; end
# Set check button state (TRUE, FALSE or MAYBE)
def check=(state=TRUE) ; end
# Get check button state (TRUE, FALSE or MAYBE)
def check() ; end
# Change check button style
def checkButtonStyle=(style) ; end
# Return current check button style
def checkButtonStyle() ; end
# Get the box background color
def boxColor() ; end
# Set the box background color
def boxColor=(clr) ; end
end
end
--- NEW FILE: FXDC.rb ---
module Fox
# Line segment
class FXSegment
attr_accessor :x1, :y1, :x2, :y2
end
# Arc
class FXArc
attr_accessor :x, :y, :w, :h, :a, :b
end
# Abstract Device Context
#
# A Device Context is used to maintain the state of the graphics drawing system.
# Defining your drawing code in terms of the Abstract Device Context allows the
# drawing commands to be rendered on different types of surfaces, such as windows
# and images (FXDCWindow), or on paper (FXDCPrint).
# WYSYWYG may be obtained by using the same identical drawing code in your
# application regardless of the actual device surface being utilized.
#
# = Drawing (BITBLT) functions
# BLT_CLR, /// D := 0
# BLT_SRC_AND_DST, /// D := S & D
# BLT_SRC_AND_NOT_DST, /// D := S & ~D
# BLT_SRC, /// D := S
# BLT_NOT_SRC_AND_DST, /// D := ~S & D
# BLT_DST, /// D := D
# BLT_SRC_XOR_DST, /// D := S ^ D
# BLT_SRC_OR_DST, /// D := S | D
# BLT_NOT_SRC_AND_NOT_DST, /// D := ~S & ~D == D := ~(S | D)
# BLT_NOT_SRC_XOR_DST, /// D := ~S ^ D
# BLT_NOT_DST, /// D := ~D
# BLT_SRC_OR_NOT_DST, /// D := S | ~D
# BLT_NOT_SRC, /// D := ~S
# BLT_NOT_SRC_OR_DST, /// D := ~S | D
# BLT_NOT_SRC_OR_NOT_DST, /// D := ~S | ~D == ~(S & D)
# BLT_SET /// D := 1
#
# = Line Styles
#
# LINE_SOLID:: Solid lines
# LINE_ONOFF_DASH:: On-off dashed lines
# LINE_DOUBLE_DASH:: Double dashed lines
#
# = Line Cap Styles
#
# CAP_NOT_LAST:: Don't include last end cap
# CAP_BUTT:: Butting line end caps
# CAP_ROUND:: Round line end caps
# CAP_PROJECTING:: Projecting line end caps
#
# = Line Join Styles
#
# JOIN_MITER:: Mitered or pointy joints
# JOIN_ROUND:: Round line joints
# JOIN_BEVEL:: Beveled or flat joints
#
# = Fill Styles
#
# FILL_SOLID:: Fill with solid color
# FILL_TILED:: Fill with tiled bitmap
# FILL_STIPPLED:: Fill where stipple mask is 1
# FILL_OPAQUESTIPPLED:: Fill with foreground where mask is 1, background otherwise
#
# = Fill Rules
#
# RULE_EVEN_ODD:: Even odd polygon filling
# RULE_WINDING:: Winding rule polygon filling
#
# = Stipple/dither patterns
#
# STIPPLE_0::
# STIPPLE_NONE::
# STIPPLE_BLACK::All ones
# STIPPLE_1::
# STIPPLE_2::
# STIPPLE_3::
# STIPPLE_4::
# STIPPLE_5::
# STIPPLE_6::
# STIPPLE_7::
# STIPPLE_8::
# STIPPLE_GRAY::50% gray
# STIPPLE_9::
# STIPPLE_10::
# STIPPLE_11::
# STIPPLE_12::
# STIPPLE_13::
# STIPPLE_14::
# STIPPLE_15::
# STIPPLE_16::
# STIPPLE_WHITE::All zeroes
# STIPPLE_HORZ::Horizontal hatch pattern
# STIPPLE_VERT::Vertical hatch pattern
# STIPPLE_CROSS::Cross-hatch pattern
# STIPPLE_DIAG::Diagonal // hatch pattern
# STIPPLE_REVDIAG::Reverse diagonal \\ hatch pattern
# STIPPLE_CROSSDIAG::Cross-diagonal hatch pattern
class FXDC
# Construct dummy DC
def initialize(app) ; end
# Get application
def app() ; end
# Read back pixel
def readPixel(x, y) ; end
# Draw points
def drawPoint(x, y) ; end
# Draw multiple points. Here, _points_ is an array of FXPoint instances.
def drawPoints(points) ; end
# Draw multiple points. Here, _points_ is an array of FXPoint instances.
def drawPointsRel(points) ; end
# Draw line
def drawLine(x1, y1, x2, y2) ; end
# Draw lines (_points_ is an array of FXPoint instances)
def drawLines(points) ; end
# Draw lines (_points_ is an array of FXPoint instances)
def drawLinesRel(points) ; end
# Draw line segments (_segments_ is an array of FXSegment instances)
def drawLineSegments(segments) ; end
# Draw rectangle
def drawRectangle(x, y, w, h) ; end
# Draw multiple rectangles (_rectangles_ is an array of FXRectangle instances)
def drawRectangles(rectangles) ; end
# Draw arcs.
# The argument _ang1_ specifies the start of the arc relative to the
# three-o'clock position from the center, in units of degrees*64.
# The argument _ang2_ specifies the path and extent of the arc relative
# to the start of the arc, in units of degrees*64.
# The arguments _x_, _y_, _w_, and _h_ specify the bounding rectangle.
def drawArc(x, y, w, h, ang1, ang2) ; end
# Draw arcs (_arcs_ is an array of FXArc instances)
def drawArcs(arcs) ; end
# Draw filled rectangle
def fillRectangle(x, y, w, h) ; end
# Draw filled rectangles (_rectangles_ is an array of FXRectangle instances)
def fillRectangles(rectangles) ; end
# Draw filled arc
def fillArc(x, y, w, h, ang1, ang2) ; end
# Draw filled arcs (_arcs_ is an array of FXArc instances)
def fillArcs(arcs) ; end
# Filled polygon (_points_ is an array of FXPoint instances)
def fillPolygon(points) ; end
# Filled polygon (_points_ is an array of FXPoint instances)
def fillConcavePolygon(points) ; end
# Filled polygon (_points_ is an array of FXPoint instances)
def fillComplexPolygon(points) ; end
# Filled polygon with relative points (_points_ is an array of FXPoint instances)
def fillPolygonRel(points) ; end
# Filled polygon with relative points (_points_ is an array of FXPoint instances)
def fillConcavePolygonRel(points) ; end
# Filled polygon with relative points (_points_ is an array of FXPoint instances)
def fillComplexPolygonRel(points) ; end
# Draw hashed box
def drawHashBox(x, y, w, h, b=1) ; end
# Draw focus rectangle
def drawFocusRectangle(x, y, w, h) ; end
# Draw area from source
def drawArea(source, sx, sy, sw, sh, dx, dy) ; end
# Draw image
def drawImage(image, dx, dy) ; end
# Draw bitmap
def drawBitmap(bitmap, dx, dy) ; end
# Draw icon
def drawIcon(icon, dx, dy) ; end
# Draw icon shaded (used for disabled labels and buttons)
def drawIconShaded(icon, dx, dy) ; end
# Draw icon sunken
def drawIconSunken(icon, dx, dy) ; end
# Draw string
def drawText(x, y, string) ; end
# Draw string
def drawImageText(x, y, string) ; end
# Set foreground drawing color
def foreground=(clr) ; end
# Get foreground drawing color
def foreground() ; end
# Set background drawing color
def background=(clr) ; end
# Get background drawing color
def background() ; end
# Set dash pattern and dash offset.
# A dash pattern of [1 2 3 4] is a repeating pattern of 1 foreground pixel,
# 2 background pixels, 3 foreground pixels, and 4 background pixels.
# The offset is where in the pattern the system will start counting.
# The maximum length of the dash pattern is 32.
def setDashes(dashoffset, dashpattern, dashlength) ; end
# Get dash pattern (a string)
def dashPattern() ; end
# Get dash offset
def dashOffset() ; end
# Get dash length
def dashLength() ; end
# Set line width:- 0 means thinnest/fastest possible
def lineWidth=(linewidth) ; end
# Get line width
def lineWidth() ; end
# Set line cap style
def lineCap=(capstyle) ; end
# Get line cap style
def lineCap() ; end
# Set line join style
def lineJoin=(joinstyle) ; end
# Get line join style
def lineJoin() ; end
# Set line style
def lineStyle=(linestyle) ; end
# Get line style
def lineStyle() ; end
# Set fill style
def fillStyle=(fillstyle) ; end
# Get fill style
def fillStyle() ; end
# Set fill rule
def fillRule=(fillrule) ; end
# Get fill rule
def fillRule() ; end
# Set rasterop function
def function=(func) ; end
# Get rasterop function
def function() ; end
# Set the tile image
def setTile(image, dx=0, dy=0) ; end
# Get the tile image
def tile() ; end
# Set the stipple pattern
def setStipple(bitmap, dx=0, dy=0) ; end
# Get stipple bitmap
def stippleBitmap() ; end
# Set the stipple pattern
def setStipple(pat, dx=0, dy=0) ; end
# Get pattern
def stipplePattern() ; end
# Set clip region
def clipRegion=(region) ; end
# Set clip rectangle
def setClipRectangle(x, y, w, h) ; end
# Change clip rectangle
def setClipRectangle(rectangle) ; end
# Return clip rectangle
def clipRectangle() ; end
# Return clip x
def clipX() ; end
# Return clip y
def clipY() ; end
# Return clip width
def clipWidth() ; end
# Return clip height
def clipHeight() ; end
# Clear clipping
def clearClipRectangle() ; end
# Set clip mask
def setClipMask(bitmap, dx=0, dy=0) ; end
# Clear clip mask
def clearClipMask() ; end
# Set font to draw text with
def textFont=(font) ; end
# Get text font
def textFont() ; end
# Clip against child windows
def clipChildren(yes) ; end
end
end
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 17:29:11
|
Update of /cvsroot/fxruby/FXRuby/rdoc-sources
In directory usw-pr-cvs1:/tmp/cvs-serv20475
Added Files:
FXColorBar.rb
Log Message:
--- NEW FILE: FXColorBar.rb ---
module Fox
# A color bar is a widget which controls the brightness (value) of a
# color by means of the hue, saturation, value specification system.
#
# = Color bar orientation
#
# COLORBAR_HORIZONTAL:: Color bar shown horizontally
# COLORBAR_VERTICAL:: Color bar shown vertically
class FXColorBar < FXFrame
long onPaint(FXObject*,FXSelector,void*);
long onLeftBtnPress(FXObject*,FXSelector,void*);
long onLeftBtnRelease(FXObject*,FXSelector,void*);
long onMotion(FXObject*,FXSelector,void*);
long onQueryHelp(FXObject*,FXSelector,void*);
long onQueryTip(FXObject*,FXSelector,void*);
# Construct color well with initial color clr
def initialize(p, tgt=nil, sel=0, opts=FRAME_NORMAL, x=0, y=0, w=0, h=0, pl=DEFAULT_PAD, pr=DEFAULT_PAD, pt=DEFAULT_PAD, pb=DEFAULT_PAD) ; end
# Change hue
def hue=(h) ; end
# Return hue
def hue() ; end
# Change saturation
def sat=(s) ; end
# Return saturation
def sat() ; end
# Change value
def val=(v) ; end
# Return value
def val() ; end
# Get the color bar style
def barStyle() ; end
# Change the color bar style
def barStyle=(style) ; end
# Set status line help text for this color bar
def helpText=(text) ; end
# Get status line help text for this color bar
def helpText() ; end
# Set tool tip message for this color bar
def tipText=(text) ; end
# Get tool tip message for this color well
def tipText() ; end
end
end
|
Update of /cvsroot/fxruby/FXRuby/examples/icons
In directory usw-pr-cvs1:/tmp/cvs-serv972
Added Files:
backview.png bigfolder.png bigpenguin.png bottomview.png
camera.png colorpal.png copy.png cut.png filenew.png
fileopen.png filesave.png filesaveas.png fonts.png fox.png
foxicon.png frontview.png help.png kill.png leftview.png
light.png minidoc.png minifolder.png minifolderopen.png
newfolder.png nolight.png parallel.png paste.png penguin.png
perspective.png printicon.png prop.png redo.png rightview.png
shutter1.png shutter2.png small.png smoothlight.png
tbuplevel.png topview.png undo.png winapp.png zoom.png
Removed Files:
backview.gif bigfolder.gif bigpenguin.gif bottomview.gif
camera.gif colorpal.gif copy.gif cut.gif filenew.gif
fileopen.gif filesave.gif filesaveas.gif fonts.gif fox.gif
foxicon.gif frontview.gif help_gif.gif kill.gif leftview.gif
light.gif minidoc.gif minifolder.gif minifolderopen.gif
newfolder.gif nolight.gif parallel.gif paste.gif penguin.gif
perspective.gif printicon.gif prop.gif redo_gif.gif
rightview.gif shutter1.gif shutter2.gif small_gif.gif
smoothlight.gif tbuplevel.gif topview.gif undo_gif.gif
winapp.gif zoom.gif
Log Message:
Replacing GIF icons with PNG versions.
--- NEW FILE: backview.png ---
PNG
d¤M .U àa
--- NEW FILE: bigfolder.png ---
PNG
--- NEW FILE: bigpenguin.png ---
PNG
.Vr'kôÞ&AD¨X
ÓHi~5É,¸égA:ðnM)Ï÷Þ½»\î®?¹÷ýä÷÷ý.ÙÀaLÏ&0Ò5.z>lò: àäq`& ¤ù,`N[`¤Àu .ì40ËU¨¼Z3
ÅÛ°lT35à~X ﶿ ÖjÛ÷?¨j]o0àÿNé töÓóÕwÚ~î©aéo?75CMË¾Û ?Ke°e³â}¯+dÂtK,$ï]%\'ÕäàáqNÁx'i Ұ챺r0Sáªë8/ÆK³]W|!T¸$#¹ÇB;aâuA5Ö|fG` ¬¨`
NÀXvuB %ÊnáÖA <
¨w
Ì0E1 ÇA!;ÚÍÇÀ2Ó%ÂÍQ¹Ï1 «ÚÃι<úÇB½ú ¸~9
v `{$Ö'wÓóöèQÝ"38Í¿
ku«ëÕ¿^W<¯^6ñZ¯Wß÷^O¼ÐÿÑS\jAöÛ
--- NEW FILE: bottomview.png ---
PNG
--- NEW FILE: camera.png ---
PNG
--- NEW FILE: colorpal.png ---
PNG
--- NEW FILE: copy.png ---
PNG
--- NEW FILE: cut.png ---
PNG
--- NEW FILE: filenew.png ---
PNG
--- NEW FILE: fileopen.png ---
PNG
--- NEW FILE: filesave.png ---
PNG
--- NEW FILE: filesaveas.png ---
PNG
hÐôV
ÞѶ£¥
--- NEW FILE: fonts.png ---
PNG
--- NEW FILE: fox.png ---
PNG
B$ÈÉ(âä¤3(§ðI ²MdR s¼)PDÍ fH£b
Cy2h"`"ãɨzBYÇ©Ê:A° ö²Æ¢
«1Y6õ1ÔM
Rý!Ru0]
Ï f*?y">"bæ±ugm¶&A/^ÙDÿðB áKP]
2ePLÉÉeWBA½&úi
<ÄôÐ?&`º
XdÎæð&ÙÍ
Í$Lñ1£+¼<! É1
&ªÍSF¢¢kHX
sÄ¢êI ¨è"þÇ
KµTI[¹©dPf¶Èò,¤p.Z¡òÐA@Ù<& ²tßRÆâ¤:#f© g©
cº)HÔ¬Ø R5ð)SPËù-$¬FsÖadj$eèh¶¯S§(ÖNLSìf,t:@Þ<Ìmº)°â¡Ð&UPh¢"&e S!b\»³²D°tjcÚhÉ (N0áòTá²bήtË¡Åæ:¨¢µ4P1HÁ"Ý×Jaêí
çèê¿ Þ»?í§%RÌn]~þö· Üå±¢óä{§ï:Ð!Á?RÈ/¾×Z\P?»gäôy½`g´©ª¢«ª¢Ò ÿ^
ô^ xUÝyy;zFG½
?úëë²aEÝ SAO\züHÔís.6¸`×yàE"h ,x<çêê ¼²¤n'a]»I®ão
x0¾ìXã$49Õ{_îHØï hf z®¾ü}EýcáNøíͯö÷çu Æôqiê'fqêÖ/ðze«{}ö`|"@è-.¸.°Ç
{+¿%? Ìö ¦Ðs°¨xs0t.
CÄ¢4 Qh
ð£[ñº¶
ÜV¢TE
"@ òªç«¶ä~¸
R÷ OÜ[Ur%H4åÄ$§H\aÙ
ÒÒU > çp ·7ÔW|" è¬ôyϬ½páûñÐãêàvGäUçÎ[~ûy§éuêj{ûpUÉÕÄÕÄðn âpl;ÜV_Ppí_C[±Á©^Ð|w÷Ñ` ±³ôÛµ¾ÿ~ü."b ,RÆÝ붼êüææêÝAP¡:yUMOµ\N $Vë#ÐÐM «±f°xVÛù¶¶»^;F2j°Ã
Nױ .Ȧ
èÝ?eýúWÓzK'ªU±h+b@xñæ?P êNºqí8
|MRTئh*
M[ÔwuÕÖîÂ#@R>Já³5WàF6ËWıÅ-ùµ£AOÍ`D× ýþ7xÝvõB¸Æ[Ò¾³ðÖ¼ù
««æðÌO¬wùû%ù-3j¿Áõdi yFÇ,Á-ï÷DâðµXqCãKÏ ùåG } Ö¦>RÛ¢ÉXvUÔÞWU
ã<ôÂÄ ã¡àIð´²6¬í§ÑúÃ3gvuu7ôtw_)I wíò÷Æã9¤"¯Ù(Ï/Ï %Ô¾'⤱
<óÜ«g·]ºtiÛ¶G~yý±Ç }ö»wÜÔYJmÉ`òî¸ã ;ölÞÕØV·m¸úùi(
¡²QdnlèÀv¤ ßÔtww×ÖÕ64Ô¶ùÇÜÜEz@>_eá'ï~v¾¶»a6qlÔpö"îXUÚx¾¶¡å§Å6}÷ÝÏxçkÒÑ µW½ 9eãâÚ"âg,õ!P$¾å vö ;~ìX¯»ªñh,½l NË|]<N«$ÖÆØóñ5¸ð¬¶%@)Hüü¡@.Ü?Æi:c©OYÒ F\^ßÝ×?r<JúиSt8!Íuè?êÔûl
|²`Æ!EG°82©> (Ð 2:,mv'} JL§09Q²+EDA4Õ K7ÅfßÓ?M¬DEw¦p3(VÃ'ZäU³$P,ã ¸æg´Á}o9U¤²Æ:¢Ù±%£Õ# >UÄ»dí+ª Ú[Õãõµ1iªx²pÓ±©»hp6Yº¯cbÕÐPFu\òY¶ l²e¢Ø£õ¦ Jw3AÝP `8à ðgD,$LçUsY -Ò)TLæ@¹¦%`$²À³OªDÙÌ»`lóÇÚø¢:ªÉØfTU4Y$áTés¤ð7ê(¯l|ÕÙ@K Dúä¢ ÄÈ4MËLé©~¨¥ ÔU <q²
ú±Ù;ö¢+ÈfHPõ-I$È 5]]ûè¢ £ã³+Ë}6ÊÙb?t#IrÝ "æÒn(ZpÓ°é ÊÖÌæ¤w ¨áe++FÆ:Ø\õl
ùg=ôÉ3 úl¥ÀS.±=üªÛG2-ð
×9SSH"HãFôà°,NE²HÌ©_R4Íf& vPÉöä ú -ÆM<&¢Wã0Ò©ã ÅCà
¼´V?æ©vXD°«ãÒúæ @9L{ÙV¼C¦Ì)iG-Ï,6-Y#
Ö`©Y Ü2çVÎ. ?²ÒíWÐë"ýº{V@þ`w 7B,@âþ&bAÿ0ô¬êGj´É|E?cÁùÌ 2(Lk Ü@Vø3®ÄÆÞ
FV9Ì2ËGo$ƱAÕ ÔYñq5¦h #Yø|`j¸¼ÄP¸ ÙÃC¢±R²#D`*-cÑ É| b§VÔ(ÌG5)ögìâG ØÒÊ. Þ8ke"¾[d ~$M»@ز£kíüè²(ú²d:þ3!
--- NEW FILE: foxicon.png ---
PNG
--- NEW FILE: frontview.png ---
PNG
f¸¸ ] FhXZ(àa
--- NEW FILE: help.png ---
PNG
--- NEW FILE: kill.png ---
PNG
--- NEW FILE: leftview.png ---
PNG
ØP
--- NEW FILE: light.png ---
PNG
--- NEW FILE: minidoc.png ---
PNG
)Ú Hìâ5Sð Ð EôBo¾CàÐÂ9W¤íÝÄG
--- NEW FILE: minifolder.png ---
PNG
20¸c
--- NEW FILE: minifolderopen.png ---
PNG
QA0©URR 2L@ ¦FT¬ËÄÄTh HÄ1ª
È`
--- NEW FILE: newfolder.png ---
PNG
--- NEW FILE: nolight.png ---
PNG
,º
--- NEW FILE: parallel.png ---
PNG
--- NEW FILE: paste.png ---
PNG
--- NEW FILE: penguin.png ---
PNG
--- NEW FILE: perspective.png ---
PNG
--- NEW FILE: printicon.png ---
PNG
--- NEW FILE: prop.png ---
PNG
il <ÁûÏÔ:ȯz ãÊÕ`Ó±@²¡´Ý(²ÇB¥óªªtPHàçë
¤Þ
| O´
--- NEW FILE: redo.png ---
PNG
--- NEW FILE: rightview.png ---
PNG
--- NEW FILE: shutter1.png ---
PNG
http://www.ozemail.com.au/~afactorF_îÛ
Ç~ $¿
QUõBP§!Ä^Ó`XÐè-ÝðpEx·´G£O
a ÝXjûØf0˯Á5Ô/.Ã^Uñ·K[ -ûºnªú6¤}æÈMO kÄ©Í!}õJ(T@¼îPñAý@Æ1tL
--- NEW FILE: shutter2.png ---
PNG
http://www.ozemail.com.au/~afactorö ´¢@
Y§
_~Xß «ÇÌ
--- NEW FILE: small.png ---
PNG
--- NEW FILE: smoothlight.png ---
PNG
--- NEW FILE: tbuplevel.png ---
PNG
--- NEW FILE: topview.png ---
PNG
B
À
þ¢
--- NEW FILE: undo.png ---
PNG
--- NEW FILE: winapp.png ---
PNG
--- NEW FILE: zoom.png ---
PNG
--- backview.gif DELETED ---
--- bigfolder.gif DELETED ---
--- bigpenguin.gif DELETED ---
--- bottomview.gif DELETED ---
--- camera.gif DELETED ---
--- colorpal.gif DELETED ---
--- copy.gif DELETED ---
--- cut.gif DELETED ---
--- filenew.gif DELETED ---
--- fileopen.gif DELETED ---
--- filesave.gif DELETED ---
--- filesaveas.gif DELETED ---
--- fonts.gif DELETED ---
--- fox.gif DELETED ---
--- foxicon.gif DELETED ---
--- frontview.gif DELETED ---
--- help_gif.gif DELETED ---
--- kill.gif DELETED ---
--- leftview.gif DELETED ---
--- light.gif DELETED ---
--- minidoc.gif DELETED ---
--- minifolder.gif DELETED ---
--- minifolderopen.gif DELETED ---
--- newfolder.gif DELETED ---
--- nolight.gif DELETED ---
--- parallel.gif DELETED ---
--- paste.gif DELETED ---
--- penguin.gif DELETED ---
--- perspective.gif DELETED ---
--- printicon.gif DELETED ---
--- prop.gif DELETED ---
--- redo_gif.gif DELETED ---
--- rightview.gif DELETED ---
--- shutter1.gif DELETED ---
--- shutter2.gif DELETED ---
--- small_gif.gif DELETED ---
--- smoothlight.gif DELETED ---
--- tbuplevel.gif DELETED ---
--- topview.gif DELETED ---
--- undo_gif.gif DELETED ---
--- winapp.gif DELETED ---
--- zoom.gif DELETED ---
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 00:40:47
|
Update of /cvsroot/fxruby/FXRuby/examples
In directory usw-pr-cvs1:/tmp/cvs-serv3601
Modified Files:
README button.rb examples.xml glviewer.rb groupbox.rb
header.rb hello2.rb imageviewer.rb mditest.rb splitter.rb
table.rb
Log Message:
Updated examples to use PNG icons instead of GIF icons.
Index: README
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README 12 Mar 2001 23:41:30 -0000 1.2
--- README 2 Apr 2002 22:27:54 -0000 1.3
***************
*** 33,37 ****
hello2.rb
! The souped-up version of "Hello, World!", complete with a GIF icon
and tooltips.
--- 33,37 ----
hello2.rb
! The souped-up version of "Hello, World!", complete with a PNG icon
and tooltips.
Index: button.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/button.rb,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** button.rb 5 Nov 2001 20:38:36 -0000 1.18
--- button.rb 2 Apr 2002 22:27:54 -0000 1.19
***************
*** 31,36 ****
0, 0, 0, 0, 20, 20, 20, 20)
! # Construct icon from a GIF file on disk
! bigpenguin = loadIcon("bigpenguin.gif")
# The button
--- 31,36 ----
0, 0, 0, 0, 20, 20, 20, 20)
! # Construct icon from a PNG file on disk
! bigpenguin = loadIcon("bigpenguin.png")
# The button
***************
*** 125,129 ****
def loadIcon(filename)
! FXGIFIcon.new(getApp(), File.open("icons/" + filename, "rb").read)
end
--- 125,129 ----
def loadIcon(filename)
! FXPNGIcon.new(getApp(), File.open("icons/" + filename, "rb").read)
end
Index: examples.xml
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/examples.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** examples.xml 23 Mar 2001 19:16:19 -0000 1.2
--- examples.xml 2 Apr 2002 22:27:54 -0000 1.3
***************
*** 35,39 ****
</example>
<example name="hello2.rb">
! The souped-up version of "Hello, World!", complete with a GIF icon
and tooltips.
</example>
--- 35,39 ----
</example>
<example name="hello2.rb">
! The souped-up version of "Hello, World!", complete with a PNG icon
and tooltips.
</example>
Index: glviewer.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/glviewer.rb,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** glviewer.rb 2 Mar 2002 01:41:21 -0000 1.9
--- glviewer.rb 2 Apr 2002 22:27:54 -0000 1.10
***************
*** 146,155 ****
include Responder
! # Load the named GIF icon from a file
def loadIcon(filename)
begin
! filename = File.join("icons", filename) + ".gif"
bytes = File.open(filename, "rb").read
! return FXGIFIcon.new(getApp(), bytes)
rescue
puts("Couldn't load icon: " + filename)
--- 146,155 ----
include Responder
! # Load the named PNG icon from a file
def loadIcon(filename)
begin
! filename = File.join("icons", filename) + ".png"
bytes = File.open(filename, "rb").read
! return FXPNGIcon.new(getApp(), bytes)
rescue
puts("Couldn't load icon: " + filename)
Index: groupbox.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/groupbox.rb,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** groupbox.rb 14 Mar 2002 17:04:52 -0000 1.11
--- groupbox.rb 2 Apr 2002 22:27:54 -0000 1.12
***************
*** 9,13 ****
# Convenience function to load & construct an icon
def getIcon(filename)
! FXGIFIcon.new(getApp(), File.open("icons/" + filename, "rb").read())
end
--- 9,13 ----
# Convenience function to load & construct an icon
def getIcon(filename)
! FXPNGIcon.new(getApp(), File.open("icons/" + filename, "rb").read())
end
***************
*** 17,23 ****
# Some icons we'll use here and there
! doc = getIcon("minidoc.gif")
! folder_open = getIcon("minifolderopen.gif")
! folder_closed = getIcon("minifolder.gif")
# Menubar
--- 17,23 ----
# Some icons we'll use here and there
! doc = getIcon("minidoc.png")
! folder_open = getIcon("minifolderopen.png")
! folder_closed = getIcon("minifolder.png")
# Menubar
Index: header.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/header.rb,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** header.rb 26 Nov 2001 18:36:32 -0000 1.15
--- header.rb 2 Apr 2002 22:27:54 -0000 1.16
***************
*** 55,59 ****
# Document icon
! doc = FXGIFIcon.new(getApp(), File.open("icons/minidoc.gif", "rb").read)
@header1.appendItem("Name", doc, 150)
--- 55,59 ----
# Document icon
! doc = FXPNGIcon.new(getApp(), File.open("icons/minidoc.png", "rb").read)
@header1.appendItem("Name", doc, 150)
Index: hello2.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/hello2.rb,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** hello2.rb 20 Feb 2002 17:42:20 -0000 1.8
--- hello2.rb 2 Apr 2002 22:27:54 -0000 1.9
***************
*** 27,35 ****
main = FXMainWindow.new(application, "Hello", nil, nil, DECOR_ALL)
! # Construct a GIF icon that we'll attach to the button. Note that the
# second argument to the constructor just needs to be a byte stream (i.e.
# a string) from some source; here, we're reading the bytes from a file
# on disk.
! icon = FXGIFIcon.new(application, File.open("icons/hello2.gif", "rb").read)
# Construct the button as a child of the main window.
--- 27,35 ----
main = FXMainWindow.new(application, "Hello", nil, nil, DECOR_ALL)
! # Construct a PNG icon that we'll attach to the button. Note that the
# second argument to the constructor just needs to be a byte stream (i.e.
# a string) from some source; here, we're reading the bytes from a file
# on disk.
! icon = FXPNGIcon.new(application, File.open("icons/hello2.png", "rb").read)
# Construct the button as a child of the main window.
Index: imageviewer.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/imageviewer.rb,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** imageviewer.rb 18 Jan 2002 02:15:38 -0000 1.17
--- imageviewer.rb 2 Apr 2002 22:27:54 -0000 1.18
***************
*** 25,35 ****
# Make some icons
! fileopenicon = getIcon("fileopen.gif")
! filesaveicon = getIcon("filesave.gif")
! cuticon = getIcon("cut.gif")
! copyicon = getIcon("copy.gif")
! pasteicon = getIcon("paste.gif")
! uplevelicon = getIcon("tbuplevel.gif")
! paletteicon = getIcon("colorpal.gif")
# Make color dialog
--- 25,35 ----
# Make some icons
! fileopenicon = getIcon("fileopen.png")
! filesaveicon = getIcon("filesave.png")
! cuticon = getIcon("cut.png")
! copyicon = getIcon("copy.png")
! pasteicon = getIcon("paste.png")
! uplevelicon = getIcon("tbuplevel.png")
! paletteicon = getIcon("colorpal.png")
# Make color dialog
***************
*** 247,254 ****
end
! # Convenience function to construct a GIF icon
def getIcon(filename)
filename = "icons/" + filename
! FXGIFIcon.new(getApp(), File.open(filename, "rb").read)
end
--- 247,254 ----
end
! # Convenience function to construct a PNG icon
def getIcon(filename)
filename = "icons/" + filename
! FXPNGIcon.new(getApp(), File.open(filename, "rb").read)
end
Index: mditest.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/mditest.rb,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mditest.rb 7 Nov 2001 18:11:21 -0000 1.7
--- mditest.rb 2 Apr 2002 22:27:54 -0000 1.8
***************
*** 64,69 ****
# Icon for MDI Child
! @mdiicon = FXGIFIcon.new(getApp(),
! File.open("icons/penguin.gif", "rb").read)
# Make MDI Menu
--- 64,69 ----
# Icon for MDI Child
! @mdiicon = FXPNGIcon.new(getApp(),
! File.open("icons/penguin.png", "rb").read)
# Make MDI Menu
Index: splitter.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/splitter.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** splitter.rb 26 Nov 2001 18:37:25 -0000 1.5
--- splitter.rb 2 Apr 2002 22:27:54 -0000 1.6
***************
*** 8,12 ****
def makeIcon(name)
! FXGIFIcon.new(getApp(), File.open(File.join("icons", name), "rb").read)
end
--- 8,12 ----
def makeIcon(name)
! FXPNGIcon.new(getApp(), File.open(File.join("icons", name), "rb").read)
end
***************
*** 16,22 ****
# Construct some icons we'll use
! folder_open = makeIcon("minifolderopen.gif")
! folder_closed = makeIcon("minifolder.gif")
! doc = makeIcon("minidoc.gif")
# Menu bar
--- 16,22 ----
# Construct some icons we'll use
! folder_open = makeIcon("minifolderopen.png")
! folder_closed = makeIcon("minifolder.png")
! doc = makeIcon("minidoc.png")
# Menu bar
Index: table.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/table.rb,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** table.rb 13 Mar 2002 22:04:31 -0000 1.8
--- table.rb 2 Apr 2002 22:27:54 -0000 1.9
***************
*** 16,20 ****
# Icon used in some cells
! penguinicon = FXGIFIcon.new(getApp(), File.open(File.join('icons', 'penguin.gif'), 'rb').read, 0, IMAGE_ALPHAGUESS)
# Menubar
--- 16,20 ----
# Icon used in some cells
! penguinicon = FXPNGIcon.new(getApp(), File.open(File.join('icons', 'penguin.png'), 'rb').read, 0, IMAGE_ALPHAGUESS)
# Menubar
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 00:38:29
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv24203/ext/fox Modified Files: 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: Updates from latest SWIG. Index: core_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** core_wrap.cpp 2 Apr 2002 04:10:09 -0000 1.59 --- core_wrap.cpp 2 Apr 2002 23:30:41 -0000 1.60 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020401-2115 * * 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-20020402-1643 * * This file is not intended to be easily readable and contains a number of Index: dialogs_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** dialogs_wrap.cpp 2 Apr 2002 04:10:13 -0000 1.33 --- dialogs_wrap.cpp 2 Apr 2002 23:30:43 -0000 1.34 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020401-2115 * * 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-20020402-1643 * * 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.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** icons_wrap.cpp 2 Apr 2002 04:10:14 -0000 1.36 --- icons_wrap.cpp 2 Apr 2002 23:30:43 -0000 1.37 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020401-2115 * * 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-20020402-1643 * * 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.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** image_wrap.cpp 2 Apr 2002 04:10:14 -0000 1.38 --- image_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.39 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020401-2115 * * 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-20020402-1643 * * This file is not intended to be easily readable and contains a number of Index: layout_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** layout_wrap.cpp 2 Apr 2002 04:10:14 -0000 1.7 --- layout_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.8 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020401-2115 * * 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-20020402-1643 * * 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.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** mdi_wrap.cpp 2 Apr 2002 04:10:14 -0000 1.35 --- mdi_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.36 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020401-2115 * * 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-20020402-1643 * * 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.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** opengl_wrap.cpp 2 Apr 2002 04:10:15 -0000 1.40 --- opengl_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.41 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020401-2115 * * 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-20020402-1643 * * This file is not intended to be easily readable and contains a number of Index: scintilla_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/scintilla_wrap.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** scintilla_wrap.cpp 28 Mar 2002 15:26:08 -0000 1.15 --- scintilla_wrap.cpp 2 Apr 2002 23:30:45 -0000 1.16 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020327-1824 * * 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-20020402-1643 * * This file is not intended to be easily readable and contains a number of *************** *** 4319,4322 **** --- 4319,4323 ---- rb_define_method(cNotifyHeader.klass, "code", VALUEFUNC(_wrap_NotifyHeader_code_get), -1); cNotifyHeader.mark = 0; + cNotifyHeader.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cSCNotification.klass = rb_define_class_under(mFox, "SCNotification", rb_cObject); Index: ui_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ui_wrap.cpp 2 Apr 2002 04:10:15 -0000 1.8 --- ui_wrap.cpp 2 Apr 2002 23:30:45 -0000 1.9 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020401-2115 * * 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-20020402-1643 * * This file is not intended to be easily readable and contains a number of |
