--- a/Tools__CodeView2.st	Fri Feb 21 18:37:25 2014 +0100
+++ b/Tools__CodeView2.st	Fri Feb 21 22:51:51 2014 +0100
@@ -2485,8 +2485,8 @@
 invalidateAcceptCancelBar
     | w |
 
-    (widthAcceptCancel ? 0) == 0 ifTrue:[ ^ self ].
-    w := ((self paddingLeft) + (widthAcceptCancel ? 0)) + 1.
+    w := self acceptCancelRight.
+    w == 0 ifTrue:[ ^ self ].
     self
         invalidateX: 0
                   y: 0
@@ -2494,6 +2494,7 @@
              height: self height.
 
     "Created: / 10-09-2013 / 03:07:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 21-02-2014 / 21:50:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 invalidateDeviceRectangle:aRectangle repairNow:doRepairNow
@@ -2516,12 +2517,13 @@
 
 redrawAcceptCancelBarX: x y: y width:w height:h
 
-    | rw acceptBottom cancelBottom |
-
-    x > ((self paddingLeft) + (widthAcceptCancel ? 0)) ifTrue:[
+    | rw acceptRight acceptBottom cancelBottom |
+
+    acceptRight := self acceptCancelRight.
+    x >= acceptRight ifTrue:[
         ^self.
     ].
-    rw := ((x + w) min: (self paddingLeft + (widthAcceptCancel ? 0))) - x.
+    rw := ((x + w) min: acceptRight) - x.
 
 
     textView reallyModified ifFalse:[
@@ -2542,7 +2544,7 @@
     ]
 
     "Created: / 07-10-2011 / 19:44:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 10-09-2013 / 03:03:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 21-02-2014 / 21:49:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 redrawBackgroundX:x y:y width:w height:h
@@ -3859,15 +3861,15 @@
 !CodeView2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.135 2014-02-21 17:18:19 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.136 2014-02-21 21:51:51 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.135 2014-02-21 17:18:19 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.136 2014-02-21 21:51:51 vrany Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__CodeView2.st,v 1.135 2014-02-21 17:18:19 vrany Exp $'
+    ^ '$Id: Tools__CodeView2.st,v 1.136 2014-02-21 21:51:51 vrany Exp $'
 ! !