projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
timecode.h
diff --git
a/src/wx/timecode.h
b/src/wx/timecode.h
index 9b6fe66542e9fec1c1bc8d15d26ccd1c7133fbc6..72b00ddeb4867065943d41b7ca41ad1295d632a8 100644
(file)
--- a/
src/wx/timecode.h
+++ b/
src/wx/timecode.h
@@
-26,18
+26,25
@@
class Timecode : public wxPanel
public:
Timecode (wxWindow *);
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;
private:
boost::signals2::signal<void ()> Changed;
private:
- void changed (wxCommandEvent &);
+ void changed ();
+ void set_clicked ();
+ wxSizer* _sizer;
+ wxPanel* _editable;
wxTextCtrl* _hours;
wxTextCtrl* _minutes;
wxTextCtrl* _seconds;
wxTextCtrl* _frames;
wxTextCtrl* _hours;
wxTextCtrl* _minutes;
wxTextCtrl* _seconds;
wxTextCtrl* _frames;
-
-
bool _in_set
;
+ wxButton* _set_button;
+
wxStaticText* _fixed
;
};
};
+