From 2dfb22d93ea6e5b2abbd73c25b65b78ea9e519b5 Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Thu, 1 Apr 2010 00:49:45 +0000
Subject: [PATCH] lcl: apply patch of Juha Manninen which registers more VCL
 compatibility properties which LCL should skip while reading

git-svn-id: trunk@24327 -
---
 lcl/forms.pp                   | 2 ++
 lcl/include/control.inc        | 2 ++
 lcl/include/customcheckbox.inc | 1 +
 lcl/include/customcombobox.inc | 3 +++
 lcl/include/customlistview.inc | 1 +
 lcl/include/pagecontrol.inc    | 3 +++
 lcl/include/statusbar.inc      | 2 ++
 lcl/include/trackbar.inc       | 3 +++
 8 files changed, 17 insertions(+)

diff --git a/lcl/forms.pp b/lcl/forms.pp
index 155b063814..c0774825ba 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -1903,6 +1903,8 @@ end;
 initialization
   {$INCLUDE cursors.lrs}
   RegisterPropertyToSkip(TForm, 'OldCreateOrder', 'VCL compatibility property', '');
+  RegisterPropertyToSkip(TForm, 'TextHeight', 'VCL compatibility property', '');
+  RegisterPropertyToSkip(TForm, 'Scaled', 'VCL compatibility property', '');
   LCLProc.OwnerFormDesignerModifiedProc:=@IfOwnerIsFormThenDesignerModified;
   Screen:=TScreen.Create(nil);
   Application:=TApplication.Create(nil);
diff --git a/lcl/include/control.inc b/lcl/include/control.inc
index 17d73d3258..ee2d34ca20 100644
--- a/lcl/include/control.inc
+++ b/lcl/include/control.inc
@@ -3473,6 +3473,8 @@ end;
 class procedure TControl.WSRegisterClass;
 begin
   inherited WSRegisterClass;
+  RegisterPropertyToSkip(TControl, 'IsControl', 'VCL compatibility property', '');
+  RegisterPropertyToSkip(TControl, 'DesignSize', 'VCL compatibility property', '');
   RegisterControl;
 end;
 
diff --git a/lcl/include/customcheckbox.inc b/lcl/include/customcheckbox.inc
index 5568f50dda..98ea5add1e 100644
--- a/lcl/include/customcheckbox.inc
+++ b/lcl/include/customcheckbox.inc
@@ -67,6 +67,7 @@ end;
 class procedure TCustomCheckBox.WSRegisterClass;
 begin
   inherited WSRegisterClass;
+  RegisterPropertyToSkip(TCustomCheckBox, 'Alignment', 'VCL compatibility property', '');
   RegisterCustomCheckBox;
 end;
 
diff --git a/lcl/include/customcombobox.inc b/lcl/include/customcombobox.inc
index 783f168096..d8dd659063 100644
--- a/lcl/include/customcombobox.inc
+++ b/lcl/include/customcombobox.inc
@@ -446,6 +446,9 @@ end;
 class procedure TCustomComboBox.WSRegisterClass;
 begin
   inherited WSRegisterClass;
+  RegisterPropertyToSkip(TCustomComboBox, 'BevelInner', 'VCL compatibility property', '');
+  RegisterPropertyToSkip(TCustomComboBox, 'BevelKind', 'VCL compatibility property', '');
+  RegisterPropertyToSkip(TCustomComboBox, 'BevelOuter', 'VCL compatibility property', '');
   RegisterCustomComboBox;
 end;
 
diff --git a/lcl/include/customlistview.inc b/lcl/include/customlistview.inc
index f86fef6aee..2af20fa2d6 100644
--- a/lcl/include/customlistview.inc
+++ b/lcl/include/customlistview.inc
@@ -417,6 +417,7 @@ end;
 class procedure TCustomListView.WSRegisterClass;
 begin
   inherited WSRegisterClass;
+  RegisterPropertyToSkip(TListColumn, 'WidthType', 'VCL compatibility property', '');
   RegisterCustomListView;
 end;
 
diff --git a/lcl/include/pagecontrol.inc b/lcl/include/pagecontrol.inc
index cb14d81cdd..bd0e8aaac8 100644
--- a/lcl/include/pagecontrol.inc
+++ b/lcl/include/pagecontrol.inc
@@ -74,6 +74,9 @@ end;
 class procedure TPageControl.WSRegisterClass;
 begin
   inherited WSRegisterClass;
+  RegisterPropertyToSkip(TPageControl, 'Style', 'VCL compatibility property', '');
+  RegisterPropertyToSkip(TPageControl, 'HotTrack', 'VCL compatibility property', '');
+  RegisterPropertyToSkip(TPageControl, 'MultiLine', 'VCL compatibility property', '');
   RegisterPageControl;
 end;
 
diff --git a/lcl/include/statusbar.inc b/lcl/include/statusbar.inc
index fbfa396793..6c9b775a93 100644
--- a/lcl/include/statusbar.inc
+++ b/lcl/include/statusbar.inc
@@ -69,6 +69,8 @@ end;
 class procedure TStatusBar.WSRegisterClass;
 begin
   inherited WSRegisterClass;
+  RegisterPropertyToSkip(TStatusBar, 'Font', 'VCL compatibility property', '');
+  RegisterPropertyToSkip(TStatusBar, 'UseSystemFont', 'VCL compatibility property', '');
   RegisterStatusBar;
 end;
 
diff --git a/lcl/include/trackbar.inc b/lcl/include/trackbar.inc
index 880ffa3e1e..5ed698c396 100644
--- a/lcl/include/trackbar.inc
+++ b/lcl/include/trackbar.inc
@@ -290,6 +290,9 @@ end;
 class procedure TCustomTrackBar.WSRegisterClass;
 begin
   inherited WSRegisterClass;
+  RegisterPropertyToSkip(TCustomTrackBar, 'SelStart', 'VCL compatibility property', '');
+  RegisterPropertyToSkip(TCustomTrackBar, 'SelEnd', 'VCL compatibility property', '');
+  RegisterPropertyToSkip(TCustomTrackBar, 'ThumbLength', 'VCL compatibility property', '');
   RegisterCustomTrackBar;
 end;