cgimagecreate from wxbitmap crashes 10.2 - turn off. Put in right click handler to...

[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 9c921c063de2b03e6d1418758dfa48774fe59858..362d87260b932a14cb054d159ce10fa40cda66e7 100644 (file)
--- a/include/wx/mac/carbon/taskbarosx.h
+++ b/include/wx/mac/carbon/taskbarosx.h
@@ -22,27 +22,43 @@ class WXDLLEXPORT wxMenu;
 class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
 {
 public:
-       //type of taskbar item to create (currently only DOCK is implemented)
-       enum wxTaskBarIconType
-       {
-               DOCK,
-               STATUSITEM,
-               MENUEXTRA
-       };
-       
+        //type of taskbar item to create 
+    //TODO:  currently only DOCK is implemented
+        enum wxTaskBarIconType
+        {
+                DOCK,
+                STATUSITEM,
+                MENUEXTRA
+        };
+        
     wxTaskBarIcon(const wxTaskBarIconType& nType = DOCK);
     virtual ~wxTaskBarIcon();
 
-    // Operations:
+    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();
+    //TODO: end not tested extensively
+    
+    //pops up the menu
     bool PopupMenu(wxMenu *menu);
 
+    //internal functions - don't call       
+    wxMenu* GetCurrentMenu();
+    wxMenu* DoCreatePopupMenu();
+
 protected:
     wxTaskBarIconType m_nType;
-       
+    void* m_pEventHandlerRef;
+    wxMenu* m_pMenu;
+    WXHMENU m_theLastMenu;
+    bool m_iconAdded;
+    
+    void OnRightDown(wxTaskBarIconEvent& evt);
+    
     DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
 };
-
 #endif
     // _TASKBAR_H_