X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e408bf5257ead0754de5ef37a39867c7536dbe03..f231df8aa87a1f2a3a68bdaa62e1ee5f07de5ddf:/src/msw/taskbar.cpp?ds=inline diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index 856b6c1911..a064e5df9e 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -203,6 +203,11 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) bool ok = wxShellNotifyIcon(m_iconAdded ? NIM_MODIFY : NIM_ADD, ¬ifyData) != 0; + if ( !ok ) + { + wxLogLastError(wxT("wxShellNotifyIcon(NIM_MODIFY/ADD)")); + } + if ( !m_iconAdded && ok ) m_iconAdded = true; @@ -218,7 +223,7 @@ wxTaskBarIcon::ShowBalloon(const wxString& title, int flags) { wxCHECK_MSG( m_iconAdded, false, - _T("can't be used before the icon is created") ); + wxT("can't be used before the icon is created") ); const HWND hwnd = GetHwndOf(m_win); @@ -228,8 +233,10 @@ wxTaskBarIcon::ShowBalloon(const wxString& title, notifyData.uFlags = 0; notifyData.uVersion = 3 /* NOTIFYICON_VERSION for Windows XP */; - wxShellNotifyIcon(NIM_SETVERSION, ¬ifyData); - + if ( !wxShellNotifyIcon(NIM_SETVERSION, ¬ifyData) ) + { + wxLogLastError(wxT("wxShellNotifyIcon(NIM_SETVERSION)")); + } // do show the balloon now notifyData = NotifyIconData(hwnd); @@ -246,7 +253,13 @@ wxTaskBarIcon::ShowBalloon(const wxString& title, else if ( flags & wxICON_ERROR ) notifyData.dwInfoFlags |= NIIF_ERROR; - return wxShellNotifyIcon(NIM_MODIFY, ¬ifyData) != 0; + bool ok = wxShellNotifyIcon(NIM_MODIFY, ¬ifyData) != 0; + if ( !ok ) + { + wxLogLastError(wxT("wxShellNotifyIcon(NIM_MODIFY)")); + } + + return ok; } #endif // wxUSE_TASKBARICON_BALLOONS @@ -260,13 +273,19 @@ bool wxTaskBarIcon::RemoveIcon() NotifyIconData notifyData(GetHwndOf(m_win)); - return wxShellNotifyIcon(NIM_DELETE, ¬ifyData) != 0; + bool ok = wxShellNotifyIcon(NIM_DELETE, ¬ifyData) != 0; + if ( !ok ) + { + wxLogLastError(wxT("wxShellNotifyIcon(NIM_DELETE)")); + } + + return ok; } #if wxUSE_MENUS bool wxTaskBarIcon::PopupMenu(wxMenu *menu) { - wxASSERT_MSG( m_win != NULL, _T("taskbar icon not initialized") ); + wxASSERT_MSG( m_win != NULL, wxT("taskbar icon not initialized") ); static bool s_inPopup = false;