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

rev 53939 : 8213116: javax/swing/JComboBox/WindowsComboBoxSize/WindowsComboBoxSizeTest.java fails in Windows
Reviewed-by: prr

*** 342,352 ****
--- 342,356 ----
              d.width += 7;
              boolean isEditable = false;
              if (c instanceof JComboBox) {
                  isEditable = ((JComboBox) c).isEditable();
              }
+             if (((JComboBox)c).getBorder() instanceof EmptyBorder) {
+                 d.height += isEditable ? 2 : 4;
+             } else {
                  d.height += isEditable ? 4 : 6;
+             }
          } else {
              d.width += 4;
              d.height += 2;
          }
          return d;