--- a/dwt/custom/CCombo.d	Sun Jan 18 18:39:46 2009 +0100
+++ b/dwt/custom/CCombo.d	Tue Feb 10 21:01:24 2009 +0100
@@ -134,26 +134,40 @@
     if ((style & DWT.FLAT) !is 0) arrowStyle |= DWT.FLAT;
     arrow = new Button (this, arrowStyle);
 
-    listener = new class() Listener {
+    listener = new class(text, list, popup, arrow) Listener {
+
+        Text text;
+        List list;
+        Shell popup;
+        Button arrow;
+
+        this (Text text, List list, Shell popup, Button arrow)
+        {
+            this.text = text;
+            this.list = list;
+            this.popup = popup;
+            this.arrow = arrow;
+        }
+
         public void handleEvent (Event event) {
             if (popup is event.widget) {
-                popupEvent (event);
+                this.outer.popupEvent (event);
                 return;
             }
             if (text is event.widget) {
-                textEvent (event);
+                this.outer.textEvent (event);
                 return;
             }
             if (list is event.widget) {
-                listEvent (event);
+                this.outer.listEvent (event);
                 return;
             }
             if (arrow is event.widget) {
-                arrowEvent (event);
+                this.outer.arrowEvent (event);
                 return;
             }
             if (this.outer is event.widget) {
-                comboEvent (event);
+                this.outer.comboEvent (event);
                 return;
             }
             if (getShell () is event.widget) {