Commit dc93d552 authored by gbazin's avatar gbazin

* modules/gui/wxwindows/*: use our new wxL2U() macro where needed.
parent a5762cd9
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* open.cpp : wxWindows plugin for vlc * open.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001, 2003 VideoLAN * Copyright (C) 2000, 2001, 2003 VideoLAN
* $Id: open.cpp,v 1.60 2003/12/22 02:24:52 sam Exp $ * $Id: open.cpp,v 1.61 2003/12/22 15:42:43 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -297,7 +297,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent, ...@@ -297,7 +297,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
{ {
sout_checkbox->SetValue(TRUE); sout_checkbox->SetValue(TRUE);
sout_button->Enable(); sout_button->Enable();
subsfile_mrl.Add( wxString(wxT("sout=")) + wxU(psz_sout) ); subsfile_mrl.Add( wxString(wxT("sout=")) + wxL2U(psz_sout) );
} }
if( psz_sout ) free( psz_sout ); if( psz_sout ) free( psz_sout );
...@@ -446,7 +446,7 @@ wxPanel *OpenDialog::FilePanel( wxWindow* parent ) ...@@ -446,7 +446,7 @@ wxPanel *OpenDialog::FilePanel( wxWindow* parent )
{ {
subsfile_checkbox->SetValue(TRUE); subsfile_checkbox->SetValue(TRUE);
subsfile_button->Enable(); subsfile_button->Enable();
subsfile_mrl.Add( wxString(wxT("sub-file=")) + wxU(psz_subsfile) ); subsfile_mrl.Add( wxString(wxT("sub-file=")) + wxL2U(psz_subsfile) );
} }
if( psz_subsfile ) free( psz_subsfile ); if( psz_subsfile ) free( psz_subsfile );
...@@ -1053,7 +1053,7 @@ void OpenDialog::OnDiscDeviceChange( wxCommandEvent& event ) ...@@ -1053,7 +1053,7 @@ void OpenDialog::OnDiscDeviceChange( wxCommandEvent& event )
if ( !psz_device ) psz_device = ""; if ( !psz_device ) psz_device = "";
if( disc_device->GetValue().Cmp( wxU( psz_device ) ) ) if( disc_device->GetValue().Cmp( wxL2U( psz_device ) ) )
{ {
b_disc_device_changed = true; b_disc_device_changed = true;
} }
...@@ -1078,7 +1078,7 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) ) ...@@ -1078,7 +1078,7 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
psz_device = config_GetPsz( p_intf, "dvd" ); psz_device = config_GetPsz( p_intf, "dvd" );
if( !b_disc_device_changed ) if( !b_disc_device_changed )
{ {
disc_device->SetValue( psz_device ? wxU(psz_device) : wxT("") ); disc_device->SetValue( psz_device ? wxL2U(psz_device) : wxT("") );
disc_title_label->SetLabel ( wxT("Title") ); disc_title_label->SetLabel ( wxT("Title") );
} }
disc_title->SetRange( i_selection, 255 ); disc_title->SetRange( i_selection, 255 );
...@@ -1090,7 +1090,7 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) ) ...@@ -1090,7 +1090,7 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
psz_device = config_GetPsz( p_intf, "vcd" ); psz_device = config_GetPsz( p_intf, "vcd" );
if( !b_disc_device_changed ) if( !b_disc_device_changed )
{ {
disc_device->SetValue( psz_device ? wxU(psz_device) : wxT("") ); disc_device->SetValue( psz_device ? wxL2U(psz_device) : wxT("") );
} }
/* There are at most 98, tracks in a VCD, 999 Segments, 500 entries /* There are at most 98, tracks in a VCD, 999 Segments, 500 entries
...@@ -1116,7 +1116,7 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) ) ...@@ -1116,7 +1116,7 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
psz_device = config_GetPsz( p_intf, "cd-audio" ); psz_device = config_GetPsz( p_intf, "cd-audio" );
if( !b_disc_device_changed ) if( !b_disc_device_changed )
{ {
disc_device->SetValue( psz_device ? wxU(psz_device) : wxT("") ); disc_device->SetValue( psz_device ? wxL2U(psz_device) : wxT("") );
} }
disc_title_label->SetLabel ( wxT("Track") ); disc_title_label->SetLabel ( wxT("Track") );
#ifdef HAVE_CDDAX #ifdef HAVE_CDDAX
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* preferences_widgets.cpp : wxWindows plugin for vlc * preferences_widgets.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: preferences_widgets.cpp,v 1.17 2003/12/22 02:24:52 sam Exp $ * $Id: preferences_widgets.cpp,v 1.18 2003/12/22 15:42:44 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* Sigmund Augdal <sigmunau@idi.ntnu.no> * Sigmund Augdal <sigmunau@idi.ntnu.no>
...@@ -304,7 +304,7 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *p_this, ...@@ -304,7 +304,7 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *p_this,
module_t *p_parser; module_t *p_parser;
label = new wxStaticText(this, -1, wxU(p_item->psz_text)); label = new wxStaticText(this, -1, wxU(p_item->psz_text));
combo = new wxComboBox( this, -1, wxU(p_item->psz_value), combo = new wxComboBox( this, -1, wxL2U(p_item->psz_value),
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
0, NULL, wxCB_READONLY | wxCB_SORT ); 0, NULL, wxCB_READONLY | wxCB_SORT );
...@@ -355,7 +355,7 @@ StringConfigControl::StringConfigControl( vlc_object_t *p_this, ...@@ -355,7 +355,7 @@ StringConfigControl::StringConfigControl( vlc_object_t *p_this,
label = new wxStaticText(this, -1, wxU(p_item->psz_text)); label = new wxStaticText(this, -1, wxU(p_item->psz_text));
sizer->Add( label, 1, wxALIGN_CENTER_VERTICAL | wxALL, 5 ); sizer->Add( label, 1, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
textctrl = new wxTextCtrl( this, -1, textctrl = new wxTextCtrl( this, -1,
wxU(p_item->psz_value), wxL2U(p_item->psz_value),
wxDefaultPosition, wxDefaultPosition,
wxDefaultSize, wxDefaultSize,
wxTE_PROCESS_ENTER); wxTE_PROCESS_ENTER);
...@@ -425,7 +425,7 @@ void StringListConfigControl::UpdateCombo( module_config_t *p_item ) ...@@ -425,7 +425,7 @@ void StringListConfigControl::UpdateCombo( module_config_t *p_item )
combo->Append( ( p_item->ppsz_list_text && combo->Append( ( p_item->ppsz_list_text &&
p_item->ppsz_list_text[i_index] ) ? p_item->ppsz_list_text[i_index] ) ?
wxU(p_item->ppsz_list_text[i_index]) : wxU(p_item->ppsz_list_text[i_index]) :
wxU(p_item->ppsz_list[i_index]) ); wxL2U(p_item->ppsz_list[i_index]) );
combo->SetClientData( i_index, (void *)p_item->ppsz_list[i_index] ); combo->SetClientData( i_index, (void *)p_item->ppsz_list[i_index] );
if( ( p_item->psz_value && if( ( p_item->psz_value &&
!strcmp( p_item->psz_value, p_item->ppsz_list[i_index] ) ) || !strcmp( p_item->psz_value, p_item->ppsz_list[i_index] ) ) ||
...@@ -435,7 +435,7 @@ void StringListConfigControl::UpdateCombo( module_config_t *p_item ) ...@@ -435,7 +435,7 @@ void StringListConfigControl::UpdateCombo( module_config_t *p_item )
combo->SetValue( ( p_item->ppsz_list_text && combo->SetValue( ( p_item->ppsz_list_text &&
p_item->ppsz_list_text[i_index] ) ? p_item->ppsz_list_text[i_index] ) ?
wxU(p_item->ppsz_list_text[i_index]) : wxU(p_item->ppsz_list_text[i_index]) :
wxU(p_item->ppsz_list[i_index]) ); wxL2U(p_item->ppsz_list[i_index]) );
} }
} }
} }
...@@ -485,7 +485,7 @@ FileConfigControl::FileConfigControl( vlc_object_t *p_this, ...@@ -485,7 +485,7 @@ FileConfigControl::FileConfigControl( vlc_object_t *p_this,
label = new wxStaticText(this, -1, wxU(p_item->psz_text)); label = new wxStaticText(this, -1, wxU(p_item->psz_text));
sizer->Add( label, 1, wxALIGN_CENTER_VERTICAL | wxALL, 5 ); sizer->Add( label, 1, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
textctrl = new wxTextCtrl( this, -1, textctrl = new wxTextCtrl( this, -1,
wxU(p_item->psz_value), wxL2U(p_item->psz_value),
wxDefaultPosition, wxDefaultPosition,
wxDefaultSize, wxDefaultSize,
wxTE_PROCESS_ENTER); wxTE_PROCESS_ENTER);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* subtitles.cpp : wxWindows plugin for vlc * subtitles.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: subtitles.cpp,v 1.8 2003/12/22 02:24:52 sam Exp $ * $Id: subtitles.cpp,v 1.9 2003/12/22 15:42:44 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -86,7 +86,7 @@ SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ): ...@@ -86,7 +86,7 @@ SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
wxHORIZONTAL ); wxHORIZONTAL );
char *psz_subsfile = config_GetPsz( p_intf, "sub-file" ); char *psz_subsfile = config_GetPsz( p_intf, "sub-file" );
file_combo = new wxComboBox( panel, -1, file_combo = new wxComboBox( panel, -1,
psz_subsfile ? wxU(psz_subsfile) : wxT(""), psz_subsfile ? wxL2U(psz_subsfile) : wxT(""),
wxPoint(20,25), wxSize(300, -1), 0, NULL ); wxPoint(20,25), wxSize(300, -1), 0, NULL );
if( psz_subsfile ) free( psz_subsfile ); if( psz_subsfile ) free( psz_subsfile );
wxButton *browse_button = new wxButton( panel, FileBrowse_Event, wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment