From 469c195b08d429fbb21a3150295a03d5464baa25 Mon Sep 17 00:00:00 2001 From: paul Date: Tue, 29 May 2007 09:11:34 +0000 Subject: [PATCH] - fixed little bug in WS component reregistration (with new private) git-svn-id: trunk@11213 - --- lcl/widgetset/wslclclasses.pp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lcl/widgetset/wslclclasses.pp b/lcl/widgetset/wslclclasses.pp index d3a65b86e9..ba7abfe31b 100644 --- a/lcl/widgetset/wslclclasses.pp +++ b/lcl/widgetset/wslclclasses.pp @@ -243,9 +243,10 @@ procedure RegisterWSComponent(const AComponent: TComponentClass; end else begin // keep original WSPrivate (only when different than default class) - if (PClass(ANode^.VClass + vmtWSPrivate)^ <> nil) - and (PClass(ANode^.VClass + vmtWSPrivate)^ <> TWSPrivate) - then WSPrivate := PClass(ANode^.VClass + vmtWSPrivate)^; + if (AWSPrivate = nil) and + (PClass(ANode^.VClass + vmtWSPrivate)^ <> nil) and + (PClass(ANode^.VClass + vmtWSPrivate)^ <> TWSPrivate) then + WSPrivate := PClass(ANode^.VClass + vmtWSPrivate)^; end; // Initially copy the WSClass