projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build following previous commit.
[dcpomatic.git]
/
src
/
wx
/
kdm_timing_panel.h
diff --git
a/src/wx/kdm_timing_panel.h
b/src/wx/kdm_timing_panel.h
index d71e2d29265788d2939651930e9b74f71e450576..a926864dbb72da8ee1904c68271064b6229c0a3a 100644
(file)
--- a/
src/wx/kdm_timing_panel.h
+++ b/
src/wx/kdm_timing_panel.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-22,12
+23,12
@@
#include <boost/signals2.hpp>
class wxDatePickerCtrl;
#include <boost/signals2.hpp>
class wxDatePickerCtrl;
-class
wxTimePickerCtrl
;
+class
TimePicker
;
class KDMTimingPanel : public wxPanel
{
public:
class KDMTimingPanel : public wxPanel
{
public:
- KDMTimingPanel (wxWindow* parent);
+
explicit
KDMTimingPanel (wxWindow* parent);
/** @return KDM from time in local time */
boost::posix_time::ptime from () const;
/** @return KDM from time in local time */
boost::posix_time::ptime from () const;
@@
-40,11
+41,11
@@
public:
private:
void changed () const;
private:
void changed () const;
- static boost::posix_time::ptime posix_time (wxDatePickerCtrl *,
wxTimePickerCtrl
*);
+ static boost::posix_time::ptime posix_time (wxDatePickerCtrl *,
TimePicker
*);
wxDatePickerCtrl* _from_date;
wxDatePickerCtrl* _until_date;
wxDatePickerCtrl* _from_date;
wxDatePickerCtrl* _until_date;
-
wxTimePickerCtrl
* _from_time;
-
wxTimePickerCtrl
* _until_time;
+
TimePicker
* _from_time;
+
TimePicker
* _until_time;
wxStaticText* _warning;
};
wxStaticText* _warning;
};