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

add wxLogLastError() calls if Shell_NotifyIcon() fails (closes #10222)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-21 01:43:56 +00:00
parent 89424d9b35
commit aea5b1c1bd
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/msw/taskbar.cpp
View File

@@ -203,6 +203,11 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
bool ok = wxShellNotifyIcon(m_iconAdded ? NIM_MODIFY bool ok = wxShellNotifyIcon(m_iconAdded ? NIM_MODIFY
: NIM_ADD, &notifyData) != 0; : NIM_ADD, &notifyData) != 0;
if ( !ok )
{
wxLogLastError(wxT("wxShellNotifyIcon(NIM_MODIFY/ADD)"));
}
if ( !m_iconAdded && ok ) if ( !m_iconAdded && ok )
m_iconAdded = true; m_iconAdded = true;
@@ -228,8 +233,10 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
notifyData.uFlags = 0; notifyData.uFlags = 0;
notifyData.uVersion = 3 /* NOTIFYICON_VERSION for Windows XP */; notifyData.uVersion = 3 /* NOTIFYICON_VERSION for Windows XP */;
wxShellNotifyIcon(NIM_SETVERSION, &notifyData); if ( !wxShellNotifyIcon(NIM_SETVERSION, &notifyData) )
{
wxLogLastError(wxT("wxShellNotifyIcon(NIM_SETVERSION)"));
}
// do show the balloon now // do show the balloon now
notifyData = NotifyIconData(hwnd); notifyData = NotifyIconData(hwnd);
@@ -246,7 +253,13 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
else if ( flags & wxICON_ERROR ) else if ( flags & wxICON_ERROR )
notifyData.dwInfoFlags |= NIIF_ERROR; notifyData.dwInfoFlags |= NIIF_ERROR;
return wxShellNotifyIcon(NIM_MODIFY, &notifyData) != 0; bool ok = wxShellNotifyIcon(NIM_MODIFY, &notifyData) != 0;
if ( !ok )
{
wxLogLastError(wxT("wxShellNotifyIcon(NIM_MODIFY)"));
}
return ok;
} }
#endif // wxUSE_TASKBARICON_BALLOONS #endif // wxUSE_TASKBARICON_BALLOONS
@@ -260,7 +273,13 @@ bool wxTaskBarIcon::RemoveIcon()
NotifyIconData notifyData(GetHwndOf(m_win)); NotifyIconData notifyData(GetHwndOf(m_win));
return wxShellNotifyIcon(NIM_DELETE, &notifyData) != 0; bool ok = wxShellNotifyIcon(NIM_DELETE, &notifyData) != 0;
if ( !ok )
{
wxLogLastError(wxT("wxShellNotifyIcon(NIM_DELETE)"));
}
return ok;
} }
#if wxUSE_MENUS #if wxUSE_MENUS