X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.cc;h=2fecdc086433996267e0a9dc6ef8959697cc5bc9;hb=151a21e155c77f50b7c06904a925e176e3cb482d;hp=9e38e9e687ff1e4f3b842fc4531d903da1435f99;hpb=4e4968464eeef1956cb82392e1fc3b27a792ab89;p=dcpomatic.git

diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index 9e38e9e68..2fecdc086 100644
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -22,12 +22,11 @@
 #include "dcpomatic_button.h"
 #include "fonts_dialog.h"
 #include "system_font_dialog.h"
-#include "wx_ptr.h"
 #include "wx_util.h"
 #include "lib/content.h"
 #include "lib/font.h"
-#include "lib/scope_guard.h"
 #include "lib/text_content.h"
+#include <dcp/filesystem.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
@@ -121,7 +120,7 @@ FontsDialog::setup ()
 		_fonts->SetItem(n, 0, id);
 		_fonts->SetItemData(n, i->id().empty());
 		if (i->file()) {
-			_fonts->SetItem(n, 1, i->file()->leaf().string());
+			_fonts->SetItem(n, 1, i->file()->filename().string());
 		}
 		++n;
 	}
@@ -175,7 +174,7 @@ FontsDialog::set_from_file_clicked ()
         */
         wxString default_dir = "";
 #ifdef DCPOMATIC_LINUX
-        if (boost::filesystem::exists ("/usr/share/fonts/truetype")) {
+        if (dcp::filesystem::exists("/usr/share/fonts/truetype")) {
                 default_dir = "/usr/share/fonts/truetype";
         } else {
                 default_dir = "/usr/share/fonts";