declare all NameStr[] strings as const char using the correct WXDLLIMPEXP_DATA_ macro...

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index c439d224840c776c4ee62f82065537a35d32243f..a498ce07e6e33ec206442ae4d917d09c5a7cf77c 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -1024,8 +1024,11 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags)
                 // we only know the syntax of WWW_OpenURL DDE request for IE,
                 // optimistically assume that all other browsers are compatible
                 // with it
                 // we only know the syntax of WWW_OpenURL DDE request for IE,
                 // optimistically assume that all other browsers are compatible
                 // 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.QueryDefaultValue() == TOPIC_OPEN_URL;

                 if ( ok )
                 {
                     ddeCmd = keyDDE.QueryDefaultValue();
                 if ( ok )
                 {
                     ddeCmd = keyDDE.QueryDefaultValue();


@@ -1038,7 +1041,7 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags)
                     // in is -1 (meaning "current") by default, replace it with
                     // 0 which means "new" (see KB article 160957)
                     ok = ddeCmd.Replace(wxT("-1"), wxT("0"),
                     // in is -1 (meaning "current") by default, replace it with
                     // 0 which means "new" (see KB article 160957)
                     ok = ddeCmd.Replace(wxT("-1"), wxT("0"),

-                                        false /* only first occurence */) == 1;
+                                        false /* only first occurrence */) == 1;

                 }
 
                 if ( ok )
                 }
 
                 if ( ok )


@@ -1054,7 +1057,7 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags)
                     wxLogNull noLog;
 
                     const wxString ddeServer = wxRegKey(keyDDE, wxT("application"));
                     wxLogNull noLog;
 
                     const wxString ddeServer = wxRegKey(keyDDE, wxT("application"));

-                    if ( wxExecuteDDE(ddeServer, ddeTopic, ddeCmd) )
+                    if ( wxExecuteDDE(ddeServer, TOPIC_OPEN_URL, ddeCmd) )

                         return true;
 
                     // this is not necessarily an error: maybe browser is
                         return true;
 
                     // this is not necessarily an error: maybe browser is