Skip to content

Commit 358f5d2

Browse files
committed
6422025: ThemeReader.cpp can be updated for VC7
Reviewed-by: aivanov
1 parent a9dff94 commit 358f5d2

File tree

3 files changed

+82
-143
lines changed

3 files changed

+82
-143
lines changed

src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -593,8 +593,7 @@ void paintSkin(Graphics g, int dx, int dy, int dw, int dh, State state) {
593593
if (XPStyle.getXP() == null) {
594594
return;
595595
}
596-
if (ThemeReader.isGetThemeTransitionDurationDefined()
597-
&& component instanceof JComponent
596+
if (component instanceof JComponent
598597
&& SwingUtilities.getAncestorOfClass(CellRendererPane.class,
599598
component) == null) {
600599
AnimationController.paintSkin((JComponent) component, this,

src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -35,13 +35,6 @@
3535
import java.util.concurrent.locks.ReadWriteLock;
3636
import java.util.concurrent.locks.ReentrantReadWriteLock;
3737

38-
/* !!!! WARNING !!!!
39-
* This class has to be in sync with
40-
* src/solaris/classes/sun/awt/windows/ThemeReader.java
41-
* while we continue to build WinL&F on solaris
42-
*/
43-
44-
4538
/**
4639
* Implements Theme Support for Windows XP.
4740
*
@@ -299,8 +292,6 @@ public static long getThemeTransitionDuration(String widget, int part,
299292
}
300293
}
301294

302-
public static native boolean isGetThemeTransitionDurationDefined();
303-
304295
private static native Insets getThemeBackgroundContentMargins(long theme,
305296
int part, int state, int boundingWidth, int boundingHeight);
306297

0 commit comments

Comments
 (0)