[Fxruby-commits] CVS: FXRuby/swig-interfaces FXRegion.i,1.6.2.4,1.6.2.5 Makefile,1.20.2.1,1.20.2.2 c
Status: Inactive
Brought to you by:
lyle
Menu
▾
▴
[Fxruby-commits] CVS: FXRuby/swig-interfaces FXRegion.i,1.6.2.4,1.6.2.5 Makefile,1.20.2.1,1.20.2.2 core.i,1.27,1.27.2.1 dialogs.i,1.13,1.13.2.1 icons.i,1.13,1.13.2.1 image.i,1.15.2.1,1.15.2.2 layout.i,1.4,1.4.2.1 mdi.i,1.11,1.11.2.1 opengl.i,1.15,1.15.2.1 scintilla.i,1.4,1.4.2.1 ui.i,1.2,1.2.2.1
|
From: Lyle J. <ly...@us...> - 2002-07-08 18:44:01
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv14447/swig-interfaces
Modified Files:
Tag: release10
FXRegion.i Makefile core.i dialogs.i icons.i image.i layout.i
mdi.i opengl.i scintilla.i ui.i
Log Message:
Started trying to include the FOX header files directly; first cut
was with FXRegion.
Index: FXRegion.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXRegion.i,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -d -r1.6.2.4 -r1.6.2.5
*** FXRegion.i 8 Jul 2002 13:27:51 -0000 1.6.2.4
--- FXRegion.i 8 Jul 2002 18:42:08 -0000 1.6.2.5
***************
*** 21,103 ****
***********************************************************************/
! %ignore FXRegion::operator=(const FXRegion& r);
%rename("empty?") FXRegion::empty() const;
%exception FXRegion::FXRegion "$action FXRbRegisterRubyObj(self, result);";
! /// Region
! class FXRegion {
! public:
!
! /// Construct new empty region
! FXRegion();
! /// Construct new region copied from region r
! FXRegion(const FXRegion& r);
!
! /// Construct new region set to given rectangle
! FXRegion(FXint x,FXint y,FXint w,FXint h);
!
! /// Assign region r to this one
! FXRegion &operator=(const FXRegion& r);
! /// Return TRUE if region is empty
! FXbool empty() const;
! /// Return TRUE if region contains point
! FXbool contains(FXint x,FXint y) const;
! /// Return TRUE if region contains rectangle
! FXbool contains(FXint x,FXint y,FXint w,FXint h) const;
! %extend {
! // Return bounding box
! FXRectangle bounds() const {
! FXRectangle r;
! self->bounds(r);
! return r;
! }
}
! /// Offset region by dx,dy
! FXRegion& offset(FXint dx,FXint dy);
! %extend {
! /// Union region r with this one
! FXRegion __add__(const FXRegion& other) {
! return (*self) + other;
! }
!
! /// Intersect region r with this one
! FXRegion __mul__(const FXRegion& other) {
! return (*self) * other;
! }
!
! /// Subtract region r from this one
! FXRegion __sub__(const FXRegion& other) {
! return (*self) - other;
! }
!
! /// Xor region r with this one
! FXRegion __xor__(const FXRegion& other) {
! return (*self)^other;
! }
! /// Return TRUE if region equal to this one
! FXbool __eq__(const FXRegion& other) {
! return (*self) == other;
! }
}
#ifdef SWIGPYTHON
! %extend {
! FXbool __ne__(const FXRegion& other) {
! return (*self) != other;
! }
}
#endif
!
! /// Destroy region
! ~FXRegion();
! };
--- 21,80 ----
***********************************************************************/
! %ignore FXRegion::bounds(FXRectangle& r) const;
+ #ifdef SWIGRUBY
%rename("empty?") FXRegion::empty() const;
%exception FXRegion::FXRegion "$action FXRbRegisterRubyObj(self, result);";
! %ignore FXRegion::operator=(const FXRegion& r);
! %ignore FXRegion::operator+=(const FXRegion& r);
! %ignore FXRegion::operator*=(const FXRegion& r);
! %ignore FXRegion::operator-=(const FXRegion& r);
! %ignore FXRegion::operator^=(const FXRegion& r);
! %ignore FXRegion::operator!=(const FXRegion& r);
! %ignore operator!=(const FXRegion& r1,const FXRegion& r2);
! #endif
! %include "FXRegion.h"
! %extend FXRegion {
! // Return bounding box
! FXRectangle bounds() const {
! FXRectangle r;
! self->bounds(r);
! return r;
! }
! // Union region r with this one
! FXRegion operator+(const FXRegion& other) const {
! return (*self) + other;
! }
! // Intersect region r with this one
! FXRegion operator*(const FXRegion& other) const {
! return (*self) * other;
}
! // Subtract region r from this one
! FXRegion operator-(const FXRegion& other) const {
! return (*self) - other;
! }
! // Xor region r with this one
! FXRegion operator^(const FXRegion& other) const {
! return (*self)^other;
! }
! // Return TRUE if region equal to this one
! FXbool operator==(const FXRegion& other) const {
! return (*self) == other;
}
#ifdef SWIGPYTHON
! FXbool operator!=(const FXRegion& other) const {
! return (*self) != other;
}
#endif
! }
Index: Makefile
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/Makefile,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -C2 -d -r1.20.2.1 -r1.20.2.2
*** Makefile 8 May 2002 16:48:59 -0000 1.20.2.1
--- Makefile 8 Jul 2002 18:42:08 -0000 1.20.2.2
***************
*** 9,13 ****
SWIG = swig
! CFLAGS = -c -c++ -ruby -no_default
SRCDIR = ../ext/fox
SED = sed -f swig.sed
--- 9,13 ----
SWIG = swig
! CFLAGS = -c -c++ -ruby -no_default -I../fox-includes
SRCDIR = ../ext/fox
SED = sed -f swig.sed
Index: core.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/core.i,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -C2 -d -r1.27 -r1.27.2.1
*** core.i 2 Apr 2002 03:44:27 -0000 1.27
--- core.i 8 Jul 2002 18:42:08 -0000 1.27.2.1
***************
*** 27,39 ****
%module core
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%inline %{
--- 27,31 ----
%module core
! %include common.i
%inline %{
Index: dialogs.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/dialogs.i,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** dialogs.i 2 Apr 2002 03:44:27 -0000 1.13
--- dialogs.i 8 Jul 2002 18:42:08 -0000 1.13.2.1
***************
*** 27,39 ****
%module dialogs
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%import fxdefs.i
--- 27,31 ----
%module dialogs
! %include common.i
%import fxdefs.i
Index: icons.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/icons.i,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** icons.i 2 Apr 2002 03:44:27 -0000 1.13
--- icons.i 8 Jul 2002 18:42:08 -0000 1.13.2.1
***************
*** 27,39 ****
%module icons
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%import fxdefs.i
--- 27,31 ----
%module icons
! %include common.i
%import fxdefs.i
Index: image.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/image.i,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -d -r1.15.2.1 -r1.15.2.2
*** image.i 8 May 2002 16:49:29 -0000 1.15.2.1
--- image.i 8 Jul 2002 18:42:08 -0000 1.15.2.2
***************
*** 27,39 ****
%module image
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%import fxdefs.i
--- 27,31 ----
%module image
! %include common.i
%import fxdefs.i
Index: layout.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/layout.i,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** layout.i 2 Apr 2002 03:44:27 -0000 1.4
--- layout.i 8 Jul 2002 18:42:08 -0000 1.4.2.1
***************
*** 27,39 ****
%module layout
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%import fxdefs.i
--- 27,31 ----
%module layout
! %include common.i
%import fxdefs.i
Index: mdi.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/mdi.i,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** mdi.i 2 Apr 2002 03:44:27 -0000 1.11
--- mdi.i 8 Jul 2002 18:42:08 -0000 1.11.2.1
***************
*** 27,39 ****
%module mdi
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%import fxdefs.i
--- 27,31 ----
%module mdi
! %include common.i
%import fxdefs.i
Index: opengl.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/opengl.i,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** opengl.i 2 Apr 2002 03:44:27 -0000 1.15
--- opengl.i 8 Jul 2002 18:42:08 -0000 1.15.2.1
***************
*** 27,39 ****
%module opengl
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%import fxdefs.i
--- 27,31 ----
%module opengl
! %include common.i
%import fxdefs.i
Index: scintilla.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/scintilla.i,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** scintilla.i 2 Apr 2002 03:44:27 -0000 1.4
--- scintilla.i 8 Jul 2002 18:42:08 -0000 1.4.2.1
***************
*** 31,34 ****
--- 31,39 ----
%}
+ #ifdef FXAPI
+ #undef FXAPI
+ #endif
+ #define FXAPI
+
%include typemaps.i
%include markfuncs.i
Index: ui.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/ui.i,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** ui.i 2 Apr 2002 03:44:27 -0000 1.2
--- ui.i 8 Jul 2002 18:42:08 -0000 1.2.2.1
***************
*** 27,39 ****
%module ui
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%import fxdefs.i
--- 27,31 ----
%module ui
! %include common.i
%import fxdefs.i
|
