diff --git a/.gitignore b/.gitignore index f5a6228..25b1ec9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ *.~* *.identcache *.local -*.stat lib/ backup/ +**/Win32 +*.rc +*.dres diff --git a/Example/Example.dproj b/Example/Example.dproj index 2a15ba0..092a89a 100644 --- a/Example/Example.dproj +++ b/Example/Example.dproj @@ -1,7 +1,7 @@  {A8933C7F-51AE-4161-8B2C-FB32D2A0F4A9} - 18.8 + 19.5 VCL Example.dpr True @@ -18,6 +18,11 @@ Base true + + true + Base + true + true Base @@ -29,6 +34,12 @@ true true + + true + Cfg_1 + true + true + true Base @@ -40,6 +51,12 @@ true true + + true + Cfg_2 + true + true + .\$(Platform)\$(Config) .\$(Platform)\$(Config) @@ -62,6 +79,14 @@ 1033 $(BDS)\bin\default_app.manifest + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + $(BDS)\bin\default_app.manifest + DEBUG;$(DCC_Define) true @@ -75,6 +100,9 @@ true PerMonitor + + PerMonitorV2 + false RELEASE;$(DCC_Define) @@ -85,6 +113,9 @@ true PerMonitor + + PerMonitorV2 + MainSource @@ -97,10 +128,6 @@ RCDATA ABOUT - - Cfg_2 - Base - Base @@ -108,6 +135,10 @@ Cfg_1 Base + + Cfg_2 + Base + Delphi.Personality.12 @@ -1004,6 +1035,7 @@ True + False 12 diff --git a/Example/Example.res b/Example/Example.res index e217ad6..14f1d9e 100644 Binary files a/Example/Example.res and b/Example/Example.res differ diff --git a/Example/UFrmExample.pas b/Example/UFrmExample.pas index 4c24ca9..50d2507 100644 --- a/Example/UFrmExample.pas +++ b/Example/UFrmExample.pas @@ -2,10 +2,8 @@ interface -uses Vcl.Forms, Vcl.ImgList, Vcl.Controls, System.Classes, Vcl.DzHTMLText, - {$IF CompilerVersion >= 29}System.ImageList,{$ENDIF} - // - Vcl.Graphics; +uses Vcl.Forms, Vcl.ImgList, Vcl.Controls, System.Classes, System.ImageList, + Vcl.DzHTMLText, Vcl.Graphics; type TForm1 = class(TForm) @@ -15,7 +13,7 @@ TForm1 = class(TForm) Lb3: TDzHTMLText; procedure FormCreate(Sender: TObject); procedure LbRetrieveImgRes(Sender: TObject; const ResourceName: string; - Picture: TAnyPicture; var Handled: Boolean); + Picture: TPicture; var Handled: Boolean); procedure LbLinkClick(Sender: TObject; Link: TDHBaseLink; var Handled: Boolean); end; @@ -45,7 +43,7 @@ procedure TForm1.LbLinkClick(Sender: TObject; Link: TDHBaseLink; end; procedure TForm1.LbRetrieveImgRes(Sender: TObject; const ResourceName: string; - Picture: TAnyPicture; var Handled: Boolean); + Picture: TPicture; var Handled: Boolean); begin if ResourceName='LOGO' then begin diff --git a/Test/TestApp.dproj b/Test/TestApp.dproj index 65b191b..ce7ae73 100644 --- a/Test/TestApp.dproj +++ b/Test/TestApp.dproj @@ -1,7 +1,7 @@  {8D65E6E8-CD34-4125-ABA8-3DEF2EBEAF3D} - 18.8 + 19.5 VCL TestApp.dpr True @@ -18,6 +18,11 @@ Base true + + true + Base + true + true Base @@ -29,6 +34,12 @@ true true + + true + Cfg_1 + true + true + true Base @@ -40,6 +51,12 @@ true true + + true + Cfg_2 + true + true + .\$(Platform)\$(Config) .\$(Platform)\$(Config) @@ -62,6 +79,14 @@ 1033 $(BDS)\bin\default_app.manifest + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + $(BDS)\bin\default_app.manifest + DEBUG;$(DCC_Define) true @@ -75,6 +100,9 @@ true PerMonitorV2 + + PerMonitorV2 + false RELEASE;$(DCC_Define) @@ -85,6 +113,9 @@ true PerMonitorV2 + + PerMonitorV2 + MainSource @@ -93,10 +124,6 @@
FrmMain
dfm - - Cfg_2 - Base - Base @@ -104,6 +131,10 @@ Cfg_1 Base + + Cfg_2 + Base +
Delphi.Personality.12 @@ -950,6 +981,7 @@ True + False 12 diff --git a/Test/TestApp.res b/Test/TestApp.res index 5bc1f5f..9a2bf1b 100644 Binary files a/Test/TestApp.res and b/Test/TestApp.res differ diff --git a/Test/UFrmMain.dfm b/Test/UFrmMain.dfm index c0ac304..5ba79bb 100644 --- a/Test/UFrmMain.dfm +++ b/Test/UFrmMain.dfm @@ -195,7 +195,7 @@ object FrmMain: TFrmMain CustomStyles = < item Ident = 'Custom' - FontColor = clDarkorange + FontColor = 33023 end item Ident = 'Other' @@ -248,8 +248,8 @@ object FrmMain: TFrmMain 'new line with specific offset' - 'new line with specific full o' + - 'ffset') + 'new line with specific full' + + ' offset') AutoHeight = True Offset.Top = 20 Offset.Bottom = 50