From 40f1c5f7d31e08753ce42641a6aa8235fd0a0a50 Mon Sep 17 00:00:00 2001
From: Steve Northover <steve>
Date: Fri, 7 Apr 2006 17:44:22 +0000
Subject: 82769 - [Contributions] Disabled menu items have enabled images when
 armed

---
 .../Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java           | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java')

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
index 5b2b05bb29..a4513a2689 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java	
@@ -587,9 +587,9 @@ LRESULT wmDrawChild (int wParam, int lParam) {
 				GCData data = new GCData();
 				data.device = display;
 				GC gc = GC.win32_new (struct.hDC, data);
-				Image drawnImage = getEnabled () ? image : new Image (display, image, SWT.IMAGE_DISABLE);
-				gc.drawImage (drawnImage, x, Math.max (0, (height - imageHeight) / 2));
-				if (drawnImage != image) drawnImage.dispose ();
+				Image image = getEnabled () ? this.image : new Image (display, this.image, SWT.IMAGE_DISABLE);
+				gc.drawImage (image, x, Math.max (0, (height - imageHeight) / 2));
+				if (image != this.image) image.dispose ();
 				gc.dispose ();
 				x += imageWidth + margin;
 			}
@@ -602,7 +602,6 @@ LRESULT wmDrawChild (int wParam, int lParam) {
 				OS.DrawText (struct.hDC, buffer, -1, rect, flags);
 			}
 		}
-
 	}
 	return null;
 }
-- 
cgit