diff --git a/lcl/interfaces/fpgui/fpguiobject.inc b/lcl/interfaces/fpgui/fpguiobject.inc
index 9eb2a951ac..3701c35a82 100644
--- a/lcl/interfaces/fpgui/fpguiobject.inc
+++ b/lcl/interfaces/fpgui/fpguiobject.inc
@@ -91,7 +91,7 @@ var
   ControlType: Cardinal;
   ControlStyle: Cardinal;
   fpgRect: TfpgRect;
-  Style: TFButtonFlags;
+  Style: TfpgButtonFlags;
   (*
   DFC_CAPTION = $01;
   DFC_MENU = $02;
diff --git a/lcl/interfaces/fpgui/fpguiwsprivate.pp b/lcl/interfaces/fpgui/fpguiwsprivate.pp
index fc01e52ef3..67084def03 100644
--- a/lcl/interfaces/fpgui/fpguiwsprivate.pp
+++ b/lcl/interfaces/fpgui/fpguiwsprivate.pp
@@ -746,7 +746,7 @@ begin
 //  WidgetProtected.OnKeyPress    := KeyHandler;
 //  WidgetProtected.OnMouseEnter  := MouseEnterHandler;
 //  WidgetProtected.OnMouseExit   := MouseExitHandler;
-  WidgetProtected.OnPaint       := PaintHandler;
+//  WidgetProtected.OnPaint       := PaintHandler;
 //  WidgetProtected.OnMouseMove   := MouseMoveHandler;
 
   //WidgetProtected.OnMove  := MoveHandler;