X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e232b083f9b6cc60d02f3fd4364e37bbf25d9149..2a45803fc3877afd0ae3ce356dfe216505165882:/include/wx/taskbar.h?ds=sidebyside diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h index 062c3c3306..9051344aa3 100644 --- a/include/wx/taskbar.h +++ b/include/wx/taskbar.h @@ -20,6 +20,21 @@ class WXDLLIMPEXP_FWD_ADV wxTaskBarIconEvent; +// ---------------------------------------------------------------------------- + +// type of taskbar item to create. Only applicable in wxOSX_COCOA +enum wxTaskBarIconType +{ + wxTBI_DOCK, + wxTBI_CUSTOM_STATUSITEM, +#if defined(wxOSX_USE_COCOA) && wxOSX_USE_COCOA + wxTBI_DEFAULT_TYPE = wxTBI_CUSTOM_STATUSITEM +#else + wxTBI_DEFAULT_TYPE = wxTBI_DOCK +#endif +}; + + // ---------------------------------------------------------------------------- // wxTaskBarIconBase: define wxTaskBarIcon interface // ---------------------------------------------------------------------------- @@ -32,7 +47,7 @@ public: #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) static bool IsAvailable(); #else - static bool IsAvailable() { return true; }; + static bool IsAvailable() { return true; } #endif // Operations: @@ -61,11 +76,9 @@ private: // now include the actual class declaration // ---------------------------------------------------------------------------- -#if defined(__WXPALMOS__) - #include "wx/palmos/taskbar.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #include "wx/msw/taskbar.h" -#elif defined(__WXGTK210__) +#elif defined(__WXGTK20__) #include "wx/gtk/taskbar.h" #elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) #include "wx/unix/taskbarx11.h"