X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffonts_dialog.h;h=a77684cb9e6984e8fb3eecc2efb7683d93b8ca0e;hb=6e3e984162ca7a181bc7c98d90c295e88e4e7f6c;hp=ba98e0963877b82ccf05982b4b81da161dd4ce99;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git diff --git a/src/wx/fonts_dialog.h b/src/wx/fonts_dialog.h index ba98e0963..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 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; };