Examples: Fix merged_cells grid example crashing if OnMergeCells event handler needs cell content (Cells[]).

git-svn-id: trunk@53086 -

examples/gridexamples/merged_cells/mainform.pas

@@ -48,6 +48,7 @@ begin
   Grid.Cells[3, 1] := 'abc';
   Grid.Cells[4, 1] := 'bold';
   Grid.Cells[5, 1] := 'Image';
+  Grid.Cells[2, 7] := 'Image';
   Grid.Cells[2, 3] := 'This is a long text' + LineEnding + 'with line break.';
   Grid.Cells[0, 2] := 'Vertical text';
   Grid.Cells[0, 6] := 'Centered';
@@ -152,6 +153,15 @@ begin
   if (ACol = 0) and (ARow in [2..5]) then begin
     ATop := 2;
     ABottom := 5;
+  end else
+  // Merge the next two cells adjacent to cell with text 'Image'
+  if (ACol > 1) and (Grid.Cells[ACol-1, ARow] = 'Image') then begin
+    ALeft := ACol;
+    ARight := ALeft + 1;
+  end else
+  if (ACol > 2) and (Grid.Cells[ACol-2, ARow] = 'Image') then begin
+    ALeft := ACol - 1;
+    ARight := ALeft + 1;
   end;
 end;
 

examples/gridexamples/merged_cells/mcgrid.pas

@@ -19,6 +19,7 @@ type
 
   TMCStringGrid = class(TStringGrid)
   private
+    FMergeLock: Integer;
     FOnMergeCells: TMergeCellsEvent;
     FOnDrawCellText: TDrawCellTextEvent;
   protected
@@ -114,7 +115,7 @@ function TMCStringGrid.GetCells(ACol, ARow: Integer): String;
 var
   L, T, R, B: Integer;
 begin
-  if IsMerged(ACol, ARow, L, T, R, B) then
+  if (FMergeLock = 0) and IsMerged(ACol, ARow, L, T, R, B) then
     Result := inherited GetCells(L, T)
   else
     Result := inherited GetCells(ACol, ARow);
@@ -145,6 +146,7 @@ begin
   Result := false;
   if not (goColSpanning in Options) then exit;
   if not Assigned(FOnMergeCells) then exit;
+  inc(FMergeLock);
 
   ALeft := ACol;
   ARight := ACol;
@@ -162,6 +164,7 @@ begin
     ABottom := tmp;
   end;
   Result := (ALeft <> ARight) or (ATop <> ABottom);
+  dec(FMergeLock);
 end;
 
 { Repaints the entire grid after the selection is moved because normally only

examples/gridexamples/merged_cells/mergedcells_project.lpi

@@ -9,7 +9,6 @@
       <Title Value="mergedcells_project"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
-      <Icon Value="0"/>
     </General>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>