projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libdcp to fix an error in the player (#2401).
[dcpomatic.git]
/
src
/
wx
/
film_name_location_dialog.h
diff --git
a/src/wx/film_name_location_dialog.h
b/src/wx/film_name_location_dialog.h
index 29fcd338495e3fc832bf845148cd49630e37d73a..083d07cd4d227c5b257a56a87ba5bf5cb302a2a6 100644
(file)
--- a/
src/wx/film_name_location_dialog.h
+++ b/
src/wx/film_name_location_dialog.h
@@
-21,13
+21,14
@@
#include "table_dialog.h"
#include "wx_util.h"
#include "table_dialog.h"
#include "wx_util.h"
-#include
"lib/warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/filepicker.h>
#include <wx/wx.h>
#include <wx/filepicker.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
+class CheckBox;
class DirPickerCtrl;
class DirPickerCtrl;
@@
-51,7
+52,7
@@
private:
#else
wxDirPickerCtrl* _folder;
#endif
#else
wxDirPickerCtrl* _folder;
#endif
-
wx
CheckBox* _use_template;
+ CheckBox* _use_template;
wxChoice* _template_name;
static boost::optional<boost::filesystem::path> _directory;
};
wxChoice* _template_name;
static boost::optional<boost::filesystem::path> _directory;
};