diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/sidebar/FocusManager.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/sidebar/SidebarController.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/dialogcontrolling.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/genericunodialog.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/toolpanel/drawerlayouter.hxx | 2 | ||||
| -rw-r--r-- | include/toolkit/awt/vclxaccessiblecomponent.hxx | 2 | ||||
| -rw-r--r-- | include/toolkit/awt/vclxwindow.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/layout.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 5 |
9 files changed, 11 insertions, 10 deletions
diff --git a/include/sfx2/sidebar/FocusManager.hxx b/include/sfx2/sidebar/FocusManager.hxx index f93f9e82c368..93b78b871ac1 100644 --- a/include/sfx2/sidebar/FocusManager.hxx +++ b/include/sfx2/sidebar/FocusManager.hxx @@ -96,7 +96,7 @@ private: /** Listen for key events for panels and buttons. */ - DECL_LINK(WindowEventListener, VclSimpleEvent*); + DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void); DECL_LINK(ChildEventListener, VclSimpleEvent*); void ClearPanels(); diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index 450190382b08..0c88901282d9 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -206,7 +206,7 @@ private: */ VclPtr<vcl::Window> mpCloseIndicator; - DECL_LINK(WindowEventHandler, VclWindowEvent*); + DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void); /** Make maRequestedContext the current context. */ void UpdateConfigurations(); diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index c0841f13dafe..47ef7497e475 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -115,7 +115,7 @@ namespace svt void impl_updateAll( const VclWindowEvent& _rTriggerEvent ); void impl_update( const VclWindowEvent& _rTriggerEvent, vcl::Window& _rWindow ); - DECL_LINK( OnWindowEvent, const VclWindowEvent* ); + DECL_LINK_TYPED( OnWindowEvent, VclWindowEvent&, void ); private: DialogController( const DialogController& ) SAL_DELETED_FUNCTION; diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index a8ef263468d8..5765e65eaf2c 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -144,7 +144,7 @@ namespace svt virtual void implInitialize(const com::sun::star::uno::Any& _rValue); private: - DECL_LINK( OnDialogDying, VclWindowEvent* ); + DECL_LINK_TYPED( OnDialogDying, VclWindowEvent&, void ); /** ensures that m_pDialog is not <NULL/> diff --git a/include/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx index 6306e7b6c1b5..45665b6fe454 100644 --- a/include/svtools/toolpanel/drawerlayouter.hxx +++ b/include/svtools/toolpanel/drawerlayouter.hxx @@ -70,7 +70,7 @@ namespace svt size_t impl_getPanelPositionFromWindow( const vcl::Window* i_pDrawerWindow ) const; void impl_removeDrawer( const size_t i_nPosition ); - DECL_LINK( OnWindowEvent, VclSimpleEvent* ); + DECL_LINK_TYPED( OnWindowEvent, VclWindowEvent&, void ); private: vcl::Window& m_rParentWindow; diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index 0fdc2a8f083f..bd0c739568d9 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -69,7 +69,7 @@ private: VCLExternalSolarLock* m_pSolarLock; protected: - DECL_LINK( WindowEventListener, VclSimpleEvent* ); + DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index dab9b8e82eeb..d9cae37ca055 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -82,7 +82,7 @@ private: protected: Size ImplCalcWindowSize( const Size& rOutSz ) const; - DECL_LINK( WindowEventListener, VclSimpleEvent* ); + DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void ); virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 3dab30bd3e83..ac6f44fe6cc2 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -418,7 +418,7 @@ private: private: friend class VclBuilder; void designate_label(vcl::Window *pWindow); - DECL_LINK(WindowEventListener, VclSimpleEvent*); + DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void); public: VclFrame(vcl::Window *pParent) : VclBin(pParent) diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 13eb1db909a8..0ea1042f11cd 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -68,6 +68,7 @@ class SystemWindow; class SalFrame; class MenuFloatingWindow; class VCLXWindow; +class VclWindowEvent; namespace com { namespace sun { namespace star { namespace accessibility { @@ -879,8 +880,8 @@ public: bool CompatPreNotify( NotifyEvent& rNEvt ); bool CompatNotify( NotifyEvent& rNEvt ); - void AddEventListener( const Link<>& rEventListener ); - void RemoveEventListener( const Link<>& rEventListener ); + void AddEventListener( const Link<VclWindowEvent&,void>& rEventListener ); + void RemoveEventListener( const Link<VclWindowEvent&,void>& rEventListener ); void AddChildEventListener( const Link<>& rEventListener ); void RemoveChildEventListener( const Link<>& rEventListener ); |