Changeset 467

Timestamp:

Dec 1, 2023, 1:10:48 PM (5 months ago)

Author:

chronos

Message:

• Modified: DpiControls unit split into multiple units according to their LCL names.

Location:

branches/highdpi

Files:

• Back.pas (modified) (1 diff)
• Brain.pas (modified) (1 diff)
• Direct.lfm (modified) (1 diff)
• Direct.pas (modified) (1 diff)
• Inp.pas (modified) (1 diff)
• Integrated.lpr (modified) (1 diff)
• LocalPlayer/Battle.pas (modified) (1 diff)
• LocalPlayer/CityScreen.pas (modified) (1 diff)
• LocalPlayer/CityType.pas (modified) (1 diff)
• LocalPlayer/Diagram.pas (modified) (1 diff)
• LocalPlayer/Draft.pas (modified) (1 diff)
• LocalPlayer/Enhance.pas (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (1 diff)
• LocalPlayer/IsoEngine.pas (modified) (1 diff)
• LocalPlayer/LocalPlayer.pas (modified) (1 diff)
• LocalPlayer/MessgEx.pas (modified) (1 diff)
• LocalPlayer/NatStat.pas (modified) (1 diff)
• LocalPlayer/Nego.pas (modified) (1 diff)
• LocalPlayer/PVSB.pas (modified) (1 diff)
• LocalPlayer/Rates.pas (modified) (1 diff)
• LocalPlayer/Select.pas (modified) (1 diff)
• LocalPlayer/TechTree.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (1 diff)
• LocalPlayer/UnitStat.pas (modified) (1 diff)
• LocalPlayer/Wonders.pas (modified) (1 diff)
• Log.pas (modified) (1 diff)
• MiniMap.pas (modified) (1 diff)
• NoTerm.pas (modified) (1 diff)
• Packages/CevoComponents/Area.pas (modified) (1 diff)
• Packages/CevoComponents/BaseWin.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonA.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonB.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonBase.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonN.pas (modified) (1 diff)
• Packages/CevoComponents/DrawDlg.pas (modified) (1 diff)
• Packages/CevoComponents/EOTButton.pas (modified) (1 diff)
• Packages/CevoComponents/GraphicSet.pas (modified) (1 diff)
• Packages/CevoComponents/ScreenTools.pas (modified) (1 diff)
• Packages/CevoComponents/Sound.pas (modified) (1 diff)
• Packages/CevoComponents/Texture.pas (modified) (1 diff)
• Packages/Common/ApplicationInfo.pas (modified) (1 diff)
• Packages/Common/FormAbout.pas (modified) (1 diff)
• Packages/Common/JobProgressView.pas (modified) (1 diff)
• Packages/Common/LastOpenedList.pas (modified) (1 diff)
• Packages/Common/ListViewSort.pas (modified) (1 diff)
• Packages/Common/MetaCanvas.pas (modified) (1 diff)
• Packages/Common/PersistentForm.pas (modified) (1 diff)
• Packages/Common/PixelPointer.pas (modified) (1 diff)
• Packages/Common/ScaleDPI.pas (modified) (1 diff)
• Packages/Common/Theme.pas (modified) (1 diff)
• Packages/Common/Threading.pas (modified) (1 diff)
• Packages/Common/Translator.pas (modified) (1 diff)
• Packages/DpiControls/Dpi.ComCtrls.pas (added)
• Packages/DpiControls/Dpi.Common.pas (added)
• Packages/DpiControls/Dpi.Controls.pas (added)
• Packages/DpiControls/Dpi.ExtCtrls.pas (added)
• Packages/DpiControls/Dpi.Forms.pas (added)
• Packages/DpiControls/Dpi.Graphics.pas (added)
• Packages/DpiControls/Dpi.Grids.pas (added)
• Packages/DpiControls/Dpi.Menus.pas (added)
• Packages/DpiControls/Dpi.Spin.pas (added)
• Packages/DpiControls/Dpi.StdCtrls.pas (added)
• Packages/DpiControls/DpiControls.lpk (modified) (2 diffs)
• Packages/DpiControls/DpiControls.pas (modified) (4 diffs)
• Packages/DpiControls/DpiControlsPackage.pas (modified) (2 diffs)
• Settings.pas (modified) (1 diff)
• Start.pas (modified) (1 diff)

branches/highdpi/Back.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, LCLIntf, LCLType, SysUtils, Classes, Graphics, Forms, Controls;
+  Dpi.Forms, Dpi.Graphics,
+  LCLIntf, LCLType, SysUtils, Classes, Graphics, Forms, Controls;
 
 type

branches/highdpi/Brain.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, SysUtils, Generics.Collections, Graphics, Protocol, LazFileUtils,
+  Dpi.Graphics, Classes, SysUtils, Generics.Collections, Graphics, Protocol, LazFileUtils,
   dynlibs, Types;
 

branches/highdpi/Direct.lfm

@@ -10 +10 @@
   DesignTimePPI = 144
   Font.Color = clWindowText
-  Font.Height = -30
+  Font.Height = -45
   Font.Name = 'MS Sans Serif'
   FormStyle = fsStayOnTop

branches/highdpi/Direct.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, Messg,
-
-  LCLIntf, LCLType, {$IFDEF UNIX}LMessages, {$ENDIF}Messages, SysUtils, Classes,
-  Graphics, Controls, Forms, DrawDlg, GameServer;
+  Dpi.Forms,
+  Messg, LCLIntf, LCLType, {$IFDEF UNIX}LMessages, {$ENDIF}Messages, SysUtils,
+  Classes, Graphics, Controls, Forms, DrawDlg, GameServer;
 
 const

branches/highdpi/Inp.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, ScreenTools, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
+  Dpi.StdCtrls, Dpi.Forms,
+  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
   DrawDlg, ButtonA, StdCtrls;
 

branches/highdpi/Integrated.lpr

@@ -8 +8 @@
   Forms, Interfaces, SysUtils, Protocol, GameServer, Direct, Start, Messg, Inp,
   Back, Log, LocalPlayer, ClientTools, Tribes, IsoEngine, Term, CityScreen, Nego,
-  NoTerm, ScreenTools, Directories, DpiControls;
+  NoTerm, ScreenTools, Directories, Dpi.Forms;
 
 {$if declared(UseHeapTrace)}

branches/highdpi/LocalPlayer/Battle.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, ScreenTools, Protocol, ButtonBase, ButtonA, Types, LCLIntf, LCLType,
+  Dpi.Graphics, Dpi.Forms,
+  ScreenTools, Protocol, ButtonBase, ButtonA, Types, LCLIntf, LCLType,
   SysUtils, Classes, Graphics, Controls, Forms, DrawDlg, IsoEngine;
 

branches/highdpi/LocalPlayer/CityScreen.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, {$IFDEF UNIX}LMessages,{$ENDIF}
+  Dpi.Graphics, Dpi.Forms,
+  {$IFDEF UNIX}LMessages,{$ENDIF}
   Protocol, ClientTools, ScreenTools, IsoEngine, BaseWin, LCLIntf, LCLType,
   Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls, ButtonA,

branches/highdpi/LocalPlayer/CityType.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType,
+  Dpi.Forms,
+  Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType,
   SysUtils, Classes, Graphics, Controls, Forms, ButtonB, ExtCtrls;
 

branches/highdpi/LocalPlayer/Diagram.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, BaseWin, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
+  Dpi.Menus, Dpi.Graphics, Dpi.Forms,
+  BaseWin, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
   ButtonB, Menus;
 

branches/highdpi/LocalPlayer/Draft.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
+  Dpi.Graphics, Dpi.Forms,
+  Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
   Classes, Graphics, Controls, Forms, ExtCtrls, ButtonA, ButtonB, Area;
 

branches/highdpi/LocalPlayer/Enhance.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, ScreenTools, BaseWin, Protocol, ClientTools, LCLIntf, LCLType, SysUtils,
+  Dpi.Menus, ScreenTools, BaseWin, Protocol, ClientTools, LCLIntf, LCLType, SysUtils,
   Classes, Graphics, Controls, Forms, IsoEngine, ButtonB, ButtonC, Menus;
 

branches/highdpi/LocalPlayer/Help.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType,
+  Dpi.Graphics, Dpi.Common,
+  Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType,
   Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
   ButtonB, PVSB, Types, Generics.Collections, IsoEngine;

branches/highdpi/LocalPlayer/IsoEngine.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, Protocol, ClientTools, ScreenTools, Tribes, LCLIntf, LCLType, SysUtils,
+  Dpi.Graphics, Dpi.Common,
+  Protocol, ClientTools, ScreenTools, Tribes, LCLIntf, LCLType, SysUtils,
   Classes, Graphics, PixelPointer, GraphicSet;
 

branches/highdpi/LocalPlayer/LocalPlayer.pas

@@ -10 +10 @@
 
 uses
-  DpiControls, Term, CityScreen, Nego, BaseWin, Forms;
+  Dpi.Forms, Term, CityScreen, Nego, BaseWin, Forms;
 
 var

branches/highdpi/LocalPlayer/MessgEx.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, Messg, Protocol, ScreenTools, Platform, DateUtils, LCLIntf, LCLType, Messages,
+  Dpi.StdCtrls, Dpi.Graphics, Dpi.Forms, Dpi.Common,
+  Messg, Protocol, ScreenTools, Platform, DateUtils, LCLIntf, LCLType, Messages,
   SysUtils, Classes, Graphics, Controls, Forms, ButtonA, ButtonB, StdCtrls,
   DrawDlg, Help;

branches/highdpi/LocalPlayer/NatStat.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
+  Dpi.Menus, Dpi.Graphics,
+  Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
   Classes, Graphics, Controls, Forms, ButtonB, ButtonC, Menus, EOTButton;
 

branches/highdpi/LocalPlayer/Nego.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, ScreenTools, BaseWin, Protocol, LCLType, SysUtils, Classes, Graphics,
+  Dpi.Graphics, ScreenTools, BaseWin, Protocol, LCLType, SysUtils, Classes, Graphics,
   Controls, Forms, ButtonA, ButtonB, ButtonN;
 

branches/highdpi/LocalPlayer/PVSB.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, {$IFDEF WINDOWS}Windows,{$ENDIF}
+  Dpi.Controls, Dpi.StdCtrls,
+  {$IFDEF WINDOWS}Windows,{$ENDIF}
   Classes, Controls, Forms, LCLIntf, LCLType, LMessages, Messages, SysUtils,
   StdCtrls, Math;

branches/highdpi/LocalPlayer/Rates.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, Protocol, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils, Classes, Graphics,
+  Dpi.Forms,
+  Protocol, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils, Classes, Graphics,
   Controls, Forms, ButtonB, ButtonC;
 

branches/highdpi/LocalPlayer/Select.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, Protocol, ClientTools, ScreenTools, PVSB, BaseWin,
+  Dpi.Menus, Dpi.Graphics, Dpi.Common, Dpi.Forms,
+  Protocol, ClientTools, ScreenTools, PVSB, BaseWin,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   ExtCtrls, ButtonB, ButtonBase, Menus, Types;

branches/highdpi/LocalPlayer/TechTree.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, ScreenTools, LCLIntf, LCLType, SysUtils, Classes, Graphics,
+  Dpi.Graphics, Dpi.Forms,
+  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, Graphics,
   Controls, Forms, ButtonB, DrawDlg;
 

branches/highdpi/LocalPlayer/Term.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, {$IFDEF WINDOWS}
+  Dpi.Menus, Dpi.Graphics, Dpi.Forms, Dpi.Common, Dpi.Controls,
+{$IFDEF WINDOWS}
   Windows,
 {$ENDIF}

branches/highdpi/LocalPlayer/UnitStat.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
+  Dpi.Graphics, Dpi.Forms,
+  Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
   Classes, Graphics, Controls, Forms, ButtonB, ButtonC, IsoEngine;
 

branches/highdpi/LocalPlayer/Wonders.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, ScreenTools, BaseWin, Protocol, LCLIntf, LCLType, SysUtils, Classes, Graphics,
+  Dpi.Common, ScreenTools, BaseWin, Protocol, LCLIntf, LCLType, SysUtils, Classes, Graphics,
   Controls, Forms, ButtonB;
 

branches/highdpi/Log.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+  Dpi.Forms, Dpi.Menus, Dpi.StdCtrls,
+  LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   StdCtrls, Menus;
 

branches/highdpi/MiniMap.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, Classes, SysUtils, Graphics, Protocol, ClientTools;
+  Dpi.Graphics, Dpi.Common,
+  Classes, SysUtils, Graphics, Protocol, ClientTools;
 
 type

branches/highdpi/NoTerm.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, ScreenTools, Protocol, Messg, LCLIntf, LCLType, dateutils, Platform,
+  Dpi.Graphics, Dpi.Forms,
+  ScreenTools, Protocol, Messg, LCLIntf, LCLType, dateutils, Platform,
   SysUtils, Classes, Graphics, Controls, Forms, ButtonB, DrawDlg;
 

branches/highdpi/Packages/CevoComponents/Area.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, Graphics, Controls;
+  Dpi.Controls, Classes, Graphics, Controls;
 
 type

branches/highdpi/Packages/CevoComponents/BaseWin.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, ScreenTools, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
+  Dpi.Graphics, Dpi.Forms, Dpi.Common,
+  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms,
   DrawDlg;
 

branches/highdpi/Packages/CevoComponents/ButtonA.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, ButtonBase, Classes, Graphics, LCLIntf, LCLType, ScreenTools, Types;
+  Dpi.Graphics, ButtonBase, Classes, Graphics, LCLIntf, LCLType, ScreenTools, Types;
 
 type

branches/highdpi/Packages/CevoComponents/ButtonB.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, ButtonBase, Classes, Graphics, LCLIntf, LCLType;
+  Dpi.Graphics, ButtonBase, Classes, Graphics, LCLIntf, LCLType;
 
 type

branches/highdpi/Packages/CevoComponents/ButtonBase.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, Graphics, Controls;
+  Dpi.Graphics, Dpi.Controls, Classes, Graphics, Controls;
 
 type

branches/highdpi/Packages/CevoComponents/ButtonN.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, Graphics, Controls, LCLIntf, LCLType, ScreenTools;
+  Dpi.Controls, Dpi.Graphics,
+  Classes, Graphics, Controls, LCLIntf, LCLType, ScreenTools;
 
 type

branches/highdpi/Packages/CevoComponents/DrawDlg.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, SysUtils, Forms, LCLIntf, LCLType, {$IFDEF UNIX}LMessages,{$ENDIF}
+  Dpi.Forms, Dpi.Common,
+  Classes, SysUtils, Forms, LCLIntf, LCLType, {$IFDEF UNIX}LMessages,{$ENDIF}
   Messages, Graphics, Controls, ButtonBase, ButtonA, ButtonB, Area, ScreenTools
   {$IFDEF LCLGTK2}, Gtk2Globals{$ENDIF};

branches/highdpi/Packages/CevoComponents/EOTButton.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, ButtonBase, Classes, SysUtils, Graphics, LCLIntf, LCLType;
+  Dpi.Graphics,
+  ButtonBase, Classes, SysUtils, Graphics, LCLIntf, LCLType;
 
 const

branches/highdpi/Packages/CevoComponents/GraphicSet.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, SysUtils, Graphics, Generics.Collections, LCLType, DOM,
+  Dpi.Graphics, Classes, SysUtils, Graphics, Generics.Collections, LCLType, DOM,
   XMLRead, XMLWrite, XML;
 

branches/highdpi/Packages/CevoComponents/ScreenTools.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, {$IFDEF WINDOWS}
+  Dpi.Menus, Dpi.Graphics, Dpi.Forms, Dpi.Common,
+  {$IFDEF WINDOWS}
   Windows,
   {$ENDIF}

branches/highdpi/Packages/CevoComponents/Sound.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, SysUtils, Classes, Graphics, Controls, Forms, Generics.Collections, FileUtil,
+  Dpi.Forms,
+  SysUtils, Classes, Graphics, Controls, Forms, Generics.Collections, FileUtil,
   StringTables, Directories, LCLType
   {$IFDEF WINDOWS}, MMSystem, Windows{$ENDIF}

branches/highdpi/Packages/CevoComponents/Texture.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, SysUtils, Graphics;
+  Dpi.Graphics, Classes, SysUtils, Graphics;
 
 type

branches/highdpi/Packages/Common/ApplicationInfo.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, SysUtils, Classes, Forms, RegistryEx, Controls, Graphics, LCLType;
+  Dpi.Graphics, SysUtils, Classes, Dpi.Forms, RegistryEx, Controls, Graphics, LCLType;
 
 type

branches/highdpi/Packages/Common/FormAbout.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
+  Dpi.Forms, Dpi.ExtCtrls, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
   StdCtrls, ExtCtrls, ApplicationInfo, Common, Translator, Theme;
 

branches/highdpi/Packages/Common/JobProgressView.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, SysUtils, Variants, Classes, Graphics, Controls, Forms, Syncobjs,
-  Dialogs, ComCtrls, StdCtrls, ExtCtrls, Generics.Collections, Threading, Math,
-  DateUtils;
+  SysUtils, Variants, Classes, Graphics, Dpi.Controls, Dpi.Forms, Syncobjs,
+  Dialogs, Dpi.ComCtrls, StdCtrls, ExtCtrls, Generics.Collections, Threading, Math,
+  DateUtils, Dpi.StdCtrls, Dpi.ExtCtrls, Forms, ComCtrls;
 
 const

branches/highdpi/Packages/Common/LastOpenedList.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, SysUtils, Registry, RegistryEx, Menus, XMLConf, DOM;
+  Classes, SysUtils, Registry, RegistryEx, Dpi.Menus, XMLConf, DOM;
 
 type

branches/highdpi/Packages/Common/ListViewSort.pas

@@ -6 +6 @@
 
 uses
-  DpiControls, {$IFDEF Windows}Windows, CommCtrl, LMessages, {$ENDIF}Classes, Graphics, ComCtrls, SysUtils,
+  Dpi.ComCtrls, Dpi.Controls, Dpi.Grids,
+  {$IFDEF Windows}Windows, CommCtrl, LMessages, {$ENDIF}Classes, Graphics, ComCtrls, SysUtils,
   Controls, DateUtils, Dialogs, Forms, Grids, StdCtrls, ExtCtrls,
   LclIntf, LclType, LResources, Generics.Collections, Generics.Defaults;

branches/highdpi/Packages/Common/MetaCanvas.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, SysUtils, Graphics, Types, Generics.Collections;
+  Dpi.Graphics, Classes, SysUtils, Graphics, Types, Generics.Collections;
 
 type

branches/highdpi/Packages/Common/PersistentForm.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, SysUtils, Forms, RegistryEx, LCLIntf, Registry, Controls, ComCtrls,
+  Dpi.Controls, Dpi.Forms, Dpi.ComCtrls, Dpi.ExtCtrls,
+  Classes, SysUtils, Forms, RegistryEx, LCLIntf, Registry, Controls, ComCtrls,
   ExtCtrls, LCLType;
 

branches/highdpi/Packages/Common/PixelPointer.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, SysUtils, Graphics;
+  Dpi.Graphics, Classes, SysUtils, Graphics;
 
 type

branches/highdpi/Packages/Common/ScaleDPI.pas

@@ -6 +6 @@
 
 uses
-  DpiControls, Classes, Forms, Graphics, Controls, ComCtrls, LCLType, SysUtils,
+  Dpi.Controls, Dpi.ComCtrls, Dpi.Forms, Dpi.Graphics,
+  Classes, Forms, Graphics, Controls, ComCtrls, LCLType, SysUtils,
   Generics.Collections;
 

branches/highdpi/Packages/Common/Theme.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, SysUtils, Graphics, ComCtrls, Controls, ExtCtrls, Menus, StdCtrls,
+  Dpi.Forms, Dpi.Controls, Dpi.StdCtrls, Dpi.Spin, Dpi.ComCtrls, Dpi.Grids,
+  Classes, SysUtils, Graphics, ComCtrls, Controls, ExtCtrls, Menus, StdCtrls,
   Spin, Forms, Generics.Collections, Grids;
 

branches/highdpi/Packages/Common/Threading.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, SysUtils, Forms, Generics.Collections, SyncObjs;
+  Dpi.Forms, Classes, SysUtils, Generics.Collections, SyncObjs;
 
 type

branches/highdpi/Packages/Common/Translator.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, SysUtils, Forms, ExtCtrls, Controls, LazFileUtils, LazUTF8,
+  Dpi.Forms, Dpi.Controls,
+  Classes, SysUtils, Forms, ExtCtrls, Controls, LazFileUtils, LazUTF8,
   Translations, TypInfo, Dialogs, FileUtil, LCLProc, Languages, LCLType,
   LCLVersion, Generics.Collections;

branches/highdpi/Packages/DpiControls/DpiControls.lpk

@@ -19 +19 @@
     <License Value="Copyleft, public domain"/>
     <Version Minor="1"/>
-    <Files Count="3">
+    <Files Count="13">
       <Item1>
         <Filename Value="DpiControls.pas"/>
@@ -34 +34 @@
         <UnitName Value="DpiControlsPackage"/>
       </Item3>
+      <Item4>
+        <Filename Value="Dpi.Forms.pas"/>
+        <UnitName Value="Dpi.Forms"/>
+      </Item4>
+      <Item5>
+        <Filename Value="Dpi.Controls.pas"/>
+        <UnitName Value="Dpi.Controls"/>
+      </Item5>
+      <Item6>
+        <Filename Value="Dpi.Graphics.pas"/>
+        <UnitName Value="Dpi.Graphics"/>
+      </Item6>
+      <Item7>
+        <Filename Value="Dpi.Common.pas"/>
+        <UnitName Value="Dpi.Common"/>
+      </Item7>
+      <Item8>
+        <Filename Value="Dpi.Menus.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="Dpi.Menus"/>
+      </Item8>
+      <Item9>
+        <Filename Value="Dpi.ComCtrls.pas"/>
+        <UnitName Value="Dpi.ComCtrls"/>
+      </Item9>
+      <Item10>
+        <Filename Value="Dpi.StdCtrls.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="Dpi.StdCtrls"/>
+      </Item10>
+      <Item11>
+        <Filename Value="Dpi.ExtCtrls.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="Dpi.ExtCtrls"/>
+      </Item11>
+      <Item12>
+        <Filename Value="Dpi.Grids.pas"/>
+        <UnitName Value="Dpi.Grids"/>
+      </Item12>
+      <Item13>
+        <Filename Value="Dpi.Spin.pas"/>
+        <UnitName Value="Dpi.Spin"/>
+      </Item13>
     </Files>
     <CompatibilityMode Value="True"/>

branches/highdpi/Packages/DpiControls/DpiControls.pas

@@ -7 +7 @@
   Generics.Collections, FormEditingIntf, ProjectIntf, Controls, StdCtrls, Graphics,
   ComCtrls, ExtCtrls, LCLType, GraphType, Types, CustApp, LMessages, LCLIntf,
-  Menus, Math, PixelPointer2, Grids, Spin;
-
-const
-  FixedDpi = 192;
+  Menus, Math, PixelPointer2, Grids, Spin, Dpi.Forms, Dpi.Controls, Dpi.Graphics;
 
 type
-  TMessageEvent = procedure (var TheMessage : TLMessage) of object;
-
-  { TFormEx }
-
-  TFormEx = class(TForm)
-  private
-    FOnMessage: TMessageEvent;
-  protected
-    procedure WndProc(var TheMessage : TLMessage); override;
-    property OnMessage: TMessageEvent read FOnMessage write FOnMessage;
-  end;
-
-  { TGraphicControlEx }
-
-  TGraphicControlEx = class(TGraphicControl)
-  public
-    property OnPaint;
-    procedure Paint; override;
-  end;
-
-  { TControlEx }
-
-  TControlEx = class(TControl)
-  public
-    property OnMouseDown;
-    property OnMouseUp;
-    property OnMouseMove;
-    property OnMouseWheel;
-    property OnMouseLeave;
-    property OnMouseEnter;
-    property OnDblClick;
-    property ParentFont;
-  end;
-
-  TWinControlEx = class(TWinControl)
-  public
-    property BorderStyle;
-    property OnKeyDown;
-  end;
 
   { TDpiFormFileDesc }
@@ -63 +21 @@
   end;
 
-  { TDpiFont }
-
-  TDpiFont = class(TPersistent)
-  private
-    FNativeFont: TFont;
-    FNativeFontFree: Boolean;
-    FOnChange: TNotifyEvent;
-    FSize: Integer;
-    FHeight: Integer;
-    FPixelsPerInch: Integer;
-    FColor: TColor;
-    function GetCharSet: TFontCharSet;
-    function GetColor: TColor;
-    function GetHeight: Integer;
-    function GetName: string;
-    function GetPixelsPerInch: Integer;
-    function GetSize: Integer;
-    function GetStyle: TFontStyles;
-    function IsNameStored: Boolean;
-    procedure SetCharSet(AValue: TFontCharSet);
-    procedure SetColor(AValue: TColor);
-    procedure SetHeight(AValue: Integer);
-    procedure SetName(AValue: string);
-    procedure SetNativeFont(AValue: TFont);
-    procedure SetPixelsPerInch(AValue: Integer);
-    procedure SetSize(AValue: Integer);
-    procedure DoChange;
-    procedure SetStyle(AValue: TFontStyles);
-    procedure UpdateFont;
-  protected
-    procedure ScreenChanged;
-    function GetNativeFont: TFont; virtual;
-  public
-    property NativeFont: TFont read FNativeFont write SetNativeFont;
-    constructor Create;
-    destructor Destroy; override;
-    procedure Assign(Source: TPersistent); override;
-    procedure GetTextSize(Text: string; var w, h: Integer);
-    function GetTextHeight(Text: string): Integer;
-    function GetTextWidth(Text: string): Integer;
-  published
-    property CharSet: TFontCharSet read GetCharSet write SetCharSet default DEFAULT_CHARSET;
-    property Color: TColor read GetColor write SetColor;
-    property Name: string read GetName write SetName stored IsNameStored;
-    property Style: TFontStyles read GetStyle write SetStyle default [];
-    property Size: Integer read GetSize write SetSize stored false;
-    property PixelsPerInch: Integer read GetPixelsPerInch write SetPixelsPerInch;
-    property Height: Integer read GetHeight write SetHeight default 0;
-    property OnChange: TNotifyEvent read FOnChange write FOnChange;
-  end;
-
-  { TDpiSizeConstraints }
-
-  TDpiSizeConstraints = class(TPersistent)
-  private
-    FMaxHeight: TConstraintSize;
-    FMaxWidth: TConstraintSize;
-    FMinHeight: TConstraintSize;
-    FMinWidth: TConstraintSize;
-    procedure SetMaxHeight(AValue: TConstraintSize);
-    procedure SetMaxWidth(AValue: TConstraintSize);
-    procedure SetMinHeight(AValue: TConstraintSize);
-    procedure SetMinWidth(AValue: TConstraintSize);
-  published
-    property MaxHeight: TConstraintSize read FMaxHeight write SetMaxHeight default 0;
-    property MaxWidth: TConstraintSize read FMaxWidth write SetMaxWidth default 0;
-    property MinHeight: TConstraintSize read FMinHeight write SetMinHeight default 0;
-    property MinWidth: TConstraintSize read FMinWidth write SetMinWidth default 0;
-  end;
-
-
-  TDpiWinControl = class;
-  TDpiControlBorderSpacing = class;
-
-  { TDpiControl }
-
-  TDpiControl = class(TComponent)
-  private
-    FBorderSpacing: TDpiControlBorderSpacing;
-    FConstraints: TDpiSizeConstraints;
-    FFont: TDpiFont;
-    FHeight: Integer;
-    FLeft: Integer;
-    FOnChangeBounds: TNotifyEvent;
-    FOnMouseUp: TMouseEvent;
-    FOnMouseDown: TMouseEvent;
-    FOnMouseMove: TMouseMoveEvent;
-    FOnMouseEnter: TNotifyEvent;
-    FOnMouseLeave: TNotifyEvent;
-    FOnMouseWheel: TMouseWheelEvent;
-    FOnResize: TNotifyEvent;
-    FTop: Integer;
-    FWidth: Integer;
-    FParent: TDpiWinControl;
-    function GetAlign: TAlign;
-    function GetAnchors: TAnchors;
-    function GetAutoSize: Boolean;
-    function GetBoundsRect: TRect;
-    function GetClientHeight: Integer;
-    function GetClientWidth: Integer;
-    function GetColor: TColor;
-    function GetCursor: TCursor;
-    function GetEnabled: Boolean;
-    function GetHint: string;
-    function GetOnClick: TNotifyEvent;
-    function GetOnDblClick: TNotifyEvent;
-    function GetParentFont: Boolean;
-    function GetShowHint: Boolean;
-    function GetVisible: Boolean;
-    function GetWindowProc: TWndMethod;
-    function IsAnchorsStored: Boolean;
-    procedure SetAlign(AValue: TAlign);
-    procedure SetAnchors(AValue: TAnchors);
-    procedure SetAutoSize(AValue: Boolean);
-    procedure SetBorderSpacing(AValue: TDpiControlBorderSpacing);
-    procedure SetBoundsRect(AValue: TRect);
-    procedure SetClientHeight(AValue: Integer);
-    procedure SetClientWidth(AValue: Integer);
-    procedure SetColor(AValue: TColor);
-    procedure SetCursor(AValue: TCursor);
-    procedure SetEnabled(AValue: Boolean);
-    procedure SetFont(AValue: TDpiFont);
-    procedure SetHint(AValue: string);
-    procedure SetOnClick(AValue: TNotifyEvent);
-    procedure SetOnDblClick(AValue: TNotifyEvent);
-    procedure SetParentFont(AValue: Boolean);
-    procedure SetShowHint(AValue: Boolean);
-    procedure NativeFormResize(Sender: TObject);
-    procedure NativeChangeBounds(Sender: TObject);
-    procedure DoFormResize;
-    procedure DoChangeBounds;
-    procedure MouseDownHandler(Sender: TObject; Button: TMouseButton; Shift: TShiftState;
-      X, Y: Integer); virtual;
-    procedure MouseUpHandler(Sender: TObject; Button: TMouseButton; Shift: TShiftState;
-      X, Y: Integer); virtual;
-    procedure MouseMoveHandler(Sender: TObject; Shift: TShiftState; X, Y: Integer); virtual;
-    procedure MouseWheelHandler(Sender: TObject; Shift: TShiftState;
-         WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean); virtual;
-    procedure MouseLeaveHandler(Sender: TObject); virtual;
-    procedure MouseEnterHandler(Sender: TObject); virtual;
-    procedure SetWindowProc(AValue: TWndMethod);
-  protected
-    procedure DoBorderSpacingChange(Sender: TObject; InnerSpaceChanged: Boolean); virtual;
-    function GetText: TCaption; virtual;
-    procedure SetText(AValue: TCaption); virtual;
-    procedure UpdateBounds; virtual;
-    procedure FontChanged(Sender: TObject); virtual;
-    function GetCaption: string; virtual;
-    procedure SetParent(AValue: TDpiWinControl); virtual;
-    procedure SetCaption(AValue: string); virtual;
-    procedure SetHeight(AValue: Integer); virtual;
-    procedure SetLeft(AValue: Integer); virtual;
-    procedure SetTop(AValue: Integer); virtual;
-    procedure SetVisible(AValue: Boolean); virtual;
-    procedure SetWidth(AValue: Integer); virtual;
-    function GetNativeControl: TControl; virtual;
-    procedure UpdateNativeControl; virtual;
-    procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
-      X, Y: Integer); virtual;
-    procedure MouseUp(Button: TMouseButton; Shift: TShiftState;
-      X, Y: Integer); virtual;
-    procedure MouseMove(Shift: TShiftState; X, Y: Integer); virtual;
-    procedure MouseLeave; virtual;
-    procedure MouseEnter; virtual;
-    property Text: TCaption read GetText write SetText;
-    property ParentFont: Boolean read GetParentFont write SetParentFont default True;
-  public
-    function ScreenToClient(const APoint: TPoint): TPoint; virtual;
-    function ClientToScreen(const APoint: TPoint): TPoint; virtual;
-    procedure AddHandlerOnVisibleChanged(const OnVisibleChangedEvent: TNotifyEvent;
-                                         AsFirst: boolean = false);
-    procedure RemoveHandlerOnVisibleChanged(const OnVisibleChangedEvent: TNotifyEvent);
-    procedure ScreenChanged; virtual;
-    procedure SetBounds(ALeft, ATop, AWidth, AHeight: Integer); virtual;
-    procedure Show;
-    procedure Hide;
-    procedure Invalidate;
-    procedure Repaint;
-    procedure Update;
-    procedure Refresh;
-    function IsParentOf(AControl: TDpiControl): boolean; virtual;
-    function Scale96ToScreen(const ASize: Integer): Integer;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-    property Parent: TDpiWinControl read FParent write SetParent;
-    property BoundsRect: TRect read GetBoundsRect write SetBoundsRect;
-    property Visible: Boolean read GetVisible write SetVisible;
-    property Anchors: TAnchors read GetAnchors write SetAnchors stored IsAnchorsStored default [akLeft, akTop];
-    property BorderSpacing: TDpiControlBorderSpacing read FBorderSpacing write SetBorderSpacing;
-    property WindowProc: TWndMethod read GetWindowProc write SetWindowProc;
-  published
-    property AutoSize: Boolean read GetAutoSize write SetAutoSize default False;
-    property ClientHeight: Integer read GetClientHeight write SetClientHeight;
-    property ClientWidth: Integer read GetClientWidth write SetClientWidth;
-    property Hint: string read GetHint write SetHint;
-    property Top: Integer read FTop write SetTop;
-    property Left: Integer read FLeft write SetLeft;
-    property Width: Integer read FWidth write SetWidth;
-    property Height: Integer read FHeight write SetHeight;
-    property Caption: string read GetCaption write SetCaption;
-    property Enabled: Boolean read GetEnabled write SetEnabled;
-    property ShowHint: Boolean read GetShowHint write SetShowHint;
-    property Font: TDpiFont read FFont write SetFont;
-    property Align: TAlign read GetAlign write SetAlign;
-    property Color: TColor read GetColor write SetColor;
-    property Constraints: TDpiSizeConstraints read FConstraints write FConstraints;
-    property Cursor: TCursor read GetCursor write SetCursor default crDefault;
-    property OnResize: TNotifyEvent read FOnResize write FOnResize;
-    property OnChangeBounds: TNotifyEvent read FOnChangeBounds write FOnChangeBounds;
-    property OnClick: TNotifyEvent read GetOnClick write SetOnClick;
-    property OnDblClick: TNotifyEvent read GetOnDblClick write SetOnDblClick;
-    property OnMouseDown: TMouseEvent read FOnMouseDown write FOnMouseDown;
-    property OnMouseMove: TMouseMoveEvent read FOnMouseMove write FOnMouseMove;
-    property OnMouseUp: TMouseEvent read FOnMouseUp write FOnMouseUp;
-    property OnMouseWheel: TMouseWheelEvent read FOnMouseWheel write FOnMouseWheel;
-  end;
-
-  TDpiControls = TObjectList<TDpiControl>;
-
-  { TDpiControlBorderSpacing }
-
-  TDpiControlBorderSpacing = class(TPersistent)
-  private
-    FAround: TSpacingSize;
-    FBottom: TSpacingSize;
-    FLeft: TSpacingSize;
-    FOnChange: TNotifyEvent;
-    FRight: TSpacingSize;
-    FTop: TSpacingSize;
-    FControl: TDpiControl;
-    FDefault: PControlBorderSpacingDefault;
-    function IsAroundStored: Boolean;
-    function IsBottomStored: Boolean;
-    function IsLeftStored: Boolean;
-    function IsRightStored: Boolean;
-    function IsTopStored: Boolean;
-    procedure SetAround(AValue: TSpacingSize);
-    procedure SetBottom(AValue: TSpacingSize);
-    procedure SetLeft(AValue: TSpacingSize);
-    procedure SetRight(AValue: TSpacingSize);
-    procedure SetTop(AValue: TSpacingSize);
-    procedure Change(InnerSpaceChanged: Boolean); virtual;
-  public
-    constructor Create(OwnerControl: TDpiControl; ADefault: PControlBorderSpacingDefault = nil);
-  published
-    property OnChange: TNotifyEvent read FOnChange write FOnChange;
-    property Around: TSpacingSize read FAround write SetAround stored IsAroundStored;
-    property Left: TSpacingSize read FLeft write SetLeft stored IsLeftStored;
-    property Top: TSpacingSize read FTop write SetTop stored IsTopStored;
-    property Right: TSpacingSize read FRight write SetRight stored IsRightStored;
-    property Bottom: TSpacingSize read FBottom write SetBottom stored IsBottomStored;
-  end;
-
-  { TDpiGraphic }
-
-  TDpiGraphic = class(TPersistent)
-  protected
-    FDpi: Integer;
-    function GetNativeGraphic: TGraphic; virtual;
-    function GetWidth: Integer; virtual; abstract;
-    function GetHeight: Integer; virtual; abstract;
-    procedure SetWidth(Value: Integer); virtual; abstract;
-    procedure SetHeight(Value: Integer); virtual; abstract;
-    procedure ScreenChanged; virtual;
-    procedure SetDpi(AValue: Integer); virtual;
-    function GetDpi: Integer; virtual;
-  public
-    NativeGraphicClass: TGraphicClass;
-    constructor Create; virtual;
-    procedure LoadFromFile(const Filename: string); virtual;
-    procedure SaveToFile(const Filename: string); virtual;
-    property Width: Integer read GetWidth write SetWidth;
-    property Height: Integer read GetHeight write SetHeight;
-    property Dpi: Integer read GetDpi write SetDpi;
-  end;
-
-  { TDpiRasterImage }
-
-  TDpiRasterImage = class(TDpiGraphic)
-  private
-    function GetRawImage: TRawImage;
-  protected
-    function GetNativeGraphic: TGraphic; override;
-    function GetNativeRasterImage: TRasterImage; virtual;
-  public
-    procedure BeginUpdate(ACanvasOnly: Boolean = False);
-    procedure EndUpdate(AStreamIsValid: Boolean = False);
-    property RawImage: TRawImage read GetRawImage;
-  end;
-
-  { TDpiPen }
-
-  TDpiPen = class
-    FWidth: Integer;
-    FNativePen: TPen;
-    FNativePenFree: Boolean;
-  private
-    function GetColor: TColor;
-    function GetStyle: TPenStyle;
-    function GetWidth: Integer;
-    procedure SetColor(AValue: TColor);
-    procedure SetNativePen(AValue: TPen);
-    procedure SetStyle(AValue: TPenStyle);
-    procedure SetWidth(AValue: Integer);
-  public
-    constructor Create;
-    destructor Destroy; override;
-    function GetNativePen: TPen;
-    procedure Assign(Source: TDpiPen);
-    property NativePen: TPen read FNativePen write SetNativePen;
-  published
-    property Color: TColor read GetColor write SetColor default clBlack;
-    property Style : TPenStyle read GetStyle write SetStyle default psSolid;
-    property Width: Integer read GetWidth write SetWidth default 1;
-  end;
-
-  { TDpiBrush }
-
-  TDpiBrush = class
-  private
-    FNativeBrush: TBrush;
-    FNativeBrushFree: Boolean;
-    function GetColor: TColor;
-    function GetStyle: TBrushStyle;
-    procedure SetColor(AValue: TColor);
-    function GetNativeBrush: TBrush;
-    procedure SetNativeBrush(AValue: TBrush);
-    procedure SetStyle(AValue: TBrushStyle);
-  public
-    constructor Create;
-    destructor Destroy; override;
-    procedure Assign(Source: TDpiBrush);
-    property NativeBrush: TBrush read FNativeBrush write SetNativeBrush;
-  published
-    property Color: TColor read GetColor write SetColor default clWhite;
-    property Style: TBrushStyle read GetStyle write SetStyle default bsSolid;
-  end;
-
-  { TDpiCanvas }
-
-  TDpiCanvas = class
-  private
-    FBrush: TDpiBrush;
-    FBrushFree: Boolean;
-    FPen: TDpiPen;
-    FPenFree: Boolean;
-    FFont: TDpiFont;
-    FFontFree: Boolean;
-    FNativeCanvas: TCanvas;
-    FNativeCanvasFree: Boolean;
-    function GetHandle: HDC;
-    function GetPixel(X, Y: Integer): TColor;
-    procedure SetBrush(AValue: TDpiBrush);
-    procedure SetFont(AValue: TDpiFont);
-    procedure SetHandle(AValue: HDC);
-    procedure SetPen(AValue: TDpiPen);
-    procedure SetPixel(X, Y: Integer; AValue: TColor);
-    procedure SetNativeCanvas(AValue: TCanvas);
-  protected
-    procedure DoLine(X1, Y1, X2, Y2: Integer); virtual;
-    procedure DoTextOut(X, Y: Integer; Text: string); virtual;
-    procedure DoRectangle(const Bounds: TRect); virtual;
-    procedure DoRectangleFill(const Bounds: TRect); virtual;
-    procedure DoPolygon(const Points: array of TPoint); virtual;
-    procedure CreateHandle; virtual;
-    procedure DoEllipse(const Bounds: TRect); virtual;
-    procedure DoMoveTo(X, Y: Integer); virtual;
-    procedure DoLineTo(X, Y: Integer); virtual;
-    procedure DoPolyline(const Points: array of TPoint); virtual;
-    procedure DoPolyBezier(Points: PPoint; NumPts: Integer;
-      Filled: Boolean = False; Continuous: Boolean = False); virtual;
-    procedure SetHeight(AValue: Integer); virtual;
-    procedure SetWidth(AValue: Integer); virtual;
-    function GetWidth: Integer; virtual;
-    function GetHeight: Integer; virtual;
-    function GetNativeCanvas: TCanvas; virtual;
-  public
-    property NativeCanvas: TCanvas read FNativeCanvas write SetNativeCanvas;
-    procedure RoundRect(const Rect: TRect; RX, RY: Integer); overload;
-    procedure RoundRect(X1, Y1, X2, Y2: Integer; RX,RY: Integer); overload; virtual;
-    procedure Polygon(const Points: array of TPoint; Winding: Boolean;
-      StartIndex: Integer = 0; NumPts: Integer = -1); overload;
-    procedure Polygon(Points: PPoint; NumPts: Integer; Winding: Boolean = False); virtual; overload;
-    procedure Polygon(const Points: array of TPoint); overload;
-    procedure PolyBezier(const Points: array of TPoint;
-      Filled: Boolean = False; Continuous: boolean = True); overload;
-    procedure PolyBezier(Points: PPoint; NumPts: Integer;
-      Filled: Boolean = False; Continuous: Boolean = True); virtual; overload;
-    procedure Polyline(const Points: array of TPoint); overload;
-    procedure Polyline(Points: PPoint; NumPts: Integer); virtual; overload;
-    procedure Ellipse(x1, y1, x2, y2: Integer); virtual; overload;
-    procedure Ellipse(const ARect: TRect); virtual; overload;
-    procedure StretchDraw(const DestRect: TRect; SrcGraphic: TGraphic); virtual; overload;
-    procedure StretchDraw(const DestRect: TRect; SrcGraphic: TDpiGraphic); virtual; overload;
-    procedure Pie(EllipseX1, EllipseY1, EllipseX2, EllipseY2,
-      StartX, StartY, EndX, EndY: Integer); virtual;
-    procedure FrameRect(Rect: TRect);
-    procedure Rectangle(X1, Y1, X2, Y2: Integer); overload;
-    procedure Rectangle(const ARect: TRect); overload;
-    function TextWidth(const Text: string): Integer;
-    function TextHeight(const Text: string): Integer;
-    function TextExtent(const Text: string): TSize; virtual;
-    procedure TextOut(X, Y: Integer; const Text: string); virtual;
-    procedure TextRect(ARect: TRect; X, Y: Integer; Text: string);
-    procedure MoveTo(X, Y: Integer);
-    procedure LineTo(X, Y: Integer);
-    procedure Line(const p1, p2: TPoint);
-    procedure FillRect(const ARect: TRect); virtual; overload;
-    procedure FillRect(X1, Y1, X2, Y2: Integer); overload;
-    procedure Draw(X, Y: Integer; Source: TDpiGraphic);
-    procedure CopyRect(Dest: TRect; SrcCanvas: TDpiCanvas; Source: TRect);
-    constructor Create;
-    destructor Destroy; override;
-    property Handle: HDC read GetHandle write SetHandle;
-    property Pixels[X, Y: Integer]: TColor read GetPixel write SetPixel;
-    property Width: Integer read GetWidth;
-    property Height: Integer read GetHeight;
-  published
-    property Brush: TDpiBrush read FBrush write SetBrush;
-    property Pen: TDpiPen read FPen write SetPen;
-    property Font: TDpiFont read FFont write SetFont;
-  end;
-
-  { TDpiGraphicControl }
-
-  TDpiGraphicControl = class(TDpiControl)
-  private
-    FOnPaint: TNotifyEvent;
-    NativeGraphicControl: TGraphicControl;
-    FCanvas: TDpiCanvas;
-    function GetOnPaint: TNotifyEvent;
-    procedure SetCanvas(AValue: TDpiCanvas);
-    procedure PaintHandler(Sender: TObject);
-    procedure SetOnPaint(AValue: TNotifyEvent);
-  protected
-    procedure Paint; virtual;
-    function GetNativeControl: TControl; override;
-    function GetNativeGraphicControl: TGraphicControl; virtual;
-    procedure UpdateNativeControl; override;
-    property OnPaint: TNotifyEvent read GetOnPaint write SetOnPaint;
-  public
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-  published
-    property Canvas: TDpiCanvas read FCanvas write SetCanvas;
-  end;
-
-  { TDpiWinControl }
-
-  TDpiWinControl = class(TDpiControl)
-  private
-    FOnKeyDown: TKeyEvent;
-    function GetBorderStyle: TBorderStyle;
-    function GetHandle: HWND;
-    function GetOnKeyDown: TKeyEvent;
-    function GetOnKeyPress: TKeyPressEvent;
-    function GetOnKeyUp: TKeyEvent;
-    function GetTabOrder: TTabOrder;
-    function GetTabStop: Boolean;
-    procedure SetBorderStyle(AValue: TBorderStyle);
-    procedure SetHandle(AValue: HWND);
-    procedure SetOnKeyDown(AValue: TKeyEvent);
-    procedure SetOnKeyPress(AValue: TKeyPressEvent);
-    procedure SetOnKeyUp(AValue: TKeyEvent);
-    procedure SetTabOrder(AValue: TTabOrder);
-    procedure SetTabStop(AValue: Boolean);
-    procedure KeyDownHandler(Sender: TObject; var Key: Word; Shift: TShiftState);
-  protected
-    procedure UpdateNativeControl; override;
-    function GetNativeControl: TControl; override;
-    function GetNativeWinControl: TWinControl; virtual;
-    property BorderStyle: TBorderStyle read GetBorderStyle write SetBorderStyle default bsNone;
-    procedure KeyDown(var Key: Word; Shift: TShiftState); virtual;
-  public
-    Controls: TDpiControls;
-    procedure ScreenChanged; override;
-    function ControlCount: Integer;
-    procedure SetFocus; virtual;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-    property Handle: HWND read GetHandle write SetHandle;
-  published
-    property TabOrder: TTabOrder read GetTabOrder write SetTabOrder default -1;
-    property TabStop: Boolean read GetTabStop write SetTabStop default False;
-    property OnKeyDown: TKeyEvent read FOnKeyDown write FOnKeyDown;
-    property OnKeyPress: TKeyPressEvent read GetOnKeyPress write SetOnKeyPress;
-    property OnKeyUp: TKeyEvent read GetOnKeyUp write SetOnKeyUp;
-  end;
-
-  { TDpiCustomControl }
-
-  TDpiCustomControl = class(TDpiWinControl)
-  private
-    FCanvas: TDpiCanvas;
-    function GetCanvas: TDpiCanvas;
-    function GetOnPaint: TNotifyEvent;
-    function GetPixelsPerInch: Integer;
-    procedure SetOnPaint(AValue: TNotifyEvent);
-    procedure SetPixelsPerInch(AValue: Integer);
-  protected
-    function GetNativeWinControl: TWinControl; override;
-    function GetNativeCustomControl: TCustomControl; virtual;
-  public
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-    property Canvas: TDpiCanvas read GetCanvas;
-  published
-    property PixelsPerInch: Integer read GetPixelsPerInch write SetPixelsPerInch stored False;
-    property OnPaint: TNotifyEvent read GetOnPaint write SetOnPaint;
-  end;
-
-  { TDpiControlScrollBar }
-
-  TDpiControlScrollBar = class(TPersistent)
-  private
-    function GetVisible: Boolean;
-    procedure SetVisible(AValue: Boolean);
-  published
-    property Visible: Boolean read GetVisible write SetVisible;
-  end;
-
-  { TDpiScrollingWinControl }
-
-  TDpiScrollingWinControl = class(TDpiCustomControl)
-  private
-    FHorzScrollBar: TDpiControlScrollBar;
-    FVertScrollBar: TDpiControlScrollBar;
-  protected
-    function GetNativeCustomControl: TCustomControl; override;
-    function GetNativeScrollingWinControl: TScrollingWinControl; virtual;
-  public
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-  published
-    property HorzScrollBar: TDpiControlScrollBar read FHorzScrollBar write FHorzScrollBar;
-    property VertScrollBar: TDpiControlScrollBar read FVertScrollBar write FVertScrollBar;
-  end;
-
-  { TDpiForm }
-
-  TDpiForm = class(TDpiScrollingWinControl)
-  private
-    FOnActivate: TNotifyEvent;
-    FOnClose: TCloseEvent;
-    FOnCloseQuery: TCloseQueryEvent;
-    FOnDeactivate: TNotifyEvent;
-    function GetBorderIcons: TBorderIcons;
-    function GetBorderStyle: TFormBorderStyle;
-    function GetDesignTimePPI: Integer;
-    function GetFormState: TFormState;
-    function GetFormStyle: TFormStyle;
-    function GetKeyPreview: Boolean;
-    function GetLCLVersion: string;
-    function GetModalResult: TModalResult;
-    function GetOnCloseQuery: TCloseQueryEvent;
-    function GetOnCreate: TNotifyEvent;
-    function GetOnDeactivate: TNotifyEvent;
-    function GetOnDestroy: TNotifyEvent;
-    function GetOnHide: TNotifyEvent;
-    function GetOnShow: TNotifyEvent;
-    function GetPosition: TPosition;
-    function GetRestoredHeight: Integer;
-    function GetRestoredLeft: Integer;
-    function GetRestoredTop: Integer;
-    function GetRestoredWidth: Integer;
-    function GetShowInTaskbar: TShowInTaskbar;
-    function GetWindowState: TWindowState;
-    procedure SetBorderIcons(AValue: TBorderIcons);
-    procedure SetBorderStyle(AValue: TFormBorderStyle);
-    procedure SetDesignTimePPI(AValue: Integer);
-    procedure SetFormStyle(AValue: TFormStyle);
-    procedure SetKeyPreview(AValue: Boolean);
-    procedure SetLCLVersion(AValue: string);
-    procedure SetModalResult(AValue: TModalResult);
-    procedure SetOnCloseQuery(AValue: TCloseQueryEvent);
-    procedure SetOnCreate(AValue: TNotifyEvent);
-    procedure SetOnDeactivate(AValue: TNotifyEvent);
-    procedure SetOnDestroy(AValue: TNotifyEvent);
-    procedure SetOnHide(AValue: TNotifyEvent);
-    procedure SetOnShow(AValue: TNotifyEvent);
-    procedure DoOnCreate;
-    procedure FormMessageHandler(var TheMessage: TLMessage);
-    procedure SetPosition(AValue: TPosition);
-    procedure SetShowInTaskBar(AValue: TShowInTaskbar);
-    procedure SetWindowState(AValue: TWindowState);
-    procedure ActivateHandler(Sender: TObject);
-    procedure DeactivateHandler(Sender: TObject);
-    procedure DoClose(var CloseAction: TCloseAction); virtual;
-    procedure CloseHandler(Sender: TObject; var CloseAction: TCloseAction);
-    procedure CloseQueryHandler(Sender : TObject; var CanClose : boolean);
-  protected
-    procedure CreateParams(var p: TCreateParams); virtual;
-    procedure GetChildren(Proc: TGetChildProc; Root: TComponent); override;
-    function GetNativeScrollingWinControl: TScrollingWinControl; override;
-    function GetNativeForm: TForm; virtual;
-    procedure UpdateNativeControl; override;
-  public
-    NativeForm: TForm;
-    procedure AfterConstruction; override;
-    property ModalResult: TModalResult read GetModalResult write SetModalResult;
-    function ShowModal: Integer; virtual;
-    procedure SetFocus; override;
-    procedure Close;
-    function CloseQuery: boolean; virtual;
-    procedure BringToFront;
-    procedure Release;
-    constructor Create(TheOwner: TComponent); override;
-    constructor CreateNew(AOwner: TComponent; Num: Integer = 0); virtual;
-    destructor Destroy; override;
-  published
-    property RestoredLeft: integer read GetRestoredLeft;
-    property RestoredTop: integer read GetRestoredTop;
-    property RestoredWidth: integer read GetRestoredWidth;
-    property RestoredHeight: integer read GetRestoredHeight;
-    property DesignTimePPI: Integer read GetDesignTimePPI write SetDesignTimePPI; // Not used
-    property FormState: TFormState read GetFormState;
-    property FormStyle: TFormStyle read GetFormStyle write SetFormStyle;
-    property BorderStyle: TFormBorderStyle read GetBorderStyle write SetBorderStyle default bsSizeable;
-    property BorderIcons: TBorderIcons read GetBorderIcons write SetBorderIcons;
-    property LCLVersion: string read GetLCLVersion write SetLCLVersion;
-    property KeyPreview: Boolean read GetKeyPreview write SetKeyPreview default False;
-    property Position: TPosition read GetPosition write SetPosition default poDesigned;
-    property WindowState: TWindowState read GetWindowState write SetWindowState default wsNormal;
-    property OnShow: TNotifyEvent read GetOnShow write SetOnShow;
-    property OnHide: TNotifyEvent read GetOnHide write SetOnHide;
-    property OnCreate: TNotifyEvent read GetOnCreate write SetOnCreate;
-    property OnDestroy: TNotifyEvent read GetOnDestroy write SetOnDestroy;
-    property OnActivate: TNotifyEvent read FOnActivate write FOnActivate;
-    property OnDeactivate: TNotifyEvent read FOnDeactivate write FOnDeactivate;
-    property OnClose: TCloseEvent read FOnClose write FOnClose;
-    property OnCloseQuery: TCloseQueryEvent read FOnCloseQuery write FOnCloseQuery;
-    property ClientHeight;
-    property ClientWidth;
-    property OnMouseUp;
-    property OnMouseDown;
-    property OnMouseMove;
-    property ShowInTaskBar: TShowInTaskbar read GetShowInTaskbar write SetShowInTaskBar
-                                        default stDefault;
-  end;
-
-  TDpiForms = TObjectList<TDpiForm>;
-
-  { TDpiEdit }
-
-  TDpiEdit = class(TDpiWinControl)
-  private
-    function GetSelLength: Integer;
-    function GetSelStart: Integer;
-    procedure SetSelLength(AValue: Integer);
-    procedure SetSelStart(AValue: Integer);
-  protected
-    function GetNativeWinControl: TWinControl; override;
-    function GetNativeEdit: TEdit; virtual;
-    function GetText: TCaption; override;
-    procedure SetText(AValue: TCaption); override;
-  public
-    NativeEdit: TEdit;
-    destructor Destroy; override;
-    property SelLength: Integer read GetSelLength write SetSelLength;
-    property SelStart: Integer read GetSelStart write SetSelStart;
-  published
-    property Text;
-    property BorderStyle default bsSingle;
-    property ParentFont;
-  end;
-
-  { TDpiButton }
-
-  TDpiButton = class(TDpiControl)
-  private
-  protected
-    function GetNativeControl: TControl; override;
-  public
-    NativeButton: TButton;
-    destructor Destroy; override;
-  published
-    property Visible;
-  end;
-
-  { TDpiListBox }
-
-  TDpiListBox = class(TDpiWinControl)
-  private
-    function GetBorderStyle: TBorderStyle;
-    function GetCount: Integer;
-    function GetExtendedSelect: Boolean;
-    function GetIntegralHeight: Boolean;
-    function GetItemHeight: Integer;
-    function GetItemIndex: Integer;
-    function GetItems: TStrings;
-    function GetOnSelectionChange: TSelectionChangeEvent;
-    function GetParentFont: Boolean;
-    function GetScrollWidth: Integer;
-    function GetTopIndex: Integer;
-    procedure SetBorderStyle(AValue: TBorderStyle);
-    procedure SetExtendedSelect(AValue: Boolean);
-    procedure SetIntegralHeight(AValue: Boolean);
-    procedure SetItemHeight(AValue: Integer);
-    procedure SetItemIndex(AValue: Integer);
-    procedure SetItems(AValue: TStrings);
-    procedure SetOnSelectionChange(AValue: TSelectionChangeEvent);
-    procedure SetParentFont(AValue: Boolean);
-    procedure SetScrollWidth(AValue: Integer);
-    procedure SetTopIndex(AValue: Integer);
-  protected
-    function GetNativeWinControl: TWinControl; override;
-    function GetNativeListBox: TListBox; virtual;
-  public
-    NativeListBox: TListBox;
-    destructor Destroy; override;
-    property ItemIndex: Integer read GetItemIndex write SetItemIndex;
-    property Items: TStrings read GetItems write SetItems;
-    property Count: Integer read GetCount;
-  published
-    property TopIndex: Integer read GetTopIndex write SetTopIndex default 0;
-    property ScrollWidth: Integer read GetScrollWidth write SetScrollWidth default 0;
-    property ParentFont: Boolean read GetParentFont write SetParentFont default True;
-    property ItemHeight: Integer read GetItemHeight write SetItemHeight;
-    property IntegralHeight: Boolean read GetIntegralHeight write SetIntegralHeight default False;
-    property ExtendedSelect: Boolean read GetExtendedSelect write SetExtendedSelect default true;
-    property BorderStyle: TBorderStyle read GetBorderStyle write SetBorderStyle default bsNone;
-    property Visible;
-    property Anchors;
-    property OnSelectionChange: TSelectionChangeEvent read GetOnSelectionChange
-                                                      write SetOnSelectionChange;
-  end;
-
-  { TDpiScrollBar }
-
-  TDpiScrollBar = class(TDpiControl)
-  private
-    function GetKind: TScrollBarKind;
-    function GetMax: Integer;
-    function GetMin: Integer;
-    function GetOnChange: TNotifyEvent;
-    function GetPageSize: Integer;
-    function GetPosition: Integer;
-    procedure SetKind(AValue: TScrollBarKind);
-    procedure SetMax(AValue: Integer);
-    procedure SetMin(AValue: Integer);
-    procedure SetOnChange(AValue: TNotifyEvent);
-    procedure SetPageSize(AValue: Integer);
-    procedure SetPosition(AValue: Integer);
-  protected
-    function GetNativeControl: TControl; override;
-  public
-    NativeScrollBar: TScrollBar;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-  published
-    property PageSize: Integer read GetPageSize write SetPageSize;
-    property Min: Integer read GetMin write SetMin;
-    property Max: Integer read GetMax write SetMax;
-    property Position: Integer read GetPosition write SetPosition;
-    property Kind: TScrollBarKind read GetKind write SetKind;
-    property OnChange: TNotifyEvent read GetOnChange write SetOnChange;
-    property Visible;
-  end;
-
-  { TDpiBitmap }
-
-  TDpiBitmap = class(TDpiRasterImage)
-  private
-    FCanvas: TDpiCanvas;
-    FWidth: Integer;
-    FHeight: Integer;
-    function GetCanvas: TDpiCanvas;
-    function GetPixelFormat: TPixelFormat;
-    function GetScanLine(Row: Integer): Pointer;
-    function GetTransparent: Boolean;
-    function GetTransparentColor: TColor;
-    procedure SetPixelFormat(AValue: TPixelFormat);
-    procedure SetTransparent(AValue: Boolean);
-    procedure SetTransparentColor(AValue: TColor);
-  protected
-    function GetHeight: Integer; override;
-    function GetWidth: Integer; override;
-    function GetNativeBitmap: TCustomBitmap; virtual;
-    function GetNativeRasterImage: TRasterImage; override;
-    procedure SetHeight(AValue: Integer); override;
-    procedure SetWidth(AValue: Integer); override;
-    procedure ScreenChanged; override;
-  public
-    NativeBitmap: TBitmap;
-    procedure BeginUpdate;
-    procedure EndUpdate;
-    procedure SetSize(AWidth, AHeight: Integer);
-    constructor Create; override;
-    destructor Destroy; override;
-    procedure Assign(Source: TPersistent); override;
-    property ScanLine[Row: Integer]: Pointer read GetScanLine;
-  published
-    property PixelFormat: TPixelFormat read GetPixelFormat write SetPixelFormat;
-    property Height: Integer read GetHeight write SetHeight;
-    property Width: Integer read GetWidth write SetWidth;
-    property Canvas: TDpiCanvas read GetCanvas;
-    property TransparentColor: TColor read GetTransparentColor
-                                      write SetTransparentColor default clDefault;
-    property Transparent: Boolean read GetTransparent write SetTransparent default False;
-  end;
-
-  { TDpiPicture }
-
-  TDpiPicture = class(TPersistent)
-  private
-    FBitmap: TDpiBitmap;
-    procedure SetBitmap(AValue: TDpiBitmap);
-  published
-    procedure LoadFromFile(FileName: string);
-    property Bitmpa: TDpiBitmap read FBitmap write SetBitmap;
-  end;
-
-  { TDpiImage }
-
-  TDpiImage = class(TDpiControl)
-  private
-    FDpiPicture: TDpiPicture;
-    FStretch: Boolean;
-    procedure SetPicture(AValue: TDpiPicture);
-    procedure SetStretch(AValue: Boolean);
-  protected
-  public
-    NativeImage: TImage;
-    function GetNativeControl: TControl; override;
-    destructor Destroy; override;
-  published
-    property Stretch: Boolean read FStretch write SetStretch;
-    property Picture: TDpiPicture read FDpiPicture write SetPicture;
-    property Visible;
-  end;
-
-  { TDpiPaintBox }
-
-  TDpiPaintBox = class(TDpiGraphicControl)
-  public
-    NativePaintBox: TPaintBox;
-    function GetNativeGraphicControl: TGraphicControl; override;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-  published
-    property OnPaint;
-    property Visible;
-  end;
-
-  TDpiCustomListView = class(TDpiWinControl)
-
-  end;
-
-  TDpiLVCustomDrawItemEvent = procedure(Sender: TDpiCustomListView; Item: TListItem;
-    State: TCustomDrawState; var DefaultDraw: Boolean) of object;
-
-  { TDpiListView }
-
-  TDpiListView = class(TDpiCustomListView)
-  private
-    FOnCustomDrawItem: TDpiLVCustomDrawItemEvent;
-    NativeListView: TListView;
-    function GetCanvas: TCanvas;
-    function GetColumns: TListColumns;
-    function GetItems: TListItems;
-    function GetOnChange: TLVChangeEvent;
-    function GetOnColumnClick: TLVColumnClickEvent;
-    function GetOnCustomDrawItem: TDpiLVCustomDrawItemEvent;
-    function GetProperty(AIndex: Integer): Boolean;
-    function GetViewStyle: TViewStyle;
-    procedure SetColumns(AValue: TListColumns);
-    procedure SetItems(AValue: TListItems);
-    procedure SetOnChange(AValue: TLVChangeEvent);
-    procedure SetOnColumnClick(AValue: TLVColumnClickEvent);
-    procedure SetOnCustomDrawItem(AValue: TDpiLVCustomDrawItemEvent);
-    procedure SetProperty(AIndex: Integer; AValue: Boolean);
-    procedure SetViewStyle(AValue: TViewStyle);
-    procedure DoCustomDrawItem(Sender: TCustomListView; Item: TListItem;
-      State: TCustomDrawState; var DefaultDraw: Boolean);
-  public
-    function GetItemAt(x,y: integer): TListItem;
-    function GetNativeListView: TListView;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-    property Columns: TListColumns read GetColumns write SetColumns;
-    property Items: TListItems read GetItems write SetItems;
-    property Canvas: TCanvas read GetCanvas;
-    property Checkboxes: Boolean index Ord(lvpCheckboxes) read GetProperty write SetProperty default False;
-  published
-    property OnColumnClick: TLVColumnClickEvent read GetOnColumnClick
-      write SetOnColumnClick;
-    property OnCustomDrawItem: TDpiLVCustomDrawItemEvent read GetOnCustomDrawItem
-      write SetOnCustomDrawItem;
-    property ViewStyle: TViewStyle read GetViewStyle write SetViewStyle default vsList;
-    property OnChange: TLVChangeEvent read GetOnChange write SetOnChange;
-  end;
-
-  { TDpiPanel }
-
-  TDpiPanel = class(TDpiWinControl)
-  private
-    NativePanel: TPanel;
-  public
-    function GetNativePanel: TPanel;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-  end;
-
-  { TDpiCustomDrawGrid }
-
-  TDpiCustomDrawGrid = class(TDpiWinControl)
-  private
-    NativeCustomDrawGrid: TCustomDrawGrid;
-    function GetEditor: TDpiWinControl;
-    procedure SetEditor(AValue: TDpiWinControl);
-  public
-    function GetNativeCustomDrawGrid: TCustomDrawGrid;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-    property Editor: TDpiWinControl read GetEditor write SetEditor;
-  end;
-
-  { TDpiPageControl }
-
-  TDpiPageControl = class(TDpiWinControl)
-  private
-    NativePageControl: TPageControl;
-    function GetPageCount: Integer;
-    function GetTabSheet(Index: Integer): TTabSheet;
-  public
-    function GetNativePageControl: TPageControl;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-    property PageCount: Integer read GetPageCount;
-    property Pages[Index: Integer]: TTabSheet read GetTabSheet;
-  end;
-
-  { TDpiRadioButton }
-
-  TDpiRadioButton = class(TDpiWinControl)
-  private
-    NativeRadioButton: TRadioButton;
-  public
-    function GetNativeRadioButton: TRadioButton;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-  end;
-
-  { TDpiSpinEdit }
-
-  TDpiSpinEdit = class(TDpiWinControl)
-  private
-    NativeSpinEdit: TSpinEdit;
-  public
-    function GetNativeSpinEdit: TSpinEdit;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-  end;
-
-  { TDpiComboBox }
-
-  TDpiComboBox = class(TDpiWinControl)
-  private
-    NativeComboBox: TComboBox;
-  public
-    function GetNativeComboBox: TComboBox;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-  end;
-
-  { TDpiCheckBox }
-
-  TDpiCheckBox = class(TDpiWinControl)
-  private
-    NativeCheckBox: TCheckBox;
-  public
-    function GetNativeCheckBox: TCheckBox;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-  end;
-
-  { TDpiMemo }
-
-  TDpiMemo = class(TDpiWinControl)
-  private
-    NativeMemo: TMemo;
-    function GetLines: TStrings;
-    function GetReadOnly: Boolean;
-    function GetScrollBars: TScrollStyle;
-    function GetWordWrap: Boolean;
-    procedure SetLines(AValue: TStrings);
-    procedure SetReadOnly(AValue: Boolean);
-    procedure SetScrollBars(AValue: TScrollStyle);
-    procedure SetWordWrap(AValue: Boolean);
-  protected
-    function GetNativeWinControl: TWinControl; override;
-    function GetNativeMemo: TMemo; virtual;
-  public
-    procedure Clear;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-  published
-    property Lines: TStrings read GetLines write SetLines;
-    property WordWrap: Boolean read GetWordWrap write SetWordWrap default True;
-    property ReadOnly: Boolean read GetReadOnly write SetReadOnly default False;
-    property ScrollBars: TScrollStyle read GetScrollBars write SetScrollBars default ssNone;
-  end;
-
-  { TDpiToolBar }
-
-  TDpiToolBar = class(TDpiCustomControl)
-  private
-    NativeToolBar: TToolBar;
-    function ButtonHeightIsStored: Boolean;
-    function ButtonWidthIsStored: Boolean;
-    function GetButtonHeight: Integer;
-    function GetButtonWidth: Integer;
-    procedure SetButtonHeight(AValue: Integer);
-    procedure SetButtonWidth(AValue: Integer);
-  public
-    function GetNativeToolBar: TToolBar;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-    property ButtonHeight: Integer read GetButtonHeight write SetButtonHeight stored ButtonHeightIsStored;
-    property ButtonWidth: Integer read GetButtonWidth write SetButtonWidth stored ButtonWidthIsStored;
-  end;
-
-  { TDpiCoolBand }
-
-  TDpiCoolBand = class(TDpiCustomControl)
-  private
-    NativeCoolBand: TCoolBand;
-    function GetMinHeight: Integer;
-    function GetMinWidth: Integer;
-    procedure SetMinHeight(AValue: Integer);
-    procedure SetMinWidth(AValue: Integer);
-  protected const
-    cDefMinHeight = 25;
-    cDefMinWidth = 100;
-  public
-    function GetNativeCoolBand: TCoolBand;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-    property MinHeight: Integer read GetMinHeight write SetMinHeight default cDefMinHeight;
-    property MinWidth: Integer read GetMinWidth write SetMinWidth default cDefMinWidth;
-  end;
-
-  { TDpiCoolBands }
-
-  TDpiCoolBands = class(TCollection)
-  private
-    procedure SetItem(Index: Integer; AValue: TDpiCoolBand);
-    function GetItem(Index: Integer): TDpiCoolBand;
-  public
-    property Items[Index: Integer]: TDpiCoolBand read GetItem write SetItem; default;
-  end;
-
-  { TDpiCoolBar }
-
-  TDpiCoolBar = class(TDpiCustomControl)
-  private
-    NativeCoolBar: TCoolBar;
-    function GetBands: TDpiCoolBands;
-    function GetThemed: Boolean;
-    procedure SetBands(AValue: TDpiCoolBands);
-    procedure SetThemed(AValue: Boolean);
-  public
-    procedure BeginUpdate;
-    procedure EndUpdate;
-    function GetNativeCoolBar: TCoolBar;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-    property Bands: TDpiCoolBands read GetBands write SetBands;
-    property Themed: Boolean read GetThemed write SetThemed default True;
-  end;
-
-  { TDpiImageList }
-
-  TDpiImageList = class(TComponent)
-  private
-    NativeImageList: TImageList;
-    function GetCount: Integer;
-    function GetHeight: Integer;
-    function GetWidth: Integer;
-    procedure SetHeight(AValue: Integer);
-    procedure SetWidth(AValue: Integer);
-  public
-    function GetNativeImageList: TImageList;
-    procedure GetBitmap(Index: Integer; Image: TDpiBitmap);
-    procedure BeginUpdate;
-    procedure EndUpdate;
-    procedure Clear;
-    function Add(Image, Mask: TDpiBitmap): Integer;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-    property Width: Integer read GetWidth write SetWidth default 16;
-    property Height: Integer read GetHeight write SetHeight default 16;
-    property Count: Integer read GetCount;
-  end;
-
-  { TDpiStringGrid }
-
-  TDpiStringGrid = class(TDpiWinControl)
-  private
-    NativeStringGrid: TStringGrid;
-    function DefaultRowHeightIsStored: Boolean;
-    function GetCells(ACol, ARow: Integer): string;
-    function GetColCount: Integer;
-    function GetColumns: TGridColumns;
-    function GetDefRowHeight: Integer;
-    function GetEditor: TWinControl;
-    function GetFixedCols: Integer;
-    function GetFixedRows: Integer;
-    function GetOptions: TGridOptions;
-    function GetRowCount: Integer;
-    function GetScrollBars: TScrollStyle;
-    function GetSelection: TGridRect;
-    function IsColumnsStored: Boolean;
-    procedure SetCells(ACol, ARow: Integer; AValue: string);
-    procedure SetColCount(AValue: Integer);
-    procedure SetColumns(AValue: TGridColumns);
-    procedure SetDefRowHeight(AValue: Integer);
-    procedure SetEditor(AValue: TWinControl);
-    procedure SetFixedCols(AValue: Integer);
-    procedure SetFixedRows(AValue: Integer);
-    procedure SetOptions(AValue: TGridOptions);
-    procedure SetRowCount(AValue: Integer);
-    procedure SetScrollBars(AValue: TScrollStyle);
-    procedure SetSelection(AValue: TGridRect);
-  public
-    function GetNativeStringGrid: TStringGrid;
-    function CellRect(ACol, ARow: Integer): TRect;
-    constructor Create(TheOwner: TComponent); override;
-    destructor Destroy; override;
-    property Selection: TGridRect read GetSelection write SetSelection;
-    property Cells[ACol, ARow: Integer]: string read GetCells write SetCells;
-  published
-    property DefaultRowHeight: Integer read GetDefRowHeight write SetDefRowHeight stored DefaultRowHeightIsStored;
-    property ScrollBars: TScrollStyle read GetScrollBars write SetScrollBars default ssAutoBoth;
-    property FixedCols: Integer read GetFixedCols write SetFixedCols default 1;
-    property FixedRows: Integer read GetFixedRows write SetFixedRows default 1;
-    property RowCount: Integer read GetRowCount write SetRowCount default 5;
-    property ColCount: Integer read GetColCount write SetColCount default 5;
-    property Options: TGridOptions read GetOptions write SetOptions default DefaultGridOptions;
-    property Columns: TGridColumns read GetColumns write SetColumns stored IsColumnsStored;
-    property Editor: TWinControl read GetEditor write SetEditor;
-  end;
-
-  { TDpiScreen }
-
-  TDpiScreen = class
-  private
-    // TScreen
-    FDpi: Integer;
-    FActiveForm: TDpiForm;
-    FPrevActiveForms: TDpiForms;
-    FForms: TDpiForms;
-    procedure AddForm(AForm: TDpiForm);
-    function GetDesktopHeight: Integer;
-    function GetDesktopLeft: Integer;
-    function GetDesktopTop: Integer;
-    function GetDesktopWidth: Integer;
-    procedure RemoveForm(AForm: TDpiForm);
-    function GetActiveForm: TDpiForm;
-    function GetCursor: TCursor;
-    function GetCursors(Index: Integer): HCURSOR;
-    function GetFormCount: Integer;
-    function GetForms(Index: Integer): TDpiForm;
-    function GetHeight: Integer;
-    function GetWidth: Integer;
-    procedure SetCursor(AValue: TCursor);
-    procedure SetCursors(Index: Integer; AValue: HCURSOR);
-    procedure SetDpi(AValue: Integer);
-    procedure UpdateForms;
-  public
-    constructor Create;
-    destructor Destroy; override;
-    procedure UpdateScreen;
-    procedure UpdateActiveFormFromNativeScreen;
-    function DisableForms(SkipForm: TDpiForm; DisabledList: Classes.TList = nil): Classes.TList;
-    procedure EnableForms(var AFormList: Classes.TList);
-    property FormCount: Integer read GetFormCount;
-    property Forms[Index: Integer]: TDpiForm read GetForms;
-    property ActiveForm: TDpiForm read GetActiveForm;
-    property Cursor: TCursor read GetCursor write SetCursor;
-    property Cursors[Index: Integer]: HCURSOR read GetCursors write SetCursors;
-  published
-    property Dpi: Integer read FDpi write SetDpi;
-    property PixelsPerInch: Integer read FDpi;
-    property Width: Integer read GetWidth;
-    property Height: Integer read GetHeight;
-    property DesktopLeft: Integer read GetDesktopLeft;
-    property DesktopTop: Integer read GetDesktopTop;
-    property DesktopWidth: Integer read GetDesktopWidth;
-    property DesktopHeight: Integer read GetDesktopHeight;
-  end;
-
-  { TDpiJpegImage }
-
-  TDpiJpegImage = class(TDpiBitmap)
-  protected
-    function GetNativeBitmap: TCustomBitmap; override;
-    function GetNativeJpeg: TJPEGImage; virtual;
-  public
-    NativeJpeg: TJPEGImage;
-    constructor Create; override;
-    destructor Destroy; override;
-  end;
-
-  { TDpiPortableNetworkGraphic }
-
-  TDpiPortableNetworkGraphic = class(TDpiBitmap)
-  protected
-    function GetNativeBitmap: TCustomBitmap; override;
-    function GetNativePng: TPortableNetworkGraphic; virtual;
-  public
-    NativePng: TPortableNetworkGraphic;
-    constructor Create; override;
-    destructor Destroy; override;
-  end;
-
-  { TDpiApplication }
-
-  TDpiApplication = class(TComponent)
-  private
-    FMainForm: TDpiForm;
-    FCreatingForm: TDpiForm;
-    FOldExitProc: Pointer;
-    function GetActive: Boolean;
-    function GetExeName: string;
-    function GetShowMainForm: Boolean;
-    function GetTaskBarBehavior: TTaskBarBehavior;
-    function GetTitle: string;
-    procedure SetMainForm(AValue: TDpiForm);
-    function GetMainForm: TDpiForm;
-    procedure SetShowMainForm(AValue: Boolean);
-    procedure SetTaskBarBehavior(AValue: TTaskBarBehavior);
-    procedure SetTitle(AValue: string);
-  protected
-    function GetNativeApplication: TApplication; virtual;
-    procedure DoBeforeFinalization;
-  public
-    constructor Create(AOwner: TComponent); override;
-    destructor Destroy; override;
-    procedure Run;
-    procedure Initialize;
-    procedure Terminate;
-    procedure ProcessMessages;
-    procedure UpdateMainForm(AForm: TDpiForm);
-    procedure CreateForm(InstanceClass: TComponentClass; out Reference);
-    function MessageBox(Text, Caption: PChar; Flags: Longint = MB_OK): Integer;
-    property MainForm: TDpiForm read GetMainForm write SetMainForm;
-    property ShowMainForm: Boolean read GetShowMainForm write SetShowMainForm default True;
-    property Title: string read GetTitle write SetTitle;
-    property Active: Boolean read GetActive;
-    property ExeName: string read GetExeName;
-    property TaskBarBehavior: TTaskBarBehavior read GetTaskBarBehavior write SetTaskBarBehavior;
-  end;
-
-  { TDpiMouse }
-
-  // TMouse
-  TDpiMouse = class
-  private
-    function GetCursorPos: TPoint;
-    procedure SetCursorPos(AValue: TPoint);
-  public
-    constructor Create;
-    property CursorPos: TPoint read GetCursorPos write SetCursorPos;
-  end;
-
-  { TDpiMenuItem }
-
-  TDpiMenuItem = class(TComponent)
-  private
-    FItems: TList;
-    FParent: TDpiMenuItem;
-    FOnClick: TNotifyEvent;
-    function GetCaption: TTranslateString;
-    function GetChecked: Boolean;
-    function GetCount: Integer;
-    function GetEnabled: Boolean;
-    function GetGroupIndex: Byte;
-    function GetItem(Index: Integer): TDpiMenuItem;
-    function GetOnClick: TNotifyEvent;
-    function GetRadioItem: Boolean;
-    function GetShortCut: TShortCut;
-    function GetVisible: Boolean;
-    function IsCaptionStored: Boolean;
-    function IsCheckedStored: Boolean;
-    function IsEnabledStored: Boolean;
-    function IsShortCutStored: Boolean;
-    function IsVisibleStored: Boolean;
-    procedure SetCaption(AValue: TTranslateString);
-    procedure SetChecked(AValue: Boolean);
-    procedure SetEnabled(AValue: Boolean);
-    procedure SetGroupIndex(AValue: Byte);
-    procedure SetOnClick(AValue: TNotifyEvent);
-    procedure SetRadioItem(AValue: Boolean);
-    procedure SetShortCut(AValue: TShortCut);
-    procedure SetVisible(AValue: Boolean);
-    procedure OnClickHandler(Sender: TObject);
-  protected
-    function GetNativeMenuItem: TMenuItem; virtual;
-    procedure SetParentComponent(AValue: TComponent); override;
-  public
-    NativeMenuItem: TMenuItem;
-    constructor Create(AOwner: TComponent); override;
-    destructor Destroy; override;
-    procedure Delete(Index: Integer);
-    procedure Add(Item: TDpiMenuItem);
-    procedure Insert(Index: Integer; Item: TDpiMenuItem);
-    function IndexOf(Item: TDpiMenuItem): Integer;
-    procedure Remove(Item: TDpiMenuItem);
-    property Items[Index: Integer]: TDpiMenuItem read GetItem; default;
-    property Count: Integer read GetCount;
-    procedure Clear;
-    procedure Click; virtual;
-  published
-    property RadioItem: Boolean read GetRadioItem write SetRadioItem default False;
-    property ShortCut: TShortCut read GetShortCut write SetShortCut
-      stored IsShortCutStored default 0;
-    property Enabled: Boolean read GetEnabled write SetEnabled
-      stored IsEnabledStored default True;
-    property Visible: Boolean read GetVisible write SetVisible
-      stored IsVisibleStored default True;
-    property Checked: Boolean read GetChecked write SetChecked
-      stored IsCheckedStored default False;
-    property Caption: TTranslateString read GetCaption write SetCaption
-      stored IsCaptionStored;
-    property OnClick: TNotifyEvent read GetOnClick write SetOnClick;
-    property GroupIndex: Byte read GetGroupIndex write SetGroupIndex default 0;
-  end;
-
-  TDpiMenu = class(TComponent)
-  private
-    FItems: TDpiMenuItem;
-  protected
-    function GetNativeMenu: TMenu; virtual;
-  public
-    property Items: TDpiMenuItem read FItems;
-    constructor Create(AOwner: TComponent); override;
-    destructor Destroy; override;
-  end;
-
-  { TDpiPopupMenu }
-
-  TDpiPopupMenu = class(TDpiMenu)
-  private
-    function GetAutoPopup: Boolean;
-    procedure SetAutoPopup(AValue: Boolean);
-  protected
-    function GetNativeMenu: TMenu; override;
-    function GetNativePopupMenu: TPopupMenu; virtual;
-  public
-    NativePopupMenu: TPopupMenu;
-    procedure PopUp;  overload;
-    procedure PopUp(X, Y: Integer); virtual; overload;
-    constructor Create(AOwner: TComponent); override;
-    destructor Destroy; override;
-  published
-    property AutoPopup: Boolean read GetAutoPopup write SetAutoPopup default True;
-  end;
-
 var
   DpiFormFileDesc: TDpiFormFileDesc;
-  DpiScreen: TDpiScreen;
-  DpiApplication: TDpiApplication;
-  DpiMouse: TDpiMouse;
 
 procedure Register;
-function DpiBitBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
-function DpiBitBltCanvas(Dest: TDpiCanvas; X, Y, Width, Height: Integer; Src: TDpiCanvas; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
-function DpiCreateRectRgn(X1, Y1, X2, Y2: Integer): HRGN;
-function DpiScrollDC(Canvas: TDpiCanvas; dx: Longint; dy: Longint; const lprcScroll: TRect;
-  const lprcClip:TRect; hrgnUpdate: Handle; lprcUpdate: PRect): Boolean;
-function ScaleToNative(Value: Integer): Integer;
-function ScaleToNativeDist(Base, Value: Integer): Integer;
-function ScaleFromNative(Value: Integer): Integer;
-function ScalePointToNative(Value: TPoint): TPoint;
-function ScalePointFromNative(Value: TPoint): TPoint;
-function ScaleSizeToNative(Value: TSize): TSize;
-function ScaleSizeFromNative(Value: TSize): TSize;
-function ScaleRectToNative(Value: TRect): TRect;
-function ScaleRectFromNative(Value: TRect): TRect;
-function ScaleFloatToNative(Value: Double): Double;
-function ScaleFloatFromNative(Value: Double): Double;
-procedure WriteLog(Text: string);
-function DpiGetSystemMetrics(nIndex: Integer): Integer;
+
 
 implementation
 
 uses
-  LCLStrConsts;
+  LCLStrConsts, Dpi.Common;
 
 resourcestring
   SDpiFormTitle = 'DpiForm form';
   SDpiFormDescription = 'DPI aware form';
-  SNotImplemented = 'Not implemented';
 
 procedure Register;
@@ -1463 +41 @@
   DpiFormFileDesc := TDpiFormFileDesc.Create;
   RegisterProjectFileDescriptor(DpiFormFileDesc);
-  RegisterComponents('DpiControls', [TDpiButton, TDpiImage, TDpiPaintBox,
-    TDpiListBox, TDpiPopupMenu, TDpiEdit]);
-end;
-
-function DpiBitBltCanvas(Dest: TDpiCanvas; X, Y, Width, Height: Integer;
-  Src: TDpiCanvas; XSrc, YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
-begin
-  Result := DpiBitBlt(Dest.Handle, X, Y, Width, Height, Src.Handle, XSrc, YSrc, Rop);
-end;
-
-function DpiCreateRectRgn(X1, Y1, X2, Y2: Integer): HRGN;
-begin
-  Result := CreateRectRgn(ScaleToNative(X1), ScaleToNative(Y1), ScaleToNative(X2),
-    ScaleToNative(Y2));
-end;
-
-function DpiScrollDC(Canvas: TDpiCanvas; dx: Longint; dy: Longint;
-  const lprcScroll: TRect; const lprcClip: TRect; hrgnUpdate: Handle;
-  lprcUpdate: PRect): Boolean;
-begin
-  {$IFDEF WINDOWS}
-  Result := Windows.ScrollDC(Canvas.Handle, ScaleToNative(dx), ScaleToNative(dy),
-    ScaleRectToNative(lprcScroll), ScaleRectToNative(lprcClip),
-    hrgnUpdate, lprcUpdate);
-  {$ENDIF}
-  {$IFDEF LINUX}
-  // Can't do scrolling of DC under Linux, then fallback into BitBlt.
-  Result := DpiBitBltCanvas(Canvas, lprcScroll.Left + dx, lprcScroll.Top + dy, lprcScroll.Right - lprcScroll.Left, lprcScroll.Bottom - lprcScroll.Top,
-    Canvas, lprcScroll.Left, lprcScroll.Top);
-  {$ENDIF}
-end;
-
-function Ceil(const X: Single): Integer;
-begin
-  if X > High(Integer) then
-    Result := High(Integer)
-  else if X < Low(Integer) then
-    Result := Low(Integer)
-  else begin
-    Result := Trunc(X);
-    if (Result <> X) then begin
-      if (Result > 0) then Inc(Result) else Dec(Result);
-    end;
-  end;
-end;
-
-function ScaleToNative(Value: Integer): Integer;
-begin
-  Result := Round(Value * DpiScreen.Dpi / 96);
-end;
-
-function ScaleToNativeDist(Base, Value: Integer): Integer;
-begin
-  Result := ScaleToNative(Base + Value) - ScaleToNative(Base);
-end;
-
-function ScaleFromNative(Value: Integer): Integer;
-begin
-  Result := Round(Value * 96 / DpiScreen.Dpi);
-end;
-
-function ScalePointToNative(Value: TPoint): TPoint;
-begin
-  Result.X := ScaleToNative(Value.X);
-  Result.Y := ScaleToNative(Value.Y);
-end;
-
-function ScalePointFromNative(Value: TPoint): TPoint;
-begin
-  Result.X := ScaleFromNative(Value.X);
-  Result.Y := ScaleFromNative(Value.Y);
-end;
-
-function ScaleSizeToNative(Value: TSize): TSize;
-begin
-  Result.Width := ScaleToNative(Value.Width);
-  Result.Height := ScaleToNative(Value.Height);
-end;
-
-function ScaleSizeFromNative(Value: TSize): TSize;
-begin
-  Result.Width := ScaleFromNative(Value.Width);
-  Result.Height := ScaleFromNative(Value.Height);
-end;
-
-function ScaleRectToNative(Value: TRect): TRect;
-begin
-  Result.Left := ScaleToNative(Value.Left);
-  Result.Top := ScaleToNative(Value.Top);
-  Result.Right := ScaleToNative(Value.Right);
-  Result.Bottom := ScaleToNative(Value.Bottom);
-end;
-
-function ScaleRectFromNative(Value: TRect): TRect;
-begin
-  Result.Left := ScaleFromNative(Value.Left);
-  Result.Top := ScaleFromNative(Value.Top);
-  Result.Right := ScaleFromNative(Value.Right);
-  Result.Bottom := ScaleFromNative(Value.Bottom);
-end;
-
-function ScaleFloatToNative(Value: Double): Double;
-begin
-  Result := Value * DpiScreen.Dpi / 96;
-end;
-
-function ScaleFloatFromNative(Value: Double): Double;
-begin
-  Result := Value * 96 / DpiScreen.Dpi;
-end;
-
-procedure WriteLog(Text: string);
-var
-  F: Text;
-const
-  FileName = 'Log.txt';
-begin
-  AssignFile(F, FileName);
-  if FileExists(FileName) then Append(F) else Rewrite(F);
-  WriteLn(F, Text);
-  CloseFile(F);
-end;
-
-function DpiGetSystemMetrics(nIndex: Integer): Integer;
-begin
-  Result := ScaleFromNative(GetSystemMetrics(nIndex));
-end;
-
-function DpiBitBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc,
-  YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
-var
-  DstWidth, DstHeight: Integer;
-  SrcWidth, SrcHeight: Integer;
-begin
-  {$IFDEF WINDOWS}
-  // LCLIntf.BitBlt is slower than direct Windows BitBlt
-  Result := Windows.BitBlt(DestDC, ScaleToNative(X), ScaleToNative(Y),
-    ScaleToNative(Width), ScaleToNative(Height), SrcDC,
-    ScaleToNative(XSrc), ScaleToNative(YSrc), Rop);
-  {$ELSE}
-
-
-  DstWidth := ScaleToNativeDist(X, Width);
-  DstHeight := ScaleToNativeDist(Y, Height);
-  SrcWidth := ScaleToNativeDist(XSrc, Width);
-  SrcHeight := ScaleToNativeDist(YSrc, Height);
-  if (DstWidth = SrcWidth) and (DstHeight = SrcHeight) then begin
-    Result := BitBlt(DestDC, ScaleToNative(X), ScaleToNative(Y),
-      DstWidth, DstHeight, SrcDC,
-      ScaleToNative(XSrc), ScaleToNative(YSrc), Rop);
-  end else begin
-    Result := BitBlt(DestDC, ScaleToNative(X), ScaleToNative(Y),
-      DstWidth, DstHeight, SrcDC,
-      ScaleToNative(XSrc), ScaleToNative(YSrc), Rop);
-{    Result := StretchBlt(DestDC, ScaleToNative(X), ScaleToNative(Y),
-      DstWidth, DstHeight, SrcDC,
-      ScaleToNative(XSrc), ScaleToNative(YSrc),
-      SrcWidth, SrcHeight, Rop);
-}  end;
-
-{  Result := BitBlt(DestDC, ScaleToNative(X), ScaleToNative(Y),
-    ScaleToNative(Width), ScaleToNative(Height), SrcDC,
-    ScaleToNative(XSrc), ScaleToNative(YSrc), Rop);
- }
-  {$ENDIF}
-end;
-
-{ TDpiRadioButton }
-
-function TDpiRadioButton.GetNativeRadioButton: TRadioButton;
-begin
-  if not Assigned(NativeRadioButton) then NativeRadioButton := TRadioButton.Create(nil);
-    Result := NativeRadioButton;
-end;
-
-constructor TDpiRadioButton.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-end;
-
-destructor TDpiRadioButton.Destroy;
-begin
-  FreeAndNil(NativeRadioButton);
-  inherited;
-end;
-
-{ TDpiPageControl }
-
-function TDpiPageControl.GetPageCount: Integer;
-begin
-  Result := GetNativePageControl.PageCount;
-end;
-
-function TDpiPageControl.GetTabSheet(Index: Integer): TTabSheet;
-begin
-  Result := GetNativePageControl.Pages[Index];
-end;
-
-function TDpiPageControl.GetNativePageControl: TPageControl;
-begin
-  if not Assigned(NativePageControl) then NativePageControl := TPageControl.Create(nil);
-    Result := NativePageControl;
-end;
-
-constructor TDpiPageControl.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-end;
-
-destructor TDpiPageControl.Destroy;
-begin
-  FreeAndNil(NativePageControl);
-  inherited;
-end;
-
-{ TDpiCustomDrawGrid }
-
-function TDpiCustomDrawGrid.GetEditor: TDpiWinControl;
-begin
-  //Result := GetNativeCustomDrawGrid.Editor;
-end;
-
-procedure TDpiCustomDrawGrid.SetEditor(AValue: TDpiWinControl);
-begin
-  //GetNativeCustomDrawGrid.Editor := AValue
-end;
-
-function TDpiCustomDrawGrid.GetNativeCustomDrawGrid: TCustomDrawGrid;
-begin
-  if not Assigned(NativeCustomDrawGrid) then NativeCustomDrawGrid := TCustomDrawGrid.Create(nil);
-    Result := NativeCustomDrawGrid;
-end;
-
-constructor TDpiCustomDrawGrid.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-end;
-
-destructor TDpiCustomDrawGrid.Destroy;
-begin
-  FreeAndNil(NativeCustomDrawGrid);
-  inherited;
-end;
-
-{ TDpiCheckBox }
-
-function TDpiCheckBox.GetNativeCheckBox: TCheckBox;
-begin
-  if not Assigned(NativeCheckBox) then NativeCheckBox := TCheckBox.Create(nil);
-    Result := NativeCheckBox;
-end;
-
-constructor TDpiCheckBox.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-end;
-
-destructor TDpiCheckBox.Destroy;
-begin
-  FreeAndNil(NativeCheckBox);
-  inherited;
-end;
-
-{ TDpiComboBox }
-
-function TDpiComboBox.GetNativeComboBox: TComboBox;
-begin
-  if not Assigned(NativeComboBox) then NativeComboBox := TComboBox.Create(nil);
-    Result := NativeComboBox;
-end;
-
-constructor TDpiComboBox.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-end;
-
-destructor TDpiComboBox.Destroy;
-begin
-  FreeAndNil(NativeComboBox);
-  inherited;
-end;
-
-{ TDpiSpinEdit }
-
-function TDpiSpinEdit.GetNativeSpinEdit: TSpinEdit;
-begin
-  if not Assigned(NativeSpinEdit) then NativeSpinEdit := TSpinEdit.Create(nil);
-    Result := NativeSpinEdit;
-end;
-
-constructor TDpiSpinEdit.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-end;
-
-destructor TDpiSpinEdit.Destroy;
-begin
-  FreeAndNil(NativeSpinEdit);
-  inherited;
-end;
-
-{ TDpiMemo }
-
-function TDpiMemo.GetLines: TStrings;
-begin
-  Result := GetNativeMemo.Lines;
-end;
-
-function TDpiMemo.GetReadOnly: Boolean;
-begin
-  Result := GetNativeMemo.ReadOnly;
-end;
-
-function TDpiMemo.GetScrollBars: TScrollStyle;
-begin
-  Result := GetNativeMemo.ScrollBars;
-end;
-
-function TDpiMemo.GetWordWrap: Boolean;
-begin
-  Result := GetNativeMemo.WordWrap;
-end;
-
-procedure TDpiMemo.SetLines(AValue: TStrings);
-begin
-  GetNativeMemo.Lines := AValue;
-end;
-
-procedure TDpiMemo.SetReadOnly(AValue: Boolean);
-begin
-  GetNativeMemo.ReadOnly := AValue;
-end;
-
-procedure TDpiMemo.SetScrollBars(AValue: TScrollStyle);
-begin
-  GetNativeMemo.ScrollBars := AValue;
-end;
-
-procedure TDpiMemo.SetWordWrap(AValue: Boolean);
-begin
-  GetNativeMemo.WordWrap := AValue;
-end;
-
-function TDpiMemo.GetNativeWinControl: TWinControl;
-begin
-  Result := GetNativeMemo;
-end;
-
-procedure TDpiMemo.Clear;
-begin
-  GetNativeMemo.Clear;
-end;
-
-function TDpiMemo.GetNativeMemo: TMemo;
-begin
-  if not Assigned(NativeMemo) then NativeMemo := TMemo.Create(nil);
-    Result := NativeMemo;
-end;
-
-constructor TDpiMemo.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-end;
-
-destructor TDpiMemo.Destroy;
-begin
-  FreeAndNil(NativeMemo);
-  inherited;
-end;
-
-{ TDpiImageList }
-
-function TDpiImageList.GetHeight: Integer;
-begin
-
-end;
-
-function TDpiImageList.GetCount: Integer;
-begin
-
-end;
-
-function TDpiImageList.GetWidth: Integer;
-begin
-
-end;
-
-procedure TDpiImageList.SetHeight(AValue: Integer);
-begin
-
-end;
-
-procedure TDpiImageList.SetWidth(AValue: Integer);
-begin
-
-end;
-
-function TDpiImageList.GetNativeImageList: TImageList;
-begin
-  if not Assigned(NativeImageList) then NativeImageList := TImageList.Create(nil);
-    Result := NativeImageList;
-end;
-
-procedure TDpiImageList.GetBitmap(Index: Integer; Image: TDpiBitmap);
-begin
-
-end;
-
-procedure TDpiImageList.BeginUpdate;
-begin
-
-end;
-
-procedure TDpiImageList.EndUpdate;
-begin
-
-end;
-
-procedure TDpiImageList.Clear;
-begin
-
-end;
-
-function TDpiImageList.Add(Image, Mask: TDpiBitmap): Integer;
-begin
-
-end;
-
-constructor TDpiImageList.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-end;
-
-destructor TDpiImageList.Destroy;
-begin
-  FreeAndNil(NativeImageList);
-  inherited Destroy;
-end;
-
-{ TDpiCoolBands }
-
-procedure TDpiCoolBands.SetItem(Index: Integer; AValue: TDpiCoolBand);
-begin
-
-end;
-
-function TDpiCoolBands.GetItem(Index: Integer): TDpiCoolBand;
-begin
-
-end;
-
-{ TDpiCoolBand }
-
-function TDpiCoolBand.GetMinWidth: Integer;
-begin
-
-end;
-
-function TDpiCoolBand.GetMinHeight: Integer;
-begin
-
-end;
-
-procedure TDpiCoolBand.SetMinHeight(AValue: Integer);
-begin
-
-end;
-
-procedure TDpiCoolBand.SetMinWidth(AValue: Integer);
-begin
-
-end;
-
-function TDpiCoolBand.GetNativeCoolBand: TCoolBand;
-begin
-
-end;
-
-constructor TDpiCoolBand.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-end;
-
-destructor TDpiCoolBand.Destroy;
-begin
-  inherited Destroy;
-end;
-
-{ TDpiCoolBar }
-
-function TDpiCoolBar.GetBands: TDpiCoolBands;
-begin
-
-end;
-
-function TDpiCoolBar.GetThemed: Boolean;
-begin
-  Result := GetNativeCoolBar.Themed;
-end;
-
-procedure TDpiCoolBar.SetBands(AValue: TDpiCoolBands);
-begin
-
-end;
-
-procedure TDpiCoolBar.SetThemed(AValue: Boolean);
-begin
-  GetNativeCoolBar.Themed := AValue
-end;
-
-procedure TDpiCoolBar.BeginUpdate;
-begin
-  GetNativeCoolBar.BeginUpdate;
-end;
-
-procedure TDpiCoolBar.EndUpdate;
-begin
-  GetNativeCoolBar.EndUpdate;
-end;
-
-function TDpiCoolBar.GetNativeCoolBar: TCoolBar;
-begin
-  if not Assigned(NativeCoolBar) then NativeCoolBar := TCoolBar.Create(nil);
-    Result := NativeCoolBar;
-end;
-
-constructor TDpiCoolBar.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-end;
-
-destructor TDpiCoolBar.Destroy;
-begin
-  FreeAndNil(NativeCoolBar);
-  inherited Destroy;
-end;
-
-{ TDpiToolBar }
-
-function TDpiToolBar.ButtonHeightIsStored: Boolean;
-begin
-
-end;
-
-function TDpiToolBar.ButtonWidthIsStored: Boolean;
-begin
-
-end;
-
-function TDpiToolBar.GetButtonHeight: Integer;
-begin
-  Result := ScaleFromNative(GetNativeToolBar.ButtonHeight);
-end;
-
-function TDpiToolBar.GetButtonWidth: Integer;
-begin
-  Result := ScaleFromNative(GetNativeToolBar.ButtonWidth);
-end;
-
-procedure TDpiToolBar.SetButtonHeight(AValue: Integer);
-begin
-  GetNativeToolBar.ButtonHeight := ScaleToNative(AValue);
-end;
-
-procedure TDpiToolBar.SetButtonWidth(AValue: Integer);
-begin
-  GetNativeToolBar.ButtonWidth := ScaleToNative(AValue);
-end;
-
-function TDpiToolBar.GetNativeToolBar: TToolBar;
-begin
-  if not Assigned(NativeToolBar) then NativeToolBar := TToolBar.Create(nil);
-    Result := NativeToolBar;
-end;
-
-constructor TDpiToolBar.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-end;
-
-destructor TDpiToolBar.Destroy;
-begin
-  FreeAndNil(NativeToolBar);
-  inherited;
-end;
-
-{ TDpiPanel }
-
-function TDpiPanel.GetNativePanel: TPanel;
-begin
-  if not Assigned(NativePanel) then NativePanel := TPanel.Create(nil);
-    Result := NativePanel;
-end;
-
-constructor TDpiPanel.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-end;
-
-destructor TDpiPanel.Destroy;
-begin
-  FreeAndNil(NativePanel);
-  inherited;
-end;
-
-{ TDpiStringGrid }
-
-function TDpiStringGrid.DefaultRowHeightIsStored: Boolean;
-begin
-  Result := GetDefRowHeight >= 0;
-end;
-
-function TDpiStringGrid.GetCells(ACol, ARow: Integer): string;
-begin
-  Result := GetNativeStringGrid.Cells[ACol, ARow];
-end;
-
-function TDpiStringGrid.GetColCount: Integer;
-begin
-  Result := GetNativeStringGrid.ColCount;
-end;
-
-function TDpiStringGrid.GetColumns: TGridColumns;
-begin
-  Result := GetNativeStringGrid.Columns;
-end;
-
-function TDpiStringGrid.GetDefRowHeight: Integer;
-begin
-  Result := GetNativeStringGrid.DefaultRowHeight;
-end;
-
-function TDpiStringGrid.GetEditor: TWinControl;
-begin
-  Result := GetNativeStringGrid.Editor;
-end;
-
-function TDpiStringGrid.GetFixedCols: Integer;
-begin
-  Result := GetNativeStringGrid.FixedCols;
-end;
-
-function TDpiStringGrid.GetFixedRows: Integer;
-begin
-  Result := GetNativeStringGrid.FixedRows;
-end;
-
-function TDpiStringGrid.GetOptions: TGridOptions;
-begin
-  Result := GetNativeStringGrid.Options;
-end;
-
-function TDpiStringGrid.GetRowCount: Integer;
-begin
-  Result := GetNativeStringGrid.RowCount;
-end;
-
-function TDpiStringGrid.GetScrollBars: TScrollStyle;
-begin
-  Result := GetNativeStringGrid.ScrollBars;
-end;
-
-function TDpiStringGrid.GetSelection: TGridRect;
-begin
-  Result := GetNativeStringGrid.Selection;
-end;
-
-function TDpiStringGrid.IsColumnsStored: Boolean;
-begin
-  Result := GetNativeStringGrid.Columns.Enabled;
-end;
-
-procedure TDpiStringGrid.SetCells(ACol, ARow: Integer; AValue: string);
-begin
-  GetNativeStringGrid.Cells[ACol, ARow] := AValue;
-end;
-
-procedure TDpiStringGrid.SetColCount(AValue: Integer);
-begin
-  GetNativeStringGrid.ColCount := AValue;
-end;
-
-procedure TDpiStringGrid.SetColumns(AValue: TGridColumns);
-begin
-  GetNativeStringGrid.Columns := AValue;
-end;
-
-procedure TDpiStringGrid.SetDefRowHeight(AValue: Integer);
-begin
-  GetNativeStringGrid.DefaultRowHeight := AValue;
-end;
-
-procedure TDpiStringGrid.SetEditor(AValue: TWinControl);
-begin
-  GetNativeStringGrid.Editor := AValue;
-end;
-
-procedure TDpiStringGrid.SetFixedCols(AValue: Integer);
-begin
-  GetNativeStringGrid.FixedCols := AValue;
-end;
-
-procedure TDpiStringGrid.SetFixedRows(AValue: Integer);
-begin
-  GetNativeStringGrid.FixedRows := AValue;
-end;
-
-procedure TDpiStringGrid.SetOptions(AValue: TGridOptions);
-begin
-  GetNativeStringGrid.Options := AValue;
-end;
-
-procedure TDpiStringGrid.SetRowCount(AValue: Integer);
-begin
-  GetNativeStringGrid.RowCount := AValue;
-end;
-
-procedure TDpiStringGrid.SetScrollBars(AValue: TScrollStyle);
-begin
-  GetNativeStringGrid.ScrollBars := AValue;
-end;
-
-procedure TDpiStringGrid.SetSelection(AValue: TGridRect);
-begin
-  GetNativeStringGrid.Selection := AValue;
-end;
-
-function TDpiStringGrid.GetNativeStringGrid: TStringGrid;
-begin
-  if not Assigned(NativeStringGrid) then NativeStringGrid := TStringGrid.Create(nil);
-    Result := NativeStringGrid;
-end;
-
-function TDpiStringGrid.CellRect(ACol, ARow: Integer): TRect;
-begin
-  Result := GetNativeStringGrid.CellRect(ACol, ARow);
-end;
-
-constructor TDpiStringGrid.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-end;
-
-destructor TDpiStringGrid.Destroy;
-begin
-  FreeAndNil(NativeStringGrid);
-  inherited;
-end;
-
-{ TDpiListView }
-
-function TDpiListView.GetItems: TListItems;
-begin
-  Result := GetNativeListView.Items;
-end;
-
-function TDpiListView.GetOnChange: TLVChangeEvent;
-begin
-  Result := GetNativeListView.OnChange;
-end;
-
-function TDpiListView.GetOnColumnClick: TLVColumnClickEvent;
-begin
-  Result := GetNativeListView.OnColumnClick;
-end;
-
-function TDpiListView.GetOnCustomDrawItem: TDpiLVCustomDrawItemEvent;
-begin
-  Result := FOnCustomDrawItem;
-end;
-
-function TDpiListView.GetProperty(AIndex: Integer): Boolean;
-begin
-  Result := GetNativeListView.Checkboxes;
-end;
-
-function TDpiListView.GetViewStyle: TViewStyle;
-begin
-  Result := GetNativeListView.ViewStyle;
-end;
-
-function TDpiListView.GetColumns: TListColumns;
-begin
-  Result := GetNativeListView.Columns;
-end;
-
-function TDpiListView.GetCanvas: TCanvas;
-begin
-  Result := GetNativeListView.Canvas;
-end;
-
-procedure TDpiListView.SetColumns(AValue: TListColumns);
-begin
-  GetNativeListView.Columns := AValue;
-end;
-
-procedure TDpiListView.SetItems(AValue: TListItems);
-begin
-  GetNativeListView.Items := AValue;
-end;
-
-procedure TDpiListView.SetOnChange(AValue: TLVChangeEvent);
-begin
-  GetNativeListView.OnChange := AValue;
-end;
-
-procedure TDpiListView.SetOnColumnClick(AValue: TLVColumnClickEvent);
-begin
-  GetNativeListView.OnColumnClick := AValue;
-end;
-
-procedure TDpiListView.SetOnCustomDrawItem(AValue: TDpiLVCustomDrawItemEvent);
-begin
-  FOnCustomDrawItem := AValue;
-end;
-
-procedure TDpiListView.SetProperty(AIndex: Integer; AValue: Boolean);
-begin
-  GetNativeListView.Checkboxes := AValue;
-end;
-
-procedure TDpiListView.SetViewStyle(AValue: TViewStyle);
-begin
-  GetNativeListView.ViewStyle := AValue;
-end;
-
-procedure TDpiListView.DoCustomDrawItem(Sender: TCustomListView; Item: TListItem;
-  State: TCustomDrawState; var DefaultDraw: Boolean);
-begin
-  if Assigned(FOnCustomDrawItem) then
-    FOnCustomDrawItem(Self, Item, State, DefaultDraw);
-end;
-
-function TDpiListView.GetItemAt(x, y: integer): TListItem;
-begin
-  Result := GetNativeListView.GetItemAt(X, Y);
-end;
-
-function TDpiListView.GetNativeListView: TListView;
-begin
-  if not Assigned(NativeListView) then begin
-    NativeListView := TListView.Create(nil);
-    NativeListView.OnCustomDrawItem := DoCustomDrawItem;
-  end;
-  Result := NativeListView;
-end;
-
-constructor TDpiListView.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-end;
-
-destructor TDpiListView.Destroy;
-begin
-  FreeAndNil(NativeListView);
-  inherited;
-end;
-
-{ TDpiPen }
-
-function TDpiPen.GetColor: TColor;
-begin
-  Result := GetNativePen.Color;
-end;
-
-function TDpiPen.GetStyle: TPenStyle;
-begin
-  Result := GetNativePen.Style;
-end;
-
-function TDpiPen.GetWidth: Integer;
-begin
-  Result := FWidth;
-end;
-
-procedure TDpiPen.SetColor(AValue: TColor);
-begin
-  GetNativePen.Color := AValue;
-end;
-
-procedure TDpiPen.SetNativePen(AValue: TPen);
-begin
-  if FNativePen = AValue then Exit;
-  if FNativePenFree then FreeAndNil(FNativePen);
-  FNativePenFree := False;
-  FNativePen := AValue;
-  SetWidth(FWidth);
-end;
-
-procedure TDpiPen.SetStyle(AValue: TPenStyle);
-begin
-  GetNativePen.Style := AValue;
-end;
-
-procedure TDpiPen.SetWidth(AValue: Integer);
-begin
-  GetNativePen.Width := ScaleToNative(AValue);
-  FWidth := AValue;
-end;
-
-constructor TDpiPen.Create;
-begin
-  FNativePen := TPen.Create;
-  FNativePenFree := True;
-  FWidth := 1;
-end;
-
-destructor TDpiPen.Destroy;
-begin
-  if FNativePenFree then
-    FreeAndNil(FNativePen);
-  inherited;
-end;
-
-function TDpiPen.GetNativePen: TPen;
-begin
-  Result := FNativePen;
-end;
-
-procedure TDpiPen.Assign(Source: TDpiPen);
-begin
-  FWidth := Source.FWidth;
-  GetNativePen.Assign(Source.GetNativePen);
-end;
-
-{ TDpiBrush }
-
-function TDpiBrush.GetColor: TColor;
-begin
-  Result := GetNativeBrush.Color;
-end;
-
-function TDpiBrush.GetStyle: TBrushStyle;
-begin
-  Result := GetNativeBrush.Style;
-end;
-
-procedure TDpiBrush.SetColor(AValue: TColor);
-begin
-  GetNativeBrush.Color := AValue;
-end;
-
-function TDpiBrush.GetNativeBrush: TBrush;
-begin
-  Result := FNativeBrush;
-end;
-
-procedure TDpiBrush.SetNativeBrush(AValue: TBrush);
-begin
-  if FNativeBrush = AValue then Exit;
-  if FNativeBrushFree then FreeAndNil(FNativeBrush);
-  FNativeBrushFree := False;
-  FNativeBrush := AValue;
-end;
-
-procedure TDpiBrush.SetStyle(AValue: TBrushStyle);
-begin
-  GetNativeBrush.Style := AValue;
-end;
-
-constructor TDpiBrush.Create;
-begin
-  FNativeBrush := TBrush.Create;
-  FNativeBrushFree := True;
-end;
-
-destructor TDpiBrush.Destroy;
-begin
-  if FNativeBrushFree then FreeAndNil(FNativeBrush);
-  inherited;
-end;
-
-procedure TDpiBrush.Assign(Source: TDpiBrush);
-begin
-  GetNativeBrush.Assign(Source.GetNativeBrush);
-end;
-
-{ TDpiControlBorderSpacing }
-
-function TDpiControlBorderSpacing.IsBottomStored: Boolean;
-begin
-  if FDefault = nil
-  then Result := FBottom <> 0
-  else Result := FBottom <> FDefault^.Bottom;
-end;
-
-function TDpiControlBorderSpacing.IsAroundStored: Boolean;
-begin
-  if FDefault = nil
-  then Result := FAround <> 0
-  else Result := FAround <> FDefault^.Around;
-end;
-
-function TDpiControlBorderSpacing.IsLeftStored: Boolean;
-begin
-  if FDefault = nil
-  then Result := FLeft <> 0
-  else Result := FLeft <> FDefault^.Left;
-end;
-
-function TDpiControlBorderSpacing.IsRightStored: Boolean;
-begin
-  if FDefault = nil
-  then Result := FRight <> 0
-  else Result := FRight <> FDefault^.Right;
-end;
-
-function TDpiControlBorderSpacing.IsTopStored: Boolean;
-begin
-  if FDefault = nil
-  then Result := FTop <> 0
-  else Result := FTop <> FDefault^.Top;
-end;
-
-procedure TDpiControlBorderSpacing.SetAround(AValue: TSpacingSize);
-begin
-  if FAround = AValue then Exit;
-  FAround := AValue;
-  Change(False);
-end;
-
-procedure TDpiControlBorderSpacing.SetBottom(AValue: TSpacingSize);
-begin
-  if FBottom = AValue then Exit;
-  FBottom := AValue;
-  Change(False);
-end;
-
-procedure TDpiControlBorderSpacing.SetLeft(AValue: TSpacingSize);
-begin
-  if FLeft = AValue then Exit;
-  FLeft := AValue;
-  Change(False);
-end;
-
-procedure TDpiControlBorderSpacing.SetRight(AValue: TSpacingSize);
-begin
-  if FRight = AValue then Exit;
-  FRight := AValue;
-  Change(False);
-end;
-
-procedure TDpiControlBorderSpacing.SetTop(AValue: TSpacingSize);
-begin
-  if FTop = AValue then Exit;
-  FTop := AValue;
-  Change(False);
-end;
-
-procedure TDpiControlBorderSpacing.Change(InnerSpaceChanged: Boolean);
-begin
-  if FControl <> nil then
-    FControl.DoBorderSpacingChange(Self, InnerSpaceChanged);
-  if Assigned(OnChange) then OnChange(Self);
-end;
-
-constructor TDpiControlBorderSpacing.Create(OwnerControl: TDpiControl;
-  ADefault: PControlBorderSpacingDefault);
-begin
-  FControl := OwnerControl;
-  FDefault := ADefault;
-  if ADefault <> nil then
-  begin
-    FLeft := ADefault^.Left;
-    FRight := ADefault^.Right;
-    FTop := ADefault^.Top;
-    FBottom := ADefault^.Bottom;
-    FAround := ADefault^.Around;
-  end;
-  inherited Create;
-end;
-
-{ TDpiEdit }
-
-function TDpiEdit.GetText: TCaption;
-begin
-  Result := GetNativeEdit.Text;
-end;
-
-procedure TDpiEdit.SetText(AValue: TCaption);
-begin
-  GetNativeEdit.Text := AValue;
-end;
-
-destructor TDpiEdit.Destroy;
-begin
-  FreeAndNil(NativeEdit);
-  inherited;
-end;
-
-function TDpiEdit.GetSelLength: Integer;
-begin
-  Result := GetNativeEdit.SelLength;
-end;
-
-function TDpiEdit.GetSelStart: Integer;
-begin
-  Result := GetNativeEdit.SelStart;
-end;
-
-procedure TDpiEdit.SetSelLength(AValue: Integer);
-begin
-  GetNativeEdit.SelLength := AValue;
-end;
-
-procedure TDpiEdit.SetSelStart(AValue: Integer);
-begin
-  GetNativeEdit.SelStart := AValue;
-end;
-
-function TDpiEdit.GetNativeWinControl: TWinControl;
-begin
-  Result := GetNativeEdit;
-end;
-
-function TDpiEdit.GetNativeEdit: TEdit;
-begin
-  if not Assigned(NativeEdit) then NativeEdit := TEdit.Create(nil);
-  Result := NativeEdit;
-end;
-
-{ TDpiMenu }
-
-function TDpiMenu.GetNativeMenu: TMenu;
-begin
-  Result := nil;
-end;
-
-constructor TDpiMenu.Create(AOwner: TComponent);
-begin
-  inherited;
-  FItems := TDpiMenuItem.Create(Self);
-end;
-
-destructor TDpiMenu.Destroy;
-begin
-  FreeAndNil(FItems);
-  inherited;
-end;
-
-{ TDpiMenuItem }
-
-function TDpiMenuItem.GetCaption: TTranslateString;
-begin
-  Result := GetNativeMenuItem.Caption;
-end;
-
-function TDpiMenuItem.GetChecked: Boolean;
-begin
-  Result := GetNativeMenuItem.Checked;
-end;
-
-function TDpiMenuItem.GetCount: Integer;
-begin
-  Result := FItems.Count;
-end;
-
-function TDpiMenuItem.GetEnabled: Boolean;
-begin
-  Result := GetNativeMenuItem.Enabled;
-end;
-
-function TDpiMenuItem.GetGroupIndex: Byte;
-begin
-  Result := GetNativeMenuItem.GroupIndex;
-end;
-
-function TDpiMenuItem.GetItem(Index: Integer): TDpiMenuItem;
-begin
-  Result := TDpiMenuItem(FItems[Index]);
-end;
-
-function TDpiMenuItem.GetOnClick: TNotifyEvent;
-begin
-  Result := FOnClick;
-end;
-
-function TDpiMenuItem.GetRadioItem: Boolean;
-begin
-  Result := GetNativeMenuItem.RadioItem;
-end;
-
-function TDpiMenuItem.GetShortCut: TShortCut;
-begin
-  Result := GetNativeMenuItem.ShortCut;
-end;
-
-function TDpiMenuItem.GetVisible: Boolean;
-begin
-  Result := GetNativeMenuItem.Visible;
-end;
-
-function TDpiMenuItem.IsCaptionStored: Boolean;
-begin
-  Result := False;
-end;
-
-function TDpiMenuItem.IsCheckedStored: Boolean;
-begin
-  Result := False;
-end;
-
-function TDpiMenuItem.IsEnabledStored: Boolean;
-begin
-  Result := False;
-end;
-
-function TDpiMenuItem.IsShortCutStored: Boolean;
-begin
-  Result := False;
-end;
-
-function TDpiMenuItem.IsVisibleStored: Boolean;
-begin
-  Result := False;
-end;
-
-procedure TDpiMenuItem.SetCaption(AValue: TTranslateString);
-begin
-  GetNativeMenuItem.Caption := AValue;
-end;
-
-procedure TDpiMenuItem.SetChecked(AValue: Boolean);
-begin
-  GetNativeMenuItem.Checked := AValue;
-end;
-
-procedure TDpiMenuItem.SetEnabled(AValue: Boolean);
-begin
-  GetNativeMenuItem.Enabled := AValue;
-end;
-
-procedure TDpiMenuItem.SetGroupIndex(AValue: Byte);
-begin
-  GetNativeMenuItem.GroupIndex := AValue;
-end;
-
-procedure TDpiMenuItem.SetOnClick(AValue: TNotifyEvent);
-begin
-  FOnClick := AValue;
-end;
-
-procedure TDpiMenuItem.SetRadioItem(AValue: Boolean);
-begin
-  GetNativeMenuItem.RadioItem := AValue;
-end;
-
-procedure TDpiMenuItem.SetShortCut(AValue: TShortCut);
-begin
-  GetNativeMenuItem.ShortCut := AValue;
-end;
-
-procedure TDpiMenuItem.SetVisible(AValue: Boolean);
-begin
-  GetNativeMenuItem.Visible := AValue;
-end;
-
-procedure TDpiMenuItem.OnClickHandler(Sender: TObject);
-begin
-  if Assigned(FOnClick) then
-    FOnClick(Self);
-end;
-
-procedure TDpiMenuItem.Delete(Index: Integer);
-begin
-  FItems.Delete(Index);
-  GetNativeMenuItem.Delete(Index);
-end;
-
-procedure TDpiMenuItem.Add(Item: TDpiMenuItem);
-begin
-  Insert(GetCount, Item);
-end;
-
-procedure TDpiMenuItem.Insert(Index: Integer; Item: TDpiMenuItem);
-begin
-  FItems.Insert(Index, Item);
-  GetNativeMenuItem.Insert(Index, Item.GetNativeMenuItem);
-end;
-
-function TDpiMenuItem.IndexOf(Item: TDpiMenuItem): Integer;
-begin
-  if FItems = nil then
-    Result := -1
-  else
-    Result := FItems.IndexOf(Item);
-end;
-
-procedure TDpiMenuItem.Remove(Item: TDpiMenuItem);
-var
-  I: Integer;
-begin
-  I := IndexOf(Item);
-  if I < 0 then
-    raise EMenuError.Create(SMenuNotFound);
-  Delete(I);
-end;
-
-procedure TDpiMenuItem.Clear;
-begin
-  GetNativeMenuItem.Clear;
-end;
-
-procedure TDpiMenuItem.Click;
-begin
-  GetNativeMenuItem.Click;
-end;
-
-function TDpiMenuItem.GetNativeMenuItem: TMenuItem;
-begin
-  if not Assigned(NativeMenuItem) then begin
-    NativeMenuItem := TMenuItem.Create(nil);
-    NativeMenuItem.Name := 'Native' + Name;
-    NativeMenuItem.OnClick := OnClickHandler;
-  end;
-  Result := NativeMenuItem;
-end;
-
-procedure TDpiMenuItem.SetParentComponent(AValue: TComponent);
-begin
-  if (FParent = AValue) then Exit;
-  if Assigned(FParent) then FParent.Remove(Self);
-  if Assigned(AValue) then
-  begin
-    if (AValue is TDpiMenu)
-      then TDpiMenu(AValue).Items.Add(Self)
-    else if (AValue is TDpiMenuItem)
-      then TDpiMenuItem(AValue).Add(Self)
-    else
-      raise Exception.Create('TDpiMenuItem.SetParentComponent: suggested parent not of type TDpiMenu or TDpiMenuItem');
-   end;
-end;
-
-constructor TDpiMenuItem.Create(AOwner: TComponent);
-begin
-  inherited;
-  FItems := TList.Create;
-end;
-
-destructor TDpiMenuItem.Destroy;
-begin
-  FreeAndNil(FItems);
-  // TODO: Release menu items
-  //FreeAndNil(NativeMenuItem);
-  inherited;
-end;
-
-{ TDpiPopupMenu }
-
-procedure TDpiPopupMenu.PopUp;
-var
-  Pos: TPoint;
-begin
-  Pos := DpiMouse.CursorPos;
-  Popup(Pos.X, Pos.Y);
-end;
-
-procedure TDpiPopupMenu.PopUp(X, Y: Integer);
-begin
-  GetNativePopupMenu.PopUp(ScaleToNative(X), ScaleToNative(Y));
-end;
-
-constructor TDpiPopupMenu.Create(AOwner: TComponent);
-begin
-  inherited;
-  GetNativePopupMenu;
-end;
-
-function TDpiPopupMenu.GetAutoPopup: Boolean;
-begin
-  Result := GetNativePopupMenu.AutoPopup;
-end;
-
-procedure TDpiPopupMenu.SetAutoPopup(AValue: Boolean);
-begin
-  GetNativePopupMenu.AutoPopup := AValue;
-end;
-
-function TDpiPopupMenu.GetNativeMenu: TMenu;
-begin
-  Result := GetNativePopupMenu;
-end;
-
-function TDpiPopupMenu.GetNativePopupMenu: TPopupMenu;
-begin
-  if not Assigned(NativePopupMenu) then begin
-    NativePopupMenu := TPopupMenu.Create(nil);
-    if Assigned(Items.NativeMenuItem) then Items.NativeMenuItem.Free;
-    Items.NativeMenuItem := NativePopupMenu.Items;
-  end;
-  Result := NativePopupMenu;
-end;
-
-destructor TDpiPopupMenu.Destroy;
-begin
-  if Assigned(NativePopupMenu) then FreeAndNil(NativePopupMenu);
-  inherited;
-end;
-
-{ TDpiMouse }
-
-function TDpiMouse.GetCursorPos: TPoint;
-begin
-  Result := ScalePointFromNative(Mouse.CursorPos);
-end;
-
-procedure TDpiMouse.SetCursorPos(AValue: TPoint);
-begin
-  Mouse.CursorPos := ScalePointToNative(AValue);
-end;
-
-constructor TDpiMouse.Create;
-begin
-
-end;
-
-{ TDpiSizeConstraints }
-
-procedure TDpiSizeConstraints.SetMaxHeight(AValue: TConstraintSize);
-begin
-  if FMaxHeight=AValue then Exit;
-  FMaxHeight:=AValue;
-end;
-
-procedure TDpiSizeConstraints.SetMaxWidth(AValue: TConstraintSize);
-begin
-  if FMaxWidth=AValue then Exit;
-  FMaxWidth:=AValue;
-end;
-
-procedure TDpiSizeConstraints.SetMinHeight(AValue: TConstraintSize);
-begin
-  if FMinHeight=AValue then Exit;
-  FMinHeight:=AValue;
-end;
-
-procedure TDpiSizeConstraints.SetMinWidth(AValue: TConstraintSize);
-begin
-  if FMinWidth=AValue then Exit;
-  FMinWidth:=AValue;
-end;
-
-{ TDpiScrollingWinControl }
-
-function TDpiScrollingWinControl.GetNativeCustomControl: TCustomControl;
-begin
-  Result := GetNativeScrollingWinControl;
-end;
-
-function TDpiScrollingWinControl.GetNativeScrollingWinControl: TScrollingWinControl;
-begin
-  Result := nil;
-end;
-
-constructor TDpiScrollingWinControl.Create(TheOwner: TComponent);
-begin
-  inherited;
-  FHorzScrollBar := TDpiControlScrollBar.Create;
-  FVertScrollBar := TDpiControlScrollBar.Create;
-end;
-
-destructor TDpiScrollingWinControl.Destroy;
-begin
-  FreeAndNil(FHorzScrollBar);
-  FreeAndNil(FVertScrollBar);
-  inherited;
-end;
-
-{ TDpiControlScrollBar }
-
-function TDpiControlScrollBar.GetVisible: Boolean;
-begin
-
-end;
-
-procedure TDpiControlScrollBar.SetVisible(AValue: Boolean);
-begin
-
-end;
-
-{ TGraphicControlEx }
-
-procedure TGraphicControlEx.Paint;
-begin
-  inherited Paint;
-end;
-
-{ TFormEx }
-
-procedure TFormEx.WndProc(var TheMessage: TLMessage);
-begin
-  inherited WndProc(TheMessage);
-  if Assigned(FOnMessage) then
-    FOnMessage(TheMessage);
-end;
-
-{ TDpiApplication }
-
-procedure TDpiApplication.SetMainForm(AValue: TDpiForm);
-begin
-  FMainForm := AValue;
-end;
-
-function TDpiApplication.GetTitle: string;
-begin
-  Result := GetNativeApplication.Title;
-end;
-
-function TDpiApplication.GetShowMainForm: Boolean;
-begin
-  Result := GetNativeApplication.ShowMainForm;
-end;
-
-function TDpiApplication.GetTaskBarBehavior: TTaskBarBehavior;
-begin
-  Result := GetNativeApplication.TaskBarBehavior;
-end;
-
-function TDpiApplication.GetActive: Boolean;
-begin
-  Result := GetNativeApplication.Active;
-end;
-
-function TDpiApplication.GetExeName: string;
-begin
-  Result := GetNativeApplication.ExeName;
-end;
-
-function TDpiApplication.GetMainForm: TDpiForm;
-begin
-  Result := FMainForm;
-end;
-
-procedure TDpiApplication.SetShowMainForm(AValue: Boolean);
-begin
-  GetNativeApplication.ShowMainForm := AValue;
-end;
-
-procedure TDpiApplication.SetTaskBarBehavior(AValue: TTaskBarBehavior);
-begin
-  GetNativeApplication.TaskBarBehavior := AValue;
-end;
-
-procedure TDpiApplication.SetTitle(AValue: string);
-begin
-  GetNativeApplication.Title := AValue;
-end;
-
-function TDpiApplication.GetNativeApplication: TApplication;
-begin
-  Result := Application;
-end;
-
-procedure DpiBeforeFinalization;
-// This is our ExitProc handler.
-begin
-  DpiApplication.DoBeforeFinalization;
-end;
-
-procedure TDpiApplication.DoBeforeFinalization;
-var
-  I: Integer;
-begin
-  if Self = nil then Exit;
-  for I := ComponentCount - 1 downto 0 do begin
-    if I < ComponentCount then
-      Components[I].Free;
-  end;
-end;
-
-function DpiFindApplicationComponent(const ComponentName: string): TComponent;
-// Note: this function is used by TReader to auto rename forms to unique names.
-begin
-  Result := DpiApplication.FindComponent(ComponentName);
-end;
-
-constructor TDpiApplication.Create(AOwner: TComponent);
-begin
-  RegisterFindGlobalComponentProc(@DpiFindApplicationComponent);
-  FOldExitProc := ExitProc;
-  ExitProc := @DpiBeforeFinalization;
-  inherited;
-end;
-
-destructor TDpiApplication.Destroy;
-begin
-  UnregisterFindGlobalComponentProc(@DpiFindApplicationComponent);
-  ExitProc := FOldExitProc;
-  inherited;
-end;
-
-procedure TDpiApplication.Run;
-begin
-  if (FMainForm <> nil) and GetShowMainForm then FMainForm.Show;
-  GetNativeApplication.Run;
-end;
-
-procedure TDpiApplication.Initialize;
-begin
-  GetNativeApplication.Initialize;
-  DpiScreen.UpdateScreen;
-end;
-
-procedure TDpiApplication.Terminate;
-begin
-  Application.Terminate;
-end;
-
-procedure TDpiApplication.ProcessMessages;
-begin
-  GetNativeApplication.ProcessMessages;
-end;
-
-procedure TDpiApplication.UpdateMainForm(AForm: TDpiForm);
-begin
-  if (FMainForm = nil)
-  and (FCreatingForm = AForm)
-  //and (not (AppDestroying in FFlags))
-  and not (AForm.FormStyle in [fsMDIChild, fsSplash])
-  then
-    FMainForm := AForm;
-  GetNativeApplication.UpdateMainForm(AForm.GetNativeForm);
-end;
-
-procedure TDpiApplication.CreateForm(InstanceClass: TComponentClass; out
-  Reference);
-var
-  Instance: TComponent;
-  Ok: Boolean;
-  AForm: TDpiForm;
-begin
-  // Allocate the instance, without calling the constructor
-  Instance := TComponent(InstanceClass.NewInstance);
-  // set the Reference before the constructor is called, so that
-  // events and constructors can refer to it
-  TComponent(Reference) := Instance;
-
-  Ok := False;
-  try
-    if (FCreatingForm = nil) and (Instance is TDpiForm) then
-      FCreatingForm := TDpiForm(Instance);
-    Instance.Create(Self);
-    Ok := true;
-  finally
-    if not Ok then begin
-      TComponent(Reference) := nil;
-      if FCreatingForm = Instance then
-        FCreatingForm := nil;
-    end;
-  end;
-
-  if (Instance is TDpiForm) then begin
-    AForm := TDpiForm(Instance);
-    UpdateMainForm(AForm);
-    if FMainForm = AForm then AForm.GetNativeForm.HandleNeeded;
-    if AForm.FormStyle = fsSplash then begin
-      // show the splash form and handle the paint message
-      AForm.Show;
-      AForm.Invalidate;
-      ProcessMessages;
-    end;
-  end;
-end;
-
-function TDpiApplication.MessageBox(Text, Caption: PChar; Flags: Longint
-  ): Integer;
-begin
-  Result := Application.MessageBox(Text, Caption, Flags);
-end;
-
-{ TDpiJpegImage }
-
-function TDpiJpegImage.GetNativeBitmap: TCustomBitmap;
-begin
-  Result := GetNativeJpeg;
-end;
-
-function TDpiJpegImage.GetNativeJpeg: TJPEGImage;
-begin
-  Result := NativeJpeg;
-end;
-
-constructor TDpiJpegImage.Create;
-begin
-  NativeJpeg := TJPEGImage.Create;
-  inherited;
-  NativeGraphicClass := TJPEGImage;
-end;
-
-destructor TDpiJpegImage.Destroy;
-begin
-  FreeAndNil(NativeJpeg);
-  inherited Destroy;
-end;
-
-{ TDpiPortableNetworkGraphic }
-
-function TDpiPortableNetworkGraphic.GetNativeBitmap: TCustomBitmap;
-begin
-  Result := GetNativePng;
-end;
-
-function TDpiPortableNetworkGraphic.GetNativePng: TPortableNetworkGraphic;
-begin
-  Result := NativePng;
-end;
-
-constructor TDpiPortableNetworkGraphic.Create;
-begin
-  NativePng := TPortableNetworkGraphic.Create;
-  inherited;
-  NativeGraphicClass := TPortableNetworkGraphic;
-end;
-
-destructor TDpiPortableNetworkGraphic.Destroy;
-begin
-  Canvas.NativeCanvas := nil;
-  FreeAndNil(NativePng);
-  inherited;
-end;
-
-{ TDpiCustomControl }
-
-function TDpiCustomControl.GetOnPaint: TNotifyEvent;
-begin
-  Result := GetNativeCustomControl.OnPaint;
-end;
-
-function TDpiCustomControl.GetPixelsPerInch: Integer;
-begin
-  //Result := GetNativeCustomControl.Pix;
-end;
-
-function TDpiCustomControl.GetCanvas: TDpiCanvas;
-begin
-  Result := FCanvas;
-end;
-
-procedure TDpiCustomControl.SetOnPaint(AValue: TNotifyEvent);
-begin
-  GetNativeCustomControl.OnPaint := AValue;
-end;
-
-procedure TDpiCustomControl.SetPixelsPerInch(AValue: Integer);
-begin
-
-end;
-
-function TDpiCustomControl.GetNativeWinControl: TWinControl;
-begin
-  Result := GetNativeCustomControl;
-end;
-
-function TDpiCustomControl.GetNativeCustomControl: TCustomControl;
-begin
-  Result := nil;
-end;
-
-constructor TDpiCustomControl.Create(TheOwner: TComponent);
-begin
-  inherited;
-  FCanvas := TDpiCanvas.Create;
-  FCanvas.NativeCanvas := GetNativeCustomControl.Canvas;
-end;
-
-destructor TDpiCustomControl.Destroy;
-begin
-  FreeAndNil(FCanvas);
-  inherited;
-end;
-
-{ TDpiScrollBar }
-
-function TDpiScrollBar.GetKind: TScrollBarKind;
-begin
-  Result := NativeScrollBar.Kind;
-end;
-
-function TDpiScrollBar.GetMax: Integer;
-begin
-  Result := NativeScrollBar.Max;
-end;
-
-function TDpiScrollBar.GetMin: Integer;
-begin
-  Result := NativeScrollBar.Min;
-end;
-
-function TDpiScrollBar.GetOnChange: TNotifyEvent;
-begin
-  Result := NativeScrollBar.OnChange;
-end;
-
-function TDpiScrollBar.GetPageSize: Integer;
-begin
-  Result := NativeScrollBar.PageSize;
-end;
-
-function TDpiScrollBar.GetPosition: Integer;
-begin
-  Result := NativeScrollBar.Position;
-end;
-
-procedure TDpiScrollBar.SetKind(AValue: TScrollBarKind);
-begin
-  NativeScrollBar.Kind := AValue;
-end;
-
-procedure TDpiScrollBar.SetMax(AValue: Integer);
-begin
-  NativeScrollBar.Max := AValue;
-end;
-
-procedure TDpiScrollBar.SetMin(AValue: Integer);
-begin
-  NativeScrollBar.Min := Avalue;
-end;
-
-procedure TDpiScrollBar.SetOnChange(AValue: TNotifyEvent);
-begin
-  NativeScrollBar.OnChange := AValue;
-end;
-
-procedure TDpiScrollBar.SetPageSize(AValue: Integer);
-begin
-  NativeScrollBar.PageSize := AValue;
-end;
-
-procedure TDpiScrollBar.SetPosition(AValue: Integer);
-begin
-  NativeScrollBar.Position := AValue;
-end;
-
-function TDpiScrollBar.GetNativeControl: TControl;
-begin
-  if not Assigned(NativeScrollBar) then NativeScrollBar := TScrollBar.Create(nil);
-  Result := NativeScrollBar;
-end;
-
-constructor TDpiScrollBar.Create(TheOwner: TComponent);
-begin
-  inherited;
-end;
-
-destructor TDpiScrollBar.Destroy;
-begin
-  FreeAndNil(NativeScrollBar);
-  inherited;
-end;
-
-{ TDpiRasterImage }
-
-function TDpiRasterImage.GetRawImage: TRawImage;
-begin
-  Result := GetNativeRasterImage.RawImage;
-end;
-
-function TDpiRasterImage.GetNativeRasterImage: TRasterImage;
-begin
-  Result := nil;
-end;
-
-procedure TDpiRasterImage.BeginUpdate(ACanvasOnly: Boolean);
-begin
-  GetNativeRasterImage.BeginUpdate(ACanvasOnly);
-end;
-
-procedure TDpiRasterImage.EndUpdate(AStreamIsValid: Boolean);
-begin
-  GetNativeRasterImage.EndUpdate(AStreamIsValid);
-end;
-
-function TDpiRasterImage.GetNativeGraphic: TGraphic;
-begin
-  Result := GetNativeRasterImage;
-end;
-
-{ TDpiGraphic }
-
-function TDpiGraphic.GetNativeGraphic: TGraphic;
-begin
-  Result := nil;
-end;
-
-procedure TDpiGraphic.ScreenChanged;
-begin
-end;
-
-procedure TDpiGraphic.SetDpi(AValue: Integer);
-begin
-  FDpi := AValue;
-  ScreenChanged;
-end;
-
-function TDpiGraphic.GetDpi: Integer;
-begin
-  Result := FDpi;
-end;
-
-constructor TDpiGraphic.Create;
-begin
-  Dpi := DpiScreen.Dpi;
-end;
-
-procedure StretchDrawBitmap(Src: TRasterImage; Dst: TBitmap);
-var
-  SrcPtr: TPixelPointer;
-  DstPtr: TPixelPointer;
-  xx, yy: Integer;
-  SrcX, SrcY: Integer;
-  DstX, DstY: Integer;
-  DstWidth, DstHeight: Integer;
-begin
-  Dst.BeginUpdate;
-  SrcPtr := PixelPointer(Src, 0, 0);
-  DstPtr := PixelPointer(Dst, 0, 0);
-  {for yy := 0 to Dst.Height - 1 do begin
-    for xx := 0 to Dst.Width - 1 do begin
-      SrcPtr.SetXY(Min(ScaleFromNative(xx), Src.Width - 1),
-        Min(ScaleFromNative(yy), Src.Height - 1));
-      DstPtr.Pixel^.B := SrcPtr.Pixel^.B;
-      DstPtr.Pixel^.G := SrcPtr.Pixel^.G;
-      DstPtr.Pixel^.R := SrcPtr.Pixel^.R;
-      DstPtr.NextPixel;
-    end;
-    DstPtr.NextLine;
-  end;
-  }
-  for SrcY := 0 to Src.Height - 1 do begin
-    DstHeight := ScaleToNative(SrcY + 1) - ScaleToNative(SrcY);
-    for DstY := 0 to DstHeight - 1 do begin
-      for SrcX := 0 to Src.Width - 1 do begin
-        DstWidth := ScaleToNative(SrcX + 1) - ScaleToNative(SrcX);
-        for DstX := 0 to DstWidth - 1 do begin
-          DstPtr.Pixel^.B := SrcPtr.Pixel^.B;
-          DstPtr.Pixel^.G := SrcPtr.Pixel^.G;
-          DstPtr.Pixel^.R := SrcPtr.Pixel^.R;
-          DstPtr.NextPixel;
-        end;
-        SrcPtr.NextPixel;
-      end;
-      DstPtr.NextLine;
-      SrcPtr.SetX(0);
-    end;
-    SrcPtr.NextLine;
-  end;
-  Dst.EndUpdate;
-end;
-
-procedure TDpiGraphic.LoadFromFile(const Filename: string);
-var
-  Bitmap: TGraphic;
-begin
-  Bitmap := NativeGraphicClass.Create;
-  try
-    Bitmap.LoadFromFile(FileName);
-    Width := Bitmap.Width;
-    Height := Bitmap.Height;
-    if Self is TDpiBitmap then begin
-      StretchDrawBitmap(TRasterImage(Bitmap), TBitmap(GetNativeGraphic));
-      //TBitmap(GetNativeGraphic).Canvas.StretchDraw(Bounds(0, 0,
-      //TBitmap(GetNativeGraphic).Width, TBitmap(GetNativeGraphic).Height), Bitmap);
-    end else raise Exception.Create('Unsupported class ' + Self.ClassName);
-  finally
-    FreeAndNil(Bitmap);
-  end;
-end;
-
-procedure TDpiGraphic.SaveToFile(const Filename: string);
-var
-  Bitmap: TGraphic;
-begin
-  Bitmap := NativeGraphicClass.Create;
-  try
-    Bitmap.Width := Width;
-    Bitmap.Height := Height;
-    if Self is TDpiBitmap then begin
-      if Bitmap is TRasterImage then
-        (Bitmap as TRasterImage).Canvas.StretchDraw(Bounds(0, 0, Bitmap.Width, Bitmap.Height), TBitmap(GetNativeGraphic))
-        else raise Exception.Create('Expected TRasterImage but got ' + Bitmap.ClassName);
-    end else raise Exception.Create('Unsupported class ' + Self.ClassName);
-    Bitmap.SaveToFile(FileName);
-  finally
-    FreeAndNil(Bitmap);
-  end;
-end;
-
-{ TDpiBitmap }
-
-function TDpiBitmap.GetHeight: Integer;
-begin
-  Result := FHeight;
-end;
-
-function TDpiBitmap.GetCanvas: TDpiCanvas;
-begin
-  Result := FCanvas;
-end;
-
-function TDpiBitmap.GetPixelFormat: TPixelFormat;
-begin
-  Result := GetNativeBitmap.PixelFormat;
-end;
-
-function TDpiBitmap.GetScanLine(Row: Integer): Pointer;
-begin
-  Result := GetNativeBitmap.ScanLine[Row];
-end;
-
-function TDpiBitmap.GetTransparent: Boolean;
-begin
-  Result := GetNativeBitmap.Transparent;
-end;
-
-function TDpiBitmap.GetTransparentColor: TColor;
-begin
-  Result := GetNativeBitmap.TransparentColor;
-end;
-
-function TDpiBitmap.GetWidth: Integer;
-begin
-  Result := FWidth;
-end;
-
-procedure TDpiBitmap.SetHeight(AValue: Integer);
-begin
-  FHeight := AValue;
-  GetNativeBitmap.Height := ScaleToNative(AValue);
-end;
-
-procedure TDpiBitmap.SetPixelFormat(AValue: TPixelFormat);
-begin
-  GetNativeBitmap.PixelFormat := AValue;
-end;
-
-procedure TDpiBitmap.SetTransparent(AValue: Boolean);
-begin
-  GetNativeBitmap.Transparent := AValue;
-end;
-
-procedure TDpiBitmap.SetTransparentColor(AValue: TColor);
-begin
-  GetNativeBitmap.TransparentColor := AValue;
-end;
-
-procedure TDpiBitmap.SetWidth(AValue: Integer);
-begin
-  FWidth := AValue;
-  GetNativeBitmap.Width := ScaleToNative(AValue);
-end;
-
-procedure TDpiBitmap.ScreenChanged;
-var
-  Bitmap: TBitmap;
-  NewWidth: Integer;
-  NewHeight: Integer;
-begin
-  NewWidth := ScaleToNative(Width);
-  NewHeight := ScaleToNative(Height);
-  if Assigned(NativeBitmap) and ((NewWidth <> NativeBitmap.Width) or (NewHeight <> NativeBitmap.Height)) then begin
-    // Rescale bitmap to new size
-    Bitmap := TBitmap.Create;
-    Bitmap.SetSize(NewWidth, NewHeight);
-    Bitmap.PixelFormat := NativeBitmap.PixelFormat;
-    Bitmap.Canvas.StretchDraw(Bounds(0, 0, NewWidth, NewHeight), NativeBitmap);
-    FreeAndNil(NativeBitmap);
-    NativeBitmap := Bitmap;
-    Canvas.NativeCanvas := NativeBitmap.Canvas;
-  end;
-end;
-
-function TDpiBitmap.GetNativeBitmap: TCustomBitmap;
-begin
-  Result := NativeBitmap;
-end;
-
-procedure TDpiBitmap.BeginUpdate;
-begin
-  GetNativeBitmap.BeginUpdate;
-end;
-
-procedure TDpiBitmap.EndUpdate;
-begin
-  GetNativeBitmap.EndUpdate;
-end;
-
-procedure TDpiBitmap.SetSize(AWidth, AHeight: Integer);
-begin
-  FWidth := AWidth;
-  FHeight := AHeight;
-  GetNativeBitmap.SetSize(ScaleToNative(AWidth), ScaleToNative(AHeight));
-end;
-
-constructor TDpiBitmap.Create;
-begin
-  inherited;
-  NativeGraphicClass := TBitmap;
-  NativeBitmap := TBitmap.Create;
-  FCanvas := TDpiCanvas.Create;
-  FCanvas.NativeCanvas := GetNativeBitmap.Canvas;
-end;
-
-destructor TDpiBitmap.Destroy;
-begin
-  FreeAndNil(FCanvas);
-  FreeAndNil(NativeBitmap);
-  inherited;
-end;
-
-procedure TDpiBitmap.Assign(Source: TPersistent);
-begin
-  if Source is TDpiBitmap then begin
-    GetNativeBitmap.Assign((Source as TDpiBitmap).GetNativeBitmap);
-  end else inherited;
-end;
-
-function TDpiBitmap.GetNativeRasterImage: TRasterImage;
-begin
-  Result := GetNativeBitmap;
-end;
-
-{ TDpiListBox }
-
-function TDpiListBox.GetBorderStyle: TBorderStyle;
-begin
-  Result := GetNativeListBox.BorderStyle;
-end;
-
-function TDpiListBox.GetCount: Integer;
-begin
-  Result := GetNativeListBox.Count;
-end;
-
-function TDpiListBox.GetExtendedSelect: Boolean;
-begin
-  Result := GetNativeListBox.ExtendedSelect;
-end;
-
-function TDpiListBox.GetIntegralHeight: Boolean;
-begin
-  Result := GetNativeListBox.IntegralHeight;
-end;
-
-function TDpiListBox.GetItemHeight: Integer;
-begin
-  Result := GetNativeListBox.ItemHeight;
-end;
-
-function TDpiListBox.GetItemIndex: Integer;
-begin
-  Result := GetNativeListBox.ItemIndex;
-end;
-
-function TDpiListBox.GetItems: TStrings;
-begin
-  Result := GetNativeListBox.Items;
-end;
-
-function TDpiListBox.GetOnSelectionChange: TSelectionChangeEvent;
-begin
-  Result := GetNativeListBox.OnSelectionChange;
-end;
-
-function TDpiListBox.GetParentFont: Boolean;
-begin
-  Result := GetNativeListBox.ParentFont;
-end;
-
-function TDpiListBox.GetScrollWidth: Integer;
-begin
-  Result := GetNativeListBox.ScrollWidth;
-end;
-
-function TDpiListBox.GetTopIndex: Integer;
-begin
-  Result := GetNativeListBox.TopIndex;
-end;
-
-procedure TDpiListBox.SetBorderStyle(AValue: TBorderStyle);
-begin
-  GetNativeListBox.BorderStyle := AValue;
-end;
-
-procedure TDpiListBox.SetExtendedSelect(AValue: Boolean);
-begin
-  GetNativeListBox.ExtendedSelect := AValue;
-end;
-
-procedure TDpiListBox.SetIntegralHeight(AValue: Boolean);
-begin
-  GetNativeListBox.IntegralHeight := AValue;
-end;
-
-procedure TDpiListBox.SetItemHeight(AValue: Integer);
-begin
-  GetNativeListBox.ItemHeight := AValue;
-end;
-
-procedure TDpiListBox.SetItemIndex(AValue: Integer);
-begin
-  GetNativeListBox.ItemIndex := AValue;
-end;
-
-procedure TDpiListBox.SetItems(AValue: TStrings);
-begin
-  GetNativeListBox.Items := AValue;
-end;
-
-procedure TDpiListBox.SetOnSelectionChange(AValue: TSelectionChangeEvent);
-begin
-  GetNativeListBox.OnSelectionChange := AValue;
-end;
-
-procedure TDpiListBox.SetParentFont(AValue: Boolean);
-begin
-  GetNativeListBox.ParentFont := AValue;
-end;
-
-procedure TDpiListBox.SetScrollWidth(AValue: Integer);
-begin
-  GetNativeListBox.ScrollWidth := AValue;
-end;
-
-procedure TDpiListBox.SetTopIndex(AValue: Integer);
-begin
-  GetNativeListBox.TopIndex := AValue;
-end;
-
-function TDpiListBox.GetNativeWinControl: TWinControl;
-begin
-  Result := GetNativeListBox;
-end;
-
-function TDpiListBox.GetNativeListBox: TListBox;
-begin
-  if not Assigned(NativeListBox) then NativeListBox := TListBox.Create(nil);
-  Result := NativeListBox;
-end;
-
-destructor TDpiListBox.Destroy;
-begin
-  FreeAndNil(NativeListBox);
-  inherited Destroy;
-end;
-
-{ TDpiPaintBox }
-
-function TDpiPaintBox.GetNativeGraphicControl: TGraphicControl;
-begin
-  if not Assigned(NativePaintBox) then NativePaintBox := TPaintBox.Create(nil);
-  Result := NativePaintBox;
-end;
-
-constructor TDpiPaintBox.Create(TheOwner: TComponent);
-begin
-  inherited;
-  Canvas := TDpiCanvas.Create;
-  Canvas.NativeCanvas := NativePaintBox.Canvas;
-  UpdateNativeControl;
-  ScreenChanged;
-end;
-
-destructor TDpiPaintBox.Destroy;
-begin
-  FreeAndNil(NativePaintBox);
-  inherited;
-end;
-
-{ TDpiPicture }
-
-procedure TDpiPicture.SetBitmap(AValue: TDpiBitmap);
-begin
-  if FBitmap = AValue then Exit;
-  FBitmap := AValue;
-end;
-
-procedure TDpiPicture.LoadFromFile(FileName: string);
-begin
-end;
-
-{ TDpiCanvas }
-
-function TDpiCanvas.GetHandle: HDC;
-begin
-  Result := GetNativeCanvas.Handle;
-end;
-
-function TDpiCanvas.GetHeight: Integer;
-begin
-  Result := ScaleFromNative(GetNativeCanvas.Height);
-end;
-
-function TDpiCanvas.GetPixel(X, Y: Integer): TColor;
-begin
-  Result := GetNativeCanvas.Pixels[ScaleToNative(X), ScaleToNative(Y)];
-end;
-
-function TDpiCanvas.GetWidth: Integer;
-begin
-  Result := ScaleFromNative(GetNativeCanvas.Width);
-end;
-
-procedure TDpiCanvas.SetBrush(AValue: TDpiBrush);
-begin
-  if FBrush = AValue then Exit;
-  if FBrushFree then FreeAndNil(FBrush);
-  FBrushFree := False;
-  FBrush := AValue;
-end;
-
-procedure TDpiCanvas.SetFont(AValue: TDpiFont);
-begin
-  if FFont = AValue then Exit;
-  if FFontFree then FreeAndNil(FFont);
-  FFontFree := False;
-  FFont := AValue;
-end;
-
-procedure TDpiCanvas.SetHandle(AValue: HDC);
-begin
-  GetNativeCanvas.Handle := AValue;
-end;
-
-procedure TDpiCanvas.SetHeight(AValue: Integer);
-begin
-  GetNativeCanvas.Height;
-end;
-
-procedure TDpiCanvas.SetWidth(AValue: Integer);
-begin
-
-end;
-
-procedure TDpiCanvas.SetPen(AValue: TDpiPen);
-begin
-  if FPen = AValue then Exit;
-  if FPenFree then FreeAndNil(FPen);
-  FPenFree := False;
-  FPen := AValue;
-end;
-
-procedure TDpiCanvas.SetPixel(X, Y: Integer; AValue: TColor);
-var
-  BrushStyle: TBrushStyle;
-  BrushColor: TColor;
-begin
- { BrushStyle := GetNativeCanvas.Brush.Style;
-  BrushColor := GetNativeCanvas.Brush.Color;
-  GetNativeCanvas.Brush.Color := AValue;
-  GetNativeCanvas.Brush.Style := bsClear;
-  GetNativeCanvas.FillRect(ScaleToNative(X), ScaleToNative(Y), ScaleToNative(X + 1) - 1, ScaleToNative(Y + 1) - 1);
-  GetNativeCanvas.Brush.Style := BrushStyle;
-  GetNativeCanvas.Brush.Color := BrushColor;
-  }
-  GetNativeCanvas.Pixels[ScaleToNative(X), ScaleToNative(Y)] := AValue;
-end;
-
-procedure TDpiCanvas.SetNativeCanvas(AValue: TCanvas);
-begin
-  if FNativeCanvas = AValue then Exit;
-  if FNativeCanvasFree then FreeAndNil(FNativeCanvas);
-  FNativeCanvasFree := False;
-  FNativeCanvas := AValue;
-  if Assigned(FNativeCanvas) then begin
-    FFont.NativeFont := FNativeCanvas.Font;
-    FBrush.NativeBrush := FNativeCanvas.Brush;
-    FPen.NativePen := FNativeCanvas.Pen;
-  end;
-end;
-
-procedure TDpiCanvas.DoLine(X1, Y1, X2, Y2: Integer);
-begin
-  raise ENotImplemented.Create(SNotImplemented);
-end;
-
-procedure TDpiCanvas.DoTextOut(X, Y: Integer; Text: string);
-begin
-  raise ENotImplemented.Create(SNotImplemented);
-end;
-
-procedure TDpiCanvas.DoRectangle(const Bounds: TRect);
-begin
-  raise ENotImplemented.Create(SNotImplemented);
-end;
-
-procedure TDpiCanvas.DoRectangleFill(const Bounds: TRect);
-begin
-  raise ENotImplemented.Create(SNotImplemented);
-end;
-
-procedure TDpiCanvas.DoPolygon(const Points: array of TPoint);
-begin
-  raise ENotImplemented.Create(SNotImplemented);
-end;
-
-procedure TDpiCanvas.CreateHandle;
-begin
-  raise ENotImplemented.Create(SNotImplemented);
-end;
-
-procedure TDpiCanvas.DoEllipse(const Bounds: TRect);
-begin
-  raise ENotImplemented.Create(SNotImplemented);
-end;
-
-procedure TDpiCanvas.DoMoveTo(X, Y: Integer);
-begin
-  raise ENotImplemented.Create(SNotImplemented);
-end;
-
-procedure TDpiCanvas.DoLineTo(X, Y: Integer);
-begin
-  raise ENotImplemented.Create(SNotImplemented);
-end;
-
-procedure TDpiCanvas.DoPolyline(const Points: array of TPoint);
-begin
-  raise ENotImplemented.Create(SNotImplemented);
-end;
-
-procedure TDpiCanvas.DoPolyBezier(Points: PPoint; NumPts: Integer;
-  Filled: Boolean; Continuous: Boolean);
-begin
-  raise ENotImplemented.Create(SNotImplemented);
-end;
-
-function TDpiCanvas.GetNativeCanvas: TCanvas;
-begin
-  Result := NativeCanvas;
-end;
-
-procedure TDpiCanvas.RoundRect(const Rect: TRect; RX, RY: Integer);
-begin
-  GetNativeCanvas.RoundRect(Rect, RX, RY);
-end;
-
-procedure TDpiCanvas.RoundRect(X1, Y1, X2, Y2: Integer; RX, RY: Integer);
-begin
-  GetNativeCanvas.RoundRect(X1, Y1, X2, Y2, RX, RY);
-end;
-
-procedure TDpiCanvas.Polygon(const Points: array of TPoint; Winding: Boolean;
-  StartIndex: Integer; NumPts: Integer);
-begin
-  GetNativeCanvas.Polygon(Points, Winding, StartIndex, NumPts);
-end;
-
-procedure TDpiCanvas.Polygon(Points: PPoint; NumPts: Integer; Winding: Boolean);
-begin
-  GetNativeCanvas.Polygon(Points, NumPts, Winding);
-end;
-
-procedure TDpiCanvas.Polygon(const Points: array of TPoint);
-begin
-  GetNativeCanvas.Polygon(Points);
-end;
-
-procedure TDpiCanvas.PolyBezier(const Points: array of TPoint; Filled: Boolean;
-  Continuous: boolean);
-begin
-  GetNativeCanvas.Polyline(Points);
-end;
-
-procedure TDpiCanvas.PolyBezier(Points: PPoint; NumPts: Integer;
-  Filled: Boolean; Continuous: Boolean);
-begin
-  GetNativeCanvas.PolyBezier(Points, NumPts, Filled, Continuous);
-end;
-
-procedure TDpiCanvas.Polyline(const Points: array of TPoint);
-begin
-  GetNativeCanvas.Polyline(Points);
-end;
-
-procedure TDpiCanvas.Polyline(Points: PPoint; NumPts: Integer);
-begin
-  GetNativeCanvas.Polyline(Points, NumPts);
-end;
-
-procedure TDpiCanvas.Ellipse(x1, y1, x2, y2: Integer);
-begin
-  GetNativeCanvas.Ellipse(X1, Y1, X2, Y2);
-end;
-
-procedure TDpiCanvas.Ellipse(const ARect: TRect);
-begin
-  Ellipse(ARect.Left, ARect.Top, ARect.Right, ARect.Bottom);
-end;
-
-procedure TDpiCanvas.StretchDraw(const DestRect: TRect; SrcGraphic: TGraphic);
-begin
-  GetNativeCanvas.StretchDraw(DestRect, SrcGraphic);
-end;
-
-procedure TDpiCanvas.Pie(EllipseX1, EllipseY1, EllipseX2, EllipseY2, StartX,
-  StartY, EndX, EndY: Integer);
-begin
-  GetNativeCanvas.Pie(EllipseX1, EllipseY1, EllipseX2, EllipseY2, StartX, StartY,
-    EndX, EndY);
-end;
-
-procedure TDpiCanvas.StretchDraw(const DestRect: TRect; SrcGraphic: TDpiGraphic
-  );
-begin
-  GetNativeCanvas.StretchDraw(ScaleRectToNative(DestRect), SrcGraphic.GetNativeGraphic);
-end;
-
-procedure TDpiCanvas.FrameRect(Rect: TRect);
-begin
-  GetNativeCanvas.FrameRect(ScaleRectToNative(Rect));
-end;
-
-procedure TDpiCanvas.Rectangle(X1, Y1, X2, Y2: Integer);
-begin
-  GetNativeCanvas.Rectangle(ScaleToNative(X1), ScaleToNative(Y1), ScaleToNative(X2), ScaleToNative(Y2));
-end;
-
-procedure TDpiCanvas.Rectangle(const ARect: TRect);
-begin
-  Rectangle(ARect.Left, ARect.Top, ARect.Right, ARect.Bottom);
-end;
-
-function TDpiCanvas.TextWidth(const Text: string): Integer;
-begin
-  Result := ScaleFromNative(GetNativeCanvas.TextWidth(Text));
-end;
-
-function TDpiCanvas.TextHeight(const Text: string): Integer;
-begin
-  Result := ScaleFromNative(GetNativeCanvas.TextHeight(Text));
-end;
-
-function TDpiCanvas.TextExtent(const Text: string): TSize;
-begin
-  Result := ScaleSizeFromNative(GetNativeCanvas.TextExtent(Text));
-end;
-
-procedure TDpiCanvas.TextOut(X, Y: Integer; const Text: string);
-begin
-  GetNativeCanvas.TextOut(ScaleToNative(X), ScaleToNative(Y), Text);
-end;
-
-procedure TDpiCanvas.TextRect(ARect: TRect; X, Y: Integer; Text: string);
-begin
-  GetNativeCanvas.TextRect(ScaleRectToNative(ARect), ScaleToNative(X), ScaleToNative(Y), Text);
-end;
-
-procedure TDpiCanvas.MoveTo(X, Y: Integer);
-begin
-  GetNativeCanvas.MoveTo(ScaleToNative(X), ScaleToNative(Y));
-end;
-
-procedure TDpiCanvas.LineTo(X, Y: Integer);
-begin
-  GetNativeCanvas.LineTo(ScaleToNative(X), ScaleToNative(Y));
-end;
-
-procedure TDpiCanvas.Line(const p1, p2: TPoint);
-begin
-  GetNativeCanvas.Line(P1, P2);
-end;
-
-procedure TDpiCanvas.FillRect(const ARect: TRect);
-begin
-  GetNativeCanvas.FillRect(ScaleRectToNative(ARect));
-end;
-
-procedure TDpiCanvas.FillRect(X1, Y1, X2, Y2: Integer);
-begin
-  GetNativeCanvas.FillRect(ScaleToNative(X1), ScaleToNative(Y1), ScaleToNative(X2), ScaleToNative(Y2));
-end;
-
-procedure TDpiCanvas.Draw(X, Y: Integer; Source: TDpiGraphic);
-begin
-  GetNativeCanvas.Draw(ScaleToNative(X), ScaleToNative(Y), Source.GetNativeGraphic);
-end;
-
-procedure TDpiCanvas.CopyRect(Dest: TRect; SrcCanvas: TDpiCanvas;
-  Source: TRect);
-begin
-  GetNativeCanvas.CopyRect(Dest, SrcCanvas.NativeCanvas, ScaleRectToNative(Source));
-end;
-
-constructor TDpiCanvas.Create;
-begin
-  FNativeCanvas := nil;
-  FFont := TDpiFont.Create;
-  FFontFree := True;
-  FPen := TDpiPen.Create;
-  FPenFree := True;
-  FBrush := TDpiBrush.Create;
-  FBrushFree := True;
-end;
-
-destructor TDpiCanvas.Destroy;
-begin
-  if FFontFree then FreeAndNil(FFont);
-  if FBrushFree then FreeAndNil(FBrush);
-  if FPenFree then FreeAndNil(FPen);
-  if FNativeCanvasFree then FreeAndNil(FNativeCanvasFree);
-  inherited;
-end;
-
-{ TDpiGraphicControl }
-
-procedure TDpiGraphicControl.SetCanvas(AValue: TDpiCanvas);
-begin
-  if FCanvas = AValue then Exit;
-  FCanvas := AValue;
-end;
-
-procedure TDpiGraphicControl.PaintHandler(Sender: TObject);
-begin
-  Paint;
-  if Assigned(FOnPaint) then
-    FOnPaint(Sender);
-end;
-
-procedure TDpiGraphicControl.Paint;
-begin
-end;
-
-function TDpiGraphicControl.GetNativeControl: TControl;
-begin
-  Result := GetNativeGraphicControl;
-end;
-
-function TDpiGraphicControl.GetNativeGraphicControl: TGraphicControl;
-begin
-  Result := NativeGraphicControl;
-end;
-
-procedure TDpiGraphicControl.UpdateNativeControl;
-begin
-  inherited;
-  TGraphicControlEx(GetNativeGraphicControl).OnPaint := PaintHandler;
-end;
-
-function TDpiGraphicControl.GetOnPaint: TNotifyEvent;
-begin
-  Result := FOnPaint;
-end;
-
-procedure TDpiGraphicControl.SetOnPaint(AValue: TNotifyEvent);
-begin
-  FOnPaint := AValue;
-end;
-
-constructor TDpiGraphicControl.Create(TheOwner: TComponent);
-begin
-  NativeGraphicControl := TGraphicControl.Create(nil);
-  inherited;
-  FCanvas := TDpiCanvas.Create;
-  FCanvas.NativeCanvas := GetNativeGraphicControl.Canvas;
-end;
-
-destructor TDpiGraphicControl.Destroy;
-begin
-  FreeAndNil(FCanvas);
-  FreeAndNil(NativeGraphicControl);
-  inherited;
-end;
-
-
-{ TDpiImage }
-
-procedure TDpiImage.SetStretch(AValue: Boolean);
-begin
-  if FStretch = AValue then Exit;
-  FStretch := AValue;
-  NativeImage.Stretch := AValue;
-end;
-
-procedure TDpiImage.SetPicture(AValue: TDpiPicture);
-begin
-  if FDpiPicture = AValue then Exit;
-  FDpiPicture := AValue;
-end;
-
-function TDpiImage.GetNativeControl: TControl;
-begin
-  if not Assigned(NativeImage) then NativeImage := TImage.Create(nil);
-  Result := NativeImage;
-end;
-
-destructor TDpiImage.Destroy;
-begin
-  FreeAndNil(NativeImage);
-  inherited Destroy;
-end;
-
-{ TDpiFont }
-
-procedure TDpiFont.SetSize(AValue: Integer);
-begin
-  if FSize = AValue then Exit;
-  FSize := AValue;
-  FHeight := -MulDiv(FSize, FPixelsPerInch, 72);
-  UpdateFont;
-  DoChange;
-end;
-
-procedure TDpiFont.DoChange;
-begin
-  if Assigned(FOnChange) then FOnChange(Self);
-end;
-
-procedure TDpiFont.SetStyle(AValue: TFontStyles);
-begin
-  GetNativeFont.Style := AValue;
-end;
-
-procedure TDpiFont.UpdateFont;
-begin
-  if Assigned(GetNativeFont) then begin
-    GetNativeFont.PixelsPerInch := FPixelsPerInch;
-    GetNativeFont.Size := FSize;
-  end;
-end;
-
-procedure TDpiFont.ScreenChanged;
-begin
-  DoChange;
-end;
-
-function TDpiFont.GetNativeFont: TFont;
-begin
-  Result := NativeFont;
-end;
-
-procedure TDpiFont.SetPixelsPerInch(AValue: Integer);
-begin
-  FPixelsPerInch := PixelsPerInch;
-  FHeight := -MulDiv(FSize, FPixelsPerInch, 72);
-  UpdateFont;
-end;
-
-function TDpiFont.GetName: string;
-begin
-  Result := GetNativeFont.Name;
-end;
-
-function TDpiFont.GetColor: TColor;
-begin
-  Result := FColor;
-end;
-
-function TDpiFont.GetCharSet: TFontCharSet;
-begin
-  Result := GetNativeFont.CharSet;
-end;
-
-function TDpiFont.GetHeight: Integer;
-begin
-  Result := GetNativeFont.Height;
-end;
-
-function TDpiFont.GetPixelsPerInch: Integer;
-begin
-  Result := FPixelsPerInch;
-end;
-
-function TDpiFont.GetSize: Integer;
-begin
-  Result := FSize;
-end;
-
-function TDpiFont.GetStyle: TFontStyles;
-begin
-  Result := GetNativeFont.Style;
-end;
-
-function TDpiFont.IsNameStored: Boolean;
-begin
-  Result := GetNativeFont.Name <> 'default';
-end;
-
-procedure TDpiFont.SetCharSet(AValue: TFontCharSet);
-begin
-  GetNativeFont.CharSet := AValue;
-end;
-
-procedure TDpiFont.SetColor(AValue: TColor);
-begin
-  if FColor = AValue then Exit;
-  FColor := AValue;
-  GetNativeFont.Color := AValue;
-end;
-
-procedure TDpiFont.SetHeight(AValue: Integer);
-begin
-  FHeight := AValue;
-  FSize := MulDiv(-FHeight, 72, FPixelsPerInch);
-  UpdateFont;
-end;
-
-procedure TDpiFont.SetName(AValue: string);
-begin
-  GetNativeFont.Name := AValue;
-end;
-
-procedure TDpiFont.SetNativeFont(AValue: TFont);
-begin
-  if FNativeFont = AValue then Exit;
-  if FNativeFontFree then FreeAndNil(FNativeFont);
-  FNativeFontFree := False;
-  FNativeFont := AValue;
-end;
-
-constructor TDpiFont.Create;
-begin
-  FNativeFont := TFont.Create;
-  FNativeFontFree := True;
-  FPixelsPerInch := DpiScreen.PixelsPerInch;
-  Size := 8;
-  Color := clDefault;
-end;
-
-destructor TDpiFont.Destroy;
-begin
-  if FNativeFontFree then
-    FreeAndNil(FNativeFont);
-  inherited;
-end;
-
-procedure TDpiFont.Assign(Source: TPersistent);
-begin
-  if Source is TDpiFont then begin
-    GetNativeFont.Assign((Source as TDpiFont).GetNativeFont);
-    Size := (Source as TDpiFont).Size;
-    Height := (Source as TDpiFont).Height;
-    PixelsPerInch := (Source as TDpiFont).PixelsPerInch;
-    FOnChange := (Source as TDpiFont).FOnChange;
-    Color := (Source as TDpiFont).Color;
-  end;
-end;
-
-procedure TDpiFont.GetTextSize(Text: string; var w, h: Integer);
-begin
-  W := GetTextWidth(Text);
-  H := GetTextHeight(Text);
-end;
-
-function TDpiFont.GetTextHeight(Text: string): Integer;
-begin
-  Result := ScaleFromNative(GetNativeFont.GetTextHeight(Text));
-end;
-
-function TDpiFont.GetTextWidth(Text: string): Integer;
-begin
-  Result := ScaleFromNative(GetNativeFont.GetTextWidth(Text));
-end;
-
-{ TDpiWinControl }
-
-function TDpiWinControl.GetBorderStyle: TBorderStyle;
-begin
-  Result := TWinControlEx(GetNativeWinControl).BorderStyle;
-end;
-
-function TDpiWinControl.GetHandle: HWND;
-begin
-  Result := GetNativeWinControl.Handle;
-end;
-
-function TDpiWinControl.GetOnKeyDown: TKeyEvent;
-begin
-  Result := GetNativeWinControl.OnKeyDown;
-end;
-
-function TDpiWinControl.GetOnKeyPress: TKeyPressEvent;
-begin
-  Result := GetNativeWinControl.OnKeyPress;
-end;
-
-function TDpiWinControl.GetOnKeyUp: TKeyEvent;
-begin
-  Result := GetNativeWinControl.OnKeyUp;
-end;
-
-function TDpiWinControl.GetTabOrder: TTabOrder;
-begin
-  Result := GetNativeWinControl.TabOrder;
-end;
-
-function TDpiWinControl.GetTabStop: Boolean;
-begin
-  Result := GetNativeWinControl.TabStop;
-end;
-
-procedure TDpiWinControl.SetBorderStyle(AValue: TBorderStyle);
-begin
-  TWinControlEx(GetNativeWinControl).BorderStyle := AValue;
-end;
-
-procedure TDpiWinControl.SetHandle(AValue: HWND);
-begin
-  GetNativeWinControl.Handle := AValue;
-end;
-
-procedure TDpiWinControl.SetOnKeyDown(AValue: TKeyEvent);
-begin
-  GetNativeWinControl.OnKeyDown := AValue;
-end;
-
-procedure TDpiWinControl.SetOnKeyPress(AValue: TKeyPressEvent);
-begin
-  GetNativeWinControl.OnKeyPress := AValue;
-end;
-
-procedure TDpiWinControl.SetOnKeyUp(AValue: TKeyEvent);
-begin
-  GetNativeWinControl.OnKeyUp := AValue;
-end;
-
-procedure TDpiWinControl.SetTabOrder(AValue: TTabOrder);
-begin
-  GetNativeWinControl.TabOrder := AValue;
-end;
-
-procedure TDpiWinControl.SetTabStop(AValue: Boolean);
-begin
-  GetNativeWinControl.TabStop := AValue;
-end;
-
-procedure TDpiWinControl.KeyDownHandler(Sender: TObject; var Key: Word;
-  Shift: TShiftState);
-begin
-  KeyDown(Key, Shift);
-  if Assigned(FOnKeyDown) then FOnKeyDown(Self, Key, Shift);
-end;
-
-procedure TDpiWinControl.UpdateNativeControl;
-begin
-  inherited;
-  GetNativeWinControl.OnKeyDown := KeyDownHandler;
-end;
-
-function TDpiWinControl.GetNativeControl: TControl;
-begin
-  Result := GetNativeWinControl;
-end;
-
-function TDpiWinControl.GetNativeWinControl: TWinControl;
-begin
-  Result := nil;
-end;
-
-procedure TDpiWinControl.KeyDown(var Key: Word; Shift: TShiftState);
-begin
-end;
-
-procedure TDpiWinControl.ScreenChanged;
-var
-  I: Integer;
-begin
-  inherited;
-  for I := 0 to Controls.Count - 1 do
-    Controls[I].ScreenChanged;
-end;
-
-function TDpiWinControl.ControlCount: Integer;
-begin
-  Result := Controls.Count;
-end;
-
-procedure TDpiWinControl.SetFocus;
-begin
-  GetNativeWinControl.SetFocus;
-end;
-
-constructor TDpiWinControl.Create(TheOwner: TComponent);
-begin
-  Controls := TDpiControls.Create;
-  Controls.OwnsObjects := False;
-  inherited;
-end;
-
-destructor TDpiWinControl.Destroy;
-begin
-  FreeAndNil(Controls);
-  inherited;
-end;
-
-{ TDpiScreen }
-
-procedure TDpiScreen.SetDpi(AValue: Integer);
-begin
-  if FDpi = AValue then Exit;
-  FDpi := AValue;
-  UpdateForms;
-end;
-
-function TDpiScreen.GetWidth: Integer;
-begin
-  Result := ScaleFromNative(Screen.Width);
-end;
-
-procedure TDpiScreen.SetCursor(AValue: TCursor);
-begin
-  Screen.Cursor := AValue;
-end;
-
-procedure TDpiScreen.SetCursors(Index: Integer; AValue: HCURSOR);
-begin
-  Screen.Cursors[Index] := AValue;
-end;
-
-function TDpiScreen.GetHeight: Integer;
-begin
-  Result := ScaleFromNative(Screen.Height);
-end;
-
-function TDpiScreen.GetFormCount: Integer;
-begin
-  Result := FForms.Count;
-end;
-
-function TDpiScreen.GetForms(Index: Integer): TDpiForm;
-begin
-  Result := FForms[Index];
-end;
-
-procedure TDpiScreen.AddForm(AForm: TDpiForm);
-begin
-  if AForm is TDpiForm then begin
-    FForms.Add(AForm);
-    //DpiApplication.UpdateVisible;
-  end;
-end;
-
-function TDpiScreen.GetDesktopHeight: Integer;
-begin
-  Result := ScaleFromNative(Screen.DesktopHeight);
-end;
-
-function TDpiScreen.GetDesktopLeft: Integer;
-begin
-  Result := ScaleFromNative(Screen.DesktopLeft);
-end;
-
-function TDpiScreen.GetDesktopTop: Integer;
-begin
-  Result := ScaleFromNative(Screen.DesktopTop);
-end;
-
-function TDpiScreen.GetDesktopWidth: Integer;
-begin
-  Result := ScaleFromNative(Screen.DesktopWidth);
-end;
-
-procedure TDpiScreen.RemoveForm(AForm: TDpiForm);
-begin
-  FForms.Remove(AForm);
-  FPrevActiveForms.Remove(AForm);
-  if AForm = FActiveForm then begin
-    FActiveForm := nil;
-  end;
-end;
-
-function TDpiScreen.GetActiveForm: TDpiForm;
-begin
-  Result := FActiveForm;
-end;
-
-function TDpiScreen.GetCursor: TCursor;
-begin
-  Result := Screen.Cursor;
-end;
-
-function TDpiScreen.GetCursors(Index: Integer): HCURSOR;
-begin
-  Result := Screen.Cursors[Index];
-end;
-
-procedure TDpiScreen.UpdateForms;
-var
-  I: Integer;
-begin
-  for I := 0 to FForms.Count - 1 do
-    FForms[I].ScreenChanged;
-end;
-
-function TDpiScreen.DisableForms(SkipForm: TDpiForm; DisabledList: Classes.TList
-  ): Classes.TList;
-begin
-  Result := Screen.DisableForms(SkipForm.GetNativeForm, DisabledList);
-end;
-
-procedure TDpiScreen.EnableForms(var AFormList: Classes.TList);
-begin
-  Screen.EnableForms(AFormList);
-end;
-
-constructor TDpiScreen.Create;
-begin
-  FForms := TDpiForms.Create;
-  FForms.OwnsObjects := False;
-  FPrevActiveForms := TDpiForms.Create;
-  FPrevActiveForms.OwnsObjects := False;
-  // Screen.PixelsPerInch is not initialized at this point
-  Dpi := 96;
-end;
-
-destructor TDpiScreen.Destroy;
-begin
-  FreeAndNil(FForms);
-  FreeAndNil(FPrevActiveForms);
-  inherited;
-end;
-
-procedure TDpiScreen.UpdateScreen;
-begin
-  if FixedDpi = -1 then Dpi := Screen.PixelsPerInch
-    else Dpi := FixedDpi;
-end;
-
-procedure TDpiScreen.UpdateActiveFormFromNativeScreen;
-var
-  I: Integer;
-  F: TDpiForm;
-begin
-  if Screen.ActiveForm = nil then FActiveForm := nil
-  else begin
-    for I := 0 to FormCount - 1 do begin
-      F := Forms[I];
-      if F.GetNativeForm = Screen.ActiveForm then begin
-        FActiveForm := F;
-        Break;
-      end;
-    end;
-  end;
-end;
-
-{ TDpiButton }
-
-function TDpiButton.GetNativeControl: TControl;
-begin
-  if not Assigned(NativeButton) then NativeButton := TButton.Create(nil);
-  Result := NativeButton;
-end;
-
-destructor TDpiButton.Destroy;
-begin
-  FreeAndNil(NativeButton);
-  inherited;
-end;
-
-{ TDpiControl }
-
-procedure TDpiControl.SetTop(AValue: Integer);
-begin
-  if FTop = AValue then Exit;
-  FTop := AValue;
-  UpdateBounds;
-end;
-
-procedure TDpiControl.SetVisible(AValue: Boolean);
-begin
-  GetNativeControl.Visible := AValue;
-end;
-
-procedure TDpiControl.SetWidth(AValue: Integer);
-begin
-  if FWidth = AValue then Exit;
-  FWidth := AValue;
-  UpdateBounds;
-end;
-
-function TDpiControl.GetNativeControl: TControl;
-begin
-  Result := nil;
-end;
-
-procedure TDpiControl.UpdateNativeControl;
-begin
-  Font.NativeFont := GetNativeControl.Font;
-  GetNativeControl.OnResize := NativeFormResize;
-  GetNativeControl.OnChangeBounds := NativeChangeBounds;
-  TControlEx(GetNativeControl).OnMouseDown := MouseDownHandler;
-  TControlEx(GetNativeControl).OnMouseUp := MouseUpHandler;
-  TControlEx(GetNativeControl).OnMouseMove := MouseMoveHandler;
-  TControlEx(GetNativeControl).OnMouseEnter := MouseEnterHandler;
-  TControlEx(GetNativeControl).OnMouseLeave := MouseLeaveHandler;
-  TControlEx(GetNativeControl).OnMouseWheel := MouseWheelHandler;
-end;
-
-procedure TDpiControl.MouseDownHandler(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; X, Y: Integer);
-begin
-  MouseDown(Button, Shift, ScaleFromNative(X), ScaleFromNative(Y));
-  if Assigned(FOnMouseDown) then FOnMouseDown(Self, Button, Shift, ScaleFromNative(X), ScaleFromNative(Y));
-end;
-
-procedure TDpiControl.MouseUpHandler(Sender: TObject; Button: TMouseButton;
-  Shift: TShiftState; X, Y: Integer);
-begin
-  MouseUp(Button, Shift, ScaleFromNative(X), ScaleFromNative(Y));
-  if Assigned(FOnMouseUp) then FOnMouseUp(Self, Button, Shift, ScaleFromNative(X), ScaleFromNative(Y));
-end;
-
-procedure TDpiControl.MouseMoveHandler(Sender: TObject; Shift: TShiftState; X,
-  Y: Integer);
-begin
-  MouseMove(Shift, ScaleFromNative(X), ScaleFromNative(Y));
-  if Assigned(FOnMouseMove) then FOnMouseMove(Self, Shift, ScaleFromNative(X), ScaleFromNative(Y));
-end;
-
-procedure TDpiControl.MouseWheelHandler(Sender: TObject; Shift: TShiftState;
-  WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
-begin
-  if Assigned(FOnMouseWheel) then FOnMouseWheel(Self, Shift, WheelDelta,
-    ScalePointFromNative(MousePos), Handled);
-end;
-
-procedure TDpiControl.MouseLeaveHandler(Sender: TObject);
-begin
-  MouseLeave;
-  if Assigned(FOnMouseLeave) then FOnMouseLeave(Self);
-end;
-
-procedure TDpiControl.MouseEnterHandler(Sender: TObject);
-begin
-  MouseEnter;
-  if Assigned(FOnMouseEnter) then FOnMouseEnter(Self);
-end;
-
-procedure TDpiControl.SetWindowProc(AValue: TWndMethod);
-begin
-  GetNativeControl.WindowProc := AValue;
-end;
-
-procedure TDpiControl.DoBorderSpacingChange(Sender: TObject;
-  InnerSpaceChanged: Boolean);
-begin
-  GetNativeControl.BorderSpacing.Left := ScaleToNative(FBorderSpacing.Left);
-  GetNativeControl.BorderSpacing.Right := ScaleToNative(FBorderSpacing.Right);
-  GetNativeControl.BorderSpacing.Top := ScaleToNative(FBorderSpacing.Top);
-  GetNativeControl.BorderSpacing.Bottom := ScaleToNative(FBorderSpacing.Bottom);
-  GetNativeControl.BorderSpacing.Around := ScaleToNative(FBorderSpacing.Around);
-end;
-
-procedure TDpiControl.SetText(AValue: TCaption);
-begin
-
-end;
-
-procedure TDpiControl.MouseDown(Button: TMouseButton; Shift: TShiftState; X,
-  Y: Integer);
-begin
-end;
-
-procedure TDpiControl.MouseUp(Button: TMouseButton; Shift: TShiftState; X,
-  Y: Integer);
-begin
-end;
-
-procedure TDpiControl.MouseMove(Shift: TShiftState; X, Y: Integer);
-begin
-end;
-
-procedure TDpiControl.MouseLeave;
-begin
-end;
-
-procedure TDpiControl.MouseEnter;
-begin
-end;
-
-function TDpiControl.ScreenToClient(const APoint: TPoint): TPoint;
-begin
-  Result := ScalePointFromNative(GetNativeControl.ScreenToClient(ScalePointToNative(APoint)));
-end;
-
-function TDpiControl.ClientToScreen(const APoint: TPoint): TPoint;
-begin
-  Result := ScalePointFromNative(GetNativeControl.ClientToScreen(ScalePointToNative(APoint)));
-end;
-
-procedure TDpiControl.AddHandlerOnVisibleChanged(
-  const OnVisibleChangedEvent: TNotifyEvent; AsFirst: boolean);
-begin
-  GetNativeControl.AddHandlerOnVisibleChanged(OnVisibleChangedEvent, AsFirst);
-end;
-
-procedure TDpiControl.RemoveHandlerOnVisibleChanged(
-  const OnVisibleChangedEvent: TNotifyEvent);
-begin
-  GetNativeControl.RemoveHandlerOnVisibleChanged(OnVisibleChangedEvent);
-end;
-
-procedure TDpiControl.ScreenChanged;
-begin
-  UpdateBounds;
-  Font.ScreenChanged;
-end;
-
-procedure TDpiControl.SetBounds(ALeft, ATop, AWidth, AHeight: Integer);
-begin
-  FLeft := ALeft;
-  FTop := ATop;
-  FWidth := AWidth;
-  FHeight := AHeight;
-  UpdateBounds;
-end;
-
-procedure TDpiControl.Show;
-begin
-  Visible := True;
-end;
-
-procedure TDpiControl.Hide;
-begin
-  Visible := False;
-end;
-
-procedure TDpiControl.Invalidate;
-begin
-  GetNativeControl.Invalidate;
-end;
-
-procedure TDpiControl.Repaint;
-begin
-  GetNativeControl.Repaint;
-end;
-
-procedure TDpiControl.Update;
-begin
-  GetNativeControl.Update;
-end;
-
-procedure TDpiControl.Refresh;
-begin
-  GetNativeControl.Refresh;
-end;
-
-function TDpiControl.IsParentOf(AControl: TDpiControl): boolean;
-begin
-  Result := False;
-  while Assigned(AControl) do
-  begin
-    AControl := AControl.Parent;
-    if Self = AControl then
-      Exit(True);
-  end;
-end;
-
-function TDpiControl.Scale96ToScreen(const ASize: Integer): Integer;
-begin
-  Result := MulDiv(ASize, Screen.PixelsPerInch, 96);
-end;
-
-constructor TDpiControl.Create(TheOwner: TComponent);
-begin
-  inherited;
-  FFont := TDpiFont.Create;
-  FFont.OnChange := FontChanged;
-  FConstraints := TDpiSizeConstraints.Create;
-  if Assigned(TheOwner) and (TheOwner is TDpiWinControl) then
-    Parent := TDpiWinControl(TheOwner);
-  FBorderSpacing := TDpiControlBorderSpacing.Create(Self);
-  GetNativeControl;
-  UpdateNativeControl;
-  ScreenChanged;
-end;
-
-destructor TDpiControl.Destroy;
-begin
-  FreeAndNil(FBorderSpacing);
-  FreeAndNil(FConstraints);
-  FreeAndNil(FFont);
-  inherited;
-end;
-
-procedure TDpiControl.SetLeft(AValue: Integer);
-begin
-  if FLeft = AValue then Exit;
-  FLeft := AValue;
-  UpdateBounds;
-end;
-
-procedure TDpiControl.SetCaption(AValue: string);
-begin
-  GetNativeControl.Caption := AValue;
-end;
-
-procedure TDpiControl.SetParent(AValue: TDpiWinControl);
-begin
-  if FParent = AValue then Exit;
-  if Assigned(FParent) then begin
-    FParent.Controls.Remove(Self);
-    if Assigned(FParent) and (FParent is TDpiWinControl) then
-      GetNativeControl.Parent := nil;
-  end;
-  FParent := AValue;
-  if Assigned(FParent) then begin
-    FParent.Controls.Add(Self);
-    if Assigned(FParent) and (FParent is TDpiWinControl) then
-      GetNativeControl.Parent := TDpiWinControl(FParent).GetNativeWinControl;
-  end;
-end;
-
-procedure TDpiControl.SetFont(AValue: TDpiFont);
-begin
-  if FFont = AValue then Exit;
-  FFont := AValue;
-end;
-
-procedure TDpiControl.SetHint(AValue: string);
-begin
-  GetNativeControl.Hint := AValue;
-end;
-
-function TDpiControl.GetBoundsRect: TRect;
-begin
-  Result.Left := Left;
-  Result.Top := Top;
-  Result.Right := Left + Width;
-  Result.Bottom := Top + Height;
-end;
-
-function TDpiControl.GetAlign: TAlign;
-begin
-  Result := GetNativeControl.Align;
-end;
-
-function TDpiControl.GetAnchors: TAnchors;
-begin
-  Result := GetNativeControl.Anchors;
-end;
-
-function TDpiControl.GetAutoSize: Boolean;
-begin
-  Result := GetNativeControl.AutoSize;
-end;
-
-function TDpiControl.GetClientHeight: Integer;
-begin
-  Result := ScaleFromNative(GetNativeControl.ClientHeight);
-end;
-
-function TDpiControl.GetClientWidth: Integer;
-begin
-  Result := ScaleFromNative(GetNativeControl.ClientWidth);
-end;
-
-function TDpiControl.GetColor: TColor;
-begin
-  Result := GetNativeControl.Color;
-end;
-
-function TDpiControl.GetCursor: TCursor;
-begin
-  Result := GetNativeControl.Cursor;
-end;
-
-function TDpiControl.GetEnabled: Boolean;
-begin
-  Result := GetNativeControl.Enabled;
-end;
-
-function TDpiControl.GetHint: string;
-begin
-  Result := GetNativeControl.Hint;
-end;
-
-function TDpiControl.GetOnClick: TNotifyEvent;
-begin
-  Result := GetNativeControl.OnClick;
-end;
-
-function TDpiControl.GetOnDblClick: TNotifyEvent;
-begin
-  Result := TControlEx(GetNativeControl).OnDblClick;
-end;
-
-function TDpiControl.GetParentFont: Boolean;
-begin
-  Result := TControlEx(GetNativeControl).ParentFont;
-end;
-
-function TDpiControl.GetShowHint: Boolean;
-begin
-  Result := GetNativeControl.ShowHint;
-end;
-
-function TDpiControl.GetText: TCaption;
-begin
-  Result := '';
-end;
-
-function TDpiControl.GetVisible: Boolean;
-begin
-  Result := GetNativeControl.Visible;
-end;
-
-function TDpiControl.GetWindowProc: TWndMethod;
-begin
-  Result := GetNativeControl.WindowProc;
-end;
-
-function TDpiControl.IsAnchorsStored: Boolean;
-begin
-
-end;
-
-procedure TDpiControl.SetAlign(AValue: TAlign);
-begin
-  GetNativeControl.Align := AValue;
-end;
-
-procedure TDpiControl.SetAnchors(AValue: TAnchors);
-begin
-  GetNativeControl.Anchors := AValue;
-end;
-
-procedure TDpiControl.SetAutoSize(AValue: Boolean);
-begin
-  GetNativeControl.AutoSize := AValue;
-end;
-
-procedure TDpiControl.SetBorderSpacing(AValue: TDpiControlBorderSpacing);
-begin
-  if FBorderSpacing = AValue then Exit;
-  FBorderSpacing := AValue;
-end;
-
-procedure TDpiControl.SetBoundsRect(AValue: TRect);
-begin
-  SetBounds(AValue.Left, AValue.Top, AValue.Right - AValue.Left, AValue.Bottom - AValue.Top);
-end;
-
-procedure TDpiControl.SetClientHeight(AValue: Integer);
-begin
-  GetNativeControl.ClientHeight := ScaleToNative(AValue);
-end;
-
-procedure TDpiControl.SetClientWidth(AValue: Integer);
-begin
-  GetNativeControl.ClientWidth := ScaleToNative(AValue);
-end;
-
-procedure TDpiControl.SetColor(AValue: TColor);
-begin
-  GetNativeControl.Color := AValue;
-end;
-
-procedure TDpiControl.SetCursor(AValue: TCursor);
-begin
-  GetNativeControl.Cursor := AValue;
-end;
-
-procedure TDpiControl.SetEnabled(AValue: Boolean);
-begin
-  GetNativeControl.Enabled := AValue;
-end;
-
-procedure TDpiControl.SetOnClick(AValue: TNotifyEvent);
-begin
-  GetNativeControl.OnClick := AValue;
-end;
-
-procedure TDpiControl.SetOnDblClick(AValue: TNotifyEvent);
-begin
-  TControlEx(GetNativeControl).OnDblClick := AValue;
-end;
-
-procedure TDpiControl.SetParentFont(AValue: Boolean);
-begin
-  TControlEx(GetNativeControl).ParentFont := AValue;
-end;
-
-procedure TDpiControl.SetShowHint(AValue: Boolean);
-begin
-  GetNativeControl.ShowHint := AValue;
-end;
-
-procedure TDpiControl.NativeFormResize(Sender: TObject);
-begin
-  BoundsRect := ScaleRectFromNative(GetNativeControl.BoundsRect);
-  DoFormResize;
-end;
-
-procedure TDpiControl.NativeChangeBounds(Sender: TObject);
-var
-  NewBounds: TRect;
-begin
-  NewBounds := ScaleRectFromNative(GetNativeControl.BoundsRect);
-  if NewBounds <> BoundsRect then begin
-    FLeft := NewBounds.Left;
-    FTop := NewBounds.Top;
-    FWidth := NewBounds.Width;
-    FHeight := NewBounds.Height;
-    DoChangeBounds;
-  end;
-end;
-
-procedure TDpiControl.DoFormResize;
-begin
-  if Assigned(FOnResize) then begin
-    FOnResize(Self);
-  end;
-end;
-
-procedure TDpiControl.DoChangeBounds;
-begin
-  if Assigned(FOnChangeBounds) then FOnChangeBounds(Self);
-end;
-
-function TDpiControl.GetCaption: string;
-begin
-  Result := GetNativeControl.Caption;
-end;
-
-procedure TDpiControl.FontChanged(Sender: TObject);
-begin
-  GetNativeControl.Font.Size := ScaleToNative(Font.Size);
-end;
-
-procedure TDpiControl.UpdateBounds;
-var
-  R: TRect;
-begin
-  GetNativeControl.BoundsRect := ScaleRectToNative(BoundsRect);
-  R := ScaleRectToNative(BoundsRect);
-  //WriteLog(Name + ' ' + IntToStr(R.Left) + ', ' + IntToStr(R.Top) + ', ' + IntToStr(R.Width) + ', ' + IntToStr(R.Height))
-end;
-
-procedure TDpiControl.SetHeight(AValue: Integer);
-begin
-  if FHeight = AValue then Exit;
-  FHeight := AValue;
-  UpdateBounds;
 end;
 
@@ -5124 +69 @@
 end;
 
-{ TDpiForm }
-
-function TDpiForm.GetBorderIcons: TBorderIcons;
-begin
-  Result := GetNativeForm.BorderIcons;
-end;
-
-function TDpiForm.GetBorderStyle: TFormBorderStyle;
-begin
-  Result := GetNativeForm.BorderStyle;
-end;
-
-function TDpiForm.GetDesignTimePPI: Integer;
-begin
-  Result := GetNativeForm.DesignTimePPI;
-end;
-
-function TDpiForm.GetFormState: TFormState;
-begin
-  Result := GetNativeForm.FormState;
-end;
-
-function TDpiForm.GetFormStyle: TFormStyle;
-begin
-  Result := GetNativeForm.FormStyle;
-end;
-
-function TDpiForm.GetKeyPreview: Boolean;
-begin
-  Result := GetNativeForm.KeyPreview;
-end;
-
-function TDpiForm.GetLCLVersion: string;
-begin
-  Result := GetNativeForm.LCLVersion;
-end;
-
-function TDpiForm.GetModalResult: TModalResult;
-begin
-  Result := GetNativeForm.ModalResult;
-end;
-
-function TDpiForm.GetOnCloseQuery: TCloseQueryEvent;
-begin
-  Result := GetNativeForm.OnCloseQuery;
-end;
-
-function TDpiForm.GetOnCreate: TNotifyEvent;
-begin
-  Result := GetNativeForm.OnCreate;
-end;
-
-function TDpiForm.GetOnDeactivate: TNotifyEvent;
-begin
-  Result := GetNativeForm.OnDeactivate;
-end;
-
-function TDpiForm.GetOnDestroy: TNotifyEvent;
-begin
-  Result := GetNativeForm.OnDestroy;
-end;
-
-function TDpiForm.GetOnHide: TNotifyEvent;
-begin
-  Result := GetNativeForm.OnHide;
-end;
-
-function TDpiForm.GetOnShow: TNotifyEvent;
-begin
-  Result := GetNativeForm.OnShow;
-end;
-
-function TDpiForm.GetPosition: TPosition;
-begin
-  Result := GetNativeForm.Position;
-end;
-
-function TDpiForm.GetRestoredHeight: Integer;
-begin
-  Result := ScaleFromNative(GetNativeForm.RestoredHeight);
-end;
-
-function TDpiForm.GetRestoredLeft: Integer;
-begin
-  Result := ScaleFromNative(GetNativeForm.RestoredLeft);
-end;
-
-function TDpiForm.GetRestoredTop: Integer;
-begin
-  Result := ScaleFromNative(GetNativeForm.RestoredTop);
-end;
-
-function TDpiForm.GetRestoredWidth: Integer;
-begin
-  Result := ScaleFromNative(GetNativeForm.RestoredWidth);
-end;
-
-function TDpiForm.GetShowInTaskbar: TShowInTaskbar;
-begin
-  Result := GetNativeForm.ShowInTaskBar;
-end;
-
-function TDpiForm.GetWindowState: TWindowState;
-begin
-  Result := GetNativeForm.WindowState;
-end;
-
-procedure TDpiForm.SetBorderIcons(AValue: TBorderIcons);
-begin
-  GetNativeForm.BorderIcons := AValue;
-end;
-
-procedure TDpiForm.SetBorderStyle(AValue: TFormBorderStyle);
-begin
-  GetNativeForm.BorderStyle := AValue;
-end;
-
-procedure TDpiForm.SetDesignTimePPI(AValue: Integer);
-begin
-  GetNativeForm.DesignTimePPI := AValue;
-end;
-
-procedure TDpiForm.SetFormStyle(AValue: TFormStyle);
-begin
-  GetNativeForm.FormStyle := AValue;
-end;
-
-procedure TDpiForm.SetKeyPreview(AValue: Boolean);
-begin
-  GetNativeForm.KeyPreview := AValue;
-end;
-
-procedure TDpiForm.SetLCLVersion(AValue: string);
-begin
-  GetNativeForm.LCLVersion := AValue;
-end;
-
-procedure TDpiForm.SetModalResult(AValue: TModalResult);
-begin
-  GetNativeForm.ModalResult := AValue;
-end;
-
-procedure TDpiForm.SetOnCloseQuery(AValue: TCloseQueryEvent);
-begin
-  GetNativeForm.OnCloseQuery := AValue;
-end;
-
-procedure TDpiForm.SetOnCreate(AValue: TNotifyEvent);
-begin
-  GetNativeForm.OnCreate := AValue;
-end;
-
-procedure TDpiForm.SetOnDeactivate(AValue: TNotifyEvent);
-begin
-  GetNativeForm.OnDeactivate := AValue;
-end;
-
-procedure TDpiForm.SetOnDestroy(AValue: TNotifyEvent);
-begin
-  GetNativeForm.OnDestroy := AValue;
-end;
-
-procedure TDpiForm.SetOnHide(AValue: TNotifyEvent);
-begin
-  GetNativeForm.OnHide := AValue;
-end;
-
-procedure TDpiForm.SetOnShow(AValue: TNotifyEvent);
-begin
-  GetNativeForm.OnShow := AValue;
-end;
-
-procedure TDpiForm.DoOnCreate;
-begin
-  if Assigned(GetNativeForm.OnCreate) then
-    GetNativeForm.OnCreate(Self);
-end;
-
-procedure TDpiForm.FormMessageHandler(var TheMessage: TLMessage);
-begin
-  Dispatch(TheMessage);
-end;
-
-procedure TDpiForm.SetPosition(AValue: TPosition);
-begin
-  GetNativeForm.Position := AValue;
-end;
-
-procedure TDpiForm.SetShowInTaskBar(AValue: TShowInTaskbar);
-begin
-  GetNativeForm.ShowInTaskBar := AValue;
-end;
-
-procedure TDpiForm.SetWindowState(AValue: TWindowState);
-begin
-  GetNativeForm.WindowState := AValue;
-end;
-
-procedure TDpiForm.ActivateHandler(Sender: TObject);
-begin
-  if Assigned(DpiScreen.FActiveForm) then begin
-    if DpiScreen.FPrevActiveForms.IndexOf(DpiScreen.FActiveForm) <> - 1 then
-      DpiScreen.FPrevActiveForms.Remove(DpiScreen.FActiveForm);
-    DpiScreen.FPrevActiveForms.Add(DpiScreen.FActiveForm);
-  end;
-  DpiScreen.FActiveForm := Self;
-  if Assigned(FOnActivate) then FOnActivate(Sender);
-end;
-
-procedure TDpiForm.DeactivateHandler(Sender: TObject);
-begin
-  if DpiScreen.FPrevActiveForms.Count > 0 then begin
-    DpiScreen.FActiveForm := DpiScreen.FPrevActiveForms.Last;
-    DpiScreen.FPrevActiveForms.Delete(DpiScreen.FPrevActiveForms.Count - 1);
-  end else DpiScreen.FActiveForm := nil;
-  //DpiScreen.UpdateActiveFormFromNativeScreen;
-  if Assigned(FOnDeactivate) then FOnDeactivate(Sender);
-end;
-
-procedure TDpiForm.DoClose(var CloseAction: TCloseAction);
-begin
-  if Assigned(FOnClose) then FOnClose(Self, CloseAction);
-end;
-
-procedure TDpiForm.CloseHandler(Sender: TObject; var CloseAction: TCloseAction);
-begin
-  Close;
-end;
-
-procedure TDpiForm.CloseQueryHandler(Sender : TObject; var CanClose : boolean);
-begin
-  if Assigned(FOnCloseQuery) then FOnCloseQuery(Self, CanClose);
-end;
-
-procedure TDpiForm.CreateParams(var p: TCreateParams);
-begin
-  // TODO: NativeForm.CreateParams(P);
-end;
-
-// This method is called by TWriter to retrieve the child components to write
-procedure TDpiForm.GetChildren(Proc: TGetChildProc; Root: TComponent);
-var
-  I: Integer;
-  OwnedComponent: TComponent;
-begin
-  DebugLn(['TDpiForm.GetChildren ComponentCount=', ComponentCount]);
-  inherited GetChildren(Proc, Root);
-  if Root = Self then begin
-    for I := 0 to ComponentCount - 1 do begin
-      OwnedComponent := Components[I];
-      if not OwnedComponent.HasParent then Proc(OwnedComponent);
-    end;
-  end;
-end;
-
-function TDpiForm.GetNativeScrollingWinControl: TScrollingWinControl;
-begin
-  Result := GetNativeForm;
-end;
-
-function TDpiForm.GetNativeForm: TForm;
-begin
-  if not Assigned(NativeForm) then begin
-    NativeForm := TFormEx.CreateNew(nil);
-    (NativeForm as TFormEx).OnMessage := FormMessageHandler;
-    //NativeForm := TForm.Create(nil);
-  end;
-  Result := NativeForm;
-end;
-
-procedure TDpiForm.UpdateNativeControl;
-begin
-  inherited;
-  GetNativeForm.OnActivate := ActivateHandler;
-  GetNativeForm.OnDeactivate := DeactivateHandler;
-  GetNativeForm.OnClose := CloseHandler;
-  GetNativeForm.OnCloseQuery := CloseQueryHandler;
-  GetNativeForm.Name := Name + 'Native';
-end;
-
-procedure TDpiForm.AfterConstruction;
-begin
-  inherited;
-  DoOnCreate;
-end;
-
-function TDpiForm.ShowModal: Integer;
-begin
-  Result := GetNativeForm.ShowModal;
-end;
-
-procedure TDpiForm.SetFocus;
-begin
-  GetNativeForm.SetFocus;
-end;
-
-procedure TDpiForm.Close;
-var
-  CloseAction: TCloseAction;
-  IsMainForm: Boolean;
-begin
-  if (fsModal in FormState) and (ModalResult = 0) then
-    ModalResult := mrCancel
-  else
-  begin
-    if CloseQuery then
-    begin
-      // IsMainForm flag set if we are closing MainForm or its parent
-      IsMainForm := (DpiApplication.MainForm = Self) or (Self.IsParentOf(DpiApplication.MainForm));
-      // Prepare default close action
-      if FormStyle = fsMDIChild then
-      begin
-        CloseAction := caNone;
-        // TODO: mdi logic
-      end
-      else
-      begin
-        if IsMainForm then
-          CloseAction := caFree
-        else
-          CloseAction := caHide;
-      end;
-      // call event handler and let user modify CloseAction
-      DoClose(CloseAction);
-      // execute action according to close action
-      case CloseAction of
-        caHide: Hide;
-        caMinimize: WindowState := wsMinimized;
-        caFree:
-          begin
-            // if form is MainForm, then terminate the application
-            // the owner of the MainForm is the application,
-            // so the Application will take care of free-ing the form
-            // and Release is not necessary
-            if IsMainForm then
-              DpiApplication.Terminate
-            else
-              Release;
-          end;
-      end;
-    end;
-  end;
-end;
-
-function TDpiForm.CloseQuery: boolean;
-begin
-  Result := True;
-  if Assigned(FOnCloseQuery) then
-    FOnCloseQuery(Self, Result);
-end;
-
-procedure TDpiForm.BringToFront;
-begin
-  GetNativeForm.BringToFront;
-end;
-
-procedure TDpiForm.Release;
-begin
-  Free;
-end;
-
-// Init the component with an IDE resource
-constructor TDpiForm.Create(TheOwner: TComponent);
-begin
-  //inherited;
-  //DebugLn(['TDpiForm.Create ', DbgSName(TheOwner)]);
-  GlobalNameSpace.BeginWrite;
-  try
-    CreateNew(TheOwner, 1); // this calls BeginFormUpdate, which is ended in AfterConstruction
-    if (ClassType <> TDpiForm) and not (csDesigning in ComponentState) then begin
-      if not InitResourceComponent(Self, TDataModule) then begin
-        raise EResNotFound.Create('Resource missing for class ' + ClassName);
-      end;
-    end;
-  finally
-    GlobalNameSpace.EndWrite;
-  end;
-  ScreenChanged;
-  UpdateNativeControl;
-end;
-
-constructor TDpiForm.CreateNew(AOwner: TComponent; Num: Integer);
-begin
-  inherited Create(AOwner);
-  DpiScreen.AddForm(Self);
-end;
-
-destructor TDpiForm.Destroy;
-begin
-  // TODO: Can't destroy directly?
-  TFormEx(NativeForm).OnMessage := nil;
-  FreeAndNil(NativeForm);
-
-  DpiScreen.RemoveForm(Self);
-  inherited;
-end;
-
 initialization
 
-RegisterPropertyToSkip(TDpiForm, 'OldCreateOrder', 'Native compatibility property', '');
-RegisterPropertyToSkip(TDpiForm, 'TextHeight', 'Native compatibility property', '');
-RegisterPropertyToSkip(TDpiForm, 'Scaled', 'Native compatibility property', '');
-RegisterPropertyToSkip(TDpiForm, 'TransparentColorValue', 'Native compatibility property', '');
-DpiScreen := TDpiScreen.Create;
-DpiApplication := TDpiApplication.Create(nil);
-DpiMouse := TDpiMouse.Create;
-RegisterClasses([TDpiButton, TDpiImage, TDpiPaintBox, TDpiListBox]);
-
-finalization
-
-FreeAndNil(DpiApplication);
-FreeAndNil(DpiScreen);
-FreeAndNil(DpiMouse);
 
 end.

branches/highdpi/Packages/DpiControls/DpiControlsPackage.pas

@@ -9 +9 @@
 
 uses
-  DpiControls, PixelPointer2, LazarusPackageIntf;
+  DpiControls, PixelPointer2, Dpi.Forms, Dpi.Controls, Dpi.Graphics, 
+  Dpi.Common, Dpi.Menus, Dpi.ComCtrls, Dpi.StdCtrls, Dpi.ExtCtrls, Dpi.Grids, 
+  Dpi.Spin, LazarusPackageIntf;
 
 implementation
@@ -16 +18 @@
 begin
   RegisterUnit('DpiControls', @DpiControls.Register);
+  RegisterUnit('Dpi.Menus', @Dpi.Menus.Register);
+  RegisterUnit('Dpi.StdCtrls', @Dpi.StdCtrls.Register);
+  RegisterUnit('Dpi.ExtCtrls', @Dpi.ExtCtrls.Register);
 end;
 

branches/highdpi/Settings.pas

@@ -4 +4 @@
 
 uses
-  DpiControls, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
+  Dpi.StdCtrls,
+  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
   LCLProc, ScreenTools, Messg, ButtonA, Directories, DrawDlg, ButtonC,
   KeyBindings, Languages;

branches/highdpi/Start.pas

@@ -5 +5 @@
 
 uses
-  DpiControls, GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area, Types,
+  Dpi.Menus, Dpi.StdCtrls, Dpi.Graphics, Dpi.Forms, Dpi.Common,
+  GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area, Types,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls,
   Menus, Registry, DrawDlg, Generics.Collections, Protocol, MiniMap, Brain,