paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-30 00:22:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

* change $ifdef ver1_1 to $ifndef ver1_0 so it works also with

Browse Source 
fpc 1.9.x

git-svn-id: trunk@4754 -
This commit is contained in:
peter 2003-11-03 16:57:47 +00:00
parent 65e03eb325
commit a69a5639ed
15 changed files with 82 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/codetools/memcheck.pas
View File

@ -1277,7 +1277,7 @@ end.
{$endif} {$endif}
//============================================================================== //==============================================================================
{$ifdef VER1_1} {$IFNDEF VER1_0}
{$goto on} {$goto on}
@ -2567,6 +2567,10 @@ end.
{ {
$Log$ $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 Revision 1.24 2003/10/30 21:41:11 mattias
replaced NEW1_1 defines replaced NEW1_1 defines

2
ide/customformeditor.pp
View File

@ -1189,7 +1189,7 @@ begin
Result:=AClassName; Result:=AClassName;
if (length(Result)>1) and (Result[1]='T') then if (length(Result)>1) and (Result[1]='T') then
Result:=RightStr(Result,length(Result)-1); Result:=RightStr(Result,length(Result)-1);
{$IfNDef VER1_1} {$IfDef VER1_0}
//make it more presentable //make it more presentable
Result := Result[1] + lowercase(Copy(Result,2,length(Result))); Result := Result[1] + lowercase(Copy(Result,2,length(Result)));
{$EndIf} {$EndIf}

6
ide/include/freebsd/lazconf.inc
View File

@ -29,7 +29,7 @@
{Should become unit Unix in the future. For both Linux and FreeBSD} {Should become unit Unix in the future. For both Linux and FreeBSD}
uses uses
{$IFDEF VER1_1} {$IFNDEF VER1_0}
unix; unix;
{$ELSE} {$ELSE}
linux; linux;
@ -39,6 +39,10 @@ uses
{ {
$Log$ $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 Revision 1.11 2003/08/15 14:01:20 mattias
combined lazconf things for unix combined lazconf things for unix

6
ide/include/linux/lazconf.inc
View File

@ -27,7 +27,7 @@
*************************************************************************** ***************************************************************************
} }
uses uses
{$IFDEF VER1_1} {$IFNDEF VER1_0}
unix,BaseUnix; unix,BaseUnix;
{$ELSE} {$ELSE}
linux; linux;
@ -39,6 +39,10 @@ uses
{ {
$Log$ $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 Revision 1.15 2003/10/31 14:25:59 mazen
* Fixing VER1_1 compile problem to allow using 1.1 compiler * Fixing VER1_1 compile problem to allow using 1.1 compiler
* Most of oldlinux unit calls are now in BaseUnix unit with prefix Fp * Most of oldlinux unit calls are now in BaseUnix unit with prefix Fp

6
ide/include/netbsd/lazconf.inc
View File

@ -28,7 +28,7 @@
} }
{Should become unit Unix in the future. For both Linux and FreeBSD} {Should become unit Unix in the future. For both Linux and FreeBSD}
uses IFNDEF VER1_0
{$IFDEF VER1_1} {$IFDEF VER1_1}
unix; unix;
{$ELSE} {$ELSE}
@ -39,6 +39,10 @@ uses
{ {
$Log$ $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 Revision 1.8 2003/08/15 14:01:20 mattias
combined lazconf things for unix combined lazconf things for unix

8
lcl/controls.pp
View File

@ -836,8 +836,8 @@ type
destructor Destroy; override; destructor Destroy; override;
procedure Dock(NewDockSite: TWinControl; ARect: TRect); dynamic; procedure Dock(NewDockSite: TWinControl; ARect: TRect); dynamic;
function ManualDock(NewDockSite: TWinControl; function ManualDock(NewDockSite: TWinControl;
DropControl: TControl {$IFDEF VER1_1}= nil{$ENDIF}; DropControl: TControl {$IFNDEF VER1_0}= nil{$ENDIF};
ControlSide: TAlign {$IFDEF VER1_1}= alNone{$ENDIF}): Boolean; ControlSide: TAlign {$IFNDEF VER1_0}= alNone{$ENDIF}): Boolean;
function ManualFloat(ScreenPos: TRect): Boolean; function ManualFloat(ScreenPos: TRect): Boolean;
function ReplaceDockedControl(Control: TControl; NewDockSite: TWinControl; function ReplaceDockedControl(Control: TControl; NewDockSite: TWinControl;
DropControl: TControl; ControlSide: TAlign): Boolean; DropControl: TControl; ControlSide: TAlign): Boolean;
@ -1847,6 +1847,10 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $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 Revision 1.156 2003/10/16 19:43:44 ajgenius
disable Buffering in TWinControl.WM_PAINT disable Buffering in TWinControl.WM_PAINT

20
lcl/graphics.pp
View File

@ -728,22 +728,22 @@ type
procedure Pie(EllipseX1,EllipseY1,EllipseX2,EllipseY2, procedure Pie(EllipseX1,EllipseY1,EllipseX2,EllipseY2,
StartX,StartY,EndX,EndY: Integer); StartX,StartY,EndX,EndY: Integer);
procedure PolyBezier(Points: PPoint; NumPts: Integer; procedure PolyBezier(Points: PPoint; NumPts: Integer;
Filled: boolean{$IFDEF VER1_1} = False{$ENDIF}; Filled: boolean{$IFNDEF VER1_0} = False{$ENDIF};
Continuous: boolean{$IFDEF VER1_1} = False{$ENDIF}); Continuous: boolean{$IFNDEF VER1_0} = False{$ENDIF});
procedure PolyBezier(const Points: array of TPoint; procedure PolyBezier(const Points: array of TPoint;
Filled: boolean{$IFDEF VER1_1} = False{$ENDIF}; Filled: boolean{$IFNDEF VER1_0} = False{$ENDIF};
Continuous: boolean{$IFDEF VER1_1} = False{$ENDIF}); Continuous: boolean{$IFNDEF VER1_0} = False{$ENDIF});
procedure PolyBezier(const Points: array of TPoint); procedure PolyBezier(const Points: array of TPoint);
procedure Polygon(const Points: array of TPoint; procedure Polygon(const Points: array of TPoint;
Winding: Boolean; Winding: Boolean;
StartIndex: Integer{$IFDEF VER1_1} = 0{$ENDIF}; StartIndex: Integer{$IFNDEF VER1_0} = 0{$ENDIF};
NumPts: Integer {$IFDEF VER1_1} = -1{$ENDIF}); NumPts: Integer {$IFNDEF VER1_0} = -1{$ENDIF});
procedure Polygon(Points: PPoint; NumPts: Integer; 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 Polygon(const Points: array of TPoint);
procedure Polyline(const Points: array of TPoint; procedure Polyline(const Points: array of TPoint;
StartIndex: Integer; StartIndex: Integer;
NumPts: Integer {$IFDEF VER1_1} = -1{$ENDIF}); NumPts: Integer {$IFNDEF VER1_0} = -1{$ENDIF});
procedure Polyline(Points: PPoint; NumPts: Integer); procedure Polyline(Points: PPoint; NumPts: Integer);
procedure Polyline(const Points: array of TPoint); procedure Polyline(const Points: array of TPoint);
Procedure Rectangle(X1,Y1,X2,Y2 : Integer); Procedure Rectangle(X1,Y1,X2,Y2 : Integer);
@ -1259,6 +1259,10 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $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 Revision 1.95 2003/10/30 21:26:23 mattias
removed some hints removed some hints

4
lcl/grids.pas
View File

@ -226,8 +226,8 @@ type
end; end;
type type
TGridCoord = {$IFNDEF VER1_1}type{$ENDIF} TPoint; TGridCoord = TPoint;
TGridRect = {$IFNDEF VER1_1}type{$ENDIF} TRect; TGridRect = TRect;
TGridDataCache=record TGridDataCache=record
FixedWidth: Integer; // Sum( Fixed ColsWidths[i] ) FixedWidth: Integer; // Sum( Fixed ColsWidths[i] )

14
lcl/include/canvas.inc
View File

@ -381,8 +381,8 @@ end;
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure TCanvas.PolyBezier(const Points: array of TPoint; procedure TCanvas.PolyBezier(const Points: array of TPoint;
Filled: boolean{$IFDEF VER1_1} = False{$ENDIF}; Filled: boolean{$IFNDEF VER1_0} = False{$ENDIF};
Continuous: boolean{$IFDEF VER1_1} = False{$ENDIF}); Continuous: boolean{$IFNDEF VER1_0} = False{$ENDIF});
var NPoints, i: integer; var NPoints, i: integer;
PointArray: ^TPoint; PointArray: ^TPoint;
begin begin
@ -398,8 +398,8 @@ begin
end; end;
procedure TCanvas.PolyBezier(Points: PPoint; NumPts: Integer; procedure TCanvas.PolyBezier(Points: PPoint; NumPts: Integer;
Filled: boolean{$IFDEF VER1_1} = False{$ENDIF}; Filled: boolean{$IFNDEF VER1_0} = False{$ENDIF};
Continuous: boolean{$IFDEF VER1_1} = False{$ENDIF}); Continuous: boolean{$IFNDEF VER1_0} = False{$ENDIF});
begin begin
Changing; Changing;
RequiredState([csHandleValid, csBrushValid, csPenValid]); RequiredState([csHandleValid, csBrushValid, csPenValid]);
@ -455,7 +455,7 @@ begin
end; end;
procedure TCanvas.Polygon(Points: PPoint; NumPts: Integer; procedure TCanvas.Polygon(Points: PPoint; NumPts: Integer;
Winding: boolean{$IFDEF VER1_1} = False{$ENDIF}); Winding: boolean{$IFNDEF VER1_0} = False{$ENDIF});
begin begin
if NumPts<=0 then exit; if NumPts<=0 then exit;
Changing; Changing;
@ -1236,6 +1236,10 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $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 Revision 1.53 2003/09/18 09:21:03 mattias
renamed LCLLinux to LCLIntf renamed LCLLinux to LCLIntf

6
lcl/include/filectrl.inc
View File

@ -723,7 +723,7 @@ begin
Result:=ParamStr(0); Result:=ParamStr(0);
if ExtractFilePath(Result)='' then begin if ExtractFilePath(Result)='' then begin
// program was started via PATH // 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]); [sffDontSearchInBasePath]);
end; end;
// resolve links // resolve links
@ -894,6 +894,10 @@ end;
{ {
$Log$ $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 Revision 1.32 2003/11/01 10:27:41 mattias
fpc 1.1 fixes, started scrollbar hiding, started polymorphing client areas fpc 1.1 fixes, started scrollbar hiding, started polymorphing client areas

12
lcl/interfaces/gtk/gtkwinapiwindow.pp
View File

@ -301,7 +301,7 @@ end;
procedure GTKAPIWidgetClient_ClassInit(theClass: Pointer);cdecl; procedure GTKAPIWidgetClient_ClassInit(theClass: Pointer);cdecl;
// theClass: PGTKAPIWidgetClientClass // theClass: PGTKAPIWidgetClientClass
{$IFDEF VER1_1} {$IFNDEF VER1_0}
type type
TAdjustParams = packed record TAdjustParams = packed record
Param1, Param2: TGtkType; Param1, Param2: TGtkType;
@ -315,7 +315,7 @@ var
WidgetClass: PGTKWidgetClass; WidgetClass: PGTKWidgetClass;
ClientClass: PGTKAPIWidgetClientClass; ClientClass: PGTKAPIWidgetClientClass;
SignalID: Guint; SignalID: Guint;
{$IFDEF VER1_1} {$IFNDEF VER1_0}
AdjustParams: TAdjustParams; AdjustParams: TAdjustParams;
{$ENDIF} {$ENDIF}
begin begin
@ -326,7 +326,7 @@ begin
WidgetClass := PGTKWidgetClass(theClass); WidgetClass := PGTKWidgetClass(theClass);
ClientClass := PGTKAPIWidgetClientClass(theClass); ClientClass := PGTKAPIWidgetClientClass(theClass);
{$IFDEF VER1_1} {$IFNDEF VER1_0}
AdjustParams.Param1 := gtk_adjustment_get_type; AdjustParams.Param1 := gtk_adjustment_get_type;
AdjustParams.Param2 := AdjustParams.Param1; AdjustParams.Param2 := AdjustParams.Param1;
SignalID := gtk_signal_newv( SignalID := gtk_signal_newv(
@ -348,7 +348,7 @@ begin
{$ENDIF} {$ENDIF}
GTK_TYPE_NONE, GTK_TYPE_NONE,
2, 2,
{$IFDEF VER1_1} {$IFNDEF VER1_0}
@AdjustParams @AdjustParams
{$ELSE} {$ELSE}
[gtk_adjustment_get_type, gtk_adjustment_get_type] [gtk_adjustment_get_type, gtk_adjustment_get_type]
@ -937,6 +937,10 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $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 Revision 1.49 2003/09/17 19:40:46 ajgenius
Initial DoubleBuffering Support for GTK2 Initial DoubleBuffering Support for GTK2

6
lcl/interfaces/win32/win32callback.inc
View File

@ -95,7 +95,7 @@ Var
NotifyUserInput: Boolean; NotifyUserInput: Boolean;
PrevWndProc: Pointer; PrevWndProc: Pointer;
NewPos: Integer; //Used by TScrollingWindow NewPos: Integer; //Used by TScrollingWindow
{$IFDEF Ver1_1} {$IFNDEF VER1_0}
List: TMsgArray; List: TMsgArray;
C: integer; C: integer;
{$ENDIF} {$ENDIF}
@ -888,6 +888,10 @@ end;
{ {
$Log$ $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 Revision 1.65 2003/10/21 15:06:27 micha
spinedit fix; variables cleanup spinedit fix; variables cleanup

6
lcl/lcltype.pp
View File

@ -1831,7 +1831,7 @@ const
type type
TShortCut = Low(Word)..High(Word); {should be moved to classes} TShortCut = Low(Word)..High(Word); {should be moved to classes}
{$IFDEF VER1_1} {$IFNDEF VER1_0}
type type
TRTLCriticalSection = pointer; TRTLCriticalSection = pointer;
{$ENDIF} {$ENDIF}
@ -1875,6 +1875,10 @@ end.
{ {
$Log$ $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 Revision 1.47 2003/10/30 18:25:18 mattias
fixed keymapping for irregular keys fixed keymapping for irregular keys

16
lcl/postscriptprinter.pas
View File

@ -175,18 +175,18 @@ type
//procedure Chord(x,y,width,height,angle1,angle2 : Integer); //procedure Chord(x,y,width,height,angle1,angle2 : Integer);
//procedure Chord(x,y,width,height,SX,SY,EX,EY : Integer); //procedure Chord(x,y,width,height,SX,SY,EX,EY : Integer);
//procedure PolyBezier(Points: PPoint; NumPts: Integer; //procedure PolyBezier(Points: PPoint; NumPts: Integer;
// Filled: boolean{$IFDEF VER1_1} = False{$ENDIF}; // Filled: boolean{$IFNDEF VER1_0} = False{$ENDIF};
// Continuous: boolean{$IFDEF VER1_1} = False{$ENDIF}); // Continuous: boolean{$IFNDEF VER1_0} = False{$ENDIF});
//procedure PolyBezier(const Points: array of TPoint; //procedure PolyBezier(const Points: array of TPoint;
// Filled: boolean{$IFDEF VER1_1} = False{$ENDIF}; // Filled: boolean{$IFNDEF VER1_0} = False{$ENDIF};
// Continuous: boolean{$IFDEF VER1_1} = False{$ENDIF}); // Continuous: boolean{$IFNDEF VER1_0} = False{$ENDIF});
//procedure PolyBezier(const Points: array of TPoint); //procedure PolyBezier(const Points: array of TPoint);
//procedure Polygon(const Points: array of TPoint; //procedure Polygon(const Points: array of TPoint;
// Winding: Boolean{$IFDEF VER1_1} = False{$ENDIF}; // Winding: Boolean{$IFNDEF VER1_0} = False{$ENDIF};
// StartIndex: Integer{$IFDEF VER1_1} = 0{$ENDIF}; // StartIndex: Integer{$IFNDEF VER1_0} = 0{$ENDIF};
// NumPts: Integer {$IFDEF VER1_1} = -1{$ENDIF}); // NumPts: Integer {$IFNDEF VER1_0} = -1{$ENDIF});
//procedure Polygon(Points: PPoint; NumPts: Integer; //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 Polygon(const Points: array of TPoint);
//Procedure FillRect(const Rect : TRect); //Procedure FillRect(const Rect : TRect);
//procedure FloodFill(X, Y: Integer; FillColor: TColor; FillStyle: TFillStyle); //procedure FloodFill(X, Y: Integer; FillColor: TColor; FillStyle: TFillStyle);

2
lcl/utrace.pp
View File

@ -22,7 +22,7 @@ interface
uses sysutils; uses sysutils;
type type
TAssertErrorAddrType = {$IFDEF VER1_1}Pointer{$ELSE}Longint{$ENDIF}; TAssertErrorAddrType = {$IFNDEF VER1_0}Pointer{$ELSE}Longint{$ENDIF};
TAssertErrorProc = procedure(Const Msg,FN :ShortString; TAssertErrorProc = procedure(Const Msg,FN :ShortString;
LineNo: LongInt; TheAddr: TAssertErrorAddrType); LineNo: LongInt; TheAddr: TAssertErrorAddrType);