// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "taskbar.h"
#endif
#include "wx/menu.h"
#endif
-#if defined(__WIN95__) && !defined(__TWIN32__)
-
-#include <windows.h>
+#if defined(__WIN95__)
+#include "wx/msw/private.h"
#include "wx/msw/winundef.h"
#include <string.h>
#include "wx/taskbar.h"
-#include "wx/msw/private.h"
-#ifndef __TWIN32__
- #ifdef __GNUWIN32_OLD__
- #include "wx/msw/gnuwin32/extra.h"
- #endif
+#ifdef __GNUWIN32_OLD__
+ #include "wx/msw/gnuwin32/extra.h"
#endif
-#ifdef __SALFORDC__
+#ifdef __WXWINCE__
+ #include <winreg.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 );
+LRESULT APIENTRY _EXPORT
+wxTaskBarIconWindowProc( HWND hWnd, unsigned msg, UINT wParam, LONG lParam );
wxChar *wxTaskBarWindowClass = (wxChar*) wxT("wxTaskBarWindowClass");
wxTaskBarIconList wxTaskBarIcon::sm_taskBarIcons;
-bool wxTaskBarIcon::sm_registeredClass = FALSE;
-UINT wxTaskBarIcon::sm_taskbarMsg = 0;
+
+// initialized on demand
+UINT gs_msgTaskbar = 0;
+UINT gs_msgRestartTaskbar = 0;
#if WXWIN_COMPATIBILITY_2_4
BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler)
IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// 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(void)
+wxTaskBarIcon::wxTaskBarIcon()
{
m_hWnd = 0;
m_iconAdded = false;
m_hWnd = CreateTaskBarWindow();
}
-wxTaskBarIcon::~wxTaskBarIcon(void)
+wxTaskBarIcon::~wxTaskBarIcon()
{
RemoveObject(this);
if (!IsOk())
return false;
- NOTIFYICONDATA notifyData;
+ m_icon = icon;
+ m_strTooltip = tooltip;
+
+ NotifyIconData notifyData(m_hWnd);
- 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.uFlags |= NIF_ICON;
- notifyData.hIcon = (HICON) icon.GetHICON();
+ notifyData.hIcon = GetHiconOf(icon);
}
- if (((const wxChar*) tooltip != NULL) && (tooltip != wxT("")))
+ 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;
- 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.uID = 99;
m_iconAdded = false;
- return (Shell_NotifyIcon(NIM_DELETE, & notifyData) != 0);
+ NotifyIconData notifyData(m_hWnd);
+
+ 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;
if (s_inPopup)
wxTaskBarIcon* wxTaskBarIcon::FindObjectForHWND(WXHWND hWnd)
{
- wxTaskBarIconList::Node *node = sm_taskBarIcons.GetFirst();
+ wxTaskBarIconList::compatibility_iterator node = sm_taskBarIcons.GetFirst();
while (node)
{
wxTaskBarIcon *obj = node->GetData();
bool wxTaskBarIcon::RegisterWindowClass()
{
- if (sm_registeredClass)
- return true;
+ static bool s_registered = false;
- // Also register the taskbar message here
- sm_taskbarMsg = ::RegisterWindowMessage(wxT("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()
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)
default:
break;
- }
+ }
- if (eventType) {
+ 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);
if (obj)
projects / wxWidgets.git / blobdiff