projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libdcp's warnings.h
[dcpomatic.git]
/
src
/
wx
/
dir_picker_ctrl.h
diff --git
a/src/wx/dir_picker_ctrl.h
b/src/wx/dir_picker_ctrl.h
index df6cbffa63afe15621dbe39d15a4272249adc393..f70168db48fa98f08be28deab3d2d34c78cb0bb5 100644
(file)
--- a/
src/wx/dir_picker_ctrl.h
+++ b/
src/wx/dir_picker_ctrl.h
@@
-1,32
+1,45
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-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/>.
*/
*/
+
+#ifndef DCPOMATIC_DIR_PICKER_CTRL
+#define DCPOMATIC_DIR_PICKER_CTRL
+
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/signals2.hpp>
+
class DirPickerCtrl : public wxPanel
{
public:
class DirPickerCtrl : public wxPanel
{
public:
- DirPickerCtrl (wxWindow *);
+
explicit
DirPickerCtrl (wxWindow *);
wxString GetPath () const;
void SetPath (wxString);
wxString GetPath () const;
void SetPath (wxString);
+ boost::signals2::signal<void ()> Changed;
+
private:
void browse_clicked ();
private:
void browse_clicked ();
@@
-36,3
+49,4
@@
private:
wxSizer* _sizer;
};
wxSizer* _sizer;
};
+#endif