Mercurial > projects > dwt-linux

changeset 201:889ad17c1fe1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Synced with dwt-win
author Frank Benoit <benoit@tionex.de>
date Sat, 08 Mar 2008 14:01:38 +0100
parents 08789b28bdf3
children 3313d5e8d23c
files dwt/layout/FillLayout.d dwt/layout/FormData.d dwt/layout/FormLayout.d dwt/layout/GridData.d dwt/layout/GridLayout.d dwt/layout/RowData.d dwt/layout/RowLayout.d
diffstat 7 files changed, 20 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/dwt/layout/FillLayout.d	Fri Mar 07 03:12:23 2008 +0100
+++ b/dwt/layout/FillLayout.d	Sat Mar 08 14:01:38 2008 +0100
@@ -23,6 +23,7 @@
 
 import tango.text.Util;
 import tango.util.Convert;
+import dwt.dwthelper.utils;
 
 /**
  * <code>FillLayout</code> is the simplest layout class. It lays out
@@ -111,7 +112,7 @@
     this.type = type;
 }
 
-protected override Point computeSize (Composite composite, int wHint, int hHint, bool flushCache) {
+override protected Point computeSize (Composite composite, int wHint, int hHint, bool flushCache) {
     Control [] children = composite.getChildren ();
     int count = children.length;
     int maxWidth = 0, maxHeight = 0;
@@ -173,7 +174,7 @@
     return size;
 }
 
-protected override bool flushCache (Control control) {
+override protected bool flushCache (Control control) {
     Object data = control.getLayoutData();
     if (data !is null) (cast(FillData)data).flushCache();
     return true;
@@ -186,7 +187,7 @@
     return string[ index + 1 .. string.length ];
 }
 
-protected override void layout (Composite composite, bool flushCache) {
+override protected void layout (Composite composite, bool flushCache) {
     Rectangle rect = composite.getClientArea ();
     Control [] children = composite.getChildren ();
     int count = children.length;
@@ -232,7 +233,7 @@
  *
  * @return a string representation of the layout
  */
-public override char[] toString () {
+override public char[] toString () {
     char[] string = getName () ~ " {";
     string ~= "type="~((type is DWT.VERTICAL) ? "DWT.VERTICAL" : "DWT.HORIZONTAL")~" ";
     if (marginWidth !is 0) string ~= "marginWidth="~to!(char[])(marginWidth)~" ";
--- a/dwt/layout/FormData.d	Fri Mar 07 03:12:23 2008 +0100
+++ b/dwt/layout/FormData.d	Sat Mar 08 14:01:38 2008 +0100
@@ -17,7 +17,6 @@
 import dwt.graphics.Point;
 import dwt.widgets.Control;
 import dwt.layout.FormAttachment;
-import tango.text.Util;
 
 import tango.text.Util;
 import tango.util.Convert;
@@ -334,7 +333,7 @@
  *
  * @return a string representation of the FormData object
  */
-public override char[] toString () {
+override public char[] toString () {
     char[] string = getName()~" {";
     if (width !is DWT.DEFAULT) string ~= "width="~to!(char[])(width)~" ";
     if (height !is DWT.DEFAULT) string ~= "height="~to!(char[])(height)~" ";
--- a/dwt/layout/FormLayout.d	Fri Mar 07 03:12:23 2008 +0100
+++ b/dwt/layout/FormLayout.d	Sat Mar 08 14:01:38 2008 +0100
@@ -247,14 +247,14 @@
     return height.solveY (data.getHeight (control, flushCache));
 }
 
-protected override Point computeSize (Composite composite, int wHint, int hHint, bool flushCache) {
+override protected Point computeSize (Composite composite, int wHint, int hHint, bool flushCache) {
     Point size = layout (composite, false, 0, 0, wHint, hHint, flushCache);
     if (wHint !is DWT.DEFAULT) size.x = wHint;
     if (hHint !is DWT.DEFAULT) size.y = hHint;
     return size;
 }
 
-protected override bool flushCache (Control control) {
+override protected bool flushCache (Control control) {
     Object data = control.getLayoutData ();
     if (data !is null) (cast(FormData) data).flushCache ();
     return true;
@@ -287,7 +287,7 @@
     return width.solveY (data.getWidth (control, flushCache));
 }
 
-protected override void layout (Composite composite, bool flushCache) {
+override protected void layout (Composite composite, bool flushCache) {
     Rectangle rect = composite.getClientArea ();
     int x = rect.x + marginLeft + marginWidth;
     int y = rect.y + marginTop + marginHeight;
@@ -379,7 +379,7 @@
  *
  * @return a string representation of the layout
  */
-public override char[] toString () {
+override public char[] toString () {
     char[] string =  getName ()~" {";
     if (marginWidth !is 0) string ~= "marginWidth="~to!(char[])(marginWidth)~" ";
     if (marginHeight !is 0) string ~= "marginHeight="~to!(char[])(marginHeight)~" ";
--- a/dwt/layout/GridData.d	Fri Mar 07 03:12:23 2008 +0100
+++ b/dwt/layout/GridData.d	Sat Mar 08 14:01:38 2008 +0100
@@ -516,7 +516,7 @@
  *
  * @return a string representation of the GridData object
  */
-public override char[] toString () {
+override public char[] toString () {
     char[] hAlign = "";
     switch (horizontalAlignment) {
         case DWT.FILL: hAlign = "DWT.FILL"; break;
--- a/dwt/layout/GridLayout.d	Fri Mar 07 03:12:23 2008 +0100
+++ b/dwt/layout/GridLayout.d	Sat Mar 08 14:01:38 2008 +0100
@@ -170,14 +170,14 @@
     this.makeColumnsEqualWidth = makeColumnsEqualWidth;
 }
 
-protected override Point computeSize (Composite composite, int wHint, int hHint, bool flushCache_) {
+override protected Point computeSize (Composite composite, int wHint, int hHint, bool flushCache_) {
     Point size = layout (composite, false, 0, 0, wHint, hHint, flushCache_);
     if (wHint !is DWT.DEFAULT) size.x = wHint;
     if (hHint !is DWT.DEFAULT) size.y = hHint;
     return size;
 }
 
-protected override bool flushCache (Control control) {
+override protected bool flushCache (Control control) {
     Object data = control.getLayoutData ();
     if (data !is null) (cast(GridData) data).flushCache ();
     return true;
@@ -200,7 +200,7 @@
     return null;
 }
 
-protected override void layout (Composite composite, bool flushCache_) {
+override protected void layout (Composite composite, bool flushCache_) {
     Rectangle rect = composite.getClientArea ();
     layout (composite, true, rect.x, rect.y, rect.width, rect.height, flushCache_);
 }
@@ -740,7 +740,7 @@
  *
  * @return a string representation of the layout
  */
-public override char[] toString () {
+override public char[] toString () {
     char[] string = getName ()~" {";
     if (numColumns !is 1) string ~= "numColumns="~to!(char[])(numColumns)~" ";
     if (makeColumnsEqualWidth) string ~= "makeColumnsEqualWidth="~to!(char[])(makeColumnsEqualWidth)~" ";
--- a/dwt/layout/RowData.d	Fri Mar 07 03:12:23 2008 +0100
+++ b/dwt/layout/RowData.d	Sat Mar 08 14:01:38 2008 +0100
@@ -118,7 +118,7 @@
  *
  * @return a string representation of the RowData object
  */
-public override char[] toString () {
+override public char[] toString () {
     char[] string = getName ()~" {";
     if (width !is DWT.DEFAULT) string ~= "width="~to!(char[])(width)~" ";
     if (height !is DWT.DEFAULT) string ~= "height="~to!(char[])(height)~" ";
--- a/dwt/layout/RowLayout.d	Fri Mar 07 03:12:23 2008 +0100
+++ b/dwt/layout/RowLayout.d	Sat Mar 08 14:01:38 2008 +0100
@@ -194,7 +194,7 @@
     this.type = type;
 }
 
-protected override Point computeSize (Composite composite, int wHint, int hHint, bool flushCache_) {
+override protected Point computeSize (Composite composite, int wHint, int hHint, bool flushCache_) {
     Point extent;
     if (type is DWT.HORIZONTAL) {
         extent = layoutHorizontal (composite, false, (wHint !is DWT.DEFAULT) && wrap, wHint, flushCache_);
@@ -216,7 +216,7 @@
     return control.computeSize (wHint, hHint, flushCache_);
 }
 
-protected override bool flushCache (Control control) {
+override protected bool flushCache (Control control) {
     return true;
 }
 
@@ -227,7 +227,7 @@
     return string[ index + 1 .. string.length ];
 }
 
-protected override void layout (Composite composite, bool flushCache_) {
+override protected void layout (Composite composite, bool flushCache_) {
     Rectangle clientArea = composite.getClientArea ();
     if (type is DWT.HORIZONTAL) {
         layoutHorizontal (composite, true, wrap, clientArea.width, flushCache_);
@@ -456,7 +456,7 @@
  *
  * @return a string representation of the layout
  */
-public override char[] toString () {
+override public char[] toString () {
     char[] string = getName ()~" {";
     string ~= "type="~((type !is DWT.HORIZONTAL) ? "DWT.VERTICAL" : "DWT.HORIZONTAL")~" ";
     if (marginWidth !is 0) string ~= "marginWidth="~to!(char[])(marginWidth)~" ";