diff options
| author | Mark Wielaard <mark@klomp.org> | 2004-05-30 13:53:58 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-05-30 13:53:58 +0000 |
| commit | 7a70d70c54f4b73e25f7860f56bcd8f9e532f16c (patch) | |
| tree | 607be5204bb760403de0943e2e525a10c01b2cbf /libjava | |
| parent | 071917b066b8545096dcd241bd6f7e2da17ce26a (diff) | |
| download | gcc-7a70d70c54f4b73e25f7860f56bcd8f9e532f16c.tar.gz | |
Toolkit.java (loadSystemColors): Implement.
2004-05-30 Mark Wielaard <mark@klomp.org>
* java/awt/Toolkit.java (loadSystemColors): Implement.
From-SVN: r82451
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/java/awt/Toolkit.java | 38 |
2 files changed, 39 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ba1983665de..c4e37d74b27 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2004-05-30 Mark Wielaard <mark@klomp.org> + + * java/awt/Toolkit.java (loadSystemColors): Implement. + 2004-05-30 Michael Koch <konqueror@gmx.de> * java/lang/System.java: Reordered imports. diff --git a/libjava/java/awt/Toolkit.java b/libjava/java/awt/Toolkit.java index 9be38e80a02..2ee3f508983 100644 --- a/libjava/java/awt/Toolkit.java +++ b/libjava/java/awt/Toolkit.java @@ -1,5 +1,6 @@ /* Toolkit.java -- AWT Toolkit superclass - Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -365,15 +366,46 @@ public abstract class Toolkit /** * Copies the current system colors into the specified array. This is - * the interface used by the <code>SystemColors</code> class. + * the interface used by the <code>SystemColor</code> class. Although + * this method fills in the array with some default colors a real Toolkit + * should override this method and provide real system colors for the + * native GUI platform. * * @param colors The array to copy the system colors into. + * It must be at least 26 elements. * * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. + * + * @see java.awt.SystemColor */ protected void loadSystemColors(int systemColors[]) { - // XXX Implement. + systemColors[SystemColor.DESKTOP] = 0xFF005C5C; + systemColors[SystemColor.ACTIVE_CAPTION] = 0xFF000080; + systemColors[SystemColor.ACTIVE_CAPTION_TEXT] = 0xFFFFFFFF; + systemColors[SystemColor.ACTIVE_CAPTION_BORDER] = 0xFFC0C0C0; + systemColors[SystemColor.INACTIVE_CAPTION] = 0xFF808080; + systemColors[SystemColor.INACTIVE_CAPTION_TEXT] = 0xFFC0C0C0; + systemColors[SystemColor.INACTIVE_CAPTION_BORDER] = 0xFFC0C0C0; + systemColors[SystemColor.WINDOW] = 0xFFFFFFFF; + systemColors[SystemColor.WINDOW_BORDER] = 0xFF000000; + systemColors[SystemColor.WINDOW_TEXT] = 0xFF000000; + systemColors[SystemColor.MENU] = 0xFFC0C0C0; + systemColors[SystemColor.MENU_TEXT] = 0xFF000000; + systemColors[SystemColor.TEXT] = 0xFFC0C0C0; + systemColors[SystemColor.TEXT_TEXT] = 0xFF000000; + systemColors[SystemColor.TEXT_HIGHLIGHT] = 0xFF000090; + systemColors[SystemColor.TEXT_HIGHLIGHT_TEXT] = 0xFFFFFFFF; + systemColors[SystemColor.TEXT_INACTIVE_TEXT] = 0xFF808080; + systemColors[SystemColor.CONTROL] = 0xFFC0C0C0; + systemColors[SystemColor.CONTROL_TEXT] = 0xFF000000; + systemColors[SystemColor.CONTROL_HIGHLIGHT] = 0xFFFFFFFF; + systemColors[SystemColor.CONTROL_LT_HIGHLIGHT] = 0xFFE0E0E0; + systemColors[SystemColor.CONTROL_SHADOW] = 0xFF808080; + systemColors[SystemColor.CONTROL_DK_SHADOW] = 0xFF000000; + systemColors[SystemColor.SCROLLBAR] = 0xFFE0E0E0; + systemColors[SystemColor.INFO] = 0xFFE0E000; + systemColors[SystemColor.INFO_TEXT] = 0xFF000000; } /** |