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>> +{$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 fc9b931..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; diff --git a/Common/Vcl.Styles.Utils.SystemMenu.pas b/Common/Vcl.Styles.Utils.SystemMenu.pas index 9ab4f13..4cacf8c 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();