Skip to content

V
vlc
Commit 0bb214dc authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/gui/wxwindows/*: the wxWindows plugin is now UNICODE happy.
parent 9d32c978
Hide whitespace changes
Inline Side-by-side
Showing with 321 additions and 299 deletions
modules/gui/wxwindows/fileinfo.cpp
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* fileinfo.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: fileinfo.cpp,v 1.11 2003/04/22 18:21:15 ipkiss Exp $
* $Id: fileinfo.cpp,v 1.12 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
......@@ -76,7 +76,7 @@ END_EVENT_TABLE()
* Constructor.
*****************************************************************************/
FileInfo::FileInfo( intf_thread_t *_p_intf, Interface *_p_main_interface ):
wxFrame( _p_main_interface, -1, "FileInfo", wxDefaultPosition,
wxFrame( _p_main_interface, -1, wxU(_("FileInfo")), wxDefaultPosition,
wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
......@@ -92,10 +92,10 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, Interface *_p_main_interface ):
new wxTreeCtrl( panel, -1, wxDefaultPosition, wxSize( 350, 350 ),
wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT | wxSUNKEN_BORDER );
fileinfo_root_label = "";
fileinfo_root_label = wxT("");
/* Create the OK button */
wxButton *ok_button = new wxButton( panel, wxID_OK, _("OK") );
wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("OK")) );
ok_button->SetDefault();
/* Place everything in sizers */
......@@ -123,7 +123,7 @@ void FileInfo::UpdateFileInfo()
{
if( fileinfo_root )
{
fileinfo_root_label = "";
fileinfo_root_label = wxT("");
fileinfo_tree->DeleteChildren( fileinfo_root );
}
return;
......@@ -135,17 +135,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( p_input->psz_name );
fileinfo_root_label = p_input->psz_name;
fileinfo_root = fileinfo_tree->AddRoot( wxU(p_input->psz_name) );
fileinfo_root_label = wxU(p_input->psz_name);
}
else if( fileinfo_root_label == (wxString)p_input->psz_name )
else if( fileinfo_root_label == wxU(p_input->psz_name) )
{
return;
}
/* We rebuild the tree from scratch */
fileinfo_tree->DeleteChildren( fileinfo_root );
fileinfo_root_label = p_input->psz_name;
fileinfo_root_label = wxU(p_input->psz_name);
vlc_mutex_lock( &p_input->stream.stream_lock );
......@@ -154,12 +154,12 @@ void FileInfo::UpdateFileInfo()
while( p_cat )
{
wxTreeItemId cat = fileinfo_tree->AppendItem( fileinfo_root,
p_cat->psz_name );
wxU(p_cat->psz_name) );
input_info_t *p_info = p_cat->p_info;
while( p_info )
{
fileinfo_tree->AppendItem( cat, wxString(p_info->psz_name) + ": "
+ p_info->psz_value );
fileinfo_tree->AppendItem( cat, wxU(p_info->psz_name) +
wxT(": ") + wxU(p_info->psz_value) );
p_info = p_info->p_next;
}
p_cat = p_cat->p_next;
......
modules/gui/wxwindows/interface.cpp
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* interface.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: interface.cpp,v 1.23 2003/05/07 12:23:06 gbazin Exp $
* $Id: interface.cpp,v 1.24 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -108,8 +108,6 @@ enum
Logs_Event,
FileInfo_Event,
Audio_Event,
Subtitles_Event,
Prefs_Event,
SliderScroll_Event,
......@@ -159,7 +157,7 @@ END_EVENT_TABLE()
* Constructor.
*****************************************************************************/
Interface::Interface( intf_thread_t *_p_intf ):
wxFrame( NULL, -1, VOUT_TITLE,
wxFrame( NULL, -1, wxT(VOUT_TITLE),
wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
......@@ -228,36 +226,42 @@ void Interface::CreateOurMenuBar()
#define HELP_LOGS N_("Show the program logs")
#define HELP_FILEINFO N_("Show information about the file being played")
#define HELP_AUDIO N_("Change the current audio track")
#define HELP_SUBS N_("Change the current subtitles stream")
#define HELP_PREFS N_("Go to the preferences menu")
#define HELP_ABOUT N_("About this program")
/* Create the "File" menu */
wxMenu *file_menu = new wxMenu;
file_menu->Append( OpenFile_Event, _("&Open File..."), HELP_FILE );
file_menu->Append( OpenDisc_Event, _("Open &Disc..."), HELP_DISC );
file_menu->Append( OpenNet_Event, _("&Network Stream..."), HELP_NET );
file_menu->Append( OpenFile_Event, wxU(_("&Open File...")),
wxU(_(HELP_FILE)) );
file_menu->Append( OpenDisc_Event, wxU(_("Open &Disc...")),
wxU(_(HELP_DISC)) );
file_menu->Append( OpenNet_Event, wxU(_("&Network Stream...")),
wxU(_(HELP_NET)) );
#if 0
file_menu->Append( OpenSat_Event, _("&Satellite Stream..."), HELP_NET );
file_menu->Append( OpenSat_Event, wxU(_("&Satellite Stream...")),
wxU(_(HELP_NET)) );
#endif
#if 0
file_menu->AppendSeparator();
file_menu->Append( EjectDisc_Event, _("&Eject Disc"), HELP_EJECT );
file_menu->Append( EjectDisc_Event, wxU(_("&Eject Disc")),
wxU(_(HELP_EJECT)) );
#endif
file_menu->AppendSeparator();
file_menu->Append( Exit_Event, _("E&xit"), HELP_EXIT );
file_menu->Append( Exit_Event, wxU(_("E&xit")), wxU(_(HELP_EXIT)) );
/* Create the "View" menu */
wxMenu *view_menu = new wxMenu;
view_menu->Append( Playlist_Event, _("&Playlist..."), HELP_PLAYLIST );
view_menu->Append( Logs_Event, _("&Logs..."), HELP_LOGS );
view_menu->Append( FileInfo_Event, _("&File info..."), HELP_FILEINFO );
view_menu->Append( Playlist_Event, wxU(_("&Playlist...")),
wxU(_(HELP_PLAYLIST)) );
view_menu->Append( Logs_Event, wxU(_("&Logs...")), wxU(_(HELP_LOGS)) );
view_menu->Append( FileInfo_Event, wxU(_("&File info...")),
wxU(_(HELP_FILEINFO)) );
/* Create the "Settings" menu */
wxMenu *settings_menu = new wxMenu;
settings_menu->Append( Subtitles_Event, _("&Subtitles"), HELP_SUBS );
settings_menu->AppendSeparator();
settings_menu->Append( Prefs_Event, _("&Preferences..."), HELP_PREFS );
settings_menu->Append( Prefs_Event, wxU(_("&Preferences...")),
wxU(_(HELP_PREFS)) );
/* Create the "Audio" menu */
p_audio_menu = new wxMenu;
......@@ -269,16 +273,16 @@ void Interface::CreateOurMenuBar()
/* Create the "Help" menu */
wxMenu *help_menu = new wxMenu;
help_menu->Append( About_Event, _("&About..."), HELP_ABOUT );
help_menu->Append( About_Event, wxU(_("&About...")), wxU(_(HELP_ABOUT)) );
/* Append the freshly created menus to the menu bar... */
wxMenuBar *menubar = new wxMenuBar( wxMB_DOCKABLE );
menubar->Append( file_menu, _("&File") );
menubar->Append( view_menu, _("&View") );
menubar->Append( settings_menu, _("&Settings") );
menubar->Append( p_audio_menu, _("&Audio") );
menubar->Append( p_video_menu, _("&Video") );
menubar->Append( help_menu, _("&Help") );
menubar->Append( file_menu, wxU(_("&File")) );
menubar->Append( view_menu, wxU(_("&View")) );
menubar->Append( settings_menu, wxU(_("&Settings")) );
menubar->Append( p_audio_menu, wxU(_("&Audio")) );
menubar->Append( p_video_menu, wxU(_("&Video")) );
menubar->Append( help_menu, wxU(_("&Help")) );
/* Attach the menu bar to the frame */
SetMenuBar( menubar );
......@@ -309,28 +313,28 @@ void Interface::CreateOurToolBar()
toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
toolbar->AddTool( OpenFile_Event, _("File"), wxBitmap( file_xpm ),
HELP_FILE );
toolbar->AddTool( OpenDisc_Event, _("Disc"), wxBitmap( disc_xpm ),
HELP_DISC );
toolbar->AddTool( OpenNet_Event, _("Net"), wxBitmap( net_xpm ),
HELP_NET );
toolbar->AddTool( OpenFile_Event, wxU(_("File")), wxBitmap( file_xpm ),
wxU(_(HELP_FILE)) );
toolbar->AddTool( OpenDisc_Event, wxU(_("Disc")), wxBitmap( disc_xpm ),
wxU(_(HELP_DISC)) );
toolbar->AddTool( OpenNet_Event, wxU(_("Net")), wxBitmap( net_xpm ),
wxU(_(HELP_NET)) );
#if 0
toolbar->AddTool( OpenSat_Event, _("Sat"), wxBitmap( sat_xpm ),
HELP_SAT );
toolbar->AddTool( OpenSat_Event, wxU(_("Sat")), wxBitmap( sat_xpm ),
wxU(_(HELP_SAT)) );
#endif
toolbar->AddSeparator();
toolbar->AddTool( StopStream_Event, _("Stop"), wxBitmap( stop_xpm ),
HELP_STOP );
toolbar->AddTool( PlayStream_Event, _("Play"), wxBitmap( play_xpm ),
HELP_PLAY );
toolbar->AddTool( StopStream_Event, wxU(_("Stop")), wxBitmap( stop_xpm ),
wxU(_(HELP_STOP)) );
toolbar->AddTool( PlayStream_Event, wxU(_("Play")), wxBitmap( play_xpm ),
wxU(_(HELP_PLAY)) );
toolbar->AddSeparator();
toolbar->AddTool( Playlist_Event, _("Playlist"), wxBitmap( playlist_xpm ),
HELP_PLO );
toolbar->AddTool( PrevStream_Event, _("Prev"), wxBitmap( previous_xpm ),
HELP_PLP );
toolbar->AddTool( NextStream_Event, _("Next"), wxBitmap( next_xpm ),
HELP_PLN );
toolbar->AddTool( Playlist_Event, wxU(_("Playlist")),
wxBitmap( playlist_xpm ), wxU(_(HELP_PLO)) );
toolbar->AddTool( PrevStream_Event, wxU(_("Prev")),
wxBitmap( previous_xpm ), wxU(_(HELP_PLP)) );
toolbar->AddTool( NextStream_Event, wxU(_("Next")), wxBitmap( next_xpm ),
wxU(_(HELP_PLN)) );
toolbar->Realize();
......@@ -360,7 +364,7 @@ void Interface::CreateOurSlider()
slider_frame->SetAutoLayout( TRUE );
/* Create static box to surround the slider */
slider_box = new wxStaticBox( slider_frame, -1, "" );
slider_box = new wxStaticBox( slider_frame, -1, wxT("") );
/* Create sizer for slider frame */
wxStaticBoxSizer *slider_sizer =
......@@ -395,7 +399,7 @@ void Interface::Open( int i_access_method )
return;
}
playlist_Add( p_playlist, (char *)dialog.mrl.c_str(),
playlist_Add( p_playlist, (const char *)dialog.mrl.mb_str(),
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
TogglePlayButton( PLAYING_S );
......@@ -419,7 +423,7 @@ void Interface::OnMenuOpen(wxMenuEvent& event)
{
p_audio_menu = AudioMenu( p_intf, this );
wxMenu *menu =
GetMenuBar()->Replace( 3, p_audio_menu, _("&Audio") );
GetMenuBar()->Replace( 3, p_audio_menu, wxU(_("&Audio")) );
if( menu ) delete menu;
b_audio_menu = 0;
......@@ -432,7 +436,7 @@ void Interface::OnMenuOpen(wxMenuEvent& event)
{
p_video_menu = VideoMenu( p_intf, this );
wxMenu *menu =
GetMenuBar()->Replace( 4, p_video_menu, _("&Video") );
GetMenuBar()->Replace( 4, p_video_menu, wxU(_("&Video")) );
if( menu ) delete menu;
b_video_menu = 0;
......@@ -442,11 +446,11 @@ void Interface::OnMenuOpen(wxMenuEvent& event)
#else
p_audio_menu = AudioMenu( p_intf, this );
wxMenu *menu = GetMenuBar()->Replace( 3, p_audio_menu, _("&Audio") );
wxMenu *menu = GetMenuBar()->Replace( 3, p_audio_menu, wxU(_("&Audio")) );
if( menu ) delete menu;
p_video_menu = VideoMenu( p_intf, this );
menu = GetMenuBar()->Replace( 4, p_video_menu, _("&Video") );
menu = GetMenuBar()->Replace( 4, p_video_menu, wxU(_("&Video")) );
if( menu ) delete menu;
#endif
......@@ -473,15 +477,15 @@ void Interface::OnExit( wxCommandEvent& WXUNUSED(event) )
void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
{
wxString msg;
msg.Printf( VOUT_TITLE + wxString(_(" (wxWindows interface)\n\n")) +
wxString(_("(C) 1996-2003 - the VideoLAN Team\n\n")) +
wxString(_("The VideoLAN team <videolan@videolan.org>\n"
"http://www.videolan.org/\n\n")) +
wxString(_("This is the VideoLAN Client, a DVD, MPEG and DivX player."
"\nIt can play MPEG and MPEG2 files from a file or from a "
"network source.")) );
wxMessageBox( msg, wxString::Format(_("About %s"), VOUT_TITLE),
msg.Printf( wxT(VOUT_TITLE) + wxU(_(" (wxWindows interface)\n\n")) +
wxU(_("(C) 1996-2003 - the VideoLAN Team\n\n")) +
wxU(_("The VideoLAN team <videolan@videolan.org>\n"
"http://www.videolan.org/\n\n")) +
wxU(_("This is the VideoLAN Client, a DVD, MPEG and DivX player."
"\nIt can play MPEG and MPEG2 files from a file or from a "
"network source.")) );
wxMessageBox( msg, wxString::Format(wxU(_("About %s")), wxT(VOUT_TITLE)),
wxOK | wxICON_INFORMATION, this );
}
......@@ -650,10 +654,10 @@ void Interface::OnSliderUpdate( wxScrollEvent& event )
char psz_time[ OFFSETTOTIME_MAX_SIZE ];
slider_box->SetLabel(
input_OffsetToTime( p_intf->p_sys->p_input,
psz_time,
p_area->i_size * event.GetPosition()
/ SLIDER_MAX_POS ) );
wxU(input_OffsetToTime( p_intf->p_sys->p_input,
psz_time,
p_area->i_size * event.GetPosition()
/ SLIDER_MAX_POS )) );
#undef p_area
}
}
......@@ -699,12 +703,12 @@ void Interface::TogglePlayButton( int i_playing_status )
if( i_playing_status == PLAYING_S )
{
GetToolBar()->InsertTool( 5, PlayStream_Event, _("Pause"),
GetToolBar()->InsertTool( 5, PlayStream_Event, wxU(_("Pause")),
wxBitmap( pause_xpm ) );
}
else
{
GetToolBar()->InsertTool( 5, PlayStream_Event, _("Play"),
GetToolBar()->InsertTool( 5, PlayStream_Event, wxU(_("Play")),
wxBitmap( play_xpm ) );
}
......@@ -738,7 +742,7 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord,
}
for( i = 0; i < filenames.GetCount(); i++ )
playlist_Add( p_playlist, (char *)filenames[i].c_str(),
playlist_Add( p_playlist, (const char *)filenames[i].mb_str(),
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
/* Rebuild the playlist */
......
modules/gui/wxwindows/menus.cpp
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* menus.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: menus.cpp,v 1.5 2003/05/08 12:09:59 gbazin Exp $
* $Id: menus.cpp,v 1.6 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -266,7 +266,7 @@ Menu::Menu( intf_thread_t *_p_intf, Interface *_p_main_interface,
if( !pi_objects[i] )
{
Append( MenuDummy_Event, ppsz_varnames[i] );
Append( MenuDummy_Event, wxU(ppsz_varnames[i]) );
continue;
}
......@@ -280,7 +280,7 @@ Menu::Menu( intf_thread_t *_p_intf, Interface *_p_main_interface,
/* Special case for empty menus */
if( GetMenuItemCount() == 0 )
{
Append( MenuDummy_Event, _("Empty") );
Append( MenuDummy_Event, wxU(_("Empty")) );
Enable( MenuDummy_Event, FALSE );
}
}
......@@ -332,9 +332,9 @@ void Menu::CreateMenuItem( wxMenu *menu, char *psz_var,
if( i_type & VLC_VAR_HASCHOICE )
{
menu->Append( MenuDummy_Event,
text.psz_string ? text.psz_string : psz_var,
wxU(text.psz_string ? text.psz_string : psz_var),
CreateChoicesMenu( psz_var, p_object ),
"" /* Nothing for now (maybe use a GETLONGTEXT) */ );
wxT("")/* Nothing for now (maybe use a GETLONGTEXT) */ );
if( text.psz_string ) free( text.psz_string );
return;
......@@ -345,18 +345,18 @@ void Menu::CreateMenuItem( wxMenu *menu, char *psz_var,
{
case VLC_VAR_VOID:
menuitem = new wxMenuItemExt( menu, ++i_item_id,
text.psz_string ?
text.psz_string : psz_var,
"", wxITEM_NORMAL, strdup(psz_var),
wxU(text.psz_string ?
text.psz_string : psz_var),
wxT(""), wxITEM_NORMAL, strdup(psz_var),
p_object->i_object_id, val, i_type );
menu->Append( menuitem );
break;
case VLC_VAR_BOOL:
menuitem = new wxMenuItemExt( menu, ++i_item_id,
text.psz_string ?
text.psz_string : psz_var,
"", wxITEM_CHECK, strdup(psz_var),
wxU(text.psz_string ?
text.psz_string : psz_var),
wxT(""), wxITEM_CHECK, strdup(psz_var),
p_object->i_object_id, val, i_type );
menu->Append( menuitem );
Check( i_item_id -1, val.b_bool ? FALSE : TRUE );
......@@ -424,12 +424,12 @@ wxMenu *Menu::CreateChoicesMenu( char *psz_var, vlc_object_t *p_object )
{
case VLC_VAR_VARIABLE:
menu->Append( MenuDummy_Event,
text_list.p_list->p_values[i].psz_string ?
wxU(text_list.p_list->p_values[i].psz_string ?
text_list.p_list->p_values[i].psz_string :
val_list.p_list->p_values[i].psz_string,
val_list.p_list->p_values[i].psz_string),
CreateChoicesMenu(
val_list.p_list->p_values[i].psz_string,
p_object ), "" );
p_object ), wxT("") );
break;
case VLC_VAR_STRING:
......@@ -437,10 +437,10 @@ wxMenu *Menu::CreateChoicesMenu( char *psz_var, vlc_object_t *p_object )
strdup(val_list.p_list->p_values[i].psz_string);
menuitem =
new wxMenuItemExt( menu, ++i_item_id,
text_list.p_list->p_values[i].psz_string ?
wxU(text_list.p_list->p_values[i].psz_string ?
text_list.p_list->p_values[i].psz_string :
another_val.psz_string,
"", wxITEM_RADIO, strdup(psz_var),
another_val.psz_string),
wxT(""), wxITEM_RADIO, strdup(psz_var),
p_object->i_object_id, another_val, i_type );
menu->Append( menuitem );
......@@ -454,10 +454,10 @@ wxMenu *Menu::CreateChoicesMenu( char *psz_var, vlc_object_t *p_object )
menuitem =
new wxMenuItemExt( menu, ++i_item_id,
text_list.p_list->p_values[i].psz_string ?
text_list.p_list->p_values[i].psz_string :
wxString::Format("%d",
wxU(text_list.p_list->p_values[i].psz_string):
wxString::Format(wxT("%d"),
val_list.p_list->p_values[i].i_int),
"", wxITEM_RADIO, strdup(psz_var),
wxT(""), wxITEM_RADIO, strdup(psz_var),
p_object->i_object_id,
val_list.p_list->p_values[i], i_type );
......
modules/gui/wxwindows/messages.cpp
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* playlist.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: messages.cpp,v 1.4 2003/04/20 20:28:40 ipkiss Exp $
* $Id: messages.cpp,v 1.5 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
*
......@@ -77,7 +77,7 @@ END_EVENT_TABLE()
* Constructor.
*****************************************************************************/
Messages::Messages( intf_thread_t *_p_intf, Interface *_p_main_interface ):
wxFrame( _p_main_interface, -1, "Messages", wxDefaultPosition,
wxFrame( _p_main_interface, -1, wxU(_("Messages")), wxDefaultPosition,
wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
......@@ -91,7 +91,7 @@ Messages::Messages( intf_thread_t *_p_intf, Interface *_p_main_interface ):
messages_panel->SetAutoLayout( TRUE );
/* Create the textctrl and some text attributes */
textctrl = new wxTextCtrl( messages_panel, -1, "", wxDefaultPosition,
textctrl = new wxTextCtrl( messages_panel, -1, wxT(""), wxDefaultPosition,
wxSize::wxSize( 400, 500 ), wxTE_MULTILINE | wxTE_READONLY |
wxTE_RICH | wxTE_NOHIDESEL );
info_attr = new wxTextAttr( wxColour::wxColour( 0, 128, 0 ) );
......@@ -100,12 +100,12 @@ Messages::Messages( intf_thread_t *_p_intf, Interface *_p_main_interface ):
dbg_attr = new wxTextAttr( *wxBLACK );
/* Create the OK button */
wxButton *ok_button = new wxButton( messages_panel, wxID_OK, _("OK") );
wxButton *ok_button = new wxButton( messages_panel, wxID_OK, wxU(_("OK")));
ok_button->SetDefault();
/* Create the Verbose checkbox */
wxCheckBox *verbose_checkbox =
new wxCheckBox( messages_panel, Verbose_Event, _("Verbose") );
new wxCheckBox( messages_panel, Verbose_Event, wxU(_("Verbose")) );
/* Place everything in sizers */
wxBoxSizer *buttons_sizer = new wxBoxSizer( wxHORIZONTAL );
......@@ -151,30 +151,30 @@ void Messages::UpdateLog()
/* Append all messages to log window */
textctrl->SetDefaultStyle( *dbg_attr );
(*textctrl) << p_sub->p_msg[i_start].psz_module;
(*textctrl) << wxU(p_sub->p_msg[i_start].psz_module);
switch( p_sub->p_msg[i_start].i_type )
{
case VLC_MSG_INFO:
(*textctrl) << ": ";
(*textctrl) << wxT(": ");
textctrl->SetDefaultStyle( *info_attr );
break;
case VLC_MSG_ERR:
(*textctrl) << " error: ";
(*textctrl) << wxT(" error: ");
textctrl->SetDefaultStyle( *err_attr );
break;
case VLC_MSG_WARN:
(*textctrl) << " warning: ";
(*textctrl) << wxT(" warning: ");
textctrl->SetDefaultStyle( *warn_attr );
break;
case VLC_MSG_DBG:
default:
(*textctrl) << " debug: ";
(*textctrl) << wxT(" debug: ");
break;
}
/* Add message */
(*textctrl) << p_sub->p_msg[i_start].psz_msg << "\n";
(*textctrl) << wxU(p_sub->p_msg[i_start].psz_msg) << wxT("\n");
}
vlc_mutex_lock( p_sub->p_lock );
......
modules/gui/wxwindows/open.cpp
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* open.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: open.cpp,v 1.17 2003/05/07 12:23:06 gbazin Exp $
* $Id: open.cpp,v 1.18 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -141,7 +141,7 @@ END_EVENT_TABLE()
*****************************************************************************/
OpenDialog::OpenDialog( intf_thread_t *_p_intf, Interface *_p_main_interface,
int i_access_method ):
wxDialog( _p_main_interface, -1, _("Open Target"), wxDefaultPosition,
wxDialog( _p_main_interface, -1, wxU(_("Open Target")), wxDefaultPosition,
wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
......@@ -156,17 +156,17 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, Interface *_p_main_interface,
/* Create MRL combobox */
wxBoxSizer *mrl_sizer_sizer = new wxBoxSizer( wxHORIZONTAL );
wxStaticBox *mrl_box = new wxStaticBox( panel, -1,
_("Media Resource Locator (MRL)") );
wxU(_("Media Resource Locator (MRL)")) );
wxStaticBoxSizer *mrl_sizer = new wxStaticBoxSizer( mrl_box,
wxHORIZONTAL );
wxStaticText *mrl_label = new wxStaticText( panel, -1,
_("Open Target:") );
wxU(_("Open Target:")) );
mrl_combo = new wxComboBox( panel, MRL_Event, mrl,
wxPoint(20,25), wxSize(120, -1),
0, NULL );
mrl_combo->SetToolTip( _("You can use this field directly by typing the "
"full MRL you want to open.\n""Alternatively, the field will be "
"filled automatically when you use the controls below") );
mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
"the full MRL you want to open.\n""Alternatively, the field will be "
"filled automatically when you use the controls below")) );
mrl_sizer->Add( mrl_label, 0, wxALL | wxALIGN_CENTER, 5 );
mrl_sizer->Add( mrl_combo, 1, wxALL | wxALIGN_CENTER, 5 );
......@@ -175,17 +175,18 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, Interface *_p_main_interface,
/* Create Static Text */
wxStaticText *label = new wxStaticText( panel, -1,
_("Alternatively, you can build an MRL using one of the "
"following predefined targets:") );
wxU(_("Alternatively, you can build an MRL using one of the "
"following predefined targets:")) );
/* Create Stream Output checkox */
wxFlexGridSizer *sout_sizer = new wxFlexGridSizer( 2, 1, 20 );
sout_checkbox = new wxCheckBox( panel, SoutEnable_Event,
_("Stream output") );
sout_checkbox->SetToolTip( _("Use VLC as a stream server") );
wxU(_("Stream output")) );
sout_checkbox->SetToolTip( wxU(_("Use VLC as a stream server")) );
sout_sizer->Add( sout_checkbox, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
sout_button = new wxButton( panel, SoutSettings_Event, _("Settings...") );
sout_button = new wxButton( panel, SoutSettings_Event,
wxU(_("Settings...")) );
sout_button->Disable();
char *psz_sout = config_GetPsz( p_intf, "sout" );
......@@ -201,19 +202,19 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, Interface *_p_main_interface,
/* Create Demux Dump checkox */
wxBoxSizer *demuxdump_sizer = new wxBoxSizer( wxHORIZONTAL );
demuxdump_checkbox = new wxCheckBox( panel, DemuxDumpEnable_Event,
_("Capture input stream") );
wxU(_("Capture input stream")) );
demuxdump_checkbox->SetToolTip(
_("Capture the stream you are playing to a file") );
demuxdump_textctrl = new wxTextCtrl( panel, DemuxDump_Event,
"", wxDefaultPosition, wxDefaultSize,
wxU(_("Capture the stream you are playing to a file")) );
demuxdump_textctrl = new wxTextCtrl( panel, DemuxDump_Event, wxT(""),
wxDefaultPosition, wxDefaultSize,
wxTE_PROCESS_ENTER);
demuxdump_button = new wxButton( panel, DemuxDumpBrowse_Event,
_("Browse...") );
wxU(_("Browse...")) );
char *psz_demuxdump = config_GetPsz( p_intf, "demuxdump-file" );
if( psz_demuxdump && *psz_demuxdump )
{
demuxdump_textctrl->SetValue( psz_demuxdump );
demuxdump_textctrl->SetValue( wxU(psz_demuxdump) );
}
if( psz_demuxdump ) free( psz_demuxdump );
......@@ -229,22 +230,23 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, Interface *_p_main_interface,
wxStaticLine *static_line = new wxStaticLine( panel, wxID_OK );
/* Create the buttons */
wxButton *ok_button = new wxButton( panel, wxID_OK, _("OK") );
wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("OK")) );
ok_button->SetDefault();
wxButton *cancel_button = new wxButton( panel, wxID_CANCEL, _("Cancel") );
wxButton *cancel_button = new wxButton( panel, wxID_CANCEL,
wxU(_("Cancel")) );
/* Create notebook */
wxNotebook *notebook = new wxNotebook( panel, Notebook_Event );
wxNotebookSizer *notebook_sizer = new wxNotebookSizer( notebook );
notebook->AddPage( FilePanel( notebook ), _("File"),
notebook->AddPage( FilePanel( notebook ), wxU(_("File")),
i_access_method == FILE_ACCESS );
notebook->AddPage( DiscPanel( notebook ), _("Disc"),
notebook->AddPage( DiscPanel( notebook ), wxU(_("Disc")),
i_access_method == DISC_ACCESS );
notebook->AddPage( NetPanel( notebook ), _("Network"),
notebook->AddPage( NetPanel( notebook ), wxU(_("Network")),
i_access_method == NET_ACCESS );
#ifndef WIN32
notebook->AddPage( SatPanel( notebook ), _("Satellite"),
notebook->AddPage( SatPanel( notebook ), wxU(_("Satellite")),
i_access_method == SAT_ACCESS );
#endif
......@@ -295,10 +297,10 @@ wxPanel *OpenDialog::FilePanel( wxWindow* parent )
wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
file_combo = new wxComboBox( panel, FileName_Event, "",
file_combo = new wxComboBox( panel, FileName_Event, wxT(""),
wxPoint(20,25), wxSize(200, -1), 0, NULL );
wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
_("Browse...") );
wxU(_("Browse...")) );
sizer->Add( file_combo, 1, wxALL, 5 );
sizer->Add( browse_button, 0, wxALL, 5 );
......@@ -316,32 +318,32 @@ wxPanel *OpenDialog::DiscPanel( wxWindow* parent )
static const wxString disc_type_array[] =
{
_("DVD"),
_("DVD (menus support)"),
_("VCD")
wxU(_("DVD")),
wxU(_("DVD (menus support)")),
wxU(_("VCD"))
};
disc_type = new wxRadioBox( panel, DiscType_Event, _("Disc type"),
disc_type = new wxRadioBox( panel, DiscType_Event, wxU(_("Disc type")),
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(disc_type_array), disc_type_array,
WXSIZEOF(disc_type_array), wxRA_SPECIFY_COLS );
sizer_row->Add( disc_type, 0, wxEXPAND | wxALL, 5 );
wxStaticText *label = new wxStaticText( panel, -1, _("Device name") );
disc_device = new wxTextCtrl( panel, DiscDevice_Event, "",
wxStaticText *label = new wxStaticText( panel, -1, wxU(_("Device name")) );
disc_device = new wxTextCtrl( panel, DiscDevice_Event, wxT(""),
wxDefaultPosition, wxDefaultSize,
wxTE_PROCESS_ENTER);
sizer->Add( label, 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
sizer->Add( disc_device, 1, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
label = new wxStaticText( panel, -1, _("Title") );
label = new wxStaticText( panel, -1, wxU(_("Title")) );
disc_title = new wxSpinCtrl( panel, DiscTitle_Event );
sizer->Add( label, 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
sizer->Add( disc_title, 1, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
label = new wxStaticText( panel, -1, _("Chapter") );
label = new wxStaticText( panel, -1, wxU(_("Chapter")) );
disc_chapter = new wxSpinCtrl( panel, DiscChapter_Event );
sizer->Add( label, 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
sizer->Add( disc_chapter, 1, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
......@@ -362,9 +364,9 @@ wxPanel *OpenDialog::NetPanel( wxWindow* parent )
static const wxString net_type_array[] =
{
_("UDP/RTP"),
_("UDP/RTP Multicast"),
_("HTTP/FTP/MMS")
wxU(_("UDP/RTP")),
wxU(_("UDP/RTP Multicast")),
wxU(_("HTTP/FTP/MMS"))
};
for( i=0; i<3; i++ )
......@@ -383,9 +385,9 @@ wxPanel *OpenDialog::NetPanel( wxWindow* parent )
wxStaticText *label;
int val = config_GetInt( p_intf, "server-port" );
subpanel_sizer = new wxFlexGridSizer( 2, 1, 20 );
label = new wxStaticText( net_subpanels[0], -1, _("Port") );
label = new wxStaticText( net_subpanels[0], -1, wxU(_("Port")) );
net_ports[0] = new wxSpinCtrl( net_subpanels[0], NetPort1_Event,
wxString::Format("%d", val),
wxString::Format(wxT("%d"), val),
wxDefaultPosition, wxDefaultSize,
wxSP_ARROW_KEYS,
0, 16000, val);
......@@ -398,17 +400,17 @@ wxPanel *OpenDialog::NetPanel( wxWindow* parent )
/* UDP/RTP Multicast row */
subpanel_sizer = new wxFlexGridSizer( 4, 1, 20 );
label = new wxStaticText( net_subpanels[1], -1, _("Address") );
net_addrs[1] = new wxTextCtrl( net_subpanels[1], NetAddr2_Event, "",
label = new wxStaticText( net_subpanels[1], -1, wxU(_("Address")) );
net_addrs[1] = new wxTextCtrl( net_subpanels[1], NetAddr2_Event, wxT(""),
wxDefaultPosition, wxDefaultSize,
wxTE_PROCESS_ENTER);
subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
subpanel_sizer->Add( net_addrs[1], 1,
wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
label = new wxStaticText( net_subpanels[1], -1, _("Port") );
label = new wxStaticText( net_subpanels[1], -1, wxU(_("Port")) );
net_ports[1] = new wxSpinCtrl( net_subpanels[1], NetPort2_Event,
wxString::Format("%d", val),
wxString::Format(wxT("%d"), val),
wxDefaultPosition, wxDefaultSize,
wxSP_ARROW_KEYS,
0, 16000, val);
......@@ -420,8 +422,8 @@ wxPanel *OpenDialog::NetPanel( wxWindow* parent )
/* HTTP row */
subpanel_sizer = new wxFlexGridSizer( 2, 1, 20 );
label = new wxStaticText( net_subpanels[2], -1, _("URL") );
net_addrs[2] = new wxTextCtrl( net_subpanels[2], NetAddr3_Event, "",
label = new wxStaticText( net_subpanels[2], -1, wxU(_("URL")) );
net_addrs[2] = new wxTextCtrl( net_subpanels[2], NetAddr3_Event, wxT(""),
wxDefaultPosition, wxSize( 200, -1 ),
wxTE_PROCESS_ENTER);
subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
......@@ -459,20 +461,20 @@ void OpenDialog::UpdateMRL( int i_access_method )
/* Check if the user asked for demuxdump */
if( demuxdump_checkbox->GetValue() )
{
demux = "/demuxdump";
demux = wxT("/demuxdump");
}
switch( i_access_method )
{
case FILE_ACCESS:
mrl = "file" + demux + "://" + file_combo->GetValue();
mrl = wxT("file") + demux + wxT("://") + file_combo->GetValue();
break;
case DISC_ACCESS:
mrl = ( disc_type->GetSelection() == 0 ? "dvdold" :
disc_type->GetSelection() == 1 ? "dvd" : "vcd" )
+ demux + "://"
mrl = ( disc_type->GetSelection() == 0 ? wxT("dvdold") :
disc_type->GetSelection() == 1 ? wxT("dvd") : wxT("vcd") )
+ demux + wxT("://")
+ disc_device->GetLineText(0)
+ wxString::Format( "@%d:%d",
+ wxString::Format( wxT("@%d:%d"),
disc_title->GetValue(),
disc_chapter->GetValue() );
break;
......@@ -483,33 +485,36 @@ void OpenDialog::UpdateMRL( int i_access_method )
if( net_ports[0]->GetValue() !=
config_GetInt( p_intf, "server-port" ) )
{
mrl = "udp" + demux +
wxString::Format( "://@:%d", net_ports[0]->GetValue() );
mrl = wxT("udp") + demux +
wxString::Format( wxT("://@:%d"),
net_ports[0]->GetValue() );
}
else
{
mrl = "udp" + demux + "://";
mrl = wxT("udp") + demux + wxT("://");
}
break;
case 1:
mrl = "udp" + demux + "://@" + net_addrs[1]->GetLineText(0);
mrl = wxT("udp") + demux + wxT("://@") +
net_addrs[1]->GetLineText(0);
if( net_ports[1]->GetValue() !=
config_GetInt( p_intf, "server-port" ) )
{
mrl = mrl + wxString::Format( ":%d",
mrl = mrl + wxString::Format( wxT(":%d"),
net_ports[1]->GetValue() );
}
break;
case 2:
/* http access */
mrl = "http" + demux + "://" + net_addrs[2]->GetLineText(0);
mrl = wxT("http") + demux + wxT("://") +
net_addrs[2]->GetLineText(0);
break;
}
break;
case SAT_ACCESS:
mrl = "satellite" + demux + "://";
mrl = wxT("satellite") + demux + wxT("://");
break;
default:
break;
......@@ -551,8 +556,8 @@ void OpenDialog::OnFilePanelChange( wxCommandEvent& WXUNUSED(event) )
void OpenDialog::OnFileBrowse( wxCommandEvent& WXUNUSED(event) )
{
wxFileDialog dialog( this, _("Open file"), "", "", "*.*",
wxOPEN );
wxFileDialog dialog( this, wxU(_("Open file")),
wxT(""), wxT(""), wxT("*.*"), wxOPEN );
if( dialog.ShowModal() == wxID_OK )
{
......@@ -577,12 +582,12 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
{
case 2:
psz_device = config_GetPsz( p_intf, "vcd" );
disc_device->SetValue( psz_device ? psz_device : "" );
disc_device->SetValue( psz_device ? wxU(psz_device) : wxT("") );
break;
default:
psz_device = config_GetPsz( p_intf, "dvd" );
disc_device->SetValue( psz_device ? psz_device : "" );
disc_device->SetValue( psz_device ? wxU(psz_device) : wxT("") );
break;
}
......@@ -656,7 +661,7 @@ void OpenDialog::OnSoutSettings( wxCommandEvent& WXUNUSED(event) )
if( dialog.ShowModal() == wxID_OK )
{
config_PutPsz( p_intf, "sout", (char *)dialog.mrl.c_str() );
config_PutPsz( p_intf, "sout", (const char *)dialog.mrl.mb_str() );
}
}
......@@ -681,7 +686,8 @@ void OpenDialog::OnDemuxDumpEnable( wxCommandEvent& event )
void OpenDialog::OnDemuxDumpBrowse( wxCommandEvent& WXUNUSED(event) )
{
wxFileDialog dialog( this, _("Save file"), "", "", "*.*", wxSAVE );
wxFileDialog dialog( this, wxU(_("Save file")),
wxT(""), wxT(""), wxT("*.*"), wxSAVE );
if( dialog.ShowModal() == wxID_OK )
{
......@@ -694,5 +700,5 @@ void OpenDialog::OnDemuxDumpBrowse( wxCommandEvent& WXUNUSED(event) )
void OpenDialog::OnDemuxDumpChange( wxCommandEvent& WXUNUSED(event) )
{
config_PutPsz( p_intf, "demuxdump-file",
demuxdump_textctrl->GetValue() );
demuxdump_textctrl->GetValue().mb_str() );
}
modules/gui/wxwindows/playlist.cpp
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* playlist.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: playlist.cpp,v 1.7 2003/04/01 16:11:43 gbazin Exp $
* $Id: playlist.cpp,v 1.8 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
*
......@@ -92,7 +92,7 @@ END_EVENT_TABLE()
* Constructor.
*****************************************************************************/
Playlist::Playlist( intf_thread_t *_p_intf, Interface *_p_main_interface ):
wxFrame( _p_main_interface, -1, "Playlist", wxDefaultPosition,
wxFrame( _p_main_interface, -1, wxU(_("Playlist")), wxDefaultPosition,
wxSize::wxSize( 400, 500 ), wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
......@@ -102,21 +102,21 @@ Playlist::Playlist( intf_thread_t *_p_intf, Interface *_p_main_interface ):
/* Create our "Manage" menu */
wxMenu *manage_menu = new wxMenu;
manage_menu->Append( AddUrl_Event, _("Add &Url...") );
manage_menu->Append( AddDirectory_Event, _("Add &Directory...") );
manage_menu->Append( AddUrl_Event, wxU(_("Add &Url...")) );
manage_menu->Append( AddDirectory_Event, wxU(_("Add &Directory...")) );
manage_menu->AppendSeparator();
manage_menu->Append( Close_Event, _("&Close") );
manage_menu->Append( Close_Event, wxU(_("&Close")) );
/* Create our "Selection" menu */
wxMenu *selection_menu = new wxMenu;
selection_menu->Append( InvertSelection_Event, _("&Invert") );
selection_menu->Append( DeleteSelection_Event, _("&Delete") );
selection_menu->Append( SelectAll_Event, _("&Select All") );
selection_menu->Append( InvertSelection_Event, wxU(_("&Invert")) );
selection_menu->Append( DeleteSelection_Event, wxU(_("&Delete")) );
selection_menu->Append( SelectAll_Event, wxU(_("&Select All")) );
/* Append the freshly created menus to the menu bar */
wxMenuBar *menubar = new wxMenuBar( wxMB_DOCKABLE );
menubar->Append( manage_menu, _("&Manage") );
menubar->Append( selection_menu, _("&Selection") );
menubar->Append( manage_menu, wxU(_("&Manage")) );
menubar->Append( selection_menu, wxU(_("&Selection")) );
/* Attach the menu bar to the frame */
SetMenuBar( menubar );
......@@ -133,13 +133,13 @@ Playlist::Playlist( intf_thread_t *_p_intf, Interface *_p_main_interface ):
listview = new wxListView( playlist_panel, ListView_Event,
wxDefaultPosition, wxSize( 350, 300 ),
wxLC_REPORT | wxSUNKEN_BORDER );
listview->InsertColumn( 0, _("Url") );
listview->InsertColumn( 1, _("Duration") );
listview->InsertColumn( 0, wxU(_("Url")) );
listview->InsertColumn( 1, wxU(_("Duration")) );
listview->SetColumnWidth( 0, 250 );
listview->SetColumnWidth( 1, 100 );
/* Create the OK button */
ok_button = new wxButton( playlist_panel, wxID_OK, _("OK") );
ok_button = new wxButton( playlist_panel, wxID_OK, wxU(_("OK")) );
ok_button->SetDefault();
/* Place everything in sizers */
......@@ -187,10 +187,10 @@ void Playlist::Rebuild()
vlc_mutex_lock( &p_playlist->object_lock );
for( int i = 0; i < p_playlist->i_size; i++ )
{
wxString filename = p_playlist->pp_items[i]->psz_name;
wxString filename = wxU(p_playlist->pp_items[i]->psz_name);
listview->InsertItem( i, filename );
/* FIXME: we should try to find the actual duration... */
listview->SetItem( i, 1, _("no info") );
listview->SetItem( i, 1, wxU(_("no info")) );
}
vlc_mutex_unlock( &p_playlist->object_lock );
......
modules/gui/wxwindows/preferences.cpp
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* preferences.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: preferences.cpp,v 1.11 2003/04/21 00:54:26 ipkiss Exp $
* $Id: preferences.cpp,v 1.12 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -99,7 +99,7 @@ struct ConfigData
ConfigData( wxPanel *_panel, int _i_conf_type,
vlc_bool_t _b_advanced, char *psz_name )
{ panel = _panel; b_advanced = _b_advanced; b_config_list = VLC_FALSE;
i_config_type = _i_conf_type; option_name = psz_name; }
i_config_type = _i_conf_type; option_name = wxU(psz_name); }
vlc_bool_t b_advanced;
int i_config_type;
......@@ -225,7 +225,7 @@ END_EVENT_TABLE()
* Constructor.
*****************************************************************************/
PrefsDialog::PrefsDialog( intf_thread_t *_p_intf, Interface *_p_main_interface)
: wxFrame( _p_main_interface, -1, _("Preferences"), wxDefaultPosition,
: wxFrame( _p_main_interface, -1, wxU(_("Preferences")), wxDefaultPosition,
wxSize(650,450), wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
......@@ -246,10 +246,11 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf, Interface *_p_main_interface)
wxStaticLine *static_line = new wxStaticLine( panel, wxID_OK );
/* Create the buttons */
wxButton *ok_button = new wxButton( panel, wxID_OK, _("OK") );
wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("OK")) );
ok_button->SetDefault();
wxButton *cancel_button = new wxButton( panel, wxID_CANCEL, _("Cancel") );
wxButton *save_button = new wxButton( panel, wxID_SAVE, _("Save") );
wxButton *cancel_button = new wxButton( panel, wxID_CANCEL,
wxU(_("Cancel")) );
wxButton *save_button = new wxButton( panel, wxID_SAVE, wxU(_("Save")) );
//wxButton *reset_button = new wxButton( panel, Reset_Event, _("Reset") );
/* Place everything in sizers */
......@@ -326,7 +327,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
p_sizer = _p_sizer;
p_parent = _p_parent;
root_item = AddRoot( "" );
root_item = AddRoot( wxT("") );
/* List the plugins */
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
......@@ -360,7 +361,8 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
config_data->panel->Hide();
/* Add the category to the tree */
AppendItem( root_item, p_item->psz_text, -1, -1, config_data );
AppendItem( root_item, wxU(p_item->psz_text),
-1, -1, config_data );
break;
}
}
......@@ -373,7 +375,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
/*
* Build a tree of all the plugins
*/
plugins_item = AppendItem( root_item, _("Plugins") );
plugins_item = AppendItem( root_item, wxU(_("Plugins")) );
for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
......@@ -401,7 +403,8 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
i_child_index < GetChildrenCount( plugins_item, FALSE );
i_child_index++ )
{
if( !GetItemText(capability_item).Cmp(p_module->psz_capability) )
if( !GetItemText(capability_item).Cmp(
wxU(p_module->psz_capability ) ) )
{
break;
}
......@@ -413,7 +416,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
{
/* We didn't find it, add it */
capability_item = AppendItem( plugins_item,
p_module->psz_capability );
wxU(p_module->psz_capability) );
}
/* Add the plugin to the tree */
......@@ -421,7 +424,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
config_data->panel =
new PrefsPanel( p_parent, p_intf, p_prefs_dialog, p_module, NULL );
config_data->panel->Hide();
AppendItem( capability_item, p_module->psz_object_name, -1, -1,
AppendItem( capability_item, wxU(p_module->psz_object_name), -1, -1,
config_data );
}
......@@ -562,12 +565,12 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
}
/* Add a head title to the panel */
wxStaticBox *static_box = new wxStaticBox( this, -1, "" );
wxStaticBox *static_box = new wxStaticBox( this, -1, wxT("") );
wxStaticBoxSizer *box_sizer = new wxStaticBoxSizer( static_box,
wxHORIZONTAL );
label = new wxStaticText( this, -1,
psz_section ? p_item->psz_text :
p_module->psz_longname );
wxU(psz_section ? p_item->psz_text :
p_module->psz_longname) );
box_sizer->Add( label, 1, wxALL, 5 );
sizer->Add( box_sizer, 0, wxEXPAND | wxALL, 5 );
......@@ -598,14 +601,14 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
switch( p_item->i_type )
{
case CONFIG_ITEM_MODULE:
label = new wxStaticText(panel, -1, p_item->psz_text);
combo = new wxComboBox( panel, -1, p_item->psz_value,
label = new wxStaticText(panel, -1, wxU(p_item->psz_text));
combo = new wxComboBox( panel, -1, wxU(p_item->psz_value),
wxDefaultPosition, wxDefaultSize,
0, NULL, wxCB_READONLY | wxCB_SORT );
/* build a list of available modules */
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
combo->Append( _("Default"), (void *)NULL );
combo->Append( wxU(_("Default")), (void *)NULL );
combo->SetSelection( 0 );
for( int i_index = 0; i_index < p_list->i_count; i_index++ )
{
......@@ -614,15 +617,15 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
if( !strcmp( p_parser->psz_capability,
p_item->psz_type ) )
{
combo->Append( p_parser->psz_longname,
combo->Append( wxU(p_parser->psz_longname),
p_parser->psz_object_name );
if( p_item->psz_value &&
!strcmp(p_item->psz_value, p_parser->psz_object_name) )
combo->SetValue( p_parser->psz_longname );
combo->SetValue( wxU(p_parser->psz_longname) );
}
}
combo->SetToolTip( p_item->psz_longtext );
combo->SetToolTip( wxU(p_item->psz_longtext) );
config_data->control.combobox = combo;
panel_sizer->Add( label, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
panel_sizer->Add( combo, 1, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
......@@ -631,32 +634,33 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
case CONFIG_ITEM_STRING:
case CONFIG_ITEM_FILE:
case CONFIG_ITEM_DIRECTORY:
label = new wxStaticText(panel, -1, p_item->psz_text);
label = new wxStaticText(panel, -1, wxU(p_item->psz_text));
panel_sizer->Add( label, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
if( !p_item->ppsz_list )
{
textctrl = new wxTextCtrl( panel, -1, p_item->psz_value,
textctrl = new wxTextCtrl( panel, -1, wxU(p_item->psz_value),
wxDefaultPosition, wxDefaultSize,
wxTE_PROCESS_ENTER);
textctrl->SetToolTip( p_item->psz_longtext );
textctrl->SetToolTip( wxU(p_item->psz_longtext) );
config_data->control.textctrl = textctrl;
panel_sizer->Add( textctrl, 1, wxALL, 5 );
}
else
{
combo = new wxComboBox( panel, -1, p_item->psz_value,
combo = new wxComboBox( panel, -1, wxU(p_item->psz_value),
wxDefaultPosition, wxDefaultSize,
0, NULL, wxCB_READONLY | wxCB_SORT );
/* build a list of available options */
for( int i_index = 0; p_item->ppsz_list[i_index]; i_index++ )
{
combo->Append( p_item->ppsz_list[i_index] );
combo->Append( wxU(p_item->ppsz_list[i_index]) );
}
if( p_item->psz_value ) combo->SetValue( p_item->psz_value );
combo->SetToolTip( p_item->psz_longtext );
if( p_item->psz_value )
combo->SetValue( wxU(p_item->psz_value) );
combo->SetToolTip( wxU(p_item->psz_longtext) );
config_data->control.combobox = combo;
config_data->b_config_list = VLC_TRUE;
panel_sizer->Add( combo, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
......@@ -664,20 +668,20 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
if( p_item->i_type == CONFIG_ITEM_FILE )
{
button = new wxButton( panel, -1, _("Browse...") );
button = new wxButton( panel, -1, wxU(_("Browse...")) );
panel_sizer->Add( button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
button->SetClientData((void *)config_data);
}
break;
case CONFIG_ITEM_INTEGER:
label = new wxStaticText(panel, -1, p_item->psz_text);
label = new wxStaticText(panel, -1, wxU(p_item->psz_text));
spin = new wxSpinCtrl( panel, -1,
wxString::Format("%d", p_item->i_value),
wxString::Format(wxT("%d"),p_item->i_value),
wxDefaultPosition, wxDefaultSize,
wxSP_ARROW_KEYS,
0, 16000, p_item->i_value);
spin->SetToolTip( p_item->psz_longtext );
spin->SetToolTip( wxU(p_item->psz_longtext) );
config_data->control.spinctrl = spin;
panel_sizer->Add( label, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
panel_sizer->Add( spin, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
......@@ -686,22 +690,22 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
break;
case CONFIG_ITEM_FLOAT:
label = new wxStaticText(panel, -1, p_item->psz_text);
label = new wxStaticText(panel, -1, wxU(p_item->psz_text));
spin = new wxSpinCtrl( panel, -1,
wxString::Format("%f", p_item->f_value),
wxString::Format(wxT("%f"),p_item->f_value),
wxDefaultPosition, wxDefaultSize,
wxSP_ARROW_KEYS,
0, 16000, (int)p_item->f_value);
spin->SetToolTip( p_item->psz_longtext );
spin->SetToolTip( wxU(p_item->psz_longtext) );
config_data->control.spinctrl = spin;
panel_sizer->Add( label, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
panel_sizer->Add( spin, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
break;
case CONFIG_ITEM_BOOL:
checkbox = new wxCheckBox( panel, -1, p_item->psz_text );
checkbox = new wxCheckBox( panel, -1, wxU(p_item->psz_text) );
if( p_item->i_value ) checkbox->SetValue(TRUE);
checkbox->SetToolTip( p_item->psz_longtext );
checkbox->SetToolTip( wxU(p_item->psz_longtext) );
config_data->control.checkbox = checkbox;
panel_sizer->Add( checkbox, 0, wxALL, 5 );
break;
......@@ -730,7 +734,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
if( !config_array.GetCount() )
{
config_sizer->Add( new wxStaticText( config_window, -1,
_("No configuration options available") ), 1,
wxU(_("No configuration options available")) ), 1,
wxALIGN_CENTER_VERTICAL | wxALIGN_CENTER, 2 );
}
......@@ -751,7 +755,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
if( config_array.GetCount() )
{
wxButton *advanced_button = new wxButton( this, Advanced_Event,
_("Advanced...") );
wxU(_("Advanced...")) );
sizer->Add( advanced_button, 0, wxALL, 5 );
}
......@@ -768,7 +772,7 @@ void PrefsPanel::ApplyChanges()
switch( config_data->i_config_type )
{
case CONFIG_ITEM_MODULE:
config_PutPsz( p_intf, config_data->option_name.c_str(), (char *)
config_PutPsz( p_intf, config_data->option_name.mb_str(), (char *)
config_data->control.combobox->GetClientData(
config_data->control.combobox->GetSelection() ) );
break;
......@@ -776,22 +780,22 @@ void PrefsPanel::ApplyChanges()
case CONFIG_ITEM_FILE:
case CONFIG_ITEM_DIRECTORY:
if( !config_data->b_config_list )
config_PutPsz( p_intf, config_data->option_name.c_str(),
config_data->control.textctrl->GetValue() );
config_PutPsz( p_intf, config_data->option_name.mb_str(),
config_data->control.textctrl->GetValue().mb_str() );
else
config_PutPsz( p_intf, config_data->option_name.c_str(),
config_data->control.combobox->GetValue() );
config_PutPsz( p_intf, config_data->option_name.mb_str(),
config_data->control.combobox->GetValue().mb_str() );
break;
case CONFIG_ITEM_BOOL:
config_PutInt( p_intf, config_data->option_name.c_str(),
config_PutInt( p_intf, config_data->option_name.mb_str(),
config_data->control.checkbox->IsChecked() );
break;
case CONFIG_ITEM_INTEGER:
config_PutInt( p_intf, config_data->option_name.c_str(),
config_PutInt( p_intf, config_data->option_name.mb_str(),
config_data->control.spinctrl->GetValue() );
break;
case CONFIG_ITEM_FLOAT:
config_PutFloat( p_intf, config_data->option_name.c_str(),
config_PutFloat( p_intf, config_data->option_name.mb_str(),
config_data->control.spinctrl->GetValue() );
break;
}
......@@ -850,8 +854,8 @@ void ConfigEvtHandler::OnCommandEvent( wxCommandEvent& event )
if( config_data->i_config_type == CONFIG_ITEM_FILE )
{
wxFileDialog dialog( p_prefs_dialog, _("Open file"), "", "", "*.*",
wxOPEN | wxSAVE );
wxFileDialog dialog( p_prefs_dialog, wxU(_("Open file")),
wxT(""), wxT(""), wxT("*.*"), wxOPEN | wxSAVE );
if( dialog.ShowModal() == wxID_OK )
{
......
modules/gui/wxwindows/streamout.cpp
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* streamout.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: streamout.cpp,v 1.7 2003/05/07 12:23:06 gbazin Exp $
* $Id: streamout.cpp,v 1.8 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -132,8 +132,8 @@ END_EVENT_TABLE()
* Constructor.
*****************************************************************************/
SoutDialog::SoutDialog( intf_thread_t *_p_intf, Interface *_p_main_interface ):
wxDialog( _p_main_interface, -1, _("Stream output"), wxDefaultPosition,
wxDefaultSize, wxDEFAULT_FRAME_STYLE )
wxDialog( _p_main_interface, -1, wxU(_("Stream output")),
wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
p_intf = _p_intf;
......@@ -147,17 +147,16 @@ SoutDialog::SoutDialog( intf_thread_t *_p_intf, Interface *_p_main_interface ):
/* Create MRL combobox */
wxBoxSizer *mrl_sizer_sizer = new wxBoxSizer( wxHORIZONTAL );
wxStaticBox *mrl_box = new wxStaticBox( panel, -1,
_("Stream output MRL") );
wxU(_("Stream output MRL")) );
wxStaticBoxSizer *mrl_sizer = new wxStaticBoxSizer( mrl_box,
wxHORIZONTAL );
wxStaticText *mrl_label = new wxStaticText( panel, -1,
_("Destination Target:") );
wxU(_("Destination Target:")));
mrl_combo = new wxComboBox( panel, MRL_Event, mrl,
wxPoint(20,25), wxSize(120, -1),
0, NULL );
mrl_combo->SetToolTip( _("You can use this field directly by typing the "
"full MRL you want to open.\n""Alternatively, the field will be "
"filled automatically when you use the controls below") );
wxPoint(20,25), wxSize(120, -1), 0, NULL );
mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
"the full MRL you want to open.\n""Alternatively, the field will be "
"filled automatically when you use the controls below")) );
mrl_sizer->Add( mrl_label, 0, wxALL | wxALIGN_CENTER, 5 );
mrl_sizer->Add( mrl_combo, 1, wxALL | wxALIGN_CENTER, 5 );
......@@ -173,9 +172,10 @@ SoutDialog::SoutDialog( intf_thread_t *_p_intf, Interface *_p_main_interface ):
wxStaticLine *static_line = new wxStaticLine( panel, wxID_OK );
/* Create the buttons */
wxButton *ok_button = new wxButton( panel, wxID_OK, _("OK") );
wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("OK")) );
ok_button->SetDefault();
wxButton *cancel_button = new wxButton( panel, wxID_CANCEL, _("Cancel") );
wxButton *cancel_button = new wxButton( panel, wxID_CANCEL,
wxU(_("Cancel")) );
/* Place everything in sizers */
wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
......@@ -214,39 +214,39 @@ void SoutDialog::UpdateMRL()
switch( i_encapsulation_type )
{
case PS_ENCAPSULATION:
encapsulation = "/ps";
encapsulation = wxT("/ps");
break;
case AVI_ENCAPSULATION:
encapsulation = "/avi";
encapsulation = wxT("/avi");
break;
case OGG_ENCAPSULATION:
encapsulation = "/ogg";
encapsulation = wxT("/ogg");
break;
case TS_ENCAPSULATION:
default:
encapsulation = "/ts";
encapsulation = wxT("/ts");
break;
}
switch( i_access_type )
{
case FILE_ACCESS_OUT:
mrl = "file" + encapsulation + ":" + file_combo->GetValue();
mrl = wxT("file") + encapsulation + wxT(":") + file_combo->GetValue();
break;
case HTTP_ACCESS_OUT:
mrl = "http" + encapsulation + ":" + net_addr->GetLineText(0)
+ wxString::Format( ":%d", net_port->GetValue() );
mrl = wxT("http") + encapsulation + wxT(":") + net_addr->GetLineText(0)
+ wxString::Format( wxT(":%d"), net_port->GetValue() );
break;
case UDP_ACCESS_OUT:
case RTP_ACCESS_OUT:
mrl = ( i_access_type == UDP_ACCESS_OUT ) ? "udp" : "rtp";
mrl += encapsulation + ":" + net_addr->GetLineText(0);
if( net_port->GetValue() != config_GetInt( p_intf, "server-port" ) )
{
mrl += wxString::Format( ":%d", net_port->GetValue() );
}
mrl = ( i_access_type == UDP_ACCESS_OUT ) ? wxT("udp") : wxT("rtp");
mrl += encapsulation + wxT(":") + net_addr->GetLineText(0);
if( net_port->GetValue() != config_GetInt( p_intf, "server-port" ) )
{
mrl += wxString::Format( wxT(":%d"), net_port->GetValue() );
}
break;
}
......@@ -260,16 +260,17 @@ wxPanel *SoutDialog::AccessPanel( wxWindow* parent )
wxSize(200, 200) );
wxFlexGridSizer *sizer = new wxFlexGridSizer( 2, 4, 20 );
wxStaticBox *panel_box = new wxStaticBox( panel, -1, _("Output Method") );
wxStaticBox *panel_box = new wxStaticBox( panel, -1,
wxU(_("Output Method")) );
wxStaticBoxSizer *panel_sizer = new wxStaticBoxSizer( panel_box,
wxHORIZONTAL );
static const wxString access_output_array[] =
{
_("File"),
_("HTTP"),
_("UDP"),
_("RTP")
wxU(_("File")),
wxU(_("HTTP")),
wxU(_("UDP")),
wxU(_("RTP"))
};
for( i=0; i<4; i++ )
......@@ -287,11 +288,11 @@ wxPanel *SoutDialog::AccessPanel( wxWindow* parent )
wxFlexGridSizer *subpanel_sizer;
wxStaticText *label;
subpanel_sizer = new wxFlexGridSizer( 3, 1, 20 );
label = new wxStaticText( access_subpanels[0], -1, _("Filename") );
file_combo = new wxComboBox( access_subpanels[0], FileName_Event, "",
label = new wxStaticText( access_subpanels[0], -1, wxU(_("Filename")) );
file_combo = new wxComboBox( access_subpanels[0], FileName_Event, wxT(""),
wxPoint(20,25), wxSize(200, -1), 0, NULL );
wxButton *browse_button = new wxButton( access_subpanels[0],
FileBrowse_Event, _("Browse...") );
FileBrowse_Event, wxU(_("Browse...")) );
subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
subpanel_sizer->Add( file_combo, 1,
wxEXPAND | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
......@@ -302,8 +303,8 @@ wxPanel *SoutDialog::AccessPanel( wxWindow* parent )
/* Net row */
subpanel_sizer = new wxFlexGridSizer( 4, 1, 20 );
label = new wxStaticText( access_subpanels[2], -1, _("Address") );
net_addr = new wxTextCtrl( access_subpanels[2], NetAddr_Event, "",
label = new wxStaticText( access_subpanels[2], -1, wxU(_("Address")) );
net_addr = new wxTextCtrl( access_subpanels[2], NetAddr_Event, wxT(""),
wxDefaultPosition, wxSize( 200, -1 ),
wxTE_PROCESS_ENTER);
subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
......@@ -311,9 +312,9 @@ wxPanel *SoutDialog::AccessPanel( wxWindow* parent )
wxEXPAND | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
int val = config_GetInt( p_intf, "server-port" );
label = new wxStaticText( access_subpanels[2], -1, _("Port") );
label = new wxStaticText( access_subpanels[2], -1, wxU(_("Port")) );
net_port = new wxSpinCtrl( access_subpanels[2], NetPort_Event,
wxString::Format("%d", val),
wxString::Format(wxT("%d"), val),
wxDefaultPosition, wxDefaultSize,
wxSP_ARROW_KEYS,
0, 16000, val );
......@@ -348,16 +349,16 @@ wxPanel *SoutDialog::EncapsulationPanel( wxWindow* parent )
wxSize(200, 200) );
wxStaticBox *panel_box = new wxStaticBox( panel, -1,
_("Encapsulation Method") );
wxU(_("Encapsulation Method")) );
wxStaticBoxSizer *panel_sizer = new wxStaticBoxSizer( panel_box,
wxHORIZONTAL );
static const wxString encapsulation_array[] =
{
_("MPEG TS"),
_("MPEG PS"),
_("AVI"),
_("Ogg")
wxU(_("MPEG TS")),
wxU(_("MPEG PS")),
wxU(_("AVI")),
wxU(_("Ogg"))
};
/* Stuff everything into the main panel */
......@@ -385,23 +386,23 @@ void SoutDialog::ParseMRL()
char *psz_sout = config_GetPsz( p_intf, "sout" );
if( psz_sout )
{
mrl = psz_sout;
mrl = wxU(psz_sout);
free( psz_sout );
}
/* Parse the MRL */
wxString access = mrl.BeforeFirst( '/' );
wxString encapsulation = mrl.BeforeFirst( ':' ).AfterFirst('/');
wxString access = mrl.BeforeFirst( wxT('/') );
wxString encapsulation = mrl.BeforeFirst( wxT(':') ).AfterFirst(wxT('/'));
if( !access.Cmp( "http" ) )
if( !access.Cmp( wxT("http") ) )
{
i_access_type = HTTP_ACCESS_OUT;
}
else if( !access.Cmp( "udp" ) )
else if( !access.Cmp( wxT("udp") ) )
{
i_access_type = UDP_ACCESS_OUT;
}
else if( !access.Cmp( "rtp" ) )
else if( !access.Cmp( wxT("rtp") ) )
{
i_access_type = RTP_ACCESS_OUT;
}
......@@ -410,15 +411,15 @@ void SoutDialog::ParseMRL()
i_access_type = FILE_ACCESS_OUT;
}
if( !encapsulation.Cmp( "ps" ) )
if( !encapsulation.Cmp( wxT("ps") ) )
{
i_encapsulation_type = PS_ENCAPSULATION;
}
else if( !encapsulation.Cmp( "avi" ) )
else if( !encapsulation.Cmp( wxT("avi") ) )
{
i_encapsulation_type = AVI_ENCAPSULATION;
}
else if( !encapsulation.Cmp( "ogg" ) )
else if( !encapsulation.Cmp( wxT("ogg") ) )
{
i_encapsulation_type = OGG_ENCAPSULATION;
}
......@@ -427,7 +428,7 @@ void SoutDialog::ParseMRL()
i_encapsulation_type = TS_ENCAPSULATION;
}
wxString second_part = mrl.AfterFirst( ':' );
wxString second_part = mrl.AfterFirst( wxT(':') );
if( i_access_type == FILE_ACCESS_OUT )
{
......@@ -437,11 +438,11 @@ void SoutDialog::ParseMRL()
else
{
/* we've got address:port */
wxString address = second_part.BeforeLast( ':' );
wxString address = second_part.BeforeLast( wxT(':') );
net_addr->SetValue( address );
long int i_port;
wxString port = second_part.AfterLast( ':' );
wxString port = second_part.AfterLast( wxT(':') );
if( port.ToLong( &i_port ) )
{
net_port->SetValue( i_port );
......@@ -542,7 +543,8 @@ void SoutDialog::OnFileChange( wxCommandEvent& WXUNUSED(event) )
void SoutDialog::OnFileBrowse( wxCommandEvent& WXUNUSED(event) )
{
wxFileDialog dialog( this, _("Save file"), "", "", "*.*", wxSAVE );
wxFileDialog dialog( this, wxU(_("Save file")),
wxT(""), wxT(""), wxT("*.*"), wxSAVE );
if( dialog.ShowModal() == wxID_OK )
{
......
modules/gui/wxwindows/timer.cpp
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* timer.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: timer.cpp,v 1.15 2003/05/07 12:23:06 gbazin Exp $
* $Id: timer.cpp,v 1.16 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -140,7 +140,7 @@ void Timer::Notify()
}
p_main_interface->statusbar->SetStatusText(
p_intf->p_sys->p_input->psz_source, 1 );
wxU(p_intf->p_sys->p_input->psz_source), 1 );
p_main_interface->TogglePlayButton( PLAYING_S );
i_old_playing_status = PLAYING_S;
......@@ -165,7 +165,7 @@ void Timer::Notify()
i_old_playing_status = PAUSE_S;
}
p_main_interface->statusbar->SetStatusText( "", 1 );
p_main_interface->statusbar->SetStatusText( wxT(""), 1 );
vlc_object_release( p_intf->p_sys->p_input );
p_intf->p_sys->p_input = NULL;
......@@ -281,9 +281,8 @@ void DisplayStreamDate( wxControl *p_slider_frame, intf_thread_t * p_intf ,
char psz_time[ OFFSETTOTIME_MAX_SIZE ];
p_slider_frame->SetLabel(
input_OffsetToTime( p_intf->p_sys->p_input,
psz_time,
p_area->i_size * i_pos / SLIDER_MAX_POS ) );
wxU(input_OffsetToTime( p_intf->p_sys->p_input,
psz_time, p_area->i_size * i_pos / SLIDER_MAX_POS )) );
#undef p_area
}
}
modules/gui/wxwindows/wxwindows.h
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* wxwindows.h: private wxWindows interface description
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: wxwindows.h,v 1.21 2003/05/07 15:54:49 gbazin Exp $
* $Id: wxwindows.h,v 1.22 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -34,6 +34,13 @@ class FileInfo;
#define SLIDER_MAX_POS 10000
/* wxU is used to convert ansi strings to unicode strings (wchar_t) */
#if wxUSE_UNICODE
# define wxU(ansi) wxString(ansi, *wxConvCurrent)
#else
# define wxU(ansi) ansi
#endif
/*****************************************************************************
* intf_sys_t: description and status of wxwindows interface
*****************************************************************************/
......
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