projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dolby is apparently recreating all their certificates (as they will soon expire)...
[dcpomatic.git]
/
src
/
wx
/
custom_scale_dialog.cc
diff --git
a/src/wx/custom_scale_dialog.cc
b/src/wx/custom_scale_dialog.cc
index 48f476a9f7bbd1c368ba6f14f67978305c1a1545..e750b9baa053d60bb5628503e839c31c3ff4b5dd 100644
(file)
--- a/
src/wx/custom_scale_dialog.cc
+++ b/
src/wx/custom_scale_dialog.cc
@@
-23,12
+23,12
@@
#include "wx_util.h"
#include "lib/util.h"
#include <dcp/raw_convert.h>
#include "wx_util.h"
#include "lib/util.h"
#include <dcp/raw_convert.h>
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/propgrid/property.h>
#include <wx/propgrid/props.h>
#include <wx/propgrid/property.h>
#include <wx/propgrid/props.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
using boost::optional;
using boost::optional;