From 8bec59f1f780aa0998822f31eb127fe56e2bff5d Mon Sep 17 00:00:00 2001
From: Martin Eckes <m.eckes@trinit-soft.de>
Date: Thu, 25 Jun 2020 12:48:43 +0200
Subject: [PATCH 1/2] Support for TFrame;Fix Rangecheck Error; Comment out
 unused vars

---
 Common/Vcl.Styles.FontAwesome.pas      | 14 +++++++-------
 Common/Vcl.Styles.Utils.SystemMenu.pas |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Common/Vcl.Styles.FontAwesome.pas b/Common/Vcl.Styles.FontAwesome.pas
index 3a1c9a4..72409df 100644
--- a/Common/Vcl.Styles.FontAwesome.pas
+++ b/Common/Vcl.Styles.FontAwesome.pas
@@ -848,13 +848,13 @@ procedure TFontAwesome.DrawChar(DC: HDC; const AChar: Char; DestRect: TRect;
 type
   TCustomActivityIndicatorShadow = class(TCustomControl)
   private
-    FAnimate: Boolean;
-    FIndicatorColor: TActivityIndicatorColor;
-    FIndicatorSize: TActivityIndicatorSize;
-    FIndicatorType: TActivityIndicatorType;
-    FFrameDelay: Word;
-    FFrameIndex: Integer;
-    FTimer: TTimer;
+    //FAnimate: Boolean;
+    //FIndicatorColor: TActivityIndicatorColor;
+    //FIndicatorSize: TActivityIndicatorSize;
+    //FIndicatorType: TActivityIndicatorType;
+    //FFrameDelay: Word;
+    //FFrameIndex: Integer;
+    //FTimer: TTimer;
     FFrameList: TImageList;
     FFrameCount: Integer;
     FFrameSize: Integer;
diff --git a/Common/Vcl.Styles.Utils.SystemMenu.pas b/Common/Vcl.Styles.Utils.SystemMenu.pas
index 629ea67..b13b24e 100644
--- a/Common/Vcl.Styles.Utils.SystemMenu.pas
+++ b/Common/Vcl.Styles.Utils.SystemMenu.pas
@@ -178,6 +178,8 @@ procedure TVclStylesSystemMenu.CreateMenuStyles;
   LSysMenu := GetSystemMenu(FForm.Handle, False);
 
   LSubMenuIndex := GetMenuItemCount(LSysMenu);
+  if LSubMenuIndex = -1 then //Support for TFrame
+    exit;
   AddMenuSeparatorHelper(LSysMenu, LSubMenuIndex);
 
   FVCLStylesMenu := CreatePopupMenu();

From ae5c60aa2652b0a11b25331fdf5ed01fd81b6751 Mon Sep 17 00:00:00 2001
From: Martin Eckes <m.eckes@trinit-soft.de>
Date: Wed, 22 Oct 2025 20:06:46 +0200
Subject: [PATCH 2/2] Fix compiler notice; Delete unused vars

---
 Common/Vcl.Styles.Ext.pas         | 8 ++++++++
 Common/Vcl.Styles.FontAwesome.pas | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Common/Vcl.Styles.Ext.pas b/Common/Vcl.Styles.Ext.pas
index c0dd5af..ecf2ab8 100644
--- a/Common/Vcl.Styles.Ext.pas
+++ b/Common/Vcl.Styles.Ext.pas
@@ -413,11 +413,19 @@ class function TStyleManagerHelper.RegisteredStyles: TDictionary<string, TSource
     006CD071 07               pop es  006CD076 FFFF             db $ff $ff
   }
   // Use the address of the Self.Flags property to calculate the offset of the FRegisteredStyles
+//>>>
+{$IF (CompilerVersion < 35)}
+//<<<
 {$IFDEF CPUX64}
   p := Pointer(PByte(@Self.Flags) + 8);
 {$ELSE}
+
   p := Pointer(PByte(@Self.Flags) + 4);
+
 {$ENDIF CPUX64}
+//>>>
+{$IFEND}
+//<<<
 
 {$IF (CompilerVersion >= 35)}  //Alexandria.
   with Self do
diff --git a/Common/Vcl.Styles.FontAwesome.pas b/Common/Vcl.Styles.FontAwesome.pas
index e5573f1..7748abc 100644
--- a/Common/Vcl.Styles.FontAwesome.pas
+++ b/Common/Vcl.Styles.FontAwesome.pas
@@ -848,13 +848,6 @@ procedure TFontAwesome.DrawChar(DC: HDC; const AChar: Char; DestRect: TRect;
 type
   TCustomActivityIndicatorShadow = class(TCustomControl)
   private
-    //FAnimate: Boolean;
-    //FIndicatorColor: TActivityIndicatorColor;
-    //FIndicatorSize: TActivityIndicatorSize;
-    //FIndicatorType: TActivityIndicatorType;
-    //FFrameDelay: Word;
-    //FFrameIndex: Integer;
-    //FTimer: TTimer;
     FFrameList: TImageList;
     FFrameCount: Integer;
     FFrameSize: Integer;