gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-25 18:21:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added missing ivars and rearranged them all.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8266 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2000-12-07 00:20:52 +00:00
parent c2f8b2e407
commit 45d762b709
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Headers/gnustep/gui/NSCell.h
View file

@ -35,6 +35,7 @@
#include <AppKit/NSText.h> #include <AppKit/NSText.h>
@class NSString; @class NSString;
@class NSMutableDictionary;
@class NSView; @class NSView;
@class NSFont; @class NSFont;
@class NSText; @class NSText;
@ -114,24 +115,28 @@ enum {
// Attributes // Attributes
NSString *_contents; NSString *_contents;
NSImage *_cell_image; NSImage *_cell_image;
NSFont *_cell_font; NSMutableDictionary *_typingAttributes;
id _objectValue;
struct GSCellFlagsType { struct GSCellFlagsType {
// total 29 bits. 3 bits left. // total 26 bits. 6 bits left.
unsigned is_highlighted:1; unsigned is_highlighted:1;
unsigned is_disabled:1; unsigned is_disabled:1;
unsigned is_editable: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_bordered:1;
unsigned is_bezeled:1; unsigned is_bezeled:1;
unsigned is_scrollable:1; unsigned is_scrollable:1;
unsigned is_selectable:1; unsigned is_selectable:1;
unsigned is_continuous:1; unsigned is_continuous:1;
unsigned float_autorange:1; unsigned float_autorange:1;
unsigned wraps:1;
unsigned allows_mixed_state:1; unsigned allows_mixed_state:1;
unsigned has_valid_object_value:1; unsigned has_valid_object_value:1;
unsigned text_align:3; // 5 values unsigned type:2; // 3 values
unsigned image_position:4; // 7 values unsigned image_position:4; // 7 values
unsigned type:4; // 8 values (see NSButtonCell)
unsigned entry_type:4; // 8 values unsigned entry_type:4; // 8 values
// 2 bits reserved for subclass use // 2 bits reserved for subclass use
unsigned subclass_bool_one:1; unsigned subclass_bool_one:1;
@ -140,12 +145,14 @@ enum {
but who knows in the future */ but who knows in the future */
int state; // 3 values but one negative int state; // 3 values but one negative
} _cell; } _cell;
unsigned char _mnemonic_location;
unsigned int _cell_float_left; unsigned int _cell_float_left;
unsigned int _cell_float_right; unsigned int _cell_float_right;
id _represented_object; unsigned int _mouse_down_flags;
unsigned int _action_mask; unsigned int _action_mask;
NSFormatter *_formatter; NSFormatter *_formatter;
id _objectValue; NSMenu *_menu;
id _represented_object;
} }
// //
@ -409,6 +416,8 @@ enum {
// //
@interface NSCell (PrivateMethods) @interface NSCell (PrivateMethods)
- (NSColor*) textColor;
- (NSSize) _sizeText: (NSString*) title;
- (void) _drawText: (NSString*)aString inFrame: (NSRect)aRect; - (void) _drawText: (NSString*)aString inFrame: (NSRect)aRect;
@end @end