paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 14:38:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes for is precedence change in fpc r44266 #831fd20413

Browse Source 
git-svn-id: trunk@62699 -
This commit is contained in:
marcus 2020-03-06 12:07:46 +00:00
parent 5e174a5729
commit b9e4a03603
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/ideintf/fieldseditor.pas
View File

@ -439,7 +439,7 @@ begin
if i >= 0 then
FieldsListBox.Items[i] := Field.FieldName;
end else
if AComponent is TDataset And (AComponent = LinkDataset) then
if (AComponent is TDataset) And (AComponent = LinkDataset) then
Caption := fesFeTitle + ' - ' + LinkDataset.Name;
end;

2
lcl/include/custompage.inc
View File

@ -136,7 +136,7 @@ end;
------------------------------------------------------------------------------}
procedure TCustomPage.CMHitTest(var Message: TLMNCHITTEST);
begin
if Parent is TCustomTabControl and
if (Parent is TCustomTabControl) and
(TCustomTabControl(Parent).ActivePageComponent <> Self) then
Message.Result := 0 // no hit
else

8
lcl/interfaces/mui/muicomctrls.pas
View File

@ -249,10 +249,10 @@ begin
Exit;
if BlockRedraw or BlockLayout then
Exit;
w := Min(FWidth, OBJ_MaxWidth(FObject));
w := Max(w, OBJ_MinWidth(FObject));
h := Min(FHeight, OBJ_MaxHeight(FObject));
h := Max(h, OBJ_MinHeight(FObject));
w := Min(FWidth, LongInt(OBJ_MaxWidth(FObject)));
w := Max(w, LongInt(OBJ_MinWidth(FObject)));
h := Min(FHeight, LongInt(OBJ_MaxHeight(FObject)));
h := Max(h, LongInt(OBJ_MinHeight(FObject)));
//writeln(self.classname,' setsize ', FLeft, ', ', FTop, ' - ', FWidth, ', ', FHeight,' count: ', Fchilds.Count, ' obj ', HexStr(FObject));
MUI_Layout(FObject, FLeft, FTop, w, h, 0);
//writeln(self.classname, ' setsize done');

2
lcl/shellctrls.pas
View File

@ -28,7 +28,7 @@ uses
// LazUtils
FileUtil, LazFileUtils, LazUTF8, Masks;
{$if defined(Windows) or defined(darwin)}
{$if defined(Windows) or defined(darwin) or defined(HASAMIGA))}
{$define CaseInsensitiveFilenames}
{$endif}
{$IF defined(CaseInsensitiveFilenames) or defined(darwin)}