changeset 12271:718e306c1399

8025492: Hand cursor does not use Windows' system cursor Reviewed-by: ant, bae Contributed-by: morvan.lemescam@gmail.com
author serb
date Wed, 17 Jun 2015 15:57:26 +0300
parents 3312b1146555
children 6366a3d08949
files src/java.desktop/windows/native/libawt/windows/awt.rc src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp src/java.desktop/windows/native/libawt/windows/hand.cur
diffstat 3 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/windows/native/libawt/windows/awt.rc	Tue Jun 16 13:00:37 2015 -0700
+++ b/src/java.desktop/windows/native/libawt/windows/awt.rc	Wed Jun 17 15:57:26 2015 +0300
@@ -1,5 +1,5 @@
 // 
-// Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-HAND_CURSOR  CURSOR  DISCARDABLE "hand.cur"
 AWT_ICON     ICON    DISCARDABLE "awt.ico"
 CHECK_BITMAP BITMAP  DISCARDABLE "check.bmp"
 
--- a/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp	Tue Jun 16 13:00:37 2015 -0700
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp	Wed Jun 17 15:57:26 2015 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,7 +144,7 @@
         winCursor = IDC_SIZEWE;
         break;
       case java_awt_Cursor_HAND_CURSOR:
-        winCursor = TEXT("HAND_CURSOR");
+        winCursor = IDC_HAND;
         break;
       case java_awt_Cursor_MOVE_CURSOR:
         winCursor = IDC_SIZEALL;
Binary file src/java.desktop/windows/native/libawt/windows/hand.cur has changed