diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 12:30:15 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 12:30:15 +0000 |
| commit | d0a0515945a12e06ee317adb21a48d5f878d824b (patch) | |
| tree | 2f37a0bc49932b49170d04f6dbef0ba08bf2af2c /vcl | |
| parent | ef4a6cad0e4065bb6a6f46a52bf0c0878ca6375b (diff) | |
INTEGRATION: CWS aquaupdateicon (1.4.78); FILE MERGED
2008/07/31 13:57:06 pl 1.4.78.3: #i92043# tooltips for addmenu buttons on the mac
2008/07/30 12:17:58 pl 1.4.78.2: #i92043# implement native menu buttons
2008/07/29 17:39:18 pl 1.4.78.1: #i92043# add: native menubar add buttons
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/salmenu.hxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/vcl/inc/vcl/salmenu.hxx b/vcl/inc/vcl/salmenu.hxx index 054a12a481ed..d924af6ee24c 100644 --- a/vcl/inc/vcl/salmenu.hxx +++ b/vcl/inc/vcl/salmenu.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salmenu.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -52,6 +52,17 @@ struct SalItemParams }; +struct SalMenuButtonItem +{ + USHORT mnId; + Image maImage; + rtl::OUString maToolTipText; + + SalMenuButtonItem() : mnId( 0 ) {} + SalMenuButtonItem( USHORT i_nId, const Image& rImg, const rtl::OUString& i_rTTText = rtl::OUString() ) + : mnId( i_nId ), maImage( rImg ), maToolTipText( i_rTTText ) {} +}; + class VCL_DLLPUBLIC SalMenuItem { public: @@ -78,7 +89,14 @@ public: virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ) = 0; virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName ) = 0; virtual void GetSystemMenuData( SystemMenuData* pData ) = 0; - virtual BOOL ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, ULONG nFlags); + virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, ULONG nFlags); + virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false if not implemented or failure + virtual void RemoveMenuBarButton( USHORT nId ); + + // return an empty rectangle if not implemented + // return Rectangle( Point( -1, -1 ), Size( 1, 1 ) ) if menu bar buttons implemented + // but rectangle cannot be determined + virtual Rectangle GetMenuBarButtonRectPixel( USHORT i_nItemId, SalFrame* i_pReferenceFrame ); }; |