From 704bc0f8be05ddca94a3853a6e112f22f8f2df70 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 7 Jul 2022 15:21:04 +0200 Subject: [PATCH] Add option to give HTMLDialog an OK button. --- src/wx/html_dialog.cc | 9 ++++++++- src/wx/html_dialog.h | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/wx/html_dialog.cc b/src/wx/html_dialog.cc index cce62e1eb..19c3aaf2a 100644 --- a/src/wx/html_dialog.cc +++ b/src/wx/html_dialog.cc @@ -35,7 +35,7 @@ using namespace boost::placeholders; #endif -HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html) +HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html, bool ok) : wxDialog (parent, wxID_ANY, title) { auto sizer = new wxBoxSizer (wxVERTICAL); @@ -62,6 +62,13 @@ HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html) /* Set height */ SetSize (h->GetInternalRepresentation()->GetWidth(), h->GetInternalRepresentation()->GetHeight() + 256); + + if (ok) { + auto buttons = CreateSeparatedButtonSizer(wxOK); + if (buttons) { + sizer->Add(buttons, wxSizerFlags().Expand().DoubleBorder()); + } + } } diff --git a/src/wx/html_dialog.h b/src/wx/html_dialog.h index 1792d86ed..c5a538a5c 100644 --- a/src/wx/html_dialog.h +++ b/src/wx/html_dialog.h @@ -31,7 +31,7 @@ class wxHtmlLinkEvent; 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); -- 2.30.2