Rename DCPOMATIC_USE_OWN_DIR_PICKER -> DCPOMATIC_USE_OWN_PICKER.

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index dcafee4caff7ae207e499f3bdcac6b5899f4583d..722fa59ce2fa4987378de2cc0976cddc85c11a4b 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -388,7 +388,7 @@ private:
                }
 
                add_label_to_sizer (table, _panel, _("Default directory for new films"), true);
-#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+#ifdef DCPOMATIC_USE_OWN_PICKER
                _directory = new DirPickerCtrl (_panel);
 #else
                _directory = new wxDirPickerCtrl (_panel, wxDD_DIR_MUST_EXIST);
@@ -536,7 +536,7 @@ private:
        wxSpinCtrl* _audio_delay;
        wxButton* _isdcf_metadata_button;
        wxSpinCtrl* _still_length;
-#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+#ifdef DCPOMATIC_USE_OWN_PICKER
        DirPickerCtrl* _directory;
 #else
        wxDirPickerCtrl* _directory;

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index fd97d1c3b0ba9edab799191e34a0ecd94262cb57..db4ad8647bdd83d07a5d64e31434f6cdcefd4a85 100644 (file)
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -20,7 +20,7 @@
 #include "kdm_output_panel.h"
 #include "wx_util.h"
 #include <dcp/types.h>
-#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+#ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #else
 #include <wx/filepicker.h>
@@ -45,7 +45,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
        _write_to = new wxRadioButton (this, wxID_ANY, _("Write to"));
        table->Add (_write_to, 1, wxEXPAND);
 
-#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+#ifdef DCPOMATIC_USE_OWN_PICKER
        _folder = new DirPickerCtrl (this);
 #else
        _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));

diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index d2423b63e67f35f976e08a1114fca3f46a37a336..a9841b3a50b91f9e05930e7772a547a6288e5e9b 100644 (file)
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -38,7 +38,7 @@ public:
 private:
        wxChoice* _type;
        wxRadioButton* _write_to;
-#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+#ifdef DCPOMATIC_USE_OWN_PICKER
        DirPickerCtrl* _folder;
 #else
        wxDirPickerCtrl* _folder;

diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index 96c8a0b0c59fef512ba3791c3d01ae5dca4b440f..eae14df74538e122fdc6957defbd634d1b28a9b5 100644 (file)
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -22,7 +22,7 @@
 #include "lib/config.h"
 #include "new_film_dialog.h"
 #include "wx_util.h"
-#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+#ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #endif
 
@@ -39,7 +39,7 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
 
        add (_("Create in folder"), true);
 
-#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+#ifdef DCPOMATIC_USE_OWN_PICKER
        _folder = new DirPickerCtrl (this);
 #else
        _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));

diff --git a/src/wx/new_film_dialog.h b/src/wx/new_film_dialog.h
index 6ce3d6e3a20cffb7a68862156cbc69bd28bb4a7a..01064f2a6e2c1ad433c9dafce0b6342ed791ea8c 100644 (file)
--- a/src/wx/new_film_dialog.h
+++ b/src/wx/new_film_dialog.h
@@ -34,7 +34,7 @@ public:
 
 private:
        wxTextCtrl* _name;
-#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+#ifdef DCPOMATIC_USE_OWN_PICKER
        DirPickerCtrl* _folder;
 #else
        wxDirPickerCtrl* _folder;

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index da544feb18fc9e3e0a2a975a44274fb75b755caf..5afb978b79b5ceef5b1364107dffc3934280680c 100644 (file)
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -90,7 +90,7 @@ extern double wx_get (wxSpinCtrlDouble* widget);
    Use our own dir picker as this is the least bad option I can think of.
 */
 #if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && (GTK_MICRO_VERSION == 17 || GTK_MICRO_VERSION == 20 || GTK_MICRO_VERSION == 23))
-#define DCPOMATIC_USE_OWN_DIR_PICKER
+#define DCPOMATIC_USE_OWN_PICKER
 #endif
 
 #endif