swaroop: fix sense of skippable property.

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

diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index 269dad6780fdb058465fff2e69f1d5f39ac24cf1..0660eea39ec2fbdec05f327f6270b46a4e02b3b0 100644 (file)
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -22,9 +22,10 @@
 #include "wx_util.h"
 #include "system_font_dialog.h"
 #include "font_files_dialog.h"
+#include "dcpomatic_button.h"
 #include "lib/font.h"
 #include "lib/content.h"
-#include "lib/caption_content.h"
+#include "lib/text_content.h"
 #include <wx/wx.h>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -34,7 +35,7 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 
-FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content, shared_ptr<CaptionContent> caption)
+FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content, shared_ptr<TextContent> caption)
        : wxDialog (parent, wxID_ANY, _("Fonts"))
        , _content (content)
        , _caption (caption)
@@ -76,7 +77,7 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content, shared_
        wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
        sizer->Add (_fonts, 1, wxEXPAND | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
 
-       _edit = new wxButton (this, wxID_ANY, _("Edit..."));
+       _edit = new Button (this, _("Edit..."));
        sizer->Add (_edit, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
 
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
@@ -100,7 +101,7 @@ void
 FontsDialog::setup ()
 {
        shared_ptr<Content> content = _content.lock ();
-       shared_ptr<CaptionContent> caption = _caption.lock ();
+       shared_ptr<TextContent> caption = _caption.lock ();
        if (!content || !caption) {
                return;
        }
@@ -140,7 +141,7 @@ void
 FontsDialog::edit_clicked ()
 {
        shared_ptr<Content> content = _content.lock ();
-       shared_ptr<CaptionContent> caption = _caption.lock ();
+       shared_ptr<TextContent> caption = _caption.lock ();
        if (!content || !caption) {
                return;
        }