From 30a7e91fb03558a4ffb6c5c6206ea25e53905e22 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 2 Oct 2013 16:24:59 +0000 Subject: [PATCH] Fix incorrect event handler functions casts in wxRibbonPanel code. Use wxMouseEventHandler() instead of (wrongly) casting a method taking wxMouseEvent to wxEvent-taking wxObjectEventFunction. Closes #15550. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/ribbon/panel.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ribbon/panel.cpp b/src/ribbon/panel.cpp index 18c2a5dad1..fd354bf38f 100644 --- a/src/ribbon/panel.cpp +++ b/src/ribbon/panel.cpp @@ -227,14 +227,14 @@ void wxRibbonPanel::AddChild(wxWindowBase *child) // for children of the window. The panel wants to be in the hovered state // whenever the mouse cursor is within its boundary, so the events need to // be attached to children too. - child->Connect(wxEVT_ENTER_WINDOW, (wxObjectEventFunction)&wxRibbonPanel::OnMouseEnterChild, NULL, this); - child->Connect(wxEVT_LEAVE_WINDOW, (wxObjectEventFunction)&wxRibbonPanel::OnMouseLeaveChild, NULL, this); + child->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseEnterChild), NULL, this); + child->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseLeaveChild), NULL, this); } void wxRibbonPanel::RemoveChild(wxWindowBase *child) { - child->Disconnect(wxEVT_ENTER_WINDOW, (wxObjectEventFunction)&wxRibbonPanel::OnMouseEnterChild, NULL, this); - child->Disconnect(wxEVT_LEAVE_WINDOW, (wxObjectEventFunction)&wxRibbonPanel::OnMouseLeaveChild, NULL, this); + child->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseEnterChild), NULL, this); + child->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseLeaveChild), NULL, this); wxRibbonControl::RemoveChild(child); } -- 2.45.2