diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-09-08 13:18:17 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-09-09 06:58:28 +0200 |
| commit | 9195fd3819197c14f6fc018483075c4be5bf85fd (patch) | |
| tree | a759610361cdbba7647d601d01aa06950f696e9e /include | |
| parent | ca455cd55efe9ad48b635f60363ea131b55e1eef (diff) | |
vcl: Kill bIsMenuBar.
Change-Id: I16bcb4be7fcdba6272f9f4a92d5c90c71dc431e8
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 aeff3561f503..741ed213e307 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -144,10 +144,9 @@ private: sal_uInt16 nImgOrChkPos; sal_uInt16 nTextPos; - bool bIsMenuBar : 1, // Is this a menubar? - bCanceled : 1, // Terminated during a callback - bInCallback : 1, // In Activate/Deactivate - bKilled : 1; // Killed... + bool bCanceled : 1, ///< Terminated during a callback + bInCallback : 1, ///< In Activate/Deactivate + bKilled : 1; ///< Killed ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible; mutable vcl::MenuLayoutData* mpLayoutData; @@ -201,12 +200,11 @@ public: SAL_DLLPRIVATE void ImplKillLayoutData() const; SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const { return pStartedFrom; } - Menu(); - explicit Menu( bool bMenuBar ); SAL_DLLPRIVATE Window* ImplGetWindow() const { return pWindow; } void ImplSelectWithStart( Menu* pStartMenu = NULL ); - public: +public: + Menu(); virtual ~Menu(); virtual void Activate(); @@ -285,7 +283,7 @@ public: bool IsItemPosVisible( sal_uInt16 nItemPos ) const; bool IsMenuVisible() const; - bool IsMenuBar() const { return bIsMenuBar; } + virtual bool IsMenuBar() const { return false; } void RemoveDisabledEntries( bool bCheckPopups = true, bool bRemoveEmptyPopups = false ); bool HasValidEntries( bool bCheckPopups = true ); @@ -413,6 +411,8 @@ public: MenuBar& operator =( const MenuBar& rMenu ); + virtual bool IsMenuBar() const SAL_OVERRIDE { return true; } + void ShowCloser( bool bShow = true ); bool HasCloser() const { return mbCloserVisible; } bool HasFloatButton() const { return mbFloatBtnVisible; } |