--- a/dwt/widgets/Caret.d	Sun Sep 14 23:32:29 2008 +0200
+++ b/dwt/widgets/Caret.d	Tue Oct 07 12:56:18 2008 +0200
@@ -44,7 +44,7 @@
 public class Caret : Widget {
     Canvas parent;
     int x, y, width, height;
-    bool isVisible, isShowing;
+    bool isVisible_, isShowing;
     int blinkRate;
     Image image;
     Font font;
@@ -86,7 +86,7 @@
 }
 
 bool blinkCaret () {
-    if (!isVisible) return true;
+    if (!isVisible_) return true;
     if (!isShowing) return showCaret ();
     if (blinkRate is 0) return true;
     return hideCaret ();
@@ -95,7 +95,7 @@
 void createWidget () {
     super.createWidget ();
     blinkRate = display.getCaretBlinkTime ();
-    isVisible = true;
+    isVisible_ = true;
     if (parent.getCaret () is null) {
         parent.setCaret (this);
     }
@@ -248,7 +248,7 @@
  */
 public bool getVisible () {
     checkWidget();
-    return isVisible;
+    return isVisible_;
 }
 
 bool hideCaret () {
@@ -273,7 +273,7 @@
  */
 public bool isVisible () {
     checkWidget();
-    return isVisible && parent.isVisible () && parent.hasFocus ();
+    return isVisible_ && parent.isVisible () && parent.hasFocus ();
 }
 
 bool isFocusCaret () {
@@ -283,7 +283,7 @@
 void killFocus () {
     if (display.currentCaret !is this) return;
     display.setCurrentCaret (null);
-    if (isVisible) hideCaret ();
+    if (isVisible_) hideCaret ();
 }
 
 void releaseParent () {
@@ -321,12 +321,12 @@
     checkWidget();
     if (this.x is x && this.y is y && this.width is width && this.height is height) return;
     bool isFocus = isFocusCaret ();
-    if (isFocus && isVisible) hideCaret ();
+    if (isFocus && isVisible_) hideCaret ();
     this.x = x;
     this.y = y;
     this.width = width;
     this.height = height;
-    if (isFocus && isVisible) showCaret ();
+    if (isFocus && isVisible_) showCaret ();
 }
 
 /**
@@ -351,7 +351,7 @@
 void setFocus () {
     if (display.currentCaret is this) return;
     display.setCurrentCaret (this);
-    if (isVisible) showCaret ();
+    if (isVisible_) showCaret ();
 }
 
 /**
@@ -398,9 +398,9 @@
         error (DWT.ERROR_INVALID_ARGUMENT);
     }
     bool isFocus = isFocusCaret ();
-    if (isFocus && isVisible) hideCaret ();
+    if (isFocus && isVisible_) hideCaret ();
     this.image = image;
-    if (isFocus && isVisible) showCaret ();
+    if (isFocus && isVisible_) showCaret ();
 }
 
 /**
@@ -492,10 +492,10 @@
  */
 public void setVisible (bool visible) {
     checkWidget();
-    if (visible is isVisible) return;
-    isVisible = visible;
+    if (visible is isVisible_) return;
+    isVisible_ = visible;
     if (!isFocusCaret ()) return;
-    if (isVisible) {
+    if (isVisible_) {
         showCaret ();
     } else {
         hideCaret ();