diff --git a/lcl/controls.pp b/lcl/controls.pp
index b1749f5d8b..75252f6efb 100644
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@@ -578,7 +578,7 @@ type
     FHostDockSite : TWinControl;
     FIsControl : Boolean;
     fLastAlignedBounds: TRect;
-    FLastChangeboundRect: TRect;
+    FLastChangebounds: TRect;
     FLastDoChangeBounds: TRect;
     FLastResizeClientHeight: integer;
     FLastResizeClientWidth: integer;
@@ -1632,6 +1632,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.139  2003/08/04 08:43:20  mattias
+  fixed breaking circle in ChangeBounds
+
   Revision 1.138  2003/07/30 13:03:44  mattias
   replaced label with memo
 
diff --git a/lcl/dirsel.pas b/lcl/dirsel.pas
index 7bcaeafabc..2a9f0dfe62 100644
--- a/lcl/dirsel.pas
+++ b/lcl/dirsel.pas
@@ -83,7 +83,6 @@ function HasSubDirs(const Dir: string; IgnoreHidden: boolean): Boolean;
 var
   //Result of FindFirst, FindNext
   FileInfo: TSearchRec;
-  i: integer;
   FCurrentDir: string;
 begin
  //Assume No
@@ -92,7 +91,6 @@ begin
  begin
    FCurrentDir:= Dir;
    FileCtrl.AppendPathDelim(FCurrentDir);
-   i:= length(Dir);
    FCurrentDir:= Dir + FindMask;
    Try
      if SysUtils.FindFirst(FCurrentDir, (faAnyFile),FileInfo)=0 then
diff --git a/lcl/include/control.inc b/lcl/include/control.inc
index 4cc862b956..4bb63a5508 100644
--- a/lcl/include/control.inc
+++ b/lcl/include/control.inc
@@ -128,13 +128,12 @@ End;
 procedure TControl.ChangeBounds(ALeft, ATop, AWidth, AHeight : integer);
 var
   SizeChanged, PosChanged : boolean;
-  ARight: Integer;
-  ABottom: Integer;
   OldLeft: Integer;
   OldTop: Integer;
   OldWidth: Integer;
   OldHeight: Integer;
   CurBounds: TRect;
+  NewBounds: TRect;
 
   function UpdatePosSizeChanged: boolean;
   begin
@@ -151,14 +150,9 @@ begin
   DoConstrainedResize(AWidth, AHeight);
 
   // check, if we are already processing this bound change
-  ARight:=ALeft+AWidth;
-  ABottom:=ATop+AHeight;
-  if (ALeft=FLastChangeboundRect.Left)
-  and (ATop=FLastChangeboundRect.Top)
-  and (ARight=FLastChangeboundRect.Right)
-  and (ABottom=FLastChangeboundRect.Bottom)
-  then exit;
-  FLastChangeboundRect:=Rect(ALeft,ATop,AWidth,AHeight);
+  NewBounds:=Bounds(ALeft,ATop,AWidth,AHeight);
+  if CompareRect(@FLastChangebounds,@NewBounds) then exit;
+  FLastChangebounds:=NewBounds;
 
   OldLeft:=FLeft;
   OldTop:=FTop;
@@ -2462,6 +2456,9 @@ end;
 
 { =============================================================================
   $Log$
+  Revision 1.145  2003/08/04 08:43:20  mattias
+  fixed breaking circle in ChangeBounds
+
   Revision 1.144  2003/07/31 19:56:50  mattias
   fixed double messages SETLabel