Merge master.

[dcpomatic.git] / src / wx / config_dialog.h

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 3da48fd08f3758207a59de2616ca5e966f6bf15a..459d64dd701327c2e8bd07f6f5f9e027aae58ebd 100644 (file)
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -25,6 +25,7 @@
 #include <wx/spinctrl.h>
 #include <wx/listctrl.h>
 #include <wx/filepicker.h>
+#include "wx_util.h"
 
 class DirPickerCtrl;
 class wxNotebook;
@@ -82,7 +83,7 @@ private:
        wxTextCtrl* _tms_password;
        wxSpinCtrl* _num_local_encoding_threads;
        wxSpinCtrl* _default_still_length;
-#ifdef __WXMSW__       
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
        DirPickerCtrl* _default_directory;
 #else
        wxDirPickerCtrl* _default_directory;