From 9bef4869c806c6137b1a1c7a7a019c1560a8c6a4 Mon Sep 17 00:00:00 2001 From: James Crook Date: Tue, 19 May 2015 21:30:45 +0100 Subject: [PATCH] LinkingWindow now handles https as well as http. --- src/AboutDialog.cpp | 4 ++++ src/widgets/LinkingHtmlWindow.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index f5b1eadcb..51fe0612e 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -525,6 +525,10 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S ) // Current date AddBuildinfoRow(&informationStr, _("Program build date: "), __TDATE__); +// Uncomment the next two lines to test hyperlinks work from here. +// AddBuildinfoRow(&informationStr, wxT("Link Test:"), +// wxT("Click bait") ); + AddBuildinfoRow(&informationStr, _("Commit Id:"), #include "RevisionIdent.h" ); diff --git a/src/widgets/LinkingHtmlWindow.cpp b/src/widgets/LinkingHtmlWindow.cpp index 05079fe2d..40409b28d 100644 --- a/src/widgets/LinkingHtmlWindow.cpp +++ b/src/widgets/LinkingHtmlWindow.cpp @@ -113,7 +113,7 @@ void LinkingHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) OpenInDefaultBrowser( link ); return; } - else if( !href.StartsWith( wxT("http:"))) + else if( !href.StartsWith( wxT("http:")) && !href.StartsWith( wxT("https:")) ) { HtmlWindow::OnLinkClicked( link ); }