Update the wxSpinCtrlDouble documentation so SetIncrement refers to SetDigits

[wxWidgets.git] / src / osx / utils_osx.cpp

diff --git a/src/osx/utils_osx.cpp b/src/osx/utils_osx.cpp
index 0a66f1363bc2be5c7e74ba2717b4ee32d72d886e..7eb431ad8660ca5f12c82e7ce1c57733ce4942ed 100644 (file)
--- a/src/osx/utils_osx.cpp
+++ b/src/osx/utils_osx.cpp
@@ -35,21 +35,13 @@
 
 // #include "MoreFilesX.h"
 
 
 // #include "MoreFilesX.h"
 

-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-    #include <AudioToolbox/AudioServices.h>
-#endif
+#include <AudioToolbox/AudioServices.h>

 
 #include "wx/osx/private.h"
 #include "wx/osx/private/timer.h"
 
 #include "wx/evtloop.h"
 
 
 #include "wx/osx/private.h"
 #include "wx/osx/private/timer.h"
 
 #include "wx/evtloop.h"
 

-#if defined(__MWERKS__) && wxUSE_UNICODE
-#if __MWERKS__ < 0x4100
-    #include <wtime.h>
-#endif
-#endif
-

 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.
 bool wxCheckForInterrupt(wxWindow *WXUNUSED(wnd))
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.
 bool wxCheckForInterrupt(wxWindow *WXUNUSED(wnd))


@@ -65,6 +57,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 +67,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()
 {


@@ -94,6 +88,7 @@ int wxDisplayDepth()
             theDepth = 32; // some reasonable default
 
         CFRelease(encoding);
             theDepth = 32; // some reasonable default
 
         CFRelease(encoding);

+        CGDisplayModeRelease(currentMode);

     }
     else
 #endif
     }
     else
 #endif