X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fhtml_dialog.cc;h=dcae84cd9d3b4b834e58a54bbf0c7138d34a84c9;hb=d2807cacb97dd6dd9b519af7d697a2a10e39564e;hp=978330187f13fe4c40c6d64a5aaf938a2149167d;hpb=e3c78ffdb5e562841e86e6f59a20494159c44de7;p=dcpomatic.git diff --git a/src/wx/html_dialog.cc b/src/wx/html_dialog.cc index 978330187..dcae84cd9 100644 --- a/src/wx/html_dialog.cc +++ b/src/wx/html_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2018 Carl Hetherington + Copyright (C) 2018-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "html_dialog.h" #include "wx_util.h" #include "lib/cross.h" @@ -29,14 +30,16 @@ DCPOMATIC_DISABLE_WARNINGS DCPOMATIC_ENABLE_WARNINGS #include + #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif + HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html) : wxDialog (parent, wxID_ANY, title) { - wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL); + auto sizer = new wxBoxSizer (wxVERTICAL); wxFileSystem::AddHandler(new wxMemoryFSHandler); @@ -46,7 +49,7 @@ HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html) wxBitmap(std_to_wx(boost::filesystem::path(resources_path() / "me.jpg").string()), wxBITMAP_TYPE_JPEG), wxBITMAP_TYPE_JPEG ); - wxHtmlWindow* h = new wxHtmlWindow (this); + auto h = new wxHtmlWindow (this); h->SetPage (html); sizer->Add (h, 1, wxEXPAND | wxALL, 6); @@ -62,6 +65,7 @@ HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html) SetSize (h->GetInternalRepresentation()->GetWidth(), h->GetInternalRepresentation()->GetHeight() + 64); } + void HTMLDialog::link_clicked (wxHtmlLinkEvent& ev) {