2.4 compatibility.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 7b6a80b8342c10c2809259ff2f5bfb5f784250f8..a8f90c9ed556ba614fdc882f1432c27129ad30d8 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -143,7 +143,11 @@ wxMenu *MyTaskBarIcon::CreatePopupMenu()
     return menu;
 }
 
     return menu;
 }
 

+#if WXWIN_COMPATIBILITY_2_4
+void MyTaskBarIcon::OnLButtonDClick(wxEvent&)
+#else

 void MyTaskBarIcon::OnLButtonDClick(wxTaskBarIconEvent&)
 void MyTaskBarIcon::OnLButtonDClick(wxTaskBarIconEvent&)

+#endif

 {
     dialog->Show(true);
 }
 {
     dialog->Show(true);
 }

diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h
index b4862386b6ea87257990f5168d9ccd828ec58f7a..c67914d99861b3c293663aa768c8ddbc9b3001ac 100644 (file)
--- a/samples/taskbar/tbtest.h
+++ b/samples/taskbar/tbtest.h
@@ -14,7 +14,11 @@ class MyTaskBarIcon: public wxTaskBarIcon
 public:
     MyTaskBarIcon() {};
 
 public:
     MyTaskBarIcon() {};
 

+#if WXWIN_COMPATIBILITY_2_4
+    void OnLButtonDClick(wxEvent&);
+#else

     void OnLButtonDClick(wxTaskBarIconEvent&);
     void OnLButtonDClick(wxTaskBarIconEvent&);

+#endif

     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
     void OnMenuSetNewIcon(wxCommandEvent&);
     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
     void OnMenuSetNewIcon(wxCommandEvent&);