Bug 422090 - Adding/Removing SWT.MeasureEvent listener will show tree

without horizontal scrollbar


Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>

2 files changed, 25 insertions, 2 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
index 4538de6baf..b95c3014b5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
@@ -255,6 +255,25 @@ TreeItem _getItem (long /*int*/ hItem, int id) {
 	return id != -1 ? items [id] : new TreeItem (this, SWT.NONE, -1, -1, hItem);
 }
 
+void _removeListener (int eventType, Listener listener) {
+	super._removeListener (eventType, listener);
+	switch (eventType) {
+		case SWT.MeasureItem: {
+			/**
+			 * If H_SCROLL is set, reverting the TVS_NOHSCROLL settings which
+			 * was applied while adding SWT.MeasureItem event Listener.
+			 */
+			if ((style & SWT.H_SCROLL) != 0) {
+				int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
+				bits &= ~OS.TVS_NOHSCROLL;
+				OS.SetWindowLong (handle, OS.GWL_STYLE, bits);
+				OS.InvalidateRect (handle, null, true);
+			}
+			break;
+		}
+	}
+}
+
 void _setBackgroundPixel (int newPixel) {
 	int oldPixel = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETBKCOLOR, 0, 0);
 	if (oldPixel != newPixel) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
index 025c8b5aec..66c8b4632e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
@@ -160,6 +160,11 @@ void _addListener (int eventType, Listener listener) {
 	eventTable.hook (eventType, listener);
 }
 
+void _removeListener (int eventType, Listener listener) {
+	if (eventTable == null) return;
+	eventTable.unhook (eventType, listener);
+}
+
 /**
  * Adds the listener to the collection of listeners who will
  * be notified when an event of the given type occurs. When the
@@ -923,8 +928,7 @@ void releaseWidget () {
 public void removeListener (int eventType, Listener listener) {
 	checkWidget();
 	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
-	if (eventTable == null) return;
-	eventTable.unhook (eventType, listener);
+	_removeListener (eventType, listener);
 }
 
 /**