paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-26 23:03:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: revert r55892 #240f1fb4dd

Browse Source 
git-svn-id: trunk@56350 -
This commit is contained in:
ondrej 2017-11-10 08:53:41 +00:00
parent 9640327dd7
commit 1afbcdb13b
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/comctrls.pp
View File

@ -499,6 +499,8 @@ type
property TabHeight: Smallint read FTabHeight write SetTabHeight default 0;
property TabPosition: TTabPosition read FTabPosition write SetTabPosition default tpTop;
property TabWidth: Smallint read FTabWidth write SetTabWidth default 0;
published
property TabStop default true;
end;
{ TTabSheet }
@ -623,7 +625,7 @@ type
property TabIndex;
property TabOrder;
property TabPosition;
property TabStop default true;
property TabStop;
property TabWidth;
property Visible;
property OnChange;
@ -815,7 +817,6 @@ type
procedure Change; override;
procedure CreateWnd; override;
procedure DestroyHandle; override;
procedure GetTabOrderList(List: TFPList); override;
procedure Notification(AComponent: TComponent; Operation: TOperation); override;
procedure SetDragMode(Value: TDragMode); override;
procedure SetTabIndex(Value: Integer); virtual;
@ -861,7 +862,7 @@ type
property TabHeight: Smallint read FTabHeight write SetTabHeight default 0;
property TabIndex: Integer read GetTabIndex write SetTabIndex default -1;
property Tabs: TStrings read FTabs write SetTabs;
property TabStop default true;
property TabStop: Boolean read GetTabStop write SetTabStop default true; // workaround, see #30305
property TabWidth: Smallint read FTabWidth write SetTabWidth default 0;
//
property Align;

14
lcl/include/tabcontrol.inc
View File

@ -534,8 +534,7 @@ end;
procedure TTabControl.SetTabStop(const AValue: Boolean);
begin
if Assigned(FTabs) then
TTabControlNoteBookStrings(FTabs).NoteBook.TabStop := AValue;
TTabControlNoteBookStrings(FTabs).NoteBook.TabStop := AValue;
end;
procedure TTabControl.SetTabWidth(AValue: Smallint);
@ -605,14 +604,6 @@ begin
EndUpdate;
end;
procedure TTabControl.GetTabOrderList(List: TFPList);
begin
// just the TTabControlNoteBookStrings not the container should be tabable, see issue #32455
List.Remove(Self);
if Assigned(FTabs) then
List.Add(TTabControlNoteBookStrings(FTabs).NoteBook);
end;
procedure TTabControl.Notification(AComponent: TComponent;
Operation: TOperation);
begin
@ -763,7 +754,8 @@ begin
FImageChangeLink := TChangeLink.Create;
FImageChangeLink.OnChange := @ImageListChange;
FTabs := CreateTabNoteBookStrings;
TabStop := True;
TWinControl(Self).TabStop := False; // workaround, see #30305
TTabControlNoteBookStrings(FTabs).NoteBook.TabStop := True;
with GetControlClassDefaultSize do
SetInitialBounds(0, 0, CX, CY);
BorderWidth:=0;