mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-30 17:10:37 +00:00
Removed ivars mcell_highlighted and mcell_has_submenu.
Renamed all ivars. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10829 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
fbcb65fafd
commit
858ba8fb73
1 changed files with 11 additions and 16 deletions
|
@ -37,22 +37,20 @@ typedef void (*DrawingIMP)(id, SEL, NSRect, NSView*);
|
||||||
|
|
||||||
@interface NSMenuItemCell : NSButtonCell <NSCopying, NSCoding>
|
@interface NSMenuItemCell : NSButtonCell <NSCopying, NSCoding>
|
||||||
{
|
{
|
||||||
BOOL mcell_highlighted;
|
NSMenuItem *_menuItem;
|
||||||
BOOL mcell_has_submenu;
|
NSMenuView *_menuView;
|
||||||
NSMenuItem *mcell_item;
|
|
||||||
NSMenuView *mcell_menuView;
|
|
||||||
|
|
||||||
// Cache
|
// Cache
|
||||||
BOOL mcell_needs_sizing;
|
BOOL _needs_sizing;
|
||||||
float mcell_imageWidth;
|
float _imageWidth;
|
||||||
float mcell_titleWidth;
|
float _titleWidth;
|
||||||
float mcell_keyEquivalentWidth;
|
float _keyEquivalentWidth;
|
||||||
float mcell_stateImageWidth;
|
float _stateImageWidth;
|
||||||
float mcell_menuItemHeight;
|
float _menuItemHeight;
|
||||||
|
|
||||||
NSImage *mcell_imageToDisplay;
|
NSImage *_imageToDisplay;
|
||||||
NSString *mcell_titleToDisplay;
|
NSString *_titleToDisplay;
|
||||||
NSSize mcell_imageSize;
|
NSSize _imageSize;
|
||||||
|
|
||||||
/* If we belong to a popupbutton, we display image on the extreme
|
/* If we belong to a popupbutton, we display image on the extreme
|
||||||
right */
|
right */
|
||||||
|
@ -64,9 +62,6 @@ typedef void (*DrawingIMP)(id, SEL, NSRect, NSView*);
|
||||||
|
|
||||||
- (void)setHighlighted:(BOOL)flag;
|
- (void)setHighlighted:(BOOL)flag;
|
||||||
- (BOOL)isHighlighted;
|
- (BOOL)isHighlighted;
|
||||||
- (void)highlight:(BOOL)flag
|
|
||||||
withFrame:(NSRect)cellFrame
|
|
||||||
inView:(NSView*)controlView;
|
|
||||||
|
|
||||||
- (void)setMenuItem:(NSMenuItem *)item;
|
- (void)setMenuItem:(NSMenuItem *)item;
|
||||||
- (NSMenuItem *)menuItem;
|
- (NSMenuItem *)menuItem;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue