merged 2.2 branch

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

src/gtk1/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:55, 2000/03/14
+# This file was automatically generated by tmake at 20:17, 2000/03/31
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
@@ -167,6 +167,7 @@ ALL_SOURCES = \
 		gtk/gdiobj.cpp \
 		gtk/gsockgtk.c \
 		gtk/icon.cpp \
+		gtk/joystick.cpp \
 		gtk/listbox.cpp \
 		gtk/main.cpp \
 		gtk/mdi.cpp \
@@ -289,6 +290,7 @@ ALL_HEADERS = \
 		filesys.h \
 		font.h \
 		fontdlg.h \
+		fontenc.h \
 		fontenum.h \
 		fontmap.h \
 		fontutil.h \
@@ -860,6 +862,7 @@ GUIOBJS = \
 		gdiobj.o \
 		gsockgtk.o \
 		icon.o \
+		joystick.o \
 		listbox.o \
 		main.o \
 		mdi.o \
@@ -920,6 +923,7 @@ GUIDEPS = \
 		gdiobj.d \
 		gsockgtk.d \
 		icon.d \
+		joystick.d \
 		listbox.d \
 		main.d \
 		mdi.d \