X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdcfde5d20f9dfdef75984802862924a68cdc2e1..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/msw/taskbar.cpp?ds=inline diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index be935781d7..4141b0e3c8 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -24,14 +24,45 @@ #include "wx/frame.h" #include "wx/utils.h" #include "wx/menu.h" + #include "wx/app.h" #endif #include "wx/msw/wrapshl.h" #include #include "wx/taskbar.h" +#include "wx/msw/private.h" #include "wx/dynlib.h" +#ifndef NIN_BALLOONTIMEOUT + #define NIN_BALLOONTIMEOUT 0x0404 + #define NIN_BALLOONUSERCLICK 0x0405 +#endif + +#ifndef NIM_SETVERSION + #define NIM_SETVERSION 0x00000004 +#endif + +#ifndef NIF_INFO + #define NIF_INFO 0x00000010 +#endif + +#ifndef NOTIFYICONDATA_V1_SIZE + #ifdef UNICODE + #define NOTIFYICONDATA_V1_SIZE 0x0098 + #else + #define NOTIFYICONDATA_V1_SIZE 0x0058 + #endif +#endif + +#ifndef NOTIFYICONDATA_V2_SIZE + #ifdef UNICODE + #define NOTIFYICONDATA_V2_SIZE 0x03A8 + #else + #define NOTIFYICONDATA_V2_SIZE 0x01E8 + #endif +#endif + // initialized on demand static UINT gs_msgTaskbar = 0; static UINT gs_msgRestartTaskbar = 0; @@ -119,7 +150,19 @@ struct NotifyIconData : public NOTIFYICONDATA NotifyIconData(WXHWND hwnd) { memset(this, 0, sizeof(NOTIFYICONDATA)); - cbSize = sizeof(NOTIFYICONDATA); + + // Do _not_ use sizeof(NOTIFYICONDATA) here, it may be too big if we're + // compiled with newer headers but running on an older system and while + // we could do complicated tests for the exact system version it's + // easier to just use an old size which should be supported everywhere + // from Windows 2000 up and which is all we need as we don't use any + // newer features so far. But if we're running under a really ancient + // system (Win9x), fall back to even smaller size -- then the balloon + // related features won't be available but the rest will still work. + cbSize = wxTheApp->GetShell32Version() >= 500 + ? NOTIFYICONDATA_V2_SIZE + : NOTIFYICONDATA_V1_SIZE; + hWnd = (HWND) hwnd; uCallbackMessage = gs_msgTaskbar; uFlags = NIF_MESSAGE; @@ -134,7 +177,7 @@ struct NotifyIconData : public NOTIFYICONDATA // wxTaskBarIcon // ---------------------------------------------------------------------------- -wxTaskBarIcon::wxTaskBarIcon() +wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType)) { m_win = NULL; m_iconAdded = false; @@ -143,11 +186,17 @@ wxTaskBarIcon::wxTaskBarIcon() wxTaskBarIcon::~wxTaskBarIcon() { - if (m_iconAdded) + if ( m_iconAdded ) RemoveIcon(); - if (m_win) - m_win->Destroy(); + if ( m_win ) + { + // we must use delete and not Destroy() here because the latter will + // only schedule the window to be deleted during the next idle event + // processing but we may not get any idle events if there are no other + // windows left in the program + delete m_win; + } } // Operations @@ -166,7 +215,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) NotifyIconData notifyData(GetHwndOf(m_win)); - if (icon.Ok()) + if (icon.IsOk()) { notifyData.uFlags |= NIF_ICON; notifyData.hIcon = GetHiconOf(icon); @@ -177,18 +226,25 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) notifyData.uFlags |= NIF_TIP; if ( !tooltip.empty() ) { - wxStrncpy(notifyData.szTip, tooltip.wx_str(), WXSIZEOF(notifyData.szTip)); + wxStrlcpy(notifyData.szTip, tooltip.t_str(), WXSIZEOF(notifyData.szTip)); } 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; return ok; } +#if wxUSE_TASKBARICON_BALLOONS + bool wxTaskBarIcon::ShowBalloon(const wxString& title, const wxString& text, @@ -196,13 +252,27 @@ 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") ); - NotifyIconData notifyData(GetHwndOf(m_win)); + const HWND hwnd = GetHwndOf(m_win); + + // we need to enable version 5.0 behaviour to receive notifications about + // the balloon disappearance + NotifyIconData notifyData(hwnd); + notifyData.uFlags = 0; + notifyData.uVersion = 3 /* NOTIFYICON_VERSION for Windows 2000/XP */; + + if ( !wxShellNotifyIcon(NIM_SETVERSION, ¬ifyData) ) + { + wxLogLastError(wxT("wxShellNotifyIcon(NIM_SETVERSION)")); + } + + // do show the balloon now + notifyData = NotifyIconData(hwnd); notifyData.uFlags |= NIF_INFO; notifyData.uTimeout = msec; - wxStrncpy(notifyData.szInfo, text.wx_str(), WXSIZEOF(notifyData.szInfo)); - wxStrncpy(notifyData.szInfoTitle, title.wx_str(), + wxStrlcpy(notifyData.szInfo, text.t_str(), WXSIZEOF(notifyData.szInfo)); + wxStrlcpy(notifyData.szInfoTitle, title.t_str(), WXSIZEOF(notifyData.szInfoTitle)); if ( flags & wxICON_INFORMATION ) @@ -212,9 +282,17 @@ 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 + bool wxTaskBarIcon::RemoveIcon() { if (!m_iconAdded) @@ -224,13 +302,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; @@ -289,9 +373,7 @@ long wxTaskBarIcon::WindowProc(unsigned int msg, unsigned int WXUNUSED(wParam), long lParam) { - wxEventType eventType = 0; - - if (msg == gs_msgRestartTaskbar) // does the icon need to be redrawn? + if ( msg == gs_msgRestartTaskbar ) // does the icon need to be redrawn? { m_iconAdded = false; SetIcon(m_icon, m_strTooltip); @@ -299,9 +381,10 @@ long wxTaskBarIcon::WindowProc(unsigned int msg, } // this function should only be called for gs_msg(Restart)Taskbar messages - wxASSERT(msg == gs_msgTaskbar); + wxASSERT( msg == gs_msgTaskbar ); - switch (lParam) + wxEventType eventType = 0; + switch ( lParam ) { case WM_LBUTTONDOWN: eventType = wxEVT_TASKBAR_LEFT_DOWN; @@ -331,11 +414,16 @@ long wxTaskBarIcon::WindowProc(unsigned int msg, eventType = wxEVT_TASKBAR_MOVE; break; - default: + case NIN_BALLOONTIMEOUT: + eventType = wxEVT_TASKBAR_BALLOON_TIMEOUT; + break; + + case NIN_BALLOONUSERCLICK: + eventType = wxEVT_TASKBAR_BALLOON_CLICK; break; } - if (eventType) + if ( eventType ) { wxTaskBarIconEvent event(eventType, this);