X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..c4053ed35abe597597c4b843529be38ca3c3c7f2:/src/msw/taskbar.cpp diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index b64a50cdf1..23e0025154 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -1,16 +1,16 @@ ///////////////////////////////////////////////////////////////////////// // File: taskbar.cpp -// Purpose: Implements wxTaskBarIcon class for manipulating icons on +// Purpose: Implements wxTaskBarIcon class for manipulating icons on // the Windows task bar. // Author: Julian Smart // Modified by: // Created: 24/3/98 // RCS-ID: $Id$ // Copyright: (c) -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "taskbar.h" #endif @@ -29,36 +29,38 @@ #include "wx/menu.h" #endif -#if defined(__WIN95__) && !defined(__TWIN32__) +#if defined(__WIN95__) + +#include "wx/msw/private.h" +#include "wx/msw/winundef.h" -#include #include -#include -#include +#include "wx/taskbar.h" -#ifndef __TWIN32__ -#ifdef __GNUWIN32__ -#ifndef wxUSE_NORLANDER_HEADERS -#include -#endif -#endif +#ifdef __GNUWIN32_OLD__ + #include "wx/msw/gnuwin32/extra.h" #endif -#ifdef __SALFORDC__ -#include +#ifdef __WXWINCE__ + #include + #include #endif -LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg, - UINT wParam, LONG lParam ); +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxTaskBarIconList); + +LRESULT APIENTRY _EXPORT +wxTaskBarIconWindowProc( HWND hWnd, unsigned msg, UINT wParam, LONG lParam ); -wxChar *wxTaskBarWindowClass = T("wxTaskBarWindowClass"); +wxChar *wxTaskBarWindowClass = (wxChar*) wxT("wxTaskBarWindowClass"); -wxList wxTaskBarIcon::sm_taskBarIcons; -bool wxTaskBarIcon::sm_registeredClass = FALSE; -UINT wxTaskBarIcon::sm_taskbarMsg = 0; +wxTaskBarIconList wxTaskBarIcon::sm_taskBarIcons; +// initialized on demand +UINT gs_msgTaskbar = 0; +UINT gs_msgRestartTaskbar = 0; -#if !USE_SHARED_LIBRARY +#if WXWIN_COMPATIBILITY_2_4 BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler) EVT_TASKBAR_MOVE (wxTaskBarIcon::_OnMouseMove) EVT_TASKBAR_LEFT_DOWN (wxTaskBarIcon::_OnLButtonDown) @@ -68,16 +70,43 @@ BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler) EVT_TASKBAR_LEFT_DCLICK (wxTaskBarIcon::_OnLButtonDClick) EVT_TASKBAR_RIGHT_DCLICK (wxTaskBarIcon::_OnRButtonDClick) END_EVENT_TABLE() +#endif IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler) -#endif +// ============================================================================ +// implementation +// ============================================================================ -wxTaskBarIcon::wxTaskBarIcon(void) +// ---------------------------------------------------------------------------- +// NotifyIconData: wrapper around NOTIFYICONDATA +// ---------------------------------------------------------------------------- + +struct NotifyIconData : public NOTIFYICONDATA +{ + NotifyIconData(WXHWND hwnd) + { + memset(this, 0, sizeof(NOTIFYICONDATA)); + cbSize = sizeof(NOTIFYICONDATA); + hWnd = (HWND) hwnd; + uCallbackMessage = gs_msgTaskbar; + uFlags = NIF_MESSAGE; + + // we use the same id for all taskbar icons as we don't need it to + // distinguish between them + uID = 99; + } +}; + +// ---------------------------------------------------------------------------- +// wxTaskBarIcon +// ---------------------------------------------------------------------------- + +wxTaskBarIcon::wxTaskBarIcon() { m_hWnd = 0; - m_iconAdded = FALSE; + m_iconAdded = false; AddObject(this); @@ -85,7 +114,7 @@ wxTaskBarIcon::wxTaskBarIcon(void) m_hWnd = CreateTaskBarWindow(); } -wxTaskBarIcon::~wxTaskBarIcon(void) +wxTaskBarIcon::~wxTaskBarIcon() { RemoveObject(this); @@ -104,77 +133,63 @@ wxTaskBarIcon::~wxTaskBarIcon(void) // Operations bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) { - if (!IsOK()) - return FALSE; + if (!IsOk()) + return false; - NOTIFYICONDATA notifyData; + m_icon = icon; + m_strTooltip = tooltip; - memset(¬ifyData, 0, sizeof(notifyData)); - notifyData.cbSize = sizeof(notifyData); - notifyData.hWnd = (HWND) m_hWnd; - notifyData.uCallbackMessage = sm_taskbarMsg; - notifyData.uFlags = NIF_MESSAGE ; - if (icon.Ok()) + NotifyIconData notifyData(m_hWnd); + + if (icon.Ok()) { - notifyData.uFlags |= NIF_ICON; - notifyData.hIcon = (HICON) icon.GetHICON(); + notifyData.uFlags |= NIF_ICON; + notifyData.hIcon = GetHiconOf(icon); } - if (((const wxChar*) tooltip != NULL) && (tooltip != T(""))) + if ( !tooltip.empty() ) { - notifyData.uFlags |= NIF_TIP ; - lstrcpyn(notifyData.szTip, WXSTRINGCAST tooltip, sizeof(notifyData.szTip)); + notifyData.uFlags |= NIF_TIP; +// lstrcpyn(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip)); + wxStrncpy(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip)); } - notifyData.uID = 99; + bool ok = Shell_NotifyIcon(m_iconAdded ? NIM_MODIFY + : NIM_ADD, ¬ifyData) != 0; - if (m_iconAdded) - return (Shell_NotifyIcon(NIM_MODIFY, & notifyData) != 0); - else - { - m_iconAdded = (Shell_NotifyIcon(NIM_ADD, & notifyData) != 0); - return m_iconAdded; - } + if ( !m_iconAdded && ok ) + m_iconAdded = true; + + return ok; } -bool wxTaskBarIcon::RemoveIcon(void) +bool wxTaskBarIcon::RemoveIcon() { if (!m_iconAdded) - return FALSE; + return false; - NOTIFYICONDATA notifyData; + m_iconAdded = false; - memset(¬ifyData, 0, sizeof(notifyData)); - notifyData.cbSize = sizeof(notifyData); - notifyData.hWnd = (HWND) m_hWnd; - notifyData.uCallbackMessage = sm_taskbarMsg; - notifyData.uFlags = NIF_MESSAGE; - notifyData.hIcon = 0 ; // hIcon; - notifyData.uID = 99; - m_iconAdded = FALSE; + NotifyIconData notifyData(m_hWnd); - return (Shell_NotifyIcon(NIM_DELETE, & notifyData) != 0); + return Shell_NotifyIcon(NIM_DELETE, ¬ifyData) != 0; } -bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y); +bool wxTaskBarIcon::PopupMenu(wxMenu *menu) { - // OK, so I know this isn't thread-friendly, but - // what to do? We need this check. - - static bool s_inPopup = FALSE; + static bool s_inPopup = false; if (s_inPopup) - return FALSE; + return false; - s_inPopup = TRUE; + s_inPopup = true; - bool rval = FALSE; wxWindow* win; int x, y; wxGetMousePosition(&x, &y); // is wxFrame the best window type to use??? - win = new wxFrame(NULL, -1, "", wxPoint(x,y), wxSize(-1,-1), 0); + win = new wxFrame(NULL, -1, wxEmptyString, wxPoint(x,y), wxSize(-1,-1), 0); win->PushEventHandler(this); // Remove from record of top-level windows, or will confuse wxWindows @@ -183,46 +198,32 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y); menu->UpdateUI(); - rval = win->PopupMenu(menu, 0, 0); + // Work around a WIN32 bug + ::SetForegroundWindow ((HWND) win->GetHWND ()); - win->PopEventHandler(FALSE); + bool rval = win->PopupMenu(menu, 0, 0); + + // Work around a WIN32 bug + ::PostMessage ((HWND) win->GetHWND(),WM_NULL,0,0L); + + win->PopEventHandler(false); win->Destroy(); delete win; - s_inPopup = FALSE; + s_inPopup = false; return rval; } - +#if WXWIN_COMPATIBILITY_2_4 // Overridables -void wxTaskBarIcon::OnMouseMove(wxEvent&) -{ -} - -void wxTaskBarIcon::OnLButtonDown(wxEvent&) -{ -} - -void wxTaskBarIcon::OnLButtonUp(wxEvent&) -{ -} - -void wxTaskBarIcon::OnRButtonDown(wxEvent&) -{ -} - -void wxTaskBarIcon::OnRButtonUp(wxEvent&) -{ -} - -void wxTaskBarIcon::OnLButtonDClick(wxEvent&) -{ -} - -void wxTaskBarIcon::OnRButtonDClick(wxEvent&) -{ -} +void wxTaskBarIcon::OnMouseMove(wxEvent&) {} +void wxTaskBarIcon::OnLButtonDown(wxEvent&) {} +void wxTaskBarIcon::OnLButtonUp(wxEvent&) {} +void wxTaskBarIcon::OnRButtonDown(wxEvent&) {} +void wxTaskBarIcon::OnRButtonUp(wxEvent&) {} +void wxTaskBarIcon::OnLButtonDClick(wxEvent&) {} +void wxTaskBarIcon::OnRButtonDClick(wxEvent&) {} void wxTaskBarIcon::_OnMouseMove(wxEvent& e) { OnMouseMove(e); } void wxTaskBarIcon::_OnLButtonDown(wxEvent& e) { OnLButtonDown(e); } @@ -231,17 +232,17 @@ void wxTaskBarIcon::_OnRButtonDown(wxEvent& e) { OnRButtonDown(e); } void wxTaskBarIcon::_OnRButtonUp(wxEvent& e) { OnRButtonUp(e); } void wxTaskBarIcon::_OnLButtonDClick(wxEvent& e) { OnLButtonDClick(e); } void wxTaskBarIcon::_OnRButtonDClick(wxEvent& e) { OnRButtonDClick(e); } - +#endif wxTaskBarIcon* wxTaskBarIcon::FindObjectForHWND(WXHWND hWnd) { - wxNode*node = sm_taskBarIcons.First(); + wxTaskBarIconList::compatibility_iterator node = sm_taskBarIcons.GetFirst(); while (node) { - wxTaskBarIcon* obj = (wxTaskBarIcon*) node->Data(); + wxTaskBarIcon *obj = node->GetData(); if (obj->GetHWND() == hWnd) return obj; - node = node->Next(); + node = node->GetNext(); } return NULL; } @@ -258,35 +259,40 @@ void wxTaskBarIcon::RemoveObject(wxTaskBarIcon* obj) bool wxTaskBarIcon::RegisterWindowClass() { - if (sm_registeredClass) - return TRUE; + static bool s_registered = false; - // Also register the taskbar message here - sm_taskbarMsg = ::RegisterWindowMessage(T("wxTaskBarIconMessage")); + if ( s_registered ) + return true; - WNDCLASS wc; - bool rc; + // Taskbar restart msg will be sent to us if the icon needs to be redrawn + gs_msgRestartTaskbar = RegisterWindowMessage(wxT("TaskbarCreated")); - HINSTANCE hInstance = GetModuleHandle(NULL); + // Also register the taskbar message here + gs_msgTaskbar = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage")); - /* - * set up and register window class - */ + // set up and register window class + WNDCLASS wc; wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = (WNDPROC) wxTaskBarIconWindowProc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; - wc.hInstance = hInstance; + wc.hInstance = wxGetInstance(); wc.hIcon = 0; wc.hCursor = 0; wc.hbrBackground = 0; wc.lpszMenuName = NULL; - wc.lpszClassName = wxTaskBarWindowClass ; - rc = (::RegisterClass( &wc ) != 0); + wc.lpszClassName = wxTaskBarWindowClass; + + if ( !::RegisterClass(&wc) ) + { + wxLogLastError(_T("RegisterClass(taskbar icon)")); + + return false; + } - sm_registeredClass = (rc != 0); + s_registered = true; - return( (rc != 0) ); + return true; } WXHWND wxTaskBarIcon::CreateTaskBarWindow() @@ -294,7 +300,7 @@ WXHWND wxTaskBarIcon::CreateTaskBarWindow() HINSTANCE hInstance = GetModuleHandle(NULL); HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass, - T("wxTaskBarWindow"), + wxT("wxTaskBarWindow"), WS_OVERLAPPED, 0, 0, @@ -308,61 +314,74 @@ WXHWND wxTaskBarIcon::CreateTaskBarWindow() return (WXHWND) hWnd; } -long wxTaskBarIcon::WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wParam, long lParam ) +// ---------------------------------------------------------------------------- +// wxTaskBarIcon window proc +// ---------------------------------------------------------------------------- + +long wxTaskBarIcon::WindowProc(WXHWND hWnd, + unsigned int msg, + unsigned int wParam, + long lParam) { wxEventType eventType = 0; - if (msg != sm_taskbarMsg) + if (msg == gs_msgRestartTaskbar) // does the icon need to be redrawn? + { + m_iconAdded = false; + SetIcon(m_icon, m_strTooltip); + } + + if (msg != gs_msgTaskbar) return DefWindowProc((HWND) hWnd, msg, wParam, lParam); switch (lParam) { - case WM_LBUTTONDOWN: + case WM_LBUTTONDOWN: eventType = wxEVT_TASKBAR_LEFT_DOWN; break; - case WM_LBUTTONUP: + case WM_LBUTTONUP: eventType = wxEVT_TASKBAR_LEFT_UP; break; - case WM_RBUTTONDOWN: + case WM_RBUTTONDOWN: eventType = wxEVT_TASKBAR_RIGHT_DOWN; break; - case WM_RBUTTONUP: + case WM_RBUTTONUP: eventType = wxEVT_TASKBAR_RIGHT_UP; break; - case WM_LBUTTONDBLCLK: + case WM_LBUTTONDBLCLK: eventType = wxEVT_TASKBAR_LEFT_DCLICK; break; - case WM_RBUTTONDBLCLK: + case WM_RBUTTONDBLCLK: eventType = wxEVT_TASKBAR_RIGHT_DCLICK; break; - case WM_MOUSEMOVE: + case WM_MOUSEMOVE: eventType = wxEVT_TASKBAR_MOVE; break; - default: + default: break; - } + } - if (eventType) { - wxEvent event; - event.SetEventType(eventType); - event.SetEventObject(this); + if (eventType) + { + wxTaskBarIconEvent event(eventType, this); ProcessEvent(event); } + return 0; } -LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg, - UINT wParam, LONG lParam ) +LRESULT APIENTRY _EXPORT +wxTaskBarIconWindowProc(HWND hWnd, unsigned msg, UINT wParam, LONG lParam) { - wxTaskBarIcon* obj = wxTaskBarIcon::FindObjectForHWND((WXHWND) hWnd); + wxTaskBarIcon *obj = wxTaskBarIcon::FindObjectForHWND((WXHWND) hWnd); if (obj) return obj->WindowProc((WXHWND) hWnd, msg, wParam, lParam); else