X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fdir_picker_ctrl.cc;h=2330e584a5ea90748ac682a8367cdb1041bdd055;hp=368ff863d8f7eff10a738b19f4b6567cf1581142;hb=ad5c8849fc3ef5aad88201f28db5474a60db4436;hpb=7fa5d6964891ea199e449d30e2591bf61645247b

diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index 368ff863d..2330e584a 100644
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -28,19 +28,19 @@
 using namespace std;
 using namespace boost;
 
-DirPickerCtrl::DirPickerCtrl (wxWindow* parent, wxSize size)
-	: wxPanel (parent, wxID_ANY, wxDefaultPosition, size)
+DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
+	: wxPanel (parent)
 {
 	_sizer = new wxBoxSizer (wxHORIZONTAL);
 
-	_folder = new wxStaticText (this, wxID_ANY, wxT ("This is the length of the folder label"));
+	_folder = new wxStaticText (this, wxID_ANY, 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 +54,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