[jdk8u] RFR: 8348760: RadioButton is not shown if JRadioButtonMenuItem is rendered with ImageIcon in WindowsLookAndFeel [v2]

[Antonio Vieiro]

On Thu, 25 Sep 2025 18:39:24 GMT, Severin Gehwolf <sgehwolf at openjdk.org> wrote:

>> Antonio Vieiro has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Copyright and newline typo
>
> There were small differences to the JDK 11 backport:
> 
> 
> diff --git a/jdk/src/share/classes/com/sun/java/swing/SwingUtilities3.java b/jdk/src/share/classes/com/sun/java/swing/SwingUtilities3.java
> index c0286a74e1..c29297a630 100644
> --- a/jdk/src/share/classes/com/sun/java/swing/SwingUtilities3.java
> +++ b/jdk/src/share/classes/com/sun/java/swing/SwingUtilities3.java
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
> + * Copyright (c) 2002, 2025, 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
> diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
> index 78b11147a7..7fda45b254 100644
> --- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
> +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
> @@ -785,6 +785,7 @@ public class WindowsIconFactory implements Serializable
>                  }
>                  assert menuItem == null || c == menuItem;
>                  Icon icon = getIcon();
> +
>                  if (type == JCheckBoxMenuItem.class
>                        || type == JRadioButtonMenuItem.class) {
>                      AbstractButton b = (AbstractButton) c;
> 
> 
> Please include them so that the patches are more alike. Seems fine otherwise.

Fixed. Thanks @jerboaa !

-------------

PR Comment: https://git.openjdk.org/jdk8u/pull/78#issuecomment-3335573202