wx/*: fix a few string additions

parent 18631b59
...@@ -458,12 +458,12 @@ void ModuleListCatConfigControl::OnUpdate( wxCommandEvent &event ) ...@@ -458,12 +458,12 @@ void ModuleListCatConfigControl::OnUpdate( wxCommandEvent &event )
if( b_waschecked ) if( b_waschecked )
{ {
/* Maybe not the clest solution */ /* Maybe not the clest solution */
if( ! newtext.Replace(wxU(",") if( ! newtext.Replace(wxString(wxT(","))
+wxU(pp_checkboxes[i]->psz_module), +wxU(pp_checkboxes[i]->psz_module),
wxU(""))) wxT("")))
{ {
if( ! newtext.Replace(wxU(pp_checkboxes[i]->psz_module) if( ! newtext.Replace(wxString(wxU(pp_checkboxes[i]->psz_module))
+ wxU(","),wxU(""))) + wxT(","),wxT("")))
{ {
newtext.Replace(wxU(pp_checkboxes[i]->psz_module),wxU("")); newtext.Replace(wxU(pp_checkboxes[i]->psz_module),wxU(""));
} }
......
...@@ -141,7 +141,7 @@ void Timer::Notify() ...@@ -141,7 +141,7 @@ void Timer::Notify()
if( psz_now_playing && *psz_now_playing ) if( psz_now_playing && *psz_now_playing )
{ {
p_main_interface->statusbar->SetStatusText( p_main_interface->statusbar->SetStatusText(
wxU(psz_now_playing) + wxT( " - " ) + wxString(wxU(psz_now_playing)) + wxT( " - " ) +
wxU(p_intf->p_sys->p_input->input.p_item->psz_name), 2 ); wxU(p_intf->p_sys->p_input->input.p_item->psz_name), 2 );
} }
else else
...@@ -211,7 +211,7 @@ void Timer::Notify() ...@@ -211,7 +211,7 @@ void Timer::Notify()
if( psz_now_playing && *psz_now_playing ) if( psz_now_playing && *psz_now_playing )
{ {
p_main_interface->statusbar->SetStatusText( p_main_interface->statusbar->SetStatusText(
wxU(psz_now_playing) + wxT( " - " ) + wxString(wxU(psz_now_playing)) + wxT( " - " ) +
wxU(p_intf->p_sys->p_input->input.p_item->psz_name), 2 ); wxU(p_intf->p_sys->p_input->input.p_item->psz_name), 2 );
} }
else else
......
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