paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 06:57:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

components: remove ver2_2_x defines

Browse Source 
git-svn-id: trunk@36369 -
This commit is contained in:
paul 2012-03-27 07:19:05 +00:00
parent 880401dbb8
commit 223ba36920
10 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/codetools/ppugraph.pas
View File

@ -476,11 +476,7 @@ var
RegisterFPLibProcName: String;
begin
Result:=true;
{$IFDEF VER2_2_0}
LibName:=Name+'.so';
{$ELSE}
LibName:=Name+'.'+SharedSuffix;
{$ENDIF}
// needed groups in topological order
if Groups.GroupGraph.GetGraphNode(KeyNode,false)=nil then
raise Exception.Create('inconsistency');

8
components/fpweb/weblazideintf.pp
View File

@ -19,9 +19,7 @@
{$H+}
unit WebLazIDEIntf;
{$IFNDEF VER2_2}
{$DEFINE HasFastCGISupport}
{$ENDIF VER2_2}
{$DEFINE HasFastCGISupport}
interface
@ -156,8 +154,8 @@ begin
RegisterComponents(fpWebTab,[THTMLDatasetContentProducer,
THTMLSelectProducer,
THTMLDatasetSelectProducer,
THTMLEntityProducer
{$IFNDEF VER2_2},THTMLPageProducer{$ENDIF}
THTMLEntityProducer,
THTMLPageProducer
])
end;

8
components/lazutils/laz_xmlstreaming.pas
View File

@ -23,13 +23,7 @@ unit Laz_XMLStreaming;
{$H+}
{$DEFINE HasReadWriteBuf}
{$IF defined(VER2_2_0)}
{$UNDEF HasReadWriteBuf}
{$ENDIF}
{$IF (FPC_VERSION = 2) AND (FPC_RELEASE >= 3)}
{$DEFINE USE_NEW_READER_WRITER}
{$IFEND}
{$DEFINE USE_NEW_READER_WRITER}
interface

4
components/lazutils/unixfileutil.inc
View File

@ -394,11 +394,7 @@ end;
function ExtractShortPathNameUTF8(const FileName: String): String;
begin
{$ifdef ver2_2_0}
Result := '';
{$else}
Result:=SysToUTF8(SysUtils.ExtractShortPathName(UTF8ToSys(FileName)));
{$endif}
end;
procedure InitFileUtils;

2
components/opengl/glgtkglxcontext.pas
View File

@ -571,7 +571,7 @@ begin
GDK_WINDOW_XWINDOW(drawable),
{$ENDIF}
PrivateContext^.glxcontext)
{$IFDEF VER2_2}=true{$ENDIF});
);
end;
procedure gdk_gl_swap_buffers(drawable: PGdkDrawable);

4
components/paradox/regparadox.pp
View File

@ -16,10 +16,6 @@ unit regparadox;
{$mode objfpc}{$H+}
{$IF defined(VER2_2_0)}
{$ERROR this package requires at least fpc 2.2.1}
{$ENDIF}
interface
uses

5
components/plotfunction/regplotpanel.pp
View File

@ -7,9 +7,7 @@ interface
uses
Classes, SysUtils,
plotpanel,
{$IFNDEF VER2_2}
exprplotpanel,
{$ENDIF VER2_2}
lresources;
Procedure Register;
@ -19,8 +17,7 @@ implementation
Procedure Register;
begin
Classes.RegisterComponents('Misc',[TPlotFunctionPanel
{$IFNDEF VER2_2},TPlotExpressionPanel{$ENDIF VER2_2}]);
Classes.RegisterComponents('Misc',[TPlotFunctionPanel, TPlotExpressionPanel]);
end;
initialization

4
components/printers/carbon/carbonprinters_h.inc
View File

@ -1,10 +1,6 @@
{%MainUnit ../osprinters.pas}
uses
{$ifdef ver2_2_0}
FPCMacOSAll,
{$else}
MacOSAll,
{$endif}
Classes, SysUtils, Printers, LCLType, CarbonCanvas, CarbonPrinting;
type

4
components/printers/carbon/carbonprinting.pas
View File

@ -11,11 +11,7 @@ interface
uses
Classes, SysUtils,
{$ifdef ver2_2_0}
FPCMacOSAll;
{$else}
MacOSAll;
{$endif}
// functions missing in MacOSAll
type

4
components/printers/printersdlgs.pp
View File

@ -85,11 +85,7 @@ uses Controls, udlgSelectPrinter, udlgPropertiesPrinter, FileUtil;
uses
Controls, Math, CarbonProc,
{$ifdef ver2_2_0}
FPCMacOSAll,
{$else}
MacOSAll,
{$endif}
LCLProc;
{$I carbonprndialogs.inc}