From 706b7cc9050bd10eb03ff308c8b9edd3fb067729 Mon Sep 17 00:00:00 2001
From: blikblum <blikblum@lazarus-ide.org>
Date: Thu, 12 Aug 2010 12:55:04 +0000
Subject: [PATCH] lcl: move RegisterPropertyToSkip calls of Grids and DBCtrls
 to unit initialization so it's called only once and not on every component
 created

git-svn-id: trunk@27074 -
---
 lcl/dbctrls.pp            |  8 ++++----
 lcl/grids.pas             | 18 +++++-------------
 lcl/include/dbimage.inc   |  6 ------
 lcl/include/dblistbox.inc |  6 ------
 lcl/include/dbmemo.inc    |  6 ------
 lcl/include/dbtext.inc    |  6 ------
 6 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/lcl/dbctrls.pp b/lcl/dbctrls.pp
index d7b6d58884..e3ec8ce84e 100644
--- a/lcl/dbctrls.pp
+++ b/lcl/dbctrls.pp
@@ -285,7 +285,6 @@ Type
     procedure Loaded; override;
     procedure Notification(AComponent: TComponent;
       Operation: TOperation); override;
-    class procedure WSRegisterClass; override;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -383,7 +382,6 @@ Type
   protected
     procedure DataChange(Sender: TObject); override;
     procedure UpdateData(Sender: TObject); override;
-    class procedure WSRegisterClass; override;
   public
     // we need to overrride the write method for db aware.
     // the Read isn't an issue since the list will be updated
@@ -847,7 +845,6 @@ Type
     procedure Change; override;
     procedure KeyPress(var Key:Char); override;
     procedure WndProc(var AMessage : TLMessage); override;
-    class procedure WSRegisterClass; override;
   public
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -978,7 +975,6 @@ Type
     procedure PictureChanged(Sender: TObject); override;
     procedure LoadPicture; virtual;
     procedure Loaded; override;
-    class procedure WSRegisterClass; override;
   public
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -1695,6 +1691,10 @@ end;
 
 
 initialization
+  RegisterPropertyToSkip(TDBImage, 'Picture', 'Removed in 0.9.29. DB control should not save/load their data from stream.', '');
+  RegisterPropertyToSkip(TDBListBox, 'Items', 'Removed in 0.9.29. DB control should not save/load their data from stream.', '');
+  RegisterPropertyToSkip(TDBMemo, 'Lines', 'Removed in 0.9.29. DB control should not save/load their data from stream.', '');
+  RegisterPropertyToSkip(TDBText, 'Caption', 'Removed in 0.9.29. DB control should not save/load their data from stream.', '');
   {$I lcl_dbnav_images.lrs}
 
 finalization
diff --git a/lcl/grids.pas b/lcl/grids.pas
index 9572579bc9..4534573f03 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -1481,8 +1481,6 @@ type
   { TStringGrid }
 
   TStringGrid = class(TCustomStringGrid)
-  protected
-    class procedure WSRegisterClass; override;
   public
     property Modified;
   published
@@ -10982,15 +10980,9 @@ begin
   FEditors[i].ActiveControl:=ActiveCtrl;
 end;
 
-{ TStringGrid }
-
-class procedure TStringGrid.WSRegisterClass;
-begin
-  RegisterPropertyToSkip(Self, 'VisibleRowCount',
-    'Property streamed in by older compliler', '');
-  RegisterPropertyToSkip(Self, 'VisibleColCount',
-    'Property streamed in by older compliler', '');
-  inherited WSRegisterClass;
-end;
-
+initialization
+  RegisterPropertyToSkip(TStringGrid, 'VisibleRowCount',
+    'Property streamed in by older compiler', '');
+  RegisterPropertyToSkip(TStringGrid, 'VisibleColCount',
+    'Property streamed in by older compiler', '');
 end.
diff --git a/lcl/include/dbimage.inc b/lcl/include/dbimage.inc
index 7a9cdc5fff..8f9536447a 100644
--- a/lcl/include/dbimage.inc
+++ b/lcl/include/dbimage.inc
@@ -193,12 +193,6 @@ begin
     DataChange(Self);
 end;
 
-class procedure TDBImage.WSRegisterClass;
-begin
-  inherited WSRegisterClass;
-  RegisterPropertyToSkip(TDBImage, 'Picture', 'Removed in 0.9.29. DB control should not save/load their data from stream.', '');
-end;
-
 constructor TDBImage.Create(TheOwner: TComponent);
 begin
   inherited Create(TheOwner);
diff --git a/lcl/include/dblistbox.inc b/lcl/include/dblistbox.inc
index 47e26f6605..6ee8c6476c 100644
--- a/lcl/include/dblistbox.inc
+++ b/lcl/include/dblistbox.inc
@@ -41,9 +41,3 @@ begin
     FDataLink.Field.AsString := '';
 end;
 
-class procedure TDBListBox.WSRegisterClass;
-begin
-  inherited WSRegisterClass;
-  RegisterPropertyToSkip(TDBListBox, 'Items', 'Removed in 0.9.29. DB control should not save/load their data from stream.', '');
-end;
-
diff --git a/lcl/include/dbmemo.inc b/lcl/include/dbmemo.inc
index 13edf4fe66..b2d1995a73 100644
--- a/lcl/include/dbmemo.inc
+++ b/lcl/include/dbmemo.inc
@@ -215,12 +215,6 @@ begin
   inherited WndProc(AMessage);
 end;
 
-class procedure TDBMemo.WSRegisterClass;
-begin
-  inherited WSRegisterClass;
-  RegisterPropertyToSkip(TDBMemo, 'Lines', 'Removed in 0.9.29. DB control should not save/load their data from stream.', '');
-end;
-
 destructor TDBMemo.Destroy;
 begin
   FDataLink.Free;
diff --git a/lcl/include/dbtext.inc b/lcl/include/dbtext.inc
index 46f2bedb5d..c62b510bd5 100644
--- a/lcl/include/dbtext.inc
+++ b/lcl/include/dbtext.inc
@@ -91,12 +91,6 @@ begin
   end;
 end;
 
-class procedure TDBText.WSRegisterClass;
-begin
-  inherited WSRegisterClass;
-  RegisterPropertyToSkip(TDBText, 'Caption', 'Removed in 0.9.29. DB control should not save/load their data from stream.', '');
-end;
-
 { Public Methods}
 constructor TDBText.Create(AOwner: TComponent);
 begin