--- a/dwt/widgets/Control.d	Sat Feb 09 21:22:47 2008 +0100
+++ b/dwt/widgets/Control.d	Sun Feb 10 04:19:19 2008 +0100
@@ -181,10 +181,10 @@
         if (control.setFocus ()) return;
     }
     shell.setSavedFocus (focusControl);
-    auto focusHandle = shell.vboxHandle;
-    OS.GTK_WIDGET_SET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
-    OS.gtk_widget_grab_focus (focusHandle);
-    OS.GTK_WIDGET_UNSET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
+    auto focusHandle_ = shell.vboxHandle;
+    OS.GTK_WIDGET_SET_FLAGS (focusHandle_, OS.GTK_CAN_FOCUS);
+    OS.gtk_widget_grab_focus (focusHandle_);
+    OS.GTK_WIDGET_UNSET_FLAGS (focusHandle_, OS.GTK_CAN_FOCUS);
 }
 
 public void fixStyle () {
@@ -226,16 +226,16 @@
 
 override void hookEvents () {
     /* Connect the keyboard signals */
-    auto focusHandle = focusHandle ();
+    auto focusHandle_ = focusHandle ();
     int focusMask = OS.GDK_KEY_PRESS_MASK | OS.GDK_KEY_RELEASE_MASK | OS.GDK_FOCUS_CHANGE_MASK;
-    OS.gtk_widget_add_events (focusHandle, focusMask);
-    OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [POPUP_MENU], 0, display.closures [POPUP_MENU], false);
-    OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [SHOW_HELP], 0, display.closures [SHOW_HELP], false);
-    OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [KEY_PRESS_EVENT], 0, display.closures [KEY_PRESS_EVENT], false);
-    OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [KEY_RELEASE_EVENT], 0, display.closures [KEY_RELEASE_EVENT], false);
-    OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [FOCUS], 0, display.closures [FOCUS], false);
-    OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [FOCUS_IN_EVENT], 0, display.closures [FOCUS_IN_EVENT], false);
-    OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [FOCUS_OUT_EVENT], 0, display.closures [FOCUS_OUT_EVENT], false);
+    OS.gtk_widget_add_events (focusHandle_, focusMask);
+    OS.g_signal_connect_closure_by_id (focusHandle_, display.signalIds [POPUP_MENU], 0, display.closures [POPUP_MENU], false);
+    OS.g_signal_connect_closure_by_id (focusHandle_, display.signalIds [SHOW_HELP], 0, display.closures [SHOW_HELP], false);
+    OS.g_signal_connect_closure_by_id (focusHandle_, display.signalIds [KEY_PRESS_EVENT], 0, display.closures [KEY_PRESS_EVENT], false);
+    OS.g_signal_connect_closure_by_id (focusHandle_, display.signalIds [KEY_RELEASE_EVENT], 0, display.closures [KEY_RELEASE_EVENT], false);
+    OS.g_signal_connect_closure_by_id (focusHandle_, display.signalIds [FOCUS], 0, display.closures [FOCUS], false);
+    OS.g_signal_connect_closure_by_id (focusHandle_, display.signalIds [FOCUS_IN_EVENT], 0, display.closures [FOCUS_IN_EVENT], false);
+    OS.g_signal_connect_closure_by_id (focusHandle_, display.signalIds [FOCUS_OUT_EVENT], 0, display.closures [FOCUS_OUT_EVENT], false);
 
     /* Connect the mouse signals */
     auto eventHandle = eventHandle ();
@@ -271,8 +271,8 @@
 
     /* Connect the event_after signal for both key and mouse */
     OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [EVENT_AFTER], 0, display.closures [EVENT_AFTER], false);
-    if (focusHandle !is eventHandle) {
-        OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [EVENT_AFTER], 0, display.closures [EVENT_AFTER], false);
+    if (focusHandle_ !is eventHandle) {
+        OS.g_signal_connect_closure_by_id (focusHandle_, display.signalIds [EVENT_AFTER], 0, display.closures [EVENT_AFTER], false);
     }
 
     /* Connect the paint signal */
@@ -1960,15 +1960,15 @@
     return forceFocus (focusHandle ());
 }
 
-bool forceFocus (GtkWidget* focusHandle) {
+bool forceFocus (GtkWidget* focusHandle_) {
     /* When the control is zero sized it must be realized */
-    OS.gtk_widget_realize (focusHandle);
-    OS.gtk_widget_grab_focus (focusHandle);
+    OS.gtk_widget_realize (focusHandle_);
+    OS.gtk_widget_grab_focus (focusHandle_);
     Shell shell = getShell ();
     auto shellHandle = shell.shellHandle;
     auto handle = OS.gtk_window_get_focus (cast(GtkWindow*)shellHandle);
     while (handle !is null) {
-        if (handle is focusHandle) return true;
+        if (handle is focusHandle_) return true;
         Widget widget = display.getWidget (handle);
         if (widget !is null && (null !is cast(Control)widget)) {
             return widget is this;
@@ -2019,18 +2019,18 @@
 }
 
 GdkColor* getBgColor () {
-    auto fontHandle = fontHandle ();
-    OS.gtk_widget_realize (fontHandle);
+    auto fontHandle_ = fontHandle ();
+    OS.gtk_widget_realize (fontHandle_);
     GdkColor* color = new GdkColor ();
-    OS.gtk_style_get_bg (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
+    OS.gtk_style_get_bg (OS.gtk_widget_get_style (fontHandle_), OS.GTK_STATE_NORMAL, color);
     return color;
 }
 
 GdkColor* getBaseColor () {
-    auto fontHandle = fontHandle ();
-    OS.gtk_widget_realize (fontHandle);
+    auto fontHandle_ = fontHandle ();
+    OS.gtk_widget_realize (fontHandle_);
     GdkColor* color = new GdkColor ();
-    OS.gtk_style_get_base (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
+    OS.gtk_style_get_base (OS.gtk_widget_get_style (fontHandle_), OS.GTK_STATE_NORMAL, color);
     return color;
 }
 
@@ -2123,9 +2123,9 @@
 }
 
 PangoFontDescription* getFontDescription () {
-    auto fontHandle = fontHandle ();
-    OS.gtk_widget_realize (fontHandle);
-    return OS.gtk_style_get_font_desc (OS.gtk_widget_get_style (fontHandle));
+    auto fontHandle_ = fontHandle ();
+    OS.gtk_widget_realize (fontHandle_);
+    return OS.gtk_style_get_font_desc (OS.gtk_widget_get_style (fontHandle_));
 }
 
 /**
@@ -2148,10 +2148,10 @@
 }
 
 GdkColor* getFgColor () {
-    auto fontHandle = fontHandle ();
-    OS.gtk_widget_realize (fontHandle);
+    auto fontHandle_ = fontHandle ();
+    OS.gtk_widget_realize (fontHandle_);
     GdkColor* color = new GdkColor ();
-    OS.gtk_style_get_fg (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
+    OS.gtk_style_get_fg (OS.gtk_widget_get_style (fontHandle_), OS.GTK_STATE_NORMAL, color);
     return color;
 }
 
@@ -2160,10 +2160,10 @@
 }
 
 GdkColor* getTextColor () {
-    auto fontHandle = fontHandle ();
-    OS.gtk_widget_realize (fontHandle);
+    auto fontHandle_ = fontHandle ();
+    OS.gtk_widget_realize (fontHandle_);
     GdkColor* color = new GdkColor ();
-    OS.gtk_style_get_text (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
+    OS.gtk_style_get_text (OS.gtk_widget_get_style (fontHandle_), OS.GTK_STATE_NORMAL, color);
     return color;
 }
 
@@ -2418,7 +2418,7 @@
 }
 
 override int /*long*/ gtk_commit (GtkIMContext* imcontext, char* text) {
-    char [] chars = fromUtf8z( text );
+    char [] chars = fromStringz( text );
     if (chars.length is 0) return 0;
     sendIMKeyEvent (DWT.KeyDown, null, chars);
     return 0;
@@ -2593,10 +2593,10 @@
         GdkEventKey* keyEvent = cast(GdkEventKey*)eventPtr;
         if (keyEvent.type is OS.GDK_KEY_PRESS) {
             Control focusControl = display.getFocusControl ();
-            auto focusHandle = focusControl !is null ? focusControl.focusHandle () : null;
-            if (focusHandle !is null) {
+            auto focusHandle_ = focusControl !is null ? focusControl.focusHandle () : null;
+            if (focusHandle_ !is null) {
                 display.mnemonicControl = this;
-                OS.gtk_widget_event (focusHandle, eventPtr);
+                OS.gtk_widget_event (focusHandle_, eventPtr);
                 display.mnemonicControl = null;
             }
             result = 1;