From 8a828a5199f17ee7cf22d7ec5b9699fc94deb740 Mon Sep 17 00:00:00 2001 From: Jim McKeeth Date: Wed, 16 Jan 2019 20:22:05 -0700 Subject: [PATCH] 10.2.3 Tokyo / VER320 / PKG 250 Support added for 10.2.3 Tokyo (Compiler 32.0 / VER320 / Product version 25 / Package Version 250) Previously at https://github.com/TurboPack-Tokyo/ --- Design/PngComponentsRegister.pas | 2 - Packages/CBuilder/PngComponentsC.cbproj | 156 +++++++++++------ Packages/CBuilder/PngComponentsCDesign.cbproj | 158 ++++++++++++------ Packages/Delphi/Delphi.groupproj | 12 +- Packages/Delphi/PngComponentsD.dpk | 2 +- Packages/Delphi/PngComponentsD.dproj | 75 ++++++--- Packages/Delphi/PngComponentsDDesign.dpk | 2 +- Packages/Delphi/PngComponentsDDesign.dproj | 69 +++++--- Source/PngImageList.pas | 43 ++++- Source/hpp/Win32/Debug/PngBitBtn.hpp | 2 +- Source/hpp/Win32/Debug/PngButtonFunctions.hpp | 2 +- Source/hpp/Win32/Debug/PngCheckListBox.hpp | 2 +- .../hpp/Win32/Debug/PngComponentEditors.hpp | 2 +- Source/hpp/Win32/Debug/PngComponentsD.hpp | 7 +- .../hpp/Win32/Debug/PngComponentsDDesign.hpp | 7 +- .../hpp/Win32/Debug/PngComponentsRegister.hpp | 2 +- Source/hpp/Win32/Debug/PngFunctions.hpp | 2 +- Source/hpp/Win32/Debug/PngImageList.hpp | 6 +- Source/hpp/Win32/Debug/PngImageListEditor.hpp | 2 +- Source/hpp/Win32/Debug/PngSpeedButton.hpp | 2 +- Source/hpp/Win32/Release/PngBitBtn.hpp | 2 +- .../hpp/Win32/Release/PngButtonFunctions.hpp | 2 +- Source/hpp/Win32/Release/PngCheckListBox.hpp | 2 +- .../hpp/Win32/Release/PngComponentEditors.hpp | 2 +- Source/hpp/Win32/Release/PngComponentsD.hpp | 7 +- .../Win32/Release/PngComponentsDDesign.hpp | 7 +- .../Win32/Release/PngComponentsRegister.hpp | 2 +- Source/hpp/Win32/Release/PngFunctions.hpp | 2 +- Source/hpp/Win32/Release/PngImageList.hpp | 6 +- .../hpp/Win32/Release/PngImageListEditor.hpp | 2 +- Source/hpp/Win32/Release/PngSpeedButton.hpp | 2 +- Source/hpp/Win32/Release/pasall.hpp | 4 +- Source/hpp/Win64/Debug/PngBitBtn.hpp | 2 +- Source/hpp/Win64/Debug/PngButtonFunctions.hpp | 2 +- Source/hpp/Win64/Debug/PngCheckListBox.hpp | 2 +- Source/hpp/Win64/Debug/PngComponentsD.hpp | 7 +- Source/hpp/Win64/Debug/PngFunctions.hpp | 2 +- Source/hpp/Win64/Debug/PngImageList.hpp | 6 +- Source/hpp/Win64/Debug/PngSpeedButton.hpp | 2 +- Source/hpp/Win64/Release/PngBitBtn.hpp | 2 +- .../hpp/Win64/Release/PngButtonFunctions.hpp | 2 +- Source/hpp/Win64/Release/PngCheckListBox.hpp | 2 +- Source/hpp/Win64/Release/PngComponentsD.hpp | 7 +- Source/hpp/Win64/Release/PngFunctions.hpp | 2 +- Source/hpp/Win64/Release/PngImageList.hpp | 6 +- Source/hpp/Win64/Release/PngSpeedButton.hpp | 2 +- 46 files changed, 433 insertions(+), 208 deletions(-) diff --git a/Design/PngComponentsRegister.pas b/Design/PngComponentsRegister.pas index a56219b..e538dd9 100644 --- a/Design/PngComponentsRegister.pas +++ b/Design/PngComponentsRegister.pas @@ -15,8 +15,6 @@ implementation procedure Register; begin - TPngImageList.IDE_WriteData_Hack := true; - //Register all components RegisterComponents(SPageName, [TPngSpeedButton, TPngBitBtn, TPngImageList, TPngImageCollection, TPngCheckListBox]); diff --git a/Packages/CBuilder/PngComponentsC.cbproj b/Packages/CBuilder/PngComponentsC.cbproj index d314aca..3ffbd6c 100644 --- a/Packages/CBuilder/PngComponentsC.cbproj +++ b/Packages/CBuilder/PngComponentsC.cbproj @@ -1,7 +1,7 @@  {3C752C57-9D67-4D01-91F6-F5391E574922} - 18.1 + 18.2 VCL PngComponentsC.cpp True @@ -66,7 +66,7 @@ true - 240 + 250 ..\..\Source\;..\CBuilder\;$(IncludePath) ..\..\source\hpp\$(Platform)\$(Config) true @@ -108,7 +108,7 @@ adortl;appanalytics;bcbie;bcbsmp;bindcomp;bindcompdbx;bindcompfmx;bindcompvcl;bindengine;CloudService;CodeSiteExpressPkg;CustomIPTransport;DataSnapClient;DataSnapCommon;DataSnapConnectors;DatasnapConnectorsFreePascal;DataSnapFireDAC;DataSnapIndy10ServerTransport;DataSnapNativeClient;DataSnapProviderClient;DataSnapServer;DataSnapServerMidas;dbexpress;dbrtl;dbxcds;DbxClientDriver;DbxCommonDriver;DBXDb2Driver;DBXFirebirdDriver;DBXInformixDriver;DBXInterBaseDriver;DBXMSSQLDriver;DBXMySQLDriver;DBXOdbcDriver;DBXOracleDriver;DBXSqliteDriver;DBXSybaseASADriver;DBXSybaseASEDriver;dsnap;dsnapcon;dsnapxml;emsclient;emsclientfiredac;FireDAC;FireDACADSDriver;FireDACASADriver;FireDACCommon;FireDACCommonDriver;FireDACDb2Driver;FireDACDBXDriver;FireDACDSDriver;FireDACIBDriver;FireDACInfxDriver;FireDACMSAccDriver;FireDACMSSQLDriver;FireDACMySQLDriver;FireDACODBCDriver;FireDACOracleDriver;FireDACPgDriver;FireDACSqliteDriver;FireDACTDataDriver;fmx;fmxase;fmxdae;fmxFireDAC;fmxobj;FMXTee;FmxTeeUI;ibmonitor;ibxpress;IndyCore;IndyIPClient;IndyIPCommon;IndyIPServer;IndyProtocols;IndySystem;inet;inetdb;inetdbxpress;Intraweb;OnGuardCR;RESTBackendComponents;RESTComponents;rtl;soapmidas;soaprtl;soapserver;svn;Tee;TeeDB;TeeUI;tethering;vcl;vclactnband;vcldb;vcldsnap;vclFireDAC;vclib;vclie;vclimg;VCLRESTComponents;vclribbon;VclSmp;vcltouch;vclx;xmlrtl;$(PackageImports) 1033 Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) $(BDSINCLUDE)\windows\vcl;$(IncludePath) true @@ -150,6 +150,7 @@ None + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) true 1033 @@ -217,98 +218,132 @@ PngComponentsC.cpp - IntraWeb 14.0 Design Package for RAD Studio XE6 - Embarcadero C++Builder-Package für Office 2000-Server - Embarcadero C++Builder-Package für Office XP-Server - Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver - Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server + Embarcadero C++Builder-Package für Office 2000-Server + Embarcadero C++Builder-Package für Office XP-Server + Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver + Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server - - + + true - - + + + PngComponentsC.tds true - + true - + + + true + + + true - - + + true - + true - + + + PngComponentsC.bpl + true + + + true - + + + true + + + - PngComponentsC.tds true - + true - + + + true + + + true - + + + true + + + true - + true - + + + true + + + + + true + + + true - + true - - + + true - + - PngComponentsC.bpl true - - + + true @@ -322,17 +357,21 @@ true - - - true - - - + true - + + + 0 + .dll;.bpl + + + 1 + .dylib + + Contents\Resources @@ -410,6 +449,14 @@ .framework + + + 1 + + + 1 + + 1 @@ -527,6 +574,16 @@ + + + Assets + 1 + + + Assets + 1 + + 1 @@ -578,6 +635,16 @@ 1 + + + Assets + 1 + + + Assets + 1 + + 0 @@ -644,16 +711,7 @@ 1 - - - 0 - .dll;.bpl - - - 1 - .dylib - - + diff --git a/Packages/CBuilder/PngComponentsCDesign.cbproj b/Packages/CBuilder/PngComponentsCDesign.cbproj index b1700aa..e8cf8b3 100644 --- a/Packages/CBuilder/PngComponentsCDesign.cbproj +++ b/Packages/CBuilder/PngComponentsCDesign.cbproj @@ -1,7 +1,7 @@  {126F2012-4351-4E58-83EC-D5CCB813C07F} - 18.1 + 18.2 VCL PngComponentsCDesign.cpp True @@ -68,7 +68,7 @@ -LUDesignIDE ..\..\source;$(DCC_UnitSearchPath) - 240 + 250 ..\..\Design\;C:\Projects\EMBT\PNGComponents\Packages\CBuilder\;$(IncludePath) ..\..\source\hpp\$(Platform)\$(Config) true @@ -111,7 +111,7 @@ 1033 Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) adortl;appanalytics;bcbie;bcbsmp;bindcomp;bindcompdbx;bindcompfmx;bindcompvcl;bindengine;CloudService;CodeSiteExpressPkg;CustomIPTransport;DataSnapClient;DataSnapCommon;DataSnapConnectors;DatasnapConnectorsFreePascal;DataSnapFireDAC;DataSnapIndy10ServerTransport;DataSnapNativeClient;DataSnapProviderClient;DataSnapServer;DataSnapServerMidas;dbexpress;dbrtl;dbxcds;DbxClientDriver;DbxCommonDriver;DBXDb2Driver;DBXFirebirdDriver;DBXInformixDriver;DBXInterBaseDriver;DBXMSSQLDriver;DBXMySQLDriver;DBXOdbcDriver;DBXOracleDriver;DBXSqliteDriver;DBXSybaseASADriver;DBXSybaseASEDriver;dsnap;dsnapcon;dsnapxml;emsclient;emsclientfiredac;FireDAC;FireDACADSDriver;FireDACASADriver;FireDACCommon;FireDACCommonDriver;FireDACDb2Driver;FireDACDBXDriver;FireDACDSDriver;FireDACIBDriver;FireDACInfxDriver;FireDACMSAccDriver;FireDACMSSQLDriver;FireDACMySQLDriver;FireDACODBCDriver;FireDACOracleDriver;FireDACPgDriver;FireDACSqliteDriver;FireDACTDataDriver;fmx;fmxase;fmxdae;fmxFireDAC;fmxobj;FMXTee;FmxTeeUI;ibmonitor;ibxpress;IndyCore;IndyIPClient;IndyIPCommon;IndyIPServer;IndyProtocols;IndySystem;inet;inetdb;inetdbxpress;Intraweb;OnGuardCR;RESTBackendComponents;RESTComponents;rtl;soapmidas;soaprtl;soapserver;svn;Tee;TeeDB;TeeUI;tethering;vcl;vclactnband;vcldb;vcldsnap;vclFireDAC;vclib;vclie;vclimg;VCLRESTComponents;vclribbon;VclSmp;vcltouch;vclx;xmlrtl;$(PackageImports) - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) true @@ -149,6 +149,7 @@ None + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) true 1033 @@ -216,122 +217,160 @@ PngComponentsCDesign.cpp - IntraWeb 14.0 Design Package for RAD Studio XE6 - Embarcadero C++Builder-Package für Office 2000-Server - Embarcadero C++Builder-Package für Office XP-Server - Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver - Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server + Embarcadero C++Builder-Package für Office 2000-Server + Embarcadero C++Builder-Package für Office XP-Server + Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver + Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server - - + + true - - + + true - - + + true - + true - - + + true - + + + PngComponentsCDesign.bpl + true + + + true - + true - + + + true + + + true - - + + true - + true - + + + true + + + true - + true - - - PngComponentsCDesign.bpl + + true - + true - + + + true + + + - PngComponentsCDesign.tds true - + true - - + + true - + true - - + + + PngComponentsCDesign.tds true - + true - + + + true + + + true - + + + true + + + + + 0 + .dll;.bpl + + + 1 + .dylib + + Contents\Resources @@ -409,6 +448,14 @@ .framework + + + 1 + + + 1 + + 1 @@ -526,6 +573,16 @@ + + + Assets + 1 + + + Assets + 1 + + 1 @@ -577,6 +634,16 @@ 1 + + + Assets + 1 + + + Assets + 1 + + 0 @@ -643,16 +710,7 @@ 1 - - - 0 - .dll;.bpl - - - 1 - .dylib - - + diff --git a/Packages/Delphi/Delphi.groupproj b/Packages/Delphi/Delphi.groupproj index a820b46..d3585c9 100644 --- a/Packages/Delphi/Delphi.groupproj +++ b/Packages/Delphi/Delphi.groupproj @@ -46,17 +46,17 @@ - - {A567FA24-8D23-4C0B-9AD6-102B2A1F6D0B} - Debug;Release - Win32;Win64 - True - {B3C4180B-520B-41C8-8853-0351F059AA78} Debug;Release Win32 True + + {A567FA24-8D23-4C0B-9AD6-102B2A1F6D0B} + Debug;Release + Win32;Win64 + True + diff --git a/Packages/Delphi/PngComponentsD.dpk b/Packages/Delphi/PngComponentsD.dpk index 42c5456..f8e254f 100644 --- a/Packages/Delphi/PngComponentsD.dpk +++ b/Packages/Delphi/PngComponentsD.dpk @@ -26,7 +26,7 @@ package PngComponentsD; {$DEFINE RELEASE} {$ENDIF IMPLICITBUILDING} {$DESCRIPTION 'Png Components for Delphi'} -{$LIBSUFFIX '240'} +{$LIBSUFFIX '250'} {$RUNONLY} {$IMPLICITBUILD ON} diff --git a/Packages/Delphi/PngComponentsD.dproj b/Packages/Delphi/PngComponentsD.dproj index 392693b..db48a0b 100644 --- a/Packages/Delphi/PngComponentsD.dproj +++ b/Packages/Delphi/PngComponentsD.dproj @@ -4,7 +4,7 @@ PngComponentsD.dpk Release DCC32 - 18.1 + 18.2 True Package VCL @@ -85,7 +85,7 @@ 2 00400000 0 - 240 + 250 C:\Users\Public\Documents\RAD Studio\7.0\Bpl\PngComponents140.bpl false x86 @@ -124,13 +124,13 @@ PngComponents_Icon.ico System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) 1033 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) PngComponents_Icon.ico 1033 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) false @@ -139,11 +139,11 @@ 0 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) 1033 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) 1033 @@ -154,11 +154,11 @@ 0 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) 1033 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) 1033 @@ -226,11 +226,10 @@ - IntraWeb 14.0 Design Package for RAD Studio XE6 - Embarcadero C++Builder-Package für Office 2000-Server - Embarcadero C++Builder-Package für Office XP-Server - Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver - Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server + Embarcadero C++Builder-Package für Office 2000-Server + Embarcadero C++Builder-Package für Office XP-Server + Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver + Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server @@ -248,7 +247,16 @@ true - + + + 0 + .dll;.bpl + + + 1 + .dylib + + Contents\Resources @@ -326,6 +334,14 @@ .framework + + + 1 + + + 1 + + 1 @@ -428,6 +444,16 @@ 1 + + + Assets + 1 + + + Assets + 1 + + @@ -443,6 +469,16 @@ + + + Assets + 1 + + + Assets + 1 + + 1 @@ -560,16 +596,7 @@ 1 - - - 0 - .dll;.bpl - - - 1 - .dylib - - + diff --git a/Packages/Delphi/PngComponentsDDesign.dpk b/Packages/Delphi/PngComponentsDDesign.dpk index fc36a14..ef6291a 100644 --- a/Packages/Delphi/PngComponentsDDesign.dpk +++ b/Packages/Delphi/PngComponentsDDesign.dpk @@ -27,7 +27,7 @@ package PngComponentsDDesign; {$DEFINE RELEASE} {$ENDIF IMPLICITBUILDING} {$DESCRIPTION 'Png components for Delphi designtime'} -{$LIBSUFFIX '240'} +{$LIBSUFFIX '250'} {$DESIGNONLY} {$IMPLICITBUILD ON} diff --git a/Packages/Delphi/PngComponentsDDesign.dproj b/Packages/Delphi/PngComponentsDDesign.dproj index 8769597..c66f0a8 100644 --- a/Packages/Delphi/PngComponentsDDesign.dproj +++ b/Packages/Delphi/PngComponentsDDesign.dproj @@ -4,7 +4,7 @@ PngComponentsDDesign.dpk Release DCC32 - 18.1 + 18.2 True Package VCL @@ -59,7 +59,7 @@ true 00400000 0 - 240 + 250 false x86 C:\Users\Public\Documents\RAD Studio\7.0\Bpl\PngComponentsDesign140.bpl @@ -79,7 +79,7 @@ PngComponentsDesign_Icon.ico System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) 1033 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) PngComponents;$(DCC_UsePackage) @@ -92,7 +92,7 @@ 0 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) 1033 @@ -103,7 +103,7 @@ 0 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) 1033 @@ -169,11 +169,10 @@ - IntraWeb 14.0 Design Package for RAD Studio XE6 - Embarcadero C++Builder-Package für Office 2000-Server - Embarcadero C++Builder-Package für Office XP-Server - Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver - Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server + Embarcadero C++Builder-Package für Office 2000-Server + Embarcadero C++Builder-Package für Office XP-Server + Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver + Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server @@ -187,7 +186,16 @@ true - + + + 0 + .dll;.bpl + + + 1 + .dylib + + Contents\Resources @@ -265,6 +273,14 @@ .framework + + + 1 + + + 1 + + 1 @@ -367,6 +383,16 @@ 1 + + + Assets + 1 + + + Assets + 1 + + @@ -382,6 +408,16 @@ + + + Assets + 1 + + + Assets + 1 + + 1 @@ -499,16 +535,7 @@ 1 - - - 0 - .dll;.bpl - - - 1 - .dylib - - + diff --git a/Source/PngImageList.pas b/Source/PngImageList.pas index 32db43c..64d861b 100644 --- a/Source/PngImageList.pas +++ b/Source/PngImageList.pas @@ -18,7 +18,6 @@ TPngImageList = class(TImageList) FPngImages: TPngImageCollectionItems; FPngOptions: TPngOptions; class var - FIDE_WriteData_Hack: Boolean; function GetHeight: Integer; function GetWidth: Integer; procedure SetHeight(const Value: Integer); @@ -46,6 +45,7 @@ TPngImageList = class(TImageList) function AddImage(Value: TCustomImageList; Index: Integer): Integer; virtual; procedure AddImages(Value: TCustomImageList); virtual; function AddMasked(Image: TBitmap; MaskColor: TColor): Integer; virtual; + procedure Assign(Source: TPersistent); override; procedure BeginUpdate; procedure Clear; virtual; procedure Delete(Index: Integer); virtual; @@ -59,9 +59,8 @@ TPngImageList = class(TImageList) procedure Replace(Index: Integer; Image, Mask: TBitmap); virtual; procedure ReplaceIcon(Index: Integer; Image: TIcon); virtual; procedure ReplaceMasked(Index: Integer; NewImage: TBitmap; MaskColor: TColor); virtual; - class property IDE_WriteData_Hack: Boolean read FIDE_WriteData_Hack write - FIDE_WriteData_Hack; published + property ColorDepth default cd32Bit; property EnabledImages: Boolean read FEnabledImages write SetEnabledImages default True; property Height read GetHeight write SetHeight default 16; property PngImages: TPngImageCollectionItems read FPngImages write SetPngImages; @@ -284,6 +283,7 @@ function TMethodPatch.PatchBack: Boolean; constructor TPngImageList.Create(AOwner: TComponent); begin inherited Create(AOwner); + ColorDepth := cd32Bit; if ImageListCount = 0 then ApplyMethodPatches; Inc(ImageListCount); @@ -477,12 +477,39 @@ function TPngImageList.AddMasked(Image: TBitmap; MaskColor: TColor): Integer; end; end; +procedure TPngImageList.Assign(Source: TPersistent); +var + pngSource: TPngImageList; +begin + if Source is TPngImageList then begin + pngSource := TPngImageList(Source); + BeginUpdate; + try + PngImages := pngSource.PngImages; + EnabledImages := pngSource.EnabledImages; + PngOptions := pngSource.PngOptions; + finally + EndUpdate(true); + end; + end; + + if Source is TCustomImageList then begin + ColorDepth := TCustomImageList(Source).ColorDepth; + end; + + inherited; +end; + procedure TPngImageList.AssignTo(Dest: TPersistent); +var + pngDest: TPngImageList; begin inherited; if Dest is TPngImageList then begin - TPngImageList(Dest).PngImages := FPngImages; - TPngImageList(Dest).EnabledImages := FEnabledImages; + pngDest := TPngImageList(Dest); + pngDest.PngImages := PngImages; + pngDest.EnabledImages := EnabledImages; + pngDest.PngOptions := PngOptions; end; end; @@ -971,8 +998,8 @@ function TPngImageList.PngToIcon(const Png: TPngImage; Background: TColor): HICO procedure TPngImageList.ReadData(Stream: TStream); begin -// if not (csReading in ComponentState) then -// inherited; + if not (csReading in ComponentState) then + inherited; //Make sure nothing gets read from the DFM end; @@ -1123,7 +1150,7 @@ procedure TPngImageList.SetWidth(const Value: Integer); procedure TPngImageList.WriteData(Stream: TStream); begin - if IDE_WriteData_Hack and not (csWriting in ComponentState) then + if not (csWriting in ComponentState) then inherited; //Make sure nothing gets written to the DFM end; diff --git a/Source/hpp/Win32/Debug/PngBitBtn.hpp b/Source/hpp/Win32/Debug/PngBitBtn.hpp index c7431bc..345a4a4 100644 --- a/Source/hpp/Win32/Debug/PngBitBtn.hpp +++ b/Source/hpp/Win32/Debug/PngBitBtn.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngBitBtn.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngBitBtn.pas' rev: 32.00 (Windows) #ifndef PngbitbtnHPP #define PngbitbtnHPP diff --git a/Source/hpp/Win32/Debug/PngButtonFunctions.hpp b/Source/hpp/Win32/Debug/PngButtonFunctions.hpp index ae44c63..112cc34 100644 --- a/Source/hpp/Win32/Debug/PngButtonFunctions.hpp +++ b/Source/hpp/Win32/Debug/PngButtonFunctions.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngButtonFunctions.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngButtonFunctions.pas' rev: 32.00 (Windows) #ifndef PngbuttonfunctionsHPP #define PngbuttonfunctionsHPP diff --git a/Source/hpp/Win32/Debug/PngCheckListBox.hpp b/Source/hpp/Win32/Debug/PngCheckListBox.hpp index 30b86f5..496b5f6 100644 --- a/Source/hpp/Win32/Debug/PngCheckListBox.hpp +++ b/Source/hpp/Win32/Debug/PngCheckListBox.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngCheckListBox.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngCheckListBox.pas' rev: 32.00 (Windows) #ifndef PngchecklistboxHPP #define PngchecklistboxHPP diff --git a/Source/hpp/Win32/Debug/PngComponentEditors.hpp b/Source/hpp/Win32/Debug/PngComponentEditors.hpp index 0760c77..ab801fe 100644 --- a/Source/hpp/Win32/Debug/PngComponentEditors.hpp +++ b/Source/hpp/Win32/Debug/PngComponentEditors.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngComponentEditors.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngComponentEditors.pas' rev: 32.00 (Windows) #ifndef PngcomponenteditorsHPP #define PngcomponenteditorsHPP diff --git a/Source/hpp/Win32/Debug/PngComponentsD.hpp b/Source/hpp/Win32/Debug/PngComponentsD.hpp index 095498f..5468034 100644 --- a/Source/hpp/Win32/Debug/PngComponentsD.hpp +++ b/Source/hpp/Win32/Debug/PngComponentsD.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngComponentsD.dpk' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngComponentsD.dpk' rev: 32.00 (Windows) #ifndef PngcomponentsdHPP #define PngcomponentsdHPP @@ -61,6 +61,11 @@ #include // (vcl) #include // (vclimg) #include // (vclx) +// SO_SFX: 250 +// PRG_EXT: .bpl +// BPI_DIR: Win32\Debug +// OBJ_DIR: Win32\Debug +// OBJ_EXT: .obj //-- user supplied ----------------------------------------------------------- diff --git a/Source/hpp/Win32/Debug/PngComponentsDDesign.hpp b/Source/hpp/Win32/Debug/PngComponentsDDesign.hpp index db1159a..b38b138 100644 --- a/Source/hpp/Win32/Debug/PngComponentsDDesign.hpp +++ b/Source/hpp/Win32/Debug/PngComponentsDDesign.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngComponentsDDesign.dpk' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngComponentsDDesign.dpk' rev: 32.00 (Windows) #ifndef PngcomponentsddesignHPP #define PngcomponentsddesignHPP @@ -92,6 +92,11 @@ #include // (designide) #include // (designide) #include // (designide) +// SO_SFX: 250 +// PRG_EXT: .bpl +// BPI_DIR: Win32\Debug +// OBJ_DIR: Win32\Debug +// OBJ_EXT: .obj //-- user supplied ----------------------------------------------------------- diff --git a/Source/hpp/Win32/Debug/PngComponentsRegister.hpp b/Source/hpp/Win32/Debug/PngComponentsRegister.hpp index 5efcab3..cf3b5e7 100644 --- a/Source/hpp/Win32/Debug/PngComponentsRegister.hpp +++ b/Source/hpp/Win32/Debug/PngComponentsRegister.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngComponentsRegister.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngComponentsRegister.pas' rev: 32.00 (Windows) #ifndef PngcomponentsregisterHPP #define PngcomponentsregisterHPP diff --git a/Source/hpp/Win32/Debug/PngFunctions.hpp b/Source/hpp/Win32/Debug/PngFunctions.hpp index 248b0f1..a990cbe 100644 --- a/Source/hpp/Win32/Debug/PngFunctions.hpp +++ b/Source/hpp/Win32/Debug/PngFunctions.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngFunctions.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngFunctions.pas' rev: 32.00 (Windows) #ifndef PngfunctionsHPP #define PngfunctionsHPP diff --git a/Source/hpp/Win32/Debug/PngImageList.hpp b/Source/hpp/Win32/Debug/PngImageList.hpp index 159153f..3af05f8 100644 --- a/Source/hpp/Win32/Debug/PngImageList.hpp +++ b/Source/hpp/Win32/Debug/PngImageList.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngImageList.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngImageList.pas' rev: 32.00 (Windows) #ifndef PngimagelistHPP #define PngimagelistHPP @@ -44,7 +44,6 @@ class PASCALIMPLEMENTATION TPngImageList : public Vcl::Controls::TImageList int FLocked; TPngImageCollectionItems* FPngImages; Pngfunctions::TPngOptions FPngOptions; - static bool FIDE_WriteData_Hack; int __fastcall GetHeight(void); int __fastcall GetWidth(void); HIDESBASE void __fastcall SetHeight(const int Value); @@ -72,6 +71,7 @@ class PASCALIMPLEMENTATION TPngImageList : public Vcl::Controls::TImageList HIDESBASE virtual int __fastcall AddImage(Vcl::Imglist::TCustomImageList* Value, int Index); HIDESBASE virtual void __fastcall AddImages(Vcl::Imglist::TCustomImageList* Value); HIDESBASE virtual int __fastcall AddMasked(Vcl::Graphics::TBitmap* Image, System::Uitypes::TColor MaskColor); + virtual void __fastcall Assign(System::Classes::TPersistent* Source); HIDESBASE void __fastcall BeginUpdate(void); HIDESBASE virtual void __fastcall Clear(void); HIDESBASE virtual void __fastcall Delete(int Index); @@ -84,9 +84,9 @@ class PASCALIMPLEMENTATION TPngImageList : public Vcl::Controls::TImageList HIDESBASE virtual void __fastcall Replace(int Index, Vcl::Graphics::TBitmap* Image, Vcl::Graphics::TBitmap* Mask); HIDESBASE virtual void __fastcall ReplaceIcon(int Index, Vcl::Graphics::TIcon* Image); HIDESBASE virtual void __fastcall ReplaceMasked(int Index, Vcl::Graphics::TBitmap* NewImage, System::Uitypes::TColor MaskColor); - /* static */ __property bool IDE_WriteData_Hack = {read=FIDE_WriteData_Hack, write=FIDE_WriteData_Hack, nodefault}; __published: + __property ColorDepth = {default=6}; __property bool EnabledImages = {read=FEnabledImages, write=SetEnabledImages, default=1}; __property Height = {read=GetHeight, write=SetHeight, default=16}; __property TPngImageCollectionItems* PngImages = {read=FPngImages, write=SetPngImages}; diff --git a/Source/hpp/Win32/Debug/PngImageListEditor.hpp b/Source/hpp/Win32/Debug/PngImageListEditor.hpp index 185075d..9b3791c 100644 --- a/Source/hpp/Win32/Debug/PngImageListEditor.hpp +++ b/Source/hpp/Win32/Debug/PngImageListEditor.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngImageListEditor.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngImageListEditor.pas' rev: 32.00 (Windows) #ifndef PngimagelisteditorHPP #define PngimagelisteditorHPP diff --git a/Source/hpp/Win32/Debug/PngSpeedButton.hpp b/Source/hpp/Win32/Debug/PngSpeedButton.hpp index 8291841..513e17c 100644 --- a/Source/hpp/Win32/Debug/PngSpeedButton.hpp +++ b/Source/hpp/Win32/Debug/PngSpeedButton.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngSpeedButton.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngSpeedButton.pas' rev: 32.00 (Windows) #ifndef PngspeedbuttonHPP #define PngspeedbuttonHPP diff --git a/Source/hpp/Win32/Release/PngBitBtn.hpp b/Source/hpp/Win32/Release/PngBitBtn.hpp index c7431bc..345a4a4 100644 --- a/Source/hpp/Win32/Release/PngBitBtn.hpp +++ b/Source/hpp/Win32/Release/PngBitBtn.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngBitBtn.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngBitBtn.pas' rev: 32.00 (Windows) #ifndef PngbitbtnHPP #define PngbitbtnHPP diff --git a/Source/hpp/Win32/Release/PngButtonFunctions.hpp b/Source/hpp/Win32/Release/PngButtonFunctions.hpp index ae44c63..112cc34 100644 --- a/Source/hpp/Win32/Release/PngButtonFunctions.hpp +++ b/Source/hpp/Win32/Release/PngButtonFunctions.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngButtonFunctions.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngButtonFunctions.pas' rev: 32.00 (Windows) #ifndef PngbuttonfunctionsHPP #define PngbuttonfunctionsHPP diff --git a/Source/hpp/Win32/Release/PngCheckListBox.hpp b/Source/hpp/Win32/Release/PngCheckListBox.hpp index 30b86f5..496b5f6 100644 --- a/Source/hpp/Win32/Release/PngCheckListBox.hpp +++ b/Source/hpp/Win32/Release/PngCheckListBox.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngCheckListBox.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngCheckListBox.pas' rev: 32.00 (Windows) #ifndef PngchecklistboxHPP #define PngchecklistboxHPP diff --git a/Source/hpp/Win32/Release/PngComponentEditors.hpp b/Source/hpp/Win32/Release/PngComponentEditors.hpp index 0760c77..ab801fe 100644 --- a/Source/hpp/Win32/Release/PngComponentEditors.hpp +++ b/Source/hpp/Win32/Release/PngComponentEditors.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngComponentEditors.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngComponentEditors.pas' rev: 32.00 (Windows) #ifndef PngcomponenteditorsHPP #define PngcomponenteditorsHPP diff --git a/Source/hpp/Win32/Release/PngComponentsD.hpp b/Source/hpp/Win32/Release/PngComponentsD.hpp index 095498f..8eedb89 100644 --- a/Source/hpp/Win32/Release/PngComponentsD.hpp +++ b/Source/hpp/Win32/Release/PngComponentsD.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngComponentsD.dpk' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngComponentsD.dpk' rev: 32.00 (Windows) #ifndef PngcomponentsdHPP #define PngcomponentsdHPP @@ -61,6 +61,11 @@ #include // (vcl) #include // (vclimg) #include // (vclx) +// SO_SFX: 250 +// PRG_EXT: .bpl +// BPI_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp +// OBJ_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp +// OBJ_EXT: .obj //-- user supplied ----------------------------------------------------------- diff --git a/Source/hpp/Win32/Release/PngComponentsDDesign.hpp b/Source/hpp/Win32/Release/PngComponentsDDesign.hpp index db1159a..119bd83 100644 --- a/Source/hpp/Win32/Release/PngComponentsDDesign.hpp +++ b/Source/hpp/Win32/Release/PngComponentsDDesign.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngComponentsDDesign.dpk' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngComponentsDDesign.dpk' rev: 32.00 (Windows) #ifndef PngcomponentsddesignHPP #define PngcomponentsddesignHPP @@ -92,6 +92,11 @@ #include // (designide) #include // (designide) #include // (designide) +// SO_SFX: 250 +// PRG_EXT: .bpl +// BPI_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp +// OBJ_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp +// OBJ_EXT: .obj //-- user supplied ----------------------------------------------------------- diff --git a/Source/hpp/Win32/Release/PngComponentsRegister.hpp b/Source/hpp/Win32/Release/PngComponentsRegister.hpp index 5efcab3..cf3b5e7 100644 --- a/Source/hpp/Win32/Release/PngComponentsRegister.hpp +++ b/Source/hpp/Win32/Release/PngComponentsRegister.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngComponentsRegister.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngComponentsRegister.pas' rev: 32.00 (Windows) #ifndef PngcomponentsregisterHPP #define PngcomponentsregisterHPP diff --git a/Source/hpp/Win32/Release/PngFunctions.hpp b/Source/hpp/Win32/Release/PngFunctions.hpp index 248b0f1..a990cbe 100644 --- a/Source/hpp/Win32/Release/PngFunctions.hpp +++ b/Source/hpp/Win32/Release/PngFunctions.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngFunctions.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngFunctions.pas' rev: 32.00 (Windows) #ifndef PngfunctionsHPP #define PngfunctionsHPP diff --git a/Source/hpp/Win32/Release/PngImageList.hpp b/Source/hpp/Win32/Release/PngImageList.hpp index 159153f..3af05f8 100644 --- a/Source/hpp/Win32/Release/PngImageList.hpp +++ b/Source/hpp/Win32/Release/PngImageList.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngImageList.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngImageList.pas' rev: 32.00 (Windows) #ifndef PngimagelistHPP #define PngimagelistHPP @@ -44,7 +44,6 @@ class PASCALIMPLEMENTATION TPngImageList : public Vcl::Controls::TImageList int FLocked; TPngImageCollectionItems* FPngImages; Pngfunctions::TPngOptions FPngOptions; - static bool FIDE_WriteData_Hack; int __fastcall GetHeight(void); int __fastcall GetWidth(void); HIDESBASE void __fastcall SetHeight(const int Value); @@ -72,6 +71,7 @@ class PASCALIMPLEMENTATION TPngImageList : public Vcl::Controls::TImageList HIDESBASE virtual int __fastcall AddImage(Vcl::Imglist::TCustomImageList* Value, int Index); HIDESBASE virtual void __fastcall AddImages(Vcl::Imglist::TCustomImageList* Value); HIDESBASE virtual int __fastcall AddMasked(Vcl::Graphics::TBitmap* Image, System::Uitypes::TColor MaskColor); + virtual void __fastcall Assign(System::Classes::TPersistent* Source); HIDESBASE void __fastcall BeginUpdate(void); HIDESBASE virtual void __fastcall Clear(void); HIDESBASE virtual void __fastcall Delete(int Index); @@ -84,9 +84,9 @@ class PASCALIMPLEMENTATION TPngImageList : public Vcl::Controls::TImageList HIDESBASE virtual void __fastcall Replace(int Index, Vcl::Graphics::TBitmap* Image, Vcl::Graphics::TBitmap* Mask); HIDESBASE virtual void __fastcall ReplaceIcon(int Index, Vcl::Graphics::TIcon* Image); HIDESBASE virtual void __fastcall ReplaceMasked(int Index, Vcl::Graphics::TBitmap* NewImage, System::Uitypes::TColor MaskColor); - /* static */ __property bool IDE_WriteData_Hack = {read=FIDE_WriteData_Hack, write=FIDE_WriteData_Hack, nodefault}; __published: + __property ColorDepth = {default=6}; __property bool EnabledImages = {read=FEnabledImages, write=SetEnabledImages, default=1}; __property Height = {read=GetHeight, write=SetHeight, default=16}; __property TPngImageCollectionItems* PngImages = {read=FPngImages, write=SetPngImages}; diff --git a/Source/hpp/Win32/Release/PngImageListEditor.hpp b/Source/hpp/Win32/Release/PngImageListEditor.hpp index 185075d..9b3791c 100644 --- a/Source/hpp/Win32/Release/PngImageListEditor.hpp +++ b/Source/hpp/Win32/Release/PngImageListEditor.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngImageListEditor.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngImageListEditor.pas' rev: 32.00 (Windows) #ifndef PngimagelisteditorHPP #define PngimagelisteditorHPP diff --git a/Source/hpp/Win32/Release/PngSpeedButton.hpp b/Source/hpp/Win32/Release/PngSpeedButton.hpp index 8291841..513e17c 100644 --- a/Source/hpp/Win32/Release/PngSpeedButton.hpp +++ b/Source/hpp/Win32/Release/PngSpeedButton.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngSpeedButton.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngSpeedButton.pas' rev: 32.00 (Windows) #ifndef PngspeedbuttonHPP #define PngspeedbuttonHPP diff --git a/Source/hpp/Win32/Release/pasall.hpp b/Source/hpp/Win32/Release/pasall.hpp index 47a9e5d..ac18f56 100644 --- a/Source/hpp/Win32/Release/pasall.hpp +++ b/Source/hpp/Win32/Release/pasall.hpp @@ -1,8 +1,8 @@ // CodeGear C++Builder -// Copyright (c) 1995, 2015 by Embarcadero Technologies, Inc. +// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'pasall.pas' rev: 30.00 (Windows) +// (DO NOT EDIT: machine generated header) 'pasall.pas' rev: 32.00 (Windows) #ifndef PasallHPP #define PasallHPP diff --git a/Source/hpp/Win64/Debug/PngBitBtn.hpp b/Source/hpp/Win64/Debug/PngBitBtn.hpp index 3c4300b..fe2aea1 100644 --- a/Source/hpp/Win64/Debug/PngBitBtn.hpp +++ b/Source/hpp/Win64/Debug/PngBitBtn.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngBitBtn.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngBitBtn.pas' rev: 32.00 (Windows) #ifndef PngbitbtnHPP #define PngbitbtnHPP diff --git a/Source/hpp/Win64/Debug/PngButtonFunctions.hpp b/Source/hpp/Win64/Debug/PngButtonFunctions.hpp index ae44c63..112cc34 100644 --- a/Source/hpp/Win64/Debug/PngButtonFunctions.hpp +++ b/Source/hpp/Win64/Debug/PngButtonFunctions.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngButtonFunctions.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngButtonFunctions.pas' rev: 32.00 (Windows) #ifndef PngbuttonfunctionsHPP #define PngbuttonfunctionsHPP diff --git a/Source/hpp/Win64/Debug/PngCheckListBox.hpp b/Source/hpp/Win64/Debug/PngCheckListBox.hpp index 30b86f5..496b5f6 100644 --- a/Source/hpp/Win64/Debug/PngCheckListBox.hpp +++ b/Source/hpp/Win64/Debug/PngCheckListBox.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngCheckListBox.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngCheckListBox.pas' rev: 32.00 (Windows) #ifndef PngchecklistboxHPP #define PngchecklistboxHPP diff --git a/Source/hpp/Win64/Debug/PngComponentsD.hpp b/Source/hpp/Win64/Debug/PngComponentsD.hpp index 54d29e2..dcb738f 100644 --- a/Source/hpp/Win64/Debug/PngComponentsD.hpp +++ b/Source/hpp/Win64/Debug/PngComponentsD.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngComponentsD.dpk' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngComponentsD.dpk' rev: 32.00 (Windows) #ifndef PngcomponentsdHPP #define PngcomponentsdHPP @@ -115,6 +115,11 @@ #include // (vclimg) #include // (vclimg) #include // (vclx) +// SO_SFX: 250 +// PRG_EXT: .bpl +// BPI_DIR: Win64\Debug +// OBJ_DIR: Win64\Debug +// OBJ_EXT: .o //-- user supplied ----------------------------------------------------------- diff --git a/Source/hpp/Win64/Debug/PngFunctions.hpp b/Source/hpp/Win64/Debug/PngFunctions.hpp index 248b0f1..a990cbe 100644 --- a/Source/hpp/Win64/Debug/PngFunctions.hpp +++ b/Source/hpp/Win64/Debug/PngFunctions.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngFunctions.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngFunctions.pas' rev: 32.00 (Windows) #ifndef PngfunctionsHPP #define PngfunctionsHPP diff --git a/Source/hpp/Win64/Debug/PngImageList.hpp b/Source/hpp/Win64/Debug/PngImageList.hpp index 9ec24f3..e603539 100644 --- a/Source/hpp/Win64/Debug/PngImageList.hpp +++ b/Source/hpp/Win64/Debug/PngImageList.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngImageList.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngImageList.pas' rev: 32.00 (Windows) #ifndef PngimagelistHPP #define PngimagelistHPP @@ -44,7 +44,6 @@ class PASCALIMPLEMENTATION TPngImageList : public Vcl::Controls::TImageList int FLocked; TPngImageCollectionItems* FPngImages; Pngfunctions::TPngOptions FPngOptions; - static bool FIDE_WriteData_Hack; int __fastcall GetHeight(void); int __fastcall GetWidth(void); HIDESBASE void __fastcall SetHeight(const int Value); @@ -72,6 +71,7 @@ class PASCALIMPLEMENTATION TPngImageList : public Vcl::Controls::TImageList HIDESBASE virtual int __fastcall AddImage(Vcl::Imglist::TCustomImageList* Value, int Index); HIDESBASE virtual void __fastcall AddImages(Vcl::Imglist::TCustomImageList* Value); HIDESBASE virtual int __fastcall AddMasked(Vcl::Graphics::TBitmap* Image, System::Uitypes::TColor MaskColor); + virtual void __fastcall Assign(System::Classes::TPersistent* Source); HIDESBASE void __fastcall BeginUpdate(void); HIDESBASE virtual void __fastcall Clear(void); HIDESBASE virtual void __fastcall Delete(int Index); @@ -84,9 +84,9 @@ class PASCALIMPLEMENTATION TPngImageList : public Vcl::Controls::TImageList HIDESBASE virtual void __fastcall Replace(int Index, Vcl::Graphics::TBitmap* Image, Vcl::Graphics::TBitmap* Mask); HIDESBASE virtual void __fastcall ReplaceIcon(int Index, Vcl::Graphics::TIcon* Image); HIDESBASE virtual void __fastcall ReplaceMasked(int Index, Vcl::Graphics::TBitmap* NewImage, System::Uitypes::TColor MaskColor); - /* static */ __property bool IDE_WriteData_Hack = {read=FIDE_WriteData_Hack, write=FIDE_WriteData_Hack, nodefault}; __published: + __property ColorDepth = {default=6}; __property bool EnabledImages = {read=FEnabledImages, write=SetEnabledImages, default=1}; __property Height = {read=GetHeight, write=SetHeight, default=16}; __property TPngImageCollectionItems* PngImages = {read=FPngImages, write=SetPngImages}; diff --git a/Source/hpp/Win64/Debug/PngSpeedButton.hpp b/Source/hpp/Win64/Debug/PngSpeedButton.hpp index 8291841..513e17c 100644 --- a/Source/hpp/Win64/Debug/PngSpeedButton.hpp +++ b/Source/hpp/Win64/Debug/PngSpeedButton.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngSpeedButton.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngSpeedButton.pas' rev: 32.00 (Windows) #ifndef PngspeedbuttonHPP #define PngspeedbuttonHPP diff --git a/Source/hpp/Win64/Release/PngBitBtn.hpp b/Source/hpp/Win64/Release/PngBitBtn.hpp index 3c4300b..fe2aea1 100644 --- a/Source/hpp/Win64/Release/PngBitBtn.hpp +++ b/Source/hpp/Win64/Release/PngBitBtn.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngBitBtn.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngBitBtn.pas' rev: 32.00 (Windows) #ifndef PngbitbtnHPP #define PngbitbtnHPP diff --git a/Source/hpp/Win64/Release/PngButtonFunctions.hpp b/Source/hpp/Win64/Release/PngButtonFunctions.hpp index ae44c63..112cc34 100644 --- a/Source/hpp/Win64/Release/PngButtonFunctions.hpp +++ b/Source/hpp/Win64/Release/PngButtonFunctions.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngButtonFunctions.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngButtonFunctions.pas' rev: 32.00 (Windows) #ifndef PngbuttonfunctionsHPP #define PngbuttonfunctionsHPP diff --git a/Source/hpp/Win64/Release/PngCheckListBox.hpp b/Source/hpp/Win64/Release/PngCheckListBox.hpp index 30b86f5..496b5f6 100644 --- a/Source/hpp/Win64/Release/PngCheckListBox.hpp +++ b/Source/hpp/Win64/Release/PngCheckListBox.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngCheckListBox.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngCheckListBox.pas' rev: 32.00 (Windows) #ifndef PngchecklistboxHPP #define PngchecklistboxHPP diff --git a/Source/hpp/Win64/Release/PngComponentsD.hpp b/Source/hpp/Win64/Release/PngComponentsD.hpp index 54d29e2..5db636c 100644 --- a/Source/hpp/Win64/Release/PngComponentsD.hpp +++ b/Source/hpp/Win64/Release/PngComponentsD.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngComponentsD.dpk' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngComponentsD.dpk' rev: 32.00 (Windows) #ifndef PngcomponentsdHPP #define PngcomponentsdHPP @@ -115,6 +115,11 @@ #include // (vclimg) #include // (vclimg) #include // (vclx) +// SO_SFX: 250 +// PRG_EXT: .bpl +// BPI_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp\Win64 +// OBJ_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp\Win64 +// OBJ_EXT: .o //-- user supplied ----------------------------------------------------------- diff --git a/Source/hpp/Win64/Release/PngFunctions.hpp b/Source/hpp/Win64/Release/PngFunctions.hpp index 248b0f1..a990cbe 100644 --- a/Source/hpp/Win64/Release/PngFunctions.hpp +++ b/Source/hpp/Win64/Release/PngFunctions.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngFunctions.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngFunctions.pas' rev: 32.00 (Windows) #ifndef PngfunctionsHPP #define PngfunctionsHPP diff --git a/Source/hpp/Win64/Release/PngImageList.hpp b/Source/hpp/Win64/Release/PngImageList.hpp index 9ec24f3..e603539 100644 --- a/Source/hpp/Win64/Release/PngImageList.hpp +++ b/Source/hpp/Win64/Release/PngImageList.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngImageList.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngImageList.pas' rev: 32.00 (Windows) #ifndef PngimagelistHPP #define PngimagelistHPP @@ -44,7 +44,6 @@ class PASCALIMPLEMENTATION TPngImageList : public Vcl::Controls::TImageList int FLocked; TPngImageCollectionItems* FPngImages; Pngfunctions::TPngOptions FPngOptions; - static bool FIDE_WriteData_Hack; int __fastcall GetHeight(void); int __fastcall GetWidth(void); HIDESBASE void __fastcall SetHeight(const int Value); @@ -72,6 +71,7 @@ class PASCALIMPLEMENTATION TPngImageList : public Vcl::Controls::TImageList HIDESBASE virtual int __fastcall AddImage(Vcl::Imglist::TCustomImageList* Value, int Index); HIDESBASE virtual void __fastcall AddImages(Vcl::Imglist::TCustomImageList* Value); HIDESBASE virtual int __fastcall AddMasked(Vcl::Graphics::TBitmap* Image, System::Uitypes::TColor MaskColor); + virtual void __fastcall Assign(System::Classes::TPersistent* Source); HIDESBASE void __fastcall BeginUpdate(void); HIDESBASE virtual void __fastcall Clear(void); HIDESBASE virtual void __fastcall Delete(int Index); @@ -84,9 +84,9 @@ class PASCALIMPLEMENTATION TPngImageList : public Vcl::Controls::TImageList HIDESBASE virtual void __fastcall Replace(int Index, Vcl::Graphics::TBitmap* Image, Vcl::Graphics::TBitmap* Mask); HIDESBASE virtual void __fastcall ReplaceIcon(int Index, Vcl::Graphics::TIcon* Image); HIDESBASE virtual void __fastcall ReplaceMasked(int Index, Vcl::Graphics::TBitmap* NewImage, System::Uitypes::TColor MaskColor); - /* static */ __property bool IDE_WriteData_Hack = {read=FIDE_WriteData_Hack, write=FIDE_WriteData_Hack, nodefault}; __published: + __property ColorDepth = {default=6}; __property bool EnabledImages = {read=FEnabledImages, write=SetEnabledImages, default=1}; __property Height = {read=GetHeight, write=SetHeight, default=16}; __property TPngImageCollectionItems* PngImages = {read=FPngImages, write=SetPngImages}; diff --git a/Source/hpp/Win64/Release/PngSpeedButton.hpp b/Source/hpp/Win64/Release/PngSpeedButton.hpp index 8291841..513e17c 100644 --- a/Source/hpp/Win64/Release/PngSpeedButton.hpp +++ b/Source/hpp/Win64/Release/PngSpeedButton.hpp @@ -2,7 +2,7 @@ // Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc. // All rights reserved -// (DO NOT EDIT: machine generated header) 'PngSpeedButton.pas' rev: 31.00 (Windows) +// (DO NOT EDIT: machine generated header) 'PngSpeedButton.pas' rev: 32.00 (Windows) #ifndef PngspeedbuttonHPP #define PngspeedbuttonHPP