X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4ad16c5f92d70b80cf32c2d87bf4b2c8ecfefdbe..e70b1175fb1b8c01e9382d6dcf858ee6c81e3008:/src/msw/taskbar.cpp diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index d42b08fe47..cc52113434 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -209,6 +209,8 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) return ok; } +#if wxUSE_TASKBARICON_BALLOONS + bool wxTaskBarIcon::ShowBalloon(const wxString& title, const wxString& text, @@ -224,9 +226,7 @@ wxTaskBarIcon::ShowBalloon(const wxString& title, // the balloon disappearance NotifyIconData notifyData(hwnd); notifyData.uFlags = 0; -#if (WINVER >= 0x0500) notifyData.uVersion = 3 /* NOTIFYICON_VERSION for Windows XP */; -#endif wxShellNotifyIcon(NIM_SETVERSION, ¬ifyData); @@ -234,7 +234,6 @@ wxTaskBarIcon::ShowBalloon(const wxString& title, // do show the balloon now notifyData = NotifyIconData(hwnd); notifyData.uFlags |= NIF_INFO; -#if (WINVER >= 0x0500) notifyData.uTimeout = msec; wxStrncpy(notifyData.szInfo, text.wx_str(), WXSIZEOF(notifyData.szInfo)); wxStrncpy(notifyData.szInfoTitle, title.wx_str(), @@ -246,11 +245,12 @@ wxTaskBarIcon::ShowBalloon(const wxString& title, notifyData.dwInfoFlags |= NIIF_WARNING; else if ( flags & wxICON_ERROR ) notifyData.dwInfoFlags |= NIIF_ERROR; -#endif return wxShellNotifyIcon(NIM_MODIFY, ¬ifyData) != 0; } +#endif // wxUSE_TASKBARICON_BALLOONS + bool wxTaskBarIcon::RemoveIcon() { if (!m_iconAdded)