diff options
author | Roman Kennke <roman@kennke.org> | 2006-03-03 20:14:43 +0000 |
---|---|---|
committer | Roman Kennke <roman@kennke.org> | 2006-03-03 20:14:43 +0000 |
commit | 4e1c6cb49c19f3b42adaaf7c839b84b74dd7119a (patch) | |
tree | f44172ca22224b960d9294aecf8cd096287ce640 | |
parent | 15d81e52c1a171113d11cfd365b76b307836df66 (diff) | |
download | classpath-4e1c6cb49c19f3b42adaaf7c839b84b74dd7119a.tar.gz |
2006-03-03 Roman Kennke <kennke@aicas.com>
* javax/swing/JInternalFrame.java
(JInternalFrame): Set frame invisible.
(show): Reformatted.
* javax/swing/plaf/basic/BasicInternalFrameUI.java
(installDefaults): Do not set invisible here.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | javax/swing/JInternalFrame.java | 44 | ||||
-rw-r--r-- | javax/swing/plaf/basic/BasicInternalFrameUI.java | 14 |
3 files changed, 31 insertions, 35 deletions
@@ -1,5 +1,13 @@ 2006-03-03 Roman Kennke <kennke@aicas.com> + * javax/swing/JInternalFrame.java + (JInternalFrame): Set frame invisible. + (show): Reformatted. + * javax/swing/plaf/basic/BasicInternalFrameUI.java + (installDefaults): Do not set invisible here. + +2006-03-03 Roman Kennke <kennke@aicas.com> + * java/awt/Toolkit.java (getScreenInsets): Return (0,0,0,0) here. diff --git a/javax/swing/JInternalFrame.java b/javax/swing/JInternalFrame.java index 1e4fad767..5bd6f781c 100644 --- a/javax/swing/JInternalFrame.java +++ b/javax/swing/JInternalFrame.java @@ -559,6 +559,8 @@ public class JInternalFrame extends JComponent implements Accessible, this.iconable = iconifiable; storedBounds = new Rectangle(); setRootPane(createRootPane()); + // JInternalFrames are invisible by default. + setVisible(false); updateUI(); setRootPaneCheckingEnabled(true); // Done the init stage, now adds go to content pane. } @@ -1629,27 +1631,27 @@ public class JInternalFrame extends JComponent implements Accessible, { if (! isVisible()) { - super.show(); - - JDesktopPane pane = getDesktopPane(); - if (pane != null) - pane.setSelectedFrame(this); - else - { - try - { - setSelected(true); - } - catch (PropertyVetoException e) - { - // Do nothing. if they don't want to be selected. - } - } - if (isFirstTimeVisible) - { - isFirstTimeVisible = false; - fireInternalFrameEvent(InternalFrameEvent.INTERNAL_FRAME_OPENED); - } + super.show(); + + JDesktopPane pane = getDesktopPane(); + if (pane != null) + pane.setSelectedFrame(this); + else + { + try + { + setSelected(true); + } + catch (PropertyVetoException e) + { + // Do nothing. if they don't want to be selected. + } + } + if (isFirstTimeVisible) + { + isFirstTimeVisible = false; + fireInternalFrameEvent(InternalFrameEvent.INTERNAL_FRAME_OPENED); + } } } diff --git a/javax/swing/plaf/basic/BasicInternalFrameUI.java b/javax/swing/plaf/basic/BasicInternalFrameUI.java index c82fe69d0..f6cbeec88 100644 --- a/javax/swing/plaf/basic/BasicInternalFrameUI.java +++ b/javax/swing/plaf/basic/BasicInternalFrameUI.java @@ -522,18 +522,6 @@ public class BasicInternalFrameUI extends InternalFrameUI } /** - * This method returns the maximum layout size. - * - * @param c - * The Container to find a maximum layout size for. - * @return The maximum dimensions for the JInternalFrame. - */ - public Dimension maximumLayoutSize(Container c) - { - return preferredLayoutSize(c); - } - - /** * Th8is method returns the preferred layout size. * * @param c @@ -1167,8 +1155,6 @@ public class BasicInternalFrameUI extends InternalFrameUI frame.setLayout(internalFrameLayout); LookAndFeel.installBorder(frame, "InternalFrame.border"); frame.setFrameIcon(UIManager.getIcon("InternalFrame.icon")); - // InternalFrames are invisible by default. - frame.setVisible(false); } /** |