X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4263bab00e05dfe9af724d9b5695826976aec08c..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 55b70aed84..21895181cb 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -140,6 +140,15 @@ void wxDecToHex(int dec, wxChar *buf) buf[2] = 0; } +// Convert decimal integer to 2 characters +void wxDecToHex(int dec, char* ch1, char* ch2) +{ + int firstDigit = (int)(dec/16.0); + int secondDigit = (int)(dec - (firstDigit*16.0)); + (*ch1) = (char) hexArray[firstDigit]; + (*ch2) = (char) hexArray[secondDigit]; +} + // Convert decimal integer to 2-character hex string wxString wxDecToHex(int dec) { @@ -692,7 +701,12 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags) wxString url(urlOrig); wxURI uri(url); if ( !uri.HasScheme() ) - url.Prepend(wxT("http://")); + { + if (wxFileExists(urlOrig)) + url.Prepend( wxT("file://") ); + else + url.Prepend(wxT("http://")); + } #if defined(__WXMSW__) @@ -816,7 +830,7 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags) wxLogDebug(wxT("ICStart error %d"), (int) err); return false; } -#else +#else // (non-Mac, non-MSW) #ifdef __UNIX__