From 7c20b517bbf78fc03104b7032e588eed72b0f2e8 Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Sat, 27 Dec 2003 14:36:30 +0000 Subject: [PATCH] * modules/gui/wxwindows/*: use the wxL2U macro when necessary. --- modules/gui/wxwindows/fileinfo.cpp | 16 ++++++++-------- modules/gui/wxwindows/messages.cpp | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/gui/wxwindows/fileinfo.cpp b/modules/gui/wxwindows/fileinfo.cpp index 07c317636d..59a2334b58 100644 --- a/modules/gui/wxwindows/fileinfo.cpp +++ b/modules/gui/wxwindows/fileinfo.cpp @@ -2,7 +2,7 @@ * fileinfo.cpp : wxWindows plugin for vlc ***************************************************************************** * Copyright (C) 2000-2001,2003 VideoLAN - * $Id: fileinfo.cpp,v 1.21 2003/12/22 02:24:52 sam Exp $ + * $Id: fileinfo.cpp,v 1.22 2003/12/27 14:36:30 gbazin Exp $ * * Authors: Sigmund Augdal * @@ -104,17 +104,17 @@ void FileInfo::UpdateFileInfo() * retrieved with the GetItemText() method, but it doesn't work on * Windows when the wxTR_HIDE_ROOT style is set. That's why we need to * use the fileinfo_root_label variable... */ - fileinfo_root = fileinfo_tree->AddRoot( wxU(p_input->psz_name) ); - fileinfo_root_label = wxU(p_input->psz_name); + fileinfo_root = fileinfo_tree->AddRoot( wxL2U(p_input->psz_name) ); + fileinfo_root_label = wxL2U(p_input->psz_name); } - else if( fileinfo_root_label == wxU(p_input->psz_name) ) + else if( fileinfo_root_label == wxL2U(p_input->psz_name) ) { return; } /* We rebuild the tree from scratch */ fileinfo_tree->DeleteChildren( fileinfo_root ); - fileinfo_root_label = wxU(p_input->psz_name); + fileinfo_root_label = wxL2U(p_input->psz_name); vlc_mutex_lock( &p_input->stream.stream_lock ); @@ -123,12 +123,12 @@ void FileInfo::UpdateFileInfo() while( p_cat ) { wxTreeItemId cat = fileinfo_tree->AppendItem( fileinfo_root, - wxU(p_cat->psz_name) ); + wxL2U(p_cat->psz_name) ); input_info_t *p_info = p_cat->p_info; while( p_info ) { - fileinfo_tree->AppendItem( cat, (wxString)wxU(p_info->psz_name) + - wxT(": ") + wxU(p_info->psz_value) ); + fileinfo_tree->AppendItem( cat, (wxString)wxL2U(p_info->psz_name) + + wxT(": ") + wxL2U(p_info->psz_value) ); p_info = p_info->p_next; } p_cat = p_cat->p_next; diff --git a/modules/gui/wxwindows/messages.cpp b/modules/gui/wxwindows/messages.cpp index 90b8de0ed2..1bcf808add 100644 --- a/modules/gui/wxwindows/messages.cpp +++ b/modules/gui/wxwindows/messages.cpp @@ -2,7 +2,7 @@ * playlist.cpp : wxWindows plugin for vlc ***************************************************************************** * Copyright (C) 2000-2001 VideoLAN - * $Id: messages.cpp,v 1.18 2003/12/22 02:24:52 sam Exp $ + * $Id: messages.cpp,v 1.19 2003/12/27 14:36:30 gbazin Exp $ * * Authors: Olivier Teulière * @@ -157,7 +157,7 @@ void Messages::UpdateLog() /* Append all messages to log window */ textctrl->SetDefaultStyle( *dbg_attr ); - (*textctrl) << wxU(p_sub->p_msg[i_start].psz_module); + (*textctrl) << wxL2U(p_sub->p_msg[i_start].psz_module); switch( p_sub->p_msg[i_start].i_type ) { @@ -180,7 +180,7 @@ void Messages::UpdateLog() } /* Add message */ - (*textctrl) << wxU(p_sub->p_msg[i_start].psz_msg) << wxT("\n"); + (*textctrl) << wxL2U(p_sub->p_msg[i_start].psz_msg) << wxT("\n"); } vlc_mutex_lock( p_sub->p_lock ); -- 2.39.2