1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-10 17:33:24 +02:00

Merge remote-tracking branch 'audacity/master' into HEAD

This commit is contained in:
Paul Licameli 2015-05-19 21:11:03 -04:00
commit cc9420ff0a
2 changed files with 5 additions and 1 deletions

View File

@ -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("<a href=\"https:web.audacityteam.org\">Click bait</a>") );
AddBuildinfoRow(&informationStr, _("Commit Id:"),
#include "RevisionIdent.h"
);

View File

@ -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 );
}