Escape underscores

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

diff --git a/include/wx/mac/carbon/taskbarosx.h b/include/wx/mac/carbon/taskbarosx.h
index 644d89fb1b2f2ab890c161de8b919cd5cbe4244f..43c952679a2310f27bb20977f893b8ddf30cbed1 100644 (file)
--- a/include/wx/mac/carbon/taskbarosx.h
+++ b/include/wx/mac/carbon/taskbarosx.h
@@ -6,43 +6,42 @@
 // Created:     04/04/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton, 2003
-// Licence:     wxWidgets licence
+// 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
 {
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
 public:
-       //type of taskbar item to create (currently only DOCK is implemented)
-       enum wxTaskBarIconType
-       {
-               DOCK,
-               STATUSITEM,
-               MENUEXTRA
-       };
-       
-    wxTaskBarIcon(const wxTaskBarIconType& nType = DOCK);
+        // type of taskbar item to create (currently only DOCK is implemented)
+        enum wxTaskBarIconType
+        {
+            DOCK
+//    ,   CUSTOM_STATUSITEM
+//    ,   STATUSITEM 
+//    ,   MENUEXTRA 
+        ,   DEFAULT_TYPE = DOCK
+        };
+
+    wxTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE);
     virtual ~wxTaskBarIcon();
 
-    // Operations:
+    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_nType;
-       
-    DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
+    class wxTaskBarIconImpl* m_impl;    
+    friend class wxTaskBarIconImpl;
 };
-
 #endif
     // _TASKBAR_H_