X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9470921fbb927af3a4432a27d52c372998311964..3ef092d63b3757744beb71a61a3b818e207632b3:/src/msw/taskbar.cpp diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index 90bb7742c7..ac7491bef0 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -3,17 +3,13 @@ // Purpose: Implements wxTaskBarIcon class for manipulating icons on // the Windows task bar. // Author: Julian Smart -// Modified by: +// Modified by: Vaclav Slavik // Created: 24/3/98 // RCS-ID: $Id$ // Copyright: (c) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "taskbar.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -37,31 +33,17 @@ #include #include "wx/taskbar.h" -#ifdef __GNUWIN32_OLD__ - #include "wx/msw/gnuwin32/extra.h" -#endif - #ifdef __WXWINCE__ #include #include #endif -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxTaskBarIconList); - -LRESULT APIENTRY _EXPORT -wxTaskBarIconWindowProc( HWND hWnd, unsigned msg, UINT wParam, LONG lParam ); - -wxChar *wxTaskBarWindowClass = (wxChar*) wxT("wxTaskBarWindowClass"); - -wxTaskBarIconList wxTaskBarIcon::sm_taskBarIcons; - // initialized on demand UINT gs_msgTaskbar = 0; UINT gs_msgRestartTaskbar = 0; #if WXWIN_COMPATIBILITY_2_4 -BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler) +BEGIN_EVENT_TABLE(wxTaskBarIcon, wxTaskBarIconBase) EVT_TASKBAR_MOVE (wxTaskBarIcon::_OnMouseMove) EVT_TASKBAR_LEFT_DOWN (wxTaskBarIcon::_OnLButtonDown) EVT_TASKBAR_LEFT_UP (wxTaskBarIcon::_OnLButtonUp) @@ -79,6 +61,41 @@ IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler) // implementation // ============================================================================ +// ---------------------------------------------------------------------------- +// wxTaskBarIconWindow: helper window +// ---------------------------------------------------------------------------- + +// NB: this class serves two purposes: +// 1. win32 needs a HWND associated with taskbar icon, this provides it +// 2. we need wxTopLevelWindow so that the app doesn't exit when +// last frame is closed but there still is a taskbar icon +class wxTaskBarIconWindow : public wxFrame +{ +public: + wxTaskBarIconWindow(wxTaskBarIcon *icon) + : wxFrame(NULL, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0), + m_icon(icon) + { + } + + WXLRESULT MSWWindowProc(WXUINT msg, + WXWPARAM wParam, WXLPARAM lParam) + { + if (msg == gs_msgRestartTaskbar || msg == gs_msgTaskbar) + { + return m_icon->WindowProc(msg, wParam, lParam); + } + else + { + return wxFrame::MSWWindowProc(msg, wParam, lParam); + } + } + +private: + wxTaskBarIcon *m_icon; +}; + + // ---------------------------------------------------------------------------- // NotifyIconData: wrapper around NOTIFYICONDATA // ---------------------------------------------------------------------------- @@ -105,41 +122,35 @@ struct NotifyIconData : public NOTIFYICONDATA wxTaskBarIcon::wxTaskBarIcon() { - m_hWnd = 0; + m_win = NULL; m_iconAdded = false; - - AddObject(this); - - if (RegisterWindowClass()) - m_hWnd = CreateTaskBarWindow(); + RegisterWindowMessages(); } wxTaskBarIcon::~wxTaskBarIcon() { - RemoveObject(this); - if (m_iconAdded) - { RemoveIcon(); - } - if (m_hWnd) - { - ::DestroyWindow((HWND) m_hWnd); - m_hWnd = 0; - } + if (m_win) + m_win->Destroy(); } // Operations bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) { - if (!IsOk()) - return false; + // NB: we have to create the window lazily because of backward compatibility, + // old applications may create a wxTaskBarIcon instance before wxApp + // is initialized (as samples/taskbar used to do) + if (!m_win) + { + m_win = new wxTaskBarIconWindow(this); + } m_icon = icon; m_strTooltip = tooltip; - NotifyIconData notifyData(m_hWnd); + NotifyIconData notifyData((HWND)m_win->GetHWND()); if (icon.Ok()) { @@ -170,13 +181,15 @@ bool wxTaskBarIcon::RemoveIcon() m_iconAdded = false; - NotifyIconData notifyData(m_hWnd); + NotifyIconData notifyData((HWND)m_win->GetHWND()); return Shell_NotifyIcon(NIM_DELETE, ¬ifyData) != 0; } bool wxTaskBarIcon::PopupMenu(wxMenu *menu) { + wxASSERT_MSG( m_win != NULL, _T("taskbar icon not initialized") ); + static bool s_inPopup = false; if (s_inPopup) @@ -184,31 +197,24 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) s_inPopup = true; - wxWindow* win; int x, y; wxGetMousePosition(&x, &y); - // is wxFrame the best window type to use??? - win = new wxFrame(NULL, -1, wxEmptyString, wxPoint(x,y), wxSize(-1,-1), 0); - win->PushEventHandler(this); + m_win->Move(x, y); - // Remove from record of top-level windows, or will confuse wxWindows - // if we try to exit right now. - wxTopLevelWindows.DeleteObject(win); + m_win->PushEventHandler(this); menu->UpdateUI(); // Work around a WIN32 bug - ::SetForegroundWindow ((HWND) win->GetHWND ()); + ::SetForegroundWindow((HWND)m_win->GetHWND()); - bool rval = win->PopupMenu(menu, 0, 0); + bool rval = m_win->PopupMenu(menu, 0, 0); // Work around a WIN32 bug - ::PostMessage ((HWND) win->GetHWND(),WM_NULL,0,0L); + ::PostMessage((HWND)m_win->GetHWND(), WM_NULL, 0, 0L); - win->PopEventHandler(false); - win->Destroy(); - delete win; + m_win->PopEventHandler(false); s_inPopup = false; @@ -217,110 +223,52 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) #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& e) { OnMouseMove(e); } -void wxTaskBarIcon::_OnLButtonDown(wxEvent& e) { OnLButtonDown(e); } -void wxTaskBarIcon::_OnLButtonUp(wxEvent& e) { OnLButtonUp(e); } -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); } +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 -wxTaskBarIcon* wxTaskBarIcon::FindObjectForHWND(WXHWND hWnd) -{ - wxTaskBarIconList::compatibility_iterator node = sm_taskBarIcons.GetFirst(); - while (node) - { - wxTaskBarIcon *obj = node->GetData(); - if (obj->GetHWND() == hWnd) - return obj; - node = node->GetNext(); - } - return NULL; -} - -void wxTaskBarIcon::AddObject(wxTaskBarIcon* obj) -{ - sm_taskBarIcons.Append(obj); -} - -void wxTaskBarIcon::RemoveObject(wxTaskBarIcon* obj) -{ - sm_taskBarIcons.DeleteObject(obj); -} - -bool wxTaskBarIcon::RegisterWindowClass() +void wxTaskBarIcon::RegisterWindowMessages() { static bool s_registered = false; - if ( s_registered ) - return true; - - // Taskbar restart msg will be sent to us if the icon needs to be redrawn - gs_msgRestartTaskbar = RegisterWindowMessage(wxT("TaskbarCreated")); - - // Also register the taskbar message here - gs_msgTaskbar = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage")); - - // 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 = wxGetInstance(); - wc.hIcon = 0; - wc.hCursor = 0; - wc.hbrBackground = 0; - wc.lpszMenuName = NULL; - wc.lpszClassName = wxTaskBarWindowClass; - - if ( !::RegisterClass(&wc) ) + if ( !s_registered ) { - wxLogLastError(_T("RegisterClass(taskbar icon)")); + // Taskbar restart msg will be sent to us if the icon needs to be redrawn + gs_msgRestartTaskbar = RegisterWindowMessage(wxT("TaskbarCreated")); - return false; - } - - s_registered = true; - - return true; -} + // Also register the taskbar message here + gs_msgTaskbar = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage")); -WXHWND wxTaskBarIcon::CreateTaskBarWindow() -{ - HINSTANCE hInstance = wxGetInstance(); - - HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass, - wxT("wxTaskBarWindow"), - WS_OVERLAPPED, - 0, - 0, - 10, - 10, - NULL, - (HMENU) 0, - hInstance, - NULL); - - return (WXHWND) hWnd; + s_registered = true; + } } // ---------------------------------------------------------------------------- // wxTaskBarIcon window proc // ---------------------------------------------------------------------------- -long wxTaskBarIcon::WindowProc(WXHWND hWnd, - unsigned int msg, - unsigned int wParam, +long wxTaskBarIcon::WindowProc(unsigned int msg, + unsigned int WXUNUSED(wParam), long lParam) { wxEventType eventType = 0; @@ -331,8 +279,8 @@ long wxTaskBarIcon::WindowProc(WXHWND hWnd, SetIcon(m_icon, m_strTooltip); } - if (msg != gs_msgTaskbar) - return DefWindowProc((HWND) hWnd, msg, wParam, lParam); + // this function should only be called for gs_msg(Restart)Taskbar messages + wxASSERT(msg == gs_msgTaskbar); switch (lParam) { @@ -378,15 +326,4 @@ long wxTaskBarIcon::WindowProc(WXHWND hWnd, return 0; } -LRESULT APIENTRY _EXPORT -wxTaskBarIconWindowProc(HWND hWnd, unsigned msg, UINT wParam, LONG lParam) -{ - wxTaskBarIcon *obj = wxTaskBarIcon::FindObjectForHWND((WXHWND) hWnd); - if (obj) - return obj->WindowProc((WXHWND) hWnd, msg, wParam, lParam); - else - return DefWindowProc(hWnd, msg, wParam, lParam); -} - -#endif - // __WIN95__ +#endif // __WIN95__