diff options
| author | Roman Kennke <roman@kennke.org> | 2005-04-22 18:31:30 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2005-04-22 18:31:30 +0000 |
| commit | c189e185d44ade63dd087a9c2ba059c19920f8a5 (patch) | |
| tree | dad7c6c39a8f34edd2605fabf4f0409f420383ff /libjava/javax/swing/plaf | |
| parent | f030e8540f48f439493aeb129cf24235d456c5a9 (diff) | |
| download | gcc-c189e185d44ade63dd087a9c2ba059c19920f8a5.zip gcc-c189e185d44ade63dd087a9c2ba059c19920f8a5.tar.gz gcc-c189e185d44ade63dd087a9c2ba059c19920f8a5.tar.bz2 | |
2005-04-22 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/basic/BasicLookAndFeel.java
(initComponentDefaults): Changed Button.border to be
BasicBorders.getButtonBorder as it should be.
2005-04-22 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/basic/BasicTabbedPaneUI.java:
(getMaximumSize): Return (Short.MAX_VALUE, Short.MAX_VALUE) as it
should according to a mauve testcase, instead of the preferred
size.
2005-04-22 Roman Kennke <roman@kennke.org>
* javax/swing/JMenu.java
(add): add(Component) now calls PopupMenu.insert(..) instead of
PopupMenu.add(..). add(..) is not implemented for Component,
so JComponent.add(..) is called instead, adding the component
in the wrong place.
2005-04-22 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/basic/BasicButtonListener.java
(mousePressed): replaced query to getModifiersEx with getModifiers.
This method relied on faulty behaviour in getModifierEx.
(mouseReleased): replaced query to getModifiersEx with getModifiers.
This method relied on faulty behaviour in getModifierEx.
2005-04-22 Roman Kennke <roman@kennke.org>
* javax/swing/plaf/metal/MetalLookAndFeel.java
(getDefaults): Call addCustomEntriesToTable on the theme.
2005-04-22 Roman Kennke <roman@kennke.org>
* javax/swing/tree/DefaultTreeSelectionModel.java
(constructor): Added implementation.
(getRowMapper): Added implementation.
(setSelectionMode): Added implementation.
(getSelectionMode): Added implementation.
(getSelectionPath): Added implementation.
(getSelectionPaths): Added implementation.
(getSelectionCount): Added implementation.
(isSelectionEmpty): Added implementation.
(getSelectionRows): Added implementation.
(getMinSelectionRow): Added implementation.
(getMaxSelectionRow): Added implementation.
(getLeadSelectionRow): Added implementation.
(getLeadSelectionPath): Added implementation.
From-SVN: r98580
Diffstat (limited to 'libjava/javax/swing/plaf')
4 files changed, 15 insertions, 6 deletions
diff --git a/libjava/javax/swing/plaf/basic/BasicButtonListener.java b/libjava/javax/swing/plaf/basic/BasicButtonListener.java index 48451c2..350db3be 100644 --- a/libjava/javax/swing/plaf/basic/BasicButtonListener.java +++ b/libjava/javax/swing/plaf/basic/BasicButtonListener.java @@ -157,7 +157,7 @@ public class BasicButtonListener { AbstractButton button = (AbstractButton) e.getSource(); ButtonModel model = button.getModel(); - if ((e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0) + if (e.getButton() == MouseEvent.BUTTON1) { // It is important that these transitions happen in this order. model.setArmed(true); @@ -179,7 +179,7 @@ public class BasicButtonListener { AbstractButton button = (AbstractButton) e.getSource(); ButtonModel model = button.getModel(); - if ((e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0) + if (e.getButton() == MouseEvent.BUTTON1) { // It is important that these transitions happen in this order. model.setPressed(false); diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java index 4a0f6d7..562f001 100644 --- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java +++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java @@ -244,7 +244,14 @@ public abstract class BasicLookAndFeel extends LookAndFeel "AbstractUndoableEdit.redoText", "Redo", "Button.background", new ColorUIResource(Color.lightGray), - "Button.border", BorderUIResource.getEtchedBorderUIResource(), + "Button.border", + new UIDefaults.LazyValue() + { + public Object createValue(UIDefaults table) + { + return BasicBorders.getButtonBorder(); + } + }, "Button.darkShadow", new ColorUIResource(Color.darkGray), "Button.focusInputMap", new UIDefaults.LazyInputMap(new Object[] { "SPACE", "pressed", diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java index a533f08..c2af60f 100644 --- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java +++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java @@ -1168,8 +1168,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants * This is a helper class that implements UIResource so it is not added as a * tab when an object of this class is added to the JTabbedPane. */ - private static class ScrollingButton extends BasicArrowButton - implements UIResource + private class ScrollingButton extends BasicArrowButton implements UIResource { /** * Creates a ScrollingButton given the direction. @@ -1682,7 +1681,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants */ public Dimension getMaximumSize(JComponent c) { - return getPreferredSize(c); + return new Dimension(Short.MAX_VALUE, Short.MAX_VALUE); } /** diff --git a/libjava/javax/swing/plaf/metal/MetalLookAndFeel.java b/libjava/javax/swing/plaf/metal/MetalLookAndFeel.java index db48a74..a55bc1b 100644 --- a/libjava/javax/swing/plaf/metal/MetalLookAndFeel.java +++ b/libjava/javax/swing/plaf/metal/MetalLookAndFeel.java @@ -92,6 +92,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel if (LAF_defaults == null) LAF_defaults = super.getDefaults(); + // add custom theme entries to the table + theme.addCustomEntriesToTable(LAF_defaults); + // Returns the default values for this look and feel. return LAF_defaults; } |