Index: virtualstringtree.pas
===================================================================
--- virtualstringtree.pas	(revision 225)
+++ virtualstringtree.pas	(working copy)
@@ -1570,7 +1570,7 @@
   R: TRect;
   S: WideString;
   DrawFormat: Cardinal;
-  BidiMode: TBidiMode;
+  aBidiMode: TBidiMode;
 //  xAlignment: TAlignment;
   PaintInfo: TVTPaintInfo;
   Dummy: TColumnIndex;
@@ -1584,16 +1584,16 @@
     DrawFormat := DT_TOP or DT_NOPREFIX or DT_CALCRECT or DT_WORDBREAK;
     if Column <= NoColumn then
     begin
-//b      BidiMode := Self.BidiMode;
+//b      aBidiMode := Self.BidiMode;
 //      xAlignment := Self.Alignment;
     end
     else
     begin
-//b      BidiMode := Header.Columns[Column].BidiMode;
+//b      aBidiMode := Header.Columns[Column].BidiMode;
 //      xAlignment := Header.Columns[Column].Alignment;
     end;
 
-//b    if BidiMode <> bdLeftToRight then
+//b    if aBidiMode <> bdLeftToRight then
 //b      ChangeBidiModeAlignment(Alignment);
 
     // Allow for autospanning.
@@ -1603,7 +1603,7 @@
     PaintInfo.CellRect := R;
     AdjustPaintCellRect(PaintInfo, Dummy);
 
-//b    if BidiMode <> bdLeftToRight then
+//b    if aBidiMode <> bdLeftToRight then
 //b      DrawFormat := DrawFormat or DT_RIGHT or DT_RTLREADING
 //b    else
       DrawFormat := DrawFormat or DT_LEFT;
Index: virtualtrees.pas
===================================================================
--- virtualtrees.pas	(revision 225)
+++ virtualtrees.pas	(working copy)
@@ -1693,7 +1693,7 @@
     FOnCompareNodes: TVTCompareEvent;            // used during sort
 
     procedure AdjustCoordinatesByIndent(var PaintInfo: TVTPaintInfo; Indent: Integer);
-    procedure AdjustImageBorder(Images: TCustomImageList; BidiMode: TBidiMode; VAlign: Integer; var R: TRect;
+    procedure AdjustImageBorder(Images: TCustomImageList; aBidiMode: TBidiMode; VAlign: Integer; var R: TRect;
       var ImageInfo: TVTImageInfo);
     procedure AdjustTotalCount(Node: PVirtualNode; Value: Integer; relative: Boolean = False);
     procedure AdjustTotalHeight(Node: PVirtualNode; Value: Integer; relative: Boolean = False);
@@ -2006,7 +2006,7 @@
     procedure PaintImage(const PaintInfo: TVTPaintInfo; ImageInfoIndex: TVTImageInfoIndex; Images: TCustomImageList;
       DoOverlay: Boolean); virtual;
     procedure PaintNodeButton(xCanvas: TCanvas; Node: PVirtualNode; const R: TRect; ButtonX, ButtonY: Integer;
-      BidiMode: TBiDiMode); virtual;
+      aBidiMode: TBiDiMode); virtual;
     procedure PaintTreeLines(const PaintInfo: TVTPaintInfo; VAlignment, IndentSize: Integer;
       LineImage: TLineImage); virtual;
     procedure PaintSelectionRectangle(Target: TCanvas; WindowOrgX: Integer; const SelectionRect: TRect;
@@ -9894,7 +9894,7 @@
 
 //----------------------------------------------------------------------------------------------------------------------
 
-procedure TBaseVirtualTree.AdjustImageBorder(Images: TCustomImageList; BidiMode: TBidiMode; VAlign: Integer; var R: TRect; 
+procedure TBaseVirtualTree.AdjustImageBorder(Images: TCustomImageList; aBidiMode: TBidiMode; VAlign: Integer; var R: TRect;
   var ImageInfo: TVTImageInfo);
 
 // Depending on the width of the image list as well as the given bidi mode R must be adjusted.
@@ -19259,7 +19259,7 @@
 //----------------------------------------------------------------------------------------------------------------------
 
 procedure TBaseVirtualTree.PaintNodeButton(xCanvas: TCanvas; Node: PVirtualNode; const R: TRect; ButtonX,
-  ButtonY: Integer; BidiMode: TBiDiMode);
+  ButtonY: Integer; aBidiMode: TBiDiMode);
 
 var
   Bitmap: TBitmap;