X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a45beea1e36b9655c47c5f744c5d8212f871b0c1..05a09b0b9f9d93cd2a149efc0c1ccc0790cdc82c:/include/wx/mac/carbon/taskbarosx.h

diff --git a/include/wx/mac/carbon/taskbarosx.h b/include/wx/mac/carbon/taskbarosx.h
index 22de7f9cd5..3e6c9accb0 100644
--- a/include/wx/mac/carbon/taskbarosx.h
+++ b/include/wx/mac/carbon/taskbarosx.h
@@ -12,50 +12,36 @@
 #ifndef _TASKBAR_H_
 #define _TASKBAR_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "taskbarosx.h"
-#endif
-
-class WXDLLEXPORT wxIcon;
-class WXDLLEXPORT wxMenu;
+class WXDLLIMPEXP_FWD_CORE wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxMenu;
 
 class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
 {
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
 public:
-        //type of taskbar item to create 
-    //TODO:  currently only DOCK is implemented
+        // type of taskbar item to create (currently only DOCK is implemented)
         enum wxTaskBarIconType
         {
-                DOCK,
-                STATUSITEM,
-                MENUEXTRA
+            DOCK
+//    ,   CUSTOM_STATUSITEM
+//    ,   STATUSITEM 
+//    ,   MENUEXTRA 
+        ,   DEFAULT_TYPE = DOCK
         };
-        
-    wxTaskBarIcon(const wxTaskBarIconType& nType = DOCK);
+
+    wxTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE);
     virtual ~wxTaskBarIcon();
 
-    inline bool IsOk() const { return true; }
-    inline bool IsIconInstalled() const { return m_iconAdded; }
-    
-    //TODO: not tested extensively
+    bool IsOk() const { return true; }
+
+    bool IsIconInstalled() const;
     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;
-    bool m_iconAdded;
-        
-    DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
+    class wxTaskBarIconImpl* m_impl;    
+    friend class wxTaskBarIconImpl;
 };
 #endif
     // _TASKBAR_H_