--- a/dwt/custom/CTabFolder.d	Sat Jun 06 17:16:51 2009 +0200
+++ b/dwt/custom/CTabFolder.d	Sat Jun 06 23:02:40 2009 +0200
@@ -3897,24 +3897,25 @@
         showMenu = new Menu(this);
     } else {
         MenuItem[] items = showMenu.getItems();
-        for (int i = 0; i < items.length; i++) {
+        for (size_t i = 0; i < items.length; i++) {
             items[i].dispose();
         }
     }
-    static const String id = "CTabFolder_showList_Index"; //$NON-NLS-1$
-    for (int i = 0; i < items.length; i++) {
+    const String id = "CTabFolder_showList_Index"; //$NON-NLS-1$
+    for (size_t i = 0; i < items.length; i++) {
         CTabItem tab = items[i];
         if (tab.showing) continue;
         MenuItem item = new MenuItem(showMenu, DWT.NONE);
         item.setText(tab.getText());
         item.setImage(tab.getImage());
         item.setData(id, tab);
-        item.addSelectionListener(new class(this) SelectionAdapter {
+        item.addSelectionListener(new class(this, id) SelectionAdapter {
             CTabFolder ctf;
+			const String id;
             
-            this (CTabFolder ctf)
-            {
+            this (CTabFolder ctf, String id) {
                 this.ctf = ctf;
+				this.id = id;
             }
             
             public void widgetSelected(SelectionEvent e) {

--- a/dwt/custom/StyledText.d	Sat Jun 06 17:16:51 2009 +0200
+++ b/dwt/custom/StyledText.d	Sat Jun 06 23:02:40 2009 +0200
@@ -1342,7 +1342,7 @@
     renderer.setFont(getFont(), tabLength);
     ime = new IME(this, DWT.NONE);
     defaultCaret = new Caret(this, DWT.NONE);
-    if ((style & DWT.WRAP) !is 0) {
+    /*if ((style & DWT.WRAP) !is 0) {
         setWordWrap(true);
     }
     if (isBidiCaret()) {
@@ -1364,7 +1364,7 @@
     setCursor(display.getSystemCursor(DWT.CURSOR_IBEAM));
     installListeners();
     initializeAccessible();
-    setData("DEFAULT_DROP_TARGET_EFFECT", new StyledTextDropTargetEffect(this));
+    setData("DEFAULT_DROP_TARGET_EFFECT", new StyledTextDropTargetEffect(this));*/
 }
 /**
  * Adds an extended modify listener. An ExtendedModify event is sent by the

--- a/dwt/widgets/Display.d	Sat Jun 06 17:16:51 2009 +0200
+++ b/dwt/widgets/Display.d	Sat Jun 06 23:02:40 2009 +0200
@@ -485,18 +485,18 @@
     
     void addPopup (Menu menu) {
         if (popups is null) popups = new Menu [4];
-        int length = popups.length;
-        for (int i=0; i<length; i++) {
+        size_t length_ = popups.length;
+        for (size_t i=0; i<length_; i++) {
             if (popups [i] is menu) return;
         }
-        int index = 0;
-        while (index < length) {
+        size_t index = 0;
+        while (index < length_) {
             if (popups [index] is null) break;
             index++;
         }
-        if (index is length) {
-            Menu [] newPopups = new Menu [length + 4];
-            System.arraycopy (popups, 0, newPopups, 0, length);
+        if (index is length_) {
+            Menu [] newPopups = new Menu [length_ + 4];
+            System.arraycopy (popups, 0, newPopups, 0, length_);
             popups = newPopups;
         }
         popups [index] = menu;

--- a/dwt/widgets/ExpandBar.d	Sat Jun 06 17:16:51 2009 +0200
+++ b/dwt/widgets/ExpandBar.d	Sat Jun 06 23:02:40 2009 +0200
@@ -105,18 +105,24 @@
     super (parent, checkStyle (style));
     items = new ExpandItem [4]; 
     
-    listener = new class () Listener {
+    listener = new class (this) Listener {
+        ExpandBar eb;
+        
+        this (ExpandBar eb) {
+            this.eb = eb;
+        }
+        
         public void handleEvent (Event event) {
             switch (event.type) {
-                case DWT.Dispose:       onDispose (event);          break;
-                case DWT.MouseDown:     onMouseDown (event);        break;
-                case DWT.MouseUp:       onMouseUp (event);          break;
-                case DWT.Paint:         onPaint (event);            break;
-                case DWT.Resize:        onResize ();                break;
-                case DWT.KeyDown:       onKeyDown (event);          break;
-                case DWT.FocusIn:       onFocus ();                 break;
-                case DWT.FocusOut:      onFocus ();                 break;
-                case DWT.Traverse:      onTraverse (event);         break;
+                case DWT.Dispose:       eb.onDispose (event);          break;
+                case DWT.MouseDown:     eb.onMouseDown (event);        break;
+                case DWT.MouseUp:       eb.onMouseUp (event);          break;
+                case DWT.Paint:         eb.onPaint (event);            break;
+                case DWT.Resize:        eb.onResize ();                break;
+                case DWT.KeyDown:       eb.onKeyDown (event);          break;
+                case DWT.FocusIn:       eb.onFocus ();                 break;
+                case DWT.FocusOut:      eb.onFocus ();                 break;
+                case DWT.Traverse:      eb.onTraverse (event);         break;
                 default:
             }
         }

--- a/dwt/widgets/Menu.d	Sat Jun 06 17:16:51 2009 +0200
+++ b/dwt/widgets/Menu.d	Sat Jun 06 23:02:40 2009 +0200
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -487,9 +487,9 @@
 String getNameText () {
     String result = "";
     MenuItem [] items = getItems ();
-    int length_ = items.length;
+    size_t length_ = items.length;
     if (length_ > 0) {
-        for (int i=0; i<length_-1; i++) {
+        for (size_t i=0; i<length_-1; i++) {
             result = result ~ items [i].getNameText() ~ ", ";
         }
         result = result ~ items [length_-1].getNameText ();