--- old/src/macosx/native/sun/awt/CWrapper.m 2012-01-31 21:41:39.000000000 +0300 +++ new/src/macosx/native/sun/awt/CWrapper.m 2012-01-31 21:41:39.000000000 +0300 @@ -359,17 +359,21 @@ /* * Class: sun_lwawt_macosx_CWrapper$NSWindow * Method: setBackgroundColor - * Signature: (J)V + * Signature: (JFFFF)V */ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CWrapper_00024NSWindow_setBackgroundColor -(JNIEnv *env, jclass cls, jlong windowPtr, jlong colorPtr) +(JNIEnv *env, jclass cls, jlong windowPtr, + jfloat red, jfloat green, jfloat blue, jfloat alpha) { JNF_COCOA_ENTER(env); AWTWindow *window = (AWTWindow *)jlong_to_ptr(windowPtr); - NSColor *color = (NSColor *)jlong_to_ptr(colorPtr); [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){ + NSColor *color = [NSColor colorWithCalibratedRed:(CGFloat)red + green:(CGFloat)green + blue:(CGFloat)blue + alpha:(CGFloat)alpha]; [window setBackgroundColor:color]; }]; @@ -714,26 +718,3 @@ return screenPtr; } - -/* - * Class: sun_lwawt_macosx_CWrapper$NSColor - * Method: clearColor - * Signature: ()J - */ -JNIEXPORT jlong JNICALL -Java_sun_lwawt_macosx_CWrapper_00024NSColor_clearColor -(JNIEnv *env, jclass cls) -{ - __block jlong clearColorPtr = 0L; - -JNF_COCOA_ENTER(env); - - [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){ - clearColorPtr = ptr_to_jlong([NSColor clearColor]); - }]; - -JNF_COCOA_EXIT(env); - - return clearColorPtr; -} -