Changeset 201:889ad17c1fe1

Show
Ignore:
Timestamp:
03/08/08 08:01:38 (7 months ago)
Author:
Frank Benoit <benoit@tionex.de>
branch:
default
Message:

Synced with dwt-win

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • dwt/layout/FillLayout.d

    r152 r201  
    2424import tango.text.Util; 
    2525import tango.util.Convert; 
     26import dwt.dwthelper.utils; 
    2627 
    2728/** 
    …… 
    112113} 
    113114 
    114 protected override Point computeSize (Composite composite, int wHint, int hHint, bool flushCache) { 
     115override protected Point computeSize (Composite composite, int wHint, int hHint, bool flushCache) { 
    115116    Control [] children = composite.getChildren (); 
    116117    int count = children.length; 
    …… 
    174175} 
    175176 
    176 protected override bool flushCache (Control control) { 
     177override protected bool flushCache (Control control) { 
    177178    Object data = control.getLayoutData(); 
    178179    if (data !is null) (cast(FillData)data).flushCache(); 
    …… 
    187188} 
    188189 
    189 protected override void layout (Composite composite, bool flushCache) { 
     190override protected void layout (Composite composite, bool flushCache) { 
    190191    Rectangle rect = composite.getClientArea (); 
    191192    Control [] children = composite.getChildren (); 
    …… 
    233234 * @return a string representation of the layout 
    234235 */ 
    235 public override char[] toString () { 
     236override public char[] toString () { 
    236237    char[] string = getName () ~ " {"; 
    237238    string ~= "type="~((type is DWT.VERTICAL) ? "DWT.VERTICAL" : "DWT.HORIZONTAL")~" "; 

  • dwt/layout/FormData.d

    r150 r201  
    1818import dwt.widgets.Control; 
    1919import dwt.layout.FormAttachment; 
    20 import tango.text.Util; 
    2120 
    2221import tango.text.Util; 
    …… 
    335334 * @return a string representation of the FormData object 
    336335 */ 
    337 public override char[] toString () { 
     336override public char[] toString () { 
    338337    char[] string = getName()~" {"; 
    339338    if (width !is DWT.DEFAULT) string ~= "width="~to!(char[])(width)~" "; 

  • dwt/layout/FormLayout.d

    r152 r201  
    248248} 
    249249 
    250 protected override Point computeSize (Composite composite, int wHint, int hHint, bool flushCache) { 
     250override protected Point computeSize (Composite composite, int wHint, int hHint, bool flushCache) { 
    251251    Point size = layout (composite, false, 0, 0, wHint, hHint, flushCache); 
    252252    if (wHint !is DWT.DEFAULT) size.x = wHint; 
    …… 
    255255} 
    256256 
    257 protected override bool flushCache (Control control) { 
     257override protected bool flushCache (Control control) { 
    258258    Object data = control.getLayoutData (); 
    259259    if (data !is null) (cast(FormData) data).flushCache (); 
    …… 
    288288} 
    289289 
    290 protected override void layout (Composite composite, bool flushCache) { 
     290override protected void layout (Composite composite, bool flushCache) { 
    291291    Rectangle rect = composite.getClientArea (); 
    292292    int x = rect.x + marginLeft + marginWidth; 
    …… 
    380380 * @return a string representation of the layout 
    381381 */ 
    382 public override char[] toString () { 
     382override public char[] toString () { 
    383383    char[] string =  getName ()~" {"; 
    384384    if (marginWidth !is 0) string ~= "marginWidth="~to!(char[])(marginWidth)~" "; 

  • dwt/layout/GridData.d

    r150 r201  
    517517 * @return a string representation of the GridData object 
    518518 */ 
    519 public override char[] toString () { 
     519override public char[] toString () { 
    520520    char[] hAlign = ""; 
    521521    switch (horizontalAlignment) { 

  • dwt/layout/GridLayout.d

    r152 r201  
    171171} 
    172172 
    173 protected override Point computeSize (Composite composite, int wHint, int hHint, bool flushCache_) { 
     173override protected Point computeSize (Composite composite, int wHint, int hHint, bool flushCache_) { 
    174174    Point size = layout (composite, false, 0, 0, wHint, hHint, flushCache_); 
    175175    if (wHint !is DWT.DEFAULT) size.x = wHint; 
    …… 
    178178} 
    179179 
    180 protected override bool flushCache (Control control) { 
     180override protected bool flushCache (Control control) { 
    181181    Object data = control.getLayoutData (); 
    182182    if (data !is null) (cast(GridData) data).flushCache (); 
    …… 
    201201} 
    202202 
    203 protected override void layout (Composite composite, bool flushCache_) { 
     203override protected void layout (Composite composite, bool flushCache_) { 
    204204    Rectangle rect = composite.getClientArea (); 
    205205    layout (composite, true, rect.x, rect.y, rect.width, rect.height, flushCache_); 
    …… 
    741741 * @return a string representation of the layout 
    742742 */ 
    743 public override char[] toString () { 
     743override public char[] toString () { 
    744744    char[] string = getName ()~" {"; 
    745745    if (numColumns !is 1) string ~= "numColumns="~to!(char[])(numColumns)~" "; 

  • dwt/layout/RowData.d

    r150 r201  
    119119 * @return a string representation of the RowData object 
    120120 */ 
    121 public override char[] toString () { 
     121override public char[] toString () { 
    122122    char[] string = getName ()~" {"; 
    123123    if (width !is DWT.DEFAULT) string ~= "width="~to!(char[])(width)~" "; 

  • dwt/layout/RowLayout.d

    r152 r201  
    195195} 
    196196 
    197 protected override Point computeSize (Composite composite, int wHint, int hHint, bool flushCache_) { 
     197override protected Point computeSize (Composite composite, int wHint, int hHint, bool flushCache_) { 
    198198    Point extent; 
    199199    if (type is DWT.HORIZONTAL) { 
    …… 
    217217} 
    218218 
    219 protected override bool flushCache (Control control) { 
     219override protected bool flushCache (Control control) { 
    220220    return true; 
    221221} 
    …… 
    228228} 
    229229 
    230 protected override void layout (Composite composite, bool flushCache_) { 
     230override protected void layout (Composite composite, bool flushCache_) { 
    231231    Rectangle clientArea = composite.getClientArea (); 
    232232    if (type is DWT.HORIZONTAL) { 
    …… 
    457457 * @return a string representation of the layout 
    458458 */ 
    459 public override char[] toString () { 
     459override public char[] toString () { 
    460460    char[] string = getName ()~" {"; 
    461461    string ~= "type="~((type !is DWT.HORIZONTAL) ? "DWT.VERTICAL" : "DWT.HORIZONTAL")~" ";