X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..f36b3a915e4543fbbd9c911724404b016972aabc:/include/wx/msw/taskbar.h diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h index 36703ce96d..9cb1249168 100644 --- a/include/wx/msw/taskbar.h +++ b/include/wx/msw/taskbar.h @@ -1,66 +1,82 @@ ///////////////////////////////////////////////////////////////////////// -// File: taskbar.h -// Purpose: Defines wxTaskBarIcon class for manipulating icons on the +// File: wx/msw/taskbar.h +// 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) -// Licence: wxWindows licence +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////// #ifndef _TASKBAR_H_ #define _TASKBAR_H_ -#ifdef __GNUG__ -#pragma interface "taskbar.h" -#endif +#include "wx/icon.h" -#include -#include +// private helper class: +class WXDLLIMPEXP_ADV wxTaskBarIconWindow; -class wxTaskBarIcon: public wxObject +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 - bool SetIcon(const wxIcon& icon, const wxString& tooltip = ""); + bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString); bool RemoveIcon(void); + bool PopupMenu(wxMenu *menu); //, int x, int y); + +#if WXWIN_COMPATIBILITY_2_4 + wxDEPRECATED( bool IsOK() const ); // Overridables - virtual void OnMouseMove(void); - virtual void OnLButtonDown(void); - virtual void OnLButtonUp(void); - virtual void OnRButtonDown(void); - virtual void OnRButtonUp(void); - virtual void OnLButtonDClick(void); - virtual void OnRButtonDClick(void); + virtual void OnMouseMove(wxEvent&); + virtual void OnLButtonDown(wxEvent&); + virtual void OnLButtonUp(wxEvent&); + virtual void OnRButtonDown(wxEvent&); + virtual void OnRButtonUp(wxEvent&); + virtual void OnLButtonDClick(wxEvent&); + virtual void OnRButtonDClick(wxEvent&); +#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(unsigned int msg, unsigned int wParam, long lParam); + void RegisterWindowMessages(); // Data members protected: - WXHWND m_hWnd; - bool m_iconAdded; - static wxList sm_taskBarIcons; - static bool sm_registeredClass; - static unsigned int sm_taskbarMsg; + 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 + void _OnMouseMove(wxTaskBarIconEvent&); + void _OnLButtonDown(wxTaskBarIconEvent&); + void _OnLButtonUp(wxTaskBarIconEvent&); + void _OnRButtonDown(wxTaskBarIconEvent&); + void _OnRButtonUp(wxTaskBarIconEvent&); + void _OnLButtonDClick(wxTaskBarIconEvent&); + void _OnRButtonDClick(wxTaskBarIconEvent&); + + DECLARE_EVENT_TABLE() +#endif }; +#if WXWIN_COMPATIBILITY_2_4 +inline bool wxTaskBarIcon::IsOK() const { return IsOk(); } #endif - // _TASKBAR_H_ +#endif + // _TASKBAR_H_