diff --git a/components/tachart/demo/dragdrop/main.lfm b/components/tachart/demo/dragdrop/main.lfm
index 91598cc2b7..8367960798 100644
--- a/components/tachart/demo/dragdrop/main.lfm
+++ b/components/tachart/demo/dragdrop/main.lfm
@@ -6,7 +6,6 @@ object Form1: TForm1
   Caption = 'Form1'
   ClientHeight = 550
   ClientWidth = 539
-  OnActivate = FormActivate
   OnCreate = FormCreate
   Position = poScreenCenter
   LCLVersion = '1.1'
@@ -19,7 +18,6 @@ object Form1: TForm1
     Align = alClient
     TabIndex = 0
     TabOrder = 0
-    OnChange = PageControl1Change
     object tsPoints: TTabSheet
       Caption = 'Points'
       ClientHeight = 524
@@ -29,6 +27,7 @@ object Form1: TForm1
         Height = 490
         Top = 34
         Width = 531
+        AutoFocus = True
         AxisList = <        
           item
             Minors = <>
diff --git a/components/tachart/demo/dragdrop/main.pas b/components/tachart/demo/dragdrop/main.pas
index a2ff38b3eb..78ea3d5ad2 100644
--- a/components/tachart/demo/dragdrop/main.pas
+++ b/components/tachart/demo/dragdrop/main.pas
@@ -42,9 +42,7 @@ type
       APoint: TPoint);
     procedure ctPointsDataPointHintTool1Hint(ATool: TDataPointHintTool;
       const APoint: TPoint; var AHint: String);
-    procedure FormActivate(Sender: TObject);
     procedure FormCreate(Sender: TObject);
-    procedure PageControl1Change(Sender: TObject);
   end;
 
 var
@@ -62,7 +60,6 @@ uses
 procedure TForm1.cbSortedChange(Sender: TObject);
 begin
   chPointsLineSeries1.ListSource.Sorted := cbSorted.Checked;
-  chPoints.SetFocus;
 end;
 
 procedure TForm1.chPointsLineSeries1GetMark(
@@ -119,11 +116,6 @@ begin
   AHint := 'Custom hint for point ' + IntToStr(ATool.PointIndex);
 end;
 
-procedure TForm1.FormActivate(Sender: TObject);
-begin
-  PageControl1Change(nil);
-end;
-
 procedure TForm1.FormCreate(Sender: TObject);
 var
   i: Integer;
@@ -134,11 +126,5 @@ begin
   chBarsBarSeries1.ListSource.CopyFrom(RandomChartSource1);
 end;
 
-procedure TForm1.PageControl1Change(Sender: TObject);
-begin
-  if PageControl1.ActivePage = tsPoints then
-    chPoints.SetFocus;
-end;
-
 end.
 
diff --git a/components/tachart/demo/tools/main.lfm b/components/tachart/demo/tools/main.lfm
index 1fc51f5a29..f98cd121d7 100644
--- a/components/tachart/demo/tools/main.lfm
+++ b/components/tachart/demo/tools/main.lfm
@@ -7,12 +7,13 @@ object Form1: TForm1
   ClientHeight = 518
   ClientWidth = 554
   Position = poScreenCenter
-  LCLVersion = '0.9.31'
+  LCLVersion = '1.1'
   object Chart1: TChart
     Left = 0
     Height = 374
     Top = 0
     Width = 554
+    AutoFocus = True
     AxisList = <    
       item
         Minors = <>
@@ -222,7 +223,6 @@ object Form1: TForm1
     object ChartToolset1DataPointCrosshairTool1: TDataPointCrosshairTool
       Shift = [ssCtrl]
       OnAfterKeyUp = ChartToolset1DataPointCrosshairTool1AfterKeyUp
-      OnAfterMouseMove = ChartToolset1DataPointCrosshairTool1AfterMouseMove
       GrabRadius = 200
       OnDraw = ChartToolset1DataPointCrosshairTool1Draw
     end
diff --git a/components/tachart/demo/tools/main.pas b/components/tachart/demo/tools/main.pas
index faa40d520b..e59bc2b719 100644
--- a/components/tachart/demo/tools/main.pas
+++ b/components/tachart/demo/tools/main.pas
@@ -42,8 +42,6 @@ type
     procedure Chart1FuncSeries1Calculate(const AX: Double; out AY: Double);
     procedure ChartToolset1DataPointCrosshairTool1AfterKeyUp(ATool: TChartTool;
       APoint: TPoint);
-    procedure ChartToolset1DataPointCrosshairTool1AfterMouseMove(
-      ATool: TChartTool; APoint: TPoint);
     procedure ChartToolset1DataPointCrosshairTool1Draw(
       ASender: TDataPointCrosshairTool);
     procedure ChartToolset1DataPointDragTool1BeforeMouseMove(ATool: TChartTool;
@@ -94,13 +92,6 @@ begin
   ChartToolset1DataPointCrosshairTool1.Hide;
 end;
 
-procedure TForm1.ChartToolset1DataPointCrosshairTool1AfterMouseMove(
-  ATool: TChartTool; APoint: TPoint);
-begin
-  Unused(ATool, APoint);
-  Chart1.SetFocus;
-end;
-
 procedure TForm1.ChartToolset1DataPointCrosshairTool1Draw(
   ASender: TDataPointCrosshairTool);
 const
diff --git a/components/tachart/demo/tools/toolsdemo.lpi b/components/tachart/demo/tools/toolsdemo.lpi
index cf2bfa9177..8de22570f1 100644
--- a/components/tachart/demo/tools/toolsdemo.lpi
+++ b/components/tachart/demo/tools/toolsdemo.lpi
@@ -48,13 +48,14 @@
         <Filename Value="main.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="main"/>
       </Unit1>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <Target>
       <Filename Value="toolsdemo"/>
@@ -64,10 +65,6 @@
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
-      <Debugging>
-        <GenerateDebugInfo Value="True"/>
-        <DebugInfoType Value="dsAuto"/>
-      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>