X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fhints_dialog.h;h=37d36459cab6a734af0755f8e7bec4e9a6d463f3;hb=70b72b53eab0f247eb4dc605a2d669d4adb4e469;hp=83510643a3be2264a54766efafbe7549a098aad2;hpb=6c7489e5d778d3e71065d88a094a7383ba2c117d;p=dcpomatic.git diff --git a/src/wx/hints_dialog.h b/src/wx/hints_dialog.h index 83510643a..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,10 +34,10 @@ 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_changed (); + void film_change (ChangeType); void film_content_change (ChangeType type); void shut_up (wxCommandEvent& ev); void update (); @@ -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; - - boost::signals2::scoped_connection _film_changed_connection; - boost::signals2::scoped_connection _film_content_changed_connection; + 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; };