Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try http scheme if we can't find the default browser for the URL scheme (this is the case for file:// URLs for example) in wxLaunchDefaultBrowser()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-30 01:01:13 +00:00
parent 89d0cfc9f4
commit 6f6dd276a8
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/utilscmn.cpp
View File

@@ -729,7 +729,8 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
// set the scheme of url to http if it does not have one // set the scheme of url to http if it does not have one
// RR: This doesn't work if the url is just a local path // RR: This doesn't work if the url is just a local path
wxString url(urlOrig); wxString url(urlOrig);
if ( !wxURI(url).HasScheme() ) wxURI uri(url);
if ( !uri.HasScheme() )
url.Prepend(wxT("http://")); url.Prepend(wxT("http://"));
@@ -740,7 +741,13 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
{ {
// ShellExecuteEx() opens the URL in an existing window by default so // ShellExecuteEx() opens the URL in an existing window by default so
// we can't use it if we need a new window // we can't use it if we need a new window
wxRegKey key(wxRegKey::HKCR, url.BeforeFirst(':') + _T("\\shell\\open")); wxRegKey key(wxRegKey::HKCR, uri.GetScheme() + _T("\\shell\\open"));
if ( !key.Exists() )
{
// try default browser, it must be registered at least for http URLs
key.SetName(wxRegKey::HKCR, _T("http\\shell\\open"));
}
if ( key.Exists() ) if ( key.Exists() )
{ {
wxRegKey keyDDE(key, wxT("DDEExec")); wxRegKey keyDDE(key, wxT("DDEExec"));