X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96aecfc900cf46a37eda895860314c494290af19..e1633ef9ac389c1a9d07d21550165af62f553150:/samples/taskbar/tbtest.cpp diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp index 5a8c024ac2..fd832b1e4d 100644 --- a/samples/taskbar/tbtest.cpp +++ b/samples/taskbar/tbtest.cpp @@ -110,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_DOWN (MyTaskBarIcon::OnRButtonDown) EVT_TASKBAR_LEFT_DCLICK (MyTaskBarIcon::OnLButtonDClick) END_EVENT_TABLE() @@ -138,15 +137,15 @@ void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&) } // Overridables -void MyTaskBarIcon::OnRButtonDown(wxEvent&) +wxMenu *MyTaskBarIcon::CreatePopupMenu() { - wxMenu menu; + 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")); - 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&)