summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-07-08 16:03:33 +0100
committerCarl Hetherington <cth@carlh.net>2015-07-08 16:03:33 +0100
commit5c306d46d8293e0f26fbc6bf8c48f7cdd2508e3a (patch)
treea0d470321a50a1a8d7a07d0b7bbd95efe7f97bae /src
parent80f27f81cc7991f52e4a41c7f687681fd9c15a65 (diff)
Include order tweaks.
Diffstat (limited to 'src')
-rw-r--r--src/wx/kdm_dialog.cc18
-rw-r--r--src/wx/kdm_dialog.h11
2 files changed, 16 insertions, 13 deletions
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 67e1a9951..300800697 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -17,24 +17,24 @@
*/
-#include <wx/treectrl.h>
-#include <wx/datectrl.h>
-#include <wx/timectrl.h>
-#include <wx/stdpaths.h>
-#include <wx/listctrl.h>
-#include <libcxml/cxml.h>
-#include "lib/cinema.h"
-#include "lib/config.h"
-#include "lib/film.h"
#include "kdm_dialog.h"
#include "cinema_dialog.h"
#include "screen_dialog.h"
#include "wx_util.h"
#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
#include "dir_picker_ctrl.h"
+#include "lib/cinema.h"
+#include "lib/config.h"
+#include "lib/film.h"
+#include <libcxml/cxml.h>
#else
#include <wx/filepicker.h>
#endif
+#include <wx/treectrl.h>
+#include <wx/datectrl.h>
+#include <wx/timectrl.h>
+#include <wx/stdpaths.h>
+#include <wx/listctrl.h>
using std::string;
using std::map;
diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h
index 1cf4ddde8..48681a92e 100644
--- a/src/wx/kdm_dialog.h
+++ b/src/wx/kdm_dialog.h
@@ -17,12 +17,13 @@
*/
-#include <map>
-#include <boost/shared_ptr.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
+#include "wx_util.h"
+#include <dcp/types.h>
#include <wx/wx.h>
#include <wx/treectrl.h>
-#include "wx_util.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <map>
class wxTreeCtrl;
class wxDatePickerCtrl;
@@ -32,6 +33,8 @@ class DirPickerCtrl;
class Cinema;
class Screen;
+class Film;
+class CPLSummary;
class KDMDialog : public wxDialog
{