moving Carbon Event Class out of USE_GUI

[wxWidgets.git] / include / wx / mac / carbon / taskbarosx.h

diff --git a/include/wx/mac/carbon/taskbarosx.h b/include/wx/mac/carbon/taskbarosx.h
index c68e386f8381e2f3554e5d8b6d79ba0beea1eb6d..242e8781e235dcaf25ff19488504525ba999f4cc 100644 (file)
--- a/include/wx/mac/carbon/taskbarosx.h
+++ b/include/wx/mac/carbon/taskbarosx.h
@@ -22,18 +22,21 @@ class WXDLLEXPORT wxMenu;
 class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
 {
 public:
-       //type of taskbar item to create 
+        //type of taskbar item to create 
     //TODO:  currently only DOCK is implemented
-       enum wxTaskBarIconType
-       {
-               DOCK,
-               STATUSITEM,
-               MENUEXTRA
-       };
-       
+        enum wxTaskBarIconType
+        {
+                DOCK,
+                STATUSITEM,
+                MENUEXTRA
+        };
+        
     wxTaskBarIcon(const wxTaskBarIconType& nType = DOCK);
     virtual ~wxTaskBarIcon();
 
+    inline bool IsOk() const { return true; }
+    inline bool IsIconInstalled() const { return m_iconAdded; }
+    
     //TODO: not tested extensively
     bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
     bool RemoveIcon();
@@ -42,15 +45,17 @@ 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;
+    wxTaskBarIconType m_nType;
+    void* m_pEventHandlerRef;
     wxMenu* m_pMenu;
-       
+    WXHMENU m_theLastMenu;
+    bool m_iconAdded;
+            
     DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
 };
 #endif