projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump ffmpeg to 5.1.2 "Riemann"
[dcpomatic.git]
/
src
/
wx
/
dir_picker_ctrl.cc
diff --git
a/src/wx/dir_picker_ctrl.cc
b/src/wx/dir_picker_ctrl.cc
index feb11a52702b62538d0496f84473eda5cbfb349d..6c8fdd1fc3e6b48c82505c7e4278b7c428156466 100644
(file)
--- a/
src/wx/dir_picker_ctrl.cc
+++ b/
src/wx/dir_picker_ctrl.cc
@@
-18,21
+18,24
@@
*/
*/
+
+#include "dcpomatic_button.h"
#include "dir_picker_ctrl.h"
#include "dir_picker_ctrl.h"
-#include "wx_util.h"
#include "static_text.h"
#include "static_text.h"
-#include "dcpomatic_button.h"
-#include "lib/warnings.h"
-#include <wx/wx.h>
-#include <wx/stdpaths.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include "wx_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/filepicker.h>
#include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/stdpaths.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
+
using namespace std;
using namespace boost;
using namespace std;
using namespace boost;
+
DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
: wxPanel (parent)
{
DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
: wxPanel (parent)
{