updates to taskbar sample to use events instead of virtuals and work under Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -20,6 +20,11 @@
|
||||
#include "wx/wx.h"
|
||||
#endif
|
||||
|
||||
// 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"
|
||||
|
||||
@@ -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
|
||||
@@ -99,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& )
|
||||
@@ -127,22 +132,6 @@ 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;
|
||||
@@ -161,10 +150,6 @@ void MyTaskBarIcon::OnLButtonDClick(wxEvent&)
|
||||
dialog->Show(TRUE);
|
||||
}
|
||||
|
||||
void MyTaskBarIcon::OnRButtonDClick(wxEvent&)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user