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

SF patch 1840451

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2007-12-07 15:33:54 +00:00
parent c6dcefd2b8
commit 4ad16c5f92
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/taskbar.cpp
View File

@@ -37,6 +37,15 @@
#define NIN_BALLOONUSERCLICK 0x0405 #define NIN_BALLOONUSERCLICK 0x0405
#endif #endif
#ifndef NIM_SETVERSION
#define NIM_SETVERSION 0x00000004
#endif
#ifndef NIF_INFO
#define NIF_INFO 0x00000010
#endif
// initialized on demand // initialized on demand
static UINT gs_msgTaskbar = 0; static UINT gs_msgTaskbar = 0;
static UINT gs_msgRestartTaskbar = 0; static UINT gs_msgRestartTaskbar = 0;
@@ -215,7 +224,9 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
// the balloon disappearance // the balloon disappearance
NotifyIconData notifyData(hwnd); NotifyIconData notifyData(hwnd);
notifyData.uFlags = 0; notifyData.uFlags = 0;
#if (WINVER >= 0x0500)
notifyData.uVersion = 3 /* NOTIFYICON_VERSION for Windows XP */; notifyData.uVersion = 3 /* NOTIFYICON_VERSION for Windows XP */;
#endif
wxShellNotifyIcon(NIM_SETVERSION, &notifyData); wxShellNotifyIcon(NIM_SETVERSION, &notifyData);
@@ -223,6 +234,7 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
// do show the balloon now // do show the balloon now
notifyData = NotifyIconData(hwnd); notifyData = NotifyIconData(hwnd);
notifyData.uFlags |= NIF_INFO; notifyData.uFlags |= NIF_INFO;
#if (WINVER >= 0x0500)
notifyData.uTimeout = msec; notifyData.uTimeout = msec;
wxStrncpy(notifyData.szInfo, text.wx_str(), WXSIZEOF(notifyData.szInfo)); wxStrncpy(notifyData.szInfo, text.wx_str(), WXSIZEOF(notifyData.szInfo));
wxStrncpy(notifyData.szInfoTitle, title.wx_str(), wxStrncpy(notifyData.szInfoTitle, title.wx_str(),
@@ -234,6 +246,7 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
notifyData.dwInfoFlags |= NIIF_WARNING; notifyData.dwInfoFlags |= NIIF_WARNING;
else if ( flags & wxICON_ERROR ) else if ( flags & wxICON_ERROR )
notifyData.dwInfoFlags |= NIIF_ERROR; notifyData.dwInfoFlags |= NIIF_ERROR;
#endif
return wxShellNotifyIcon(NIM_MODIFY, &notifyData) != 0; return wxShellNotifyIcon(NIM_MODIFY, &notifyData) != 0;
} }