Commit d35c6eef authored by Gildas Bazin's avatar Gildas Bazin

* modules/gui/wxwindows/*: make gcc-2.95 happy.
parent d09106d2
......@@ -2,7 +2,7 @@
* open.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2004 VideoLAN
* $Id: open.cpp,v 1.68 2004/02/08 18:17:22 gbazin Exp $
* $Id: open.cpp,v 1.69 2004/02/14 12:36:16 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -1038,23 +1038,28 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
/* Fall through... */
case 1: /* DVD of some sort */
{
psz_device = config_GetPsz( p_intf, "dvd" );
if( !b_disc_device_changed )
{
disc_device->SetValue( psz_device ? wxL2U(psz_device) : wxT("") );
if( psz_device )
disc_device->SetValue( wxL2U(psz_device) );
else
disc_device->SetValue( wxT("") );
disc_title_label->SetLabel ( wxU(_("Title")) );
}
disc_title->SetRange( i_selection, 255 );
disc_title->SetValue( i_selection );
break;
}
case 2: /* VCD of some sort */
psz_device = config_GetPsz( p_intf, "vcd" );
if( !b_disc_device_changed )
{
disc_device->SetValue( psz_device ? wxL2U(psz_device) : wxT("") );
if( psz_device )
disc_device->SetValue( wxL2U(psz_device) );
else
disc_device->SetValue( wxT("") );
}
/* There are at most 98, tracks in a VCD, 999 Segments, 500 entries
......@@ -1080,7 +1085,10 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
psz_device = config_GetPsz( p_intf, "cd-audio" );
if( !b_disc_device_changed )
{
disc_device->SetValue( psz_device ? wxL2U(psz_device) : wxT("") );
if( psz_device )
disc_device->SetValue( wxL2U(psz_device) );
else
disc_device->SetValue( wxT("") );
}
disc_title_label->SetLabel ( wxU(_("Track")) );
#ifdef HAVE_CDDAX
......
......@@ -2,7 +2,7 @@
* subtitles.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: subtitles.cpp,v 1.10 2004/01/25 03:29:02 hartman Exp $
* $Id: subtitles.cpp,v 1.11 2004/02/14 12:36:16 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -83,8 +83,8 @@ SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
wxStaticBoxSizer *file_sizer = new wxStaticBoxSizer( file_box,
wxHORIZONTAL );
char *psz_subsfile = config_GetPsz( p_intf, "sub-file" );
file_combo = new wxComboBox( panel, -1,
psz_subsfile ? wxL2U(psz_subsfile) : wxT(""),
if( !psz_subsfile ) psz_subsfile = strdup("");
file_combo = new wxComboBox( panel, -1, wxL2U(psz_subsfile),
wxPoint(20,25), wxSize(300, -1), 0, NULL );
if( psz_subsfile ) free( psz_subsfile );
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