Make sure wxWidgets headers are included before any Windows ones.

[dcpomatic.git] / src / wx / closed_captions_dialog.cc

diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 491a6fb1e4a8dfeb32e76dbcee2130635ef20105..200c2f415d61047090eae9c0feb79b8c70124a33 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "closed_captions_dialog.h"
 #include "wx_util.h"
 #include "film_viewer.h"
@@ -27,6 +28,7 @@
 #include "lib/compose.hpp"
 #include <boost/bind/bind.hpp>
 
+
 using std::list;
 using std::max;
 using std::cout;
@@ -201,7 +203,7 @@ ClosedCaptionsDialog::update ()
                auto j = to_show.begin();
                int k = 0;
                while (j != to_show.end() && k < MAX_CLOSED_CAPTION_LINES) {
-                       _lines[k] = j->text();
+                       _lines[k] = std_to_wx (j->text());
                        ++j;
                        ++k;
                }
@@ -249,7 +251,7 @@ ClosedCaptionsDialog::update_tracks (shared_ptr<const Film> film)
 
        _track->Clear ();
        for (auto const& i: _tracks) {
-               _track->Append (std_to_wx(String::compose("%1 (%2)", i.name, i.language)));
+               _track->Append (std_to_wx(String::compose("%1 (%2)", i.name, i.language ? i.language->to_string() : wx_to_std(_("Unknown")))));
        }
 
        if (_track->GetCount() > 0) {