From f524b09335213d4e41636bdb9c9dc9857f996393 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 14 Sep 2008 00:46:39 +0000 Subject: [PATCH] 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) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/utilscmn.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 3186968dfc..c439d22484 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -1021,13 +1021,11 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags) wxRegKey keyDDE(key, wxT("DDEExec")); if ( keyDDE.Exists() ) { - const wxString ddeTopic = wxRegKey(keyDDE, wxT("topic")); - // we only know the syntax of WWW_OpenURL DDE request for IE, // optimistically assume that all other browsers are compatible // with it - wxString ddeCmd; - bool ok = ddeTopic == wxT("WWW_OpenURL"); + wxRegKey keyTopic(keyDDE, wxT("topic")); + bool ok = keyTopic.Exists() && keyTopic == wxT("WWW_OpenURL"); if ( ok ) { ddeCmd = keyDDE.QueryDefaultValue(); @@ -1074,6 +1072,7 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags) sei.lpFile = url.c_str(); sei.lpVerb = _T("open"); sei.nShow = SW_SHOWNORMAL; + sei.fMask = SEE_MASK_FLAG_NO_UI; // we give error message ourselves ::ShellExecuteEx(&sei); -- 2.47.2