OSX/availability: use of the numerical value instead of the symbol in the #if MAC_OS_...
authorJens Verwiebe <info@jensverwiebe.de>
Sat, 15 Dec 2012 11:15:05 +0000 (11:15 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Sat, 15 Dec 2012 11:15:05 +0000 (11:15 +0000)
intern/ghost/intern/GHOST_SystemCocoa.mm
intern/ghost/intern/GHOST_WindowCocoa.mm
intern/itasc/kdl/chain.hpp
intern/itasc/kdl/tree.hpp
source/blender/editors/space_file/fsmenu.c
source/blender/quicktime/apple/qtkit_export.m
source/blender/quicktime/quicktime_export.h

index 7f6b69d9d504a3091d091314f71c7fa050eb6844..aca1a4071d8f914d9bf9dbe9e36fb3346f0e9572 100644 (file)
@@ -56,7 +56,7 @@
 #include "AssertMacros.h"
 
 #pragma mark KeyMap, mouse converters
-#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= 1040
 /* Keycodes not defined in Tiger */
 /*  
  *  Summary:
@@ -360,7 +360,7 @@ static GHOST_TKey convertKey(int rawCode, unichar recvChar, UInt16 keyAction)
                                return (GHOST_TKey) (recvChar - 'a' + GHOST_kKeyA);
                        }
                        else {
-#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= 1040
                                KeyboardLayoutRef keyLayout;
                                UCKeyboardLayout *uchrData;
                                
@@ -423,7 +423,7 @@ static GHOST_TKey convertKey(int rawCode, unichar recvChar, UInt16 keyAction)
 
 
 #pragma mark defines for 10.6 api not documented in 10.5
-#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= 1040
 enum {
        /* The following event types are available on some hardware on 10.5.2 and later */
        NSEventTypeGesture          = 29,
index 6c5dbe83f4c3f6a9e7fc810da3b45422b75e39e2..792836b0a2192e1d81d0c17f63b37708c801238c 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <Cocoa/Cocoa.h>
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= 1050
 //Use of the SetSystemUIMode function (64bit compatible)
 #include <Carbon/Carbon.h>
 #endif
@@ -58,7 +58,7 @@ extern "C" {
        extern void wm_draw_update(bContext *C);
 };*/
 @interface CocoaWindowDelegate : NSObject
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
 <NSWindowDelegate>
 #endif
 {
@@ -115,12 +115,12 @@ extern "C" {
 
 - (void)windowDidResize:(NSNotification *)notification
 {
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
        //if (![[notification object] inLiveResize]) {
                //Send event only once, at end of resize operation (when user has released mouse button)
 #endif
                systemCocoa->handleWindowEvent(GHOST_kEventWindowSize, associatedWindow);
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
        //}
 #endif
        /* Live resize ugly patch. Needed because live resize runs in a modal loop, not letting main loop run
@@ -287,7 +287,7 @@ extern "C" {
        }
 }
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= 1040
 //Cmd+key are handled differently before 10.5
 - (BOOL)performKeyEquivalent:(NSEvent *)theEvent
 {
@@ -578,7 +578,7 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
        setDrawingContextType(type);
        updateDrawingContext();
        activateDrawingContext();
-#if defined(MAC_OS_X_VERSION_10_7) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7) // retina support started with 10.7.4 afaik
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070      // retina support started with 10.7.4 afaik
        if (m_systemCocoa->m_nativePixel) {
                [m_openGLView setWantsBestResolutionOpenGLSurface:YES];
                NSRect backingBounds = [m_openGLView convertRectToBacking:[m_openGLView bounds]];
@@ -928,7 +928,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
                                 * doesn't know view/window difference. */
                                m_fullScreen = true;
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
                                //10.6 provides Cocoa functions to autoshow menu bar, and to change a window style
                                //Hide menu & dock if needed
                                if ([[m_window screen] isEqual:[[NSScreen screens] objectAtIndex:0]]) {
@@ -987,7 +987,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
                                m_fullScreen = false;
 
                                //Exit fullscreen
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
                                //Show again menu & dock if needed
                                if ([[m_window screen] isEqual:[NSScreen mainScreen]]) {
                                        [NSApp setPresentationOptions:NSApplicationPresentationDefault];
index fde9d4ed23ee8b1f5d892758ae9f443f943c8b1e..1776737fc7deaa0d73332bfe11f595ff24ac6896 100644 (file)
@@ -36,7 +36,7 @@ namespace KDL {
     class Chain {
     private:
 #if defined(__APPLE__)
-#  if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5
+#  if MAC_OS_X_VERSION_MIN_REQUIRED <= 1050
                std::vector<Segment> segments;
 #  else
         // Eigen allocator is needed for alignment of Eigen data types
index a020c6cf2cf3623acf905367732bc212f89dcfba..82794f96b94122a997955cd5b90951ce1233148c 100644 (file)
@@ -28,7 +28,7 @@
 #include <string>
 #include <map>
 #if defined(__APPLE__)
-#  if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5
+#  if MAC_OS_X_VERSION_MIN_REQUIRED <= 1050
     //no include
 #  else
 #    include <Eigen/Core>
@@ -42,7 +42,7 @@ namespace KDL
     //Forward declaration
     class TreeElement;
 #if defined(__APPLE__)
-#  if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5
+#  if MAC_OS_X_VERSION_MIN_REQUIRED <= 1050
     typedef std::map<std::string,TreeElement> SegmentMap;
 #  else
     // Eigen allocator is needed for alignment of Eigen data types
index a5647c06b92b0fec390e19e8993bd4d6f085bdd0..5f1f9a3ab224a8122bde3afc8b3e5da7412a9d4c 100644 (file)
@@ -350,7 +350,7 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks)
 #else
 #ifdef __APPLE__
        {
-#if (MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4)
+#if (MAC_OS_X_VERSION_MIN_REQUIRED <= 1040)
                OSErr err = noErr;
                int i;
                const char *home;
index e0858cd5ec2af70b8eb95b57cb927ecec61e46fc..6935c908ee4ea4323b7164c4483d1891098e145c 100644 (file)
@@ -61,7 +61,7 @@
 #import <QTKit/QTKit.h>
 #include <AudioToolbox/AudioToolbox.h>
 
-#if (MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4) || !__LP64__
+#if (MAC_OS_X_VERSION_MIN_REQUIRED <= 1040) || !__LP64__
 #error 64 bit build & OSX 10.5 minimum are needed for QTKit
 #endif
 
index a3469ddafde5008afadac5468d03cca106bd2839..d773cdc8f3a3b9d9e4c711db1491e522ff5fca88 100644 (file)
@@ -87,7 +87,7 @@ void makeqtstring(struct RenderData *rd, char *string);               //for playanim.c
 
 
 
-#if (defined(USE_QTKIT) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && __LP64__)
+#if (defined(USE_QTKIT) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 && __LP64__)
 //Include the quicktime codec types constants that are missing in QTKitDefines.h
 enum {
        kRawCodecType                                           = 'raw ',