diff --git a/components/pngcomponents/include/Thany.inc b/components/pngcomponents/include/Thany.inc deleted file mode 100644 index 401cb929..00000000 --- a/components/pngcomponents/include/Thany.inc +++ /dev/null @@ -1,242 +0,0 @@ -{$B-} -{$X+} -{$T+} -{$P+} -{$H+} -{$J-} - -{$IFNDEF WIN32} - Thany components do not support 16-bit Windows. -{$ENDIF} - -{$IFDEF VER170} - {$DEFINE THANY_COMPILER_9} - {$IFDEF BCB} - {$DEFINE THANY_CPPB} - {$DEFINE THANY_CPPB_9} - {$ELSE} - {$DEFINE THANY_DELPHI} - {$DEFINE THANY_DELPHI_9} - {$ENDIF} -{$ENDIF} - -{$IFDEF VER150} - {$DEFINE THANY_COMPILER_7} - {$IFDEF BCB} - {$DEFINE THANY_CPPB} - {$DEFINE THANY_CPPB_7} - {$ELSE} - {$DEFINE THANY_DELPHI} - {$DEFINE THANY_DELPHI_7} - {$ENDIF} -{$ENDIF} - -{$IFDEF VER140} - {$DEFINE THANY_COMPILER_6} - {$IFDEF BCB} - {$DEFINE THANY_CPPB} - {$DEFINE THANY_CPPB_6} - {$ELSE} - {$DEFINE THANY_DELPHI} - {$DEFINE THANY_DELPHI_6} - {$ENDIF} -{$ENDIF} - -{$IFDEF VER130} - {$DEFINE THANY_COMPILER_5} - {$IFDEF BCB} - {$DEFINE THANY_CPPB} - {$DEFINE THANY_CPPB_5} - {$ELSE} - {$DEFINE THANY_DELPHI} - {$DEFINE THANY_DELPHI_5} - {$ENDIF} -{$ENDIF} - -{$IFDEF VER125} - {$DEFINE THANY_COMPILER_4} - {$DEFINE THANY_CPPB} - {$DEFINE THANY_CPPB_4} -{$ENDIF} - -{$IFDEF VER120} - {$DEFINE THANY_COMPILER_4} - {$DEFINE THANY_DELPHI} - {$DEFINE THANY_DELPHI_4} -{$ENDIF} - -{$IFDEF VER110} - {$DEFINE THANY_COMPILER_3} - {$DEFINE THANY_CPPB} - {$DEFINE THANY_CPPB_3} -{$ENDIF} - -{$IFDEF VER100} - {$DEFINE THANY_COMPILER_3} - {$DEFINE THANY_DELPHI} - {$DEFINE THANY_DELPHI_3} -{$ENDIF} - -{$IFDEF VER93} - {$DEFINE THANY_COMPILER_2} - {$DEFINE THANY_CPPB} - {$DEFINE THANY_CPPB_1} -{$ENDIF} - -{$IFDEF VER90} - {$DEFINE THANY_COMPILER_2} - {$DEFINE THANY_DELPHI} - {$DEFINE THANY_DELPHI_2} -{$ENDIF} - -{$IFNDEF THANY_CPPB} - {$IFNDEF THANY_DELPHI} - {$DEFINE THANY_UNKNOWN_COMPILER} - {$ENDIF} -{$ENDIF} - -{$IFDEF THANY_COMPILER_2} - {$DEFINE THANY_COMPILER_2_UP} -{$ENDIF} - -{$IFDEF THANY_COMPILER_3} - {$DEFINE THANY_COMPILER_2_UP} - {$DEFINE THANY_COMPILER_3_UP} -{$ENDIF} - -{$IFDEF THANY_COMPILER_4} - {$DEFINE THANY_COMPILER_2_UP} - {$DEFINE THANY_COMPILER_3_UP} - {$DEFINE THANY_COMPILER_4_UP} -{$ENDIF} - -{$IFDEF THANY_COMPILER_5} - {$DEFINE THANY_COMPILER_2_UP} - {$DEFINE THANY_COMPILER_3_UP} - {$DEFINE THANY_COMPILER_4_UP} - {$DEFINE THANY_COMPILER_5_UP} -{$ENDIF} - -{$IFDEF THANY_COMPILER_6} - {$DEFINE THANY_COMPILER_2_UP} - {$DEFINE THANY_COMPILER_3_UP} - {$DEFINE THANY_COMPILER_4_UP} - {$DEFINE THANY_COMPILER_5_UP} - {$DEFINE THANY_COMPILER_6_UP} -{$ENDIF} - -{$IFDEF THANY_COMPILER_7} - {$DEFINE THANY_COMPILER_2_UP} - {$DEFINE THANY_COMPILER_3_UP} - {$DEFINE THANY_COMPILER_4_UP} - {$DEFINE THANY_COMPILER_5_UP} - {$DEFINE THANY_COMPILER_6_UP} - {$DEFINE THANY_COMPILER_7_UP} -{$ENDIF} - -{$IFDEF THANY_COMPILER_9} - {$DEFINE THANY_COMPILER_2_UP} - {$DEFINE THANY_COMPILER_3_UP} - {$DEFINE THANY_COMPILER_4_UP} - {$DEFINE THANY_COMPILER_5_UP} - {$DEFINE THANY_COMPILER_6_UP} - {$DEFINE THANY_COMPILER_7_UP} - {$DEFINE THANY_COMPILER_9_UP} -{$ENDIF} - -{$IFDEF THANY_DELPHI_2} - {$DEFINE THANY_DELPHI_2_UP} -{$ENDIF} - -{$IFDEF THANY_DELPHI_3} - {$DEFINE THANY_DELPHI_2_UP} - {$DEFINE THANY_DELPHI_3_UP} -{$ENDIF} - -{$IFDEF THANY_DELPHI_4} - {$DEFINE THANY_DELPHI_2_UP} - {$DEFINE THANY_DELPHI_3_UP} - {$DEFINE THANY_DELPHI_4_UP} -{$ENDIF} - -{$IFDEF THANY_DELPHI_5} - {$DEFINE THANY_DELPHI_2_UP} - {$DEFINE THANY_DELPHI_3_UP} - {$DEFINE THANY_DELPHI_4_UP} - {$DEFINE THANY_DELPHI_5_UP} -{$ENDIF} - -{$IFDEF THANY_DELPHI_6} - {$DEFINE THANY_DELPHI_2_UP} - {$DEFINE THANY_DELPHI_3_UP} - {$DEFINE THANY_DELPHI_4_UP} - {$DEFINE THANY_DELPHI_5_UP} - {$DEFINE THANY_DELPHI_6_UP} -{$ENDIF} - -{$IFDEF THANY_DELPHI_7} - {$DEFINE THANY_DELPHI_2_UP} - {$DEFINE THANY_DELPHI_3_UP} - {$DEFINE THANY_DELPHI_4_UP} - {$DEFINE THANY_DELPHI_5_UP} - {$DEFINE THANY_DELPHI_6_UP} - {$DEFINE THANY_DELPHI_7_UP} -{$ENDIF} - -{$IFDEF THANY_DELPHI_9} - {$DEFINE THANY_DELPHI_2_UP} - {$DEFINE THANY_DELPHI_3_UP} - {$DEFINE THANY_DELPHI_4_UP} - {$DEFINE THANY_DELPHI_5_UP} - {$DEFINE THANY_DELPHI_6_UP} - {$DEFINE THANY_DELPHI_7_UP} - {$DEFINE THANY_DELPHI_9_UP} -{$ENDIF} - -{$IFDEF THANY_CPPB_3} - {$DEFINE THANY_CPPB_3_UP} -{$ENDIF} - -{$IFDEF THANY_CPPB_4} - {$DEFINE THANY_CPPB_3_UP} - {$DEFINE THANY_CPPB_4_UP} -{$ENDIF} - -{$IFDEF THANY_CPPB_5} - {$DEFINE THANY_CPPB_3_UP} - {$DEFINE THANY_CPPB_4_UP} - {$DEFINE THANY_CPPB_5_UP} -{$ENDIF} - -{$IFDEF THANY_CPPB_6} - {$DEFINE THANY_CPPB_3_UP} - {$DEFINE THANY_CPPB_4_UP} - {$DEFINE THANY_CPPB_5_UP} - {$DEFINE THANY_CPPB_6_UP} -{$ENDIF} - -{$IFDEF THANY_CPPB_7} - {$DEFINE THANY_CPPB_3_UP} - {$DEFINE THANY_CPPB_4_UP} - {$DEFINE THANY_CPPB_5_UP} - {$DEFINE THANY_CPPB_6_UP} - {$DEFINE THANY_CPPB_7_UP} -{$ENDIF} - -{$IFDEF THANY_CPPB_9} - {$DEFINE THANY_CPPB_3_UP} - {$DEFINE THANY_CPPB_4_UP} - {$DEFINE THANY_CPPB_5_UP} - {$DEFINE THANY_CPPB_6_UP} - {$DEFINE THANY_CPPB_7_UP} - {$DEFINE THANY_CPPB_9_UP} -{$ENDIF} - -{$IFDEF THANY_CPPB_3_UP} - // C++Builder requires this if you use Delphi components in run-time packages. - {$ObjExportAll On} -{$ENDIF} - -{$IFDEF THANY_COMPILER_7_UP} - {$DEFINE ThemeSupport} -{$ENDIF} diff --git a/components/pngcomponents/packages/PNG.dpk b/components/pngcomponents/packages/delphi11/PNG.dpk similarity index 74% rename from components/pngcomponents/packages/PNG.dpk rename to components/pngcomponents/packages/delphi11/PNG.dpk index 63079a62..ba8ad773 100644 --- a/components/pngcomponents/packages/PNG.dpk +++ b/components/pngcomponents/packages/delphi11/PNG.dpk @@ -1,5 +1,6 @@ package PNG; +{$R *.res} {$ALIGN 8} {$ASSERTIONS ON} {$BOOLEVAL OFF} @@ -21,16 +22,16 @@ package PNG; {$WRITEABLECONST OFF} {$MINENUMSIZE 1} {$IMAGEBASE $400000} -{$IMPLICITBUILD OFF} {$DESCRIPTION 'PNG image runtime/designtime'} +{$IMPLICITBUILD OFF} requires vcl, rtl; contains - pngimage in '..\source\pngimage.pas', - pnglang in '..\source\pnglang.pas', - pngzlib in '..\source\pngzlib.pas'; + pngimage in '..\..\source\pngimage.pas', + pnglang in '..\..\source\pnglang.pas', + pngzlib in '..\..\source\pngzlib.pas'; end. diff --git a/components/pngcomponents/packages/delphi11/PNG.dproj b/components/pngcomponents/packages/delphi11/PNG.dproj new file mode 100644 index 00000000..4f00eb71 --- /dev/null +++ b/components/pngcomponents/packages/delphi11/PNG.dproj @@ -0,0 +1,47 @@ + + + + {3adf4b67-001b-48bd-8974-5d17cf2057f3} + PNG.dpk + Debug + AnyCPU + DCC32 + ..\..\build\PNG.bpl + + + 7.0 + False + False + 0 + RELEASE + + + 7.0 + ..\..\build + ..\..\build + ..\..\build + ..\..\build + ..\..\build + ..\..\build + ..\..\build + ..\..\build + ..\..\build + + + Delphi.Personality + Package + +FalseTrueFalsePNG image runtime/designtimeFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse103112521.0.0.01.0.0.0PNG.dpk + + + + + MainSource + + + + + + + + \ No newline at end of file diff --git a/components/pngcomponents/packages/PngComponents.dpk b/components/pngcomponents/packages/delphi11/PngComponents.dpk similarity index 58% rename from components/pngcomponents/packages/PngComponents.dpk rename to components/pngcomponents/packages/delphi11/PngComponents.dpk index c81ba39e..58741817 100644 --- a/components/pngcomponents/packages/PngComponents.dpk +++ b/components/pngcomponents/packages/delphi11/PngComponents.dpk @@ -1,5 +1,6 @@ package PngComponents; +{$R *.res} {$ALIGN 8} {$ASSERTIONS ON} {$BOOLEVAL OFF} @@ -32,11 +33,11 @@ requires PNG; contains - PngSpeedButton in '..\source\PngSpeedButton.pas', - PngFunctions in '..\source\PngFunctions.pas', - PngImageList in '..\source\PngImageList.pas', - PngBitBtn in '..\source\PngBitBtn.pas', - PngButtonFunctions in '..\source\PngButtonFunctions.pas', - PngCheckListBox in '..\source\PngCheckListBox.pas'; + PngSpeedButton in '..\..\source\PngSpeedButton.pas', + PngFunctions in '..\..\source\PngFunctions.pas', + PngImageList in '..\..\source\PngImageList.pas', + PngBitBtn in '..\..\source\PngBitBtn.pas', + PngButtonFunctions in '..\..\source\PngButtonFunctions.pas', + PngCheckListBox in '..\..\source\PngCheckListBox.pas'; end. diff --git a/components/pngcomponents/packages/delphi11/PngComponents.dproj b/components/pngcomponents/packages/delphi11/PngComponents.dproj new file mode 100644 index 00000000..a101dab5 --- /dev/null +++ b/components/pngcomponents/packages/delphi11/PngComponents.dproj @@ -0,0 +1,52 @@ + + + + {c1b67ac4-6c06-4206-850d-5f5efcc7880b} + PngComponents.dpk + Debug + AnyCPU + DCC32 + ..\..\build\PngComponents.bpl + + + 7.0 + False + False + 0 + RELEASE + + + 7.0 + ..\..\..\compilerdetection\include;..\..\build + ..\..\..\compilerdetection\include;..\..\build + ..\..\..\compilerdetection\include;..\..\build + ..\..\..\compilerdetection\include;..\..\build + ..\..\build + ..\..\build + ..\..\build + ..\..\build + ..\..\build + + + Delphi.Personality + Package + +FalseTrueFalsePng componentsTrueFalseTrueTrueFalse1000FalseFalseFalseFalseFalse103112521.0.0.01.0.0.0PngComponents.dpk + + + + + MainSource + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/pngcomponents/packages/delphi11/PngComponents.groupproj b/components/pngcomponents/packages/delphi11/PngComponents.groupproj new file mode 100644 index 00000000..47aa80cf --- /dev/null +++ b/components/pngcomponents/packages/delphi11/PngComponents.groupproj @@ -0,0 +1,49 @@ + + + {02633fc8-2f46-4d55-a3cf-c9c04bee06a7} + + + + + Default.Personality + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/pngcomponents/packages/PngComponentsD.dpk b/components/pngcomponents/packages/delphi11/PngComponentsD.dpk similarity index 63% rename from components/pngcomponents/packages/PngComponentsD.dpk rename to components/pngcomponents/packages/delphi11/PngComponentsD.dpk index 3f08a7d0..c2aa5288 100644 --- a/components/pngcomponents/packages/PngComponentsD.dpk +++ b/components/pngcomponents/packages/delphi11/PngComponentsD.dpk @@ -1,6 +1,7 @@ package PngComponentsD; -{$R '..\Design\PngComponents.dcr'} +{$R *.res} +{$R '..\..\source\PngComponents.dcr'} {$ALIGN 8} {$ASSERTIONS ON} {$BOOLEVAL OFF} @@ -31,8 +32,8 @@ requires PngComponents; contains - PngComponentsRegister in '..\source\PngComponentsRegister.pas', - PngComponentEditors in '..\source\PngComponentEditors.pas', - PngImageListEditor in '..\source\PngImageListEditor.pas' {PngImageListEditorDlg}; + PngComponentsRegister in '..\..\source\PngComponentsRegister.pas', + PngComponentEditors in '..\..\source\PngComponentEditors.pas', + PngImageListEditor in '..\..\source\PngImageListEditor.pas' {PngImageListEditorDlg}; end. diff --git a/components/pngcomponents/packages/delphi11/PngComponentsD.dproj b/components/pngcomponents/packages/delphi11/PngComponentsD.dproj new file mode 100644 index 00000000..7c870a8f --- /dev/null +++ b/components/pngcomponents/packages/delphi11/PngComponentsD.dproj @@ -0,0 +1,50 @@ + + + + {86eae7f6-8975-4793-8cd9-a56637d060d5} + PngComponentsD.dpk + Debug + AnyCPU + DCC32 + ..\..\build\PngComponentsD.bpl + + + 7.0 + False + False + 0 + RELEASE + + + 7.0 + ..\..\..\compilerdetection\include;..\..\build + ..\..\..\compilerdetection\include;..\..\build + ..\..\..\compilerdetection\include;..\..\build + ..\..\..\compilerdetection\include;..\..\build + ..\..\build + ..\..\build + ..\..\build + ..\..\build + ..\..\build + + + Delphi.Personality + Package + +FalseTrueFalsePng components designtimeTrueTrueFalseTrueFalse1000FalseFalseFalseFalseFalse103112521.0.0.01.0.0.0PngComponentsD.dpk + + + + + MainSource + + + + + + +
PngImageListEditorDlg
+ + + + \ No newline at end of file diff --git a/components/pngcomponents/source/PngBitBtn.pas b/components/pngcomponents/source/PngBitBtn.pas index 81d95372..e2878300 100644 --- a/components/pngcomponents/source/PngBitBtn.pas +++ b/components/pngcomponents/source/PngBitBtn.pas @@ -1,6 +1,6 @@ unit PngBitBtn; -{$I ..\Include\Thany.inc} +{$I compilers.inc} interface diff --git a/components/pngcomponents/source/PngButtonFunctions.pas b/components/pngcomponents/source/PngButtonFunctions.pas index 2a71e259..c01aa36b 100644 --- a/components/pngcomponents/source/PngButtonFunctions.pas +++ b/components/pngcomponents/source/PngButtonFunctions.pas @@ -1,6 +1,6 @@ unit PngButtonFunctions; -{$I ..\Include\Thany.inc} +{$I compilers.inc} interface diff --git a/components/pngcomponents/source/PngCheckListBox.pas b/components/pngcomponents/source/PngCheckListBox.pas index 86884b31..54b09d21 100644 --- a/components/pngcomponents/source/PngCheckListBox.pas +++ b/components/pngcomponents/source/PngCheckListBox.pas @@ -1,6 +1,6 @@ unit PngCheckListBox; -{$I ..\Include\Thany.inc} +{$I compilers.inc} interface @@ -90,7 +90,7 @@ procedure TPngCheckListBox.DrawItem(Index: Integer; Rect: TRect; State: TOwnerDr then Inc(Rect.Left, 2) else Dec(Rect.Right, 2); Data := ''; - {$IFDEF THANY_COMPILER_6_UP} + {$IFDEF COMPILER_6_UP} if (Style in [lbVirtual, lbVirtualOwnerDraw]) then Data := DoGetData(Index) else Data := Items[Index]; @@ -116,7 +116,7 @@ else begin then begin R := Rect; Enable := Self.Enabled and ItemEnabled[Index]; - if {$IFDEF THANY_COMPILER_6_UP} not Header[Index] {$ELSE} True {$ENDIF} + if {$IFDEF COMPILER_6_UP} not Header[Index] {$ELSE} True {$ENDIF} then begin if not UseRightToLeftAlignment then begin @@ -130,7 +130,7 @@ else begin DrawCheck(R, Self.State[Index], Enable); end else begin - {$IFDEF THANY_COMPILER_6_UP} + {$IFDEF COMPILER_6_UP} Canvas.Font.Color := HeaderColor; Canvas.Brush.Color := HeaderBackgroundColor; {$ENDIF} diff --git a/components/pngcomponents/source/PngComponentEditors.pas b/components/pngcomponents/source/PngComponentEditors.pas index 83a58ace..96f6ecd6 100644 --- a/components/pngcomponents/source/PngComponentEditors.pas +++ b/components/pngcomponents/source/PngComponentEditors.pas @@ -1,15 +1,15 @@ unit PngComponentEditors; -{$I ..\Include\Thany.inc} +{$I compilers.inc} interface uses Windows, SysUtils, Forms, Classes, Controls, PngImageList, TypInfo, - {$IFDEF THANY_COMPILER_6_UP} DesignIntf, DesignEditors, ColnEdit {$ELSE} DsgnIntf {$ENDIF}; + {$IFDEF COMPILER_6_UP} DesignIntf, DesignEditors, ColnEdit {$ELSE} DsgnIntf {$ENDIF}; type - {$IFNDEF THANY_COMPILER_6_UP} + {$IFNDEF COMPILER_6_UP} IProperty = TPropertyEditor; IDesignerSelections = TDesignerSelectionList; IDesigner = IFormDesigner; @@ -61,7 +61,7 @@ type TEditProperty = class private FPropery: string; - procedure EnumProperty({$IFDEF THANY_COMPILER_6_UP}const{$ENDIF} Prop: IProperty); + procedure EnumProperty({$IFDEF COMPILER_6_UP}const{$ENDIF} Prop: IProperty); public constructor Create(Component: TComponent; const Prop: string; Designer: IDesigner); end; @@ -173,7 +173,7 @@ end; { TD5ComponentEditor } -{$IFNDEF THANY_COMPILER_6_UP} +{$IFNDEF COMPILER_6_UP} function TThanyComponentEditor.GetComponent: TComponent; begin @@ -184,7 +184,7 @@ end; { TEditProperty } -{$IFDEF THANY_COMPILER_6_UP} +{$IFDEF COMPILER_6_UP} constructor TEditProperty.Create(Component: TComponent; const Prop: string; Designer: IDesigner); var @@ -216,7 +216,7 @@ end; {$ENDIF} -procedure TEditProperty.EnumProperty({$IFDEF THANY_COMPILER_6_UP}const{$ENDIF} Prop: IProperty); +procedure TEditProperty.EnumProperty({$IFDEF COMPILER_6_UP}const{$ENDIF} Prop: IProperty); begin if Prop.GetName = FPropery then Prop.Edit; diff --git a/components/pngcomponents/source/PngComponentsRegister.pas b/components/pngcomponents/source/PngComponentsRegister.pas index 2bd02258..c63fdef0 100644 --- a/components/pngcomponents/source/PngComponentsRegister.pas +++ b/components/pngcomponents/source/PngComponentsRegister.pas @@ -1,11 +1,11 @@ unit PngComponentsRegister; -{$I ..\Include\Thany.inc} +{$I compilers.inc} interface uses - Classes, {$IFDEF THANY_COMPILER_6_UP} DesignIntf {$ELSE} DsgnIntf {$ENDIF}, + Classes, {$IFDEF COMPILER_6_UP} DesignIntf {$ELSE} DsgnIntf {$ENDIF}, PngSpeedButton, PngBitBtn, PngImageList, PngCheckListBox, PngComponentEditors, TypInfo; @@ -13,7 +13,7 @@ procedure Register; implementation -{$IFNDEF THANY_COMPILER_7_UP} +{$IFNDEF COMPILER_7_UP} procedure UnlistPublishedProperty(ComponentClass: TClass; const PropertyName: string); var diff --git a/components/pngcomponents/source/PngFunctions.pas b/components/pngcomponents/source/PngFunctions.pas index af9ee3f0..3f9cd90d 100644 --- a/components/pngcomponents/source/PngFunctions.pas +++ b/components/pngcomponents/source/PngFunctions.pas @@ -1,6 +1,6 @@ unit PngFunctions; -{$I ..\Include\Thany.inc} +{$I compilers.inc} interface diff --git a/components/pngcomponents/source/PngImageList.pas b/components/pngcomponents/source/PngImageList.pas index a3632439..b10c5304 100644 --- a/components/pngcomponents/source/PngImageList.pas +++ b/components/pngcomponents/source/PngImageList.pas @@ -1,6 +1,6 @@ unit PngImageList; -{$I ..\Include\Thany.inc} +{$I compilers.inc} interface @@ -20,7 +20,7 @@ type FPngOptions: TPngOptions; FLocked: Integer; procedure SetPngOptions(const Value: TPngOptions); - {$IFNDEF THANY_COMPILER_7_UP} + {$IFNDEF COMPILER_7_UP} procedure ReadLeft(Reader: TReader); procedure ReadTop(Reader: TReader); procedure WriteLeft(Writer: TWriter); @@ -37,7 +37,7 @@ type function PngToIcon(const Png: TPNGObject; Background: TColor = clNone): HICON; procedure CopyPngs; virtual; procedure DoDraw(Index: Integer; Canvas: TCanvas; X, Y: Integer; Style: Cardinal; Enabled: Boolean = True); override; - {$IFDEF THANY_COMPILER_7_UP} + {$IFDEF COMPILER_7_UP} procedure ReadData(Stream: TStream); override; procedure WriteData(Stream: TStream); override; {$ELSE} @@ -52,7 +52,7 @@ type //Patched methods function Add(Image, Mask: TBitmap): Integer; virtual; function AddIcon(Image: TIcon): Integer; virtual; - {$IFDEF THANY_COMPILER_7_UP} + {$IFDEF COMPILER_7_UP} function AddImage(Value: TCustomImageList; Index: Integer): Integer; virtual; {$ENDIF} procedure AddImages(Value: TCustomImageList); virtual; @@ -207,7 +207,7 @@ then begin SetLength(Pointers, 14); Pointers[0] := Combo(@TCustomImageList.Add, @TPngImageList.Add, 'Add'); Pointers[1] := Combo(@TCustomImageList.AddIcon, @TPngImageList.AddIcon, 'AddIcon'); - {$IFDEF THANY_COMPILER_7_UP} + {$IFDEF COMPILER_7_UP} Pointers[2] := Combo(@TCustomImageList.AddImage, @TPngImageList.AddImage, 'AddImage'); {$ELSE} Pointers[2] := EmptyCombo; @@ -438,7 +438,7 @@ type end; begin -if {$IFDEF THANY_COMPILER_7_UP} +if {$IFDEF COMPILER_7_UP} GetComCtlVersion >= ComCtlVersionIE6 {$ELSE} False {$ENDIF} then //Windows XP or later, using the modern method: convert every PNG to @@ -633,7 +633,7 @@ else begin end; end; -{$IFDEF THANY_COMPILER_7_UP} +{$IFDEF COMPILER_7_UP} function TPngImageList.AddImage(Value: TCustomImageList; Index: Integer): Integer; var Item: TPngImageCollectionItem; @@ -1096,7 +1096,7 @@ then begin end; end; -{$IFDEF THANY_COMPILER_7_UP} +{$IFDEF COMPILER_7_UP} procedure TPngImageList.ReadData(Stream: TStream); begin @@ -1145,7 +1145,7 @@ then begin end; end; -{$IFNDEF THANY_COMPILER_7_UP} +{$IFNDEF COMPILER_7_UP} procedure TPngImageList.ReadLeft(Reader: TReader); var @@ -1229,9 +1229,9 @@ end; function TPngImageCollectionItems.Add(DontCreatePNG: Boolean = False): TPngImageCollectionItem; begin -{$IFDEF THANY_COMPILER_6_UP}{$WARN SYMBOL_DEPRECATED OFF}{$ENDIF} +{$IFDEF COMPILER_6_UP}{$WARN SYMBOL_DEPRECATED OFF}{$ENDIF} Result := TPngImageCollectionItem.Create(Self, DontCreatePNG); -{$IFDEF THANY_COMPILER_6_UP}Added(TCollectionItem(Result));{$ENDIF} +{$IFDEF COMPILER_6_UP}Added(TCollectionItem(Result));{$ENDIF} end; function TPngImageCollectionItems.Insert(Index: Integer; DontCreatePNG: Boolean = False): TPngImageCollectionItem; diff --git a/components/pngcomponents/source/PngImageListEditor.pas b/components/pngcomponents/source/PngImageListEditor.pas index 360a326a..592614bb 100644 --- a/components/pngcomponents/source/PngImageListEditor.pas +++ b/components/pngcomponents/source/PngImageListEditor.pas @@ -1,11 +1,11 @@ unit PngImageListEditor; -{$I ..\Include\Thany.inc} +{$I compilers.inc} interface uses - Windows, Messages, SysUtils, {$IFDEF THANY_COMPILER_6_UP}Variants,{$ENDIF} + Windows, Messages, SysUtils, {$IFDEF COMPILER_6_UP}Variants,{$ENDIF} Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, Buttons, PngBitBtn, ExtCtrls, PngImageList, ExtDlgs, pngimage; diff --git a/components/pngcomponents/source/PngSpeedButton.pas b/components/pngcomponents/source/PngSpeedButton.pas index be4ecf84..43b02877 100644 --- a/components/pngcomponents/source/PngSpeedButton.pas +++ b/components/pngcomponents/source/PngSpeedButton.pas @@ -1,6 +1,6 @@ unit PngSpeedButton; -{$I ..\Include\Thany.inc} +{$I compilers.inc} interface