Move _state_timer into VideoView.

[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 bd20d48e6e99c4326d2ff62e5c5c4d6e28b70aeb..7dcc6f8f1060ce4c5636bf7195facb0f2d6db903 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,7 +20,7 @@
 
 #include "content_properties_dialog.h"
 #include "wx_util.h"
-#include "lib/raw_convert.h"
+#include "static_text.h"
 #include "lib/content.h"
 #include "lib/video_content.h"
 #include "lib/audio_content.h"
@@ -34,11 +34,11 @@ using std::map;
 using boost::shared_ptr;
 using boost::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> ();
                }
@@ -50,13 +50,11 @@ ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<C
        maybe_add_group (grouped, UserProperty::AUDIO);
        maybe_add_group (grouped, UserProperty::LENGTH);
 
-       layout ();
+       /* Nasty hack to stop the bottom property being cut off on Windows / OS X */
+       add (wxString (), false);
+       add (wxString (), false);
 
-       /* SetSizeHints() seems to get it slightly wrong (see #884),
-          so hack in a bit more height.
-       */
-       wxSize const s = GetMinSize ();
-       SetMinSize (wxSize (s.GetWidth(), s.GetHeight() + 32));
+       layout ();
 }
 
 void
@@ -83,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);
@@ -95,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)));
        }
 }