--- a/dwt/widgets/ExpandBar.d	Tue Dec 23 22:53:07 2008 +0100
+++ b/dwt/widgets/ExpandBar.d	Tue Dec 23 22:57:31 2008 +0100
@@ -7,6 +7,9 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     
+ * Port to the D programming language:
+ *     Jacob Carlborg <doob@me.com>
  *******************************************************************************/
 module dwt.widgets.ExpandBar;
 
@@ -24,6 +27,13 @@
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
 
+import dwt.widgets.Composite;
+import dwt.widgets.Event;
+import dwt.widgets.ExpandItem;
+import dwt.widgets.Listener;
+import dwt.widgets.ScrollBar;
+import dwt.widgets.TypedListener;
+
 /**
  * Instances of this class support the layout of selectable
  * expand bar items.
@@ -93,7 +103,7 @@
     super (parent, checkStyle (style));
     items = new ExpandItem [4]; 
 
-    listener = new Listener () {
+    listener = new class () Listener {
         public void handleEvent (Event event) {
             switch (event.type) {
                 case DWT.Dispose:       onDispose (event);          break;
@@ -105,6 +115,7 @@
                 case DWT.FocusIn:       onFocus ();                 break;
                 case DWT.FocusOut:      onFocus ();                 break;
                 case DWT.Traverse:      onTraverse (event);         break;
+                default:
             }
         }
     };
@@ -120,7 +131,7 @@
     
     ScrollBar verticalBar = getVerticalBar ();
     if (verticalBar !is null) {
-        verticalBar.addListener (DWT.Selection, new Listener () {
+        verticalBar.addListener (DWT.Selection, new class () Listener {
             public void handleEvent (Event event) {
                 onScroll (event);
             }
@@ -510,6 +521,8 @@
             }
             break;
         }
+        
+        default:
     }
 }