diff options
| author | Steve Northover <steve> | 2009-01-23 18:59:42 +0000 |
|---|---|---|
| committer | Steve Northover <steve> | 2009-01-23 18:59:42 +0000 |
| commit | 70f43562025b90d1ef4cb5b9c19500fa4791a7d8 (patch) | |
| tree | 6a1bf4c4c2d32397389cd6a1aa9d090a88b88b01 /bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java | |
| parent | e9f72285f87316cbbf1faf63337939688cd5a7e9 (diff) | |
| download | eclipse.platform.swt-70f43562025b90d1ef4cb5b9c19500fa4791a7d8.tar.gz eclipse.platform.swt-70f43562025b90d1ef4cb5b9c19500fa4791a7d8.tar.xz eclipse.platform.swt-70f43562025b90d1ef4cb5b9c19500fa4791a7d8.zip | |
fix warnings (hide them with /*final*/)
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java')
| -rwxr-xr-x | bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java | 4 |
1 files changed, 2 insertions, 2 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 e4a21c839d..831fb7eaba 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 @@ -51,7 +51,7 @@ public class Label extends Control { String text = ""; Image image; static final int MARGIN = 4; - static final boolean IMAGE_AND_TEXT = false; + static /*final*/ boolean IMAGE_AND_TEXT = false; static final int /*long*/ LabelProc; static final TCHAR LabelClass = new TCHAR (0, "STATIC", true); static { @@ -625,7 +625,7 @@ LRESULT wmDrawChild (int /*long*/ wParam, int /*long*/ lParam) { int height = struct.bottom - struct.top; if (width != 0 && height != 0) { boolean drawImage = image != null; - boolean drawText = IMAGE_AND_TEXT /*&& text.length () != 0*/; + boolean drawText = IMAGE_AND_TEXT && text.length () != 0; int margin = drawText && drawImage ? MARGIN : 0; int imageWidth = 0, imageHeight = 0; if (drawImage) { |