diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-09 20:35:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-09 20:35:39 +0100 |
| commit | 89115db77729a2c99f1a09ff6a461720e16f889e (patch) | |
| tree | e528ec014b820d4e0efa28893dcee91cd76ee618 /src/wx/config_dialog.h | |
| parent | f8ad440cf187c517b7800f3efdfc0954025c4422 (diff) | |
| parent | d2ff6a6b0256e256b6df416f280c846072f7682f (diff) | |
Merge master.
Diffstat (limited to 'src/wx/config_dialog.h')
| -rw-r--r-- | src/wx/config_dialog.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h index 3da48fd08..459d64dd7 100644 --- 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; |