Site Navigation

Date:      Tue, 14 Feb 2006 20:53:00 GMT
From:      Matthias Sund <m.sund@arcor.de>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/93358: [new port:] devel/upp; Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
Message-ID:  <200602142053.k1EKr03E055318@www.freebsd.org>
Resent-Message-ID: <200602142100.k1EL0OYg059051@freefall.freebsd.org>

---

next in thread | raw e-mail | index | archive | help

---

>Number:         93358
>Category:       ports
>Synopsis:       [new port:] devel/upp; Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 14 21:00:18 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Matthias Sund
>Release:        FreeBSD 6 stable
>Organization:
>Environment:
FreeBSD travelmate 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #9: Tue Feb  7 19:46:31 CET 2006     masu@travelmate:/usr/obj/usr/src/sys/TRAVELMATE  i386
>Description:
Ultimate++ is a C++ cross-platform rapid application development suite.
It includes a set of libraries (GUI, SQL, etc..), and an integrated
development environment.

WWW: http://upp.sourceforge.net/
>How-To-Repeat:
              
>Fix:
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	upp
#	upp/Makefile
#	upp/distinfo
#	upp/pkg-descr
#	upp/pkg-message
#	upp/files
#	upp/files/patch-uppsrc-Draw-Draw.upp
#	upp/files/patch-uppsrc-coff-util.cpp
#	upp/files/patch-uppsrc-ide-Install.cpp
#	upp/files/patch-uppsrc-ide-Makefile
#	upp/files/patch-uppsrc-ide-idewin.cpp
#	upp/files/patch-examples-Scribble3-Scribble.cpp
#	upp/files/patch-uppsrc-Core-Core.upp
#	upp/files/patch-uppsrc-TCtrlLib-TCtrlLib.h
#	upp/files/patch-examples-SDLExample-SDLExample.upp
#	upp/files/patch-uppsrc-Core-Stream.cpp
#
echo c - upp
mkdir -p upp > /dev/null 2>&1
echo x - upp/Makefile
sed 's/^X//' >upp/Makefile << 'END-of-upp/Makefile'
X# New ports collection makefile for:	upp
X# Date created:				February, 8th 2006
X# Whom:					Matthias Sund <m.sund@arcor.de>
X#
X# $FreeBSD$
X#
X
XPORTNAME=	upp
XPORTVERSION=	602b
XCATEGORIES=	devel x11-toolkits
XMASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
XMASTER_SITE_SUBDIR=	${PORTNAME}
XDISTNAME=	upp-src-602-beta
X
XMAINTAINER=	m.sund@arcor.de
XCOMMENT=	Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
X
XLIB_DEPENDS=	Xft:${PORTSDIR}/x11-fonts/libXft\
X		freetype.9:${PORTSDIR}/print/freetype2\
X		expat.6:${PORTSDIR}/textproc/expat2
X
XUSE_ZIP=	yes
XUSE_GMAKE=	yes
XUSE_X_PREFIX=	yes
X
XBUILD_WRKSRC=	${WRKSRC}/uppsrc/ide
X
XINSTALL_DIRS=	Common examples reference uppsrc
X
Xpost-extract:
X	@${MKDIR} ${WRKDIR}/${DISTNAME}
X	@for d in ${INSTALL_DIRS}; do ${MV} ${WRKDIR}/$$d ${WRKSRC}; done;
X
Xpre-patch:
X	@${FIND} -E ${WRKDIR} -type f -iregex \
X	".*\.(c|h|cpp|icpp|upp|tpp|am|in|lay|key|txt)" -print0 | \
X	${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//'
X	@for f in `${FIND} -E ${WRKDIR} -type f -name Makefile -print`; \
X	do ${CP} $$f $$f.bak && (${CAT} $$f.bak | ${TR} -d "\r" > $$f); done
X
Xpre-build:
X	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${BUILD_WRKSRC}/Makefile
X	@${REINPLACE_CMD} -e 's|CINC =(.*)|$1 ${PTHREAD_CFLAGS}|' ${BUILD_WRKSRC}/Makefile
X
Xpost-build:
X	@${FIND} -E ${WRKDIR} -type f -iregex ".*\.(bak|orig)" -exec ${RM} -r {} \;
X	@${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "COMPILER = \"\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "DEBUG_INFO = \"0\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "DEBUG_BLITZ = \"1\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "DEBUG_LINKMODE = \"0\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "DEBUG_OPTIONS = \"-O0\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "RELEASE_BLITZ = \"1\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "RELEASE_LINKMODE = \"0\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "RELEASE_OPTIONS = \"-O2\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "RELEASE_SIZE_OPTIONS = \"-O1\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "PATH = \"\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "INCLUDE = \"${X11BASE}/include;${LOCALBASE}/include;${LOCALBASE}/include/freetype2\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "LIB = \"${X11BASE}/lib;${LOCALBASE}/lib\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "REMOTE_HOST = \"\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "REMOTE_OS = \"FREEBSD\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "REMOTE_TRANSFER = \"\";" >> ${WRKSRC}/GCC32.bm
X	@${ECHO_CMD} "REMOTE_MAP = \"\";" >> ${WRKSRC}/GCC32.bm
X
Xdo-install:
X	@${INSTALL_PROGRAM} ${WRKSRC}/ide ${PREFIX}/bin/uppide
X	@${MKDIR} ${PREFIX}/share/upp
X	@${INSTALL_DATA} ${WRKSRC}/GCC32.bm ${PREFIX}/share/upp/GCC32.bm
X	@(cd ${WRKSRC} && for d in ${INSTALL_DIRS};do ${FIND} $$d -type d -print|${SORT} -r>>dirs.txt;done;)
X	@(cd ${WRKSRC} && for d in ${INSTALL_DIRS};do ${FIND} $$d -type f -print|${SORT}>>files.txt;done;)
X	@for d in `${CAT} ${WRKSRC}/dirs.txt`;do ${MKDIR} ${PREFIX}/share/upp/$$d;done;
X	@for f in `${CAT} ${WRKSRC}/files.txt`;do ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/upp/$$f;done;
X
Xpost-install:
X	@${ECHO_CMD} bin/uppide > ${TMPPLIST}
X	@${ECHO_CMD} share/upp/GCC32.bm >> ${TMPPLIST}
X	@for f in `${CAT} ${WRKSRC}/files.txt`;do ${ECHO_CMD} share/upp/$$f >> ${TMPPLIST};done;
X	@for d in `${CAT} ${WRKSRC}/dirs.txt`;do ${ECHO_CMD} @dirrm share/upp/$$d >> ${TMPPLIST};done;
X	@${ECHO_CMD} @dirrm share/upp >> ${TMPPLIST}
X	@${RM} ${WRKSRC}/*.txt
X	@${CAT} ${PKGMESSAGE}
X
X.include <bsd.port.mk>
END-of-upp/Makefile
echo x - upp/distinfo
sed 's/^X//' >upp/distinfo << 'END-of-upp/distinfo'
XMD5 (upp-src-602-beta.zip) = adfd662ea408ac99bc8270ee19671cce
XSHA256 (upp-src-602-beta.zip) = 745ae9ea2ecbebe59f50a4e89a2ef6bc7521259502a091bd198a766eedf44d28
XSIZE (upp-src-602-beta.zip) = 5849877
END-of-upp/distinfo
echo x - upp/pkg-descr
sed 's/^X//' >upp/pkg-descr << 'END-of-upp/pkg-descr'
XUltimate++ is a C++ cross-platform rapid application development suite.
XIt includes a set of libraries (GUI, SQL, etc..), and an integrated
Xdevelopment environment.
X
XWWW: http://upp.sourceforge.net/
END-of-upp/pkg-descr
echo x - upp/pkg-message
sed 's/^X//' >upp/pkg-message << 'END-of-upp/pkg-message'
X===============================================================================
XYou may wish to set environment variable $UPP_DIR to your personal Ultimate++
Xinstallation directory.
X===============================================================================
END-of-upp/pkg-message
echo c - upp/files
mkdir -p upp/files > /dev/null 2>&1
echo x - upp/files/patch-uppsrc-Draw-Draw.upp
sed 's/^X//' >upp/files/patch-uppsrc-Draw-Draw.upp << 'END-of-upp/files/patch-uppsrc-Draw-Draw.upp'
X--- uppsrc/Draw/Draw.upp.orig	Mon Feb 13 23:46:27 2006
X+++ uppsrc/Draw/Draw.upp	Mon Feb 13 23:46:38 2006
X@@ -1,20 +1,20 @@
X-uses
X-	Core;
X-
X acceptflags
X 	XLFD;
X 
X+uses
X+	Core;
X+
X library(WIN32) "user32 gdi32";
X 
X-library(LINUX) "X11";
X+library(LINUX) X11;
X 
X-library(LINUX) "dl";
X+library(LINUX) dl;
X 
X-library(LINUX !XLFD) "Xft";
X+library(LINUX !XLFD) Xft;
X 
X-library(FREEBSD) "X11";
X+library(FREEBSD) X11;
X 
X-library(FREEBSD !XLFD) "Xft fontconfig";
X+library(FREEBSD !XLFD) "Xft fontconfig Xrender freetype expat";
X 
X library(LINUX !XLFD !SHARED) "fontconfig Xrender freetype expat";
X 
X@@ -62,3 +62,4 @@
X 
X mainconfig
X 	"Debug" = "MSC GUI DEBUG WIN32";
X+
END-of-upp/files/patch-uppsrc-Draw-Draw.upp
echo x - upp/files/patch-uppsrc-coff-util.cpp
sed 's/^X//' >upp/files/patch-uppsrc-coff-util.cpp << 'END-of-upp/files/patch-uppsrc-coff-util.cpp'
X--- uppsrc/coff/util.cpp.orig	Sun Feb 12 16:06:44 2006
X+++ uppsrc/coff/util.cpp	Sun Feb 12 17:19:30 2006
X@@ -13,12 +13,6 @@
X #include            <Core/dli.h>
X #endif
X 
X-#ifdef PLATFORM_FREEBSD
X-#include <fcntl.>
X-#include <unistd.h>
X-#include <sys/mman.h>
X-#endif
X-
X #ifdef PLATFORM_WIN32
X Vector<String> EnumWinRegSubkeys(const char *path, HKEY base_key) {
X 	HKEY key = 0;
END-of-upp/files/patch-uppsrc-coff-util.cpp
echo x - upp/files/patch-uppsrc-ide-Install.cpp
sed 's/^X//' >upp/files/patch-uppsrc-ide-Install.cpp << 'END-of-upp/files/patch-uppsrc-ide-Install.cpp'
X--- uppsrc/ide/Install.cpp.orig	Mon Feb 13 00:08:00 2006
X+++ uppsrc/ide/Install.cpp	Mon Feb 13 00:03:55 2006
X@@ -250,6 +250,7 @@
X 	String supp;
X 	ChkSupp(GetHomeDirFile("upp"), supp);
X 	ChkSupp("/usr/local/share/upp", supp);
X+	ChkSupp("/usr/X11R6/share/upp", supp);
X 	ChkSupp("/usr/local/lib/upp", supp);
X 	ChkSupp("/usr/local/bin/upp", supp);
X 	ChkSupp("/usr/share/upp", supp);
X@@ -260,7 +261,23 @@
X 		return true;
X 	}
X 	Progress pi;
X+#ifdef PLATFORM_FREEBSD
X+	String upp = FromSystemCharset(getenv("UPP_DIR"));
X+	if(IsNull(upp)) {
X+	  upp = AppendFileName(FromSystemCharset(getenv("HOME")), "upp");
X+	  if (DirectoryExists(upp)) {
X+	    Exclamation("Personal Ultimate`+`+ directory not found. Please set variable $UPP`_DIR appropriately.");
X+	    return false;
X+	  }
X+	} else {
X+	  if (DirectoryExists(upp)) {
X+	    Exclamation("Directory defined in variable $UPP`_DIR already exists. Please define another directory for Ultimate`+`+");
X+	    return false;
X+	  }
X+	}
X+#else
X 	String upp = GetHomeDirFile("upp");
X+#endif
X 	String uppsrc;
X 	String pp;
X 	String out = AppendFileName(upp, "out");
END-of-upp/files/patch-uppsrc-ide-Install.cpp
echo x - upp/files/patch-uppsrc-ide-Makefile
sed 's/^X//' >upp/files/patch-uppsrc-ide-Makefile << 'END-of-upp/files/patch-uppsrc-ide-Makefile'
X--- uppsrc/ide/Makefile.orig	Mon Feb 13 07:21:50 2006
X+++ uppsrc/ide/Makefile	Mon Feb 13 07:52:28 2006
X@@ -1,13 +1,13 @@
X-UPPDIR1 = /src/uppsrc/
X+UPPDIR1 = ../
X 
X-UPPOUT = /home/cxl/upp/out/
X-CINC =  -I$(UPPDIR1)
X-Macro =  -DflagGUI -DflagGCC -DflagSHARED -DflagLINUX
X-CC = c++ -c -O2 -ffunction-sections
X-CFLAGS = $(CC) -x c
X-CPPFLAGS = $(CC) -x c++
X-LIBPATH =  -L"/usr/X11R6/lib"
X+UPPOUT = $(UPPDIR1)../out/
X+CINC =  -I$(UPPDIR1) -I$(X11BASE)/include -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2
X+Macro =  -DflagGUI -DflagGCC -DflagSHARED -DflagFREEBSD
X+CFLAGS = $(CC) -c -O2 -fPIC
X+CPPFLAGS = $(CXX) -c -O2 -fPIC
X+LIBPATH =  -L$(X11BASE)/lib -L$(LOCALBASE)/lib
X AR = ar -sr
X+MKDIR?=	mkdir -p
X OutDir_ide = $(UPPOUT)ide/GCC32-Gcc-Gui-Linux-Main-Shared/
X Macro_ide = $(Macro) -DflagMAIN
X OutDir_ide_Common = $(UPPOUT)ide/Common/GCC32-Gcc-Gui-Linux-Shared/
X@@ -78,48 +78,48 @@
X Macro_DocTypes = $(Macro)
X 
X OutDir = $(OutDir_ide)
X-OutFile = /src/ide
X+OutFile = $(UPPDIR1)../ide
X 
X .PHONY: all
X all: install $(OutFile)
X 
X .PHONY: install
X install:
X-	-mkdir -p $(OutDir)
X-	-mkdir -p $(OutDir_ide)
X-	-mkdir -p $(OutDir_ide_Common)
X-	-mkdir -p $(OutDir_ide_LayDes)
X-	-mkdir -p $(OutDir_ide_IconDes)
X-	-mkdir -p $(OutDir_ide_Builders)
X-	-mkdir -p $(OutDir_ide_Debuggers)
X-	-mkdir -p $(OutDir_ide_Browser)
X-	-mkdir -p $(OutDir_ide_Topic)
X-	-mkdir -p $(OutDir_ide_VectorDes)
X-	-mkdir -p $(OutDir_CodeEditor)
X-	-mkdir -p $(OutDir_Topic)
X-	-mkdir -p $(OutDir_CtrlLib)
X-	-mkdir -p $(OutDir_Web)
X-	-mkdir -p $(OutDir_plugin_bz2)
X-	-mkdir -p $(OutDir_HexView)
X-	-mkdir -p $(OutDir_Esc)
X-	-mkdir -p $(OutDir_Core)
X-	-mkdir -p $(OutDir_RichEdit)
X-	-mkdir -p $(OutDir_plugin_png)
X-	-mkdir -p $(OutDir_plugin_gif)
X-	-mkdir -p $(OutDir_Image)
X-	-mkdir -p $(OutDir_plugin_tif)
X-	-mkdir -p $(OutDir_plugin_jpg)
X-	-mkdir -p $(OutDir_Draw)
X-	-mkdir -p $(OutDir_plugin_z)
X-	-mkdir -p $(OutDir_coff_binobj)
X-	-mkdir -p $(OutDir_coff)
X-	-mkdir -p $(OutDir_plugin_ndisasm)
X-	-mkdir -p $(OutDir_CppBase)
X-	-mkdir -p $(OutDir_VectorDes)
X-	-mkdir -p $(OutDir_RichText)
X-	-mkdir -p $(OutDir_CtrlCore)
X-	-mkdir -p $(OutDir_PdfDraw)
X-	-mkdir -p $(OutDir_DocTypes)
X+	-$(MKDIR) $(OutDir)
X+	-$(MKDIR) $(OutDir_ide)
X+	-$(MKDIR) $(OutDir_ide_Common)
X+	-$(MKDIR) $(OutDir_ide_LayDes)
X+	-$(MKDIR) $(OutDir_ide_IconDes)
X+	-$(MKDIR) $(OutDir_ide_Builders)
X+	-$(MKDIR) $(OutDir_ide_Debuggers)
X+	-$(MKDIR) $(OutDir_ide_Browser)
X+	-$(MKDIR) $(OutDir_ide_Topic)
X+	-$(MKDIR) $(OutDir_ide_VectorDes)
X+	-$(MKDIR) $(OutDir_CodeEditor)
X+	-$(MKDIR) $(OutDir_Topic)
X+	-$(MKDIR) $(OutDir_CtrlLib)
X+	-$(MKDIR) $(OutDir_Web)
X+	-$(MKDIR) $(OutDir_plugin_bz2)
X+	-$(MKDIR) $(OutDir_HexView)
X+	-$(MKDIR) $(OutDir_Esc)
X+	-$(MKDIR) $(OutDir_Core)
X+	-$(MKDIR) $(OutDir_RichEdit)
X+	-$(MKDIR) $(OutDir_plugin_png)
X+	-$(MKDIR) $(OutDir_plugin_gif)
X+	-$(MKDIR) $(OutDir_Image)
X+	-$(MKDIR) $(OutDir_plugin_tif)
X+	-$(MKDIR) $(OutDir_plugin_jpg)
X+	-$(MKDIR) $(OutDir_Draw)
X+	-$(MKDIR) $(OutDir_plugin_z)
X+	-$(MKDIR) $(OutDir_coff_binobj)
X+	-$(MKDIR) $(OutDir_coff)
X+	-$(MKDIR) $(OutDir_plugin_ndisasm)
X+	-$(MKDIR) $(OutDir_CppBase)
X+	-$(MKDIR) $(OutDir_VectorDes)
X+	-$(MKDIR) $(OutDir_RichText)
X+	-$(MKDIR) $(OutDir_CtrlCore)
X+	-$(MKDIR) $(OutDir_PdfDraw)
X+	-$(MKDIR) $(OutDir_DocTypes)
X 
X $(OutFile):  \
X 	$(OutDir_ide)UppDlg.o \
X@@ -149,6 +149,10 @@
X 	$(OutDir_ide)Host.o \
X 	$(OutDir_ide)Build.o \
X 	$(OutDir_ide)Debug.o \
X+	$(OutDir_ide)UppWspc.o \
X+	$(OutDir_ide)SelectPkg.o \
X+	$(OutDir_ide)Thisbacks.o \
X+	$(OutDir_ide)Virtuals.o \
X 	$(OutDir_ide_Common)Common.a \
X 	$(OutDir_ide_LayDes)LayDes.a \
X 	$(OutDir_ide_IconDes)IconDes.a \
X@@ -182,7 +186,7 @@
X 	$(OutDir_CtrlCore)CtrlCore.a \
X 	$(OutDir_PdfDraw)PdfDraw.a \
X 	$(OutDir_DocTypes)DocTypes.a
X-	c++ -o $(OutFile) -Wl,-s $(LIBPATH) -Wl,--gc-sections,-O,2 $(LINKOPTIONS) \
X+	$(CXX) -o $(OutFile) -Wl,-s $(LIBPATH) -Wl,-O,2 $(LINKOPTIONS) \
X 		$(OutDir_ide)UppDlg.o \
X 		$(OutDir_ide)Template.o \
X 		$(OutDir_ide)FindInFiles.o \
X@@ -210,6 +214,10 @@
X 		$(OutDir_ide)Host.o \
X 		$(OutDir_ide)Build.o \
X 		$(OutDir_ide)Debug.o \
X+		$(OutDir_ide)UppWspc.o \
X+		$(OutDir_ide)SelectPkg.o \
X+		$(OutDir_ide)Thisbacks.o \
X+		$(OutDir_ide)Virtuals.o \
X 		-Wl,--start-group  \
X 			$(OutDir_ide_Common)Common.a \
X 			$(OutDir_ide_LayDes)LayDes.a \
X@@ -244,12 +252,23 @@
X 			$(OutDir_CtrlCore)CtrlCore.a \
X 			$(OutDir_PdfDraw)PdfDraw.a \
X 			$(OutDir_DocTypes)DocTypes.a \
X-			-lpthread \
X-			-ldl \
X+			-pthread \
X+			-lfreetype \
X 			-lX11 \
X 			-lXft \
X 		-Wl,--end-group
X 
X+$(OutDir_ide)UppWspc.o: $(UPPDIR1)ide/UppWspc.cpp $(UPPDIR1)ide/ide.h
X+	$(CPPFLAGS) $(CINC) $(Macro_ide)  $(UPPDIR1)ide/UppWspc.cpp -o $(OutDir_ide)UppWspc.o
X+
X+$(OutDir_ide)SelectPkg.o: $(UPPDIR1)ide/SelectPkg.cpp $(UPPDIR1)ide/ide.h
X+	$(CPPFLAGS) $(CINC) $(Macro_ide)  $(UPPDIR1)ide/SelectPkg.cpp -o $(OutDir_ide)SelectPkg.o
X+
X+$(OutDir_ide)Thisbacks.o: $(UPPDIR1)ide/Thisbacks.cpp $(UPPDIR1)ide/ide.h
X+	$(CPPFLAGS) $(CINC) $(Macro_ide)  $(UPPDIR1)ide/Thisbacks.cpp -o $(OutDir_ide)Thisbacks.o
X+
X+$(OutDir_ide)Virtuals.o: $(UPPDIR1)ide/Virtuals.cpp $(UPPDIR1)ide/ide.h
X+	$(CPPFLAGS) $(CINC) $(Macro_ide)  $(UPPDIR1)ide/Virtuals.cpp -o $(OutDir_ide)Virtuals.o
X 
X $(OutDir_ide)UppDlg.o: $(UPPDIR1)ide/UppDlg.cpp \
X 	$(UPPDIR1)CodeEditor/CodeEditor.h \
X@@ -323,8 +342,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -334,7 +352,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -456,8 +473,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -467,7 +483,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -589,8 +604,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -600,7 +614,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -722,8 +735,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -733,7 +745,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -855,8 +866,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -866,7 +876,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -988,8 +997,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -999,7 +1007,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -1121,8 +1128,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -1132,7 +1138,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -1254,8 +1259,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -1265,7 +1269,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -1387,8 +1390,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -1398,7 +1400,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -1520,8 +1521,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -1531,7 +1531,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -1653,8 +1652,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -1664,7 +1662,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -1786,8 +1783,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -1797,7 +1793,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -1919,8 +1914,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -1930,7 +1924,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -2052,8 +2045,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -2063,7 +2055,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -2185,8 +2176,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -2196,7 +2186,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -2320,8 +2309,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -2331,7 +2319,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -2453,8 +2440,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -2464,7 +2450,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -2588,8 +2573,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -2599,7 +2583,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -2742,8 +2725,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -2753,7 +2735,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -2875,8 +2856,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -2886,7 +2866,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -3008,8 +2987,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -3019,7 +2997,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -3141,8 +3118,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -3152,7 +3128,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -3274,8 +3249,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -3285,7 +3259,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -3407,8 +3380,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -3418,7 +3390,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -3540,8 +3511,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -3551,7 +3521,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -3674,8 +3643,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -3685,7 +3653,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -3808,8 +3775,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -3819,7 +3785,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -3934,8 +3899,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -3945,7 +3909,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -4041,8 +4004,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -4052,7 +4014,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -4147,8 +4108,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -4158,7 +4118,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -4253,8 +4212,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -4264,7 +4222,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -4359,8 +4316,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -4370,7 +4326,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -4400,17 +4355,22 @@
X 	$(UPPDIR1)Web/Web.h
X 	$(CPPFLAGS) $(CINC) $(Macro_ide_Common)  $(UPPDIR1)ide/Common/ComDlg.cpp -o $(OutDir_ide_Common)ComDlg.o
X 
X+$(OutDir_ide_Common)Package.o: $(UPPDIR1)ide/Common/Package.cpp $(UPPDIR1)ide/Common/Common.h
X+	$(CPPFLAGS) $(CINC) $(Macro_ide_Common)  $(UPPDIR1)ide/Common/Package.cpp -o $(OutDir_ide_Common)Package.o
X+
X $(OutDir_ide_Common)Common.a: \
X 	$(OutDir_ide_Common)Common.o \
X 	$(OutDir_ide_Common)Hdepend.o \
X 	$(OutDir_ide_Common)Workspace.o \
X 	$(OutDir_ide_Common)usc.o \
X+	$(OutDir_ide_Common)Package.o \
X 	$(OutDir_ide_Common)ComDlg.o
X 	$(AR) $(OutDir_ide_Common)Common.a \
X 		$(OutDir_ide_Common)Common.o \
X 		$(OutDir_ide_Common)Hdepend.o \
X 		$(OutDir_ide_Common)Workspace.o \
X 		$(OutDir_ide_Common)usc.o \
X+		$(OutDir_ide_Common)Package.o \
X 		$(OutDir_ide_Common)ComDlg.o
X 
X $(OutDir_ide_LayDes)sdiff.o: $(UPPDIR1)ide/LayDes/sdiff.cpp \
X@@ -4479,8 +4439,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -4490,7 +4449,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -4593,8 +4551,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -4604,7 +4561,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -4707,8 +4663,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -4718,7 +4673,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -4821,8 +4775,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -4832,7 +4785,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -4935,8 +4887,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -4946,7 +4897,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -5049,8 +4999,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -5060,7 +5009,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -5163,8 +5111,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -5174,7 +5121,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -5277,8 +5223,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -5288,7 +5233,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -5391,8 +5335,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -5402,7 +5345,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -5505,8 +5447,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -5516,7 +5457,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -5620,8 +5560,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -5631,7 +5570,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -5736,8 +5674,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -5747,7 +5684,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -5784,6 +5720,9 @@
X 	$(UPPDIR1)Web/Web.h
X 	$(CPPFLAGS) $(CINC) $(Macro_ide_LayDes)  $(UPPDIR1)ide/LayDes/laywin.cpp -o $(OutDir_ide_LayDes)laywin.o
X 
X+$(OutDir_ide_LayDes)visgen.o: $(UPPDIR1)ide/LayDes/visgen.cpp $(UPPDIR1)ide/LayDes/LayDes.h
X+	$(CPPFLAGS) $(CINC) $(Macro_ide_LayDes)  $(UPPDIR1)ide/LayDes/visgen.cpp -o $(OutDir_ide_LayDes)visgen.o
X+
X $(OutDir_ide_LayDes)LayDes.a: \
X 	$(OutDir_ide_LayDes)sdiff.o \
X 	$(OutDir_ide_LayDes)laylib.o \
X@@ -5796,6 +5735,7 @@
X 	$(OutDir_ide_LayDes)layout.o \
X 	$(OutDir_ide_LayDes)laydes.o \
X 	$(OutDir_ide_LayDes)layfile.o \
X+	$(OutDir_ide_LayDes)visgen.o \
X 	$(OutDir_ide_LayDes)laywin.o
X 	$(AR) $(OutDir_ide_LayDes)LayDes.a \
X 		$(OutDir_ide_LayDes)sdiff.o \
X@@ -5809,6 +5749,7 @@
X 		$(OutDir_ide_LayDes)layout.o \
X 		$(OutDir_ide_LayDes)laydes.o \
X 		$(OutDir_ide_LayDes)layfile.o \
X+		$(OutDir_ide_LayDes)visgen.o \
X 		$(OutDir_ide_LayDes)laywin.o
X 
X $(OutDir_ide_IconDes)ImageEditCtrl.o: $(UPPDIR1)ide/IconDes/ImageEditCtrl.cpp \
X@@ -5876,8 +5817,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -5887,7 +5827,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -5992,8 +5931,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -6003,7 +5941,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -6104,8 +6041,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -6115,7 +6051,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -6218,8 +6153,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -6229,7 +6163,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -6345,8 +6278,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -6356,7 +6288,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -6458,8 +6389,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -6469,7 +6399,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -6571,8 +6500,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -6582,7 +6510,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -6678,8 +6605,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -6689,7 +6615,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -6785,8 +6710,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -6796,7 +6720,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -6906,8 +6829,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -6917,7 +6839,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -7022,8 +6943,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -7033,7 +6953,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -7139,8 +7058,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -7150,7 +7068,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -7255,8 +7172,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -7266,7 +7182,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -7371,8 +7286,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -7382,7 +7296,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -7487,8 +7400,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -7498,7 +7410,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -7603,8 +7514,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -7614,7 +7524,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -7719,8 +7628,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -7730,7 +7638,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -7835,8 +7742,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -7846,7 +7752,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -7951,8 +7856,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -7962,7 +7866,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -8069,8 +7972,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -8080,7 +7982,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -8211,8 +8112,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -8222,7 +8122,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -8331,8 +8230,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -8342,7 +8240,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -8442,8 +8339,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -8453,7 +8349,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -8553,8 +8448,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -8564,7 +8458,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -8664,8 +8557,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -8675,7 +8567,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -8775,8 +8666,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -8786,7 +8676,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -8902,8 +8791,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -8913,7 +8801,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -9024,8 +8911,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -9035,7 +8921,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -9151,8 +9036,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -9162,7 +9046,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -9272,8 +9155,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -9283,7 +9165,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -9370,8 +9251,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -9381,7 +9261,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -9468,8 +9347,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -9479,7 +9357,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -9566,8 +9443,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -9577,7 +9453,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -9664,8 +9539,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -9675,7 +9549,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -9762,8 +9635,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -9773,7 +9645,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -9872,8 +9743,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -9883,7 +9753,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -9975,8 +9844,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -9986,7 +9854,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -10078,8 +9945,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -10089,7 +9955,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -10181,8 +10046,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -10192,7 +10056,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -10284,8 +10147,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -10295,7 +10157,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -10401,8 +10262,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -10412,7 +10272,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -10495,8 +10354,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -10506,7 +10364,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -10589,8 +10446,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -10600,7 +10456,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -10683,8 +10538,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -10694,7 +10548,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -10777,8 +10630,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -10788,7 +10640,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -10871,8 +10722,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -10882,7 +10732,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -10965,8 +10814,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -10976,7 +10824,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -11059,8 +10906,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -11070,7 +10916,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -11153,8 +10998,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -11164,7 +11008,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -11247,8 +11090,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -11258,7 +11100,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -11341,8 +11182,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -11352,7 +11192,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -11435,8 +11274,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -11446,7 +11284,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -11529,8 +11366,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -11540,7 +11376,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -11623,8 +11458,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -11634,7 +11468,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -11717,8 +11550,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -11728,7 +11560,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -11811,8 +11642,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -11822,7 +11652,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -11905,8 +11734,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -11916,7 +11744,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -11934,100 +11761,6 @@
X 	$(UPPDIR1)RichText/Txt.h
X 	$(CPPFLAGS) $(CINC) $(Macro_CtrlLib)  $(UPPDIR1)CtrlLib/ColumnList.cpp -o $(OutDir_CtrlLib)ColumnList.o
X 
X-$(OutDir_CtrlLib)QtfCtrl.o: $(UPPDIR1)CtrlLib/QtfCtrl.cpp \
X-	$(UPPDIR1)Core/Algo.h \
X-	$(UPPDIR1)Core/App.h \
X-	$(UPPDIR1)Core/BiCont.h \
X-	$(UPPDIR1)Core/Callback.h \
X-	$(UPPDIR1)Core/Cbgen.h \
X-	$(UPPDIR1)Core/CharSet.h \
X-	$(UPPDIR1)Core/Color.h \
X-	$(UPPDIR1)Core/Convert.h \
X-	$(UPPDIR1)Core/Core.h \
X-	$(UPPDIR1)Core/Defs.h \
X-	$(UPPDIR1)Core/Diag.h \
X-	$(UPPDIR1)Core/Format.h \
X-	$(UPPDIR1)Core/Global.h \
X-	$(UPPDIR1)Core/Gtypes.h \
X-	$(UPPDIR1)Core/i18n.h \
X-	$(UPPDIR1)Core/Index.h \
X-	$(UPPDIR1)Core/Index.hpp \
X-	$(UPPDIR1)Core/Lang.h \
X-	$(UPPDIR1)Core/Lang_s.h \
X-	$(UPPDIR1)Core/Map.h \
X-	$(UPPDIR1)Core/Mt.h \
X-	$(UPPDIR1)Core/Other.h \
X-	$(UPPDIR1)Core/Parser.h \
X-	$(UPPDIR1)Core/Path.h \
X-	$(UPPDIR1)Core/Ptr.h \
X-	$(UPPDIR1)Core/Stream.h \
X-	$(UPPDIR1)Core/String.h \
X-	$(UPPDIR1)Core/String.hpp \
X-	$(UPPDIR1)Core/t_.h \
X-	$(UPPDIR1)Core/Thread.h \
X-	$(UPPDIR1)Core/TimeDate.h \
X-	$(UPPDIR1)Core/Topic.h \
X-	$(UPPDIR1)Core/Topt.h \
X-	$(UPPDIR1)Core/Util.h \
X-	$(UPPDIR1)Core/Uuid.h \
X-	$(UPPDIR1)Core/Value.h \
X-	$(UPPDIR1)Core/Vcont.h \
X-	$(UPPDIR1)Core/Vcont.hpp \
X-	$(UPPDIR1)Core/Win32Com.h \
X-	$(UPPDIR1)Core/XML.h \
X-	$(UPPDIR1)Core/Xmlize.h \
X-	$(UPPDIR1)CtrlCore/CtrlCore.h \
X-	$(UPPDIR1)CtrlCore/lay.h \
X-	$(UPPDIR1)CtrlCore/MKeys.h \
X-	$(UPPDIR1)CtrlCore/TopWindow.h \
X-	$(UPPDIR1)CtrlCore/Win32Keys.h \
X-	$(UPPDIR1)CtrlCore/X11Keys.h \
X-	$(UPPDIR1)CtrlLib/AKeys.h \
X-	$(UPPDIR1)CtrlLib/ArrayCtrl.h \
X-	$(UPPDIR1)CtrlLib/Bar.h \
X-	$(UPPDIR1)CtrlLib/ColumnList.h \
X-	$(UPPDIR1)CtrlLib/Ctrl.iml \
X-	$(UPPDIR1)CtrlLib/Ctrl.lay \
X-	$(UPPDIR1)CtrlLib/CtrlLib.h \
X-	$(UPPDIR1)CtrlLib/CtrlUtil.h \
X-	$(UPPDIR1)CtrlLib/DlgColor.h \
X-	$(UPPDIR1)CtrlLib/DropChoice.h \
X-	$(UPPDIR1)CtrlLib/EditCtrl.h \
X-	$(UPPDIR1)CtrlLib/FileSel.h \
X-	$(UPPDIR1)CtrlLib/HeaderCtrl.h \
X-	$(UPPDIR1)CtrlLib/LabelBase.h \
X-	$(UPPDIR1)CtrlLib/Lang.h \
X-	$(UPPDIR1)CtrlLib/Progress.h \
X-	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X-	$(UPPDIR1)CtrlLib/RichText.h \
X-	$(UPPDIR1)CtrlLib/ScrollBar.h \
X-	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X-	$(UPPDIR1)CtrlLib/Splitter.h \
X-	$(UPPDIR1)CtrlLib/StaticCtrl.h \
X-	$(UPPDIR1)CtrlLib/StatusBar.h \
X-	$(UPPDIR1)CtrlLib/TabCtrl.h \
X-	$(UPPDIR1)CtrlLib/TextEdit.h \
X-	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X-	$(UPPDIR1)Draw/Debug.h \
X-	$(UPPDIR1)Draw/Display.h \
X-	$(UPPDIR1)Draw/Draw.h \
X-	$(UPPDIR1)Draw/DrawWin32.h \
X-	$(UPPDIR1)Draw/Image.h \
X-	$(UPPDIR1)Draw/ImageDraw.h \
X-	$(UPPDIR1)Draw/iml_header.h \
X-	$(UPPDIR1)Draw/PixelArray.h \
X-	$(UPPDIR1)Image/Image.h \
X-	$(UPPDIR1)plugin/png/png.h \
X-	$(UPPDIR1)RichText/Para.h \
X-	$(UPPDIR1)RichText/RichText.h \
X-	$(UPPDIR1)RichText/Table.h \
X-	$(UPPDIR1)RichText/Text.h \
X-	$(UPPDIR1)RichText/Txt.h
X-	$(CPPFLAGS) $(CINC) $(Macro_CtrlLib)  $(UPPDIR1)CtrlLib/QtfCtrl.cpp -o $(OutDir_CtrlLib)QtfCtrl.o
X-
X $(OutDir_CtrlLib)Progress.o: $(UPPDIR1)CtrlLib/Progress.cpp \
X 	$(UPPDIR1)Core/Algo.h \
X 	$(UPPDIR1)Core/App.h \
X@@ -12093,8 +11826,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -12104,7 +11836,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -12187,8 +11918,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -12198,7 +11928,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -12281,8 +12010,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -12292,7 +12020,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -12375,8 +12102,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -12386,7 +12112,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -12469,8 +12194,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -12480,7 +12204,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -12563,8 +12286,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -12574,7 +12296,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -12657,8 +12378,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -12668,7 +12388,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -12751,8 +12470,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -12762,7 +12480,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -12845,8 +12562,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -12856,7 +12572,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -12939,8 +12654,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -12950,7 +12664,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -13033,8 +12746,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -13044,7 +12756,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -13127,8 +12838,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -13138,7 +12848,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -13221,8 +12930,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -13232,7 +12940,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -13315,8 +13022,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -13326,7 +13032,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -13409,8 +13114,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -13420,7 +13124,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -13503,8 +13206,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -13514,7 +13216,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -13597,8 +13298,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -13608,7 +13308,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -13691,8 +13390,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -13702,7 +13400,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -13785,8 +13482,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -13796,7 +13492,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -13879,8 +13574,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -13890,7 +13584,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -13974,8 +13667,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -13985,7 +13677,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -14068,8 +13759,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -14079,7 +13769,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -14097,7 +13786,7 @@
X 	$(UPPDIR1)RichText/Txt.h
X 	$(CPPFLAGS) $(CINC) $(Macro_CtrlLib)  $(UPPDIR1)CtrlLib/LNGCtrl.cpp -o $(OutDir_CtrlLib)LNGCtrl.o
X 
X-$(OutDir_CtrlLib)Report.o: $(UPPDIR1)CtrlLib/Report.cpp \
X+$(OutDir_CtrlLib)Report.o: $(UPPDIR1)Report/Report.cpp \
X 	$(UPPDIR1)Core/Algo.h \
X 	$(UPPDIR1)Core/App.h \
X 	$(UPPDIR1)Core/BiCont.h \
X@@ -14162,8 +13851,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -14173,7 +13861,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -14189,101 +13876,7 @@
X 	$(UPPDIR1)RichText/Table.h \
X 	$(UPPDIR1)RichText/Text.h \
X 	$(UPPDIR1)RichText/Txt.h
X-	$(CPPFLAGS) $(CINC) $(Macro_CtrlLib)  $(UPPDIR1)CtrlLib/Report.cpp -o $(OutDir_CtrlLib)Report.o
X-
X-$(OutDir_CtrlLib)ShowReport.o: $(UPPDIR1)CtrlLib/ShowReport.cpp \
X-	$(UPPDIR1)Core/Algo.h \
X-	$(UPPDIR1)Core/App.h \
X-	$(UPPDIR1)Core/BiCont.h \
X-	$(UPPDIR1)Core/Callback.h \
X-	$(UPPDIR1)Core/Cbgen.h \
X-	$(UPPDIR1)Core/CharSet.h \
X-	$(UPPDIR1)Core/Color.h \
X-	$(UPPDIR1)Core/Convert.h \
X-	$(UPPDIR1)Core/Core.h \
X-	$(UPPDIR1)Core/Defs.h \
X-	$(UPPDIR1)Core/Diag.h \
X-	$(UPPDIR1)Core/Format.h \
X-	$(UPPDIR1)Core/Global.h \
X-	$(UPPDIR1)Core/Gtypes.h \
X-	$(UPPDIR1)Core/i18n.h \
X-	$(UPPDIR1)Core/Index.h \
X-	$(UPPDIR1)Core/Index.hpp \
X-	$(UPPDIR1)Core/Lang.h \
X-	$(UPPDIR1)Core/Lang_s.h \
X-	$(UPPDIR1)Core/Map.h \
X-	$(UPPDIR1)Core/Mt.h \
X-	$(UPPDIR1)Core/Other.h \
X-	$(UPPDIR1)Core/Parser.h \
X-	$(UPPDIR1)Core/Path.h \
X-	$(UPPDIR1)Core/Ptr.h \
X-	$(UPPDIR1)Core/Stream.h \
X-	$(UPPDIR1)Core/String.h \
X-	$(UPPDIR1)Core/String.hpp \
X-	$(UPPDIR1)Core/t_.h \
X-	$(UPPDIR1)Core/Thread.h \
X-	$(UPPDIR1)Core/TimeDate.h \
X-	$(UPPDIR1)Core/Topic.h \
X-	$(UPPDIR1)Core/Topt.h \
X-	$(UPPDIR1)Core/Util.h \
X-	$(UPPDIR1)Core/Uuid.h \
X-	$(UPPDIR1)Core/Value.h \
X-	$(UPPDIR1)Core/Vcont.h \
X-	$(UPPDIR1)Core/Vcont.hpp \
X-	$(UPPDIR1)Core/Win32Com.h \
X-	$(UPPDIR1)Core/XML.h \
X-	$(UPPDIR1)Core/Xmlize.h \
X-	$(UPPDIR1)CtrlCore/CtrlCore.h \
X-	$(UPPDIR1)CtrlCore/lay.h \
X-	$(UPPDIR1)CtrlCore/MKeys.h \
X-	$(UPPDIR1)CtrlCore/TopWindow.h \
X-	$(UPPDIR1)CtrlCore/Win32Keys.h \
X-	$(UPPDIR1)CtrlCore/X11Keys.h \
X-	$(UPPDIR1)CtrlLib/AKeys.h \
X-	$(UPPDIR1)CtrlLib/ArrayCtrl.h \
X-	$(UPPDIR1)CtrlLib/Bar.h \
X-	$(UPPDIR1)CtrlLib/ColumnList.h \
X-	$(UPPDIR1)CtrlLib/Ctrl.iml \
X-	$(UPPDIR1)CtrlLib/Ctrl.lay \
X-	$(UPPDIR1)CtrlLib/CtrlLib.h \
X-	$(UPPDIR1)CtrlLib/CtrlUtil.h \
X-	$(UPPDIR1)CtrlLib/DlgColor.h \
X-	$(UPPDIR1)CtrlLib/DropChoice.h \
X-	$(UPPDIR1)CtrlLib/EditCtrl.h \
X-	$(UPPDIR1)CtrlLib/FileSel.h \
X-	$(UPPDIR1)CtrlLib/HeaderCtrl.h \
X-	$(UPPDIR1)CtrlLib/LabelBase.h \
X-	$(UPPDIR1)CtrlLib/Lang.h \
X-	$(UPPDIR1)CtrlLib/Progress.h \
X-	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X-	$(UPPDIR1)CtrlLib/RichText.h \
X-	$(UPPDIR1)CtrlLib/ScrollBar.h \
X-	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X-	$(UPPDIR1)CtrlLib/Splitter.h \
X-	$(UPPDIR1)CtrlLib/StaticCtrl.h \
X-	$(UPPDIR1)CtrlLib/StatusBar.h \
X-	$(UPPDIR1)CtrlLib/TabCtrl.h \
X-	$(UPPDIR1)CtrlLib/TextEdit.h \
X-	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X-	$(UPPDIR1)Draw/Debug.h \
X-	$(UPPDIR1)Draw/Display.h \
X-	$(UPPDIR1)Draw/Draw.h \
X-	$(UPPDIR1)Draw/DrawWin32.h \
X-	$(UPPDIR1)Draw/Image.h \
X-	$(UPPDIR1)Draw/ImageDraw.h \
X-	$(UPPDIR1)Draw/iml_header.h \
X-	$(UPPDIR1)Draw/PixelArray.h \
X-	$(UPPDIR1)Image/Image.h \
X-	$(UPPDIR1)plugin/png/png.h \
X-	$(UPPDIR1)RichText/Para.h \
X-	$(UPPDIR1)RichText/RichText.h \
X-	$(UPPDIR1)RichText/Table.h \
X-	$(UPPDIR1)RichText/Text.h \
X-	$(UPPDIR1)RichText/Txt.h
X-	$(CPPFLAGS) $(CINC) $(Macro_CtrlLib)  $(UPPDIR1)CtrlLib/ShowReport.cpp -o $(OutDir_CtrlLib)ShowReport.o
X+	$(CPPFLAGS) $(CINC) $(Macro_CtrlLib)  $(UPPDIR1)Report/Report.cpp -o $(OutDir_CtrlLib)Report.o
X 
X $(OutDir_CtrlLib)CtrlLib.a: \
X 	$(OutDir_CtrlLib)LabelBase.o \
X@@ -14303,7 +13896,6 @@
X 	$(OutDir_CtrlLib)Splitter.o \
X 	$(OutDir_CtrlLib)SliderCtrl.o \
X 	$(OutDir_CtrlLib)ColumnList.o \
X-	$(OutDir_CtrlLib)QtfCtrl.o \
X 	$(OutDir_CtrlLib)Progress.o \
X 	$(OutDir_CtrlLib)AKeys.o \
X 	$(OutDir_CtrlLib)RichTextView.o \
X@@ -14326,8 +13918,7 @@
X 	$(OutDir_CtrlLib)CtrlUtil.o \
X 	$(OutDir_CtrlLib)Update.o \
X 	$(OutDir_CtrlLib)LNGCtrl.o \
X-	$(OutDir_CtrlLib)Report.o \
X-	$(OutDir_CtrlLib)ShowReport.o
X+	$(OutDir_CtrlLib)Report.o
X 	$(AR) $(OutDir_CtrlLib)CtrlLib.a \
X 		$(OutDir_CtrlLib)LabelBase.o \
X 		$(OutDir_CtrlLib)Button.o \
X@@ -14346,7 +13937,6 @@
X 		$(OutDir_CtrlLib)Splitter.o \
X 		$(OutDir_CtrlLib)SliderCtrl.o \
X 		$(OutDir_CtrlLib)ColumnList.o \
X-		$(OutDir_CtrlLib)QtfCtrl.o \
X 		$(OutDir_CtrlLib)Progress.o \
X 		$(OutDir_CtrlLib)AKeys.o \
X 		$(OutDir_CtrlLib)RichTextView.o \
X@@ -14369,8 +13959,7 @@
X 		$(OutDir_CtrlLib)CtrlUtil.o \
X 		$(OutDir_CtrlLib)Update.o \
X 		$(OutDir_CtrlLib)LNGCtrl.o \
X-		$(OutDir_CtrlLib)Report.o \
X-		$(OutDir_CtrlLib)ShowReport.o
X+		$(OutDir_CtrlLib)Report.o
X 
X $(OutDir_Web)util.o: $(UPPDIR1)Web/util.cpp \
X 	$(UPPDIR1)Core/Algo.h \
X@@ -15035,8 +14624,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -15046,7 +14634,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -15131,8 +14718,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -15142,7 +14728,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -16867,6 +16452,9 @@
X 	$(UPPDIR1)Core/Xmlize.h
X 	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/Dli.cpp -o $(OutDir_Core)Dli.o
X 
X+$(OutDir_Core)ChkAndSet.o: $(UPPDIR1)Core/ChkAndSet.cpp $(UPPDIR1)Core/Core.h
X+	$(CPPFLAGS) $(CINC) $(Macro_Core)  $(UPPDIR1)Core/ChkAndSet.cpp -o $(OutDir_Core)ChkAndSet.o
X+
X $(OutDir_Core)Core.a: \
X 	$(OutDir_Core)Mt.o \
X 	$(OutDir_Core)Thread.o \
X@@ -16898,6 +16486,7 @@
X 	$(OutDir_Core)Ptr.o \
X 	$(OutDir_Core)Topic.o \
X 	$(OutDir_Core)Win32Com.o \
X+	$(OutDir_Core)ChkAndSet.o \
X 	$(OutDir_Core)Dli.o
X 	$(AR) $(OutDir_Core)Core.a \
X 		$(OutDir_Core)Mt.o \
X@@ -16930,6 +16519,7 @@
X 		$(OutDir_Core)Ptr.o \
X 		$(OutDir_Core)Topic.o \
X 		$(OutDir_Core)Win32Com.o \
X+		$(OutDir_Core)ChkAndSet.o \
X 		$(OutDir_Core)Dli.o
X 
X $(OutDir_RichEdit)Ruler.o: $(UPPDIR1)RichEdit/Ruler.cpp \
X@@ -16997,8 +16587,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -17008,7 +16597,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -17095,8 +16683,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -17106,7 +16693,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -17192,8 +16778,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -17203,7 +16788,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -17289,8 +16873,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -17300,7 +16883,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -17386,8 +16968,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -17397,7 +16978,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -17483,8 +17063,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -17494,7 +17073,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -17580,8 +17158,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -17591,7 +17168,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -17677,8 +17253,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -17688,7 +17263,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -17774,8 +17348,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -17785,7 +17358,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -17871,8 +17443,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -17882,7 +17453,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -17968,8 +17538,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -17979,7 +17548,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -18065,8 +17633,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -18076,7 +17643,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -18162,8 +17728,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -18173,7 +17738,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -18259,8 +17823,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -18270,7 +17833,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -18356,8 +17918,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -18367,7 +17928,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -21987,8 +21547,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -21998,7 +21557,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -22093,8 +21651,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -22104,7 +21661,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -22202,8 +21758,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -22213,7 +21768,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -22316,8 +21870,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -22327,7 +21880,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -23233,8 +22785,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -23244,7 +22795,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -24988,8 +24538,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -24999,7 +24548,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -25085,8 +24633,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -25096,7 +24643,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -25182,8 +24728,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -25193,7 +24738,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -25279,8 +24823,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -25290,7 +24833,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -25376,8 +24918,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -25387,7 +24928,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -25473,8 +25013,7 @@
X 	$(UPPDIR1)CtrlLib/Lang.h \
X 	$(UPPDIR1)CtrlLib/Progress.h \
X 	$(UPPDIR1)CtrlLib/PushCtrl.h \
X-	$(UPPDIR1)CtrlLib/QtfCtrl.h \
X-	$(UPPDIR1)CtrlLib/Report.h \
X+	$(UPPDIR1)Report/Report.h \
X 	$(UPPDIR1)CtrlLib/RichText.h \
X 	$(UPPDIR1)CtrlLib/ScrollBar.h \
X 	$(UPPDIR1)CtrlLib/SliderCtrl.h \
X@@ -25484,7 +25023,6 @@
X 	$(UPPDIR1)CtrlLib/TabCtrl.h \
X 	$(UPPDIR1)CtrlLib/TextEdit.h \
X 	$(UPPDIR1)CtrlLib/TreeCtrl.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -25520,327 +25058,7 @@
X 		$(OutDir_PdfDraw)PdfDraw.o \
X 		$(OutDir_PdfDraw)Test.o
X 
X-$(OutDir_DocTypes)ParaFormat.o: $(UPPDIR1)DocTypes/ParaFormat.cpp \
X-	$(UPPDIR1)Core/Algo.h \
X-	$(UPPDIR1)Core/App.h \
X-	$(UPPDIR1)Core/BiCont.h \
X-	$(UPPDIR1)Core/Callback.h \
X-	$(UPPDIR1)Core/Cbgen.h \
X-	$(UPPDIR1)Core/CharSet.h \
X-	$(UPPDIR1)Core/Color.h \
X-	$(UPPDIR1)Core/Convert.h \
X-	$(UPPDIR1)Core/Core.h \
X-	$(UPPDIR1)Core/Defs.h \
X-	$(UPPDIR1)Core/Diag.h \
X-	$(UPPDIR1)Core/Format.h \
X-	$(UPPDIR1)Core/Global.h \
X-	$(UPPDIR1)Core/Gtypes.h \
X-	$(UPPDIR1)Core/i18n.h \
X-	$(UPPDIR1)Core/Index.h \
X-	$(UPPDIR1)Core/Index.hpp \
X-	$(UPPDIR1)Core/Lang.h \
X-	$(UPPDIR1)Core/Lang_s.h \
X-	$(UPPDIR1)Core/Map.h \
X-	$(UPPDIR1)Core/Mt.h \
X-	$(UPPDIR1)Core/Other.h \
X-	$(UPPDIR1)Core/Parser.h \
X-	$(UPPDIR1)Core/Path.h \
X-	$(UPPDIR1)Core/Ptr.h \
X-	$(UPPDIR1)Core/Stream.h \
X-	$(UPPDIR1)Core/String.h \
X-	$(UPPDIR1)Core/String.hpp \
X-	$(UPPDIR1)Core/t_.h \
X-	$(UPPDIR1)Core/Thread.h \
X-	$(UPPDIR1)Core/TimeDate.h \
X-	$(UPPDIR1)Core/Topic.h \
X-	$(UPPDIR1)Core/Topt.h \
X-	$(UPPDIR1)Core/Util.h \
X-	$(UPPDIR1)Core/Uuid.h \
X-	$(UPPDIR1)Core/Value.h \
X-	$(UPPDIR1)Core/Vcont.h \
X-	$(UPPDIR1)Core/Vcont.hpp \
X-	$(UPPDIR1)Core/Win32Com.h \
X-	$(UPPDIR1)Core/XML.h \
X-	$(UPPDIR1)Core/Xmlize.h \
X-	$(UPPDIR1)CtrlCore/CtrlCore.h \
X-	$(UPPDIR1)CtrlCore/MKeys.h \
X-	$(UPPDIR1)CtrlCore/TopWindow.h \
X-	$(UPPDIR1)CtrlCore/Win32Keys.h \
X-	$(UPPDIR1)CtrlCore/X11Keys.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X-	$(UPPDIR1)Draw/Debug.h \
X-	$(UPPDIR1)Draw/Display.h \
X-	$(UPPDIR1)Draw/Draw.h \
X-	$(UPPDIR1)Draw/DrawWin32.h \
X-	$(UPPDIR1)Draw/Image.h \
X-	$(UPPDIR1)Draw/ImageDraw.h \
X-	$(UPPDIR1)Draw/PixelArray.h \
X-	$(UPPDIR1)Image/Image.h \
X-	$(UPPDIR1)plugin/png/png.h \
X-	$(UPPDIR1)RichText/Para.h \
X-	$(UPPDIR1)RichText/RichText.h \
X-	$(UPPDIR1)RichText/Table.h \
X-	$(UPPDIR1)RichText/Text.h \
X-	$(UPPDIR1)RichText/Txt.h
X-	$(CPPFLAGS) $(CINC) $(Macro_DocTypes)  $(UPPDIR1)DocTypes/ParaFormat.cpp -o $(OutDir_DocTypes)ParaFormat.o
X-
X-$(OutDir_DocTypes)DocTypes.o: $(UPPDIR1)DocTypes/DocTypes.cpp \
X-	$(UPPDIR1)Core/Algo.h \
X-	$(UPPDIR1)Core/App.h \
X-	$(UPPDIR1)Core/BiCont.h \
X-	$(UPPDIR1)Core/Callback.h \
X-	$(UPPDIR1)Core/Cbgen.h \
X-	$(UPPDIR1)Core/CharSet.h \
X-	$(UPPDIR1)Core/Color.h \
X-	$(UPPDIR1)Core/Convert.h \
X-	$(UPPDIR1)Core/Core.h \
X-	$(UPPDIR1)Core/Defs.h \
X-	$(UPPDIR1)Core/Diag.h \
X-	$(UPPDIR1)Core/Format.h \
X-	$(UPPDIR1)Core/Global.h \
X-	$(UPPDIR1)Core/Gtypes.h \
X-	$(UPPDIR1)Core/i18n.h \
X-	$(UPPDIR1)Core/Index.h \
X-	$(UPPDIR1)Core/Index.hpp \
X-	$(UPPDIR1)Core/Lang.h \
X-	$(UPPDIR1)Core/Lang_s.h \
X-	$(UPPDIR1)Core/Map.h \
X-	$(UPPDIR1)Core/Mt.h \
X-	$(UPPDIR1)Core/Other.h \
X-	$(UPPDIR1)Core/Parser.h \
X-	$(UPPDIR1)Core/Path.h \
X-	$(UPPDIR1)Core/Ptr.h \
X-	$(UPPDIR1)Core/Stream.h \
X-	$(UPPDIR1)Core/String.h \
X-	$(UPPDIR1)Core/String.hpp \
X-	$(UPPDIR1)Core/t_.h \
X-	$(UPPDIR1)Core/Thread.h \
X-	$(UPPDIR1)Core/TimeDate.h \
X-	$(UPPDIR1)Core/Topic.h \
X-	$(UPPDIR1)Core/Topt.h \
X-	$(UPPDIR1)Core/Util.h \
X-	$(UPPDIR1)Core/Uuid.h \
X-	$(UPPDIR1)Core/Value.h \
X-	$(UPPDIR1)Core/Vcont.h \
X-	$(UPPDIR1)Core/Vcont.hpp \
X-	$(UPPDIR1)Core/Win32Com.h \
X-	$(UPPDIR1)Core/XML.h \
X-	$(UPPDIR1)Core/Xmlize.h \
X-	$(UPPDIR1)CtrlCore/CtrlCore.h \
X-	$(UPPDIR1)CtrlCore/MKeys.h \
X-	$(UPPDIR1)CtrlCore/TopWindow.h \
X-	$(UPPDIR1)CtrlCore/Win32Keys.h \
X-	$(UPPDIR1)CtrlCore/X11Keys.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X-	$(UPPDIR1)Draw/Debug.h \
X-	$(UPPDIR1)Draw/Display.h \
X-	$(UPPDIR1)Draw/Draw.h \
X-	$(UPPDIR1)Draw/DrawWin32.h \
X-	$(UPPDIR1)Draw/Image.h \
X-	$(UPPDIR1)Draw/ImageDraw.h \
X-	$(UPPDIR1)Draw/PixelArray.h \
X-	$(UPPDIR1)Image/Image.h \
X-	$(UPPDIR1)plugin/png/png.h \
X-	$(UPPDIR1)RichText/Para.h \
X-	$(UPPDIR1)RichText/RichText.h \
X-	$(UPPDIR1)RichText/Table.h \
X-	$(UPPDIR1)RichText/Text.h \
X-	$(UPPDIR1)RichText/Txt.h
X-	$(CPPFLAGS) $(CINC) $(Macro_DocTypes)  $(UPPDIR1)DocTypes/DocTypes.cpp -o $(OutDir_DocTypes)DocTypes.o
X-
X-$(OutDir_DocTypes)DocTable.o: $(UPPDIR1)DocTypes/DocTable.cpp \
X-	$(UPPDIR1)Core/Algo.h \
X-	$(UPPDIR1)Core/App.h \
X-	$(UPPDIR1)Core/BiCont.h \
X-	$(UPPDIR1)Core/Callback.h \
X-	$(UPPDIR1)Core/Cbgen.h \
X-	$(UPPDIR1)Core/CharSet.h \
X-	$(UPPDIR1)Core/Color.h \
X-	$(UPPDIR1)Core/Convert.h \
X-	$(UPPDIR1)Core/Core.h \
X-	$(UPPDIR1)Core/Defs.h \
X-	$(UPPDIR1)Core/Diag.h \
X-	$(UPPDIR1)Core/Format.h \
X-	$(UPPDIR1)Core/Global.h \
X-	$(UPPDIR1)Core/Gtypes.h \
X-	$(UPPDIR1)Core/i18n.h \
X-	$(UPPDIR1)Core/Index.h \
X-	$(UPPDIR1)Core/Index.hpp \
X-	$(UPPDIR1)Core/Lang.h \
X-	$(UPPDIR1)Core/Lang_s.h \
X-	$(UPPDIR1)Core/Map.h \
X-	$(UPPDIR1)Core/Mt.h \
X-	$(UPPDIR1)Core/Other.h \
X-	$(UPPDIR1)Core/Parser.h \
X-	$(UPPDIR1)Core/Path.h \
X-	$(UPPDIR1)Core/Ptr.h \
X-	$(UPPDIR1)Core/Stream.h \
X-	$(UPPDIR1)Core/String.h \
X-	$(UPPDIR1)Core/String.hpp \
X-	$(UPPDIR1)Core/t_.h \
X-	$(UPPDIR1)Core/Thread.h \
X-	$(UPPDIR1)Core/TimeDate.h \
X-	$(UPPDIR1)Core/Topic.h \
X-	$(UPPDIR1)Core/Topt.h \
X-	$(UPPDIR1)Core/Util.h \
X-	$(UPPDIR1)Core/Uuid.h \
X-	$(UPPDIR1)Core/Value.h \
X-	$(UPPDIR1)Core/Vcont.h \
X-	$(UPPDIR1)Core/Vcont.hpp \
X-	$(UPPDIR1)Core/Win32Com.h \
X-	$(UPPDIR1)Core/XML.h \
X-	$(UPPDIR1)Core/Xmlize.h \
X-	$(UPPDIR1)CtrlCore/CtrlCore.h \
X-	$(UPPDIR1)CtrlCore/MKeys.h \
X-	$(UPPDIR1)CtrlCore/TopWindow.h \
X-	$(UPPDIR1)CtrlCore/Win32Keys.h \
X-	$(UPPDIR1)CtrlCore/X11Keys.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X-	$(UPPDIR1)Draw/Debug.h \
X-	$(UPPDIR1)Draw/Display.h \
X-	$(UPPDIR1)Draw/Draw.h \
X-	$(UPPDIR1)Draw/DrawWin32.h \
X-	$(UPPDIR1)Draw/Image.h \
X-	$(UPPDIR1)Draw/ImageDraw.h \
X-	$(UPPDIR1)Draw/PixelArray.h \
X-	$(UPPDIR1)Image/Image.h \
X-	$(UPPDIR1)plugin/png/png.h \
X-	$(UPPDIR1)RichText/Para.h \
X-	$(UPPDIR1)RichText/RichText.h \
X-	$(UPPDIR1)RichText/Table.h \
X-	$(UPPDIR1)RichText/Text.h \
X-	$(UPPDIR1)RichText/Txt.h
X-	$(CPPFLAGS) $(CINC) $(Macro_DocTypes)  $(UPPDIR1)DocTypes/DocTable.cpp -o $(OutDir_DocTypes)DocTable.o
X-
X-$(OutDir_DocTypes)QtfParser.o: $(UPPDIR1)DocTypes/QtfParser.cpp \
X-	$(UPPDIR1)Core/Algo.h \
X-	$(UPPDIR1)Core/App.h \
X-	$(UPPDIR1)Core/BiCont.h \
X-	$(UPPDIR1)Core/Callback.h \
X-	$(UPPDIR1)Core/Cbgen.h \
X-	$(UPPDIR1)Core/CharSet.h \
X-	$(UPPDIR1)Core/Color.h \
X-	$(UPPDIR1)Core/Convert.h \
X-	$(UPPDIR1)Core/Core.h \
X-	$(UPPDIR1)Core/Defs.h \
X-	$(UPPDIR1)Core/Diag.h \
X-	$(UPPDIR1)Core/Format.h \
X-	$(UPPDIR1)Core/Global.h \
X-	$(UPPDIR1)Core/Gtypes.h \
X-	$(UPPDIR1)Core/i18n.h \
X-	$(UPPDIR1)Core/Index.h \
X-	$(UPPDIR1)Core/Index.hpp \
X-	$(UPPDIR1)Core/Lang.h \
X-	$(UPPDIR1)Core/Lang_s.h \
X-	$(UPPDIR1)Core/Map.h \
X-	$(UPPDIR1)Core/Mt.h \
X-	$(UPPDIR1)Core/Other.h \
X-	$(UPPDIR1)Core/Parser.h \
X-	$(UPPDIR1)Core/Path.h \
X-	$(UPPDIR1)Core/Ptr.h \
X-	$(UPPDIR1)Core/Stream.h \
X-	$(UPPDIR1)Core/String.h \
X-	$(UPPDIR1)Core/String.hpp \
X-	$(UPPDIR1)Core/t_.h \
X-	$(UPPDIR1)Core/Thread.h \
X-	$(UPPDIR1)Core/TimeDate.h \
X-	$(UPPDIR1)Core/Topic.h \
X-	$(UPPDIR1)Core/Topt.h \
X-	$(UPPDIR1)Core/Util.h \
X-	$(UPPDIR1)Core/Uuid.h \
X-	$(UPPDIR1)Core/Value.h \
X-	$(UPPDIR1)Core/Vcont.h \
X-	$(UPPDIR1)Core/Vcont.hpp \
X-	$(UPPDIR1)Core/Win32Com.h \
X-	$(UPPDIR1)Core/XML.h \
X-	$(UPPDIR1)Core/Xmlize.h \
X-	$(UPPDIR1)CtrlCore/CtrlCore.h \
X-	$(UPPDIR1)CtrlCore/MKeys.h \
X-	$(UPPDIR1)CtrlCore/TopWindow.h \
X-	$(UPPDIR1)CtrlCore/Win32Keys.h \
X-	$(UPPDIR1)CtrlCore/X11Keys.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X-	$(UPPDIR1)Draw/Debug.h \
X-	$(UPPDIR1)Draw/Display.h \
X-	$(UPPDIR1)Draw/Draw.h \
X-	$(UPPDIR1)Draw/DrawWin32.h \
X-	$(UPPDIR1)Draw/Image.h \
X-	$(UPPDIR1)Draw/ImageDraw.h \
X-	$(UPPDIR1)Draw/PixelArray.h \
X-	$(UPPDIR1)Image/Image.h \
X-	$(UPPDIR1)plugin/png/png.h \
X-	$(UPPDIR1)RichText/Para.h \
X-	$(UPPDIR1)RichText/RichText.h \
X-	$(UPPDIR1)RichText/Table.h \
X-	$(UPPDIR1)RichText/Text.h \
X-	$(UPPDIR1)RichText/Txt.h
X-	$(CPPFLAGS) $(CINC) $(Macro_DocTypes)  $(UPPDIR1)DocTypes/QtfParser.cpp -o $(OutDir_DocTypes)QtfParser.o
X-
X-$(OutDir_DocTypes)QtfEncoder.o: $(UPPDIR1)DocTypes/QtfEncoder.cpp \
X-	$(UPPDIR1)Core/Algo.h \
X-	$(UPPDIR1)Core/App.h \
X-	$(UPPDIR1)Core/BiCont.h \
X-	$(UPPDIR1)Core/Callback.h \
X-	$(UPPDIR1)Core/Cbgen.h \
X-	$(UPPDIR1)Core/CharSet.h \
X-	$(UPPDIR1)Core/Color.h \
X-	$(UPPDIR1)Core/Convert.h \
X-	$(UPPDIR1)Core/Core.h \
X-	$(UPPDIR1)Core/Defs.h \
X-	$(UPPDIR1)Core/Diag.h \
X-	$(UPPDIR1)Core/Format.h \
X-	$(UPPDIR1)Core/Global.h \
X-	$(UPPDIR1)Core/Gtypes.h \
X-	$(UPPDIR1)Core/i18n.h \
X-	$(UPPDIR1)Core/Index.h \
X-	$(UPPDIR1)Core/Index.hpp \
X-	$(UPPDIR1)Core/Lang.h \
X-	$(UPPDIR1)Core/Lang_s.h \
X-	$(UPPDIR1)Core/Map.h \
X-	$(UPPDIR1)Core/Mt.h \
X-	$(UPPDIR1)Core/Other.h \
X-	$(UPPDIR1)Core/Parser.h \
X-	$(UPPDIR1)Core/Path.h \
X-	$(UPPDIR1)Core/Ptr.h \
X-	$(UPPDIR1)Core/Stream.h \
X-	$(UPPDIR1)Core/String.h \
X-	$(UPPDIR1)Core/String.hpp \
X-	$(UPPDIR1)Core/t_.h \
X-	$(UPPDIR1)Core/Thread.h \
X-	$(UPPDIR1)Core/TimeDate.h \
X-	$(UPPDIR1)Core/Topic.h \
X-	$(UPPDIR1)Core/Topt.h \
X-	$(UPPDIR1)Core/Util.h \
X-	$(UPPDIR1)Core/Uuid.h \
X-	$(UPPDIR1)Core/Value.h \
X-	$(UPPDIR1)Core/Vcont.h \
X-	$(UPPDIR1)Core/Vcont.hpp \
X-	$(UPPDIR1)Core/Win32Com.h \
X-	$(UPPDIR1)Core/XML.h \
X-	$(UPPDIR1)Core/Xmlize.h \
X-	$(UPPDIR1)CtrlCore/CtrlCore.h \
X-	$(UPPDIR1)CtrlCore/MKeys.h \
X-	$(UPPDIR1)CtrlCore/TopWindow.h \
X-	$(UPPDIR1)CtrlCore/Win32Keys.h \
X-	$(UPPDIR1)CtrlCore/X11Keys.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X-	$(UPPDIR1)Draw/Debug.h \
X-	$(UPPDIR1)Draw/Display.h \
X-	$(UPPDIR1)Draw/Draw.h \
X-	$(UPPDIR1)Draw/DrawWin32.h \
X-	$(UPPDIR1)Draw/Image.h \
X-	$(UPPDIR1)Draw/ImageDraw.h \
X-	$(UPPDIR1)Draw/PixelArray.h \
X-	$(UPPDIR1)Image/Image.h \
X-	$(UPPDIR1)plugin/png/png.h \
X-	$(UPPDIR1)RichText/Para.h \
X-	$(UPPDIR1)RichText/RichText.h \
X-	$(UPPDIR1)RichText/Table.h \
X-	$(UPPDIR1)RichText/Text.h \
X-	$(UPPDIR1)RichText/Txt.h
X-	$(CPPFLAGS) $(CINC) $(Macro_DocTypes)  $(UPPDIR1)DocTypes/QtfEncoder.cpp -o $(OutDir_DocTypes)QtfEncoder.o
X-
X-$(OutDir_DocTypes)RtfDocOut.o: $(UPPDIR1)DocTypes/RtfDocOut.cpp \
X+$(OutDir_DocTypes)ParaFormat.o: $(UPPDIR1)RichEdit/ParaFormat.cpp \
X 	$(UPPDIR1)Core/Algo.h \
X 	$(UPPDIR1)Core/App.h \
X 	$(UPPDIR1)Core/BiCont.h \
X@@ -25887,7 +25105,6 @@
X 	$(UPPDIR1)CtrlCore/TopWindow.h \
X 	$(UPPDIR1)CtrlCore/Win32Keys.h \
X 	$(UPPDIR1)CtrlCore/X11Keys.h \
X-	$(UPPDIR1)DocTypes/DocTypes.h \
X 	$(UPPDIR1)Draw/Debug.h \
X 	$(UPPDIR1)Draw/Display.h \
X 	$(UPPDIR1)Draw/Draw.h \
X@@ -25902,19 +25119,9 @@
X 	$(UPPDIR1)RichText/Table.h \
X 	$(UPPDIR1)RichText/Text.h \
X 	$(UPPDIR1)RichText/Txt.h
X-	$(CPPFLAGS) $(CINC) $(Macro_DocTypes)  $(UPPDIR1)DocTypes/RtfDocOut.cpp -o $(OutDir_DocTypes)RtfDocOut.o
X+	$(CPPFLAGS) $(CINC) $(Macro_DocTypes)  $(UPPDIR1)RichEdit/ParaFormat.cpp -o $(OutDir_DocTypes)ParaFormat.o
X 
X $(OutDir_DocTypes)DocTypes.a: \
X-	$(OutDir_DocTypes)ParaFormat.o \
X-	$(OutDir_DocTypes)DocTypes.o \
X-	$(OutDir_DocTypes)DocTable.o \
X-	$(OutDir_DocTypes)QtfParser.o \
X-	$(OutDir_DocTypes)QtfEncoder.o \
X-	$(OutDir_DocTypes)RtfDocOut.o
X+	$(OutDir_DocTypes)ParaFormat.o
X 	$(AR) $(OutDir_DocTypes)DocTypes.a \
X-		$(OutDir_DocTypes)ParaFormat.o \
X-		$(OutDir_DocTypes)DocTypes.o \
X-		$(OutDir_DocTypes)DocTable.o \
X-		$(OutDir_DocTypes)QtfParser.o \
X-		$(OutDir_DocTypes)QtfEncoder.o \
X-		$(OutDir_DocTypes)RtfDocOut.o
X+		$(OutDir_DocTypes)ParaFormat.o
END-of-upp/files/patch-uppsrc-ide-Makefile
echo x - upp/files/patch-uppsrc-ide-idewin.cpp
sed 's/^X//' >upp/files/patch-uppsrc-ide-idewin.cpp << 'END-of-upp/files/patch-uppsrc-ide-idewin.cpp'
X--- uppsrc/ide/idewin.cpp.orig	Sat Feb 11 20:26:15 2006
X+++ uppsrc/ide/idewin.cpp	Sat Feb 11 20:40:13 2006
X@@ -482,7 +482,7 @@
X }
X #endif
X 
X-#ifdef PLATFORM_LINUX
X+#if defined PLATFORM_LINUX || defined PLATFORM_FREEBSD
X void Puts(const char *s)
X {
X 	puts(s);
END-of-upp/files/patch-uppsrc-ide-idewin.cpp
echo x - upp/files/patch-examples-Scribble3-Scribble.cpp
sed 's/^X//' >upp/files/patch-examples-Scribble3-Scribble.cpp << 'END-of-upp/files/patch-examples-Scribble3-Scribble.cpp'
X--- examples/Scribble3/Scribble.cpp.orig	Mon Feb 13 23:49:38 2006
X+++ examples/Scribble3/Scribble.cpp	Mon Feb 13 23:49:50 2006
X@@ -1,6 +1,6 @@
X #include <CtrlLib/CtrlLib.h>
X 
X-#define LAYOUTFILE <Scribble3/scribble.lay>
X+#define LAYOUTFILE <Scribble3/Scribble.lay>
X #include <CtrlCore/lay.h>
X 
X class Scribble : public TopWindow {
END-of-upp/files/patch-examples-Scribble3-Scribble.cpp
echo x - upp/files/patch-uppsrc-Core-Core.upp
sed 's/^X//' >upp/files/patch-uppsrc-Core-Core.upp << 'END-of-upp/files/patch-uppsrc-Core-Core.upp'
X--- uppsrc/Core/Core.upp.orig	Mon Feb 13 23:44:21 2006
X+++ uppsrc/Core/Core.upp	Mon Feb 13 23:44:42 2006
X@@ -13,9 +13,11 @@
X 
X library(WIN32 GCC) "ole32 oleaut32 uuid";
X 
X-options(XGNU) "-O0";
X+library(FREEBSD) "pthread freetype";
X 
X-options(XGNU) "-ffunction-sections";
X+options(XGNU) -O0;
X+
X+options(XGNU) -ffunction-sections;
X 
X link(SOLARIS) "-Wl,-R -Wl,/usr/local/lib";
X 
X@@ -118,3 +120,4 @@
X mainconfig
X 	"Normal" = "",
X 	"Remote shared" = "SHARED";
X+
END-of-upp/files/patch-uppsrc-Core-Core.upp
echo x - upp/files/patch-uppsrc-TCtrlLib-TCtrlLib.h
sed 's/^X//' >upp/files/patch-uppsrc-TCtrlLib-TCtrlLib.h << 'END-of-upp/files/patch-uppsrc-TCtrlLib-TCtrlLib.h'
X--- uppsrc/TCtrlLib/TCtrlLib.h.orig	Tue Feb 14 20:28:51 2006
X+++ uppsrc/TCtrlLib/TCtrlLib.h	Tue Feb 14 20:29:20 2006
X@@ -2,7 +2,6 @@
X #define __TCtrlLib__
X 
X #include <CtrlLib/CtrlLib.h>
X-#include <DocTypes/DocTypes.h>
X #include <TDraw/TDraw.h>
X #include <TCore/TCore.h>
X #include "util.h"
END-of-upp/files/patch-uppsrc-TCtrlLib-TCtrlLib.h
echo x - upp/files/patch-examples-SDLExample-SDLExample.upp
sed 's/^X//' >upp/files/patch-examples-SDLExample-SDLExample.upp << 'END-of-upp/files/patch-examples-SDLExample-SDLExample.upp'
X--- examples/SDLExample/SDLExample.upp.orig	Mon Feb 13 23:47:58 2006
X+++ examples/SDLExample/SDLExample.upp	Mon Feb 13 23:48:07 2006
X@@ -5,6 +5,10 @@
X 
X library(GCC WIN32) "SDL.dll SDLmain";
X 
X+library(FREEBSD) SDL-1.1;
X+
X+options(FREEBSD) -I/usr/local/include/SDL11;
X+
X file
X 	main.cpp;
X 
END-of-upp/files/patch-examples-SDLExample-SDLExample.upp
echo x - upp/files/patch-uppsrc-Core-Stream.cpp
sed 's/^X//' >upp/files/patch-uppsrc-Core-Stream.cpp << 'END-of-upp/files/patch-uppsrc-Core-Stream.cpp'
X--- uppsrc/Core/Stream.cpp.orig	Sat Feb 11 17:52:17 2006
X+++ uppsrc/Core/Stream.cpp	Sat Feb 11 17:53:21 2006
X@@ -1205,15 +1205,15 @@
X void FileStream::SetStreamSize(int64 pos)
X {
X 	if(handle < 0) return;
X-	loff_t cur = lseek64(handle, 0, SEEK_CUR);
X+	off_t cur = lseek(handle, 0, SEEK_CUR);
X 	if(cur < 0) {
X 		SetLastError();
X 		return;
X 	}
X-	loff_t len = lseek64(handle, 0, SEEK_END);
X+	off_t len = lseek(handle, 0, SEEK_END);
X 	if(len < 0) {
X 		SetLastError();
X-		lseek64(handle, cur, SEEK_SET);
X+		lseek(handle, cur, SEEK_SET);
X 		return;
X 	}
X 	while(pos > len) {
X@@ -1222,24 +1222,24 @@
X 		int chunk = (diff > sizeof(buffer) ? sizeof(buffer) : (int)diff);
X 		if(write(handle, buffer, chunk) != chunk) {
X 			SetLastError();
X-			lseek64(handle, cur, SEEK_SET);
X+			lseek(handle, cur, SEEK_SET);
X 			return;
X 		}
X 		len += chunk;
X 	}
X 	if(pos < len) {
X 		if(cur > pos)
X-			lseek64(handle, cur = pos, SEEK_SET);
X-		if(ftruncate64(handle, pos) < 0)
X+			lseek(handle, cur = pos, SEEK_SET);
X+		if(ftruncate(handle, pos) < 0)
X 			SetLastError();
X 	}
X-	if(lseek64(handle, cur, SEEK_SET) < 0)
X+	if(lseek(handle, cur, SEEK_SET) < 0)
X 		SetLastError();
X }
X 
X void FileStream::SetPos(int64 pos) {
X 	ASSERT(IsOpen());
X-	if(lseek64(handle, pos, SEEK_SET) < 0)
X+	if(lseek(handle, pos, SEEK_SET) < 0)
X 		SetLastError();
X }
X 
END-of-upp/files/patch-uppsrc-Core-Stream.cpp
exit

>Release-Note:
>Audit-Trail:
>Unformatted:

---

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602142053.k1EKr03E055318>

Legal Notices | © 1995-2025 The FreeBSD Project. All rights reserved.

Contact