diff options
| author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-10-30 17:55:42 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-10-30 17:55:42 -0400 |
| commit | ccd2d5aea4fb2e484cfeea5d7ce086a6f7e68860 (patch) | |
| tree | 150f22ca51340c4b93e96f23205564020a20c817 /bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java | |
| parent | 9e6ed5ddefaae266127428adb6c5fbedbb333dc4 (diff) | |
| download | eclipse.platform.swt-ccd2d5aea4fb2e484cfeea5d7ce086a6f7e68860.tar.gz eclipse.platform.swt-ccd2d5aea4fb2e484cfeea5d7ce086a6f7e68860.tar.xz eclipse.platform.swt-ccd2d5aea4fb2e484cfeea5d7ce086a6f7e68860.zip | |
Bug 389910 - Substitute GdkColor with GdkRGBA
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 | 9 |
1 files changed, 4 insertions, 5 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 5ecf918e10..aa8ed91938 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 @@ -189,8 +189,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) { OS.g_object_get (labelHandle, OS.ypad, buffer, 0); fontHeight += 2 * buffer [0]; if (frameHandle != 0) { - long /*int*/ style = OS.gtk_widget_get_style (frameHandle); - fontHeight += 2 * OS.gtk_style_get_ythickness (style); + fontHeight += 2 * getThickness (frameHandle).y; fontHeight += 2 * OS.gtk_container_get_border_width (frameHandle); } size.y = Math.max (size.y, fontHeight); @@ -281,7 +280,7 @@ public int getAlignment () { public int getBorderWidth () { checkWidget(); if (frameHandle != 0) { - return OS.gtk_style_get_xthickness (OS.gtk_widget_get_style (frameHandle)); + return getThickness (frameHandle).x; } return 0; } @@ -486,8 +485,8 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize void setFontDescription (long /*int*/ font) { super.setFontDescription (font); - if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font); - if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font); + if (labelHandle != 0) setFontDescription (labelHandle, font); + if (imageHandle != 0) setFontDescription (imageHandle, font); } void setForegroundColor (GdkColor color) { |