X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42d0df0030abbac4ca11a78b2f529133e3c9d986..d2dfef5f3f0152ad9b30092168869fec0698e6bf:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 9f77a8a6a8..0831170f37 100644 --- 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 // ============================================================================ @@ -549,7 +545,7 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags) bool ok = ddeTopic == wxT("WWW_OpenURL"); if ( ok ) { - ddeCmd = keyDDE; + ddeCmd = keyDDE.QueryDefaultValue(); ok = !ddeCmd.empty(); }