lcl: moving RegisterPropertyToSkip from unit initialization to WSRegisterClass methods

git-svn-id: trunk@62581 -

lcl/comctrls.pp

@@ -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.

lcl/controls.pp

@@ -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}

lcl/dialogs.pp

@@ -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;

lcl/editbtn.pas

@@ -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.

lcl/extctrls.pp

@@ -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.

lcl/forms.pp

@@ -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;

lcl/groupededit.pp

@@ -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.

lcl/include/commondialog.inc

@@ -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);

lcl/include/control.inc

@@ -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;

lcl/include/customedit.inc

@@ -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;

lcl/include/customform.inc

@@ -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

lcl/include/page.inc

@@ -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

lcl/include/tabcontrol.inc

@@ -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);

lcl/maskedit.pp

@@ -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.

lcl/stdctrls.pp

@@ -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.