*** empty log message ***

5 files changed, 35 insertions, 9 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
index ed615bcc2c..485f1f052a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
@@ -330,11 +330,13 @@ int parentingHandle () {
 }
 
 int processFocusIn(int int0, int int1, int int2) {
-	return super.processFocusIn(int0, int1, int2);
+	int result = super.processFocusIn(int0, int1, int2);
+	return (state & CANVAS) != 0 ? 1 : result;
 }
 
 int processFocusOut(int int0, int int1, int int2) {
-	return super.processFocusOut(int0, int1, int2);
+	int result = super.processFocusOut(int0, int1, int2);
+	return (state & CANVAS) != 0 ? 1 : result;
 }
 
 int processMouseDown (int callData, int arg1, int int2) {
@@ -353,11 +355,6 @@ int processMouseDown (int callData, int arg1, int int2) {
 	return result;
 }
 
-int processMouseUp (int callData, int arg1, int int2) {
-	int result = super.processMouseUp (callData, arg1, int2);
-	return result;
-}
-
 int processPaint (int callData, int int1, int int2) {
 	if ((state & CANVAS) == 0) {
 		return super.processPaint (callData, int1, int2);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
index d53c239231..fb5cb8b984 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -122,6 +122,8 @@ void hookEvents () {
 	OS.gtk_signal_connect (eventHandle, OS.key_press_event, windowProc3, SWT.KeyDown);
 	OS.gtk_signal_connect (eventHandle, OS.key_release_event, windowProc3, SWT.KeyUp);
 	OS.gtk_signal_connect (eventHandle, OS.motion_notify_event, windowProc3, SWT.MouseMove);
+	OS.gtk_signal_connect (eventHandle, OS.focus_in_event, windowProc3, SWT.FocusIn);
+	OS.gtk_signal_connect (eventHandle, OS.focus_out_event, windowProc3, SWT.FocusOut);
 	OS.gtk_signal_connect_after (eventHandle, OS.button_press_event, windowProc3, -SWT.MouseDown);
 	OS.gtk_signal_connect_after (eventHandle, OS.button_release_event, windowProc3, -SWT.MouseUp);
 	OS.gtk_signal_connect_after (eventHandle, OS.key_press_event, windowProc3, -SWT.KeyDown);
@@ -129,8 +131,6 @@ void hookEvents () {
 	OS.gtk_signal_connect_after (eventHandle, OS.motion_notify_event, windowProc3, -SWT.MouseMove);
 	OS.gtk_signal_connect_after (eventHandle, OS.enter_notify_event, windowProc3, SWT.MouseEnter);
 	OS.gtk_signal_connect_after (eventHandle, OS.leave_notify_event, windowProc3, SWT.MouseExit);
-	OS.gtk_signal_connect_after (eventHandle, OS.focus_in_event, windowProc3, SWT.FocusIn);
-	OS.gtk_signal_connect_after (eventHandle, OS.focus_out_event, windowProc3, SWT.FocusOut);
 	OS.gtk_signal_connect_after (eventHandle, OS.expose_event, windowProc3, SWT.Paint);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
index f8e2c9669f..5cb95051f2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
@@ -652,6 +652,7 @@ int processEvent (int eventNumber, int int0, int int1, int int2) {
 			case OS.GDK_BUTTON_PRESS:
 			case OS.GDK_2BUTTON_PRESS: {
 				if ((style & SWT.MULTI) != 0) selected = true;
+				processMouseDown (int0, int1, int2);
 				break;
 			}
 			case OS.GDK_BUTTON_RELEASE: {
@@ -680,6 +681,7 @@ int processEvent (int eventNumber, int int0, int int1, int int2) {
 					}
 					selected = false;
 				}
+				processMouseUp (int0, int1, int2);
 				break;
 			}
 		}
@@ -735,6 +737,13 @@ int processKeyUp (int callData, int arg1, int int2) {
 	return result;
 }
 
+int processMouseDown (int callData, int arg1, int int2) {
+	return 0;
+}
+
+int processMouseUp (int callData, int arg1, int int2) {
+	return 0;
+}
 
 int processSelection (int int0, int int1, int int2) {
 	if (int0 != OS.GTK_CLIST_FOCUS_ROW (handle)) return 0;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
index 018c645dde..321e56f134 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
@@ -744,6 +744,7 @@ int processEvent (int eventNumber, int int0, int int1, int int2) {
 						}
 					}
 				}
+				processMouseDown (int0, int1, int2);
 				break;
 			}
 			case OS.GDK_BUTTON_RELEASE: {
@@ -772,6 +773,7 @@ int processEvent (int eventNumber, int int0, int int1, int int2) {
 					}
 					selected = false;
 				}
+				processMouseUp (int0, int1, int2);
 				break;
 			}
 		}
@@ -830,6 +832,14 @@ int processKeyUp (int callData, int arg1, int int2) {
 	return result;
 }
 
+int processMouseDown (int callData, int arg1, int int2) {
+	return 0;
+}
+
+int processMouseUp (int callData, int arg1, int int2) {
+	return 0;
+}
+
 /**
  * Returns the zero-relative index of the item which is currently
  * at the top of the receiver. This index can change when items are
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
index 493376edf6..b92401a0ae 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
@@ -678,6 +678,7 @@ int processEvent (int eventNumber, int int0, int int1, int int2) {
 						}
 					}
 				}
+				processMouseDown (int0, int1, int2); 
 				break;
 			}
 			case OS.GDK_BUTTON_RELEASE: {
@@ -739,6 +740,7 @@ int processEvent (int eventNumber, int int0, int int1, int int2) {
 					}
 				}
 				doubleSelected = false;
+				processMouseUp (int0, int1, int2);
 				break;
 			}
 		}
@@ -764,6 +766,14 @@ int processExpand (int int0, int int1, int int2) {
 	return 0;
 }
 
+int processMouseDown (int callData, int arg1, int int2) {
+	return 0;
+}
+
+int processMouseUp (int callData, int arg1, int int2) {
+	return 0;
+}
+
 int processSelection (int int0, int int1, int int2) {
 	if ((style & SWT.SINGLE) != 0) {
 		selected = true;