X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimecode.h;h=18508847b3af4e0b2f1ddf225f339c1afa7e7be5;hb=f644c272a6a6384f6bfc6ca16ada6208057402a8;hp=7a34b80fec949eecf69eb06dec2bcab319404f80;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 7a34b80fe..18508847b 100644
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 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/>.
 
 */
 
@@ -29,18 +30,21 @@
 class TimecodeBase : public wxPanel
 {
 public:
-	TimecodeBase (wxWindow *);
+	TimecodeBase (wxWindow *, bool set_button);
 
 	void clear ();
 
 	void set_editable (bool);
+	void set_focus ();
 
 	boost::signals2::signal<void ()> Changed;
 
+	static wxSize size (wxWindow* parent);
+
 protected:
 	void changed ();
 	void set_clicked ();
-	
+
 	wxSizer* _sizer;
 	wxPanel* _editable;
 	wxTextCtrl* _hours;
@@ -55,29 +59,29 @@ template <class T>
 class Timecode : public TimecodeBase
 {
 public:
-	Timecode (wxWindow* parent)
-		: TimecodeBase (parent)
+	Timecode (wxWindow* parent, bool set_button = true)
+		: TimecodeBase (parent, set_button)
 	{
 
 	}
 
-	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
+	T get (float fps) const
 	{
 		T t;
 		std::string const h = wx_to_std (_hours->GetValue ());
@@ -88,7 +92,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;
 	}
 };