--- a/dwt/widgets/Display.d	Wed Jan 09 01:08:22 2008 +0100
+++ b/dwt/widgets/Display.d	Wed Jan 09 02:59:32 2008 +0100
@@ -634,8 +634,8 @@
 	popups [index] = menu;
 }
 
-void addWidget (int/**/ handle, Widget widget) {
-	if (handle is 0) return;
+void addWidget (GtkWidget* handle, Widget widget) {
+	if (handle is null) return;
 	if (freeSlot is -1) {
 		int len = (freeSlot = indexTable.length) + GROW_SIZE;
 		int[] newIndexTable = new int[len];
@@ -858,7 +858,7 @@
 	if (!OS.gtk_init_check (&cnt, null)) {
 		SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]");
 	}
-	if (OS.GDK_WINDOWING_X11 ()) xDisplay = cast(dwt.internal.gtk.c.cairotypes.Display*) OS.GDK_DISPLAY ();
+	if (OS.GDK_WINDOWING_X11 ()) xDisplay = cast(void*) OS.GDK_DISPLAY ();
 	char* ptr = OS.gtk_check_version (MAJOR, MINOR, MICRO);
 	if (ptr !is null) {
 		char [] buffer = fromUtf8z(ptr);
@@ -3350,7 +3350,7 @@
 		auto handle = (cast(LONG) data [0]).value;
 		Widget widget = cast(Widget) data [1];
 		if (widget !is null) {
-			addWidget (handle, widget);
+			addWidget (cast(GtkWidget*)handle, widget);
 		} else {
 			removeWidget (cast(GtkWidget*)handle);
 		}