Allow wx parents a chance to handle events fired by non-wx children. (i.e. wxActiveX...

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 9f77a8a6a8a5ef182755e828d5d6f9dd4892a428..b048ccd3c6e617ebffabefdb593d7a95d3b15872 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        utilscmn.cpp
+// Name:        src/common/utilscmn.cpp
 // Purpose:     Miscellaneous utility functions and classes
 // Author:      Julian Smart
 // Modified by:
@@ -89,6 +89,7 @@
 
 #if defined(__WXMSW__)
     #include "wx/msw/private.h"
+    #include "wx/msw/registry.h"
 #endif
 
 #if wxUSE_BASE
@@ -97,11 +98,6 @@
 // common data
 // ----------------------------------------------------------------------------
 
-#if WXWIN_COMPATIBILITY_2_2
-    const wxChar *wxInternalErrorStr = wxT("wxWidgets Internal Error");
-    const wxChar *wxFatalErrorStr = wxT("wxWidgets Fatal Error");
-#endif // WXWIN_COMPATIBILITY_2_2
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -530,6 +526,8 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
         url.Prepend(wxT("http://"));
 
 #if defined(__WXMSW__)
+
+#if wxUSE_IPC
     if ( flags & wxBROWSER_NEW_WINDOW )
     {
         // ShellExecuteEx() opens the URL in an existing window by default so
@@ -549,7 +547,7 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
                 bool ok = ddeTopic == wxT("WWW_OpenURL");
                 if ( ok )
                 {
-                    ddeCmd = keyDDE;
+                    ddeCmd = keyDDE.QueryDefaultValue();
                     ok = !ddeCmd.empty();
                 }
 
@@ -587,6 +585,7 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
             }
         }
     }
+#endif // wxUSE_IPC
 
     WinStruct<SHELLEXECUTEINFO> sei;
     sei.lpFile = url.c_str();