diff options
-rw-r--r-- | include/vcl/menu.hxx | 4 | ||||
-rw-r--r-- | vcl/source/window/menubarwindow.cxx | 14 | ||||
-rw-r--r-- | vcl/source/window/menubarwindow.hxx | 2 |
3 files changed, 0 insertions, 20 deletions
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 1d22bdc22eb6..46149cc37cc5 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -413,8 +413,6 @@ VCL_DLLPUBLIC void Invalidated(); class VCL_DLLPUBLIC MenuBar : public Menu { Link<void*,void> maCloseHdl; - Link<> maFloatHdl; - Link<> maHideHdl; bool mbCloseBtnVisible : 1; bool mbFloatBtnVisible : 1; bool mbHideBtnVisible : 1; @@ -470,8 +468,6 @@ public: void SetCloseButtonClickHdl( const Link<void*,void>& rLink ) { maCloseHdl = rLink; } const Link<void*,void>& GetCloseButtonClickHdl() const { return maCloseHdl; } - const Link<>& GetFloatButtonClickHdl() const { return maFloatHdl; } - const Link<>& GetHideButtonClickHdl() const { return maHideHdl; } // - by default a menubar is displayable // - if a menubar is not displayable, its MenuBarWindow will never be shown diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index d3ac8d6a680a..772894334f59 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -153,11 +153,9 @@ MenuBarWindow::MenuBarWindow( vcl::Window* pParent ) : aCloseBtn->AddEventListener(LINK(this, MenuBarWindow, ToolboxEventHdl)); aCloseBtn->SetQuickHelpText(IID_DOCUMENTCLOSE, ResId(SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr).toString()); - aFloatBtn->SetClickHdl( LINK( this, MenuBarWindow, FloatHdl ) ); aFloatBtn->SetSymbol( SymbolType::FLOAT ); aFloatBtn->SetQuickHelpText( ResId(SV_HELPTEXT_RESTORE, *pResMgr).toString() ); - aHideBtn->SetClickHdl( LINK( this, MenuBarWindow, HideHdl ) ); aHideBtn->SetSymbol( SymbolType::HIDE ); aHideBtn->SetQuickHelpText( ResId(SV_HELPTEXT_MINIMIZE, *pResMgr).toString() ); } @@ -289,18 +287,6 @@ IMPL_LINK( MenuBarWindow, ShowHideListener, VclWindowEvent*, pEvent ) return 0; } -IMPL_LINK_NOARG_TYPED(MenuBarWindow, FloatHdl, Button*, void) -{ - if (pMenu) - static_cast<MenuBar*>(pMenu)->GetFloatButtonClickHdl().Call( pMenu ); -} - -IMPL_LINK_NOARG_TYPED(MenuBarWindow, HideHdl, Button*, void) -{ - if (pMenu) - static_cast<MenuBar*>(pMenu)->GetHideButtonClickHdl().Call( pMenu ); -} - void MenuBarWindow::ImplCreatePopup( bool bPreSelectFirst ) { MenuItemData* pItemData = pMenu ? pMenu->GetItemList()->GetDataFromPos( nHighlightedItem ) : NULL; diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx index 70040668dbbd..da15f86f9d61 100644 --- a/vcl/source/window/menubarwindow.hxx +++ b/vcl/source/window/menubarwindow.hxx @@ -104,8 +104,6 @@ private: virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; DECL_LINK_TYPED(CloseHdl, ToolBox*, void); - DECL_LINK_TYPED(FloatHdl, Button*, void); - DECL_LINK_TYPED(HideHdl, Button*, void); DECL_LINK( ToolboxEventHdl, VclWindowEvent* ); DECL_LINK( ShowHideListener, VclWindowEvent* ); |