From 2ca1eea5568cd4ae6adeed99a281f588abcdf938 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Fri, 7 Nov 2003 22:50:44 +0000
Subject: [PATCH] fixed finding sysutilh.inc

git-svn-id: trunk@4775 -
---
 components/codetools/definetemplates.pas  |  1 +
 components/codetools/keywordfunclists.pas |  1 +
 designer/propedits.pp                     |  2 ++
 lcl/include/interfacebase.inc             |  8 ++++++--
 lcl/interfaces/gtk/gtkproc.inc            |  5 ++++-
 lcl/intfgraphics.pas                      | 12 ++++++++++++
 6 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas
index e3cf0b4261..34484e5a4e 100644
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@@ -3045,6 +3045,7 @@ begin
   MainDir.AddChild(RTLDir);
   s:=IncPathMacro
     +';'+Dir+'rtl'+DS+'objpas'+DS
+    +';'+Dir+'rtl'+DS+'objpas'+DS+'sysutils'
     +';'+Dir+'rtl'+DS+'inc'+DS
     +';'+Dir+'rtl'+DS+TargetProcessor+DS
     +';'+Dir+'rtl'+DS+SrcOS+DS;
diff --git a/components/codetools/keywordfunclists.pas b/components/codetools/keywordfunclists.pas
index b70f9f1427..b3fedfbea1 100644
--- a/components/codetools/keywordfunclists.pas
+++ b/components/codetools/keywordfunclists.pas
@@ -646,6 +646,7 @@ begin
     Add('IOCHECK'      ,{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('LOCAL'        ,{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('NEAR'         ,{$ifdef FPC}@{$endif}AllwaysTrue);
+    Add('OLDFPCCALL'   ,{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('OVERLOAD'     ,{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('PASCAL'       ,{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('PLATFORM'     ,{$ifdef FPC}@{$endif}AllwaysTrue);
diff --git a/designer/propedits.pp b/designer/propedits.pp
index a79d874121..43b9a203ce 100644
--- a/designer/propedits.pp
+++ b/designer/propedits.pp
@@ -2096,6 +2096,7 @@ var
   I:Integer;
   Changed: boolean;
 begin
+  Changed:=false;
   for I:=0 to FPropCount-1 do
     with FPropList^[I] do
       Changed:=Changed or (GetStrProp(Instance,PropInfo)<>NewValue);
@@ -2111,6 +2112,7 @@ var
   I:Integer;
   Changed: boolean;
 begin
+  Changed:=false;
   for I:=0 to FPropCount-1 do
     with FPropList^[I] do
       Changed:=Changed or (GetVariantProp(Instance,PropInfo)<>NewValue);
diff --git a/lcl/include/interfacebase.inc b/lcl/include/interfacebase.inc
index 431ae43f35..04782ba461 100644
--- a/lcl/include/interfacebase.inc
+++ b/lcl/include/interfacebase.inc
@@ -282,7 +282,8 @@ Begin
   Result := False;
 end;
 
-function TInterfaceBase.DrawText(DC: HDC; Str: PChar; Count: Integer; var Rect: TRect; Flags: Cardinal): Integer;
+function TInterfaceBase.DrawText(DC: HDC; Str: PChar; Count: Integer;
+  var Rect: TRect; Flags: Cardinal): Integer;
 var
   AP : TSize;
   TM : TTextmetric;
@@ -580,7 +581,7 @@ begin
       DeleteAmpersands(tmpString);
 
     If tmpString > '' then begin
-      TextExtent(DC, tmpString);
+      AP:=TextExtent(DC, tmpString);
       AP.cX := AP.cX div Length(tmpString);
     end
     else begin
@@ -1847,6 +1848,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.109  2003/11/07 22:50:44  mattias
+  fixed finding sysutilh.inc
+
   Revision 1.108  2003/11/07 18:48:52  micha
   symmetry getdesignerdc, releasedesignerdc
 
diff --git a/lcl/interfaces/gtk/gtkproc.inc b/lcl/interfaces/gtk/gtkproc.inc
index f4569fe290..5a12f7a148 100644
--- a/lcl/interfaces/gtk/gtkproc.inc
+++ b/lcl/interfaces/gtk/gtkproc.inc
@@ -4993,7 +4993,7 @@ begin
   style := nil;
   Result := DefaultColor;
 
-  Case Color of
+  Case TColor(Color) of
     clINFOTEXT :
       begin
         Style := GetStyle('tooltip');
@@ -5539,6 +5539,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.225  2003/11/07 22:50:44  mattias
+  fixed finding sysutilh.inc
+
   Revision 1.224  2003/11/01 10:27:41  mattias
   fpc 1.1 fixes, started scrollbar hiding, started polymorphing client areas
 
diff --git a/lcl/intfgraphics.pas b/lcl/intfgraphics.pas
index 40ce322e38..f193865c29 100644
--- a/lcl/intfgraphics.pas
+++ b/lcl/intfgraphics.pas
@@ -111,6 +111,8 @@ type
   protected
     procedure SetInternalColor(x, y: integer; const Value: TFPColor); override;
     function GetInternalColor(x, y: integer): TFPColor; override;
+    procedure SetInternalPixel (x,y:integer; Value:integer); override;
+    function GetInternalPixel (x,y:integer) : integer; override;
     procedure FreeAllData; virtual;
     procedure FreePixelData; virtual;
     procedure FreeMaskData; virtual;
@@ -647,6 +649,16 @@ begin
   end;
 end;
 
+procedure TLazIntfImage.SetInternalPixel(x, y: integer; Value: integer);
+begin
+
+end;
+
+function TLazIntfImage.GetInternalPixel(x, y: integer): integer;
+begin
+  Result:=0;
+end;
+
 procedure TLazIntfImage.FreeAllData;
 begin
   FreePixelData;