pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

SpkToolbar: Less hints and warnings

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8055 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2021-06-23 17:47:24 +00:00
parent c1347e04e7
commit 239da83e8c
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/spktoolbar/SpkGUITools/SpkGUITools.pas
View File

@ -1905,7 +1905,7 @@ var
OrgRgn: HRGN;
ClipRgn: HRGN;
//ImageIcon: TIcon; // wp: no longer needed -- see below
ImageBitmap: TBitmap;
//ImageBitmap: TBitmap;
begin
// Storing original ClipRgn and applying a new one
SaveClipRgn(ACanvas.Handle, UseOrgClipRgn, OrgRgn);
@ -1956,7 +1956,7 @@ var
OrgRgn: HRGN;
ClipRgn: HRGN;
//ImageIcon: TIcon; // wp: no longer needed -- see below
ImageBitmap: TBitmap;
//ImageBitmap: TBitmap;
begin
// Storing original ClipRgn and applying a new one
SaveClipRgn(ACanvas.Handle, UseOrgClipRgn, OrgRgn);
@ -2508,8 +2508,8 @@ class procedure TGUITools.FillGradientRectangle(ACanvas: TCanvas;
Rect: T2DIntRect; ColorFrom: TColor; ColorTo: TColor;
GradientKind: TBackgroundKind);
var
Mesh: array of GRADIENTRECT;
GradientVertice: array of TRIVERTEX;
Mesh: array of GRADIENTRECT = nil;
GradientVertice: array of TRIVERTEX = nil;
ConcaveColor: TColor;
begin
case GradientKind of

12
components/spktoolbar/SpkToolbar/SpkToolbar.pas
View File

@ -301,15 +301,15 @@ type
// *************************************************
{ Method called when the mouse will move over the region of Menu Button }
procedure MenuButtonMouseMove({%H-}Shift: TShiftState; X, Y: integer);
procedure MenuButtonMouseMove({%H-}Shift: TShiftState; {%H-}X, {%H-}Y: integer);
{ Method called when mouse pointer left the region of Menu Button }
procedure MenuButtonMouseLeave;
{ Method called when the mouse button is pressed
and at the same time the mouse pointer is over the region of Menu Button }
procedure MenuButtonMouseDown(Button: TMouseButton; {%H-}Shift: TShiftState;
X, Y: integer);
procedure MenuButtonMouseDown({%H-}Button: TMouseButton; {%H-}Shift: TShiftState;
{%H-}X, {%H-}Y: integer);
{ Method called when one of the mouse buttons is released
and at the same time the region of Menu Button was active element of toolbar }
@ -1893,7 +1893,7 @@ procedure TSpkToolbar.ValidateBuffer;
procedure DrawMenuButtonBackground(BorderColor, GradientFrom, GradientTo: TColor; GradientKind: TBackgroundKind);
var
MenuButtonRegion: HRGN;
TmpRegion, TmpRegion2: HRGN;
TmpRegion: HRGN;
aCornerRadius: Integer;
DrawRounded: Boolean;
begin
@ -2550,10 +2550,6 @@ end;
// MouseMove to support Menu Button
procedure TSpkToolbar.MenuButtonMouseMove(Shift: TShiftState; X, Y: integer);
var
NewTabHover: integer;
TabRect: T2DIntRect;
i: integer;
begin
//During rebuilding procees the mouse is ignored
if FInternalUpdating or FUpdating then

2
components/spktoolbar/SpkToolbar/spkt_Appearance.pas
View File

@ -79,7 +79,7 @@ type
procedure Reset(AStyle: TSpkStyle = spkOffice2007Blue);
{$IF lcl_fullversion >= 1080000}
procedure AutoAdjustLayout(const AXProportion, AYProportion: Double);
procedure AutoAdjustLayout(const {%H-}AXProportion, AYProportion: Double);
{$IFEND}
published

2
components/spktoolbar/SpkToolbar/spkt_Const.pas
View File

@ -307,8 +307,10 @@ uses
procedure SpkInitLayoutConsts(FromDPI: Integer; ToDPI: Integer = 0);
begin
{
if not SPK_DPI_AWARE then
ToDPI := FromDPI;
}
{$IfDef Darwin}
ToDPI := FromDPI; //macOS raster scales by itself

4
components/spktoolbar/SpkToolbar/spkt_Pane.pas
View File

@ -632,7 +632,7 @@ type
TLayoutColumn = array of TLayoutRow;
TLayout = array of TLayoutColumn;
var
Layout: TLayout;
Layout: TLayout = nil;
CurrentColumn: integer;
CurrentRow: integer;
CurrentItem: integer;
@ -648,6 +648,8 @@ var
ItemWidth: Integer;
tmpRect: T2DIntRect;
begin
Result.Rects := Default(T2DIntRectArray);
SetLength(Result.Rects, FItems.count);
Result.Width := 0;

3
components/spktoolbar/SpkXML/SpkXMLParser.pas
View File

@ -1271,7 +1271,8 @@ var // Stos przetwarzanych ga
// Przetwarzana ga��� XMLa
Node : TSpkXMLNode;
// Pomocnicze ci�gi znak�w
s,s1 : string;
s: String = '';
s1: string;
// Pozycja w pliku - linia i znak
ParseLine, ParseChar : integer;

2
components/spktoolbar/designtime/spkte_EditWindow.pas
View File

@ -6,7 +6,7 @@ interface
uses
LCLIntf, LCLType, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls, ImgList, ComCtrls,
Dialogs, ImgList, ComCtrls,
ActnList, Menus, ComponentEditors, PropEdits,
SpkToolbar, spkt_Tab, spkt_Pane, spkt_BaseItem, spkt_Buttons, spkt_Types, spkt_Checkboxes;