diff options
| author | Steve Northover | 2002-03-18 16:57:14 +0000 |
|---|---|---|
| committer | Steve Northover | 2002-03-18 16:57:14 +0000 |
| commit | 7e6481805b37101076112a14e793b210259bea47 (patch) | |
| tree | 79b6c6227475bcff222184d993445b7a71aef255 | |
| parent | 83183b45d46c9b94b53882da638773f5d8717727 (diff) | |
| download | eclipse.platform.swt-7e6481805b37101076112a14e793b210259bea47.tar.gz eclipse.platform.swt-7e6481805b37101076112a14e793b210259bea47.tar.xz eclipse.platform.swt-7e6481805b37101076112a14e793b210259bea47.zip | |
font codePage
| -rwxr-xr-x | bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java index a5ea840cde..d0e793eb63 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java @@ -153,6 +153,7 @@ public void dispose () { drawable = null;
data.device = null;
data.image = null;
+ data.codePage = null;
data = null;
handle = 0;
}
@@ -2262,12 +2263,10 @@ public void setClipping (Region region) { */ public void setFont (Font font) { if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
- if (font == null) {
- data.fontList = data.device.systemFont.handle; - } else {
- if (font.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
- data.fontList = font.handle;
- }
+ if (font == null) font = data.device.systemFont; + if (font.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+ data.fontList = font.handle;
+ data.codePage = font.codePage;
if (data.renderTable != 0) OS.XmRenderTableFree(data.renderTable);
data.renderTable = 0;
}
|