|
|
commit 0d37604d8ab6df57d1ef09b247c0c63504c59837
Author: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Mon Sep 21 15:10:19 2020 +0200
Commit: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Mon Sep 21 15:10:34 2020 +0200
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.
src/Fl_cocoa.mm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git src/Fl_cocoa.mm src/Fl_cocoa.mm
index eaf3ffc..9d8fa3c 100644
--- src/Fl_cocoa.mm
+++ src/Fl_cocoa.mm
@@ -2387,7 +2387,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;
@@ -2461,7 +2461,7 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
if (window->damage()) i->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 {
[ Direct Link to Message ] | |
|
| |