diff options
| author | Anatoly Spektor <aspektor@redhat.com> | 2012-08-02 16:36:51 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-08-03 11:17:00 -0400 |
| commit | 5983c24ed5237e3fc3d1e8e4c23d3ce4ce153bac (patch) | |
| tree | e00688b350467b1730204459583d9dd0a2720fa1 /bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java | |
| parent | 34f0c3974a377d1fb41f2905de1ceb16ac6ba1ce (diff) | |
| download | eclipse.platform.swt-5983c24ed5237e3fc3d1e8e4c23d3ce4ce153bac.tar.gz eclipse.platform.swt-5983c24ed5237e3fc3d1e8e4c23d3ce4ce153bac.tar.xz eclipse.platform.swt-5983c24ed5237e3fc3d1e8e4c23d3ce4ce153bac.zip | |
Omit use of deprecated GTK_WIDGET_FLAGS
Conflicts:
bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java index 7f38f41c50..1d11b629e9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java @@ -129,7 +129,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { * The fix is to use pango layout directly instead of the label size request * to calculate its preferred size. */ - boolean fixWrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && (OS.GTK_WIDGET_FLAGS (labelHandle) & OS.GTK_VISIBLE) != 0; + boolean fixWrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && gtk_widget_get_visible (labelHandle); if (fixWrap || frameHandle != 0) forceResize (); if (fixWrap) { int /*long*/ labelLayout = OS.gtk_label_get_layout (labelHandle); |