paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-23 18:30:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Win32,WinCE,Carbon: fixed saving checkbox state inside TCheckListBox when moving items. issue #20589

Browse Source 
git-svn-id: trunk@33172 -
This commit is contained in:
zeljko 2011-10-30 12:21:35 +00:00
parent b2cfc29c58
commit bec12a3edc
5 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lcl/interfaces/carbon/carbonstrings.pp
View File

@ -67,6 +67,7 @@ type
constructor Create(AOwner: TCarbonListBox);
procedure Clear; override;
procedure Delete(Index: Integer); override;
procedure Move(CurIndex, NewIndex: Integer); override;
procedure Sort; override;
procedure Exchange(Index1, Index2: Integer); override;
public
@ -96,7 +97,7 @@ type
implementation
uses
CarbonProc;
CarbonProc, CarbonWSCheckLst, CheckLst;
{ TCarbonComboBoxStrings }
@ -288,6 +289,20 @@ begin
FOwner.DeleteItem(Index);
end;
procedure TCarbonListBoxStrings.Move(CurIndex, NewIndex: Integer);
var
AState: TCheckBoxState;
begin
if Owner is TCustomCheckListBox then
AState := TCarbonWSCustomCheckListBox.GetState(TCustomCheckListBox(Owner), CurIndex);
inherited Move(CurIndex, NewIndex);
if Owner is TCustomCheckListBox then
TCarbonWSCustomCheckListBox.SetState(TCustomCheckListBox(Owner), NewIndex, AState);
end;
{------------------------------------------------------------------------------
Method: TCarbonListBoxStrings.Sort

9
lcl/interfaces/win32/win32listsl.inc
View File

@ -548,6 +548,15 @@ begin
inherited Delete(Index);
end;
procedure TWin32CheckListBoxStrings.Move(CurIndex, NewIndex: Integer);
var
AState: TCheckBoxState;
begin
AState := State[CurIndex];
inherited Move(CurIndex, NewIndex);
State[NewIndex] := AState;
end;
function TWin32CheckListBoxStrings.GetObject(Index: Integer): TObject;
begin
Result:= GetItemRecord(Index, false)^.TheObject;

1
lcl/interfaces/win32/win32listslh.inc
View File

@ -128,6 +128,7 @@ Type
class procedure DeleteItemRecord(const List: HWND; const Index: integer);
procedure Clear; override;
procedure Delete(Index: Integer); override;
procedure Move(CurIndex, NewIndex: Integer); override;
property Enabled[Index: Integer]: Boolean read GetEnabled write SetEnabled;
property State[Index: Integer]: TCheckBoxState read GetState write SetState;
end;

9
lcl/interfaces/wince/wincelistsl.inc
View File

@ -454,6 +454,15 @@ begin
inherited Delete(Index);
end;
procedure TWinCECheckListBoxStrings.Move(CurIndex, NewIndex: Integer);
var
AState: TCheckBoxState;
begin
AState := State[CurIndex];
inherited Move(CurIndex, NewIndex);
State[NewIndex] := AState;
end;
function TWinCECheckListBoxStrings.GetObject(Index: Integer): TObject;
begin
Result:= GetItemRecord(Index, false)^.TheObject;

1
lcl/interfaces/wince/wincelistslh.inc
View File

@ -113,6 +113,7 @@ type
class procedure DeleteItemRecord(const List: HWND; const Index: integer);
procedure Clear; override;
procedure Delete(Index: Integer); override;
procedure Move(CurIndex, NewIndex: Integer); override;
property State[AIndex: Integer]: TCheckBoxState read GetState write SetState;
end;