X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27301f26901fcedf07dba3a4517a859effb7cac3..e1633ef9ac389c1a9d07d21550165af62f553150:/samples/taskbar/tbtest.cpp

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index e7be15d9b3..fd832b1e4d 100644
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -25,6 +25,8 @@
     #include "../sample.xpm"
 #endif
 
+#include "smile.xpm"
+
 #include "wx/taskbar.h"
 #include "tbtest.h"
 
@@ -36,7 +38,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit(void)
 {
     // Create the main frame window
-    dialog = new MyDialog(NULL, wxID_ANY, wxT("wxTaskBarIcon Test Dialog"), wxDefaultPosition, wxSize(365, 290), wxDIALOG_MODELESS|wxDEFAULT_DIALOG_STYLE);
+    dialog = new MyDialog(NULL, wxID_ANY, wxT("wxTaskBarIcon Test Dialog"), wxDefaultPosition, wxSize(365, 290));
 
     dialog->Show(true);
 
@@ -81,17 +83,16 @@ void MyDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 
 void MyDialog::Init(void)
 {
-  (void)new wxStaticText(this, wxID_ANY, _T("Press OK to hide me, Exit to quit."),
+  (void)new wxStaticText(this, wxID_ANY, _T("Press 'Hide me' to hide me, Exit to quit."),
                          wxPoint(10, 20));
 
   (void)new wxStaticText(this, wxID_ANY, _T("Double-click on the taskbar icon to show me again."),
                          wxPoint(10, 40));
 
   (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();
+  (new wxButton(this, wxID_OK, _T("Hide me"), wxPoint(100, 230), wxSize(80, 25)))->SetDefault();
   Centre(wxBOTH);
    
-  
   m_taskBarIcon = new MyTaskBarIcon();
   if (!m_taskBarIcon->SetIcon(wxICON(sample), wxT("wxTaskBarIcon Sample")))
         wxMessageBox(wxT("Could not set icon."));
@@ -109,7 +110,6 @@ 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()
 
@@ -122,7 +122,7 @@ void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {
     dialog->Close(true);
 
-    // Nudge wxWindows into destroying the dialog, since
+    // Nudge wxWidgets into destroying the dialog, since
     // with a hidden window no messages will get sent to put
     // it into idle processing.
     wxGetApp().ProcessIdle();
@@ -130,33 +130,25 @@ void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 
 void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
 {
-#ifdef __WXMSW__
-    wxIcon icon(wxT("wxDEFAULT_FRAME"));
+    wxIcon icon(smile_xpm);
 
-    if (!SetIcon(icon, wxT("wxTaskBarIcon Sample")))
+    if (!SetIcon(icon, wxT("wxTaskBarIcon Sample - a different icon")))
         wxMessageBox(wxT("Could not set new icon."));
-#endif
 }
 
 // Overridables
-void MyTaskBarIcon::OnRButtonUp(wxEvent&)
+wxMenu *MyTaskBarIcon::CreatePopupMenu()
 {
-    wxMenu      menu;
-
-    menu.Append(PU_RESTORE, _T("&Restore TBTest"));
-#ifdef __WXMSW__
-    menu.Append(PU_NEW_ICON,_T("&Set New Icon"));
-#endif
-    menu.Append(PU_EXIT,    _T("E&xit"));
+    wxMenu *menu = new wxMenu;
+    
+    menu->Append(PU_RESTORE, _T("&Restore TBTest"));
+    menu->Append(PU_NEW_ICON,_T("&Set New Icon"));
+    menu->Append(PU_EXIT,    _T("E&xit"));
 
-    PopupMenu(&menu);
+    return menu;
 }
 
 void MyTaskBarIcon::OnLButtonDClick(wxEvent&)
 {
     dialog->Show(true);
 }
-
-
-
-