diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-22 01:19:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-22 01:19:33 +0100 |
| commit | 129d868fb0bd10b18da0663911117d68ff90bf97 (patch) | |
| tree | f613643248269ef36c7821603c19847e6e9a47c3 /src/wx | |
| parent | c5fe4e83db7a6fa7263e0d67804fd5a5569bf00a (diff) | |
| parent | 5e9e59e044fe3b51352d5dccad7f11882c6a571c (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/dir_picker_ctrl.cc | 4 | ||||
| -rw-r--r-- | src/wx/dir_picker_ctrl.h | 5 | ||||
| -rw-r--r-- | src/wx/new_film_dialog.cc | 2 |
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 |