pot/merge.

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

diff --git a/src/wx/time_picker.h b/src/wx/time_picker.h
index 53e31a06a8d21e15c26cfe90f3d29b8b1a161de3..53b0ce2b8886214128ce476b1de2c2efe6f1f05d 100644 (file)
--- a/src/wx/time_picker.h
+++ b/src/wx/time_picker.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,24 +18,54 @@
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class wxSpinCtrl;
 
+
 class TimePicker : public wxPanel
 {
 public:
-       TimePicker (wxWindow* parent, wxDateTime time);
+       TimePicker (wxWindow* parent);
 
-       int hours () const;
-       int minutes () const;
+       virtual int hours () const = 0;
+       virtual int minutes () const = 0;
 
        boost::signals2::signal<void ()> Changed;
+};
+
+
+class TimePickerSpin : public TimePicker
+{
+public:
+       TimePickerSpin (wxWindow* parent, wxDateTime time);
+
+       int hours () const;
+       int minutes () const;
 
 private:
-       void spin_changed ();
+       void changed ();
 
        wxSpinCtrl* _hours;
        wxSpinCtrl* _minutes;
 };
+
+
+class TimePickerText : public TimePicker
+{
+public:
+       TimePickerText (wxWindow* parent, wxDateTime time);
+
+       int hours () const;
+       int minutes () const;
+
+private:
+       void changed ();
+
+       wxTextCtrl* _hours;
+       wxTextCtrl* _minutes;
+};