Merge branch 'master' into content-rework-take5

[dcpomatic.git] / src / wx / filter_dialog.cc

diff --git a/src/wx/filter_dialog.cc b/src/wx/filter_dialog.cc
index bd844845298bcdd3012eed9308ea732c33b4e765..2abe53026532aff7a42c54862132067898cdfccc 100644 (file)
--- a/src/wx/filter_dialog.cc
+++ b/src/wx/filter_dialog.cc
@@ -26,15 +26,16 @@
 #include "filter_view.h"
 
 using namespace std;
+using boost::bind;
 
 FilterDialog::FilterDialog (wxWindow* parent, vector<Filter const *> const & f)
-       : wxDialog (parent, wxID_ANY, _("Filters"))
+       : wxDialog (parent, wxID_ANY, wxString (_("Filters")))
        , _filters (new FilterView (this, f))
 {
        wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-       sizer->Add (_filters, 1, wxEXPAND);
+       sizer->Add (_filters, 1, wxEXPAND | wxALL, 6);
 
-       _filters->ActiveChanged.connect (sigc::mem_fun (*this, &FilterDialog::active_changed));
+       _filters->ActiveChanged.connect (bind (&FilterDialog::active_changed, this));
 
        wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
        if (buttons) {