projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include audio mapping in the digest used to distinguish different
[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 ec7854764e048c435819e129467c33a051f0a28f..fad545283acfb47aa3d20c0c37b885a35a76e952 100644
(file)
--- a/
src/wx/dir_picker_ctrl.cc
+++ b/
src/wx/dir_picker_ctrl.cc
@@
-29,7
+29,6
@@
using namespace boost;
DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
: wxPanel (parent)
DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
: wxPanel (parent)
- , _parent (parent)
{
_sizer = new wxBoxSizer (wxHORIZONTAL);
{
_sizer = new wxBoxSizer (wxHORIZONTAL);
@@
-40,7
+39,7
@@
DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
SetSizerAndFit (_sizer);
SetSizerAndFit (_sizer);
- _browse->
Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (DirPickerCtrl::browse_clicked), 0, this
);
+ _browse->
Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DirPickerCtrl::browse_clicked, this)
);
}
void
}
void
@@
-65,10
+64,11
@@
DirPickerCtrl::GetPath () const
}
void
}
void
-DirPickerCtrl::browse_clicked (
wxCommandEvent &
)
+DirPickerCtrl::browse_clicked ()
{
wxDirDialog* d = new wxDirDialog (this);
{
wxDirDialog* d = new wxDirDialog (this);
- d->ShowModal ();
- SetPath (d->GetPath ());
+ if (d->ShowModal () == wxID_OK) {
+ SetPath (d->GetPath ());
+ }
d->Destroy ();
}
d->Destroy ();
}