Merge master.

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

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index bebfa3f5f8d2f00c3cdea476a5b7e6fde8f9b9ae..72b00ddeb4867065943d41b7ca41ad1295d632a8 100644 (file)
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -26,8 +26,11 @@ class Timecode : public wxPanel
 public:
        Timecode (wxWindow *);
 
-       void set (Time, int);
-       Time get (int) const;
+       void set (DCPTime, int);
+       DCPTime get (int) const;
+       void clear ();
+
+       void set_editable (bool);
 
        boost::signals2::signal<void ()> Changed;
 
@@ -35,10 +38,13 @@ private:
        void changed ();
        void set_clicked ();
        
+       wxSizer* _sizer;
+       wxPanel* _editable;
        wxTextCtrl* _hours;
        wxTextCtrl* _minutes;
        wxTextCtrl* _seconds;
        wxTextCtrl* _frames;
        wxButton* _set_button;
+       wxStaticText* _fixed;
 };