remove unfinished sample for release

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

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 44042da02f27dde48fbc881172beb55d666eb8d7..89f7295273153fb65f1bcf926b008c8f88acc954 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -110,8 +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_RIGHT_UP     (MyTaskBarIcon::OnRButtonUp)
-    EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLButtonDClick)
+    EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLeftButtonDClick)
 END_EVENT_TABLE()
 
 void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
@@ -122,11 +121,6 @@ void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
 void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {
     dialog->Close(true);
-
-    // Nudge wxWidgets into destroying the dialog, since
-    // with a hidden window no messages will get sent to put
-    // it into idle processing.
-    wxGetApp().ProcessIdle();
 }
 
 void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
@@ -138,18 +132,18 @@ void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
 }
 
 // Overridables
-void MyTaskBarIcon::OnRButtonUp(wxEvent&)
+wxMenu *MyTaskBarIcon::CreatePopupMenu()
 {
-    wxMenu      menu;
-
-    menu.Append(PU_RESTORE, _T("&Restore TBTest"));
-    menu.Append(PU_NEW_ICON,_T("&Set New Icon"));
-    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&)
+void MyTaskBarIcon::OnLeftButtonDClick(wxTaskBarIconEvent&)
 {
     dialog->Show(true);
 }