diff --git a/lcl/interfaces/gtk/gtkproc.pp b/lcl/interfaces/gtk/gtkproc.pp index 5339b73536..70b23369e8 100644 --- a/lcl/interfaces/gtk/gtkproc.pp +++ b/lcl/interfaces/gtk/gtkproc.pp @@ -820,8 +820,8 @@ var // Some defaults are set here incase we didn't find them type TModifier = record - Mask: Cardinal; // if UseValue is set, the modifier is set when the masked state matches the value - Value: Cardinal; // otherwise any nonzero value will match + Mask: TGdkModifierType; // if UseValue is set, the modifier is set when the masked state matches the value + Value: TGdkModifierType; // otherwise any nonzero value will match UseValue: Boolean; end; diff --git a/lcl/interfaces/gtk/gtkwidgetset.inc b/lcl/interfaces/gtk/gtkwidgetset.inc index e8683a54ba..9b5916aa45 100644 --- a/lcl/interfaces/gtk/gtkwidgetset.inc +++ b/lcl/interfaces/gtk/gtkwidgetset.inc @@ -1589,7 +1589,7 @@ begin BitSize := longint(SizeOf(Byte)) *(longint(biSizeImage) div biHeight) *longint(NumScans + StartScan); - if MemSize(Bits) < PtrInt(BitSize) + if MemSize(Bits) < PtrUInt(BitSize) then begin DebugLn('WARNING: [TGtkWidgetSet.InternalGetDIBits] not enough memory allocated for Bits!'); exit; diff --git a/lcl/interfaces/gtk/gtkwinapi.inc b/lcl/interfaces/gtk/gtkwinapi.inc index be4e1ec2d4..aa6a74e927 100644 --- a/lcl/interfaces/gtk/gtkwinapi.inc +++ b/lcl/interfaces/gtk/gtkwinapi.inc @@ -6606,11 +6606,11 @@ begin Result := False; //Sanity Checks For Vertices Size vs. Count - If MemSize(Vertices) < PtrInt(SizeOf(tagTRIVERTEX)*NumVertices) then + If MemSize(Vertices) < PtrUInt(SizeOf(tagTRIVERTEX)*NumVertices) then exit; //Sanity Checks For Meshes Size vs. Count - If MemSize(Meshes) < PtrInt(MeshSize[DoFillTriangle]*NumMeshes) then + If MemSize(Meshes) < PtrUInt(MeshSize[DoFillTriangle]*NumMeshes) then exit; For I := 0 to NumMeshes - 1 do begin diff --git a/lcl/interfaces/gtk/gtkwscustomlistview.inc b/lcl/interfaces/gtk/gtkwscustomlistview.inc index 520b66fe09..58beaec297 100644 --- a/lcl/interfaces/gtk/gtkwscustomlistview.inc +++ b/lcl/interfaces/gtk/gtkwscustomlistview.inc @@ -786,7 +786,7 @@ begin // check if the row is are already selected // since we are in singleselect, the first item is checked if (CListWidget^.selection <> nil) - and (PtrUInt(CListWidget^.selection^.Data) = AIndex) + and (PtrInt(PtrUInt(CListWidget^.selection^.Data)) = AIndex) then Exit; gtk_clist_unselect_all(CListWidget); end;