Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add some version checks to help compiling on OSX.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-18 10:51:57 +00:00
parent 39ab701469
commit 74a8f67d96
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osx/webview_webkit.mm
View File

@@ -1084,16 +1084,20 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
*out = wxWEB_NAV_ERR_USER_CANCELLED; *out = wxWEB_NAV_ERR_USER_CANCELLED;
break; break;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
case NSURLErrorCannotDecodeRawData: case NSURLErrorCannotDecodeRawData:
case NSURLErrorCannotDecodeContentData: case NSURLErrorCannotDecodeContentData:
case NSURLErrorBadServerResponse:
case NSURLErrorCannotParseResponse: case NSURLErrorCannotParseResponse:
#endif
case NSURLErrorBadServerResponse:
*out = wxWEB_NAV_ERR_REQUEST; *out = wxWEB_NAV_ERR_REQUEST;
break; break;
case NSURLErrorUserAuthenticationRequired: case NSURLErrorUserAuthenticationRequired:
case NSURLErrorSecureConnectionFailed: case NSURLErrorSecureConnectionFailed:
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
case NSURLErrorClientCertificateRequired: case NSURLErrorClientCertificateRequired:
#endif
*out = wxWEB_NAV_ERR_AUTH; *out = wxWEB_NAV_ERR_AUTH;
break; break;