projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move _state_timer into VideoView.
[dcpomatic.git]
/
src
/
wx
/
dir_picker_ctrl.cc
diff --git
a/src/wx/dir_picker_ctrl.cc
b/src/wx/dir_picker_ctrl.cc
index 368ff863d8f7eff10a738b19f4b6567cf1581142..b05e73273d99d0703379ff109b5c1e70f200b9cf 100644
(file)
--- a/
src/wx/dir_picker_ctrl.cc
+++ b/
src/wx/dir_picker_ctrl.cc
@@
-18,29
+18,31
@@
*/
*/
+#include "dir_picker_ctrl.h"
+#include "wx_util.h"
+#include "static_text.h"
+#include "dcpomatic_button.h"
#include <wx/wx.h>
#include <wx/stdpaths.h>
#include <wx/filepicker.h>
#include <boost/filesystem.hpp>
#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;
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);
{
_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);
_sizer->Add (_folder, 1, wxEXPAND | wxALL, 6);
- _browse = new
wxButton (this, wxID_ANY
, _("Browse..."));
+ _browse = new
Button (this
, _("Browse..."));
_sizer->Add (_browse, 0);
_sizer->Add (_browse, 0);
- SetSizer
AndFit
(_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
}
void
@@
-54,11
+56,11
@@
DirPickerCtrl::SetPath (wxString p)
_folder->SetLabel (std_to_wx (filesystem::path (wx_to_std (_path)).leaf().string()));
}
_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 ();
GetEventHandler()->ProcessEvent (ev);
_sizer->Layout ();
-
_sizer->SetSizeHints (this
);
+
SetMinSize (wxSize (max (400, _sizer->GetSize().GetWidth()), -1)
);
}
wxString
}
wxString