summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-21 23:50:39 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-21 23:50:39 +0100
commit7fa5d6964891ea199e449d30e2591bf61645247b (patch)
tree6d2a5541e24c17f3b479f92c04d2d3f498954625 /src
parenta8a0dfd1b21de6c0facf965ab119833ff6f790bf (diff)
Make our own DirPicker wider in the new file dialog (#902).
Diffstat (limited to 'src')
-rw-r--r--src/wx/dir_picker_ctrl.cc4
-rw-r--r--src/wx/dir_picker_ctrl.h5
-rw-r--r--src/wx/new_film_dialog.cc2
3 files changed, 5 insertions, 6 deletions
diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index aafc0e381..368ff863d 100644
--- 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 2ab2a5714..383362f57 100644
--- 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 04b9e1057..df5890f2c 100644
--- 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