[sword-svn] r496 - in branches/BCB5/TntUnicodeControls: . CBuilder Delphi/bds4 Delphi/d6 Delphi/d7 Delphi/d9 Design Example Source
chrislit at crosswire.org
chrislit at crosswire.org
Sun Mar 8 20:21:01 MST 2009
Author: chrislit
Date: 2009-03-08 20:21:01 -0700 (Sun, 08 Mar 2009)
New Revision: 496
Modified:
branches/BCB5/TntUnicodeControls/CBuilder/TntLibD.bpk
branches/BCB5/TntUnicodeControls/CBuilder/TntLibR.bpk
branches/BCB5/TntUnicodeControls/Delphi/bds4/TntUnicodeVcl.bdsproj
branches/BCB5/TntUnicodeControls/Delphi/bds4/TntUnicodeVcl.res
branches/BCB5/TntUnicodeControls/Delphi/bds4/TntUnicodeVcl_Design.bdsproj
branches/BCB5/TntUnicodeControls/Delphi/bds4/TntUnicodeVcl_Design.res
branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicodeVcl_D60.dof
branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicodeVcl_D60.res
branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicodeVcl_R60.dof
branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicodeVcl_R60.res
branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicode_6.bpg
branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_D70.dof
branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_D70.res
branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_D70_DATASNAP.dof
branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_D70_DATASNAP.res
branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_R70.dof
branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_R70.res
branches/BCB5/TntUnicodeControls/Delphi/d9/TntUnicodeVcl_D90.bdsproj
branches/BCB5/TntUnicodeControls/Delphi/d9/TntUnicodeVcl_D90.res
branches/BCB5/TntUnicodeControls/Delphi/d9/TntUnicodeVcl_R90.bdsproj
branches/BCB5/TntUnicodeControls/Delphi/d9/TntUnicodeVcl_R90.res
branches/BCB5/TntUnicodeControls/Design/TntActions_Design.pas
branches/BCB5/TntUnicodeControls/Design/TntComCtrls_Design.pas
branches/BCB5/TntUnicodeControls/Design/TntDBClientActns_Design.pas
branches/BCB5/TntUnicodeControls/Design/TntDBCtrls.dcr
branches/BCB5/TntUnicodeControls/Design/TntDBGrids_Design.pas
branches/BCB5/TntUnicodeControls/Design/TntDesignEditors_Design.pas
branches/BCB5/TntUnicodeControls/Design/TntForms_Design.pas
branches/BCB5/TntUnicodeControls/Design/TntMenus_Design.pas
branches/BCB5/TntUnicodeControls/Design/TntStrEdit_Design.pas
branches/BCB5/TntUnicodeControls/Design/TntUnicodeVcl_Register.pas
branches/BCB5/TntUnicodeControls/Design/TntWideStringProperty_Design.pas
branches/BCB5/TntUnicodeControls/Example/ExampleUnicode.dof
branches/BCB5/TntUnicodeControls/Example/ExampleUnicode.res
branches/BCB5/TntUnicodeControls/License.rtf
branches/BCB5/TntUnicodeControls/Source/ActiveIMM_TLB.pas
branches/BCB5/TntUnicodeControls/Source/TntActnList.pas
branches/BCB5/TntUnicodeControls/Source/TntAxCtrls.pas
branches/BCB5/TntUnicodeControls/Source/TntBandActn.pas
branches/BCB5/TntUnicodeControls/Source/TntButtons.pas
branches/BCB5/TntUnicodeControls/Source/TntCheckLst.pas
branches/BCB5/TntUnicodeControls/Source/TntClasses.pas
branches/BCB5/TntUnicodeControls/Source/TntClipBrd.pas
branches/BCB5/TntUnicodeControls/Source/TntComCtrls.pas
branches/BCB5/TntUnicodeControls/Source/TntControls.pas
branches/BCB5/TntUnicodeControls/Source/TntDB.pas
branches/BCB5/TntUnicodeControls/Source/TntDBActns.pas
branches/BCB5/TntUnicodeControls/Source/TntDBClientActns.pas
branches/BCB5/TntUnicodeControls/Source/TntDBCtrls.pas
branches/BCB5/TntUnicodeControls/Source/TntDBGrids.pas
branches/BCB5/TntUnicodeControls/Source/TntDBLogDlg.pas
branches/BCB5/TntUnicodeControls/Source/TntDialogs.pas
branches/BCB5/TntUnicodeControls/Source/TntExtActns.pas
branches/BCB5/TntUnicodeControls/Source/TntExtCtrls.pas
branches/BCB5/TntUnicodeControls/Source/TntExtDlgs.pas
branches/BCB5/TntUnicodeControls/Source/TntFileCtrl.pas
branches/BCB5/TntUnicodeControls/Source/TntFormatStrUtils.pas
branches/BCB5/TntUnicodeControls/Source/TntForms.pas
branches/BCB5/TntUnicodeControls/Source/TntGraphics.pas
branches/BCB5/TntUnicodeControls/Source/TntGrids.pas
branches/BCB5/TntUnicodeControls/Source/TntListActns.pas
branches/BCB5/TntUnicodeControls/Source/TntMenus.pas
branches/BCB5/TntUnicodeControls/Source/TntRegistry.pas
branches/BCB5/TntUnicodeControls/Source/TntStdActns.pas
branches/BCB5/TntUnicodeControls/Source/TntStdCtrls.pas
branches/BCB5/TntUnicodeControls/Source/TntSysUtils.pas
branches/BCB5/TntUnicodeControls/Source/TntSystem.pas
branches/BCB5/TntUnicodeControls/Source/TntWideStrUtils.pas
branches/BCB5/TntUnicodeControls/Source/TntWideStrings.pas
branches/BCB5/TntUnicodeControls/Source/TntWindows.pas
Log:
Updated TntUnicodeControls to final version (2.3.0) -- we should see about hooking this up to BCB5
Modified: branches/BCB5/TntUnicodeControls/CBuilder/TntLibD.bpk
===================================================================
--- branches/BCB5/TntUnicodeControls/CBuilder/TntLibD.bpk 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/CBuilder/TntLibD.bpk 2009-03-09 03:21:01 UTC (rev 496)
@@ -29,7 +29,7 @@
<PACKAGES value="TntLibR.bpi designide.bpi dcldb.bpi designdgm.bpi dclstd.bpi dclact.bpi
rtl.bpi vcl.bpi vclx.bpi vcldb.bpi dbrtl.bpi"/>
<PATHCPP value=".;"/>
- <PATHPAS value=".;..\Design;.."/>
+ <PATHPAS value=".;..\Design;..\Design;..\Design;..\Design;..\Design;..\Design;..\Design;..\Design;..\Design;..\Source"/>
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
@@ -38,14 +38,14 @@
<USERDEFINES value=""/>
<SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
<MAINSOURCE value="TntLibD.cpp"/>
- <INCLUDEPATH value="..;$(BCB)\include;$(BCB)\include\vcl;..\Design"/>
- <LIBPATH value="..;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\Projects\lib;..\Design"/>
+ <INCLUDEPATH value="..\Source;..\;..;$(BCB)\include;$(BCB)\include\vcl;..\Design"/>
+ <LIBPATH value="..\Source;..\;..;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\Projects\lib;..\Design"/>
<WARNINGS value="-w-par"/>
<OTHERFILES value=""/>
</MACROS>
<OPTIONS>
- <IDLCFLAGS value="-I..\. -I$(BCB)\include -I$(BCB)\include\vcl -I.. -I..\Design -src_suffix
- cpp -boa"/>
+ <IDLCFLAGS value="-I..\Source -I..\. -I.. -I$(BCB)\include -I$(BCB)\include\vcl -I..\Design
+ -src_suffix cpp -boa"/>
<CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -c -tWM"/>
<PFLAGS value="-N2. -N0. -$Y- -$L- -$D- -$A8 -v -JPHNE -M -LUdclstd"/>
<RFLAGS value=""/>
@@ -82,7 +82,7 @@
<FILE FILENAME="..\Design\TntDialogs.dcr" FORMNAME="" UNITNAME="" CONTAINERID="DcrTool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\Design\TntExtDlgs.dcr" FORMNAME="" UNITNAME="" CONTAINERID="DcrTool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\Design\TntWideStringProperty_Design.pas" FORMNAME="" UNITNAME="TntWideStringProperty_Design" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\TntBandActn.pas" FORMNAME="" UNITNAME="TntBandActn" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\Source\TntBandActn.pas" FORMNAME="" UNITNAME="TntBandActn" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="TntLibR.bpi" FORMNAME="" UNITNAME="TntLibR" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="designide.bpi" FORMNAME="" UNITNAME="designide" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="dcldb.bpi" FORMNAME="" UNITNAME="dcldb" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
Modified: branches/BCB5/TntUnicodeControls/CBuilder/TntLibR.bpk
===================================================================
--- branches/BCB5/TntUnicodeControls/CBuilder/TntLibR.bpk 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/CBuilder/TntLibR.bpk 2009-03-09 03:21:01 UTC (rev 496)
@@ -16,10 +16,10 @@
<IDLFILES value=""/>
<IDLGENFILES value=""/>
<DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES) ..\TntDBLogDlg.dfm"/>
+ <RESDEPEN value="$(RESFILES) ..\Source\TntDBLogDlg.dfm"/>
<LIBFILES value=""/>
- <LIBRARIES value="bcbsmp.lib dclocx.lib dsnapcon.lib dsnapcrba.lib dss.lib bcb2kaxserver.lib
- indy.lib dbxcds.lib soaprtl.lib nmfast.lib dbexpress.lib inetdbxpress.lib
+ <LIBRARIES value="dclocx.lib dsnapcon.lib dsnapcrba.lib dss.lib bcb2kaxserver.lib indy.lib
+ dbxcds.lib soaprtl.lib nmfast.lib dbexpress.lib inetdbxpress.lib
inetdb.lib inetdbbde.lib inet.lib xmlrtl.lib visualdbclx.lib ibxpress.lib
teeqr.lib tee.lib teedb.lib teeui.lib bdecds.lib cds.lib dsnap.lib
vcldbx.lib bdertl.lib qrpt.lib adortl.lib"/>
@@ -28,9 +28,9 @@
ibxpress.lib visualdbclx.lib xmlrtl.lib inet.lib inetdbbde.lib inetdb.lib
inetdbxpress.lib dbexpress.lib nmfast.lib soaprtl.lib dbxcds.lib indy.lib
bcb2kaxserver.lib dss.lib dsnapcrba.lib dsnapcon.lib dclocx.lib bcbsmp.lib"/>
- <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi vcldb.bpi dbrtl.bpi"/>
+ <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi vcldb.bpi dbrtl.bpi bcbsmp.bpi"/>
<PATHCPP value=".;"/>
- <PATHPAS value=".;.."/>
+ <PATHPAS value=".;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source;..\Source"/>
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
@@ -39,13 +39,13 @@
<USERDEFINES value=""/>
<SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
<MAINSOURCE value="TntLibR.cpp"/>
- <INCLUDEPATH value="..;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="$(BCB)\Projects\Lib;..;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <INCLUDEPATH value="..\Source;..;$(BCB)\include;$(BCB)\include\vcl"/>
+ <LIBPATH value="..\Source;$(BCB)\Projects\Lib;..;$(BCB)\lib\obj;$(BCB)\lib"/>
<WARNINGS value="-w-par"/>
<OTHERFILES value=""/>
</MACROS>
<OPTIONS>
- <IDLCFLAGS value="-I..\. -I$(BCB)\include -I$(BCB)\include\vcl -I.. -src_suffix cpp -boa"/>
+ <IDLCFLAGS value="-I..\Source -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -boa"/>
<CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -c -tWM"/>
<PFLAGS value="-N2. -N0. -$Y- -$L- -$D- -$A8 -v -JPHNE -M"/>
<RFLAGS value=""/>
@@ -100,6 +100,7 @@
<FILE FILENAME="..\Source\vclx.bpi" FORMNAME="" UNITNAME="vclx" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\Source\vcldb.bpi" FORMNAME="" UNITNAME="vcldb" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\Source\dbrtl.bpi" FORMNAME="" UNITNAME="dbrtl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="bcbsmp.bpi" FORMNAME="" UNITNAME="bcbsmp" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
</FILELIST>
<BUILDTOOLS>
</BUILDTOOLS>
Modified: branches/BCB5/TntUnicodeControls/Delphi/bds4/TntUnicodeVcl.bdsproj
===================================================================
--- branches/BCB5/TntUnicodeControls/Delphi/bds4/TntUnicodeVcl.bdsproj 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Delphi/bds4/TntUnicodeVcl.bdsproj 2009-03-09 03:21:01 UTC (rev 496)
@@ -155,8 +155,8 @@
<VersionInfo Name="IncludeVerInfo" Type="Boolean">True</VersionInfo>
<VersionInfo Name="AutoIncBuild" Type="Boolean">False</VersionInfo>
<VersionInfo Name="MajorVer" Type="Integer">2</VersionInfo>
- <VersionInfo Name="MinorVer" Type="Integer">2</VersionInfo>
- <VersionInfo Name="Release" Type="Integer">7</VersionInfo>
+ <VersionInfo Name="MinorVer" Type="Integer">3</VersionInfo>
+ <VersionInfo Name="Release" Type="Integer">0</VersionInfo>
<VersionInfo Name="Build" Type="Integer">1</VersionInfo>
<VersionInfo Name="Debug" Type="Boolean">False</VersionInfo>
<VersionInfo Name="PreRelease" Type="Boolean">False</VersionInfo>
@@ -169,13 +169,13 @@
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="FileDescription" Type="String"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion" Type="String">2.2.7.1</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion" Type="String">2.3.0.1</VersionInfoKeys>
<VersionInfoKeys Name="InternalName" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="LegalCopyright" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="OriginalFilename" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="ProductName" Type="String"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion" Type="String">2.2.7.1</VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion" Type="String">2.3.0.1</VersionInfoKeys>
</VersionInfoKeys>
</Delphi.Personality>
<StarTeamAssociation></StarTeamAssociation>
Modified: branches/BCB5/TntUnicodeControls/Delphi/bds4/TntUnicodeVcl.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/TntUnicodeControls/Delphi/bds4/TntUnicodeVcl_Design.bdsproj
===================================================================
--- branches/BCB5/TntUnicodeControls/Delphi/bds4/TntUnicodeVcl_Design.bdsproj 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Delphi/bds4/TntUnicodeVcl_Design.bdsproj 2009-03-09 03:21:01 UTC (rev 496)
@@ -155,8 +155,8 @@
<VersionInfo Name="IncludeVerInfo" Type="Boolean">True</VersionInfo>
<VersionInfo Name="AutoIncBuild" Type="Boolean">False</VersionInfo>
<VersionInfo Name="MajorVer" Type="Integer">2</VersionInfo>
- <VersionInfo Name="MinorVer" Type="Integer">2</VersionInfo>
- <VersionInfo Name="Release" Type="Integer">7</VersionInfo>
+ <VersionInfo Name="MinorVer" Type="Integer">3</VersionInfo>
+ <VersionInfo Name="Release" Type="Integer">0</VersionInfo>
<VersionInfo Name="Build" Type="Integer">1</VersionInfo>
<VersionInfo Name="Debug" Type="Boolean">False</VersionInfo>
<VersionInfo Name="PreRelease" Type="Boolean">False</VersionInfo>
@@ -169,13 +169,13 @@
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="FileDescription" Type="String"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion" Type="String">2.2.7.1</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion" Type="String">2.3.0.1</VersionInfoKeys>
<VersionInfoKeys Name="InternalName" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="LegalCopyright" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="OriginalFilename" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="ProductName" Type="String"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion" Type="String">2.2.7.1</VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion" Type="String">2.3.0.1</VersionInfoKeys>
</VersionInfoKeys>
</Delphi.Personality>
<StarTeamAssociation></StarTeamAssociation>
Modified: branches/BCB5/TntUnicodeControls/Delphi/bds4/TntUnicodeVcl_Design.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicodeVcl_D60.dof
===================================================================
--- branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicodeVcl_D60.dof 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicodeVcl_D60.dof 2009-03-09 03:21:01 UTC (rev 496)
@@ -64,8 +64,8 @@
IncludeVerInfo=1
AutoIncBuild=0
MajorVer=2
-MinorVer=2
-Release=7
+MinorVer=3
+Release=0
Build=1
Debug=0
PreRelease=0
@@ -77,11 +77,11 @@
[Version Info Keys]
CompanyName=
FileDescription=
-FileVersion=2.2.7.1
+FileVersion=2.3.0.1
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
-ProductVersion=2.2.7.1
+ProductVersion=2.3.0.1
Comments=
Modified: branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicodeVcl_D60.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicodeVcl_R60.dof
===================================================================
--- branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicodeVcl_R60.dof 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicodeVcl_R60.dof 2009-03-09 03:21:01 UTC (rev 496)
@@ -64,8 +64,8 @@
IncludeVerInfo=1
AutoIncBuild=0
MajorVer=2
-MinorVer=2
-Release=7
+MinorVer=3
+Release=0
Build=1
Debug=0
PreRelease=0
@@ -77,11 +77,11 @@
[Version Info Keys]
CompanyName=
FileDescription=
-FileVersion=2.2.7.1
+FileVersion=2.3.0.1
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
-ProductVersion=2.2.7.1
+ProductVersion=2.3.0.1
Comments=
Modified: branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicodeVcl_R60.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicode_6.bpg
===================================================================
--- branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicode_6.bpg 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Delphi/d6/TntUnicode_6.bpg 2009-03-09 03:21:01 UTC (rev 496)
@@ -9,7 +9,7 @@
DCC = $(ROOT)\bin\dcc32.exe $**
BRCC = $(ROOT)\bin\brcc32.exe $**
#------------------------------------------------------------------------------
-PROJECTS = TntUnicodeVcl_R60.bpl TntUnicodeVcl_D60.bpl TntThemeManager6.bpl
+PROJECTS = TntUnicodeVcl_R60.bpl TntUnicodeVcl_D60.bpl
#------------------------------------------------------------------------------
default: $(PROJECTS)
#------------------------------------------------------------------------------
@@ -20,7 +20,4 @@
TntUnicodeVcl_D60.bpl: TntUnicodeVcl_D60.dpk
$(DCC)
-TntThemeManager6.bpl: TntThemeManager6.dpk
- $(DCC)
-
Modified: branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_D70.dof
===================================================================
--- branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_D70.dof 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_D70.dof 2009-03-09 03:21:01 UTC (rev 496)
@@ -113,8 +113,8 @@
IncludeVerInfo=1
AutoIncBuild=0
MajorVer=2
-MinorVer=2
-Release=7
+MinorVer=3
+Release=0
Build=1
Debug=0
PreRelease=0
@@ -126,11 +126,11 @@
[Version Info Keys]
CompanyName=
FileDescription=
-FileVersion=2.2.7.1
+FileVersion=2.3.0.1
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
-ProductVersion=2.2.7.1
+ProductVersion=2.3.0.1
Comments=
Modified: branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_D70.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_D70_DATASNAP.dof
===================================================================
--- branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_D70_DATASNAP.dof 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_D70_DATASNAP.dof 2009-03-09 03:21:01 UTC (rev 496)
@@ -113,8 +113,8 @@
IncludeVerInfo=1
AutoIncBuild=0
MajorVer=2
-MinorVer=2
-Release=7
+MinorVer=3
+Release=0
Build=1
Debug=0
PreRelease=0
@@ -126,11 +126,11 @@
[Version Info Keys]
CompanyName=
FileDescription=
-FileVersion=2.2.7.1
+FileVersion=2.3.0.1
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
-ProductVersion=2.2.7.1
+ProductVersion=2.3.0.1
Comments=
Modified: branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_D70_DATASNAP.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_R70.dof
===================================================================
--- branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_R70.dof 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_R70.dof 2009-03-09 03:21:01 UTC (rev 496)
@@ -64,8 +64,8 @@
IncludeVerInfo=1
AutoIncBuild=0
MajorVer=2
-MinorVer=2
-Release=7
+MinorVer=3
+Release=0
Build=1
Debug=0
PreRelease=0
@@ -77,11 +77,11 @@
[Version Info Keys]
CompanyName=
FileDescription=
-FileVersion=2.2.7.1
+FileVersion=2.3.0.1
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
-ProductVersion=2.2.7.1
+ProductVersion=2.3.0.1
Comments=
Modified: branches/BCB5/TntUnicodeControls/Delphi/d7/TntUnicodeVcl_R70.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/TntUnicodeControls/Delphi/d9/TntUnicodeVcl_D90.bdsproj
===================================================================
--- branches/BCB5/TntUnicodeControls/Delphi/d9/TntUnicodeVcl_D90.bdsproj 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Delphi/d9/TntUnicodeVcl_D90.bdsproj 2009-03-09 03:21:01 UTC (rev 496)
@@ -146,8 +146,8 @@
<VersionInfo Name="IncludeVerInfo" Type="Boolean">True</VersionInfo>
<VersionInfo Name="AutoIncBuild" Type="Boolean">False</VersionInfo>
<VersionInfo Name="MajorVer" Type="Integer">2</VersionInfo>
- <VersionInfo Name="MinorVer" Type="Integer">2</VersionInfo>
- <VersionInfo Name="Release" Type="Integer">7</VersionInfo>
+ <VersionInfo Name="MinorVer" Type="Integer">3</VersionInfo>
+ <VersionInfo Name="Release" Type="Integer">0</VersionInfo>
<VersionInfo Name="Build" Type="Integer">1</VersionInfo>
<VersionInfo Name="Debug" Type="Boolean">False</VersionInfo>
<VersionInfo Name="PreRelease" Type="Boolean">False</VersionInfo>
@@ -160,13 +160,13 @@
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="FileDescription" Type="String"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion" Type="String">2.2.7.1</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion" Type="String">2.3.0.1</VersionInfoKeys>
<VersionInfoKeys Name="InternalName" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="LegalCopyright" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="OriginalFilename" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="ProductName" Type="String"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion" Type="String">2.2.7.1</VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion" Type="String">2.3.0.1</VersionInfoKeys>
</VersionInfoKeys>
</Delphi.Personality>
</BorlandProject>
Modified: branches/BCB5/TntUnicodeControls/Delphi/d9/TntUnicodeVcl_D90.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/TntUnicodeControls/Delphi/d9/TntUnicodeVcl_R90.bdsproj
===================================================================
--- branches/BCB5/TntUnicodeControls/Delphi/d9/TntUnicodeVcl_R90.bdsproj 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Delphi/d9/TntUnicodeVcl_R90.bdsproj 2009-03-09 03:21:01 UTC (rev 496)
@@ -146,8 +146,8 @@
<VersionInfo Name="IncludeVerInfo" Type="Boolean">True</VersionInfo>
<VersionInfo Name="AutoIncBuild" Type="Boolean">False</VersionInfo>
<VersionInfo Name="MajorVer" Type="Integer">2</VersionInfo>
- <VersionInfo Name="MinorVer" Type="Integer">2</VersionInfo>
- <VersionInfo Name="Release" Type="Integer">7</VersionInfo>
+ <VersionInfo Name="MinorVer" Type="Integer">3</VersionInfo>
+ <VersionInfo Name="Release" Type="Integer">0</VersionInfo>
<VersionInfo Name="Build" Type="Integer">1</VersionInfo>
<VersionInfo Name="Debug" Type="Boolean">False</VersionInfo>
<VersionInfo Name="PreRelease" Type="Boolean">False</VersionInfo>
@@ -160,13 +160,13 @@
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="FileDescription" Type="String"></VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion" Type="String">2.2.7.1</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion" Type="String">2.3.0.1</VersionInfoKeys>
<VersionInfoKeys Name="InternalName" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="LegalCopyright" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="OriginalFilename" Type="String"></VersionInfoKeys>
<VersionInfoKeys Name="ProductName" Type="String"></VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion" Type="String">2.2.7.1</VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion" Type="String">2.3.0.1</VersionInfoKeys>
</VersionInfoKeys>
</Delphi.Personality>
</BorlandProject>
Modified: branches/BCB5/TntUnicodeControls/Delphi/d9/TntUnicodeVcl_R90.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/TntUnicodeControls/Design/TntActions_Design.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Design/TntActions_Design.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Design/TntActions_Design.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Design/TntComCtrls_Design.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Design/TntComCtrls_Design.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Design/TntComCtrls_Design.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -57,7 +57,7 @@
implementation
uses
- SysUtils, TntSysUtils, DsnConst, TntComCtrls, TntDesignEditors_Design;
+ SysUtils, DsnConst, TntComCtrls, TntDesignEditors_Design;
procedure Register;
begin
Modified: branches/BCB5/TntUnicodeControls/Design/TntDBClientActns_Design.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Design/TntDBClientActns_Design.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Design/TntDBClientActns_Design.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Design/TntDBCtrls.dcr
===================================================================
(Binary files differ)
Modified: branches/BCB5/TntUnicodeControls/Design/TntDBGrids_Design.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Design/TntDBGrids_Design.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Design/TntDBGrids_Design.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Design/TntDesignEditors_Design.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Design/TntDesignEditors_Design.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Design/TntDesignEditors_Design.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -46,7 +46,7 @@
implementation
uses
- SysUtils, TntSysUtils;
+ SysUtils;
{ TTntDesignerSelections }
Modified: branches/BCB5/TntUnicodeControls/Design/TntForms_Design.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Design/TntForms_Design.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Design/TntForms_Design.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -16,7 +16,7 @@
interface
uses
- Classes, Windows, DesignIntf, ToolsApi, Forms;
+ Classes, Windows, DesignIntf, ToolsApi;
type HICON = LongWord;
@@ -28,6 +28,7 @@
protected
function ThisFormName: WideString;
function ThisFormClass: TComponentClass; virtual; abstract;
+ function ThisFormUnit: WideString;
public
// IOTAWizard
function GetIDString: AnsiString;
@@ -43,7 +44,7 @@
// IOTARepositoryWizard60
function GetDesigner: AnsiString;
{$ENDIF}
- {$IFDEF COMPILER_9_UP}
+ {$IFDEF COMPILER_9_UP}
// IOTARepositoryWizard80
function GetGalleryCategory: IOTAGalleryCategory;
function GetPersonality: AnsiString;
@@ -133,6 +134,7 @@
TTntNewFormCreator = class(TInterfacedObject, IOTACreator, IOTAModuleCreator)
private
FAncestorName: WideString;
+ FUnitName: WideString;
public
// IOTACreator
function GetCreatorType: AnsiString;
@@ -153,7 +155,7 @@
function NewIntfSource(const ModuleIdent, FormIdent, AncestorIdent: AnsiString): IOTAFile;
procedure FormCreated(const FormEditor: IOTAFormEditor);
public
- constructor Create(const FormName, AncestorName: WideString);
+ constructor Create(const UnitName, AncestorName: WideString);
end;
TTntSourceFile = class(TInterfacedObject, IOTAFile)
@@ -165,9 +167,10 @@
constructor Create(const Source: AnsiString);
end;
-constructor TTntNewFormCreator.Create(const FormName, AncestorName: WideString);
+constructor TTntNewFormCreator.Create(const UnitName, AncestorName: WideString);
begin
inherited Create;
+ FUnitName := UnitName;
FAncestorName := AncestorName;
end;
@@ -249,7 +252,7 @@
'' + #13#10 +
'uses' + #13#10 +
' Windows, Messages, SysUtils' + {$IFDEF COMPILER_6_UP}', Variants' + {$ENDIF}
- ', Classes, Graphics, Controls, Forms,' + #13#10 + ' Dialogs, TntForms;' + #13#10 +
+ ', Classes, Graphics, Controls, Forms,' + #13#10 + ' Dialogs, %s;' + #13#10 +
'' + #13#10 +
'type' + #13#10 +
' T%s = class(T%s)' + #13#10 +
@@ -267,9 +270,9 @@
'{$R *.DFM}' + #13#10 +
'' + #13#10 +
'end.';
-begin
- Result := TTntSourceFile.Create(Format{TNT-ALLOW Format}(cSource, [ModuleIdent, FormIdent,
- AncestorIdent, FormIdent, FormIdent]));
+begin
+ Result := TTntSourceFile.Create(Format{TNT-ALLOW Format}(cSource,
+ [ModuleIdent, FUnitName, FormIdent, AncestorIdent, FormIdent, FormIdent]));
end;
function TTntNewFormCreator.NewIntfSource(const ModuleIdent, FormIdent, AncestorIdent: AnsiString): IOTAFile;
@@ -285,6 +288,11 @@
Delete(Result, 1, 1); // drop the 'T'
end;
+function TTntNewFormWizard.ThisFormUnit: WideString;
+begin
+ Result := GetTypeData(ThisFormClass.ClassInfo).UnitName;
+end;
+
function TTntNewFormWizard.GetName: AnsiString;
begin
Result := ThisFormName;
@@ -319,7 +327,7 @@
var
Module: IOTAModule;
begin
- Module := (BorlandIDEServices as IOTAModuleServices).CreateModule(TTntNewFormCreator.Create('', ThisFormName));
+ Module := (BorlandIDEServices as IOTAModuleServices).CreateModule(TTntNewFormCreator.Create(ThisFormUnit, ThisFormName));
end;
{$IFDEF COMPILER_6_UP}
Modified: branches/BCB5/TntUnicodeControls/Design/TntMenus_Design.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Design/TntMenus_Design.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Design/TntMenus_Design.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -29,7 +29,7 @@
{$ENDIF}
uses
- Windows, Classes, Menus, TntMenus, Forms, Messages, Controls,
+ Windows, Classes, Menus, Messages,
{$IFDEF MNUBUILD_AVAILABLE} MnuBuild, {$ENDIF}
DesignEditors, DesignIntf;
@@ -47,7 +47,7 @@
uses
{$IFDEF MNUBUILD_AVAILABLE} MnuConst, {$ELSE} DesignWindows, {$ENDIF} SysUtils, Graphics, ActnList,
- Dialogs, TntDesignEditors_Design, TntActnList;
+ Controls, Forms, TntDesignEditors_Design, TntActnList, TntMenus;
procedure Register;
begin
Modified: branches/BCB5/TntUnicodeControls/Design/TntStrEdit_Design.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Design/TntStrEdit_Design.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Design/TntStrEdit_Design.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -18,9 +18,9 @@
interface
uses
- Windows, Classes, Graphics, Forms, Controls, Buttons, Dialogs, Menus, StdCtrls,
+ Windows, Classes, Graphics, Controls, Buttons, Menus, StdCtrls,
TntStdCtrls, ExtCtrls, DesignEditors, DesignIntf,
- TntForms, TntMenus, TntExtCtrls, TntClasses, TntDialogs;
+ TntForms, TntMenus, TntClasses, TntDialogs;
type
TTntStrEditDlg = class(TTntForm)
@@ -76,8 +76,8 @@
{$R *.dfm}
uses
- ActiveX, SysUtils, DesignConst, ToolsAPI, IStreams, LibHelp,
- StFilSys, TypInfo, TntDesignEditors_Design, TntSystem, TntSysUtils;
+ ActiveX, Forms, SysUtils, DesignConst, ToolsAPI, IStreams, LibHelp,
+ StFilSys, TypInfo, TntSystem, TntDesignEditors_Design;
procedure Register;
begin
Modified: branches/BCB5/TntUnicodeControls/Design/TntUnicodeVcl_Register.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Design/TntUnicodeVcl_Register.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Design/TntUnicodeVcl_Register.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Design/TntWideStringProperty_Design.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Design/TntWideStringProperty_Design.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Design/TntWideStringProperty_Design.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -24,7 +24,7 @@
{$ENDIF}
uses
- Classes, Messages, Windows, Graphics, Controls, Forms, TypInfo, TntDesignEditors_Design,
+ Classes, Messages, Windows, Graphics, TypInfo, TntDesignEditors_Design,
DesignIntf, DesignEditors, VCLEditors;
type
@@ -76,9 +76,9 @@
implementation
uses
- SysUtils, StdCtrls, TntClasses, TntGraphics, TntControls,
- TntSysUtils, TntStrEdit_Design, TntSystem, Consts,
- RTLConsts, TntWindows;
+ Controls, Forms, SysUtils, StdCtrls, TntGraphics, TntControls,
+ TntSysUtils, TntSystem, Consts,
+ RTLConsts;
procedure Register;
begin
Modified: branches/BCB5/TntUnicodeControls/Example/ExampleUnicode.dof
===================================================================
--- branches/BCB5/TntUnicodeControls/Example/ExampleUnicode.dof 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Example/ExampleUnicode.dof 2009-03-09 03:21:01 UTC (rev 496)
@@ -64,8 +64,8 @@
IncludeVerInfo=0
AutoIncBuild=0
MajorVer=2
-MinorVer=2
-Release=7
+MinorVer=3
+Release=0
Build=1
Debug=0
PreRelease=0
@@ -77,11 +77,11 @@
[Version Info Keys]
CompanyName=
FileDescription=
-FileVersion=2.2.7.1
+FileVersion=2.3.0.1
InternalName=
LegalCopyright=
LegalTrademarks=
OriginalFilename=
ProductName=
-ProductVersion=2.2.7.1
+ProductVersion=2.3.0.1
Comments=
Modified: branches/BCB5/TntUnicodeControls/Example/ExampleUnicode.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/TntUnicodeControls/License.rtf
===================================================================
--- branches/BCB5/TntUnicodeControls/License.rtf 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/License.rtf 2009-03-09 03:21:01 UTC (rev 496)
@@ -1,15 +1,52 @@
-{\rtf1\ansi\ansicpg1252\deff0\deflang1033\deflangfe2052{\fonttbl{\f0\fscript\fprq2\fcharset0 Comic Sans MS;}{\f1\fswiss\fprq2\fcharset0 Tahoma;}}
-{\colortbl ;\red0\green0\blue0;}
-{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\nowidctlpar\cf1\b\f0\fs28 TntWare Delphi Unicode Controls\f1\fs24\par
-\b0\fs16 \cf0 http://www.tntware.com/delphicontrols/unicode/\cf1\par
-\par
-\i Copyright (c) 2002-2006, Troy Wolbrink (www.tntware.com) \par
-\i0\par
-\pard\brdrb\brdrs\brdrw15\brsp20 \nowidctlpar\b License\par
-\pard\nowidctlpar\b0 Redistribution and use in binary forms, with or without modification, are permitted. Redistribution and use in source forms, with or without modification, are permitted provided that the redistributions of source code retain the above copyright.\par
-\par
-\pard\brdrb\brdrs\brdrw15\brsp20 \nowidctlpar\b Disclaimer\par
-\pard\nowidctlpar\b0 This software is provided by the author "as is" and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the author be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.\par
-\cf0\fs20\par
-}
-
\ No newline at end of file
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch14\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1042{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f14\froman\fcharset136\fprq2{\*\panose 02020300000000000000}PMingLiU{\*\falt \'b7\'73\'b2\'d3\'a9\'fa\'c5\'e9};}
+{\f36\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}{\f37\froman\fcharset136\fprq2{\*\panose 02020300000000000000}@PMingLiU;}{\f38\fscript\fcharset0\fprq2{\*\panose 030f0702030302020204}Comic Sans MS;}
+{\f39\froman\fcharset238\fprq2 Times New Roman CE;}{\f40\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f42\froman\fcharset161\fprq2 Times New Roman Greek;}{\f43\froman\fcharset162\fprq2 Times New Roman Tur;}
+{\f44\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f45\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f46\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f47\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\f181\froman\fcharset0\fprq2 PMingLiU Western{\*\falt \'b7\'73\'b2\'d3\'a9\'fa\'c5\'e9};}{\f399\fswiss\fcharset238\fprq2 Tahoma CE;}{\f400\fswiss\fcharset204\fprq2 Tahoma Cyr;}{\f402\fswiss\fcharset161\fprq2 Tahoma Greek;}
+{\f403\fswiss\fcharset162\fprq2 Tahoma Tur;}{\f404\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f405\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic);}{\f406\fswiss\fcharset186\fprq2 Tahoma Baltic;}
+{\f407\fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}{\f408\fswiss\fcharset222\fprq2 Tahoma (Thai);}{\f411\froman\fcharset0\fprq2 @PMingLiU Western;}{\f419\fscript\fcharset238\fprq2 Comic Sans MS CE;}{\f420\fscript\fcharset204\fprq2 Comic Sans MS Cyr;}
+{\f422\fscript\fcharset161\fprq2 Comic Sans MS Greek;}{\f423\fscript\fcharset162\fprq2 Comic Sans MS Tur;}{\f426\fscript\fcharset186\fprq2 Comic Sans MS Baltic;}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;
+\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;
+\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0
+\fs24\lang1033\langfe1042\loch\f0\hich\af0\dbch\af14\cgrid\langnp1033\langfenp1042 \snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}}
+{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid12926494}{\*\generator Microsoft Word 11.0.8106;}{\info{\operator HP Authorized Customer}{\creatim\yr2007\mo1\dy2\hr16\min30}{\revtim\yr2007\mo1\dy2\hr16\min30}{\version2}{\edmins0}{\nofpages1}
+{\nofwords166}{\nofchars949}{\nofcharsws1113}{\vern24611}{\*\password 00000000}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}{\xmlns2 urn:schemas-microsoft-com:office:smarttags}}
+\paperw12240\paperh15840\margl1800\margr1800\margt1440\margb1440\gutter0\ltrsect
+\widowctrl\ftnbj\aenddoc\donotembedsysfont0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3
+\jcompress\viewkind4\viewscale200\rsidroot12926494 \fet0{\*\wgrffmtfilter 013f}\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnqc\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2
+\pnucltr\pnqc\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnqc\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnqc\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnqc\pnstart1\pnindent720\pnhang {\pntxtb (}
+{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnqc\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnqc\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnqc\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}
+{\*\pnseclvl9\pnlcrm\pnqc\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0
+\fs24\lang1033\langfe1042\loch\af0\hich\af0\dbch\af14\cgrid\langnp1033\langfenp1042 {\rtlch\fcs1 \ab\af38\afs28 \ltrch\fcs0 \b\f38\fs28\cf1\insrsid12926494 \hich\af38\dbch\af14\loch\f38 TntWare Delphi Unicode Controls}{\rtlch\fcs1 \ab\af36 \ltrch\fcs0
+\b\f36\cf1\insrsid12926494
+\par }{\rtlch\fcs1 \af36\afs16 \ltrch\fcs0 \f36\fs16\cf1\insrsid12926494 \hich\af36\dbch\af14\loch\f36 }{\rtlch\fcs1 \af36\afs16 \ltrch\fcs0 \f36\fs16\insrsid12926494 \hich\af36\dbch\af14\loch\f36 http\hich\af36\dbch\af14\loch\f36 ://
+\hich\af36\dbch\af14\loch\f36 www\hich\af36\dbch\af14\loch\f36 .\hich\af36\dbch\af14\loch\f36 tntware\hich\af36\dbch\af14\loch\f36 .\hich\af36\dbch\af14\loch\f36 com\hich\af36\dbch\af14\loch\f36 /\hich\af36\dbch\af14\loch\f36 delphicontrols
+\hich\af36\dbch\af14\loch\f36 /\hich\af36\dbch\af14\loch\f36 unicode\hich\af36\dbch\af14\loch\f36 /}{\rtlch\fcs1 \af36\afs16 \ltrch\fcs0 \f36\fs16\cf1\insrsid12926494
+\par
+\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid12926494 {\rtlch\fcs1 \ai\af36\afs16 \ltrch\fcs0 \i\f36\fs16\cf1\insrsid12926494 \hich\af36\dbch\af14\loch\f36 Copyright \hich\af36\dbch\af14\loch\f36 (
+\hich\af36\dbch\af14\loch\f36 c\hich\af36\dbch\af14\loch\f36 ) \hich\af36\dbch\af14\loch\f36 2002-200}{\rtlch\fcs1 \ai\af36\afs16 \ltrch\fcs0 \i\f36\fs16\cf1\insrsid12926494 \hich\af36\dbch\af14\loch\f36 7}{\rtlch\fcs1 \ai\af36\afs16 \ltrch\fcs0
+\i\f36\fs16\cf1\insrsid12926494 \hich\af36\dbch\af14\loch\f36 , {\*\xmlopen\xmlns2{\factoidname PersonName}}\hich\af36\dbch\af14\loch\f36 Troy Wolbrink{\*\xmlclose} \hich\af36\dbch\af14\loch\f36 (\hich\af36\dbch\af14\loch\f36 www
+\hich\af36\dbch\af14\loch\f36 .\hich\af36\dbch\af14\loch\f36 tntware\hich\af36\dbch\af14\loch\f36 .\hich\af36\dbch\af14\loch\f36 com\hich\af36\dbch\af14\loch\f36 )
+\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af36\afs16 \ltrch\fcs0 \f36\fs16\cf1\insrsid12926494
+\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\brdrb\brdrs\brdrw15\brsp20 \wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \ab\af36\afs16 \ltrch\fcs0 \b\f36\fs16\cf1\insrsid12926494 \hich\af36\dbch\af14\loch\f36 License
+\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af36\afs16 \ltrch\fcs0 \f36\fs16\cf1\insrsid12926494 \hich\af36\dbch\af14\loch\f36 Redistribution and use in binary forms\hich\af36\dbch\af14\loch\f36 ,
+\hich\af36\dbch\af14\loch\f36 with or without modification\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 are permitted\hich\af36\dbch\af14\loch\f36 . \hich\af36\dbch\af14\loch\f36 Redistribution and use in source forms
+\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 with or without modification\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 are permitted provided that the redistributions of source code retain the above copyright
+\hich\af36\dbch\af14\loch\f36 .
+\par
+\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\brdrb\brdrs\brdrw15\brsp20 \wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \ab\af36\afs16 \ltrch\fcs0 \b\f36\fs16\cf1\insrsid12926494 \hich\af36\dbch\af14\loch\f36 Disclaim\hich\af36\dbch\af14\loch\f36 er
+\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af36\afs16 \ltrch\fcs0 \f36\fs16\cf1\insrsid12926494 \hich\af36\dbch\af14\loch\f36 This software is provided by the author \hich\af36\dbch\af14\loch\f36 "
+\hich\af36\dbch\af14\loch\f36 as is\hich\af36\dbch\af14\loch\f36 " \hich\af36\dbch\af14\loch\f36 and any express or implied warranties\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 including\hich\af36\dbch\af14\loch\f36 ,
+\hich\af36\dbch\af14\loch\f36 but not limited to\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 the implied warranties of merchantability and fitness for a particular purpose are disclaimed\hich\af36\dbch\af14\loch\f36 .
+\hich\af36\dbch\af14\loch\f36 In no event shall the author be liable f\hich\af36\dbch\af14\loch\f36 or any direct\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 indirect\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 incidental
+\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 special\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 exemplary\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 or consequential damages
+\hich\af36\dbch\af14\loch\f36 (\hich\af36\dbch\af14\loch\f36 including\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 but not limited to\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 procurement of substitute goods or services
+\hich\af36\dbch\af14\loch\f36 ; \hich\af36\dbch\af14\loch\f36 loss of use\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 data\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 or profits\hich\af36\dbch\af14\loch\f36 ;
+\hich\af36\dbch\af14\loch\f36 or business interruption\hich\af36\dbch\af14\loch\f36 ) \hich\af36\dbch\af14\loch\f36 however caused and on any theory of liab\hich\af36\dbch\af14\loch\f36 ility\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36
+whether in contract\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 strict liability\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36 or tort \hich\af36\dbch\af14\loch\f36 (\hich\af36\dbch\af14\loch\f36
+including negligence or otherwise\hich\af36\dbch\af14\loch\f36 ) \hich\af36\dbch\af14\loch\f36 arising in any way out of the use of this software\hich\af36\dbch\af14\loch\f36 , \hich\af36\dbch\af14\loch\f36
+even if advised of the possibility of such damage\hich\af36\dbch\af14\loch\f36 .
+\par }{\rtlch\fcs1 \af36\afs20 \ltrch\fcs0 \f36\fs20\insrsid12926494
+\par }}
\ No newline at end of file
Modified: branches/BCB5/TntUnicodeControls/Source/ActiveIMM_TLB.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/ActiveIMM_TLB.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/ActiveIMM_TLB.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -54,7 +54,7 @@
interface
uses
- Windows, ActiveX, Classes, Graphics, OleServer, OleCtrls, StdVCL;
+ Windows, ActiveX, Classes, OleServer;
// *********************************************************************//
// GUIDS declared in the TypeLibrary. Following prefixes are used:
Modified: branches/BCB5/TntUnicodeControls/Source/TntActnList.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntActnList.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntActnList.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -16,7 +16,7 @@
interface
uses
- Classes, Controls, ActnList, Buttons, TntControls, ExtCtrls, ComCtrls, StdCtrls, Menus;
+ Classes, Controls, ActnList, Buttons, ExtCtrls, ComCtrls, StdCtrls, Menus;
type
{TNT-WARN TActionList}
@@ -200,7 +200,7 @@
implementation
uses
- SysUtils, TntMenus, TntClasses, TntSysUtils;
+ SysUtils, TntMenus, TntClasses, TntControls;
{ TActionListList }
Modified: branches/BCB5/TntUnicodeControls/Source/TntAxCtrls.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntAxCtrls.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntAxCtrls.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -16,7 +16,7 @@
interface
uses
- ComObj, StdVcl, AxCtrls,
+ ComObj, StdVcl,
{$IFNDEF COMPILER_10_UP}
TntWideStrings,
{$ELSE}
Modified: branches/BCB5/TntUnicodeControls/Source/TntBandActn.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntBandActn.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntBandActn.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -16,7 +16,7 @@
interface
uses
- Classes, ActnList, BandActn, TntActnList;
+ Classes, BandActn, TntActnList;
type
{TNT-WARN TCustomizeActionBars}
@@ -38,7 +38,7 @@
implementation
uses
- TntClasses;
+ ActnList, TntClasses;
{TNT-IGNORE-UNIT}
Modified: branches/BCB5/TntUnicodeControls/Source/TntButtons.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntButtons.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntButtons.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -16,9 +16,9 @@
interface
uses
- Windows, Messages, Classes, Controls, Forms, Graphics, StdCtrls,
+ Windows, Messages, Classes, Controls, Graphics, StdCtrls,
ExtCtrls, CommCtrl, Buttons,
- TntForms, TntControls, TntStdCtrls;
+ TntControls;
type
ITntGlyphButton = interface
@@ -92,9 +92,9 @@
implementation
-uses
- SysUtils, TypInfo, RTLConsts, TntWindows,
- {$IFDEF THEME_7_UP} Themes, {$ENDIF} TntClasses, TntActnList, ActnList, TntSysUtils;
+uses
+ SysUtils, ActnList, TntForms, TntStdCtrls, TypInfo, RTLConsts, TntWindows,
+ {$IFDEF THEME_7_UP} Themes, {$ENDIF} TntClasses, TntActnList, TntSysUtils;
type
EAbortPaint = class(EAbort);
Modified: branches/BCB5/TntUnicodeControls/Source/TntCheckLst.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntCheckLst.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntCheckLst.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Source/TntClasses.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntClasses.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntClasses.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -45,7 +45,7 @@
{TNT-WARN TStringStream} // TODO: Implement a TWideStringStream
// A potential implementation of TWideStringStream can be found at:
-// http://cvs.sourceforge.net/viewcvs.py/kdsxml/Global/KDSClasses.pas?view=markup
+// http://kdsxml.cvs.sourceforge.net/kdsxml/Global/KDSClasses.pas?revision=1.10&view=markup
procedure TntPersistent_AfterInherited_DefineProperties(Filer: TFiler; Instance: TPersistent);
@@ -690,7 +690,7 @@
destructor TTntResourceStream.Destroy;
begin
UnlockResource(HGlobal);
- FreeResource(HGlobal);
+ FreeResource(HGlobal); { Technically this is not necessary (MS KB #193678) }
inherited Destroy;
end;
Modified: branches/BCB5/TntUnicodeControls/Source/TntClipBrd.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntClipBrd.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntClipBrd.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -16,7 +16,7 @@
interface
uses
- Classes, Windows, Clipbrd;
+ Windows, Clipbrd;
type
{TNT-WARN TClipboard}
Modified: branches/BCB5/TntUnicodeControls/Source/TntComCtrls.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntComCtrls.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntComCtrls.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -23,7 +23,7 @@
{ TODO: TToolBar: Unicode-enable handling of CN_DIALOGCHAR, WM_SYSCOMMAND, FindButtonFromAccel }
uses
- Forms, Classes, Controls, ListActns, ComCtrls, Messages, Menus,
+ Classes, Controls, ListActns, Menus, ComCtrls, Messages,
Windows, CommCtrl, Contnrs, TntControls, TntClasses, Graphics, TntSysUtils;
type
@@ -78,6 +78,17 @@
property SubItems: TTntStrings read FSubItems write SetSubItems;
end;
+ TTntListItemsEnumerator = class
+ private
+ FIndex: Integer;
+ FListItems: TTntListItems;
+ public
+ constructor Create(AListItems: TTntListItems);
+ function GetCurrent: TTntListItem;
+ function MoveNext: Boolean;
+ property Current: TTntListItem read GetCurrent;
+ end;
+
{TNT-WARN TListItems}
TTntListItems = class(TListItems{TNT-ALLOW TListItems})
private
@@ -88,6 +99,7 @@
property Item[Index: Integer]: TTntListItem read GetItem write SetItem; default;
function Add: TTntListItem;
function AddItem(Item: TTntListItem; Index: Integer = -1): TTntListItem;
+ function GetEnumerator: TTntListItemsEnumerator;
function Insert(Index: Integer): TTntListItem;
end;
@@ -913,6 +925,17 @@
TTntTreeNodeClass = class of TTntTreeNode;
+ TTntTreeNodesEnumerator = class
+ private
+ FIndex: Integer;
+ FTreeNodes: TTntTreeNodes;
+ public
+ constructor Create(ATreeNodes: TTntTreeNodes);
+ function GetCurrent: TTntTreeNode;
+ function MoveNext: Boolean;
+ property Current: TTntTreeNode read GetCurrent;
+ end;
+
{TNT-WARN TTreeNodes}
TTntTreeNodes = class(TTreeNodes{TNT-ALLOW TTreeNodes})
private
@@ -946,6 +969,7 @@
Ptr: Pointer; Method: TNodeAttachMode): TTntTreeNode;
public
function GetFirstNode: TTntTreeNode;
+ function GetEnumerator: TTntTreeNodesEnumerator;
function GetNode(ItemId: HTreeItem): TTntTreeNode;
property Item[Index: Integer]: TTntTreeNode read GetNodeFromIndex; default;
property Owner: TTntCustomTreeView read GetNodesOwner;
@@ -1116,9 +1140,9 @@
implementation
uses
- SysUtils, TntGraphics, ImgList, TntSystem, TntStdCtrls, StdCtrls, Consts,
- RichEdit, ActiveIMM_TLB, Printers, TntForms, ComStrs,
- TntActnList, TntStdActns, TntWindows, TntMenus,
+ Forms, SysUtils, TntGraphics, ImgList, TntSystem, TntStdCtrls, StdCtrls,
+ RichEdit, ActiveIMM_TLB, TntForms, ComStrs, TntMenus,
+ TntActnList, TntStdActns, TntWindows,
{$IFNDEF COMPILER_10_UP}
TntWideStrings,
{$ELSE}
@@ -1398,6 +1422,27 @@
Result := ((inherited Owner).Owner as TTntCustomListView);
end;
+{ TTntListItemsEnumerator }
+
+constructor TTntListItemsEnumerator.Create(AListItems: TTntListItems);
+begin
+ inherited Create;
+ FIndex := -1;
+ FListItems := AListItems;
+end;
+
+function TTntListItemsEnumerator.GetCurrent: TTntListItem;
+begin
+ Result := FListItems[FIndex];
+end;
+
+function TTntListItemsEnumerator.MoveNext: Boolean;
+begin
+ Result := FIndex < FListItems.Count - 1;
+ if Result then
+ Inc(FIndex);
+end;
+
{ TTntListItems }
function TTntListItems.Add: TTntListItem;
@@ -1430,6 +1475,11 @@
inherited Item[Index] := Value;
end;
+function TTntListItems.GetEnumerator: TTntListItemsEnumerator;
+begin
+ Result := TTntListItemsEnumerator.Create(Self);
+end;
+
{ TSavedListItem }
type
TSavedListItem = class
@@ -1584,7 +1634,7 @@
constructor TTntCustomListView.Create(AOwner: TComponent);
begin
inherited;
- FEditInstance := MakeObjectInstance(EditWndProcW);
+ FEditInstance := Classes.MakeObjectInstance(EditWndProcW);
// create list columns
Assert(THackCustomListView(Self).FListColumns = inherited Columns, 'Internal Error in TTntCustomListView.Create().');
FreeAndNil(THackCustomListView(Self).FListColumns);
@@ -1594,7 +1644,8 @@
destructor TTntCustomListView.Destroy;
begin
inherited;
- FreeObjectInstance(FEditInstance);
+ Classes.FreeObjectInstance(FEditInstance);
+ FreeAndNil(FSavedItems);
end;
procedure TTntCustomListView.CreateWindowHandle(const Params: TCreateParams);
@@ -1816,8 +1867,8 @@
TntLClass := TTntListItemClass(LClass);
Result := TntLClass.Create(inherited Items);
if FTempItem = nil then
- FTempItem := Result as TTntListItem; { In Delphi 5/6/7/9, the first item created is the temp item }
- { TODO: Verify that D10 creates a temp item in its constructor. }
+ FTempItem := Result as TTntListItem; { In Delphi 5/6/7/9/10, the first item created is the temp item }
+ { TODO: Verify that D11 creates a temp item in its constructor. }
end;
function TTntCustomListView.CreateListItems: TListItems{TNT-ALLOW TListItems};
@@ -4140,6 +4191,27 @@
Result := inherited TreeView as TTntCustomTreeView;
end;
+{ TTntTreeNodesEnumerator }
+
+constructor TTntTreeNodesEnumerator.Create(ATreeNodes: TTntTreeNodes);
+begin
+ inherited Create;
+ FIndex := -1;
+ FTreeNodes := ATreeNodes;
+end;
+
+function TTntTreeNodesEnumerator.GetCurrent: TTntTreeNode;
+begin
+ Result := FTreeNodes[FIndex];
+end;
+
+function TTntTreeNodesEnumerator.MoveNext: Boolean;
+begin
+ Result := FIndex < FTreeNodes.Count - 1;
+ if Result then
+ Inc(FIndex);
+end;
+
{ TTntTreeNodes }
{$IFDEF COMPILER_6} // verified against VCL source in Delphi 6 and BCB 6
@@ -4304,6 +4376,11 @@
Result := inherited GetFirstNode as TTntTreeNode;
end;
+function TTntTreeNodes.GetEnumerator: TTntTreeNodesEnumerator;
+begin
+ Result := TTntTreeNodesEnumerator.Create(Self);
+end;
+
function TTntTreeNodes.GetNodesOwner: TTntCustomTreeView;
begin
Result := inherited Owner as TTntCustomTreeView;
@@ -4505,13 +4582,13 @@
constructor TTntCustomTreeView.Create(AOwner: TComponent);
begin
inherited;
- FEditInstance := MakeObjectInstance(EditWndProcW);
+ FEditInstance := Classes.MakeObjectInstance(EditWndProcW);
end;
destructor TTntCustomTreeView.Destroy;
begin
Destroying;
- FreeObjectInstance(FEditInstance);
+ Classes.FreeObjectInstance(FEditInstance);
FreeAndNil(FSavedNodeText);
inherited;
end;
Modified: branches/BCB5/TntUnicodeControls/Source/TntControls.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntControls.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntControls.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -62,9 +62,9 @@
{ TODO: Unicode enable .OnKeyPress event }
uses
- Forms, Classes, Windows, Messages, Controls, TntClasses, ActnList, Menus, TntMenus,
- TntSysUtils;
+ Classes, Windows, Messages, Controls, Menus;
+
{TNT-WARN TCaption}
type TWideCaption = type WideString;
@@ -144,7 +144,8 @@
implementation
uses
- SysUtils, Contnrs, TntGraphics, TntWindows;
+ ActnList, Forms, SysUtils, Contnrs,
+ TntGraphics, TntWindows, TntClasses, TntMenus, TntSysUtils;
type
TAccessControl = class(TControl);
@@ -454,16 +455,16 @@
inherited Create(nil);
FControl.FreeNotification(Self);
- WinControl_ObjectInstance := MakeObjectInstance(FControl.MainWndProc);
- ObjectInstance := MakeObjectInstance(Win32Proc);
- DefObjectInstance := MakeObjectInstance(DefWin32Proc);
+ WinControl_ObjectInstance := Classes.MakeObjectInstance(FControl.MainWndProc);
+ ObjectInstance := Classes.MakeObjectInstance(Win32Proc);
+ DefObjectInstance := Classes.MakeObjectInstance(DefWin32Proc);
end;
destructor TWinControlTrap.Destroy;
begin
- FreeObjectInstance(ObjectInstance);
- FreeObjectInstance(DefObjectInstance);
- FreeObjectInstance(WinControl_ObjectInstance);
+ Classes.FreeObjectInstance(ObjectInstance);
+ Classes.FreeObjectInstance(DefObjectInstance);
+ Classes.FreeObjectInstance(WinControl_ObjectInstance);
inherited;
end;
Modified: branches/BCB5/TntUnicodeControls/Source/TntDB.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntDB.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntDB.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -250,7 +250,7 @@
implementation
uses
- SysUtils, MaskUtils, Variants, Contnrs, TntSystem, TntSysUtils, TntClasses;
+ SysUtils, MaskUtils, Variants, Contnrs, TntSystem, TntSysUtils;
function GetTntFieldClass(FieldClass: TFieldClass): TFieldClass;
begin
Modified: branches/BCB5/TntUnicodeControls/Source/TntDBActns.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntDBActns.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntDBActns.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Source/TntDBClientActns.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntDBClientActns.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntDBClientActns.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Source/TntDBCtrls.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntDBCtrls.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntDBCtrls.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -16,7 +16,7 @@
interface
uses
- Forms, Classes, Windows, Messages, DB, DBCtrls, Controls, StdCtrls,
+ Classes, Windows, Messages, DB, DBCtrls, Controls, StdCtrls,
TntClasses, TntStdCtrls, TntControls, TntComCtrls, TntExtCtrls;
type
@@ -532,7 +532,7 @@
implementation
uses
- SysUtils, Graphics, Variants, TntDB,
+ Forms, SysUtils, Graphics, Variants, TntDB,
TntActnList, TntGraphics, TntSysUtils, RichEdit, Mask;
function FieldIsBlobLike(Field: TField): Boolean;
@@ -567,7 +567,7 @@
procedure TTntPaintControl.DestroyHandle;
begin
if FHandle <> 0 then DestroyWindow(FHandle);
- FreeObjectInstance(FObjectInstance);
+ Classes.FreeObjectInstance(FObjectInstance);
FHandle := 0;
FObjectInstance := nil;
end;
@@ -578,7 +578,7 @@
begin
if FHandle = 0 then
begin
- FObjectInstance := MakeObjectInstance(WndProc);
+ FObjectInstance := Classes.MakeObjectInstance(WndProc);
TAccessWinControl(FOwner).CreateParams(Params);
Params.Style := Params.Style and not (WS_HSCROLL or WS_VSCROLL);
if (not Win32PlatformIsUnicode) then begin
Modified: branches/BCB5/TntUnicodeControls/Source/TntDBGrids.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntDBGrids.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntDBGrids.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -242,7 +242,7 @@
implementation
uses
- SysUtils, TntControls, Math, Variants, Forms, TntDBCtrls,
+ SysUtils, TntControls, Math, Variants, Forms,
TntGraphics, Graphics, TntDB, TntActnList, TntSysUtils, TntWindows;
{ TTntColumnTitle }
Modified: branches/BCB5/TntUnicodeControls/Source/TntDBLogDlg.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntDBLogDlg.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntDBLogDlg.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -16,8 +16,8 @@
interface
uses
- SysUtils, Windows, Messages, Classes, Graphics, Controls,
- TntForms, TntStdCtrls, TntExtCtrls, StdCtrls, ExtCtrls;
+ SysUtils, Windows, Messages, Classes, Graphics,
+ TntForms, TntStdCtrls, TntExtCtrls, StdCtrls, ExtCtrls, Controls;
type
TTntLoginDialog = class(TTntForm)
Modified: branches/BCB5/TntUnicodeControls/Source/TntDialogs.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntDialogs.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntDialogs.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -19,8 +19,8 @@
{ TODO: Property editor for TTntOpenDialog.Filter }
uses
- Classes, Controls, Forms, Messages, CommDlg, Windows, Dialogs,
- TntClasses, TntControls, TntForms, TntSysUtils;
+ Classes, Messages, CommDlg, Windows, Dialogs,
+ TntClasses, TntForms, TntSysUtils;
type
{TNT-WARN TIncludeItemEvent}
@@ -61,11 +61,15 @@
procedure GetFileNamesW(var OpenFileName: TOpenFileNameW);
procedure DoIncludeItem(const OFN: TOFNotifyEx; var Include: Boolean); override;
procedure WndProc(var Message: TMessage); override;
- function DoExecuteW(Func: Pointer): Bool;
+ function DoExecuteW(Func: Pointer; ParentWnd: HWND): Bool; overload;
+ function DoExecuteW(Func: Pointer): Bool; overload;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
function Execute: Boolean; override;
+ {$IFDEF COMPILER_9_UP}
+ function Execute(ParentWnd: HWND): Boolean; override;
+ {$ENDIF}
property Files: TTntStrings read GetFiles;
published
property DefaultExt: WideString read GetDefaultExt write SetDefaultExt;
@@ -80,24 +84,38 @@
TTntSaveDialog = class(TTntOpenDialog)
public
function Execute: Boolean; override;
+ {$IFDEF COMPILER_9_UP}
+ function Execute(ParentWnd: HWND): Boolean; override;
+ {$ENDIF}
end;
{ Message dialog }
{TNT-WARN CreateMessageDialog}
function WideCreateMessageDialog(const Msg: WideString; DlgType: TMsgDlgType;
- Buttons: TMsgDlgButtons): TTntForm;
+ Buttons: TMsgDlgButtons): TTntForm;overload;
+function WideCreateMessageDialog(const Msg: WideString; DlgType: TMsgDlgType;
+ Buttons: TMsgDlgButtons; DefaultButton: TMsgDlgBtn): TTntForm; overload;
{TNT-WARN MessageDlg}
function WideMessageDlg(const Msg: WideString; DlgType: TMsgDlgType;
- Buttons: TMsgDlgButtons; HelpCtx: Longint): Integer;
+ Buttons: TMsgDlgButtons; HelpCtx: Longint): Integer; overload;
+function WideMessageDlg(const Msg: WideString; DlgType: TMsgDlgType;
+ Buttons: TMsgDlgButtons; HelpCtx: Longint; DefaultButton: TMsgDlgBtn): Integer; overload;
+
{TNT-WARN MessageDlgPos}
function WideMessageDlgPos(const Msg: WideString; DlgType: TMsgDlgType;
- Buttons: TMsgDlgButtons; HelpCtx: Longint; X, Y: Integer): Integer;
+ Buttons: TMsgDlgButtons; HelpCtx: Longint; X, Y: Integer): Integer; overload;
+function WideMessageDlgPos(const Msg: WideString; DlgType: TMsgDlgType;
+ Buttons: TMsgDlgButtons; HelpCtx: Longint; X, Y: Integer; DefaultButton: TMsgDlgBtn): Integer; overload;
+
{TNT-WARN MessageDlgPosHelp}
function WideMessageDlgPosHelp(const Msg: WideString; DlgType: TMsgDlgType;
Buttons: TMsgDlgButtons; HelpCtx: Longint; X, Y: Integer;
- const HelpFileName: WideString): Integer;
+ const HelpFileName: WideString): Integer; overload;
+function WideMessageDlgPosHelp(const Msg: WideString; DlgType: TMsgDlgType;
+ Buttons: TMsgDlgButtons; HelpCtx: Longint; X, Y: Integer;
+ const HelpFileName: WideString; DefaultButton: TMsgDlgBtn): Integer; overload;
{TNT-WARN ShowMessage}
procedure WideShowMessage(const Msg: WideString);
@@ -119,13 +137,33 @@
const ADefaultExt: WideString = ''; const ATitle: WideString = '';
const AInitialDir: WideString = ''; SaveDialog: Boolean = False): Boolean;
+function GetModalParentWnd: HWND;
+
implementation
uses
- Types, SysUtils, Graphics, Consts, Math,
- TntSystem, TntWindows, TntStdCtrls, TntClipBrd, TntExtCtrls,
+ Controls, Forms, Types, SysUtils, Graphics, Consts, Math,
+ TntWindows, TntStdCtrls, TntClipBrd, TntExtCtrls,
{$IFDEF COMPILER_9_UP} WideStrUtils, {$ENDIF} TntWideStrUtils;
+function GetModalParentWnd: HWND;
+begin
+ {$IFDEF COMPILER_9}
+ Result := Application.ActiveFormHandle;
+ {$ELSE}
+ Result := 0;
+ {$ENDIF}
+ {$IFDEF COMPILER_10_UP}
+ if Application.ModalPopupMode <> pmNone then
+ begin
+ Result := Application.ActiveFormHandle;
+ end;
+ {$ENDIF}
+ if Result = 0 then begin
+ Result := Application.Handle;
+ end;
+end;
+
var
ProxyExecuteDialog: TTntOpenDialog;
@@ -305,6 +343,11 @@
end;
function TTntOpenDialog.DoExecuteW(Func: Pointer): Bool;
+begin
+ Result := DoExecuteW(Func, GetModalParentWnd);
+end;
+
+function TTntOpenDialog.DoExecuteW(Func: Pointer; ParentWnd: HWND): Bool;
var
OpenFilename: TOpenFilenameW;
@@ -355,11 +398,7 @@
with OpenFilename do
begin
if not IsWindow(hWndOwner) then begin
- {$IFDEF COMPILER_9_UP}
- hWndOwner := Application.ActiveFormHandle;
- {$ELSE}
- hWndOwner := Application.Handle;
- {$ENDIF}
+ hWndOwner := ParentWnd;
end;
// Filter (PChar -> PWideChar)
TempFilter := AllocFilterStr(Filter);
@@ -416,7 +455,9 @@
i: integer;
begin
FileList := ExtractStringsFromStringArray(P, Separator);
- if Length(FileList) > 0 then begin
+ if Length(FileList) = 0 then
+ FFiles.Add('')
+ else begin
DirName := FileList[0];
if Length(FileList) = 1 then
FFiles.Add(DirName)
@@ -472,6 +513,16 @@
Result := DoExecuteW(@GetOpenFileNameW);
end;
+{$IFDEF COMPILER_9_UP}
+function TTntOpenDialog.Execute(ParentWnd: HWND): Boolean;
+begin
+ if (not Win32PlatformIsUnicode) then
+ Result := DoExecute(@GetOpenFileNameA, ParentWnd)
+ else
+ Result := DoExecuteW(@GetOpenFileNameW, ParentWnd);
+end;
+{$ENDIF}
+
{ TTntSaveDialog }
function TTntSaveDialog.Execute: Boolean;
@@ -482,6 +533,16 @@
Result := DoExecuteW(@GetSaveFileNameW);
end;
+{$IFDEF COMPILER_9_UP}
+function TTntSaveDialog.Execute(ParentWnd: HWND): Boolean;
+begin
+ if (not Win32PlatformIsUnicode) then
+ Result := DoExecute(@GetSaveFileNameA, ParentWnd)
+ else
+ Result := DoExecuteW(@GetSaveFileNameW, ParentWnd);
+end;
+{$ENDIF}
+
{ Message dialog }
function GetAveCharSize(Canvas: TCanvas): TPoint;
@@ -592,7 +653,7 @@
mrYesToAll, 0);
function WideCreateMessageDialog(const Msg: WideString; DlgType: TMsgDlgType;
- Buttons: TMsgDlgButtons): TTntForm;
+ Buttons: TMsgDlgButtons; DefaultButton: TMsgDlgBtn): TTntForm;
const
mcHorzMargin = 8;
mcVertMargin = 8;
@@ -606,16 +667,17 @@
HorzMargin, VertMargin, HorzSpacing, VertSpacing, ButtonWidth,
ButtonHeight, ButtonSpacing, ButtonCount, ButtonGroupWidth,
IconTextWidth, IconTextHeight, X, ALeft: Integer;
- B, DefaultButton, CancelButton: TMsgDlgBtn;
+ B, CancelButton: TMsgDlgBtn;
IconID: PAnsiChar;
ATextRect: TRect;
ThisButtonWidth: integer;
+ LButton: TTntButton;
begin
Result := TTntMessageForm.CreateNew(Application);
with Result do
begin
+ BorderStyle := bsDialog; // By doing this first, it will work on WINE.
BiDiMode := Application.BiDiMode;
- BorderStyle := bsDialog;
Canvas.Font := Font;
KeyPreview := True;
Position := poDesigned;
@@ -693,49 +755,76 @@
SetBounds(ALeft, VertMargin,
ATextRect.Right, ATextRect.Bottom);
end;
- if mbOk in Buttons then DefaultButton := mbOk else
- if mbYes in Buttons then DefaultButton := mbYes else
- DefaultButton := mbRetry;
if mbCancel in Buttons then CancelButton := mbCancel else
if mbNo in Buttons then CancelButton := mbNo else
CancelButton := mbOk;
X := (ClientWidth - ButtonGroupWidth) div 2;
for B := Low(TMsgDlgBtn) to High(TMsgDlgBtn) do
if B in Buttons then
- with TTntButton.Create(Result) do
+ begin
+ LButton := TTntButton.Create(Result);
+ with LButton do
begin
Name := ButtonNames[B];
Parent := Result;
Caption := GetButtonCaption(B);
ModalResult := ModalResults[B];
- if B = DefaultButton then Default := True;
- if B = CancelButton then Cancel := True;
+ if B = DefaultButton then
+ begin
+ Default := True;
+ ActiveControl := LButton;
+ end;
+ if B = CancelButton then
+ Cancel := True;
SetBounds(X, IconTextHeight + VertMargin + VertSpacing,
ButtonWidth, ButtonHeight);
Inc(X, ButtonWidth + ButtonSpacing);
if B = mbHelp then
OnClick := TTntMessageForm(Result).HelpButtonClick;
end;
+ end;
end;
end;
+function WideCreateMessageDialog(const Msg: WideString; DlgType: TMsgDlgType;
+ Buttons: TMsgDlgButtons): TTntForm;
+var
+ DefaultButton: TMsgDlgBtn;
+begin
+ if mbOk in Buttons then DefaultButton := mbOk else
+ if mbYes in Buttons then DefaultButton := mbYes else
+ DefaultButton := mbRetry;
+ Result := WideCreateMessageDialog(Msg, DlgType, Buttons, DefaultButton);
+end;
+
function WideMessageDlg(const Msg: WideString; DlgType: TMsgDlgType;
+ Buttons: TMsgDlgButtons; HelpCtx: Longint; DefaultButton: TMsgDlgBtn): Integer;
+begin
+ Result := WideMessageDlgPosHelp(Msg, DlgType, Buttons, HelpCtx, -1, -1, '', DefaultButton);
+end;
+
+function WideMessageDlg(const Msg: WideString; DlgType: TMsgDlgType;
Buttons: TMsgDlgButtons; HelpCtx: Longint): Integer;
begin
Result := WideMessageDlgPosHelp(Msg, DlgType, Buttons, HelpCtx, -1, -1, '');
end;
function WideMessageDlgPos(const Msg: WideString; DlgType: TMsgDlgType;
+ Buttons: TMsgDlgButtons; HelpCtx: Longint; X, Y: Integer; DefaultButton: TMsgDlgBtn): Integer;
+begin
+ Result := WideMessageDlgPosHelp(Msg, DlgType, Buttons, HelpCtx, X, Y, '', DefaultButton);
+end;
+
+function WideMessageDlgPos(const Msg: WideString; DlgType: TMsgDlgType;
Buttons: TMsgDlgButtons; HelpCtx: Longint; X, Y: Integer): Integer;
begin
Result := WideMessageDlgPosHelp(Msg, DlgType, Buttons, HelpCtx, X, Y, '');
end;
-function WideMessageDlgPosHelp(const Msg: WideString; DlgType: TMsgDlgType;
- Buttons: TMsgDlgButtons; HelpCtx: Longint; X, Y: Integer;
+function _Internal_WideMessageDlgPosHelp(Dlg: TTntForm; HelpCtx: Longint; X, Y: Integer;
const HelpFileName: WideString): Integer;
begin
- with WideCreateMessageDialog(Msg, DlgType, Buttons) do
+ with Dlg do
try
HelpContext := HelpCtx;
HelpFile := HelpFileName;
@@ -748,6 +837,22 @@
end;
end;
+function WideMessageDlgPosHelp(const Msg: WideString; DlgType: TMsgDlgType;
+ Buttons: TMsgDlgButtons; HelpCtx: Longint; X, Y: Integer;
+ const HelpFileName: WideString; DefaultButton: TMsgDlgBtn): Integer;
+begin
+ Result := _Internal_WideMessageDlgPosHelp(
+ WideCreateMessageDialog(Msg, DlgType, Buttons, DefaultButton), HelpCtx, X, Y, HelpFileName);
+end;
+
+function WideMessageDlgPosHelp(const Msg: WideString; DlgType: TMsgDlgType;
+ Buttons: TMsgDlgButtons; HelpCtx: Longint; X, Y: Integer;
+ const HelpFileName: WideString): Integer;
+begin
+ Result := _Internal_WideMessageDlgPosHelp(
+ WideCreateMessageDialog(Msg, DlgType, Buttons), HelpCtx, X, Y, HelpFileName);
+end;
+
procedure WideShowMessage(const Msg: WideString);
begin
WideShowMessagePos(Msg, -1, -1);
@@ -777,9 +882,9 @@
Form := TTntForm.Create(Application);
with Form do begin
try
+ BorderStyle := bsDialog; // By doing this first, it will work on WINE.
Canvas.Font := Font;
DialogUnits := GetAveCharSize(Canvas);
- BorderStyle := bsDialog;
Caption := ACaption;
ClientWidth := MulDiv(180, DialogUnits.X, 4);
Position := poScreenCenter;
Modified: branches/BCB5/TntUnicodeControls/Source/TntExtActns.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntExtActns.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntExtActns.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -16,7 +16,7 @@
interface
uses
- Classes, ActnList, TntActnList, TntStdActns, ExtActns;
+ Classes, TntActnList, ExtActns;
type
{TNT-WARN TCustomFileRun}
@@ -438,7 +438,7 @@
implementation
uses
- TntClasses;
+ ActnList, TntStdActns, TntClasses;
{TNT-IGNORE-UNIT}
Modified: branches/BCB5/TntUnicodeControls/Source/TntExtCtrls.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntExtCtrls.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntExtCtrls.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Source/TntExtDlgs.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntExtDlgs.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntExtDlgs.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -16,7 +16,7 @@
interface
uses
- Classes, TntDialogs, TntExtCtrls, TntStdCtrls, TntButtons;
+ Classes, Windows, TntDialogs, TntExtCtrls, TntStdCtrls, TntButtons;
type
{TNT-WARN TOpenPictureDialog}
@@ -42,18 +42,24 @@
public
constructor Create(AOwner: TComponent); override;
function Execute: Boolean; override;
+ {$IFDEF COMPILER_9_UP}
+ function Execute(ParentWnd: HWND): Boolean; override;
+ {$ENDIF}
end;
{TNT-WARN TSavePictureDialog}
TTntSavePictureDialog = class(TTntOpenPictureDialog)
public
function Execute: Boolean; override;
+ {$IFDEF COMPILER_9_UP}
+ function Execute(ParentWnd: HWND): Boolean; override;
+ {$ENDIF}
end;
implementation
uses
- ExtDlgs, {ExtDlgs is needed for a linked resource} Dialogs, Consts, Messages, Windows,
+ ExtDlgs, {ExtDlgs is needed for a linked resource} Dialogs, Consts, Messages,
Graphics, Math, Controls, Forms, SysUtils, CommDlg, TntSysUtils, TntForms;
{ TTntSilentPaintPanel }
@@ -209,6 +215,16 @@
Result := inherited Execute;
end;
+{$IFDEF COMPILER_9_UP}
+function TTntOpenPictureDialog.Execute(ParentWnd: HWND): Boolean;
+begin
+ if NewStyleControls and not (ofOldStyleDialog in Options) then
+ Template := 'DLGTEMPLATE' else
+ Template := nil;
+ Result := inherited Execute(ParentWnd);
+end;
+{$ENDIF}
+
function TTntOpenPictureDialog.IsFilterStored: Boolean;
begin
Result := not (Filter = GraphicFilter(TGraphic));
@@ -223,9 +239,9 @@
with PreviewForm do
try
Name := 'PreviewForm';
+ BorderStyle := bsSizeToolWin; // By doing this first, it will work on WINE.
Visible := False;
Caption := SPreviewLabel;
- BorderStyle := bsSizeToolWin;
KeyPreview := True;
Position := poScreenCenter;
OnKeyPress := PreviewKeyPress;
@@ -284,4 +300,18 @@
Result := DoExecuteW(@GetSaveFileNameW);
end;
+{$IFDEF COMPILER_9_UP}
+function TTntSavePictureDialog.Execute(ParentWnd: HWND): Boolean;
+begin
+ if NewStyleControls and not (ofOldStyleDialog in Options) then
+ Template := 'DLGTEMPLATE' else
+ Template := nil;
+
+ if (not Win32PlatformIsUnicode) then
+ Result := DoExecute(@GetSaveFileNameA, ParentWnd)
+ else
+ Result := DoExecuteW(@GetSaveFileNameW, ParentWnd);
+end;
+{$ENDIF}
+
end.
Modified: branches/BCB5/TntUnicodeControls/Source/TntFileCtrl.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntFileCtrl.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntFileCtrl.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Source/TntFormatStrUtils.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntFormatStrUtils.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntFormatStrUtils.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -18,7 +18,7 @@
// this unit provides functions to work with format strings
uses
- Classes, TntClasses, TntSysUtils;
+ TntSysUtils;
function GetCanonicalFormatStr(const _FormatString: WideString): WideString;
{$IFNDEF COMPILER_9_UP}
@@ -35,7 +35,7 @@
implementation
uses
- SysUtils, Math;
+ SysUtils, Math, TntClasses;
resourcestring
SInvalidFormatSpecifier = 'Invalid Format Specifier: %s';
@@ -442,7 +442,7 @@
UpdateTypeList(ArgList2, TypeList2);
if TypeList1.Count <> TypeList2.Count then
- raise EFormatSpecError.Create(SMismatchedArgumentCounts);
+ raise EFormatSpecError.Create(SMismatchedArgumentCounts + CRLF + CRLF + '> ' + FormatStr1 + CRLF + '> ' + FormatStr2);
for i := 0 to TypeList1.Count - 1 do begin
if TypeList1.Objects[i] <> TypeList2.Objects[i] then begin
Modified: branches/BCB5/TntUnicodeControls/Source/TntForms.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntForms.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntForms.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -16,7 +16,7 @@
interface
uses
- Classes, TntClasses, Windows, Messages, Controls, Forms, TntControls;
+ Classes, Windows, Messages, Controls, Forms, TntControls;
type
{TNT-WARN TScrollBox}
@@ -140,6 +140,7 @@
procedure DefineProperties(Filer: TFiler); override;
function GetActionLinkClass: TControlActionLinkClass; override;
procedure ActionChange(Sender: TObject; CheckDefaults: Boolean); override;
+ function CreateDockManager: IDockManager; override;
public
constructor Create(AOwner: TComponent); override;
procedure DefaultHandler(var Message); override;
@@ -198,7 +199,7 @@
uses
SysUtils, Consts, RTLConsts, Menus, FlatSB, StdActns,
- Graphics, TntSystem, TntSysUtils, TntWindows, TntMenus, TntActnList, TntStdActns;
+ Graphics, TntSystem, TntSysUtils, TntMenus, TntActnList, TntStdActns, TntClasses;
function IsWideCharAccel(CharCode: Word; const Caption: WideString): Boolean;
var
@@ -481,6 +482,13 @@
FixMenuBiDiProblem(Menu);
end;
+function TTntForm.CreateDockManager: IDockManager;
+begin
+ if (DockManager = nil) and DockSite and UseDockManager then
+ HandleNeeded; // force TNT subclassing to occur first
+ Result := inherited CreateDockManager;
+end;
+
{ TTntApplication }
constructor TTntApplication.Create(AOwner: TComponent);
@@ -611,7 +619,9 @@
procedure TTntApplication.DoIdle;
begin
- Hint := ApplicationMouseControlHint;
+ // update TntApplication.Hint only when Ansi encodings are the same... (otherwise there are problems with action menus)
+ if Application.Hint = AnsiString(ApplicationMouseControlHint) then
+ Hint := ApplicationMouseControlHint;
end;
function TTntApplication.IsDlgMsg(var Msg: TMsg): Boolean;
@@ -775,14 +785,6 @@
RaiseLastOSError;
end;
-function UnhookIsKnownToFail: Boolean;
-begin
- Result := (WideTextPos('W3WP.', WideExtractFileName(WideParamStr(0))) = 1) // for IIS 6.0
- or (WideTextPos('DLLHOST.', WideExtractFileName(WideParamStr(0))) = 1) // for IIS 5.0
- or (WideTextPos('miranda32.exe', WideExtractFileName(WideParamStr(0))) = 1) // for Miranda IM
- or (_IsShellProgramming);
-end;
-
//---------------------------------------------------------------------------------------------
// Tnt Environment Setup
//---------------------------------------------------------------------------------------------
@@ -864,10 +866,7 @@
finalization
if NTGetMessageHook <> 0 then begin
- if UnhookIsKnownToFail then
- UnhookWindowsHookEx(NTGetMessageHook) // no Win32Check!
- else
- Win32Check(UnhookWindowsHookEx(NTGetMessageHook));
+ UnhookWindowsHookEx(NTGetMessageHook) // no Win32Check, fails in too many cases, and doesn't matter
end;
FreeAndNil(TntApplication);
Modified: branches/BCB5/TntUnicodeControls/Source/TntGraphics.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntGraphics.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntGraphics.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -16,7 +16,7 @@
interface
uses
- Classes, Graphics, Windows;
+ Graphics, Windows;
{TNT-WARN TextRect}
procedure WideCanvasTextRect(Canvas: TCanvas; Rect: TRect; X, Y: Integer; const Text: WideString);
@@ -41,7 +41,7 @@
implementation
uses
- SysUtils, TntClasses, TntSysUtils;
+ SysUtils, TntSysUtils;
type
TAccessCanvas = class(TCanvas);
Modified: branches/BCB5/TntUnicodeControls/Source/TntGrids.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntGrids.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntGrids.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Source/TntListActns.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntListActns.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntListActns.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -16,7 +16,7 @@
interface
uses
- Classes, ActnList, TntActnList, ListActns;
+ Classes, TntActnList, ListActns;
type
{TNT-WARN TCustomListAction}
@@ -70,7 +70,7 @@
implementation
uses
- TntClasses;
+ ActnList, TntClasses;
{TNT-IGNORE-UNIT}
Modified: branches/BCB5/TntUnicodeControls/Source/TntMenus.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntMenus.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntMenus.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -25,6 +25,7 @@
FIgnoreMenuChanged: Boolean;
FCaption: WideString;
FHint: WideString;
+ FKeyboardLayout: HKL;
function GetCaption: WideString;
procedure SetInheritedCaption(const Value: AnsiString);
procedure SetCaption(const Value: WideString);
@@ -47,6 +48,7 @@
var Rect: TRect; Selected: Boolean; Flags: Integer);
procedure MeasureItem(ACanvas: TCanvas; var Width, Height: Integer); override;
public
+ procedure InitiateAction; override;
procedure Loaded; override;
function Find(ACaption: WideString): TMenuItem{TNT-ALLOW TMenuItem};
published
@@ -122,8 +124,8 @@
implementation
uses
- Controls, Forms, SysUtils, Consts, ActnList, ImgList, TntControls,
- TntGraphics, TntActnList, TntClasses, TntForms, TntSysUtils, TntWindows;
+ Forms, SysUtils, Consts, ActnList, ImgList, TntControls, TntGraphics,
+ TntActnList, TntClasses, TntForms, TntSysUtils, TntWindows;
function WideNewSubMenu(const ACaption: WideString; hCtx: THelpContext;
const AName: TComponentName; const Items: array of TTntMenuItem;
@@ -181,9 +183,19 @@
end;
function WideGetKeyboardChar(Key: Word): WideChar;
+var
+ LatinNumChar: WideChar;
begin
Assert(Win32PlatformIsUnicode);
Result := WideChar(MapVirtualKeyW(Key, 2));
+ if (Key in [$30..$39]) then
+ begin
+ // Check to see if "0" - "9" can be used if all that differs is shift state
+ LatinNumChar := WideChar(Key - $30 + Ord('0'));
+ if (Result <> LatinNumChar)
+ and (Byte(Key) = WordRec(VkKeyScanW(LatinNumChar)).Lo) then // .Hi would be the shift state
+ Result := LatinNumChar;
+ end;
end;
function WideShortCutToText(WordShortCut: Word): WideString;
@@ -437,18 +449,25 @@
end;
procedure FixMenuBiDiProblem(Menu: TMenu);
+var
+ i: integer;
begin
- // TMenu sometimes sets bidi on item[0] which can convert caption to ansi
- if (SysLocale.MiddleEast) then begin
- if (Menu <> nil)
- and (Menu.Items.Count > 0)
- and (Menu.Items[0] is TTntMenuItem) then
- begin
- (Menu.Items[0] as TTntMenuItem).UpdateMenuString(Menu);
+ // TMenu sometimes sets bidi on first visible item which can convert caption to ansi
+ if (SysLocale.MiddleEast)
+ and (Menu <> nil)
+ and (Menu.Items.Count > 0) then
+ begin
+ for i := 0 to Menu.Items.Count - 1 do begin
+ if Menu.Items[i].Visible then begin
+ if (Menu.Items[i] is TTntMenuItem) then
+ (Menu.Items[i] as TTntMenuItem).UpdateMenuString(Menu);
+ break; // found first visible menu item!
+ end;
end;
end;
end;
+
{$IFDEF COMPILER_6} // verified against VCL source in Delphi 6 and BCB 6
type
THackMenuItem = class(TComponent)
@@ -577,6 +596,13 @@
type TAccessActionlink = class(TActionLink);
+procedure TTntMenuItem.InitiateAction;
+begin
+ if GetKeyboardLayout(0) <> FKeyboardLayout then
+ MenuChanged(False);
+ inherited;
+end;
+
function TTntMenuItem.IsCaptionStored: Boolean;
begin
Result := (ActionLink = nil) or (not TAccessActionlink(ActionLink).IsCaptionLinked);
@@ -697,6 +723,7 @@
var
MenuCaption: WideString;
begin
+ FKeyboardLayout := GetKeyboardLayout(0);
if Parent = nil then
ParentHandle := 0
else if (THackMenuItem(Self.Parent).FMergedWith <> nil) then
Modified: branches/BCB5/TntUnicodeControls/Source/TntRegistry.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntRegistry.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntRegistry.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Source/TntStdActns.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntStdActns.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntStdActns.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Source/TntStdCtrls.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntStdCtrls.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntStdCtrls.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -18,7 +18,7 @@
{ TODO: Implement TCustomListBox.KeyPress, OnDataFind. }
uses
- Windows, Messages, Classes, Controls, TntControls, StdCtrls, CheckLst, Graphics,
+ Windows, Messages, Classes, Controls, TntControls, StdCtrls, Graphics,
TntClasses, TntSysUtils;
{TNT-WARN TCustomEdit}
@@ -149,7 +149,6 @@
TTntCustomMemo = class(TCustomMemo{TNT-ALLOW TCustomMemo})
private
FLines: TTntStrings;
- procedure SetLines(const Value: TTntStrings);
procedure SetSelText(const Value: WideString);
function GetText: WideString;
procedure SetText(const Value: WideString);
@@ -161,6 +160,7 @@
procedure DefineProperties(Filer: TFiler); override;
function GetActionLinkClass: TControlActionLinkClass; override;
procedure ActionChange(Sender: TObject; CheckDefaults: Boolean); override;
+ procedure SetLines(const Value: TTntStrings); virtual;
function GetSelStart: Integer; reintroduce; virtual;
procedure SetSelStart(const Value: Integer); reintroduce; virtual;
function GetSelLength: Integer; reintroduce; virtual;
Modified: branches/BCB5/TntUnicodeControls/Source/TntSysUtils.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntSysUtils.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntSysUtils.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -331,6 +331,7 @@
Win32PlatformIsUnicode: Boolean;
Win32PlatformIsXP: Boolean;
Win32PlatformIs2003: Boolean;
+ Win32PlatformIsVista: Boolean;
{$IFNDEF COMPILER_7_UP}
function CheckWin32Version(AMajor: Integer; AMinor: Integer = 0): Boolean;
@@ -382,7 +383,7 @@
implementation
uses
- ActiveX, ComObj, Math, SysConst, Consts,
+ ActiveX, ComObj, SysConst,
{$IFDEF COMPILER_9_UP} WideStrUtils, {$ENDIF} TntWideStrUtils,
TntSystem, TntWindows, TntFormatStrUtils;
@@ -1688,6 +1689,7 @@
or (Win32MajorVersion > 5);
Win32PlatformIs2003 := ((Win32MajorVersion = 5) and (Win32MinorVersion >= 2))
or (Win32MajorVersion > 5);
+ Win32PlatformIsVista := (Win32MajorVersion >= 6);
finalization
Currency_DecimalSep := ''; {make memory sleuth happy}
Modified: branches/BCB5/TntUnicodeControls/Source/TntSystem.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntSystem.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntSystem.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Source/TntWideStrUtils.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntWideStrUtils.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntWideStrUtils.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Source/TntWideStrings.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntWideStrings.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntWideStrings.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
Modified: branches/BCB5/TntUnicodeControls/Source/TntWindows.pas
===================================================================
--- branches/BCB5/TntUnicodeControls/Source/TntWindows.pas 2009-03-08 06:13:22 UTC (rev 495)
+++ branches/BCB5/TntUnicodeControls/Source/TntWindows.pas 2009-03-09 03:21:01 UTC (rev 496)
@@ -3,9 +3,9 @@
{ }
{ Tnt Delphi Unicode Controls }
{ http://www.tntware.com/delphicontrols/unicode/ }
-{ Version: 2.2.7 }
+{ Version: 2.3.0 }
{ }
-{ Copyright (c) 2002-2006, Troy Wolbrink (troy.wolbrink at tntware.com) }
+{ Copyright (c) 2002-2007, Troy Wolbrink (troy.wolbrink at tntware.com) }
{ }
{*****************************************************************************}
@@ -444,7 +444,7 @@
implementation
uses
- SysUtils, Math, TntSystem, TntSysUtils,
+ SysUtils, Math, TntSysUtils,
{$IFDEF COMPILER_9_UP} WideStrUtils, {$ENDIF} TntWideStrUtils;
function _PAnsiCharWithNil(const S: AnsiString): PAnsiChar;
More information about the sword-cvs
mailing list