From 210e8007d4a4e66cccd0249a221daf0e5599f73d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 15 Mar 2014 20:39:10 +0000 Subject: [PATCH] Force size of wxDirPickerCtrl in a couple of places. --- ChangeLog | 2 ++ src/wx/kdm_dialog.cc | 5 ++--- src/wx/new_film_dialog.cc | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f42277184..e9afa9302 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-03-15 Carl Hetherington + * Improve appearance of new film and KDM dialogs on OS X. + * Fix KDM dialog to predictably set up its initial range to a week from now. diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 17d7bd2a1..1f4d62bde 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -122,7 +122,7 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) } } - table = new wxFlexGridSizer (3, 2, 6); + table = new wxFlexGridSizer (2, 2, 6); _write_to = new wxRadioButton (this, wxID_ANY, _("Write to")); table->Add (_write_to, 1, wxEXPAND); @@ -130,13 +130,12 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) #ifdef DCPOMATIC_USE_OWN_DIR_PICKER _folder = new DirPickerCtrl (this); #else - _folder = new wxDirPickerCtrl (this, wxID_ANY); + _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); #endif _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir()); table->Add (_folder, 1, wxEXPAND); - table->AddSpacer (0); _email = new wxRadioButton (this, wxID_ANY, _("Send by email")); table->Add (_email, 1, wxEXPAND); diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc index e0ad2c457..f6d910282 100644 --- a/src/wx/new_film_dialog.cc +++ b/src/wx/new_film_dialog.cc @@ -50,7 +50,7 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent) #ifdef DCPOMATIC_USE_OWN_DIR_PICKER _folder = new DirPickerCtrl (this); #else - _folder = new wxDirPickerCtrl (this, wxID_ANY); + _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); #endif if (!_directory) { -- 2.30.2