make wxTmemchr() return (and take) char* instead of void* in ANSI build too

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

diff --git a/include/wx/mac/taskbarosx.h b/include/wx/mac/taskbarosx.h
index 9c921c063de2b03e6d1418758dfa48774fe59858..07815224cb9699b22381248c5f98c30eb4ab897f 100644 (file)
--- a/include/wx/mac/taskbarosx.h
+++ b/include/wx/mac/taskbarosx.h
@@ -1,48 +1,5 @@
-/////////////////////////////////////////////////////////////////////////
-// 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"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/taskbarosx.h"
+#else
+#include "wx/mac/carbon/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_