mirror of https://github.com/BOINC/boinc.git
- MGR: Enable task bar icon on Linux.
clientgui/ BOINCBaseFrame.cpp BOINCGUIApp.cpp svn path=/trunk/boinc/; revision=20440
This commit is contained in:
parent
3dea9a555b
commit
057c51b5d3
|
@ -932,3 +932,10 @@ Rom 5 Feb 2010
|
|||
|
||||
clientscr/
|
||||
boinc_ss.rc
|
||||
|
||||
Rom 5 Feb 2010
|
||||
- MGR: Enable task bar icon on Linux.
|
||||
|
||||
clientgui/
|
||||
BOINCBaseFrame.cpp
|
||||
BOINCGUIApp.cpp
|
||||
|
|
|
@ -306,7 +306,7 @@ void CBOINCBaseFrame::OnClose(wxCloseEvent& event) {
|
|||
wxLogTrace(wxT("Function Start/End"), wxT("CBOINCBaseFrame::OnClose - Function Begin"));
|
||||
|
||||
|
||||
#if defined(__WXMSW__) || defined(__WXMAC__)
|
||||
#ifdef wxHAS_TASK_BAR_ICON
|
||||
if (!event.CanVeto() || IsIconized()) {
|
||||
wxGetApp().FrameClosed();
|
||||
Destroy();
|
||||
|
@ -373,8 +373,7 @@ void CBOINCBaseFrame::OnExit(wxCommandEvent& WXUNUSED(event)) {
|
|||
wxGetApp().DeleteMacSystemMenu();
|
||||
#endif
|
||||
|
||||
// TaskBarIcon isn't used in Linux
|
||||
#if defined(__WXMSW__) || defined(__WXMAC__)
|
||||
#ifdef wxHAS_TASK_BAR_ICON
|
||||
wxGetApp().DeleteTaskBarIcon();
|
||||
#endif
|
||||
|
||||
|
|
|
@ -410,7 +410,7 @@ bool CBOINCGUIApp::OnInit() {
|
|||
#endif
|
||||
|
||||
// Initialize the task bar icon
|
||||
#if defined(__WXMSW__) || defined(__WXMAC__)
|
||||
#ifdef wxHAS_TASK_BAR_ICON
|
||||
m_pTaskBarIcon = new CTaskBarIcon(
|
||||
m_pSkinManager->GetAdvanced()->GetApplicationName(),
|
||||
m_pSkinManager->GetAdvanced()->GetApplicationIcon(),
|
||||
|
|
Loading…
Reference in New Issue