Merge master.

[dcpomatic.git] / src / wx / new_film_dialog.cc

diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index 289926b8e6a0f870abc62b492c95dcceafe05c26..d4b78d5bff1ad845afd1732c3ef79c83720aecf7 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 DVDOMATIC_USE_OWN_DIR_PICKER
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
 #include "dir_picker_ctrl.h"
 #endif
 
@@ -37,7 +37,7 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
        SetSizer (overall_sizer);
        
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, DVDOMATIC_SIZER_X_GAP, DVDOMATIC_SIZER_Y_GAP);
+       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
        table->AddGrowableCol (1, 1);
        overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
 
@@ -47,7 +47,7 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
 
        add_label_to_sizer (table, this, _("Create in folder"), true);
 
-#ifdef DVDOMATIC_USE_OWN_DIR_PICKER
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
        _folder = new DirPickerCtrl (this); 
 #else  
        _folder = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);