diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2020-09-19 21:59:09 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2020-09-19 21:59:25 +0200 |
| commit | 5c5132f68119cfd289e27e7bd20a0bd34c5a0ca2 (patch) | |
| tree | bbaaea96d8e4269dbea1b41e48b400d01c4a48aa | |
| parent | 8ba68dd27556fcc72afefc117e00139b186a5b80 (diff) | |
Fix when building with SDK 10.15 and running with 11.0 Big Sur
When FLTK runs under macOS "Big Sur", the OS appears as 11.0
if FLTK was built with SDK 11.0 and as 10.16 it it was built with
SDK 10.15.
| -rw-r--r-- | src/Fl_cocoa.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 8c7b4ae1d..260525bc3 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -2183,7 +2183,7 @@ static FLTextInputContext* fltextinputcontext_instance = nil; } #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14 - (void)create_aux_bitmap:(CGContextRef)gc retina:(BOOL)r { - if (!gc || fl_mac_os_version >= 110000) { + if (!gc || fl_mac_os_version >= 101600) { // bitmap context-related functions (e.g., CGBitmapContextGetBytesPerRow) can't be used here with macOS 11.0 "Big Sur" static CGColorSpaceRef cspace = CGColorSpaceCreateDeviceRGB(); int W = [self frame].size.width, H = [self frame].size.height; @@ -2258,7 +2258,7 @@ static FLTextInputContext* fltextinputcontext_instance = nil; if (window->damage()) d->Fl_Window_Driver::flush(); #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14 if (destination) { // can be NULL with gl_start/gl_finish - if (fl_mac_os_version < 110000 && CGBitmapContextGetBytesPerRow(aux_bitmap) == CGBitmapContextGetBytesPerRow(destination)) { + if (fl_mac_os_version < 101600 && CGBitmapContextGetBytesPerRow(aux_bitmap) == CGBitmapContextGetBytesPerRow(destination)) { memcpy(CGBitmapContextGetData(destination), CGBitmapContextGetData(aux_bitmap), CGBitmapContextGetHeight(aux_bitmap) * CGBitmapContextGetBytesPerRow(aux_bitmap)); } else { |