- wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
- SetSizer (overall_sizer);
-
- wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
- table->AddGrowableCol (1, 1);
- overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
-
- add_label_to_sizer (table, this, _("Film name"));
- _name = new wxTextCtrl (this, wxID_ANY);
- table->Add (_name, 1, wxEXPAND);
-
- add_label_to_sizer (table, this, _("Create in folder"));
-
- /* GTK 2.24.17 has a buggy GtkFileChooserButton and it was put in Ubuntu 13.04.
- 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)
- _folder = new DirPickerCtrl (this);
-#else
- _folder = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);
+ add (_("Film name"), true);
+ _name = add (new wxTextCtrl (this, wxID_ANY));
+
+ add (_("Create in folder"), true);
+
+#ifdef DCPOMATIC_USE_OWN_PICKER
+ _folder = new DirPickerCtrl (this);
+#else
+ _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));