--- a/dwt/widgets/Widget.d	Thu Jan 10 05:17:47 2008 +0100
+++ b/dwt/widgets/Widget.d	Thu Jan 10 07:33:15 2008 +0100
@@ -639,7 +639,7 @@
 	return 0;
 }
 
-int /*long*/ gtk_focus (GtkWidget* widget, GdkEventFocus* event) {
+int /*long*/ gtk_focus (GtkWidget* widget, int directionType) {
 	return 0;
 }
 
@@ -699,7 +699,7 @@
 	return 0;
 }
 
-int /*long*/ gtk_move_focus (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_move_focus (GtkWidget* widget, int directionType) {
 	return 0;
 }
 
@@ -795,7 +795,7 @@
 	return 0;
 }
 
-int /*long*/ gtk_window_state_event (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_window_state_event (GtkWidget* widget, GdkEventWindowState* event) {
 	return 0;
 }
 
@@ -809,7 +809,7 @@
 	return OS.PANGO_PIXELS (ascent + descent);
 }
 
-int filterProc (GdkXEvent* xEvent, GdkEvent* gdkEvent, void* data) {
+int filterProc (XEvent* xEvent, GdkEvent* gdkEvent, void* data) {
 	return 0;
 }
 
@@ -1402,15 +1402,15 @@
 void setOrientation () {
 }
 
-int /*long*/ shellMapProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+int /*long*/ shellMapProc (GtkWidget* handle, int /*long*/ arg0, int /*long*/ user_data) {
 	return 0;
 }
 
-int /*long*/ sizeAllocateProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+int /*long*/ sizeAllocateProc (GtkWidget* handle, int /*long*/ arg0, int /*long*/ user_data) {
 	return 0;
 }
 
-int /*long*/ sizeRequestProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+int /*long*/ sizeRequestProc (GtkWidget* handle, int /*long*/ arg0, int /*long*/ user_data) {
 	return 0;
 }
 
@@ -1492,7 +1492,7 @@
 		case EVENT: return gtk_event (handle, cast(GdkEvent*)arg0);
 		case EVENT_AFTER: return gtk_event_after (handle, cast(GdkEvent*)arg0);
 		case EXPOSE_EVENT: return gtk_expose_event (handle, cast(GdkEventExpose*)arg0);
-		case FOCUS: return gtk_focus (handle, cast(GdkEventFocus*)arg0);
+		case FOCUS: return gtk_focus (handle, arg0);
 		case FOCUS_IN_EVENT: return gtk_focus_in_event (handle, cast(GdkEventFocus*)arg0);
 		case FOCUS_OUT_EVENT: return gtk_focus_out_event (handle, cast(GdkEventFocus*)arg0);
 		case KEY_PRESS_EVENT: return gtk_key_press_event (handle, cast(GdkEventKey*)arg0);
@@ -1510,7 +1510,7 @@
 		case TOGGLED: return gtk_toggled (cast(int)handle, arg0);
 		case UNMAP_EVENT: return gtk_unmap_event (handle, arg0);
 		case VISIBILITY_NOTIFY_EVENT: return gtk_visibility_notify_event (handle, cast(GdkEventVisibility*)arg0);
-		case WINDOW_STATE_EVENT: return gtk_window_state_event (handle, arg0);
+		case WINDOW_STATE_EVENT: return gtk_window_state_event (handle, cast(GdkEventWindowState*)arg0);
 		default: return 0;
 	}
 }