Take into account wxFONTFLAG_STRIKETHROUGH in wxGTK wxFont ctor.

[wxWidgets.git] / include / wx / osx / taskbarosx.h

diff --git a/include/wx/osx/taskbarosx.h b/include/wx/osx/taskbarosx.h
index 07815224cb9699b22381248c5f98c30eb4ab897f..9805ccb2b4359835190dc00d984759c33f3bdf99 100644 (file)
--- a/include/wx/osx/taskbarosx.h
+++ b/include/wx/osx/taskbarosx.h
@@ -1,5 +1,44 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/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:
+    wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);
+    virtual ~wxTaskBarIcon();
+
+    // returns true if the taskbaricon is in the global menubar
+#if wxOSX_USE_COCOA
+    bool OSXIsStatusItem();

 #else
 #else

-#include "wx/mac/carbon/taskbarosx.h"
+    bool OSXIsStatusItem() { return false; }

 #endif
 #endif

+    bool IsOk() const { return true; }
+
+    bool IsIconInstalled() const;
+    bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
+    bool RemoveIcon();
+    bool PopupMenu(wxMenu *menu);
+
+protected:
+    wxTaskBarIconType m_type;
+    class wxTaskBarIconImpl* m_impl;
+    friend class wxTaskBarIconImpl;
+};
+#endif
+    // _TASKBAR_H_