Merge branch 'master' of /home/carl/git/dvdomatic

[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 c7106633e4fc3a3d3425b355dcf740f195209879..cc48c422a697bd9c99fc52a02e3279bd2443be94 100644 (file)
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -18,16 +18,22 @@
 */
 
 #include <boost/filesystem.hpp>
+#include <wx/stdpaths.h>
 #include "new_film_dialog.h"
+#ifdef __WXMSW__
+#include "dir_picker_ctrl.h"
+#endif
 #include "wx_util.h"
 
 using namespace std;
 using namespace boost;
 
 NewFilmDialog::NewFilmDialog (wxWindow* parent)
-       : wxDialog (parent, wxID_ANY, _("New Film"))
+       : wxDialog (parent, wxID_ANY, wxString (_("New Film")))
 {
        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);
@@ -37,7 +43,12 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
        table->Add (_name, 1, wxEXPAND);
 
        add_label_to_sizer (table, this, "Create in folder");
+#ifdef __WXMSW__
+       _folder = new DirPickerCtrl (this);
+#else  
        _folder = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);
+#endif
+       _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir());
        table->Add (_folder, 1, wxEXPAND);
 
        wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
@@ -45,7 +56,6 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
                overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
        }
 
-       SetSizer (overall_sizer);
        overall_sizer->Layout ();
        overall_sizer->SetSizeHints (this);
 }