From 012f1014dfcb3140d5133045b4d3d903218dca3a Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sun, 15 Aug 2004 19:51:45 +0000
Subject: [PATCH] warning fix w/o #ifdefs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/taskbar/tbtest.cpp | 8 ++------
 samples/taskbar/tbtest.h   | 6 +-----
 2 files changed, 3 insertions(+), 11 deletions(-)

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&);
-- 
2.45.2