[Fxruby-commits] CVS: FXRuby/swig-interfaces FXRange.i,1.11.2.1,1.11.2.2

[Lyle J. <ly...@us...>]

Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv11589/swig-interfaces

Modified Files:
      Tag: release10
	FXRange.i 
Log Message:
Deprecated FXRange instance methods empty(), overlap(), contains() and
intersect(); replaced with empty?(), overlaps?(), contains?() and
intersects?().


Index: FXRange.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXRange.i,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -d -r1.11.2.1 -r1.11.2.2
*** FXRange.i	6 May 2002 19:16:29 -0000	1.11.2.1
--- FXRange.i	24 May 2002 16:24:29 -0000	1.11.2.2
***************
*** 52,55 ****
--- 52,67 ----
  };
  
+ // Do not wrap default constructor
+ %ignore FXRange::FXRange();
+ 
+ // Rename these methods
+ %rename("empty?") FXRange::empty() const;
+ %rename("overlaps?") FXRange::overlap(const FXRange& box) const;
+ %rename("contains?") FXRange::contains(FXfloat x,FXfloat y,FXfloat z) const;
+ %rename("includeRange") FXRange::include(const FXRange& box);
+ %rename("includePoint") FXRange::include(FXfloat x,FXfloat y,FXfloat z);
+ %rename("includeVec") FXRange::include(const FXVec& v);
+ %rename("intersects?") FXRange::intersects(const FXVec& u,const FXVec& v) const;
+ 
  %exception FXRange::FXRange "$action FXRbRegisterRubyObj(self, result);";
  
***************
*** 59,62 ****
--- 71,78 ----
    FXfloat d[3][2];
  public:
+ 
+   // Default constructor
+   FXRange();
+   
    // Initialize
    FXRange(FXfloat xlo=0.0f,FXfloat xhi=0.0f,FXfloat ylo=0.0f,FXfloat yhi=0.0f,FXfloat zlo=0.0f,FXfloat zhi=0.0f);
***************
*** 105,115 ****
  
    // Include given range into box
!   %name(includeRange) FXRange& include(const FXRange& box);
  
    // Include point 
!   %name(includePoint) FXRange& include(FXfloat x,FXfloat y,FXfloat z);
  
    // Include point 
!   %name(includeVec) FXRange& include(const FXVec& v);
    
    // Clip domain against another 
--- 121,131 ----
  
    // Include given range into box
!   FXRange& include(const FXRange& box);
  
    // Include point 
!   FXRange& include(FXfloat x,FXfloat y,FXfloat z);
  
    // Include point 
!   FXRange& include(const FXVec& v);
    
    // Clip domain against another 
***************
*** 135,139 ****
    
      /// Ray intersection test
!     FXbool intersect(const FXVec& u,const FXVec& v) const {
        return boxIntersect(*self,u,v);
        }
--- 151,155 ----
    
      /// Ray intersection test
!     FXbool intersects(const FXVec& u,const FXVec& v) const {
        return boxIntersect(*self,u,v);
        }