Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added "set new icon" menu item to taskbar sample; updated some makefiles

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-05-08 10:11:24 +00:00
parent 0a67a93b17
commit ab85e6cd00
9 changed files with 88 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
samples/taskbar/tbtest.cpp
View File

@@ -30,13 +30,13 @@ IMPLEMENT_APP(MyApp)
bool MyApp::OnInit(void)
{
wxIcon icon("mondrian_icon");
wxIcon icon(wxT("mondrian_icon"));
if (!m_taskBarIcon.SetIcon(icon, "wxTaskBarIcon Sample"))
wxMessageBox("Could not set icon.");
if (!m_taskBarIcon.SetIcon(icon, wxT("wxTaskBarIcon Sample")))
wxMessageBox(wxT("Could not set icon."));
// Create the main frame window
dialog = new MyDialog(NULL, -1, "wxTaskBarIcon Test Dialog", wxPoint(-1, -1), wxSize(365, 290), wxDIALOG_MODELESS|wxDEFAULT_DIALOG_STYLE);
dialog = new MyDialog(NULL, -1, wxT("wxTaskBarIcon Test Dialog"), wxPoint(-1, -1), wxSize(365, 290), wxDIALOG_MODELESS|wxDEFAULT_DIALOG_STYLE);
dialog->Show(TRUE);
@@ -94,6 +94,7 @@ void MyDialog::Init(void)
enum {
PU_RESTORE = 10001,
PU_NEW_ICON,
PU_EXIT,
};
@@ -101,6 +102,7 @@ enum {
BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
EVT_MENU(PU_EXIT, MyTaskBarIcon::OnMenuExit)
EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)
END_EVENT_TABLE()
void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
@@ -118,6 +120,15 @@ void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
wxGetApp().ProcessIdle();
}
void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
{
#ifdef __WXMSW__
wxIcon icon(wxT("wxDEFAULT_FRAME"));
if (!SetIcon(icon, wxT("wxTaskBarIcon Sample")))
wxMessageBox(wxT("Could not set new icon."));
#endif
}
// Overridables
void MyTaskBarIcon::OnMouseMove(wxEvent&)
@@ -141,6 +152,9 @@ void MyTaskBarIcon::OnRButtonUp(wxEvent&)
wxMenu menu;
menu.Append(PU_RESTORE, "&Restore TBTest");
#ifdef __WXMSW__
menu.Append(PU_NEW_ICON,"&Set New Icon");
#endif
menu.Append(PU_EXIT, "E&xit");
PopupMenu(&menu);