Changeset 112436


Ignore:
Timestamp:
Oct 23, 2013, 9:33:38 AM (5 years ago)
Author:
mojca@…
Message:

wxWidgets-3.0: additional upstream patch/revert for 10.5 (#40842)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-10.5.diff

    r112422 r112436  
    33http://trac.wxwidgets.org/changeset/75025
    44http://trac.wxwidgets.org/changeset/75028
     5http://trac.wxwidgets.org/changeset/75035
    56http://trac.wxwidgets.org/changeset/75050
    67
     
    23592360             case NSURLErrorFileIsDirectory:
    23602361                 *out = wxWEBVIEW_NAV_ERR_REQUEST;
    2361 @@ -1098,20 +1093,16 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
     2362@@ -1098,11 +1093,9 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
    23622363                 *out = wxWEBVIEW_NAV_ERR_USER_CANCELLED;
    23632364                 break;
     
    23712372                 *out = wxWEBVIEW_NAV_ERR_REQUEST;
    23722373                 break;
    2373  
    2374              case NSURLErrorUserAuthenticationRequired:
    2375              case NSURLErrorSecureConnectionFailed:
    2376 -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
    2377              case NSURLErrorClientCertificateRequired:
    2378 -#endif
    2379                  *out = wxWEBVIEW_NAV_ERR_AUTH;
    2380                  break;
    2381  
    23822374--- src/unix/dlunix.cpp
    23832375+++ src/unix/dlunix.cpp
Note: See TracChangeset for help on using the changeset viewer.