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

Compilation fix after r62545.

Browse Source 
Cherry picking the change from the trunk didn't work correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@62547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-11-03 14:47:34 +00:00
parent b49f1679af
commit 806ffd552d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/utilscmn.cpp
View File

@@ -764,8 +764,10 @@ static bool wxLaunchDefaultBrowserBaseImpl(const wxString& url, int flags)
// 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
static const wxChar *TOPIC_OPEN_URL = wxT("WWW_OpenURL");
wxString ddeCmd;
wxRegKey keyTopic(keyDDE, wxT("topic")); wxRegKey keyTopic(keyDDE, wxT("topic"));
bool ok = keyTopic.Exists() && keyTopic == wxT("WWW_OpenURL"); bool ok = keyTopic.Exists() && keyTopic == TOPIC_OPEN_URL;
if ( ok ) if ( ok )
{ {
ddeCmd = keyDDE.QueryDefaultValue(); ddeCmd = keyDDE.QueryDefaultValue();
@@ -794,7 +796,7 @@ static bool wxLaunchDefaultBrowserBaseImpl(const wxString& url, int flags)
wxLogNull noLog; wxLogNull noLog;
const wxString ddeServer = wxRegKey(keyDDE, wxT("application")); const wxString ddeServer = wxRegKey(keyDDE, wxT("application"));
if ( wxExecuteDDE(ddeServer, ddeTopic, ddeCmd) ) if ( wxExecuteDDE(ddeServer, TOPIC_OPEN_URL, ddeCmd) )
return true; return true;
// this is not necessarily an error: maybe browser is // this is not necessarily an error: maybe browser is