X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.h;h=a77684cb9e6984e8fb3eecc2efb7683d93b8ca0e;hb=c783cb134af8af6441665e229236800fe347b750;hp=6c6873ea34f5629b2a448633026ca80041795bad;hpb=cbd4450197a083bf58bda510e626f73ba583cb66;p=dcpomatic.git diff --git a/src/wx/fonts_dialog.h b/src/wx/fonts_dialog.h index 6c6873ea3..a77684cb9 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,19 +18,23 @@ */ + +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include #include -#include -#include +DCPOMATIC_ENABLE_WARNINGS #include + class Content; -class CaptionContent; +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 (); @@ -38,8 +42,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; };