X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftime_picker.h;h=50177afd3e49a78c4f719828a37682d35b2eabca;hb=c3802179cb922adc58232dcd5a29fc3962494293;hp=53b0ce2b8886214128ce476b1de2c2efe6f1f05d;hpb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;p=dcpomatic.git diff --git a/src/wx/time_picker.h b/src/wx/time_picker.h index 53b0ce2b8..50177afd3 100644 --- a/src/wx/time_picker.h +++ b/src/wx/time_picker.h @@ -18,10 +18,11 @@ */ -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS + +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include class wxSpinCtrl; @@ -44,8 +45,8 @@ class TimePickerSpin : public TimePicker public: TimePickerSpin (wxWindow* parent, wxDateTime time); - int hours () const; - int minutes () const; + int hours () const override; + int minutes () const override; private: void changed (); @@ -60,8 +61,8 @@ class TimePickerText : public TimePicker public: TimePickerText (wxWindow* parent, wxDateTime time); - int hours () const; - int minutes () const; + int hours () const override; + int minutes () const override; private: void changed ();