diff --git a/build/osx/wxcocoa.xcconfig b/build/osx/wxcocoa.xcconfig index a2d5082ab9..429a39b975 100644 --- a/build/osx/wxcocoa.xcconfig +++ b/build/osx/wxcocoa.xcconfig @@ -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 diff --git a/configure b/configure index bdef4b6602..463a500b35 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.in b/configure.in index 14883df326..c8b4eaeda5 100644 --- a/configure.in +++ b/configure.in @@ -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, diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index f8a6739cd4..c7d0c7b338 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -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.