// Purpose: Defines 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) Julian Smart
#pragma interface "taskbar.h"
#endif
-#include "wx/list.h"
#include "wx/icon.h"
-class WXDLLIMPEXP_ADV wxTaskBarIcon;
-
-WX_DECLARE_LIST_WITH_DECL(wxTaskBarIcon, wxTaskBarIconList,
- class WXDLLIMPEXP_ADV);
+// private helper class:
+class WXDLLIMPEXP_ADV wxTaskBarIconWindow;
class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
{
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
public:
- wxTaskBarIcon(void);
- virtual ~wxTaskBarIcon(void);
+ wxTaskBarIcon();
+ virtual ~wxTaskBarIcon();
// Accessors
- inline WXHWND GetHWND() const { return m_hWnd; }
- inline bool IsOk() const { return (m_hWnd != 0) ; }
+ inline bool IsOk() const { return true; }
inline bool IsIconInstalled() const { return m_iconAdded; }
// Operations
#endif
// Implementation
- static wxTaskBarIcon* FindObjectForHWND(WXHWND hWnd);
- static void AddObject(wxTaskBarIcon* obj);
- static void RemoveObject(wxTaskBarIcon* obj);
- static bool RegisterWindowClass();
- static WXHWND CreateTaskBarWindow();
- long WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wParam, long lParam );
+protected:
+ friend class wxTaskBarIconWindow;
+ long WindowProc(WXHWND hWnd, unsigned int msg,
+ unsigned int wParam, long lParam);
+ void RegisterWindowMessages();
// Data members
protected:
- WXHWND m_hWnd;
- bool m_iconAdded;
- wxIcon m_icon;
- wxString m_strTooltip;
-
- static wxTaskBarIconList sm_taskBarIcons;
+ wxTaskBarIconWindow *m_win;
+ bool m_iconAdded;
+ wxIcon m_icon;
+ wxString m_strTooltip;
#if WXWIN_COMPATIBILITY_2_4
// non-virtual default event handlers to forward events to the virtuals
#endif
// _TASKBAR_H_
-
-
-
-
-
// 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)
#include <shellapi.h>
#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;
// 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, -1, 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(GetHWND(), msg, wParam, lParam);
+ }
+ else
+ {
+ return wxFrame::MSWWindowProc(msg, wParam, lParam);
+ }
+ }
+
+private:
+ wxTaskBarIcon *m_icon;
+};
+
+
// ----------------------------------------------------------------------------
// NotifyIconData: wrapper around 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 compatiblity,
+ // old aplications may create 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())
{
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)
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);
-
- // Remove from record of top-level windows, or will confuse wxWindows
- // if we try to exit right now.
- wxTopLevelWindows.DeleteObject(win);
+ m_win->Move(x, y);
+
+ 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;
void wxTaskBarIcon::_OnRButtonDClick(wxEvent& 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) )
- {
- wxLogLastError(_T("RegisterClass(taskbar icon)"));
-
- return false;
- }
-
- s_registered = true;
+ if ( !s_registered )
+ {
+ // Taskbar restart msg will be sent to us if the icon needs to be redrawn
+ gs_msgRestartTaskbar = RegisterWindowMessage(wxT("TaskbarCreated"));
- 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;
+ }
}
// ----------------------------------------------------------------------------
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)
{
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__
projects / wxWidgets.git / commitdiff
