Changeset 246 for branches/highdpi/Packages/DpiControls/UDpiControls.pas

Timestamp:

May 21, 2020, 8:17:38 PM (4 years ago)

Author:

chronos

Message:

• Modified: Update from trunk rev 245.
• Modified: Vcl prefix/suffix changed to Native.

File:

• branches/highdpi/Packages/DpiControls/UDpiControls.pas (modified) (124 diffs)

branches/highdpi/Packages/DpiControls/UDpiControls.pas

@@ -77 +77 @@
   protected
     procedure ScreenChanged;
-    function GetVclFont: TFont; virtual;
+    function GetNativeFont: TFont; virtual;
   public
-    VclFont: TFont;
+    NativeFont: TFont;
     constructor Create;
     destructor Destroy; override;
@@ -162 +162 @@
     procedure SetOnResize(AValue: TNotifyEvent);
     procedure SetShowHint(AValue: Boolean);
-    procedure VclFormResize(Sender: TObject);
-    procedure VclChangeBounds(Sender: TObject);
+    procedure NativeFormResize(Sender: TObject);
+    procedure NativeChangeBounds(Sender: TObject);
     procedure DoFormResize;
     procedure DoChangeBounds;
@@ -186 +186 @@
     procedure SetVisible(AValue: Boolean); virtual;
     procedure SetWidth(AValue: Integer); virtual;
-    function GetVclControl: TControl; virtual;
-    procedure UpdateVclControl; virtual;
+    function GetNativeControl: TControl; virtual;
+    procedure UpdateNativeControl; virtual;
     procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
       X, Y: Integer); virtual;
@@ -247 +247 @@
   protected
     FDpi: Integer;
-    function GetVclGraphic: TGraphic; virtual;
+    function GetNativeGraphic: TGraphic; virtual;
     function GetWidth: Integer; virtual; abstract;
     function GetHeight: Integer; virtual; abstract;
@@ -256 +256 @@
     function GetDpi: Integer; virtual;
   public
-    VclGraphicClass: TGraphicClass;
+    NativeGraphicClass: TGraphicClass;
     constructor Create; virtual;
     procedure LoadFromFile(const Filename: string); virtual;
@@ -271 +271 @@
     function GetRawImage: TRawImage;
   protected
-    function GetVclGraphic: TGraphic; override;
-    function GetVclRasterImage: TRasterImage; virtual;
+    function GetNativeGraphic: TGraphic; override;
+    function GetNativeRasterImage: TRasterImage; virtual;
   public
     property RawImage: TRawImage read GetRawImage;
@@ -282 +282 @@
   private
     FFont: TDpiFont;
-    FVclCanvas: TCanvas;
+    FNativeCanvas: TCanvas;
     function GetBrush: TBrush;
     function GetHandle: HDC;
@@ -294 +294 @@
     procedure SetPen(AValue: TPen);
     procedure SetPixel(X, Y: Integer; AValue: TColor);
-    procedure SetVclCanvas(AValue: TCanvas);
+    procedure SetNativeCanvas(AValue: TCanvas);
   protected
-    function GetVclCanvas: TCanvas; virtual;
+    function GetNativeCanvas: TCanvas; virtual;
   public
-    property VclCanvas: TCanvas read FVclCanvas write SetVclCanvas;
+    property NativeCanvas: TCanvas read FNativeCanvas write SetNativeCanvas;
     procedure StretchDraw(const DestRect: TRect; SrcGraphic: TDpiGraphic); virtual;
     procedure FrameRect(Rect: TRect);
@@ -331 +331 @@
   private
     FOnPaint: TNotifyEvent;
-    VclGraphicControl: TGraphicControl;
+    NativeGraphicControl: TGraphicControl;
     FCanvas: TDpiCanvas;
     function GetOnPaint: TNotifyEvent;
@@ -339 +339 @@
   protected
     procedure Paint; virtual;
-    function GetVclControl: TControl; override;
-    function GetVclGraphicControl: TGraphicControl; virtual;
-    procedure UpdateVclControl; override;
+    function GetNativeControl: TControl; override;
+    function GetNativeGraphicControl: TGraphicControl; virtual;
+    procedure UpdateNativeControl; override;
     property OnPaint: TNotifyEvent read GetOnPaint write SetOnPaint;
   public
@@ -367 +367 @@
     procedure SetTabStop(AValue: Boolean);
   protected
-    function GetVclControl: TControl; override;
-    function GetVclWinControl: TWinControl; virtual;
+    function GetNativeControl: TControl; override;
+    function GetNativeWinControl: TWinControl; virtual;
   public
     Controls: TDpiControls;
@@ -395 +395 @@
     procedure SetPixelsPerInch(AValue: Integer);
   protected
-    function GetVclWinControl: TWinControl; override;
-    function GetVclCustomControl: TCustomControl; virtual;
+    function GetNativeWinControl: TWinControl; override;
+    function GetNativeCustomControl: TCustomControl; virtual;
   public
     property Canvas: TDpiCanvas read GetCanvas;
@@ -421 +421 @@
     FVertScrollBar: TDpiControlScrollBar;
   protected
-    function GetVclCustomControl: TCustomControl; override;
-    function GetVclScrollingWinControl: TScrollingWinControl; virtual;
+    function GetNativeCustomControl: TCustomControl; override;
+    function GetNativeScrollingWinControl: TScrollingWinControl; virtual;
   public
     constructor Create(TheOwner: TComponent); override;
@@ -480 +480 @@
     procedure CreateParams(var p: TCreateParams); virtual;
     procedure GetChildren(Proc: TGetChildProc; Root: TComponent); override;
-    function GetVclScrollingWinControl: TScrollingWinControl; override;
-    function GetVclForm: TForm; virtual;
-    procedure UpdateVclControl; override;
+    function GetNativeScrollingWinControl: TScrollingWinControl; override;
+    function GetNativeForm: TForm; virtual;
+    procedure UpdateNativeControl; override;
   public
-    VclForm: TForm;
+    NativeForm: TForm;
     procedure AfterConstruction; override;
     property ModalResult: TModalResult read GetModalResult write SetModalResult;
@@ -527 +527 @@
   private
   protected
-    function GetVclControl: TControl; override;
+    function GetNativeControl: TControl; override;
   public
-    VclButton: TButton;
+    NativeButton: TButton;
     destructor Destroy; override;
   published
@@ -559 +559 @@
     procedure SetTopIndex(AValue: Integer);
   protected
-    function GetVclWinControl: TWinControl; override;
-    function GetVclListBox: TListBox; virtual;
+    function GetNativeWinControl: TWinControl; override;
+    function GetNativeListBox: TListBox; virtual;
   public
-    VclListBox: TListBox;
+    NativeListBox: TListBox;
     destructor Destroy; override;
     property ItemIndex: Integer read GetItemIndex write SetItemIndex;
@@ -598 +598 @@
     procedure SetPosition(AValue: Integer);
   protected
-    function GetVclControl: TControl; override;
+    function GetNativeControl: TControl; override;
   public
-    VclScrollBar: TScrollBar;
+    NativeScrollBar: TScrollBar;
     destructor Destroy; override;
   published
@@ -627 +627 @@
     function GetHeight: Integer; override;
     function GetWidth: Integer; override;
-    function GetVclBitmap: TCustomBitmap; virtual;
-    function GetVclRasterImage: TRasterImage; override;
+    function GetNativeBitmap: TCustomBitmap; virtual;
+    function GetNativeRasterImage: TRasterImage; override;
     procedure SetHeight(AValue: Integer); override;
     procedure SetWidth(AValue: Integer); override;
     procedure ScreenChanged; override;
   public
-    VclBitmap: TBitmap;
+    NativeBitmap: TBitmap;
     procedure BeginUpdate;
     procedure EndUpdate;
@@ -669 +669 @@
   protected
   public
-    VclImage: TImage;
-    function GetVclControl: TControl; override;
+    NativeImage: TImage;
+    function GetNativeControl: TControl; override;
     destructor Destroy; override;
   published
@@ -682 +682 @@
   TDpiPaintBox = class(TDpiGraphicControl)
   public
-    VclPaintBox: TPaintBox;
-    function GetVclGraphicControl: TGraphicControl; override;
+    NativePaintBox: TPaintBox;
+    function GetNativeGraphicControl: TGraphicControl; override;
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -718 +718 @@
     destructor Destroy; override;
     procedure UpdateScreen;
-    procedure UpdateActiveFormFromVclScreen;
+    procedure UpdateActiveFormFromNativeScreen;
     property FormCount: Integer read GetFormCount;
     property Forms[Index: Integer]: TDpiForm read GetForms;
@@ -735 +735 @@
   TDpiJpegImage = class(TDpiBitmap)
   protected
-    function GetVclBitmap: TCustomBitmap; override;
-    function GetVclJpeg: TJPEGImage; virtual;
+    function GetNativeBitmap: TCustomBitmap; override;
+    function GetNativeJpeg: TJPEGImage; virtual;
   public
-    VclJpeg: TJPEGImage;
+    NativeJpeg: TJPEGImage;
     constructor Create; override;
   end;
@@ -746 +746 @@
   TDpiPortableNetworkGraphic = class(TDpiBitmap)
   protected
-    function GetVclBitmap: TCustomBitmap; override;
-    function GetVclPng: TPortableNetworkGraphic; virtual;
+    function GetNativeBitmap: TCustomBitmap; override;
+    function GetNativePng: TPortableNetworkGraphic; virtual;
   public
-    VclPng: TPortableNetworkGraphic;
+    NativePng: TPortableNetworkGraphic;
     constructor Create; override;
   end;
@@ -767 +767 @@
     procedure SetTitle(AValue: string);
   protected
-    function GetVclApplication: TApplication; virtual;
+    function GetNativeApplication: TApplication; virtual;
   public
     constructor Create(AOwner: TComponent); override;
@@ -828 +828 @@
     procedure OnClickHandler(Sender: TObject);
   protected
-    function GetVclMenuItem: TMenuItem; virtual;
+    function GetNativeMenuItem: TMenuItem; virtual;
     procedure SetParentComponent(AValue: TComponent); override;
   public
-    VclMenuItem: TMenuItem;
+    NativeMenuItem: TMenuItem;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -861 +861 @@
     FItems: TDpiMenuItem;
   protected
-    function GetVclMenu: TMenu; virtual;
+    function GetNativeMenu: TMenu; virtual;
   public
     property Items: TDpiMenuItem read FItems;
@@ -875 +875 @@
     procedure SetAutoPopup(AValue: Boolean);
   protected
-    function GetVclMenu: TMenu; override;
-    function GetVclPopupMenu: TPopupMenu; virtual;
+    function GetNativeMenu: TMenu; override;
+    function GetNativePopupMenu: TPopupMenu; virtual;
   public
-    VclPopupMenu: TPopupMenu;
+    NativePopupMenu: TPopupMenu;
     procedure PopUp;
     procedure PopUp(X, Y: Integer); virtual;
@@ -897 +897 @@
 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 ScaleToVcl(Value: Integer): Integer;
-function ScaleFromVcl(Value: Integer): Integer;
-function ScalePointToVcl(Value: TPoint): TPoint;
-function ScalePointFromVcl(Value: TPoint): TPoint;
-function ScaleSizeToVcl(Value: TSize): TSize;
-function ScaleSizeFromVcl(Value: TSize): TSize;
-function ScaleRectToVcl(Value: TRect): TRect;
-function ScaleRectFromVcl(Value: TRect): TRect;
+function ScaleToNative(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;
 
 
@@ -933 +933 @@
 function DpiCreateRectRgn(X1, Y1, X2, Y2: Integer): HRGN;
 begin
-  Result := CreateRectRgn(ScaleToVcl(X1), ScaleToVcl(Y1), ScaleToVcl(X2),
-    ScaleToVcl(Y2));
-end;
-
-function ScaleToVcl(Value: Integer): Integer;
+  Result := CreateRectRgn(ScaleToNative(X1), ScaleToNative(Y1), ScaleToNative(X2),
+    ScaleToNative(Y2));
+end;
+
+function ScaleToNative(Value: Integer): Integer;
 begin
   Result := Round(Value * DpiScreen.Dpi / 96);
 end;
 
-function ScaleFromVcl(Value: Integer): Integer;
+function ScaleFromNative(Value: Integer): Integer;
 begin
   Result := Round(Value * 96 / DpiScreen.Dpi);
 end;
 
-function ScalePointToVcl(Value: TPoint): TPoint;
-begin
-  Result.X := ScaleToVcl(Value.X);
-  Result.Y := ScaleToVcl(Value.Y);
-end;
-
-function ScalePointFromVcl(Value: TPoint): TPoint;
-begin
-  Result.X := ScaleFromVcl(Value.X);
-  Result.Y := ScaleFromVcl(Value.Y);
-end;
-
-function ScaleSizeToVcl(Value: TSize): TSize;
-begin
-  Result.Width := ScaleToVcl(Value.Width);
-  Result.Height := ScaleToVcl(Value.Height);
-end;
-
-function ScaleSizeFromVcl(Value: TSize): TSize;
-begin
-  Result.Width := ScaleFromVcl(Value.Width);
-  Result.Height := ScaleFromVcl(Value.Height);
-end;
-
-function ScaleRectToVcl(Value: TRect): TRect;
-begin
-  Result.Left := ScaleToVcl(Value.Left);
-  Result.Top := ScaleToVcl(Value.Top);
-  Result.Right := ScaleToVcl(Value.Right);
-  Result.Bottom := ScaleToVcl(Value.Bottom);
-end;
-
-function ScaleRectFromVcl(Value: TRect): TRect;
-begin
-  Result.Left := ScaleFromVcl(Value.Left);
-  Result.Top := ScaleFromVcl(Value.Top);
-  Result.Right := ScaleFromVcl(Value.Right);
-  Result.Bottom := ScaleFromVcl(Value.Bottom);
+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;
 
@@ -990 +990 @@
   YSrc: Integer; Rop: DWORD = SRCCOPY): Boolean;
 begin
-  Result := BitBlt(DestDC, ScaleToVcl(X), ScaleToVcl(Y), ScaleToVcl(Width),
-    ScaleToVcl(Height), SrcDC, ScaleToVcl(XSrc), ScaleToVcl(YSrc), Rop);
+  Result := BitBlt(DestDC, ScaleToNative(X), ScaleToNative(Y), ScaleToNative(Width),
+    ScaleToNative(Height), SrcDC, ScaleToNative(XSrc), ScaleToNative(YSrc), Rop);
 end;
 
 { TDpiMenu }
 
-function TDpiMenu.GetVclMenu: TMenu;
+function TDpiMenu.GetNativeMenu: TMenu;
 begin
   Result := nil;
@@ -1017 +1017 @@
 function TDpiMenuItem.GetCaption: TTranslateString;
 begin
-  Result := GetVclMenuItem.Caption;
+  Result := GetNativeMenuItem.Caption;
 end;
 
 function TDpiMenuItem.GetChecked: Boolean;
 begin
-  Result := GetVclMenuItem.Checked;
+  Result := GetNativeMenuItem.Checked;
 end;
 
@@ -1032 +1032 @@
 function TDpiMenuItem.GetEnabled: Boolean;
 begin
-  Result := GetVclMenuItem.Enabled;
+  Result := GetNativeMenuItem.Enabled;
 end;
 
 function TDpiMenuItem.GetGroupIndex: Byte;
 begin
-  Result := GetVclMenuItem.GroupIndex;
+  Result := GetNativeMenuItem.GroupIndex;
 end;
 
@@ -1052 +1052 @@
 function TDpiMenuItem.GetRadioItem: Boolean;
 begin
-  Result := GetVclMenuItem.RadioItem;
+  Result := GetNativeMenuItem.RadioItem;
 end;
 
 function TDpiMenuItem.GetShortCut: TShortCut;
 begin
-  Result := GetVclMenuItem.ShortCut;
+  Result := GetNativeMenuItem.ShortCut;
 end;
 
 function TDpiMenuItem.GetVisible: Boolean;
 begin
-  Result := GetVclMenuItem.Visible;
+  Result := GetNativeMenuItem.Visible;
 end;
 
@@ -1092 +1092 @@
 procedure TDpiMenuItem.SetCaption(AValue: TTranslateString);
 begin
-  GetVclMenuItem.Caption := AValue;
+  GetNativeMenuItem.Caption := AValue;
 end;
 
 procedure TDpiMenuItem.SetChecked(AValue: Boolean);
 begin
-  GetVclMenuItem.Checked := AValue;
+  GetNativeMenuItem.Checked := AValue;
 end;
 
 procedure TDpiMenuItem.SetEnabled(AValue: Boolean);
 begin
-  GetVclMenuItem.Enabled := AValue;
+  GetNativeMenuItem.Enabled := AValue;
 end;
 
 procedure TDpiMenuItem.SetGroupIndex(AValue: Byte);
 begin
-  GetVclMenuItem.GroupIndex := AValue;
+  GetNativeMenuItem.GroupIndex := AValue;
 end;
 
@@ -1117 +1117 @@
 procedure TDpiMenuItem.SetRadioItem(AValue: Boolean);
 begin
-  GetVclMenuItem.RadioItem := AValue;
+  GetNativeMenuItem.RadioItem := AValue;
 end;
 
 procedure TDpiMenuItem.SetShortCut(AValue: TShortCut);
 begin
-  GetVclMenuItem.ShortCut := AValue;
+  GetNativeMenuItem.ShortCut := AValue;
 end;
 
 procedure TDpiMenuItem.SetVisible(AValue: Boolean);
 begin
-  GetVclMenuItem.Visible := AValue;
+  GetNativeMenuItem.Visible := AValue;
 end;
 
@@ -1139 +1139 @@
 begin
   FItems.Delete(Index);
-  GetVclMenuItem.Delete(Index);
+  GetNativeMenuItem.Delete(Index);
 end;
 
@@ -1150 +1150 @@
 begin
   FItems.Insert(Index, Item);
-  GetVclMenuItem.Insert(Index, Item.GetVclMenuItem);
+  GetNativeMenuItem.Insert(Index, Item.GetNativeMenuItem);
 end;
 
@@ -1171 +1171 @@
 end;
 
-function TDpiMenuItem.GetVclMenuItem: TMenuItem;
-begin
-  if not Assigned(VclMenuItem) then begin
-    VclMenuItem := TMenuItem.Create(nil);
-    VclMenuItem.Name := 'Vcl' + Name;
-    VclMenuItem.OnClick := @OnClickHandler;
-  end;
-  Result := VclMenuItem;
+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;
 
@@ -1220 +1220 @@
 procedure TDpiPopupMenu.PopUp(X, Y: Integer);
 begin
-  GetVclPopupMenu.PopUp(ScaleToVcl(X), ScaleToVcl(Y));
+  GetNativePopupMenu.PopUp(ScaleToNative(X), ScaleToNative(Y));
 end;
 
@@ -1226 +1226 @@
 begin
   inherited;
-  GetVclPopupMenu;
+  GetNativePopupMenu;
 end;
 
 function TDpiPopupMenu.GetAutoPopup: Boolean;
 begin
-  Result := GetVclPopupMenu.AutoPopup;
+  Result := GetNativePopupMenu.AutoPopup;
 end;
 
 procedure TDpiPopupMenu.SetAutoPopup(AValue: Boolean);
 begin
-  GetVclPopupMenu.AutoPopup := AValue;
-end;
-
-function TDpiPopupMenu.GetVclMenu: TMenu;
-begin
-  Result := GetVclPopupMenu;
-end;
-
-function TDpiPopupMenu.GetVclPopupMenu: TPopupMenu;
-begin
-  if not Assigned(VclPopupMenu) then begin
-    VclPopupMenu := TPopupMenu.Create(nil);
-    if Assigned(Items.VclMenuItem) then Items.VclMenuItem.Free;
-    Items.VclMenuItem := VclPopupMenu.Items;
-  end;
-  Result := VclPopupMenu;
+  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(VclPopupMenu) then FreeAndNil(VclPopupMenu);
+  if Assigned(NativePopupMenu) then FreeAndNil(NativePopupMenu);
   inherited Destroy;
 end;
@@ -1264 +1264 @@
 function TDpiMouse.GetCursorPos: TPoint;
 begin
-  Result := ScalePointFromVcl(Mouse.CursorPos);
+  Result := ScalePointFromNative(Mouse.CursorPos);
 end;
 
 procedure TDpiMouse.SetCursorPos(AValue: TPoint);
 begin
-  Mouse.CursorPos := ScalePointToVcl(AValue);
+  Mouse.CursorPos := ScalePointToNative(AValue);
 end;
 
@@ -1305 +1305 @@
 { TDpiScrollingWinControl }
 
-function TDpiScrollingWinControl.GetVclCustomControl: TCustomControl;
-begin
-  Result := GetVclScrollingWinControl;
-end;
-
-function TDpiScrollingWinControl.GetVclScrollingWinControl: TScrollingWinControl;
+function TDpiScrollingWinControl.GetNativeCustomControl: TCustomControl;
+begin
+  Result := GetNativeScrollingWinControl;
+end;
+
+function TDpiScrollingWinControl.GetNativeScrollingWinControl: TScrollingWinControl;
 begin
   Result := nil;
@@ -1366 +1366 @@
 function TDpiApplication.GetTitle: string;
 begin
-  Result := GetVclApplication.Title;
+  Result := GetNativeApplication.Title;
 end;
 
 function TDpiApplication.GetShowMainForm: Boolean;
 begin
-  Result := GetVclApplication.ShowMainForm;
+  Result := GetNativeApplication.ShowMainForm;
 end;
 
@@ -1386 +1386 @@
 procedure TDpiApplication.SetShowMainForm(AValue: Boolean);
 begin
-  GetVclApplication.ShowMainForm := AValue;
+  GetNativeApplication.ShowMainForm := AValue;
 end;
 
 procedure TDpiApplication.SetTitle(AValue: string);
 begin
-  GetVclApplication.Title := AValue;
-end;
-
-function TDpiApplication.GetVclApplication: TApplication;
+  GetNativeApplication.Title := AValue;
+end;
+
+function TDpiApplication.GetNativeApplication: TApplication;
 begin
   Result := Application;
@@ -1419 +1419 @@
 begin
   if (FMainForm <> nil) and GetShowMainForm then FMainForm.Show;
-  GetVclApplication.Run;
+  GetNativeApplication.Run;
 end;
 
 procedure TDpiApplication.Initialize;
 begin
-  GetVclApplication.Initialize;
+  GetNativeApplication.Initialize;
   DpiScreen.UpdateScreen;
 end;
@@ -1435 +1435 @@
 procedure TDpiApplication.ProcessMessages;
 begin
-  GetVclApplication.ProcessMessages;
+  GetNativeApplication.ProcessMessages;
 end;
 
@@ -1446 +1446 @@
   then
     FMainForm := AForm;
-  GetVclApplication.UpdateMainForm(AForm.GetVclForm);
+  GetNativeApplication.UpdateMainForm(AForm.GetNativeForm);
 end;
 
@@ -1479 +1479 @@
     AForm := TDpiForm(Instance);
     UpdateMainForm(AForm);
-    if FMainForm = AForm then AForm.GetVclForm.HandleNeeded;
+    if FMainForm = AForm then AForm.GetNativeForm.HandleNeeded;
     if AForm.FormStyle = fsSplash then begin
       // show the splash form and handle the paint message
@@ -1497 +1497 @@
 { TDpiJpegImage }
 
-function TDpiJpegImage.GetVclBitmap: TCustomBitmap;
-begin
-  Result := GetVclJpeg;
-end;
-
-function TDpiJpegImage.GetVclJpeg: TJPEGImage;
-begin
-  if not Assigned(VclJpeg) then VclJpeg := TJPEGImage.Create;
-  Result := VclJpeg;
+function TDpiJpegImage.GetNativeBitmap: TCustomBitmap;
+begin
+  Result := GetNativeJpeg;
+end;
+
+function TDpiJpegImage.GetNativeJpeg: TJPEGImage;
+begin
+  if not Assigned(NativeJpeg) then NativeJpeg := TJPEGImage.Create;
+  Result := NativeJpeg;
 end;
 
@@ -1511 +1511 @@
 begin
   inherited;
-  VclGraphicClass := TJPEGImage;
+  NativeGraphicClass := TJPEGImage;
 end;
 
 { TDpiPortableNetworkGraphic }
 
-function TDpiPortableNetworkGraphic.GetVclBitmap: TCustomBitmap;
-begin
-  Result := GetVclPng;
-end;
-
-function TDpiPortableNetworkGraphic.GetVclPng: TPortableNetworkGraphic;
-begin
-  if not Assigned(VclPng) then VclPng := TPortableNetworkGraphic.Create;
-  Result := VclPng;
+function TDpiPortableNetworkGraphic.GetNativeBitmap: TCustomBitmap;
+begin
+  Result := GetNativePng;
+end;
+
+function TDpiPortableNetworkGraphic.GetNativePng: TPortableNetworkGraphic;
+begin
+  if not Assigned(NativePng) then NativePng := TPortableNetworkGraphic.Create;
+  Result := NativePng;
 end;
 
@@ -1530 +1530 @@
 begin
   inherited;
-  VclGraphicClass := TPortableNetworkGraphic;
+  NativeGraphicClass := TPortableNetworkGraphic;
 end;
 
@@ -1537 +1537 @@
 function TDpiCustomControl.GetOnPaint: TNotifyEvent;
 begin
-  Result := GetVclCustomControl.OnPaint;
+  Result := GetNativeCustomControl.OnPaint;
 end;
 
 function TDpiCustomControl.GetPixelsPerInch: Integer;
 begin
-//  Result := GetVclCustomControl.P;
+//  Result := GetNativeCustomControl.P;
 end;
 
@@ -1549 +1549 @@
   if not Assigned(FCanvas) then begin
     FCanvas := TDpiCanvas.Create;
-    FCanvas.VclCanvas := GetVclCustomControl.Canvas;
+    FCanvas.NativeCanvas := GetNativeCustomControl.Canvas;
   end;
   Result := FCanvas;
@@ -1556 +1556 @@
 procedure TDpiCustomControl.SetOnPaint(AValue: TNotifyEvent);
 begin
-  GetVclCustomControl.OnPaint := AValue;
+  GetNativeCustomControl.OnPaint := AValue;
 end;
 
@@ -1564 +1564 @@
 end;
 
-function TDpiCustomControl.GetVclWinControl: TWinControl;
-begin
-  Result := GetVclCustomControl;
-end;
-
-function TDpiCustomControl.GetVclCustomControl: TCustomControl;
+function TDpiCustomControl.GetNativeWinControl: TWinControl;
+begin
+  Result := GetNativeCustomControl;
+end;
+
+function TDpiCustomControl.GetNativeCustomControl: TCustomControl;
 begin
   Result := nil;
@@ -1578 +1578 @@
 function TDpiScrollBar.GetBorderSpacing: TControlBorderSpacing;
 begin
-  Result := VclScrollBar.BorderSpacing;
+  Result := NativeScrollBar.BorderSpacing;
 end;
 
 function TDpiScrollBar.GetKind: TScrollBarKind;
 begin
-  Result := VclScrollBar.Kind;
+  Result := NativeScrollBar.Kind;
 end;
 
 function TDpiScrollBar.GetMax: Integer;
 begin
-  Result := VclScrollBar.Max;
+  Result := NativeScrollBar.Max;
 end;
 
 function TDpiScrollBar.GetMin: Integer;
 begin
-  Result := VclScrollBar.Min;
+  Result := NativeScrollBar.Min;
 end;
 
 function TDpiScrollBar.GetOnChange: TNotifyEvent;
 begin
-  Result := VclScrollBar.OnChange;
+  Result := NativeScrollBar.OnChange;
 end;
 
 function TDpiScrollBar.GetPageSize: Integer;
 begin
-  Result := VclScrollBar.PageSize;
+  Result := NativeScrollBar.PageSize;
 end;
 
 function TDpiScrollBar.GetPosition: Integer;
 begin
-  Result := VclScrollBar.Position;
+  Result := NativeScrollBar.Position;
 end;
 
 procedure TDpiScrollBar.SetBorderSpacing(AValue: TControlBorderSpacing);
 begin
-  VclScrollBar.BorderSpacing := AValue;
+  NativeScrollBar.BorderSpacing := AValue;
 end;
 
 procedure TDpiScrollBar.SetKind(AValue: TScrollBarKind);
 begin
-  VclScrollBar.Kind := AValue;
+  NativeScrollBar.Kind := AValue;
 end;
 
 procedure TDpiScrollBar.SetMax(AValue: Integer);
 begin
-  VclScrollBar.Max := AValue;
+  NativeScrollBar.Max := AValue;
 end;
 
 procedure TDpiScrollBar.SetMin(AValue: Integer);
 begin
-  VclScrollBar.Min := Avalue;
+  NativeScrollBar.Min := Avalue;
 end;
 
 procedure TDpiScrollBar.SetOnChange(AValue: TNotifyEvent);
 begin
-  VclScrollBar.OnChange := AValue;
+  NativeScrollBar.OnChange := AValue;
 end;
 
 procedure TDpiScrollBar.SetPageSize(AValue: Integer);
 begin
-  VclScrollBar.PageSize := AValue;
+  NativeScrollBar.PageSize := AValue;
 end;
 
 procedure TDpiScrollBar.SetPosition(AValue: Integer);
 begin
-  VclScrollBar.Position := AValue;
-end;
-
-function TDpiScrollBar.GetVclControl: TControl;
-begin
-  if not Assigned(VclScrollBar) then VclScrollBar := TScrollBar.Create(nil);
-  Result := VclScrollBar;
+  NativeScrollBar.Position := AValue;
+end;
+
+function TDpiScrollBar.GetNativeControl: TControl;
+begin
+  if not Assigned(NativeScrollBar) then NativeScrollBar := TScrollBar.Create(nil);
+  Result := NativeScrollBar;
 end;
 
 destructor TDpiScrollBar.Destroy;
 begin
-  FreeAndNil(VclScrollBar);
+  FreeAndNil(NativeScrollBar);
   inherited Destroy;
 end;
@@ -1662 +1662 @@
 function TDpiRasterImage.GetRawImage: TRawImage;
 begin
-  Result := GetVclRasterImage.RawImage;
-end;
-
-function TDpiRasterImage.GetVclRasterImage: TRasterImage;
-begin
-  Result := GetVclRasterImage;
-end;
-
-function TDpiRasterImage.GetVclGraphic: TGraphic;
-begin
-  Result := GetVclRasterImage;
+  Result := GetNativeRasterImage.RawImage;
+end;
+
+function TDpiRasterImage.GetNativeRasterImage: TRasterImage;
+begin
+  Result := GetNativeRasterImage;
+end;
+
+function TDpiRasterImage.GetNativeGraphic: TGraphic;
+begin
+  Result := GetNativeRasterImage;
 end;
 
 { TDpiGraphic }
 
-function TDpiGraphic.GetVclGraphic: TGraphic;
+function TDpiGraphic.GetNativeGraphic: TGraphic;
 begin
   Result := nil;
@@ -1706 +1706 @@
   Bitmap: TGraphic;
 begin
-  Bitmap := VclGraphicClass.Create;
+  Bitmap := NativeGraphicClass.Create;
   Bitmap.LoadFromFile(FileName);
   Width := Bitmap.Width;
   Height := Bitmap.Height;
   if Self is TDpiBitmap then
-    TBitmap(GetVclGraphic).Canvas.StretchDraw(Bounds(0, 0,
-    TBitmap(GetVclGraphic).Width, TBitmap(GetVclGraphic).Height), Bitmap)
+    TBitmap(GetNativeGraphic).Canvas.StretchDraw(Bounds(0, 0,
+    TBitmap(GetNativeGraphic).Width, TBitmap(GetNativeGraphic).Height), Bitmap)
     else raise Exception.Create('Unsupported class ' + Self.ClassName);
   Bitmap.Free;
@@ -1721 +1721 @@
   Bitmap: TGraphic;
 begin
-  Bitmap := VclGraphicClass.Create;
+  Bitmap := NativeGraphicClass.Create;
   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(GetVclGraphic))
+      (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);
@@ -1744 +1744 @@
   if not Assigned(FCanvas) then begin
     FCanvas := TDpiCanvas.Create;
-    FCanvas.VclCanvas := GetVclBitmap.Canvas;
+    FCanvas.NativeCanvas := GetNativeBitmap.Canvas;
   end;
   Result := FCanvas;
@@ -1751 +1751 @@
 function TDpiBitmap.GetPixelFormat: TPixelFormat;
 begin
-  Result := GetVclBitmap.PixelFormat;
+  Result := GetNativeBitmap.PixelFormat;
 end;
 
 function TDpiBitmap.GetScanLine(Row: Integer): Pointer;
 begin
-  Result := GetVclBitmap.ScanLine[Row];
+  Result := GetNativeBitmap.ScanLine[Row];
 end;
 
@@ -1767 +1767 @@
 begin
   FHeight := AValue;
-  GetVclBitmap.Height := ScaleToVcl(AValue);
+  GetNativeBitmap.Height := ScaleToNative(AValue);
 end;
 
 procedure TDpiBitmap.SetPixelFormat(AValue: TPixelFormat);
 begin
-  GetVclBitmap.PixelFormat := AValue;
+  GetNativeBitmap.PixelFormat := AValue;
 end;
 
@@ -1778 +1778 @@
 begin
   FWidth := AValue;
-  GetVclBitmap.Width := ScaleToVcl(AValue);
+  GetNativeBitmap.Width := ScaleToNative(AValue);
 end;
 
@@ -1787 +1787 @@
   NewHeight: Integer;
 begin
-  NewWidth := ScaleToVcl(Width);
-  NewHeight := ScaleToVcl(Height);
-  if Assigned(VclBitmap) and ((NewWidth <> VclBitmap.Width) or (NewHeight <> VclBitmap.Height)) then 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 := VclBitmap.PixelFormat;
-    Bitmap.Canvas.StretchDraw(Bounds(0, 0, NewWidth, NewHeight), VclBitmap);
-    VclBitmap.Free;
-    VclBitmap := Bitmap;
-    Canvas.VclCanvas := VclBitmap.Canvas;
-  end;
-end;
-
-function TDpiBitmap.GetVclBitmap: TCustomBitmap;
-begin
-  if not Assigned(VclBitmap) then begin
-    VclBitmap := TBitmap.Create;
-    Canvas.VclCanvas := VclBitmap.Canvas;
-  end;
-  Result := VclBitmap;
+    Bitmap.PixelFormat := NativeBitmap.PixelFormat;
+    Bitmap.Canvas.StretchDraw(Bounds(0, 0, NewWidth, NewHeight), NativeBitmap);
+    NativeBitmap.Free;
+    NativeBitmap := Bitmap;
+    Canvas.NativeCanvas := NativeBitmap.Canvas;
+  end;
+end;
+
+function TDpiBitmap.GetNativeBitmap: TCustomBitmap;
+begin
+  if not Assigned(NativeBitmap) then begin
+    NativeBitmap := TBitmap.Create;
+    Canvas.NativeCanvas := NativeBitmap.Canvas;
+  end;
+  Result := NativeBitmap;
 end;
 
 procedure TDpiBitmap.BeginUpdate;
 begin
-  GetVclBitmap.BeginUpdate;
+  GetNativeBitmap.BeginUpdate;
 end;
 
 procedure TDpiBitmap.EndUpdate;
 begin
-  GetVclBitmap.EndUpdate;
+  GetNativeBitmap.EndUpdate;
 end;
 
@@ -1824 +1824 @@
   FWidth := AWidth;
   FHeight := AHeight;
-  GetVclBitmap.SetSize(ScaleToVcl(AWidth), ScaleToVcl(AHeight));
+  GetNativeBitmap.SetSize(ScaleToNative(AWidth), ScaleToNative(AHeight));
 end;
 
@@ -1830 +1830 @@
 begin
   inherited;
-  VclGraphicClass := TBitmap;
+  NativeGraphicClass := TBitmap;
 end;
 
@@ -1836 +1836 @@
 begin
   FreeAndNil(FCanvas);
-  FreeAndNil(VclBitmap);
+  FreeAndNil(NativeBitmap);
   inherited;
 end;
@@ -1843 +1843 @@
 begin
   if Source is TDpiBitmap then begin
-    GetVclBitmap.Assign((Source as TDpiBitmap).GetVclBitmap);
+    GetNativeBitmap.Assign((Source as TDpiBitmap).GetNativeBitmap);
   end else inherited;
 end;
 
-function TDpiBitmap.GetVclRasterImage: TRasterImage;
-begin
-  Result := GetVclBitmap;
+function TDpiBitmap.GetNativeRasterImage: TRasterImage;
+begin
+  Result := GetNativeBitmap;
 end;
 
@@ -1856 +1856 @@
 function TDpiListBox.GetBorderStyle: TBorderStyle;
 begin
-  Result := GetVclListBox.BorderStyle;
+  Result := GetNativeListBox.BorderStyle;
 end;
 
 function TDpiListBox.GetCount: Integer;
 begin
-  Result := GetVclListBox.Count;
+  Result := GetNativeListBox.Count;
 end;
 
 function TDpiListBox.GetExtendedSelect: Boolean;
 begin
-  Result := GetVclListBox.ExtendedSelect;
+  Result := GetNativeListBox.ExtendedSelect;
 end;
 
 function TDpiListBox.GetIntegralHeight: Boolean;
 begin
-  Result := GetVclListBox.IntegralHeight;
+  Result := GetNativeListBox.IntegralHeight;
 end;
 
 function TDpiListBox.GetItemHeight: Integer;
 begin
-  Result := GetVclListBox.ItemHeight;
+  Result := GetNativeListBox.ItemHeight;
 end;
 
 function TDpiListBox.GetItemIndex: Integer;
 begin
-  Result := GetVclListBox.ItemIndex;
+  Result := GetNativeListBox.ItemIndex;
 end;
 
 function TDpiListBox.GetItems: TStrings;
 begin
-  Result := GetVclListBox.Items;
+  Result := GetNativeListBox.Items;
 end;
 
 function TDpiListBox.GetParentFont: Boolean;
 begin
-  Result := GetVclListBox.ParentFont;
+  Result := GetNativeListBox.ParentFont;
 end;
 
 function TDpiListBox.GetScrollWidth: Integer;
 begin
-  Result := GetVclListBox.ScrollWidth;
+  Result := GetNativeListBox.ScrollWidth;
 end;
 
 function TDpiListBox.GetTopIndex: Integer;
 begin
-  Result := GetVclListBox.TopIndex;
+  Result := GetNativeListBox.TopIndex;
 end;
 
 procedure TDpiListBox.SetBorderStyle(AValue: TBorderStyle);
 begin
-  GetVclListBox.BorderStyle := AValue;
+  GetNativeListBox.BorderStyle := AValue;
 end;
 
 procedure TDpiListBox.SetExtendedSelect(AValue: Boolean);
 begin
-  GetVclListBox.ExtendedSelect := AValue;
+  GetNativeListBox.ExtendedSelect := AValue;
 end;
 
 procedure TDpiListBox.SetIntegralHeight(AValue: Boolean);
 begin
-  GetVclListBox.IntegralHeight := AValue;
+  GetNativeListBox.IntegralHeight := AValue;
 end;
 
 procedure TDpiListBox.SetItemHeight(AValue: Integer);
 begin
-  GetVclListBox.ItemHeight := AValue;
+  GetNativeListBox.ItemHeight := AValue;
 end;
 
 procedure TDpiListBox.SetItemIndex(AValue: Integer);
 begin
-  GetVclListBox.ItemIndex := AValue;
+  GetNativeListBox.ItemIndex := AValue;
 end;
 
 procedure TDpiListBox.SetItems(AValue: TStrings);
 begin
-  GetVclListBox.Items := AValue;
+  GetNativeListBox.Items := AValue;
 end;
 
 procedure TDpiListBox.SetParentFont(AValue: Boolean);
 begin
-  GetVclListBox.ParentFont := AValue;
+  GetNativeListBox.ParentFont := AValue;
 end;
 
 procedure TDpiListBox.SetScrollWidth(AValue: Integer);
 begin
-  GetVclListBox.ScrollWidth := AValue;
+  GetNativeListBox.ScrollWidth := AValue;
 end;
 
 procedure TDpiListBox.SetTopIndex(AValue: Integer);
 begin
-  GetVclListBox.TopIndex := AValue;
-end;
-
-function TDpiListBox.GetVclWinControl: TWinControl;
-begin
-  Result := GetVclListBox;
-end;
-
-function TDpiListBox.GetVclListBox: TListBox;
-begin
-  if not Assigned(VclListBox) then VclListBox := TListBox.Create(nil);
-  Result := VclListBox;
+  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(VclListBox);
+  FreeAndNil(NativeListBox);
   inherited Destroy;
 end;
@@ -1968 +1968 @@
 { TDpiPaintBox }
 
-function TDpiPaintBox.GetVclGraphicControl: TGraphicControl;
-begin
-  if not Assigned(VclPaintBox) then VclPaintBox := TPaintBox.Create(nil);
-  Result := VclPaintBox;
+function TDpiPaintBox.GetNativeGraphicControl: TGraphicControl;
+begin
+  if not Assigned(NativePaintBox) then NativePaintBox := TPaintBox.Create(nil);
+  Result := NativePaintBox;
 end;
 
@@ -1978 +1978 @@
   inherited;
   Canvas := TDpiCanvas.Create;
-  Canvas.VclCanvas := VclPaintBox.Canvas;
-  Canvas.Font.VclFont := VclPaintBox.Canvas.Font;
-  UpdateVclControl;
+  Canvas.NativeCanvas := NativePaintBox.Canvas;
+  Canvas.Font.NativeFont := NativePaintBox.Canvas.Font;
+  UpdateNativeControl;
   ScreenChanged;
 end;
@@ -1986 +1986 @@
 destructor TDpiPaintBox.Destroy;
 begin
-  FreeAndNil(VclPaintBox);
+  FreeAndNil(NativePaintBox);
   inherited;
 end;
@@ -2006 +2006 @@
 function TDpiCanvas.GetBrush: TBrush;
 begin
-  Result := GetVclCanvas.Brush;
+  Result := GetNativeCanvas.Brush;
 end;
 
 function TDpiCanvas.GetHandle: HDC;
 begin
-  Result := GetVclCanvas.Handle;
+  Result := GetNativeCanvas.Handle;
 end;
 
 function TDpiCanvas.GetHeight: Integer;
 begin
-  Result := ScaleFromVcl(GetVclCanvas.Height);
+  Result := ScaleFromNative(GetNativeCanvas.Height);
 end;
 
 function TDpiCanvas.GetPen: TPen;
 begin
-  Result := GetVclCanvas.Pen;
+  Result := GetNativeCanvas.Pen;
 end;
 
 function TDpiCanvas.GetPixel(X, Y: Integer): TColor;
 begin
-  Result := GetVclCanvas.Pixels[ScaleToVcl(X), ScaleToVcl(Y)];
+  Result := GetNativeCanvas.Pixels[ScaleToNative(X), ScaleToNative(Y)];
 end;
 
 function TDpiCanvas.GetWidth: Integer;
 begin
-  Result := ScaleFromVcl(GetVclCanvas.Width);
+  Result := ScaleFromNative(GetNativeCanvas.Width);
 end;
 
 procedure TDpiCanvas.SetBrush(AValue: TBrush);
 begin
-  GetVclCanvas.Brush := AValue;
+  GetNativeCanvas.Brush := AValue;
 end;
 
@@ -2047 +2047 @@
 procedure TDpiCanvas.SetHandle(AValue: HDC);
 begin
-  GetVclCanvas.Handle := AValue;
+  GetNativeCanvas.Handle := AValue;
 end;
 
 procedure TDpiCanvas.SetPen(AValue: TPen);
 begin
-  GetVclCanvas.Pen := AValue;
+  GetNativeCanvas.Pen := AValue;
 end;
 
@@ -2060 +2060 @@
   BrushColor: TColor;
 begin
- { BrushStyle := GetVclCanvas.Brush.Style;
-  BrushColor := GetVclCanvas.Brush.Color;
-  GetVclCanvas.Brush.Color := AValue;
-  GetVclCanvas.Brush.Style := bsClear;
-  GetVclCanvas.FillRect(ScaleToVcl(X), ScaleToVcl(Y), ScaleToVcl(X + 1) - 1, ScaleToVcl(Y + 1) - 1);
-  GetVclCanvas.Brush.Style := BrushStyle;
-  GetVclCanvas.Brush.Color := BrushColor;
+ { 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;
   }
-  GetVclCanvas.Pixels[ScaleToVcl(X), ScaleToVcl(Y)] := AValue;
-end;
-
-procedure TDpiCanvas.SetVclCanvas(AValue: TCanvas);
-begin
-  if FVclCanvas = AValue then Exit;
-  FVclCanvas := AValue;
-  FFont.VclFont := FVclCanvas.Font;
-end;
-
-function TDpiCanvas.GetVclCanvas: TCanvas;
-begin
-  //if not Assigned(VclCanvas) then VclCanvas := TCanvas.Create;
-  Result := VclCanvas;
+  GetNativeCanvas.Pixels[ScaleToNative(X), ScaleToNative(Y)] := AValue;
+end;
+
+procedure TDpiCanvas.SetNativeCanvas(AValue: TCanvas);
+begin
+  if FNativeCanvas = AValue then Exit;
+  FNativeCanvas := AValue;
+  FFont.NativeFont := FNativeCanvas.Font;
+end;
+
+function TDpiCanvas.GetNativeCanvas: TCanvas;
+begin
+  //if not Assigned(NativeCanvas) then NativeCanvas := TCanvas.Create;
+  Result := NativeCanvas;
 end;
 
@@ -2087 +2087 @@
   );
 begin
-  GetVclCanvas.StretchDraw(ScaleRectToVcl(DestRect), SrcGraphic.GetVclGraphic);
+  GetNativeCanvas.StretchDraw(ScaleRectToNative(DestRect), SrcGraphic.GetNativeGraphic);
 end;
 
 procedure TDpiCanvas.FrameRect(Rect: TRect);
 begin
-  GetVclCanvas.FrameRect(ScaleRectToVcl(Rect));
+  GetNativeCanvas.FrameRect(ScaleRectToNative(Rect));
 end;
 
 procedure TDpiCanvas.Rectangle(X1, Y1, X2, Y2: Integer);
 begin
-  GetVclCanvas.Rectangle(ScaleToVcl(X1), ScaleToVcl(Y1), ScaleToVcl(X2), ScaleToVcl(Y2));
+  GetNativeCanvas.Rectangle(ScaleToNative(X1), ScaleToNative(Y1), ScaleToNative(X2), ScaleToNative(Y2));
 end;
 
@@ -2107 +2107 @@
 function TDpiCanvas.TextWidth(Text: string): Integer;
 begin
-  Result := ScaleFromVcl(GetVclCanvas.TextWidth(Text));
+  Result := ScaleFromNative(GetNativeCanvas.TextWidth(Text));
 end;
 
 function TDpiCanvas.TextHeight(Text: string): Integer;
 begin
-  Result := ScaleFromVcl(GetVclCanvas.TextHeight(Text));
+  Result := ScaleFromNative(GetNativeCanvas.TextHeight(Text));
 end;
 
 function TDpiCanvas.TextExtent(Text: string): TSize;
 begin
-  Result := ScaleSizeFromVcl(GetVclCanvas.TextExtent(Text));
+  Result := ScaleSizeFromNative(GetNativeCanvas.TextExtent(Text));
 end;
 
 procedure TDpiCanvas.TextOut(X, Y: Integer; Text: string);
 begin
-  GetVclCanvas.TextOut(ScaleToVcl(X), ScaleToVcl(Y), Text);
+  GetNativeCanvas.TextOut(ScaleToNative(X), ScaleToNative(Y), Text);
 end;
 
 procedure TDpiCanvas.TextRect(ARect: TRect; X, Y: Integer; Text: string);
 begin
-  GetVclCanvas.TextRect(ARect, ScaleToVcl(X), ScaleToVcl(Y), Text);
+  GetNativeCanvas.TextRect(ARect, ScaleToNative(X), ScaleToNative(Y), Text);
 end;
 
 procedure TDpiCanvas.MoveTo(X, Y: Integer);
 begin
-  GetVclCanvas.MoveTo(ScaleToVcl(X), ScaleToVcl(Y));
+  GetNativeCanvas.MoveTo(ScaleToNative(X), ScaleToNative(Y));
 end;
 
 procedure TDpiCanvas.LineTo(X, Y: Integer);
 begin
-  GetVclCanvas.LineTo(ScaleToVcl(X), ScaleToVcl(Y));
+  GetNativeCanvas.LineTo(ScaleToNative(X), ScaleToNative(Y));
 end;
 
 procedure TDpiCanvas.FillRect(ARect: TRect);
 begin
-  GetVclCanvas.FillRect(ScaleRectToVcl(ARect));
+  GetNativeCanvas.FillRect(ScaleRectToNative(ARect));
 end;
 
 procedure TDpiCanvas.FillRect(X1, Y1, X2, Y2: Integer);
 begin
-  GetVclCanvas.FillRect(ScaleToVcl(X1), ScaleToVcl(Y1), ScaleToVcl(X2), ScaleToVcl(Y2));
+  GetNativeCanvas.FillRect(ScaleToNative(X1), ScaleToNative(Y1), ScaleToNative(X2), ScaleToNative(Y2));
 end;
 
 procedure TDpiCanvas.Draw(X, Y: Integer; Source: TDpiGraphic);
 begin
-  GetVclCanvas.Draw(ScaleToVcl(X), ScaleToVcl(Y), Source.GetVclGraphic);
+  GetNativeCanvas.Draw(ScaleToNative(X), ScaleToNative(Y), Source.GetNativeGraphic);
 end;
 
@@ -2158 +2158 @@
   Source: TRect);
 begin
-  GetVclCanvas.CopyRect(Dest, SrcCanvas.VclCanvas, ScaleRectToVcl(Source));
+  GetNativeCanvas.CopyRect(Dest, SrcCanvas.NativeCanvas, ScaleRectToNative(Source));
 end;
 
@@ -2191 +2191 @@
 end;
 
-function TDpiGraphicControl.GetVclControl: TControl;
-begin
-  Result := GetVclGraphicControl;
-end;
-
-function TDpiGraphicControl.GetVclGraphicControl: TGraphicControl;
-begin
-  if not Assigned(VclGraphicControl) then begin
-    VclGraphicControl := TGraphicControl.Create(nil);
-  end;
-  Result := VclGraphicControl;
-end;
-
-procedure TDpiGraphicControl.UpdateVclControl;
+function TDpiGraphicControl.GetNativeControl: TControl;
+begin
+  Result := GetNativeGraphicControl;
+end;
+
+function TDpiGraphicControl.GetNativeGraphicControl: TGraphicControl;
+begin
+  if not Assigned(NativeGraphicControl) then begin
+    NativeGraphicControl := TGraphicControl.Create(nil);
+  end;
+  Result := NativeGraphicControl;
+end;
+
+procedure TDpiGraphicControl.UpdateNativeControl;
 begin
   inherited;
-  TGraphicControlEx(GetVclGraphicControl).OnPaint := @PaintHandler;
+  TGraphicControlEx(GetNativeGraphicControl).OnPaint := @PaintHandler;
 end;
 
@@ -2224 +2224 @@
   inherited;
   FCanvas := TDpiCanvas.Create;
-  FCanvas.VclCanvas := GetVclGraphicControl.Canvas;
+  FCanvas.NativeCanvas := GetNativeGraphicControl.Canvas;
 end;
 
@@ -2240 +2240 @@
   if FStretch = AValue then Exit;
   FStretch := AValue;
-  VclImage.Stretch := AValue;
+  NativeImage.Stretch := AValue;
 end;
 
@@ -2249 +2249 @@
 end;
 
-function TDpiImage.GetVclControl: TControl;
-begin
-  if not Assigned(VclImage) then VclImage := TImage.Create(nil);
-  Result := VclImage;
+function TDpiImage.GetNativeControl: TControl;
+begin
+  if not Assigned(NativeImage) then NativeImage := TImage.Create(nil);
+  Result := NativeImage;
 end;
 
 destructor TDpiImage.Destroy;
 begin
-  FreeAndNil(VclImage);
+  FreeAndNil(NativeImage);
   inherited Destroy;
 end;
@@ -2267 +2267 @@
   if FSize = AValue then Exit;
   FSize := AValue;
-  GetVclFont.Size := AValue;
+  GetNativeFont.Size := AValue;
   DoChange;
 end;
@@ -2278 +2278 @@
 procedure TDpiFont.SetStyle(AValue: TFontStyles);
 begin
-  GetVclFont.Style := AValue;
+  GetNativeFont.Style := AValue;
 end;
 
@@ -2286 +2286 @@
 end;
 
-function TDpiFont.GetVclFont: TFont;
-begin
-  if not Assigned(VclFont) then VclFont := TFont.Create;
-  Result := VclFont;
+function TDpiFont.GetNativeFont: TFont;
+begin
+  if not Assigned(NativeFont) then NativeFont := TFont.Create;
+  Result := NativeFont;
 end;
 
@@ -2300 +2300 @@
 procedure TDpiFont.SetPixelsPerInch(AValue: Integer);
 begin
-  GetVclFont.PixelsPerInch := PixelsPerInch;
+  GetNativeFont.PixelsPerInch := PixelsPerInch;
 end;
 
 function TDpiFont.GetName: string;
 begin
-  Result := GetVclFont.Name;
+  Result := GetNativeFont.Name;
 end;
 
 function TDpiFont.GetColor: TColor;
 begin
-  Result := GetVclFont.Color;
+  Result := GetNativeFont.Color;
 end;
 
 function TDpiFont.GetCharSet: TFontCharSet;
 begin
-  Result := GetVclFont.CharSet;
+  Result := GetNativeFont.CharSet;
 end;
 
 function TDpiFont.GetHeight: Integer;
 begin
-  Result := GetVclFont.Height;
+  Result := GetNativeFont.Height;
 end;
 
 function TDpiFont.GetPixelsPerInch: Integer;
 begin
-  Result := GetVclFont.PixelsPerInch;
+  Result := GetNativeFont.PixelsPerInch;
 end;
 
 function TDpiFont.GetStyle: TFontStyles;
 begin
-  Result := GetVclFont.Style;
+  Result := GetNativeFont.Style;
 end;
 
 function TDpiFont.IsNameStored: Boolean;
 begin
-  Result := GetVclFont.Name <> 'default';
+  Result := GetNativeFont.Name <> 'default';
 end;
 
 procedure TDpiFont.SetCharSet(AValue: TFontCharSet);
 begin
-  GetVclFont.CharSet := AValue;
+  GetNativeFont.CharSet := AValue;
 end;
 
 procedure TDpiFont.SetColor(AValue: TColor);
 begin
-  GetVclFont.Color := AValue;
+  GetNativeFont.Color := AValue;
 end;
 
 procedure TDpiFont.SetHeight(AValue: Integer);
 begin
-  GetVclFont.Height := AValue;
+  GetNativeFont.Height := AValue;
 end;
 
 procedure TDpiFont.SetName(AValue: string);
 begin
-  GetVclFont.Name := AValue;
+  GetNativeFont.Name := AValue;
 end;
 
@@ -2371 +2371 @@
 begin
   if Source is TDpiFont then begin
-    GetVclFont.Assign((Source as TDpiFont).GetVclFont);
+    GetNativeFont.Assign((Source as TDpiFont).GetNativeFont);
     Size := (Source as TDpiFont).Size;
     FOnChange := (Source as TDpiFont).FOnChange;
@@ -2381 +2381 @@
 function TDpiWinControl.GetHandle: HWND;
 begin
-  Result := GetVclWinControl.Handle;
+  Result := GetNativeWinControl.Handle;
 end;
 
 function TDpiWinControl.GetOnKeyDown: TKeyEvent;
 begin
-  Result := GetVclWinControl.OnKeyDown;
+  Result := GetNativeWinControl.OnKeyDown;
 end;
 
 function TDpiWinControl.GetOnKeyPress: TKeyPressEvent;
 begin
-  Result := GetVclWinControl.OnKeyPress;
+  Result := GetNativeWinControl.OnKeyPress;
 end;
 
 function TDpiWinControl.GetOnKeyUp: TKeyEvent;
 begin
-  Result := GetVclWinControl.OnKeyUp;
+  Result := GetNativeWinControl.OnKeyUp;
 end;
 
 function TDpiWinControl.GetTabOrder: TTabOrder;
 begin
-  Result := GetVclWinControl.TabOrder;
+  Result := GetNativeWinControl.TabOrder;
 end;
 
 function TDpiWinControl.GetTabStop: Boolean;
 begin
-  Result := GetVclWinControl.TabStop;
+  Result := GetNativeWinControl.TabStop;
 end;
 
 procedure TDpiWinControl.SetHandle(AValue: HWND);
 begin
-  GetVclWinControl.Handle := AValue;
+  GetNativeWinControl.Handle := AValue;
 end;
 
 procedure TDpiWinControl.SetOnKeyDown(AValue: TKeyEvent);
 begin
-  GetVclWinControl.OnKeyDown := AValue;
+  GetNativeWinControl.OnKeyDown := AValue;
 end;
 
 procedure TDpiWinControl.SetOnKeyPress(AValue: TKeyPressEvent);
 begin
-  GetVclWinControl.OnKeyPress := AValue;
+  GetNativeWinControl.OnKeyPress := AValue;
 end;
 
 procedure TDpiWinControl.SetOnKeyUp(AValue: TKeyEvent);
 begin
-  GetVclWinControl.OnKeyUp := AValue;
+  GetNativeWinControl.OnKeyUp := AValue;
 end;
 
 procedure TDpiWinControl.SetTabOrder(AValue: TTabOrder);
 begin
-  GetVclWinControl.TabOrder := AValue;
+  GetNativeWinControl.TabOrder := AValue;
 end;
 
 procedure TDpiWinControl.SetTabStop(AValue: Boolean);
 begin
-  GetVclWinControl.TabStop := AValue;
-end;
-
-function TDpiWinControl.GetVclControl: TControl;
-begin
-  Result := GetVclWinControl;
-end;
-
-function TDpiWinControl.GetVclWinControl: TWinControl;
+  GetNativeWinControl.TabStop := AValue;
+end;
+
+function TDpiWinControl.GetNativeControl: TControl;
+begin
+  Result := GetNativeWinControl;
+end;
+
+function TDpiWinControl.GetNativeWinControl: TWinControl;
 begin
   Result := nil;
@@ -2487 +2487 @@
 function TDpiScreen.GetWidth: Integer;
 begin
-  Result := ScaleFromVcl(Screen.Width);
+  Result := ScaleFromNative(Screen.Width);
 end;
 
@@ -2502 +2502 @@
 function TDpiScreen.GetHeight: Integer;
 begin
-  Result := ScaleFromVcl(Screen.Height);
+  Result := ScaleFromNative(Screen.Height);
 end;
 
@@ -2578 +2578 @@
 end;
 
-procedure TDpiScreen.UpdateActiveFormFromVclScreen;
+procedure TDpiScreen.UpdateActiveFormFromNativeScreen;
 var
   I: Integer;
@@ -2587 +2587 @@
     for I := 0 to FormCount - 1 do begin
       F := Forms[I];
-      if F.GetVclForm = Screen.ActiveForm then begin
+      if F.GetNativeForm = Screen.ActiveForm then begin
         FActiveForm := F;
         Break;
@@ -2597 +2597 @@
 { TDpiButton }
 
-function TDpiButton.GetVclControl: TControl;
-begin
-  if not Assigned(VclButton) then VclButton := TButton.Create(nil);
-  Result := VclButton;
+function TDpiButton.GetNativeControl: TControl;
+begin
+  if not Assigned(NativeButton) then NativeButton := TButton.Create(nil);
+  Result := NativeButton;
 end;
 
 destructor TDpiButton.Destroy;
 begin
-  FreeAndNil(VclButton);
+  FreeAndNil(NativeButton);
   inherited;
 end;
@@ -2620 +2620 @@
 procedure TDpiControl.SetVisible(AValue: Boolean);
 begin
-  GetVclControl.Visible := AValue;
+  GetNativeControl.Visible := AValue;
 end;
 
@@ -2630 +2630 @@
 end;
 
-function TDpiControl.GetVclControl: TControl;
+function TDpiControl.GetNativeControl: TControl;
 begin
   Result := nil;
 end;
 
-procedure TDpiControl.UpdateVclControl;
-begin
-  Font.VclFont := GetVclControl.Font;
-  GetVclControl.OnResize := @VclFormResize;
-  GetVclControl.OnChangeBounds := @VclChangeBounds;
-  TControlEx(GetVclControl).OnMouseDown := @MouseDownHandler;
-  TControlEx(GetVclControl).OnMouseUp := @MouseUpHandler;
-  TControlEx(GetVclControl).OnMouseMove := @MouseMoveHandler;
-  TControlEx(GetVclControl).OnMouseEnter := @MouseEnterHandler;
-  TControlEx(GetVclControl).OnMouseLeave := @MouseLeaveHandler;
-  TControlEx(GetVclControl).OnMouseWheel := @MouseWheelHandler;
+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;
 
@@ -2651 +2651 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-  MouseDown(Button, Shift, ScaleFromVcl(X), ScaleFromVcl(Y));
-  if Assigned(FOnMouseDown) then FOnMouseDown(Self, Button, Shift, ScaleFromVcl(X), ScaleFromVcl(Y));
+  MouseDown(Button, Shift, ScaleFromNative(X), ScaleFromNative(Y));
+  if Assigned(FOnMouseDown) then FOnMouseDown(Self, Button, Shift, ScaleFromNative(X), ScaleFromNative(Y));
 end;
 
@@ -2658 +2658 @@
   Shift: TShiftState; X, Y: Integer);
 begin
-  MouseUp(Button, Shift, ScaleFromVcl(X), ScaleFromVcl(Y));
-  if Assigned(FOnMouseUp) then FOnMouseUp(Self, Button, Shift, ScaleFromVcl(X), ScaleFromVcl(Y));
+  MouseUp(Button, Shift, ScaleFromNative(X), ScaleFromNative(Y));
+  if Assigned(FOnMouseUp) then FOnMouseUp(Self, Button, Shift, ScaleFromNative(X), ScaleFromNative(Y));
 end;
 
@@ -2665 +2665 @@
   Y: Integer);
 begin
-  MouseMove(Shift, ScaleFromVcl(X), ScaleFromVcl(Y));
-  if Assigned(FOnMouseMove) then FOnMouseMove(Self, Shift, ScaleFromVcl(X), ScaleFromVcl(Y));
+  MouseMove(Shift, ScaleFromNative(X), ScaleFromNative(Y));
+  if Assigned(FOnMouseMove) then FOnMouseMove(Self, Shift, ScaleFromNative(X), ScaleFromNative(Y));
 end;
 
@@ -2673 +2673 @@
 begin
   if Assigned(FOnMouseWheel) then FOnMouseWheel(Self, Shift, WheelDelta,
-    ScalePointFromVcl(MousePos), Handled);
+    ScalePointFromNative(MousePos), Handled);
 end;
 
@@ -2712 +2712 @@
 function TDpiControl.ScreenToClient(const APoint: TPoint): TPoint;
 begin
-  Result := ScalePointFromVcl(GetVclControl.ScreenToClient(ScalePointToVcl(APoint)));
+  Result := ScalePointFromNative(GetNativeControl.ScreenToClient(ScalePointToNative(APoint)));
 end;
 
 function TDpiControl.ClientToScreen(const APoint: TPoint): TPoint;
 begin
-  Result := ScalePointFromVcl(GetVclControl.ClientToScreen(ScalePointToVcl(APoint)));
+  Result := ScalePointFromNative(GetNativeControl.ClientToScreen(ScalePointToNative(APoint)));
 end;
 
@@ -2723 +2723 @@
   const OnVisibleChangedEvent: TNotifyEvent; AsFirst: boolean);
 begin
-  GetVclControl.AddHandlerOnVisibleChanged(OnVisibleChangedEvent, AsFirst);
+  GetNativeControl.AddHandlerOnVisibleChanged(OnVisibleChangedEvent, AsFirst);
 end;
 
@@ -2729 +2729 @@
   const OnVisibleChangedEvent: TNotifyEvent);
 begin
-  GetVclControl.RemoveHandlerOnVisibleChanged(OnVisibleChangedEvent);
+  GetNativeControl.RemoveHandlerOnVisibleChanged(OnVisibleChangedEvent);
 end;
 
@@ -2759 +2759 @@
 procedure TDpiControl.Invalidate;
 begin
-  GetVclControl.Invalidate;
+  GetNativeControl.Invalidate;
 end;
 
 procedure TDpiControl.Repaint;
 begin
-  GetVclControl.Repaint;
+  GetNativeControl.Repaint;
 end;
 
 procedure TDpiControl.Update;
 begin
-  GetVclControl.Update;
+  GetNativeControl.Update;
 end;
 
@@ -2791 +2791 @@
   if Assigned(TheOwner) and (TheOwner is TDpiWinControl) then
     Parent := TDpiWinControl(TheOwner);
-  GetVclControl;
-  UpdateVclControl;
+  GetNativeControl;
+  UpdateNativeControl;
   ScreenChanged;
 end;
@@ -2812 +2812 @@
 procedure TDpiControl.SetCaption(AValue: string);
 begin
-  GetVclControl.Caption := AValue;
+  GetNativeControl.Caption := AValue;
 end;
 
@@ -2821 +2821 @@
     FParent.Controls.Remove(Self);
     if Assigned(FParent) and (FParent is TDpiWinControl) then
-      GetVclControl.Parent := nil;
+      GetNativeControl.Parent := nil;
   end;
   FParent := AValue;
@@ -2827 +2827 @@
     FParent.Controls.Add(Self);
     if Assigned(FParent) and (FParent is TDpiWinControl) then
-      GetVclControl.Parent := TDpiWinControl(FParent).GetVclWinControl;
+      GetNativeControl.Parent := TDpiWinControl(FParent).GetNativeWinControl;
   end;
 end;
@@ -2839 +2839 @@
 procedure TDpiControl.SetHint(AValue: string);
 begin
-  GetVclControl.Hint := AValue;
+  GetNativeControl.Hint := AValue;
 end;
 
@@ -2852 +2852 @@
 function TDpiControl.GetAlign: TAlign;
 begin
-  Result := GetVclControl.Align;
+  Result := GetNativeControl.Align;
 end;
 
 function TDpiControl.GetAnchors: TAnchors;
 begin
-  Result := GetVclControl.Anchors;
+  Result := GetNativeControl.Anchors;
 end;
 
 function TDpiControl.GetClientHeight: Integer;
 begin
-  Result := ScaleFromVcl(GetVclControl.ClientHeight);
+  Result := ScaleFromNative(GetNativeControl.ClientHeight);
 end;
 
 function TDpiControl.GetClientWidth: Integer;
 begin
-  Result := ScaleFromVcl(GetVclControl.ClientWidth);
+  Result := ScaleFromNative(GetNativeControl.ClientWidth);
 end;
 
 function TDpiControl.GetColor: TColor;
 begin
-  Result := GetVclControl.Color;
+  Result := GetNativeControl.Color;
 end;
 
 function TDpiControl.GetCursor: TCursor;
 begin
-  Result := GetVclControl.Cursor;
+  Result := GetNativeControl.Cursor;
 end;
 
 function TDpiControl.GetEnabled: Boolean;
 begin
-  Result := GetVclControl.Enabled;
+  Result := GetNativeControl.Enabled;
 end;
 
 function TDpiControl.GetHint: string;
 begin
-  Result := GetVclControl.Hint;
+  Result := GetNativeControl.Hint;
 end;
 
 function TDpiControl.GetOnClick: TNotifyEvent;
 begin
-  Result := GetVclControl.OnClick;
+  Result := GetNativeControl.OnClick;
 end;
 
 function TDpiControl.GetShowHint: Boolean;
 begin
-  Result := GetVclControl.ShowHint;
+  Result := GetNativeControl.ShowHint;
 end;
 
 function TDpiControl.GetVisible: Boolean;
 begin
-  Result := GetVclControl.Visible;
+  Result := GetNativeControl.Visible;
 end;
 
@@ -2912 +2912 @@
 procedure TDpiControl.SetAlign(AValue: TAlign);
 begin
-  GetVclControl.Align := AValue;
+  GetNativeControl.Align := AValue;
 end;
 
 procedure TDpiControl.SetAnchors(AValue: TAnchors);
 begin
-  GetVclControl.Anchors := AValue;
+  GetNativeControl.Anchors := AValue;
 end;
 
@@ -2927 +2927 @@
 procedure TDpiControl.SetClientHeight(AValue: Integer);
 begin
-  GetVclControl.ClientHeight := ScaletoVcl(AValue);
+  GetNativeControl.ClientHeight := ScaleToNative(AValue);
 end;
 
 procedure TDpiControl.SetClientWidth(AValue: Integer);
 begin
-  GetVclControl.ClientWidth := ScaletoVcl(AValue);
+  GetNativeControl.ClientWidth := ScaleToNative(AValue);
 end;
 
 procedure TDpiControl.SetColor(AValue: TColor);
 begin
-  GetVclControl.Color := AValue;
+  GetNativeControl.Color := AValue;
 end;
 
 procedure TDpiControl.SetCursor(AValue: TCursor);
 begin
-  GetVclControl.Cursor := AValue;
+  GetNativeControl.Cursor := AValue;
 end;
 
 procedure TDpiControl.SetEnabled(AValue: Boolean);
 begin
-  GetVclControl.Enabled := AValue;
+  GetNativeControl.Enabled := AValue;
 end;
 
@@ -2958 +2958 @@
 procedure TDpiControl.SetOnClick(AValue: TNotifyEvent);
 begin
-  GetVclControl.OnClick := AValue;
+  GetNativeControl.OnClick := AValue;
 end;
 
@@ -2969 +2969 @@
 procedure TDpiControl.SetShowHint(AValue: Boolean);
 begin
-  GetVclControl.ShowHint := AValue;
-end;
-
-procedure TDpiControl.VclFormResize(Sender: TObject);
-begin
-  BoundsRect := ScaleRectFromVcl(GetVclControl.BoundsRect);
+  GetNativeControl.ShowHint := AValue;
+end;
+
+procedure TDpiControl.NativeFormResize(Sender: TObject);
+begin
+  BoundsRect := ScaleRectFromNative(GetNativeControl.BoundsRect);
   DoFormResize;
 end;
 
-procedure TDpiControl.VclChangeBounds(Sender: TObject);
+procedure TDpiControl.NativeChangeBounds(Sender: TObject);
 var
   NewBounds: TRect;
 begin
-  NewBounds := ScaleRectFromVcl(GetVclControl.BoundsRect);
+  NewBounds := ScaleRectFromNative(GetNativeControl.BoundsRect);
   if NewBounds <> BoundsRect then begin
     BoundsRect := NewBounds;
@@ -3001 +3001 @@
 function TDpiControl.GetCaption: string;
 begin
-  Result := GetVclControl.Caption;
+  Result := GetNativeControl.Caption;
 end;
 
 procedure TDpiControl.FontChanged(Sender: TObject);
 begin
-  GetVclControl.Font.Size := ScaleToVcl(Font.Size);
+  GetNativeControl.Font.Size := ScaleToNative(Font.Size);
 end;
 
 procedure TDpiControl.UpdateBounds;
 begin
-  GetVclControl.BoundsRect := ScaleRectToVcl(BoundsRect);
+  GetNativeControl.BoundsRect := ScaleRectToNative(BoundsRect);
 end;
 
@@ -3051 +3051 @@
 function TDpiForm.GetBorderIcons: TBorderIcons;
 begin
-  Result := GetVclForm.BorderIcons;
+  Result := GetNativeForm.BorderIcons;
 end;
 
 function TDpiForm.GetBorderStyle: TFormBorderStyle;
 begin
-  Result := GetVclForm.BorderStyle;
+  Result := GetNativeForm.BorderStyle;
 end;
 
 function TDpiForm.GetDesignTimePPI: Integer;
 begin
-  Result := GetVclForm.DesignTimePPI;
+  Result := GetNativeForm.DesignTimePPI;
 end;
 
 function TDpiForm.GetFormState: TFormState;
 begin
-  Result := GetVclForm.FormState;
+  Result := GetNativeForm.FormState;
 end;
 
 function TDpiForm.GetFormStyle: TFormStyle;
 begin
-  Result := GetVclForm.FormStyle;
+  Result := GetNativeForm.FormStyle;
 end;
 
 function TDpiForm.GetKeyPreview: Boolean;
 begin
-  Result := GetVclForm.KeyPreview;
+  Result := GetNativeForm.KeyPreview;
 end;
 
 function TDpiForm.GetLCLVersion: string;
 begin
-  Result := GetVclForm.LCLVersion;
+  Result := GetNativeForm.LCLVersion;
 end;
 
 function TDpiForm.GetModalResult: TModalResult;
 begin
-  Result := GetVclForm.ModalResult;
+  Result := GetNativeForm.ModalResult;
 end;
 
 function TDpiForm.GetOnCloseQuery: TCloseQueryEvent;
 begin
-  Result := GetVclForm.OnCloseQuery;
+  Result := GetNativeForm.OnCloseQuery;
 end;
 
 function TDpiForm.GetOnCreate: TNotifyEvent;
 begin
-  Result := GetVclForm.OnCreate;
+  Result := GetNativeForm.OnCreate;
 end;
 
 function TDpiForm.GetOnDeactivate: TNotifyEvent;
 begin
-  Result := GetVclForm.OnDeactivate;
+  Result := GetNativeForm.OnDeactivate;
 end;
 
 function TDpiForm.GetOnDestroy: TNotifyEvent;
 begin
-  Result := GetVclForm.OnDestroy;
+  Result := GetNativeForm.OnDestroy;
 end;
 
 function TDpiForm.GetOnHide: TNotifyEvent;
 begin
-  Result := GetVclForm.OnHide;
+  Result := GetNativeForm.OnHide;
 end;
 
 function TDpiForm.GetOnShow: TNotifyEvent;
 begin
-  Result := GetVclForm.OnShow;
+  Result := GetNativeForm.OnShow;
 end;
 
 function TDpiForm.GetPosition: TPosition;
 begin
-  Result := GetVclForm.Position;
+  Result := GetNativeForm.Position;
 end;
 
 function TDpiForm.GetWindowState: TWindowState;
 begin
-  Result := GetVclForm.WindowState;
+  Result := GetNativeForm.WindowState;
 end;
 
 procedure TDpiForm.SetBorderIcons(AValue: TBorderIcons);
 begin
-  GetVclForm.BorderIcons := AValue;
+  GetNativeForm.BorderIcons := AValue;
 end;
 
 procedure TDpiForm.SetBorderStyle(AValue: TFormBorderStyle);
 begin
-  GetVclForm.BorderStyle := AValue;
+  GetNativeForm.BorderStyle := AValue;
 end;
 
 procedure TDpiForm.SetDesignTimePPI(AValue: Integer);
 begin
-  GetVclForm.DesignTimePPI := AValue;
+  GetNativeForm.DesignTimePPI := AValue;
 end;
 
 procedure TDpiForm.SetFormStyle(AValue: TFormStyle);
 begin
-  GetVclForm.FormStyle := AValue;
+  GetNativeForm.FormStyle := AValue;
 end;
 
 procedure TDpiForm.SetKeyPreview(AValue: Boolean);
 begin
-  GetVclForm.KeyPreview := AValue;
+  GetNativeForm.KeyPreview := AValue;
 end;
 
 procedure TDpiForm.SetLCLVersion(AValue: string);
 begin
-  GetVclForm.LCLVersion := AValue;
+  GetNativeForm.LCLVersion := AValue;
 end;
 
 procedure TDpiForm.SetModalResult(AValue: TModalResult);
 begin
-  GetVclForm.ModalResult := AValue;
+  GetNativeForm.ModalResult := AValue;
 end;
 
 procedure TDpiForm.SetOnCloseQuery(AValue: TCloseQueryEvent);
 begin
-  GetVclForm.OnCloseQuery := AValue;
+  GetNativeForm.OnCloseQuery := AValue;
 end;
 
 procedure TDpiForm.SetOnCreate(AValue: TNotifyEvent);
 begin
-  GetVclForm.OnCreate := AValue;
+  GetNativeForm.OnCreate := AValue;
 end;
 
 procedure TDpiForm.SetOnDeactivate(AValue: TNotifyEvent);
 begin
-  GetVclForm.OnDeactivate := AValue;
+  GetNativeForm.OnDeactivate := AValue;
 end;
 
 procedure TDpiForm.SetOnDestroy(AValue: TNotifyEvent);
 begin
-  GetVclForm.OnDestroy := AValue;
+  GetNativeForm.OnDestroy := AValue;
 end;
 
 procedure TDpiForm.SetOnHide(AValue: TNotifyEvent);
 begin
-  GetVclForm.OnHide := AValue;
+  GetNativeForm.OnHide := AValue;
 end;
 
 procedure TDpiForm.SetOnShow(AValue: TNotifyEvent);
 begin
-  GetVclForm.OnShow := AValue;
+  GetNativeForm.OnShow := AValue;
 end;
 
 procedure TDpiForm.DoOnCreate;
 begin
-  if Assigned(GetVclForm.OnCreate) then
-    GetVclForm.OnCreate(Self);
+  if Assigned(GetNativeForm.OnCreate) then
+    GetNativeForm.OnCreate(Self);
 end;
 
@@ -3207 +3207 @@
 procedure TDpiForm.SetPosition(AValue: TPosition);
 begin
-  GetVclForm.Position := AValue;
+  GetNativeForm.Position := AValue;
 end;
 
 procedure TDpiForm.SetWindowState(AValue: TWindowState);
 begin
-  GetVclForm.WindowState := AValue;
+  GetNativeForm.WindowState := AValue;
 end;
 
@@ -3225 +3225 @@
 begin
   DpiScreen.FActiveForm := DpiScreen.FActiveFormPrev;
-  //DpiScreen.UpdateActiveFormFromVclScreen;
+  //DpiScreen.UpdateActiveFormFromNativeScreen;
   if Assigned(FOnDeactivate) then FOnDeactivate(Sender);
 end;
@@ -3246 +3246 @@
 procedure TDpiForm.CreateParams(var p: TCreateParams);
 begin
-  // TODO: VclForm.CreateParams(P);
+  // TODO: NativeForm.CreateParams(P);
 end;
 
@@ -3265 +3265 @@
 end;
 
-function TDpiForm.GetVclScrollingWinControl: TScrollingWinControl;
-begin
-  Result := GetVclForm;
-end;
-
-function TDpiForm.GetVclForm: TForm;
-begin
-  if not Assigned(VclForm) then begin
-    VclForm := TFormEx.CreateNew(nil);
-    (VclForm as TFormEx).OnMessage := @FormMessageHandler;
-    //VclForm := TForm.Create(nil);
-  end;
-  Result := VclForm;
-end;
-
-procedure TDpiForm.UpdateVclControl;
+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;
-  GetVclForm.OnActivate := @ActivateHandler;
-  GetVclForm.OnDeactivate := @DeactivateHandler;
-  GetVclForm.OnClose := @CloseHandler;
-  GetVclForm.OnCloseQuery := @CloseQueryHandler;
-  GetVclForm.Name := Name + 'Vcl';
+  GetNativeForm.OnActivate := @ActivateHandler;
+  GetNativeForm.OnDeactivate := @DeactivateHandler;
+  GetNativeForm.OnClose := @CloseHandler;
+  GetNativeForm.OnCloseQuery := @CloseQueryHandler;
+  GetNativeForm.Name := Name + 'Native';
 end;
 
@@ -3298 +3298 @@
 function TDpiForm.ShowModal: Integer;
 begin
-  Result := GetVclForm.ShowModal;
+  Result := GetNativeForm.ShowModal;
 end;
 
@@ -3358 +3358 @@
 procedure TDpiForm.BringToFront;
 begin
-  GetVclForm.BringToFront;
+  GetNativeForm.BringToFront;
 end;
 
@@ -3383 +3383 @@
   end;
   ScreenChanged;
-  UpdateVclControl;
+  UpdateNativeControl;
 end;
 
@@ -3395 +3395 @@
 begin
   // TODO: Can't destroy directly?
-  //FreeAndNil(VclForm);
+  //FreeAndNil(NativeForm);
   DpiScreen.RemoveForm(Self);
 end;
@@ -3401 +3401 @@
 initialization
 
-RegisterPropertyToSkip(TDpiForm, 'OldCreateOrder', 'VCL compatibility property', '');
-RegisterPropertyToSkip(TDpiForm, 'TextHeight', 'VCL compatibility property', '');
-RegisterPropertyToSkip(TDpiForm, 'Scaled', 'VCL compatibility property', '');
-RegisterPropertyToSkip(TDpiForm, 'TransparentColorValue', 'VCL compatibility property', '');
+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);