Commit f5da6786 authored by gbazin's avatar gbazin
Browse files

* modules/gui/wxwindows: portability fixes by Erik Simko (erik dot simko at gmail dot com).

parent 39d87a89
...@@ -392,8 +392,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent, ...@@ -392,8 +392,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
wxStaticText *mrl_label = new wxStaticText( panel, -1, wxStaticText *mrl_label = new wxStaticText( panel, -1,
wxU(_("Open:")) ); wxU(_("Open:")) );
mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""), mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
wxPoint(20,25), wxSize(120, -1), wxPoint(20,25), wxSize(120, -1) );
0, NULL );
mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing " 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 " "the full MRL you want to open.\n""Alternatively, the field will be "
"filled automatically when you use the controls below.")) ); "filled automatically when you use the controls below.")) );
...@@ -592,7 +591,7 @@ wxPanel *OpenDialog::FilePanel( wxWindow* parent ) ...@@ -592,7 +591,7 @@ wxPanel *OpenDialog::FilePanel( wxWindow* parent )
wxBoxSizer *file_sizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer *file_sizer = new wxBoxSizer( wxHORIZONTAL );
file_combo = new wxComboBox( panel, FileName_Event, wxT(""), file_combo = new wxComboBox( panel, FileName_Event, wxT(""),
wxPoint(20,25), wxSize(200, -1), 0, NULL ); wxPoint(20,25), wxSize(200, -1) );
wxButton *browse_button = new wxButton( panel, FileBrowse_Event, wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
wxU(_("Browse...")) ); wxU(_("Browse...")) );
file_sizer->Add( file_combo, 1, wxALL, 5 ); file_sizer->Add( file_combo, 1, wxALL, 5 );
......
...@@ -171,7 +171,7 @@ SoutDialog::SoutDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ): ...@@ -171,7 +171,7 @@ SoutDialog::SoutDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
wxStaticText *mrl_label = new wxStaticText( panel, -1, wxStaticText *mrl_label = new wxStaticText( panel, -1,
wxU(_("Destination Target:"))); wxU(_("Destination Target:")));
mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""), mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
wxPoint(20,25), wxSize(120, -1), 0, NULL ); wxPoint(20,25), wxSize(120, -1) );
mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing " 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 " "the full MRL you want to open.\n""Alternatively, the field will be "
"filled automatically when you use the controls below")) ); "filled automatically when you use the controls below")) );
...@@ -457,7 +457,7 @@ wxPanel *SoutDialog::AccessPanel( wxWindow* parent ) ...@@ -457,7 +457,7 @@ wxPanel *SoutDialog::AccessPanel( wxWindow* parent )
subpanel_sizer = new wxFlexGridSizer( 3, 2, 20 ); subpanel_sizer = new wxFlexGridSizer( 3, 2, 20 );
label = new wxStaticText( access_subpanels[1], -1, wxU(_("Filename")) ); label = new wxStaticText( access_subpanels[1], -1, wxU(_("Filename")) );
file_combo = new wxComboBox( access_subpanels[1], FileName_Event, wxT(""), file_combo = new wxComboBox( access_subpanels[1], FileName_Event, wxT(""),
wxPoint(20,25), wxSize(200, -1), 0, NULL ); wxPoint(20,25), wxSize(200, -1) );
wxButton *browse_button = new wxButton( access_subpanels[1], wxButton *browse_button = new wxButton( access_subpanels[1],
FileBrowse_Event, wxU(_("Browse...")) ); FileBrowse_Event, wxU(_("Browse...")) );
subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL ); subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
......
...@@ -85,7 +85,7 @@ SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ): ...@@ -85,7 +85,7 @@ SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
char *psz_subsfile = config_GetPsz( p_intf, "sub-file" ); char *psz_subsfile = config_GetPsz( p_intf, "sub-file" );
if( !psz_subsfile ) psz_subsfile = strdup(""); if( !psz_subsfile ) psz_subsfile = strdup("");
file_combo = new wxComboBox( panel, -1, wxL2U(psz_subsfile), file_combo = new wxComboBox( panel, -1, wxL2U(psz_subsfile),
wxPoint(20,25), wxSize(300, -1), 0, NULL ); wxPoint(20,25), wxSize(300, -1) );
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,
wxU(_("Browse...")) ); wxU(_("Browse...")) );
......
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