--- old/src/macosx/native/sun/awt/AWTView.m 2012-02-01 03:44:52.000000000 -0800 +++ new/src/macosx/native/sun/awt/AWTView.m 2012-02-01 03:44:51.000000000 -0800 @@ -81,15 +81,15 @@ fInPressAndHold = NO; fPAHNeedsToSelect = NO; - if (windowLayer != nil) { + if (windowLayer != nil) { self.cglLayer = windowLayer; [self setWantsLayer: YES]; [self.layer addSublayer: (CALayer *)cglLayer]; [self setLayerContentsRedrawPolicy: NSViewLayerContentsRedrawDuringViewResize]; [self setLayerContentsPlacement: NSViewLayerContentsPlacementTopLeft]; - [self setAutoresizingMask: NSViewHeightSizable | NSViewWidthSizable]; + [self setAutoresizingMask: NSViewHeightSizable | NSViewWidthSizable]; } - + #if USE_INTERMEDIATE_BUFFER self.cglLayer = windowLayer; [self setWantsLayer: YES]; @@ -200,7 +200,7 @@ [self deliverJavaMouseEvent: event]; } } - + - (void) mouseUp: (NSEvent *)event { [self deliverJavaMouseEvent: event]; } @@ -326,8 +326,8 @@ absP.y = screenRect.size.height - absP.y; jint clickCount; - if (type == NSMouseEntered || - type == NSMouseExited || + if (type == NSMouseEntered || + type == NSMouseExited || type == NSScrollWheel || type == NSMouseMoved) { clickCount = 0; @@ -338,7 +338,7 @@ static JNF_CLASS_CACHE(jc_NSEvent, "sun/lwawt/macosx/event/NSEvent"); static JNF_CTOR_CACHE(jctor_NSEvent, jc_NSEvent, "(IIIIIIIIDD)V"); jobject jEvent = JNFNewObject(env, jctor_NSEvent, - [event type], + [event type], [event modifierFlags], clickCount, [event buttonNumber], @@ -383,7 +383,7 @@ jstring characters = NULL; if ([event type] != NSFlagsChanged) { - characters = JNFNSToJavaString(env, [event characters]); + characters = JNFNSToJavaString(env, [event characters]); } static JNF_CLASS_CACHE(jc_NSEvent, "sun/lwawt/macosx/event/NSEvent"); @@ -398,7 +398,7 @@ static JNF_MEMBER_CACHE(jm_deliverKeyEvent, jc_PlatformView, "deliverKeyEvent", "(Lsun/lwawt/macosx/event/NSEvent;)V"); JNFCallVoidMethod(env, m_cPlatformView, jm_deliverKeyEvent, jevent); - + if (characters != NULL) { (*env)->DeleteLocalRef(env, characters); }