Hand-apply b737b25e10a4bcfb8cb645e95a089192347b4805 from master; more deflickering.

[dcpomatic.git] / src / wx / timecode.h

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 7a34b80fec949eecf69eb06dec2bcab319404f80..620782567fabf789b51523c7a2facc7c46955334 100644 (file)
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -37,6 +37,8 @@ public:
 
        boost::signals2::signal<void ()> Changed;
 
+       static wxSize size (wxWindow* parent);
+
 protected:
        void changed ();
        void set_clicked ();
@@ -61,7 +63,7 @@ public:
 
        }
 
-       void set (T t, int fps)
+       void set (T t, float fps)
        {
                int h;
                int m;
@@ -74,7 +76,7 @@ public:
                checked_set (_seconds, boost::lexical_cast<std::string> (s));
                checked_set (_frames, boost::lexical_cast<std::string> (f));
                
-               _fixed->SetLabel (std_to_wx (t.timecode (fps)));
+               checked_set (_fixed, t.timecode (fps));
        }
 
        T get (int fps) const