X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_sub_panel.h;h=2a7bc4f75e05b9800fa48b115d7d2d153c3a5d59;hp=7f201ff488773fdd2bcb91246ad2b2ad72a99779;hb=8ccbe70f3c2f5db9e88978a98f3ad5735ece07ab;hpb=031564554ff22efa72bc36c0f058d77056aa8373 diff --git a/src/wx/content_sub_panel.h b/src/wx/content_sub_panel.h index 7f201ff48..2a7bc4f75 100644 --- a/src/wx/content_sub_panel.h +++ b/src/wx/content_sub_panel.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -21,10 +21,11 @@ #ifndef DCPOMATIC_CONTENT_SUB_PANEL_H #define DCPOMATIC_CONTENT_SUB_PANEL_H -#include -#include #include "lib/film.h" -#include "lib/config.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS +#include +DCPOMATIC_ENABLE_WARNINGS class ContentPanel; class Content; @@ -48,17 +49,14 @@ public: protected: - void setup_refer_button (wxCheckBox* button, wxStaticText* note, boost::shared_ptr dcp, bool can_reference, std::string why_not) const; + void setup_refer_button (wxCheckBox* button, wxStaticText* note, std::shared_ptr dcp, bool can_reference, wxString cannot); + void layout (); virtual void add_to_grid () = 0; ContentPanel* _parent; wxSizer* _sizer; wxGridBagSizer* _grid; wxString _name; - -private: - void config_changed (Config::Property); - boost::signals2::scoped_connection _config_connection; }; #endif