projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix GL information fetching.
[dcpomatic.git]
/
src
/
wx
/
file_dialog_wrapper.h
diff --git
a/src/wx/file_dialog_wrapper.h
b/src/wx/file_dialog_wrapper.h
index 251d1b71d15711462cd0be9cee6a0f038bbb6c9a..8223371dbce0399b2d40ff221dff092eae9d22ec 100644
(file)
--- a/
src/wx/file_dialog_wrapper.h
+++ b/
src/wx/file_dialog_wrapper.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,8
+18,11
@@
*/
*/
+
+#include "wx_util.h"
#include <dcp/util.h>
#include <dcp/util.h>
+
template <class T>
class FileDialogWrapper
{
template <class T>
class FileDialogWrapper
{
@@
-32,9
+35,9
@@
public:
void set (T) {}
void set (T) {}
-
T
get ()
+
boost::optional<T>
get ()
{
{
- return T (dcp::file_to_string
(wx_to_std (_dialog->GetPath
())));
+ return T (dcp::file_to_string
(wx_to_std(_dialog->GetPath
())));
}
int ShowModal ()
}
int ShowModal ()
@@
-49,7
+52,7
@@
public:
delete this;
}
delete this;
}
-pr
ivate
:
+pr
otected
:
wxWindow* _parent;
wxFileDialog* _dialog;
};
wxWindow* _parent;
wxFileDialog* _dialog;
};