Index: Source/DesignTime/GLSceneForm.pas
===================================================================
--- Source/DesignTime/GLSceneForm.pas	(revision 7332)
+++ Source/DesignTime/GLSceneForm.pas	(working copy)
@@ -139,6 +139,7 @@
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
+    class procedure WSRegisterClass; override;
     procedure DestroyWnd; override;
 
     property IsRenderingContextAvailable: Boolean read
@@ -219,6 +220,17 @@
   inherited Destroy;
 end;
 
+class procedure TGLSceneForm.WSRegisterClass;
+const
+  Registered : Boolean = False;
+begin
+  if Registered then
+    Exit;
+  inherited WSRegisterClass;
+  RegisterWSComponent(TGLSceneForm, TGLSOpenGLForm);
+  Registered := True;
+end;
+
 // Notification
 //
 
@@ -793,7 +805,7 @@
 
 procedure GLRegisterWSComponent(aControl: TComponentClass);
 begin
-  RegisterWSComponent(aControl, TGLSOpenGLForm);
+//  RegisterWSComponent(aControl, TGLSOpenGLForm);
 end;
 {$endif}
 
Index: Source/GLViewer.pas
===================================================================
--- Source/GLViewer.pas	(revision 7332)
+++ Source/GLViewer.pas	(working copy)
@@ -29,14 +29,19 @@
 {$I GLScene.inc}
 
 uses
-  GLContext,
+  GLContext, WSLCLClasses, GLWidgetContext,
 
   GLLCLViewer;
 type
 
-  TGLSceneViewer = GLLCLViewer.TGLSceneViewer;
+  { TGLSceneViewer }
 
+  TGLSceneViewer = class(GLLCLViewer.TGLSceneViewer)
+  public
+    class procedure WSRegisterClass; override;
+  end;
 
+
 procedure SetupVSync(const AVSyncMode : TVSyncMode);
 
 implementation
@@ -60,6 +65,20 @@
     end;
   end;
 end;
+
+{ TGLSceneViewer }
+
+class procedure TGLSceneViewer.WSRegisterClass;
+const
+  Registered : Boolean = False;
+begin
+  if Registered then
+    Exit;
+  inherited WSRegisterClass;
+  RegisterWSComponent(TGLSceneViewer, TGLSOpenGLControl);
+  Registered := True;
+end;
+
 {$ENDIF}
 {$IFDEF Linux}
 begin
Index: Source/Plateform/GLWidgetContext.pas
===================================================================
--- Source/Plateform/GLWidgetContext.pas	(revision 7332)
+++ Source/Plateform/GLWidgetContext.pas	(working copy)
@@ -258,7 +258,7 @@
 
 procedure GLRegisterWSComponent(aControl: TComponentClass);
 begin
-  RegisterWSComponent(aControl, TGLSOpenGLControl);
+//  RegisterWSComponent(aControl, TGLSOpenGLControl);
 end;
 {$ENDIF}