--- a/dwt/browser/MozillaDelegate.d	Fri Jan 16 12:19:08 2009 +0100
+++ b/dwt/browser/MozillaDelegate.d	Fri Jan 16 12:49:08 2009 +0100
@@ -21,6 +21,7 @@
 import dwt.widgets.Listener;
 
 import dwt.browser.Browser;
+import dwt.browser.Mozilla;
 import objc = dwt.internal.objc.runtime;
 
 class MozillaDelegate {
@@ -29,7 +30,6 @@
     boolean hasFocus;
     
 this (Browser browser) {
-    super ();
     this.browser = browser;
 }
 
@@ -38,7 +38,7 @@
     return cast(Browser)display.findWidget (handle);
 }
 
-static char[] mbcsToWcs (String codePage, byte [] buffer) {
+/+static char[] mbcsToWcs (String codePage, byte [] buffer) {
 //  int encoding = OS.CFStringGetSystemEncoding ();
 //  int cfstring = OS.CFStringCreateWithBytes (OS.kCFAllocatorDefault, buffer, buffer.length, encoding, false);
 //  char[] chars = null;
@@ -54,10 +54,10 @@
 //  }
 //  return chars;
     // TODO implement mbcsToWcs
-    return new String(buffer).toCharArray();
-}
+    return new_String(buffer).toCharArray();
+}+/
 
-static byte[] wcsToMbcs (String codePage, String string, boolean terminate) {
+/+static byte[] wcsToMbcs (String codePage, String string, boolean terminate) {
 //  char[] chars = new char [string.length()];
 //  string.getChars (0, chars.length, chars, 0);
 //  int cfstring = OS.CFStringCreateWithCharacters (OS.kCFAllocatorDefault, chars, chars.length);
@@ -78,9 +78,9 @@
     // TODO implement wcsToMbcs
     if (terminate) string += "\0";
     return string.getBytes();
-}
+}+/
 
-int /*long*/ getHandle () {
+objc.id getHandle () {
     return browser.view.id;
 }
 
@@ -95,21 +95,21 @@
 void handleFocus () {
     if (hasFocus) return;
     hasFocus = true;
-    ((Mozilla)browser.webBrowser).Activate ();
+    (cast(Mozilla)browser.webBrowser).Activate ();
     browser.setFocus ();
-    listener = new Listener () {
+    listener = new class () Listener {
         public void handleEvent (Event event) {
             if (event.widget == browser) return;
-            ((Mozilla)browser.webBrowser).Deactivate ();
+            (cast(Mozilla)browser.webBrowser).Deactivate ();
             hasFocus = false;
-            browser.getDisplay ().removeFilter (SWT.FocusIn, this);
-            browser.getShell ().removeListener (SWT.Deactivate, this);
+            browser.getDisplay ().removeFilter (DWT.FocusIn, this);
+            browser.getShell ().removeListener (DWT.Deactivate, this);
             listener = null;
         }
     
     };
-    browser.getDisplay ().addFilter (SWT.FocusIn, listener);
-    browser.getShell ().addListener (SWT.Deactivate, listener);
+    browser.getDisplay ().addFilter (DWT.FocusIn, listener);
+    browser.getShell ().addListener (DWT.Deactivate, listener);
 }
 
 void handleMouseDown () {
@@ -126,16 +126,16 @@
     return false;
 }
 
-void onDispose (int /*long*/ embedHandle) {
-    if (listener != null) {
-        browser.getDisplay ().removeFilter (SWT.FocusIn, listener);
-        browser.getShell ().removeListener (SWT.Deactivate, listener);
+void onDispose (objc.id embedHandle) {
+    if (listener !is null) {
+        browser.getDisplay ().removeFilter (DWT.FocusIn, listener);
+        browser.getShell ().removeListener (DWT.Deactivate, listener);
         listener = null;
     }
     browser = null;
 }
 
-void setSize (int /*long*/ embedHandle, int width, int height) {
+void setSize (objc.id embedHandle, int width, int height) {
     // TODO
 }