From a69a5639ede5290b4c9a23db85c61b228c325385 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 3 Nov 2003 16:57:47 +0000 Subject: [PATCH] * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with fpc 1.9.x git-svn-id: trunk@4754 - --- components/codetools/memcheck.pas | 6 +++++- ide/customformeditor.pp | 2 +- ide/include/freebsd/lazconf.inc | 6 +++++- ide/include/linux/lazconf.inc | 6 +++++- ide/include/netbsd/lazconf.inc | 6 +++++- lcl/controls.pp | 8 ++++++-- lcl/graphics.pp | 20 ++++++++++++-------- lcl/grids.pas | 4 ++-- lcl/include/canvas.inc | 14 +++++++++----- lcl/include/filectrl.inc | 6 +++++- lcl/interfaces/gtk/gtkwinapiwindow.pp | 12 ++++++++---- lcl/interfaces/win32/win32callback.inc | 6 +++++- lcl/lcltype.pp | 6 +++++- lcl/postscriptprinter.pas | 16 ++++++++-------- lcl/utrace.pp | 2 +- 15 files changed, 82 insertions(+), 38 deletions(-) diff --git a/components/codetools/memcheck.pas b/components/codetools/memcheck.pas index 9cad87baff..6c84d63a21 100644 --- a/components/codetools/memcheck.pas +++ b/components/codetools/memcheck.pas @@ -1277,7 +1277,7 @@ end. {$endif} //============================================================================== -{$ifdef VER1_1} +{$IFNDEF VER1_0} {$goto on} @@ -2567,6 +2567,10 @@ end. { $Log$ + Revision 1.25 2003/11/03 16:57:47 peter + * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with + fpc 1.9.x + Revision 1.24 2003/10/30 21:41:11 mattias replaced NEW1_1 defines diff --git a/ide/customformeditor.pp b/ide/customformeditor.pp index 5d58b269f4..27de369dae 100644 --- a/ide/customformeditor.pp +++ b/ide/customformeditor.pp @@ -1189,7 +1189,7 @@ begin Result:=AClassName; if (length(Result)>1) and (Result[1]='T') then Result:=RightStr(Result,length(Result)-1); - {$IfNDef VER1_1} + {$IfDef VER1_0} //make it more presentable Result := Result[1] + lowercase(Copy(Result,2,length(Result))); {$EndIf} diff --git a/ide/include/freebsd/lazconf.inc b/ide/include/freebsd/lazconf.inc index 5db89786be..2fe675df84 100644 --- a/ide/include/freebsd/lazconf.inc +++ b/ide/include/freebsd/lazconf.inc @@ -29,7 +29,7 @@ {Should become unit Unix in the future. For both Linux and FreeBSD} uses - {$IFDEF VER1_1} + {$IFNDEF VER1_0} unix; {$ELSE} linux; @@ -39,6 +39,10 @@ uses { $Log$ + Revision 1.12 2003/11/03 16:57:47 peter + * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with + fpc 1.9.x + Revision 1.11 2003/08/15 14:01:20 mattias combined lazconf things for unix diff --git a/ide/include/linux/lazconf.inc b/ide/include/linux/lazconf.inc index cf4993cc23..7752384c7f 100644 --- a/ide/include/linux/lazconf.inc +++ b/ide/include/linux/lazconf.inc @@ -27,7 +27,7 @@ *************************************************************************** } uses - {$IFDEF VER1_1} + {$IFNDEF VER1_0} unix,BaseUnix; {$ELSE} linux; @@ -39,6 +39,10 @@ uses { $Log$ + Revision 1.16 2003/11/03 16:57:47 peter + * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with + fpc 1.9.x + Revision 1.15 2003/10/31 14:25:59 mazen * Fixing VER1_1 compile problem to allow using 1.1 compiler * Most of oldlinux unit calls are now in BaseUnix unit with prefix Fp diff --git a/ide/include/netbsd/lazconf.inc b/ide/include/netbsd/lazconf.inc index 481844bee0..e299e70955 100644 --- a/ide/include/netbsd/lazconf.inc +++ b/ide/include/netbsd/lazconf.inc @@ -28,7 +28,7 @@ } {Should become unit Unix in the future. For both Linux and FreeBSD} -uses +IFNDEF VER1_0 {$IFDEF VER1_1} unix; {$ELSE} @@ -39,6 +39,10 @@ uses { $Log$ + Revision 1.9 2003/11/03 16:57:47 peter + * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with + fpc 1.9.x + Revision 1.8 2003/08/15 14:01:20 mattias combined lazconf things for unix diff --git a/lcl/controls.pp b/lcl/controls.pp index 64ac19fbc2..1ab5f902ec 100644 --- a/lcl/controls.pp +++ b/lcl/controls.pp @@ -836,8 +836,8 @@ type destructor Destroy; override; procedure Dock(NewDockSite: TWinControl; ARect: TRect); dynamic; function ManualDock(NewDockSite: TWinControl; - DropControl: TControl {$IFDEF VER1_1}= nil{$ENDIF}; - ControlSide: TAlign {$IFDEF VER1_1}= alNone{$ENDIF}): Boolean; + DropControl: TControl {$IFNDEF VER1_0}= nil{$ENDIF}; + ControlSide: TAlign {$IFNDEF VER1_0}= alNone{$ENDIF}): Boolean; function ManualFloat(ScreenPos: TRect): Boolean; function ReplaceDockedControl(Control: TControl; NewDockSite: TWinControl; DropControl: TControl; ControlSide: TAlign): Boolean; @@ -1847,6 +1847,10 @@ end. { ============================================================================= $Log$ + Revision 1.157 2003/11/03 16:57:47 peter + * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with + fpc 1.9.x + Revision 1.156 2003/10/16 19:43:44 ajgenius disable Buffering in TWinControl.WM_PAINT diff --git a/lcl/graphics.pp b/lcl/graphics.pp index 84baef1cb1..8652bb7002 100644 --- a/lcl/graphics.pp +++ b/lcl/graphics.pp @@ -728,22 +728,22 @@ type procedure Pie(EllipseX1,EllipseY1,EllipseX2,EllipseY2, StartX,StartY,EndX,EndY: Integer); procedure PolyBezier(Points: PPoint; NumPts: Integer; - Filled: boolean{$IFDEF VER1_1} = False{$ENDIF}; - Continuous: boolean{$IFDEF VER1_1} = False{$ENDIF}); + Filled: boolean{$IFNDEF VER1_0} = False{$ENDIF}; + Continuous: boolean{$IFNDEF VER1_0} = False{$ENDIF}); procedure PolyBezier(const Points: array of TPoint; - Filled: boolean{$IFDEF VER1_1} = False{$ENDIF}; - Continuous: boolean{$IFDEF VER1_1} = False{$ENDIF}); + Filled: boolean{$IFNDEF VER1_0} = False{$ENDIF}; + Continuous: boolean{$IFNDEF VER1_0} = False{$ENDIF}); procedure PolyBezier(const Points: array of TPoint); procedure Polygon(const Points: array of TPoint; Winding: Boolean; - StartIndex: Integer{$IFDEF VER1_1} = 0{$ENDIF}; - NumPts: Integer {$IFDEF VER1_1} = -1{$ENDIF}); + StartIndex: Integer{$IFNDEF VER1_0} = 0{$ENDIF}; + NumPts: Integer {$IFNDEF VER1_0} = -1{$ENDIF}); procedure Polygon(Points: PPoint; NumPts: Integer; - Winding: boolean{$IFDEF VER1_1} = False{$ENDIF}); + Winding: boolean{$IFNDEF VER1_0} = False{$ENDIF}); Procedure Polygon(const Points: array of TPoint); procedure Polyline(const Points: array of TPoint; StartIndex: Integer; - NumPts: Integer {$IFDEF VER1_1} = -1{$ENDIF}); + NumPts: Integer {$IFNDEF VER1_0} = -1{$ENDIF}); procedure Polyline(Points: PPoint; NumPts: Integer); procedure Polyline(const Points: array of TPoint); Procedure Rectangle(X1,Y1,X2,Y2 : Integer); @@ -1259,6 +1259,10 @@ end. { ============================================================================= $Log$ + Revision 1.96 2003/11/03 16:57:47 peter + * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with + fpc 1.9.x + Revision 1.95 2003/10/30 21:26:23 mattias removed some hints diff --git a/lcl/grids.pas b/lcl/grids.pas index 145048b185..98922157c2 100644 --- a/lcl/grids.pas +++ b/lcl/grids.pas @@ -226,8 +226,8 @@ type end; type - TGridCoord = {$IFNDEF VER1_1}type{$ENDIF} TPoint; - TGridRect = {$IFNDEF VER1_1}type{$ENDIF} TRect; + TGridCoord = TPoint; + TGridRect = TRect; TGridDataCache=record FixedWidth: Integer; // Sum( Fixed ColsWidths[i] ) diff --git a/lcl/include/canvas.inc b/lcl/include/canvas.inc index c3785b534a..5258c6ce09 100644 --- a/lcl/include/canvas.inc +++ b/lcl/include/canvas.inc @@ -381,8 +381,8 @@ end; ------------------------------------------------------------------------------} procedure TCanvas.PolyBezier(const Points: array of TPoint; - Filled: boolean{$IFDEF VER1_1} = False{$ENDIF}; - Continuous: boolean{$IFDEF VER1_1} = False{$ENDIF}); + Filled: boolean{$IFNDEF VER1_0} = False{$ENDIF}; + Continuous: boolean{$IFNDEF VER1_0} = False{$ENDIF}); var NPoints, i: integer; PointArray: ^TPoint; begin @@ -398,8 +398,8 @@ begin end; procedure TCanvas.PolyBezier(Points: PPoint; NumPts: Integer; - Filled: boolean{$IFDEF VER1_1} = False{$ENDIF}; - Continuous: boolean{$IFDEF VER1_1} = False{$ENDIF}); + Filled: boolean{$IFNDEF VER1_0} = False{$ENDIF}; + Continuous: boolean{$IFNDEF VER1_0} = False{$ENDIF}); begin Changing; RequiredState([csHandleValid, csBrushValid, csPenValid]); @@ -455,7 +455,7 @@ begin end; procedure TCanvas.Polygon(Points: PPoint; NumPts: Integer; - Winding: boolean{$IFDEF VER1_1} = False{$ENDIF}); + Winding: boolean{$IFNDEF VER1_0} = False{$ENDIF}); begin if NumPts<=0 then exit; Changing; @@ -1236,6 +1236,10 @@ end; { ============================================================================= $Log$ + Revision 1.54 2003/11/03 16:57:47 peter + * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with + fpc 1.9.x + Revision 1.53 2003/09/18 09:21:03 mattias renamed LCLLinux to LCLIntf diff --git a/lcl/include/filectrl.inc b/lcl/include/filectrl.inc index 35a24b364e..29c312ce93 100644 --- a/lcl/include/filectrl.inc +++ b/lcl/include/filectrl.inc @@ -723,7 +723,7 @@ begin Result:=ParamStr(0); if ExtractFilePath(Result)='' then begin // program was started via PATH - Result:=SearchFileInPath(Result,'',{$IFDEF Ver1_0}GetEnv{$ELSE}FpGetEnv{$ENDIF}('PATH'),':', + Result:=SearchFileInPath(Result,'',{$IFDEF Ver1_0}GetEnv{$ELSE}{$ifdef Unix}FpGetEnv{$else}GetEnv{$endif}{$ENDIF}('PATH'),':', [sffDontSearchInBasePath]); end; // resolve links @@ -894,6 +894,10 @@ end; { $Log$ + Revision 1.33 2003/11/03 16:57:47 peter + * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with + fpc 1.9.x + Revision 1.32 2003/11/01 10:27:41 mattias fpc 1.1 fixes, started scrollbar hiding, started polymorphing client areas diff --git a/lcl/interfaces/gtk/gtkwinapiwindow.pp b/lcl/interfaces/gtk/gtkwinapiwindow.pp index 1e80faac1d..4a2d00141e 100644 --- a/lcl/interfaces/gtk/gtkwinapiwindow.pp +++ b/lcl/interfaces/gtk/gtkwinapiwindow.pp @@ -301,7 +301,7 @@ end; procedure GTKAPIWidgetClient_ClassInit(theClass: Pointer);cdecl; // theClass: PGTKAPIWidgetClientClass -{$IFDEF VER1_1} +{$IFNDEF VER1_0} type TAdjustParams = packed record Param1, Param2: TGtkType; @@ -315,7 +315,7 @@ var WidgetClass: PGTKWidgetClass; ClientClass: PGTKAPIWidgetClientClass; SignalID: Guint; -{$IFDEF VER1_1} +{$IFNDEF VER1_0} AdjustParams: TAdjustParams; {$ENDIF} begin @@ -326,7 +326,7 @@ begin WidgetClass := PGTKWidgetClass(theClass); ClientClass := PGTKAPIWidgetClientClass(theClass); - {$IFDEF VER1_1} + {$IFNDEF VER1_0} AdjustParams.Param1 := gtk_adjustment_get_type; AdjustParams.Param2 := AdjustParams.Param1; SignalID := gtk_signal_newv( @@ -348,7 +348,7 @@ begin {$ENDIF} GTK_TYPE_NONE, 2, - {$IFDEF VER1_1} + {$IFNDEF VER1_0} @AdjustParams {$ELSE} [gtk_adjustment_get_type, gtk_adjustment_get_type] @@ -937,6 +937,10 @@ end. { ============================================================================= $Log$ + Revision 1.50 2003/11/03 16:57:47 peter + * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with + fpc 1.9.x + Revision 1.49 2003/09/17 19:40:46 ajgenius Initial DoubleBuffering Support for GTK2 diff --git a/lcl/interfaces/win32/win32callback.inc b/lcl/interfaces/win32/win32callback.inc index f91a6bd186..d59b97cd5c 100644 --- a/lcl/interfaces/win32/win32callback.inc +++ b/lcl/interfaces/win32/win32callback.inc @@ -95,7 +95,7 @@ Var NotifyUserInput: Boolean; PrevWndProc: Pointer; NewPos: Integer; //Used by TScrollingWindow - {$IFDEF Ver1_1} + {$IFNDEF VER1_0} List: TMsgArray; C: integer; {$ENDIF} @@ -888,6 +888,10 @@ end; { $Log$ + Revision 1.66 2003/11/03 16:57:47 peter + * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with + fpc 1.9.x + Revision 1.65 2003/10/21 15:06:27 micha spinedit fix; variables cleanup diff --git a/lcl/lcltype.pp b/lcl/lcltype.pp index f150de0dda..78b6375e09 100644 --- a/lcl/lcltype.pp +++ b/lcl/lcltype.pp @@ -1831,7 +1831,7 @@ const type TShortCut = Low(Word)..High(Word); {should be moved to classes} -{$IFDEF VER1_1} +{$IFNDEF VER1_0} type TRTLCriticalSection = pointer; {$ENDIF} @@ -1875,6 +1875,10 @@ end. { $Log$ + Revision 1.48 2003/11/03 16:57:47 peter + * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with + fpc 1.9.x + Revision 1.47 2003/10/30 18:25:18 mattias fixed keymapping for irregular keys diff --git a/lcl/postscriptprinter.pas b/lcl/postscriptprinter.pas index 2a9cd79d19..68ad210ef1 100644 --- a/lcl/postscriptprinter.pas +++ b/lcl/postscriptprinter.pas @@ -175,18 +175,18 @@ type //procedure Chord(x,y,width,height,angle1,angle2 : Integer); //procedure Chord(x,y,width,height,SX,SY,EX,EY : Integer); //procedure PolyBezier(Points: PPoint; NumPts: Integer; - // Filled: boolean{$IFDEF VER1_1} = False{$ENDIF}; - // Continuous: boolean{$IFDEF VER1_1} = False{$ENDIF}); + // Filled: boolean{$IFNDEF VER1_0} = False{$ENDIF}; + // Continuous: boolean{$IFNDEF VER1_0} = False{$ENDIF}); //procedure PolyBezier(const Points: array of TPoint; - // Filled: boolean{$IFDEF VER1_1} = False{$ENDIF}; - // Continuous: boolean{$IFDEF VER1_1} = False{$ENDIF}); + // Filled: boolean{$IFNDEF VER1_0} = False{$ENDIF}; + // Continuous: boolean{$IFNDEF VER1_0} = False{$ENDIF}); //procedure PolyBezier(const Points: array of TPoint); //procedure Polygon(const Points: array of TPoint; - // Winding: Boolean{$IFDEF VER1_1} = False{$ENDIF}; - // StartIndex: Integer{$IFDEF VER1_1} = 0{$ENDIF}; - // NumPts: Integer {$IFDEF VER1_1} = -1{$ENDIF}); + // Winding: Boolean{$IFNDEF VER1_0} = False{$ENDIF}; + // StartIndex: Integer{$IFNDEF VER1_0} = 0{$ENDIF}; + // NumPts: Integer {$IFNDEF VER1_0} = -1{$ENDIF}); //procedure Polygon(Points: PPoint; NumPts: Integer; - // Winding: boolean{$IFDEF VER1_1} = False{$ENDIF}); + // Winding: boolean{$IFNDEF VER1_0} = False{$ENDIF}); //Procedure Polygon(const Points: array of TPoint); //Procedure FillRect(const Rect : TRect); //procedure FloodFill(X, Y: Integer; FillColor: TColor; FillStyle: TFillStyle); diff --git a/lcl/utrace.pp b/lcl/utrace.pp index 66d15347f2..2f61bd89fb 100644 --- a/lcl/utrace.pp +++ b/lcl/utrace.pp @@ -22,7 +22,7 @@ interface uses sysutils; type - TAssertErrorAddrType = {$IFDEF VER1_1}Pointer{$ELSE}Longint{$ENDIF}; + TAssertErrorAddrType = {$IFNDEF VER1_0}Pointer{$ELSE}Longint{$ENDIF}; TAssertErrorProc = procedure(Const Msg,FN :ShortString; LineNo: LongInt; TheAddr: TAssertErrorAddrType);