X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Ffonts_dialog.h;h=612971031bebe7473ea9a196a7e7a105792512f1;hb=d99ce6462e5e17d20f232e02e7ce3b6da078700c;hp=260e74c3dcd58715f79e1b8f762446fdf1a4e773;hpb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;p=dcpomatic.git diff --git a/src/wx/fonts_dialog.h b/src/wx/fonts_dialog.h index 260e74c3d..612971031 100644 --- a/src/wx/fonts_dialog.h +++ b/src/wx/fonts_dialog.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington + Copyright (C) 2014-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,22 +18,24 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS -#include -#include +LIBDCP_ENABLE_WARNINGS #include +#include + class Content; class TextContent; + class FontsDialog : public wxDialog { public: - FontsDialog (wxWindow* parent, boost::shared_ptr, boost::shared_ptr caption); + FontsDialog (wxWindow* parent, std::shared_ptr, std::shared_ptr caption); private: void setup (); @@ -41,8 +43,8 @@ private: void selection_changed (); void edit_clicked (); - boost::weak_ptr _content; - boost::weak_ptr _caption; + std::weak_ptr _content; + std::weak_ptr _caption; wxListCtrl* _fonts; wxButton* _edit; };