Don't interpret '&' specially in wxTextWrapper.

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

diff --git a/include/wx/osx/taskbarosx.h b/include/wx/osx/taskbarosx.h
index 0d4872161346e2e2bbf7293cf747fdc851d7bbde..bd6a148cd2ed7d8104dd3fcdbc70150e45c9f36b 100644 (file)
--- a/include/wx/osx/taskbarosx.h
+++ b/include/wx/osx/taskbarosx.h
@@ -26,14 +26,22 @@ public:
 #if wxOSX_USE_COCOA
         ,   CUSTOM_STATUSITEM
 #endif
 #if wxOSX_USE_COCOA
         ,   CUSTOM_STATUSITEM
 #endif

-//    ,   STATUSITEM 
-//    ,   MENUEXTRA 
+#if wxOSX_USE_COCOA
+        ,   DEFAULT_TYPE = CUSTOM_STATUSITEM
+#else

         ,   DEFAULT_TYPE = DOCK
         ,   DEFAULT_TYPE = DOCK

+#endif

         };
 
     wxTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE);
     virtual ~wxTaskBarIcon();
 
         };
 
     wxTaskBarIcon(wxTaskBarIconType iconType = 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;
     bool IsOk() const { return true; }
 
     bool IsIconInstalled() const;


@@ -42,7 +50,8 @@ public:
     bool PopupMenu(wxMenu *menu);
 
 protected:
     bool PopupMenu(wxMenu *menu);
 
 protected:

-    class wxTaskBarIconImpl* m_impl;    
+    wxTaskBarIconType m_type;
+    class wxTaskBarIconImpl* m_impl;

     friend class wxTaskBarIconImpl;
 };
 #endif
     friend class wxTaskBarIconImpl;
 };
 #endif