Update to zlib 1.2.3

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 04bac3aa0af32ff26f291ecf905d2ea66195db0f..2128a5cd4c38adf2ed861127413ade494ab23b0c 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -553,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
@@ -604,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")
@@ -1155,4 +1156,3 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 #endif // !wxGTK
 
 #endif // wxUSE_GUI
-