LCL: revert r56162, r56031, r55890 #9ac706fc7a (TabStop handling)

git-svn-id: trunk@56344 -

components/lazcontrols/spinex.inc

@@ -368,12 +368,6 @@ begin
     SetInitialBounds(0, 0, CX, CY);
 end;
 
-procedure TCustomFloatSpinEditEx.GetTabOrderList(List: TFPList);
-begin
-// just the TCustomEditButton as container should be tabable, see issue #32335
-// so no inherited adding of child controls
-end;
-
 function TCustomFloatSpinEditEx.GetLimitedValue(const AValue: Double): Double;
 begin
   Result := AValue;

components/lazcontrols/spinex.pp

@@ -144,7 +144,6 @@ type
     property MinRepeatValue: Byte read FMinRepeatValue write SetMinRepeatValue default 100;
   public
     constructor Create(TheOwner: TComponent); override;
-    procedure GetTabOrderList(List: TFPList); override;
     function GetLimitedValue(const AValue: Double): Double; virtual;
     function ValueToStr(const AValue: Double): String; virtual;
     function StrToValue(const S: String): Double; virtual;

lcl/comctrls.pp

@@ -793,7 +793,7 @@ type
     function GetScrollOpposite: Boolean;
     function GetTabIndex: Integer;
     function GetTabRectWithBorder: TRect;
-    function GetTabStop: Boolean; override;
+    function GetTabStop: Boolean;
     procedure SetHotTrack(const AValue: Boolean);
     procedure SetImages(const AValue: TCustomImageList);
     procedure SetMultiLine(const AValue: Boolean);
@@ -805,7 +805,7 @@ type
     procedure SetTabHeight(AValue: Smallint);
     procedure SetTabPosition(AValue: TTabPosition); override;
     procedure SetTabs(const AValue: TStrings);
-    procedure SetTabStop(AValue: Boolean); override;
+    procedure SetTabStop(const AValue: Boolean);
     procedure SetTabWidth(AValue: Smallint);
   protected
     procedure SetOptions(const AValue: TCTabControlOptions); override;

lcl/controls.pp

@@ -1988,6 +1988,7 @@ type
     procedure SetBorderWidth(Value: TBorderWidth);
     procedure SetParentWindow(const AValue: HWND);
     procedure SetTabOrder(NewTabOrder: TTabOrder);
+    procedure SetTabStop(NewTabStop: Boolean);
     procedure SetUseDockManager(const AValue: Boolean);
     procedure UpdateTabOrder(NewTabOrder: TTabOrder);
     procedure Insert(AControl: TControl);
@@ -2032,14 +2033,12 @@ type
                                      WithThemeSpace: Boolean); override;
     procedure GetPreferredSizeClientFrame(out aWidth, aHeight: integer); virtual;
     procedure GetChildren(Proc: TGetChildProc; Root: TComponent); override;
-    function GetTabStop: Boolean; virtual;
     function ChildClassAllowed(ChildClass: TClass): boolean; override;
     procedure PaintControls(DC: HDC; First: TControl);
     procedure PaintHandler(var TheMessage: TLMPaint);
     procedure PaintWindow(DC: HDC); virtual;
     procedure CreateBrush; virtual;
     procedure ScaleControls(Multiplier, Divider: Integer); virtual;
-    procedure SetTabStop(NewTabStop: Boolean); virtual;
     procedure ChangeScale(Multiplier, Divider: Integer); override;
   protected
     // messages
@@ -2189,7 +2188,7 @@ type
     property Handle: HWND read GetHandle write SetHandle;
     property IsResizing: Boolean read GetIsResizing;
     property TabOrder: TTabOrder read GetTabOrder write SetTabOrder default -1;
-    property TabStop: Boolean read GetTabStop write SetTabStop default false;
+    property TabStop: Boolean read FTabStop write SetTabStop default false;
     property OnAlignInsertBefore: TAlignInsertBeforeEvent read FOnAlignInsertBefore write FOnAlignInsertBefore;
     property OnAlignPosition: TAlignPositionEvent read FOnAlignPosition write FOnAlignPosition;
     property OnDockDrop: TDockDropEvent read FOnDockDrop write FOnDockDrop;

lcl/editbtn.pas

@@ -103,7 +103,6 @@ type
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
-    procedure GetTabOrderList(List: TFPList); override;
   end;
 
  { TEditButton }
@@ -1075,7 +1074,6 @@ begin
   inherited Create(AOwner);
   FButtonOnlyWhenFocused := False;
   FocusOnButtonClick := False;
-  TabStop := True;
 
   SetInitialBounds(0, 0, GetControlClassDefaultSize.CX, GetControlClassDefaultSize.CY);
 
@@ -1093,12 +1091,6 @@ begin
   inherited Destroy;
 end;
 
-procedure TCustomEditButton.GetTabOrderList(List: TFPList);
-begin
-// just the TCustomEditButton as container should be tabable, see issue #32335
-// so no inherited adding of child controls
-end;
-
 
 { TCustomControlFilterEdit }
 

lcl/groupededit.pp

@@ -118,6 +118,7 @@ type
     function GetSelLength: Integer;
     function GetSelStart: Integer;
     function GetSelText: String;
+    function GetTabStop: Boolean;
     function GetTextHint: TTranslateString;
 
     procedure InternalOnBuddyClick(Sender: TObject);
@@ -170,6 +171,7 @@ type
     procedure SetSelStart(AValue: Integer);
     procedure SetSelText(AValue: String);
     procedure SetSpacing(const Value: integer);
+    procedure SetTabStop(AValue: Boolean);
     procedure SetTextHint(AValue: TTranslateString);
   protected
     procedure CalculatePreferredSize(var PreferredWidth, PreferredHeight: integer;
@@ -231,14 +233,12 @@ type
     function  EditCanModify: Boolean; virtual;
     procedure GetSel(out _SelStart: Integer; out _SelStop: Integer);
     function GetSpacing: Integer; virtual;
-    function GetTabStop: Boolean; override;
     procedure SetSel(const _SelStart: Integer; _SelStop: Integer);
     procedure Loaded; override;
     procedure Reset; virtual;
     procedure SetAutoSize(AValue: Boolean); override;
     procedure SetColor(AValue: TColor); reintroduce;
     procedure SetCursor(AValue: TCursor); override;
-    procedure SetTabStop(AValue: Boolean); override;
     procedure ShouldAutoAdjust(var AWidth, AHeight: Boolean); override;
 
     property AutoSelect: Boolean read GetAutoSelect write SetAutoSelect default True;
@@ -407,10 +407,18 @@ implementation
 
 function TGEEdit.PerformTab(ForwardTab: boolean): boolean;
 begin
-  if Assigned(Owner) and (Owner is TCustomAbstractGroupedEdit) then
-    Result :=  TCustomAbstractGroupedEdit(Owner).PerformTab(ForwardTab)
+  //if not Forward then inherited PerFormTab will set focus to the owning
+  //TCustomAbstractGroupedEdit, which immediately transfers the focus back to the TGEEdit
+  //so let TCustomAbstractGroupedEdit do the Performtab in this case
+  if ForwardTab then
+    Result := inherited PerformTab(ForwardTab)
   else
-    Result := False;
+  begin
+    if Assigned(Owner) and (Owner is TCustomAbstractGroupedEdit) then
+      Result :=  TCustomAbstractGroupedEdit(Owner).PerformTab(ForwardTab)
+    else
+      Result := False;
+  end;
 end;
 
 { TCustomAbstractGroupedEdit }
@@ -823,11 +831,6 @@ begin
   FEdit.Cursor := AValue;
 end;
 
-procedure TCustomAbstractGroupedEdit.SetTabStop(AValue: Boolean);
-begin
-  FEdit.TabStop := AValue;
-end;
-
 procedure TCustomAbstractGroupedEdit.ShouldAutoAdjust(var AWidth,
   AHeight: Boolean);
 begin
@@ -1110,6 +1113,11 @@ begin
   if not (csLoading in ComponentState) then UpdateSpacing;
 end;
 
+procedure TCustomAbstractGroupedEdit.SetTabStop(AValue: Boolean);
+begin
+  FEdit.TabStop := AValue;
+end;
+
 procedure TCustomAbstractGroupedEdit.SetTextHint(AValue: TTranslateString);
 begin
   FEdit.TextHint := AValue;
@@ -1167,6 +1175,7 @@ begin
   FDirectInput := True;
   FIsReadOnly := False;
   TabStop := True;
+  inherited TabStop := False;
   FocusOnBuddyClick := False;
   FSpacing := 0;
   SetInitialBounds(0, 0, GetControlClassDefaultSize.CX, GetControlClassDefaultSize.CY);

lcl/include/tabcontrol.inc

@@ -532,7 +532,7 @@ begin
   FTabs.Assign(AValue);
 end;
 
-procedure TTabControl.SetTabStop(AValue: Boolean);
+procedure TTabControl.SetTabStop(const AValue: Boolean);
 begin
   if Assigned(FTabs) then
     TTabControlNoteBookStrings(FTabs).NoteBook.TabStop := AValue;

lcl/include/wincontrol.inc

@@ -3909,11 +3909,6 @@ begin
   end;
 end;
 
-function TWinControl.GetTabStop: Boolean;
-begin
-  Result := FTabStop;
-end;
-
 {-------------------------------------------------------------------------------
   function TWinControl.ChildClassAllowed(ChildClass: TClass): boolean;
 
@@ -4250,6 +4245,15 @@ begin
     UpdateTabOrder(NewTabOrder);
 end;
 
+procedure TWinControl.SetTabStop(NewTabStop: Boolean);
+begin
+  if FTabStop = NewTabStop then
+    Exit;
+  FTabStop := NewTabStop;
+  UpdateTabOrder(FTabOrder);
+  Perform(CM_TABSTOPCHANGED, 0, 0);
+end;
+
 {------------------------------------------------------------------------------
   TControl UpdateTabOrder
 ------------------------------------------------------------------------------}
@@ -4984,15 +4988,6 @@ begin
     Controls[i].ChangeScale(Multiplier, Divider);
 end;
 
-procedure TWinControl.SetTabStop(NewTabStop: Boolean);
-begin
-  if FTabStop = NewTabStop then
-    Exit;
-  FTabStop := NewTabStop;
-  UpdateTabOrder(FTabOrder);
-  Perform(CM_TABSTOPCHANGED, 0, 0);
-end;
-
 procedure TWinControl.ChangeScale(Multiplier, Divider: Integer);
 var
   i: Integer;