no real changes, just some cleanup

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-08-14 22:44:44 +00:00
parent 39f0cb547f
commit 71e33cfbbd

View File

@ -10,44 +10,42 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
#ifndef _TASKBAR_H_ #ifndef _WX_TASKBAR_H_
#define _TASKBAR_H_ #define _WX_TASKBAR_H_
#include "wx/icon.h" #include "wx/icon.h"
// private helper class: // private helper class:
class WXDLLIMPEXP_FWD_ADV wxTaskBarIconWindow; class WXDLLIMPEXP_FWD_ADV wxTaskBarIconWindow;
class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
{ {
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
public: public:
wxTaskBarIcon(); wxTaskBarIcon();
virtual ~wxTaskBarIcon(); virtual ~wxTaskBarIcon();
// Accessors // Accessors
inline bool IsOk() const { return true; } bool IsOk() const { return true; }
inline bool IsIconInstalled() const { return m_iconAdded; } bool IsIconInstalled() const { return m_iconAdded; }
// Operations // Operations
bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString); bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
bool RemoveIcon(void); bool RemoveIcon(void);
bool PopupMenu(wxMenu *menu); //, int x, int y); bool PopupMenu(wxMenu *menu);
// Implementation
protected: protected:
friend class wxTaskBarIconWindow; friend class wxTaskBarIconWindow;
long WindowProc(unsigned int msg, unsigned int wParam, long lParam); long WindowProc(unsigned int msg, unsigned int wParam, long lParam);
void RegisterWindowMessages(); void RegisterWindowMessages();
// Data members
protected:
wxTaskBarIconWindow *m_win; wxTaskBarIconWindow *m_win;
bool m_iconAdded; bool m_iconAdded;
wxIcon m_icon; wxIcon m_icon;
wxString m_strTooltip; wxString m_strTooltip;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
}; };
#endif #endif // _WX_TASKBAR_H_
// _TASKBAR_H_