diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-09-15 23:12:58 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-09-16 10:14:08 +0200 |
| commit | d2d8cda6c2bf93149acbe9a04389d056709d7ed2 (patch) | |
| tree | 94ef832ddec3f0b3b45a7a235d3abc8297a4e3d5 /include | |
| parent | e6b9651756abd339dbbec6b0540ea4fd1f41fec2 (diff) | |
vcl menu: Make SelectItem() virtual to eliminate IsMenuBar() call.
Award for the sickiest usage of IsMenuBar().
Change-Id: I194b983b61d0106b3628d364f08b261a03c0c42c
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/menu.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index a4576959eb51..ec49165aa1dc 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -274,7 +274,7 @@ public: void CheckItem( sal_uInt16 nItemId, bool bCheck = true ); bool IsItemChecked( sal_uInt16 nItemId ) const; - void SelectItem( sal_uInt16 nItemId ); + virtual void SelectItem(sal_uInt16 nItemId) = 0; void DeSelect() { SelectItem( 0xFFFF ); } // MENUITEMPOS_INVALID void EnableItem( sal_uInt16 nItemId, bool bEnable = true ); @@ -434,12 +434,12 @@ public: bool HasHideButton() const { return mbHideBtnVisible; } void ShowButtons( bool bClose, bool bFloat, bool bHide ); - void SelectEntry( sal_uInt16 nId ); - bool HandleMenuActivateEvent( Menu *pMenu ) const; - bool HandleMenuDeActivateEvent( Menu *pMenu ) const; - bool HandleMenuHighlightEvent( Menu *pMenu, sal_uInt16 nEventId ) const; - bool HandleMenuCommandEvent( Menu *pMenu, sal_uInt16 nEventId ) const; - bool HandleMenuButtonEvent( Menu *pMenu, sal_uInt16 nEventId ) const; + virtual void SelectItem(sal_uInt16 nId) SAL_OVERRIDE; + bool HandleMenuActivateEvent(Menu *pMenu) const; + bool HandleMenuDeActivateEvent(Menu *pMenu) const; + bool HandleMenuHighlightEvent(Menu *pMenu, sal_uInt16 nEventId) const; + bool HandleMenuCommandEvent(Menu *pMenu, sal_uInt16 nEventId) const; + bool HandleMenuButtonEvent(Menu *pMenu, sal_uInt16 nEventId) const; void SetCloseButtonClickHdl( const Link& rLink ) { maCloseHdl = rLink; } const Link& GetCloseButtonClickHdl() const { return maCloseHdl; } @@ -523,7 +523,7 @@ public: // Fuer das TestTool void EndExecute( sal_uInt16 nSelect = 0 ); - void SelectEntry( sal_uInt16 nId ); + virtual void SelectItem(sal_uInt16 nId) SAL_OVERRIDE; void SetSelectedEntry( sal_uInt16 nId ); // for use by native submenu only static bool IsInExecute(); |