X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.h;h=a77684cb9e6984e8fb3eecc2efb7683d93b8ca0e;hb=f984990795e548e2c4160d17d0fa54a40c8b1311;hp=e251ddab183d9412d958126c81bab8ae50b156f2;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/wx/fonts_dialog.h b/src/wx/fonts_dialog.h index e251ddab1..a77684cb9 100644 --- a/src/wx/fonts_dialog.h +++ b/src/wx/fonts_dialog.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2016 Carl Hetherington + Copyright (C) 2014-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,18 +18,23 @@ */ + +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include #include -#include -#include +DCPOMATIC_ENABLE_WARNINGS #include + class Content; +class TextContent; + class FontsDialog : public wxDialog { public: - FontsDialog (wxWindow* parent, boost::shared_ptr); + FontsDialog (wxWindow* parent, std::shared_ptr, std::shared_ptr caption); private: void setup (); @@ -37,7 +42,8 @@ private: void selection_changed (); void edit_clicked (); - boost::weak_ptr _content; + std::weak_ptr _content; + std::weak_ptr _caption; wxListCtrl* _fonts; wxButton* _edit; };