--- a/dwt/widgets/Composite.d	Sun Sep 14 23:32:29 2008 +0200
+++ b/dwt/widgets/Composite.d	Tue Oct 07 12:56:18 2008 +0200
@@ -70,7 +70,7 @@
  * @see Canvas
  */
 public class Composite : Scrollable {
-    Layout layout;
+    Layout layout_;
     Control[] tabList;
     int scrolledVisibleRgn, siblingsVisibleRgn;
     int layoutCount, backgroundMode;
@@ -199,7 +199,7 @@
         Control child = changed [i];
         Composite composite = child.parent;
         while (child !is this) {
-            if (composite.layout is null || !composite.layout.flushCache (child)) {
+            if (composite.layout_ is null || !composite.layout_.flushCache (child)) {
                 composite.state |= LAYOUT_CHANGED;
             }
             child = composite;
@@ -211,10 +211,10 @@
 public Point computeSize (int wHint, int hHint, bool changed) {
     checkWidget();
     Point size;
-    if (layout !is null) {
+    if (layout_ !is null) {
         if ((wHint is DWT.DEFAULT) || (hHint is DWT.DEFAULT)) {
             changed |= (state & LAYOUT_CHANGED) !is 0;
-            size = layout.computeSize (this, wHint, hHint, changed);
+            size = layout_.computeSize (this, wHint, hHint, changed);
             state &= ~LAYOUT_CHANGED;
         } else {
             size = new Point (wHint, hHint);
@@ -410,7 +410,7 @@
  */
 public Layout getLayout () {
     checkWidget();
-    return layout;
+    return layout_;
 }
 
 /**
@@ -555,7 +555,7 @@
  */
 public void layout (bool changed) {
     checkWidget ();
-    if (layout is null) return;
+    if (layout_ is null) return;
     layout (changed, false);
 }
 
@@ -596,7 +596,7 @@
  */
 public void layout (bool changed, bool all) {
     checkWidget ();
-    if (layout is null && !all) return;
+    if (layout_ is null && !all) return;
     markLayout (changed, all);
     updateLayout (all);
 }
@@ -651,9 +651,9 @@
         Control child = changed [i];
         Composite composite = child.parent;
         while (child !is this) {
-            if (composite.layout !is null) {
+            if (composite.layout_ !is null) {
                 composite.state |= LAYOUT_NEEDED;
-                if (!composite.layout.flushCache (child)) {
+                if (!composite.layout_.flushCache (child)) {
                     composite.state |= LAYOUT_CHANGED;
                 }
             }
@@ -672,7 +672,7 @@
 }
 
 void markLayout (bool changed, bool all) {
-    if (layout !is null) {
+    if (layout_ !is null) {
         state |= LAYOUT_NEEDED;
         if (changed) state |= LAYOUT_CHANGED;
     }
@@ -708,7 +708,7 @@
 
 void releaseWidget () {
     super.releaseWidget ();
-    layout = null;
+    layout_ = null;
     tabList = null;
 }
 
@@ -744,7 +744,7 @@
 
 int setBounds (int x, int y, int width, int height, bool move, bool resize) {
     int result = super.setBounds (x, y, width, height, move, resize);
-    if (layout !is null && (result & RESIZED) !is 0) {
+    if (layout_ !is null && (result & RESIZED) !is 0) {
         markLayout (false, false);
         updateLayout (false);
     }
@@ -773,7 +773,7 @@
  */
 public void setLayout (Layout layout) {
     checkWidget();
-    this.layout = layout;
+    this.layout_ = layout;
 }
 
 /**
@@ -813,7 +813,7 @@
 
 bool setScrollBarVisible (ScrollBar bar, bool visible) {
     bool changed = super.setScrollBarVisible (bar, visible);
-    if (changed && layout !is null) {
+    if (changed && layout_ !is null) {
         markLayout (false, false);
         updateLayout (false);
     }
@@ -889,7 +889,7 @@
     if ((state & LAYOUT_NEEDED) !is 0) {
         bool changed = (state & LAYOUT_CHANGED) !is 0;
         state &= ~(LAYOUT_NEEDED | LAYOUT_CHANGED);
-        layout.layout (this, changed);
+        layout_.layout (this, changed);
     }
     if (all) {
         state &= ~LAYOUT_CHILD;