X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimecode.h;h=45a421c4d71774d5ad76eb161f8a842e57a6efb5;hb=1201b14bac64cae911181340719610c376635500;hp=7a34b80fec949eecf69eb06dec2bcab319404f80;hpb=e491397c0028a80ac4a48a92007f783746553c1a;p=dcpomatic.git

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 7a34b80fe..45a421c4d 100644
--- 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,10 +37,12 @@ public:
 
 	boost::signals2::signal<void ()> Changed;
 
+	static wxSize size (wxWindow* parent);
+
 protected:
 	void changed ();
 	void set_clicked ();
-	
+
 	wxSizer* _sizer;
 	wxPanel* _editable;
 	wxTextCtrl* _hours;
@@ -61,20 +63,20 @@ public:
 
 	}
 
-	void set (T t, int fps)
+	void set (T t, float fps)
 	{
 		int h;
 		int m;
 		int s;
 		int f;
 		t.split (fps, h, m, s, f);
-		
+
 		checked_set (_hours, boost::lexical_cast<std::string> (h));
 		checked_set (_minutes, boost::lexical_cast<std::string> (m));
 		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
@@ -88,7 +90,7 @@ public:
 		t += T::from_seconds (boost::lexical_cast<int> (s.empty() ? "0" : s));
 		std::string const f = wx_to_std (_frames->GetValue());
 		t += T::from_seconds (boost::lexical_cast<double> (f.empty() ? "0" : f) / fps);
-		
+
 		return t;
 	}
 };