Temporary reverting font to Tahoma:8 (from default BCB 11's Segoe UI:9) to match the windows layout

Source commit: 815a497dffe349865a283f50ec0cd4af92cb3489
2026-10-24 02:28:55 +03:00 · 2024-10-08 11:32:13 +00:00
parent 79dd86a15f
commit e55f27dab3
42 changed files with 208 additions and 46 deletions
--- a/source/WinSCP.cpp
+++ b/source/WinSCP.cpp
@@ -62,6 +62,8 @@ WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
    Application->Initialize();
    Application->MainFormOnTaskBar = true;
    Application->ModalPopupMode = pmAuto;
+    Application->DefaultFont->Name = L"Tahoma";
+    Application->DefaultFont->Height = -11;
    SetEnvironmentVariable(L"WINSCP_PATH",
      ExcludeTrailingBackslash(ExtractFilePath(Application->ExeName)).c_str());
    CoreInitialize();
--- a/source/forms/About.dfm
+++ b/source/forms/About.dfm
@@ -9,7 +9,11 @@ object AboutDialog: TAboutDialog
  ClientHeight = 501
  ClientWidth = 410
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  KeyPreview = True
  Position = poOwnerFormCenter
  OnKeyDown = FormKeyDown
--- a/source/forms/Authenticate.dfm
+++ b/source/forms/Authenticate.dfm
@@ -11,7 +11,11 @@ object AuthenticateForm: TAuthenticateForm
  Color = clBtnFace
  Constraints.MinHeight = 200
  Constraints.MinWidth = 280
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnResize = FormResize
  OnShow = FormShow
--- a/source/forms/Cleanup.dfm
+++ b/source/forms/Cleanup.dfm
@@ -9,7 +9,11 @@ object CleanupDialog: TCleanupDialog
  ClientHeight = 299
  ClientWidth = 489
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnShow = FormShow
  DesignSize = (
--- a/source/forms/Console.dfm
+++ b/source/forms/Console.dfm
@@ -10,7 +10,11 @@ object ConsoleDialog: TConsoleDialog
  Color = clBtnFace
  Constraints.MinHeight = 250
  Constraints.MinWidth = 420
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Icon.Data = {
    000001000700404000000100200028420000760000003030000001002000A825
    00009E4200002828000001002000681A0000466800002020000001002000A810
--- a/source/forms/Copy.dfm
+++ b/source/forms/Copy.dfm
@@ -9,7 +9,11 @@ object CopyDialog: TCopyDialog
  ClientHeight = 225
  ClientWidth = 511
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnCloseQuery = FormCloseQuery
  OnShow = FormShow
--- a/source/forms/CopyLocal.dfm
+++ b/source/forms/CopyLocal.dfm
@@ -9,7 +9,11 @@ object CopyLocalDialog: TCopyLocalDialog
  ClientHeight = 121
  ClientWidth = 511
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnCloseQuery = FormCloseQuery
  OnShow = FormShow
--- a/source/forms/CopyParamCustom.dfm
+++ b/source/forms/CopyParamCustom.dfm
@@ -9,7 +9,11 @@ object CopyParamCustomDialog: TCopyParamCustomDialog
  ClientHeight = 515
  ClientWidth = 420
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnCloseQuery = FormCloseQuery
  DesignSize = (
--- a/source/forms/CopyParamPreset.dfm
+++ b/source/forms/CopyParamPreset.dfm
@@ -9,7 +9,11 @@ object CopyParamPresetDialog: TCopyParamPresetDialog
  ClientHeight = 560
  ClientWidth = 675
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnCloseQuery = FormCloseQuery
  OnShow = FormShow
--- a/source/forms/CopyParams.dfm
+++ b/source/forms/CopyParams.dfm
@@ -4,6 +4,12 @@ object CopyParamsFrame: TCopyParamsFrame
  Width = 420
  Height = 477
  HelpType = htKeyword
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
+  ParentFont = False
  TabOrder = 0
  object CommonPropertiesGroup: TGroupBox
    Left = 212
--- a/source/forms/CreateDirectory.dfm
+++ b/source/forms/CreateDirectory.dfm
@@ -9,7 +9,11 @@ object CreateDirectoryDialog: TCreateDirectoryDialog
  ClientHeight = 253
  ClientWidth = 337
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnCloseQuery = FormCloseQuery
  OnShow = FormShow
--- a/source/forms/Custom.dfm
+++ b/source/forms/Custom.dfm
@@ -7,7 +7,11 @@ object CustomDialog: TCustomDialog
  ClientHeight = 41
  ClientWidth = 326
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  DesignSize = (
    326
--- a/source/forms/CustomCommand.dfm
+++ b/source/forms/CustomCommand.dfm
@@ -9,7 +9,11 @@ object CustomCommandDialog: TCustomCommandDialog
  ClientHeight = 309
  ClientWidth = 416
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnCloseQuery = FormCloseQuery
  OnShow = FormShow
--- a/source/forms/CustomScpExplorer.dfm
+++ b/source/forms/CustomScpExplorer.dfm
@@ -5,7 +5,11 @@ object CustomScpExplorerForm: TCustomScpExplorerForm
  ClientHeight = 432
  ClientWidth = 620
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  KeyPreview = True
  OnClose = FormClose
  OnCloseQuery = FormCloseQuery
--- a/source/forms/EditMask.dfm
+++ b/source/forms/EditMask.dfm
@@ -9,7 +9,11 @@ object EditMaskDialog: TEditMaskDialog
  ClientHeight = 500
  ClientWidth = 425
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  KeyPreview = True
  Position = poOwnerFormCenter
  OnCloseQuery = FormCloseQuery
--- a/source/forms/Editor.dfm
+++ b/source/forms/Editor.dfm
@@ -8,7 +8,11 @@ object EditorForm: TEditorForm
  ClientHeight = 381
  ClientWidth = 609
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Icon.Data = {
    000001000700404000000100200028420000760000003030000001002000A825
    00009E4200002828000001002000681A0000466800002020000001002000A810
--- a/source/forms/EditorPreferences.dfm
+++ b/source/forms/EditorPreferences.dfm
@@ -9,7 +9,11 @@ object EditorPreferencesDialog: TEditorPreferencesDialog
  ClientHeight = 389
  ClientWidth = 403
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnCloseQuery = FormCloseQuery
  OnShow = FormShow
--- a/source/forms/FileFind.dfm
+++ b/source/forms/FileFind.dfm
@@ -10,7 +10,11 @@ object FileFindDialog: TFileFindDialog
  Color = clBtnFace
  Constraints.MinHeight = 240
  Constraints.MinWidth = 400
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Icon.Data = {
    000001000700404000000100200028420000760000003030000001002000A825
    00009E4200002828000001002000681A0000466800002020000001002000A810
--- a/source/forms/FileSystemInfo.dfm
+++ b/source/forms/FileSystemInfo.dfm
@@ -9,7 +9,11 @@ object FileSystemInfoDialog: TFileSystemInfoDialog
  ClientHeight = 398
  ClientWidth = 371
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnShow = FormShow
  DesignSize = (
--- a/source/forms/FullSynchronize.dfm
+++ b/source/forms/FullSynchronize.dfm
@@ -9,7 +9,11 @@ object FullSynchronizeDialog: TFullSynchronizeDialog
  ClientHeight = 477
  ClientWidth = 481
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnCloseQuery = FormCloseQuery
  OnShow = FormShow
--- a/source/forms/GenerateUrl.dfm
+++ b/source/forms/GenerateUrl.dfm
@@ -11,7 +11,11 @@ object GenerateUrlDialog: TGenerateUrlDialog
  Color = clBtnFace
  Constraints.MinHeight = 300
  Constraints.MinWidth = 484
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnShow = FormShow
  DesignSize = (
--- a/source/forms/ImportSessions.dfm
+++ b/source/forms/ImportSessions.dfm
@@ -9,7 +9,11 @@ object ImportSessionsDialog: TImportSessionsDialog
  ClientHeight = 273
  ClientWidth = 375
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnShow = FormShow
  DesignSize = (
--- a/source/forms/License.dfm
+++ b/source/forms/License.dfm
@@ -8,7 +8,11 @@ object LicenseDialog: TLicenseDialog
  ClientHeight = 320
  ClientWidth = 504
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  DesignSize = (
    504
--- a/source/forms/LocationProfiles.dfm
+++ b/source/forms/LocationProfiles.dfm
@@ -9,7 +9,11 @@ object LocationProfilesDialog: TLocationProfilesDialog
  ClientHeight = 435
  ClientWidth = 557
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnShow = FormShow
  DesignSize = (
--- a/source/forms/Login.dfm
+++ b/source/forms/Login.dfm
@@ -10,7 +10,11 @@ object LoginDialog: TLoginDialog
  Color = clBtnFace
  Constraints.MinHeight = 399
  Constraints.MinWidth = 600
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  KeyPreview = True
  Position = poOwnerFormCenter
  OnCloseQuery = FormCloseQuery
--- a/source/forms/MessageDlg.cpp
+++ b/source/forms/MessageDlg.cpp
@@ -21,6 +21,7 @@
 #include <Setup.h>
 #include <WinApi.h>
 #include "MessageDlg.h"
+#include <Custom.h>
 //---------------------------------------------------------------------------
 #pragma resource "*.dfm"
 //---------------------------------------------------------------------------
@@ -78,7 +79,8 @@ __fastcall TMessageForm::TMessageForm(TComponent * AOwner) : TForm(AOwner)
  NeverAskAgainCheck = NULL;
  FUpdateForShiftStateTimer = NULL;
  UseSystemSettingsPre(this);
-  FDummyForm = new TForm(this);
+  // DFM-based form, to use the custom Tahoma font
+  FDummyForm = new TCustomDialog(EmptyStr);
  UseSystemSettings(FDummyForm);
 }
 //---------------------------------------------------------------------------
--- a/source/forms/MessageDlg.dfm
+++ b/source/forms/MessageDlg.dfm
@@ -7,7 +7,11 @@ object MessageForm: TMessageForm
  ClientHeight = 41
  ClientWidth = 326
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  TextHeight = 13
 end
--- a/source/forms/OpenDirectory.dfm
+++ b/source/forms/OpenDirectory.dfm
@@ -9,7 +9,11 @@ object OpenDirectoryDialog: TOpenDirectoryDialog
  ClientHeight = 334
  ClientWidth = 405
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnShow = FormShow
  DesignSize = (
--- a/source/forms/Preferences.dfm
+++ b/source/forms/Preferences.dfm
@@ -9,7 +9,11 @@ object PreferencesDialog: TPreferencesDialog
  ClientHeight = 519
  ClientWidth = 545
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnCloseQuery = FormCloseQuery
  OnShortCut = FormShortCut
--- a/source/forms/Progress.dfm
+++ b/source/forms/Progress.dfm
@@ -9,7 +9,11 @@ object ProgressForm: TProgressForm
  ClientHeight = 291
  ClientWidth = 360
  Color = clWindow
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  PopupMode = pmAuto
  Position = poOwnerFormCenter
  OnHide = FormHide
--- a/source/forms/Properties.dfm
+++ b/source/forms/Properties.dfm
@@ -9,7 +9,11 @@ object PropertiesDialog: TPropertiesDialog
  ClientHeight = 416
  ClientWidth = 357
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnCloseQuery = FormCloseQuery
  OnShow = FormShow
--- a/source/forms/RemoteTransfer.dfm
+++ b/source/forms/RemoteTransfer.dfm
@@ -9,7 +9,11 @@ object RemoteTransferDialog: TRemoteTransferDialog
  ClientHeight = 179
  ClientWidth = 420
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnCloseQuery = FormCloseQuery
  OnShow = FormShow
--- a/source/forms/Rights.dfm
+++ b/source/forms/Rights.dfm
@@ -3,6 +3,12 @@ object RightsFrame: TRightsFrame
  Top = 0
  Width = 239
  Height = 109
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
+  ParentFont = False
  TabOrder = 0
  OnContextPopup = FrameContextPopup
  object OthersButton: TSpeedButton
--- a/source/forms/SelectMask.dfm
+++ b/source/forms/SelectMask.dfm
@@ -9,7 +9,11 @@ object SelectMaskDialog: TSelectMaskDialog
  ClientHeight = 186
  ClientWidth = 417
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poDesigned
  OnCloseQuery = FormCloseQuery
  OnShow = FormShow
--- a/source/forms/SiteAdvanced.dfm
+++ b/source/forms/SiteAdvanced.dfm
@@ -9,7 +9,11 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
  ClientHeight = 432
  ClientWidth = 561
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnClose = FormClose
  OnCloseQuery = FormCloseQuery
--- a/source/forms/Symlink.dfm
+++ b/source/forms/Symlink.dfm
@@ -9,7 +9,11 @@ object SymlinkDialog: TSymlinkDialog
  ClientHeight = 183
  ClientWidth = 396
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  OnShow = FormShow
  DesignSize = (
--- a/source/forms/Synchronize.dfm
+++ b/source/forms/Synchronize.dfm
@@ -9,7 +9,11 @@ object SynchronizeDialog: TSynchronizeDialog
  ClientHeight = 445
  ClientWidth = 468
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  KeyPreview = True
  Position = poOwnerFormCenter
  OnCloseQuery = FormCloseQuery
--- a/source/forms/SynchronizeChecklist.dfm
+++ b/source/forms/SynchronizeChecklist.dfm
@@ -8,7 +8,11 @@ object SynchronizeChecklistDialog: TSynchronizeChecklistDialog
  ClientHeight = 521
  ClientWidth = 695
  Color = clBtnFace
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Icon.Data = {
    000001000700404000000100200028420000760000003030000001002000A825
    00009E4200002828000001002000681A0000466800002020000001002000A810
--- a/source/forms/SynchronizeProgress.dfm
+++ b/source/forms/SynchronizeProgress.dfm
@@ -7,7 +7,11 @@ object SynchronizeProgressForm: TSynchronizeProgressForm
  ClientHeight = 219
  ClientWidth = 424
  Color = clWindow
-  ParentFont = True
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
  Position = poOwnerFormCenter
  DesignSize = (
    424
--- a/source/windows/UserInterface.cpp
+++ b/source/windows/UserInterface.cpp
@@ -115,7 +115,7 @@ void __fastcall FlashOnBackground()
  }
 }
 //---------------------------------------------------------------------------
-void __fastcall LocalSystemSettings(TCustomForm * /*Control*/)
+void __fastcall LocalSystemSettings(TForm * /*Control*/)
 {
  // noop
 }
--- a/source/windows/VCLCommon.cpp
+++ b/source/windows/VCLCommon.cpp
@@ -1163,7 +1163,7 @@ void __fastcall ApplySystemSettingsOnControl(TControl * Control)
 }
 //---------------------------------------------------------------------------
 // Settings that must be set as soon as possible.
-void __fastcall UseSystemSettingsPre(TCustomForm * Control)
+void __fastcall UseSystemSettingsPre(TForm * Control)
 {
  LocalSystemSettings(Control);

@@ -1178,6 +1178,12 @@ void __fastcall UseSystemSettingsPre(TCustomForm * Control)
    Control->HelpKeyword = L"start";
  }

+  // We have legacy XE6 font (Tahoma) explicitly set in DFMs to match the layout.
+  // That unlinks the font fonts from the Application->DefaultFont. We set the DefaultFont to Tahoma in WinSCP.cpp.
+  // So we can link the form's font back to it now.
+  DebugAssert(SameFont(Control->Font, Application->DefaultFont));
+  Control->ParentFont = true;
+
  ApplySystemSettingsOnControl(Control);
 };
 //---------------------------------------------------------------------------
@@ -1211,7 +1217,7 @@ static void FlipAnchors(TControl * Control)
 }
 //---------------------------------------------------------------------------
 // Settings that must be set only after whole form is constructed
-void __fastcall UseSystemSettingsPost(TCustomForm * Control)
+void __fastcall UseSystemSettingsPost(TForm * Control)
 {
  // When showing an early error message
  if (WinConfiguration != NULL)
@@ -1229,13 +1235,13 @@ void __fastcall UseSystemSettingsPost(TCustomForm * Control)
  ResetSystemSettings(Control);
 };
 //---------------------------------------------------------------------------
-void __fastcall UseSystemSettings(TCustomForm * Control)
+void __fastcall UseSystemSettings(TForm * Control)
 {
  UseSystemSettingsPre(Control);
  UseSystemSettingsPost(Control);
 };
 //---------------------------------------------------------------------------
-void __fastcall ResetSystemSettings(TCustomForm * /*Control*/)
+void __fastcall ResetSystemSettings(TForm * /*Control*/)
 {
  // noop
 }
--- a/source/windows/VCLCommon.h
+++ b/source/windows/VCLCommon.h
@@ -20,11 +20,11 @@ int CalculateCheckBoxWidth(TControl * Control, const UnicodeString & Caption);
 void AutoSizeCheckBox(TCheckBox * CheckBox);
 void __fastcall InitializeSystemSettings();
 void __fastcall FinalizeSystemSettings();
-void __fastcall LocalSystemSettings(TCustomForm * Control);
-void __fastcall UseSystemSettingsPre(TCustomForm * Control);
-void __fastcall UseSystemSettingsPost(TCustomForm * Control);
-void __fastcall UseSystemSettings(TCustomForm * Control);
-void __fastcall ResetSystemSettings(TCustomForm * Control);
+void __fastcall LocalSystemSettings(TForm * Control);
+void __fastcall UseSystemSettingsPre(TForm * Control);
+void __fastcall UseSystemSettingsPost(TForm * Control);
+void __fastcall UseSystemSettings(TForm * Control);
+void __fastcall ResetSystemSettings(TForm * Control);
 void __fastcall LinkLabel(TStaticText * StaticText, UnicodeString Url = L"",
  TNotifyEvent OnEnter = NULL);
 void __fastcall LinkActionLabel(TStaticText * StaticText);