Force size of wxDirPickerCtrl in a couple of places.

diff --git a/ChangeLog b/ChangeLog
index f42277184ff95981064e1f49d16cd0bcefff8f55..e9afa930235b1c1e610bb6f5d064de451c2a4911 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-03-15  Carl Hetherington  <cth@carlh.net>
 
+       * 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 17d7bd2a1a73b676289d0e2c15803c4253494282..1f4d62bde1f90a03d9b2819369c6f69e3454edab 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -122,7 +122,7 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr<const Film> 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<const Film> 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 e0ad2c457625d08fd188fb829ac50bc6d0b68f3a..f6d91028267a98bbd719bc6da4cdc797369e6315 100644 (file)
--- 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) {