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

adding Big Sur update fix

Browse Source 
see #19111
(include linking against QuartzCore which contains the kCAContentsFormatRGBA8Uint reference)
This commit is contained in:
Stefan Csomor 2021-04-03 21:12:54 +02:00
parent 78b272c1df
commit 5628a4a334
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/osx/wxcocoa.xcconfig
View File

@ -9,4 +9,4 @@ GCC_VERSION =
ARCHS = i386 x86_64
OTHER_LDFLAGS = -framework WebKit -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework OpenGL -framework AVFoundation -framework CoreMedia -framework Security -weak_framework AVKit
OTHER_LDFLAGS = -framework WebKit -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework OpenGL -framework AVFoundation -framework CoreMedia -framework Security -framework QuartzCore -weak_framework AVKit

2
configure vendored
View File

@ -38269,7 +38269,7 @@ if test "$wxUSE_MAC" = 1 ; then
if test "$wxUSE_OSX_IPHONE" = 1; then
EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore -framework GLKit -framework CoreText"
else
EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"
EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework QuartzCore -framework AudioToolbox -framework System -framework OpenGL"
if test "$wxUSE_MEDIACTRL" = "yes"; then

2
configure.in
View File

@ -8008,7 +8008,7 @@ if test "$wxUSE_MAC" = 1 ; then
if test "$wxUSE_OSX_IPHONE" = 1; then
EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore -framework GLKit -framework CoreText"
else
EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"
EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework QuartzCore -framework AudioToolbox -framework System -framework OpenGL"
dnl The case of QuickTime framework is special: with Cocoa, we only
dnl need it in 32 bit builds and not in 64 bit and, moreover,

11
src/osx/cocoa/window.mm
View File

@ -884,6 +884,17 @@ static void SetDrawingEnabledIfFrozenRecursive(wxWidgetCocoaImpl *impl, bool ena
[super viewDidMoveToWindow];
}
- (void) viewWillDraw
{
if ( WX_IS_MACOS_AVAILABLE(11, 0) )
{
CALayer* layer = self.layer;
layer.contentsFormat = kCAContentsFormatRGBA8Uint;
}
[super viewWillDraw];
}
@end // wxNSView
// We need to adopt NSTextInputClient protocol in order to interpretKeyEvents: to work.