paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RxFPC:fix compile after lazarus rev 476da882

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9613 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75 2025-01-31 19:57:37 +00:00
parent e8bac51fc8
commit 025bbdb0d2
4 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/rx/trunk/rxcontrols/rxclock.pas
View File

@ -179,7 +179,7 @@ type
implementation implementation
uses rxlclutils, RTLConsts, LCLIntf; uses Types, rxlclutils, RTLConsts, LCLIntf;
const const
Registered: Boolean = False; Registered: Boolean = False;

7
components/rx/trunk/rxcontrols/rxctrls.pas
View File

@ -821,8 +821,9 @@ type
implementation implementation
uses SysUtils, Dialogs, rxlclutils, Math, RxAppUtils, ImgList, uses SysUtils, Types, Dialogs, rxlclutils, Math, RxAppUtils, ImgList,
ActnList, InterfaceBase; ActnList, InterfaceBase;
const const
Alignments: array [TAlignment] of Word = (DT_LEFT, DT_RIGHT, DT_CENTER); Alignments: array [TAlignment] of Word = (DT_LEFT, DT_RIGHT, DT_CENTER);
WordWraps: array[Boolean] of Word = (0, DT_WORDBREAK); WordWraps: array[Boolean] of Word = (0, DT_WORDBREAK);
@ -2539,8 +2540,8 @@ begin
RShadow := Rect; RShadow := Rect;
Color := SetTextColor(DC, ShadowColor); Color := SetTextColor(DC, ShadowColor);
case ShadowPos of case ShadowPos of
spLeftTop: OffsetRect(RShadow, -ShadowSize, -ShadowSize); spLeftTop: Types.OffsetRect(RShadow, -ShadowSize, -ShadowSize);
spRightBottom: OffsetRect(RShadow, ShadowSize, ShadowSize); spRightBottom: Types.OffsetRect(RShadow, ShadowSize, ShadowSize);
spLeftBottom: spLeftBottom:
begin begin
{OffsetRect(RText, ShadowSize, 0);} {OffsetRect(RText, ShadowSize, 0);}

44
components/rx/trunk/rxcontrols/rxinipropstorage.pas
View File

@ -106,33 +106,53 @@ begin
inherited FinishPropertyList(List); inherited FinishPropertyList(List);
end; end;
const
sWidth = '_WIDTH';
sHeight = '_HEIGHT';
function TRxIniPropStorage.DoReadString(const Section, Ident, function TRxIniPropStorage.DoReadString(const Section, Ident,
DefaultValue: string): string; DefaultValue: string): string;
var var
S: String; S: String;
ASize: LongInt; ASize: LongInt;
ASize1, PP: Integer; ASize1, PP: Integer;
R:SizeInt;
CC:SizeInt;
begin begin
PP:=0; PP:=0;
Result := inherited DoReadString(Section, Ident, DefaultValue); Result := inherited DoReadString(Section, Ident, DefaultValue);
{$IfNDef FIX_WIDTH_WIDE_STRING96} {$IfNDef FIX_WIDTH_WIDE_STRING96}
S:=UpperCase(Ident);
if (Pos('_WIDTH', S) > 0) or (Pos('_HEIGHT', S) > 0) then if (Pos('_', Ident) > 0) then
begin begin
if Assigned(Screen) then // CompareStr
S:=UpperCase(Ident);
R:=Length(S);
if R >= Length(sWidth) then
CC:=CompareChar(S[R-Length(sWidth)+1], sWidth[1], Length(sWidth));
if (CC<>0) and (R >= Length(sHeight)) then
CC:=CompareChar(S[R-Length(sHeight)+1], sHeight[1], Length(sHeight));
// if (Pos('_WIDTH', S) > 0) or (Pos('_HEIGHT', S) > 0) then
if CC=0 then
begin begin
ASize:=StrToIntDef(Result, -1); if Assigned(Screen) then
if ASize>-1 then
begin begin
//ASize1 := MulDiv(ASize, Screen.PixelsPerInch, 96); ASize:=StrToIntDef(Result, -1);
if Screen.PixelsPerInch <> 0 then if ASize>-1 then
begin begin
if Owner is TForm then //ASize1 := MulDiv(ASize, Screen.PixelsPerInch, 96);
PP:=TForm(Owner).DesignTimePPI; if Screen.PixelsPerInch <> 0 then
if PP>0 then
begin begin
ASize1 := MulDiv(ASize, PP, Screen.PixelsPerInch); if Owner is TForm then
Result := IntToStr(ASize1); PP:=TForm(Owner).DesignTimePPI;
if PP>0 then
begin
ASize1 := MulDiv(ASize, PP, Screen.PixelsPerInch);
Result := IntToStr(ASize1);
end;
end; end;
end; end;
end; end;

2
components/rx/trunk/rxdb/rxlookup.pas
View File

@ -1926,7 +1926,7 @@ end;
procedure TRxDBLookupCombo.OnInternalClosePopup(AResult: boolean); procedure TRxDBLookupCombo.OnInternalClosePopup(AResult: boolean);
begin begin
inherited OnInternalClosePopup(AResult); inherited OnInternalClosePopup(AResult);
if MouseEntered or FButton.MouseEntered then if MouseInClient or FButton.MouseInClient then
FStopClick:=true; FStopClick:=true;
end; end;