Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/osx/taskbarosx.h b/include/wx/osx/taskbarosx.h
index 8d8f3950535e5436142df2353721bfb841adfe94..7d13df747e193c8f5dcbb307b11c7a7bd48dd001 100644 (file)
--- a/include/wx/osx/taskbarosx.h
+++ b/include/wx/osx/taskbarosx.h
@@ -4,7 +4,6 @@
 // Author:      Ryan Norton
 // Modified by:
 // Created:     04/04/2003
-// RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton, 2003
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
@@ -19,21 +18,15 @@ 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);
+    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
+    bool OSXIsStatusItem() { return false; }
+#endif
     bool IsOk() const { return true; }
 
     bool IsIconInstalled() const;
@@ -42,6 +35,7 @@ public:
     bool PopupMenu(wxMenu *menu);
 
 protected:
+    wxTaskBarIconType m_type;
     class wxTaskBarIconImpl* m_impl;
     friend class wxTaskBarIconImpl;
 };