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 cf03cdd6da26f6ece1ca2c796677995ea9fe647e..21ce1733860ff8b22febc6e95d2200dbb2f9581d 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -17,10 +17,15 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
-#include <wx/msw/taskbar.h>
+// 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"
 
 // Declare two frames
@@ -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
@@ -76,19 +79,15 @@ void MyDialog::OnCloseWindow(wxCloseEvent& event)
 
 void MyDialog::Init(void)
 {
-  int dialogWidth = 365;
-  int dialogHeight = 290;
+  (void)new wxStaticText(this, -1, _T("Press OK to hide me, Exit to quit."),
+                         wxPoint(10, 20));
 
-  wxStaticText* stat = new wxStaticText(this, -1, "Press OK to hide me, Exit to quit.",
-    wxPoint(10, 20));
+  (void)new wxStaticText(this, -1, _T("Double-click on the taskbar icon to show me again."),
+                         wxPoint(10, 40));
 
-  wxStaticText* stat2 = new wxStaticText(this, -1, "Double-click on the taskbar icon to show me again.",
-    wxPoint(10, 40));
-
-  wxButton *okButton = new wxButton(this, wxID_OK, "OK", wxPoint(100, 230), wxSize(80, 25));
-  wxButton *exitButton = new wxButton(this, wxID_EXIT, "Exit", wxPoint(185, 230), wxSize(80, 25));
-  okButton->SetDefault();
-  this->Centre(wxBOTH);
+  (void)new wxButton(this, wxID_EXIT, _T("Exit"), wxPoint(185, 230), wxSize(80, 25));
+  (new wxButton(this, wxID_OK, _T("OK"), wxPoint(100, 230), wxSize(80, 25)))->SetDefault();
+  Centre(wxBOTH);
 }
 
 
@@ -103,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& )
@@ -131,31 +132,15 @@ 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;
 
-    menu.Append(PU_RESTORE, "&Restore TBTest");
+    menu.Append(PU_RESTORE, _T("&Restore TBTest"));
 #ifdef __WXMSW__
-    menu.Append(PU_NEW_ICON,"&Set New Icon");
+    menu.Append(PU_NEW_ICON,_T("&Set New Icon"));
 #endif
-    menu.Append(PU_EXIT,    "E&xit");
+    menu.Append(PU_EXIT,    _T("E&xit"));
 
     PopupMenu(&menu);
 }
@@ -165,10 +150,6 @@ void MyTaskBarIcon::OnLButtonDClick(wxEvent&)
     dialog->Show(TRUE);
 }
 
-void MyTaskBarIcon::OnRButtonDClick(wxEvent&)
-{
-}
-