Modified ivars to reduce memory consumption.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8328 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2000-12-16 13:54:23 +00:00
parent 2c1ac429dc
commit b489f16573

View file

@ -1,4 +1,4 @@
/*
/* -*-objc-*-
NSCell.h
The abstract cell class
@ -115,31 +115,34 @@ enum {
// Attributes
NSString *_contents;
NSImage *_cell_image;
NSMutableDictionary *_typingAttributes;
NSFont *_font;
id _objectValue;
struct GSCellFlagsType {
// total 26 bits. 6 bits left.
unsigned is_highlighted:1;
unsigned is_disabled:1;
unsigned is_editable:1;
// total 32 bits. 0 bits left.
unsigned contents_is_attributed_string: 1;
unsigned is_highlighted: 1;
unsigned is_disabled: 1;
unsigned is_editable: 1;
unsigned is_rich_text: 1;
unsigned imports_graphics: 1;
unsigned shows_first_responder:1;
unsigned refuses_first_responder:1;
unsigned sends_action_on_end_editing:1;
unsigned is_bordered:1;
unsigned is_bezeled:1;
unsigned is_scrollable:1;
unsigned is_selectable:1;
unsigned is_continuous:1;
unsigned allows_mixed_state:1;
unsigned has_valid_object_value:1;
unsigned type:2; // 3 values
unsigned image_position:4; // 7 values
unsigned entry_type:4; // 8 values
unsigned shows_first_responder: 1;
unsigned refuses_first_responder: 1;
unsigned sends_action_on_end_editing: 1;
unsigned is_bordered: 1;
unsigned is_bezeled: 1;
unsigned is_scrollable: 1;
unsigned wraps: 1;
unsigned text_align: 3; // 5 values
unsigned is_selectable: 1;
unsigned is_continuous: 1;
unsigned allows_mixed_state: 1;
unsigned has_valid_object_value: 1;
unsigned type: 2; // 3 values
unsigned image_position: 4; // 7 values
unsigned entry_type: 4; // 8 values
// 2 bits reserved for subclass use
unsigned subclass_bool_one:1;
unsigned subclass_bool_two:1;
unsigned subclass_bool_one: 1;
unsigned subclass_bool_two: 1;
/* This is not in the bitfield now (for simpler macosx compatibility)
but who knows in the future */
int state; // 3 values but one negative
@ -416,7 +419,9 @@ enum {
- (NSMutableDictionary*) _typingAttributes;
- (NSColor*) textColor;
- (NSSize) _sizeText: (NSString*) title;
- (void) _drawText: (NSString*)aString inFrame: (NSRect)aRect;
- (void) _drawText: (NSString*)aString inFrame: (NSRect)aRect;
- (void) _drawAttributedText: (NSAttributedString*)aString
inFrame: (NSRect)aRect;
@end