Index: javax/swing/plaf/metal/MetalLookAndFeel.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/metal/MetalLookAndFeel.java,v retrieving revision 1.5.2.2 diff -u -r1.5.2.2 MetalLookAndFeel.java --- javax/swing/plaf/metal/MetalLookAndFeel.java 22 Dec 2004 20:48:32 -0000 1.5.2.2 +++ javax/swing/plaf/metal/MetalLookAndFeel.java 3 Jan 2005 16:49:18 -0000 @@ -40,6 +40,7 @@ import javax.swing.UIDefaults; import javax.swing.plaf.ColorUIResource; +import javax.swing.plaf.FontUIResource; import javax.swing.plaf.basic.BasicLookAndFeel; public class MetalLookAndFeel extends BasicLookAndFeel @@ -142,6 +143,11 @@ return theme.getControlTextColor(); } + public static FontUIResource getControlTextFont() + { + return theme.getControlTextFont(); + } + public static ColorUIResource getDesktopColor() { return theme.getDesktopColor(); @@ -192,6 +198,11 @@ return theme.getMenuSelectedForeground(); } + public static FontUIResource getMenuTextFont() + { + return theme.getMenuTextFont(); + } + public static ColorUIResource getPrimaryControl() { return theme.getPrimaryControl(); @@ -227,11 +238,21 @@ return theme.getSeparatorForeground(); } + public static FontUIResource getSubTextFont() + { + return theme.getSubTextFont(); + } + public static ColorUIResource getSystemTextColor() { return theme.getSystemTextColor(); } + public static FontUIResource getSystemTextFont() + { + return theme.getSystemTextFont(); + } + public static ColorUIResource getTextHighlightColor() { return theme.getTextHighlightColor(); @@ -242,6 +263,11 @@ return theme.getUserTextColor(); } + public static FontUIResource getUserTextFont() + { + return theme.getUserTextFont(); + } + public static ColorUIResource getWhite() { return theme.getWhite(); @@ -257,6 +283,11 @@ return theme.getWindowTitleBackground(); } + public static FontUIResource getWindowTitleFont() + { + return theme.getWindowTitleFont(); + } + public static ColorUIResource getWindowTitleForeground() { return theme.getWindowTitleForeground();