X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/588c80dea16b3ab32c7f1f8f15b62eb4450a20a9..c9eee7f035ebc6b5c044475d508b018ae9fb5bc2:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index d79d79f54c..b048ccd3c6 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 // ============================================================================ @@ -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 @@ -587,6 +585,7 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags) } } } +#endif // wxUSE_IPC WinStruct sei; sei.lpFile = url.c_str();