projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Note that newer libsub version is required.
[dcpomatic.git]
/
src
/
wx
/
html_dialog.h
diff --git
a/src/wx/html_dialog.h
b/src/wx/html_dialog.h
index 9da4c82151d06b7ce4bf53dc893b5d5c5c0e77c3..c5a538a5ccb03b3bdc59d908339786d7762b24cb 100644
(file)
--- a/
src/wx/html_dialog.h
+++ b/
src/wx/html_dialog.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,17
+18,20
@@
*/
*/
-#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;
+
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);