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

don't give spurious error messages if the default browser doesn't provide DDE interface; also use SEE_MASK_FLAG_NO_UI to avoid shell error messages as we give them ourselves (#9948)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-14 00:46:39 +00:00
parent 4db307e110
commit f524b09335
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/utilscmn.cpp
View File

@@ -1021,13 +1021,11 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags)
wxRegKey keyDDE(key, wxT("DDEExec")); wxRegKey keyDDE(key, wxT("DDEExec"));
if ( keyDDE.Exists() ) if ( keyDDE.Exists() )
{ {
const wxString ddeTopic = wxRegKey(keyDDE, wxT("topic"));
// we only know the syntax of WWW_OpenURL DDE request for IE, // we only know the syntax of WWW_OpenURL DDE request for IE,
// optimistically assume that all other browsers are compatible // optimistically assume that all other browsers are compatible
// with it // with it
wxString ddeCmd; wxRegKey keyTopic(keyDDE, wxT("topic"));
bool ok = ddeTopic == wxT("WWW_OpenURL"); bool ok = keyTopic.Exists() && keyTopic == wxT("WWW_OpenURL");
if ( ok ) if ( ok )
{ {
ddeCmd = keyDDE.QueryDefaultValue(); ddeCmd = keyDDE.QueryDefaultValue();
@@ -1074,6 +1072,7 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags)
sei.lpFile = url.c_str(); sei.lpFile = url.c_str();
sei.lpVerb = _T("open"); sei.lpVerb = _T("open");
sei.nShow = SW_SHOWNORMAL; sei.nShow = SW_SHOWNORMAL;
sei.fMask = SEE_MASK_FLAG_NO_UI; // we give error message ourselves
::ShellExecuteEx(&sei); ::ShellExecuteEx(&sei);