diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp index a8f90c9ed5..89f7295273 100644 --- a/samples/taskbar/tbtest.cpp +++ b/samples/taskbar/tbtest.cpp @@ -110,7 +110,7 @@ BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon) EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore) EVT_MENU(PU_EXIT, MyTaskBarIcon::OnMenuExit) EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon) - EVT_TASKBAR_LEFT_DCLICK (MyTaskBarIcon::OnLButtonDClick) + EVT_TASKBAR_LEFT_DCLICK (MyTaskBarIcon::OnLeftButtonDClick) END_EVENT_TABLE() void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& ) @@ -143,11 +143,7 @@ wxMenu *MyTaskBarIcon::CreatePopupMenu() return menu; } -#if WXWIN_COMPATIBILITY_2_4 -void MyTaskBarIcon::OnLButtonDClick(wxEvent&) -#else -void MyTaskBarIcon::OnLButtonDClick(wxTaskBarIconEvent&) -#endif +void MyTaskBarIcon::OnLeftButtonDClick(wxTaskBarIconEvent&) { dialog->Show(true); } diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h index c67914d998..b5f1760723 100644 --- a/samples/taskbar/tbtest.h +++ b/samples/taskbar/tbtest.h @@ -14,11 +14,7 @@ class MyTaskBarIcon: public wxTaskBarIcon public: MyTaskBarIcon() {}; -#if WXWIN_COMPATIBILITY_2_4 - void OnLButtonDClick(wxEvent&); -#else - void OnLButtonDClick(wxTaskBarIconEvent&); -#endif + void OnLeftButtonDClick(wxTaskBarIconEvent&); void OnMenuRestore(wxCommandEvent&); void OnMenuExit(wxCommandEvent&); void OnMenuSetNewIcon(wxCommandEvent&);