merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:26, 2000/03/20
+# This file was automatically generated by tmake at 20:17, 2000/03/31
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
 ALL_SOURCES = \
 		common/init.cpp \
@@ -9,6 +9,7 @@ ALL_SOURCES = \
 		common/datstrm.cpp \
 		common/dynarray.cpp \
 		common/dynlib.cpp \
+		common/encconv.cpp \
 		common/event.cpp \
 		common/extended.c \
 		common/ffile.cpp \
@@ -16,6 +17,7 @@ ALL_SOURCES = \
 		common/fileconf.cpp \
 		common/filefn.cpp \
 		common/filesys.cpp \
+		common/fontmap.cpp \
 		common/fs_inet.cpp \
 		common/fs_mem.cpp \
 		common/fs_zip.cpp \
@@ -78,12 +80,16 @@ ALL_HEADERS = \
 		dir.h \
 		dynarray.h \
 		dynlib.h \
+		encconv.h \
 		event.h \
 		ffile.h \
 		file.h \
 		fileconf.h \
 		filefn.h \
 		filesys.h \
+		fontenc.h \
+		fontmap.h \
+		fontutil.h \
 		fs_inet.h \
 		fs_mem.h \
 		fs_zip.h \
@@ -145,6 +151,7 @@ BASE_OBJS = \
 		datstrm.o \
 		dynarray.o \
 		dynlib.o \
+		encconv.o \
 		event.o \
 		extended.o \
 		ffile.o \
@@ -152,6 +159,7 @@ BASE_OBJS = \
 		fileconf.o \
 		filefn.o \
 		filesys.o \
+		fontmap.o \
 		fs_inet.o \
 		fs_mem.o \
 		fs_zip.o \
@@ -201,6 +209,7 @@ BASE_DEPS = \
 		datstrm.d \
 		dynarray.d \
 		dynlib.d \
+		encconv.d \
 		event.d \
 		extended.d \
 		ffile.d \
@@ -208,6 +217,7 @@ BASE_DEPS = \
 		fileconf.d \
 		filefn.d \
 		filesys.d \
+		fontmap.d \
 		fs_inet.d \
 		fs_mem.d \
 		fs_zip.d \
@@ -264,6 +274,7 @@ BASE_DEPS = \
 		datstrm.d \
 		dynarray.d \
 		dynlib.d \
+		encconv.d \
 		event.d \
 		extended.d \
 		ffile.d \
@@ -271,6 +282,7 @@ BASE_DEPS = \
 		fileconf.d \
 		filefn.d \
 		filesys.d \
+		fontmap.d \
 		fs_inet.d \
 		fs_mem.d \
 		fs_zip.d \