diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-10 16:44:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-11 08:48:55 +0200 |
| commit | 71a83295d8c719f4fd4fa05f367c3c85323e22e9 (patch) | |
| tree | 1ff99c92e49ad61e7b478daad338fd6109324222 /include | |
| parent | c80fb09256f02379b78f7bb219e94dfbf5277872 (diff) | |
convert Link<> to typed
and remove unused maChildEventListeners
Change-Id: I845a9af608c3429cf9ccb0e8041f24f423839513
Diffstat (limited to 'include')
| -rw-r--r-- | include/toolkit/awt/vclxmenu.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/menu.hxx | 7 | ||||
| -rw-r--r-- | include/vcl/toolbox.hxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index b38e549e5374..49624fece463 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -40,6 +40,7 @@ class Menu; class MenuBar; class VclSimpleEvent; class PopupMenu; +class VclMenuEvent; typedef ::std::vector< css::uno::Reference< css::awt::XPopupMenu >* @@ -65,7 +66,7 @@ private: protected: ::osl::Mutex& GetMutex() { return maMutex; } - DECL_LINK( MenuEventListener, VclSimpleEvent* ); + DECL_LINK_TYPED( MenuEventListener, VclMenuEvent&, void ); void ImplCreateMenu( bool bPopup ); diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 46149cc37cc5..b1c1b9b36404 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -141,8 +141,7 @@ private: Link<Menu*, bool> aHighlightHdl; // Highlight-Handler Link<Menu*, bool> aSelectHdl; // Highlight-Handler - VclEventListeners maEventListeners; - VclEventListeners maChildEventListeners; + std::list<Link<VclMenuEvent&,void> > maEventListeners; OUString aTitleText; // PopupMenu text sal_uInt16 nTitleHeight; @@ -357,8 +356,8 @@ public: return nTitleHeight; } - void AddEventListener( const Link<>& rEventListener ); - void RemoveEventListener( const Link<>& rEventListener ); + void AddEventListener( const Link<VclMenuEvent&,void>& rEventListener ); + void RemoveEventListener( const Link<VclMenuEvent&,void>& rEventListener ); Menu& operator =( const Menu& rMenu ); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 9d91d49a1ab1..732e6f5eb645 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -226,7 +226,7 @@ private: DECL_DLLPRIVATE_LINK_TYPED( ImplCallExecuteCustomMenu, void*, void ); DECL_DLLPRIVATE_LINK_TYPED( ImplUpdateHdl, Idle*, void ); - DECL_DLLPRIVATE_LINK( ImplCustomMenuListener, VclMenuEvent* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplCustomMenuListener, VclMenuEvent&, void ); DECL_DLLPRIVATE_LINK_TYPED( ImplDropdownLongClickHdl, Timer*, void ); ToolBox (const ToolBox &) SAL_DELETED_FUNCTION; |