diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-09-15 10:30:18 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-09-15 12:07:18 +0200 |
| commit | 5ac2c503c04282b3b456ccb8bf39d886e568d1fa (patch) | |
| tree | 169406c90c51f8b06b2f171fe429ddf983862e95 /include | |
| parent | fcc49e118c9da28309dce3389d111a546cba19cd (diff) | |
vcl menu: Make DeactivateMenuBar() virtual to eliminate IsMenuBar() call.
Change-Id: I33ba324a13e2addb678fb801222bd25a21c3ef1b
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/menu.hxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 8045963174d6..db133e66d3d8 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -190,7 +190,7 @@ protected: virtual void CloseStartedFrom() = 0; /// Deactivate the MenuBarWindow. - SAL_DLLPRIVATE sal_uLong DeactivateMenuBar(sal_uLong nFocusId); + virtual sal_uLong DeactivateMenuBar(sal_uLong nFocusId); /// Forward the KeyInput call to the MenuBar. SAL_DLLPRIVATE void MenuBarKeyInput(const KeyEvent& rEvent); @@ -423,6 +423,9 @@ public: /// Close the 'pStartedFrom' menu window. virtual void CloseStartedFrom() SAL_OVERRIDE; + /// Deactivate the MenuBarWindow. + virtual sal_uLong DeactivateMenuBar(sal_uLong nFocusId) SAL_OVERRIDE; + void ShowCloseButton( bool bShow = true ); bool HasCloseButton() const { return mbCloseBtnVisible; } bool HasFloatButton() const { return mbFloatBtnVisible; } |