Merged revision(s) 52912 #b1262a951e from trunk:

Grids: fix wrong result of TCustomGrid.GetEditorBorderStyle when FEditor = FPickListEditor. Issue #0028782.
........

git-svn-id: branches/fixes_1_6@52923 -
This commit is contained in:
maxim 2016-09-06 22:25:57 +00:00
parent 6b1eeb12fc
commit 495bbde601

View File

@ -5093,10 +5093,10 @@ end;
function TCustomGrid.GetEditorBorderStyle: TBorderStyle;
begin
result := bsSingle;
if FEditor = FstringEditor then
if FEditor = FStringEditor then
Result := FStringEditor.BorderStyle
else if FEditor = FPickListEditor then
Result := FStringEditor.BorderStyle;
Result := FPickListEditor.BorderStyle;
end;
function TCustomGrid.GetBorderWidth: Integer;