diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-07 23:08:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-07 23:08:38 +0100 |
| commit | d0702ff32eace9f49676600fef22f935a4e5e16a (patch) | |
| tree | 8d6357d65e95ce12d21f4651a7f825ecca845f95 /src | |
| parent | 0e8364674b5963a08ce44fa9234b4e1cb64f29a6 (diff) | |
wx2.8 fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/servomatic_gui.cc | 2 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/servomatic_gui.cc b/src/tools/servomatic_gui.cc index 52ec0a3a3..5e36660eb 100644 --- a/src/tools/servomatic_gui.cc +++ b/src/tools/servomatic_gui.cc @@ -99,7 +99,7 @@ public: #endif #ifdef __WXGTK__ wxInitAllImageHandlers(); - wxBitmap bitmap (wxString::Format ("%s/taskbar_icon.png", POSIX_ICON_PREFIX), wxBITMAP_TYPE_PNG); + wxBitmap bitmap (wxString::Format (wxT ("%s/taskbar_icon.png"), POSIX_ICON_PREFIX), wxBITMAP_TYPE_PNG); wxIcon icon; icon.CopyFromBitmap (bitmap); #endif diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index eb36ce1ff..5e597ac30 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -822,10 +822,10 @@ FilmEditor::setup_frame_rate_description () _film->target_audio_sample_rate() ); } else { - d << "\n"; + d << wxT ("\n"); } #else - d << "\n"; + d << wxT ("\n"); #endif } @@ -1268,9 +1268,9 @@ FilmEditor::setup_audio_details () if (_film->audio_stream()->channels() == 1) { s << _("1 channel"); } else { - s << _film->audio_stream()->channels () << " " << _("channels"); + s << _film->audio_stream()->channels () << wxT (" ") << _("channels"); } - s << ", " << _film->audio_stream()->sample_rate() << _("Hz"); + s << wxT (", ") << _film->audio_stream()->sample_rate() << _("Hz"); _audio->SetLabel (s); } @@ -1390,7 +1390,7 @@ FilmEditor::setup_scaling_description () } for (int i = lines; i < 4; ++i) { - d << " \n"; + d << wxT (" \n"); } _scaling_description->SetLabel (d); |