X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7520f3da332d64a676b6f7d27a56004fabf2db36..9ab7ff537d1ead0f0b07c14841474203c7fa59ba:/src/msw/taskbar.cpp diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index ec0f9b717b..a064e5df9e 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -17,6 +17,8 @@ #pragma hdrstop #endif +#if wxUSE_TASKBARICON + #ifndef WX_PRECOMP #include "wx/window.h" #include "wx/frame.h" @@ -24,40 +26,69 @@ #include "wx/menu.h" #endif -#include "wx/msw/private.h" -#include "wx/msw/winundef.h" +#include "wx/msw/wrapshl.h" #include #include "wx/taskbar.h" +#include "wx/dynlib.h" -#ifdef __WXWINCE__ - #include - #include +#ifndef NIN_BALLOONTIMEOUT + #define NIN_BALLOONTIMEOUT 0x0404 + #define NIN_BALLOONUSERCLICK 0x0405 #endif -// initialized on demand -UINT gs_msgTaskbar = 0; -UINT gs_msgRestartTaskbar = 0; - -#if WXWIN_COMPATIBILITY_2_4 -BEGIN_EVENT_TABLE(wxTaskBarIcon, wxTaskBarIconBase) - EVT_TASKBAR_MOVE (wxTaskBarIcon::_OnMouseMove) - EVT_TASKBAR_LEFT_DOWN (wxTaskBarIcon::_OnLButtonDown) - EVT_TASKBAR_LEFT_UP (wxTaskBarIcon::_OnLButtonUp) - EVT_TASKBAR_RIGHT_DOWN (wxTaskBarIcon::_OnRButtonDown) - EVT_TASKBAR_RIGHT_UP (wxTaskBarIcon::_OnRButtonUp) - EVT_TASKBAR_LEFT_DCLICK (wxTaskBarIcon::_OnLButtonDClick) - EVT_TASKBAR_RIGHT_DCLICK (wxTaskBarIcon::_OnRButtonDClick) -END_EVENT_TABLE() +#ifndef NIM_SETVERSION + #define NIM_SETVERSION 0x00000004 +#endif + +#ifndef NIF_INFO + #define NIF_INFO 0x00000010 #endif +// initialized on demand +static UINT gs_msgTaskbar = 0; +static UINT gs_msgRestartTaskbar = 0; + + IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler) // ============================================================================ // implementation // ============================================================================ +// wrapper around Shell_NotifyIcon(): this function is not present in Win95 +// shell32.dll so load it dynamically to allow programs using wxTaskBarIcon to +// start under this OS +static BOOL wxShellNotifyIcon(DWORD dwMessage, NOTIFYICONDATA *pData) +{ +#if wxUSE_DYNLIB_CLASS + typedef BOOL (WINAPI *Shell_NotifyIcon_t)(DWORD, NOTIFYICONDATA *); + + static Shell_NotifyIcon_t s_pfnShell_NotifyIcon = NULL; + static bool s_initialized = false; + if ( !s_initialized ) + { + s_initialized = true; + + wxLogNull noLog; + wxDynamicLibrary dllShell("shell32.dll"); + if ( dllShell.IsLoaded() ) + { + wxDL_INIT_FUNC_AW(s_pfn, Shell_NotifyIcon, dllShell); + } + + // NB: it's ok to destroy dllShell here, we link to shell32.dll + // implicitly so it won't be unloaded + } + + return s_pfnShell_NotifyIcon ? (*s_pfnShell_NotifyIcon)(dwMessage, pData) + : FALSE; +#else // !wxUSE_DYNLIB_CLASS + return Shell_NotifyIcon(dwMessage, pData); +#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS +} + // ---------------------------------------------------------------------------- // wxTaskBarIconWindow: helper window // ---------------------------------------------------------------------------- @@ -126,11 +157,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 @@ -147,7 +184,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) m_icon = icon; m_strTooltip = tooltip; - NotifyIconData notifyData((HWND)m_win->GetHWND()); + NotifyIconData notifyData(GetHwndOf(m_win)); if (icon.Ok()) { @@ -155,15 +192,21 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) notifyData.hIcon = GetHiconOf(icon); } + // set NIF_TIP even for an empty tooltip: otherwise it would be impossible + // to remove an existing tooltip using this function + notifyData.uFlags |= NIF_TIP; if ( !tooltip.empty() ) { - notifyData.uFlags |= NIF_TIP; -// lstrcpyn(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip)); - wxStrncpy(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip)); + wxStrlcpy(notifyData.szTip, tooltip.wx_str(), WXSIZEOF(notifyData.szTip)); } - bool ok = Shell_NotifyIcon(m_iconAdded ? NIM_MODIFY - : NIM_ADD, ¬ifyData) != 0; + 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; @@ -171,6 +214,56 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) return ok; } +#if wxUSE_TASKBARICON_BALLOONS + +bool +wxTaskBarIcon::ShowBalloon(const wxString& title, + const wxString& text, + unsigned msec, + int flags) +{ + wxCHECK_MSG( m_iconAdded, false, + wxT("can't be used before the icon is created") ); + + 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 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; + wxStrlcpy(notifyData.szInfo, text.wx_str(), WXSIZEOF(notifyData.szInfo)); + wxStrlcpy(notifyData.szInfoTitle, title.wx_str(), + WXSIZEOF(notifyData.szInfoTitle)); + + if ( flags & wxICON_INFORMATION ) + notifyData.dwInfoFlags |= NIIF_INFO; + else if ( flags & wxICON_WARNING ) + notifyData.dwInfoFlags |= NIIF_WARNING; + else if ( flags & wxICON_ERROR ) + notifyData.dwInfoFlags |= NIIF_ERROR; + + 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) @@ -178,14 +271,21 @@ bool wxTaskBarIcon::RemoveIcon() m_iconAdded = false; - NotifyIconData notifyData((HWND)m_win->GetHWND()); + NotifyIconData notifyData(GetHwndOf(m_win)); - return Shell_NotifyIcon(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; @@ -203,13 +303,14 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) menu->UpdateUI(); - // Work around a WIN32 bug - ::SetForegroundWindow((HWND)m_win->GetHWND()); + // the SetForegroundWindow() and PostMessage() calls are needed to work + // around Win32 bug with the popup menus shown for the notifications as + // documented at http://support.microsoft.com/kb/q135788/ + ::SetForegroundWindow(GetHwndOf(m_win)); bool rval = m_win->PopupMenu(menu, 0, 0); - // Work around a WIN32 bug - ::PostMessage((HWND)m_win->GetHWND(), WM_NULL, 0, 0L); + ::PostMessage(GetHwndOf(m_win), WM_NULL, 0, 0L); m_win->PopEventHandler(false); @@ -217,32 +318,7 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) return rval; } - -#if WXWIN_COMPATIBILITY_2_4 -// Overridables -void wxTaskBarIcon::OnMouseMove(wxEvent& e) { e.Skip(); } -void wxTaskBarIcon::OnLButtonDown(wxEvent& e) { e.Skip(); } -void wxTaskBarIcon::OnLButtonUp(wxEvent& e) { e.Skip(); } -void wxTaskBarIcon::OnRButtonDown(wxEvent& e) { e.Skip(); } -void wxTaskBarIcon::OnRButtonUp(wxEvent& e) { e.Skip(); } -void wxTaskBarIcon::OnLButtonDClick(wxEvent& e) { e.Skip(); } -void wxTaskBarIcon::OnRButtonDClick(wxEvent& e) { e.Skip(); } - -void wxTaskBarIcon::_OnMouseMove(wxTaskBarIconEvent& e) - { OnMouseMove(e); } -void wxTaskBarIcon::_OnLButtonDown(wxTaskBarIconEvent& e) - { OnLButtonDown(e); } -void wxTaskBarIcon::_OnLButtonUp(wxTaskBarIconEvent& e) - { OnLButtonUp(e); } -void wxTaskBarIcon::_OnRButtonDown(wxTaskBarIconEvent& e) - { OnRButtonDown(e); } -void wxTaskBarIcon::_OnRButtonUp(wxTaskBarIconEvent& e) - { OnRButtonUp(e); } -void wxTaskBarIcon::_OnLButtonDClick(wxTaskBarIconEvent& e) - { OnLButtonDClick(e); } -void wxTaskBarIcon::_OnRButtonDClick(wxTaskBarIconEvent& e) - { OnRButtonDClick(e); } -#endif +#endif // wxUSE_MENUS void wxTaskBarIcon::RegisterWindowMessages() { @@ -268,18 +344,18 @@ 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); + return 0; } // 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; @@ -309,11 +385,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); @@ -322,3 +403,6 @@ long wxTaskBarIcon::WindowProc(unsigned int msg, return 0; } + +#endif // wxUSE_TASKBARICON +