X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.h;h=c741131c41c4cd707a7aea7e3e1aa2eab0049dfc;hb=d0188ed3e1ea5536e729e93b87d54114368120ac;hp=260e74c3dcd58715f79e1b8f762446fdf1a4e773;hpb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;p=dcpomatic.git

diff --git a/src/wx/fonts_dialog.h b/src/wx/fonts_dialog.h
index 260e74c3d..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,31 +18,39 @@
 
 */
 
-#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
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
+#include <memory>
+
 
 class Content;
 class TextContent;
+namespace dcpomatic {
+	class Font;
+}
+
 
 class FontsDialog : public wxDialog
 {
 public:
-	FontsDialog (wxWindow* parent, boost::shared_ptr<Content>, boost::shared_ptr<TextContent> caption);
+	FontsDialog (wxWindow* parent, std::shared_ptr<Content>, std::shared_ptr<TextContent> caption);
 
 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 ();
 
-	boost::weak_ptr<Content> _content;
-	boost::weak_ptr<TextContent> _caption;
+	std::weak_ptr<Content> _content;
+	std::weak_ptr<TextContent> _caption;
 	wxListCtrl* _fonts;
-	wxButton* _edit;
+	wxButton* _set_from_file;
+	wxButton* _set_from_system_font = nullptr;
 };