Port filters dialog. Make command line loading work again.

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

diff --git a/src/wx/filter_view.cc b/src/wx/filter_view.cc
index f686c204d500cf1a3aa6f63eb40c9cbf60dd3e51..8d9535d812c300bcfd2ff2f70848ed67af1bbf90 100644 (file)
--- a/src/wx/filter_view.cc
+++ b/src/wx/filter_view.cc
@@ -18,43 +18,38 @@
 */
 
 /** @file  src/filter_view.cc
- *  @brief A widget to select FFmpeg filters.
+ *  @brief A panel to select FFmpeg filters.
  */
 
 #include <iostream>
+#include <algorithm>
 #include "lib/filter.h"
 #include "filter_view.h"
+#include "wx_util.h"
 
 using namespace std;
 
-FilterView::FilterView (vector<Filter const *> const & active)
+FilterView::FilterView (wxWindow* parent, vector<Filter const *> const & active)
+       : wxPanel (parent)
 {
-       _box.set_spacing (4);
+       wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+       SetSizer (sizer);
        
        vector<Filter const *> filters = Filter::all ();
 
        for (vector<Filter const *>::iterator i = filters.begin(); i != filters.end(); ++i) {
-               Gtk::CheckButton* b = Gtk::manage (new Gtk::CheckButton ((*i)->name()));
+               wxCheckBox* b = new wxCheckBox (this, wxID_ANY, std_to_wx ((*i)->name ()));
                bool const a = find (active.begin(), active.end(), *i) != active.end ();
-               b->set_active (a);
-               _filters[*i] = a;
-               b->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &FilterView::filter_toggled), *i));
-               _box.pack_start (*b, false, false);
+               b->SetValue (a);
+               _filters[*i] = b;
+               b->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilterView::filter_toggled), 0, this);
+               sizer->Add (b);
        }
-
-       _box.show_all ();
-}
-
-Gtk::Widget &
-FilterView::widget ()
-{
-       return _box;
 }
 
 void
-FilterView::filter_toggled (Filter const * f)
+FilterView::filter_toggled (wxCommandEvent &)
 {
-       _filters[f] = !_filters[f];
        ActiveChanged ();
 }
 
@@ -62,8 +57,8 @@ vector<Filter const*>
 FilterView::active () const
 {
        vector<Filter const *> active;
-       for (map<Filter const *, bool>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
-               if (i->second) {
+       for (map<Filter const *, wxCheckBox*>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
+               if (i->second->IsChecked ()) {
                        active.push_back (i->first);
                }
        }