diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-01-10 15:59:36 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-01-10 15:59:36 +0000 |
| commit | e2880df85352a4f46c1fc8b28c4cd08540a2daed (patch) | |
| tree | aee81230bdbf73bd817662e0ce7a4665939ab41d /javax/swing/plaf/basic/BasicComboBoxUI.java | |
| parent | 05f169147352fa3eeb9726f3d57597a83eb7d64d (diff) | |
| download | classpath-e2880df85352a4f46c1fc8b28c4cd08540a2daed.tar.gz | |
2006-01-10 Andrew John Hughes <gnu_andrew@member.fsf.org>
Merge of HEAD --> generics branch for the period
2005/11/27 to 2006/01/09.
Diffstat (limited to 'javax/swing/plaf/basic/BasicComboBoxUI.java')
| -rw-r--r-- | javax/swing/plaf/basic/BasicComboBoxUI.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/javax/swing/plaf/basic/BasicComboBoxUI.java b/javax/swing/plaf/basic/BasicComboBoxUI.java index 78ceccb05..288a8d89f 100644 --- a/javax/swing/plaf/basic/BasicComboBoxUI.java +++ b/javax/swing/plaf/basic/BasicComboBoxUI.java @@ -294,8 +294,7 @@ public class BasicComboBoxUI extends ComboBoxUI comboBox.addPropertyChangeListener(propertyChangeListener); focusListener = createFocusListener(); - comboBox.addFocusListener(focusListener); - listBox.addFocusListener(focusListener); + editor.addFocusListener(focusListener); itemListener = createItemListener(); comboBox.addItemListener(itemListener); @@ -572,6 +571,7 @@ public class BasicComboBoxUI extends ComboBoxUI { arrowButton.setEnabled(comboBox.isEnabled()); arrowButton.setFont(comboBox.getFont()); + arrowButton.setFocusable(false); } /** @@ -624,12 +624,14 @@ public class BasicComboBoxUI extends ComboBoxUI public void setPopupVisible(JComboBox c, boolean v) { if (v) - { - popup.show(); - popup.getList().requestFocus(); - } + popup.show(); else popup.hide(); + + if (comboBox.isEditable()) + editor.requestFocus(); + else + comboBox.requestFocus(); } /** |