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 ca6deb9692a033085f0e5f5bba26663385f6aca2..b13e8c3c084b9c35514e805f59e752927fe46ae1 100644
(file)
--- a/
src/wx/timecode.h
+++ b/
src/wx/timecode.h
@@
-26,19
+26,24
@@
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 set_editable (bool);
boost::signals2::signal<void ()> Changed;
private:
boost::signals2::signal<void ()> Changed;
private:
- void changed (
wxCommandEvent &
);
- void set_clicked (
wxCommandEvent &
);
+ void changed ();
+ void set_clicked ();
+ wxSizer* _sizer;
+ wxPanel* _editable;
wxTextCtrl* _hours;
wxTextCtrl* _minutes;
wxTextCtrl* _seconds;
wxTextCtrl* _frames;
wxButton* _set_button;
wxTextCtrl* _hours;
wxTextCtrl* _minutes;
wxTextCtrl* _seconds;
wxTextCtrl* _frames;
wxButton* _set_button;
+ wxStaticText* _fixed;
};
};