projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
wx
/
new_film_dialog.h
diff --git
a/src/wx/new_film_dialog.h
b/src/wx/new_film_dialog.h
index 3d1253ecc7d3cbae849afc61ca20ad3195aca67a..6dc83d815b546528ee54c7ae2706a32024fc036a 100644
(file)
--- a/
src/wx/new_film_dialog.h
+++ b/
src/wx/new_film_dialog.h
@@
-1,39
+1,44
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2014
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/>.
*/
#include <wx/wx.h>
#include <wx/filepicker.h>
*/
#include <wx/wx.h>
#include <wx/filepicker.h>
+#include "wx_util.h"
+#include "table_dialog.h"
class DirPickerCtrl;
class DirPickerCtrl;
-class NewFilmDialog : public
wx
Dialog
+class NewFilmDialog : public
Table
Dialog
{
public:
NewFilmDialog (wxWindow *);
{
public:
NewFilmDialog (wxWindow *);
+ ~NewFilmDialog ();
-
std::string
get_path () const;
+
boost::filesystem::path
get_path () const;
private:
wxTextCtrl* _name;
private:
wxTextCtrl* _name;
-#ifdef
__WXMSW__
+#ifdef
DCPOMATIC_USE_OWN_PICKER
DirPickerCtrl* _folder;
#else
wxDirPickerCtrl* _folder;
DirPickerCtrl* _folder;
#else
wxDirPickerCtrl* _folder;
-#endif
+#endif
+ static boost::optional<boost::filesystem::path> _directory;
};
};