paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 07:49:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL, grids, fix cbsEllipsis editor not allowing focus change, issue #25824

Browse Source 
git-svn-id: trunk@44415 -
This commit is contained in:
jesus 2014-03-13 00:48:43 +00:00
parent 156692fdcd
commit 564b4228a3
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lcl/grids.pas
View File

@ -297,6 +297,7 @@ type
destructor Destroy; override; destructor Destroy; override;
procedure AddEditor(aEditor: TWinControl; aAlign: TAlign; ActiveCtrl:boolean); procedure AddEditor(aEditor: TWinControl; aAlign: TAlign; ActiveCtrl:boolean);
procedure SetFocus; override; procedure SetFocus; override;
function Focused: Boolean; override;
property MaxLength: Integer read GetMaxLength write SetMaxLength; property MaxLength: Integer read GetMaxLength write SetMaxLength;
property ActiveControl: TWinControl read GetActiveControl; property ActiveControl: TWinControl read GetActiveControl;
end; end;
@ -12088,6 +12089,19 @@ begin
inherited SetFocus; inherited SetFocus;
end; end;
function TCompositeCellEditor.Focused: Boolean;
var
i: Integer;
begin
Result:=inherited Focused;
if not result then
for i:=0 to Length(Feditors)-1 do
if (FEditors[i].Editor<>nil) and (FEditors[i].Editor.Focused) then begin
result := true;
break;
end;
end;
procedure TCompositeCellEditor.WndProc(var TheMessage: TLMessage); procedure TCompositeCellEditor.WndProc(var TheMessage: TLMessage);
begin begin
with TheMessage do with TheMessage do