/*****************************************************************************
* interface.cpp : wxWidgets plugin for vlc
*****************************************************************************
- * Copyright (C) 2000-2005 the VideoLAN team
+ * Copyright (C) 2000-2006 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
/* 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;
{
p_systray = new Systray( this, p_intf );
}
+#endif
#endif
/* Creation of the menu bar */
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;
wxString msg;
msg.Printf( wxString(wxT("VLC media player " PACKAGE_VERSION)) +
wxU(_(" (wxWidgets interface)\n\n")) +
- wxU(_("(c) 1996-2005 - the VideoLAN Team\n\n")) +
+ wxU(_("(c) 1996-2006 - the VideoLAN Team\n\n")) +
wxU(_("Compiled by "))+ wxU(VLC_CompileBy())+ wxU("@") +
wxU(VLC_CompileHost())+ wxT(".")+ wxU(VLC_CompileDomain())+ wxT(".\n") +
wxU(_("Compiler: "))+ wxU(VLC_Compiler())+wxT( ".\n") +
wxU(_("Based on SVN revision: "))+wxU(VLC_Changeset())+wxT(".\n\n") +
#ifdef __WXMSW__
- wxU( vlc_wraptext(LICENSE_MSG,WRAPCOUNT,VLC_TRUE) ) + wxT("\n\n") +
+ wxU( vlc_wraptext(LICENSE_MSG,WRAPCOUNT) ) + wxT("\n\n") +
#else
wxU( LICENSE_MSG ) + wxT("\n\n") +
#endif
vlc_value_t new_val, void *param )
{
Interface *p_interface = (Interface*)param;
- interaction_dialog_t *p_dialog = (interaction_dialog_t*)(new_val.p_address);
+ /*interaction_dialog_t *p_dialog = (interaction_dialog_t*)(new_val.p_address);*/
wxCommandEvent event( wxEVT_INTERACTION, -1 );
event.SetClientData( new_val.p_address );
for( size_t i = 0; i < filenames.GetCount(); i++ )
{
- char *psz_utf8 = wxFromLocale( filenames[i] );
+ char *psz_utf8 = wxDnDFromLocale( filenames[i] );
playlist_Add( p_playlist, psz_utf8, psz_utf8,
PLAYLIST_APPEND | ((i | b_enqueue) ? 0 : PLAYLIST_GO),
PLAYLIST_END );
- wxLocaleFree( psz_utf8 );
+
+ wxDnDLocaleFree( psz_utf8 );
}
vlc_object_release( p_playlist );
* Systray class.
*****************************************************************************/
+/* wxCocoa pretends to support this, but at least 2.6.x doesn't */
+#ifndef __APPLE__
#ifdef wxHAS_TASK_BAR_ICON
BEGIN_EVENT_TABLE(Systray, wxTaskBarIcon)
SetIcon( wxIcon( vlc16x16_xpm ), tooltip );
}
#endif
+#endif