From 1d21bd0877af58e80e5c304b5b46919cc27463af Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 9 Aug 2014 17:07:54 +0000 Subject: [PATCH] removing code for pre 10.6 systems git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/dcscreen.cpp | 11 +---------- src/osx/carbon/graphics.cpp | 4 ---- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/osx/carbon/dcscreen.cpp b/src/osx/carbon/dcscreen.cpp index e738a13e58..ed7e2f3376 100644 --- a/src/osx/carbon/dcscreen.cpp +++ b/src/osx/carbon/dcscreen.cpp @@ -90,16 +90,7 @@ wxBitmap wxScreenDCImpl::DoGetAsBitmap(const wxRect *subrect) const CGImageRef image = NULL; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 - if ( UMAGetSystemVersion() >= 0x1060) - { - image = CGDisplayCreateImage(kCGDirectMainDisplay); - } - else -#endif - { - image = grabViaOpenGL(kCGNullDirectDisplay, srcRect); - } + image = CGDisplayCreateImage(kCGDirectMainDisplay); wxASSERT_MSG(image, wxT("wxScreenDC::GetAsBitmap - unable to get screenshot.")); diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index 912064d4ef..e9aaae3468 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -1757,11 +1757,7 @@ bool wxMacCoreGraphicsContext::SetInterpolationQuality(wxInterpolationQuality in quality = kCGInterpolationLow; break; case wxINTERPOLATION_GOOD: -#if wxOSX_USE_COCOA_OR_CARBON - quality = UMAGetSystemVersion() < 0x1060 ? kCGInterpolationHigh : (CGInterpolationQuality) 4 /*kCGInterpolationMedium only on 10.6*/; -#else quality = kCGInterpolationMedium; -#endif break; case wxINTERPOLATION_BEST: quality = kCGInterpolationHigh;