X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c6eb3a84be918dcfed2496d014549e13af0f0e9..232b2162776e08c0b16d5280b90f5c075f38c667:/include/wx/osx/taskbarosx.h

diff --git a/include/wx/osx/taskbarosx.h b/include/wx/osx/taskbarosx.h
index 07815224cb..0d48721613 100644
--- a/include/wx/osx/taskbarosx.h
+++ b/include/wx/osx/taskbarosx.h
@@ -1,5 +1,49 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/taskbarosx.h"
-#else
-#include "wx/mac/carbon/taskbarosx.h"
+/////////////////////////////////////////////////////////////////////////
+// File:        wx/mac/taskbarosx.h
+// Purpose:     Defines wxTaskBarIcon class for OSX
+// Author:      Ryan Norton
+// Modified by:
+// Created:     04/04/2003
+// RCS-ID:      $Id$
+// Copyright:   (c) Ryan Norton, 2003
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////
+
+#ifndef _TASKBAR_H_
+#define _TASKBAR_H_
+
+class WXDLLIMPEXP_FWD_CORE wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxMenu;
+
+class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
+{
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
+public:
+        // type of taskbar item to create (currently only DOCK is implemented)
+        enum wxTaskBarIconType
+        {
+            DOCK
+#if wxOSX_USE_COCOA
+        ,   CUSTOM_STATUSITEM
 #endif
+//    ,   STATUSITEM 
+//    ,   MENUEXTRA 
+        ,   DEFAULT_TYPE = DOCK
+        };
+
+    wxTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE);
+    virtual ~wxTaskBarIcon();
+
+    bool IsOk() const { return true; }
+
+    bool IsIconInstalled() const;
+    bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
+    bool RemoveIcon();
+    bool PopupMenu(wxMenu *menu);
+
+protected:
+    class wxTaskBarIconImpl* m_impl;    
+    friend class wxTaskBarIconImpl;
+};
+#endif
+    // _TASKBAR_H_