X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilter_editor.cc;h=32faee35dcfdaa66d11c35fe3ddccf86f512b4b7;hb=3044ef060894c62e8a1cef15ad14078001093982;hp=4dd18004bfcae15547363c413b99d59f93236a6a;hpb=2499c41097f8410cb3016e095a85d68979485a7b;p=dcpomatic.git diff --git a/src/wx/filter_editor.cc b/src/wx/filter_editor.cc index 4dd18004b..32faee35d 100644 --- a/src/wx/filter_editor.cc +++ b/src/wx/filter_editor.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -21,11 +22,13 @@ * @brief A panel to select FFmpeg filters. */ -#include -#include -#include "lib/filter.h" #include "filter_editor.h" #include "wx_util.h" +#include "static_text.h" +#include "check_box.h" +#include "lib/filter.h" +#include +#include using namespace std; @@ -34,7 +37,7 @@ FilterEditor::FilterEditor (wxWindow* parent, vector const & act { wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL); SetSizer (sizer); - + vector filters = Filter::all (); typedef map > CategoryMap; @@ -53,18 +56,18 @@ FilterEditor::FilterEditor (wxWindow* parent, vector const & act for (CategoryMap::iterator i = categories.begin(); i != categories.end(); ++i) { - wxStaticText* c = new wxStaticText (this, wxID_ANY, std_to_wx (i->first)); + wxStaticText* c = new StaticText (this, std_to_wx(i->first)); wxFont font = c->GetFont(); font.SetWeight(wxFONTWEIGHT_BOLD); c->SetFont(font); sizer->Add (c); for (list::iterator j = i->second.begin(); j != i->second.end(); ++j) { - wxCheckBox* b = new wxCheckBox (this, wxID_ANY, std_to_wx ((*j)->name ())); + wxCheckBox* b = new CheckBox (this, std_to_wx ((*j)->name ())); bool const a = find (active.begin(), active.end(), *j) != active.end (); b->SetValue (a); _filters[*j] = b; - b->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilterEditor::filter_toggled, this)); + b->Bind (wxEVT_CHECKBOX, boost::bind (&FilterEditor::filter_toggled, this)); sizer->Add (b); }