X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50c319beec2454b4f669b6c8cf3d089f53c979f6..0ddf7c0cad6ab8c394d5e1002660a3dc983735a7:/src/msw/taskbar.cpp diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index 749fabf602..6be5dd0428 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -1,13 +1,13 @@ ///////////////////////////////////////////////////////////////////////// // 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__ @@ -23,30 +23,52 @@ #ifndef WX_PRECOMP #include "wx/defs.h" +#include "wx/window.h" +#include "wx/frame.h" +#include "wx/utils.h" +#include "wx/menu.h" #endif -#ifdef __WIN95__ +#if defined(__WIN95__) && !defined(__TWIN32__) -#include -#include #include -#include -#ifdef __GNUWIN32__ -#include +#include "wx/msw/winundef.h" + +#include +#include "wx/msw/taskbar.h" +#include "wx/msw/private.h" + +#ifndef __TWIN32__ + #ifdef __GNUWIN32_OLD__ + #include "wx/msw/gnuwin32/extra.h" + #endif #endif +#ifdef __SALFORDC__ + #include +#endif + +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxTaskBarIconList); + LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg, - UINT wParam, LONG lParam ); + UINT wParam, LONG lParam ); -char *wxTaskBarWindowClass = "wxTaskBarWindowClass"; +wxChar *wxTaskBarWindowClass = (wxChar*) wxT("wxTaskBarWindowClass"); -wxList wxTaskBarIcon::sm_taskBarIcons; +wxTaskBarIconList wxTaskBarIcon::sm_taskBarIcons; bool wxTaskBarIcon::sm_registeredClass = FALSE; UINT wxTaskBarIcon::sm_taskbarMsg = 0; +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE ) +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DOWN ) +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_UP ) +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DOWN ) +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_UP ) +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DCLICK ) +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DCLICK ) -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler) EVT_TASKBAR_MOVE (wxTaskBarIcon::_OnMouseMove) EVT_TASKBAR_LEFT_DOWN (wxTaskBarIcon::_OnLButtonDown) @@ -59,13 +81,12 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler) -#endif wxTaskBarIcon::wxTaskBarIcon(void) { m_hWnd = 0; - m_iconAdded = FALSE; + m_iconAdded = false; AddObject(this); @@ -93,25 +114,25 @@ wxTaskBarIcon::~wxTaskBarIcon(void) bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) { if (!IsOK()) - return FALSE; + return false; NOTIFYICONDATA notifyData; 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()) + notifyData.cbSize = sizeof(notifyData); + notifyData.hWnd = (HWND) m_hWnd; + notifyData.uCallbackMessage = sm_taskbarMsg; + notifyData.uFlags = NIF_MESSAGE ; + if (icon.Ok()) { - notifyData.uFlags |= NIF_ICON; - notifyData.hIcon = (HICON) icon.GetHICON(); + notifyData.uFlags |= NIF_ICON; + notifyData.hIcon = (HICON) icon.GetHICON(); } - if (((const char*) tooltip != NULL) && (tooltip != "")) + if (((const wxChar*) tooltip != NULL) && (tooltip != wxT(""))) { notifyData.uFlags |= NIF_TIP ; - lstrcpyn(notifyData.szTip, (char*) (const char*) tooltip, sizeof(notifyData.szTip)); + lstrcpyn(notifyData.szTip, WXSTRINGCAST tooltip, sizeof(notifyData.szTip)); } notifyData.uID = 99; @@ -128,37 +149,63 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) bool wxTaskBarIcon::RemoveIcon(void) { if (!m_iconAdded) - return FALSE; + return false; NOTIFYICONDATA notifyData; 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.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; + m_iconAdded = false; return (Shell_NotifyIcon(NIM_DELETE, & notifyData) != 0); } bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y); { - bool rval = FALSE; + // OK, so I know this isn't thread-friendly, but + // what to do? We need this check. + + static bool s_inPopup = false; + + if (s_inPopup) + return false; + + 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 + // if we try to exit right now. + wxTopLevelWindows.DeleteObject(win); + + menu->UpdateUI(); + + // Work around a WIN32 bug + ::SetForegroundWindow ((HWND) win->GetHWND ()); + rval = win->PopupMenu(menu, 0, 0); - win->PopEventHandler(FALSE); + // Work around a WIN32 bug + ::PostMessage ((HWND) win->GetHWND(),WM_NULL,0,0L); + + win->PopEventHandler(false); win->Destroy(); + delete win; + + s_inPopup = false; + return rval; } @@ -203,13 +250,13 @@ void wxTaskBarIcon::_OnRButtonDClick(wxEvent& e) { OnRButtonDClick(e); } wxTaskBarIcon* wxTaskBarIcon::FindObjectForHWND(WXHWND hWnd) { - wxNode*node = sm_taskBarIcons.First(); + wxTaskBarIconList::Node *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; } @@ -227,13 +274,13 @@ void wxTaskBarIcon::RemoveObject(wxTaskBarIcon* obj) bool wxTaskBarIcon::RegisterWindowClass() { if (sm_registeredClass) - return TRUE; + return true; // Also register the taskbar message here - sm_taskbarMsg = ::RegisterWindowMessage("wxTaskBarIconMessage"); + sm_taskbarMsg = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage")); - WNDCLASS wc; - bool rc; + WNDCLASS wc; + bool rc; HINSTANCE hInstance = GetModuleHandle(NULL); @@ -262,7 +309,7 @@ WXHWND wxTaskBarIcon::CreateTaskBarWindow() HINSTANCE hInstance = GetModuleHandle(NULL); HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass, - "wxTaskBarWindow", + wxT("wxTaskBarWindow"), WS_OVERLAPPED, 0, 0, @@ -285,42 +332,40 @@ long wxTaskBarIcon::WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wPar 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); + wxTaskBarIconEvent event(eventType, this); ProcessEvent(event); } @@ -328,9 +373,9 @@ long wxTaskBarIcon::WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wPar } LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg, - UINT wParam, LONG lParam ) + 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