X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdir_picker_ctrl.cc;h=ffd3b6fa115a116b63d6c352c1c7d29d2c5487b0;hb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;hp=aafc0e381da42a3ef53ef293198b74a8e7ea214a;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index aafc0e381..ffd3b6fa1 100644
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -18,12 +18,13 @@
 
 */
 
+#include "dir_picker_ctrl.h"
+#include "wx_util.h"
+#include "static_text.h"
 #include <wx/wx.h>
 #include <wx/stdpaths.h>
 #include <wx/filepicker.h>
 #include <boost/filesystem.hpp>
-#include "dir_picker_ctrl.h"
-#include "wx_util.h"
 
 using namespace std;
 using namespace boost;
@@ -33,14 +34,14 @@ DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
 {
 	_sizer = new wxBoxSizer (wxHORIZONTAL);
 
-	_folder = new wxStaticText (this, wxID_ANY, wxT ("This is the length of the folder label"));
+	_folder = new StaticText (this, wxT(""));
 	_sizer->Add (_folder, 1, wxEXPAND | wxALL, 6);
 	_browse = new wxButton (this, wxID_ANY, _("Browse..."));
 	_sizer->Add (_browse, 0);
 
-	SetSizerAndFit (_sizer);
+	SetSizer (_sizer);
 
-	_browse->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DirPickerCtrl::browse_clicked, this));
+	_browse->Bind (wxEVT_BUTTON, boost::bind (&DirPickerCtrl::browse_clicked, this));
 }
 
 void
@@ -54,11 +55,11 @@ DirPickerCtrl::SetPath (wxString p)
 		_folder->SetLabel (std_to_wx (filesystem::path (wx_to_std (_path)).leaf().string()));
 	}
 
-	wxCommandEvent ev (wxEVT_COMMAND_DIRPICKER_CHANGED, wxID_ANY);
+	wxCommandEvent ev (wxEVT_DIRPICKER_CHANGED, wxID_ANY);
 	GetEventHandler()->ProcessEvent (ev);
 
 	_sizer->Layout ();
-	_sizer->SetSizeHints (this);
+	SetMinSize (wxSize (max (400, _sizer->GetSize().GetWidth()), -1));
 }
 
 wxString