diff options
| -rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 8 | ||||
| -rw-r--r-- | include/vcl/menu.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/menu.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/menubarwindow.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/menubarwindow.hxx | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 9847eacf541c..b046ab66512a 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -144,7 +144,7 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper private: DECL_LINK_TYPED(ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool); - DECL_LINK( HighlightHdl, MenuBar::MenuBarButtonCallbackArg* ); + DECL_LINK_TYPED(HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, bool); DECL_LINK_TYPED(WaitTimeOutHdl, Idle *, void); DECL_LINK_TYPED(TimeOutHdl, Timer *, void); DECL_LINK_TYPED(UserEventHdl, void *, void); @@ -601,14 +601,14 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, ClickHdl, MenuBar::MenuBarButtonCallbackArg } -IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg*, pData ) +IMPL_LINK_TYPED( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, rData, bool ) { - if ( pData->bHighlight ) + if ( rData.bHighlight ) maWaitIdle.Start(); else RemoveBubbleWindow( false ); - return 0; + return false; } diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 654880ad31ce..089cd8b4eb5a 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -488,7 +488,7 @@ public: // set the highlight link for additional button with ID nId // highlight link will be called with a MenuBarButtonHighlightArg // the bHighlight member of that struct shall contain the new state - void SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<>& ); + void SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<MenuBar::MenuBarButtonCallbackArg&,bool>& ); // returns the rectangle occupied by the additional button named nId // coordinates are relative to the systemwindiow the menubar is attached to // if the menubar is unattached an empty rectangle is returned diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 574bdf7bc9c7..e49ff60f5ec4 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2737,7 +2737,7 @@ sal_uInt16 MenuBar::AddMenuBarButton( const Image& i_rImage, const Link<MenuBar: return pMenuWin ? pMenuWin->AddMenuBarButton(i_rImage, i_rLink, i_rToolTip) : 0; } -void MenuBar::SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<>& rLink ) +void MenuBar::SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<MenuBar::MenuBarButtonCallbackArg&,bool>& rLink ) { MenuBarWindow* pMenuWin = getMenuBarWindow(); if (!pMenuWin) diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 7116eb1d1280..5380b05af57c 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -270,7 +270,7 @@ IMPL_LINK( MenuBarWindow, ToolboxEventHdl, VclWindowEvent*, pEvent ) std::map< sal_uInt16, AddButtonEntry >::iterator it = m_aAddButtons.find( aArg.nId ); if( it != m_aAddButtons.end() ) { - it->second.m_aHighlightLink.Call( &aArg ); + it->second.m_aHighlightLink.Call( aArg ); } return 0; } @@ -1150,7 +1150,7 @@ sal_uInt16 MenuBarWindow::AddMenuBarButton( const Image& i_rImage, const Link<Me return nId; } -void MenuBarWindow::SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<>& rLink ) +void MenuBarWindow::SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<MenuBar::MenuBarButtonCallbackArg&,bool>& rLink ) { std::map< sal_uInt16, AddButtonEntry >::iterator it = m_aAddButtons.find( nId ); if( it != m_aAddButtons.end() ) diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx index 34c3aa1d9736..f460a770f45c 100644 --- a/vcl/source/window/menubarwindow.hxx +++ b/vcl/source/window/menubarwindow.hxx @@ -69,7 +69,7 @@ private: { sal_uInt16 m_nId; Link<MenuBar::MenuBarButtonCallbackArg&,bool> m_aSelectLink; - Link<> m_aHighlightLink; + Link<MenuBar::MenuBarButtonCallbackArg&,bool> m_aHighlightLink; AddButtonEntry() : m_nId( 0 ) {} }; @@ -143,7 +143,7 @@ public: /// Add an arbitrary button to the menubar that will appear next to the close button. sal_uInt16 AddMenuBarButton(const Image&, const Link<MenuBar::MenuBarButtonCallbackArg&,bool>&, const OUString&); - void SetMenuBarButtonHighlightHdl(sal_uInt16 nId, const Link<>&); + void SetMenuBarButtonHighlightHdl(sal_uInt16 nId, const Link<MenuBar::MenuBarButtonCallbackArg&,bool>&); Rectangle GetMenuBarButtonRectPixel(sal_uInt16 nId); void RemoveMenuBarButton(sal_uInt16 nId); bool HandleMenuButtonEvent(sal_uInt16 i_nButtonId); |