X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/131f235d04ef7a192e5f553c74c7df45c526cfa2..3dccf96eabc68d95839782d35e6193855f007fd2:/include/wx/msw/taskbar.h diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h index 0f4fb67f1e..9533b19bc4 100644 --- a/include/wx/msw/taskbar.h +++ b/include/wx/msw/taskbar.h @@ -3,7 +3,7 @@ // 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 @@ -13,28 +13,20 @@ #ifndef _TASKBAR_H_ #define _TASKBAR_H_ -#ifdef __GNUG__ -#pragma interface "taskbar.h" -#endif - -#include "wx/list.h" #include "wx/icon.h" -class 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 @@ -42,58 +34,20 @@ public: bool RemoveIcon(void); bool PopupMenu(wxMenu *menu); //, int x, int y); -#if WXWIN_COMPATIBILITY_2_4 - wxDEPRECATED( bool IsOK() const ); - -// Overridables - 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; - wxIcon m_icon; - wxString m_strTooltip; - - static wxTaskBarIconList sm_taskBarIcons; - -#if WXWIN_COMPATIBILITY_2_4 - // non-virtual default event handlers to forward events to the virtuals - void _OnMouseMove(wxEvent&); - void _OnLButtonDown(wxEvent&); - void _OnLButtonUp(wxEvent&); - void _OnRButtonDown(wxEvent&); - void _OnRButtonUp(wxEvent&); - void _OnLButtonDClick(wxEvent&); - void _OnRButtonDClick(wxEvent&); + wxTaskBarIconWindow *m_win; + bool m_iconAdded; + wxIcon m_icon; + wxString m_strTooltip; - DECLARE_EVENT_TABLE() -#endif }; -#if WXWIN_COMPATIBILITY_2_4 -inline bool wxTaskBarIcon::IsOK() const { return IsOk(); } -#endif - #endif // _TASKBAR_H_ - - - - -