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 0a66f1363bc2be5c7e74ba2717b4ee32d72d886e..e1765e81d1dd8455cc432498003da0a6d58ffc33 100644 (file)
--- a/src/osx/utils_osx.cpp
+++ b/src/osx/utils_osx.cpp
@@ -65,6 +65,9 @@ bool wxColourDisplay()
     return true;
 }
 
     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)
 #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
 
                             __IPHONE_NA, __IPHONE_NA);
 #endif
 

-#if wxOSX_USE_COCOA_OR_CARBON

 // Returns depth of screen
 int wxDisplayDepth()
 {
 // Returns depth of screen
 int wxDisplayDepth()
 {