diff --git a/components/opengl/example/mainunit.lfm b/components/opengl/example/mainunit.lfm
index 33b0e3adc7..679671a30b 100644
--- a/components/opengl/example/mainunit.lfm
+++ b/components/opengl/example/mainunit.lfm
@@ -1,10 +1,22 @@
 object Form1: TForm1
-  Left = 419
+  Left = 302
   Height = 300
-  Top = 287
+  Top = 181
   Width = 400
   HorzScrollBar.Page = 399
   VertScrollBar.Page = 299
   Caption = 'Form1'
+  ClientHeight = 300
+  ClientWidth = 400
   OnCreate = FormCreate
+  LCLVersion = '2.1.0.0'
+  object Panel1: TPanel
+    Left = 97
+    Height = 50
+    Top = 49
+    Width = 170
+    Caption = 'Panel1'
+    TabOrder = 0
+    OnMouseMove = Panel1MouseMove
+  end
 end
diff --git a/components/opengl/example/testopenglcontext1.lpi b/components/opengl/example/testopenglcontext1.lpi
index 6db09b21a6..697c78bd13 100644
--- a/components/opengl/example/testopenglcontext1.lpi
+++ b/components/opengl/example/testopenglcontext1.lpi
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <ResourceType Value="res"/>
     </General>
     <BuildModes Count="1">
@@ -16,15 +16,19 @@
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
@@ -44,6 +48,7 @@
         <Filename Value="mainunit.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="MainUnit"/>
       </Unit1>
@@ -57,6 +62,9 @@
       </SyntaxOptions>
     </Parsing>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf2"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/opengl/glcocoanscontext.pas b/components/opengl/glcocoanscontext.pas
index 2eba0458c1..8c6cd10fc0 100644
--- a/components/opengl/glcocoanscontext.pas
+++ b/components/opengl/glcocoanscontext.pas
@@ -94,10 +94,6 @@ type
     procedure mouseExited(event: NSEvent); override;
     procedure mouseMoved(event: NSEvent); override;
     procedure scrollWheel(event: NSEvent); override;
-    // key
-    procedure keyDown(event: NSEvent); override;
-    procedure keyUp(event: NSEvent); override;
-    procedure flagsChanged(event: NSEvent); override;
     // other
     procedure resetCursorRects; override;
   end;
@@ -509,24 +505,6 @@ begin
     else inherited scrollWheel(event);
 end;
 
-procedure TCocoaOpenGLView.keyDown(event: NSEvent);
-begin
-  if not Assigned(callback) or not callback.KeyEvent(event) then
-    inherited keyDown(event);
-end;
-
-procedure TCocoaOpenGLView.keyUp(event: NSEvent);
-begin
-  if not Assigned(callback) or not callback.KeyEvent(event) then
-    inherited keyUp(event);
-end;
-
-procedure TCocoaOpenGLView.flagsChanged(event: NSEvent);
-begin
-  if not Assigned(callback) or not callback.KeyEvent(event) then
-    inherited flagsChanged(event);
-end;
-
 procedure TCocoaOpenGLView.resetCursorRects;
 begin
   if not Assigned(callback) or not callback.resetCursorRects then