Merge remote-tracking branch 'upstream/V5_stable' into lazarus_v5

# Conflicts:
#	Demos/Objects/MVCTypes.pas
#	Source/VirtualTrees.pas

Author: blikblum

CHANGES.txt

@@ -1,4 +1,19 @@
-V5.5.1: (planned for 13 Oct 2014)
+V5.5.4:
+* Fixed #506: Autosort is being triggered at design-time
+
+V5.5.3: (08 Jan 2015)
+  * Fixed issue #495: Incorrect text vertical align when changing font in OnPaintText
+  * Fixed Issue #496: Access violation at VT destroy
+  * Fixed issue #498: Node totalheight not initialized properly when adding new node and using toVariableNodeHeight
+        
+V5.5.2: (10 Nov 2014)
+  * Various improvements regarding code style
+  * Implemented #471: Added emVisibleDueToExpansion and emSelected to TVTExportMode  
+  * Fixed issue #488: XE7 packages should depend on one another and use suffix 21
+  * Fixed issue #462: Undo r636, make VirtualTreesD require VirtualTreesR again
+  * Fixed issue #489 XE2 compiler switch error
+       
+V5.5.1: (13 Oct 2014)
   * Fixed issue #479: The style hooks for the VCL styles are now registered for TVirtualStringTree and TVirtualDrawTree instead of TBaseVirtualTree, which makes it easier to use own style hooks in derived classes.  
   * Partial fix for issue #478: The standard VCL property StyleElemets (public in TControl in RAD Studio XE3 and higher) is now supported and published for TVirtualStringTree and TVirtualDrawTree (XE3 and higher). This means you can define if the font and the backgrounbd color is taken from the VCL style or the control's properties. Leaving out seBorder is not yet working well, more work will be necessary.
   *  Fixed issue #473: Return type of GetUtilityImages should be TCustomImageList

Demos/Objects/MVCTypes.pas

@@ -808,7 +808,7 @@ function TMVCTreeView.InternalData(Node: PVirtualNode): Pointer;
   if (Node = RootNode) or (Node = nil) then
     Result := nil
   else
-    Result := PChar(Node) + FInternalDataOffset;
+    Result := PByte(Node) + FInternalDataOffset;
 end;
 
 function TMVCTreeView.InternalDataSize: Cardinal;

INSTALL.txt

@@ -1,13 +1,13 @@
-Supported Delphi version: Delphi 7, Delphi 2006 - XE, RAD Studio XE2
-Supported Windows Versions: XP, 2003, Vista, 2008, 7, 2008R2
+Supported Delphi version: Delphi 7, Delphi 2006 - XE, RAD Studio XE2 - XE7
+Supported Windows Versions: XP and higher
 
 
 The former installer is no longer maintained, but installation is quite easy:
 Extract the entire(!) ZIP file and follow the instzructions below for your 
 Delphi / RAD Studio version.
 
 
-Delphi / RAD Studio XE - XE6 Installation
+Delphi / RAD Studio XE - XE7 Installation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1. Open the project group "Packages\RAD Studio XE*\RAD Studio XE*.groupproj"
 2. Right click on "VirtualTreesD*.bpl" and click "Install"

Source/VirtualTrees.pas

@@ -103,7 +103,7 @@ interface
 
   VTMajorVersion = 5;
   VTMinorVersion = 5;
-  VTReleaseVersion = 1;
+  VTReleaseVersion = 3;
   VTTreeStreamVersion = 2;
   VTHeaderStreamVersion = 6;    // The header needs an own stream version to indicate changes only relevant to the header.
 
@@ -8160,6 +8160,8 @@ procedure TVirtualTreeColumns.HandleClick(P: TPoint; Button: TMouseButton; Force
   NewClickIndex: Integer;
 
 begin
+  if (csDesigning in Header.Treeview.ComponentState) then
+    exit;
   // Convert vertical position to local coordinates.
   //lclheader
   //Inc(P.Y, FHeader.FHeight);
@@ -14294,6 +14296,7 @@ procedure TBaseVirtualTree.SetChildCount(Node: PVirtualNode; NewChildCount: Card
               lNodeHeight := Child.NodeHeight;
               DoMeasureItem(Canvas, Child, lNodeHeight);
               Child.NodeHeight := lNodeHeight;
+              Child.TotalHeight := lNodeHeight;
             end;
             Inc(NewHeight, Child.NodeHeight);
           end;
@@ -26318,8 +26321,10 @@ procedure TBaseVirtualTree.EndUpdate;
       end;
     end;
 
-    if FUpdateCount = 0 then
-      DoUpdating(usEnd)
+    if FUpdateCount = 0 then begin
+      DoUpdating(usEnd);
+      EnsureNodeSelected();
+    end
     else
       DoUpdating(usUpdate);
   end;
@@ -32994,8 +32999,8 @@ procedure TCustomVirtualStringTree.PaintNormalText(var PaintInfo: TVTPaintInfo;
     //       for 9x/Me.
     if vsMultiline in Node.States then
     begin
-      Height := ComputeNodeHeight(Canvas, Node, Column);
       DoPaintText(Node, Canvas, Column, ttNormal);
+      Height := ComputeNodeHeight(Canvas, Node, Column);
       // Disabled node color overrides all other variants.
       if (vsDisabled in Node.States) or not Enabled then
         Canvas.Font.Color := FColors.DisabledColor;