*** empty log message ***

2 files changed, 6 insertions, 15 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
index a84e9dbe33..37ca32bf12 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
@@ -499,12 +499,13 @@ public void setImage (Image image) {
 	checkWidget ();
 	this.image = image;
 	if ((style & SWT.ARROW) != 0) return;
-	OS.gtk_widget_hide (labelHandle);
 	if (image != null) {
 		OS.gtk_image_set_from_pixmap (imageHandle, image.pixmap, image.mask);
+		OS.gtk_widget_hide (labelHandle);
 		OS.gtk_widget_show (imageHandle);
 	} else {
 		OS.gtk_image_set_from_pixmap (imageHandle, 0, 0);
+		OS.gtk_widget_show (labelHandle);
 		OS.gtk_widget_hide (imageHandle);
 	}
 	/*
@@ -566,11 +567,7 @@ public void setText (String string) {
 	byte [] buffer = Converter.wcsToMbcs (null, chars, false);
 	OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
 	OS.gtk_widget_hide (imageHandle);
-	if (string.length () != 0) {
-		OS.gtk_widget_show (labelHandle);
-	} else {
-		OS.gtk_widget_hide (labelHandle);
-	}
+	OS.gtk_widget_show (labelHandle);
 	/*
 	* Bug in GTK.  For some reason, the button does not allocate the size of its internal
 	* children if its bounds is set before the image is set.  The fix is to force this by calling
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 9941f56167..19a94798ce 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
@@ -116,9 +116,6 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
 	}
 	if (labelHandle != 0) {
 		OS.gtk_widget_set_size_request (labelHandle, labelWidth, labelHeight);
-		if (text.length () == 0 && OS.GTK_WIDGET_VISIBLE (labelHandle))  {
-			requisition.height += fontHeight (getFontDescription (), labelHandle);
-		}
 	}
 	OS.gtk_widget_set_size_request (handle, width, height);
 	return new Point (requisition.width, requisition.height);	
@@ -442,12 +439,13 @@ public void setImage (Image image) {
 	checkWidget ();
 	this.image = image;
 	if ((style & SWT.SEPARATOR) != 0) return;
-	OS.gtk_widget_hide (labelHandle);
 	if (image != null) {
 		OS.gtk_image_set_from_pixmap (imageHandle, image.pixmap, image.mask);
+		OS.gtk_widget_hide (labelHandle);
 		OS.gtk_widget_show (imageHandle);
 	} else {
 		OS.gtk_image_set_from_pixmap (imageHandle, 0, 0);
+		OS.gtk_widget_show (labelHandle);
 		OS.gtk_widget_hide (imageHandle);
 	}
 }
@@ -478,11 +476,7 @@ public void setText (String string) {
 	byte [] buffer = Converter.wcsToMbcs (null, chars, false);
 	OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
 	OS.gtk_widget_hide (imageHandle);
-	if (string.length () != 0) {
-		OS.gtk_widget_show (labelHandle);
-	} else {
-		OS.gtk_widget_hide (labelHandle);
-	}
+	OS.gtk_widget_show (labelHandle);
 }
 
 }