stop usign a deprecated method, and ensure that the imagelist

[wxWidgets.git] / samples / taskbar / tbtest.cpp

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index ec3b5cd011d7162a53b47d7c1f5aad95b7bed90d..21ce1733860ff8b22febc6e95d2200dbb2f9581d 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -20,6 +20,11 @@
 #include "wx/wx.h"
 #endif
 
+// the application icon (under Windows and OS/2 it is in resources)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+    #include "mondrian.xpm"
+#endif
+
 #include "wx/taskbar.h"
 #include "tbtest.h"
 
@@ -30,9 +35,7 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit(void)
 {
-    wxIcon icon(wxT("mondrian_icon"));
-
-    if (!m_taskBarIcon.SetIcon(icon, wxT("wxTaskBarIcon Sample")))
+    if (!m_taskBarIcon.SetIcon(wxICON(mondrian), wxT("wxTaskBarIcon Sample")))
         wxMessageBox(wxT("Could not set icon."));
 
     // Create the main frame window
@@ -99,6 +102,8 @@ 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_RIGHT_UP     (MyTaskBarIcon::OnRButtonUp)
+    EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLButtonDClick)
 END_EVENT_TABLE()
 
 void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
@@ -127,22 +132,6 @@ void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
 }
 
 // Overridables
-void MyTaskBarIcon::OnMouseMove(wxEvent&)
-{
-}
-
-void MyTaskBarIcon::OnLButtonDown(wxEvent&)
-{
-}
-
-void MyTaskBarIcon::OnLButtonUp(wxEvent&)
-{
-}
-
-void MyTaskBarIcon::OnRButtonDown(wxEvent&)
-{
-}
-
 void MyTaskBarIcon::OnRButtonUp(wxEvent&)
 {
     wxMenu      menu;
@@ -161,10 +150,6 @@ void MyTaskBarIcon::OnLButtonDClick(wxEvent&)
     dialog->Show(TRUE);
 }
 
-void MyTaskBarIcon::OnRButtonDClick(wxEvent&)
-{
-}
-