--- a/dwt/widgets/Widget.d	Thu Jan 10 05:01:46 2008 +0100
+++ b/dwt/widgets/Widget.d	Thu Jan 10 05:17:47 2008 +0100
@@ -575,11 +575,11 @@
 	return 0;
 }
 
-int /*long*/ gtk_button_press_event (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_button_press_event (GtkWidget* widget, GdkEventButton* event) {
 	return 0;
 }
 
-int /*long*/ gtk_button_release_event (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_button_release_event (GtkWidget* widget, GdkEventButton* event) {
 	return 0;
 }
 
@@ -595,7 +595,7 @@
 	return 0;
 }
 
-int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ text) {
+int /*long*/ gtk_commit (GtkIMContext* imcontext, char* text) {
 	return 0;
 }
 
@@ -619,15 +619,15 @@
 	return 0;
 }
 
-int /*long*/ gtk_enter_notify_event (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_enter_notify_event (GtkWidget* widget, GdkEventCrossing* event) {
 	return 0;
 }
 
-int /*long*/ gtk_event (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_event (GtkWidget* widget, GdkEvent* event) {
 	return 0;
 }
 
-int /*long*/ gtk_event_after (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_event_after (GtkWidget* widget, GdkEvent* event) {
 	return 0;
 }
 
@@ -635,19 +635,19 @@
 	return 0;
 }
 
-int /*long*/ gtk_expose_event (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_expose_event (GtkWidget* widget, GdkEventExpose* event) {
 	return 0;
 }
 
-int /*long*/ gtk_focus (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_focus (GtkWidget* widget, GdkEventFocus* event) {
 	return 0;
 }
 
-int /*long*/ gtk_focus_in_event (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_focus_in_event (GtkWidget* widget, GdkEventFocus* event) {
 	return 0;
 }
 
-int /*long*/ gtk_focus_out_event (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_focus_out_event (GtkWidget* widget, GdkEventFocus* event) {
 	return 0;
 }
 
@@ -675,7 +675,7 @@
 	return sendKeyEvent (SWT.KeyUp, event) ? 0 : 1;
 }
 
-int /*long*/ gtk_leave_notify_event (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_leave_notify_event (GtkWidget* widget, GdkEventCrossing* event) {
 	return 0;
 }
 
@@ -695,7 +695,7 @@
 	return 0;
 }
 
-int /*long*/ gtk_motion_notify_event (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_motion_notify_event (GtkWidget* widget, GdkEventMotion* event) {
 	return 0;
 }
 
@@ -711,7 +711,7 @@
 	return 0;
 }
 
-int /*long*/ gtk_preedit_changed (GtkWidget* imcontext) {
+int /*long*/ gtk_preedit_changed (GtkIMContext* imcontext) {
 	return 0;
 }
 
@@ -727,7 +727,7 @@
 	return 0;
 }
 
-int /*long*/ gtk_scroll_event (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_scroll_event (GtkWidget* widget, GdkEventScroll*  event) {
 	return 0;
 }
 
@@ -791,7 +791,7 @@
 	return 0;
 }
 
-int /*long*/ gtk_visibility_notify_event (GtkWidget* widget, int /*long*/ event) {
+int /*long*/ gtk_visibility_notify_event (GtkWidget* widget, GdkEventVisibility* event) {
 	return 0;
 }
 
@@ -1457,7 +1457,7 @@
 		case MONTH_CHANGED: return gtk_month_changed (handle);
 		case OUTPUT: return gtk_output (handle);
 		case POPUP_MENU: return gtk_popup_menu (handle);
-		case PREEDIT_CHANGED: return gtk_preedit_changed (handle);
+		case PREEDIT_CHANGED: return gtk_preedit_changed (cast(GtkIMContext*)handle);
 		case REALIZE: return gtk_realize (handle);
 		case SELECT: return gtk_select (cast(int)handle);
 		case SHOW: return gtk_show (handle);
@@ -1483,33 +1483,33 @@
 		case MOTION_NOTIFY_EVENT_INVERSE: {
 			return 1;
 		}
-		case BUTTON_PRESS_EVENT: return gtk_button_press_event (handle, arg0);
-		case BUTTON_RELEASE_EVENT: return gtk_button_release_event (handle, arg0);
-		case COMMIT: return gtk_commit (cast(int)handle, arg0);
+		case BUTTON_PRESS_EVENT: return gtk_button_press_event (handle, cast(GdkEventButton*)arg0);
+		case BUTTON_RELEASE_EVENT: return gtk_button_release_event (handle, cast(GdkEventButton*)arg0);
+		case COMMIT: return gtk_commit (cast(GtkIMContext*)handle, cast(char*)arg0);
 		case CONFIGURE_EVENT: return gtk_configure_event (handle, arg0);
 		case DELETE_EVENT: return gtk_delete_event (handle, arg0);
-		case ENTER_NOTIFY_EVENT: return gtk_enter_notify_event (handle, arg0);
-		case EVENT: return gtk_event (handle, arg0);
-		case EVENT_AFTER: return gtk_event_after (handle, arg0);
-		case EXPOSE_EVENT: return gtk_expose_event (handle, arg0);
-		case FOCUS: return gtk_focus (handle, arg0);
-		case FOCUS_IN_EVENT: return gtk_focus_in_event (handle, arg0);
-		case FOCUS_OUT_EVENT: return gtk_focus_out_event (handle, arg0);
+		case ENTER_NOTIFY_EVENT: return gtk_enter_notify_event (handle, cast(GdkEventCrossing*)arg0);
+		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_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);
 		case KEY_RELEASE_EVENT: return gtk_key_release_event (handle, cast(GdkEventKey*)arg0);
 		case INPUT: return gtk_input (handle, arg0);
-		case LEAVE_NOTIFY_EVENT: return gtk_leave_notify_event (handle, arg0);
+		case LEAVE_NOTIFY_EVENT: return gtk_leave_notify_event (handle, cast(GdkEventCrossing*)arg0);
 		case MAP_EVENT: return gtk_map_event (handle, arg0);
 		case MNEMONIC_ACTIVATE: return gtk_mnemonic_activate (handle, arg0);
-		case MOTION_NOTIFY_EVENT: return gtk_motion_notify_event (handle, arg0);
+		case MOTION_NOTIFY_EVENT: return gtk_motion_notify_event (handle, cast(GdkEventMotion*)arg0);
 		case MOVE_FOCUS: return gtk_move_focus (handle, arg0);
-		case SCROLL_EVENT:	return gtk_scroll_event (handle, arg0);
+		case SCROLL_EVENT:	return gtk_scroll_event (handle, cast(GdkEventScroll*)arg0);
 		case SHOW_HELP: return gtk_show_help (handle, arg0);
 		case SIZE_ALLOCATE: return gtk_size_allocate (handle, arg0);
 		case STYLE_SET: return gtk_style_set (handle, arg0);
 		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, 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);
 		default: return 0;
 	}