X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=55de4b1c706286b9503bb868fca3cbb4439a378f;hp=fad3779bd07ed5339ff96b7915a897ba3ae12307;hb=96107588e0ddf383d21ff00b4d3febb313e43794;hpb=47d83b296248119d04b9226fd51a67e2fd3faac5

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index fad3779bd..55de4b1c7 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -34,15 +34,15 @@
 #include "lib/job_manager.h"
 #include "lib/util.h"
 #include "lib/version.h"
-#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
 #include <wx/splash.h>
 #include <wx/progdlg.h>
 #include <wx/filepicker.h>
 #include <wx/sizer.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 
 
@@ -101,7 +101,7 @@ add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool left, int prop, in
 	setup_osx_flags (s, left, flags);
 #endif
 	auto m = create_label (p, t, left);
-	s->Add (m, prop, flags, 6);
+	s->Add (m, prop, flags, DCPOMATIC_SIZER_GAP);
 	return m;
 }
 
@@ -116,7 +116,7 @@ add_label_to_sizer (wxSizer* s, wxStaticText* t, bool, int prop, int flags)
 #ifdef __WXOSX__
 	setup_osx_flags (s, left, flags);
 #endif
-	s->Add (t, prop, flags, 6);
+	s->Add (t, prop, flags, DCPOMATIC_SIZER_GAP);
 	return t;
 }
 
@@ -297,7 +297,7 @@ checked_set (wxChoice* widget, string value)
 
 
 void
-checked_set (wxChoice* widget, vector<pair<string, string> > items)
+checked_set (wxChoice* widget, vector<pair<string, string>> items)
 {
        vector<pair<string, string>> current;
        for (unsigned int i = 0; i < widget->GetCount(); ++i) {