Added simple instructions and autogen.mk to rebuild configure script.

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 8bb3fcd9828b168a830bfe0dd36be814cfe721da..2128a5cd4c38adf2ed861127413ade494ab23b0c 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -533,6 +533,8 @@ long wxExecute(const wxString& command,
 
 bool wxLaunchDefaultBrowser(const wxString& url)
 {
+    bool success = true;
+
     wxString finalurl = url;
 
     //if it isn't a full url, try appending http:// to it
@@ -551,12 +553,13 @@ bool wxLaunchDefaultBrowser(const wxString& url)
         wxRegKey keyDDE(key, wxT("DDEExec"));
         if ( keyDDE.Exists() )
         {
-            wxString ddeTopic = wxRegKey(keyDDE, wxT("topic"));
+            wxRegKey keyTopic(keyDDE, wxT("topic"));
+            wxString ddeTopic = keyTopic.QueryDefaultValue();
 
             // we only know the syntax of WWW_OpenURL DDE request
             if ( ddeTopic == wxT("WWW_OpenURL") )
             {
-                wxString ddeCmd = keyDDE;
+                wxString ddeCmd = keyDDE.QueryDefaultValue();
 
                 // this is a bit naive but should work as -1 can't appear
                 // elsewhere in the DDE topic, normally
@@ -602,7 +605,7 @@ bool wxLaunchDefaultBrowser(const wxString& url)
             (LPShellExecute) ::GetProcAddress(hShellDll,
             wxString::Format(wxT("ShellExecute%s"),
 
-#ifdef __WXUNICODE__
+#if wxUSE_UNICODE
             wxT("W")
 #else
             wxT("A")
@@ -619,7 +622,7 @@ bool wxLaunchDefaultBrowser(const wxString& url)
         // Windows sometimes doesn't open the browser correctly when using mime
         // types, so do ShellExecute - i.e. start <url> (from James Carroll)
         nResult = (int) (*lpShellExecute)(NULL, NULL, finalurl.c_str(),
-                                                       NULL, wxT(""), SW_SHOWNORMAL);
+                                          NULL, wxT(""), SW_SHOWNORMAL);
         // Unload Shell32.dll
         ::FreeLibrary(hShellDll);
 #else
@@ -701,16 +704,16 @@ bool wxLaunchDefaultBrowser(const wxString& url)
         if ( cmd.empty() || wxExecute(cmd + wxT(" ") + finalurl) == -1)
             return false;
     }
-     
+
 
 #else // !wxUSE_MIMETYPE && !(WXMSW && wxUSE_NATIVE_CONFIG)
 
-        return false;
+    success = false;
 
 #endif
 
     //success - hopefully
-    return true;
+    return success;
 }
 
 // ----------------------------------------------------------------------------
@@ -1153,4 +1156,3 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 #endif // !wxGTK
 
 #endif // wxUSE_GUI
-