From 8e64bd00aeae83044726ee2e341b9c376defe2b2 Mon Sep 17 00:00:00 2001 From: vincents Date: Tue, 8 Feb 2005 21:46:23 +0000 Subject: [PATCH] fixed fpc 1.0.x compilation git-svn-id: trunk@6773 - --- designer/controlselection.pp | 2 +- lcl/actnlist.pas | 3 ++- lcl/buttons.pp | 7 +++++-- lcl/controls.pp | 9 ++++++--- lcl/forms.pp | 9 ++++++++- lcl/fpcadds.pas | 1 + lcl/grids.pas | 2 +- lcl/lcltype.pp | 5 ++++- lcl/lmessages.pp | 5 ++++- 9 files changed, 32 insertions(+), 11 deletions(-) diff --git a/designer/controlselection.pp b/designer/controlselection.pp index a38825bccc..0c0d3131bc 100644 --- a/designer/controlselection.pp +++ b/designer/controlselection.pp @@ -814,7 +814,7 @@ begin FRubberbandType:=rbtSelection; FRubberbandCreationColor:=clMaroon; FRubberbandSelectionColor:=clNavy; - Application.AddOnIdleHandler(@OnIdle); + Application.AddOnIdleHandler(@OnIdle {$IFDEF VER1_0}, true{$ENDIF}); end; destructor TControlSelection.Destroy; diff --git a/lcl/actnlist.pas b/lcl/actnlist.pas index b3bf61fbbf..e6cc46fb23 100644 --- a/lcl/actnlist.pas +++ b/lcl/actnlist.pas @@ -26,7 +26,8 @@ unit ActnList; interface uses - Classes, SysUtils, LCLStrConsts, LCLProc, ImgList, LCLClasses, LMessages; + Classes, SysUtils, FPCAdds, + LCLStrConsts, LCLProc, ImgList, LCLClasses, LMessages; type diff --git a/lcl/buttons.pp b/lcl/buttons.pp index 588a3a7b60..710861b342 100644 --- a/lcl/buttons.pp +++ b/lcl/buttons.pp @@ -38,8 +38,8 @@ interface {$endif} uses - Classes, SysUtils, LCLType, LCLProc, LCLIntf, LCLStrConsts, GraphType, - Graphics, ImgList, ActnList, Controls, StdCtrls, lMessages, Forms, + Classes, SysUtils, FPCAdds, LCLType, LCLProc, LCLIntf, LCLStrConsts, + GraphType, Graphics, ImgList, ActnList, Controls, StdCtrls, lMessages, Forms, Menus {for ShortCut procedures}; type @@ -387,6 +387,9 @@ end. { ============================================================================= $Log$ + Revision 1.87 2005/02/08 21:46:22 vincents + fixed fpc 1.0.x compilation + Revision 1.86 2005/01/14 00:27:05 mattias fixed several dialogs to react on esacpe diff --git a/lcl/controls.pp b/lcl/controls.pp index 2acf5aa60f..b5d2533b51 100644 --- a/lcl/controls.pp +++ b/lcl/controls.pp @@ -40,9 +40,9 @@ interface {$ENDIF} uses - Classes, SysUtils, TypInfo, DynHashArray, LCLStrConsts, LCLType, LCLProc, - GraphType, Graphics, LMessages, LCLIntf, InterfaceBase, ImgList, UTrace, - PropertyStorage, Menus, ActnList, LCLClasses; + Classes, SysUtils, TypInfo, FPCAdds, DynHashArray, LCLStrConsts, LCLType, + LCLProc, GraphType, Graphics, LMessages, LCLIntf, InterfaceBase, ImgList, + UTrace, PropertyStorage, Menus, ActnList, LCLClasses; const @@ -2899,6 +2899,9 @@ end. { ============================================================================= $Log$ + Revision 1.281 2005/02/08 21:46:22 vincents + fixed fpc 1.0.x compilation + Revision 1.280 2005/02/05 16:09:52 marc * first 64bit changes diff --git a/lcl/forms.pp b/lcl/forms.pp index 11814d1790..9e589ed714 100644 --- a/lcl/forms.pp +++ b/lcl/forms.pp @@ -55,7 +55,7 @@ interface {$ENDIF} uses - Classes, SysUtils, Math, LCLStrConsts, LCLType, LCLProc, LCLIntf, + Classes, SysUtils, Math, FPCAdds, LCLStrConsts, LCLType, LCLProc, LCLIntf, InterfaceBase, LResources, GraphType, Graphics, Menus, LMessages, CustomTimer, ActnList, ClipBrd, CustApp, LCLClasses, Controls; @@ -1241,6 +1241,8 @@ end; procedure ExceptionOccurred(Sender: TObject; Addr,Frame: Pointer); {$ELSE} procedure ExceptionOccurred(Sender: TObject; Addr:Pointer; FrameCount:Longint; Frames: PPointer); +var + FrameNumber: integer; {$ENDIF} Begin DebugLn('[FORMS.PP] ExceptionOccurred '); @@ -1250,6 +1252,11 @@ Begin DebugLn(' Sender=',Sender.ClassName); if Sender is Exception then begin DebugLn(' Exception=',Exception(Sender).Message); +{$IFNDEF ExceptionHasNoFrames} + DebugLn(' Stack trace:'); + for FrameNumber := 0 to FrameCount-1 do + DebugLn(BackTraceStrFunc(Frames[FrameNumber])); +{$ENDIF} end; end else DebugLn(' Sender=nil'); diff --git a/lcl/fpcadds.pas b/lcl/fpcadds.pas index 045a3b35bd..bcb30a26ea 100644 --- a/lcl/fpcadds.pas +++ b/lcl/fpcadds.pas @@ -37,6 +37,7 @@ type {$IFDEF VER1_0} PCardinal = ^Cardinal; PtrInt = Longint; + PtrUInt = Cardinal; {$ENDIF} PHandle = ^THandle; diff --git a/lcl/grids.pas b/lcl/grids.pas index 0675152ce1..4fb81797ed 100644 --- a/lcl/grids.pas +++ b/lcl/grids.pas @@ -41,7 +41,7 @@ unit Grids; interface uses - Classes, SysUtils, LCLStrConsts, LCLProc, LCLType, LCLIntf, Controls, + Classes, SysUtils, FPCAdds, LCLStrConsts, LCLProc, LCLType, LCLIntf, Controls, GraphType, Graphics, Forms, DynamicArray, LMessages, XMLCfg, StdCtrls, LResources, MaskEdit, Buttons; diff --git a/lcl/lcltype.pp b/lcl/lcltype.pp index ba874e82e3..9adf6b2a76 100644 --- a/lcl/lcltype.pp +++ b/lcl/lcltype.pp @@ -52,7 +52,7 @@ uses {$ifdef win32} windows, {$endif win32} - Classes, SysUtils; + Classes, SysUtils, FPCAdds; type {$IFDEF USE_UTF8BIDI_LCL} @@ -2320,6 +2320,9 @@ end. { $Log$ + Revision 1.76 2005/02/08 21:46:23 vincents + fixed fpc 1.0.x compilation + Revision 1.75 2005/02/05 16:09:52 marc * first 64bit changes diff --git a/lcl/lmessages.pp b/lcl/lmessages.pp index a125843052..6888490502 100644 --- a/lcl/lmessages.pp +++ b/lcl/lmessages.pp @@ -29,7 +29,7 @@ unit LMessages; interface -uses Classes, SysUtils, LCLType, GraphType +uses Classes, SysUtils, FPCAdds, LCLType, GraphType {$ifdef win32} {$ifndef ver1_0} ,messages @@ -807,6 +807,9 @@ end. { $Log$ + Revision 1.126 2005/02/08 21:46:23 vincents + fixed fpc 1.0.x compilation + Revision 1.125 2005/02/05 16:09:52 marc * first 64bit changes