std::shared_ptr

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

diff --git a/src/wx/content_properties_dialog.cc b/src/wx/content_properties_dialog.cc
index acc232df4cd8445c69ec5ba12f1d763d8ec1b681..bf1f67ace40c5b8fc0649b06a8fe52ea1b74dc3f 100644 (file)
--- a/src/wx/content_properties_dialog.cc
+++ b/src/wx/content_properties_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,10 +20,10 @@
 
 #include "content_properties_dialog.h"
 #include "wx_util.h"
+#include "static_text.h"
 #include "lib/content.h"
 #include "lib/video_content.h"
 #include "lib/audio_content.h"
-#include <dcp/raw_convert.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 
@@ -31,15 +31,14 @@ using std::string;
 using std::list;
 using std::pair;
 using std::map;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
-using dcp::raw_convert;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
-ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<Content> content)
+ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<const Film> film, shared_ptr<Content> content)
        : TableDialog (parent, _("Content Properties"), 2, 1, false)
 {
        map<UserProperty::Category, list<UserProperty> > grouped;
-       BOOST_FOREACH (UserProperty i, content->user_properties()) {
+       BOOST_FOREACH (UserProperty i, content->user_properties(film)) {
                if (grouped.find(i.category) == grouped.end()) {
                        grouped[i.category] = list<UserProperty> ();
                }
@@ -82,7 +81,7 @@ ContentPropertiesDialog::maybe_add_group (map<UserProperty::Category, list<UserP
                break;
        }
 
-       wxStaticText* m = new wxStaticText (this, wxID_ANY, category_name);
+       wxStaticText* m = new StaticText (this, category_name);
        wxFont font (*wxNORMAL_FONT);
        font.SetWeight (wxFONTWEIGHT_BOLD);
        m->SetFont (font);
@@ -94,6 +93,6 @@ ContentPropertiesDialog::maybe_add_group (map<UserProperty::Category, list<UserP
 
        BOOST_FOREACH (UserProperty j, i->second) {
                add (std_to_wx (j.key), true);
-               add (new wxStaticText (this, wxID_ANY, std_to_wx (j.value + " " + j.unit)));
+               add (new StaticText (this, std_to_wx (j.value + " " + j.unit)));
        }
 }