aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/awt/GridLayout.java
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2002-01-25 17:25:26 +0000
committerTom Tromey <tromey@gcc.gnu.org>2002-01-25 17:25:26 +0000
commit2fb4e07f24a248effea30f2fd56173d56d612088 (patch)
tree85b7efd7458539c32b0b0f84cabc914c4b6e789d /libjava/java/awt/GridLayout.java
parentfd29f6eae8e6109ca0b141a249482ef2e986535a (diff)
downloadgcc-2fb4e07f24a248effea30f2fd56173d56d612088.zip
gcc-2fb4e07f24a248effea30f2fd56173d56d612088.tar.gz
gcc-2fb4e07f24a248effea30f2fd56173d56d612088.tar.bz2
FlowLayout.java (layoutContainer): Correctly compute loop termination condition.
* java/awt/FlowLayout.java (layoutContainer): Correctly compute loop termination condition. * java/awt/GridLayout.java (getSize): Use `real_cols' to compute width. From-SVN: r49216
Diffstat (limited to 'libjava/java/awt/GridLayout.java')
-rw-r--r--libjava/java/awt/GridLayout.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/java/awt/GridLayout.java b/libjava/java/awt/GridLayout.java
index d887f3e..e6cf1ec 100644
--- a/libjava/java/awt/GridLayout.java
+++ b/libjava/java/awt/GridLayout.java
@@ -320,8 +320,8 @@ public class GridLayout implements LayoutManager, Serializable
Insets ins = parent.getInsets ();
// We subtract out an extra gap here because the gaps are only
// between cells.
- w = ins.left + ins.right + real_rows * (w + hgap) - hgap;
- h = ins.top + ins.bottom + real_cols * (h + vgap) - vgap;
+ w = ins.left + ins.right + real_cols * (w + hgap) - hgap;
+ h = ins.top + ins.bottom + real_rows * (h + vgap) - vgap;
return new Dimension (w, h);
}