--- a/dwt/widgets/Widget.d	Wed Jan 09 07:07:50 2008 +0100
+++ b/dwt/widgets/Widget.d	Thu Jan 10 02:18:07 2008 +0100
@@ -12,8 +12,6 @@
 
 import dwt.SWT;
 import dwt.dwthelper.utils;
-import dwt.internal.gtk.c.gtktypes;
-import dwt.internal.gtk.c.gdktypes;
 
 import dwt.events.DisposeListener;
 import dwt.internal.Converter;
@@ -811,8 +809,8 @@
 	return OS.PANGO_PIXELS (ascent + descent);
 }
 
-GdkFilterReturn filterProc (GdkXEvent* xEvent, GdkEvent* gdkEvent, void* data) {
-	return cast(GdkFilterReturn)0;
+int filterProc (GdkXEvent* xEvent, GdkEvent* gdkEvent, void* data) {
+	return 0;
 }
 
 bool filters (int eventType) {
@@ -922,9 +920,9 @@
 
 bool mnemonicHit (int /*long*/ mnemonicHandle, char key) {
 	if (!mnemonicMatch (mnemonicHandle, key)) return false;
-	OS.g_signal_handlers_block_matched ( cast(void*)mnemonicHandle, cast(GSignalMatchType)OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)MNEMONIC_ACTIVATE);
+	OS.g_signal_handlers_block_matched ( cast(void*)mnemonicHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)MNEMONIC_ACTIVATE);
 	bool result = cast(bool)OS.gtk_widget_mnemonic_activate (cast(GtkWidget*)mnemonicHandle, false);
-	OS.g_signal_handlers_unblock_matched (cast(void*)mnemonicHandle, cast(GSignalMatchType)OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)MNEMONIC_ACTIVATE);
+	OS.g_signal_handlers_unblock_matched (cast(void*)mnemonicHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)MNEMONIC_ACTIVATE);
 	return result;
 }
 
@@ -1138,7 +1136,7 @@
 
 bool sendKeyEvent (int type, GdkEventKey* keyEvent) {
 	int len = keyEvent.length;
-	if (keyEvent.str is null || OS.g_utf8_strlen (keyEvent.str, len) <= 1) {
+	if (keyEvent.string is null || OS.g_utf8_strlen (keyEvent.string, len) <= 1) {
 		Event event = new Event ();
 		event.time = keyEvent.time;
 		if (!setKeyState (event, keyEvent)) return true;
@@ -1154,7 +1152,7 @@
 		if (isDisposed ()) return false;
 		return event.doit;
 	}
-	char [] chars = fromUtf8z( keyEvent.str );
+	char [] chars = fromUtf8z( keyEvent.string );
 	return sendIMKeyEvent (type, keyEvent, chars) !is null;
 }
 
@@ -1178,7 +1176,7 @@
 		}
 	}
 	if (keyEvent is null) {
-		GdkModifierType buffer;
+		int buffer;
 		OS.gtk_get_current_event_state (&buffer);
 		state = buffer;
 	}
@@ -1362,7 +1360,7 @@
 }
 
 bool setKeyState (Event event, GdkEventKey* keyEvent) {
-	if (keyEvent.str !is null && OS.g_utf8_strlen (keyEvent.str, keyEvent.length) > 1) return false;
+	if (keyEvent.string !is null && OS.g_utf8_strlen (keyEvent.string, keyEvent.length) > 1) return false;
 	bool isNull = false;
 	event.keyCode = Display.translateKey (keyEvent.keyval);
 	switch (keyEvent.keyval) {
@@ -1379,8 +1377,8 @@
 			if (event.keyCode is 0) {
 				uint keyval;
                 int effective_group, level;
-                GdkModifierType consumed_modifiers;
-				if (OS.gdk_keymap_translate_keyboard_state(OS.gdk_keymap_get_default (), keyEvent.hardware_keycode, cast(GdkModifierType)0, keyEvent.group, &keyval, &effective_group, &level, &consumed_modifiers)) {
+                int consumed_modifiers;
+				if (OS.gdk_keymap_translate_keyboard_state(OS.gdk_keymap_get_default (), keyEvent.hardware_keycode, 0, keyEvent.group, &keyval, &effective_group, &level, &consumed_modifiers)) {
 					event.keyCode = OS.gdk_keyval_to_unicode (keyval );
 				}
 			}