/////////////////////////////////////////////////////////////////////////
// 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__
#include "wx/window.h"
#include "wx/frame.h"
#include "wx/utils.h"
+#include "wx/menu.h"
#endif
#if defined(__WIN95__) && !defined(__TWIN32__)
#include <windows.h>
+
+#include "wx/msw/winundef.h"
+
#include <string.h>
-#include <wx/msw/taskbar.h>
-#include <wx/msw/private.h>
+#include "wx/msw/taskbar.h"
+#include "wx/msw/private.h"
#ifndef __TWIN32__
-#ifdef __GNUWIN32__
-#ifndef wxUSE_NORLANDER_HEADERS
-#include <wx/msw/gnuwin32/extra.h>
-#endif
-#endif
+ #ifdef __GNUWIN32_OLD__
+ #include "wx/msw/gnuwin32/extra.h"
+ #endif
#endif
#ifdef __SALFORDC__
-#include <shellapi.h>
+ #include <shellapi.h>
#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 );
-wxChar *wxTaskBarWindowClass = _T("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)
IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
-#endif
wxTaskBarIcon::wxTaskBarIcon(void)
{
m_hWnd = 0;
- m_iconAdded = FALSE;
+ m_iconAdded = false;
AddObject(this);
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 wxChar*) tooltip != NULL) && (tooltip != _T("")))
+ if (((const wxChar*) tooltip != NULL) && (tooltip != wxT("")))
{
notifyData.uFlags |= NIF_TIP ;
- lstrcpyn(notifyData.szTip, WXSTRINGCAST tooltip, sizeof(notifyData.szTip));
+ lstrcpyn(notifyData.szTip, WXSTRINGCAST tooltip, sizeof(notifyData.szTip));
}
notifyData.uID = 99;
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;
}
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;
}
bool wxTaskBarIcon::RegisterWindowClass()
{
if (sm_registeredClass)
- return TRUE;
+ return true;
// Also register the taskbar message here
- sm_taskbarMsg = ::RegisterWindowMessage(_T("wxTaskBarIconMessage"));
+ sm_taskbarMsg = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage"));
- WNDCLASS wc;
- bool rc;
+ WNDCLASS wc;
+ bool rc;
HINSTANCE hInstance = GetModuleHandle(NULL);
HINSTANCE hInstance = GetModuleHandle(NULL);
HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass,
- _T("wxTaskBarWindow"),
+ wxT("wxTaskBarWindow"),
WS_OVERLAPPED,
0,
0,
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);
}
}
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
projects / wxWidgets.git / blobdiff