No-op; rename a whole load of wx constants to their shorter equivalents.

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

diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index 9c03299143161c3d64783c6e6d0fdfd19ee71d6e..c85d18e342d37a096f270c51af316c79b8b12cb2 100644 (file)
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -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 ();
 }
@@ -110,8 +110,10 @@ FontsDialog::setup ()
                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;
        }