src/macosx/native/sun/awt/CSystemColors.m

Print this page

        

*** 31,40 **** --- 31,45 ---- #import <JavaNativeFoundation/JavaNativeFoundation.h> #import <JavaRuntimeSupport/JavaRuntimeSupport.h> #import "ThreadUtilities.h" + /* Use THIS_FILE when it is available. */ + #ifndef THIS_FILE + #define THIS_FILE __FILE__ + #endif + NSColor **sColors = nil; NSColor **appleColors = nil; @implementation CSystemColors
*** 128,138 **** if (colorIndex < (useAppleColor) ? sun_lwawt_macosx_LWCToolkit_NUM_APPLE_COLORS : java_awt_SystemColor_NUM_COLORS) { result = (useAppleColor ? appleColors : sColors)[colorIndex]; } else { ! NSLog(@"%s: %s %sColor: %ld not found, returning black.", __FILE__, __FUNCTION__, (useAppleColor) ? "Apple" : "System", colorIndex); result = [NSColor blackColor]; } return result; } --- 133,143 ---- if (colorIndex < (useAppleColor) ? sun_lwawt_macosx_LWCToolkit_NUM_APPLE_COLORS : java_awt_SystemColor_NUM_COLORS) { result = (useAppleColor ? appleColors : sColors)[colorIndex]; } else { ! NSLog(@"%s: %s %sColor: %ld not found, returning black.", THIS_FILE, __FUNCTION__, (useAppleColor) ? "Apple" : "System", colorIndex); result = [NSColor blackColor]; } return result; }