From: Stefan Csomor Date: Wed, 26 Oct 2011 05:38:24 +0000 (+0000) Subject: move declaration into cocoa part X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fdb2f6a2c0ef13c7df825be5b73a0e71248871e5 move declaration into cocoa part git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/osx/utils_osx.cpp b/src/osx/utils_osx.cpp index 0a66f1363b..e1765e81d1 100644 --- a/src/osx/utils_osx.cpp +++ b/src/osx/utils_osx.cpp @@ -65,6 +65,9 @@ bool wxColourDisplay() return true; } + +#if wxOSX_USE_COCOA_OR_CARBON + #if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070) && (MAC_OS_X_VERSION_MIN_REQUIRED < 1060) // bring back declaration so that we can support deployment targets < 10_6 CG_EXTERN size_t CGDisplayBitsPerPixel(CGDirectDisplayID display) @@ -72,7 +75,6 @@ CG_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_6, __IPHONE_NA, __IPHONE_NA); #endif -#if wxOSX_USE_COCOA_OR_CARBON // Returns depth of screen int wxDisplayDepth() {