mark changes. Mac OSX taskbar implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -29,9 +29,9 @@
|
||||
#undef wxHAS_RAW_KEY_CODES
|
||||
#endif
|
||||
|
||||
/* taskbar is only implemented in wxMSW and X11 ports */
|
||||
/* taskbar is only implemented in the major ports */
|
||||
#if defined(__WXMSW__) || \
|
||||
defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__)
|
||||
defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) || defined(__DARWIN__)
|
||||
#define wxHAS_TASK_BAR_ICON
|
||||
#else
|
||||
#undef wxHAS_TASK_BAR_ICON
|
||||
|
@@ -22,7 +22,8 @@ class WXDLLEXPORT wxMenu;
|
||||
class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
|
||||
{
|
||||
public:
|
||||
//type of taskbar item to create (currently only DOCK is implemented)
|
||||
//type of taskbar item to create
|
||||
//TODO: currently only DOCK is implemented
|
||||
enum wxTaskBarIconType
|
||||
{
|
||||
DOCK,
|
||||
@@ -33,16 +34,24 @@ public:
|
||||
wxTaskBarIcon(const wxTaskBarIconType& nType = DOCK);
|
||||
virtual ~wxTaskBarIcon();
|
||||
|
||||
// Operations:
|
||||
//TODO: not tested extensively
|
||||
bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
|
||||
bool RemoveIcon();
|
||||
//TODO: end not tested extensively
|
||||
|
||||
//pops up the menu
|
||||
bool PopupMenu(wxMenu *menu);
|
||||
|
||||
//internal functions - don't call
|
||||
void SetInternalEvent(void* pEvent);
|
||||
wxMenu* GetCurrentMenu();
|
||||
|
||||
protected:
|
||||
wxTaskBarIconType m_nType;
|
||||
|
||||
wxTaskBarIconType m_nType;
|
||||
void* m_pEvent;
|
||||
wxMenu* m_pMenu;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
|
||||
};
|
||||
|
||||
#endif
|
||||
// _TASKBAR_H_
|
||||
|
Reference in New Issue
Block a user