X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fhints_dialog.h;h=37d36459cab6a734af0755f8e7bec4e9a6d463f3;hb=6d716e405a0781c3d6cdc37d3718a8858faf3dd9;hp=2755c70fdf8f8f9c47b9a6e047a3828dc8f5d2b4;hpb=4408e6eea87ce9630e71e4a7d40e2dade091b0ee;p=dcpomatic.git diff --git a/src/wx/hints_dialog.h b/src/wx/hints_dialog.h index 2755c70fd..37d36459c 100644 --- a/src/wx/hints_dialog.h +++ b/src/wx/hints_dialog.h @@ -18,11 +18,15 @@ */ -#include "lib/types.h" + +#include "lib/change_signaller.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include -#include +DCPOMATIC_ENABLE_WARNINGS #include + class wxRichTextCtrl; class Film; class Hints; @@ -30,7 +34,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,13 +46,18 @@ 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; + boost::signals2::scoped_connection _hints_hint_connection; + boost::signals2::scoped_connection _hints_progress_connection; + boost::signals2::scoped_connection _hints_pulse_connection; + boost::signals2::scoped_connection _hints_finished_connection; };