summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse
diff options
context:
space:
mode:
authorSteve Northover <steve>2007-08-02 17:14:17 +0000
committerSteve Northover <steve>2007-08-02 17:14:17 +0000
commit46eb071230b8a396e106ca043cda2006116e91e3 (patch)
tree7cb1ed444bdfd4ce8c89e2737259d515e6090b54 /bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse
parentd2b5564608d62cf967c0a44d8107a33edd257121 (diff)
downloadeclipse.platform.swt-46eb071230b8a396e106ca043cda2006116e91e3.tar.gz
eclipse.platform.swt-46eb071230b8a396e106ca043cda2006116e91e3.tar.xz
eclipse.platform.swt-46eb071230b8a396e106ca043cda2006116e91e3.zip
198430 - Font not set correctly in GC supplied to events of virtual table/tree
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse')
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
index f06791f42a..440917ce18 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
@@ -3647,10 +3647,10 @@ void init(Drawable drawable, GCData data, int /*long*/ hDC) {
}
data.state &= ~(NULL_BRUSH | NULL_PEN);
int /*long*/ hFont = data.hFont;
- if (hFont != 0) {
+ if (hFont != 0 && hFont != -1) {
data.state &= ~FONT;
} else {
- hFont = OS.GetCurrentObject(hDC, OS.OBJ_FONT);
+ data.hFont = OS.GetCurrentObject(hDC, OS.OBJ_FONT);
}
int /*long*/ hPalette = data.device.hPalette;
if (hPalette != 0) {