diff --git a/components/opengl/example/testopenglcontext1.lpi b/components/opengl/example/testopenglcontext1.lpi
index b976a69f1d..93b35bad34 100644
--- a/components/opengl/example/testopenglcontext1.lpi
+++ b/components/opengl/example/testopenglcontext1.lpi
@@ -11,7 +11,7 @@
       <MainUnit Value="0"/>
       <IconPath Value="./"/>
       <TargetFileExt Value=""/>
-      <ActiveEditorIndexAtStart Value="0"/>
+      <ActiveEditorIndexAtStart Value="1"/>
     </General>
     <PublishOptions>
       <Version Value="2"/>
@@ -40,7 +40,7 @@
         <UnitName Value="TestOpenGLContext1"/>
         <CursorPos X="8" Y="10"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="2"/>
         <UsageCount Value="142"/>
         <Loaded Value="True"/>
       </Unit0>
@@ -50,7 +50,7 @@
         <IsPartOfProject Value="True"/>
         <ResourceFilename Value="mainunit.lrs"/>
         <UnitName Value="MainUnit"/>
-        <CursorPos X="29" Y="28"/>
+        <CursorPos X="16" Y="26"/>
         <TopLine Value="11"/>
         <EditorIndex Value="0"/>
         <UsageCount Value="142"/>
@@ -61,7 +61,7 @@
   <CompilerOptions>
     <Version Value="5"/>
     <SearchPaths>
-      <LCLWidgetType Value="gtk"/>
+      <LCLWidgetType Value="gtk2"/>
     </SearchPaths>
     <CodeGeneration>
       <Generate Value="Faster"/>
diff --git a/ide/main.pp b/ide/main.pp
index c97e84ad45..4e2d90f6e9 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -1391,7 +1391,7 @@ procedure TMainIDE.SetupSpeedButtons;
       B.Free;
       NumGlyphs := ANumGlyphs;
       Flat := True;
-      //Transparent:=True;
+      //Transparent:=true;
       if mfTop in AMoveFlags then Inc(ATop, Height);
       if mfLeft in AMoveFlags then Inc(ALeft, Width);
       Hint := AHint;
diff --git a/lcl/include/control.inc b/lcl/include/control.inc
index ff3a6ae44f..114cbd8857 100644
--- a/lcl/include/control.inc
+++ b/lcl/include/control.inc
@@ -2533,9 +2533,9 @@ begin
   Repaint;
 end;
 
-{------------------------------------------------------------------------------}
-{  TControl Repaint                                                            }
-{------------------------------------------------------------------------------}
+{------------------------------------------------------------------------------
+  TControl Repaint
+------------------------------------------------------------------------------}
 procedure TControl.Repaint;
 var
   DC: HDC;
diff --git a/lcl/include/winapih.inc b/lcl/include/winapih.inc
index d6ccb22609..94103f6979 100644
--- a/lcl/include/winapih.inc
+++ b/lcl/include/winapih.inc
@@ -235,13 +235,13 @@ function StretchDIBits(DC: HDC; DestX, DestY, DestWidth, DestHeight, SrcX,
   Usage: UINT; Rop: DWORD): Integer; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 function SystemParametersInfo(uiAction: DWord; uiParam: DWord; pvParam: Pointer; fWinIni: DWord): LongBool; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 
-Function TextOut(DC: HDC; X,Y : Integer; Str : Pchar; Count: Integer) : Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
+function TextOut(DC: HDC; X,Y : Integer; Str : Pchar; Count: Integer) : Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 
 function UpdateWindow(Handle: HWND): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 
 //function UnionRect --> independent
 
-Function WindowFromPoint(Point : TPoint) : HWND; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
+function WindowFromPoint(Point : TPoint) : HWND; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 //##apiwiz##eps##     // Do not remove
 {******************************************************************************
   Platform independent stuff
diff --git a/lcl/interfaces/gtk2/gtk2winapi.inc b/lcl/interfaces/gtk2/gtk2winapi.inc
index e222709ced..e2c7dd5869 100644
--- a/lcl/interfaces/gtk2/gtk2winapi.inc
+++ b/lcl/interfaces/gtk2/gtk2winapi.inc
@@ -525,6 +525,19 @@ begin
   end;
 end;
 
+function TGtk2WidgetSet.UpdateWindow(Handle: HWND): Boolean;
+var
+  CurWidget: PGtkWidget;
+begin
+  CurWidget:=PGTKWidget(Handle);
+  //DebugLn(['TGtk2WidgetSet.UpdateWindow ',GetWidgetDebugReport(CurWidget)]);
+  if GTK_WIDGET_DRAWABLE(CurWidget) then begin
+    //DebugLn(['TGtk2WidgetSet.UpdateWindow DRAWING']);
+    gtk_widget_queue_draw(CurWidget);
+    gdk_window_process_updates(CurWidget^.window,TRUE);
+  end;
+end;
+
 //##apiwiz##eps##   // Do not remove
 
 {$IfDef ASSERT_IS_ON}
diff --git a/lcl/interfaces/gtk2/gtk2winapih.inc b/lcl/interfaces/gtk2/gtk2winapih.inc
index 0cec4088c5..f76a214ebf 100644
--- a/lcl/interfaces/gtk2/gtk2winapih.inc
+++ b/lcl/interfaces/gtk2/gtk2winapih.inc
@@ -45,6 +45,8 @@ function GetCursorPos(var lpPoint: TPoint ): Boolean; override;
 function GetTextExtentPoint(DC: HDC; Str: PChar; Count: Integer; var Size: TSize): Boolean; override;
 
 function TextOut(DC: HDC; X,Y : Integer; Str : Pchar; Count: Integer) : Boolean; override;
-   
+
+function UpdateWindow(Handle: HWND): Boolean; override;
+
 
 //##apiwiz##eps##   // Do not remove, no wizard declaration after this line