# HG changeset patch # User serb # Date 1434545846 -10800 # Node ID 58fbcd98520653b3a47f0cdf4a3056ec94bd2539 # Parent 21d1b32bafb669cc3679fa58dc9a0d644a5fca41 8025492: Hand cursor does not use Windows' system cursor Reviewed-by: ant, bae Contributed-by: morvan.lemescam@gmail.com diff -r 21d1b32bafb6 -r 58fbcd985206 jdk/src/java.desktop/windows/native/libawt/windows/awt.rc --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt.rc Tue Jun 16 13:00:37 2015 -0700 +++ b/jdk/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" diff -r 21d1b32bafb6 -r 58fbcd985206 jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp Tue Jun 16 13:00:37 2015 -0700 +++ b/jdk/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; diff -r 21d1b32bafb6 -r 58fbcd985206 jdk/src/java.desktop/windows/native/libawt/windows/hand.cur Binary file jdk/src/java.desktop/windows/native/libawt/windows/hand.cur has changed