X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fhints_dialog.h;h=4c4449a26ba6ff0c66a82a24621f383da8f57224;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=2755c70fdf8f8f9c47b9a6e047a3828dc8f5d2b4;hpb=4408e6eea87ce9630e71e4a7d40e2dade091b0ee;p=dcpomatic.git diff --git a/src/wx/hints_dialog.h b/src/wx/hints_dialog.h index 2755c70fd..4c4449a26 100644 --- a/src/wx/hints_dialog.h +++ b/src/wx/hints_dialog.h @@ -19,8 +19,10 @@ */ #include "lib/types.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include -#include +DCPOMATIC_ENABLE_WARNINGS #include class wxRichTextCtrl; @@ -30,7 +32,7 @@ class Hints; class HintsDialog : public wxDialog { public: - HintsDialog (wxWindow* parent, boost::weak_ptr, bool ok); + HintsDialog (wxWindow* parent, std::weak_ptr, bool ok); private: void film_change (ChangeType); @@ -42,12 +44,13 @@ private: void finished (); void progress (std::string m); - boost::weak_ptr _film; + std::weak_ptr _film; wxGauge* _gauge; wxStaticText* _gauge_message; wxRichTextCtrl* _text; - boost::shared_ptr _hints; + boost::scoped_ptr _hints; std::list _current; + bool _finished; boost::signals2::scoped_connection _film_change_connection; boost::signals2::scoped_connection _film_content_change_connection;