summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
diff options
context:
space:
mode:
authorSteve Northover <steve>2006-04-07 17:44:22 +0000
committerSteve Northover <steve>2006-04-07 17:44:22 +0000
commit40f1c5f7d31e08753ce42641a6aa8235fd0a0a50 (patch)
tree88ebdc32dfe745d1678428e71e574318b15c91cf /bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
parent842af3804926d31ad2f49f4ce7faac1998bf8575 (diff)
downloadeclipse.platform.swt-40f1c5f7d31e08753ce42641a6aa8235fd0a0a50.tar.gz
eclipse.platform.swt-40f1c5f7d31e08753ce42641a6aa8235fd0a0a50.tar.xz
eclipse.platform.swt-40f1c5f7d31e08753ce42641a6aa8235fd0a0a50.zip
82769 - [Contributions] Disabled menu items have enabled images when armed
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java')
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java7
1 files changed, 3 insertions, 4 deletions
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;
}