X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.cc;h=668d8798b000bb9105cc02ee26ae3cd71c57e3f9;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=29af6a739d4487e24c49efefd5383c17c462e9b1;hpb=a5d004b0773f633401528392fc28e66d70e13ac8;p=dcpomatic.git

diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index 29af6a739..668d8798b 100644
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,22 +18,27 @@
 
 */
 
+
+#include "dcpomatic_button.h"
 #include "fonts_dialog.h"
-#include "wx_util.h"
 #include "system_font_dialog.h"
-#include "dcpomatic_button.h"
-#include "lib/font.h"
+#include "wx_util.h"
 #include "lib/content.h"
+#include "lib/font.h"
 #include "lib/text_content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <iostream>
+DCPOMATIC_ENABLE_WARNINGS
+#include <memory>
+
 
 using std::list;
-using std::string;
-using std::cout;
 using std::shared_ptr;
+using std::string;
 using namespace dcpomatic;
 
+
 FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content, shared_ptr<TextContent> caption)
 	: wxDialog (parent, wxID_ANY, _("Fonts"))
 	, _content (content)
@@ -57,16 +62,16 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content, shared_
 		_fonts->InsertColumn (1, ip);
 	}
 
-	wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
+	auto sizer = new wxBoxSizer (wxHORIZONTAL);
 	sizer->Add (_fonts, 1, wxEXPAND | wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
 
 	_edit = new Button (this, _("Edit..."));
 	sizer->Add (_edit, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
 
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	auto overall_sizer = new wxBoxSizer (wxVERTICAL);
 	overall_sizer->Add (sizer, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_X_GAP);
 
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+	auto buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {
 		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
@@ -80,11 +85,12 @@ FontsDialog::FontsDialog (wxWindow* parent, shared_ptr<Content> content, shared_
 	setup ();
 }
 
+
 void
 FontsDialog::setup ()
 {
-	shared_ptr<Content> content = _content.lock ();
-	shared_ptr<TextContent> caption = _caption.lock ();
+	auto content = _content.lock ();
+	auto caption = _caption.lock ();
 	if (!content || !caption) {
 		return;
 	}
@@ -105,12 +111,14 @@ FontsDialog::setup ()
 	setup_sensitivity ();
 }
 
+
 void
 FontsDialog::selection_changed ()
 {
 	setup_sensitivity ();
 }
 
+
 void
 FontsDialog::setup_sensitivity ()
 {
@@ -118,17 +126,18 @@ FontsDialog::setup_sensitivity ()
 	_edit->Enable (item != -1);
 }
 
+
 void
 FontsDialog::edit_clicked ()
 {
-	shared_ptr<Content> content = _content.lock ();
-	shared_ptr<TextContent> caption = _caption.lock ();
+	auto content = _content.lock ();
+	auto caption = _caption.lock ();
 	if (!content || !caption) {
 		return;
 	}
 
 	int const item = _fonts->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	string const id = wx_to_std (_fonts->GetItemText (item, 0));
+	auto const id = wx_to_std (_fonts->GetItemText(item, 0));
 	shared_ptr<Font> font;
 	for (auto i: caption->fonts()) {
 		if (i->id() == id) {
@@ -155,7 +164,7 @@ FontsDialog::edit_clicked ()
         default_dir = "/System/Library/Fonts";
 #endif
 
-	wxFileDialog* d = new wxFileDialog (this, _("Choose a font file"), default_dir, wxT(""), wxT("*.ttf;*.otf"), wxFD_CHANGE_DIR);
+	auto d = new wxFileDialog (this, _("Choose a font file"), default_dir, wxT(""), wxT("*.ttf;*.otf;*.ttc"), wxFD_CHANGE_DIR);
 	int const r = d->ShowModal ();
 
 	if (r != wxID_OK) {