* more systray related ifndefs for the Darwin platform

diff --git a/modules/gui/wxwidgets/input_manager.cpp b/modules/gui/wxwidgets/input_manager.cpp
index a062926b79e4defc2b1624759d4a4387eff6f1fd..210d90cd9a85351d72fc76b2cb18cf021cac8318 100644 (file)
--- a/modules/gui/wxwidgets/input_manager.cpp
+++ b/modules/gui/wxwidgets/input_manager.cpp
@@ -171,12 +171,15 @@ void InputManager::UpdateButtons( vlc_bool_t b_play )
         p_main_intf->statusbar->SetStatusText( wxT(""), 0 );
         p_main_intf->statusbar->SetStatusText( wxT(""), 2 );
 
+/* wxCocoa pretends to support this, but at least 2.6.x doesn't */
+#ifndef __APPLE__
 #ifdef wxHAS_TASK_BAR_ICON
         if( p_main_intf->p_systray )
         {
             p_main_intf->p_systray->UpdateTooltip(
                 wxString(wxT("VLC media player - ")) + wxU(_("Stopped")) );
         }
+#endif
 #endif
 
         return;
@@ -192,6 +195,8 @@ void InputManager::UpdateButtons( vlc_bool_t b_play )
         p_main_intf->TogglePlayButton( val.i_int == STATUS_PAUSE ?
                                        PAUSE_S : PLAYING_S );
 
+/* wxCocoa pretends to support this, but at least 2.6.x doesn't */
+#ifndef __APPLE__
 #ifdef wxHAS_TASK_BAR_ICON
         if( p_main_intf->p_systray )
         {
@@ -199,6 +204,7 @@ void InputManager::UpdateButtons( vlc_bool_t b_play )
                 wxU(p_input->input.p_item->psz_name) + wxString(wxT(" - ")) +
                 (val.i_int == PAUSE_S ? wxU(_("Paused")) : wxU(_("Playing"))));
         }
+#endif
 #endif
     }
 }

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index 699ce391a27e3b4971aa0d491da5e7c6b0b3eb13..6e628df8fe12ed780b3c351acd10fb7c17f3c1d4 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -396,6 +396,8 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
     /* Put this in the splitter */
     splitter->Initialize( main_panel );
 
+/* wxCocoa pretends to support this, but at least 2.6.x doesn't */
+#ifndef __APPLE__
 #ifdef wxHAS_TASK_BAR_ICON
     /* Systray integration */
     p_systray = NULL;
@@ -403,6 +405,7 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
     {
         p_systray = new Systray( this, p_intf );
     }
+#endif
 #endif
 
     /* Creation of the menu bar */
@@ -493,8 +496,11 @@ Interface::~Interface()
 
     if( video_window ) delete video_window;
 
+/* wxCocoa pretends to support this, but at least 2.6.x doesn't */
+#ifndef __APPLE__
 #ifdef wxHAS_TASK_BAR_ICON
     if( p_systray ) delete p_systray;
+#endif
 #endif
 
     p_intf->b_interaction = VLC_FALSE;

diff --git a/modules/gui/wxwidgets/interface.hpp b/modules/gui/wxwidgets/interface.hpp
index cf88b7ab27c7172cc27cee6d3976081bcbb4734d..768897feb966b171728a2395db508c55983a11a8 100644 (file)
--- a/modules/gui/wxwidgets/interface.hpp
+++ b/modules/gui/wxwidgets/interface.hpp
@@ -54,6 +54,8 @@ namespace wxvlc
 #endif
 
     /* Systray integration */
+/* wxCocoa pretends to support this, but at least 2.6.x doesn't */
+#ifndef __APPLE__
 #ifdef wxHAS_TASK_BAR_ICON
    class Systray: public wxTaskBarIcon
    {
@@ -75,6 +77,7 @@ namespace wxvlc
         intf_thread_t *p_intf;
         DECLARE_EVENT_TABLE()
     };
+#endif
 #endif
 
     /* Main Interface */
@@ -104,8 +107,11 @@ namespace wxvlc
 
         wxControl  *volctrl;
 
+    /* wxCocoa pretends to support this, but at least 2.6.x doesn't */
+    #ifndef __APPLE__
     #ifdef wxHAS_TASK_BAR_ICON
         Systray     *p_systray;
+    #endif
     #endif
 
         wxWindow *video_window;

diff --git a/modules/gui/wxwidgets/wxwidgets.cpp b/modules/gui/wxwidgets/wxwidgets.cpp
index 346f68ea2d0ebd36a41cf7efac254873134d97c0..31c2e8b290e2b5f62bca4e076e03c090842562fa 100644 (file)
--- a/modules/gui/wxwidgets/wxwidgets.cpp
+++ b/modules/gui/wxwidgets/wxwidgets.cpp
@@ -135,10 +135,13 @@ vlc_module_begin();
     add_bool( "wx-autosize", 1, NULL,
               SIZE_TO_VIDEO_TEXT, SIZE_TO_VIDEO_LONGTEXT, VLC_TRUE );
     add_deprecated( "wxwin-autosize", VLC_FALSE); /*Deprecated since 0.8.4*/
+/* wxCocoa pretends to support this, but at least 2.6.x doesn't */
+#ifndef __APPLE__
 #ifdef wxHAS_TASK_BAR_ICON
     add_bool( "wx-systray", 0, NULL,
               SYSTRAY_TEXT, SYSTRAY_LONGTEXT, VLC_FALSE );
     add_deprecated( "wxwin-systray", VLC_FALSE); /*Deprecated since 0.8.4*/
+#endif
 #endif
     add_string( "wx-config-last", NULL, NULL,
                 "last config", "last config", VLC_TRUE );