--- a/dwt/widgets/Control.d	Thu Jan 10 05:01:46 2008 +0100
+++ b/dwt/widgets/Control.d	Thu Jan 10 05:17:47 2008 +0100
@@ -2350,7 +2350,7 @@
 	return (state & HIDDEN) is 0;
 }
 
-int /*long*/ gtk_button_press_event (GtkWidget* widget, GdkEventButton* event) {
+override int /*long*/ gtk_button_press_event (GtkWidget* widget, GdkEventButton* event) {
 	GdkEventButton* gdkEvent = new GdkEventButton ();
 	memmove (gdkEvent, event, GdkEventButton.sizeof);
 	if (gdkEvent.type is OS.GDK_3BUTTON_PRESS) return 0;
@@ -2414,7 +2414,7 @@
 	return result;
 }
 
-int /*long*/ gtk_button_release_event (GtkWidget* widget, GdkEventButton* event) {
+override int /*long*/ gtk_button_release_event (GtkWidget* widget, GdkEventButton* event) {
 	GdkEventButton* gdkEvent = new GdkEventButton ();
 	memmove (gdkEvent, event, GdkEventButton.sizeof);
 	/*
@@ -2433,14 +2433,14 @@
 	return sendMouseEvent (SWT.MouseUp, button, display.clickCount, 0, false, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
 }
 
-int /*long*/ gtk_commit (GtkIMContext* imcontext, char* text) {
+override int /*long*/ gtk_commit (GtkIMContext* imcontext, char* text) {
 	char [] chars = fromUtf8z( text );
     if (chars.length is 0) return 0;
 	sendIMKeyEvent (SWT.KeyDown, null, chars);
 	return 0;
 }
 
-int /*long*/ gtk_enter_notify_event (GtkWidget*  widget, GdkEventCrossing* event) {
+override int /*long*/ gtk_enter_notify_event (GtkWidget*  widget, GdkEventCrossing* event) {
 	if (display.currentControl is this) return 0;
 	GdkEventCrossing* gdkEvent = new GdkEventCrossing ();
 	memmove (gdkEvent, event, GdkEventCrossing.sizeof);
@@ -2457,7 +2457,7 @@
 	return 0;
 }
 
-int /*long*/ gtk_event_after (GtkWidget*  widget, GdkEvent* gdkEvent) {
+override int /*long*/ gtk_event_after (GtkWidget*  widget, GdkEvent* gdkEvent) {
 	GdkEvent* event = new GdkEvent ();
 	memmove (event, gdkEvent, GdkEvent.sizeof);
 	switch (cast(int)event.type) {
@@ -2513,7 +2513,7 @@
 	return 0;
 }
 
-int /*long*/ gtk_expose_event (GtkWidget*  widget, GdkEventExpose* eventPtr) {
+override int /*long*/ gtk_expose_event (GtkWidget*  widget, GdkEventExpose* eventPtr) {
 	if ((state & OBSCURED) !is 0) return 0;
 	if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0;
 	GdkEventExpose* gdkEvent = new GdkEventExpose ();
@@ -2534,12 +2534,12 @@
 	return 0;
 }
 
-int /*long*/ gtk_focus (GtkWidget* widget, int /*long*/ directionType) {
+override int /*long*/ gtk_focus (GtkWidget* widget, GdkEventFocus* directionType) {
 	/* Stop GTK traversal for every widget */
 	return 1;
 }
 
-int /*long*/ gtk_focus_in_event (GtkWidget*  widget, int /*long*/ event) {
+override int /*long*/ gtk_focus_in_event (GtkWidget*  widget, GdkEventFocus* event) {
 	// widget could be disposed at this point
 	if (handle !is null) {
 		Control oldControl = display.imControl;
@@ -2557,7 +2557,7 @@
 	return 0;
 }
 
-int /*long*/ gtk_focus_out_event (GtkWidget* widget, int /*long*/ event) {
+override int /*long*/ gtk_focus_out_event (GtkWidget* widget, GdkEventFocus* event) {
 	// widget could be disposed at this point
 	if (handle !is null) {
 		if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) {
@@ -2570,7 +2570,7 @@
 	return 0;
 }
 
-int /*long*/ gtk_key_press_event (GtkWidget*  widget, GdkEventKey* event) {
+override int /*long*/ gtk_key_press_event (GtkWidget*  widget, GdkEventKey* event) {
 	if (!hasFocus ()) return 0;
 	GdkEventKey* gdkEvent = new GdkEventKey ();
 	memmove (gdkEvent, event, GdkEventKey.sizeof);
@@ -2589,7 +2589,7 @@
 	return super.gtk_key_press_event (widget, event);
 }
 
-int /*long*/ gtk_key_release_event (GtkWidget*  widget, GdkEventKey* event) {
+override int /*long*/ gtk_key_release_event (GtkWidget*  widget, GdkEventKey* event) {
 	if (!hasFocus ()) return 0;
 	auto imHandle = imHandle ();
 	if (imHandle !is null) {
@@ -2598,7 +2598,7 @@
 	return super.gtk_key_release_event (widget, event);
 }
 
-int /*long*/ gtk_leave_notify_event (GtkWidget* widget, GdkEventCrossing* event) {
+override int /*long*/ gtk_leave_notify_event (GtkWidget* widget, GdkEventCrossing* event) {
 	if (display.currentControl !is this) return 0;
 	display.removeMouseHoverTimeout (handle);
 	int result = 0;
@@ -2613,7 +2613,7 @@
 	return result;
 }
 
-int /*long*/ gtk_mnemonic_activate (GtkWidget* widget, int /*long*/ arg1) {
+override int /*long*/ gtk_mnemonic_activate (GtkWidget* widget, int /*long*/ arg1) {
 	int result = 0;
 	auto eventPtr = OS.gtk_get_current_event ();
 	if (eventPtr !is null) {
@@ -2634,7 +2634,7 @@
 	return result;
 }
 
-int /*long*/ gtk_motion_notify_event (GtkWidget* widget, GdkEventMotion* event) {
+override int /*long*/ gtk_motion_notify_event (GtkWidget* widget, GdkEventMotion* event) {
 	GdkEventMotion* gdkEvent = new GdkEventMotion ();
 	memmove (gdkEvent, event, GdkEventMotion.sizeof);
 	if (this is display.currentControl && (hooks (SWT.MouseHover) || filters (SWT.MouseHover))) {
@@ -2655,19 +2655,19 @@
 	return result;
 }
 
-int /*long*/ gtk_popup_menu (GtkWidget* widget) {
+override int /*long*/ gtk_popup_menu (GtkWidget* widget) {
 	if (!hasFocus()) return 0;
 	int x, y ;
 	OS.gdk_window_get_pointer (null, &x, &y, null);
 	return showMenu (x, y) ? 1 : 0;
 }
 
-int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {
+override int /*long*/ gtk_preedit_changed (GtkIMContext* imcontext) {
 	display.showIMWindow (this);
 	return 0;
 }
 
-int /*long*/ gtk_realize (GtkWidget* widget) {
+override int /*long*/ gtk_realize (GtkWidget* widget) {
 	auto imHandle = imHandle ();
 	if (imHandle !is null) {
 		auto window = OS.GTK_WIDGET_WINDOW (paintHandle ());
@@ -2680,7 +2680,7 @@
 	return 0;
 }
 
-int /*long*/ gtk_scroll_event (GtkWidget* widget, GdkEventScroll* eventPtr) {
+override int /*long*/ gtk_scroll_event (GtkWidget* widget, GdkEventScroll* eventPtr) {
 	GdkEventScroll* gdkEvent = new GdkEventScroll ();
 	memmove (gdkEvent, eventPtr, GdkEventScroll.sizeof);
 	switch (cast(int)gdkEvent.direction) {
@@ -2696,25 +2696,25 @@
 	return 0;
 }
 
-int /*long*/ gtk_show_help (GtkWidget* widget, int /*long*/ helpType) {
+override int /*long*/ gtk_show_help (GtkWidget* widget, int /*long*/ helpType) {
 	if (!hasFocus ()) return 0;
 	return sendHelpEvent (helpType) ? 1 : 0;
 }
 
-int /*long*/ gtk_style_set (GtkWidget* widget, int /*long*/ previousStyle) {
+override int /*long*/ gtk_style_set (GtkWidget* widget, int /*long*/ previousStyle) {
 	if (backgroundImage !is null) {
 		setBackgroundPixmap (backgroundImage.pixmap);
 	}
 	return 0;
 }
 
-int /*long*/ gtk_unrealize (GtkWidget* widget) {
+override int /*long*/ gtk_unrealize (GtkWidget* widget) {
 	auto imHandle = imHandle ();
 	if (imHandle !is null) OS.gtk_im_context_set_client_window (imHandle, null);
 	return 0;
 }
 
-int /*long*/ gtk_visibility_notify_event (GtkWidget* widget, GdkEventVisibility* event) {
+override int /*long*/ gtk_visibility_notify_event (GtkWidget* widget, GdkEventVisibility* event) {
 	GdkEventVisibility* gdkEvent = new GdkEventVisibility ();
 	memmove (gdkEvent, event, GdkEventVisibility.sizeof);
 	auto paintWindow = paintWindow();
@@ -2737,7 +2737,7 @@
 	return 0;
 }
 
-void gtk_widget_size_request (GtkWidget* widget, GtkRequisition* requisition) {
+/*no override*/ void gtk_widget_size_request (GtkWidget* widget, GtkRequisition* requisition) {
 	OS.gtk_widget_size_request (widget, requisition);
 }