X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.h;h=c741131c41c4cd707a7aea7e3e1aa2eab0049dfc;hb=82b08e910e07bb571b11368124d49dc3d73e33ca;hp=0ef3658cfd7f572f32fc0bc96398bbd64b8cd739;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/wx/fonts_dialog.h b/src/wx/fonts_dialog.h
index 0ef3658cf..c741131c4 100644
--- a/src/wx/fonts_dialog.h
+++ b/src/wx/fonts_dialog.h
@@ -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,15 +18,22 @@
 
 */
 
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
+#include <memory>
+
 
 class Content;
 class TextContent;
+namespace dcpomatic {
+	class Font;
+}
+
 
 class FontsDialog : public wxDialog
 {
@@ -37,10 +44,13 @@ private:
 	void setup ();
 	void setup_sensitivity ();
 	void selection_changed ();
-	void edit_clicked ();
+	void set_from_file_clicked ();
+	void set_from_system_font_clicked ();
+	std::shared_ptr<dcpomatic::Font> get_selection ();
 
 	std::weak_ptr<Content> _content;
 	std::weak_ptr<TextContent> _caption;
 	wxListCtrl* _fonts;
-	wxButton* _edit;
+	wxButton* _set_from_file;
+	wxButton* _set_from_system_font = nullptr;
 };