--- a/dwt/widgets/Button.d	Sat Jan 12 07:02:08 2008 +0100
+++ b/dwt/widgets/Button.d	Sat Jan 12 08:44:23 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -48,11 +48,11 @@
  * </p>
  */
 public class Button : Control {
-	GtkWidget* boxHandle, labelHandle, imageHandle, arrowHandle, groupHandle;
-	bool selected;
-	ImageList imageList;
-	Image image;
-	char[] text;
+    GtkWidget* boxHandle, labelHandle, imageHandle, arrowHandle, groupHandle;
+    bool selected;
+    ImageList imageList;
+    Image image;
+    char[] text;
 
 /**
  * Constructs a new instance of this class given its parent
@@ -91,22 +91,22 @@
  * @see Widget#getStyle
  */
 public this (Composite parent, int style) {
-	super (parent, checkStyle (style));
+    super (parent, checkStyle (style));
 }
 
 static int checkStyle (int style) {
-	style = checkBits (style, SWT.PUSH, SWT.ARROW, SWT.CHECK, SWT.RADIO, SWT.TOGGLE, 0);
-	if ((style & (SWT.PUSH | SWT.TOGGLE)) !is 0) {
-		return checkBits (style, SWT.CENTER, SWT.LEFT, SWT.RIGHT, 0, 0, 0);
-	}
-	if ((style & (SWT.CHECK | SWT.RADIO)) !is 0) {
-		return checkBits (style, SWT.LEFT, SWT.RIGHT, SWT.CENTER, 0, 0, 0);
-	}
-	if ((style & SWT.ARROW) !is 0) {
-		style |= SWT.NO_FOCUS;
-		return checkBits (style, SWT.UP, SWT.DOWN, SWT.LEFT, SWT.RIGHT, 0, 0);
-	}
-	return style;
+    style = checkBits (style, SWT.PUSH, SWT.ARROW, SWT.CHECK, SWT.RADIO, SWT.TOGGLE, 0);
+    if ((style & (SWT.PUSH | SWT.TOGGLE)) !is 0) {
+        return checkBits (style, SWT.CENTER, SWT.LEFT, SWT.RIGHT, 0, 0, 0);
+    }
+    if ((style & (SWT.CHECK | SWT.RADIO)) !is 0) {
+        return checkBits (style, SWT.LEFT, SWT.RIGHT, SWT.CENTER, 0, 0, 0);
+    }
+    if ((style & SWT.ARROW) !is 0) {
+        style |= SWT.NO_FOCUS;
+        return checkBits (style, SWT.UP, SWT.DOWN, SWT.LEFT, SWT.RIGHT, 0, 0);
+    }
+    return style;
 }
 
 /**
@@ -134,139 +134,139 @@
  * @see SelectionEvent
  */
 public void addSelectionListener (SelectionListener listener) {
-	checkWidget ();
-	if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
-	TypedListener typedListener = new TypedListener (listener);
-	addListener (SWT.Selection,typedListener);
-	addListener (SWT.DefaultSelection,typedListener);
+    checkWidget ();
+    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    TypedListener typedListener = new TypedListener (listener);
+    addListener (SWT.Selection,typedListener);
+    addListener (SWT.DefaultSelection,typedListener);
 }
 
 override public Point computeSize (int wHint, int hHint, bool changed) {
-	checkWidget ();
-	if (wHint !is SWT.DEFAULT && wHint < 0) wHint = 0;
-	if (hHint !is SWT.DEFAULT && hHint < 0) hHint = 0;
-	/*
-	* Feature in GTK, GtkCheckButton and GtkRadioButton allocate
-	* only the minimum size necessary for its child. This causes the child
-	* alignment to fail. The fix is to set the child size to the size
-	* of the button.
-	*/
-	forceResize ();
-	int reqWidth = -1, reqHeight = -1;
-	if ((style & (SWT.CHECK | SWT.RADIO)) !is 0) {
-		OS.gtk_widget_get_size_request (boxHandle, &reqWidth, &reqHeight);
-		OS.gtk_widget_set_size_request (boxHandle, -1, -1);
-	}
-	Point size = computeNativeSize (handle, wHint, hHint, changed);
-	if ((style & (SWT.CHECK | SWT.RADIO)) !is 0) {
-		OS.gtk_widget_set_size_request (boxHandle, reqWidth, reqHeight);
-	}
-	if (wHint !is SWT.DEFAULT || hHint !is SWT.DEFAULT) {
-		if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_CAN_DEFAULT) !is 0) {
-			GtkBorder border;
+    checkWidget ();
+    if (wHint !is SWT.DEFAULT && wHint < 0) wHint = 0;
+    if (hHint !is SWT.DEFAULT && hHint < 0) hHint = 0;
+    /*
+    * Feature in GTK, GtkCheckButton and GtkRadioButton allocate
+    * only the minimum size necessary for its child. This causes the child
+    * alignment to fail. The fix is to set the child size to the size
+    * of the button.
+    */
+    forceResize ();
+    int reqWidth = -1, reqHeight = -1;
+    if ((style & (SWT.CHECK | SWT.RADIO)) !is 0) {
+        OS.gtk_widget_get_size_request (boxHandle, &reqWidth, &reqHeight);
+        OS.gtk_widget_set_size_request (boxHandle, -1, -1);
+    }
+    Point size = computeNativeSize (handle, wHint, hHint, changed);
+    if ((style & (SWT.CHECK | SWT.RADIO)) !is 0) {
+        OS.gtk_widget_set_size_request (boxHandle, reqWidth, reqHeight);
+    }
+    if (wHint !is SWT.DEFAULT || hHint !is SWT.DEFAULT) {
+        if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_CAN_DEFAULT) !is 0) {
+            GtkBorder border;
             GtkBorder* buffer;
-			OS.gtk_widget_style_get1 (handle, OS.default_border.ptr, cast(int*)&buffer );
-			if (buffer !is null) {
+            OS.gtk_widget_style_get1 (handle, OS.default_border.ptr, cast(int*)&buffer );
+            if (buffer !is null) {
                 border = *buffer;
-			} else {
-				/* Use the GTK+ default value of 1 for each. */
-				border.left = border.right = border.top = border.bottom = 1;
-			}
-			if (wHint !is SWT.DEFAULT) size.x += border.left + border.right;
-			if (hHint !is SWT.DEFAULT) size.y += border.top + border.bottom;
-		}
-	}
-	return size;
+            } else {
+                /* Use the GTK+ default value of 1 for each. */
+                border.left = border.right = border.top = border.bottom = 1;
+            }
+            if (wHint !is SWT.DEFAULT) size.x += border.left + border.right;
+            if (hHint !is SWT.DEFAULT) size.y += border.top + border.bottom;
+        }
+    }
+    return size;
 }
 
 override void createHandle (int index) {
-	state |= HANDLE;
-	if ((style & SWT.PUSH) is 0) state |= THEME_BACKGROUND;
-	int bits = SWT.ARROW | SWT.TOGGLE | SWT.CHECK | SWT.RADIO | SWT.PUSH;
-	fixedHandle = cast(GtkWidget*)OS.g_object_new (display.gtk_fixed_get_type (), null);
-	if (fixedHandle is null) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_fixed_set_has_window (cast(GtkFixed*)fixedHandle, true);
-	switch (style & bits) {
-		case SWT.ARROW:
-			int arrow_type = OS.GTK_ARROW_UP;
-			if ((style & SWT.UP) !is 0) arrow_type = OS.GTK_ARROW_UP;
-			if ((style & SWT.DOWN) !is 0) arrow_type = OS.GTK_ARROW_DOWN;
+    state |= HANDLE;
+    if ((style & SWT.PUSH) is 0) state |= THEME_BACKGROUND;
+    int bits = SWT.ARROW | SWT.TOGGLE | SWT.CHECK | SWT.RADIO | SWT.PUSH;
+    fixedHandle = cast(GtkWidget*)OS.g_object_new (display.gtk_fixed_get_type (), null);
+    if (fixedHandle is null) error (SWT.ERROR_NO_HANDLES);
+    OS.gtk_fixed_set_has_window (cast(GtkFixed*)fixedHandle, true);
+    switch (style & bits) {
+        case SWT.ARROW:
+            int arrow_type = OS.GTK_ARROW_UP;
+            if ((style & SWT.UP) !is 0) arrow_type = OS.GTK_ARROW_UP;
+            if ((style & SWT.DOWN) !is 0) arrow_type = OS.GTK_ARROW_DOWN;
             if ((style & SWT.LEFT) !is 0) arrow_type = OS.GTK_ARROW_LEFT;
             if ((style & SWT.RIGHT) !is 0) arrow_type = OS.GTK_ARROW_RIGHT;
-			handle = OS.gtk_button_new ();
-			if (handle is null) error (SWT.ERROR_NO_HANDLES);
-			arrowHandle = OS.gtk_arrow_new (arrow_type, OS.GTK_SHADOW_OUT);
-			if (arrowHandle is null) error (SWT.ERROR_NO_HANDLES);
-			break;
-		case SWT.TOGGLE:
-			handle = OS.gtk_toggle_button_new ();
-			if (handle is null) error (SWT.ERROR_NO_HANDLES);
-			break;
-		case SWT.CHECK:
-			handle = OS.gtk_check_button_new ();
-			if (handle is null) error (SWT.ERROR_NO_HANDLES);
-			break;
-		case SWT.RADIO:
-			/*
-			* Feature in GTK.  In GTK, radio button must always be part of
-			* a radio button group.  In a GTK radio group, one button is always
-			* selected.  This means that it is not possible to have a single
-			* radio button that is unselected.  This is necessary to allow
-			* applications to implement their own radio behavior or use radio
-			* buttons outside of radio groups.  The fix is to create a hidden
-			* radio button for each radio button we create and add them
-			* to the same group.  This allows the visible button to be
-			* unselected.
-			*/
-			groupHandle = cast(GtkWidget*)OS.gtk_radio_button_new (null);
-			if (groupHandle is null) error (SWT.ERROR_NO_HANDLES);
-			OS.g_object_ref (groupHandle);
-			OS.gtk_object_sink (cast(GtkObject*)groupHandle);
-			handle = OS.gtk_radio_button_new ( OS.gtk_radio_button_get_group (cast(GtkRadioButton*)groupHandle));
-			if (handle is null) error (SWT.ERROR_NO_HANDLES);
-			break;
-		case SWT.PUSH:
-		default:
-			handle = OS.gtk_button_new ();
-			if (handle is null) error (SWT.ERROR_NO_HANDLES);
-			OS.GTK_WIDGET_SET_FLAGS(handle, OS.GTK_CAN_DEFAULT);
-			break;
-	}
-	if ((style & SWT.ARROW) !is 0) {
-		OS.gtk_container_add (cast(GtkContainer*)handle, arrowHandle);
-	} else {
-		boxHandle = OS.gtk_hbox_new (false, 4);
-		if (boxHandle is null) error (SWT.ERROR_NO_HANDLES);
-		labelHandle = OS.gtk_label_new_with_mnemonic (null);
-		if (labelHandle is null) error (SWT.ERROR_NO_HANDLES);
-		imageHandle = OS.gtk_image_new ();
-		if (imageHandle is null) error (SWT.ERROR_NO_HANDLES);
-		OS.gtk_container_add (cast(GtkContainer*)handle, boxHandle);
-		OS.gtk_container_add (cast(GtkContainer*)boxHandle, imageHandle);
-		OS.gtk_container_add (cast(GtkContainer*)boxHandle, labelHandle);
-	}
-	OS.gtk_container_add (cast(GtkContainer*)fixedHandle, handle);
+            handle = OS.gtk_button_new ();
+            if (handle is null) error (SWT.ERROR_NO_HANDLES);
+            arrowHandle = OS.gtk_arrow_new (arrow_type, OS.GTK_SHADOW_OUT);
+            if (arrowHandle is null) error (SWT.ERROR_NO_HANDLES);
+            break;
+        case SWT.TOGGLE:
+            handle = OS.gtk_toggle_button_new ();
+            if (handle is null) error (SWT.ERROR_NO_HANDLES);
+            break;
+        case SWT.CHECK:
+            handle = OS.gtk_check_button_new ();
+            if (handle is null) error (SWT.ERROR_NO_HANDLES);
+            break;
+        case SWT.RADIO:
+            /*
+            * Feature in GTK.  In GTK, radio button must always be part of
+            * a radio button group.  In a GTK radio group, one button is always
+            * selected.  This means that it is not possible to have a single
+            * radio button that is unselected.  This is necessary to allow
+            * applications to implement their own radio behavior or use radio
+            * buttons outside of radio groups.  The fix is to create a hidden
+            * radio button for each radio button we create and add them
+            * to the same group.  This allows the visible button to be
+            * unselected.
+            */
+            groupHandle = cast(GtkWidget*)OS.gtk_radio_button_new (null);
+            if (groupHandle is null) error (SWT.ERROR_NO_HANDLES);
+            OS.g_object_ref (groupHandle);
+            OS.gtk_object_sink (cast(GtkObject*)groupHandle);
+            handle = OS.gtk_radio_button_new ( OS.gtk_radio_button_get_group (cast(GtkRadioButton*)groupHandle));
+            if (handle is null) error (SWT.ERROR_NO_HANDLES);
+            break;
+        case SWT.PUSH:
+        default:
+            handle = OS.gtk_button_new ();
+            if (handle is null) error (SWT.ERROR_NO_HANDLES);
+            OS.GTK_WIDGET_SET_FLAGS(handle, OS.GTK_CAN_DEFAULT);
+            break;
+    }
+    if ((style & SWT.ARROW) !is 0) {
+        OS.gtk_container_add (cast(GtkContainer*)handle, arrowHandle);
+    } else {
+        boxHandle = OS.gtk_hbox_new (false, 4);
+        if (boxHandle is null) error (SWT.ERROR_NO_HANDLES);
+        labelHandle = OS.gtk_label_new_with_mnemonic (null);
+        if (labelHandle is null) error (SWT.ERROR_NO_HANDLES);
+        imageHandle = OS.gtk_image_new ();
+        if (imageHandle is null) error (SWT.ERROR_NO_HANDLES);
+        OS.gtk_container_add (cast(GtkContainer*)handle, boxHandle);
+        OS.gtk_container_add (cast(GtkContainer*)boxHandle, imageHandle);
+        OS.gtk_container_add (cast(GtkContainer*)boxHandle, labelHandle);
+    }
+    OS.gtk_container_add (cast(GtkContainer*)fixedHandle, handle);
 
     if ((style & SWT.ARROW) !is 0) return;
-	_setAlignment (style & (SWT.LEFT | SWT.CENTER | SWT.RIGHT));
+    _setAlignment (style & (SWT.LEFT | SWT.CENTER | SWT.RIGHT));
 }
 
 override void createWidget (int index) {
-	super.createWidget (index);
-	text = "";
+    super.createWidget (index);
+    text = "";
 }
 
 override void deregister () {
-	super.deregister ();
-	if (boxHandle !is null) display.removeWidget (boxHandle);
-	if (labelHandle !is null) display.removeWidget (labelHandle);
-	if (imageHandle !is null) display.removeWidget (imageHandle);
-	if (arrowHandle !is null) display.removeWidget (arrowHandle);
+    super.deregister ();
+    if (boxHandle !is null) display.removeWidget (boxHandle);
+    if (labelHandle !is null) display.removeWidget (labelHandle);
+    if (imageHandle !is null) display.removeWidget (imageHandle);
+    if (arrowHandle !is null) display.removeWidget (arrowHandle);
 }
 
 override GtkWidget* fontHandle () {
-	if (labelHandle !is null) return labelHandle;
-	return super.fontHandle ();
+    if (labelHandle !is null) return labelHandle;
+    return super.fontHandle ();
 }
 
 /**
@@ -286,18 +286,18 @@
  * </ul>
  */
 public int getAlignment () {
-	checkWidget ();
-	if ((style & SWT.ARROW) !is 0) {
-		if ((style & SWT.UP) !is 0) return SWT.UP;
-		if ((style & SWT.DOWN) !is 0) return SWT.DOWN;
-		if ((style & SWT.LEFT) !is 0) return SWT.LEFT;
-		if ((style & SWT.RIGHT) !is 0) return SWT.RIGHT;
-		return SWT.UP;
-	}
-	if ((style & SWT.LEFT) !is 0) return SWT.LEFT;
-	if ((style & SWT.CENTER) !is 0) return SWT.CENTER;
-	if ((style & SWT.RIGHT) !is 0) return SWT.RIGHT;
-	return SWT.LEFT;
+    checkWidget ();
+    if ((style & SWT.ARROW) !is 0) {
+        if ((style & SWT.UP) !is 0) return SWT.UP;
+        if ((style & SWT.DOWN) !is 0) return SWT.DOWN;
+        if ((style & SWT.LEFT) !is 0) return SWT.LEFT;
+        if ((style & SWT.RIGHT) !is 0) return SWT.RIGHT;
+        return SWT.UP;
+    }
+    if ((style & SWT.LEFT) !is 0) return SWT.LEFT;
+    if ((style & SWT.CENTER) !is 0) return SWT.CENTER;
+    if ((style & SWT.RIGHT) !is 0) return SWT.RIGHT;
+    return SWT.LEFT;
 }
 
 /**
@@ -312,12 +312,12 @@
  * </ul>
  */
 public Image getImage () {
-	checkWidget ();
-	return image;
+    checkWidget ();
+    return image;
 }
 
 override char[] getNameText () {
-	return getText ();
+    return getText ();
 }
 
 /**
@@ -337,9 +337,9 @@
  * </ul>
  */
 public bool getSelection () {
-	checkWidget ();
-	if ((style & (SWT.CHECK | SWT.RADIO | SWT.TOGGLE)) is 0) return false;
-	return cast(bool)OS.gtk_toggle_button_get_active (cast(GtkToggleButton*)handle);
+    checkWidget ();
+    if ((style & (SWT.CHECK | SWT.RADIO | SWT.TOGGLE)) is 0) return false;
+    return cast(bool)OS.gtk_toggle_button_get_active (cast(GtkToggleButton*)handle);
 }
 
 /**
@@ -355,108 +355,108 @@
  * </ul>
  */
 public char[] getText () {
-	checkWidget();
-	if ((style & SWT.ARROW) !is 0) return "";
-	return text;
+    checkWidget();
+    if ((style & SWT.ARROW) !is 0) return "";
+    return text;
 }
 
 override int /*long*/ gtk_button_press_event (GtkWidget* widget, GdkEventButton* event) {
-	auto result = super.gtk_button_press_event (widget, event);
-	if (result !is 0) return result;
-	if ((style & SWT.RADIO) !is 0) selected  = getSelection ();
-	return result;
+    auto result = super.gtk_button_press_event (widget, event);
+    if (result !is 0) return result;
+    if ((style & SWT.RADIO) !is 0) selected  = getSelection ();
+    return result;
 }
 
 override int /*long*/ gtk_clicked (GtkWidget* widget) {
-	if ((style & SWT.RADIO) !is 0) {
-		if ((parent.getStyle () & SWT.NO_RADIO_GROUP) !is 0) {
-			setSelection (!selected);
-		} else {
-			selectRadio ();
-		}
-	}
-	postEvent (SWT.Selection);
-	return 0;
+    if ((style & SWT.RADIO) !is 0) {
+        if ((parent.getStyle () & SWT.NO_RADIO_GROUP) !is 0) {
+            setSelection (!selected);
+        } else {
+            selectRadio ();
+        }
+    }
+    postEvent (SWT.Selection);
+    return 0;
 }
 
 override int /*long*/ gtk_focus_in_event (GtkWidget* widget, GdkEventFocus* event) {
-	auto result = super.gtk_focus_in_event (widget, event);
-	// widget could be disposed at this point
-	if (handle is null) return 0;
-	if ((style & SWT.PUSH) !is 0 && OS.GTK_WIDGET_HAS_DEFAULT (handle)) {
-		Decorations menuShell = menuShell ();
-		menuShell.defaultButton = this;
-	}
-	return result;
+    auto result = super.gtk_focus_in_event (widget, event);
+    // widget could be disposed at this point
+    if (handle is null) return 0;
+    if ((style & SWT.PUSH) !is 0 && OS.GTK_WIDGET_HAS_DEFAULT (handle)) {
+        Decorations menuShell = menuShell ();
+        menuShell.defaultButton = this;
+    }
+    return result;
 }
 
 override int /*long*/ gtk_focus_out_event (GtkWidget* widget, GdkEventFocus* event) {
-	auto result = super.gtk_focus_out_event (widget, event);
-	// widget could be disposed at this point
-	if (handle is null) return 0;
-	if ((style & SWT.PUSH) !is 0 && !OS.GTK_WIDGET_HAS_DEFAULT (handle)) {
-		Decorations menuShell = menuShell ();
-		if (menuShell.defaultButton is this) {
-			menuShell.defaultButton = null;
-		}
-	}
-	return result;
+    auto result = super.gtk_focus_out_event (widget, event);
+    // widget could be disposed at this point
+    if (handle is null) return 0;
+    if ((style & SWT.PUSH) !is 0 && !OS.GTK_WIDGET_HAS_DEFAULT (handle)) {
+        Decorations menuShell = menuShell ();
+        if (menuShell.defaultButton is this) {
+            menuShell.defaultButton = null;
+        }
+    }
+    return result;
 }
 
 override int /*long*/ gtk_key_press_event (GtkWidget* widget, GdkEventKey* event) {
-	auto result = super.gtk_key_press_event (widget, event);
-	if (result !is 0) return result;
-	if ((style & SWT.RADIO) !is 0) selected  = getSelection ();
-	return result;
+    auto result = super.gtk_key_press_event (widget, event);
+    if (result !is 0) return result;
+    if ((style & SWT.RADIO) !is 0) selected  = getSelection ();
+    return result;
 }
 
 override void hookEvents () {
-	super.hookEvents();
-	OS.g_signal_connect_closure (handle, OS.clicked.ptr, display.closures [CLICKED], false);
-	if (labelHandle !is null) {
-		OS.g_signal_connect_closure_by_id (cast(void*)labelHandle, display.signalIds [MNEMONIC_ACTIVATE], 0, display.closures [MNEMONIC_ACTIVATE], false);
-	}
+    super.hookEvents();
+    OS.g_signal_connect_closure (handle, OS.clicked.ptr, display.closures [CLICKED], false);
+    if (labelHandle !is null) {
+        OS.g_signal_connect_closure_by_id (cast(void*)labelHandle, display.signalIds [MNEMONIC_ACTIVATE], 0, display.closures [MNEMONIC_ACTIVATE], false);
+    }
 }
 
 override bool isDescribedByLabel () {
-	return false;
+    return false;
 }
 
 alias Control.mnemonicHit mnemonicHit;
 override bool mnemonicHit (char key) {
-	if (labelHandle is null) return false;
-	bool result = super.mnemonicHit (labelHandle, key);
-	if (result) setFocus ();
-	return result;
+    if (labelHandle is null) return false;
+    bool result = super.mnemonicHit (labelHandle, key);
+    if (result) setFocus ();
+    return result;
 }
 
 alias Control.mnemonicMatch mnemonicMatch;
 override bool mnemonicMatch (char key) {
-	if (labelHandle is null) return false;
-	return mnemonicMatch (labelHandle, key);
+    if (labelHandle is null) return false;
+    return mnemonicMatch (labelHandle, key);
 }
 
 override void register () {
-	super.register ();
-	if (boxHandle !is null) display.addWidget (boxHandle, this);
-	if (labelHandle !is null) display.addWidget (labelHandle, this);
-	if (imageHandle !is null) display.addWidget (imageHandle, this);
-	if (arrowHandle !is null) display.addWidget (arrowHandle, this);
+    super.register ();
+    if (boxHandle !is null) display.addWidget (boxHandle, this);
+    if (labelHandle !is null) display.addWidget (labelHandle, this);
+    if (imageHandle !is null) display.addWidget (imageHandle, this);
+    if (arrowHandle !is null) display.addWidget (arrowHandle, this);
 }
 
 override void releaseHandle () {
-	super.releaseHandle ();
-	boxHandle = imageHandle = labelHandle = arrowHandle = null;
+    super.releaseHandle ();
+    boxHandle = imageHandle = labelHandle = arrowHandle = null;
 }
 
 override void releaseWidget () {
-	super.releaseWidget ();
-	if (groupHandle !is null) OS.g_object_unref (groupHandle);
-	groupHandle = null;
-	if (imageList !is null) imageList.dispose ();
-	imageList = null;
-	image = null;
-	text = null;
+    super.releaseWidget ();
+    if (groupHandle !is null) OS.g_object_unref (groupHandle);
+    groupHandle = null;
+    if (imageList !is null) imageList.dispose ();
+    imageList = null;
+    image = null;
+    text = null;
 }
 
 /**
@@ -477,49 +477,49 @@
  * @see #addSelectionListener
  */
 public void removeSelectionListener (SelectionListener listener) {
-	checkWidget();
-	if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
-	if (eventTable is null) return;
-	eventTable.unhook (SWT.Selection, listener);
-	eventTable.unhook (SWT.DefaultSelection,listener);
+    checkWidget();
+    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (eventTable is null) return;
+    eventTable.unhook (SWT.Selection, listener);
+    eventTable.unhook (SWT.DefaultSelection,listener);
 }
 
 override void resizeHandle (int width, int height) {
-	super.resizeHandle (width, height);
-	/*
-	* Feature in GTK, GtkCheckButton and GtkRadioButton allocate
-	* only the minimum size necessary for its child. This causes the child
-	* alignment to fail. The fix is to set the child size to the size
-	* of the button.
-	*/
-	if ((style & (SWT.CHECK | SWT.RADIO)) !is 0) {
-		OS.gtk_widget_set_size_request (boxHandle, width, -1);
-	}
+    super.resizeHandle (width, height);
+    /*
+    * Feature in GTK, GtkCheckButton and GtkRadioButton allocate
+    * only the minimum size necessary for its child. This causes the child
+    * alignment to fail. The fix is to set the child size to the size
+    * of the button.
+    */
+    if ((style & (SWT.CHECK | SWT.RADIO)) !is 0) {
+        OS.gtk_widget_set_size_request (boxHandle, width, -1);
+    }
 }
 
 void selectRadio () {
-	/*
-	* This code is intentionally commented.  When two groups
-	* of radio buttons with the same parent are separated by
-	* another control, the correct behavior should be that
-	* the two groups act independently.  This is consistent
-	* with radio tool and menu items.  The commented code
-	* implements this behavior.
-	*/
-//	int index = 0;
-//	Control [] children = parent._getChildren ();
-//	while (index < children.length && children [index] !is this) index++;
-//	int i = index - 1;
-//	while (i >= 0 && children [i].setRadioSelection (false)) --i;
-//	int j = index + 1;
-//	while (j < children.length && children [j].setRadioSelection (false)) j++;
-//	setSelection (true);
-	Control [] children = parent._getChildren ();
-	for (int i=0; i<children.length; i++) {
-		Control child = children [i];
-		if (this !is child) child.setRadioSelection (false);
-	}
-	setSelection (true);
+    /*
+    * This code is intentionally commented.  When two groups
+    * of radio buttons with the same parent are separated by
+    * another control, the correct behavior should be that
+    * the two groups act independently.  This is consistent
+    * with radio tool and menu items.  The commented code
+    * implements this behavior.
+    */
+//  int index = 0;
+//  Control [] children = parent._getChildren ();
+//  while (index < children.length && children [index] !is this) index++;
+//  int i = index - 1;
+//  while (i >= 0 && children [i].setRadioSelection (false)) --i;
+//  int j = index + 1;
+//  while (j < children.length && children [j].setRadioSelection (false)) j++;
+//  setSelection (true);
+    Control [] children = parent._getChildren ();
+    for (int i=0; i<children.length; i++) {
+        Control child = children [i];
+        if (this !is child) child.setRadioSelection (false);
+    }
+    setSelection (true);
 }
 
 /**
@@ -539,100 +539,100 @@
  * </ul>
  */
 public void setAlignment (int alignment) {
-	checkWidget ();
-	_setAlignment (alignment);
+    checkWidget ();
+    _setAlignment (alignment);
 }
 
 void _setAlignment (int alignment) {
-	if ((style & SWT.ARROW) !is 0) {
-		if ((style & (SWT.UP | SWT.DOWN | SWT.LEFT | SWT.RIGHT)) is 0) return;
-		style &= ~(SWT.UP | SWT.DOWN | SWT.LEFT | SWT.RIGHT);
-		style |= alignment & (SWT.UP | SWT.DOWN | SWT.LEFT | SWT.RIGHT);
-		int arrow_type = OS.GTK_ARROW_UP;
-		bool isRTL = (style & SWT.RIGHT_TO_LEFT) !is 0;
-		switch (alignment) {
-			case SWT.UP: arrow_type = OS.GTK_ARROW_UP; break;
-			case SWT.DOWN: arrow_type = OS.GTK_ARROW_DOWN; break;
-			case SWT.LEFT: arrow_type = isRTL ? OS.GTK_ARROW_RIGHT : OS.GTK_ARROW_LEFT; break;
-			case SWT.RIGHT: arrow_type = isRTL ? OS.GTK_ARROW_LEFT : OS.GTK_ARROW_RIGHT; break;
+    if ((style & SWT.ARROW) !is 0) {
+        if ((style & (SWT.UP | SWT.DOWN | SWT.LEFT | SWT.RIGHT)) is 0) return;
+        style &= ~(SWT.UP | SWT.DOWN | SWT.LEFT | SWT.RIGHT);
+        style |= alignment & (SWT.UP | SWT.DOWN | SWT.LEFT | SWT.RIGHT);
+        int arrow_type = OS.GTK_ARROW_UP;
+        bool isRTL = (style & SWT.RIGHT_TO_LEFT) !is 0;
+        switch (alignment) {
+            case SWT.UP: arrow_type = OS.GTK_ARROW_UP; break;
+            case SWT.DOWN: arrow_type = OS.GTK_ARROW_DOWN; break;
+            case SWT.LEFT: arrow_type = isRTL ? OS.GTK_ARROW_RIGHT : OS.GTK_ARROW_LEFT; break;
+            case SWT.RIGHT: arrow_type = isRTL ? OS.GTK_ARROW_LEFT : OS.GTK_ARROW_RIGHT; break;
             default:
-		}
-		OS.gtk_arrow_set (cast(GtkArrow*)arrowHandle, arrow_type, OS.GTK_SHADOW_OUT);
-		return;
-	}
-	if ((alignment & (SWT.LEFT | SWT.RIGHT | SWT.CENTER)) is 0) return;
-	style &= ~(SWT.LEFT | SWT.RIGHT | SWT.CENTER);
-	style |= alignment & (SWT.LEFT | SWT.RIGHT | SWT.CENTER);
-	/* Alignment not honoured when image and text are visible */
-	bool bothVisible = OS.GTK_WIDGET_VISIBLE (labelHandle) && OS.GTK_WIDGET_VISIBLE (imageHandle);
-	if (bothVisible) {
-		if ((style & (SWT.RADIO | SWT.CHECK)) !is 0) alignment = SWT.LEFT;
-		if ((style & (SWT.PUSH | SWT.TOGGLE)) !is 0) alignment = SWT.CENTER;
-	}
-	if ((alignment & SWT.LEFT) !is 0) {
-		if (bothVisible) {
-			OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, labelHandle, false, false, 0, OS.GTK_PACK_START);
-			OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, imageHandle, false, false, 0, OS.GTK_PACK_START);
-		}
-		OS.gtk_misc_set_alignment (cast(GtkMisc*)labelHandle, 0.0f, 0.5f);
-		OS.gtk_label_set_justify (cast(GtkLabel*)labelHandle, OS.GTK_JUSTIFY_LEFT);
-		OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 0.0f, 0.5f);
-		return;
-	}
-	if ((alignment & SWT.CENTER) !is 0) {
-		if (bothVisible) {
-			OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, labelHandle, true, true, 0, OS.GTK_PACK_END);
-			OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, imageHandle, true, true, 0, OS.GTK_PACK_START);
-			OS.gtk_misc_set_alignment (cast(GtkMisc*)labelHandle, 0f, 0.5f);
-			OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 1f, 0.5f);
-		} else {
-			OS.gtk_misc_set_alignment (cast(GtkMisc*)labelHandle, 0.5f, 0.5f);
-			OS.gtk_label_set_justify (cast(GtkLabel*)labelHandle, OS.GTK_JUSTIFY_CENTER);
-			OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 0.5f, 0.5f);
-		}
-		return;
-	}
-	if ((alignment & SWT.RIGHT) !is 0) {
-		if (bothVisible) {
-			OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, labelHandle, false, false, 0, OS.GTK_PACK_END);
-			OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, imageHandle, false, false, 0, OS.GTK_PACK_END);
-		}
-		OS.gtk_misc_set_alignment (cast(GtkMisc*)labelHandle, 1.0f, 0.5f);
-		OS.gtk_label_set_justify (cast(GtkLabel*)labelHandle, OS.GTK_JUSTIFY_RIGHT);
-		OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 1.0f, 0.5f);
-		return;
-	}
+        }
+        OS.gtk_arrow_set (cast(GtkArrow*)arrowHandle, arrow_type, OS.GTK_SHADOW_OUT);
+        return;
+    }
+    if ((alignment & (SWT.LEFT | SWT.RIGHT | SWT.CENTER)) is 0) return;
+    style &= ~(SWT.LEFT | SWT.RIGHT | SWT.CENTER);
+    style |= alignment & (SWT.LEFT | SWT.RIGHT | SWT.CENTER);
+    /* Alignment not honoured when image and text are visible */
+    bool bothVisible = OS.GTK_WIDGET_VISIBLE (labelHandle) && OS.GTK_WIDGET_VISIBLE (imageHandle);
+    if (bothVisible) {
+        if ((style & (SWT.RADIO | SWT.CHECK)) !is 0) alignment = SWT.LEFT;
+        if ((style & (SWT.PUSH | SWT.TOGGLE)) !is 0) alignment = SWT.CENTER;
+    }
+    if ((alignment & SWT.LEFT) !is 0) {
+        if (bothVisible) {
+            OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, labelHandle, false, false, 0, OS.GTK_PACK_START);
+            OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, imageHandle, false, false, 0, OS.GTK_PACK_START);
+        }
+        OS.gtk_misc_set_alignment (cast(GtkMisc*)labelHandle, 0.0f, 0.5f);
+        OS.gtk_label_set_justify (cast(GtkLabel*)labelHandle, OS.GTK_JUSTIFY_LEFT);
+        OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 0.0f, 0.5f);
+        return;
+    }
+    if ((alignment & SWT.CENTER) !is 0) {
+        if (bothVisible) {
+            OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, labelHandle, true, true, 0, OS.GTK_PACK_END);
+            OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, imageHandle, true, true, 0, OS.GTK_PACK_START);
+            OS.gtk_misc_set_alignment (cast(GtkMisc*)labelHandle, 0f, 0.5f);
+            OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 1f, 0.5f);
+        } else {
+            OS.gtk_misc_set_alignment (cast(GtkMisc*)labelHandle, 0.5f, 0.5f);
+            OS.gtk_label_set_justify (cast(GtkLabel*)labelHandle, OS.GTK_JUSTIFY_CENTER);
+            OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 0.5f, 0.5f);
+        }
+        return;
+    }
+    if ((alignment & SWT.RIGHT) !is 0) {
+        if (bothVisible) {
+            OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, labelHandle, false, false, 0, OS.GTK_PACK_END);
+            OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, imageHandle, false, false, 0, OS.GTK_PACK_END);
+        }
+        OS.gtk_misc_set_alignment (cast(GtkMisc*)labelHandle, 1.0f, 0.5f);
+        OS.gtk_label_set_justify (cast(GtkLabel*)labelHandle, OS.GTK_JUSTIFY_RIGHT);
+        OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 1.0f, 0.5f);
+        return;
+    }
 }
 
 alias Control.setBackgroundColor setBackgroundColor;
 override void setBackgroundColor (GdkColor* color) {
-	super.setBackgroundColor (color);
-	setBackgroundColor(fixedHandle, color);
-	if (labelHandle !is null) setBackgroundColor(labelHandle, color);
-	if (imageHandle !is null) setBackgroundColor(imageHandle, color);
+    super.setBackgroundColor (color);
+    setBackgroundColor(fixedHandle, color);
+    if (labelHandle !is null) setBackgroundColor(labelHandle, color);
+    if (imageHandle !is null) setBackgroundColor(imageHandle, color);
 }
 
 override void setFontDescription (PangoFontDescription* font) {
-	super.setFontDescription (font);
-	if (labelHandle !is null) OS.gtk_widget_modify_font (labelHandle, font);
-	if (imageHandle !is null) OS.gtk_widget_modify_font (imageHandle, font);
+    super.setFontDescription (font);
+    if (labelHandle !is null) OS.gtk_widget_modify_font (labelHandle, font);
+    if (imageHandle !is null) OS.gtk_widget_modify_font (imageHandle, font);
 }
 
 override bool setRadioSelection (bool value) {
-	if ((style & SWT.RADIO) is 0) return false;
-	if (getSelection () !is value) {
-		setSelection (value);
-		postEvent (SWT.Selection);
-	}
-	return true;
+    if ((style & SWT.RADIO) is 0) return false;
+    if (getSelection () !is value) {
+        setSelection (value);
+        postEvent (SWT.Selection);
+    }
+    return true;
 }
 
 alias Control.setForegroundColor setForegroundColor;
 override void setForegroundColor (GdkColor* color) {
-	super.setForegroundColor (color);
-	setForegroundColor (fixedHandle, color);
-	if (labelHandle !is null) setForegroundColor (labelHandle, color);
-	if (imageHandle !is null) setForegroundColor (imageHandle, color);
+    super.setForegroundColor (color);
+    setForegroundColor (fixedHandle, color);
+    if (labelHandle !is null) setForegroundColor (labelHandle, color);
+    if (imageHandle !is null) setForegroundColor (imageHandle, color);
 }
 
 /**
@@ -655,40 +655,40 @@
  * </ul>
  */
 public void setImage (Image image) {
-	checkWidget ();
-	if ((style & SWT.ARROW) !is 0) return;
-	if (imageList !is null) imageList.dispose ();
-	imageList = null;
-	if (image !is null) {
-		if (image.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
-		imageList = new ImageList ();
-		int imageIndex = imageList.add (image);
-		auto pixbuf = imageList.getPixbuf (imageIndex);
-		OS.gtk_image_set_from_pixbuf (cast(GtkImage*)imageHandle, pixbuf);
-		if (text.length is 0) OS.gtk_widget_hide (labelHandle);
-		OS.gtk_widget_show (imageHandle);
-	} else {
-		OS.gtk_image_set_from_pixbuf (cast(GtkImage*)imageHandle, null);
-		OS.gtk_widget_show (labelHandle);
-		OS.gtk_widget_hide (imageHandle);
-	}
-	this.image = image;
-	_setAlignment (style);
+    checkWidget ();
+    if ((style & SWT.ARROW) !is 0) return;
+    if (imageList !is null) imageList.dispose ();
+    imageList = null;
+    if (image !is null) {
+        if (image.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
+        imageList = new ImageList ();
+        int imageIndex = imageList.add (image);
+        auto pixbuf = imageList.getPixbuf (imageIndex);
+        OS.gtk_image_set_from_pixbuf (cast(GtkImage*)imageHandle, pixbuf);
+        if (text.length is 0) OS.gtk_widget_hide (labelHandle);
+        OS.gtk_widget_show (imageHandle);
+    } else {
+        OS.gtk_image_set_from_pixbuf (cast(GtkImage*)imageHandle, null);
+        OS.gtk_widget_show (labelHandle);
+        OS.gtk_widget_hide (imageHandle);
+    }
+    this.image = image;
+    _setAlignment (style);
 }
 
 override void setOrientation () {
-	super.setOrientation ();
-	if ((style & SWT.RIGHT_TO_LEFT) !is 0) {
-		if (labelHandle !is null) OS.gtk_widget_set_direction (labelHandle, OS.GTK_TEXT_DIR_RTL);
-		if (imageHandle !is null) OS.gtk_widget_set_direction (imageHandle, OS.GTK_TEXT_DIR_RTL);
-		if (arrowHandle !is null) {
-			switch (style & (SWT.LEFT | SWT.RIGHT)) {
-				case SWT.LEFT: OS.gtk_arrow_set (cast(GtkArrow*)arrowHandle, OS.GTK_ARROW_RIGHT, OS.GTK_SHADOW_OUT); break;
-				case SWT.RIGHT: OS.gtk_arrow_set (cast(GtkArrow*)arrowHandle, OS.GTK_ARROW_LEFT, OS.GTK_SHADOW_OUT); break;
+    super.setOrientation ();
+    if ((style & SWT.RIGHT_TO_LEFT) !is 0) {
+        if (labelHandle !is null) OS.gtk_widget_set_direction (labelHandle, OS.GTK_TEXT_DIR_RTL);
+        if (imageHandle !is null) OS.gtk_widget_set_direction (imageHandle, OS.GTK_TEXT_DIR_RTL);
+        if (arrowHandle !is null) {
+            switch (style & (SWT.LEFT | SWT.RIGHT)) {
+                case SWT.LEFT: OS.gtk_arrow_set (cast(GtkArrow*)arrowHandle, OS.GTK_ARROW_RIGHT, OS.GTK_SHADOW_OUT); break;
+                case SWT.RIGHT: OS.gtk_arrow_set (cast(GtkArrow*)arrowHandle, OS.GTK_ARROW_LEFT, OS.GTK_SHADOW_OUT); break;
                 default:
-			}
-		}
-	}
+            }
+        }
+    }
 }
 
 /**
@@ -708,12 +708,12 @@
  * </ul>
  */
 public void setSelection (bool selected) {
-	checkWidget();
-	if ((style & (SWT.CHECK | SWT.RADIO | SWT.TOGGLE)) is 0) return;
-	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)CLICKED);
-	OS.gtk_toggle_button_set_active (cast(GtkToggleButton*)handle, selected);
-	if ((style & SWT.RADIO) !is 0) OS.gtk_toggle_button_set_active (cast(GtkToggleButton*)groupHandle, !selected);
-	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)CLICKED);
+    checkWidget();
+    if ((style & (SWT.CHECK | SWT.RADIO | SWT.TOGGLE)) is 0) return;
+    OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)CLICKED);
+    OS.gtk_toggle_button_set_active (cast(GtkToggleButton*)handle, selected);
+    if ((style & SWT.RADIO) !is 0) OS.gtk_toggle_button_set_active (cast(GtkToggleButton*)groupHandle, !selected);
+    OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)CLICKED);
 }
 
 /**
@@ -748,29 +748,29 @@
  * </ul>
  */
 public void setText (char[] string) {
-	checkWidget ();
-	if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
-	if ((style & SWT.ARROW) !is 0) return;
-	text = string;
-	char [] chars = fixMnemonic (string);
-	OS.gtk_label_set_text_with_mnemonic (cast(GtkLabel*)labelHandle, toStringz(chars));
-	if (image is null) OS.gtk_widget_hide (imageHandle);
-	OS.gtk_widget_show (labelHandle);
-	_setAlignment (style);
+    checkWidget ();
+    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if ((style & SWT.ARROW) !is 0) return;
+    text = string;
+    char [] chars = fixMnemonic (string);
+    OS.gtk_label_set_text_with_mnemonic (cast(GtkLabel*)labelHandle, toStringz(chars));
+    if (image is null) OS.gtk_widget_hide (imageHandle);
+    OS.gtk_widget_show (labelHandle);
+    _setAlignment (style);
 }
 
 override void showWidget () {
-	super.showWidget ();
-	if (boxHandle !is null) OS.gtk_widget_show (boxHandle);
-	if (labelHandle !is null) OS.gtk_widget_show (labelHandle);
-	if (arrowHandle !is null) OS.gtk_widget_show (arrowHandle);
+    super.showWidget ();
+    if (boxHandle !is null) OS.gtk_widget_show (boxHandle);
+    if (labelHandle !is null) OS.gtk_widget_show (labelHandle);
+    if (arrowHandle !is null) OS.gtk_widget_show (arrowHandle);
 }
 
 alias Control.traversalCode traversalCode;
 override int traversalCode (int key, GdkEventKey* event) {
-	int code = super.traversalCode (key, event);
-	if ((style & SWT.RADIO) !is 0) code |= SWT.TRAVERSE_ARROW_NEXT | SWT.TRAVERSE_ARROW_PREVIOUS;
-	return code;
+    int code = super.traversalCode (key, event);
+    if ((style & SWT.RADIO) !is 0) code |= SWT.TRAVERSE_ARROW_NEXT | SWT.TRAVERSE_ARROW_PREVIOUS;
+    return code;
 }
 
 }