From 858ba8fb7379a083e02fd2f8c847489e177702a0 Mon Sep 17 00:00:00 2001 From: Fred Kiefer Date: Sat, 1 Sep 2001 17:11:53 +0000 Subject: [PATCH] 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 --- Headers/gnustep/gui/NSMenuItemCell.h | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/Headers/gnustep/gui/NSMenuItemCell.h b/Headers/gnustep/gui/NSMenuItemCell.h index ef1d871e8..79fbb6da6 100644 --- a/Headers/gnustep/gui/NSMenuItemCell.h +++ b/Headers/gnustep/gui/NSMenuItemCell.h @@ -37,22 +37,20 @@ typedef void (*DrawingIMP)(id, SEL, NSRect, NSView*); @interface NSMenuItemCell : NSButtonCell { - BOOL mcell_highlighted; - BOOL mcell_has_submenu; - NSMenuItem *mcell_item; - NSMenuView *mcell_menuView; + NSMenuItem *_menuItem; + NSMenuView *_menuView; // Cache - BOOL mcell_needs_sizing; - float mcell_imageWidth; - float mcell_titleWidth; - float mcell_keyEquivalentWidth; - float mcell_stateImageWidth; - float mcell_menuItemHeight; + BOOL _needs_sizing; + float _imageWidth; + float _titleWidth; + float _keyEquivalentWidth; + float _stateImageWidth; + float _menuItemHeight; - NSImage *mcell_imageToDisplay; - NSString *mcell_titleToDisplay; - NSSize mcell_imageSize; + NSImage *_imageToDisplay; + NSString *_titleToDisplay; + NSSize _imageSize; /* If we belong to a popupbutton, we display image on the extreme right */ @@ -64,9 +62,6 @@ typedef void (*DrawingIMP)(id, SEL, NSRect, NSView*); - (void)setHighlighted:(BOOL)flag; - (BOOL)isHighlighted; -- (void)highlight:(BOOL)flag - withFrame:(NSRect)cellFrame - inView:(NSView*)controlView; - (void)setMenuItem:(NSMenuItem *)item; - (NSMenuItem *)menuItem;