fxruby-commits Mailing List for FXRuby
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-07-12 17:06:55
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv7936
Modified Files:
core_wrap.cpp scintilla_wrap.cpp
Log Message:
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** core_wrap.cpp 12 Jul 2002 17:03:24 -0000 1.65
--- core_wrap.cpp 12 Jul 2002 17:06:43 -0000 1.66
***************
*** 10432,10436 ****
static VALUE
! _wrap_FXRegion___add____SWIG_1(int argc, VALUE *argv, VALUE self) {
FX::FXRegion *arg1 ;
FX::FXRegion *arg2 ;
--- 10432,10436 ----
static VALUE
! _wrap_FXRegion___add__(int argc, VALUE *argv, VALUE self) {
FX::FXRegion *arg1 ;
FX::FXRegion *arg2 ;
***************
*** 10453,10491 ****
- static VALUE _wrap_FXRegion___add__(int nargs, VALUE *args, VALUE self) {
- int argc;
- VALUE argv[3];
- int ii;
-
- argc = nargs + 1;
- argv[0] = self;
- for (ii = 1; (ii < argc) && (ii < 2); ii++) {
- argv[ii] = args[ii-1];
- }
- if (argc == 2) {
- int _m = 1;
- int _v = 1;
- {
- void *ptr;
- _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FX__FXRegion, 0) != -1)) ? 1 : 0;
- }
- _m &= _v;
- {
- void *ptr;
- _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FX__FXRegion, 0) != -1)) ? 1 : 0;
- }
- _m &= _v;
- if (_m && _v) {
- return _wrap_FXRegion___add____SWIG_1(nargs, args, self);
- }
- }
-
- rb_raise(rb_eArgError, "No matching function for overloaded 'FXRegion___add__'");
- return Qnil;
- }
-
-
static VALUE
! _wrap_FXRegion___mul____SWIG_1(int argc, VALUE *argv, VALUE self) {
FX::FXRegion *arg1 ;
FX::FXRegion *arg2 ;
--- 10453,10458 ----
static VALUE
! _wrap_FXRegion___mul__(int argc, VALUE *argv, VALUE self) {
FX::FXRegion *arg1 ;
FX::FXRegion *arg2 ;
***************
*** 10508,10546 ****
- static VALUE _wrap_FXRegion___mul__(int nargs, VALUE *args, VALUE self) {
- int argc;
- VALUE argv[3];
- int ii;
-
- argc = nargs + 1;
- argv[0] = self;
- for (ii = 1; (ii < argc) && (ii < 2); ii++) {
- argv[ii] = args[ii-1];
- }
- if (argc == 2) {
- int _m = 1;
- int _v = 1;
- {
- void *ptr;
- _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FX__FXRegion, 0) != -1)) ? 1 : 0;
- }
- _m &= _v;
- {
- void *ptr;
- _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FX__FXRegion, 0) != -1)) ? 1 : 0;
- }
- _m &= _v;
- if (_m && _v) {
- return _wrap_FXRegion___mul____SWIG_1(nargs, args, self);
- }
- }
-
- rb_raise(rb_eArgError, "No matching function for overloaded 'FXRegion___mul__'");
- return Qnil;
- }
-
-
static VALUE
! _wrap_FXRegion___sub____SWIG_1(int argc, VALUE *argv, VALUE self) {
FX::FXRegion *arg1 ;
FX::FXRegion *arg2 ;
--- 10475,10480 ----
static VALUE
! _wrap_FXRegion___sub__(int argc, VALUE *argv, VALUE self) {
FX::FXRegion *arg1 ;
FX::FXRegion *arg2 ;
***************
*** 10563,10601 ****
- static VALUE _wrap_FXRegion___sub__(int nargs, VALUE *args, VALUE self) {
- int argc;
- VALUE argv[3];
- int ii;
-
- argc = nargs + 1;
- argv[0] = self;
- for (ii = 1; (ii < argc) && (ii < 2); ii++) {
- argv[ii] = args[ii-1];
- }
- if (argc == 2) {
- int _m = 1;
- int _v = 1;
- {
- void *ptr;
- _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FX__FXRegion, 0) != -1)) ? 1 : 0;
- }
- _m &= _v;
- {
- void *ptr;
- _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FX__FXRegion, 0) != -1)) ? 1 : 0;
- }
- _m &= _v;
- if (_m && _v) {
- return _wrap_FXRegion___sub____SWIG_1(nargs, args, self);
- }
- }
-
- rb_raise(rb_eArgError, "No matching function for overloaded 'FXRegion___sub__'");
- return Qnil;
- }
-
-
static VALUE
! _wrap_FXRegion___xor____SWIG_1(int argc, VALUE *argv, VALUE self) {
FX::FXRegion *arg1 ;
FX::FXRegion *arg2 ;
--- 10497,10502 ----
static VALUE
! _wrap_FXRegion___xor__(int argc, VALUE *argv, VALUE self) {
FX::FXRegion *arg1 ;
FX::FXRegion *arg2 ;
***************
*** 10618,10656 ****
- static VALUE _wrap_FXRegion___xor__(int nargs, VALUE *args, VALUE self) {
- int argc;
- VALUE argv[3];
- int ii;
-
- argc = nargs + 1;
- argv[0] = self;
- for (ii = 1; (ii < argc) && (ii < 2); ii++) {
- argv[ii] = args[ii-1];
- }
- if (argc == 2) {
- int _m = 1;
- int _v = 1;
- {
- void *ptr;
- _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FX__FXRegion, 0) != -1)) ? 1 : 0;
- }
- _m &= _v;
- {
- void *ptr;
- _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FX__FXRegion, 0) != -1)) ? 1 : 0;
- }
- _m &= _v;
- if (_m && _v) {
- return _wrap_FXRegion___xor____SWIG_1(nargs, args, self);
- }
- }
-
- rb_raise(rb_eArgError, "No matching function for overloaded 'FXRegion___xor__'");
- return Qnil;
- }
-
-
static VALUE
! _wrap_FXRegion___eq____SWIG_1(int argc, VALUE *argv, VALUE self) {
FX::FXRegion *arg1 ;
FX::FXRegion *arg2 ;
--- 10519,10524 ----
static VALUE
! _wrap_FXRegion___eq__(int argc, VALUE *argv, VALUE self) {
FX::FXRegion *arg1 ;
FX::FXRegion *arg2 ;
***************
*** 10666,10702 ****
vresult = result ? Qtrue : Qfalse;
return vresult;
- }
-
-
- static VALUE _wrap_FXRegion___eq__(int nargs, VALUE *args, VALUE self) {
- int argc;
- VALUE argv[3];
- int ii;
-
- argc = nargs + 1;
- argv[0] = self;
- for (ii = 1; (ii < argc) && (ii < 2); ii++) {
- argv[ii] = args[ii-1];
- }
- if (argc == 2) {
- int _m = 1;
- int _v = 1;
- {
- void *ptr;
- _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FX__FXRegion, 0) != -1)) ? 1 : 0;
- }
- _m &= _v;
- {
- void *ptr;
- _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FX__FXRegion, 0) != -1)) ? 1 : 0;
- }
- _m &= _v;
- if (_m && _v) {
- return _wrap_FXRegion___eq____SWIG_1(nargs, args, self);
- }
- }
-
- rb_raise(rb_eArgError, "No matching function for overloaded 'FXRegion___eq__'");
- return Qnil;
}
--- 10534,10537 ----
Index: scintilla_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/scintilla_wrap.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** scintilla_wrap.cpp 11 Jul 2002 13:33:10 -0000 1.17
--- scintilla_wrap.cpp 12 Jul 2002 17:06:52 -0000 1.18
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.14u-20020708-1058
*
* 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.14u-20020712-1142
*
[...1132 lines suppressed...]
static swig_type_info _swigt__p_SCNotification[] = {{"_p_SCNotification", 0, "SCNotification *"},{"_p_SCNotification"},{0}};
! static swig_type_info _swigt__p_FXComposite[] = {{"_p_FXComposite", 0, "FXComposite *"},{"_p_FXIconList", _p_FXIconListTo_p_FXComposite},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXComposite},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXComposite},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXComposite},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXComposite},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXComposite},{"_p_FXComposite"},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXComposite},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXComposite},{"_p_FXTabBook", _p_FXTabBookTo_p_FXComposite},{"_p_FXShell", _p_FXShellTo_p_FXComposite},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXComposite},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXComposite},{"_p_FXPopup", _p_FXPopupTo_p_FXComposite},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXComposite},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXComposite},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXComposite},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXComposite},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXComposite},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXComposite},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXComposite},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXComposite},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXComposite},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXComposite},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXComposite},{"_p_FXScintilla", _p_FXScintillaTo_p_FXComposite},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXComposite},{"_p_FXFileList", _p_FXFileListTo_p_FXComposite},{"_p_FXText", _p_FXTextTo_p_FXComposite},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXComposite},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXComposite},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXComposite},{"_p_FXPacker", _p_FXPackerTo_p_FXComposite},{"_p_FXRbText", _p_FXRbTextTo_p_FXComposite},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXComposite},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXComposite},{"_p_FXTable", _p_FXTableTo_p_FXComposite},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXComposite},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXComposite},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXComposite},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXComposite},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXComposite},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXComposite},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXComposite},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXComposite},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXComposite},{"_p_FXDirList", _p_FXDirListTo_p_FXComposite},{"_p_FXRbShell", _p_FXRbShellTo_p_FXComposite},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXComposite},{"_p_FXListBox", _p_FXListBoxTo_p_FXComposite},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXComposite},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXComposite},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXComposite},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXComposite},{"_p_FXToolbar", _p_FXToolbarTo_p_FXComposite},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXComposite},{"_p_FXMenubar", _p_FXMenubarTo_p_FXComposite},{"_p_FXTooltip", _p_FXTooltipTo_p_FXComposite},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXComposite},{"_p_FXList", _p_FXListTo_p_FXComposite},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXComposite},{"_p_FXTabBar", _p_FXTabBarTo_p_FXComposite},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXComposite},{"_p_FXImageView", _p_FXImageViewTo_p_FXComposite},{"_p_FXTreeList", _p_FXTreeListTo_p_FXComposite},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXComposite},{"_p_FXRbList", _p_FXRbListTo_p_FXComposite},{"_p_FXRbTable", _p_FXRbTableTo_p_FXComposite},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXComposite},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXComposite},{0}};
! static swig_type_info _swigt__p_FXWindow[] = {{"_p_FXWindow", 0, "FXWindow *"},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXWindow},{"_p_FXColorBar", _p_FXColorBarTo_p_FXWindow},{"_p_FXTreeList", _p_FXTreeListTo_p_FXWindow},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXWindow},{"_p_FXTabBar", _p_FXTabBarTo_p_FXWindow},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXWindow},{"_p_FXTextField", _p_FXTextFieldTo_p_FXWindow},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXWindow},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXWindow},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXWindow},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXWindow},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXWindow},{"_p_FXDirList", _p_FXDirListTo_p_FXWindow},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXWindow},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXWindow},{"_p_FXList", _p_FXListTo_p_FXWindow},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXWindow},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXWindow},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXWindow},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXWindow},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXWindow},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXWindow},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXWindow},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXWindow},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXWindow},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXWindow},{"_p_FXPicker", _p_FXPickerTo_p_FXWindow},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXWindow},{"_p_FXPopup", _p_FXPopupTo_p_FXWindow},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXWindow},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXWindow},{"_p_FXTooltip", _p_FXTooltipTo_p_FXWindow},{"_p_FXRbShell", _p_FXRbShellTo_p_FXWindow},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXWindow},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXWindow},{"_p_FXHeader", _p_FXHeaderTo_p_FXWindow},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXWindow},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXWindow},{"_p_FXPacker", _p_FXPackerTo_p_FXWindow},{"_p_FXTabBook", _p_FXTabBookTo_p_FXWindow},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXWindow},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXWindow},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXWindow},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXWindow},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXWindow},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXWindow},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXWindow},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXWindow},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXWindow},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXWindow},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXWindow},{"_p_FXRbList", _p_FXRbListTo_p_FXWindow},{"_p_FXTable", _p_FXTableTo_p_FXWindow},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXWindow},{"_p_FXComposite", _p_FXCompositeTo_p_FXWindow},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXWindow},{"_p_FXScintilla", _p_FXScintillaTo_p_FXWindow},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXWindow},{"_p_FXSlider", _p_FXSliderTo_p_FXWindow},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXWindow},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXWindow},{"_p_FXListBox", _p_FXListBoxTo_p_FXWindow},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXWindow},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXWindow},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXWindow},{"_p_FXCanvas", _p_FXCanvasTo_p_FXWindow},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXWindow},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXWindow},{"_p_FXMenubar", _p_FXMenubarTo_p_FXWindow},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXWindow},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXWindow},{"_p_FXDial", _p_FXDialTo_p_FXWindow},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXWindow},{"_p_FXButton", _p_FXButtonTo_p_FXWindow},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXWindow},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXWindow},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXWindow},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXWindow},{"_p_FXTabItem", _p_FXTabItemTo_p_FXWindow},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXWindow},{"_p_FXFrame", _p_FXFrameTo_p_FXWindow},{"_p_FXText", _p_FXTextTo_p_FXWindow},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXWindow},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXWindow},{"_p_FXToolbar", _p_FXToolbarTo_p_FXWindow},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXWindow},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXWindow},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXWindow},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXWindow},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXWindow},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXWindow},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXWindow},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXWindow},{"_p_FXWindow"},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXWindow},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXWindow},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXWindow},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXWindow},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXWindow},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXWindow},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXWindow},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXWindow},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXWindow},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXWindow},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXWindow},{"_p_FXRbDial", _p_FXRbDialTo_p_FXWindow},{"_p_FXLabel", _p_FXLabelTo_p_FXWindow},{"_p_FXShell", _p_FXShellTo_p_FXWindow},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXWindow},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXWindow},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXWindow},{"_p_FXOption", _p_FXOptionTo_p_FXWindow},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXWindow},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXWindow},{"_p_FXColorWell", _p_FXColorWellTo_p_FXWindow},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXWindow},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXWindow},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXWindow},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXWindow},{"_p_FXIconList", _p_FXIconListTo_p_FXWindow},{"_p_FXStatusline", _p_FXStatuslineTo_p_FXWindow},{"_p_FXRbStatusline", _p_FXRbStatuslineTo_p_FXWindow},{"_p_FXRbTable", _p_FXRbTableTo_p_FXWindow},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXWindow},{"_p_FXImageView", _p_FXImageViewTo_p_FXWindow},{"_p_FXRbText", _p_FXRbTextTo_p_FXWindow},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXWindow},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXWindow},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXWindow},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXWindow},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXWindow},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXWindow},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXWindow},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXWindow},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXWindow},{"_p_FXFileList", _p_FXFileListTo_p_FXWindow},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXWindow},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXWindow},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXWindow},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXWindow},{0}};
static swig_type_info _swigt__p_TextRange[] = {{"_p_TextRange", 0, "TextRange *"},{"_p_TextRange"},{0}};
! static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable *"},{"_p_FXColorBar", _p_FXColorBarTo_p_FXDrawable},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXDrawable},{"_p_FXTreeList", _p_FXTreeListTo_p_FXDrawable},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXDrawable},{"_p_FXTabBar", _p_FXTabBarTo_p_FXDrawable},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXDrawable},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXDrawable},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXDrawable},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXDrawable},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXDrawable},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXDrawable},{"_p_FXDirList", _p_FXDirListTo_p_FXDrawable},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXDrawable},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXDrawable},{"_p_FXList", _p_FXListTo_p_FXDrawable},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXDrawable},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXDrawable},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXDrawable},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXDrawable},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXDrawable},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXDrawable},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXDrawable},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXDrawable},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXDrawable},{"_p_FXPicker", _p_FXPickerTo_p_FXDrawable},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXDrawable},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXDrawable},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXDrawable},{"_p_FXTooltip", _p_FXTooltipTo_p_FXDrawable},{"_p_FXDrawable"},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXDrawable},{"_p_FXRbShell", _p_FXRbShellTo_p_FXDrawable},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXDrawable},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXDrawable},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXDrawable},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXDrawable},{"_p_FXPacker", _p_FXPackerTo_p_FXDrawable},{"_p_FXTabBook", _p_FXTabBookTo_p_FXDrawable},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXDrawable},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXDrawable},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXDrawable},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXDrawable},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXDrawable},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXDrawable},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXDrawable},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXDrawable},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXDrawable},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXDrawable},{"_p_FXRbList", _p_FXRbListTo_p_FXDrawable},{"_p_FXTable", _p_FXTableTo_p_FXDrawable},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXDrawable},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXDrawable},{"_p_FXScintilla", _p_FXScintillaTo_p_FXDrawable},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXDrawable},{"_p_FXSlider", _p_FXSliderTo_p_FXDrawable},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXDrawable},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXDrawable},{"_p_FXListBox", _p_FXListBoxTo_p_FXDrawable},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXDrawable},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXDrawable},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXDrawable},{"_p_FXCanvas", _p_FXCanvasTo_p_FXDrawable},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXDrawable},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXDrawable},{"_p_FXMenubar", _p_FXMenubarTo_p_FXDrawable},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXDrawable},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXDrawable},{"_p_FXDial", _p_FXDialTo_p_FXDrawable},{"_p_FXButton", _p_FXButtonTo_p_FXDrawable},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXDrawable},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXDrawable},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXDrawable},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXDrawable},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXDrawable},{"_p_FXTabItem", _p_FXTabItemTo_p_FXDrawable},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXDrawable},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable},{"_p_FXText", _p_FXTextTo_p_FXDrawable},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXDrawable},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXDrawable},{"_p_FXToolbar", _p_FXToolbarTo_p_FXDrawable},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXDrawable},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXDrawable},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXDrawable},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXDrawable},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXDrawable},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXDrawable},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXDrawable},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXDrawable},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXDrawable},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXDrawable},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXDrawable},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXDrawable},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXDrawable},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXDrawable},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXDrawable},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXDrawable},{"_p_FXWindow", _p_FXWindowTo_p_FXDrawable},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXDrawable},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXDrawable},{"_p_FXRbDial", _p_FXRbDialTo_p_FXDrawable},{"_p_FXLabel", _p_FXLabelTo_p_FXDrawable},{"_p_FXShell", _p_FXShellTo_p_FXDrawable},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXDrawable},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXDrawable},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXDrawable},{"_p_FXOption", _p_FXOptionTo_p_FXDrawable},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXDrawable},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXDrawable},{"_p_FXColorWell", _p_FXColorWellTo_p_FXDrawable},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXDrawable},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXDrawable},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXDrawable},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXDrawable},{"_p_FXIconList", _p_FXIconListTo_p_FXDrawable},{"_p_FXStatusline", _p_FXStatuslineTo_p_FXDrawable},{"_p_FXRbStatusline", _p_FXRbStatuslineTo_p_FXDrawable},{"_p_FXRbTable", _p_FXRbTableTo_p_FXDrawable},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXDrawable},{"_p_FXImageView", _p_FXImageViewTo_p_FXDrawable},{"_p_FXRbText", _p_FXRbTextTo_p_FXDrawable},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXDrawable},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXDrawable},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXDrawable},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXDrawable},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXDrawable},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXDrawable},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXDrawable},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXDrawable},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXDrawable},{"_p_FXFileList", _p_FXFileListTo_p_FXDrawable},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXDrawable},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXDrawable},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXDrawable},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXDrawable},{0}};
! static swig_type_info _swigt__p_FXObject[] = {{"_p_FXObject", 0, "FXObject *"},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXObject},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXObject},{"_p_FXRbShell", _p_FXRbShellTo_p_FXObject},{"_p_FXRbIconDict", _p_FXRbIconDictTo_p_FXObject},{"_p_FXIconDict", _p_FXIconDictTo_p_FXObject},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXObject},{"_p_FXDirList", _p_FXDirListTo_p_FXObject},{"_p_FXRbDial", _p_FXRbDialTo_p_FXObject},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXObject},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXObject},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXObject},{"_p_FXMenubar", _p_FXMenubarTo_p_FXObject},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXObject},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXObject},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXObject},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXObject},{"_p_FXPopup", _p_FXPopupTo_p_FXObject},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXObject},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXObject},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXObject},{"_p_FXComposite", _p_FXCompositeTo_p_FXObject},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXObject},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXObject},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXObject},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXObject},{"_p_FXScintilla", _p_FXScintillaTo_p_FXObject},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXObject},{"_p_FXRbId", _p_FXRbIdTo_p_FXObject},{"_p_FXRbListItem", _p_FXRbListItemTo_p_FXObject},{"_p_FXListItem", _p_FXListItemTo_p_FXObject},{"_p_FXHeader", _p_FXHeaderTo_p_FXObject},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXObject},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXObject},{"_p_FXApp", _p_FXAppTo_p_FXObject},{"_p_FXDirItem", _p_FXDirItemTo_p_FXObject},{"_p_FXRbDirItem", _p_FXRbDirItemTo_p_FXObject},{"_p_FXTabItem", _p_FXTabItemTo_p_FXObject},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXObject},{"_p_FXRbDocument", _p_FXRbDocumentTo_p_FXObject},{"_p_FXDocument", _p_FXDocumentTo_p_FXObject},{"_p_FXList", _p_FXListTo_p_FXObject},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXObject},{"_p_FXColorWell", _p_FXColorWellTo_p_FXObject},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXObject},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXObject},{"_p_FXRbObject", _p_FXRbObjectTo_p_FXObject},{"_p_FXObject"},{"_p_FXSettings", _p_FXSettingsTo_p_FXObject},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXObject},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXObject},{"_p_FXRbRecentFiles", _p_FXRbRecentFilesTo_p_FXObject},{"_p_FXRecentFiles", _p_FXRecentFilesTo_p_FXObject},{"_p_FXFileList", _p_FXFileListTo_p_FXObject},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXObject},{"_p_FXRegistry", _p_FXRegistryTo_p_FXObject},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXObject},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXObject},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXObject},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXObject},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXObject},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXObject},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXObject},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXObject},{"_p_FXText", _p_FXTextTo_p_FXObject},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXObject},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXObject},{"_p_FXVisual", _p_FXVisualTo_p_FXObject},{"_p_FXRbVisual", _p_FXRbVisualTo_p_FXObject},{"_p_FXRbFont", _p_FXRbFontTo_p_FXObject},{"_p_FXRbApp", _p_FXRbAppTo_p_FXObject},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXObject},{"_p_FXIconList", _p_FXIconListTo_p_FXObject},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXObject},{"_p_FXPicker", _p_FXPickerTo_p_FXObject},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXObject},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXObject},{"_p_FXDial", _p_FXDialTo_p_FXObject},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXObject},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXObject},{"_p_FXButton", _p_FXButtonTo_p_FXObject},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXObject},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXObject},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXObject},{"_p_FXListBox", _p_FXListBoxTo_p_FXObject},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXObject},{"_p_FXRbDict", _p_FXRbDictTo_p_FXObject},{"_p_FXFrame", _p_FXFrameTo_p_FXObject},{"_p_FXDelegator", _p_FXDelegatorTo_p_FXObject},{"_p_FXRbDelegator", _p_FXRbDelegatorTo_p_FXObject},{"_p_FXRbGIFCursor", _p_FXRbGIFCursorTo_p_FXObject},{"_p_FXGIFCursor", _p_FXGIFCursorTo_p_FXObject},{"_p_FXRbCURCursor", _p_FXRbCURCursorTo_p_FXObject},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXObject},{"_p_FXRbCursor", _p_FXRbCursorTo_p_FXObject},{"_p_FXCursor", _p_FXCursorTo_p_FXObject},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXObject},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXObject},{"_p_FXFileItem", _p_FXFileItemTo_p_FXObject},{"_p_FXRbFileItem", _p_FXRbFileItemTo_p_FXObject},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXObject},{"_p_FXPacker", _p_FXPackerTo_p_FXObject},{"_p_FXTabBook", _p_FXTabBookTo_p_FXObject},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXObject},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXObject},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXObject},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXObject},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXObject},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXObject},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXObject},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXObject},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXObject},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXObject},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXObject},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXObject},{"_p_FXHeaderItem", _p_FXHeaderItemTo_p_FXObject},{"_p_FXRbHeaderItem", _p_FXRbHeaderItemTo_p_FXObject},{"_p_FXLabel", _p_FXLabelTo_p_FXObject},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXObject},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXObject},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXObject},{"_p_FXTreeList", _p_FXTreeListTo_p_FXObject},{"_p_FXIconItem", _p_FXIconItemTo_p_FXObject},{"_p_FXRbIconItem", _p_FXRbIconItemTo_p_FXObject},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXObject},{"_p_FXTooltip", _p_FXTooltipTo_p_FXObject},{"_p_FXTextField", _p_FXTextFieldTo_p_FXObject},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXObject},{"_p_FXWindow", _p_FXWindowTo_p_FXObject},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXObject},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXObject},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXObject},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXObject},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXObject},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXObject},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXObject},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXObject},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXObject},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXObject},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXObject},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXObject},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXObject},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXObject},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXObject},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXObject},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXObject},{"_p_FXRbDebugTarget", _p_FXRbDebugTargetTo_p_FXObject},{"_p_FXDebugTarget", _p_FXDebugTargetTo_p_FXObject},{"_p_FXRbDataTarget", _p_FXRbDataTargetTo_p_FXObject},{"_p_FXDataTarget", _p_FXDataTargetTo_p_FXObject},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXObject},{"_p_FXTableItem", _p_FXTableItemTo_p_FXObject},{"_p_FXRbTableItem", _p_FXRbTableItemTo_p_FXObject},{"_p_FXRbStringDict", _p_FXRbStringDictTo_p_FXObject},{"_p_FXStringDict", _p_FXStringDictTo_p_FXObject},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXObject},{"_p_FXColorBar", _p_FXColorBarTo_p_FXObject},{"_p_FXId", _p_FXIdTo_p_FXObject},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXObject},{"_p_FXOption", _p_FXOptionTo_p_FXObject},{"_p_FXTable", _p_FXTableTo_p_FXObject},{"_p_FXFont", _p_FXFontTo_p_FXObject},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXObject},{"_p_FXSlider", _p_FXSliderTo_p_FXObject},{"_p_FXTabBar", _p_FXTabBarTo_p_FXObject},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXObject},{"_p_FXRbTreeItem", _p_FXRbTreeItemTo_
p_FXObject},{"_p_FXTreeItem", _p_FXTreeItemTo_p_FXObject},{"_p_FXStatusline", _p_FXStatuslineTo_p_FXObject},{"_p_FXRbStatusline", _p_FXRbStatuslineTo_p_FXObject},{"_p_FXDrawable", _p_FXDrawableTo_p_FXObject},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXObject},{"_p_FXAccelTable", _p_FXAccelTableTo_p_FXObject},{"_p_FXRbAccelTable", _p_FXRbAccelTableTo_p_FXObject},{"_p_FXImageView", _p_FXImageViewTo_p_FXObject},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXObject},{"_p_FXRbList", _p_FXRbListTo_p_FXObject},{"_p_FXDict", _p_FXDictTo_p_FXObject},{"_p_FXCanvas", _p_FXCanvasTo_p_FXObject},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXObject},{"_p_FXRbTable", _p_FXRbTableTo_p_FXObject},{"_p_FXShell", _p_FXShellTo_p_FXObject},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXObject},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXObject},{"_p_FXRbFileDict", _p_FXRbFileDictTo_p_FXObject},{"_p_FXFileDict", _p_FXFileDictTo_p_FXObject},{"_p_FXRbText", _p_FXRbTextTo_p_FXObject},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXObject},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXObject},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXObject},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXObject},{"_p_FXToolbar", _p_FXToolbarTo_p_FXObject},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXObject},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXObject},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXObject},{0}};
static swig_type_info _swigt__p_FXScrollArea[] = {{"_p_FXScrollArea", 0, "FXScrollArea *"},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXScrollArea},{"_p_FXScrollArea"},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXScrollArea},{"_p_FXImageView", _p_FXImageViewTo_p_FXScrollArea},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXScrollArea},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXScrollArea},{"_p_FXText", _p_FXTextTo_p_FXScrollArea},{"_p_FXRbText", _p_FXRbTextTo_p_FXScrollArea},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXScrollArea},{"_p_FXDirList", _p_FXDirListTo_p_FXScrollArea},{"_p_FXTable", _p_FXTableTo_p_FXScrollArea},{"_p_FXList", _p_FXListTo_p_FXScrollArea},{"_p_FXIconList", _p_FXIconListTo_p_FXScrollArea},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXScrollArea},{"_p_FXRbList", _p_FXRbListTo_p_FXScrollArea},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXScrollArea},{"_p_FXTreeList", _p_FXTreeListTo_p_FXScrollArea},{"_p_FXRbTable", _p_FXRbTableTo_p_FXScrollArea},{"_p_FXFileList", _p_FXFileListTo_p_FXScrollArea},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXScrollArea},{"_p_FXScintilla", _p_FXScintillaTo_p_FXScrollArea},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXScrollArea},{0}};
static swig_type_info _swigt__p_NotifyHeader[] = {{"_p_NotifyHeader", 0, "struct NotifyHeader *"},{"_p_NotifyHeader"},{0}};
--- 4368,4378 ----
return (void *)((FXScintilla *) ((FXRbScintilla *) x));
}
! static swig_type_info _swigt__p_FXId[] = {{"_p_FXId", 0, "FXId *"},{"_p_FXRbId", _p_FXRbIdTo_p_FXId},{"_p_FXColorBar", _p_FXColorBarTo_p_FXId},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXId},{"_p_FXTreeList", _p_FXTreeListTo_p_FXId},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXId},{"_p_FXTabBar", _p_FXTabBarTo_p_FXId},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXId},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXId},{"_p_FXTextField", _p_FXTextFieldTo_p_FXId},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXId},{"_p_FXRbToolBarTab", _p_FXRbToolBarTabTo_p_FXId},{"_p_FXToolBarTab", _p_FXToolBarTabTo_p_FXId},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXId},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXId},{"_p_FXDirList", _p_FXDirListTo_p_FXId},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXId},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXId},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXId},{"_p_FXList", _p_FXListTo_p_FXId},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXId},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXId},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXId},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXId},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXId},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXId},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXId},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXId},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXId},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXId},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXId},{"_p_FXPicker", _p_FXPickerTo_p_FXId},{"_p_FXPopup", _p_FXPopupTo_p_FXId},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXId},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXId},{"_p_FXDrawable", _p_FXDrawableTo_p_FXId},{"_p_FXRbShell", _p_FXRbShellTo_p_FXId},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXId},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXId},{"_p_FXFont", _p_FXFontTo_p_FXId},{"_p_FXHeader", _p_FXHeaderTo_p_FXId},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXId},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXId},{"_p_FXPacker", _p_FXPackerTo_p_FXId},{"_p_FXTabBook", _p_FXTabBookTo_p_FXId},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXId},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXId},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXId},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXId},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXId},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXId},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXId},{"_p_FXRbSeparator", _p_FXRbSeparatorTo_p_FXId},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXId},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXId},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXId},{"_p_FXRbList", _p_FXRbListTo_p_FXId},{"_p_FXTable", _p_FXTableTo_p_FXId},{"_p_FXToolTip", _p_FXToolTipTo_p_FXId},{"_p_FXRbToolTip", _p_FXRbToolTipTo_p_FXId},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXId},{"_p_FXComposite", _p_FXCompositeTo_p_FXId},{"_p_FXScintilla", _p_FXScintillaTo_p_FXId},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXId},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXId},{"_p_FXSlider", _p_FXSliderTo_p_FXId},{"_p_FXRbFont", _p_FXRbFontTo_p_FXId},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXId},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXId},{"_p_FXId"},{"_p_FXListBox", _p_FXListBoxTo_p_FXId},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXId},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXId},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXId},{"_p_FXCanvas", _p_FXCanvasTo_p_FXId},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXId},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXId},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXId},{"_p_FXDial", _p_FXDialTo_p_FXId},{"_p_FXButton", _p_FXButtonTo_p_FXId},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXId},{"_p_FXScrollBar", _p_FXScrollBarTo_p_FXId},{"_p_FXRbScrollBar", _p_FXRbScrollBarTo_p_FXId},{"_p_FXToolBarGrip", _p_FXToolBarGripTo_p_FXId},{"_p_FXRbToolBarGrip", _p_FXRbToolBarGripTo_p_FXId},{"_p_FXRbVisual", _p_FXRbVisualTo_p_FXId},{"_p_FXVisual", _p_FXVisualTo_p_FXId},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXId},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXId},{"_p_FXTabItem", _p_FXTabItemTo_p_FXId},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXId},{"_p_FXFrame", _p_FXFrameTo_p_FXId},{"_p_FXText", _p_FXTextTo_p_FXId},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXId},{"_p_FXRbGIFCursor", _p_FXRbGIFCursorTo_p_FXId},{"_p_FX__FXGIFCursor", _p_FX__FXGIFCursorTo_p_FXId},{"_p_FXRbCURCursor", _p_FXRbCURCursorTo_p_FXId},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXId},{"_p_FXRbCursor", _p_FXRbCursorTo_p_FXId},{"_p_FXCursor", _p_FXCursorTo_p_FXId},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXId},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXId},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXId},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXId},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXId},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXId},{"_p_FXMenuBar", _p_FXMenuBarTo_p_FXId},{"_p_FXRbMenuBar", _p_FXRbMenuBarTo_p_FXId},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXId},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXId},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXId},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXId},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXId},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXId},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXId},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXId},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXId},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXId},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXId},{"_p_FXWindow", _p_FXWindowTo_p_FXId},{"_p_FXStatusLine", _p_FXStatusLineTo_p_FXId},{"_p_FXRbStatusLine", _p_FXRbStatusLineTo_p_FXId},{"_p_FXRbDial", _p_FXRbDialTo_p_FXId},{"_p_FXLabel", _p_FXLabelTo_p_FXId},{"_p_FXShell", _p_FXShellTo_p_FXId},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXId},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXId},{"_p_FXOption", _p_FXOptionTo_p_FXId},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXId},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXId},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXId},{"_p_FXColorWell", _p_FXColorWellTo_p_FXId},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXId},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXId},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXId},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXId},{"_p_FXIconList", _p_FXIconListTo_p_FXId},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXId},{"_p_FXImageView", _p_FXImageViewTo_p_FXId},{"_p_FXRbText", _p_FXRbTextTo_p_FXId},{"_p_FXRbTable", _p_FXRbTableTo_p_FXId},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXId},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXId},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXId},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXId},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXId},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXId},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXId},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXId},{"_p_FXFileList", _p_FXFileListTo_p_FXId},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXId},{"_p_FXToolBar", _p_FXToolBarTo_p_FXId},{"_p_FXRbToolBar", _p_FXRbToolBarTo_p_FXId},{"_p_FXToolBarShell", _p_FXToolBarShellTo_p_FXId},{"_p_FXRbToolBarShell", _p_FXRbToolBarShellTo_p_FXId},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXId},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXId},{0}};
static swig_type_info _swigt__p_SCNotification[] = {{"_p_SCNotification", 0, "SCNotification *"},{"_p_SCNotification"},{0}};
! static swig_type_info _swigt__p_FXComposite[] = {{"_p_FXComposite", 0, "FXComposite *"},{"_p_FXIconList", _p_FXIconListTo_p_FXComposite},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXComposite},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXComposite},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXComposite},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXComposite},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXComposite},{"_p_FXRbMenuBar", _p_FXRbMenuBarTo_p_FXComposite},{"_p_FXMenuBar", _p_FXMenuBarTo_p_FXComposite},{"_p_FXRbToolBar", _p_FXRbToolBarTo_p_FXComposite},{"_p_FXToolBar", _p_FXToolBarTo_p_FXComposite},{"_p_FXComposite"},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXComposite},{"_p_FXRbToolTip", _p_FXRbToolTipTo_p_FXComposite},{"_p_FXToolTip", _p_FXToolTipTo_p_FXComposite},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXComposite},{"_p_FXTabBook", _p_FXTabBookTo_p_FXComposite},{"_p_FXShell", _p_FXShellTo_p_FXComposite},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXComposite},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXComposite},{"_p_FXPopup", _p_FXPopupTo_p_FXComposite},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXComposite},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXComposite},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXComposite},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXComposite},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXComposite},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXComposite},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXComposite},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXComposite},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXComposite},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXComposite},{"_p_FXScintilla", _p_FXScintillaTo_p_FXComposite},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXComposite},{"_p_FXFileList", _p_FXFileListTo_p_FXComposite},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXComposite},{"_p_FXText", _p_FXTextTo_p_FXComposite},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXComposite},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXComposite},{"_p_FXPacker", _p_FXPackerTo_p_FXComposite},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXComposite},{"_p_FXRbText", _p_FXRbTextTo_p_FXComposite},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXComposite},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXComposite},{"_p_FXTable", _p_FXTableTo_p_FXComposite},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXComposite},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXComposite},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXComposite},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXComposite},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXComposite},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXComposite},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXComposite},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXComposite},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXComposite},{"_p_FXDirList", _p_FXDirListTo_p_FXComposite},{"_p_FXRbShell", _p_FXRbShellTo_p_FXComposite},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXComposite},{"_p_FXListBox", _p_FXListBoxTo_p_FXComposite},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXComposite},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXComposite},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXComposite},{"_p_FXList", _p_FXListTo_p_FXComposite},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXComposite},{"_p_FXTabBar", _p_FXTabBarTo_p_FXComposite},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXComposite},{"_p_FXImageView", _p_FXImageViewTo_p_FXComposite},{"_p_FXTreeList", _p_FXTreeListTo_p_FXComposite},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXComposite},{"_p_FXRbList", _p_FXRbListTo_p_FXComposite},{"_p_FXRbTable", _p_FXRbTableTo_p_FXComposite},{"_p_FXToolBarShell", _p_FXToolBarShellTo_p_FXComposite},{"_p_FXRbToolBarShell", _p_FXRbToolBarShellTo_p_FXComposite},{0}};
! static swig_type_info _swigt__p_FXWindow[] = {{"_p_FXWindow", 0, "FXWindow *"},{"_p_FXColorBar", _p_FXColorBarTo_p_FXWindow},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXWindow},{"_p_FXTreeList", _p_FXTreeListTo_p_FXWindow},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXWindow},{"_p_FXTabBar", _p_FXTabBarTo_p_FXWindow},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXWindow},{"_p_FXTextField", _p_FXTextFieldTo_p_FXWindow},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXWindow},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXWindow},{"_p_FXRbToolBarTab", _p_FXRbToolBarTabTo_p_FXWindow},{"_p_FXToolBarTab", _p_FXToolBarTabTo_p_FXWindow},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXWindow},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXWindow},{"_p_FXDirList", _p_FXDirListTo_p_FXWindow},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXWindow},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXWindow},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXWindow},{"_p_FXList", _p_FXListTo_p_FXWindow},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXWindow},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXWindow},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXWindow},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXWindow},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXWindow},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXWindow},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXWindow},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXWindow},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXWindow},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXWindow},{"_p_FXPicker", _p_FXPickerTo_p_FXWindow},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXWindow},{"_p_FXPopup", _p_FXPopupTo_p_FXWindow},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXWindow},{"_p_FXRbShell", _p_FXRbShellTo_p_FXWindow},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXWindow},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXWindow},{"_p_FXHeader", _p_FXHeaderTo_p_FXWindow},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXWindow},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXWindow},{"_p_FXPacker", _p_FXPackerTo_p_FXWindow},{"_p_FXTabBook", _p_FXTabBookTo_p_FXWindow},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXWindow},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXWindow},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXWindow},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXWindow},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXWindow},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXWindow},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXWindow},{"_p_FXRbSeparator", _p_FXRbSeparatorTo_p_FXWindow},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXWindow},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXWindow},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXWindow},{"_p_FXRbList", _p_FXRbListTo_p_FXWindow},{"_p_FXTable", _p_FXTableTo_p_FXWindow},{"_p_FXToolTip", _p_FXToolTipTo_p_FXWindow},{"_p_FXRbToolTip", _p_FXRbToolTipTo_p_FXWindow},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXWindow},{"_p_FXComposite", _p_FXCompositeTo_p_FXWindow},{"_p_FXScintilla", _p_FXScintillaTo_p_FXWindow},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXWindow},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXWindow},{"_p_FXSlider", _p_FXSliderTo_p_FXWindow},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXWindow},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXWindow},{"_p_FXListBox", _p_FXListBoxTo_p_FXWindow},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXWindow},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXWindow},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXWindow},{"_p_FXCanvas", _p_FXCanvasTo_p_FXWindow},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXWindow},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXWindow},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXWindow},{"_p_FXDial", _p_FXDialTo_p_FXWindow},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXWindow},{"_p_FXButton", _p_FXButtonTo_p_FXWindow},{"_p_FXScrollBar", _p_FXScrollBarTo_p_FXWindow},{"_p_FXRbScrollBar", _p_FXRbScrollBarTo_p_FXWindow},{"_p_FXToolBarGrip", _p_FXToolBarGripTo_p_FXWindow},{"_p_FXRbToolBarGrip", _p_FXRbToolBarGripTo_p_FXWindow},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXWindow},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXWindow},{"_p_FXTabItem", _p_FXTabItemTo_p_FXWindow},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXWindow},{"_p_FXFrame", _p_FXFrameTo_p_FXWindow},{"_p_FXText", _p_FXTextTo_p_FXWindow},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXWindow},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXWindow},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXWindow},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXWindow},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXWindow},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXWindow},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXWindow},{"_p_FXWindow"},{"_p_FXMenuBar", _p_FXMenuBarTo_p_FXWindow},{"_p_FXRbMenuBar", _p_FXRbMenuBarTo_p_FXWindow},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXWindow},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXWindow},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXWindow},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXWindow},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXWindow},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXWindow},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXWindow},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXWindow},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXWindow},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXWindow},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXWindow},{"_p_FXStatusLine", _p_FXStatusLineTo_p_FXWindow},{"_p_FXRbStatusLine", _p_FXRbStatusLineTo_p_FXWindow},{"_p_FXRbDial", _p_FXRbDialTo_p_FXWindow},{"_p_FXLabel", _p_FXLabelTo_p_FXWindow},{"_p_FXShell", _p_FXShellTo_p_FXWindow},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXWindow},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXWindow},{"_p_FXOption", _p_FXOptionTo_p_FXWindow},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXWindow},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXWindow},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXWindow},{"_p_FXColorWell", _p_FXColorWellTo_p_FXWindow},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXWindow},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXWindow},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXWindow},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXWindow},{"_p_FXIconList", _p_FXIconListTo_p_FXWindow},{"_p_FXRbTable", _p_FXRbTableTo_p_FXWindow},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXWindow},{"_p_FXImageView", _p_FXImageViewTo_p_FXWindow},{"_p_FXRbText", _p_FXRbTextTo_p_FXWindow},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXWindow},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXWindow},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXWindow},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXWindow},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXWindow},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXWindow},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXWindow},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXWindow},{"_p_FXFileList", _p_FXFileListTo_p_FXWindow},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXWindow},{"_p_FXToolBar", _p_FXToolBarTo_p_FXWindow},{"_p_FXRbToolBar", _p_FXRbToolBarTo_p_FXWindow},{"_p_FXToolBarShell", _p_FXToolBarShellTo_p_FXWindow},{"_p_FXRbToolBarShell", _p_FXRbToolBarShellTo_p_FXWindow},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXWindow},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXWindow},{0}};
static swig_type_info _swigt__p_TextRange[] = {{"_p_TextRange", 0, "TextRange *"},{"_p_TextRange"},{0}};
! static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable *"},{"_p_FXColorBar", _p_FXColorBarTo_p_FXDrawable},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXDrawable},{"_p_FXTreeList", _p_FXTreeListTo_p_FXDrawable},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXDrawable},{"_p_FXTabBar", _p_FXTabBarTo_p_FXDrawable},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXDrawable},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXDrawable},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXDrawable},{"_p_FXRbToolBarTab", _p_FXRbToolBarTabTo_p_FXDrawable},{"_p_FXToolBarTab", _p_FXToolBarTabTo_p_FXDrawable},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXDrawable},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXDrawable},{"_p_FXDirList", _p_FXDirListTo_p_FXDrawable},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXDrawable},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXDrawable},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXDrawable},{"_p_FXList", _p_FXListTo_p_FXDrawable},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXDrawable},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXDrawable},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXDrawable},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXDrawable},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXDrawable},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXDrawable},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXDrawable},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXDrawable},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXDrawable},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable},{"_p_FXPicker", _p_FXPickerTo_p_FXDrawable},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXDrawable},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXDrawable},{"_p_FXDrawable"},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXDrawable},{"_p_FXRbShell", _p_FXRbShellTo_p_FXDrawable},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXDrawable},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXDrawable},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXDrawable},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXDrawable},{"_p_FXPacker", _p_FXPackerTo_p_FXDrawable},{"_p_FXTabBook", _p_FXTabBookTo_p_FXDrawable},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXDrawable},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXDrawable},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXDrawable},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXDrawable},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXDrawable},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXDrawable},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXDrawable},{"_p_FXRbSeparator", _p_FXRbSeparatorTo_p_FXDrawable},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXDrawable},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXDrawable},{"_p_FXRbList", _p_FXRbListTo_p_FXDrawable},{"_p_FXTable", _p_FXTableTo_p_FXDrawable},{"_p_FXToolTip", _p_FXToolTipTo_p_FXDrawable},{"_p_FXRbToolTip", _p_FXRbToolTipTo_p_FXDrawable},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXDrawable},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable},{"_p_FXScintilla", _p_FXScintillaTo_p_FXDrawable},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXDrawable},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXDrawable},{"_p_FXSlider", _p_FXSliderTo_p_FXDrawable},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXDrawable},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXDrawable},{"_p_FXListBox", _p_FXListBoxTo_p_FXDrawable},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXDrawable},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXDrawable},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXDrawable},{"_p_FXCanvas", _p_FXCanvasTo_p_FXDrawable},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXDrawable},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXDrawable},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXDrawable},{"_p_FXDial", _p_FXDialTo_p_FXDrawable},{"_p_FXButton", _p_FXButtonTo_p_FXDrawable},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXDrawable},{"_p_FXScrollBar", _p_FXScrollBarTo_p_FXDrawable},{"_p_FXRbScrollBar", _p_FXRbScrollBarTo_p_FXDrawable},{"_p_FXToolBarGrip", _p_FXToolBarGripTo_p_FXDrawable},{"_p_FXRbToolBarGrip", _p_FXRbToolBarGripTo_p_FXDrawable},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXDrawable},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXDrawable},{"_p_FXTabItem", _p_FXTabItemTo_p_FXDrawable},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXDrawable},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable},{"_p_FXText", _p_FXTextTo_p_FXDrawable},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXDrawable},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXDrawable},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXDrawable},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXDrawable},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXDrawable},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXDrawable},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXDrawable},{"_p_FXMenuBar", _p_FXMenuBarTo_p_FXDrawable},{"_p_FXRbMenuBar", _p_FXRbMenuBarTo_p_FXDrawable},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXDrawable},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXDrawable},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXDrawable},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXDrawable},{"_p_FXMainWindow", _p_FXMainWi...
[truncated message content] |
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv6990 Modified Files: core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp layout_wrap.cpp mdi_wrap.cpp opengl_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.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** core_wrap.cpp 12 Jul 2002 16:34:22 -0000 1.64 --- core_wrap.cpp 12 Jul 2002 17:03:24 -0000 1.65 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020709-0944 * * 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.14u-20020712-1142 * * This file is not intended to be easily readable and contains a number of *************** *** 1543,1547 **** argv[ii] = args[ii-1]; } ! if ((argc >= 1) && (argc <= 1)) { int _m = 1; int _v = 1; --- 1543,1547 ---- argv[ii] = args[ii-1]; } ! if (argc == 1) { int _m = 1; int _v = 1; *************** *** 1551,1559 **** } _m &= _v; ! if (_m) { return _wrap_FX_Stream_position__SWIG_0(nargs, args, self); } } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 1551,1559 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FX_Stream_position__SWIG_0(nargs, args, self); } } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 1567,1571 **** } _m &= _v; ! if (_m) { return _wrap_FX_Stream_position__SWIG_1(nargs, args, self); } --- 1567,1571 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FX_Stream_position__SWIG_1(nargs, args, self); } *************** *** 1623,1627 **** argv[ii] = args[ii-1]; } ! if ((argc >= 1) && (argc <= 1)) { int _m = 1; int _v = 1; --- 1623,1627 ---- argv[ii] = args[ii-1]; } ! if (argc == 1) { int _m = 1; int _v = 1; *************** *** 1631,1639 **** } _m &= _v; ! if (_m) { return _wrap_FX_Stream_swapBytes__SWIG_1(nargs, args, self); } } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 1631,1639 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FX_Stream_swapBytes__SWIG_1(nargs, args, self); } } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 1647,1651 **** } _m &= _v; ! if (_m) { return _wrap_FX_Stream_swapBytes__SWIG_0(nargs, args, self); } --- 1647,1651 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FX_Stream_swapBytes__SWIG_0(nargs, args, self); } *************** *** 1920,1924 **** argv[ii] = args[ii-1]; } ! if ((argc >= 3) && (argc <= 3)) { int _m = 1; int _v = 1; --- 1920,1924 ---- argv[ii] = args[ii-1]; } ! if (argc == 3) { int _m = 1; int _v = 1; *************** *** 1937,1945 **** } _m &= _v; ! if (_m) { return _wrap_FX_MemoryStream_open__SWIG_0(nargs, args, self); } } ! if ((argc >= 4) && (argc <= 4)) { int _m = 1; int _v = 1; --- 1937,1945 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FX_MemoryStream_open__SWIG_0(nargs, args, self); } } ! if (argc == 4) { int _m = 1; int _v = 1; *************** *** 1962,1966 **** } _m &= _v; ! if (_m) { return _wrap_FX_MemoryStream_open__SWIG_1(nargs, args, self); } --- 1962,1966 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FX_MemoryStream_open__SWIG_1(nargs, args, self); } *************** *** 4221,4228 **** argv[ii] = args[ii]; } ! if ((argc >= 0) && (argc <= 0)) { int _m = 1; int _v = 1; ! if (_m) { return _wrap_new_FX_RecentFiles__SWIG_0(nargs, args, self); } --- 4221,4228 ---- argv[ii] = args[ii]; } ! if (argc == 0) { int _m = 1; int _v = 1; ! if (_m && _v) { return _wrap_new_FX_RecentFiles__SWIG_0(nargs, args, self); } *************** *** 4248,4252 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_RecentFiles__SWIG_1(nargs, args, self); } --- 4248,4252 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_RecentFiles__SWIG_1(nargs, args, self); } *************** *** 4520,4527 **** argv[ii] = args[ii]; } ! if ((argc >= 0) && (argc <= 0)) { int _m = 1; int _v = 1; ! if (_m) { return _wrap_new_FXRecentFiles__SWIG_0(nargs, args, self); } --- 4520,4527 ---- argv[ii] = args[ii]; } ! if (argc == 0) { int _m = 1; int _v = 1; ! if (_m && _v) { return _wrap_new_FXRecentFiles__SWIG_0(nargs, args, self); } *************** *** 4547,4551 **** _m &= _v; } ! if (_m) { return _wrap_new_FXRecentFiles__SWIG_1(nargs, args, self); } --- 4547,4551 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXRecentFiles__SWIG_1(nargs, args, self); } *************** *** 5767,5771 **** _m &= _v; } ! if (_m) { return _wrap_FX_App_stopModal__SWIG_1(nargs, args, self); } --- 5767,5771 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_App_stopModal__SWIG_1(nargs, args, self); } *************** *** 5790,5794 **** _m &= _v; } ! if (_m) { return _wrap_FX_App_stopModal__SWIG_0(nargs, args, self); } --- 5790,5794 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_App_stopModal__SWIG_0(nargs, args, self); } *************** *** 7976,7980 **** argv[ii] = args[ii]; } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 7976,7980 ---- argv[ii] = args[ii]; } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 7989,7997 **** } _m &= _v; ! if (_m) { return _wrap_new_FX_Font__SWIG_0(nargs, args, self); } } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 7989,7997 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FX_Font__SWIG_0(nargs, args, self); } } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 8005,8009 **** } _m &= _v; ! if (_m) { return _wrap_new_FX_Font__SWIG_2(nargs, args, self); } --- 8005,8009 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FX_Font__SWIG_2(nargs, args, self); } *************** *** 8055,8059 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_Font__SWIG_1(nargs, args, self); } --- 8055,8059 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_Font__SWIG_1(nargs, args, self); } *************** *** 8604,8608 **** argv[ii] = args[ii]; } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 8604,8608 ---- argv[ii] = args[ii]; } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 8617,8625 **** } _m &= _v; ! if (_m) { return _wrap_new_FXFont__SWIG_0(nargs, args, self); } } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 8617,8625 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXFont__SWIG_0(nargs, args, self); } } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 8633,8637 **** } _m &= _v; ! if (_m) { return _wrap_new_FXFont__SWIG_2(nargs, args, self); } --- 8633,8637 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXFont__SWIG_2(nargs, args, self); } *************** *** 8683,8687 **** _m &= _v; } ! if (_m) { return _wrap_new_FXFont__SWIG_1(nargs, args, self); } --- 8683,8687 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXFont__SWIG_1(nargs, args, self); } *************** *** 8905,8909 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_Cursor__SWIG_0(nargs, args, self); } --- 8905,8909 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_Cursor__SWIG_0(nargs, args, self); } *************** *** 8951,8955 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_Cursor__SWIG_1(nargs, args, self); } --- 8951,8955 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_Cursor__SWIG_1(nargs, args, self); } *************** *** 9213,9217 **** _m &= _v; } ! if (_m) { return _wrap_new_FXCursor__SWIG_0(nargs, args, self); } --- 9213,9217 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXCursor__SWIG_0(nargs, args, self); } *************** *** 9259,9263 **** _m &= _v; } ! if (_m) { return _wrap_new_FXCursor__SWIG_1(nargs, args, self); } --- 9259,9263 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXCursor__SWIG_1(nargs, args, self); } *************** *** 10197,10208 **** argv[ii] = args[ii]; } ! if ((argc >= 0) && (argc <= 0)) { int _m = 1; int _v = 1; ! if (_m) { return _wrap_new_FXRegion__SWIG_0(nargs, args, self); } } ! if ((argc >= 1) && (argc <= 1)) { int _m = 1; int _v = 1; --- 10197,10208 ---- argv[ii] = args[ii]; } ! if (argc == 0) { int _m = 1; int _v = 1; ! if (_m && _v) { return _wrap_new_FXRegion__SWIG_0(nargs, args, self); } } ! if (argc == 1) { int _m = 1; int _v = 1; *************** *** 10212,10216 **** } _m &= _v; ! if (_m) { return _wrap_new_FXRegion__SWIG_1(nargs, args, self); } --- 10212,10216 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXRegion__SWIG_1(nargs, args, self); } *************** *** 10230,10238 **** _m &= _v; } ! if (_m) { return _wrap_new_FXRegion__SWIG_3(nargs, args, self); } } ! if ((argc >= 4) && (argc <= 4)) { int _m = 1; int _v = 1; --- 10230,10238 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXRegion__SWIG_3(nargs, args, self); } } ! if (argc == 4) { int _m = 1; int _v = 1; *************** *** 10253,10257 **** } _m &= _v; ! if (_m) { return _wrap_new_FXRegion__SWIG_2(nargs, args, self); } --- 10253,10257 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXRegion__SWIG_2(nargs, args, self); } *************** *** 10333,10337 **** argv[ii] = args[ii-1]; } ! if ((argc >= 3) && (argc <= 3)) { int _m = 1; int _v = 1; --- 10333,10337 ---- argv[ii] = args[ii-1]; } ! if (argc == 3) { int _m = 1; int _v = 1; *************** *** 10349,10357 **** } _m &= _v; ! if (_m) { return _wrap_FXRegion_contains__SWIG_0(nargs, args, self); } } ! if ((argc >= 5) && (argc <= 5)) { int _m = 1; int _v = 1; --- 10349,10357 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FXRegion_contains__SWIG_0(nargs, args, self); } } ! if (argc == 5) { int _m = 1; int _v = 1; *************** *** 10377,10381 **** } _m &= _v; ! if (_m) { return _wrap_FXRegion_contains__SWIG_1(nargs, args, self); } --- 10377,10381 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FXRegion_contains__SWIG_1(nargs, args, self); } *************** *** 10463,10467 **** argv[ii] = args[ii-1]; } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 10463,10467 ---- argv[ii] = args[ii-1]; } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 10476,10480 **** } _m &= _v; ! if (_m) { return _wrap_FXRegion___add____SWIG_1(nargs, args, self); } --- 10476,10480 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FXRegion___add____SWIG_1(nargs, args, self); } *************** *** 10518,10522 **** argv[ii] = args[ii-1]; } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 10518,10522 ---- argv[ii] = args[ii-1]; } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 10531,10535 **** } _m &= _v; ! if (_m) { return _wrap_FXRegion___mul____SWIG_1(nargs, args, self); } --- 10531,10535 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FXRegion___mul____SWIG_1(nargs, args, self); } *************** *** 10573,10577 **** argv[ii] = args[ii-1]; } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 10573,10577 ---- argv[ii] = args[ii-1]; } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 10586,10590 **** } _m &= _v; ! if (_m) { return _wrap_FXRegion___sub____SWIG_1(nargs, args, self); } --- 10586,10590 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FXRegion___sub____SWIG_1(nargs, args, self); } *************** *** 10628,10632 **** argv[ii] = args[ii-1]; } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 10628,10632 ---- argv[ii] = args[ii-1]; } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 10641,10645 **** } _m &= _v; ! if (_m) { return _wrap_FXRegion___xor____SWIG_1(nargs, args, self); } --- 10641,10645 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FXRegion___xor____SWIG_1(nargs, args, self); } *************** *** 10679,10683 **** argv[ii] = args[ii-1]; } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 10679,10683 ---- argv[ii] = args[ii-1]; } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 10692,10696 **** } _m &= _v; ! if (_m) { return _wrap_FXRegion___eq____SWIG_1(nargs, args, self); } --- 10692,10696 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FXRegion___eq____SWIG_1(nargs, args, self); } *************** *** 13908,13912 **** argv[ii] = args[ii]; } ! if ((argc >= 1) && (argc <= 1)) { int _m = 1; int _v = 1; --- 13908,13912 ---- argv[ii] = args[ii]; } ! if (argc == 1) { int _m = 1; int _v = 1; *************** *** 13916,13924 **** } _m &= _v; ! if (_m) { return _wrap_new_FX_DCWindow__SWIG_1(nargs, args, self); } } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 13916,13924 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FX_DCWindow__SWIG_1(nargs, args, self); } } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 13933,13937 **** } _m &= _v; ! if (_m) { return _wrap_new_FX_DCWindow__SWIG_0(nargs, args, self); } --- 13933,13937 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FX_DCWindow__SWIG_0(nargs, args, self); } *************** *** 14024,14028 **** argv[ii] = args[ii]; } ! if ((argc >= 1) && (argc <= 1)) { int _m = 1; int _v = 1; --- 14024,14028 ---- argv[ii] = args[ii]; } ! if (argc == 1) { int _m = 1; int _v = 1; *************** *** 14032,14040 **** } _m &= _v; ! if (_m) { return _wrap_new_FXDCWindow__SWIG_1(nargs, args, self); } } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 14032,14040 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXDCWindow__SWIG_1(nargs, args, self); } } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 14049,14053 **** } _m &= _v; ! if (_m) { return _wrap_new_FXDCWindow__SWIG_0(nargs, args, self); } --- 14049,14053 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXDCWindow__SWIG_0(nargs, args, self); } *************** *** 17899,17903 **** argv[ii] = args[ii]; } ! if ((argc >= 1) && (argc <= 1)) { int _m = 1; int _v = 1; --- 17899,17903 ---- argv[ii] = args[ii]; } ! if (argc == 1) { int _m = 1; int _v = 1; *************** *** 17907,17915 **** } _m &= _v; ! if (_m) { return _wrap_new_FX_FileDict__SWIG_0(nargs, args, self); } } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 17907,17915 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FX_FileDict__SWIG_0(nargs, args, self); } } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 17924,17928 **** } _m &= _v; ! if (_m) { return _wrap_new_FX_FileDict__SWIG_1(nargs, args, self); } --- 17924,17928 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FX_FileDict__SWIG_1(nargs, args, self); } *************** *** 18183,18187 **** argv[ii] = args[ii]; } ! if ((argc >= 1) && (argc <= 1)) { int _m = 1; int _v = 1; --- 18183,18187 ---- argv[ii] = args[ii]; } ! if (argc == 1) { int _m = 1; int _v = 1; *************** *** 18191,18199 **** } _m &= _v; ! if (_m) { return _wrap_new_FXFileDict__SWIG_0(nargs, args, self); } } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 18191,18199 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXFileDict__SWIG_0(nargs, args, self); } } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 18208,18212 **** } _m &= _v; ! if (_m) { return _wrap_new_FXFileDict__SWIG_1(nargs, args, self); } --- 18208,18212 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXFileDict__SWIG_1(nargs, args, self); } Index: dialogs_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** dialogs_wrap.cpp 12 Jul 2002 16:34:36 -0000 1.36 --- dialogs_wrap.cpp 12 Jul 2002 17:03:30 -0000 1.37 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020709-0944 * * 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.14u-20020712-1142 * * This file is not intended to be easily readable and contains a number of *************** *** 837,841 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_DialogBox__SWIG_0(nargs, args, self); } --- 837,841 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_DialogBox__SWIG_0(nargs, args, self); } *************** *** 919,923 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_DialogBox__SWIG_1(nargs, args, self); } --- 919,923 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_DialogBox__SWIG_1(nargs, args, self); } *************** *** 1186,1190 **** _m &= _v; } ! if (_m) { return _wrap_new_FXDialogBox__SWIG_0(nargs, args, self); } --- 1186,1190 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXDialogBox__SWIG_0(nargs, args, self); } *************** *** 1268,1272 **** _m &= _v; } ! if (_m) { return _wrap_new_FXDialogBox__SWIG_1(nargs, args, self); } --- 1268,1272 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXDialogBox__SWIG_1(nargs, args, self); } *************** *** 11046,11050 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_MessageBox__SWIG_0(nargs, args, self); } --- 11046,11050 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_MessageBox__SWIG_0(nargs, args, self); } *************** *** 11091,11095 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_MessageBox__SWIG_1(nargs, args, self); } --- 11091,11095 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_MessageBox__SWIG_1(nargs, args, self); } *************** *** 11356,11360 **** _m &= _v; } ! if (_m) { return _wrap_new_FXMessageBox__SWIG_0(nargs, args, self); } --- 11356,11360 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXMessageBox__SWIG_0(nargs, args, self); } *************** *** 11401,11405 **** _m &= _v; } ! if (_m) { return _wrap_new_FXMessageBox__SWIG_1(nargs, args, self); } --- 11401,11405 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXMessageBox__SWIG_1(nargs, args, self); } Index: icons_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** icons_wrap.cpp 12 Jul 2002 16:34:37 -0000 1.39 --- icons_wrap.cpp 12 Jul 2002 17:03:30 -0000 1.40 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020709-0944 * * 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.14u-20020712-1142 * * 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.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** image_wrap.cpp 12 Jul 2002 16:34:37 -0000 1.41 --- image_wrap.cpp 12 Jul 2002 17:03:30 -0000 1.42 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020709-0944 * * 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.14u-20020712-1142 * * 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.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** layout_wrap.cpp 12 Jul 2002 16:34:38 -0000 1.10 --- layout_wrap.cpp 12 Jul 2002 17:03:31 -0000 1.11 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020709-0944 * * 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.14u-20020712-1142 * * This file is not intended to be easily readable and contains a number of *************** *** 6206,6210 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_Splitter__SWIG_0(nargs, args, self); } --- 6206,6210 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_Splitter__SWIG_0(nargs, args, self); } *************** *** 6257,6261 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_Splitter__SWIG_1(nargs, args, self); } --- 6257,6261 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_Splitter__SWIG_1(nargs, args, self); } *************** *** 6462,6466 **** _m &= _v; } ! if (_m) { return _wrap_new_FXSplitter__SWIG_0(nargs, args, self); } --- 6462,6466 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXSplitter__SWIG_0(nargs, args, self); } *************** *** 6513,6517 **** _m &= _v; } ! if (_m) { return _wrap_new_FXSplitter__SWIG_1(nargs, args, self); } --- 6513,6517 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXSplitter__SWIG_1(nargs, args, self); } *************** *** 7374,7378 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_4Splitter__SWIG_0(nargs, args, self); } --- 7374,7378 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_4Splitter__SWIG_0(nargs, args, self); } *************** *** 7425,7429 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_4Splitter__SWIG_1(nargs, args, self); } --- 7425,7429 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_4Splitter__SWIG_1(nargs, args, self); } *************** *** 7783,7787 **** _m &= _v; } ! if (_m) { return _wrap_new_FX4Splitter__SWIG_0(nargs, args, self); } --- 7783,7787 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX4Splitter__SWIG_0(nargs, args, self); } *************** *** 7834,7838 **** _m &= _v; } ! if (_m) { return _wrap_new_FX4Splitter__SWIG_1(nargs, args, self); } --- 7834,7838 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX4Splitter__SWIG_1(nargs, args, self); } Index: mdi_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** mdi_wrap.cpp 12 Jul 2002 16:34:39 -0000 1.38 --- mdi_wrap.cpp 12 Jul 2002 17:03:31 -0000 1.39 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020709-0944 * * 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.14u-20020712-1142 * * 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.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** opengl_wrap.cpp 12 Jul 2002 16:34:39 -0000 1.43 --- opengl_wrap.cpp 12 Jul 2002 17:03:31 -0000 1.44 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020709-0944 * * 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.14u-20020712-1142 * [...977 lines suppressed...] ! if (_m && _v) { return _wrap_new_FXGLShape__SWIG_0(nargs, args, self); } } ! if (argc == 6) { int _m = 1; int _v = 1; *************** *** 13245,13249 **** } _m &= _v; ! if (_m) { return _wrap_new_FXGLShape__SWIG_1(nargs, args, self); } --- 13245,13249 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXGLShape__SWIG_1(nargs, args, self); } Index: ui_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ui_wrap.cpp 12 Jul 2002 16:34:40 -0000 1.11 --- ui_wrap.cpp 12 Jul 2002 17:03:32 -0000 1.12 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020709-0944 * * 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.14u-20020712-1142 * * This file is not intended to be easily readable and contains a number of *************** *** 4298,4302 **** argv[ii] = args[ii-1]; } ! if ((argc >= 1) && (argc <= 1)) { int _m = 1; int _v = 1; --- 4298,4302 ---- argv[ii] = args[ii-1]; } ! if (argc == 1) { int _m = 1; int _v = 1; *************** *** 4306,4314 **** } _m &= _v; ! if (_m) { return _wrap_FX_Window_update__SWIG_1(nargs, args, self); } } ! if ((argc >= 5) && (argc <= 5)) { int _m = 1; int _v = 1; --- 4306,4314 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FX_Window_update__SWIG_1(nargs, args, self); } } ! if (argc == 5) { int _m = 1; int _v = 1; *************** *** 4334,4338 **** } _m &= _v; ! if (_m) { return _wrap_FX_Window_update__SWIG_0(nargs, args, self); } --- 4334,4338 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FX_Window_update__SWIG_0(nargs, args, self); } *************** *** 4388,4392 **** argv[ii] = args[ii-1]; } ! if ((argc >= 1) && (argc <= 1)) { int _m = 1; int _v = 1; --- 4388,4392 ---- argv[ii] = args[ii-1]; } ! if (argc == 1) { int _m = 1; int _v = 1; *************** *** 4396,4404 **** } _m &= _v; ! if (_m) { return _wrap_FX_Window_repaint__SWIG_1(nargs, args, self); } } ! if ((argc >= 5) && (argc <= 5)) { int _m = 1; int _v = 1; --- 4396,4404 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FX_Window_repaint__SWIG_1(nargs, args, self); } } ! if (argc == 5) { int _m = 1; int _v = 1; *************** *** 4424,4428 **** } _m &= _v; ! if (_m) { return _wrap_FX_Window_repaint__SWIG_0(nargs, args, self); } --- 4424,4428 ---- } _m &= _v; ! if (_m && _v) { return _wrap_FX_Window_repaint__SWIG_0(nargs, args, self); } *************** *** 5281,5289 **** _m &= _v; } ! if (_m) { return _wrap_new_FXWindow__SWIG_0(nargs, args, self); } } ! if ((argc >= 2) && (argc <= 2)) { int _m = 1; int _v = 1; --- 5281,5289 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXWindow__SWIG_0(nargs, args, self); } } ! if (argc == 2) { int _m = 1; int _v = 1; *************** *** 5298,5306 **** } _m &= _v; ! if (_m) { return _wrap_new_FXWindow__SWIG_1(nargs, args, self); } } ! if ((argc >= 7) && (argc <= 7)) { int _m = 1; int _v = 1; --- 5298,5306 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXWindow__SWIG_1(nargs, args, self); } } ! if (argc == 7) { int _m = 1; int _v = 1; *************** *** 5335,5339 **** } _m &= _v; ! if (_m) { return _wrap_new_FXWindow__SWIG_2(nargs, args, self); } --- 5335,5339 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXWindow__SWIG_2(nargs, args, self); } *************** *** 30065,30069 **** argv[ii] = args[ii]; } ! if ((argc >= 6) && (argc <= 6)) { int _m = 1; int _v = 1; --- 30065,30069 ---- argv[ii] = args[ii]; } ! if (argc == 6) { int _m = 1; int _v = 1; *************** *** 30093,30101 **** } _m &= _v; ! if (_m) { return _wrap_new_FXShell__SWIG_0(nargs, args, self); } } ! if ((argc >= 6) && (argc <= 6)) { int _m = 1; int _v = 1; --- 30093,30101 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXShell__SWIG_0(nargs, args, self); } } ! if (argc == 6) { int _m = 1; int _v = 1; *************** *** 30125,30129 **** } _m &= _v; ! if (_m) { return _wrap_new_FXShell__SWIG_1(nargs, args, self); } --- 30125,30129 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXShell__SWIG_1(nargs, args, self); } *************** *** 33693,33697 **** argv[ii] = args[ii]; } ! if ((argc >= 15) && (argc <= 15)) { int _m = 1; int _v = 1; --- 33693,33697 ---- argv[ii] = args[ii]; } ! if (argc == 15) { int _m = 1; int _v = 1; *************** *** 33759,33767 **** } _m &= _v; ! if (_m) { return _wrap_new_FXTopWindow__SWIG_0(nargs, args, self); } } ! if ((argc >= 15) && (argc <= 15)) { int _m = 1; int _v = 1; --- 33759,33767 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXTopWindow__SWIG_0(nargs, args, self); } } ! if (argc == 15) { int _m = 1; int _v = 1; *************** *** 33829,33833 **** } _m &= _v; ! if (_m) { return _wrap_new_FXTopWindow__SWIG_1(nargs, args, self); } --- 33829,33833 ---- } _m &= _v; ! if (_m && _v) { return _wrap_new_FXTopWindow__SWIG_1(nargs, args, self); } *************** *** 40859,40863 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_ToolBar__SWIG_1(nargs, args, self); } --- 40859,40863 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_ToolBar__SWIG_1(nargs, args, self); } *************** *** 40942,40946 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_ToolBar__SWIG_0(nargs, args, self); } --- 40942,40946 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_ToolBar__SWIG_0(nargs, args, self); } *************** *** 41312,41316 **** _m &= _v; } ! if (_m) { return _wrap_new_FXToolBar__SWIG_1(nargs, args, self); } --- 41312,41316 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXToolBar__SWIG_1(nargs, args, self); } *************** *** 41395,41399 **** _m &= _v; } ! if (_m) { return _wrap_new_FXToolBar__SWIG_0(nargs, args, self); } --- 41395,41399 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXToolBar__SWIG_0(nargs, args, self); } *************** *** 42338,42342 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_MenuBar__SWIG_1(nargs, args, self); } --- 42338,42342 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_MenuBar__SWIG_1(nargs, args, self); } *************** *** 42421,42425 **** _m &= _v; } ! if (_m) { return _wrap_new_FX_MenuBar__SWIG_0(nargs, args, self); } --- 42421,42425 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FX_MenuBar__SWIG_0(nargs, args, self); } *************** *** 42642,42646 **** _m &= _v; } ! if (_m) { return _wrap_new_FXMenuBar__SWIG_1(nargs, args, self); } --- 42642,42646 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXMenuBar__SWIG_1(nargs, args, self); } *************** *** 42725,42729 **** _m &= _v; } ! if (_m) { return _wrap_new_FXMenuBar__SWIG_0(nargs, args, self); } --- 42725,42729 ---- _m &= _v; } ! if (_m && _v) { return _wrap_new_FXMenuBar__SWIG_0(nargs, args, self); } *************** *** 53419,53423 **** _m &= _v; } ! if (_m) { return _wrap_FX_List_replaceItem__SWIG_0(nargs, args, self); } --- 53419,53423 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_List_replaceItem__SWIG_0(nargs, args, self); } *************** *** 53459,53463 **** _m &= _v; } ! if (_m) { return _wrap_FX_List_replaceItem__SWIG_1(nargs, args, self); } --- 53459,53463 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_List_replaceItem__SWIG_1(nargs, args, self); } *************** *** 53577,53581 **** _m &= _v; } ! if (_m) { return _wrap_FX_List_insertItem__SWIG_0(nargs, args, self); } --- 53577,53581 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_List_insertItem__SWIG_0(nargs, args, self); } *************** *** 53617,53621 **** _m &= _v; } ! if (_m) { return _wrap_FX_List_insertItem__SWIG_1(nargs, args, self); } --- 53617,53621 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_List_insertItem__SWIG_1(nargs, args, self); } *************** *** 53727,53731 **** _m &= _v; } ! if (_m) { return _wrap_FX_List_appendItem__SWIG_0(nargs, args, self); } --- 53727,53731 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_List_appendItem__SWIG_0(nargs, args, self); } *************** *** 53763,53767 **** _m &= _v; } ! if (_m) { return _wrap_FX_List_appendItem__SWIG_1(nargs, args, self); } --- 53763,53767 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_List_appendItem__SWIG_1(nargs, args, self); } *************** *** 53873,53877 **** _m &= _v; } ! if (_m) { return _wrap_FX_List_prependItem__SWIG_0(nargs, args, self); } --- 53873,53877 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_List_prependItem__SWIG_0(nargs, args, self); } *************** *** 53909,53913 **** _m &= _v; } ! if (_m) { return _wrap_FX_List_prependItem__SWIG_1(nargs, args, self); } --- 53909,53913 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_List_prependItem__SWIG_1(nargs, args, self); } *************** *** 60516,60520 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeList_addItemFirst__SWIG_0(nargs, args, self); } --- 60516,60520 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeList_addItemFirst__SWIG_0(nargs, args, self); } *************** *** 60564,60568 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeList_addItemFirst__SWIG_1(nargs, args, self); } --- 60564,60568 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeList_addItemFirst__SWIG_1(nargs, args, self); } *************** *** 60687,60691 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeList_addItemLast__SWIG_0(nargs, args, self); } --- 60687,60691 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeList_addItemLast__SWIG_0(nargs, args, self); } *************** *** 60735,60739 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeList_addItemLast__SWIG_1(nargs, args, self); } --- 60735,60739 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeList_addItemLast__SWIG_1(nargs, args, self); } *************** *** 60858,60862 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeList_addItemAfter__SWIG_0(nargs, args, self); } --- 60858,60862 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeList_addItemAfter__SWIG_0(nargs, args, self); } *************** *** 60906,60910 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeList_addItemAfter__SWIG_1(nargs, args, self); } --- 60906,60910 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeList_addItemAfter__SWIG_1(nargs, args, self); } *************** *** 61029,61033 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeList_addItemBefore__SWIG_0(nargs, args, self); } --- 61029,61033 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeList_addItemBefore__SWIG_0(nargs, args, self); } *************** *** 61077,61081 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeList_addItemBefore__SWIG_1(nargs, args, self); } --- 61077,61081 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeList_addItemBefore__SWIG_1(nargs, args, self); } *************** *** 63411,63415 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeListBox_addItemFirst__SWIG_0(nargs, args, self); } --- 63411,63415 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeListBox_addItemFirst__SWIG_0(nargs, args, self); } *************** *** 63453,63457 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeListBox_addItemFirst__SWIG_1(nargs, args, self); } --- 63453,63457 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeListBox_addItemFirst__SWIG_1(nargs, args, self); } *************** *** 63539,63543 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeListBox_addItemLast__SWIG_0(nargs, args, self); } --- 63539,63543 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeListBox_addItemLast__SWIG_0(nargs, args, self); } *************** *** 63581,63585 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeListBox_addItemLast__SWIG_1(nargs, args, self); } --- 63581,63585 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeListBox_addItemLast__SWIG_1(nargs, args, self); } *************** *** 63667,63671 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeListBox_addItemAfter__SWIG_0(nargs, args, self); } --- 63667,63671 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeListBox_addItemAfter__SWIG_0(nargs, args, self); } *************** *** 63709,63713 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeListBox_addItemAfter__SWIG_1(nargs, args, self); } --- 63709,63713 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeListBox_addItemAfter__SWIG_1(nargs, args, self); } *************** *** 63795,63799 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeListBox_addItemBefore__SWIG_0(nargs, args, self); } --- 63795,63799 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeListBox_addItemBefore__SWIG_0(nargs, args, self); } *************** *** 63837,63841 **** _m &= _v; } ! if (_m) { return _wrap_FX_TreeListBox_addItemBefore__SWIG_1(nargs, args, self); } --- 63837,63841 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_TreeListBox_addItemBefore__SWIG_1(nargs, args, self); } *************** *** 77095,77099 **** _m &= _v; } ! if (_m) { return _wrap_FX_Header_replaceItem__SWIG_0(nargs, args, self); } --- 77095,77099 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_Header_replaceItem__SWIG_0(nargs, args, self); } *************** *** 77141,77145 **** _m &= _v; } ! if (_m) { return _wrap_FX_Header_replaceItem__SWIG_1(nargs, args, self); } --- 77141,77145 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_Header_replaceItem__SWIG_1(nargs, args, self); } *************** *** 77263,77267 **** _m &= _v; } ! if (_m) { return _wrap_FX_Header_insertItem__SWIG_0(nargs, args, self); } --- 77263,77267 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_Header_insertItem__SWIG_0(nargs, args, self); } *************** *** 77309,77313 **** _m &= _v; } ! if (_m) { return _wrap_FX_Header_insertItem__SWIG_1(nargs, args, self); } --- 77309,77313 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_Header_insertItem__SWIG_1(nargs, args, self); } *************** *** 77423,77427 **** _m &= _v; } ! if (_m) { return _wrap_FX_Header_appendItem__SWIG_0(nargs, args, self); } --- 77423,77427 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_Header_appendItem__SWIG_0(nargs, args, self); } *************** *** 77465,77469 **** _m &= _v; } ! if (_m) { return _wrap_FX_Header_appendItem__SWIG_1(nargs, args, self); } --- 77465,77469 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_Header_appendItem__SWIG_1(nargs, args, self); } *************** *** 77579,77583 **** _m &= _v; } ! if (_m) { return _wrap_FX_Header_prependItem__SWIG_0(nargs, args, self); } --- 77579,77583 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_Header_prependItem__SWIG_0(nargs, args, self); } *************** *** 77621,77625 **** _m &= _v; } ! if (_m) { return _wrap_FX_Header_prependItem__SWIG_1(nargs, args, self); } --- 77621,77625 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_Header_prependItem__SWIG_1(nargs, args, self); } *************** *** 80759,80763 **** _m &= _v; } ! if (_m) { return _wrap_FX_IconList_replaceItem__SWIG_0(nargs, args, self); } --- 80759,80763 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_IconList_replaceItem__SWIG_0(nargs, args, self); } *************** *** 80806,80810 **** _m &= _v; } ! if (_m) { return _wrap_FX_IconList_replaceItem__SWIG_1(nargs, args, self); } --- 80806,80810 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_IconList_replaceItem__SWIG_1(nargs, args, self); } *************** *** 80928,80932 **** _m &= _v; } ! if (_m) { return _wrap_FX_IconList_insertItem__SWIG_0(nargs, args, self); } --- 80928,80932 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_IconList_insertItem__SWIG_0(nargs, args, self); } *************** *** 80975,80979 **** _m &= _v; } ! if (_m) { return _wrap_FX_IconList_insertItem__SWIG_1(nargs, args, self); } --- 80975,80979 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_IconList_insertItem__SWIG_1(nargs, args, self); } *************** *** 81089,81093 **** _m &= _v; } ! if (_m) { return _wrap_FX_IconList_appendItem__SWIG_0(nargs, args, self); } --- 81089,81093 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_IconList_appendItem__SWIG_0(nargs, args, self); } *************** *** 81132,81136 **** _m &= _v; } ! if (_m) { return _wrap_FX_IconList_appendItem__SWIG_1(nargs, args, self); } --- 81132,81136 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_IconList_appendItem__SWIG_1(nargs, args, self); } *************** *** 81246,81250 **** _m &= _v; } ! if (_m) { return _wrap_FX_IconList_prependItem__SWIG_0(nargs, args, self); } --- 81246,81250 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_IconList_prependItem__SWIG_0(nargs, args, self); } *************** *** 81289,81293 **** _m &= _v; } ! if (_m) { return _wrap_FX_IconList_prependItem__SWIG_1(nargs, args, self); } --- 81289,81293 ---- _m &= _v; } ! if (_m && _v) { return _wrap_FX_IconList_prependItem__SWIG_1(nargs, args, self); } |
|
From: Lyle J. <ly...@us...> - 2002-07-12 16:35:26
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv30500/ext/fox Modified Files: core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp impl.cpp layout_wrap.cpp markfuncs.cpp mdi_wrap.cpp opengl_wrap.cpp ui_wrap.cpp Log Message: Many, many changes for the fox-1.1 update. Index: core_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** core_wrap.cpp 11 Jul 2002 13:32:57 -0000 1.63 --- core_wrap.cpp 12 Jul 2002 16:34:22 -0000 1.64 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020708-1058 * * 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.14u-20020709-0944 * [...2629 lines suppressed...] rb_define_method(cFXDC.klass, "fillArc", VALUEFUNC(_wrap_FXDC_fillArc), -1); rb_define_method(cFXDC.klass, "fillArcs", VALUEFUNC(_wrap_FXDC_fillArcs), -1); *************** *** 20371,20374 **** --- 20816,20821 ---- rb_define_method(cFXDCWindow.klass, "fillRectangle", VALUEFUNC(_wrap_FXDCWindow_fillRectangle), -1); rb_define_method(cFXDCWindow.klass, "fillRectangles", VALUEFUNC(_wrap_FXDCWindow_fillRectangles), -1); + rb_define_method(cFXDCWindow.klass, "fillChord", VALUEFUNC(_wrap_FXDCWindow_fillChord), -1); + rb_define_method(cFXDCWindow.klass, "fillChords", VALUEFUNC(_wrap_FXDCWindow_fillChords), -1); rb_define_method(cFXDCWindow.klass, "fillArc", VALUEFUNC(_wrap_FXDCWindow_fillArc), -1); rb_define_method(cFXDCWindow.klass, "fillArcs", VALUEFUNC(_wrap_FXDCWindow_fillArcs), -1); *************** *** 20512,20515 **** --- 20959,20964 ---- rb_define_method(cFXDCPrint.klass, "fillRectangle", VALUEFUNC(_wrap_FXDCPrint_fillRectangle), -1); rb_define_method(cFXDCPrint.klass, "fillRectangles", VALUEFUNC(_wrap_FXDCPrint_fillRectangles), -1); + rb_define_method(cFXDCPrint.klass, "fillChord", VALUEFUNC(_wrap_FXDCPrint_fillChord), -1); + rb_define_method(cFXDCPrint.klass, "fillChords", VALUEFUNC(_wrap_FXDCPrint_fillChords), -1); rb_define_method(cFXDCPrint.klass, "fillArc", VALUEFUNC(_wrap_FXDCPrint_fillArc), -1); rb_define_method(cFXDCPrint.klass, "fillArcs", VALUEFUNC(_wrap_FXDCPrint_fillArcs), -1); Index: dialogs_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** dialogs_wrap.cpp 11 Jul 2002 13:33:08 -0000 1.35 --- dialogs_wrap.cpp 12 Jul 2002 16:34:36 -0000 1.36 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020708-1058 * * 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.14u-20020709-0944 * [...3255 lines suppressed...] ! rb_define_method(cFXProgressDialog.klass, "close", VALUEFUNC(_wrap_FXProgressDialog_close), -1); rb_define_method(cFXProgressDialog.klass, "execute", VALUEFUNC(_wrap_FXProgressDialog_execute), -1); cFXProgressDialog.mark = (void (*)(void *)) FXRbProgressDialog::markfunc; *************** *** 14671,14676 **** rb_define_method(cFXMessageBox.klass, "setBackColor", VALUEFUNC(_wrap_FXMessageBox_setBackColor), -1); rb_define_method(cFXMessageBox.klass, "layout", VALUEFUNC(_wrap_FXMessageBox_layout), -1); ! rb_define_method(cFXMessageBox.klass, "iconify", VALUEFUNC(_wrap_FXMessageBox_iconify), -1); ! rb_define_method(cFXMessageBox.klass, "deiconify", VALUEFUNC(_wrap_FXMessageBox_deiconify), -1); rb_define_method(cFXMessageBox.klass, "execute", VALUEFUNC(_wrap_FXMessageBox_execute), -1); cFXMessageBox.mark = (void (*)(void *)) FXRbMessageBox::markfunc; --- 15527,15534 ---- rb_define_method(cFXMessageBox.klass, "setBackColor", VALUEFUNC(_wrap_FXMessageBox_setBackColor), -1); rb_define_method(cFXMessageBox.klass, "layout", VALUEFUNC(_wrap_FXMessageBox_layout), -1); ! rb_define_method(cFXMessageBox.klass, "maximize", VALUEFUNC(_wrap_FXMessageBox_maximize), -1); ! rb_define_method(cFXMessageBox.klass, "minimize", VALUEFUNC(_wrap_FXMessageBox_minimize), -1); ! rb_define_method(cFXMessageBox.klass, "restore", VALUEFUNC(_wrap_FXMessageBox_restore), -1); ! rb_define_method(cFXMessageBox.klass, "close", VALUEFUNC(_wrap_FXMessageBox_close), -1); rb_define_method(cFXMessageBox.klass, "execute", VALUEFUNC(_wrap_FXMessageBox_execute), -1); cFXMessageBox.mark = (void (*)(void *)) FXRbMessageBox::markfunc; Index: icons_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** icons_wrap.cpp 11 Jul 2002 13:33:08 -0000 1.38 --- icons_wrap.cpp 12 Jul 2002 16:34:37 -0000 1.39 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020708-1058 * * 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.14u-20020709-0944 * [...1070 lines suppressed...] static swig_type_info _swigt__p_FXRbGIFIcon[] = {{"_p_FXRbGIFIcon", 0, "FXRbGIFIcon *"},{"_p_FXRbGIFIcon"},{0}}; *************** *** 6939,6946 **** static swig_type_info _swigt__p_FXRbTIFIcon[] = {{"_p_FXRbTIFIcon", 0, "FXRbTIFIcon *"},{"_p_FXRbTIFIcon"},{0}}; static swig_type_info _swigt__p_FXTGAIcon[] = {{"_p_FXTGAIcon", 0, "FXTGAIcon *"},{"_p_FXTGAIcon"},{"_p_FXRbTGAIcon", _p_FXRbTGAIconTo_p_FXTGAIcon},{0}}; ! static swig_type_info _swigt__p_FXId[] = {{"_p_FXId", 0, "FXId *"},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXId},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXId},{"_p_FXRbShell", _p_FXRbShellTo_p_FXId},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXId},{"_p_FXDirList", _p_FXDirListTo_p_FXId},{"_p_FXRbDial", _p_FXRbDialTo_p_FXId},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXId},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXId},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXId},{"_p_FXMenubar", _p_FXMenubarTo_p_FXId},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXId},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXId},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXId},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXId},{"_p_FXTIFIcon", _p_FXTIFIconTo_p_FXId},{"_p_FXRbTIFIcon", _p_FXRbTIFIconTo_p_FXId},{"_p_FXPopup", _p_FXPopupTo_p_FXId},{"_p_FXImage", _p_FXImageTo_p_FXId},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXId},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXId},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXId},{"_p_FXComposite", _p_FXCompositeTo_p_FXId},{"_p_FXRbPNGImage", _p_FXRbPNGImageTo_p_FXId},{"_p_FXPNGImage", _p_FXPNGImageTo_p_FXId},{"_p_FXRbJPGImage", _p_FXRbJPGImageTo_p_FXId},{"_p_FXJPGImage", _p_FXJPGImageTo_p_FXId},{"_p_FXRbPNGIcon", _p_FXRbPNGIconTo_p_FXId},{"_p_FXPNGIcon", _p_FXPNGIconTo_p_FXId},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXId},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXId},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXId},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXId},{"_p_FXRbId", _p_FXRbIdTo_p_FXId},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXId},{"_p_FXHeader", _p_FXHeaderTo_p_FXId},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXId},{"_p_FXRGBImage", _p_FXRGBImageTo_p_FXId},{"_p_FXRbImage", _p_FXRbImageTo_p_FXId},{"_p_FXRbRGBImage", _p_FXRbRGBImageTo_p_FXId},{"_p_FXGIFIcon", _p_FXGIFIconTo_p_FXId},{"_p_FXRbGIFIcon", _p_FXRbGIFIconTo_p_FXId},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXId},{"_p_FXTabItem", _p_FXTabItemTo_p_FXId},{"_p_FXRbPCXImage", _p_FXRbPCXImageTo_p_FXId},{"_p_FXPCXImage", _p_FXPCXImageTo_p_FXId},{"_p_FXRbIcon", _p_FXRbIconTo_p_FXId},{"_p_FXList", _p_FXListTo_p_FXId},{"_p_FXColorWell", _p_FXColorWellTo_p_FXId},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXId},{"_p_FXRbPCXIcon", _p_FXRbPCXIconTo_p_FXId},{"_p_FXPCXIcon", _p_FXPCXIconTo_p_FXId},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXId},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXId},{"_p_FXRbRGBIcon", _p_FXRbRGBIconTo_p_FXId},{"_p_FXRGBIcon", _p_FXRGBIconTo_p_FXId},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXId},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXId},{"_p_FXFileList", _p_FXFileListTo_p_FXId},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXId},{"_p_FXRbTGAIcon", _p_FXRbTGAIconTo_p_FXId},{"_p_FXTGAIcon", _p_FXTGAIconTo_p_FXId},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXId},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXId},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXId},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXId},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXId},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXId},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXId},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXId},{"_p_FXText", _p_FXTextTo_p_FXId},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXId},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXId},{"_p_FXVisual", _p_FXVisualTo_p_FXId},{"_p_FXRbVisual", _p_FXRbVisualTo_p_FXId},{"_p_FXRbFont", _p_FXRbFontTo_p_FXId},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXId},{"_p_FXIconList", _p_FXIconListTo_p_FXId},{"_p_FXPicker", _p_FXPickerTo_p_FXId},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXId},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXId},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXId},{"_p_FXDial", _p_FXDialTo_p_FXId},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXId},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXId},{"_p_FXButton", _p_FXButtonTo_p_FXId},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXId},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXId},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXId},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXId},{"_p_FXListBox", _p_FXListBoxTo_p_FXId},{"_p_FXFrame", _p_FXFrameTo_p_FXId},{"_p_FXBMPIcon", _p_FXBMPIconTo_p_FXId},{"_p_FXRbBMPIcon", _p_FXRbBMPIconTo_p_FXId},{"_p_FXCursor", _p_FXCursorTo_p_FXId},{"_p_FXRbCursor", _p_FXRbCursorTo_p_FXId},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXId},{"_p_FXRbCURCursor", _p_FXRbCURCursorTo_p_FXId},{"_p_FXGIFCursor", _p_FXGIFCursorTo_p_FXId},{"_p_FXRbGIFCursor", _p_FXRbGIFCursorTo_p_FXId},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXId},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXId},{"_p_FXRbICOImage", _p_FXRbICOImageTo_p_FXId},{"_p_FXICOImage", _p_FXICOImageTo_p_FXId},{"_p_FXPacker", _p_FXPackerTo_p_FXId},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXId},{"_p_FXXPMImage", _p_FXXPMImageTo_p_FXId},{"_p_FXRbXPMImage", _p_FXRbXPMImageTo_p_FXId},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXId},{"_p_FXTabBook", _p_FXTabBookTo_p_FXId},{"_p_FXRbICOIcon", _p_FXRbICOIconTo_p_FXId},{"_p_FXICOIcon", _p_FXICOIconTo_p_FXId},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXId},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXId},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXId},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXId},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXId},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXId},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXId},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXId},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXId},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXId},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXId},{"_p_FXLabel", _p_FXLabelTo_p_FXId},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXId},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXId},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXId},{"_p_FXTreeList", _p_FXTreeListTo_p_FXId},{"_p_FXTooltip", _p_FXTooltipTo_p_FXId},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXId},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXId},{"_p_FXTextField", _p_FXTextFieldTo_p_FXId},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXId},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXId},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXId},{"_p_FXWindow", _p_FXWindowTo_p_FXId},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXId},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXId},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXId},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXId},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXId},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXId},{"_p_FXIcon", _p_FXIconTo_p_FXId},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXId},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXId},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXId},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXId},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXId},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXId},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXId},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXId},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXId},{"_p_FXId"},{"_p_FXColorBar", _p_FXColorBarTo_p_FXId},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXId},{"_p_FXOption", _p_FXOptionTo_p_FXId},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXId},{"_p_FXTable", _p_FXTableTo_p_FXId},{"_p_FXTGAImage", _p_FXTGAImageTo_p_FXId},{"_p_FXRbTGAImage", _p_FXRbTGAImageTo_p_FXId},{"_p_FXFont", _p_FXFontTo_p_FXId},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXId},{"_p_FXSlider", _p_FXSliderTo_p_FXId},{"_p_FXXPMIcon", _p_FXXPMIconTo_p_FXId},{"_p_FXRbXPMIcon", _p_FXRbXPMIconTo_p_FXId},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXId},{"_p_FXTabBar", _p_FXTabBarTo_p_FXId},{"_p_FXRbStatusline", _p_FXRbStatuslineTo_p_FXId},{"_p_FXStatusline", _p_FXStatuslineTo_p_FXId},{"_p_FXDrawable", _p_FXDrawableTo_p_FXId},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXId},{"_p_FXRbTIFImage", _p_FXRbTIFImageTo_p_FXId},{"_p_FXTIFImage", _p_FXTIFImageTo_p_FXId},{"_p_FXGIFImage", _p_FXGIFImageTo_p_FXId},{"_p_FXRbGIFImage", _p_FXRbGIFImageTo_p_FXId},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXId},{"_p_FXImageView", _p_FXImageViewTo_p_FXId},{"_p_FXRbList", _p_FXRbListTo_p_FXId},{"_p_FXCanvas", _p_FXCanvasTo_p_FXId},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXId},{"_p_FXRbTable", _p_FXRbTableTo_p_FXId},{"_p_FXShell", _p_FXShellTo_p_FXId},{"_p_FXRbJPGIcon", _p_FXRbJPGIconTo_p_FXId},{"_p_FXJPGIcon", _p_FXJPGIconTo_p_FXId},{"_p_FXRbD riveBox", _p_FXRbDriveBoxTo_p_FXId},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXId},{"_p_FXRbBitmap", _p_FXRbBitmapTo_p_FXId},{"_p_FXBitmap", _p_FXBitmapTo_p_FXId},{"_p_FXRbBMPImage", _p_FXRbBMPImageTo_p_FXId},{"_p_FXBMPImage", _p_FXBMPImageTo_p_FXId},{"_p_FXRbText", _p_FXRbTextTo_p_FXId},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXId},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXId},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXId},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXId},{"_p_FXToolbar", _p_FXToolbarTo_p_FXId},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXId},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXId},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXId},{0}}; static swig_type_info _swigt__p_FXRbTGAIcon[] = {{"_p_FXRbTGAIcon", 0, "FXRbTGAIcon *"},{"_p_FXRbTGAIcon"},{0}}; static swig_type_info _swigt__p_p_FXchar[] = {{"_p_p_FXchar", 0, "FXchar const **"},{"_p_p_FXchar"},{0}}; ! static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable *"},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXDrawable},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXDrawable},{"_p_FXRbShell", _p_FXRbShellTo_p_FXDrawable},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXDrawable},{"_p_FXDirList", _p_FXDirListTo_p_FXDrawable},{"_p_FXRbDial", _p_FXRbDialTo_p_FXDrawable},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXDrawable},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXDrawable},{"_p_FXMenubar", _p_FXMenubarTo_p_FXDrawable},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXDrawable},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXDrawable},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXDrawable},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXDrawable},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXDrawable},{"_p_FXTIFIcon", _p_FXTIFIconTo_p_FXDrawable},{"_p_FXRbTIFIcon", _p_FXRbTIFIconTo_p_FXDrawable},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable},{"_p_FXImage", _p_FXImageTo_p_FXDrawable},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXDrawable},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXDrawable},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXDrawable},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable},{"_p_FXRbPNGImage", _p_FXRbPNGImageTo_p_FXDrawable},{"_p_FXPNGImage", _p_FXPNGImageTo_p_FXDrawable},{"_p_FXRbJPGImage", _p_FXRbJPGImageTo_p_FXDrawable},{"_p_FXJPGImage", _p_FXJPGImageTo_p_FXDrawable},{"_p_FXRbPNGIcon", _p_FXRbPNGIconTo_p_FXDrawable},{"_p_FXPNGIcon", _p_FXPNGIconTo_p_FXDrawable},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXDrawable},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXDrawable},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXDrawable},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXDrawable},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXDrawable},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXDrawable},{"_p_FXRGBImage", _p_FXRGBImageTo_p_FXDrawable},{"_p_FXRbImage", _p_FXRbImageTo_p_FXDrawable},{"_p_FXRbRGBImage", _p_FXRbRGBImageTo_p_FXDrawable},{"_p_FXGIFIcon", _p_FXGIFIconTo_p_FXDrawable},{"_p_FXRbGIFIcon", _p_FXRbGIFIconTo_p_FXDrawable},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXDrawable},{"_p_FXTabItem", _p_FXTabItemTo_p_FXDrawable},{"_p_FXRbPCXImage", _p_FXRbPCXImageTo_p_FXDrawable},{"_p_FXPCXImage", _p_FXPCXImageTo_p_FXDrawable},{"_p_FXRbIcon", _p_FXRbIconTo_p_FXDrawable},{"_p_FXList", _p_FXListTo_p_FXDrawable},{"_p_FXColorWell", _p_FXColorWellTo_p_FXDrawable},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXDrawable},{"_p_FXRbPCXIcon", _p_FXRbPCXIconTo_p_FXDrawable},{"_p_FXPCXIcon", _p_FXPCXIconTo_p_FXDrawable},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXDrawable},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXDrawable},{"_p_FXRbRGBIcon", _p_FXRbRGBIconTo_p_FXDrawable},{"_p_FXRGBIcon", _p_FXRGBIconTo_p_FXDrawable},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXDrawable},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXDrawable},{"_p_FXFileList", _p_FXFileListTo_p_FXDrawable},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXDrawable},{"_p_FXRbTGAIcon", _p_FXRbTGAIconTo_p_FXDrawable},{"_p_FXTGAIcon", _p_FXTGAIconTo_p_FXDrawable},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXDrawable},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXDrawable},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXDrawable},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXDrawable},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXDrawable},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXDrawable},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXDrawable},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXDrawable},{"_p_FXText", _p_FXTextTo_p_FXDrawable},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXDrawable},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXDrawable},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXDrawable},{"_p_FXIconList", _p_FXIconListTo_p_FXDrawable},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXDrawable},{"_p_FXPicker", _p_FXPickerTo_p_FXDrawable},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXDrawable},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXDrawable},{"_p_FXDial", _p_FXDialTo_p_FXDrawable},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXDrawable},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXDrawable},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXDrawable},{"_p_FXButton", _p_FXButtonTo_p_FXDrawable},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXDrawable},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXDrawable},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXDrawable},{"_p_FXListBox", _p_FXListBoxTo_p_FXDrawable},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable},{"_p_FXBMPIcon", _p_FXBMPIconTo_p_FXDrawable},{"_p_FXRbBMPIcon", _p_FXRbBMPIconTo_p_FXDrawable},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXDrawable},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXDrawable},{"_p_FXRbICOImage", _p_FXRbICOImageTo_p_FXDrawable},{"_p_FXICOImage", _p_FXICOImageTo_p_FXDrawable},{"_p_FXPacker", _p_FXPackerTo_p_FXDrawable},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXDrawable},{"_p_FXXPMImage", _p_FXXPMImageTo_p_FXDrawable},{"_p_FXRbXPMImage", _p_FXRbXPMImageTo_p_FXDrawable},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXDrawable},{"_p_FXTabBook", _p_FXTabBookTo_p_FXDrawable},{"_p_FXRbICOIcon", _p_FXRbICOIconTo_p_FXDrawable},{"_p_FXICOIcon", _p_FXICOIconTo_p_FXDrawable},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXDrawable},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXDrawable},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXDrawable},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXDrawable},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXDrawable},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXDrawable},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXDrawable},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXDrawable},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXDrawable},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXDrawable},{"_p_FXLabel", _p_FXLabelTo_p_FXDrawable},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXDrawable},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXDrawable},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXDrawable},{"_p_FXTreeList", _p_FXTreeListTo_p_FXDrawable},{"_p_FXTooltip", _p_FXTooltipTo_p_FXDrawable},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXDrawable},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXDrawable},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXDrawable},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXDrawable},{"_p_FXWindow", _p_FXWindowTo_p_FXDrawable},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXDrawable},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXDrawable},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXDrawable},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXDrawable},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXDrawable},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXDrawable},{"_p_FXIcon", _p_FXIconTo_p_FXDrawable},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXDrawable},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXDrawable},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXDrawable},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXDrawable},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXDrawable},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXDrawable},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXDrawable},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXDrawable},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXDrawable},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXDrawable},{"_p_FXColorBar", _p_FXColorBarTo_p_FXDrawable},{"_p_FXOption", _p_FXOptionTo_p_FXDrawable},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXDrawable},{"_p_FXTable", _p_FXTableTo_p_FXDrawable},{"_p_FXTGAImage", _p_FXTGAImageTo_p_FXDrawable},{"_p_FXRbTGAImage", _p_FXRbTGAImageTo_p_FXDrawable},{"_p_FXSlider", _p_FXSliderTo_p_FXDrawable},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXDrawable},{"_p_FXXPMIcon", _p_FXXPMIconTo_p_FXDrawable},{"_p_FXRbXPMIcon", _p_FXRbXPMIconTo_p_FXDrawable},{"_p_FXTabBar", _p_FXTabBarTo_p_FXDrawable},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXDrawable},{"_p_FXDrawable"},{"_p_FXStatusline", _p_FXStatuslineTo_p_FXDrawable},{"_p_FXRbStatusline", _p_FXRbStatuslineTo_p_FXDrawable},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXDrawable},{"_p_FXRbTIFImage", _p_FXRbTIFImageTo_p_FXDrawable},{"_p_FXTIFImage", _p_FXTIFImag eTo_p_FXDrawable},{"_p_FXGIFImage", _p_FXGIFImageTo_p_FXDrawable},{"_p_FXRbGIFImage", _p_FXRbGIFImageTo_p_FXDrawable},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXDrawable},{"_p_FXImageView", _p_FXImageViewTo_p_FXDrawable},{"_p_FXRbList", _p_FXRbListTo_p_FXDrawable},{"_p_FXCanvas", _p_FXCanvasTo_p_FXDrawable},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXDrawable},{"_p_FXRbTable", _p_FXRbTableTo_p_FXDrawable},{"_p_FXShell", _p_FXShellTo_p_FXDrawable},{"_p_FXRbJPGIcon", _p_FXRbJPGIconTo_p_FXDrawable},{"_p_FXJPGIcon", _p_FXJPGIconTo_p_FXDrawable},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXDrawable},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXDrawable},{"_p_FXRbBitmap", _p_FXRbBitmapTo_p_FXDrawable},{"_p_FXBitmap", _p_FXBitmapTo_p_FXDrawable},{"_p_FXRbBMPImage", _p_FXRbBMPImageTo_p_FXDrawable},{"_p_FXBMPImage", _p_FXBMPImageTo_p_FXDrawable},{"_p_FXRbText", _p_FXRbTextTo_p_FXDrawable},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXDrawable},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXDrawable},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXDrawable},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXDrawable},{"_p_FXToolbar", _p_FXToolbarTo_p_FXDrawable},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXDrawable},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXDrawable},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable},{0}}; static swig_type_info _swigt__p_FXPCXIcon[] = {{"_p_FXPCXIcon", 0, "FXPCXIcon *"},{"_p_FXPCXIcon"},{"_p_FXRbPCXIcon", _p_FXRbPCXIconTo_p_FXPCXIcon},{0}}; static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *"},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream},{"_p_FXRbFileStream", _p_FXRbFileStreamTo_p_FXStream},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream},{"_p_FXRbMemoryStream", _p_FXRbMemoryStreamTo_p_FXStream},{"_p_FXStream"},{"_p_FXRbStream", _p_FXRbStreamTo_p_FXStream},{0}}; --- 6957,6964 ---- static swig_type_info _swigt__p_FXRbTIFIcon[] = {{"_p_FXRbTIFIcon", 0, "FXRbTIFIcon *"},{"_p_FXRbTIFIcon"},{0}}; static swig_type_info _swigt__p_FXTGAIcon[] = {{"_p_FXTGAIcon", 0, "FXTGAIcon *"},{"_p_FXTGAIcon"},{"_p_FXRbTGAIcon", _p_FXRbTGAIconTo_p_FXTGAIcon},{0}}; ! static swig_type_info _swigt__p_FXId[] = {{"_p_FXId", 0, "FXId *"},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXId},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXId},{"_p_FXRbShell", _p_FXRbShellTo_p_FXId},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXId},{"_p_FXDirList", _p_FXDirListTo_p_FXId},{"_p_FXRbScrollBar", _p_FXRbScrollBarTo_p_FXId},{"_p_FXScrollBar", _p_FXScrollBarTo_p_FXId},{"_p_FXRbDial", _p_FXRbDialTo_p_FXId},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXId},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXId},{"_p_FXTIFIcon", _p_FXTIFIconTo_p_FXId},{"_p_FXRbTIFIcon", _p_FXRbTIFIconTo_p_FXId},{"_p_FXPopup", _p_FXPopupTo_p_FXId},{"_p_FXImage", _p_FXImageTo_p_FXId},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXId},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXId},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXId},{"_p_FXComposite", _p_FXCompositeTo_p_FXId},{"_p_FXRbPNGImage", _p_FXRbPNGImageTo_p_FXId},{"_p_FXPNGImage", _p_FXPNGImageTo_p_FXId},{"_p_FXRbJPGImage", _p_FXRbJPGImageTo_p_FXId},{"_p_FXJPGImage", _p_FXJPGImageTo_p_FXId},{"_p_FXRbPNGIcon", _p_FXRbPNGIconTo_p_FXId},{"_p_FXPNGIcon", _p_FXPNGIconTo_p_FXId},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXId},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXId},{"_p_FXToolBarGrip", _p_FXToolBarGripTo_p_FXId},{"_p_FXRbToolBarGrip", _p_FXRbToolBarGripTo_p_FXId},{"_p_FXRbId", _p_FXRbIdTo_p_FXId},{"_p_FXHeader", _p_FXHeaderTo_p_FXId},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXId},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXId},{"_p_FXRGBImage", _p_FXRGBImageTo_p_FXId},{"_p_FXRbImage", _p_FXRbImageTo_p_FXId},{"_p_FXRbRGBImage", _p_FXRbRGBImageTo_p_FXId},{"_p_FXRbGIFIcon", _p_FXRbGIFIconTo_p_FXId},{"_p_FXGIFIcon", _p_FXGIFIconTo_p_FXId},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXId},{"_p_FXTabItem", _p_FXTabItemTo_p_FXId},{"_p_FXRbPCXImage", _p_FXRbPCXImageTo_p_FXId},{"_p_FXPCXImage", _p_FXPCXImageTo_p_FXId},{"_p_FXRbIcon", _p_FXRbIconTo_p_FXId},{"_p_FXList", _p_FXListTo_p_FXId},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXId},{"_p_FXColorWell", _p_FXColorWellTo_p_FXId},{"_p_FXRbPCXIcon", _p_FXRbPCXIconTo_p_FXId},{"_p_FXPCXIcon", _p_FXPCXIconTo_p_FXId},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXId},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXId},{"_p_FXRbRGBIcon", _p_FXRbRGBIconTo_p_FXId},{"_p_FXRGBIcon", _p_FXRGBIconTo_p_FXId},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXId},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXId},{"_p_FXFileList", _p_FXFileListTo_p_FXId},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXId},{"_p_FXRbTGAIcon", _p_FXRbTGAIconTo_p_FXId},{"_p_FXTGAIcon", _p_FXTGAIconTo_p_FXId},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXId},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXId},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXId},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXId},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXId},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXId},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXId},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXId},{"_p_FXText", _p_FXTextTo_p_FXId},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXId},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXId},{"_p_FXRbVisual", _p_FXRbVisualTo_p_FXId},{"_p_FXVisual", _p_FXVisualTo_p_FXId},{"_p_FXRbFont", _p_FXRbFontTo_p_FXId},{"_p_FXIconList", _p_FXIconListTo_p_FXId},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXId},{"_p_FXPicker", _p_FXPickerTo_p_FXId},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXId},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXId},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXId},{"_p_FXDial", _p_FXDialTo_p_FXId},{"_p_FXRbToolBarShell", _p_FXRbToolBarShellTo_p_FXId},{"_p_FXToolBarShell", _p_FXToolBarShellTo_p_FXId},{"_p_FXButton", _p_FXButtonTo_p_FXId},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXId},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXId},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXId},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXId},{"_p_FXListBox", _p_FXListBoxTo_p_FXId},{"_p_FXFrame", _p_FXFrameTo_p_FXId},{"_p_FXBMPIcon", _p_FXBMPIconTo_p_FXId},{"_p_FXRbBMPIcon", _p_FXRbBMPIconTo_p_FXId},{"_p_FXCursor", _p_FXCursorTo_p_FXId},{"_p_FXRbCursor", _p_FXRbCursorTo_p_FXId},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXId},{"_p_FXRbCURCursor", _p_FXRbCURCursorTo_p_FXId},{"_p_FX__FXGIFCursor", _p_FX__FXGIFCursorTo_p_FXId},{"_p_FXRbGIFCursor", _p_FXRbGIFCursorTo_p_FXId},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXId},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXId},{"_p_FXRbICOImage", _p_FXRbICOImageTo_p_FXId},{"_p_FXICOImage", _p_FXICOImageTo_p_FXId},{"_p_FXPacker", _p_FXPackerTo_p_FXId},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXId},{"_p_FXRbXPMImage", _p_FXRbXPMImageTo_p_FXId},{"_p_FXXPMImage", _p_FXXPMImageTo_p_FXId},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXId},{"_p_FXTabBook", _p_FXTabBookTo_p_FXId},{"_p_FXRbICOIcon", _p_FXRbICOIconTo_p_FXId},{"_p_FXICOIcon", _p_FXICOIconTo_p_FXId},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXId},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXId},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXId},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXId},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXId},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXId},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXId},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXId},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXId},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXId},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXId},{"_p_FXLabel", _p_FXLabelTo_p_FXId},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXId},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXId},{"_p_FXToolTip", _p_FXToolTipTo_p_FXId},{"_p_FXRbToolTip", _p_FXRbToolTipTo_p_FXId},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXId},{"_p_FXTreeList", _p_FXTreeListTo_p_FXId},{"_p_FXTextField", _p_FXTextFieldTo_p_FXId},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXId},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXId},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXId},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXId},{"_p_FXWindow", _p_FXWindowTo_p_FXId},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXId},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXId},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXId},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXId},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXId},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXId},{"_p_FXIcon", _p_FXIconTo_p_FXId},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXId},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXId},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXId},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXId},{"_p_FXRbSeparator", _p_FXRbSeparatorTo_p_FXId},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXId},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXId},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXId},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXId},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXId},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXId},{"_p_FXId"},{"_p_FXColorBar", _p_FXColorBarTo_p_FXId},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXId},{"_p_FXOption", _p_FXOptionTo_p_FXId},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXId},{"_p_FXTable", _p_FXTableTo_p_FXId},{"_p_FXTGAImage", _p_FXTGAImageTo_p_FXId},{"_p_FXRbTGAImage", _p_FXRbTGAImageTo_p_FXId},{"_p_FXFont", _p_FXFontTo_p_FXId},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXId},{"_p_FXSlider", _p_FXSliderTo_p_FXId},{"_p_FXXPMIcon", _p_FXXPMIconTo_p_FXId},{"_p_FXRbXPMIcon", _p_FXRbXPMIconTo_p_FXId},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXId},{"_p_FXTabBar", _p_FXTabBarTo_p_FXId},{"_p_FXDrawable", _p_FXDrawableTo_p_FXId},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXId},{"_p_FXRbTIFImage", _p_FXRbTIFImageTo_p_FXId},{"_p_FXTIFImage", _p_FXTIFImageTo_p_FXId},{"_p_FXGIFImage", _p_FXGIFImageTo_p_FXId},{"_p_FXRbGIFImage", _p_FXRbGIFImageTo_p_FXId},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXId},{"_p_FXImageView", _p_FXImageViewTo_p_FXId},{"_p_FXRbStatusLine", _p_FXRbStatusLineTo_p_FXId},{"_p_FXStatusLine", _p_FXStatusLineTo_p_FXId},{"_p_FXRbList", _p_FXRbListTo_p_FXId},{"_p_FXCanvas", _p_FXCanvasTo_p_FXId},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXId},{"_p_FXRbTable", _p_FXRbTableTo_p_FXId},{"_p_FXRbToolBarTab", _p_FXRbToolBarTabTo_p_FXId},{"_p_FXToolBarTab", _p_FXToolBarTabTo_p_FXId},{"_p_FXShell", _p_FXShellTo_p_FXId},{"_p_FXRbJPGIcon", _p_FXRbJPGIconTo_p_FXId},{"_p_FXJPGIcon", _p_FXJPGIconTo_p_ FXId},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXId},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXId},{"_p_FXRbBitmap", _p_FXRbBitmapTo_p_FXId},{"_p_FXBitmap", _p_FXBitmapTo_p_FXId},{"_p_FXRbBMPImage", _p_FXRbBMPImageTo_p_FXId},{"_p_FXBMPImage", _p_FXBMPImageTo_p_FXId},{"_p_FXRbText", _p_FXRbTextTo_p_FXId},{"_p_FXToolBar", _p_FXToolBarTo_p_FXId},{"_p_FXRbToolBar", _p_FXRbToolBarTo_p_FXId},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXId},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXId},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXId},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXId},{"_p_FXMenuBar", _p_FXMenuBarTo_p_FXId},{"_p_FXRbMenuBar", _p_FXRbMenuBarTo_p_FXId},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXId},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXId},{0}}; static swig_type_info _swigt__p_FXRbTGAIcon[] = {{"_p_FXRbTGAIcon", 0, "FXRbTGAIcon *"},{"_p_FXRbTGAIcon"},{0}}; static swig_type_info _swigt__p_p_FXchar[] = {{"_p_p_FXchar", 0, "FXchar const **"},{"_p_p_FXchar"},{0}}; ! static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable *"},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXDrawable},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXDrawable},{"_p_FXRbShell", _p_FXRbShellTo_p_FXDrawable},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXDrawable},{"_p_FXDirList", _p_FXDirListTo_p_FXDrawable},{"_p_FXRbScrollBar", _p_FXRbScrollBarTo_p_FXDrawable},{"_p_FXScrollBar", _p_FXScrollBarTo_p_FXDrawable},{"_p_FXRbDial", _p_FXRbDialTo_p_FXDrawable},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXDrawable},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXDrawable},{"_p_FXTIFIcon", _p_FXTIFIconTo_p_FXDrawable},{"_p_FXRbTIFIcon", _p_FXRbTIFIconTo_p_FXDrawable},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable},{"_p_FXImage", _p_FXImageTo_p_FXDrawable},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXDrawable},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXDrawable},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXDrawable},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable},{"_p_FXRbPNGImage", _p_FXRbPNGImageTo_p_FXDrawable},{"_p_FXPNGImage", _p_FXPNGImageTo_p_FXDrawable},{"_p_FXRbJPGImage", _p_FXRbJPGImageTo_p_FXDrawable},{"_p_FXJPGImage", _p_FXJPGImageTo_p_FXDrawable},{"_p_FXRbPNGIcon", _p_FXRbPNGIconTo_p_FXDrawable},{"_p_FXPNGIcon", _p_FXPNGIconTo_p_FXDrawable},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXDrawable},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXDrawable},{"_p_FXToolBarGrip", _p_FXToolBarGripTo_p_FXDrawable},{"_p_FXRbToolBarGrip", _p_FXRbToolBarGripTo_p_FXDrawable},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXDrawable},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXDrawable},{"_p_FXRGBImage", _p_FXRGBImageTo_p_FXDrawable},{"_p_FXRbImage", _p_FXRbImageTo_p_FXDrawable},{"_p_FXRbRGBImage", _p_FXRbRGBImageTo_p_FXDrawable},{"_p_FXRbGIFIcon", _p_FXRbGIFIconTo_p_FXDrawable},{"_p_FXGIFIcon", _p_FXGIFIconTo_p_FXDrawable},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXDrawable},{"_p_FXTabItem", _p_FXTabItemTo_p_FXDrawable},{"_p_FXRbPCXImage", _p_FXRbPCXImageTo_p_FXDrawable},{"_p_FXPCXImage", _p_FXPCXImageTo_p_FXDrawable},{"_p_FXRbIcon", _p_FXRbIconTo_p_FXDrawable},{"_p_FXList", _p_FXListTo_p_FXDrawable},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXDrawable},{"_p_FXColorWell", _p_FXColorWellTo_p_FXDrawable},{"_p_FXRbPCXIcon", _p_FXRbPCXIconTo_p_FXDrawable},{"_p_FXPCXIcon", _p_FXPCXIconTo_p_FXDrawable},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXDrawable},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXDrawable},{"_p_FXRbRGBIcon", _p_FXRbRGBIconTo_p_FXDrawable},{"_p_FXRGBIcon", _p_FXRGBIconTo_p_FXDrawable},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXDrawable},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXDrawable},{"_p_FXFileList", _p_FXFileListTo_p_FXDrawable},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXDrawable},{"_p_FXRbTGAIcon", _p_FXRbTGAIconTo_p_FXDrawable},{"_p_FXTGAIcon", _p_FXTGAIconTo_p_FXDrawable},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXDrawable},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXDrawable},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXDrawable},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXDrawable},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXDrawable},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXDrawable},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXDrawable},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXDrawable},{"_p_FXText", _p_FXTextTo_p_FXDrawable},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXDrawable},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXDrawable},{"_p_FXIconList", _p_FXIconListTo_p_FXDrawable},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXDrawable},{"_p_FXPicker", _p_FXPickerTo_p_FXDrawable},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXDrawable},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXDrawable},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXDrawable},{"_p_FXDial", _p_FXDialTo_p_FXDrawable},{"_p_FXRbToolBarShell", _p_FXRbToolBarShellTo_p_FXDrawable},{"_p_FXToolBarShell", _p_FXToolBarShellTo_p_FXDrawable},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXDrawable},{"_p_FXButton", _p_FXButtonTo_p_FXDrawable},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXDrawable},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXDrawable},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXDrawable},{"_p_FXListBox", _p_FXListBoxTo_p_FXDrawable},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable},{"_p_FXBMPIcon", _p_FXBMPIconTo_p_FXDrawable},{"_p_FXRbBMPIcon", _p_FXRbBMPIconTo_p_FXDrawable},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXDrawable},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXDrawable},{"_p_FXRbICOImage", _p_FXRbICOImageTo_p_FXDrawable},{"_p_FXICOImage", _p_FXICOImageTo_p_FXDrawable},{"_p_FXPacker", _p_FXPackerTo_p_FXDrawable},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXDrawable},{"_p_FXRbXPMImage", _p_FXRbXPMImageTo_p_FXDrawable},{"_p_FXXPMImage", _p_FXXPMImageTo_p_FXDrawable},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXDrawable},{"_p_FXTabBook", _p_FXTabBookTo_p_FXDrawable},{"_p_FXRbICOIcon", _p_FXRbICOIconTo_p_FXDrawable},{"_p_FXICOIcon", _p_FXICOIconTo_p_FXDrawable},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXDrawable},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXDrawable},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXDrawable},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXDrawable},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXDrawable},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXDrawable},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXDrawable},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXDrawable},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXDrawable},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXDrawable},{"_p_FXLabel", _p_FXLabelTo_p_FXDrawable},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXDrawable},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXDrawable},{"_p_FXToolTip", _p_FXToolTipTo_p_FXDrawable},{"_p_FXRbToolTip", _p_FXRbToolTipTo_p_FXDrawable},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXDrawable},{"_p_FXTreeList", _p_FXTreeListTo_p_FXDrawable},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXDrawable},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXDrawable},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXDrawable},{"_p_FXWindow", _p_FXWindowTo_p_FXDrawable},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXDrawable},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXDrawable},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXDrawable},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXDrawable},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXDrawable},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXDrawable},{"_p_FXIcon", _p_FXIconTo_p_FXDrawable},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXDrawable},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXDrawable},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXDrawable},{"_p_FXRbSeparator", _p_FXRbSeparatorTo_p_FXDrawable},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXDrawable},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXDrawable},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXDrawable},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXDrawable},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXDrawable},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXDrawable},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXDrawable},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXDrawable},{"_p_FXColorBar", _p_FXColorBarTo_p_FXDrawable},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXDrawable},{"_p_FXOption", _p_FXOptionTo_p_FXDrawable},{"_p_FXTable", _p_FXTableTo_p_FXDrawable},{"_p_FXTGAImage", _p_FXTGAImageTo_p_FXDrawable},{"_p_FXRbTGAImage", _p_FXRbTGAImageTo_p_FXDrawable},{"_p_FXSlider", _p_FXSliderTo_p_FXDrawable},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXDrawable},{"_p_FXXPMIcon", _p_FXXPMIconTo_p_FXDrawable},{"_p_FXRbXPMIcon", _p_FXRbXPMIconTo_p_FXDrawable},{"_p_FXTabBar", _p_FXTabBarTo_p_FXDrawable},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXDrawable},{"_p_FXDrawable"},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXDrawable},{"_p_FXRbTIFImage", _p_FXRbTIFImageTo_p_FXDrawable},{"_p_FXTIFImage", _p_FXTIFImageTo_p_FXDrawable},{"_p_FXGIFImage", _p_FXGIFImageTo_p_FXDrawable},{"_p_FXRbGIFImage", _p_FXRbGIFImageTo_p_FXDrawable},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXDrawable},{"_p_FXImageView", _p_FXImageViewTo_ p_FXDrawable},{"_p_FXRbStatusLine", _p_FXRbStatusLineTo_p_FXDrawable},{"_p_FXStatusLine", _p_FXStatusLineTo_p_FXDrawable},{"_p_FXRbList", _p_FXRbListTo_p_FXDrawable},{"_p_FXCanvas", _p_FXCanvasTo_p_FXDrawable},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXDrawable},{"_p_FXRbTable", _p_FXRbTableTo_p_FXDrawable},{"_p_FXRbToolBarTab", _p_FXRbToolBarTabTo_p_FXDrawable},{"_p_FXToolBarTab", _p_FXToolBarTabTo_p_FXDrawable},{"_p_FXShell", _p_FXShellTo_p_FXDrawable},{"_p_FXRbJPGIcon", _p_FXRbJPGIconTo_p_FXDrawable},{"_p_FXJPGIcon", _p_FXJPGIconTo_p_FXDrawable},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXDrawable},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXDrawable},{"_p_FXRbBitmap", _p_FXRbBitmapTo_p_FXDrawable},{"_p_FXBitmap", _p_FXBitmapTo_p_FXDrawable},{"_p_FXRbBMPImage", _p_FXRbBMPImageTo_p_FXDrawable},{"_p_FXBMPImage", _p_FXBMPImageTo_p_FXDrawable},{"_p_FXRbText", _p_FXRbTextTo_p_FXDrawable},{"_p_FXToolBar", _p_FXToolBarTo_p_FXDrawable},{"_p_FXRbToolBar", _p_FXRbToolBarTo_p_FXDrawable},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXDrawable},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXDrawable},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXDrawable},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXDrawable},{"_p_FXMenuBar", _p_FXMenuBarTo_p_FXDrawable},{"_p_FXRbMenuBar", _p_FXRbMenuBarTo_p_FXDrawable},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXDrawable},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable},{0}}; static swig_type_info _swigt__p_FXPCXIcon[] = {{"_p_FXPCXIcon", 0, "FXPCXIcon *"},{"_p_FXPCXIcon"},{"_p_FXRbPCXIcon", _p_FXRbPCXIconTo_p_FXPCXIcon},{0}}; static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *"},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream},{"_p_FXRbFileStream", _p_FXRbFileStreamTo_p_FXStream},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream},{"_p_FXRbMemoryStream", _p_FXRbMemoryStreamTo_p_FXStream},{"_p_FXStream"},{"_p_FXRbStream", _p_FXRbStreamTo_p_FXStream},{0}}; Index: image_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** image_wrap.cpp 11 Jul 2002 13:33:09 -0000 1.40 --- image_wrap.cpp 12 Jul 2002 16:34:37 -0000 1.41 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.14u-20020708-1058 * * 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.14u-20020709-0944 * [...1094 lines suppressed...] ! static swig_type_info _swigt__p_FXObject[] = {{"_p_FXObject", 0, "FXObject *"},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXObject},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXObject},{"_p_FXRbShell", _p_FXRbShellTo_p_FXObject},{"_p_FXRbIconDict", _p_FXRbIconDictTo_p_FXObject},{"_p_FXIconDict", _p_FXIconDictTo_p_FXObject},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXObject},{"_p_FXDirList", _p_FXDirListTo_p_FXObject},{"_p_FXRbScrollBar", _p_FXRbScrollBarTo_p_FXObject},{"_p_FXScrollBar", _p_FXScrollBarTo_p_FXObject},{"_p_FXRbDial", _p_FXRbDialTo_p_FXObject},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXObject},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXObject},{"_p_FXPopup", _p_FXPopupTo_p_FXObject},{"_p_FXImage", _p_FXImageTo_p_FXObject},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXObject},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXObject},{"_p_FXComposite", _p_FXCompositeTo_p_FXObject},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXObject},{"_p_FXJPGImage", _p_FXJPGImageTo_p_FXObject},{"_p_FXRbJPGImage", _p_FXRbJPGImageTo_p_FXObject},{"_p_FXPNGImage", _p_FXPNGImageTo_p_FXObject},{"_p_FXRbPNGImage", _p_FXRbPNGImageTo_p_FXObject},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXObject},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXObject},{"_p_FXRbToolBarGrip", _p_FXRbToolBarGripTo_p_FXObject},{"_p_FXToolBarGrip", _p_FXToolBarGripTo_p_FXObject},{"_p_FXRbId", _p_FXRbIdTo_p_FXObject},{"_p_FXListItem", _p_FXListItemTo_p_FXObject},{"_p_FXRbListItem", _p_FXRbListItemTo_p_FXObject},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXObject},{"_p_FXHeader", _p_FXHeaderTo_p_FXObject},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXObject},{"_p_FXApp", _p_FXAppTo_p_FXObject},{"_p_FXRGBImage", _p_FXRGBImageTo_p_FXObject},{"_p_FXRbImage", _p_FXRbImageTo_p_FXObject},{"_p_FXRbRGBImage", _p_FXRbRGBImageTo_p_FXObject},{"_p_FXRbDirItem", _p_FXRbDirItemTo_p_FXObject},{"_p_FXDirItem", _p_FXDirItemTo_p_FXObject},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXObject},{"_p_FXTabItem", _p_FXTabItemTo_p_FXObject},{"_p_FXRbPCXImage", _p_FXRbPCXImageTo_p_FXObject},{"_p_FXPCXImage", _p_FXPCXImageTo_p_FXObject},{"_p_FXDocument", _p_FXDocumentTo_p_FXObject},{"_p_FXRbDocument", _p_FXRbDocumentTo_p_FXObject},{"_p_FXList", _p_FXListTo_p_FXObject},{"_p_FXColorWell", _p_FXColorWellTo_p_FXObject},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXObject},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXObject},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXObject},{"_p_FXObject"},{"_p_FXRbObject", _p_FXRbObjectTo_p_FXObject},{"_p_FXSettings", _p_FXSettingsTo_p_FXObject},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXObject},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXObject},{"_p_FXRecentFiles", _p_FXRecentFilesTo_p_FXObject},{"_p_FXRbRecentFiles", _p_FXRbRecentFilesTo_p_FXObject},{"_p_FXFileList", _p_FXFileListTo_p_FXObject},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXObject},{"_p_FXRegistry", _p_FXRegistryTo_p_FXObject},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXObject},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXObject},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXObject},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXObject},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXObject},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXObject},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXObject},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXObject},{"_p_FXText", _p_FXTextTo_p_FXObject},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXObject},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXObject},{"_p_FXVisual", _p_FXVisualTo_p_FXObject},{"_p_FXRbVisual", _p_FXRbVisualTo_p_FXObject},{"_p_FXRbFont", _p_FXRbFontTo_p_FXObject},{"_p_FXRbApp", _p_FXRbAppTo_p_FXObject},{"_p_FXIconList", _p_FXIconListTo_p_FXObject},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXObject},{"_p_FXPicker", _p_FXPickerTo_p_FXObject},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXObject},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXObject},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXObject},{"_p_FXDial", _p_FXDialTo_p_FXObject},{"_p_FXToolBarShell", _p_FXToolBarShellTo_p_FXObject},{"_p_FXRbToolBarShell", _p_FXRbToolBarShellTo_p_FXObject},{"_p_FXButton", _p_FXButtonTo_p_FXObject},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXObject},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXObject},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXObject},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXObject},{"_p_FXListBox", _p_FXListBoxTo_p_FXObject},{"_p_FXRbDict", _p_FXRbDictTo_p_FXObject},{"_p_FXFrame", _p_FXFrameTo_p_FXObject},{"_p_FXDelegator", _p_FXDelegatorTo_p_FXObject},{"_p_FXRbDelegator", _p_FXRbDelegatorTo_p_FXObject},{"_p_FXRbGIFCursor", _p_FXRbGIFCursorTo_p_FXObject},{"_p_FX__FXGIFCursor", _p_FX__FXGIFCursorTo_p_FXObject},{"_p_FXRbCURCursor", _p_FXRbCURCursorTo_p_FXObject},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXObject},{"_p_FXRbCursor", _p_FXRbCursorTo_p_FXObject},{"_p_FXCursor", _p_FXCursorTo_p_FXObject},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXObject},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXObject},{"_p_FXRbICOImage", _p_FXRbICOImageTo_p_FXObject},{"_p_FXICOImage", _p_FXICOImageTo_p_FXObject},{"_p_FXFileItem", _p_FXFileItemTo_p_FXObject},{"_p_FXRbFileItem", _p_FXRbFileItemTo_p_FXObject},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXObject},{"_p_FXPacker", _p_FXPackerTo_p_FXObject},{"_p_FXXPMImage", _p_FXXPMImageTo_p_FXObject},{"_p_FXRbXPMImage", _p_FXRbXPMImageTo_p_FXObject},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXObject},{"_p_FXTabBook", _p_FXTabBookTo_p_FXObject},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXObject},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXObject},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXObject},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXObject},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXObject},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXObject},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXObject},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXObject},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXObject},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXObject},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXObject},{"_p_FXHeaderItem", _p_FXHeaderItemTo_p_FXObject},{"_p_FXRbHeaderItem", _p_FXRbHeaderItemTo_p_FXObject},{"_p_FXLabel", _p_FXLabelTo_p_FXObject},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXObject},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXObject},{"_p_FXRbToolTip", _p_FXRbToolTipTo_p_FXObject},{"_p_FXToolTip", _p_FXToolTipTo_p_FXObject},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXObject},{"_p_FXTreeList", _p_FXTreeListTo_p_FXObject},{"_p_FXIconItem", _p_FXIconItemTo_p_FXObject},{"_p_FXRbIconItem", _p_FXRbIconItemTo_p_FXObject},{"_p_FXTextField", _p_FXTextFieldTo_p_FXObject},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXObject},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXObject},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXObject},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXObject},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXObject},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXObject},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXObject},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXObject},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXObject},{"_p_FXWindow", _p_FXWindowTo_p_FXObject},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXObject},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXObject},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXObject},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXObject},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXObject},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXObject},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXObject},{"_p_FXRbSeparator", _p_FXRbSeparatorTo_p_FXObject},{"_p_FXSeparator", _p_FXSeparatorTo_p_FXObject},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXObject},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXObject},{"_p_FXDebugTarget", _p_FXDebugTargetTo_p_FXObject},{"_p_FXRbDataTarget", _p_FXRbDataTargetTo_p_FXObject},{"_p_FXDataTarget", _p_FXDataTargetTo_p_FXObject},{"_p_FXRbDebugTarget", _p_FXRbDebugTargetTo_p_FXObject},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXObject},{"_p_FXRbTableItem", _p_FXRbTableItemTo_p_FXObject},{"_p_FXTableItem", _p_FXTableItemTo_p_FXObject},{"_p_FXStringDict", _p_FXStringDictTo_p_FXObject},{"_p_FXRbStringDict", _p_FXRbStringDictTo_p_FXObject},{"_p_FXColorBar", _p_FXColorBarTo_p_FX Object},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXObject},{"_p_FXId", _p_FXIdTo_p_FXObject},{"_p_FXOption", _p_FXOptionTo_p_FXObject},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXObject},{"_p_FXTable", _p_FXTableTo_p_FXObject},{"_p_FXTGAImage", _p_FXTGAImageTo_p_FXObject},{"_p_FXRbTGAImage", _p_FXRbTGAImageTo_p_FXObject},{"_p_FXFont", _p_FXFontTo_p_FXObject},{"_p_FXSlider", _p_FXSliderTo_p_FXObject},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXObject},{"_p_FXTabBar", _p_FXTabBarTo_p_FXObject},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXObject},{"_p_FXRbTreeItem", _p_FXRbTreeItemTo_p_FXObject},{"_p_FXTreeItem", _p_FXTreeItemTo_p_FXObject},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXObject},{"_p_FXDrawable", _p_FXDrawableTo_p_FXObject},{"_p_FXRbGIFImage", _p_FXRbGIFImageTo_p_FXObject},{"_p_FXGIFImage", _p_FXGIFImageTo_p_FXObject},{"_p_FXTIFImage", _p_FXTIFImageTo_p_FXObject},{"_p_FXRbTIFImage", _p_FXRbTIFImageTo_p_FXObject},{"_p_FXAccelTable", _p_FXAccelTableTo_p_FXObject},{"_p_FXRbAccelTable", _p_FXRbAccelTableTo_p_FXObject},{"_p_FXImageView", _p_FXImageViewTo_p_FXObject},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXObject},{"_p_FXStatusLine", _p_FXStatusLineTo_p_FXObject},{"_p_FXRbStatusLine", _p_FXRbStatusLineTo_p_FXObject},{"_p_FXRbList", _p_FXRbListTo_p_FXObject},{"_p_FXDict", _p_FXDictTo_p_FXObject},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXObject},{"_p_FXCanvas", _p_FXCanvasTo_p_FXObject},{"_p_FXRbTable", _p_FXRbTableTo_p_FXObject},{"_p_FXToolBarTab", _p_FXToolBarTabTo_p_FXObject},{"_p_FXRbToolBarTab", _p_FXRbToolBarTabTo_p_FXObject},{"_p_FXShell", _p_FXShellTo_p_FXObject},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXObject},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXObject},{"_p_FXBitmap", _p_FXBitmapTo_p_FXObject},{"_p_FXRbBitmap", _p_FXRbBitmapTo_p_FXObject},{"_p_FXRbFileDict", _p_FXRbFileDictTo_p_FXObject},{"_p_FXFileDict", _p_FXFileDictTo_p_FXObject},{"_p_FXBMPImage", _p_FXBMPImageTo_p_FXObject},{"_p_FXRbBMPImage", _p_FXRbBMPImageTo_p_FXObject},{"_p_FXRbText", _p_FXRbTextTo_p_FXObject},{"_p_FXRbToolBar", _p_FXRbToolBarTo_p_FXObject},{"_p_FXToolBar", _p_FXToolBarTo_p_FXObject},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXObject},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXObject},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXObject},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXObject},{"_p_FXMenuBar", _p_FXMenuBarTo_p_FXObject},{"_p_FXRbMenuBar", _p_FXRbMenuBarTo_p_FXObject},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXObject},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXObject},{0}}; static swig_type_info _swigt__p_FXRGBImage[] = {{"_p_FXRGBImage", 0, "FXRGBImage *"},{"_p_FXRGBImage"},{"_p_FXRbRGBImage", _p_FXRbRGBImageTo_p_FXRGBImage},{0}}; static swig_type_info _swigt__p_FXRbImage[] = {{"_p_FXRbImage", 0, "FXRbImage *"},{"_p_FXRbImage"},{0}}; *************** *** 7279,7285 **** static swig_type_info _swigt__p_FXBitmap[] = {{"_p_FXBitmap", 0, "FXBitmap *"},{"_p_FXBitmap"},{"_p_FXRbBitmap", _p_FXRbBitmapTo_p_FXBitmap},{0}}; static swig_type_info _swigt__p_FXRbBitmap[] = {{"_p_FXRbBitmap", 0, "FXRbBitmap *"},{"_p_FXRbBitmap"},{0}}; ! static swig_type_info _swigt__p_FXId[] = {{"_p_FXId", 0, "FXId *"},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXId},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXId},{"_p_FXRbShell", _p_FXRbShellTo_p_FXId},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXId},{"_p_FXDirList", _p_FXDirListTo_p_FXId},{"_p_FXRbDial", _p_FXRbDialTo_p_FXId},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXId},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXId},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXId},{"_p_FXMenubar", _p_FXMenubarTo_p_FXId},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXId},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXId},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXId},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXId},{"_p_FXPopup", _p_FXPopupTo_p_FXId},{"_p_FXImage", _p_FXImageTo_p_FXId},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXId},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXId},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXId},{"_p_FXComposite", _p_FXCompositeTo_p_FXId},{"_p_FXPNGImage", _p_FXPNGImageTo_p_FXId},{"_p_FXRbPNGImage", _p_FXRbPNGImageTo_p_FXId},{"_p_FXRbJPGImage", _p_FXRbJPGImageTo_p_FXId},{"_p_FXJPGImage", _p_FXJPGImageTo_p_FXId},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXId},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXId},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXId},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXId},{"_p_FXRbId", _p_FXRbIdTo_p_FXId},{"_p_FXHeader", _p_FXHeaderTo_p_FXId},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXId},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXId},{"_p_FXRGBImage", _p_FXRGBImageTo_p_FXId},{"_p_FXRbImage", _p_FXRbImageTo_p_FXId},{"_p_FXRbRGBImage", _p_FXRbRGBImageTo_p_FXId},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXId},{"_p_FXTabItem", _p_FXTabItemTo_p_FXId},{"_p_FXRbPCXImage", _p_FXRbPCXImageTo_p_FXId},{"_p_FXPCXImage", _p_FXPCXImageTo_p_FXId},{"_p_FXList", _p_FXListTo_p_FXId},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXId},{"_p_FXColorWell", _p_FXColorWellTo_p_FXId},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXId},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXId},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXId},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXId},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXId},{"_p_FXFileList", _p_FXFileListTo_p_FXId},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXId},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXId},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXId},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXId},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXId},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXId},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXId},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXId},{"_p_FXText", _p_FXTextTo_p_FXId},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXId},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXId},{"_p_FXVisual", _p_FXVisualTo_p_FXId},{"_p_FXRbVisual", _p_FXRbVisualTo_p_FXId},{"_p_FXRbFont", _p_FXRbFontTo_p_FXId},{"_p_FXIconList", _p_FXIconListTo_p_FXId},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXId},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXId},{"_p_FXPicker", _p_FXPickerTo_p_FXId},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXId},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXId},{"_p_FXDial", _p_FXDialTo_p_FXId},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXId},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXId},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXId},{"_p_FXButton", _p_FXButtonTo_p_FXId},{"_p_FX... [truncated message content] |
|
From: Lyle J. <ly...@us...> - 2002-07-12 16:35:20
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv30500/ext/fox/include
Modified Files:
FXRbDCVirtuals.h FXRbGIFCursor.h FXRbMDIChild.h
FXRbMDIClient.h FXRbMenuBar.h FXRbSeparator.h
FXRbToolBarGrip.h FXRbTopWindow.h FXRbTopWindowVirtuals.h
Added Files:
FXRbMDIClientVirtuals.h
Log Message:
Many, many changes for the fox-1.1 update.
--- NEW FILE: FXRbMDIClientVirtuals.h ---
public:
// Calls the base class version of setActiveChild()
FXbool _setActiveChild(FXMDIChild* child=NULL,FXbool notify=FALSE);
// Overrides the base class version of setActiveChild()
virtual FXbool setActiveChild(FXMDIChild* child=NULL,FXbool notify=FALSE);
// Calls the base class version of cascade()
void _cascade(FXbool notify=FALSE);
// Overrides the base class version of cascade()
virtual void cascade(FXbool notify=FALSE);
// Calls the base class version of horizontal()
void _horizontal(FXbool notify=FALSE);
// Overrides the base class version of horizontal()
virtual void horizontal(FXbool notify=FALSE);
// Calls the base class version of vertical()
void _vertical(FXbool notify=FALSE);
// Overrides the base class version of vertical()
virtual void vertical(FXbool notify=FALSE);
Index: FXRbDCVirtuals.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbDCVirtuals.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXRbDCVirtuals.h 11 Jul 2002 18:00:23 -0000 1.4
--- FXRbDCVirtuals.h 12 Jul 2002 16:34:46 -0000 1.5
***************
*** 91,98 ****
// Calls the base class version of fillChords()
! void _fillChords(const FXChord* chords,FXuint nchords);
// Overrides the base class version of fillChords()
! virtual void fillChords(const FXChord* chords,FXuint nchords);
// Calls the base class version of fillArc()
--- 91,98 ----
// Calls the base class version of fillChords()
! void _fillChords(const FXArc* chords,FXuint nchords);
// Overrides the base class version of fillChords()
! virtual void fillChords(const FXArc* chords,FXuint nchords);
// Calls the base class version of fillArc()
Index: FXRbGIFCursor.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbGIFCursor.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXRbGIFCursor.h 11 Jul 2002 13:33:12 -0000 1.2
--- FXRbGIFCursor.h 12 Jul 2002 16:34:46 -0000 1.3
***************
*** 37,41 ****
public:
/// Construct a cursor from memory stream formatted as CompuServe GIF format
! FXRbGIFCursor(FXApp* a,const void* pix,FXint hx,FXint hy):FXGIFCursor(a,pix,hx,hy){
FXRbRegisterAppSensitiveObject(this);
}
--- 37,41 ----
public:
/// Construct a cursor from memory stream formatted as CompuServe GIF format
! FXRbGIFCursor(FXApp* a,const void* pix,FXint hx=0,FXint hy=0):FXGIFCursor(a,pix,hx,hy){
FXRbRegisterAppSensitiveObject(this);
}
Index: FXRbMDIChild.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbMDIChild.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbMDIChild.h 12 Jul 2001 19:44:18 -0000 1.1
--- FXRbMDIChild.h 12 Jul 2002 16:34:46 -0000 1.2
***************
*** 29,49 ****
#define IMPLEMENT_FXMDICHILD_STUBS(cls,baseclass) \
! void cls::_minimize(FXbool notify){ \
! baseclass::minimize(notify); \
} \
! void cls::minimize(FXbool notify){ \
! FXRbCallVoidMethod(this,"minimize",notify); \
} \
! void cls::_maximize(FXbool notify){ \
! baseclass::maximize(notify); \
} \
! void cls::maximize(FXbool notify){ \
! FXRbCallVoidMethod(this,"maximize",notify); \
} \
! void cls::_restore(FXbool notify){ \
! baseclass::restore(notify); \
} \
! void cls::restore(FXbool notify){ \
! FXRbCallVoidMethod(this,"restore",notify); \
}
--- 29,55 ----
#define IMPLEMENT_FXMDICHILD_STUBS(cls,baseclass) \
! FXbool cls::_minimize(FXbool notify){ \
! return baseclass::minimize(notify); \
} \
! FXbool cls::minimize(FXbool notify){ \
! return FXRbCallBoolMethod(this,"minimize",notify); \
} \
! FXbool cls::_maximize(FXbool notify){ \
! return baseclass::maximize(notify); \
} \
! FXbool cls::maximize(FXbool notify){ \
! return FXRbCallBoolMethod(this,"maximize",notify); \
} \
! FXbool cls::_restore(FXbool notify){ \
! return baseclass::restore(notify); \
} \
! FXbool cls::restore(FXbool notify){ \
! return FXRbCallBoolMethod(this,"restore",notify); \
! } \
! FXbool cls::_close(FXbool notify){ \
! return baseclass::close(notify); \
! } \
! FXbool cls::close(FXbool notify){ \
! return FXRbCallBoolMethod(this,"restore",notify); \
}
Index: FXRbMDIClient.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbMDIClient.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbMDIClient.h 12 Jul 2001 19:44:18 -0000 1.1
--- FXRbMDIClient.h 12 Jul 2002 16:34:46 -0000 1.2
***************
*** 28,31 ****
--- 28,57 ----
#define FXRBMDICLIENT_H
+ #define IMPLEMENT_FXMDICLIENT_STUBS(cls,baseclass) \
+ FXbool cls::_setActiveChild(FXMDIChild* child,FXbool notify){ \
+ return baseclass::setActiveChild(child,notify); \
+ } \
+ FXbool cls::setActiveChild(FXMDIChild* child,FXbool notify){ \
+ return FXRbCallBoolMethod(this,"setActiveChild",child,notify); \
+ } \
+ void cls::_cascade(FXbool notify){ \
+ baseclass::cascade(notify); \
+ } \
+ void cls::cascade(FXbool notify){ \
+ FXRbCallVoidMethod(this,"cascade",notify); \
+ } \
+ void cls::_horizontal(FXbool notify){ \
+ baseclass::horizontal(notify); \
+ } \
+ void cls::horizontal(FXbool notify){ \
+ FXRbCallVoidMethod(this,"horizontal",notify); \
+ } \
+ void cls::_vertical(FXbool notify){ \
+ baseclass::vertical(notify); \
+ } \
+ void cls::vertical(FXbool notify){ \
+ FXRbCallVoidMethod(this,"vertical",notify); \
+ }
+
class FXRbMDIClient : public FXMDIClient {
FXDECLARE(FXRbMDIClient)
***************
*** 36,40 ****
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
! #include "FXRbScrollAreaVirtuals.h"
public:
/// Construct MDI Client window
--- 62,66 ----
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
! #include "FXRbMDIClientVirtuals.h"
public:
/// Construct MDI Client window
Index: FXRbMenuBar.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbMenuBar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbMenuBar.h 4 Apr 2002 02:10:48 -0000 1.1
--- FXRbMenuBar.h 12 Jul 2002 16:34:46 -0000 1.2
***************
*** 36,40 ****
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
! #include "FXRbToolbarVirtuals.h"
public:
/**
--- 36,40 ----
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
! #include "FXRbToolBarVirtuals.h"
public:
/**
Index: FXRbSeparator.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbSeparator.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbSeparator.h 12 Jul 2001 19:44:18 -0000 1.1
--- FXRbSeparator.h 12 Jul 2002 16:34:46 -0000 1.2
***************
*** 28,31 ****
--- 28,53 ----
#define FXRBSEPARATOR_H
+ class FXRbSeparator : public FXSeparator {
+ FXDECLARE(FXRbSeparator)
+ protected:
+ FXRbSeparator(){}
+ #include "FXRbObjectVirtuals.h"
+ #include "FXRbIdVirtuals.h"
+ #include "FXRbDrawableVirtuals.h"
+ #include "FXRbWindowVirtuals.h"
+ public:
+ /// Constructor
+ FXRbSeparator(FXComposite* p,FXuint opts=SEPARATOR_GROOVE|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=1,FXint pr=1,FXint pt=0,FXint pb=0) : FXSeparator(p,opts,x,y,w,h,pl,pr,pt,pb){}
+
+ // Destructor
+ virtual ~FXRbSeparator(){
+ FXRbUnregisterRubyObj(this);
+ }
+
+ // Mark dependencies for the GC
+ static void markfunc(FXSeparator* self);
+ };
+
+
class FXRbHorizontalSeparator : public FXHorizontalSeparator {
FXDECLARE(FXRbHorizontalSeparator)
Index: FXRbToolBarGrip.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbToolBarGrip.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbToolBarGrip.h 4 Apr 2002 02:10:48 -0000 1.1
--- FXRbToolBarGrip.h 12 Jul 2002 16:34:46 -0000 1.2
***************
*** 38,42 ****
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
--- 38,42 ----
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
Index: FXRbTopWindow.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbTopWindow.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXRbTopWindow.h 11 Jul 2002 13:33:12 -0000 1.2
--- FXRbTopWindow.h 12 Jul 2002 16:34:47 -0000 1.3
***************
*** 35,49 ****
FXRbCallVoidMethod(this,"show",placement); \
} \
! void cls::_iconify(){ \
! baseclass::iconify(); \
} \
! void cls::iconify(){ \
! FXRbCallVoidMethod(this,"iconify"); \
} \
! void cls::_deiconify(){ \
! baseclass::deiconify(); \
} \
! void cls::deiconify(){ \
! FXRbCallVoidMethod(this,"deiconify"); \
}
--- 35,61 ----
FXRbCallVoidMethod(this,"show",placement); \
} \
! FXbool cls::_maximize(FXbool notify){ \
! return baseclass::maximize(notify); \
} \
! FXbool cls::maximize(FXbool notify){ \
! return FXRbCallBoolMethod(this,"maximize",notify); \
} \
! FXbool cls::_minimize(FXbool notify){ \
! return baseclass::minimize(notify); \
} \
! FXbool cls::minimize(FXbool notify){ \
! return FXRbCallBoolMethod(this,"minimize",notify); \
! } \
! FXbool cls::_restore(FXbool notify){ \
! return baseclass::restore(notify); \
! } \
! FXbool cls::restore(FXbool notify){ \
! return FXRbCallBoolMethod(this,"restore",notify); \
! } \
! FXbool cls::_close(FXbool notify){ \
! return baseclass::close(notify); \
! } \
! FXbool cls::close(FXbool notify){ \
! return FXRbCallBoolMethod(this,"close",notify); \
}
Index: FXRbTopWindowVirtuals.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbTopWindowVirtuals.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbTopWindowVirtuals.h 12 Jul 2001 19:44:19 -0000 1.1
--- FXRbTopWindowVirtuals.h 12 Jul 2002 16:34:47 -0000 1.2
***************
*** 6,18 ****
virtual void show(FXuint placement);
! // Calls the base class version of iconify()
! void _iconify();
! // Overrides the base class version of iconify()
! virtual void iconify();
! // Calls the base class version of deiconify()
! void _deiconify();
! // Overrides the base class version of deiconify()
! virtual void deiconify();
--- 6,30 ----
virtual void show(FXuint placement);
! // Calls the base class version of maximize()
! FXbool _maximize(FXbool notify=FALSE);
! // Overrides the base class version of maximize()
! virtual FXbool maximize(FXbool notify=FALSE);
! // Calls the base class version of minimize()
! FXbool _minimize(FXbool notify=FALSE);
! // Overrides the base class version of minimize()
! virtual FXbool minimize(FXbool notify=FALSE);
!
! // Calls the base class version of restore()
! FXbool _restore(FXbool notify=FALSE);
!
! // Overrides the base class version of restore()
! virtual FXbool restore(FXbool notify=FALSE);
!
! // Calls the base class version of close()
! FXbool _close(FXbool notify=FALSE);
!
! // Overrides the base class version of close()
! virtual FXbool close(FXbool notify=FALSE);
|
|
From: Lyle J. <ly...@us...> - 2002-07-12 16:34:55
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv30500 Modified Files: ChangeLog Log Message: Many, many changes for the fox-1.1 update. Index: ChangeLog =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ChangeLog,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** ChangeLog 11 Jul 2002 13:32:53 -0000 1.25 --- ChangeLog 12 Jul 2002 16:34:21 -0000 1.26 *************** *** 1,2 **** --- 1,386 ---- + 2002-07-11 13:00 lyle + + * fox-includes/: FXAccelTable.h, FXApp.h, FXColorBar.h, + FXComboBox.h, FXDialogBox.h, FXStatusline.h: [no log message] + + 2002-07-11 13:00 lyle + + * ext/fox/include/FXRbDC.h, ext/fox/include/FXRbDCVirtuals.h, + fox-includes/FXDC.h, fox-includes/FXDCPrint.h, [...3571 lines suppressed...] swig-interfaces/FXStream.i, swig-interfaces/FXTopWindow.i, swig-interfaces/FXVisual.i, swig-interfaces/FXWindow.i, ! swig-interfaces/Makefile, swig-interfaces/fox.i, ! swig-interfaces/fxdefs.i: Initial revision ! ! 2000-12-19 19:28 lyle ! ! * examples/hello.rb, swig-interfaces/FXAccelTable.i, ! swig-interfaces/FXApp.i, swig-interfaces/FXButton.i, ! swig-interfaces/FXComposite.i, swig-interfaces/FXCursor.i, ! swig-interfaces/FXDrawable.i, swig-interfaces/FXFont.i, ! swig-interfaces/FXFrame.i, swig-interfaces/FXIcon.i, ! swig-interfaces/FXId.i, swig-interfaces/FXImage.i, ! swig-interfaces/FXLabel.i, swig-interfaces/FXMainWindow.i, ! swig-interfaces/FXObject.i, swig-interfaces/FXShell.i, ! swig-interfaces/FXStream.i, swig-interfaces/FXTopWindow.i, ! swig-interfaces/FXVisual.i, swig-interfaces/FXWindow.i, ! swig-interfaces/Makefile, swig-interfaces/fox.i, ! swig-interfaces/fxdefs.i: Initial import of FXRuby source code |
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv30500/swig-interfaces
Modified Files:
FXAccelTable.i FXApp.i FXColorBar.i FXComboBox.i FXDialogBox.i
FXDirList.i FXGIFCursor.i FXIconList.i FXList.i FXListBox.i
FXMDIChild.i FXMDIClient.i FXMainWindow.i FXMatrix.i
FXObject.i FXPopup.i FXProgressBar.i FXProgressDialog.i
FXRegion.i FXScrollArea.i FXSeparator.i FXStream.i FXTable.i
FXText.i FXTextField.i FXTopWindow.i FXTreeList.i
FXTreeListBox.i FXWindow.i freefuncs.i fxdefs.i layout.i
markfuncs.i renames.i stubs.i typemaps.i ui.i
Added Files:
FXGradientBar.i FXMenuBar.i FXScrollBar.i FXStatusBar.i
FXStatusLine.i FXToolBar.i FXToolBarGrip.i FXToolBarShell.i
FXToolBarTab.i FXToolTip.i
Removed Files:
FXMenubar.i
Log Message:
Many, many changes for the fox-1.1 update.
--- NEW FILE: FXGradientBar.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
%exception FXGradientBar::FXGradientBar {
$action
FXRbRegisterRubyObj(self, result);
}
%include "FXGradientBar.h"
%exception FXRbGradientBar::FXRbGradientBar {
$action
FXRbRegisterRubyObj(self, result);
}
class FXRbGradientBar : public FXGradientBar {
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);
/// Destructor
virtual ~FXGradientBar();
};
--- NEW FILE: FXMenuBar.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
%exception FXMenuBar::FXMenuBar "$action FXRbRegisterRubyObj(self, result);";
/// Menu bar
class FXMenuBar : public FXToolBar {
protected:
FXMenuBar(){}
public:
long onFocusLeft(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusRight(FXObject*,FXSelector,void* PTR_EVENT);
long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
long onLeave(FXObject*,FXSelector,void* PTR_EVENT);
long onMotion(FXObject*,FXSelector,void* PTR_EVENT);
long onButtonPress(FXObject*,FXSelector,void* PTR_IGNORE);
long onButtonRelease(FXObject*,FXSelector,void* PTR_EVENT);
long onCmdUnpost(FXObject*,FXSelector,void* PTR_IGNORE);
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.
*/
FXMenuBar(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);
/**
* Construct a non-floatable menubar.
* The menubar can not be undocked.
*/
FXMenuBar(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);
};
%exception FXRbMenuBar::FXRbMenuBar "$action FXRbRegisterRubyObj(self, result);";
class FXRbMenuBar : public FXMenuBar {
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);
/**
* 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);
// Destructor
virtual ~FXRbMenuBar();
public:
DECLARE_FXOBJECT_VIRTUALS
DECLARE_FXID_VIRTUALS
DECLARE_FXDRAWABLE_VIRTUALS
DECLARE_FXWINDOW_VIRTUALS
DECLARE_FXTOOLBAR_VIRTUALS
};
--- NEW FILE: FXScrollBar.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
/// ScrollBar styles
enum {
SCROLLBAR_HORIZONTAL = 0x00020000, /// Horizontally oriented
SCROLLBAR_VERTICAL = 0 /// Vertically oriented
};
%exception FXScrollBar::FXScrollBar "$action FXRbRegisterRubyObj(self, result);";
/// Scroll bar
class FXScrollBar : public FXWindow {
protected:
FXint range; // Scrollable range
FXint page; // Page size
FXint line; // Line size
FXint pos; // Position
FXint thumbsize; // Thumb size
FXint thumbpos; // Thumb position
FXColor hiliteColor; // Hightlight color
FXColor shadowColor; // Shadow color
FXColor borderColor; // Border color
FXTimer *timer; // Autoscroll timer
FXint dragpoint; // Point where grabbed
FXint dragjump; // Jump this much
FXuchar pressed; // Action being undertaken
protected:
FXScrollBar();
void drawButton(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
void drawLeftArrow(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
void drawRightArrow(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
void drawUpArrow(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
void drawDownArrow(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
virtual void layout();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onMotion(FXObject*,FXSelector,void* PTR_EVENT);
long onMouseWheel(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);
long onMiddleBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
long onMiddleBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);
long onRightBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
long onRightBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);
long onUngrabbed(FXObject*,FXSelector,void* PTR_EVENT);
long onTimeIncPix(FXObject*,FXSelector,void* PTR_IGNORE);
long onTimeIncLine(FXObject*,FXSelector,void* PTR_IGNORE);
long onTimeIncPage(FXObject*,FXSelector,void* PTR_IGNORE);
long onTimeDecPix(FXObject*,FXSelector,void* PTR_IGNORE);
long onTimeDecLine(FXObject*,FXSelector,void* PTR_IGNORE);
long onTimeDecPage(FXObject*,FXSelector,void* PTR_IGNORE);
long onTimeWheel(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdSetValue(FXObject*,FXSelector,void* PTR_INT);
long onCmdSetIntValue(FXObject*,FXSelector,void* PTR_PINT);
long onCmdGetIntValue(FXObject*,FXSelector,void* PTR_IGNORE); // FIXME
long onCmdSetIntRange(FXObject*,FXSelector,void* PTR_INTRANGE_IN);
long onCmdGetIntRange(FXObject*,FXSelector,void* PTR_INTRANGE_OUT);
public:
enum{
ID_TIMEWHEEL=FXWindow::ID_LAST,
ID_AUTOINC_LINE,
ID_AUTODEC_LINE,
ID_AUTOINC_PAGE,
ID_AUTODEC_PAGE,
ID_AUTOINC_PIX,
ID_AUTODEC_PIX,
ID_LAST
};
public:
/// Construct scroll bar
FXScrollBar(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=SCROLLBAR_VERTICAL,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
/// Set content size range
void setRange(FXint r);
/// Return content size range
FXint getRange() const;
/// Set viewport page size
void setPage(FXint p);
/// Return page size
FXint getPage() const;
/// Set scroll increment for line
void setLine(FXint l);
/// Return line increment
FXint getLine() const;
/// Change current scroll position
void setPosition(FXint p);
/// return scroll position
FXint getPosition() const;
/// Change highlight color
void setHiliteColor(FXColor clr);
/// Return highlight color
FXColor getHiliteColor() const;
/// Change shadow color
void setShadowColor(FXColor clr);
/// Return shadow color
FXColor getShadowColor() const;
/// Return border color
FXColor getBorderColor() const;
/// Change border color
void setBorderColor(FXColor clr);
/// Change the scrollbar style
FXuint getScrollbarStyle() const;
/// Get the current scrollbar style
void setScrollbarStyle(FXuint style);
/// Destructor
virtual ~FXScrollBar();
};
%exception FXRbScrollBar::FXRbScrollBar "$action FXRbRegisterRubyObj(self, result);";
class FXRbScrollBar : public FXScrollBar {
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);
// Destructor
virtual ~FXRbScrollBar();
public:
DECLARE_FXOBJECT_VIRTUALS
DECLARE_FXID_VIRTUALS
DECLARE_FXDRAWABLE_VIRTUALS
DECLARE_FXWINDOW_VIRTUALS
};
/// Corner between scroll bars
class FXScrollCorner : public FXWindow {
protected:
FXScrollCorner();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
/// Constructor
FXScrollCorner(FXComposite* p);
};
class FXRbScrollCorner : public FXScrollCorner {
public:
// Constructor
FXRbScrollCorner(FXComposite* p);
// Destructor
virtual ~FXRbScrollCorner();
public:
DECLARE_FXOBJECT_VIRTUALS
DECLARE_FXID_VIRTUALS
DECLARE_FXDRAWABLE_VIRTUALS
DECLARE_FXWINDOW_VIRTUALS
};
--- NEW FILE: FXStatusBar.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
/// StatusBar options
enum {
STATUSBAR_WITH_DRAGCORNER = 0x00020000 /// Causes the DragCorner to be shown
};
class FXDragCorner;
class FXStatusLine;
%exception FXStatusBar::FXStatusBar "$action FXRbRegisterRubyObj(self, result);";
/// Status bar
class FXStatusBar : public FXHorizontalFrame {
protected:
FXDragCorner *corner;
FXStatusLine *status;
protected:
FXStatusBar(){}
virtual void layout();
public:
/// Construct status bar with or without a drag corner
FXStatusBar(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);
/// Show or hide the drag corner
void setCornerStyle(FXbool withcorner=TRUE);
/// Return TRUE if drag corner shown
FXbool getCornerStyle() const;
/// Acess the status line widget
FXStatusLine *getStatusLine() const;
/// Access the drag corner widget
FXDragCorner *getDragCorner() const;
/// Destructor
virtual ~FXStatusBar();
};
%exception FXRbStatusBar::FXRbStatusBar "$action FXRbRegisterRubyObj(self, result);";
class FXRbStatusBar : public FXStatusBar {
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);
// Destructor
virtual ~FXRbStatusBar();
public:
DECLARE_FXOBJECT_VIRTUALS
DECLARE_FXID_VIRTUALS
DECLARE_FXDRAWABLE_VIRTUALS
DECLARE_FXWINDOW_VIRTUALS
};
--- NEW FILE: FXStatusLine.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
%exception FXStatusLine::FXStatusLine "$action FXRbRegisterRubyObj(self, result);";
/**
* The status line normally shows its permanent message; when
* moving the mouse over a Widget which has status-line help, the status line
* temporarily replaces its normal message with the help information; the status
* line obtains the help message by sending the Widget a ID_QUERY_HELP message
* with type SEL_UPDATE.
* If this query does not result in a new status string, the target of
* the status line is tried via an ordinary SEL_UPDATE message.
* If none of the above work then the status line will display the normal text,
* i.e. the string set via setNormalText().
* If the message contains a newline (\n), then the part before the newline
* will be displayed in the highlight color, while the part after the newline
* is shown using the normal text color.
*/
class FXStatusLine : public FXFrame {
protected:
FXString status; // Current status message
FXString normal; // Normally displayed message
FXFont *font; // Font
FXColor textColor; // Status text color
FXColor textHighlightColor; // Status text highlight color
protected:
FXStatusLine();
#ifdef 0
%extend {
static VALUE defaultMessage(){
return to_ruby(FXStatusLine::defaultMessage);
}
}
#endif
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onUpdate(FXObject*,FXSelector,void* PTR_NULL);
long onCmdGetStringValue(FXObject*,FXSelector,void* PTR_IGNORE); // FIXME
long onCmdSetStringValue(FXObject*,FXSelector,void* PTR_STRING);
public:
/// Constructor
FXStatusLine(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0);
/// Change the temporary status message
void setText(const FXString& text);
/// Return the temporary status message
FXString getText() const;
/// Change the permanent status message
void setNormalText(const FXString& text);
/// Return the permanent status message
FXString getNormalText() const;
/// Change the font
void setFont(FXFont* fnt);
/// Return the current font
FXFont* getFont() const;
/// Return the text color
FXColor getTextColor() const;
/// Change the text color
void setTextColor(FXColor clr);
/// Return the highlight text color
FXColor getTextHighlightColor() const;
/// Change the highlight text color
void setTextHighlightColor(FXColor clr);
/// Destroy
virtual ~FXStatusLine();
};
%exception FXRbStatusLine::FXRbStatusLine "$action FXRbRegisterRubyObj(self, result);";
class FXRbStatusLine : public FXStatusLine {
public:
// Constructor
FXRbStatusLine(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0);
// Destructor
virtual ~FXRbStatusLine();
public:
DECLARE_FXOBJECT_VIRTUALS
DECLARE_FXID_VIRTUALS
DECLARE_FXDRAWABLE_VIRTUALS
DECLARE_FXWINDOW_VIRTUALS
};
--- NEW FILE: FXToolBar.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
%exception FXToolBar::FXToolBar "$action FXRbRegisterRubyObj(self, result);";
/**
* ToolBar control.
*/
class FXToolBar : public FXPacker {
protected:
FXComposite *drydock; // Parent when docked
FXComposite *wetdock; // Parent when floating
FXRectangle outline; // Outline shown while dragging
FXWindow *dockafter; // Dock after this window
FXuint dockside; // Dock on this side
FXbool docking; // Dock it
protected:
FXToolBar();
virtual void layout();
public:
long onCmdUndock(FXObject*,FXSelector,void* PTR_IGNORE);
long onUpdUndock(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdDockTop(FXObject*,FXSelector,void* PTR_IGNORE);
long onUpdDockTop(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdDockBottom(FXObject*,FXSelector,void* PTR_IGNORE);
long onUpdDockBottom(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdDockLeft(FXObject*,FXSelector,void* PTR_IGNORE);
long onUpdDockLeft(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdDockRight(FXObject*,FXSelector,void* PTR_IGNORE);
long onUpdDockRight(FXObject*,FXSelector,void* PTR_IGNORE);
long onBeginDragGrip(FXObject*,FXSelector,void* PTR_EVENT);
long onEndDragGrip(FXObject*,FXSelector,void* PTR_EVENT);
long onDraggedGrip(FXObject*,FXSelector,void* PTR_EVENT);
public:
enum {
ID_UNDOCK=FXPacker::ID_LAST, /// Undock the toolbar
ID_DOCK_TOP, /// Dock on the top
ID_DOCK_BOTTOM, /// Dock on the bottom
ID_DOCK_LEFT, /// Dock on the left
ID_DOCK_RIGHT, /// Dock on the right
ID_TOOLBARGRIP, /// Notifications from toolbar grip
ID_LAST
};
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.
*/
FXToolBar(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);
/**
* Construct a non-floatable toolbar.
* The toolbar can not be undocked.
*/
FXToolBar(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);
/**
* Set parent when docked.
* If it was docked, reparent under the new docking window.
*/
void setDryDock(FXComposite* dry);
/**
* Set parent when floating.
* If it was undocked, then reparent under the new floating window.
*/
void setWetDock(FXComposite* wet);
/// Return parent when docked
FXComposite* getDryDock() const;
/// Return parent when floating
FXComposite* getWetDock() const;
/// Return true if toolbar is docked
FXbool isDocked() const;
/**
* Dock the bar against the given side, after some other widget.
* However, if after is -1, it will be docked as the innermost bar just before
* the work-area, while if after is 0, if will be docked as the outermost bar.
*/
// virtual void dock(FXuint side=LAYOUT_SIDE_TOP,FXWindow* after=(FXWindow*)-1);
virtual void dock(FXuint side=LAYOUT_SIDE_TOP,FXWindow* after=NULL); // FIXME
/**
* Undock or float the bar.
* The initial position of the wet dock is a few pixels
* below and to the right of the original docked position.
*/
virtual void undock();
/// Set docking side
void setDockingSide(FXuint side=LAYOUT_SIDE_TOP);
/// Return docking side
FXuint getDockingSide() const;
/// Destroy
virtual ~FXToolBar();
};
%exception FXRbToolBar::FXRbToolBar "$action FXRbRegisterRubyObj(self, result);";
class FXRbToolBar : public FXToolBar {
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);
/**
* 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);
// Destructor
virtual ~FXRbToolBar();
public:
DECLARE_FXOBJECT_VIRTUALS
DECLARE_FXID_VIRTUALS
DECLARE_FXDRAWABLE_VIRTUALS
DECLARE_FXWINDOW_VIRTUALS
DECLARE_FXTOOLBAR_VIRTUALS
};
--- NEW FILE: FXToolBarGrip.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
/// ToolBar Grip styles
enum {
TOOLBARGRIP_SINGLE = 0, /// Single bar mode for movable toolbars
TOOLBARGRIP_DOUBLE = 0x00008000, /// Double bar mode for dockable toolbars
TOOLBARGRIP_SEPARATOR = 0x00010000 /// Separator mode
};
class FXToolBar;
%exception FXToolBarGrip::FXToolBarGrip "$action FXRbRegisterRubyObj(self, result);";
/**
* A toolbar grip is used to move its parent [an FXToolBar].
* The grip draws either a single or double bar; it is customary
* to use the single bar grip for toolbar-rearrangements only,
* and use the double-bar when the toolbar needs to be floated
* or docked.
* The toolbar grip is automatically oriented properly by the
* the toolbar widget.
*/
class FXToolBarGrip : public FXWindow {
protected:
FXColor activeColor; // Color when active
FXColor hiliteColor; // Highlight color
FXColor shadowColor; // Shadow color
protected:
FXToolBarGrip();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);
long onMotion(FXObject*,FXSelector,void* PTR_EVENT);
long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
long onLeave(FXObject*,FXSelector,void* PTR_EVENT);
public:
/// Construct toolbar grip
FXToolBarGrip(FXToolBar* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=TOOLBARGRIP_SINGLE,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
/// Change toolbar grip to double
void setDoubleBar(FXbool dbl=TRUE);
/// Return toolbar grip to double
FXuint getDoubleBar() const;
/// Change highlight color
void setHiliteColor(FXColor clr);
/// Get highlight color
FXColor getHiliteColor() const;
/// Change shadow color
void setShadowColor(FXColor clr);
/// Get shadow color
FXColor getShadowColor() const;
/// Set the active color
void setActiveColor(FXColor clr);
/// Get the active color
FXColor getActiveColor() const;
};
%exception FXRbToolBarGrip::FXRbToolBarGrip "$action FXRbRegisterRubyObj(self, result);";
class FXRbToolBarGrip : public FXToolBarGrip {
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);
// Destructor
virtual ~FXRbToolBarGrip();
public:
DECLARE_FXOBJECT_VIRTUALS
DECLARE_FXID_VIRTUALS
DECLARE_FXDRAWABLE_VIRTUALS
DECLARE_FXWINDOW_VIRTUALS
};
--- NEW FILE: FXToolBarShell.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
%exception FXToolBarShell::FXToolBarShell "$action FXRbRegisterRubyObj(self, result);";
/**
* A Tool bar shell is a widget floating around over the Main Window.
* It typically contains an undocked tool bar.
*/
class FXToolBarShell : public FXTopWindow {
protected:
FXColor baseColor;
FXColor hiliteColor;
FXColor shadowColor;
FXColor borderColor;
FXint border;
protected:
FXToolBarShell(){}
virtual void layout();
void drawBorderRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawRidgeRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawGrooveRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawDoubleRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawDoubleSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawFrame(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
public:
/// Construct a toolbar shell
FXToolBarShell(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);
/// Change frame style
void setFrameStyle(FXuint style);
/// Get current frame style
FXuint getFrameStyle() const;
/// Get border width
FXint getBorderWidth() const;
/// Change highlight color
void setHiliteColor(FXColor clr);
/// Get highlight color
FXColor getHiliteColor() const;
/// Change shadow color
void setShadowColor(FXColor clr);
/// Get shadow color
FXColor getShadowColor() const;
/// Change border color
void setBorderColor(FXColor clr);
/// Get border color
FXColor getBorderColor() const;
/// Change base gui color
void setBaseColor(FXColor clr);
/// Get base gui color
FXColor getBaseColor() const;
};
%exception FXRbToolBarShell::FXRbToolBarShell "$action FXRbRegisterRubyObj(self, result);";
class FXRbToolBarShell : public FXToolBarShell {
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);
// Destructor
virtual ~FXRbToolBarShell();
public:
DECLARE_FXOBJECT_VIRTUALS
DECLARE_FXID_VIRTUALS
DECLARE_FXDRAWABLE_VIRTUALS
DECLARE_FXWINDOW_VIRTUALS
DECLARE_FXTOPWINDOW_VIRTUALS
};
--- NEW FILE: FXToolBarTab.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
/// ToolBar Tab styles
enum {
TOOLBARTAB_HORIZONTAL = 0, /// Default is for horizontal toolbar
TOOLBARTAB_VERTICAL = 0x00008000 /// For vertical toolbar
};
%exception FXToolBarTab::FXToolBarTab "$action FXRbRegisterRubyObj(self, result);";
/**
* A toolbar tab is used to collapse or uncollapse a sibling
* widget. The sibling affected is the widget immediately following
* the toolbar tab or, if the toolbar tab is the last widget in the list,
* the widget immediately preceding the toolbar tab.
*/
class FXToolBarTab : public FXFrame {
protected:
FXColor activeColor; // Color when active
FXbool collapsed; // Is collapsed flat
FXbool down; // Button down
protected:
FXToolBarTab();
void drawUpArrow(FXDCWindow& dc);
void drawDownArrow(FXDCWindow& dc);
void drawRightArrow(FXDCWindow& dc);
void drawLeftArrow(FXDCWindow& dc);
void drawHSpeckles(FXDCWindow& dc,FXint x,FXint w);
void drawVSpeckles(FXDCWindow& dc,FXint y,FXint h);
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onUpdate(FXObject*,FXSelector,void* PTR_NULL);
long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
long onLeave(FXObject*,FXSelector,void* PTR_EVENT);
long onUngrabbed(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
long onLeftBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);
long onKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
long onKeyRelease(FXObject*,FXSelector,void* PTR_EVENT);
long onCmdCollapse(FXObject*,FXSelector,void* PTR_IGNORE);
long onUpdCollapse(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdUncollapse(FXObject*,FXSelector,void* PTR_IGNORE);
long onUpdUncollapse(FXObject*,FXSelector,void* PTR_IGNORE);
public:
enum {
ID_COLLAPSE=FXFrame::ID_LAST,
ID_UNCOLLAPSE,
ID_LAST
};
public:
/// Construct toolbar tab
FXToolBarTab(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=FRAME_RAISED,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
/// Collapse or uncollapse the toolbar
void collapse(FXbool c=TRUE);
/// Return true if the toolbar is collapsed
FXbool isCollapsed() const;
/// Change the tab style
void setTabStyle(FXuint style);
/// Get current tab style
FXuint getTabStyle() const;
/// Get the active color
FXColor getActiveColor() const;
/// Set the active color
void setActiveColor(FXColor clr);
};
%exception FXRbToolBarTab::FXRbToolBarTab "$action FXRbRegisterRubyObj(self, result);";
class FXRbToolBarTab : public FXToolBarTab {
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);
// Destructor
virtual ~FXRbToolBarTab();
public:
DECLARE_FXOBJECT_VIRTUALS
DECLARE_FXID_VIRTUALS
DECLARE_FXDRAWABLE_VIRTUALS
DECLARE_FXWINDOW_VIRTUALS
};
--- NEW FILE: FXToolTip.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
/// ToolTip styles
enum {
TOOLTIP_PERMANENT = 0x00020000, /// ToolTip stays up indefinitely
TOOLTIP_VARIABLE = 0x00040000, /// ToolTip stays up variable time, depending on the length of the string
TOOLTIP_NORMAL = 0
};
class FXFont;
%exception FXToolTip::FXToolTip "$action FXRbRegisterRubyObj(self, result);";
/// Hopefully Helpful Hint message
class FXToolTip : public FXShell {
protected:
FXString label;
FXFont *font;
FXColor textColor;
FXTimer *timer;
FXbool popped;
protected:
FXToolTip();
virtual FXbool doesOverrideRedirect() const;
void place(FXint x,FXint y);
void autoplace();
public:
long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
long onUpdate(FXObject*,FXSelector,void* PTR_NULL);
long onTipShow(FXObject*,FXSelector,void* PTR_IGNORE);
long onTipHide(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdGetStringValue(FXObject*,FXSelector,void* PTR_IGNORE); // FIXME
long onCmdSetStringValue(FXObject*,FXSelector,void* PTR_STRING);
public:
enum {
ID_TIP_SHOW=FXShell::ID_LAST,
ID_TIP_HIDE,
ID_LAST
};
public:
/// Construct a tool tip
FXToolTip(FXApp* a,FXuint opts=TOOLTIP_NORMAL,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
/// Set the text for this tip
void setText(const FXString& text);
/// Get the text for this tip
FXString getText() const;
/// Set the tip text font
void setFont(FXFont *fnt);
/// Get the tip text font
FXFont* getFont() const;
/// Get the current tip text color
FXColor getTextColor() const;
/// Set the current tip text color
void setTextColor(FXColor clr);
/// Destructor
virtual ~FXToolTip();
};
%exception FXRbToolTip::FXRbToolTip "$action FXRbRegisterRubyObj(self, result);";
class FXRbToolTip : public FXToolTip {
public:
// Construct a tool tip
FXRbToolTip(FXApp* a,FXuint opts=TOOLTIP_NORMAL,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
// Destructor
virtual ~FXRbToolTip();
public:
DECLARE_FXOBJECT_VIRTUALS
DECLARE_FXID_VIRTUALS
DECLARE_FXDRAWABLE_VIRTUALS
DECLARE_FXWINDOW_VIRTUALS
};
Index: FXAccelTable.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXAccelTable.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXAccelTable.i 19 Mar 2002 23:18:40 -0000 1.11
--- FXAccelTable.i 12 Jul 2002 16:34:47 -0000 1.12
***************
*** 21,26 ****
***********************************************************************/
- struct FXAccelKey;
-
%exception FXAccelTable::FXAccelTable "$action FXRbRegisterRubyObj(self, result);";
--- 21,24 ----
***************
*** 31,34 ****
--- 29,39 ----
*/
class FXAccelTable : public FXObject {
+ protected:
+ struct FXAccelKey {
+ FXObject *target; // Target object of message
+ FXSelector messagedn; // Message being sent
+ FXSelector messageup; // Message being sent
+ FXHotKey code; // Keysym and modifier mask to match
+ };
public:
long onKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
Index: FXApp.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXApp.i,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** FXApp.i 11 Jul 2002 13:33:13 -0000 1.39
--- FXApp.i 12 Jul 2002 16:34:47 -0000 1.40
***************
*** 21,28 ****
***********************************************************************/
class FXCursor;
class FXFont;
class FXVisual;
! class FXWindow;
/// File input modes for addInput
--- 21,39 ----
***********************************************************************/
+ // Forward declarations
+ class FXWindow;
+ class FXIcon;
+ class FXBitmap;
class FXCursor;
+ class FXRootWindow;
+ class FXMainWindow;
+ class FXPopup;
class FXFont;
+ class FXDC;
+ class FXDCWindow;
class FXVisual;
! class FXGLVisual;
! class FXGLContext;
!
/// File input modes for addInput
***************
*** 165,169 ****
/// Connection to display; this is called by init()
! FXbool openDisplay(const FXchar* dpyname=":0");
/// Close connection to the display
--- 176,180 ----
/// Connection to display; this is called by init()
! FXbool openDisplay(const FXchar* dpyname=NULL);
/// Close connection to the display
***************
*** 173,176 ****
--- 184,193 ----
void* getDisplay() const;
+ /// Get argument count
+ FXint getArgc() const;
+
+ /// Get argument vector
+ const FXchar *const *getArgv() const; // FIXME
+
/// Get default visual
FXVisual* getDefaultVisual() const;
***************
*** 183,187 ****
/// Get root Window
! FXRootWindow* getRoot() const;
/// Get the window under the cursor, if any
--- 200,204 ----
/// Get root Window
! FXRootWindow* getRootWindow() const;
/// Get the window under the cursor, if any
***************
*** 191,196 ****
FXWindow *getFocusWindow() const;
! /// Get main window, if any
! FXWindow *getMainWindow() const;
/// Find window from id
--- 208,213 ----
FXWindow *getFocusWindow() const;
! /// Get current popup window, if any
! FXPopup* getPopupWindow() const;
/// Find window from id
***************
*** 343,350 ****
/// Return window of current modal loop
! FXWindow* modalWindow() const;
/// Return mode of current modal loop
! FXModality modalModality() const;
/**
--- 360,367 ----
/// Return window of current modal loop
! FXWindow* getModalWindow() const;
/// Return mode of current modal loop
! FXModality getModality() const;
/**
Index: FXColorBar.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXColorBar.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXColorBar.i 19 Mar 2002 23:18:40 -0000 1.3
--- FXColorBar.i 12 Jul 2002 16:34:47 -0000 1.4
***************
*** 82,95 ****
void setBarStyle(FXuint style);
! /// Set status line help text for this color well
void setHelpText(const FXString& text);
! /// Get status line help text for this color well
FXString getHelpText() const;
! /// Set tool tip message for this color well
void setTipText(const FXString& text);
! /// Get tool tip message for this color well
FXString getTipText() const;
--- 82,95 ----
void setBarStyle(FXuint style);
! /// Set status line help text for this color bar
void setHelpText(const FXString& text);
! /// Get status line help text for this color bar
FXString getHelpText() const;
! /// Set tool tip message for this color bar
void setTipText(const FXString& text);
! /// Get tool tip message for this color bar
FXString getTipText() const;
Index: FXComboBox.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXComboBox.i,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** FXComboBox.i 11 Jul 2002 13:33:14 -0000 1.24
--- FXComboBox.i 12 Jul 2002 16:34:47 -0000 1.25
***************
*** 54,57 ****
--- 54,58 ----
long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);
+ long onFocusSelf(FXObject*,FXSelector,void* PTR_EVENT);
long onTextButton(FXObject*,FXSelector,void* PTR_IGNORE);
long onTextChanged(FXObject*,FXSelector,void* PTR_CSTRING);
Index: FXDialogBox.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDialogBox.i,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** FXDialogBox.i 11 Jul 2002 13:33:14 -0000 1.18
--- FXDialogBox.i 12 Jul 2002 16:34:48 -0000 1.19
***************
*** 35,39 ****
long onKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
long onKeyRelease(FXObject*,FXSelector,void* PTR_EVENT);
- long onClose(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdAccept(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdCancel(FXObject*,FXSelector,void* PTR_IGNORE);
--- 35,38 ----
Index: FXDirList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDirList.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FXDirList.i 11 Jul 2002 13:33:14 -0000 1.21
--- FXDirList.i 12 Jul 2002 16:34:48 -0000 1.22
***************
*** 58,71 ****
public:
/// Constructor
! FXDirItem(const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ptr=NULL);
FXbool isDirectory() const;
FXbool isExecutable() const;
FXbool isSymlink() const;
FXbool isChardev() const;
FXbool isBlockdev() const;
FXbool isFifo() const;
FXbool isSocket() const;
FXFileAssoc* getAssoc() const;
unsigned long getSize() const;
FXTime getDate() const;
};
--- 58,94 ----
public:
/// Constructor
! FXDirItem(const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ptr=NULL):FXTreeItem(text,oi,ci,ptr),iprev(NULL),inext(NULL),list(NULL),assoc(NULL),size(0),date(0){}
!
! /// Return true if this is a file item
! FXbool isFile() const;
!
! /// Return true if this is a directory item
FXbool isDirectory() const;
+
+ /// Return true if this is an executable item
FXbool isExecutable() const;
+
+ /// Return true if this is a symbolic link item
FXbool isSymlink() const;
+
+ /// Return true if this is a character device item
FXbool isChardev() const;
+
+ /// Return true if this is a block device item
FXbool isBlockdev() const;
+
+ /// Return true if this is an FIFO item
FXbool isFifo() const;
+
+ /// Return true if this is a socket
FXbool isSocket() const;
+
+ /// Return the file-association object for this item
FXFileAssoc* getAssoc() const;
+
+ /// Return the file size for this item
unsigned long getSize() const;
+
+ /// Return the date for this item
FXTime getDate() const;
};
Index: FXGIFCursor.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGIFCursor.i,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FXGIFCursor.i 11 Jul 2002 17:21:05 -0000 1.13
--- FXGIFCursor.i 12 Jul 2002 16:34:48 -0000 1.14
***************
*** 21,35 ****
***********************************************************************/
! %exception FXGIFCursor::FXGIFCursor "$action FXRbRegisterRubyObj(self, result);";
! %ignore ::fxloadGIF(FXStream& store,FXuchar*& data,FXColor& transp,FXint& width,FXint& height);
%apply const FXuchar *PIXELS { const FXuchar *data };
! %include FXGIFCursor.h
%exception FXRbGIFCursor::FXRbGIFCursor "$action FXRbRegisterRubyObj(self, result);";
! class FXRbGIFCursor : public FXGIFCursor {
public:
// Constructor
--- 21,35 ----
***********************************************************************/
! %exception FX::FXGIFCursor::FXGIFCursor "$action FXRbRegisterRubyObj(self, result);";
! %ignore FX::fxloadGIF(FXStream& store,FXuchar*& data,FXColor& transp,FXint& width,FXint& height);
%apply const FXuchar *PIXELS { const FXuchar *data };
! %include "FXGIFCursor.h"
%exception FXRbGIFCursor::FXRbGIFCursor "$action FXRbRegisterRubyObj(self, result);";
! class FXRbGIFCursor : public FX::FXGIFCursor {
public:
// Constructor
***************
*** 44,48 ****
DECLARE_FXCURSOR_VIRTUALS
};
-
%inline %{
--- 44,47 ----
Index: FXIconList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXIconList.i,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** FXIconList.i 11 Jul 2002 13:33:14 -0000 1.35
--- FXIconList.i 12 Jul 2002 16:34:48 -0000 1.36
***************
*** 451,455 ****
/// Repaint item at index
! void updateItem(FXint index);
/// Select items in rectangle
--- 451,455 ----
/// Repaint item at index
! void updateItem(FXint index) const;
/// Select items in rectangle
Index: FXList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXList.i,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** FXList.i 11 Jul 2002 13:33:14 -0000 1.37
--- FXList.i 12 Jul 2002 16:34:48 -0000 1.38
***************
*** 396,400 ****
/// Repaint item
! void updateItem(FXint index);
/// Enable item
--- 396,400 ----
/// Repaint item
! void updateItem(FXint index) const;
/// Enable item
Index: FXListBox.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXListBox.i,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** FXListBox.i 11 Jul 2002 13:33:14 -0000 1.24
--- FXListBox.i 12 Jul 2002 16:34:48 -0000 1.25
***************
*** 46,49 ****
--- 46,50 ----
long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);
+ long onFocusSelf(FXObject*,FXSelector,void* PTR_EVENT);
long onFieldButton(FXObject*,FXSelector,void* PTR_IGNORE);
long onListUpdate(FXObject*,FXSelector,void* PTR_IGNORE);
Index: FXMDIChild.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXMDIChild.i,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** FXMDIChild.i 19 Mar 2002 23:18:40 -0000 1.14
--- FXMDIChild.i 12 Jul 2002 16:34:48 -0000 1.15
***************
*** 96,102 ****
long onSelected(FXObject*,FXSelector,void* PTR_MDICHILD);
long onDeselected(FXObject*,FXSelector,void* PTR_MDICHILD);
- long onMinimize(FXObject*,FXSelector,void* PTR_IGNORE);
- long onRestore(FXObject*,FXSelector,void* PTR_IGNORE);
- long onMaximize(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdRestore(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdMaximize(FXObject*,FXSelector,void* PTR_IGNORE);
--- 96,99 ----
***************
*** 114,117 ****
--- 111,115 ----
long onUpdClose(FXObject*,FXSelector,void* PTR_IGNORE);
long onCmdSetStringValue(FXObject*,FXSelector,void* PTR_STRING);
+ long onCmdGetStringValue(FXObject*,FXSelector,void* PTR_IGNORE); // FIXME
virtual long onDefault(FXObject*,FXSelector,void* PTR_IGNORE); // FIXME
public:
***************
*** 120,163 ****
FXMDIChild(FXMDIClient* p,const FXString& name,FXIcon* ic=NULL,FXMenuPane* mn=NULL,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
- /// Get next MDI Child
- FXMDIChild* getMDINext() const;
-
- /// Get previous MDI Child
- FXMDIChild* getMDIPrev() const;
-
/// Change normal (restored) position
void setNormalX(FXint x);
-
void setNormalY(FXint y);
-
void setNormalWidth(FXint w);
-
void setNormalHeight(FXint h);
/// Return normal (restored) position
FXint getNormalX() const;
-
FXint getNormalY() const;
-
FXint getNormalWidth() const;
-
FXint getNormalHeight() const;
/// Change iconified position
void setIconX(FXint x);
-
void setIconY(FXint y);
-
void setIconWidth(FXint w);
-
void setIconHeight(FXint h);
/// Return iconified position
FXint getIconX() const;
-
FXint getIconY() const;
-
FXint getIconWidth() const;
-
FXint getIconHeight() const;
--- 118,143 ----
***************
*** 173,214 ****
/// Get colors
FXColor getHiliteColor() const;
-
FXColor getShadowColor() const;
-
FXColor getBaseColor() const;
-
FXColor getBorderColor() const;
-
FXColor getTitleColor () const;
-
FXColor getTitleBackColor() const;
/// Change colors
void setHiliteColor(FXColor clr);
-
void setShadowColor(FXColor clr);
-
void setBaseColor(FXColor clr);
-
void setBorderColor(FXColor clr);
-
void setTitleColor(FXColor clr);
-
void setTitleBackColor(FXColor clr);
/// Return TRUE if maximized
FXbool isMaximized() const;
!
/// Return TRUE if minimized
FXbool isMinimized() const;
-
- /// Maximize MDI Child
- virtual void maximize(FXbool notify=FALSE);
-
- /// Minimize/iconify MDI Child
- virtual void minimize(FXbool notify=FALSE);
-
- /// Restore MDI Child to normal
- virtual void restore(FXbool notify=FALSE);
/// Get window icon
--- 153,187 ----
/// Get colors
FXColor getHiliteColor() const;
FXColor getShadowColor() const;
FXColor getBaseColor() const;
FXColor getBorderColor() const;
FXColor getTitleColor () const;
FXColor getTitleBackColor() const;
/// Change colors
void setHiliteColor(FXColor clr);
void setShadowColor(FXColor clr);
void setBaseColor(FXColor clr);
void setBorderColor(FXColor clr);
void setTitleColor(FXColor clr);
void setTitleBackColor(FXColor clr);
+ /// Maximize MDI window, return TRUE if maximized
+ virtual FXbool maximize(FXbool notify=FALSE);
+
+ /// Minimize/iconify MDI window, return TRUE if minimized
+ virtual FXbool minimize(FXbool notify=FALSE);
+
+ /// Restore MDI window to normal, return TRUE if restored
+ virtual FXbool restore(FXbool notify=FALSE);
+
+ /// Close MDI window, return TRUE if actually closed
+ virtual FXbool close(FXbool notify=FALSE);
+
/// Return TRUE if maximized
FXbool isMaximized() const;
!
/// Return TRUE if minimized
FXbool isMinimized() const;
/// Get window icon
Index: FXMDIClient.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXMDIClient.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXMDIClient.i 19 Mar 2002 23:18:40 -0000 1.11
--- FXMDIClient.i 12 Jul 2002 16:34:48 -0000 1.12
***************
*** 38,52 ****
* window by the MDI client.
*/
! class FXMDIClient : public FXScrollArea {
protected:
FXint cascadex; // Cascade offset X
FXint cascadey; // Cascade offset Y
- FXint xmin; // Space taken up by all children
- FXint xmax;
- FXint ymin;
- FXint ymax;
protected:
FXMDIClient();
- void recompute();
virtual void layout();
public:
--- 38,48 ----
* window by the MDI client.
*/
! class FXMDIClient : public FXComposite {
protected:
+ FXMDIChild *active; // Active child
FXint cascadex; // Cascade offset X
FXint cascadey; // Cascade offset Y
protected:
FXMDIClient();
virtual void layout();
public:
***************
*** 98,107 ****
FXMDIClient(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
- /// Get first MDI Child
- FXMDIChild* getMDIChildFirst() const;
-
- /// Get last MDI Child
- FXMDIChild* getMDIChildLast() const;
-
/// Pass message to all MDI Child windows
long forallWindows(FXObject* sender,FXSelector sel,void* ptr);
--- 94,97 ----
***************
*** 110,119 ****
long forallDocWindows(FXObject* document,FXObject* sender,FXSelector sel,void* ptr);
/// Get current active child; may be NULL!
FXMDIChild* getActiveChild() const;
! /// Set active MDI Child
! FXbool setActiveChild(FXMDIChild* child=NULL,FXbool notify=TRUE);
!
/// Change cascade offset X
void setCascadeX(FXint off);
--- 100,118 ----
long forallDocWindows(FXObject* document,FXObject* sender,FXSelector sel,void* ptr);
+ /// Set active MDI Child
+ virtual FXbool setActiveChild(FXMDIChild* child=NULL,FXbool notify=TRUE);
+
/// Get current active child; may be NULL!
FXMDIChild* getActiveChild() const;
! // Cascade windows
! virtual void cascade(FXbool notify=FALSE);
!
! // Layout horizontally
! virtual void horizontal(FXbool notify=FALSE);
!
! // Layout vertically
! virtual void vertical(FXbool notify=FALSE);
!
/// Change cascade offset X
void setCascadeX(FXint off);
***************
*** 147,151 ****
DECLARE_FXDRAWABLE_VIRTUALS
DECLARE_FXWINDOW_VIRTUALS
! DECLARE_FXSCROLLAREA_VIRTUALS
};
--- 146,150 ----
DECLARE_FXDRAWABLE_VIRTUALS
DECLARE_FXWINDOW_VIRTUALS
! DECLARE_FXMDICLIENT_VIRTUALS
};
Index: FXMainWindow.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXMainWindow.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FXMainWindow.i 19 Mar 2002 23:18:40 -0000 1.10
--- FXMainWindow.i 12 Jul 2002 16:34:48 -0000 1.11
***************
*** 23,36 ****
%exception FXMainWindow::FXMainWindow "$action FXRbRegisterRubyObj(self, result);";
! /// Main application window
class FXMainWindow : public FXTopWindow {
protected:
FXMainWindow(){}
public:
- long onClose(FXObject*,FXSelector,void* PTR_IGNORE);
- public:
/// Construct a main window
! FXMainWindow(FXApp* a,const FXString& name,FXIcon *ic=NULL,FXIcon *mi=NULL,FXuint opts=DECOR_ALL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0,FXint hs=4,FXint vs=4);
/// Destructor
--- 23,42 ----
%exception FXMainWindow::FXMainWindow "$action FXRbRegisterRubyObj(self, result);";
! /**
! * Main application window. There may be any number of
! * MainWindows in an application.
! * When a MainWindow is closed, it sends a SEL_CLOSE message to
! * its target; the target should return 0 if there is no objection
! * against proceeding with the close, and 1 otherwise.
! * After the SEL_CLOSE message has been sent and no objection was
! * raised, the MainWindow will delete itself.
! */
class FXMainWindow : public FXTopWindow {
protected:
FXMainWindow(){}
public:
/// Construct a main window
! FXMainWindow(FXApp* a,const FXString& name,FXIcon *ic=NULL,FXIcon *mi=NULL,FXuint opts=DECOR_ALL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0,FXint hs=0,FXint vs=0);
/// Destructor
***************
*** 43,47 ****
public:
// Constructor
! FXRbMainWindow(FXApp* a,const FXString& name,FXIcon *ic=NULL,FXIcon *mi=NULL,FXuint opts=DECOR_ALL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0,FXint hs=4,FXint vs=4);
// Destructor
--- 49,53 ----
public:
// Constructor
! FXRbMainWindow(FXApp* a,const FXString& name,FXIcon *ic=NULL,FXIcon *mi=NULL,FXuint opts=DECOR_ALL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0,FXint hs=0,FXint vs=0);
// Destructor
Index: FXMatrix.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXMatrix.i,v
retrieving revision 1.14
retrieving revision 1.1...
[truncated message content] |
|
From: Lyle J. <ly...@us...> - 2002-07-12 16:34:51
|
Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv30500/fox-includes
Modified Files:
FXMainWindow.h FXMatrix.h FXObject.h FXPopup.h FXProgressBar.h
FXProgressDialog.h FXScrollArea.h FXSeparator.h FXStream.h
FXTable.h FXText.h FXTextField.h FXTopWindow.h FXTreeList.h
FXTreeListBox.h FXWindow.h fxdefs.h
Log Message:
Many, many changes for the fox-1.1 update.
Index: FXMainWindow.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXMainWindow.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXMainWindow.h 26 Nov 2001 16:13:04 -0000 1.4
--- FXMainWindow.h 12 Jul 2002 16:34:47 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXMAINWINDOW_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXMAINWINDOW_H
***************
*** 29,35 ****
#endif
! /// Main application window
class FXAPI FXMainWindow : public FXTopWindow {
FXDECLARE(FXMainWindow)
--- 29,44 ----
#endif
+ namespace FX {
! /**
! * Main application window. There may be any number of
! * MainWindows in an application.
! * When a MainWindow is closed, it sends a SEL_CLOSE message to
! * its target; the target should return 0 if there is no objection
! * against proceeding with the close, and 1 otherwise.
! * After the SEL_CLOSE message has been sent and no objection was
! * raised, the MainWindow will delete itself.
! */
class FXAPI FXMainWindow : public FXTopWindow {
FXDECLARE(FXMainWindow)
***************
*** 40,55 ****
FXMainWindow &operator=(const FXMainWindow&);
public:
- long onClose(FXObject*,FXSelector,void*);
- public:
/// Construct a main window
FXMainWindow(FXApp* a,const FXString& name,FXIcon *ic=NULL,FXIcon *mi=NULL,FXuint opts=DECOR_ALL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0,FXint hs=0,FXint vs=0);
/// Destructor
virtual ~FXMainWindow();
};
!
!
#endif
--- 49,64 ----
FXMainWindow &operator=(const FXMainWindow&);
public:
/// Construct a main window
FXMainWindow(FXApp* a,const FXString& name,FXIcon *ic=NULL,FXIcon *mi=NULL,FXuint opts=DECOR_ALL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0,FXint hs=0,FXint vs=0);
+ /// Create server-side resources
+ virtual void create();
+
/// Destructor
virtual ~FXMainWindow();
};
! }
#endif
Index: FXMatrix.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXMatrix.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXMatrix.h 26 Nov 2001 16:13:04 -0000 1.4
--- FXMatrix.h 12 Jul 2002 16:34:47 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXMATRIX_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXMATRIX_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 86,93 ****
/// Return the row in which the given child is placed
! FXint rowOfChild(FXWindow* child) const;
/// Return the column in which the given child is placed
! FXint colOfChild(FXWindow* child) const;
/// Change the matrix style
--- 87,94 ----
/// Return the row in which the given child is placed
! FXint rowOfChild(const FXWindow* child) const;
/// Return the column in which the given child is placed
! FXint colOfChild(const FXWindow* child) const;
/// Change the matrix style
***************
*** 110,113 ****
--- 111,115 ----
};
+ }
#endif
Index: FXObject.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXObject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXObject.h 25 Jun 2001 21:11:35 -0000 1.4
--- FXObject.h 12 Jul 2002 16:34:47 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,37 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXOBJECT_H
#define FXOBJECT_H
! // Minimum and maximum keys
! #define MINKEY 0
! #define MAXKEY 65535
! // Minimum and maximum types
! #define MINTYPE 0
! #define MAXTYPE 65535
--- 20,42 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXOBJECT_H
#define FXOBJECT_H
+ namespace FX {
! /// Minimum and maximum keys
! enum {
! MINKEY = 0,
! MAXKEY = 65535
! };
! /// Minimum and maximum types
! enum {
! MINTYPE = 0,
! MAXTYPE = 65535
! };
***************
*** 44,48 ****
-
/// Describes a FOX object
struct FXAPI FXMetaClass {
--- 49,52 ----
***************
*** 79,82 ****
--- 83,87 ----
public:
__FXMETACLASSINITIALIZER__(const FXMetaClass* meta);
+ ~__FXMETACLASSINITIALIZER__();
};
***************
*** 85,95 ****
#define FXDECLARE(classname) \
public: \
! struct FXMapEntry { FXSelector keylo; FXSelector keyhi; long (classname::* func)(FXObject*,FXSelector,void*); }; \
! static const FXMetaClass metaClass; \
! static FXObject* manufacture(); \
! virtual long handle(FXObject* sender,FXSelector sel,void* ptr); \
! virtual const FXMetaClass* getMetaClass() const { return &metaClass; } \
! friend FXStream& operator<<(FXStream& store,const classname* obj){return store.saveObject((FXObjectPtr)(obj));} \
! friend FXStream& operator>>(FXStream& store,classname*& obj){return store.loadObject((FXObjectPtr&)(obj));} \
private:
--- 90,100 ----
#define FXDECLARE(classname) \
public: \
! struct FXMapEntry { FX::FXSelector keylo; FX::FXSelector keyhi; long (classname::* func)(FX::FXObject*,FX::FXSelector,void*); }; \
! static const FX::FXMetaClass metaClass; \
! static FX::FXObject* manufacture(); \
! virtual long handle(FX::FXObject* sender,FX::FXSelector sel,void* ptr); \
! virtual const FX::FXMetaClass* getMetaClass() const { return &metaClass; } \
! friend FX::FXStream& operator<<(FX::FXStream& store,const classname* obj){return store.saveObject((FX::FXObjectPtr)(obj));} \
! friend FX::FXStream& operator>>(FX::FXStream& store,classname*& obj){return store.loadObject((FX::FXObjectPtr&)(obj));} \
private:
***************
*** 97,104 ****
/// Macro to set up class implementation
#define FXIMPLEMENT(classname,baseclassname,mapping,nmappings) \
! FXObject* classname::manufacture(){return new classname;} \
! const FXMetaClass classname::metaClass={#classname,classname::manufacture,&baseclassname::metaClass,mapping,nmappings,sizeof(classname::FXMapEntry),sizeof(#classname)}; \
! __FXMETACLASSINITIALIZER__ classname##Initializer(&classname::metaClass); \
! long classname::handle(FXObject* sender,FXSelector sel,void* ptr){ \
const FXMapEntry* me=(const FXMapEntry*)metaClass.search(sel); \
return me ? (this->* me->func)(sender,sel,ptr) : baseclassname::handle(sender,sel,ptr); \
--- 102,109 ----
/// Macro to set up class implementation
#define FXIMPLEMENT(classname,baseclassname,mapping,nmappings) \
! FX::FXObject* classname::manufacture(){return new classname;} \
! const FX::FXMetaClass classname::metaClass={#classname,classname::manufacture,&baseclassname::metaClass,mapping,nmappings,sizeof(classname::FXMapEntry),sizeof(#classname)}; \
! FX::__FXMETACLASSINITIALIZER__ classname##Initializer(&classname::metaClass); \
! long classname::handle(FX::FXObject* sender,FX::FXSelector sel,void* ptr){ \
const FXMapEntry* me=(const FXMapEntry*)metaClass.search(sel); \
return me ? (this->* me->func)(sender,sel,ptr) : baseclassname::handle(sender,sel,ptr); \
***************
*** 109,118 ****
#define FXDECLARE_ABSTRACT(classname) \
public: \
! struct FXMapEntry { FXSelector keylo; FXSelector keyhi; long (classname::* func)(FXObject*,FXSelector,void*); }; \
! static const FXMetaClass metaClass; \
! virtual long handle(FXObject* sender,FXSelector sel,void* ptr); \
! virtual const FXMetaClass* getMetaClass() const { return &metaClass; } \
! friend FXStream& operator<<(FXStream& store,const classname* obj){return store.saveObject((FXObjectPtr)(obj));} \
! friend FXStream& operator>>(FXStream& store,classname*& obj){return store.loadObject((FXObjectPtr&)(obj));} \
private:
--- 114,123 ----
#define FXDECLARE_ABSTRACT(classname) \
public: \
! struct FXMapEntry { FX::FXSelector keylo; FX::FXSelector keyhi; long (classname::* func)(FX::FXObject*,FX::FXSelector,void*); }; \
! static const FX::FXMetaClass metaClass; \
! virtual long handle(FX::FXObject* sender,FX::FXSelector sel,void* ptr); \
! virtual const FX::FXMetaClass* getMetaClass() const { return &metaClass; } \
! friend FX::FXStream& operator<<(FX::FXStream& store,const classname* obj){return store.saveObject((FX::FXObjectPtr)(obj));} \
! friend FX::FXStream& operator>>(FX::FXStream& store,classname*& obj){return store.loadObject((FX::FXObjectPtr&)(obj));} \
private:
***************
*** 120,126 ****
/// Macro to set up abstract class implementation
#define FXIMPLEMENT_ABSTRACT(classname,baseclassname,mapping,nmappings) \
! const FXMetaClass classname::metaClass={#classname,NULL,&baseclassname::metaClass,mapping,nmappings,sizeof(classname::FXMapEntry),sizeof(#classname)}; \
__FXMETACLASSINITIALIZER__ classname##Initializer(&classname::metaClass); \
! long classname::handle(FXObject* sender,FXSelector sel,void* ptr){ \
const FXMapEntry* me=(const FXMapEntry*)metaClass.search(sel); \
return me ? (this->* me->func)(sender,sel,ptr) : baseclassname::handle(sender,sel,ptr); \
--- 125,131 ----
/// Macro to set up abstract class implementation
#define FXIMPLEMENT_ABSTRACT(classname,baseclassname,mapping,nmappings) \
! const FX::FXMetaClass classname::metaClass={#classname,NULL,&baseclassname::metaClass,mapping,nmappings,sizeof(classname::FXMapEntry),sizeof(#classname)}; \
__FXMETACLASSINITIALIZER__ classname##Initializer(&classname::metaClass); \
! long classname::handle(FX::FXObject* sender,FX::FXSelector sel,void* ptr){ \
const FXMapEntry* me=(const FXMapEntry*)metaClass.search(sel); \
return me ? (this->* me->func)(sender,sel,ptr) : baseclassname::handle(sender,sel,ptr); \
***************
*** 174,177 ****
--- 179,183 ----
};
+ }
#endif
Index: FXPopup.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXPopup.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FXPopup.h 26 Nov 2001 16:13:05 -0000 1.6
--- FXPopup.h 12 Jul 2002 16:34:47 -0000 1.7
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXPOPUP_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXPOPUP_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 43,48 ****
class FXAPI FXPopup : public FXShell {
FXDECLARE(FXPopup)
protected:
! FXWindow *grabowner; // Window which will get grabbed when outside
FXColor baseColor;
FXColor hiliteColor;
--- 44,52 ----
class FXAPI FXPopup : public FXShell {
FXDECLARE(FXPopup)
+ private:
+ FXPopup *prevActive; // Popup below this one in stack
+ FXPopup *nextActive; // Popup above this one in stack
protected:
! FXWindow *grabowner; // Window which will get grabbed when outside
FXColor baseColor;
FXColor hiliteColor;
***************
*** 51,55 ****
FXint border;
protected:
! FXPopup(){}
virtual void layout();
virtual FXbool doesOverrideRedirect() const;
--- 55,59 ----
FXint border;
protected:
! FXPopup();
virtual void layout();
virtual FXbool doesOverrideRedirect() const;
***************
*** 103,106 ****
--- 107,116 ----
virtual FXint getDefaultHeight();
+ /// Return a pointer to the prior active popup
+ FXPopup* getPrevActive() const { return prevActive; }
+
+ /// Return a pointer to the next active popup
+ FXPopup* getNextActive() const { return nextActive; }
+
/// Move the focus to this window
virtual void setFocus();
***************
*** 109,112 ****
--- 119,128 ----
virtual void killFocus();
+ /// Show this window
+ virtual void show();
+
+ /// Hide this window
+ virtual void hide();
+
/// Change frame style
void setFrameStyle(FXuint style);
***************
*** 175,178 ****
--- 191,195 ----
};
+ }
#endif
Index: FXProgressBar.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXProgressBar.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FXProgressBar.h 26 Nov 2001 16:13:05 -0000 1.5
--- FXProgressBar.h 12 Jul 2002 16:34:47 -0000 1.6
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXPROGRESSBAR_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXPROGRESSBAR_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 55,58 ****
--- 56,60 ----
protected:
FXProgressBar(){}
+ void drawInterior(FXDCWindow& dc);
private:
FXProgressBar(const FXProgressBar&);
***************
*** 152,155 ****
--- 154,159 ----
virtual ~FXProgressBar();
};
+
+ }
#endif
Index: FXProgressDialog.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXProgressDialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXProgressDialog.h 26 Nov 2001 16:13:05 -0000 1.2
--- FXProgressDialog.h 12 Jul 2002 16:34:47 -0000 1.3
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 2001,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXPROGRESSDIALOG_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXPROGRESSDIALOG_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 57,61 ****
FXbool cancelled; // User hit cancel
protected:
! FXProgressDialog(){}
private:
FXProgressDialog(const FXProgressDialog&);
--- 58,62 ----
FXbool cancelled; // User hit cancel
protected:
! FXProgressDialog();
private:
FXProgressDialog(const FXProgressDialog&);
***************
*** 97,105 ****
FXbool isCancelled() const { return cancelled; }
/// Destroy
virtual ~FXProgressDialog();
};
!
#endif
--- 98,109 ----
FXbool isCancelled() const { return cancelled; }
+ /// Change cancelled flag
+ void setCancelled(FXbool flg){ cancelled=flg; }
+
/// Destroy
virtual ~FXProgressDialog();
};
! }
#endif
Index: FXScrollArea.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXScrollArea.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FXScrollArea.h 2 Jan 2002 22:23:56 -0000 1.6
--- FXScrollArea.h 12 Jul 2002 16:34:47 -0000 1.7
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXSCROLLAREA_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXSCROLLAREA_H
***************
*** 29,32 ****
--- 29,34 ----
#endif
+ namespace FX {
+
/// Scrollbar options
***************
*** 46,50 ****
! class FXScrollbar;
class FXScrollCorner;
struct FXTimer;
--- 48,52 ----
! class FXScrollBar;
class FXScrollCorner;
struct FXTimer;
***************
*** 68,73 ****
FXDECLARE(FXScrollArea)
protected:
! FXScrollbar *horizontal;
! FXScrollbar *vertical;
FXScrollCorner *corner;
FXTimer *scrolltimer;
--- 70,75 ----
FXDECLARE(FXScrollArea)
protected:
! FXScrollBar *horizontal;
! FXScrollBar *vertical;
FXScrollCorner *corner;
FXTimer *scrolltimer;
***************
*** 124,131 ****
/// Return a pointer to the horizontal scrollbar
! FXScrollbar* horizontalScrollbar() const { return horizontal; }
/// Return a pointer to the vertical scrollbar
! FXScrollbar* verticalScrollbar() const { return vertical; }
/// Return the current x-position
--- 126,133 ----
/// Return a pointer to the horizontal scrollbar
! FXScrollBar* horizontalScrollBar() const { return horizontal; }
/// Return a pointer to the vertical scrollbar
! FXScrollBar* verticalScrollBar() const { return vertical; }
/// Return the current x-position
***************
*** 148,152 ****
};
!
#endif
--- 150,154 ----
};
! }
#endif
Index: FXSeparator.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXSeparator.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXSeparator.h 26 Nov 2001 16:13:05 -0000 1.3
--- FXSeparator.h 12 Jul 2002 16:34:47 -0000 1.4
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXSEPARATOR_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXSEPARATOR_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 40,51 ****
! /// Horizontal separator
! class FXAPI FXHorizontalSeparator : public FXFrame {
! FXDECLARE(FXHorizontalSeparator)
protected:
! FXHorizontalSeparator(){}
private:
! FXHorizontalSeparator(const FXHorizontalSeparator&);
! FXHorizontalSeparator &operator=(const FXHorizontalSeparator&);
public:
long onPaint(FXObject*,FXSelector,void*);
--- 41,52 ----
! /// Separator widget
! class FXAPI FXSeparator : public FXFrame {
! FXDECLARE(FXSeparator)
protected:
! FXSeparator(){}
private:
! FXSeparator(const FXSeparator&);
! FXSeparator &operator=(const FXSeparator&);
public:
long onPaint(FXObject*,FXSelector,void*);
***************
*** 53,57 ****
/// Constructor
! FXHorizontalSeparator(FXComposite* p,FXuint opts=SEPARATOR_GROOVE|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=1,FXint pr=1,FXint pt=0,FXint pb=0);
/// Return default width
--- 54,58 ----
/// Constructor
! FXSeparator(FXComposite* p,FXuint opts=SEPARATOR_GROOVE|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0);
/// Return default width
***************
*** 63,68 ****
! /// Vertical separator
! class FXAPI FXVerticalSeparator : public FXFrame {
FXDECLARE(FXVerticalSeparator)
protected:
--- 64,86 ----
!
! /// Horizontal separator widget
! class FXAPI FXHorizontalSeparator : public FXSeparator {
! FXDECLARE(FXHorizontalSeparator)
! protected:
! FXHorizontalSeparator(){}
! private:
! FXHorizontalSeparator(const FXHorizontalSeparator&);
! FXHorizontalSeparator &operator=(const FXHorizontalSeparator&);
! public:
!
! /// Constructor
! FXHorizontalSeparator(FXComposite* p,FXuint opts=SEPARATOR_GROOVE|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=1,FXint pr=1,FXint pt=0,FXint pb=0);
! };
!
!
!
! /// Vertical separator widget
! class FXAPI FXVerticalSeparator : public FXSeparator {
FXDECLARE(FXVerticalSeparator)
protected:
***************
*** 72,88 ****
FXVerticalSeparator &operator=(const FXVerticalSeparator&);
public:
- long onPaint(FXObject*,FXSelector,void*);
- public:
/// Constructor
FXVerticalSeparator(FXComposite* p,FXuint opts=SEPARATOR_GROOVE|LAYOUT_FILL_Y,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=1,FXint pb=1);
-
- /// Return default width
- virtual FXint getDefaultWidth();
-
- /// Return default height
- virtual FXint getDefaultHeight();
};
#endif
--- 90,99 ----
FXVerticalSeparator &operator=(const FXVerticalSeparator&);
public:
/// Constructor
FXVerticalSeparator(FXComposite* p,FXuint opts=SEPARATOR_GROOVE|LAYOUT_FILL_Y,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=1,FXint pb=1);
};
+ }
#endif
Index: FXStream.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXStream.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXStream.h 16 Feb 2001 00:04:16 -0000 1.2
--- FXStream.h 12 Jul 2002 16:34:47 -0000 1.3
***************
*** 1,8 ****
/********************************************************************************
* *
! * Persistent Storage Stream *
* *
*********************************************************************************
! * Copyright (C) 1997 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 1,8 ----
/********************************************************************************
* *
! * P e r s i s t e n t S t o r a g e S t r e a m C l a s s e s *
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXSTREAM_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXSTREAM_H
***************
*** 26,54 ****
/// Stream data flow direction
! enum FXStreamDirection {
! FXStreamDead=0, // Unopened stream
! FXStreamSave=1, // Saving stuff to stream
! FXStreamLoad=2 // Loading stuff from stream
};
!
/// Stream status codes
enum FXStreamStatus {
! FXStreamOK=0, // OK
! FXStreamEnd=1, // Try read past end of stream
! FXStreamFull=2, // Filled up stream buffer or disk full
! FXStreamNoWrite=3, // Unable to open for write
! FXStreamNoRead=4, // Unable to open for read
! FXStreamFormat=5, // Stream format error
! FXStreamUnknown=6, // Trying to read unknown class
! FXStreamAlloc=7, // Alloc failed
! FXStreamFailure=8 // General failure
};
// Hash table entry
! struct FXStreamHashEntry {
FXuint ref; // Object reference number
FXObject* obj; // Pointer to object
--- 26,56 ----
+ namespace FX {
+
/// Stream data flow direction
! enum FXStreamDirection {
! FXStreamDead=0, /// Unopened stream
! FXStreamSave=1, /// Saving stuff to stream
! FXStreamLoad=2 /// Loading stuff from stream
};
!
/// Stream status codes
enum FXStreamStatus {
! FXStreamOK=0, /// OK
! FXStreamEnd=1, /// Try read past end of stream
! FXStreamFull=2, /// Filled up stream buffer or disk full
! FXStreamNoWrite=3, /// Unable to open for write
! FXStreamNoRead=4, /// Unable to open for read
! FXStreamFormat=5, /// Stream format error
! FXStreamUnknown=6, /// Trying to read unknown class
! FXStreamAlloc=7, /// Alloc failed
! FXStreamFailure=8 /// General failure
};
// Hash table entry
! struct FXStreamHashEntry {
FXuint ref; // Object reference number
FXObject* obj; // Pointer to object
***************
*** 63,67 ****
/// Persistent store definition
class FXAPI FXStream {
!
FXStreamHashEntry* table; // Hash table
FXuint ntable; // Amount of table that is filled
--- 65,69 ----
/// Persistent store definition
class FXAPI FXStream {
! private:
FXStreamHashEntry* table; // Hash table
FXuint ntable; // Amount of table that is filled
***************
*** 71,87 ****
const FXObject* parent; // Parent object
void grow(); // Enlarge the table
-
protected:
FXStreamDirection dir; // Direction of current transfer
FXStreamStatus code; // Status code
unsigned long pos; // Position
-
protected:
/// Save bunch of items
! virtual void saveItems(const void *buf,FXuint n);
/// Load bunch of items
! virtual void loadItems(void *buf,FXuint n);
public:
--- 73,87 ----
const FXObject* parent; // Parent object
void grow(); // Enlarge the table
protected:
FXStreamDirection dir; // Direction of current transfer
FXStreamStatus code; // Status code
unsigned long pos; // Position
protected:
/// Save bunch of items
! virtual void saveItems(const void *buf,unsigned long n);
/// Load bunch of items
! virtual void loadItems(void *buf,unsigned long n);
public:
***************
*** 122,126 ****
/// Return implementation's endianness
static FXbool isLittleEndian(){ return !FOX_BIGENDIAN; }
!
/// Save to stream
virtual FXStream& operator<<(const FXuchar& v);
--- 122,126 ----
/// Return implementation's endianness
static FXbool isLittleEndian(){ return !FOX_BIGENDIAN; }
!
/// Save to stream
virtual FXStream& operator<<(const FXuchar& v);
***************
*** 132,136 ****
FXStream& operator<<(const FXfloat& v);
FXStream& operator<<(const FXdouble& v);
!
#ifdef FX_LONG
FXStream& operator<<(const FXlong& v);
--- 132,136 ----
FXStream& operator<<(const FXfloat& v);
FXStream& operator<<(const FXdouble& v);
!
#ifdef FX_LONG
FXStream& operator<<(const FXlong& v);
***************
*** 138,158 ****
#endif
! FXStream& save(const FXuchar* p,FXuint n);
! FXStream& save(const FXchar* p,FXuint n);
! FXStream& save(const FXushort* p,FXuint n);
! FXStream& save(const FXshort* p,FXuint n);
! FXStream& save(const FXuint* p,FXuint n);
! FXStream& save(const FXint* p,FXuint n);
! FXStream& save(const FXfloat* p,FXuint n);
! FXStream& save(const FXdouble* p,FXuint n);
!
#ifdef FX_LONG
! FXStream& save(const FXlong* p,FXuint n);
! FXStream& save(const FXulong* p,FXuint n);
#endif
/// Save object
FXStream& saveObject(const FXObject* v);
!
/// Load from stream
virtual FXStream& operator>>(FXuchar& v);
--- 138,158 ----
#endif
! FXStream& save(const FXuchar* p,unsigned long n);
! FXStream& save(const FXchar* p,unsigned long n);
! FXStream& save(const FXushort* p,unsigned long n);
! FXStream& save(const FXshort* p,unsigned long n);
! FXStream& save(const FXuint* p,unsigned long n);
! FXStream& save(const FXint* p,unsigned long n);
! FXStream& save(const FXfloat* p,unsigned long n);
! FXStream& save(const FXdouble* p,unsigned long n);
!
#ifdef FX_LONG
! FXStream& save(const FXlong* p,unsigned long n);
! FXStream& save(const FXulong* p,unsigned long n);
#endif
/// Save object
FXStream& saveObject(const FXObject* v);
!
/// Load from stream
virtual FXStream& operator>>(FXuchar& v);
***************
*** 164,168 ****
FXStream& operator>>(FXfloat& v);
FXStream& operator>>(FXdouble& v);
!
#ifdef FX_LONG
FXStream& operator>>(FXlong& v);
--- 164,168 ----
FXStream& operator>>(FXfloat& v);
FXStream& operator>>(FXdouble& v);
!
#ifdef FX_LONG
FXStream& operator>>(FXlong& v);
***************
*** 170,190 ****
#endif
! FXStream& load(FXuchar* p,FXuint n);
! FXStream& load(FXchar* p,FXuint n);
! FXStream& load(FXushort* p,FXuint n);
! FXStream& load(FXshort* p,FXuint n);
! FXStream& load(FXuint* p,FXuint n);
! FXStream& load(FXint* p,FXuint n);
! FXStream& load(FXfloat* p,FXuint n);
! FXStream& load(FXdouble* p,FXuint n);
!
#ifdef FX_LONG
! FXStream& load(FXlong* p,FXuint n);
! FXStream& load(FXulong* p,FXuint n);
#endif
/// Load object
FXStream& loadObject(FXObject*& v);
!
/// Destructor
virtual ~FXStream();
--- 170,190 ----
#endif
! FXStream& load(FXuchar* p,unsigned long n);
! FXStream& load(FXchar* p,unsigned long n);
! FXStream& load(FXushort* p,unsigned long n);
! FXStream& load(FXshort* p,unsigned long n);
! FXStream& load(FXuint* p,unsigned long n);
! FXStream& load(FXint* p,unsigned long n);
! FXStream& load(FXfloat* p,unsigned long n);
! FXStream& load(FXdouble* p,unsigned long n);
!
#ifdef FX_LONG
! FXStream& load(FXlong* p,unsigned long n);
! FXStream& load(FXulong* p,unsigned long n);
#endif
/// Load object
FXStream& loadObject(FXObject*& v);
!
/// Destructor
virtual ~FXStream();
***************
*** 197,205 ****
/// File Store Definition
class FXAPI FXFileStream : public FXStream {
! void* file; // File being dealt with
protected:
! virtual void saveItems(const void *buf,FXuint n);
! virtual void loadItems(void *buf,FXuint n);
!
public:
--- 197,205 ----
/// File Store Definition
class FXAPI FXFileStream : public FXStream {
! private:
! void *file; // File being dealt with
protected:
! virtual void saveItems(const void *buf,unsigned long n);
! virtual void loadItems(void *buf,unsigned long n);
public:
***************
*** 219,223 ****
virtual FXStream& operator<<(const FXuchar& v);
virtual FXStream& operator<<(const FXchar& v);
!
/// Load from stream
virtual FXStream& operator>>(FXuchar& v);
--- 219,223 ----
virtual FXStream& operator<<(const FXuchar& v);
virtual FXStream& operator<<(const FXchar& v);
!
/// Load from stream
virtual FXStream& operator>>(FXuchar& v);
***************
*** 228,243 ****
};
!
/************************** Memory Store Definition **************************/
/// Memory Store Definition
class FXAPI FXMemoryStream : public FXStream {
! FXuchar *ptr; // Memory pointer
! FXuint space; // Space in buffer
! FXbool owns; // Owns the data array
protected:
! virtual void saveItems(const void *buf,FXuint n);
! virtual void loadItems(void *buf,FXuint n);
!
public:
--- 228,243 ----
};
!
/************************** Memory Store Definition **************************/
/// Memory Store Definition
class FXAPI FXMemoryStream : public FXStream {
! private:
! FXuchar *ptr; // Memory pointer
! unsigned long space; // Space in buffer
! FXbool owns; // Owns the data array
protected:
! virtual void saveItems(const void *buf,unsigned long n);
! virtual void loadItems(void *buf,unsigned long n);
public:
***************
*** 247,269 ****
/// Open file store
FXbool open(FXuchar* data,FXStreamDirection save_or_load);
!
/// Open memory store
! FXbool open(FXuchar* data,FXuint sp,FXStreamDirection save_or_load);
/// Get available space
! FXuint getSpace() const { return space; }
/// Set available space
! void setSpace(FXuint sp);
!
/// Take buffer away from stream
! void takeBuffer(FXuchar*& buffer,FXuint& sp);
!
/// Give buffer to stream
! void giveBuffer(FXuchar *buffer,FXuint sp);
!
/// Close memory store
FXbool close();
!
/// Move to position
virtual FXbool position(unsigned long p);
--- 247,269 ----
/// Open file store
FXbool open(FXuchar* data,FXStreamDirection save_or_load);
!
/// Open memory store
! FXbool open(FXuchar* data,unsigned long sp,FXStreamDirection save_or_load);
/// Get available space
! unsigned long getSpace() const { return space; }
/// Set available space
! void setSpace(unsigned long sp);
!
/// Take buffer away from stream
! void takeBuffer(FXuchar*& buffer,unsigned long& sp);
!
/// Give buffer to stream
! void giveBuffer(FXuchar *buffer,unsigned long sp);
!
/// Close memory store
FXbool close();
!
/// Move to position
virtual FXbool position(unsigned long p);
***************
*** 272,285 ****
virtual FXStream& operator<<(const FXuchar& v);
virtual FXStream& operator<<(const FXchar& v);
!
/// Load from stream
virtual FXStream& operator>>(FXuchar& v);
virtual FXStream& operator>>(FXchar& v);
!
/// Destructor
virtual ~FXMemoryStream();
};
!
#endif
--- 272,285 ----
virtual FXStream& operator<<(const FXuchar& v);
virtual FXStream& operator<<(const FXchar& v);
!
/// Load from stream
virtual FXStream& operator>>(FXuchar& v);
virtual FXStream& operator>>(FXchar& v);
!
/// Destructor
virtual ~FXMemoryStream();
};
! }
#endif
Index: FXTable.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXTable.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FXTable.h 2 Jan 2002 22:23:56 -0000 1.6
--- FXTable.h 12 Jul 2002 16:34:47 -0000 1.7
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1999,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1999,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXTABLE_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXTABLE_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 40,44 ****
/// Default cell margin
! #define DEFAULT_MARGIN 2
--- 41,45 ----
/// Default cell margin
! const FXint DEFAULT_MARGIN = 2;
***************
*** 389,400 ****
FXint getNumCols() const { return ncols; }
! /// Change cell margins
void setMarginTop(FXint pt);
FXint getMarginTop() const { return margintop; }
void setMarginBottom(FXint pb);
FXint getMarginBottom() const { return marginbottom; }
void setMarginLeft(FXint pl);
FXint getMarginLeft() const { return marginleft; }
void setMarginRight(FXint pr);
FXint getMarginRight() const { return marginright; }
--- 390,415 ----
FXint getNumCols() const { return ncols; }
! /// Change top cell margin
void setMarginTop(FXint pt);
+
+ /// Return top cell margin
FXint getMarginTop() const { return margintop; }
+
+ /// Change bottom cell margin
void setMarginBottom(FXint pb);
+
+ /// Return bottom cell margin
FXint getMarginBottom() const { return marginbottom; }
+
+ /// Change left cell margin
void setMarginLeft(FXint pl);
+
+ /// Return left cell margin
FXint getMarginLeft() const { return marginleft; }
+
+ /// Change right cell margin
void setMarginRight(FXint pr);
+
+ /// Return right cell margin
FXint getMarginRight() const { return marginright; }
***************
*** 492,499 ****
/// Repaint cells between grid lines sr,er and grid lines sc,ec
! void updateRange(FXint sr,FXint er,FXint sc,FXint ec);
/// Repaint cell at r,c
! void updateItem(FXint r,FXint c);
/// Enable, disable, select, deselect, toggle cell
--- 507,514 ----
/// Repaint cells between grid lines sr,er and grid lines sc,ec
! void updateRange(FXint sr,FXint er,FXint sc,FXint ec) const;
/// Repaint cell at r,c
! void updateItem(FXint r,FXint c) const;
/// Enable, disable, select, deselect, toggle cell
***************
*** 574,578 ****
};
!
#endif
--- 589,593 ----
};
! }
#endif
Index: FXText.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXText.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXText.h 25 Feb 2002 15:57:03 -0000 1.11
--- FXText.h 12 Jul 2002 16:34:47 -0000 1.12
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXTEXT_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXTEXT_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 145,149 ****
FXint posToLine(FXint pos,FXint ln) const;
FXbool posVisible(FXint pos) const;
! void updateRange(FXint beg,FXint end);
void movegap(FXint pos);
void sizegap(FXint sz);
--- 146,150 ----
FXint posToLine(FXint pos,FXint ln) const;
FXbool posVisible(FXint pos) const;
! void updateRange(FXint beg,FXint end) const;
void movegap(FXint pos);
void sizegap(FXint sz);
***************
*** 185,189 ****
MOUSE_SCROLL, // Scrolling
MOUSE_DRAG, // Dragging text
- MOUSE_PASTE, // Pasting
MOUSE_TRYDRAG // Tentative drag
};
--- 186,189 ----
***************
*** 241,244 ****
--- 241,245 ----
long onUpdCursorColumn(FXObject*,FXSelector,void*);
long onUpdHaveSelection(FXObject*,FXSelector,void*);
+ long onUpdSelectAll(FXObject*,FXSelector,void*);
long onCmdSetStringValue(FXObject*,FXSelector,void*);
long onCmdGetStringValue(FXObject*,FXSelector,void*);
***************
*** 290,293 ****
--- 291,295 ----
long onCmdChangeCase(FXObject*,FXSelector,void*);
long onCmdShiftText(FXObject*,FXSelector,void*);
+ long onCmdPasteMiddle(FXObject*,FXSelector,void*);
// Changing Selection
***************
*** 339,344 ****
ID_CUT_SEL,
ID_COPY_SEL,
- ID_PASTE_SEL,
ID_DELETE_SEL,
ID_SELECT_CHAR,
ID_SELECT_WORD,
--- 341,347 ----
ID_CUT_SEL,
ID_COPY_SEL,
ID_DELETE_SEL,
+ ID_PASTE_SEL,
+ ID_PASTE_MIDDLE,
ID_SELECT_CHAR,
ID_SELECT_WORD,
***************
*** 588,592 ****
/// Extract n characters of style info from position pos
void extractStyle(FXchar *style,FXint pos,FXint n) const;
!
/// Replace m characters at pos by n characters
void replaceText(FXint pos,FXint m,const FXchar *text,FXint n,FXbool notify=FALSE);
--- 591,595 ----
/// Extract n characters of style info from position pos
void extractStyle(FXchar *style,FXint pos,FXint n) const;
!
/// Replace m characters at pos by n characters
void replaceText(FXint pos,FXint m,const FXchar *text,FXint n,FXbool notify=FALSE);
***************
*** 777,790 ****
/// Change number of visible rows
! void setVisRows(FXint rows);
/// Return number of visible rows
! FXint getVisRows() const { return vrows; }
/// Change number of visible columns
! void setVisCols(FXint cols);
/// Return number of visible columns
! FXint getVisCols() const { return vcols; }
/**
--- 780,793 ----
/// Change number of visible rows
! void setVisibleRows(FXint rows);
/// Return number of visible rows
! FXint getVisibleRows() const { return vrows; }
/// Change number of visible columns
! void setVisibleCols(FXint cols);
/// Return number of visible columns
! FXint getVisibleCols() const { return vcols; }
/**
***************
*** 815,819 ****
};
!
#endif
--- 818,822 ----
};
! }
#endif
Index: FXTextField.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXTextField.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FXTextField.h 2 Jan 2002 22:23:56 -0000 1.8
--- FXTextField.h 12 Jul 2002 16:34:47 -0000 1.9
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXTEXTFIELD_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXTEXTFIELD_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 139,142 ****
--- 140,145 ----
long onCmdToggleOverstrike(FXObject*,FXSelector,void*);
long onUpdToggleOverstrike(FXObject*,FXSelector,void*);
+ long onUpdHaveSelection(FXObject*,FXSelector,void*);
+ long onUpdSelectAll(FXObject*,FXSelector,void*);
public:
enum{
***************
*** 300,303 ****
--- 303,307 ----
};
+ }
#endif
Index: FXTopWindow.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXTopWindow.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FXTopWindow.h 26 Nov 2001 16:13:06 -0000 1.8
--- FXTopWindow.h 12 Jul 2002 16:34:47 -0000 1.9
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXTOPWINDOW_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXTOPWINDOW_H
***************
*** 30,45 ****
/// Title and border decorations
enum {
! DECOR_NONE = 0, /// Borderless window
! DECOR_TITLE = 0x00020000, /// Window title
! DECOR_MINIMIZE = 0x00040000, /// Minimize button
! DECOR_MAXIMIZE = 0x00080000, /// Maximize button
! DECOR_CLOSE = 0x00100000, /// Close button
! DECOR_BORDER = 0x00200000, /// Border
! DECOR_RESIZE = 0x00400000, /// Resize handles
! DECOR_MENU = 0x00800000, /// Window menu
! DECOR_ALL = (DECOR_TITLE|DECOR_MINIMIZE|DECOR_MAXIMIZE|DECOR_CLOSE|DECOR_BORDER|DECOR_RESIZE|DECOR_MENU)
};
--- 30,49 ----
+ namespace FX {
+
/// Title and border decorations
enum {
! DECOR_NONE = 0, /// Borderless window
! DECOR_TITLE = 0x00020000, /// Window title
! DECOR_MINIMIZE = 0x00040000, /// Minimize button
! DECOR_MAXIMIZE = 0x00080000, /// Maximize button
! DECOR_CLOSE = 0x00100000, /// Close button
! DECOR_BORDER = 0x00200000, /// Border
! DECOR_SHRINKABLE = 0x00400000, /// Window can become smaller
! DECOR_STRETCHABLE = 0x00800000, /// Window can become larger
! DECOR_RESIZE = DECOR_SHRINKABLE|DECOR_STRETCHABLE, /// Resize handles
! DECOR_MENU = 0x01000000, /// Window menu
! DECOR_ALL = (DECOR_TITLE|DECOR_MINIMIZE|DECOR_MAXIMIZE|DECOR_CLOSE|DECOR_BORDER|DECOR_SHRINKABLE|DECOR_STRETCHABLE|DECOR_MENU)
};
***************
*** 56,64 ****
! class FXToolbar;
! /// Abstract base class for all top-level windows
class FXAPI FXTopWindow : public FXShell {
FXDECLARE_ABSTRACT(FXTopWindow)
--- 60,90 ----
! class FXToolBar;
! /**
! * Abstract base class for all top-level windows.
! * TopWindows are usually managed by a Window Manager under X11 and
! * therefore borders and window-menus and other decorations like resize-
! * handles are subject to the Window Manager's interpretation of the
! * decoration hints.
! * When a TopWindow is closed, it sends a SEL_CLOSE message to its
! * target. The target should return 0 in response to this message if
! * there is no objection to proceed with the closing of the window, and
! * return 1 otherwise. After the SEL_CLOSE message has been sent and
! * no objection was raised, the window will delete itself.
! * When receiving a SEL_UPDATE, the target can update the title string
! * of the window, so that the title of the window reflects the name
! * of the document, for example.
! * For convenience, TopWindow provides the same layout behavior as
! * the Packer widget, as well as docking and undocking of toolbars.
! * TopWindows can be owned by other windows, or be free-floating.
! * Owned TopWindows will usually remain stacked on top of the owner
! * windows; also, the lifetime of an owned window should not
! * exceed that of the owner.
! * The application will receive an ID_QUIT message when the last
! * MainWindow is hidden, therefore normally terminating the application.
! */
class FXAPI FXTopWindow : public FXShell {
FXDECLARE_ABSTRACT(FXTopWindow)
***************
*** 91,107 ****
#endif
public:
- long onClose(FXObject*,FXSelector,void*);
- long onCmdSetStringValue(FXObject*,FXSelector,void*);
- long onCmdIconify(FXObject*,FXSelector,void*);
- long onCmdDeiconify(FXObject*,FXSelector,void*);
long onFocusUp(FXObject*,FXSelector,void*);
long onFocusDown(FXObject*,FXSelector,void*);
long onFocusLeft(FXObject*,FXSelector,void*);
long onFocusRight(FXObject*,FXSelector,voi...
[truncated message content] |
|
From: Lyle J. <ly...@us...> - 2002-07-12 16:34:51
|
Update of /cvsroot/fxruby/FXRuby/lib/fox
In directory usw-pr-cvs1:/tmp/cvs-serv30500/lib/fox
Modified Files:
aliases.rb
Log Message:
Many, many changes for the fox-1.1 update.
Index: aliases.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/lib/fox/aliases.rb,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** aliases.rb 11 Jul 2002 13:33:13 -0000 1.25
--- aliases.rb 12 Jul 2002 16:34:47 -0000 1.26
***************
*** 9,20 ****
alias appName getAppName
alias vendorName getVendorName
alias defaultVisual getDefaultVisual
alias defaultVisual= setDefaultVisual
alias monoVisual getMonoVisual
! alias root getRoot
alias cursorWindow getCursorWindow
alias focusWindow getFocusWindow
! alias mainWindow getMainWindow
alias modal? isModal
alias normalFont getNormalFont
alias normalFont= setNormalFont
--- 9,24 ----
alias appName getAppName
alias vendorName getVendorName
+ alias argc getArgc
+ alias argv getArgv
alias defaultVisual getDefaultVisual
alias defaultVisual= setDefaultVisual
alias monoVisual getMonoVisual
! alias rootWindow getRootWindow
alias cursorWindow getCursorWindow
alias focusWindow getFocusWindow
! alias popupWindow getPopupWindow
alias modal? isModal
+ alias modalWindow getModalWindow
+ alias modality getModality
alias normalFont getNormalFont
alias normalFont= setNormalFont
***************
*** 270,273 ****
--- 274,290 ----
alias dirBoxStyle= setDirBoxStyle
end
+ class FX_DirItem
+ alias file? isFile
+ alias directory? isDirectory
+ alias executable? isExecutable
+ alias symlink? isSymlink
+ alias chardev? isChardev
+ alias blockdev? isBlockdev
+ alias fifo? isFifo
+ alias socket? isSocket
+ alias assoc getAssoc
+ alias size getSize
+ alias date getDate
+ end
class FX_DirList
alias currentFile getCurrentFile
***************
*** 872,875 ****
--- 889,894 ----
end
class FX_Popup
+ alias prevActive getPrevActive
+ alias nextActive getNextActive
alias frameStyle= setFrameStyle
alias frameStyle getFrameStyle
***************
*** 921,924 ****
--- 940,944 ----
alias total getTotal
alias cancelled? isCancelled
+ alias cancelled= setCancelled
end
class FX_RadioButton
***************
*** 1257,1264 ****
alias textStyle= setTextStyle
alias textStyle getTextStyle
! alias visRows= setVisRows
! alias visRows getVisRows
! alias visCols= setVisCols
! alias visCols getVisCols
alias hiliteMatchTime= setHiliteMatchTime
alias hiliteMatchTime getHiliteMatchTime
--- 1277,1284 ----
alias textStyle= setTextStyle
alias textStyle getTextStyle
! alias visibleRows= setVisibleRows
! alias visibleRows getVisibleRows
! alias visibleCols= setVisibleCols
! alias visibleCols getVisibleCols
alias hiliteMatchTime= setHiliteMatchTime
alias hiliteMatchTime getHiliteMatchTime
***************
*** 1366,1370 ****
end
class FX_TopWindow
! alias iconified? isIconified
alias title= setTitle
alias title getTitle
--- 1386,1391 ----
end
class FX_TopWindow
! alias maximized? isMaximized
! alias minimized? isMinimzed
alias title= setTitle
alias title getTitle
***************
*** 1505,1508 ****
--- 1526,1530 ----
alias accelTable= setAccelTable
alias shell? isShell
+ alias ownerOf? isOwnerOf
alias childOf? isChildOf
alias containsChild? containsChild
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 20:36:42
|
Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv11358
Modified Files:
FXDirList.h FXIconList.h FXList.h FXListBox.h FXMDIChild.h
FXMDIClient.h
Log Message:
Index: FXDirList.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDirList.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FXDirList.h 26 Nov 2001 16:13:03 -0000 1.8
--- FXDirList.h 11 Jul 2002 20:36:38 -0000 1.9
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDIRLIST_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDIRLIST_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 72,84 ****
--- 73,108 ----
/// Constructor
FXDirItem(const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ptr=NULL):FXTreeItem(text,oi,ci,ptr),iprev(NULL),inext(NULL),list(NULL),assoc(NULL),size(0),date(0){}
+
+ /// Return true if this is a file item
+ FXbool isFile() const { return (state&(FOLDER|BLOCKDEV|CHARDEV|FIFO|SOCK))==0; }
+
+ /// Return true if this is a directory item
FXbool isDirectory() const { return (state&FOLDER)!=0; }
+
+ /// Return true if this is an executable item
FXbool isExecutable() const { return (state&EXECUTABLE)!=0; }
+
+ /// Return true if this is a symbolic link item
FXbool isSymlink() const { return (state&SYMLINK)!=0; }
+
+ /// Return true if this is a character device item
FXbool isChardev() const { return (state&CHARDEV)!=0; }
+
+ /// Return true if this is a block device item
FXbool isBlockdev() const { return (state&BLOCKDEV)!=0; }
+
+ /// Return true if this is an FIFO item
FXbool isFifo() const { return (state&FIFO)!=0; }
+
+ /// Return true if this is a socket
FXbool isSocket() const { return (state&SOCK)!=0; }
+
+ /// Return the file-association object for this item
FXFileAssoc* getAssoc() const { return assoc; }
+
+ /// Return the file size for this item
unsigned long getSize() const { return size; }
+
+ /// Return the date for this item
FXTime getDate() const { return date; }
};
***************
*** 248,251 ****
--- 272,276 ----
};
+ }
#endif
Index: FXIconList.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXIconList.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXIconList.h 2 Jan 2002 22:23:56 -0000 1.11
--- FXIconList.h 11 Jul 2002 20:36:38 -0000 1.12
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1999,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1999,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXICONLIST_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXICONLIST_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 389,393 ****
/// Repaint item at index
! void updateItem(FXint index);
/// Select items in rectangle
--- 390,394 ----
/// Repaint item at index
! void updateItem(FXint index) const;
/// Select items in rectangle
***************
*** 491,495 ****
};
!
#endif
--- 492,496 ----
};
! }
#endif
Index: FXList.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXList.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXList.h 2 Jan 2002 22:23:56 -0000 1.11
--- FXList.h 11 Jul 2002 20:36:38 -0000 1.12
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXLIST_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXLIST_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 300,304 ****
/// Repaint item
! void updateItem(FXint index);
/// Enable item
--- 301,305 ----
/// Repaint item
! void updateItem(FXint index) const;
/// Enable item
***************
*** 393,396 ****
--- 394,398 ----
};
+ }
#endif
Index: FXListBox.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXListBox.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FXListBox.h 27 Feb 2002 19:19:04 -0000 1.8
--- FXListBox.h 11 Jul 2002 20:36:38 -0000 1.9
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 60,63 ****
--- 61,65 ----
long onFocusUp(FXObject*,FXSelector,void*);
long onFocusDown(FXObject*,FXSelector,void*);
+ long onFocusSelf(FXObject*,FXSelector,void*);
long onFieldButton(FXObject*,FXSelector,void*);
long onListUpdate(FXObject*,FXSelector,void*);
***************
*** 226,230 ****
};
!
#endif
--- 228,232 ----
};
! }
#endif
Index: FXMDIChild.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXMDIChild.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FXMDIChild.h 26 Nov 2001 16:13:04 -0000 1.5
--- FXMDIChild.h 11 Jul 2002 20:36:38 -0000 1.6
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXMDICHILD_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXMDICHILD_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 82,88 ****
FXint oldh;
FXuchar action;
- private:
- FXMDIChild *mdinext;
- FXMDIChild *mdiprev;
protected:
FXMDIChild();
--- 83,86 ----
***************
*** 113,119 ****
long onSelected(FXObject*,FXSelector,void*);
long onDeselected(FXObject*,FXSelector,void*);
- long onMinimize(FXObject*,FXSelector,void*);
- long onRestore(FXObject*,FXSelector,void*);
- long onMaximize(FXObject*,FXSelector,void*);
long onCmdRestore(FXObject*,FXSelector,void*);
long onCmdMaximize(FXObject*,FXSelector,void*);
--- 111,114 ----
***************
*** 131,134 ****
--- 126,130 ----
long onUpdClose(FXObject*,FXSelector,void*);
long onCmdSetStringValue(FXObject*,FXSelector,void*);
+ long onCmdGetStringValue(FXObject*,FXSelector,void*);
virtual long onDefault(FXObject*,FXSelector,void*);
public:
***************
*** 143,152 ****
virtual void detach();
- /// Get next MDI Child
- FXMDIChild* getMDINext() const { return mdinext; }
-
- /// Get previous MDI Child
- FXMDIChild* getMDIPrev() const { return mdiprev; }
-
/// Compute default size
virtual FXint getDefaultWidth();
--- 139,142 ----
***************
*** 214,217 ****
--- 204,219 ----
void setTitleBackColor(FXColor clr);
+ /// Maximize MDI window, return TRUE if maximized
+ virtual FXbool maximize(FXbool notify=FALSE);
+
+ /// Minimize/iconify MDI window, return TRUE if minimized
+ virtual FXbool minimize(FXbool notify=FALSE);
+
+ /// Restore MDI window to normal, return TRUE if restored
+ virtual FXbool restore(FXbool notify=FALSE);
+
+ /// Close MDI window, return TRUE if actually closed
+ virtual FXbool close(FXbool notify=FALSE);
+
/// Return TRUE if maximized
FXbool isMaximized() const;
***************
*** 220,232 ****
FXbool isMinimized() const;
- /// Maximize MDI Child
- virtual void maximize(FXbool notify=FALSE);
-
- /// Minimize/iconify MDI Child
- virtual void minimize(FXbool notify=FALSE);
-
- /// Restore MDI Child to normal
- virtual void restore(FXbool notify=FALSE);
-
/// Get window icon
FXIcon *getWindowIcon() const;
--- 222,225 ----
***************
*** 257,260 ****
--- 250,254 ----
};
+ }
#endif
Index: FXMDIClient.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXMDIClient.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXMDIClient.h 26 Nov 2001 16:13:04 -0000 1.3
--- FXMDIClient.h 11 Jul 2002 20:36:38 -0000 1.4
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXMDICLIENT_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXMDICLIENT_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 47,67 ****
* window by the MDI client.
*/
! class FXAPI FXMDIClient : public FXScrollArea {
FXDECLARE(FXMDIClient)
friend class FXMDIChild;
protected:
FXint cascadex; // Cascade offset X
FXint cascadey; // Cascade offset Y
- FXint xmin; // Space taken up by all children
- FXint xmax;
- FXint ymin;
- FXint ymax;
- private:
- FXMDIChild *mdifirst;
- FXMDIChild *mdilast;
- FXMDIChild *active;
protected:
FXMDIClient();
- void recompute();
virtual void layout();
private:
--- 48,60 ----
* window by the MDI client.
*/
! class FXAPI FXMDIClient : public FXComposite {
FXDECLARE(FXMDIClient)
friend class FXMDIChild;
protected:
+ FXMDIChild *active; // Active child
FXint cascadex; // Cascade offset X
FXint cascadey; // Cascade offset Y
protected:
FXMDIClient();
virtual void layout();
private:
***************
*** 116,130 ****
FXMDIClient(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
! /// Recalculate interior for scrollbars
! virtual void recalc();
!
! /// Move MDI Children around
! virtual void moveContents(FXint x,FXint y);
!
! /// Get first MDI Child
! FXMDIChild* getMDIChildFirst() const { return mdifirst; }
! /// Get last MDI Child
! FXMDIChild* getMDIChildLast() const { return mdilast; }
/// Pass message to all MDI Child windows
--- 109,117 ----
FXMDIClient(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
! /// Return default width
! virtual FXint getDefaultWidth();
! /// Return default height
! virtual FXint getDefaultHeight();
/// Pass message to all MDI Child windows
***************
*** 134,149 ****
long forallDocWindows(FXObject* document,FXObject* sender,FXSelector sel,void* ptr);
! /// Recompute content width
! virtual FXint getContentWidth();
!
! /// Recompute content height
! virtual FXint getContentHeight();
/// Get current active child; may be NULL!
FXMDIChild* getActiveChild() const { return active; }
! /// Set active MDI Child
! FXbool setActiveChild(FXMDIChild* child=NULL,FXbool notify=TRUE);
!
/// Change cascade offset X
void setCascadeX(FXint off){ cascadex=off; }
--- 121,139 ----
long forallDocWindows(FXObject* document,FXObject* sender,FXSelector sel,void* ptr);
! /// Set active MDI Child
! virtual FXbool setActiveChild(FXMDIChild* child=NULL,FXbool notify=TRUE);
/// Get current active child; may be NULL!
FXMDIChild* getActiveChild() const { return active; }
! // Cascade windows
! virtual void cascade(FXbool notify=FALSE);
!
! // Layout horizontally
! virtual void horizontal(FXbool notify=FALSE);
!
! // Layout vertically
! virtual void vertical(FXbool notify=FALSE);
!
/// Change cascade offset X
void setCascadeX(FXint off){ cascadex=off; }
***************
*** 168,171 ****
--- 158,162 ----
};
+ }
#endif
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 18:00:44
|
Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv23879
Modified Files:
FXAccelTable.h FXApp.h FXColorBar.h FXComboBox.h FXDialogBox.h
Removed Files:
FXStatusline.h
Log Message:
Index: FXAccelTable.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXAccelTable.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXAccelTable.h 26 Nov 2001 16:13:03 -0000 1.3
--- FXAccelTable.h 11 Jul 2002 18:00:41 -0000 1.4
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXACCELTABLE_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXACCELTABLE_H
***************
*** 29,35 ****
#endif
!
!
! struct FXAccelKey;
--- 29,33 ----
#endif
! namespace FX {
***************
*** 41,44 ****
--- 39,49 ----
class FXAPI FXAccelTable : public FXObject {
FXDECLARE(FXAccelTable)
+ protected:
+ struct FXAccelKey {
+ FXObject *target; // Target object of message
+ FXSelector messagedn; // Message being sent
+ FXSelector messageup; // Message being sent
+ FXHotKey code; // Keysym and modifier mask to match
+ };
private:
FXAccelKey *key; // Accelerator table
***************
*** 66,70 ****
/// Return target object of the given accelerator
FXObject* targetOfAccel(FXHotKey hotkey) const;
!
/// Remove mapping for specified hot key
void removeAccel(FXHotKey hotkey);
--- 71,75 ----
/// Return target object of the given accelerator
FXObject* targetOfAccel(FXHotKey hotkey) const;
!
/// Remove mapping for specified hot key
void removeAccel(FXHotKey hotkey);
***************
*** 80,83 ****
--- 85,89 ----
};
+ }
#endif
Index: FXApp.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXApp.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXApp.h 2 Jan 2002 22:23:55 -0000 1.11
--- FXApp.h 11 Jul 2002 18:00:42 -0000 1.12
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXAPP_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXAPP_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 38,41 ****
--- 39,43 ----
class FXRootWindow;
class FXMainWindow;
+ class FXPopup;
class FXFont;
class FXDC;
***************
*** 146,149 ****
--- 148,152 ----
friend class FXTopWindow;
friend class FXMainWindow;
+ friend class FXPopup;
friend class FXFont;
friend class FXVisual;
***************
*** 157,162 ****
// Platform independent private data
void *display; // Display we're talking to
FXRegistry registry; // Application setting registry
- FXWindow *mainWindow; // Main window
FXWindow *focusWindow; // Window which has the focus
FXWindow *cursorWindow; // Window under the cursor
--- 160,165 ----
// Platform independent private data
void *display; // Display we're talking to
+ const FXchar *dpy; // Initial display guess
FXRegistry registry; // Application setting registry
FXWindow *focusWindow; // Window which has the focus
FXWindow *cursorWindow; // Window under the cursor
***************
*** 169,172 ****
--- 172,176 ----
FXWindow *dragWindow; // Drag source window
FXWindow *refresher; // GUI refresher pointer
+ FXPopup *popupWindow; // Current popup window
FXRootWindow *root; // Root window
FXVisual *monoVisual; // Monochrome visual
***************
*** 182,185 ****
--- 186,190 ----
FXint nsignals; // Number of signals
FXFont *normalFont; // Normal font
+ FXFont *stockFont; // Stock font
FXuint maxcolors; // Maximum number of colors to allocate
FXEvent event; // Event
***************
*** 214,217 ****
--- 219,224 ----
FXuint waitcount; // Number of times wait cursor was called
FXCursor *cursor[DEF_ROTATE_CURSOR+1];
+ FXint appArgc; // Argument count
+ const FXchar *const *appArgv; // Argument vector
FXbool initialized; // Has been initialized
***************
*** 229,232 ****
--- 236,243 ----
FXID wmTakeFocus; // Focus explicitly set by app
FXID wmState; // Window state
+ FXID wmNetSupported; // Extended Window Manager states list
+ FXID wmNetState; // Extended Window Manager window state
+ FXID wmNetHMaximized; // Extended Window Manager horizontally maximized
+ FXID wmNetVMaximized; // Extended Window Manager vertically maximized
FXID ddeTargets; // DDE targets atom
FXID ddeAtom; // DDE exchange atom
***************
*** 294,298 ****
FXRectangle xdndRect; // XDND rectangle bounding target
FXID stipples[17]; // Standard stipple bitmaps
- static FXID hInstance; // Global instance handle
void **handles; // Waitable object handles
--- 305,308 ----
***************
*** 306,318 ****
static void signalhandler(int sig);
static void immediatesignalhandler(int sig);
! void dragdropSetData(FXWindow* window,FXDragType type,FXuchar* data,FXuint size);
! void dragdropGetData(FXWindow* window,FXDragType type,FXuchar*& data,FXuint& size);
! void dragdropGetTypes(FXWindow* window,FXDragType*& types,FXuint& numtypes);
! void selectionSetData(FXWindow* window,FXDragType type,FXuchar* data,FXuint size);
! void selectionGetData(FXWindow* window,FXDragType type,FXuchar*& data,FXuint& size);
! void selectionGetTypes(FXWindow* window,FXDragType*& types,FXuint& numtypes);
! void clipboardSetData(FXWindow* window,FXDragType type,FXuchar* data,FXuint size);
! void clipboardGetData(FXWindow* window,FXDragType type,FXuchar*& data,FXuint& size);
! void clipboardGetTypes(FXWindow* window,FXDragType*& types,FXuint& numtypes);
#ifndef WIN32
void addRepaint(FXID win,FXint x,FXint y,FXint w,FXint h,FXbool synth=0);
--- 316,328 ----
static void signalhandler(int sig);
static void immediatesignalhandler(int sig);
! void dragdropSetData(const FXWindow* window,FXDragType type,FXuchar* data,FXuint size);
! void dragdropGetData(const FXWindow* window,FXDragType type,FXuchar*& data,FXuint& size);
! void dragdropGetTypes(const FXWindow* window,FXDragType*& types,FXuint& numtypes);
! void selectionSetData(const FXWindow* window,FXDragType type,FXuchar* data,FXuint size);
! void selectionGetData(const FXWindow* window,FXDragType type,FXuchar*& data,FXuint& size);
! void selectionGetTypes(const FXWindow* window,FXDragType*& types,FXuint& numtypes);
! void clipboardSetData(const FXWindow* window,FXDragType type,FXuchar* data,FXuint size);
! void clipboardGetData(const FXWindow* window,FXDragType type,FXuchar*& data,FXuint& size);
! void clipboardGetTypes(const FXWindow* window,FXDragType*& types,FXuint& numtypes);
#ifndef WIN32
void addRepaint(FXID win,FXint x,FXint y,FXint w,FXint h,FXbool synth=0);
***************
*** 368,372 ****
/// Connection to display; this is called by init()
! FXbool openDisplay(const FXchar* dpyname=":0");
/// Close connection to the display
--- 378,382 ----
/// Connection to display; this is called by init()
! FXbool openDisplay(const FXchar* dpyname=NULL);
/// Close connection to the display
***************
*** 376,379 ****
--- 386,395 ----
void* getDisplay() const { return display; }
+ /// Get argument count
+ FXint getArgc() const { return appArgc; }
+
+ /// Get argument vector
+ const FXchar *const *getArgv() const { return appArgv; }
+
/// Get default visual
FXVisual* getDefaultVisual() const { return defaultVisual; }
***************
*** 386,390 ****
/// Get root Window
! FXRootWindow* getRoot() const { return root; }
/// Get the window under the cursor, if any
--- 402,406 ----
/// Get root Window
! FXRootWindow* getRootWindow() const { return root; }
/// Get the window under the cursor, if any
***************
*** 394,399 ****
FXWindow *getFocusWindow() const { return focusWindow; }
! /// Get main window, if any
! FXWindow *getMainWindow() const { return mainWindow; }
/// Find window from id
--- 410,415 ----
FXWindow *getFocusWindow() const { return focusWindow; }
! /// Get current popup window, if any
! FXPopup* getPopupWindow() const { return popupWindow; }
/// Find window from id
***************
*** 510,517 ****
/// Return window of current modal loop
! FXWindow* modalWindow() const;
/// Return mode of current modal loop
! FXModality modalModality() const;
/**
--- 526,533 ----
/// Return window of current modal loop
! FXWindow* getModalWindow() const;
/// Return mode of current modal loop
! FXModality getModality() const;
/**
***************
*** 541,545 ****
/// Flush pending repaints
void flush(FXbool sync=FALSE);
!
/**
* Paint all windows marked for repainting.
--- 557,561 ----
/// Flush pending repaints
void flush(FXbool sync=FALSE);
!
/**
* Paint all windows marked for repainting.
***************
*** 662,665 ****
--- 678,683 ----
virtual ~FXApp();
};
+
+ }
#endif
Index: FXColorBar.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXColorBar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXColorBar.h 17 Jan 2002 23:52:57 -0000 1.3
--- FXColorBar.h 11 Jul 2002 18:00:42 -0000 1.4
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 2001,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORBAR_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORBAR_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 107,126 ****
void setBarStyle(FXuint style);
! /// Set status line help text for this color well
void setHelpText(const FXString& text){ help=text; }
! /// Get status line help text for this color well
FXString getHelpText() const { return help; }
! /// Set tool tip message for this color well
void setTipText(const FXString& text){ tip=text; }
! /// Get tool tip message for this color well
FXString getTipText() const { return tip; }
! /// Save color well to a stream
virtual void save(FXStream& store) const;
! /// Load color well from a stream
virtual void load(FXStream& store);
--- 108,127 ----
void setBarStyle(FXuint style);
! /// Set status line help text for this color bar
void setHelpText(const FXString& text){ help=text; }
! /// Get status line help text for this color bar
FXString getHelpText() const { return help; }
! /// Set tool tip message for this color bar
void setTipText(const FXString& text){ tip=text; }
! /// Get tool tip message for this color bar
FXString getTipText() const { return tip; }
! /// Save color bar to a stream
virtual void save(FXStream& store) const;
! /// Load color bar from a stream
virtual void load(FXStream& store);
***************
*** 129,132 ****
--- 130,134 ----
};
+ }
#endif
Index: FXComboBox.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXComboBox.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FXComboBox.h 27 Feb 2002 19:19:04 -0000 1.8
--- FXComboBox.h 11 Jul 2002 18:00:42 -0000 1.9
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 67,70 ****
--- 68,72 ----
long onFocusUp(FXObject*,FXSelector,void*);
long onFocusDown(FXObject*,FXSelector,void*);
+ long onFocusSelf(FXObject*,FXSelector,void*);
long onTextButton(FXObject*,FXSelector,void*);
long onTextChanged(FXObject*,FXSelector,void*);
***************
*** 244,248 ****
};
!
#endif
--- 246,250 ----
};
! }
#endif
Index: FXDialogBox.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDialogBox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXDialogBox.h 26 Nov 2001 16:13:03 -0000 1.4
--- FXDialogBox.h 11 Jul 2002 18:00:42 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDIALOGBOX_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDIALOGBOX_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 47,51 ****
long onKeyPress(FXObject*,FXSelector,void*);
long onKeyRelease(FXObject*,FXSelector,void*);
- long onClose(FXObject*,FXSelector,void*);
long onCmdAccept(FXObject*,FXSelector,void*);
long onCmdCancel(FXObject*,FXSelector,void*);
--- 48,51 ----
***************
*** 68,71 ****
--- 68,72 ----
};
+ }
#endif
--- FXStatusline.h DELETED ---
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 18:00:26
|
Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv23484/fox-includes
Modified Files:
FXDC.h FXDCPrint.h FXDCWindow.h
Log Message:
Added support for new FXDC virtual functions fillChord() and fillChords().
Index: FXDC.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDC.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FXDC.h 2 Jan 2002 22:23:56 -0000 1.7
--- FXDC.h 11 Jul 2002 18:00:23 -0000 1.8
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1999,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1999,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,28 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDC_H
#define FXDC_H
/// Drawing (BITBLT) functions
--- 20,29 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDC_H
#define FXDC_H
+ namespace FX {
/// Drawing (BITBLT) functions
***************
*** 75,79 ****
enum FXFillStyle {
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
--- 76,80 ----
enum FXFillStyle {
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
***************
*** 121,132 ****
/// Line segment
! struct FXSegment {
! FXshort x1,y1,x2,y2;
};
/// Arc
! struct FXArc {
! FXshort x,y,w,h,a,b;
};
--- 122,133 ----
/// Line segment
! struct FXSegment {
! FXshort x1,y1,x2,y2;
};
/// Arc
! struct FXArc {
! FXshort x,y,w,h,a,b;
};
***************
*** 209,215 ****
/**
* 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,h specify the bounding rectangle.
--- 210,216 ----
/**
* 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,h specify the bounding rectangle.
***************
*** 222,225 ****
--- 223,230 ----
virtual void fillRectangles(const FXRectangle* rectangles,FXuint nrectangles);
+ /// Fill chord
+ virtual void fillChord(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
+ virtual void fillChords(const FXArc* chords,FXuint nchords);
+
/// Draw arcs
virtual void fillArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
***************
*** 241,245 ****
/// Draw focus rectangle
virtual void drawFocusRectangle(FXint x,FXint y,FXint w,FXint h);
!
/// Draw area from source
virtual void drawArea(const FXDrawable* source,FXint sx,FXint sy,FXint sw,FXint sh,FXint dx,FXint dy);
--- 246,250 ----
/// Draw focus rectangle
virtual void drawFocusRectangle(FXint x,FXint y,FXint w,FXint h);
!
/// Draw area from source
virtual void drawArea(const FXDrawable* source,FXint sx,FXint sy,FXint sw,FXint sh,FXint dx,FXint dy);
***************
*** 274,278 ****
/**
* 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.
--- 279,283 ----
/**
* 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.
***************
*** 355,362 ****
/// Set clip rectangle
virtual void setClipRectangle(FXint x,FXint y,FXint w,FXint h);
!
/// Change clip rectangle
virtual void setClipRectangle(const FXRectangle& rectangle);
!
/// Return clip rectangle
const FXRectangle& getClipRectangle() const { return clip; }
--- 360,367 ----
/// Set clip rectangle
virtual void setClipRectangle(FXint x,FXint y,FXint w,FXint h);
!
/// Change clip rectangle
virtual void setClipRectangle(const FXRectangle& rectangle);
!
/// Return clip rectangle
const FXRectangle& getClipRectangle() const { return clip; }
***************
*** 396,399 ****
--- 401,405 ----
};
+ }
#endif
Index: FXDCPrint.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDCPrint.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FXDCPrint.h 26 Nov 2001 16:13:03 -0000 1.8
--- FXDCPrint.h 11 Jul 2002 18:00:23 -0000 1.9
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDCPRINT_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDCPRINT_H
***************
*** 31,34 ****
--- 31,36 ----
////////////////////////////// UNDER DEVELOPMENT //////////////////////////////
+ namespace FX {
+
class FXApp;
class FXDrawable;
***************
*** 160,163 ****
--- 162,169 ----
virtual void fillRectangles(const FXRectangle* rectangles,FXuint nrectangles);
+ /// Fill chord
+ virtual void fillChord(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
+ virtual void fillChords(const FXArc* chords,FXuint nchords);
+
/// Draw arcs
virtual void fillArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
***************
*** 257,260 ****
--- 263,267 ----
};
+ }
#endif
Index: FXDCWindow.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDCWindow.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FXDCWindow.h 2 Jan 2002 22:23:56 -0000 1.7
--- FXDCWindow.h 11 Jul 2002 18:00:23 -0000 1.8
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1999,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1999,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDCWINDOW_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDCWINDOW_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 40,44 ****
-
/**
* Window Device Context
--- 41,44 ----
***************
*** 122,125 ****
--- 122,129 ----
virtual void fillRectangles(const FXRectangle* rectangles,FXuint nrectangles);
+ /// Fill chord
+ virtual void fillChord(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
+ virtual void fillChords(const FXArc* chords,FXuint nchords);
+
/// Draw arcs
virtual void fillArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
***************
*** 225,228 ****
--- 229,233 ----
};
+ }
#endif
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 18:00:26
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv23484/swig-interfaces
Modified Files:
FXDC.i stubs.i
Log Message:
Added support for new FXDC virtual functions fillChord() and fillChords().
Index: FXDC.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDC.i,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** FXDC.i 11 Jul 2002 13:33:14 -0000 1.22
--- FXDC.i 11 Jul 2002 18:00:23 -0000 1.23
***************
*** 252,255 ****
--- 252,259 ----
virtual void fillRectangles(const FXRectangle* rectangles,FXuint nrectangles);
+ /// Fill chord
+ virtual void fillChord(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
+ virtual void fillChords(const FXArc* chords,FXuint nchords);
+
/// Draw arcs
virtual void fillArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
Index: stubs.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/stubs.i,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** stubs.i 11 Jul 2002 13:33:14 -0000 1.24
--- stubs.i 11 Jul 2002 18:00:23 -0000 1.25
***************
*** 52,55 ****
--- 52,57 ----
%name(fillRectangle) void _fillRectangle(FXint x,FXint y,FXint w,FXint h); \
%name(fillRectangles) void _fillRectangles(const FXRectangle* rectangles,FXuint nrectangles); \
+ %name(fillChord) void _fillChord(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2); \
+ %name(fillChords) void _fillChords(const FXArc* chords,FXuint nchords); \
%name(fillArc) void _fillArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2); \
%name(fillArcs) void _fillArcs(const FXArc* arcs,FXuint narcs); \
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 18:00:26
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv23484/ext/fox/include
Modified Files:
FXRbDC.h FXRbDCVirtuals.h
Log Message:
Added support for new FXDC virtual functions fillChord() and fillChords().
Index: FXRbDC.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbDC.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXRbDC.h 3 Apr 2002 21:40:57 -0000 1.3
--- FXRbDC.h 11 Jul 2002 18:00:23 -0000 1.4
***************
*** 113,116 ****
--- 113,128 ----
rb_funcall(FXRbGetRubyObj(this),rb_intern("fillRectangles"),1,FXRbMakeArray(rectangles,nrectangles)); \
} \
+ void cls::_fillChord(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2){ \
+ baseclass::fillChord(x,y,w,h,ang1,ang2); \
+ } \
+ void cls::fillChord(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2){ \
+ FXRbCallVoidMethod(this,"fillChord",x,y,w,h,ang1,ang2); \
+ } \
+ void cls::_fillChords(const FXArc* chords,FXuint nchords){ \
+ baseclass::fillChords(chords,nchords); \
+ } \
+ void cls::fillChords(const FXArc* chords,FXuint nchords){ \
+ rb_funcall(FXRbGetRubyObj(this),rb_intern("fillChords"),1,FXRbMakeArray(chords,nchords)); \
+ } \
void cls::_fillArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2){ \
baseclass::fillArc(x,y,w,h,ang1,ang2); \
Index: FXRbDCVirtuals.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbDCVirtuals.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXRbDCVirtuals.h 3 Apr 2002 21:40:57 -0000 1.3
--- FXRbDCVirtuals.h 11 Jul 2002 18:00:23 -0000 1.4
***************
*** 84,87 ****
--- 84,99 ----
virtual void fillRectangles(const FXRectangle* rectangles,FXuint nrectangles);
+ // Calls the base class version of fillChord()
+ void _fillChord(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
+
+ // Overrides the base class version of fillChord()
+ virtual void fillChord(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
+
+ // Calls the base class version of fillChords()
+ void _fillChords(const FXChord* chords,FXuint nchords);
+
+ // Overrides the base class version of fillChords()
+ virtual void fillChords(const FXChord* chords,FXuint nchords);
+
// Calls the base class version of fillArc()
void _fillArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 17:45:06
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv17489/ext/fox/include
Modified Files:
FXRbCursor.h
Log Message:
Added default argument values for FXCursor hotspot.
Index: FXRbCursor.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbCursor.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbCursor.h 12 Jul 2001 19:44:17 -0000 1.1
--- FXRbCursor.h 11 Jul 2002 17:44:58 -0000 1.2
***************
*** 56,60 ****
/// Make cursor from source and mask; cursor size should at most 32x32 for portability!
! FXRbCursor(FXApp* a,const void* src,const void* msk,FXint w=32,FXint h=32,FXint hx=-1,FXint hy=-1) : FXCursor(a,src,msk,w,h,hx,hy){
FXRbRegisterAppSensitiveObject(this);
}
--- 56,60 ----
/// Make cursor from source and mask; cursor size should at most 32x32 for portability!
! FXRbCursor(FXApp* a,const void* src,const void* msk,FXint w=32,FXint h=32,FXint hx=0,FXint hy=0) : FXCursor(a,src,msk,w,h,hx,hy){
FXRbRegisterAppSensitiveObject(this);
}
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 17:45:06
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv17489/swig-interfaces
Modified Files:
FXCursor.i
Log Message:
Added default argument values for FXCursor hotspot.
Index: FXCursor.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXCursor.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FXCursor.i 11 Jul 2002 13:33:14 -0000 1.12
--- FXCursor.i 11 Jul 2002 17:44:58 -0000 1.13
***************
*** 54,58 ****
/// Make cursor from source and mask; cursor size should at most 32x32 for portability!
! FXCursor(FXApp* a,const void* src,const void* msk,FXint w,FXint h,FXint hx,FXint hy);
/// Width of cursor
--- 54,58 ----
/// Make cursor from source and mask; cursor size should at most 32x32 for portability!
! FXCursor(FXApp* a,const void* src,const void* msk,FXint w=32,FXint h=32,FXint hx=0,FXint hy=0);
/// Width of cursor
***************
*** 101,105 ****
// Construct from source and mask
! FXRbCursor(FXApp* a,const void* src,const void* msk,FXint w,FXint h,FXint hx,FXint hy);
// Destructor
--- 101,105 ----
// Construct from source and mask
! FXRbCursor(FXApp* a,const void* src,const void* msk,FXint w=32,FXint h=32,FXint hx=0,FXint hy=0);
// Destructor
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 17:45:06
|
Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv17489/fox-includes
Modified Files:
FXCursor.h
Log Message:
Added default argument values for FXCursor hotspot.
Index: FXCursor.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXCursor.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXCursor.h 26 Nov 2001 16:13:03 -0000 1.4
--- FXCursor.h 11 Jul 2002 17:44:58 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCURSOR_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCURSOR_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 68,72 ****
/// Make cursor from source and mask; cursor size should at most 32x32 for portability!
! FXCursor(FXApp* a,const void* src,const void* msk,FXint w=32,FXint h=32,FXint hx=-1,FXint hy=-1);
/// Width of cursor
--- 69,73 ----
/// Make cursor from source and mask; cursor size should at most 32x32 for portability!
! FXCursor(FXApp* a,const void* src,const void* msk,FXint w=32,FXint h=32,FXint hx=0,FXint hy=0);
/// Width of cursor
***************
*** 107,110 ****
--- 108,112 ----
};
+ }
#endif
|
Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv10097
Modified Files:
FX4Splitter.h FXArray.h FXArrowButton.h FXBMPIcon.h
FXBMPImage.h FXBitmap.h FXButton.h FXCURCursor.h FXCanvas.h
FXCharset.h FXCheckButton.h FXColorDialog.h FXColorSelector.h
FXColorWell.h FXColorWheel.h FXComposite.h FXDHMat.h FXDHVec.h
FXDQuat.h FXDVec.h FXDataTarget.h FXDebugTarget.h
FXDelegator.h FXDial.h FXDict.h FXDirBox.h FXDirDialog.h
FXDirSelector.h FXDocument.h FXDragCorner.h FXDrawable.h
FXDriveBox.h FXElement.h FXException.h FXFile.h FXFileDialog.h
FXFileDict.h FXFileList.h FXFileSelector.h FXFont.h
FXFontDialog.h FXFontSelector.h FXFrame.h FXGIFCursor.h
FXGIFIcon.h FXGIFImage.h FXGLCanvas.h FXGLCone.h FXGLContext.h
FXGLCube.h FXGLCylinder.h FXGLObject.h FXGLShape.h
FXGLSphere.h FXGLTriangleMesh.h FXGLViewer.h FXGLVisual.h
FXGroupBox.h FXHMat.h FXHVec.h FXHeader.h FXHorizontalFrame.h
FXICOIcon.h FXICOImage.h FXIcon.h FXId.h FXImage.h
FXImageView.h FXInputDialog.h FXJPGIcon.h FXJPGImage.h
FXLabel.h FXMDIButton.h FXMenuButton.h FXMenuCaption.h
FXMenuCascade.h FXMenuCommand.h FXMenuPane.h FXMenuSeparator.h
FXMenuTitle.h FXMessageBox.h FXObjectList.h FXOptionMenu.h
FXPCXIcon.h FXPCXImage.h FXPNGIcon.h FXPNGImage.h FXPacker.h
FXPicker.h FXPoint.h FXPrintDialog.h FXQuat.h FXRGBIcon.h
FXRGBImage.h FXRadioButton.h FXRange.h FXRecentFiles.h
FXRectangle.h FXRegion.h FXRegistry.h FXReplaceDialog.h
FXRex.h FXRootWindow.h FXScrollWindow.h FXSearchDialog.h
FXSettings.h FXShell.h FXShutter.h FXSize.h FXSlider.h
FXSpinner.h FXSplitter.h FXString.h FXStringDict.h
FXSwitcher.h FXTGAIcon.h FXTGAImage.h FXTIFIcon.h FXTIFImage.h
FXTabBar.h FXTabBook.h FXTabItem.h FXToggleButton.h FXURL.h
FXUndoList.h FXVec.h FXVerticalFrame.h FXVisual.h FXXPMIcon.h
FXXPMImage.h fx.h fx3d.h fxkeys.h fxver.h xincs.h
Log Message:
Checked in first set of fox-1.1.13 header files (those which haven't
changed other than inclusion in FX namespace).
Index: FX4Splitter.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FX4Splitter.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FX4Splitter.h 26 Nov 2001 16:13:03 -0000 1.5
--- FX4Splitter.h 11 Jul 2002 17:28:13 -0000 1.6
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1999,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1999,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FX4SPLITTER_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FX4SPLITTER_H
***************
*** 29,33 ****
#endif
!
// Splitter options
--- 29,33 ----
#endif
! namespace FX {
// Splitter options
***************
*** 157,160 ****
--- 157,161 ----
};
+ }
#endif
Index: FXArray.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXArray.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXArray.h 8 Mar 2001 21:51:06 -0000 1.3
--- FXArray.h 11 Jul 2002 17:28:13 -0000 1.4
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,28 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXARRAY_H
#define FXARRAY_H
--- 20,33 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXARRAY_H
#define FXARRAY_H
+ #ifndef FXELEMENT_H
+ #include "FXElement.h"
+ #endif
+
+ namespace FX {
***************
*** 104,108 ****
template<class TYPE>
FXint FXArray<TYPE>::size() const {
! return total;
}
--- 109,113 ----
template<class TYPE>
FXint FXArray<TYPE>::size() const {
! return total;
}
***************
*** 126,131 ****
template<class TYPE>
const TYPE& FXArray<TYPE>::operator[](FXint i) const {
! FXASSERT(0<=i&&i<number);
! return list[i];
}
--- 131,136 ----
template<class TYPE>
const TYPE& FXArray<TYPE>::operator[](FXint i) const {
! FXASSERT(0<=i&&i<number);
! return list[i];
}
***************
*** 133,139 ****
// Return element lvalue
template<class TYPE>
! TYPE& FXArray<TYPE>::operator[](FXint i){
! FXASSERT(0<=i&&i<number);
! return list[i];
}
--- 138,144 ----
// Return element lvalue
template<class TYPE>
! TYPE& FXArray<TYPE>::operator[](FXint i){
! FXASSERT(0<=i&&i<number);
! return list[i];
}
***************
*** 188,192 ****
}
}
!
// Insert element anywhere
--- 193,197 ----
}
}
!
// Insert element anywhere
***************
*** 198,203 ****
list[pos]=p;
}
!
!
// Append element at end
template<class TYPE>
--- 203,208 ----
list[pos]=p;
}
!
!
// Append element at end
template<class TYPE>
***************
*** 253,258 ****
// Trunc excess
template<class TYPE>
! void FXArray<TYPE>::trunc(){
! size(number);
}
--- 258,263 ----
// Trunc excess
template<class TYPE>
! void FXArray<TYPE>::trunc(){
! size(number);
}
***************
*** 260,265 ****
// Clear the list
template<class TYPE>
! void FXArray<TYPE>::clear(){
! size(0);
}
--- 265,270 ----
// Clear the list
template<class TYPE>
! void FXArray<TYPE>::clear(){
! size(0);
}
***************
*** 282,287 ****
constructElms(list,number); // Fresh elements
loadElms(store,list,number); // Uses load operator
! }
!
// Destruct list
--- 287,292 ----
constructElms(list,number); // Fresh elements
loadElms(store,list,number); // Uses load operator
! }
!
// Destruct list
***************
*** 292,295 ****
--- 297,301 ----
}
+ }
#endif
Index: FXArrowButton.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXArrowButton.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FXArrowButton.h 17 Jan 2002 23:52:57 -0000 1.9
--- FXArrowButton.h 11 Jul 2002 17:28:13 -0000 1.10
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXARROWBUTTON_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXARROWBUTTON_H
***************
*** 29,32 ****
--- 29,34 ----
#endif
+ namespace FX {
+
struct FXTimer;
***************
*** 161,164 ****
--- 163,167 ----
};
+ }
#endif
Index: FXBMPIcon.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXBMPIcon.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXBMPIcon.h 2 Jan 2002 22:23:55 -0000 1.4
--- FXBMPIcon.h 11 Jul 2002 17:28:13 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBMPICON_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBMPICON_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 62,65 ****
--- 63,67 ----
extern FXAPI FXbool fxsaveBMP(FXStream& store,const FXuchar *data,FXColor transp,FXint width,FXint height);
+ }
#endif
Index: FXBMPImage.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXBMPImage.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXBMPImage.h 2 Jan 2002 22:23:56 -0000 1.4
--- FXBMPImage.h 11 Jul 2002 17:28:13 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBMPIMAGE_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBMPIMAGE_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 62,65 ****
--- 63,67 ----
extern FXAPI FXbool fxsaveBMP(FXStream& store,const FXuchar *data,FXColor transp,FXint width,FXint height);
+ }
#endif
Index: FXBitmap.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXBitmap.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FXBitmap.h 2 Jan 2002 22:23:56 -0000 1.5
--- FXBitmap.h 11 Jul 2002 17:28:13 -0000 1.6
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBITMAP_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBITMAP_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
// Image rendering hints
***************
*** 111,114 ****
--- 112,116 ----
};
+ }
#endif
Index: FXButton.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXButton.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FXButton.h 17 Jan 2002 23:52:57 -0000 1.9
--- FXButton.h 11 Jul 2002 17:28:13 -0000 1.10
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBUTTON_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBUTTON_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 100,104 ****
/// Set as default button
virtual void setDefault(FXbool enable=TRUE);
!
/// Set the button state
void setState(FXuint s);
--- 101,105 ----
/// Set as default button
virtual void setDefault(FXbool enable=TRUE);
!
/// Set the button state
void setState(FXuint s);
***************
*** 112,118 ****
/// Get the button style flags
FXuint getButtonStyle() const;
!
};
#endif
--- 113,120 ----
/// Get the button style flags
FXuint getButtonStyle() const;
!
};
+ }
#endif
Index: FXCURCursor.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXCURCursor.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXCURCursor.h 2 Jan 2002 22:23:56 -0000 1.1
--- FXCURCursor.h 11 Jul 2002 17:28:13 -0000 1.2
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 2001 by Sander Jansen. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 2001,2002 by Sander Jansen. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCURCURSOR_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCURCURSOR_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
/// CUR Cursor class
***************
*** 54,57 ****
--- 55,59 ----
extern FXAPI FXbool fxloadCUR(FXStream& store,FXuchar*& source,FXuchar*& mask,FXint& width,FXint& height,FXint& xspot,FXint& yspot);
+ }
#endif
Index: FXCanvas.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXCanvas.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXCanvas.h 26 Nov 2001 16:13:03 -0000 1.4
--- FXCanvas.h 11 Jul 2002 17:28:13 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCANVAS_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCANVAS_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 53,56 ****
--- 54,58 ----
};
+ }
#endif
Index: FXCharset.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXCharset.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXCharset.h 16 Feb 2001 00:04:14 -0000 1.2
--- FXCharset.h 11 Jul 2002 17:28:13 -0000 1.3
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 2000 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 2000,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,30 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCHARSET_H
#define FXCHARSET_H
! /// A set of characters
class FXAPI FXCharset {
private:
--- 20,31 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCHARSET_H
#define FXCHARSET_H
+ namespace FX {
! /// A set of characters
class FXAPI FXCharset {
private:
***************
*** 56,60 ****
/// See if character ch is member of set
! FXbool has(FXchar ch) const {
return (s[((FXuchar)ch)>>5] & (1<<(ch&31)))!=0;
}
--- 57,61 ----
/// See if character ch is member of set
! FXbool has(FXchar ch) const {
return (s[((FXuchar)ch)>>5] & (1<<(ch&31)))!=0;
}
***************
*** 73,77 ****
/// Include character ch into set
! FXCharset& operator+=(FXchar ch){
s[((FXuchar)ch)>>5] |= (1<<(ch&31));
return *this;
--- 74,78 ----
/// Include character ch into set
! FXCharset& operator+=(FXchar ch){
s[((FXuchar)ch)>>5] |= (1<<(ch&31));
return *this;
***************
*** 79,83 ****
/// Exclude character ch from set
! FXCharset& operator-=(FXchar ch){
s[((FXuchar)ch)>>5] &= ~(1<<(ch&31));
return *this;
--- 80,84 ----
/// Exclude character ch from set
! FXCharset& operator-=(FXchar ch){
s[((FXuchar)ch)>>5] &= ~(1<<(ch&31));
return *this;
***************
*** 151,156 ****
--- 152,159 ----
/// Load set from a stream
friend FXAPI FXStream& operator>>(FXStream& store,FXCharset& cs);
+
};
+ }
#endif
Index: FXCheckButton.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXCheckButton.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FXCheckButton.h 26 Nov 2001 16:13:03 -0000 1.7
--- FXCheckButton.h 11 Jul 2002 17:28:13 -0000 1.8
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCHECKBUTTON_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCHECKBUTTON_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 117,120 ****
--- 118,122 ----
};
+ }
#endif
Index: FXColorDialog.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXColorDialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXColorDialog.h 26 Nov 2001 16:13:03 -0000 1.3
--- FXColorDialog.h 11 Jul 2002 17:28:13 -0000 1.4
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORDIALOG_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORDIALOG_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 87,90 ****
--- 88,92 ----
};
+ }
#endif
Index: FXColorSelector.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXColorSelector.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXColorSelector.h 26 Nov 2001 16:13:03 -0000 1.4
--- FXColorSelector.h 11 Jul 2002 17:28:13 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORSELECTOR_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORSELECTOR_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 179,182 ****
--- 180,184 ----
};
+ }
#endif
Index: FXColorWell.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXColorWell.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FXColorWell.h 17 Jan 2002 23:52:57 -0000 1.8
--- FXColorWell.h 11 Jul 2002 17:28:13 -0000 1.9
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORWELL_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORWELL_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 167,170 ****
--- 168,172 ----
};
+ }
#endif
Index: FXColorWheel.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXColorWheel.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXColorWheel.h 26 Nov 2001 16:13:03 -0000 1.2
--- FXColorWheel.h 11 Jul 2002 17:28:13 -0000 1.3
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 2001,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORWHEEL_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORWHEEL_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 123,126 ****
--- 124,128 ----
};
+ }
#endif
Index: FXComposite.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXComposite.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FXComposite.h 26 Nov 2001 16:13:03 -0000 1.5
--- FXComposite.h 11 Jul 2002 17:28:13 -0000 1.6
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOMPOSITE_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOMPOSITE_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 81,84 ****
--- 82,86 ----
};
+ }
#endif
Index: FXDHMat.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDHMat.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXDHMat.h 16 Feb 2001 00:04:15 -0000 1.2
--- FXDHMat.h 11 Jul 2002 17:28:13 -0000 1.3
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1994,2000 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1994,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,28 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDHMAT_H
#define FXDHMAT_H
/// Homogeneous matrix (double-precision version)
--- 20,29 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDHMAT_H
#define FXDHMAT_H
+ namespace FX {
/// Homogeneous matrix (double-precision version)
***************
*** 50,57 ****
FXDHMat& operator/=(FXdouble w);
! /// Return a non-const reference to the ith row
FXDHVec& operator[](FXint i){return m[i];}
! /// Return a const reference to the ith row
const FXDHVec& operator[](FXint i) const {return m[i];}
--- 51,58 ----
FXDHMat& operator/=(FXdouble w);
! /// Return a non-const reference to the ith row
FXDHVec& operator[](FXint i){return m[i];}
! /// Return a const reference to the ith row
const FXDHVec& operator[](FXint i) const {return m[i];}
***************
*** 77,81 ****
friend FXAPI FXDVec operator*(const FXDVec& v,const FXDHMat& m);
friend FXAPI FXDVec operator*(const FXDHMat& a,const FXDVec& v);
!
/// Set to identity matrix
FXDHMat& eye();
--- 78,82 ----
friend FXAPI FXDVec operator*(const FXDVec& v,const FXDHMat& m);
friend FXAPI FXDVec operator*(const FXDHMat& a,const FXDVec& v);
!
/// Set to identity matrix
FXDHMat& eye();
***************
*** 83,87 ****
/// Orthographic projection
FXDHMat& ortho(FXdouble left,FXdouble right,FXdouble bottom,FXdouble top,FXdouble hither,FXdouble yon);
!
/// Perspective projection
FXDHMat& frustum(FXdouble left,FXdouble right,FXdouble bottom,FXdouble top,FXdouble hither,FXdouble yon);
--- 84,88 ----
/// Orthographic projection
FXDHMat& ortho(FXdouble left,FXdouble right,FXdouble bottom,FXdouble top,FXdouble hither,FXdouble yon);
!
/// Perspective projection
FXDHMat& frustum(FXdouble left,FXdouble right,FXdouble bottom,FXdouble top,FXdouble hither,FXdouble yon);
***************
*** 138,141 ****
--- 139,144 ----
friend FXAPI FXStream& operator>>(FXStream& store,FXDHMat& m);
};
+
+ }
#endif
Index: FXDHVec.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDHVec.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXDHVec.h 16 Feb 2001 00:04:15 -0000 1.2
--- FXDHVec.h 11 Jul 2002 17:28:13 -0000 1.3
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1994 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1994,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,28 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDHVEC_H
#define FXDHVEC_H
--- 20,29 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDHVEC_H
#define FXDHVEC_H
+ namespace FX {
***************
*** 110,114 ****
};
!
#endif
--- 111,115 ----
};
! }
#endif
Index: FXDQuat.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDQuat.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXDQuat.h 16 Feb 2001 00:04:15 -0000 1.2
--- FXDQuat.h 11 Jul 2002 17:28:13 -0000 1.3
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1994,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1994,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,28 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDQUAT_H
#define FXDQUAT_H
/// Quaternion (double-precision version)
--- 20,29 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDQUAT_H
#define FXDQUAT_H
+ namespace FX {
/// Quaternion (double-precision version)
***************
*** 35,39 ****
/// Construct from axis and angle
FXDQuat(const FXDVec& axis,FXdouble phi=0.0);
!
/// Construct from euler angles yaw (z), pitch (y), and roll (x)
FXDQuat(FXdouble roll,FXdouble pitch,FXdouble yaw);
--- 36,40 ----
/// Construct from axis and angle
FXDQuat(const FXDVec& axis,FXdouble phi=0.0);
!
/// Construct from euler angles yaw (z), pitch (y), and roll (x)
FXDQuat(FXdouble roll,FXdouble pitch,FXdouble yaw);
***************
*** 47,60 ****
/// Set quaternion from yaw (z), pitch (y), and roll (x)
void setRollPitchYaw(FXdouble roll,FXdouble pitch,FXdouble yaw);
!
! /// Obtain yaw, pitch, and roll
void getRollPitchYaw(FXdouble& roll,FXdouble& pitch,FXdouble& yaw);
!
/// Exponentiate quaternion
friend FXAPI FXDQuat exp(const FXDQuat& q);
!
/// Take logarithm of quaternion
friend FXAPI FXDQuat log(const FXDQuat& q);
!
/// Invert quaternion
friend FXAPI FXDQuat invert(const FXDQuat& q);
--- 48,61 ----
/// Set quaternion from yaw (z), pitch (y), and roll (x)
void setRollPitchYaw(FXdouble roll,FXdouble pitch,FXdouble yaw);
!
! /// Obtain yaw, pitch, and roll
void getRollPitchYaw(FXdouble& roll,FXdouble& pitch,FXdouble& yaw);
!
/// Exponentiate quaternion
friend FXAPI FXDQuat exp(const FXDQuat& q);
!
/// Take logarithm of quaternion
friend FXAPI FXDQuat log(const FXDQuat& q);
!
/// Invert quaternion
friend FXAPI FXDQuat invert(const FXDQuat& q);
***************
*** 72,75 ****
--- 73,78 ----
friend FXAPI FXDQuat lerp(const FXDQuat& u,const FXDQuat& v,FXdouble f);
};
+
+ }
#endif
Index: FXDVec.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDVec.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXDVec.h 16 Feb 2001 00:04:15 -0000 1.2
--- FXDVec.h 11 Jul 2002 17:28:13 -0000 1.3
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1994,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1994,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,28 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDVEC_H
#define FXDVEC_H
--- 20,29 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDVEC_H
#define FXDVEC_H
+ namespace FX {
***************
*** 105,109 ****
};
!
#endif
--- 106,110 ----
};
! }
#endif
Index: FXDataTarget.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDataTarget.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXDataTarget.h 26 Nov 2001 16:13:03 -0000 1.4
--- FXDataTarget.h 11 Jul 2002 17:28:13 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDATATARGET_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDATATARGET_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 156,162 ****
/// Associate with string variable
void connect(FXString& value){ type=DT_STRING; data=&value; }
};
!
#endif
--- 157,166 ----
/// Associate with string variable
void connect(FXString& value){ type=DT_STRING; data=&value; }
+
+ /// Destroy
+ virtual ~FXDataTarget();
};
! }
#endif
Index: FXDebugTarget.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDebugTarget.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXDebugTarget.h 26 Nov 2001 16:13:03 -0000 1.3
--- FXDebugTarget.h 11 Jul 2002 17:28:13 -0000 1.4
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDEBUGTARGET_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDEBUGTARGET_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 56,61 ****
};
!
!
#endif
--- 57,61 ----
};
! }
#endif
Index: FXDelegator.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDelegator.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXDelegator.h 26 Nov 2001 16:13:03 -0000 1.3
--- FXDelegator.h 11 Jul 2002 17:28:13 -0000 1.4
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 2000,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 2000,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDELEGATOR_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDELEGATOR_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 64,69 ****
};
!
!
#endif
--- 65,69 ----
};
! }
#endif
Index: FXDial.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDial.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FXDial.h 26 Nov 2001 16:13:03 -0000 1.6
--- FXDial.h 11 Jul 2002 17:28:13 -0000 1.7
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDIAL_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDIAL_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 169,172 ****
--- 170,175 ----
virtual void load(FXStream& store);
};
+
+ }
#endif
Index: FXDict.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDict.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FXDict.h 25 Feb 2002 15:57:03 -0000 1.5
--- FXDict.h 11 Jul 2002 17:28:13 -0000 1.6
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDICT_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDICT_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 161,164 ****
--- 162,166 ----
};
+ }
#endif
Index: FXDirBox.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDirBox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXDirBox.h 26 Nov 2001 16:13:03 -0000 1.4
--- FXDirBox.h 11 Jul 2002 17:28:13 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1999,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
**************************************************...
[truncated message content] |
|
From: Lyle J. <ly...@us...> - 2002-07-11 17:25:50
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces In directory usw-pr-cvs1:/tmp/cvs-serv9060 Modified Files: FXPacker.i Log Message: Changed DEFAULT_SPACING from a #define to a const FXint value. Index: FXPacker.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXPacker.i,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** FXPacker.i 19 Mar 2002 23:18:40 -0000 1.14 --- FXPacker.i 11 Jul 2002 17:25:47 -0000 1.15 *************** *** 22,26 **** // Default spacing ! #define DEFAULT_SPACING 4 %exception FXPacker::FXPacker "$action FXRbRegisterRubyObj(self, result);"; --- 22,26 ---- // Default spacing ! const FXint DEFAULT_SPACING = 4; %exception FXPacker::FXPacker "$action FXRbRegisterRubyObj(self, result);"; |
|
From: Lyle J. <ly...@us...> - 2002-07-11 17:21:08
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv7114
Modified Files:
FXGIFCursor.i
Log Message:
Added default argument values for cursor hotspot.
Index: FXGIFCursor.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGIFCursor.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FXGIFCursor.i 11 Jul 2002 13:33:14 -0000 1.12
--- FXGIFCursor.i 11 Jul 2002 17:21:05 -0000 1.13
***************
*** 34,38 ****
public:
// Constructor
! FXRbGIFCursor(FXApp* a,const void* pix,FXint hx,FXint hy);
// Destructor
--- 34,38 ----
public:
// Constructor
! FXRbGIFCursor(FXApp* a,const void* pix,FXint hx=0,FXint hy=0);
// Destructor
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 17:20:25
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv6898
Modified Files:
FXGLViewer.i
Log Message:
Removed #define for PICK_TOL.
Index: FXGLViewer.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLViewer.i,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** FXGLViewer.i 11 Jul 2002 13:33:14 -0000 1.26
--- FXGLViewer.i 11 Jul 2002 17:20:22 -0000 1.27
***************
*** 25,32 ****
- // Pick tolerance
- #define PICK_TOL 3
-
-
// GL Viewer options
enum {
--- 25,28 ----
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 17:19:30
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces In directory usw-pr-cvs1:/tmp/cvs-serv6462 Modified Files: FXFrame.i Log Message: Changed DEFAULT_PAD from a #define to a const FXint. Index: FXFrame.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFrame.i,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** FXFrame.i 19 Mar 2002 23:18:40 -0000 1.12 --- FXFrame.i 11 Jul 2002 17:19:27 -0000 1.13 *************** *** 22,26 **** // Default padding ! #define DEFAULT_PAD 2 %exception FXFrame::FXFrame "$action FXRbRegisterRubyObj(self, result);"; --- 22,26 ---- // Default padding ! const FXint DEFAULT_PAD = 2; %exception FXFrame::FXFrame "$action FXRbRegisterRubyObj(self, result);"; |
Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv26134
Added Files:
FXBzStream.h FXGradientBar.h FXGzStream.h FXImageFrame.h
FXMenuBar.h FXRuler.h FXScrollBar.h FXStatusBar.h
FXStatusLine.h FXToolBar.h FXToolBarGrip.h FXToolBarShell.h
FXToolBarTab.h FXToolTip.h FXWizard.h
Removed Files:
FXMenubar.h FXScrollbar.h FXStatusbar.h FXToolbar.h
FXToolbarGrip.h FXToolbarShell.h FXToolbarTab.h FXTooltip.h
Log Message:
New and removed header files for fox-1.1.13.
--- NEW FILE: FXBzStream.h ---
/********************************************************************************
* *
* B Z S t r e a m C l a s s e s *
* *
*********************************************************************************
* Copyright (C) 1999, 2002 by 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. *
*********************************************************************************
* $Id: FXBzStream.h,v 1.1 2002/07/11 16:46:53 lyle Exp $ *
********************************************************************************/
#ifdef HAVE_BZ2LIB_H
#ifndef FXBZSTREAM_H
#define FXBZSTREAM_H
#ifndef FXSTREAM_H
#include "FXStream.h"
#endif
namespace FX {
/// BZIP2 compressed file stream
class FXAPI FXBzFileStream : public FXStream {
void *file;
void *bzfile;
protected:
virtual void saveItems(const void *buf,unsigned long n);
virtual void loadItems(void *buf,unsigned long n);
public:
/// Create BZIP2 file stream
FXBzFileStream(const FXObject* cont=NULL);
/// Open file stream
FXbool open(const char* filename,FXStreamDirection save_or_load);
/// Close file stream
FXbool close();
/// Move to position
virtual FXbool position(unsigned long p){ return FALSE; }
/// Clean up
virtual ~FXBzFileStream();
};
/// BZIP2 compressed memory stream
class FXAPI FXBzMemoryStream : public FXStream {
private:
void *strm;
unsigned long bzpos;
FXuchar *ptr;
FXuint space;
FXbool owns;
protected:
virtual void saveItems(const void *buf, unsigned long n);
virtual void loadItems(void *buf, unsigned long n);
void finish();
public:
/// Create memory stream
FXBzMemoryStream(const FXObject* cont=NULL);
/// Open store
FXbool open(FXuchar* data, FXStreamDirection);
/// Open stream with specified size
FXbool open(FXuchar* data, FXuint sp, FXStreamDirection);
// Get available space
unsigned long getSpace() const { return space; }
/// Set available space
void setSpace(unsigned long sp);
/// Take buffer away from stream
void takeBuffer(FXuchar*& buffer,unsigned long& sp);
/// Give buffer to stream
void giveBuffer(FXuchar *buffer,unsigned long sp);
/// Move to position
virtual FXbool position(unsigned long p) { return FALSE; }
/// Get final size of compressed stream
unsigned long getCompressedSize() const { return bzpos; }
/// Close
FXbool close();
/// Destructor
virtual ~FXBzMemoryStream();
};
}
#endif
#endif
--- NEW FILE: FXGradientBar.h ---
/********************************************************************************
* *
* G r a d i e n t B a r W i d g e t *
* *
*********************************************************************************
* Copyright (C) 2002 by Jeroen van der Zijp. 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. *
*********************************************************************************
* $Id: FXGradientBar.h,v 1.1 2002/07/11 16:46:53 lyle Exp $ *
********************************************************************************/
#ifndef FXGRADIENTBAR_H
#define FXGRADIENTBAR_H
#ifndef FXFRAME_H
#include "FXFrame.h"
#endif
namespace FX {
/// Gradient bar orientation
enum {
GRADIENTBAR_HORIZONTAL = 0, /// Gradient bar shown horizontally
GRADIENTBAR_VERTICAL = 0x00008000, /// Gradient bar shown vertically
GRADIENTBAR_NO_CONTROLS = 0, /// No controls shown
GRADIENTBAR_CONTROLS_TOP = 0x00010000, /// Controls on top
GRADIENTBAR_CONTROLS_BOTTOM = 0x00020000, /// Controls on bottom
GRADIENTBAR_CONTROLS_LEFT = GRADIENTBAR_CONTROLS_TOP, /// Controls on left
GRADIENTBAR_CONTROLS_RIGHT = GRADIENTBAR_CONTROLS_BOTTOM /// Controls on right
};
/// Blend modes
enum {
GRADIENT_BLEND_LINEAR, /// Linear blend
GRADIENT_BLEND_POWER, /// Power law blend
GRADIENT_BLEND_SINE, /// Sine blend
GRADIENT_BLEND_INCREASING, /// Quadratic increasing blend
GRADIENT_BLEND_DECREASING /// Quadratic decreasing blend
};
// Gradient segment
struct FXGradient {
FXdouble lower; /// Lower value
FXdouble middle; /// Middle value
FXdouble upper; /// Upper value
FXColor lowerColor; /// Lower color
FXColor upperColor; /// Upper color
FXuchar blend; /// Blend method
};
class FXImage;
/**
* The gradient bar is a control that is used to edit color gradient,
* such as used in texture mapping and shape filling.
*/
class FXGradientBar : public FXFrame {
FXDECLARE(FXGradientBar)
protected:
FXImage *bar; // Image containing colors
FXGradient *seg; // Segments
FXint nsegs; // Number of segments
FXint sellower; // Lower selected segment
FXint selupper; // Upper selected segment
FXint dropped; // Dropped segment
FXint current; // Current segment
FXint anchor; // Anchor segment
FXint grip; // Grip being dragged, if any
FXint where; // Where dropped in segment
FXString tip; // Tooltip value
FXString help; // Help value
FXColor selectColor; // Select color
FXint offset; // Offset
protected:
FXGradientBar();
void updatebar();
virtual void layout();
FXdouble getValue(FXint x,FXint y) const;
FXint getSegmentLowerPos(FXint sg) const;
FXint getSegmentUpperPos(FXint sg) const;
FXint getSegmentMiddlePos(FXint sg) const;
void drawUpArrow(FXDCWindow& dc,FXint x,FXint y,FXColor clr);
void drawDnArrow(FXDCWindow& dc,FXint x,FXint y,FXColor clr);
void drawRtArrow(FXDCWindow& dc,FXint x,FXint y,FXColor clr);
void drawLtArrow(FXDCWindow& dc,FXint x,FXint y,FXColor clr);
void drawBottomArrows(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawTopArrows(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawLeftArrows(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawRightArrows(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
static FXdouble blendlinear(FXdouble middle,FXdouble pos);
static FXdouble blendpower(FXdouble middle,FXdouble pos);
static FXdouble blendsine(FXdouble middle,FXdouble pos);
static FXdouble blendincreasing(FXdouble middle,FXdouble pos);
static FXdouble blenddecreasing(FXdouble middle,FXdouble pos);
protected:
enum {
GRIP_NONE,
GRIP_LOWER,
GRIP_SEG_LOWER,
GRIP_MIDDLE,
GRIP_SEG_UPPER,
GRIP_UPPER
};
private:
FXGradientBar(const FXGradientBar&);
FXGradientBar &operator=(const FXGradientBar&);
public:
long onPaint(FXObject*,FXSelector,void*);
long onLeftBtnPress(FXObject*,FXSelector,void*);
long onLeftBtnRelease(FXObject*,FXSelector,void*);
long onMotion(FXObject*,FXSelector,void*);
long onDNDEnter(FXObject*,FXSelector,void*);
long onDNDLeave(FXObject*,FXSelector,void*);
long onDNDMotion(FXObject*,FXSelector,void*);
long onDNDDrop(FXObject*,FXSelector,void*);
long onQueryHelp(FXObject*,FXSelector,void*);
long onQueryTip(FXObject*,FXSelector,void*);
long onCmdBlending(FXObject*,FXSelector,void*);
long onUpdBlending(FXObject*,FXSelector,void*);
long onUpdSegColor(FXObject*,FXSelector,void*);
long onCmdSegColor(FXObject*,FXSelector,void*);
long onUpdRecenter(FXObject*,FXSelector,void*);
long onCmdRecenter(FXObject*,FXSelector,void*);
long onUpdSplit(FXObject*,FXSelector,void*);
long onCmdSplit(FXObject*,FXSelector,void*);
long onUpdMerge(FXObject*,FXSelector,void*);
long onCmdMerge(FXObject*,FXSelector,void*);
long onUpdUniform(FXObject*,FXSelector,void*);
long onCmdUniform(FXObject*,FXSelector,void*);
public:
enum{
ID_LOWER_COLOR=FXFrame::ID_LAST,
ID_UPPER_COLOR,
ID_BLEND_LINEAR,
ID_BLEND_POWER,
ID_BLEND_SINE,
ID_BLEND_INCREASING,
ID_BLEND_DECREASING,
ID_RECENTER,
ID_SPLIT,
ID_MERGE,
ID_UNIFORM,
ID_LAST
};
public:
/// Construct a gradient bar
FXGradientBar(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);
/// Create server-side resources
virtual void create();
/// Return default width
virtual FXint getDefaultWidth();
/// Return default height
virtual FXint getDefaultHeight();
/// Obtain segment containing location x, y
FXint getSegment(FXint x,FXint y) const;
/// Get the grip in segment sg which is closest to location x, y
FXint getGrip(FXint sg,FXint x,FXint y) const;
/// Return the number of segments
FXint geNumSegments() const { return nsegs; }
/// Change several the gradient segments
void setGradients(const FXGradient *segments,FXint nsegments);
/// Return the gradient segments
void getGradients(FXGradient*& segments,FXint& nsegments) const;
/// Change current segment
void setCurrentSegment(FXint index,FXbool notify=FALSE);
/// Return current segment, if any
FXint getCurrentSegment() const { return current; }
/// Change anchor segment
void setAnchorSegment(FXint index);
/// Return anchor segment, if any
FXint getAnchorSegment() const { return anchor; }
/// Select segment
FXbool selectSegments(FXint fm,FXint to,FXbool notify=FALSE);
// Deselect all segments
FXbool deselectSegments(FXbool notify);
/// Is segment selected
FXbool isSegmentSelected(FXint s) const;
/// Set colors of a segment
void setSegmentLowerColor(FXint s,FXColor clr,FXbool notify=FALSE);
void setSegmentUpperColor(FXint s,FXColor clr,FXbool notify=FALSE);
/// Get colors of a segment
FXColor getSegmentLowerColor(FXint s) const;
FXColor getSegmentUpperColor(FXint s) const;
/// Move lower point of segment sg
void moveSegmentLower(FXint sg,FXdouble val,FXbool notify=FALSE);
/// Move middle point of segment sg
void moveSegmentMiddle(FXint sg,FXdouble val,FXbool notify=FALSE);
/// Move upper point of segment sg
void moveSegmentUpper(FXint sg,FXdouble val,FXbool notify=FALSE);
/// Move segments sglo to sghi to new position val
void moveSegments(FXint sglo,FXint sghi,FXdouble val,FXbool notify=FALSE);
/// Get values of segment sg
FXdouble getSegmentLower(FXint sg) const;
FXdouble getSegmentMiddle(FXint sg) const;
FXdouble getSegmentUpper(FXint sg) const;
/// Get gradient ramp
void gradient(FXColor *ramp,FXint nramp);
/// Get blend cuve of segment
FXuint getSegmentBlend(FXint s) const;
/// Split segment at the midpoint
void splitSegments(FXint sglo,FXint sghi,FXbool notify=FALSE);
/// Merge segments
void mergeSegments(FXint sglo,FXint sghi,FXbool notify=FALSE);
/// Make segments uniformly distributed
void uniformSegments(FXint sglo,FXint sghi,FXbool notify=FALSE);
/// Change blend curve of segment
void blendSegments(FXint sglo,FXint sghi,FXuint blend=GRADIENT_BLEND_LINEAR,FXbool notify=FALSE);
/// Change the gradient bar style
FXuint getBarStyle() const;
/// Get the gradient bar style
void setBarStyle(FXuint style);
/// Set color
void setSelectColor(FXColor clr);
/// Get color
FXColor getSelectColor() const { return selectColor; }
/// Set status line help text for this gradient bar
void setHelpText(const FXString& text){ help=text; }
/// Get status line help text for this gradient bar
FXString getHelpText() const { return help; }
/// Set tool tip message for this gradient bar
void setTipText(const FXString& text){ tip=text; }
/// Get tool tip message for this gradient bar
FXString getTipText() const { return tip; }
/// Save gradient bar to a stream
virtual void save(FXStream& store) const;
/// Load gradient bar from a stream
virtual void load(FXStream& store);
virtual ~FXGradientBar();
};
}
#endif
--- NEW FILE: FXGzStream.h ---
/********************************************************************************
* *
* G Z S t r e a m C l a s s e s *
* *
*********************************************************************************
* Copyright (C) 2002 by Sander Jansen. 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. *
*********************************************************************************
* $Id: FXGzStream.h,v 1.1 2002/07/11 16:46:53 lyle Exp $ *
********************************************************************************/
#ifdef HAVE_ZLIB_H
#ifndef FXGZSTREAM_H
#define FXGZSTREAM_H
#ifndef FXSTREAM_H
#include "FXStream.h"
#endif
////////////////////////////// UNDER DEVELOPMENT //////////////////////////////
namespace FX {
/// GZIP compressed stream
class FXAPI FXGzFileStream : public FXStream {
void *gzfile;
protected:
virtual void saveItems(const void *buf,unsigned long n);
virtual void loadItems(void *buf,unsigned long n);
public:
/// Create GZIP compressed file stream
FXGzFileStream(const FXObject* cont=NULL);
/// Open file stream
FXbool open(const char* filename,FXStreamDirection save_or_load);
/// Close file stream
FXbool close();
/// Move to position
virtual FXbool position(unsigned long p){ return FALSE; }
/// Clean up
virtual ~FXGzFileStream();
};
}
#endif
#endif
--- NEW FILE: FXImageFrame.h ---
/********************************************************************************
* *
* I m a g e F r a m e W i d g e t *
* *
*********************************************************************************
* Copyright (C) 2001,2002 by H. J. Daniel III. 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. *
*********************************************************************************
* $Id: FXImageFrame.h,v 1.1 2002/07/11 16:46:53 lyle Exp $ *
********************************************************************************/
#ifndef FXIMAGEFRAME_H
#define FXIMAGEFRAME_H
#ifndef FXFRAME_H
#include "FXFrame.h"
#endif
namespace FX {
/**
* The image frame is a simple frame widget displaying
* an image; the image is not owned by the image frame so
* it must be explicitly deleted elsewhere.
*/
class FXImageFrame : public FXFrame {
FXDECLARE(FXImageFrame)
protected:
FXImage* image; // The image being displayed
protected:
FXImageFrame();
private:
FXImageFrame(const FXImageFrame&);
FXImageFrame &operator=(const FXImageFrame&);
public:
long onPaint(FXObject*,FXSelector,void* ptr);
public:
/// Construct image frame and pass it an image
FXImageFrame(FXComposite* p,FXImage *img,FXuint opts=FRAME_SUNKEN|FRAME_THICK,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0);
/// Create window
virtual void create();
/// Get default width
virtual FXint getDefaultWidth();
/// Get default height
virtual FXint getDefaultHeight();
/// Change the image being displayed
void setImage(FXImage* img);
/// Return the current image
FXImage* getImage() const { return image; }
/// Save to stream
virtual void save(FXStream& store) const;
/// Load from stream
virtual void load(FXStream& store);
/// Destroy the widget, but do not destroy the image
virtual ~FXImageFrame();
};
}
#endif
--- NEW FILE: FXMenuBar.h ---
/********************************************************************************
* *
* M e n u B a r W i d g e t *
* *
*********************************************************************************
* Copyright (C) 1998,2002 by Jeroen van der Zijp. 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. *
*********************************************************************************
* $Id: FXMenuBar.h,v 1.1 2002/07/11 16:46:53 lyle Exp $ *
********************************************************************************/
#ifndef FXMENUBAR_H
#define FXMENUBAR_H
#ifndef FXTOOLBAR_H
#include "FXToolBar.h"
#endif
namespace FX {
/// Menu bar
class FXAPI FXMenuBar : public FXToolBar {
FXDECLARE(FXMenuBar)
protected:
FXMenuBar(){}
private:
FXMenuBar(const FXMenuBar&);
FXMenuBar &operator=(const FXMenuBar&);
public:
long onFocusLeft(FXObject*,FXSelector,void*);
long onFocusRight(FXObject*,FXSelector,void*);
long onEnter(FXObject*,FXSelector,void*);
long onLeave(FXObject*,FXSelector,void*);
long onMotion(FXObject*,FXSelector,void*);
long onButtonPress(FXObject*,FXSelector,void*);
long onButtonRelease(FXObject*,FXSelector,void*);
long onCmdUnpost(FXObject*,FXSelector,void*);
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.
*/
FXMenuBar(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);
/**
* Construct a non-floatable menubar.
* The menubar can not be undocked.
*/
FXMenuBar(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);
/// Returns true if specified coordinate (in parent's coordinate system) is in menubar
virtual FXbool contains(FXint parentx,FXint parenty) const;
};
}
#endif
--- NEW FILE: FXRuler.h ---
/********************************************************************************
* *
* R u l e r W i d g e t *
* *
*********************************************************************************
* Copyright (C) 2002 by Jeroen van der Zijp. 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. *
*********************************************************************************
* $Id: FXRuler.h,v 1.1 2002/07/11 16:46:53 lyle Exp $ *
********************************************************************************/
#ifndef FXRULER_H
#define FXRULER_H
#ifndef FXFRAME_H
#include "FXFrame.h"
#endif
namespace FX {
/// Ruler options
enum {
RULER_NORMAL = 0, /// Default appearance (default)
RULER_HORIZONTAL = 0, /// Ruler is horizontal (default)
RULER_VERTICAL = 0x00008000, /// Ruler is vertical
RULER_TICKS_OFF = 0, /// Tick marks off (default)
RULER_TICKS_TOP = 0x00010000, /// Ticks on the top (if horizontal)
RULER_TICKS_BOTTOM = 0x00020000, /// Ticks on the bottom (if horizontal)
RULER_TICKS_LEFT = RULER_TICKS_TOP, /// Ticks on the left (if vertical)
RULER_TICKS_RIGHT = RULER_TICKS_BOTTOM, /// Ticks on the right (if vertical)
RULER_TICKS_CENTER = RULER_TICKS_TOP|RULER_TICKS_BOTTOM, /// Tickmarks centered
RULER_NUMBERS = 0x00040000, /// Show numbers
RULER_ARROW = 0x00080000, /// Draw small arrow for cursor position
RULER_MARKERS = 0x00100000, /// Draw markers for indentation settings
RULER_METRIC = 0, /// Metric subdivision (default)
RULER_ENGLISH = 0x00200000 /// English subdivision
};
class FXFont;
/**
* The Ruler widget is placed alongside a document to measure position
* and size of entities within the document.
*/
class FXAPI FXRuler : public FXFrame {
FXDECLARE(FXRuler)
protected:
FXFont* font; // Font for numbers
FXColor textColor; // Color for numbers and ticks
FXint pos; // Arrow position
FXString tip;
FXString help;
protected:
FXRuler();
void drawLeftArrow(FXDCWindow& dc,FXint x,FXint y);
void drawRightArrow(FXDCWindow& dc,FXint x,FXint y);
void drawUpArrow(FXDCWindow& dc,FXint x,FXint y);
void drawDownArrow(FXDCWindow& dc,FXint x,FXint y);
private:
FXRuler(const FXRuler&);
FXRuler &operator=(const FXRuler&);
public:
long onPaint(FXObject*,FXSelector,void*);
long onQueryHelp(FXObject*,FXSelector,void*);
long onQueryTip(FXObject*,FXSelector,void*);
long onCmdSetValue(FXObject*,FXSelector,void*);
long onCmdSetIntValue(FXObject*,FXSelector,void*);
long onCmdGetIntValue(FXObject*,FXSelector,void*);
public:
enum {
ID_ARROW=FXFrame::ID_LAST,
ID_LAST
};
public:
/// Construct label with given text and icon
FXRuler(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=RULER_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);
/// Create server-side resources
virtual void create();
/// Detach server-side resources
virtual void detach();
/// Return default width
virtual FXint getDefaultWidth();
/// Return default height
virtual FXint getDefaultHeight();
/// Set the text font
void setFont(FXFont *fnt);
/// Get the text font
FXFont* getFont() const { return font; }
/// Change slider value
void setValue(FXint value);
/// Return slider value
FXint getValue() const { return pos; }
/// Set ruler style
void setRulerStyle(FXuint style);
/// Get ruler style
FXuint getRulerStyle() const;
/// Get the current text color
FXColor getTextColor() const { return textColor; }
/// Set the current text color
void setTextColor(FXColor clr);
/// Set the status line help text for this label
void setHelpText(const FXString& text);
/// Get the status line help text for this label
FXString getHelpText() const { return help; }
/// Set the tool tip message for this label
void setTipText(const FXString& text);
/// Get the tool tip message for this label
FXString getTipText() const { return tip; }
/// Save label to a stream
virtual void save(FXStream& store) const;
/// Load label from a stream
virtual void load(FXStream& store);
/// Destructor
virtual ~FXRuler();
};
}
#endif
--- NEW FILE: FXScrollBar.h ---
/********************************************************************************
* *
* S c r o l l B a r W i d g e t *
* *
*********************************************************************************
* Copyright (C) 1997,2002 by Jeroen van der Zijp. 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. *
*********************************************************************************
* $Id: FXScrollBar.h,v 1.1 2002/07/11 16:46:53 lyle Exp $ *
********************************************************************************/
#ifndef FXSCROLLBAR_H
#define FXSCROLLBAR_H
#ifndef FXWINDOW_H
#include "FXWindow.h"
#endif
namespace FX {
struct FXTimer;
/// ScrollBar styles
enum {
SCROLLBAR_HORIZONTAL = 0x00020000, /// Horizontally oriented
SCROLLBAR_VERTICAL = 0 /// Vertically oriented
};
/**
* The scroll bar is used when a document has a larger content than may be made
* visible. The range is the total size of the document, the page is the part
* of the document which is visible. The size of the scrollbar thumb is adjusted
* to give feedback of the relative sizes of each.
* The scroll bar may be manipulated by the left mouse (normal scrolling), right
* mouse (vernier or fine-scrolling), or middle mouse (same as the left mouse only
* the scroll position can hop to the place where the click is made).
* Finally, if the mouse sports a wheel, the scroll bar can be manipulated by means
* of the mouse wheel as well. Holding down the Control-key during wheel motion
* will cause the scrolling to go faster than normal.
* While moving the scroll bar, a message of type SEL_CHANGED will be sent to the
* target, and the message data will reflect the current position of type FXint.
* At the end of the interaction, the scroll bar will send a message of type
* SEL_COMMAND to notify the target of the final position.
*/
class FXAPI FXScrollBar : public FXWindow {
FXDECLARE(FXScrollBar)
protected:
FXint range; // Scrollable range
FXint page; // Page size
FXint line; // Line size
FXint pos; // Position
FXint thumbsize; // Thumb size
FXint thumbpos; // Thumb position
FXColor hiliteColor; // Hightlight color
FXColor shadowColor; // Shadow color
FXColor borderColor; // Border color
FXColor arrowColor; // Arrow color
FXTimer *timer; // Autoscroll timer
FXint dragpoint; // Point where grabbed
FXint dragjump; // Jump this much
FXuchar pressed; // Action being undertaken
protected:
FXScrollBar();
void drawButton(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
void drawLeftArrow(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
void drawRightArrow(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
void drawUpArrow(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
void drawDownArrow(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXbool down);
virtual void layout();
private:
FXScrollBar(const FXScrollBar&);
FXScrollBar &operator=(const FXScrollBar&);
public:
long onPaint(FXObject*,FXSelector,void*);
long onMotion(FXObject*,FXSelector,void*);
long onMouseWheel(FXObject*,FXSelector,void*);
long onLeftBtnPress(FXObject*,FXSelector,void*);
long onLeftBtnRelease(FXObject*,FXSelector,void*);
long onMiddleBtnPress(FXObject*,FXSelector,void*);
long onMiddleBtnRelease(FXObject*,FXSelector,void*);
long onRightBtnPress(FXObject*,FXSelector,void*);
long onRightBtnRelease(FXObject*,FXSelector,void*);
long onUngrabbed(FXObject*,FXSelector,void*);
long onTimeIncPix(FXObject*,FXSelector,void*);
long onTimeIncLine(FXObject*,FXSelector,void*);
long onTimeIncPage(FXObject*,FXSelector,void*);
long onTimeDecPix(FXObject*,FXSelector,void*);
long onTimeDecLine(FXObject*,FXSelector,void*);
long onTimeDecPage(FXObject*,FXSelector,void*);
long onTimeWheel(FXObject*,FXSelector,void*);
long onCmdSetValue(FXObject*,FXSelector,void*);
long onCmdSetIntValue(FXObject*,FXSelector,void*);
long onCmdGetIntValue(FXObject*,FXSelector,void*);
long onCmdSetIntRange(FXObject*,FXSelector,void*);
long onCmdGetIntRange(FXObject*,FXSelector,void*);
public:
enum{
ID_TIMEWHEEL=FXWindow::ID_LAST,
ID_AUTOINC_LINE,
ID_AUTODEC_LINE,
ID_AUTOINC_PAGE,
ID_AUTODEC_PAGE,
ID_AUTOINC_PIX,
ID_AUTODEC_PIX,
ID_LAST
};
public:
/// Construct scroll bar
FXScrollBar(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=SCROLLBAR_VERTICAL,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
/// Return default width
virtual FXint getDefaultWidth();
/// Return default height
virtual FXint getDefaultHeight();
/// Set content size range
void setRange(FXint r);
/// Return content size range
FXint getRange() const { return range; }
/// Set viewport page size
void setPage(FXint p);
/// Return page size
FXint getPage() const { return page; }
/// Set scoll increment for line
void setLine(FXint l);
/// Return line increment
FXint getLine() const { return line; }
/// Change current scroll position
void setPosition(FXint p);
/// return scroll position
FXint getPosition() const { return pos; }
/// Change highlight color
void setHiliteColor(FXColor clr);
/// Return highlight color
FXColor getHiliteColor() const { return hiliteColor; }
/// Change shadow color
void setShadowColor(FXColor clr);
/// Return shadow color
FXColor getShadowColor() const { return shadowColor; }
/// Return border color
void setBorderColor(FXColor clr);
/// Change border color
FXColor getBorderColor() const { return borderColor; }
/// Return arrow color
void setArrowColor(FXColor clr);
/// Return arrow color
FXColor getArrowColor() const { return arrowColor; }
/// Change the scrollbar style
FXuint getScrollbarStyle() const;
/// Get the current scrollbar style
void setScrollbarStyle(FXuint style);
/// Save to stream
virtual void save(FXStream& store) const;
/// Load from stream
virtual void load(FXStream& store);
/// Destructor
virtual ~FXScrollBar();
};
/// Corner between scroll bars
class FXAPI FXScrollCorner : public FXWindow {
FXDECLARE(FXScrollCorner)
protected:
FXScrollCorner();
private:
FXScrollCorner(const FXScrollCorner&);
FXScrollCorner &operator=(const FXScrollCorner&);
public:
long onPaint(FXObject*,FXSelector,void*);
public:
/// Constructor
FXScrollCorner(FXComposite* p);
/// Can not be enabled
virtual void enable();
/// Can not be disabled
virtual void disable();
};
}
#endif
--- NEW FILE: FXStatusBar.h ---
/********************************************************************************
* *
* S t a t u s B a r W i d g e t *
* *
*********************************************************************************
* Copyright (C) 1997,2002 by Jeroen van der Zijp. 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. *
*********************************************************************************
* $Id: FXStatusBar.h,v 1.1 2002/07/11 16:46:53 lyle Exp $ *
********************************************************************************/
#ifndef FXSTATUSBAR_H
#define FXSTATUSBAR_H
#ifndef FXHORIZONTALFRAME_H
#include "FXHorizontalFrame.h"
#endif
namespace FX {
/// StatusBar options
enum {
STATUSBAR_WITH_DRAGCORNER = 0x00020000 /// Causes the DragCorner to be shown
};
class FXDragCorner;
class FXStatusLine;
/// Status bar
class FXAPI FXStatusBar : public FXHorizontalFrame {
FXDECLARE(FXStatusBar)
protected:
FXDragCorner *corner;
FXStatusLine *status;
protected:
FXStatusBar(){}
virtual void layout();
private:
FXStatusBar(const FXStatusBar&);
FXStatusBar& operator=(const FXStatusBar&);
public:
/// Construct status bar with or without a drag corner
FXStatusBar(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);
/// Return default width
virtual FXint getDefaultWidth();
/// Return default height
virtual FXint getDefaultHeight();
/// Show or hide the drag corner
void setCornerStyle(FXbool withcorner=TRUE);
/// Return TRUE if drag corner shown
FXbool getCornerStyle() const;
/// Acess the status line widget
FXStatusLine *getStatusLine() const { return status; }
/// Access the drag corner widget
FXDragCorner *getDragCorner() const { return corner; }
/// Save status bar to a stream
virtual void save(FXStream& store) const;
/// Load status bar from a stream
virtual void load(FXStream& store);
/// Destructor
virtual ~FXStatusBar();
};
}
#endif
--- NEW FILE: FXStatusLine.h ---
/********************************************************************************
* *
* S t a t u s L i n e W i d g e t *
* *
*********************************************************************************
* Copyright (C) 1999,2002 by Jeroen van der Zijp. 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. *
*********************************************************************************
* $Id: FXStatusLine.h,v 1.1 2002/07/11 16:46:53 lyle Exp $ *
********************************************************************************/
#ifndef FXSTATUSLINE_H
#define FXSTATUSLINE_H
#ifndef FXFRAME_H
#include "FXFrame.h"
#endif
namespace FX {
/**
* The status line normally shows its permanent message; when
* moving the mouse over a Widget which has status-line help, the status line
* temporarily replaces its normal message with the help information; the status
* line obtains the help message by sending the Widget a ID_QUERY_HELP message
* with type SEL_UPDATE.
* If this query does not result in a new status string, the target of
* the status line is tried via an ordinary SEL_UPDATE message.
* If none of the above work then the status line will display the normal text,
* i.e. the string set via setNormalText().
* If the message contains a newline (\n), then the part before the newline
* will be displayed in the highlight color, while the part after the newline
* is shown using the normal text color.
*/
class FXAPI FXStatusLine : public FXFrame {
FXDECLARE(FXStatusLine)
protected:
FXString status; // Current status message
FXString normal; // Normally displayed message
FXFont *font; // Font
FXColor textColor; // Status text color
FXColor textHighlightColor; // Status text highlight color
protected:
FXStatusLine();
static const FXchar defaultMessage[];
private:
FXStatusLine(const FXStatusLine&);
FXStatusLine& operator=(const FXStatusLine&);
public:
long onPaint(FXObject*,FXSelector,void*);
long onUpdate(FXObject*,FXSelector,void*);
long onCmdGetStringValue(FXObject*,FXSelector,void*);
long onCmdSetStringValue(FXObject*,FXSelector,void*);
public:
/// Constructor
FXStatusLine(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0);
/// Create server-side resources
virtual void create();
/// Detach server-side resources
virtual void detach();
/// Return default width
virtual FXint getDefaultWidth();
/// Return default height
virtual FXint getDefaultHeight();
/// Change the temporary status message
void setText(const FXString& text);
/// Return the temporary status message
FXString getText() const { return status; }
/// Change the permanent status message
void setNormalText(const FXString& text);
/// Return the permanent status message
FXString getNormalText() const { return normal; }
/// Change the font
void setFont(FXFont* fnt);
/// Return the current font
FXFont* getFont() const { return font; }
/// Return the text color
FXColor getTextColor() const { return textColor; }
/// Change the text color
void setTextColor(FXColor clr);
/// Return the highlight text color
FXColor getTextHighlightColor() const { return textHighlightColor; }
/// Change the highlight text color
void setTextHighlightColor(FXColor clr);
/// Save status line to stream
virtual void save(FXStream& store) const;
/// Load status line from stream
virtual void load(FXStream& store);
/// Destroy
virtual ~FXStatusLine();
};
}
#endif
--- NEW FILE: FXToolBar.h ---
/********************************************************************************
* *
* T o o l B a r W i d g e t *
* *
*********************************************************************************
* Copyright (C) 2000,2002 by Jeroen van der Zijp. 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. *
*********************************************************************************
* $Id: FXToolBar.h,v 1.1 2002/07/11 16:46:53 lyle Exp $ *
********************************************************************************/
#ifndef FXTOOLBAR_H
#define FXTOOLBAR_H
#ifndef FXPACKER_H
#include "FXPacker.h"
#endif
namespace FX {
/**
* ToolBar control.
*/
class FXAPI FXToolBar : public FXPacker {
FXDECLARE(FXToolBar)
protected:
FXComposite *drydock; // Parent when docked
FXComposite *wetdock; // Parent when floating
FXRectangle outline; // Outline shown while dragging
FXWindow *dockafter; // Dock after this window
FXuint dockside; // Dock on this side
FXbool docking; // Dock it
protected:
FXToolBar();
virtual void layout();
private:
FXToolBar(const FXToolBar&);
FXToolBar &operator=(const FXToolBar&);
public:
long onCmdUndock(FXObject*,FXSelector,void*);
long onUpdUndock(FXObject*,FXSelector,void*);
long onCmdDockTop(FXObject*,FXSelector,void*);
long onUpdDockTop(FXObject*,FXSelector,void*);
long onCmdDockBottom(FXObject*,FXSelector,void*);
long onUpdDockBottom(FXObject*,FXSelector,void*);
long onCmdDockLeft(FXObject*,FXSelector,void*);
long onUpdDockLeft(FXObject*,FXSelector,void*);
long onCmdDockRight(FXObject*,FXSelector,void*);
long onUpdDockRight(FXObject*,FXSelector,void*);
long onBeginDragGrip(FXObject*,FXSelector,void*);
long onEndDragGrip(FXObject*,FXSelector,void*);
long onDraggedGrip(FXObject*,FXSelector,void*);
public:
enum {
ID_UNDOCK=FXPacker::ID_LAST, /// Undock the toolbar
ID_DOCK_TOP, /// Dock on the top
ID_DOCK_BOTTOM, /// Dock on the bottom
ID_DOCK_LEFT, /// Dock on the left
ID_DOCK_RIGHT, /// Dock on the right
ID_TOOLBARGRIP, /// Notifications from toolbar grip
ID_LAST
};
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.
*/
FXToolBar(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);
/**
* Construct a non-floatable toolbar.
* The toolbar can not be undocked.
*/
FXToolBar(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);
/**
* Set parent when docked.
* If it was docked, reparent under the new docking window.
*/
void setDryDock(FXComposite* dry);
/**
* Set parent when floating.
* If it was undocked, then reparent under the new floating window.
*/
void setWetDock(FXComposite* wet);
/// Return parent when docked
FXComposite* getDryDock() const { return drydock; }
/// Return parent when floating
FXComposite* getWetDock() const { return wetdock; }
/// Return true if toolbar is docked
FXbool isDocked() const;
/**
* Dock the bar against the given side, after some other widget.
* However, if after is -1, it will be docked as the innermost bar just before
* the work-area, while if after is 0, if will be docked as the outermost bar.
*/
virtual void dock(FXuint side=LAYOUT_SIDE_TOP,FXWindow* after=(FXWindow*)-1);
/**
* Undock or float the bar.
* The initial position of the wet dock is a few pixels
* below and to the right of the original docked position.
*/
virtual void undock();
/// Return default width
virtual FXint getDefaultWidth();
/// Return default height
virtual FXint getDefaultHeight();
/// Return width for given height
virtual FXint getWidthForHeight(FXint h);
/// Return height for given width
virtual FXint getHeightForWidth(FXint w);
/// Set docking side
void setDockingSide(FXuint side=LAYOUT_SIDE_TOP);
/// Return docking side
FXuint getDockingSide() const;
/// Save toolbar to a stream
virtual void save(FXStream& store) const;
/// Load toolbar from a stream
virtual void load(FXStream& store);
/// Destroy
virtual ~FXToolBar();
};
}
#endif
--- NEW FILE: FXToolBarGrip.h ---
/********************************************************************************
* *
* T o o l B a r G r i p W i d g e t *
* *
*********************************************************************************
* Copyright (C) 2000,2002 by Jeroen van der Zijp. 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. *
*********************************************************************************
* $Id: FXToolBarGrip.h,v 1.1 2002/07/11 16:46:53 lyle Exp $ *
********************************************************************************/
#ifndef FXTOOLBARGRIP_H
#define FXTOOLBARGRIP_H
#ifndef FXWINDOW_H
#include "FXWindow.h"
#endif
namespace FX {
/// Tool Bar Grip styles
enum {
TOOLBARGRIP_SINGLE = 0, /// Single bar mode for movable toolbars
TOOLBARGRIP_DOUBLE = 0x00008000, /// Double bar mode for dockable toolbars
TOOLBARGRIP_SEPARATOR = 0x00010000 /// Separator mode
};
class FXToolBar;
/**
* A toolbar grip is used to move its parent [an FXToolBar].
* The grip draws either a single or double bar; it is customary
* to use the single bar grip for toolbar-rearrangements only,
* and use the double-bar when the toolbar needs to be floated
* or docked.
* The toolbar grip is automatically oriented properly by the
* the toolbar widget.
*/
class FXAPI FXToolBarGrip : public FXWindow {
FXDECLARE(FXToolBarGrip)
protected:
FXColor activeColor; // Color when active
FXColor hiliteColor; // Highlight color
FXColor shadowColor; // Shadow color
protected:
FXToolBarGrip();
private:
FXToolBarGrip(const FXToolBarGrip&);
FXToolBarGrip& operator=(const FXToolBarGrip&);
public:
long onPaint(FXObject*,FXSelector,void*);
long onLeftBtnPress(FXObject*,FXSelector,void*);
long onLeftBtnRelease(FXObject*,FXSelector,void*);
long onMotion(FXObject*,FXSelector,void*);
long onEnter(FXObject*,FXSelector,void*);
long onLeave(FXObject*,FXSelector,void*);
public:
/// Construct toolbar grip
FXToolBarGrip(FXToolBar* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=TOOLBARGRIP_SINGLE,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
/// Return default width
virtual FXint getDefaultWidth();
/// Return default height
virtual FXint getDefaultHeight();
/// Change toolbar grip to double
void setDoubleBar(FXbool dbl=TRUE);
/// Return toolbar grip to double
FXuint getDoubleBar() const;
/// Change highlight color
void setHiliteColor(FXColor clr);
/// Get highlight color
FXColor getHiliteColor() const { return hiliteColor; }
/// Change shadow color
void setShadowColor(FXColor clr);
/// Get shadow color
FXColor getShadowColor() const { return shadowColor; }
/// Set the active color
void setActiveColor(FXColor clr);
/// Get the active color
FXColor getActiveColor() const { return activeColor; }
/// Save to stream
virtual void save(FXStream& store) const;
/// Load from stream
virtual void load(FXStream& store);
};
}
#endif
--- NEW FILE: FXToolBarShell.h ---
/********************************************************************************
* *
* T o o l B a r S h e l l W i d g e t *
* *
*********************************************************************************
* Copyright (C) 2000,2002 by Jeroen van der Zijp. 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. *
*********************************************************************************
* $Id: FXToolBarShell.h,v 1.1 2002/07/11 16:46:53 lyle Exp $ *
********************************************************************************/
#ifndef FXTOOLBARSHELL_H
#define FXTOOLBARSHELL_H
#ifndef FXTOPWINDOW_H
#include "FXTopWindow.h"
#endif
namespace FX {
/**
* A Tool bar shell is a widget floating around over the Main Window.
* It typically contains an undocked tool bar.
*/
class FXAPI FXToolBarShell : public FXTopWindow {
FXDECLARE(FXToolBarShell)
protected:
FXColor baseColor;
FXColor hiliteColor;
FXColor shadowColor;
FXColor borderColor;
FXint border;
protected:
FXToolBarShell(){}
virtual void layout();
void drawBorderRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawRidgeRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawGrooveRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawDoubleRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawDoubleSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
void drawFrame(FXDCWindow& dc,FXint x,FX...
[truncated message content] |
|
From: Lyle J. <ly...@us...> - 2002-07-11 16:43:47
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include In directory usw-pr-cvs1:/tmp/cvs-serv24892 Modified Files: FXRuby.h Log Message: Index: FXRuby.h =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRuby.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** FXRuby.h 11 Jul 2002 13:33:12 -0000 1.23 --- FXRuby.h 11 Jul 2002 16:43:44 -0000 1.24 *************** *** 571,574 **** --- 571,578 ---- #include "FXRbPrintDialog.h" #include "FXRbDebugTarget.h" + #include "FXRbGradientBar.h" + #include "FXRbImageFrame.h" + #include "FXRbRuler.h" + #include "FXRbWizard.h" #ifdef WITH_FXSCINTILLA #include "FXRbScintilla.h" |
|
From: Lyle J. <ly...@us...> - 2002-07-11 16:43:06
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv24261
Modified Files:
FXRbGradientBar.h FXRbImageFrame.h FXRbRuler.h FXRbWizard.h
Log Message:
Modified these headers to include the corresponding FOX headers (e.g.
"FXWizard.h" for FXRbWizard.h) if they haven't already been included.
None of these four are listed (yet) in fx.h.
Index: FXRbGradientBar.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbGradientBar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbGradientBar.h 4 Apr 2002 02:10:48 -0000 1.1
--- FXRbGradientBar.h 11 Jul 2002 16:43:03 -0000 1.2
***************
*** 28,31 ****
--- 28,35 ----
#define FXRBGRADIENTBAR_H
+ #ifndef FXGRADIENTBAR_H
+ #include "FXGradientBar.h"
+ #endif
+
class FXRbGradientBar : public FXGradientBar {
FXDECLARE(FXRbGradientBar)
Index: FXRbImageFrame.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbImageFrame.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbImageFrame.h 11 Jul 2002 16:03:35 -0000 1.1
--- FXRbImageFrame.h 11 Jul 2002 16:43:03 -0000 1.2
***************
*** 28,31 ****
--- 28,35 ----
#define FXRBIMAGEFRAME_H
+ #ifndef FXIMAGEFRAME_H
+ #include "FXImageFrame.h"
+ #endif
+
class FXRbImageFrame : public FXImageFrame {
FXDECLARE(FXRbImageFrame)
Index: FXRbRuler.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbRuler.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbRuler.h 11 Jul 2002 16:03:35 -0000 1.1
--- FXRbRuler.h 11 Jul 2002 16:43:03 -0000 1.2
***************
*** 28,31 ****
--- 28,35 ----
#define FXRBRULER_H
+ #ifndef FXRULER_H
+ #include "FXRuler.h"
+ #endif
+
class FXRbRuler : public FXRuler {
FXDECLARE(FXRbRuler)
***************
*** 46,50 ****
// Destructor
virtual ~FXRbRuler(){
! FXRbUnregisterRubyObject(this);
}
};
--- 50,54 ----
// Destructor
virtual ~FXRbRuler(){
! FXRbUnregisterRubyObj(this);
}
};
Index: FXRbWizard.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbWizard.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbWizard.h 11 Jul 2002 16:03:35 -0000 1.1
--- FXRbWizard.h 11 Jul 2002 16:43:03 -0000 1.2
***************
*** 28,31 ****
--- 28,35 ----
#define FXRBWIZARD_H
+ #ifndef FXWIZARD_H
+ #include "FXWizard.h"
+ #endif
+
class FXRbWizard : public FXWizard {
FXDECLARE(FXRbWizard)
***************
*** 50,54 ****
// Destructor
virtual ~FXRbWizard(){
! FXRbUnregisterRubyObject(this);
}
};
--- 54,58 ----
// Destructor
virtual ~FXRbWizard(){
! FXRbUnregisterRubyObj(this);
}
};
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 16:41:36
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv23675
Modified Files:
FXRbMDIChildVirtuals.h
Log Message:
Corrected the return types for FXMDIChild virtual member functions
minimize(), maximize() and restore(); also added override for close().
Index: FXRbMDIChildVirtuals.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbMDIChildVirtuals.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbMDIChildVirtuals.h 12 Jul 2001 19:44:18 -0000 1.1
--- FXRbMDIChildVirtuals.h 11 Jul 2002 16:41:33 -0000 1.2
***************
*** 1,18 ****
public:
// Calls the base class version of minimize()
! void _minimize(FXbool notify=FALSE);
// Overrides the base class version of minimize()
! virtual void minimize(FXbool notify=FALSE);
// Calls the base class version of maximize()
! void _maximize(FXbool notify=FALSE);
// Overrides the base class version of maximize()
! virtual void maximize(FXbool notify=FALSE);
// Calls the base class version of restore()
! void _restore(FXbool notify=FALSE);
// Overrides the base class version of restore()
! virtual void restore(FXbool notify=FALSE);
--- 1,24 ----
public:
// Calls the base class version of minimize()
! FXbool _minimize(FXbool notify=FALSE);
// Overrides the base class version of minimize()
! virtual FXbool minimize(FXbool notify=FALSE);
// Calls the base class version of maximize()
! FXbool _maximize(FXbool notify=FALSE);
// Overrides the base class version of maximize()
! virtual FXbool maximize(FXbool notify=FALSE);
// Calls the base class version of restore()
! FXbool _restore(FXbool notify=FALSE);
// Overrides the base class version of restore()
! virtual FXbool restore(FXbool notify=FALSE);
!
! // Calls the base class version of close()
! FXbool _close(FXbool notify=FALSE);
!
! // Overrides the base class version of close()
! virtual FXbool close(FXbool notify=FALSE);
|
