RadioButton not drawn. ImageIcon on the fly

Author: prsadhuk

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

@@ -884,38 +884,6 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
                     }
                 }
                 if (icon != null) {
-                    if (!((AbstractButton) c).isSelected()) {
-                        Part backgroundPart = Part.MP_POPUPCHECKBACKGROUND;
-                        Part part;
-                        if (type == JRadioButtonMenuItem.class) {
-                            part = Part.BP_RADIOBUTTON;
-                        } else {
-                            part = Part.MP_POPUPCHECK;
-                        }
-                        State backgroundState;
-                        State state;
-                        if (isEnabled(c, null)) {
-                            backgroundState = State.NORMAL;
-                            state = (type == JRadioButtonMenuItem.class)
-                                    ? State.BULLETNORMAL
-                                    : State.CHECKMARKNORMAL;
-                        } else {
-                            backgroundState = State.DISABLEDPUSHED;
-                            state =
-                                    (type == JRadioButtonMenuItem.class)
-                                            ? State.BULLETDISABLED
-                                            : State.CHECKMARKDISABLED;
-                        }
-                        XPStyle xp = XPStyle.getXP();
-                        if (xp != null) {
-                            Skin skin;
-                            skin = xp.getSkin(c, backgroundPart);
-                            skin.paintSkin(g, x, y,
-                                    getIconWidth(), getIconHeight(), backgroundState);
-                            skin = xp.getSkin(c, part);
-                            skin.paintSkin(g, x - 2 * OFFSET, y + OFFSET, state);
-                        }
-                    }
                     icon.paintIcon(c, g, x + 3 * OFFSET, y + OFFSET);
                 }
             }

test/jdk/javax/swing/JMenuItem/TestImageIconWithJRadioButtonMenuItem.java

@@ -32,6 +32,9 @@
  * @run main/manual TestImageIconWithJRadioButtonMenuItem
  */
 
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
 import javax.swing.AbstractButton;
 import javax.swing.ButtonGroup;
 import javax.swing.ImageIcon;
@@ -46,8 +49,8 @@ public class TestImageIconWithJRadioButtonMenuItem {
 
     private static final String INSTRUCTIONS = """
         Two JRadioButtonMenuItem will be shown.
-        One JRadioButtonMenuItem is with image icon and
-        another one without image icon.
+        One JRadioButtonMenuItem is with image icon of a red square
+        and another one without image icon.
         Verify that for JRadioButtonMenuItem with image icon,
         radiobutton is been shown alongside the image icon.
         If radiobutton is shown, test passes else fails.""";
@@ -65,11 +68,14 @@ public static void main(String[] args) throws Exception {
     }
 
     public static JFrame doTest() {
-        String imgDir = System.getProperty("test.src", ".");
-        String imgPath = imgDir + File.separator + "duke.gif";
+        BufferedImage img = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
+        Graphics g = img.getGraphics();
+        g.setColor(Color.red);
+        g.fillRect(0, 0, img.getWidth(), img.getHeight());
+        g.dispose();
 
         JFrame frame = new JFrame("RadioButtonWithImageIcon");
-        ImageIcon imageIcon1 = new ImageIcon(imgPath);
+        ImageIcon imageIcon1 = new ImageIcon(img);
         AbstractButton button1 = new JRadioButtonMenuItem("JRadioButtonMenuItem 1",
                 imageIcon1);
         button1.setSelected(true);