projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Daniel Courville to testers.
[dcpomatic.git]
/
src
/
wx
/
html_dialog.h
diff --git
a/src/wx/html_dialog.h
b/src/wx/html_dialog.h
index 2b6924179b8c8252cad5d63cfa3f35477e287e89..c5a538a5ccb03b3bdc59d908339786d7762b24cb 100644
(file)
--- a/
src/wx/html_dialog.h
+++ b/
src/wx/html_dialog.h
@@
-19,10
+19,10
@@
*/
*/
-#include
"lib/warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
class wxHtmlLinkEvent;
class wxHtmlLinkEvent;
@@
-31,7
+31,7
@@
class wxHtmlLinkEvent;
class HTMLDialog : public wxDialog
{
public:
class HTMLDialog : public wxDialog
{
public:
- HTMLDialog (wxWindow* parent, wxString title, wxString html);
+ HTMLDialog (wxWindow* parent, wxString title, wxString html
, bool ok = false
);
private:
void link_clicked (wxHtmlLinkEvent& ev);
private:
void link_clicked (wxHtmlLinkEvent& ev);