X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc3388ae63420668587b30ba4fd33b71565fe27a..b377eda09d9eca8810cee1c252879bee3c9bd190:/include/wx/mac/carbon/taskbarosx.h diff --git a/include/wx/mac/carbon/taskbarosx.h b/include/wx/mac/carbon/taskbarosx.h index 2a31ec26de..f0b597583f 100644 --- a/include/wx/mac/carbon/taskbarosx.h +++ b/include/wx/mac/carbon/taskbarosx.h @@ -12,10 +12,6 @@ #ifndef _TASKBAR_H_ #define _TASKBAR_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "taskbarosx.h" -#endif - class WXDLLEXPORT wxIcon; class WXDLLEXPORT wxMenu; @@ -45,17 +41,19 @@ public: //pops up the menu bool PopupMenu(wxMenu *menu); - //internal functions - don't call - void SetInternalEvent(void* pEvent); + //internal functions - don't call wxMenu* GetCurrentMenu(); + wxMenu* DoCreatePopupMenu(); protected: wxTaskBarIconType m_nType; - void* m_pEvent; void* m_pEventHandlerRef; wxMenu* m_pMenu; + WXHMENU m_theLastMenu; bool m_iconAdded; - + + void OnRightDown(wxTaskBarIconEvent& evt); + DECLARE_DYNAMIC_CLASS(wxTaskBarIcon) }; #endif