diff options
| author | Carolyn MacLeod <carolyn> | 2004-11-30 20:16:36 +0000 |
|---|---|---|
| committer | Carolyn MacLeod <carolyn> | 2004-11-30 20:16:36 +0000 |
| commit | b69b16b9e249b3d2aa31225c29e0b0e1b47775fe (patch) | |
| tree | 867628689bd7766eedce1e8fe53efec112a1413d | |
| parent | 7574e2036ff99c9e9b0efd33114a637c8b9647e2 (diff) | |
| download | eclipse.platform.swt-b69b16b9e249b3d2aa31225c29e0b0e1b47775fe.tar.gz eclipse.platform.swt-b69b16b9e249b3d2aa31225c29e0b0e1b47775fe.tar.xz eclipse.platform.swt-b69b16b9e249b3d2aa31225c29e0b0e1b47775fe.zip | |
bug 26859
| -rwxr-xr-x | bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java index 334c3a6248..4e6e8f9f23 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java @@ -473,12 +473,11 @@ void setBitmap (Image image) { } } int [] argList = { - OS.XmNlabelType, OS.XmPIXMAP, + OS.XmNlabelType, image == null ? OS.XmSTRING : OS.XmPIXMAP, OS.XmNlabelPixmap, labelPixmap, OS.XmNlabelInsensitivePixmap, labelInsensitivePixmap, }; OS.XtSetValues (handle, argList, argList.length / 2); - if (image == null && text != null && !text.equals("")) _setText(text); } boolean setBounds (int x, int y, int width, int height, boolean move, boolean resize) { boolean changed = super.setBounds (x, y, width, height, move, resize); |