--- a/jdk/src/windows/native/sun/windows/awt_Component.cpp Tue Apr 01 00:33:40 2014 +0400
+++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp Tue Apr 01 01:03:52 2014 +0400
@@ -6112,7 +6112,7 @@
c = (AwtComponent *)pData;
if (::IsWindow(c->GetHWnd()))
{
- result = (jboolean)c->InheritsNativeMouseWheelBehavior();
+ result = JNI_IS_TRUE(c->InheritsNativeMouseWheelBehavior());
}
ret:
env->DeleteGlobalRef(self);
@@ -6928,9 +6928,9 @@
{
TRY;
- return (jboolean)AwtToolkit::GetInstance().SyncCall(
+ return JNI_IS_TRUE(AwtToolkit::GetInstance().SyncCall(
(void *(*)(void *))AwtComponent::_NativeHandlesWheelScrolling,
- env->NewGlobalRef(self));
+ env->NewGlobalRef(self)));
// global ref is deleted in _NativeHandlesWheelScrolling
CATCH_BAD_ALLOC_RET(NULL);
@@ -6949,9 +6949,9 @@
jobject selfGlobalRef = env->NewGlobalRef(self);
- return (jboolean)AwtToolkit::GetInstance().SyncCall(
+ return JNI_IS_TRUE(AwtToolkit::GetInstance().SyncCall(
(void*(*)(void*))AwtComponent::_IsObscured,
- (void *)selfGlobalRef);
+ (void *)selfGlobalRef));
// selfGlobalRef is deleted in _IsObscured
CATCH_BAD_ALLOC_RET(NULL);