src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java

*** 76,86 ****
          if (WindowsLookAndFeel.isMnemonicHidden() == true) {
              mnemonicIndex = -1;
          }
  
          g.setColor(l.getForeground());
!         SwingUtilities2.drawStringUnderlineCharAt(l, g, s, mnemonicIndex,
                                                       textX, textY);
      }
  
      protected void paintDisabledText(JLabel l, Graphics g, String s,
                                       int textX, int textY) {
--- 76,86 ----
          if (WindowsLookAndFeel.isMnemonicHidden() == true) {
              mnemonicIndex = -1;
          }
  
          g.setColor(l.getForeground());
!         getTextUIDrawing().drawStringUnderlineCharAt(l, g, s, mnemonicIndex,
                                                       textX, textY);
      }
  
      protected void paintDisabledText(JLabel l, Graphics g, String s,
                                       int textX, int textY) {
*** 90,112 ****
              mnemonicIndex = -1;
          }
          if ( UIManager.getColor("Label.disabledForeground") instanceof Color &&
               UIManager.getColor("Label.disabledShadow") instanceof Color) {
              g.setColor( UIManager.getColor("Label.disabledShadow") );
!             SwingUtilities2.drawStringUnderlineCharAt(l, g, s,
                                                           mnemonicIndex,
                                                           textX + 1, textY + 1);
              g.setColor( UIManager.getColor("Label.disabledForeground") );
!             SwingUtilities2.drawStringUnderlineCharAt(l, g, s,
                                                           mnemonicIndex,
                                                           textX, textY);
          } else {
              Color background = l.getBackground();
              g.setColor(background.brighter());
!             SwingUtilities2.drawStringUnderlineCharAt(l,g, s, mnemonicIndex,
                                                           textX + 1, textY + 1);
              g.setColor(background.darker());
!             SwingUtilities2.drawStringUnderlineCharAt(l,g, s, mnemonicIndex,
                                                           textX, textY);
          }
      }
  }
--- 90,112 ----
              mnemonicIndex = -1;
          }
          if ( UIManager.getColor("Label.disabledForeground") instanceof Color &&
               UIManager.getColor("Label.disabledShadow") instanceof Color) {
              g.setColor( UIManager.getColor("Label.disabledShadow") );
!             getTextUIDrawing().drawStringUnderlineCharAt(l, g, s,
                                                           mnemonicIndex,
                                                           textX + 1, textY + 1);
              g.setColor( UIManager.getColor("Label.disabledForeground") );
!             getTextUIDrawing().drawStringUnderlineCharAt(l, g, s,
                                                           mnemonicIndex,
                                                           textX, textY);
          } else {
              Color background = l.getBackground();
              g.setColor(background.brighter());
!             getTextUIDrawing().drawStringUnderlineCharAt(l,g, s, mnemonicIndex,
                                                           textX + 1, textY + 1);
              g.setColor(background.darker());
!             getTextUIDrawing().drawStringUnderlineCharAt(l,g, s, mnemonicIndex,
                                                           textX, textY);
          }
      }
  }