*** empty log message ***

8 files changed, 22 insertions, 26 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 7b24f589f4..514ceb9819 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
@@ -461,10 +461,10 @@ public void setText (String string) {
 		int widget = OS.g_list_nth_data (list, 0);
 		if (widget != 0) OS.gtk_widget_destroy (widget);
 	}
-	byte [] buffer1 = Converter.wcsToMbcs (null, text);
-	int label = OS.gtk_label_new (buffer1);
-	byte [] buffer2 = Converter.wcsToMbcs (null, pattern);
-	OS.gtk_label_set_pattern (label, buffer2);	
+	/* FIXME - accels */
+	int label = OS.gtk_label_new (string);
+/*	byte [] buffer2 = Converter.wcsToMbcs (null, pattern);
+	OS.gtk_label_set_pattern (label, buffer2);*/	
 	OS.gtk_container_add (handle, label);
 	OS.gtk_widget_show (label);	
 }
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 0712117f16..93f70839f5 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
@@ -78,7 +78,7 @@ void createHandle (int index) {
 	
 	handle = ((style&SWT.SEPARATOR) != 0)? (((style&SWT.HORIZONTAL)!= 0)?
 		OS.gtk_hseparator_new() : OS.gtk_vseparator_new()):
-		OS.gtk_label_new (new byte [1]);
+		OS.gtk_label_new (null);
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 }
 
@@ -281,7 +281,7 @@ public void setImage (Image image) {
 	WidgetTable.remove (handle);
 	OS.gtk_widget_destroy (handle);
 	if (image == null) {
-		handle = OS.gtk_label_new (new byte [1]);
+		handle = OS.gtk_label_new (null);
 	} else {
 		handle = OS.gtk_pixmap_new (image.pixmap, image.mask);
 	}
@@ -323,7 +323,7 @@ public void setText (String string) {
 		//NOT IMPLEMENTED - events and state of handle lost
 		WidgetTable.remove (handle);
 		OS.gtk_widget_destroy (handle);
-		handle = OS.gtk_label_new (new byte [1]);
+		handle = OS.gtk_label_new (null);
 		OS.gtk_container_add (frameHandle, handle);
 		WidgetTable.put (handle, this);
 		int alignment = style & (SWT.LEFT | SWT.RIGHT | SWT.CENTER);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java
index ecded1218f..638c65e410 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java
@@ -171,8 +171,8 @@ private void createHandle() {
 	}
 }
 private void createMessage() {
-	byte[] bytes = Converter.wcsToMbcs (null, getMessage(), true);
-	label = OS.gtk_label_new (bytes);
+	label = OS.gtk_label_new (message);
+	if (label==0) error(SWT.ERROR_NO_HANDLES);
 	OS.gtk_box_pack_start (OS.GTK_DIALOG_VBOX(handle), label, true, true, 5); // FIXME should we use container_add??
 }
 private void createActionButtons() {	
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
index cc53d3427c..676a7800e9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
@@ -664,8 +664,7 @@ public void setSelection (boolean selected) {
 	OS.gtk_signal_handler_unblock_by_data (handle, SWT.Selection);
 }
 public void setText (String string) {
-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);
-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);
+	checkWidget();
 	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if ((style & SWT.SEPARATOR) != 0) return;
 	text = string;
@@ -694,8 +693,7 @@ public void setText (String string) {
 		int widget = OS.g_list_nth_data (list, 0);
 		if (widget !=  0) OS.gtk_widget_destroy (widget);
 	}
-	byte [] buffer1 = Converter.wcsToMbcs (null, text);
-	int label = OS.gtk_label_new (buffer1);
+	int label = OS.gtk_label_new (string);
 	byte [] buffer2 = Converter.wcsToMbcs (null, pattern);
 	OS.gtk_label_set_pattern (label, buffer2);	
 	OS.gtk_container_add (handle, label);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/Button.java
index 7b24f589f4..514ceb9819 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/Button.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/Button.java
@@ -461,10 +461,10 @@ public void setText (String string) {
 		int widget = OS.g_list_nth_data (list, 0);
 		if (widget != 0) OS.gtk_widget_destroy (widget);
 	}
-	byte [] buffer1 = Converter.wcsToMbcs (null, text);
-	int label = OS.gtk_label_new (buffer1);
-	byte [] buffer2 = Converter.wcsToMbcs (null, pattern);
-	OS.gtk_label_set_pattern (label, buffer2);	
+	/* FIXME - accels */
+	int label = OS.gtk_label_new (string);
+/*	byte [] buffer2 = Converter.wcsToMbcs (null, pattern);
+	OS.gtk_label_set_pattern (label, buffer2);*/	
 	OS.gtk_container_add (handle, label);
 	OS.gtk_widget_show (label);	
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/Label.java
index 0712117f16..93f70839f5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/Label.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/Label.java
@@ -78,7 +78,7 @@ void createHandle (int index) {
 	
 	handle = ((style&SWT.SEPARATOR) != 0)? (((style&SWT.HORIZONTAL)!= 0)?
 		OS.gtk_hseparator_new() : OS.gtk_vseparator_new()):
-		OS.gtk_label_new (new byte [1]);
+		OS.gtk_label_new (null);
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 }
 
@@ -281,7 +281,7 @@ public void setImage (Image image) {
 	WidgetTable.remove (handle);
 	OS.gtk_widget_destroy (handle);
 	if (image == null) {
-		handle = OS.gtk_label_new (new byte [1]);
+		handle = OS.gtk_label_new (null);
 	} else {
 		handle = OS.gtk_pixmap_new (image.pixmap, image.mask);
 	}
@@ -323,7 +323,7 @@ public void setText (String string) {
 		//NOT IMPLEMENTED - events and state of handle lost
 		WidgetTable.remove (handle);
 		OS.gtk_widget_destroy (handle);
-		handle = OS.gtk_label_new (new byte [1]);
+		handle = OS.gtk_label_new (null);
 		OS.gtk_container_add (frameHandle, handle);
 		WidgetTable.put (handle, this);
 		int alignment = style & (SWT.LEFT | SWT.RIGHT | SWT.CENTER);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/MessageBox.java
index ecded1218f..638c65e410 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/MessageBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/MessageBox.java
@@ -171,8 +171,8 @@ private void createHandle() {
 	}
 }
 private void createMessage() {
-	byte[] bytes = Converter.wcsToMbcs (null, getMessage(), true);
-	label = OS.gtk_label_new (bytes);
+	label = OS.gtk_label_new (message);
+	if (label==0) error(SWT.ERROR_NO_HANDLES);
 	OS.gtk_box_pack_start (OS.GTK_DIALOG_VBOX(handle), label, true, true, 5); // FIXME should we use container_add??
 }
 private void createActionButtons() {	
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/ToolItem.java
index cc53d3427c..676a7800e9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/ToolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk1x/org/eclipse/swt/widgets/ToolItem.java
@@ -664,8 +664,7 @@ public void setSelection (boolean selected) {
 	OS.gtk_signal_handler_unblock_by_data (handle, SWT.Selection);
 }
 public void setText (String string) {
-	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);
-	if (!isValidWidget ()) error (SWT.ERROR_WIDGET_DISPOSED);
+	checkWidget();
 	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if ((style & SWT.SEPARATOR) != 0) return;
 	text = string;
@@ -694,8 +693,7 @@ public void setText (String string) {
 		int widget = OS.g_list_nth_data (list, 0);
 		if (widget !=  0) OS.gtk_widget_destroy (widget);
 	}
-	byte [] buffer1 = Converter.wcsToMbcs (null, text);
-	int label = OS.gtk_label_new (buffer1);
+	int label = OS.gtk_label_new (string);
 	byte [] buffer2 = Converter.wcsToMbcs (null, pattern);
 	OS.gtk_label_set_pattern (label, buffer2);	
 	OS.gtk_container_add (handle, label);