diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 12:28:40 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 12:28:40 +0000 |
| commit | ef24eb6a928c1511942cd7eeb1726f5bbaa45ee6 (patch) | |
| tree | c22042f868c7b14d841737f34e7ac0f1264590ce /vcl | |
| parent | 909e908f0b0d4b73b01af25cf7c474a4e445ed5e (diff) | |
INTEGRATION: CWS aquaupdateicon (1.4.78); FILE MERGED
2008/07/31 13:55:06 pl 1.4.78.2: #i92043# refactor for tiger, which has problems with NSStatusItems at exit, so use one and only one
2008/07/29 17:39:18 pl 1.4.78.1: #i92043# add: native menubar add buttons
Diffstat (limited to 'vcl')
| -rwxr-xr-x | vcl/aqua/inc/salnsmenu.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/vcl/aqua/inc/salnsmenu.h b/vcl/aqua/inc/salnsmenu.h index 075e4cb16691..4065d96a623c 100755 --- a/vcl/aqua/inc/salnsmenu.h +++ b/vcl/aqua/inc/salnsmenu.h @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salnsmenu.h,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -31,18 +31,16 @@ #ifndef _VCL_SALNSMENU_H #define _VCL_SALNSMENU_H -class AquaSalMenuItem : public SalMenuItem -{ -public: - AquaSalMenuItem( const SalItemParams* ); - virtual ~AquaSalMenuItem(); +class AquaSalMenu; +class AquaSalMenuItem; - USHORT mnId; // Item ID - Menu* mpVCLMenu; // VCL Menu into which this MenuItem is inserted - AquaSalMenu* mpParentMenu; // The menu in which this menu item is inserted - AquaSalMenu* mpSubMenu; // Sub menu of this item (if defined) - NSMenuItem* mpMenuItem; // The NSMenuItem -}; +@interface OOStatusItemView : NSView +{ +} +-(void)drawRect: (NSRect)aRect; +-(void)layout; +-(void)mouseUp: (NSEvent *)pEvent; +@end @interface SalNSMenu : NSMenu { |