Move Film::make_kdms to the call sites.

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

diff --git a/src/wx/filter_dialog.cc b/src/wx/filter_dialog.cc
index e52efb68b0e54d323ff0a2a228626407859aeb58..ac3e354045718516f97109a6b55a1c4c408511bf 100644 (file)
--- a/src/wx/filter_dialog.cc
+++ b/src/wx/filter_dialog.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -23,25 +24,33 @@
 
 #include "lib/film.h"
 #include "filter_dialog.h"
+#include "filter_editor.h"
 
 using namespace std;
+using boost::bind;
 
-FilterDialog::FilterDialog (vector<Filter const *> const & f)
-       : Gtk::Dialog ("Filters")
-       , _filters (f)
+FilterDialog::FilterDialog (wxWindow* parent, vector<Filter const *> const & f)
+       : wxDialog (parent, wxID_ANY, wxString (_("Filters")))
+       , _filters (new FilterEditor (this, f))
 {
-       get_vbox()->pack_start (_filters.widget ());
+       wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+       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));
 
-       add_button ("Close", Gtk::RESPONSE_CLOSE);
+       wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+       if (buttons) {
+               sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+       }
 
-       show_all ();
+       SetSizer (sizer);
+       sizer->Layout ();
+       sizer->SetSizeHints (this);
 }
-       
+
 
 void
 FilterDialog::active_changed ()
 {
-       ActiveChanged (_filters.active ());
+       ActiveChanged (_filters->active ());
 }