paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-08 09:20:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

MG: fixed parser for external vars

Browse Source 
git-svn-id: trunk@1785 -
This commit is contained in:
lazarus 2002-07-09 17:18:23 +00:00
parent a9d326e24a
commit de61fbc396
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/pascalparsertool.pas
View File

@ -2064,7 +2064,7 @@ begin
if UpAtomIs('EXTERNAL') then begin if UpAtomIs('EXTERNAL') then begin
// read external name // read external name
ReadNextAtom; ReadNextAtom;
if AtomIsStringConstant then if (not UpAtomIs('NAME')) and AtomIsIdentifier(false) then
ReadConstant(true,false,[]); ReadConstant(true,false,[]);
end else end else
ReadNextAtom; ReadNextAtom;

15
lcl/interfaces/gtk/gtkwinapi.inc
View File

@ -4081,18 +4081,20 @@ begin
then begin then begin
with PDeviceContext(DC)^, CurrentBackColor do with PDeviceContext(DC)^, CurrentBackColor do
begin begin
Result := ((Red and HI_MASK) shr 8) or (Green and HI_MASK) or ((Blue and HI_MASK) shl 8); Result := ((Red and HI_MASK) shr 8)
or (Green and HI_MASK)
if Result <> Color or ((Blue and HI_MASK) shl 8);
then begin
if Result <> Color then
begin
gdk_colormap_free_colors(gdk_colormap_get_system, @CurrentBackColor, 1); gdk_colormap_free_colors(gdk_colormap_get_system, @CurrentBackColor, 1);
Red := ((Color shl 8) and HI_MASK) or ((Color ) and LO_MASK); Red := ((Color shl 8) and HI_MASK) or ((Color ) and LO_MASK);
Green := ((Color ) and HI_MASK) or ((Color shr 8 ) and LO_MASK); Green := ((Color ) and HI_MASK) or ((Color shr 8 ) and LO_MASK);
Blue := ((Color shr 8) and HI_MASK) or ((Color shr 16) and LO_MASK); Blue := ((Color shr 8) and HI_MASK) or ((Color shr 16) and LO_MASK);
gdk_colormap_alloc_color(gdk_colormap_get_system, @CurrentBackColor, False, True); gdk_colormap_alloc_color(gdk_colormap_get_system, @CurrentBackColor,
False, True);
end; end;
end; end;
@ -4810,6 +4812,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.81 2002/07/09 17:18:23 lazarus
MG: fixed parser for external vars
Revision 1.80 2002/06/21 15:41:56 lazarus Revision 1.80 2002/06/21 15:41:56 lazarus
MG: moved RectVisible, ExcludeClipRect and IntersectClipRect to interface dependent functions MG: moved RectVisible, ExcludeClipRect and IntersectClipRect to interface dependent functions