paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 13:59:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl: moving RegisterPropertyToSkip from unit initialization to WSRegisterClass methods

Browse Source 
git-svn-id: trunk@62581 -
This commit is contained in:
dmitry 2020-01-23 15:28:39 +00:00
parent 1bfb7ec3fd
commit 8bcb4c3d6f
15 changed files with 68 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/comctrls.pp
View File

@ -818,6 +818,7 @@ type
procedure SetTabStop(const AValue: Boolean);
procedure SetTabWidth(AValue: Smallint);
protected
class procedure WSRegisterClass; override;
procedure SetOptions(const AValue: TCTabControlOptions); override;
procedure AddRemovePageHandle(APage: TCustomPage); override;
function CanChange: Boolean; override;
@ -4207,7 +4208,4 @@ begin
Done := True;
end;
initialization
RegisterPropertyToSkip(TTabControl, 'OnDrawTab', 'Property streamed in older Lazarus revision','');
end.

9
lcl/controls.pp
View File

@ -4625,15 +4625,6 @@ end;
initialization
//DebugLn('controls.pp - initialization');
RegisterPropertyToSkip(TControl, 'AlignWithMargins', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'Ctl3D', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'ParentCtl3D', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'IsControl', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'DesignSize', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'ExplicitLeft', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'ExplicitHeight', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'ExplicitTop', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'ExplicitWidth', 'VCL compatibility property', '');
{$IF FPC_FULLVERSION<30003}
RegisterPropertyToSkip(TDataModule, 'PPI', 'PPI was introduced in FPC 3.0.3', '');
{$ENDIF}

3
lcl/dialogs.pp
View File

@ -978,9 +978,6 @@ initialization
InterfaceBase.PromptDialogFunction := @DefaultPromptDialog;
InterfaceBase.QuestionDialogFunction := @DefaultQuestionDialog;
RegisterPropertyToSkip(TCommonDialog, 'Width', 'Property streamed in older Lazarus revision','');
RegisterPropertyToSkip(TCommonDialog, 'Height', 'Property streamed in older Lazarus revision','');
finalization
InterfaceBase.InputDialogFunction := nil;
InterfaceBase.QuestionDialogFunction := nil;

20
lcl/editbtn.pas
View File

@ -256,6 +256,7 @@ type
procedure MoveEnd(ASelect: Boolean = False); virtual; abstract;
function ReturnKeyHandled: Boolean; virtual; abstract;
function GetDefaultGlyphName: string; override;
class procedure WSRegisterClass; override;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
@ -588,6 +589,7 @@ type
procedure SetDateOrder(const AValue: TDateOrder);
function DateToText(Value: TDateTime): String;
protected
class procedure WSRegisterClass; override;
function GetDefaultGlyphName: string; override;
procedure ButtonClick; override;
procedure EditDblClick; override;
@ -1302,6 +1304,12 @@ begin
Result := ResBtnListFilter;
end;
class procedure TCustomControlFilterEdit.WSRegisterClass;
begin
inherited WSRegisterClass;
RegisterPropertyToSkip(TCustomControlFilterEdit, 'UseFormActivate', 'Property streamed in older Lazarus revision','');
end;
{ TFileNameEdit }
constructor TFileNameEdit.Create(AOwner: TComponent);
@ -2039,6 +2047,13 @@ begin
end;
end;
class procedure TDateEdit.WSRegisterClass;
begin
inherited WSRegisterClass;
RegisterPropertyToSkip(TDateEdit, 'OKCaption', 'Property streamed in older Lazarus revision','');
RegisterPropertyToSkip(TDateEdit, 'CancelCaption', 'Property streamed in older Lazarus revision','');
end;
{ TTimeEdit }
function TTimeEdit.GetTime: TDateTime;
@ -2255,9 +2270,4 @@ begin
TDateEdit,TTimeEdit,TCalcEdit]);
end;
Initialization
RegisterPropertyToSkip(TDateEdit, 'OKCaption', 'Property streamed in older Lazarus revision','');
RegisterPropertyToSkip(TDateEdit, 'CancelCaption', 'Property streamed in older Lazarus revision','');
RegisterPropertyToSkip(TCustomControlFilterEdit, 'UseFormActivate', 'Property streamed in older Lazarus revision','');
end.

3
lcl/extctrls.pp
View File

@ -48,6 +48,7 @@ type
FOnBeforeShow: TBeforeShowPageEvent;
function GetPageIndex: Integer;
protected
class procedure WSRegisterClass; override;
procedure SetParent(AParent: TWinControl); override;
public
constructor Create(TheOwner: TComponent); override;
@ -1720,7 +1721,5 @@ end;
initialization
DockSplitterClass := TSplitter;
RegisterPropertyToSkip(TPage, 'ClientHeight', 'This property was published for a long time in Lazarus 0.9.31', '');
RegisterPropertyToSkip(TPage, 'ClientWidth', 'This property was published for a long time in Lazarus 0.9.31', '');
end.

5
lcl/forms.pp
View File

@ -755,6 +755,7 @@ type
FLCLVersion: string;
function LCLVersionIsStored: boolean;
protected
class procedure WSRegisterClass; override;
procedure CreateWnd; override;
procedure Loaded; override;
public
@ -2282,10 +2283,6 @@ begin
end;
initialization
RegisterPropertyToSkip(TForm, 'OldCreateOrder', 'VCL compatibility property', '');
RegisterPropertyToSkip(TForm, 'TextHeight', 'VCL compatibility property', '');
RegisterPropertyToSkip(TForm, 'Scaled', 'VCL compatibility property', '');
RegisterPropertyToSkip(TForm, 'TransparentColorValue', 'VCL compatibility property', '');
LCLProc.OwnerFormDesignerModifiedProc:=@IfOwnerIsFormThenDesignerModified;
ThemesImageDrawEvent:=@ImageDrawEvent;
IsFormDesign := @IsFormDesignFunction;

11
lcl/groupededit.pp
View File

@ -174,6 +174,7 @@ type
procedure SetTabStop(AValue: Boolean);
procedure SetTextHint(AValue: TTranslateString);
protected
class procedure WSRegisterClass; override;
procedure CalculatePreferredSize(var PreferredWidth, PreferredHeight: integer;
WithThemeSpace: Boolean); override;
function CreateBuddy: TControl; virtual;
@ -1128,6 +1129,13 @@ begin
FEdit.TextHint := AValue;
end;
class procedure TCustomAbstractGroupedEdit.WSRegisterClass;
begin
inherited WSRegisterClass;
RegisterPropertyToSkip(TCustomAbstractGroupedEdit, 'TextHintFontColor','Used in a previous version of Lazarus','');
RegisterPropertyToSkip(TCustomAbstractGroupedEdit, 'TextHintFontStyle','Used in a previous version of Lazarus','');
end;
procedure TCustomAbstractGroupedEdit.UpdateSpacing;
begin
if (FBuddy=nil) or not FBuddy.Visible then
@ -1279,7 +1287,4 @@ begin
FEdit.ValidateEdit;
end;
initialization
RegisterPropertyToSkip(TCustomAbstractGroupedEdit, 'TextHintFontColor','Used in a previous version of Lazarus','');
RegisterPropertyToSkip(TCustomAbstractGroupedEdit, 'TextHintFontStyle','Used in a previous version of Lazarus','');
end.

2
lcl/include/commondialog.inc
View File

@ -104,6 +104,8 @@ class procedure TCommonDialog.WSRegisterClass;
begin
inherited WSRegisterClass;
RegisterCommonDialog;
RegisterPropertyToSkip(TCommonDialog, 'Width', 'Property streamed in older Lazarus revision','');
RegisterPropertyToSkip(TCommonDialog, 'Height', 'Property streamed in older Lazarus revision','');
end;
procedure TCommonDialog.SetHeight(const AValue: integer);

9
lcl/include/control.inc
View File

@ -4269,6 +4269,15 @@ class procedure TControl.WSRegisterClass;
begin
inherited WSRegisterClass;
RegisterControl;
RegisterPropertyToSkip(TControl, 'AlignWithMargins', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'Ctl3D', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'ParentCtl3D', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'IsControl', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'DesignSize', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'ExplicitLeft', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'ExplicitHeight', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'ExplicitTop', 'VCL compatibility property', '');
RegisterPropertyToSkip(TControl, 'ExplicitWidth', 'VCL compatibility property', '');
end;
function TControl.GetCursor: TCursor;

2
lcl/include/customedit.inc
View File

@ -395,6 +395,8 @@ begin
RegisterPropertyToSkip(TCustomEdit, 'BevelKind', 'VCL compatibility property', '');
RegisterPropertyToSkip(TCustomEdit, 'BevelOuter', 'VCL compatibility property', '');
RegisterPropertyToSkip(TCustomEdit, 'OEMConvert', 'VCL compatibility property', '');
RegisterPropertyToSkip(TCustomEdit, 'TextHintFontColor','Used in a previous version of Lazarus','');
RegisterPropertyToSkip(TCustomEdit, 'TextHintFontStyle','Used in a previous version of Lazarus','');
end;
function TCustomEdit.CanShowEmulatedTextHint: Boolean;

9
lcl/include/customform.inc
View File

@ -3115,6 +3115,15 @@ begin
Result:=Parent=nil;
end;
class procedure TForm.WSRegisterClass;
begin
inherited WSRegisterClass;
RegisterPropertyToSkip(TForm, 'OldCreateOrder', 'VCL compatibility property', '');
RegisterPropertyToSkip(TForm, 'TextHeight', 'VCL compatibility property', '');
RegisterPropertyToSkip(TForm, 'Scaled', 'VCL compatibility property', '');
RegisterPropertyToSkip(TForm, 'TransparentColorValue', 'VCL compatibility property', '');
end;
procedure TForm.CreateWnd;
begin
if (Application<>nil) then

7
lcl/include/page.inc
View File

@ -85,5 +85,10 @@ begin
Result := -1;
end;
class procedure TPage.WSRegisterClass;
begin
inherited WSRegisterClass;
RegisterPropertyToSkip(TPage, 'ClientHeight', 'This property was published for a long time in Lazarus 0.9.31', '');
RegisterPropertyToSkip(TPage, 'ClientWidth', 'This property was published for a long time in Lazarus 0.9.31', '');
end;
// included by extctrls.pp

6
lcl/include/tabcontrol.inc
View File

@ -545,6 +545,12 @@ begin
TTabControlNoteBookStrings(FTabs).NoteBook.TabWidth := AValue;
end;
class procedure TTabControl.WSRegisterClass;
begin
inherited WSRegisterClass;
RegisterPropertyToSkip(TTabControl, 'OnDrawTab', 'Property streamed in older Lazarus revision','');
end;
procedure TTabControl.SetOptions(const AValue: TCTabControlOptions);
begin
inherited SetOptions(AValue);

13
lcl/maskedit.pp
View File

@ -230,6 +230,7 @@ const
procedure DeleteSelected;
procedure DeleteChars(NextChar : Boolean);
protected
class procedure WSRegisterClass; override;
function ApplyMaskToText(Value: TCaption): TCaption;
function CanShowEmulatedTextHint: Boolean; override;
function DisableMask(const NewText: String): Boolean;
@ -1387,6 +1388,13 @@ begin
end;
end;
class procedure TCustomMaskEdit.WSRegisterClass;
begin
inherited WSRegisterClass;
RegisterPropertyToSkip(TCustomMaskEdit, 'TextHintFontColor','Used in a previous version of Lazarus','');
RegisterPropertyToSkip(TCustomMaskEdit, 'TextHintFontStyle','Used in a previous version of Lazarus','');
end;
function TCustomMaskEdit.ApplyMaskToText(Value: TCaption): TCaption;
{ This tries to mimic Delphi behaviour (D3):
- if mask contains no literals text is set, if necessary padded with blanks,
@ -2203,9 +2211,4 @@ begin
RegisterComponents('Additional',[TMaskEdit]);
end;
initialization
RegisterPropertyToSkip(TCustomMaskEdit, 'TextHintFontColor','Used in a previous version of Lazarus','');
RegisterPropertyToSkip(TCustomMaskEdit, 'TextHintFontStyle','Used in a previous version of Lazarus','');
end.

3
lcl/stdctrls.pp
View File

@ -1722,7 +1722,4 @@ end;
{$I customstatictext.inc}
initialization
RegisterPropertyToSkip(TCustomEdit, 'TextHintFontColor','Used in a previous version of Lazarus','');
RegisterPropertyToSkip(TCustomEdit, 'TextHintFontStyle','Used in a previous version of Lazarus','');
end.