diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-01-29 16:31:24 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-01-29 16:31:24 +0000 |
| commit | c7c760626066fc57eef09006f5f3bbf7c1af18d8 (patch) | |
| tree | ffdbcbe07428ddaf38f9f14443b7603db63fe23d /libjava/java | |
| parent | 3d7423f9c193185bed4193c67a69f8ebf27b3294 (diff) | |
| download | gcc-c7c760626066fc57eef09006f5f3bbf7c1af18d8.tar.gz | |
* java/awt/GridLayout.java (layoutContainer): Use number of rows
to compute height of each cell, and number of columns to compute
width of each cell.
* java/awt/Window.java (getOwnedWindows): Don't return null.
* java/awt/FlowLayout.java (layoutContainer): Set width and height
of component. Increment x using horizontal gap, not vertical
gap.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49320 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/awt/FlowLayout.java | 4 | ||||
| -rw-r--r-- | libjava/java/awt/GridLayout.java | 4 | ||||
| -rw-r--r-- | libjava/java/awt/Window.java | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libjava/java/awt/FlowLayout.java b/libjava/java/awt/FlowLayout.java index a432a51a5c0..e328d63796e 100644 --- a/libjava/java/awt/FlowLayout.java +++ b/libjava/java/awt/FlowLayout.java @@ -212,8 +212,8 @@ public class FlowLayout implements LayoutManager, Serializable if (comps[k].visible) { Dimension c = comps[k].getPreferredSize (); - comps[k].setLocation (x, y); - x += c.width + vgap; + comps[k].setBounds (x, y, c.width, new_h); + x += c.width + hgap; } } diff --git a/libjava/java/awt/GridLayout.java b/libjava/java/awt/GridLayout.java index e6cf1ec19bf..347186536cb 100644 --- a/libjava/java/awt/GridLayout.java +++ b/libjava/java/awt/GridLayout.java @@ -172,9 +172,9 @@ public class GridLayout implements LayoutManager, Serializable // Compute width and height of each cell in the grid. int tw = d.width - ins.left - ins.right; - tw = (tw - (real_rows - 1) * hgap) / real_rows; + tw = (tw - (real_cols - 1) * hgap) / real_cols; int th = d.height - ins.top - ins.bottom; - th = (th - (real_cols - 1) * vgap) / real_cols; + th = (th - (real_rows - 1) * vgap) / real_rows; // If the cells are too small, still try to do something. if (tw < 0) diff --git a/libjava/java/awt/Window.java b/libjava/java/awt/Window.java index b95dc8e961b..6af7c345008 100644 --- a/libjava/java/awt/Window.java +++ b/libjava/java/awt/Window.java @@ -303,7 +303,7 @@ public class Window extends Container { // FIXME: return array containing all the windows this window currently // owns. - return null; + return new Window[0]; } /** |