OS X Dock Menu/Taskbar support (not added to bakefiles yet - preliminary)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/features.h b/include/wx/features.h
index 80d7e6b317c46c9620e47a2d398b9a589caa532b..c3341f0a957787306b496630b09e391995566e07 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -38,7 +38,7 @@
 #endif
 
 /*  taskbar is only implemented in wxMSW and X11 ports */
-#if defined(__WXMSW__) || \
+#if defined(__WXMSW__) || defined(__DARWIN__) || \
         defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__)
     #define wxHAS_TASK_BAR_ICON
 #else

diff --git a/include/wx/mac/taskbarosx.h b/include/wx/mac/taskbarosx.h
new file mode 100644 (file)
index 0000000..9c921c0
--- /dev/null
+++ b/include/wx/mac/taskbarosx.h
@@ -0,0 +1,48 @@
+/////////////////////////////////////////////////////////////////////////
+// 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_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "taskbarosx.h"
+#endif
+
+class WXDLLEXPORT wxIcon;
+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
+       };
+       
+    wxTaskBarIcon(const wxTaskBarIconType& nType = DOCK);
+    virtual ~wxTaskBarIcon();
+
+    // Operations:
+    bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
+    bool RemoveIcon();
+    bool PopupMenu(wxMenu *menu);
+
+protected:
+    wxTaskBarIconType m_nType;
+       
+    DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
+};
+
+#endif
+    // _TASKBAR_H_

diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index 69674549796952f23ea6b7b0afa89232cbcc9780..24e310c77aab61d09a7ad81970da0a8d4fa8b440 100644 (file)
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -29,6 +29,8 @@ private:
     #include "wx/msw/taskbar.h"
 #elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
     #include "wx/unix/taskbarx11.h"
+#elif defined(__DARWIN__)
+    #include "wx/mac/taskbarosx.h"
 #endif
 
 // ----------------------------------------------------------------------------