diff --git a/examples/androidlcl/mainform.lfm b/examples/androidlcl/mainform.lfm
index f2f8b7bf3f..6f9080fbc0 100644
--- a/examples/androidlcl/mainform.lfm
+++ b/examples/androidlcl/mainform.lfm
@@ -17,7 +17,9 @@ object Form1: TForm1
     Top = 64
     Width = 79
     OnClick = Arrow1Click
+    OnMouseMove = Arrow1MouseMove
     OnMouseDown = Arrow1MouseDown
+    OnMouseUp = Arrow1MouseUp
   end
   object Button1: TButton
     Left = 96
@@ -46,9 +48,9 @@ object Form1: TForm1
   end
   object CheckBox1: TCheckBox
     Left = 72
-    Height = 21
+    Height = 18
     Top = 48
-    Width = 94
+    Width = 91
     Caption = 'CheckBox1'
     TabOrder = 4
   end
diff --git a/examples/androidlcl/mainform.pas b/examples/androidlcl/mainform.pas
index d34c0c3d75..9548550bf3 100644
--- a/examples/androidlcl/mainform.pas
+++ b/examples/androidlcl/mainform.pas
@@ -22,6 +22,10 @@ type
     procedure Arrow1Click(Sender: TObject);
     procedure Arrow1MouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
+    procedure Arrow1MouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer
+      );
+    procedure Arrow1MouseUp(Sender: TObject; Button: TMouseButton;
+      Shift: TShiftState; X, Y: Integer);
     procedure Button1Click(Sender: TObject);
     procedure FormClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
@@ -42,8 +46,8 @@ type
     procedure MouseDown(Button: TMouseButton; Shift:TShiftState; X,Y:Integer); override;
     procedure MouseMove(Shift: TShiftState; X,Y: Integer); override;
     procedure MouseUp(Button: TMouseButton; Shift:TShiftState; X,Y:Integer); override;
- {   procedure MouseEnter; virtual;
-    procedure MouseLeave; virtual;}
+    procedure MouseEnter; override;
+    procedure MouseLeave; override;
     procedure Paint; override;
   end;
 
@@ -57,18 +61,28 @@ implementation
 procedure TSubControl.MouseDown(Button: TMouseButton; Shift: TShiftState; X,
   Y: Integer);
 begin
-  DebugLn('TSubControl.MouseDown');
+  DebugLn(Format('TSubControl.Mouse Down X=%d Y=%d', [X, Y]));
 end;
 
 procedure TSubControl.MouseMove(Shift: TShiftState; X, Y: Integer);
 begin
-  DebugLn('TSubControl.MouseMove');
+  DebugLn(Format('TSubControl.Mouse Move X=%d Y=%d', [X, Y]));
 end;
 
 procedure TSubControl.MouseUp(Button: TMouseButton; Shift: TShiftState; X,
   Y: Integer);
 begin
-  DebugLn('TSubControl.MouseUp');
+  DebugLn(Format('TSubControl.Mouse Up X=%d Y=%d', [X, Y]));
+end;
+
+procedure TSubControl.MouseEnter;
+begin
+  DebugLn('TSubControl.Mouse Enter');
+end;
+
+procedure TSubControl.MouseLeave;
+begin
+  DebugLn('TSubControl.Mouse Leave');
 end;
 
 procedure TSubControl.Paint;
@@ -97,7 +111,19 @@ end;
 procedure TForm1.Arrow1MouseDown(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; X, Y: Integer);
 begin
-  DebugLn('Arrow Mouse Down');
+  DebugLn(Format('Arrow Mouse Down X=%d Y=%d', [X, Y]));
+end;
+
+procedure TForm1.Arrow1MouseMove(Sender: TObject; Shift: TShiftState; X,
+  Y: Integer);
+begin
+  DebugLn(Format('Arrow Mouse Move X=%d Y=%d', [X, Y]));
+end;
+
+procedure TForm1.Arrow1MouseUp(Sender: TObject; Button: TMouseButton;
+  Shift: TShiftState; X, Y: Integer);
+begin
+  DebugLn(Format('Arrow Mouse Up X=%d Y=%d', [X, Y]));
 end;
 
 procedure TForm1.Button1Click(Sender: TObject);
@@ -108,12 +134,12 @@ end;
 
 procedure TForm1.FormCreate(Sender: TObject);
 begin
-{  SubControl := TSubControl.Create(Self);
-  SubControl.Left := 100;
-  SubControl.Top := 100;
+  SubControl := TSubControl.Create(Self);
+  SubControl.Left := 40;
+  SubControl.Top := 160;
   SubControl.Width := 100;
   SubControl.Height := 100;
-  SubControl.Parent := Self;}
+  SubControl.Parent := Self;
 end;
 
 procedure TForm1.FormMouseMove(Sender: TObject; Shift: TShiftState; X,
diff --git a/examples/androidlcl/nonandroidtest.lpi b/examples/androidlcl/nonandroidtest.lpi
index e5d9ae80dc..1f72b8ff3b 100644
--- a/examples/androidlcl/nonandroidtest.lpi
+++ b/examples/androidlcl/nonandroidtest.lpi
@@ -7,7 +7,6 @@
       <MainUnit Value="0"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
-      <Icon Value="0"/>
     </General>
     <i18n>
       <EnableI18N LFM="False"/>
@@ -18,9 +17,12 @@
     <MacroValues Count="1">
       <Macro1 Name="LCLWidgetType" Value="customdrawn"/>
     </MacroValues>
-    <BuildModes Count="2">
-      <Item1 Name="Default" Default="True"/>
+    <BuildModes Count="3">
+      <Item1 Name="CustomDrawn" Default="True"/>
       <Item2 Name="NotCustomDrawn">
+        <MacroValues Count="1">
+          <Macro1 Name="LCLWidgetType" Value="carbon"/>
+        </MacroValues>
         <CompilerOptions>
           <Version Value="11"/>
           <Target>
@@ -45,6 +47,34 @@
           </Other>
         </CompilerOptions>
       </Item2>
+      <Item3 Name="Cocoa">
+        <MacroValues Count="1">
+          <Macro1 Name="LCLWidgetType" Value="cocoa"/>
+        </MacroValues>
+        <CompilerOptions>
+          <Version Value="11"/>
+          <Target>
+            <Filename Value="nonandroidtest"/>
+          </Target>
+          <SearchPaths>
+            <IncludeFiles Value="$(ProjOutDir)"/>
+            <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
+          </SearchPaths>
+          <Linking>
+            <Options>
+              <Win32>
+                <GraphicApplication Value="True"/>
+              </Win32>
+            </Options>
+          </Linking>
+          <Other>
+            <CompilerMessages>
+              <UseMsgFile Value="True"/>
+            </CompilerMessages>
+            <CompilerPath Value="$(CompPath)"/>
+          </Other>
+        </CompilerOptions>
+      </Item3>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>