Clean up after previous commit.

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

diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index 9c03299143161c3d64783c6e6d0fdfd19ee71d6e..528b3999bd036c529e90ba1bbffe7b19394fde3b 100644 (file)
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,7 +24,7 @@
 #include "font_files_dialog.h"
 #include "lib/font.h"
 #include "lib/content.h"
-#include "lib/subtitle_content.h"
+#include "lib/caption_content.h"
 #include <wx/wx.h>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -88,9 +88,9 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content)
 
        SetSizerAndFit (overall_sizer);
 
-       _edit->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FontsDialog::edit_clicked, this));
-       _fonts->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&FontsDialog::selection_changed, this));
-       _fonts->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&FontsDialog::selection_changed, this));
+       _edit->Bind (wxEVT_BUTTON, boost::bind (&FontsDialog::edit_clicked, this));
+       _fonts->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&FontsDialog::selection_changed, this));
+       _fonts->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&FontsDialog::selection_changed, this));
 
        setup ();
 }
@@ -105,13 +105,15 @@ FontsDialog::setup ()
 
        _fonts->DeleteAllItems ();
        size_t n = 0;
-       BOOST_FOREACH (shared_ptr<Font> i, content->subtitle->fonts ()) {
+       BOOST_FOREACH (shared_ptr<Font> i, content->caption->fonts ()) {
                wxListItem item;
                item.SetId (n);
                _fonts->InsertItem (item);
                _fonts->SetItem (n, 0, std_to_wx (i->id ()));
-               if (i->file(FontFiles::NORMAL)) {
-                       _fonts->SetItem (n, 1, i->file(FontFiles::NORMAL).get().leaf().string ());
+               for (int j = 0; j < FontFiles::VARIANTS; ++j) {
+                       if (i->file(static_cast<FontFiles::Variant>(j))) {
+                               _fonts->SetItem (n, j + 1, i->file(static_cast<FontFiles::Variant>(j)).get().leaf().string ());
+                       }
                }
                ++n;
        }
@@ -143,7 +145,7 @@ FontsDialog::edit_clicked ()
        int const item = _fonts->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
        string const id = wx_to_std (_fonts->GetItemText (item, 0));
        shared_ptr<Font> font;
-       BOOST_FOREACH (shared_ptr<Font> i, content->subtitle->fonts()) {
+       BOOST_FOREACH (shared_ptr<Font> i, content->caption->fonts()) {
                if (i->id() == id) {
                        font = i;
                }