Patch as per Mattias' suggestion attached,
I tested it and verified that it fixes the problem allowing derivative
components of ipHtmlPanel to be created and used.
Ciao
A.J.
--
A.J. Venter
Chief Software Architect
OpenLab International
www.getopenlab.com
www.silentcoder.co.za
+27 82 726 5103
Index: components/turbopower_ipro/iphtml.pas
===================================================================
--- components/turbopower_ipro/iphtml.pas (revision 8812)
+++ components/turbopower_ipro/iphtml.pas (working copy)
@@ -15976,7 +15976,7 @@
function TIpHtmlInternalPanel.HtmlPanel: TIpHtmlCustomPanel;
begin
Result := TIpHtmlPanel(Parent);
- while (Result.ClassType <> TIpHtmlPanel) do
+ while not (Result is TIpHtmlPanel) do
Result := TIpHtmlPanel(Result.Parent);
end;
Index: components/fpcunit/Makefile.fpc
===================================================================
--- components/fpcunit/Makefile.fpc (revision 8812)
+++ components/fpcunit/Makefile.fpc (working copy)
@@ -7,7 +7,7 @@
[compiler]
unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
unitdir=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
-options=-dLCL -dLCLgtk -S2 -gl
+options=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
[target]
units=fpcunittestrunner.pas
@@ -18,6 +18,16 @@
$(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) \
$(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) \
$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+[prerules]
+# LCL Platform
+ifndef LCL_PLATFORM
+ifeq ($(OS_TARGET),win32)
+LCL_PLATFORM=win32
+else
+LCL_PLATFORM=gtk
+endif
+endif
+export LCL_PLATFORM
[rules]
.PHONY: cleartarget all
Index: components/fpcunit/Makefile
===================================================================
--- components/fpcunit/Makefile (revision 8812)
+++ components/fpcunit/Makefile (working copy)
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/01/19]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/07]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -231,6 +231,14 @@
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
override PACKAGE_NAME=fpcunittestrunner
override PACKAGE_VERSION=0.1
+ifndef LCL_PLATFORM
+ifeq ($(OS_TARGET),win32)
+LCL_PLATFORM=win32
+else
+LCL_PLATFORM=gtk
+endif
+endif
+export LCL_PLATFORM
ifeq ($(FULL_TARGET),i386-linux)
override TARGET_UNITS+=fpcunittestrunner.pas
endif
@@ -454,115 +462,115 @@
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCLgtk -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_UNITDIR+=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
@@ -969,9 +977,6 @@
ifndef INSTALL_DATADIR
INSTALL_DATADIR=$(INSTALL_BASEDIR)
endif
-ifndef INSTALL_SHAREDDIR
-INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib
-endif
ifdef CROSSCOMPILE
ifndef CROSSBINDIR
CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))
@@ -992,7 +997,6 @@
SMARTEXT=.sl
STATICLIBEXT=.a
SHAREDLIBEXT=.so
-SHAREDLIBPREFIX=libfp
STATICLIBPREFIX=libp
RSTEXT=.rst
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
@@ -1763,14 +1767,6 @@
override FPCOPTDEF+=HASUNIX
endif
endif
-ifdef CREATESHARED
-override FPCOPT+=-Cg
-ifeq ($(CPU_TARGET),i386)
-override FPCOPT+=-Aas
-endif
-endif
-ifdef LINKSHARED
-endif
ifdef OPT
override FPCOPT+=$(OPT)
endif
@@ -1785,14 +1781,6 @@
override FPCOPT:=!FPCEXTCMD
export FPCEXTCMD
endif
-override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
-override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
-ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))
-override ACROSSCOMPILE=1
-endif
-ifdef ACROSSCOMPILE
-override FPCOPT+=$(CROSSOPT)
-endif
override COMPILER:=$(FPC) $(FPCOPT)
ifeq (,$(findstring -s ,$(COMPILER)))
EXECPPAS=
@@ -1814,7 +1802,7 @@
override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
override CLEANRSTFILES+=$(RSTFILES)
endif
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
+.PHONY: fpc_all fpc_smart fpc_debug fpc_release
$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
@$(ECHOREDIR) Compiled > $(FPCMADE)
fpc_all: $(FPCMADE)
@@ -1855,38 +1843,6 @@
vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
- $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
- $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
- @$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
- $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
ifdef INSTALL_UNITS
override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@@ -2217,7 +2173,7 @@
release: fpc_release
units: fpc_units
examples:
-shared: fpc_shared
+shared:
install: fpc_install
sourceinstall: fpc_sourceinstall
exampleinstall: fpc_exampleinstall
Index: ide/revision.inc
===================================================================
--- ide/revision.inc (revision 8812)
+++ ide/revision.inc (working copy)
@@ -1,2 +1,2 @@
// Created by Svn2RevisionInc
-const RevisionStr = '8642M';
+const RevisionStr = '8812M';
Index: examples/fontenum/fontenumeration.lpi
===================================================================
--- examples/fontenum/fontenumeration.lpi (revision 8812)
+++ examples/fontenum/fontenumeration.lpi (working copy)
@@ -13,28 +13,7 @@
<Title Value="project1"/>
<ActiveEditorIndexAtStart Value="0"/>
</General>
- <Units Count="2">
- <Unit0>
- <CursorPos X="44" Y="15"/>
- <Filename Value="fontenumeration.lpr"/>
- <IsPartOfProject Value="True"/>
- <TopLine Value="1"/>
- <UnitName Value="fontenumeration"/>
- <UsageCount Value="158"/>
- </Unit0>
- <Unit1>
- <CursorPos X="55" Y="554"/>
- <EditorIndex Value="0"/>
- <Filename Value="mainunit.pas"/>
- <ComponentName Value="frmMain"/>
- <IsPartOfProject Value="True"/>
- <Loaded Value="True"/>
- <ResourceFilename Value="mainunit.lrs"/>
- <TopLine Value="118"/>
- <UnitName Value="mainunit"/>
- <UsageCount Value="158"/>
- </Unit1>
- </Units>
+ <LazDoc Paths=""/>
<PublishOptions>
<Version Value="2"/>
<DestinationDirectory Value="$(ProjPath)/published"/>
@@ -53,6 +32,28 @@
<PackageName Value="LCL"/>
</Item1>
</RequiredPackages>
+ <Units Count="2">
+ <Unit0>
+ <Filename Value="fontenumeration.lpr"/>
+ <IsPartOfProject Value="True"/>
+ <UnitName Value="fontenumeration"/>
+ <CursorPos X="44" Y="15"/>
+ <TopLine Value="1"/>
+ <UsageCount Value="158"/>
+ </Unit0>
+ <Unit1>
+ <Filename Value="mainunit.pas"/>
+ <ComponentName Value="frmMain"/>
+ <IsPartOfProject Value="True"/>
+ <ResourceFilename Value="mainunit.lrs"/>
+ <UnitName Value="mainunit"/>
+ <CursorPos X="55" Y="554"/>
+ <TopLine Value="118"/>
+ <EditorIndex Value="0"/>
+ <UsageCount Value="158"/>
+ <Loaded Value="True"/>
+ </Unit1>
+ </Units>
<JumpHistory Count="0" HistoryIndex="-1"/>
</ProjectOptions>
<CompilerOptions>
Index: examples/fontenum/mainunit.lfm
===================================================================
--- examples/fontenum/mainunit.lfm (revision 8812)
+++ examples/fontenum/mainunit.lfm (working copy)
@@ -1,65 +1,72 @@
object frmMain: TfrmMain
+ ActiveControl = lbFamily
Caption = 'frmMain'
ClientHeight = 440
ClientWidth = 714
OnCloseQuery = FormCloseQuery
OnCreate = FormCreate
OnShow = FormShow
- PixelsPerInch = 75
+ PixelsPerInch = 86
ShowHint = True
HorzScrollBar.Page = 713
VertScrollBar.Page = 439
- Left = 33
+ Left = 253
Height = 440
- Top = 28
+ Top = 173
Width = 714
object Label3: TLabel
Caption = 'Filtro'
Color = clNone
+ ParentColor = False
Left = 548
- Height = 12
+ Height = 13
Top = 257
- Width = 28
+ Width = 29
end
object Label4: TLabel
Caption = 'Face font list'
Color = clNone
+ ParentColor = False
Left = 216
- Height = 12
+ Height = 13
Top = 16
- Width = 72
+ Width = 73
end
object Label5: TLabel
Caption = 'Styles'
Color = clNone
+ ParentColor = False
Left = 424
- Height = 12
+ Height = 13
Top = 11
- Width = 34
+ Width = 35
end
object Sizes: TLabel
Caption = 'Sizes'
Color = clNone
+ ParentColor = False
Left = 648
- Height = 12
+ Height = 13
Top = 11
- Width = 30
+ Width = 31
end
object lblCharset: TLabel
Caption = 'lblCharset'
Color = clNone
+ ParentColor = False
Left = 424
- Height = 12
+ Height = 13
Top = 176
- Width = 43
+ Width = 57
end
object Label6: TLabel
Caption = 'Filter'
Color = clNone
+ ParentColor = False
Left = 11
- Height = 12
+ Height = 13
Top = 16
- Width = 28
+ Width = 29
end
object lbFamily: TListBox
OnClick = lbFamilyClick
@@ -71,6 +78,7 @@
Width = 200
end
object cbCharset: TComboBox
+ AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
MaxLength = 0
TabOrder = 1
Text = 'ANSI_CHARSET'
@@ -117,13 +125,14 @@
Width = 208
end
object cbPitch: TComboBox
+ AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+ ItemIndex = 0
Items.Strings = (
'DEFAULT_PITCH'
'FIXED_PITCH'
'VARIABLE_PITCH'
'MONO_FONT'
)
- ItemIndex = 0
MaxLength = 0
TabOrder = 6
Text = 'DEFAULT_PITCH'
@@ -146,17 +155,17 @@
Caption = 'Strikeout'
TabOrder = 8
Left = 591
- Height = 21
+ Height = 24
Top = 312
- Width = 73
+ Width = 72
end
object chkUnderLine: TCheckBox
Caption = 'UnderLine'
TabOrder = 9
Left = 592
- Height = 21
+ Height = 24
Top = 336
- Width = 82
+ Width = 81
end
object Button1: TButton
BorderSpacing.InnerBorder = 2
@@ -179,6 +188,8 @@
Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goSmoothScroll]
RowCount = 5
ScrollBars = ssAutoBoth
+ TabOrder = 11
+ TabStop = True
VisibleColCount = 1
VisibleRowCount = 5
Left = 216
Index: examples/fontenum/mainunit.lrs
===================================================================
--- examples/fontenum/mainunit.lrs (revision 8812)
+++ examples/fontenum/mainunit.lrs (working copy)
@@ -1,52 +1,56 @@
{ This is an automatically generated lazarus resource file }
LazarusResources.Add('TfrmMain','FORMDATA',[
- 'TPF0'#8'TfrmMain'#7'frmMain'#7'Caption'#6#7'frmMain'#12'ClientHeight'#3#184#1
- +#11'ClientWidth'#3#202#2#12'OnCloseQuery'#7#14'FormCloseQuery'#8'OnCreate'#7
- +#10'FormCreate'#6'OnShow'#7#8'FormShow'#13'PixelsPerInch'#2'K'#8'ShowHint'#9
- +#18'HorzScrollBar.Page'#3#201#2#18'VertScrollBar.Page'#3#183#1#4'Left'#2'!'#6
- +'Height'#3#184#1#3'Top'#2#28#5'Width'#3#202#2#0#6'TLabel'#6'Label3'#7'Captio'
- +'n'#6#6'Filtro'#5'Color'#7#6'clNone'#4'Left'#3'$'#2#6'Height'#2#12#3'Top'#3#1
- +#1#5'Width'#2#28#0#0#6'TLabel'#6'Label4'#7'Caption'#6#14'Face font list'#5'C'
- +'olor'#7#6'clNone'#4'Left'#3#216#0#6'Height'#2#12#3'Top'#2#16#5'Width'#2'H'#0
- +#0#6'TLabel'#6'Label5'#7'Caption'#6#6'Styles'#5'Color'#7#6'clNone'#4'Left'#3
- +#168#1#6'Height'#2#12#3'Top'#2#11#5'Width'#2'"'#0#0#6'TLabel'#5'Sizes'#7'Cap'
- +'tion'#6#5'Sizes'#5'Color'#7#6'clNone'#4'Left'#3#136#2#6'Height'#2#12#3'Top'
- +#2#11#5'Width'#2#30#0#0#6'TLabel'#10'lblCharset'#7'Caption'#6#10'lblCharset'
- +#5'Color'#7#6'clNone'#4'Left'#3#168#1#6'Height'#2#12#3'Top'#3#176#0#5'Width'
- +#2'+'#0#0#6'TLabel'#6'Label6'#7'Caption'#6#6'Filter'#5'Color'#7#6'clNone'#4
- +'Left'#2#11#6'Height'#2#12#3'Top'#2#16#5'Width'#2#28#0#0#8'TListBox'#8'lbFam'
- +'ily'#7'OnClick'#7#13'lbFamilyClick'#8'TabOrder'#2#0#8'TopIndex'#2#255#4'Lef'
- +'t'#3#216#0#6'Height'#3#16#1#3'Top'#2' '#5'Width'#3#200#0#0#0#9'TComboBox'#9
- +'cbCharset'#9'MaxLength'#2#0#8'TabOrder'#2#1#4'Text'#6#12'ANSI_CHARSET'#4'Le'
- +'ft'#2#8#6'Height'#2#21#3'Top'#2'%'#5'Width'#3#194#0#0#0#7'TButton'#7'Button'
- +'2'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#12'apply filter'#7'OnClic'
- +'k'#7#12'Button2Click'#8'TabOrder'#2#2#4'Left'#2#8#6'Height'#2#25#3'Top'#2'`'
- +#5'Width'#2'K'#0#0#8'TListBox'#8'lbStyles'#7'OnClick'#7#13'lbStylesClick'#8
- +'TabOrder'#2#3#8'TopIndex'#2#255#4'Left'#3#168#1#6'Height'#3#128#0#3'Top'#2
+ 'TPF0'#8'TfrmMain'#7'frmMain'#13'ActiveControl'#7#8'lbFamily'#7'Caption'#6#7
+ +'frmMain'#12'ClientHeight'#3#184#1#11'ClientWidth'#3#202#2#12'OnCloseQuery'#7
+ +#14'FormCloseQuery'#8'OnCreate'#7#10'FormCreate'#6'OnShow'#7#8'FormShow'#13
+ +'PixelsPerInch'#2'V'#8'ShowHint'#9#18'HorzScrollBar.Page'#3#201#2#18'VertScr'
+ +'ollBar.Page'#3#183#1#4'Left'#3#253#0#6'Height'#3#184#1#3'Top'#3#173#0#5'Wid'
+ +'th'#3#202#2#0#6'TLabel'#6'Label3'#7'Caption'#6#6'Filtro'#5'Color'#7#6'clNon'
+ +'e'#11'ParentColor'#8#4'Left'#3'$'#2#6'Height'#2#13#3'Top'#3#1#1#5'Width'#2
+ +#29#0#0#6'TLabel'#6'Label4'#7'Caption'#6#14'Face font list'#5'Color'#7#6'clN'
+ +'one'#11'ParentColor'#8#4'Left'#3#216#0#6'Height'#2#13#3'Top'#2#16#5'Width'#2
+ +'I'#0#0#6'TLabel'#6'Label5'#7'Caption'#6#6'Styles'#5'Color'#7#6'clNone'#11'P'
+ +'arentColor'#8#4'Left'#3#168#1#6'Height'#2#13#3'Top'#2#11#5'Width'#2'#'#0#0#6
+ +'TLabel'#5'Sizes'#7'Caption'#6#5'Sizes'#5'Color'#7#6'clNone'#11'ParentColor'
+ +#8#4'Left'#3#136#2#6'Height'#2#13#3'Top'#2#11#5'Width'#2#31#0#0#6'TLabel'#10
+ +'lblCharset'#7'Caption'#6#10'lblCharset'#5'Color'#7#6'clNone'#11'ParentColor'
+ +#8#4'Left'#3#168#1#6'Height'#2#13#3'Top'#3#176#0#5'Width'#2'9'#0#0#6'TLabel'
+ +#6'Label6'#7'Caption'#6#6'Filter'#5'Color'#7#6'clNone'#11'ParentColor'#8#4'L'
+ +'eft'#2#11#6'Height'#2#13#3'Top'#2#16#5'Width'#2#29#0#0#8'TListBox'#8'lbFami'
+ +'ly'#7'OnClick'#7#13'lbFamilyClick'#8'TabOrder'#2#0#8'TopIndex'#2#255#4'Left'
+ +#3#216#0#6'Height'#3#16#1#3'Top'#2' '#5'Width'#3#200#0#0#0#9'TComboBox'#9'cb'
+ +'Charset'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchA'
+ +'scending'#0#9'MaxLength'#2#0#8'TabOrder'#2#1#4'Text'#6#12'ANSI_CHARSET'#4'L'
+ +'eft'#2#8#6'Height'#2#21#3'Top'#2'%'#5'Width'#3#194#0#0#0#7'TButton'#7'Butto'
+ +'n2'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#12'apply filter'#7'OnCli'
+ +'ck'#7#12'Button2Click'#8'TabOrder'#2#2#4'Left'#2#8#6'Height'#2#25#3'Top'#2
+ +'`'#5'Width'#2'K'#0#0#8'TListBox'#8'lbStyles'#7'OnClick'#7#13'lbStylesClick'
+ +#8'TabOrder'#2#3#8'TopIndex'#2#255#4'Left'#3#168#1#6'Height'#3#128#0#3'Top'#2
+' '#5'Width'#3#208#0#0#0#8'TListBox'#7'lbSizes'#7'OnClick'#7#12'lbSizesClick'
+#8'TabOrder'#2#4#8'TopIndex'#2#255#4'Left'#3#128#2#6'Height'#3#16#1#3'Top'#2
+' '#5'Width'#2'8'#0#0#8'TListBox'#9'lbCharset'#7'OnClick'#7#14'lbCharsetClic'
+'k'#8'TabOrder'#2#5#8'TopIndex'#2#255#4'Left'#3#168#1#6'Height'#2'p'#3'Top'#3
- +#192#0#5'Width'#3#208#0#0#0#9'TComboBox'#7'cbPitch'#13'Items.Strings'#1#6#13
- +'DEFAULT_PITCH'#6#11'FIXED_PITCH'#6#14'VARIABLE_PITCH'#6#9'MONO_FONT'#0#9'It'
- +'emIndex'#2#0#9'MaxLength'#2#0#8'TabOrder'#2#6#4'Text'#6#13'DEFAULT_PITCH'#4
- +'Left'#2#8#6'Height'#2#21#3'Top'#2'='#5'Width'#3#194#0#0#0#7'TButton'#10'Btn'
- +'FontDlg'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#8'Font Dlg'#7'OnCli'
- +'ck'#7#15'BtnFontDlgClick'#8'TabOrder'#2#7#4'Left'#2'8'#6'Height'#2'('#3'Top'
- +#3'p'#1#5'Width'#3#152#0#0#0#9'TCheckBox'#9'chkStrike'#7'Caption'#6#9'Strike'
- +'out'#8'TabOrder'#2#8#4'Left'#3'O'#2#6'Height'#2#21#3'Top'#3'8'#1#5'Width'#2
- +'I'#0#0#9'TCheckBox'#12'chkUnderLine'#7'Caption'#6#9'UnderLine'#8'TabOrder'#2
- +#9#4'Left'#3'P'#2#6'Height'#2#21#3'Top'#3'P'#1#5'Width'#2'R'#0#0#7'TButton'#7
- +'Button1'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#17'Reset Sample Tex'
- +'t'#7'OnClick'#7#12'Button1Click'#8'TabOrder'#2#10#4'Left'#2'8'#6'Height'#2
- +')'#3'Top'#3'8'#1#5'Width'#3#153#0#0#0#11'TStringGrid'#4'grid'#15'AutoFillCo'
- +'lumns'#9#8'ColCount'#2#1#16'DefaultRowHeight'#2#17#10'FixedColor'#7#9'clBtn'
- +'Face'#9'FixedCols'#2#0#9'FixedRows'#2#0#13'GridLineWidth'#2#0#7'Options'#11
- +#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLine'#13'go'
- +'RangeSelect'#9'goEditing'#14'goSmoothScroll'#0#8'RowCount'#2#5#10'ScrollBar'
- +'s'#7#10'ssAutoBoth'#15'VisibleColCount'#2#1#15'VisibleRowCount'#2#5#4'Left'
- +#3#216#0#6'Height'#2'x'#3'Top'#3'8'#1#5'Width'#3'p'#1#0#0#11'TFontDialog'#11
- +'FontDialog1'#5'Title'#6#13'Select a font'#5'Title'#6#13'Select a font'#4'le'
- +'ft'#3'8'#1#3'top'#3#128#1#0#0#0
+ +#192#0#5'Width'#3#208#0#0#0#9'TComboBox'#7'cbPitch'#16'AutoCompleteText'#11
+ +#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'ItemIndex'#2#0#13'I'
+ +'tems.Strings'#1#6#13'DEFAULT_PITCH'#6#11'FIXED_PITCH'#6#14'VARIABLE_PITCH'#6
+ +#9'MONO_FONT'#0#9'MaxLength'#2#0#8'TabOrder'#2#6#4'Text'#6#13'DEFAULT_PITCH'
+ +#4'Left'#2#8#6'Height'#2#21#3'Top'#2'='#5'Width'#3#194#0#0#0#7'TButton'#10'B'
+ +'tnFontDlg'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#8'Font Dlg'#7'OnC'
+ +'lick'#7#15'BtnFontDlgClick'#8'TabOrder'#2#7#4'Left'#2'8'#6'Height'#2'('#3'T'
+ +'op'#3'p'#1#5'Width'#3#152#0#0#0#9'TCheckBox'#9'chkStrike'#7'Caption'#6#9'St'
+ +'rikeout'#8'TabOrder'#2#8#4'Left'#3'O'#2#6'Height'#2#24#3'Top'#3'8'#1#5'Widt'
+ +'h'#2'H'#0#0#9'TCheckBox'#12'chkUnderLine'#7'Caption'#6#9'UnderLine'#8'TabOr'
+ +'der'#2#9#4'Left'#3'P'#2#6'Height'#2#24#3'Top'#3'P'#1#5'Width'#2'Q'#0#0#7'TB'
+ +'utton'#7'Button1'#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#17'Reset S'
+ +'ample Text'#7'OnClick'#7#12'Button1Click'#8'TabOrder'#2#10#4'Left'#2'8'#6'H'
+ +'eight'#2')'#3'Top'#3'8'#1#5'Width'#3#153#0#0#0#11'TStringGrid'#4'grid'#15'A'
+ +'utoFillColumns'#9#8'ColCount'#2#1#16'DefaultRowHeight'#2#17#10'FixedColor'#7
+ +#9'clBtnFace'#9'FixedCols'#2#0#9'FixedRows'#2#0#13'GridLineWidth'#2#0#7'Opti'
+ +'ons'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLin'
+ +'e'#13'goRangeSelect'#9'goEditing'#14'goSmoothScroll'#0#8'RowCount'#2#5#10'S'
+ +'crollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#11#7'TabStop'#9#15'VisibleColCoun'
+ +'t'#2#1#15'VisibleRowCount'#2#5#4'Left'#3#216#0#6'Height'#2'x'#3'Top'#3'8'#1
+ +#5'Width'#3'p'#1#0#0#11'TFontDialog'#11'FontDialog1'#5'Title'#6#13'Select a '
+ +'font'#5'Title'#6#13'Select a font'#4'left'#3'8'#1#3'top'#3#128#1#0#0#0
]);