Whoops! Need to add the header changes.

This commit is contained in:
Jeff Teunissen 2002-08-17 07:17:53 +00:00
parent 51ce063486
commit 8cee7b7e4a
2 changed files with 12 additions and 40 deletions

View file

@ -12,11 +12,12 @@
Size size; Size size;
} }
- (id) initWithOrigin: (Point)_origin size: (Size)_size;
- (id) initWithComponents: (integer)x : (integer)y : (integer)w : (integer)h; - (id) initWithComponents: (integer)x : (integer)y : (integer)w : (integer)h;
- (id) initWithOrigin: (Point)anOrigin size: (Size)aSize;
- (id) initWithRect: (Rect)aRect; - (id) initWithRect: (Rect)aRect;
- (id) copy; - (id) copy;
#if 0
- (BOOL) intersectsRect: (Rect)aRect; - (BOOL) intersectsRect: (Rect)aRect;
- (BOOL) containsPoint: (Point)aPoint; - (BOOL) containsPoint: (Point)aPoint;
- (BOOL) containsRect: (Rect)aRect; - (BOOL) containsRect: (Rect)aRect;
@ -28,11 +29,14 @@
- (Rect) insetBySize: (Size)aSize; - (Rect) insetBySize: (Size)aSize;
- (Rect) offsetBySize: (Size)aSize; - (Rect) offsetBySize: (Size)aSize;
#endif
- (Point) origin; - (Point) origin;
- (Size) size; - (Size) size;
- (void) setOrigin: (Point)aPoint;
- (void) setSize: (Size)aSize; - (void) setSize: (Size)aSize;
- (void) setRect: (Rect)aRect;
@end @end

View file

@ -2,8 +2,6 @@
#define __ruamoko_Size_h #define __ruamoko_Size_h
#include "Object.h" #include "Object.h"
#include "Point.h"
#include "Size.h"
@interface Size: Object @interface Size: Object
{ {
@ -12,50 +10,20 @@
integer height; integer height;
} }
- (id) initWithWidth: (integer)w height: (integer)h; - (id) initWithComponents: (integer)w : (integer)h;
- (id) initWithSize: (Size)aSize; - (id) initWithSize: (Size)aSize;
- (id) copy; - (id) copy;
- (void) addSize: (Size)aSize;
- (void) subtractSize: (Size)aSize;
- (integer) width; - (integer) width;
- (integer) height; - (integer) height;
- (void) setSize: (Size)aSize; - (void) setSize: (Size)aSize;
- (void) setWidth: (integer)_width; - (void) setWidth: (integer)w;
- (void) setHeight: (integer)_width; - (void) setHeight: (integer)h;
- (void) addSize: (Size)aSize;
- (void) subtractSize: (Size)aSize;
@end @end
@interface Rect: Object #endif //__ruamoko_Size_h
{
@public
Point origin;
Size size;
}
- (id) initWithOrigin: (Point)_origin size: (Size)_size;
- (id) initWithComponents: (integer)x : (integer)y : (integer)w : (integer)h;
- (id) initWithRect: (Rect)aRect;
- (id) copy;
- (BOOL) intersectsRect: (Rect)aRect;
- (BOOL) containsPoint: (Point)aPoint;
- (BOOL) containsRect: (Rect)aRect;
- (BOOL) isEqualToRect: (Rect)aRect;
- (BOOL) isEmpty;
- (Rect) intersectionWithRect: (Rect)aRect;
- (Rect) unionWithRect: (Rect)aRect;
- (Rect) insetBySize: (Size)aSize;
- (Point) origin;
- (Size) size;
- (void) setSize: (Size)aSize;
@end
#endif//__ruamoko_point_h