Make our own DirPicker wider in the new file dialog (#902).

diff --git a/ChangeLog b/ChangeLog
index 70670d373717bc47edfe6323c4149b7942c06368..b78aec3582c39f14eb1f67425319e5cbda516571 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-21  Carl Hetherington  <cth@carlh.net>
+
+       * Make new file dialogue bigger on some platforms (#902).
+
 2016-06-20  Carl Hetherington  <cth@carlh.net>
 
        * Updated nl_NL translation from Rob van Nieuwkerk.

diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index aafc0e381da42a3ef53ef293198b74a8e7ea214a..368ff863d8f7eff10a738b19f4b6567cf1581142 100644 (file)
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -28,8 +28,8 @@
 using namespace std;
 using namespace boost;
 
-DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
-       : wxPanel (parent)
+DirPickerCtrl::DirPickerCtrl (wxWindow* parent, wxSize size)
+       : wxPanel (parent, wxID_ANY, wxDefaultPosition, size)
 {
        _sizer = new wxBoxSizer (wxHORIZONTAL);
 

diff --git a/src/wx/dir_picker_ctrl.h b/src/wx/dir_picker_ctrl.h
index 2ab2a5714b8f42d7ae96aa5625421abd45fc5914..383362f570d97095e296d6559af3e2d23da44b36 100644 (file)
--- a/src/wx/dir_picker_ctrl.h
+++ b/src/wx/dir_picker_ctrl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,7 +23,7 @@
 class DirPickerCtrl : public wxPanel
 {
 public:
-       DirPickerCtrl (wxWindow *);
+       DirPickerCtrl (wxWindow *, wxSize size = wxDefaultSize);
 
        wxString GetPath () const;
        void SetPath (wxString);
@@ -36,4 +36,3 @@ private:
        wxString _path;
        wxSizer* _sizer;
 };
-

diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index 04b9e10578889d8f43b59f50f1d178dfd193d9ce..df5890f2c8a2636e1bca97a628f8ec6ac6145c50 100644 (file)
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -41,7 +41,7 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
        add (_("Create in folder"), true);
 
 #ifdef DCPOMATIC_USE_OWN_PICKER
-       _folder = new DirPickerCtrl (this);
+       _folder = new DirPickerCtrl (this, wxSize (300, -1));
 #else
        _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
 #endif