diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp index dd98a639a7..3486bd1fd9 100644 --- a/lcl/comctrls.pp +++ b/lcl/comctrls.pp @@ -380,7 +380,6 @@ type FMultiSelect: Boolean; FOnChanging: TTabChangingEvent; FOnCloseTabClicked: TNotifyEvent; - FOnDrawTab: TDrawTabEvent; FOnGetImageIndex: TTabGetImageEvent; FOnPageChanged: TNotifyEvent; FOptions: TCTabControlOptions; @@ -468,11 +467,9 @@ type property Tabs: TStrings read FAccess write SetPages; property TabIndex: Integer read FPageIndex write SetPageIndex default -1; property OnChange: TNotifyEvent read FOnPageChanged write FOnPageChanged; - property OnDrawTab: TDrawTabEvent read FOnDrawTab write FOnDrawTab; deprecated 'Will be deleted in Lazarus 1.8'; public constructor Create(TheOwner: TComponent); override; destructor Destroy; override; - function TabIndexAtClientPos(ClientPos: TPoint): integer; deprecated 'Will be deleted in next major Lazarus release, use IndexOfPageAt'; function TabRect(AIndex: Integer): TRect; function GetImageIndex(ThePageIndex: Integer): Integer; virtual; function IndexOf(APage: TPersistent): integer; virtual; @@ -855,7 +852,6 @@ type property MultiSelect: Boolean read GetMultiSelect write SetMultiSelect default False; property OnChange: TNotifyEvent read FOnChange write FOnChange; property OnChanging; - property OnDrawTab; deprecated 'Will be removed in 1.8'; property OnGetImageIndex; property OwnerDraw: Boolean read GetOwnerDraw write SetOwnerDraw default False; property RaggedRight: Boolean read GetRaggedRight write SetRaggedRight default False; diff --git a/lcl/dbgrids.pas b/lcl/dbgrids.pas index 6e070646be..bf546d4169 100644 --- a/lcl/dbgrids.pas +++ b/lcl/dbgrids.pas @@ -509,7 +509,6 @@ type public constructor Create(AOwner: TComponent); override; procedure AutoAdjustColumns; override; - procedure AutoSizeColumns; deprecated 'This method will be deleted in 1.8. Use AutoAdjustColumns'; procedure InitiateAction; override; procedure DefaultDrawColumnCell(const Rect: TRect; DataCol: Integer; Column: TColumn; State: TGridDrawState); function EditorByStyle(Style: TColumnButtonStyle): TWinControl; override; @@ -3556,11 +3555,6 @@ begin UpdateAutoSizeColumns; end; -procedure TCustomDBGrid.AutoSizeColumns; -begin - AutoAdjustColumns; -end; - procedure TCustomDBGrid.InitiateAction; begin {$ifdef dbgDBGrid}DebugLnEnter('%s.InitiateAction INIT', [ClassName]);{$endif} diff --git a/lcl/editbtn.pas b/lcl/editbtn.pas index 343b3173d9..d92e685003 100644 --- a/lcl/editbtn.pas +++ b/lcl/editbtn.pas @@ -204,11 +204,9 @@ type fSortData: Boolean; // Data needs to be sorted. fIsFirstSetFormActivate: Boolean; fOnAfterFilter: TNotifyEvent; - function GetUseFormActivate: Boolean; procedure SetFilter(const AValue: string); procedure SetIdleConnected(const AValue: Boolean); procedure OnIdle(Sender: TObject; var Done: Boolean); - procedure SetUseFormActivate(AValue: Boolean); function IsTextHintStored: Boolean; protected fNeedUpdate: Boolean; @@ -255,7 +253,6 @@ type deprecated 'Use OnFilterItemEx with a caption parameter instead.'; property OnFilterItemEx: TFilterItemExEvent read fOnFilterItemEx write fOnFilterItemEx; property OnCheckItem: TCheckItemEvent read fOnCheckItem write fOnCheckItem; - property UseFormActivate: Boolean read GetUseFormActivate write SetUseFormActivate stored False; deprecated 'Will be removed after 1.8 release.'; // TEditButton properties. property ButtonCaption; property ButtonCursor; @@ -1154,11 +1151,6 @@ begin fOnAfterFilter(Self); end; -procedure TCustomControlFilterEdit.SetUseFormActivate(AValue: Boolean); -begin - // Remove after 1.8 -end; - procedure TCustomControlFilterEdit.SetFilter(const AValue: string); begin Button.Enabled:=AValue<>''; @@ -1274,11 +1266,6 @@ begin Result := ResBtnListFilter; end; -function TCustomControlFilterEdit.GetUseFormActivate: Boolean; -begin - Result := False; -end; - { TFileNameEdit } constructor TFileNameEdit.Create(AOwner: TComponent); diff --git a/lcl/forms.pp b/lcl/forms.pp index cde3fb323c..35497ad72e 100644 --- a/lcl/forms.pp +++ b/lcl/forms.pp @@ -273,7 +273,6 @@ type public constructor Create(TheOwner: TComponent); override; public - property DesignTimeDPI: Integer read FDesignTimePPI write SetDesignTimePPI stored False; deprecated {$IFNDEF FPDOC}'Use DesignTimePPI instead. DesignTimeDPI will be removed in 1.8'{$ENDIF}; property DesignTimePPI: Integer read FDesignTimePPI write SetDesignTimePPI default 96; property PixelsPerInch: Integer read FPixelsPerInch write FPixelsPerInch stored False; property Scaled: Boolean read FScaled write SetScaled default True; diff --git a/lcl/groupededit.pp b/lcl/groupededit.pp index ba788555eb..cca99e14e7 100644 --- a/lcl/groupededit.pp +++ b/lcl/groupededit.pp @@ -70,8 +70,6 @@ type FIsReadOnly: Boolean; FLayout: TLeftRight; FSpacing: Integer; - FTextHintFontColor: TColor; //remove in 1.9 - FTextHintFontStyle: TFontStyles; //remove in 1.9 //Forwarded events from FButton FOnBuddyClick: TNotifyEvent; //Forwarded events from FEdit @@ -122,8 +120,6 @@ type function GetSelText: String; function GetTabStop: Boolean; function GetTextHint: TTranslateString; - function GetTextHintFontColor: TColor; //Remove in 1.9 - function GetTextHintFontStyle: TFontStyles; //Remove in 1.9 procedure InternalOnBuddyClick(Sender: TObject); procedure InternalOnEditClick(Sender: TObject); @@ -302,8 +298,6 @@ type property TabStop: Boolean read GetTabStop write SetTabStop default True; property Text; property TextHint: TTranslateString read GetTextHint write SetTextHint; - property TextHintFontColor: TColor read GetTextHintFontColor write FTextHintFontColor default clGrayText; deprecated 'Will be removed in the future'; //deprecated in 1.7 - property TextHintFontStyle: TFontStyles read GetTextHintFontStyle write FTextHintFontStyle default [fsItalic]; deprecated 'Will be removed in the future'; //deprecated in 1.7 property OnChange: TNotifyEvent read FOnEditChange write FOnEditChange; property OnClick: TNotifyEvent read FOnEditClick write FOnEditClick; @@ -631,16 +625,6 @@ begin Result := FEdit.TextHint; end; -function TCustomAbstractGroupedEdit.GetTextHintFontColor: TColor; -begin - Result := clGrayText; -end; - -function TCustomAbstractGroupedEdit.GetTextHintFontStyle: TFontStyles; -begin - Result := [fsItalic]; -end; - procedure TCustomAbstractGroupedEdit.FocusAndMaybeSelectAll; begin FEdit.SetFocus; diff --git a/lcl/include/customedit.inc b/lcl/include/customedit.inc index 3c188e3ce4..9325410f5a 100644 --- a/lcl/include/customedit.inc +++ b/lcl/include/customedit.inc @@ -680,17 +680,6 @@ begin end; end; -procedure TCustomEdit.SetTextHintFontColor(const aTextHintFontColor: TColor); -begin - DebugLn('TCustomEdit.TextHintFontColor is deprecated and will be removed in Lazarus 1.9'); -end; - -procedure TCustomEdit.SetTextHintFontStyle(const aTextHintFontStyle: TFontStyles - ); -begin - DebugLn('TCustomEdit.TextHintFontStyle is deprecated and will be removed in Lazarus 1.9'); -end; - procedure TCustomEdit.ShowEmulatedTextHint; var HintFont: TFont; @@ -713,18 +702,6 @@ begin FEmulatedTextHintStatus := thsShowing; end; -function TCustomEdit.GetTextHintFontColor: TColor; -begin - Result := clNone; - DebugLn('TCustomEdit.TextHintFontColor is deprecated and will be removed in Lazarus 1.9'); -end; - -function TCustomEdit.GetTextHintFontStyle: TFontStyles; -begin - Result := []; - DebugLn('TCustomEdit.TextHintFontStyle is deprecated and will be removed in Lazarus 1.9'); -end; - procedure TCustomEdit.HideEmulatedTextHint; begin if FEmulatedTextHintStatus<>thsShowing then diff --git a/lcl/include/customnotebook.inc b/lcl/include/customnotebook.inc index 51de9f6d10..8b69826d96 100644 --- a/lcl/include/customnotebook.inc +++ b/lcl/include/customnotebook.inc @@ -356,26 +356,6 @@ begin inherited Destroy; end; -{------------------------------------------------------------------------------ - function TCustomTabControl.TabIndexAtClientPos(ClientPos: TPoint): integer; - - Returns the index of the page of the tab at the client position. - For example: - Index:=NoteBook1.TabIndexAtClientPos( - NoteBook1.ScreenToClient(Mouse.CursorPos)); - ------------------------------------------------------------------------------} -function TCustomTabControl.TabIndexAtClientPos(ClientPos: TPoint): integer; -begin - if HandleAllocated then begin - Result := TWSCustomTabControlClass(WidgetSetClass).GetTabIndexAtPos(Self, ClientPos); - // Result is the index in visible tabs because invisible tabs are removed - // from the native control. Calculate the real tab index here. - Result := TabToPageIndex(Result); - end - else - Result := -1; -end; - function TCustomTabControl.TabRect(AIndex: Integer): TRect; begin if HandleAllocated then diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp index 612d100092..a9d7a011b5 100644 --- a/lcl/stdctrls.pp +++ b/lcl/stdctrls.pp @@ -731,8 +731,6 @@ type FSelStart: integer; FTextChangedByRealSetText: Boolean; FTextHint: TTranslateString; - function GetTextHintFontColor: TColor; //Remove in 1.9 - function GetTextHintFontStyle: TFontStyles; //Remove in 1.9 procedure ShowEmulatedTextHint; procedure HideEmulatedTextHint; procedure SetAlignment(const AValue: TAlignment); @@ -743,8 +741,6 @@ type procedure SetMaxLength(Value: Integer); procedure SetModified(Value: Boolean); procedure SetPasswordChar(const AValue: Char); - procedure SetTextHintFontColor(const aTextHintFontColor: TColor); - procedure SetTextHintFontStyle(const aTextHintFontStyle: TFontStyles); protected type TEmulatedTextHintStatus = (thsHidden, thsShowing, thsChanging); protected @@ -825,8 +821,6 @@ type property TabStop default true; property Text; property TextHint: TTranslateString read GetTextHint write SetTextHint; - property TextHintFontColor: TColor read GetTextHintFontColor write SetTextHintFontColor default clGrayText; deprecated 'Will be removed in the future'; //deprecated in 1.7 - property TextHintFontStyle: TFontStyles read GetTextHintFontStyle write SetTextHintFontStyle default [fsItalic]; deprecated 'Will be removed in the future'; end;