From 41819cbe0c3feceb0954adc64a5e184ff8d7c4ea Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 2 Jul 2004 22:22:56 +0000 Subject: [PATCH] wxTaskBarIconBase event handlers were never called in 2.4 compatibility mode git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/taskbar.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index 45ec2c6dcc..64c5dee7ec 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -51,7 +51,7 @@ UINT gs_msgTaskbar = 0; UINT gs_msgRestartTaskbar = 0; #if WXWIN_COMPATIBILITY_2_4 -BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler) +BEGIN_EVENT_TABLE(wxTaskBarIcon, wxTaskBarIconBase) EVT_TASKBAR_MOVE (wxTaskBarIcon::_OnMouseMove) EVT_TASKBAR_LEFT_DOWN (wxTaskBarIcon::_OnLButtonDown) EVT_TASKBAR_LEFT_UP (wxTaskBarIcon::_OnLButtonUp) @@ -231,13 +231,13 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) #if WXWIN_COMPATIBILITY_2_4 // Overridables -void wxTaskBarIcon::OnMouseMove(wxEvent&) {} -void wxTaskBarIcon::OnLButtonDown(wxEvent&) {} -void wxTaskBarIcon::OnLButtonUp(wxEvent&) {} -void wxTaskBarIcon::OnRButtonDown(wxEvent&) {} -void wxTaskBarIcon::OnRButtonUp(wxEvent&) {} -void wxTaskBarIcon::OnLButtonDClick(wxEvent&) {} -void wxTaskBarIcon::OnRButtonDClick(wxEvent&) {} +void wxTaskBarIcon::OnMouseMove(wxEvent& e) { e.Skip(); } +void wxTaskBarIcon::OnLButtonDown(wxEvent& e) { e.Skip(); } +void wxTaskBarIcon::OnLButtonUp(wxEvent& e) { e.Skip(); } +void wxTaskBarIcon::OnRButtonDown(wxEvent& e) { e.Skip(); } +void wxTaskBarIcon::OnRButtonUp(wxEvent& e) { e.Skip(); } +void wxTaskBarIcon::OnLButtonDClick(wxEvent& e) { e.Skip(); } +void wxTaskBarIcon::OnRButtonDClick(wxEvent& e) { e.Skip(); } void wxTaskBarIcon::_OnMouseMove(wxTaskBarIconEvent& e) { OnMouseMove(e); } -- 2.50.0