mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-30 06:40:49 +00:00
Removed ivar meunv_menu and reuse _menu from NSResponder.
Renamed all the ivars. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10867 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
fa9637f045
commit
325aa480ad
1 changed files with 18 additions and 22 deletions
|
@ -47,28 +47,28 @@
|
||||||
|
|
||||||
@interface NSMenuView : NSView <NSCoding>
|
@interface NSMenuView : NSView <NSCoding>
|
||||||
{
|
{
|
||||||
NSMenu *menuv_menu;
|
NSMutableArray *_itemCells;
|
||||||
NSMutableArray *menuv_itemCells;
|
BOOL _horizontal;
|
||||||
BOOL menuv_horizontal;
|
NSFont *_font;
|
||||||
NSFont *menuv_font;
|
int _highlightedItemIndex;
|
||||||
int menuv_highlightedItemIndex;
|
float _horizontalEdgePad;
|
||||||
float menuv_horizontalEdgePad;
|
float _stateImageOffset;
|
||||||
float menuv_stateImageOffset;
|
float _stateImageWidth;
|
||||||
float menuv_stateImageWidth;
|
float _imageAndTitleOffset;
|
||||||
float menuv_imageAndTitleOffset;
|
float _imageAndTitleWidth;
|
||||||
float menuv_imageAndTitleWidth;
|
float _keyEqOffset;
|
||||||
float menuv_keyEqOffset;
|
float _keyEqWidth;
|
||||||
float menuv_keyEqWidth;
|
BOOL _needsSizing;
|
||||||
BOOL menuv_needsSizing;
|
NSSize _cellSize;
|
||||||
NSSize cellSize;
|
|
||||||
@private
|
@private
|
||||||
id menuv_items_link;
|
id _items_link;
|
||||||
BOOL menuv_keepAttachedMenus;
|
BOOL _keepAttachedMenus;
|
||||||
int _oldHighlightedItemIndex;
|
int _oldHighlightedItemIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ (float)menuBarHeight;
|
+ (float)menuBarHeight;
|
||||||
|
|
||||||
|
- (id)initAsTearOff;
|
||||||
- (void)setMenu:(NSMenu *)menu;
|
- (void)setMenu:(NSMenu *)menu;
|
||||||
- (NSMenu *)menu;
|
- (NSMenu *)menu;
|
||||||
- (void)setHorizontal:(BOOL)flag;
|
- (void)setHorizontal:(BOOL)flag;
|
||||||
|
@ -115,12 +115,8 @@
|
||||||
- (BOOL)trackWithEvent:(NSEvent *)event;
|
- (BOOL)trackWithEvent:(NSEvent *)event;
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSMenuView (Private)
|
@interface NSMenuView (GNUstepExtension)
|
||||||
- (id) initWithFrame: (NSRect)aFrame
|
- (void) _setCellSize: (NSSize)aSize;
|
||||||
cellSize: (NSSize)aSize;
|
|
||||||
- (void) setPopUpButton: (NSPopUpButton *)popb;
|
|
||||||
- (NSPopUpButton *) popupButton;
|
|
||||||
- (void)setTitleWidth:(float)titleWidth;
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue