X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fhints_dialog.cc;h=7a44e22676b0305578052d4e1d287ed5b08f6376;hb=790db8faab093231664c402fcc33b0b96687e222;hp=db576da160865a887bbeefc91d29261db5c2e07e;hpb=2b38e2bb56be58db90577c42ec9f2f7586fb8e1c;p=dcpomatic.git

diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index db576da16..7a44e2267 100644
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -26,10 +26,10 @@
 #include "lib/film.h"
 #include "lib/hints.h"
 #include "lib/config.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/richtext/richtextctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::max;
@@ -62,9 +62,9 @@ HintsDialog::HintsDialog (wxWindow* parent, std::weak_ptr<Film> film, bool ok)
 	sizer->Add (_text, 1, wxEXPAND | wxALL, 6);
 
 	if (!ok) {
-		wxCheckBox* b = new CheckBox (this, _("Don't show hints again"));
+		auto b = new CheckBox(this, _("Don't show hints again"));
 		sizer->Add (b, 0, wxALL, 6);
-		b->Bind (wxEVT_CHECKBOX, bind (&HintsDialog::shut_up, this, _1));
+		b->bind(&HintsDialog::shut_up, this, _1);
 	}
 
 	auto buttons = CreateStdDialogButtonSizer (0);
@@ -117,10 +117,10 @@ HintsDialog::film_change (ChangeType type)
 	_finished = false;
 
 	_hints.reset (new Hints (_film));
-	_hints->Hint.connect (bind (&HintsDialog::hint, this, _1));
-	_hints->Progress.connect (bind (&HintsDialog::progress, this, _1));
-	_hints->Pulse.connect (bind (&HintsDialog::pulse, this));
-	_hints->Finished.connect (bind (&HintsDialog::finished, this));
+	_hints_hint_connection = _hints->Hint.connect(bind(&HintsDialog::hint, this, _1));
+	_hints_progress_connection = _hints->Progress.connect(bind(&HintsDialog::progress, this, _1));
+	_hints_pulse_connection = _hints->Pulse.connect(bind(&HintsDialog::pulse, this));
+	_hints_finished_connection = _hints->Finished.connect(bind(&HintsDialog::finished, this));
 	_hints->start ();
 }