Prefixed ivars with underscores; use a bitfield; moved

sizeForBorderType to a function (even inlined for now)


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5453 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nico 1999-12-13 02:30:24 +00:00
parent a5414f5e78
commit b5c414aa59

View file

@ -109,29 +109,31 @@ enum {
@interface NSCell : NSObject <NSCopying, NSCoding> @interface NSCell : NSObject <NSCopying, NSCoding>
{ {
// Attributes // Attributes
NSString *contents; NSString *_contents;
NSImage *cell_image; NSImage *_cell_image;
NSFont *cell_font; NSFont *_cell_font;
BOOL cell_state; struct GSCellFlagsType {
BOOL cell_highlighted; unsigned is_highlighted:1;
BOOL cell_enabled; unsigned is_enabled:1;
BOOL cell_editable; unsigned is_editable:1;
BOOL cell_bordered; unsigned is_bordered:1;
BOOL cell_bezeled; unsigned is_bezeled:1;
BOOL cell_scrollable; unsigned is_scrollable:1;
BOOL cell_selectable; unsigned is_selectable:1;
BOOL cell_continuous; unsigned is_continuous:1;
BOOL cell_float_autorange; unsigned float_autorange:1;
unsigned int cell_float_left; } _cell;
unsigned int cell_float_right; int _cell_state;
NSCellImagePosition image_position; unsigned int _cell_float_left;
int cell_type; unsigned int _cell_float_right;
NSTextAlignment text_align; NSCellImagePosition _image_position;
int entry_type; NSCellType _cell_type;
NSView *control_view; NSTextAlignment _text_align;
NSSize cell_size; int _entry_type;
id represented_object; NSView *_control_view;
unsigned int action_mask; NSSize _cell_size;
id _represented_object;
unsigned int _action_mask;
} }
// //
@ -341,16 +343,6 @@ enum {
@end @end
//
// Methods the backend should implement
//
@interface NSCell (GNUstepBackend)
// Returns the size of a border
+ (NSSize)sizeForBorderType:(NSBorderType)aType;
@end
// //
// Methods that are private GNUstep extensions // Methods that are private GNUstep extensions
// //
@ -360,5 +352,13 @@ enum {
@end @end
//
// Function which should be somewhere else
//
inline NSSize
_sizeForBorderType (NSBorderType aType);
#endif // _GNUstep_H_NSCell #endif // _GNUstep_H_NSCell