mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=8621
This commit is contained in:
parent
c5b0681a2f
commit
2d3c101ee4
|
@ -1253,13 +1253,14 @@ void CMainFrame::OnClose(wxCloseEvent& event) {
|
||||||
void CMainFrame::OnAlert(CMainFrameAlertEvent& event) {
|
void CMainFrame::OnAlert(CMainFrameAlertEvent& event) {
|
||||||
wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnAlert - Function Begin"));
|
wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnAlert - Function Begin"));
|
||||||
|
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
CTaskBarIcon* pTaskbar = wxGetApp().GetTaskBarIcon();
|
CTaskBarIcon* pTaskbar = wxGetApp().GetTaskBarIcon();
|
||||||
wxASSERT(pTaskbar);
|
wxASSERT(pTaskbar);
|
||||||
|
|
||||||
if ((IsShown() && !event.m_notification_only) || (IsShown() && !pTaskbar->IsBalloonsSupported())) {
|
if ((IsShown() && !event.m_notification_only) || (IsShown() && !pTaskbar->IsBalloonsSupported())) {
|
||||||
::wxMessageBox(event.m_message, event.m_title, event.m_style, this);
|
if (!event.m_notification_only) {
|
||||||
|
::wxMessageBox(event.m_message, event.m_title, event.m_style, this);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// If the main window is hidden or minimzed use the system tray ballon
|
// If the main window is hidden or minimzed use the system tray ballon
|
||||||
// to notify the user instead. This keeps dialogs from interfering
|
// to notify the user instead. This keeps dialogs from interfering
|
||||||
|
|
Loading…
Reference in New Issue