X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55b88634ebbe8cf1233c715eeffc2687596882ad..2e99f815328a471c30fb51700917775a872dd65a:/src/gtk/files.lst

diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index e0b5213fa2..955714a70f 100644
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -1,29 +1,33 @@
-# This file was automatically generated by tmake at 17:10, 2000/07/27
+# This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
+		generic/accel.cpp \
 		generic/busyinfo.cpp \
 		generic/calctrl.cpp \
 		generic/caret.cpp \
 		generic/choicdgg.cpp \
 		generic/colrdlgg.cpp \
+		generic/dcbuffer.cpp \
 		generic/dcpsg.cpp \
 		generic/dirctrlg.cpp \
 		generic/dirdlgg.cpp \
 		generic/dragimgg.cpp \
+		generic/fdrepdlg.cpp \
 		generic/filedlgg.cpp \
+		generic/fontdlgg.cpp \
 		generic/grid.cpp \
+		generic/gridctrl.cpp \
 		generic/gridsel.cpp \
 		generic/helpext.cpp \
 		generic/helphtml.cpp \
-		generic/helpwxht.cpp \
 		generic/imaglist.cpp \
 		generic/laywin.cpp \
 		generic/listctrl.cpp \
 		generic/logg.cpp \
 		generic/msgdlgg.cpp \
 		generic/numdlgg.cpp \
+		generic/paletteg.cpp \
 		generic/panelg.cpp \
-		generic/plot.cpp \
 		generic/printps.cpp \
 		generic/prntdlgg.cpp \
 		generic/progdlgg.cpp \
@@ -31,43 +35,59 @@ ALL_SOURCES = \
 		generic/propform.cpp \
 		generic/proplist.cpp \
 		generic/sashwin.cpp \
-		generic/scrolwin.cpp \
+		generic/scrlwing.cpp \
+		generic/spinctlg.cpp \
+		generic/splash.cpp \
 		generic/splitter.cpp \
 		generic/statusbr.cpp \
 		generic/tabg.cpp \
 		generic/tbarsmpl.cpp \
 		generic/textdlgg.cpp \
 		generic/tipdlg.cpp \
-		generic/treectrl.cpp \
+		generic/tipwin.cpp \
+		generic/treectlg.cpp \
 		generic/treelay.cpp \
 		generic/wizard.cpp \
 		common/appcmn.cpp \
+		common/artprov.cpp \
+		common/artstd.cpp \
 		common/choiccmn.cpp \
 		common/clipcmn.cpp \
+		common/clntdata.cpp \
 		common/cmdline.cpp \
+		common/cmdproc.cpp \
 		common/cmndata.cpp \
 		common/config.cpp \
+		common/containr.cpp \
+		common/cshelp.cpp \
 		common/ctrlcmn.cpp \
 		common/ctrlsub.cpp \
 		common/datetime.cpp \
 		common/datstrm.cpp \
 		common/db.cpp \
+		common/dbgrid.cpp \
 		common/dbtable.cpp \
 		common/dcbase.cpp \
+		common/dircmn.cpp \
 		common/dlgcmn.cpp \
 		common/dndcmn.cpp \
 		common/dobjcmn.cpp \
 		common/docmdi.cpp \
 		common/docview.cpp \
+		common/dseldlg.cpp \
 		common/dynarray.cpp \
 		common/dynlib.cpp \
+		common/dynload.cpp \
+		common/effects.cpp \
 		common/encconv.cpp \
 		common/event.cpp \
 		common/extended.c \
+		common/fddlgcmn.cpp \
 		common/ffile.cpp \
 		common/file.cpp \
 		common/fileconf.cpp \
 		common/filefn.cpp \
+		common/filename.cpp \
 		common/filesys.cpp \
 		common/fontcmn.cpp \
 		common/fontmap.cpp \
@@ -76,21 +96,27 @@ ALL_SOURCES = \
 		common/fs_mem.cpp \
 		common/fs_zip.cpp \
 		common/ftp.cpp \
+		common/gaugecmn.cpp \
 		common/gdicmn.cpp \
 		common/geometry.cpp \
 		common/gifdecod.cpp \
 		common/hash.cpp \
+		common/hashmap.cpp \
 		common/helpbase.cpp \
 		common/http.cpp \
+		common/iconbndl.cpp \
 		common/imagall.cpp \
 		common/imagbmp.cpp \
 		common/image.cpp \
+		common/imagfill.cpp \
 		common/imaggif.cpp \
+		common/imagiff.cpp \
 		common/imagjpeg.cpp \
 		common/imagpcx.cpp \
 		common/imagpng.cpp \
 		common/imagpnm.cpp \
 		common/imagtiff.cpp \
+		common/imagxpm.cpp \
 		common/intl.cpp \
 		common/ipcbase.cpp \
 		common/layout.cpp \
@@ -98,33 +124,42 @@ ALL_SOURCES = \
 		common/list.cpp \
 		common/log.cpp \
 		common/longlong.cpp \
+		common/matrix.cpp \
 		common/memory.cpp \
 		common/menucmn.cpp \
 		common/mimecmn.cpp \
 		common/module.cpp \
 		common/mstream.cpp \
+		common/nbkbase.cpp \
 		common/object.cpp \
-		common/objstrm.cpp \
 		common/paper.cpp \
+		common/popupcmn.cpp \
 		common/prntbase.cpp \
 		common/process.cpp \
 		common/protocol.cpp \
+		common/quantize.cpp \
+		common/radiocmn.cpp \
+		common/regex.cpp \
 		common/resource.cpp \
 		common/sckaddr.cpp \
 		common/sckfile.cpp \
 		common/sckipc.cpp \
 		common/sckstrm.cpp \
-		common/serbase.cpp \
 		common/sizer.cpp \
 		common/socket.cpp \
+		common/statbar.cpp \
 		common/strconv.cpp \
 		common/stream.cpp \
 		common/string.cpp \
+		common/sysopt.cpp \
 		common/tbarbase.cpp \
+		common/textbuf.cpp \
 		common/textcmn.cpp \
 		common/textfile.cpp \
 		common/timercmn.cpp \
 		common/tokenzr.cpp \
+		common/toplvcmn.cpp \
+		common/treebase.cpp \
 		common/txtstrm.cpp \
 		common/unzip.c \
 		common/url.cpp \
@@ -137,9 +172,9 @@ ALL_SOURCES = \
 		common/wincmn.cpp \
 		common/wxchar.cpp \
 		common/wxexpr.cpp \
+		common/xpmdecod.cpp \
 		common/zipstrm.cpp \
 		common/zstream.cpp \
-		gtk/accel.cpp \
 		gtk/app.cpp \
 		gtk/bitmap.cpp \
 		gtk/bmpbuttn.cpp \
@@ -161,6 +196,7 @@ ALL_SOURCES = \
 		gtk/dcscreen.cpp \
 		gtk/dialog.cpp \
 		gtk/dnd.cpp \
+		gtk/evtloop.cpp \
 		gtk/font.cpp \
 		gtk/fontdlg.cpp \
 		gtk/frame.cpp \
@@ -175,12 +211,13 @@ ALL_SOURCES = \
 		gtk/menu.cpp \
 		gtk/minifram.cpp \
 		gtk/notebook.cpp \
-		gtk/palette.cpp \
 		gtk/pen.cpp \
+		gtk/popupwin.cpp \
 		gtk/radiobox.cpp \
 		gtk/radiobut.cpp \
 		gtk/region.cpp \
 		gtk/scrolbar.cpp \
+		gtk/scrolwin.cpp \
 		gtk/settings.cpp \
 		gtk/slider.cpp \
 		gtk/spinbutt.cpp \
@@ -191,8 +228,10 @@ ALL_SOURCES = \
 		gtk/stattext.cpp \
 		gtk/tbargtk.cpp \
 		gtk/textctrl.cpp \
+		gtk/tglbtn.cpp \
 		gtk/timer.cpp \
 		gtk/tooltip.cpp \
+		gtk/toplevel.cpp \
 		gtk/utilsgtk.cpp \
 		gtk/utilsres.cpp \
 		gtk/wave.cpp \
@@ -204,8 +243,10 @@ ALL_SOURCES = \
 		unix/fontutil.cpp \
 		unix/gsocket.c \
 		unix/mimetype.cpp \
+		unix/snglinst.cpp \
 		unix/threadpsx.cpp \
 		unix/utilsunx.cpp \
+		unix/utilsx11.cpp \
 		html/helpctrl.cpp \
 		html/helpdata.cpp \
 		html/helpfrm.cpp \
@@ -224,6 +265,7 @@ ALL_SOURCES = \
 		html/m_list.cpp \
 		html/m_meta.cpp \
 		html/m_pre.cpp \
+		html/m_style.cpp \
 		html/m_tables.cpp \
 		html/winpars.cpp
 
@@ -231,6 +273,7 @@ ALL_HEADERS = \
 		accel.h \
 		app.h \
 		arrimpl.cpp \
+		artprov.h \
 		bitmap.h \
 		bmpbuttn.h \
 		brush.h \
@@ -241,17 +284,22 @@ ALL_HEADERS = \
 		caret.h \
 		checkbox.h \
 		checklst.h \
+		chkconf.h \
 		choicdlg.h \
 		choice.h \
 		clipbrd.h \
+		clntdata.h \
 		cmdline.h \
+		cmdproc.h \
 		cmndata.h \
 		colordlg.h \
 		colour.h \
 		combobox.h \
 		confbase.h \
 		config.h \
+		containr.h \
 		control.h \
+		cshelp.h \
 		ctrlsub.h \
 		cursor.h \
 		dataobj.h \
@@ -260,8 +308,11 @@ ALL_HEADERS = \
 		datetime.inl \
 		datstrm.h \
 		db.h \
+		dbgrid.h \
+		dbkeyg.h \
 		dbtable.h \
 		dc.h \
+		dcbuffer.h \
 		dcclient.h \
 		dcmemory.h \
 		dcprint.h \
@@ -273,6 +324,7 @@ ALL_HEADERS = \
 		dialog.h \
 		dialup.h \
 		dir.h \
+		dirctrl.h \
 		dirdlg.h \
 		dnd.h \
 		docmdi.h \
@@ -280,14 +332,18 @@ ALL_HEADERS = \
 		dragimag.h \
 		dynarray.h \
 		dynlib.h \
+		dynload.h \
 		encconv.h \
 		event.h \
 		expr.h \
+		fdrepdlg.h \
+		features.h \
 		ffile.h \
 		file.h \
 		fileconf.h \
 		filedlg.h \
 		filefn.h \
+		filename.h \
 		filesys.h \
 		font.h \
 		fontdlg.h \
@@ -308,22 +364,24 @@ ALL_HEADERS = \
 		grid.h \
 		gsocket.h \
 		hash.h \
+		hashmap.h \
 		help.h \
 		helpbase.h \
-		helpchm.h \
 		helphtml.h \
 		helpwin.h \
-		helpxlp.h \
 		icon.h \
+		iconbndl.h \
 		imagbmp.h \
 		image.h \
 		imaggif.h \
+		imagiff.h \
 		imagjpeg.h \
 		imaglist.h \
 		imagpcx.h \
 		imagpng.h \
 		imagpnm.h \
 		imagtiff.h \
+		imagxpm.h \
 		intl.h \
 		ioswrap.h \
 		ipcbase.h \
@@ -342,6 +400,7 @@ ALL_HEADERS = \
 		mdi.h \
 		memconf.h \
 		memory.h \
+		memtext.h \
 		menu.h \
 		menuitem.h \
 		metafile.h \
@@ -352,14 +411,14 @@ ALL_HEADERS = \
 		mstream.h \
 		notebook.h \
 		object.h \
-		objstrm.h \
 		odbc.h \
 		ownerdrw.h \
 		palette.h \
 		panel.h \
 		paper.h \
 		pen.h \
-		plot.h \
+		platform.h \
+		popupwin.h \
 		print.h \
 		printdlg.h \
 		prntbase.h \
@@ -370,6 +429,7 @@ ALL_HEADERS = \
 		proplist.h \
 		radiobox.h \
 		radiobut.h \
+		regex.h \
 		region.h \
 		resource.h \
 		sashwin.h \
@@ -378,15 +438,16 @@ ALL_HEADERS = \
 		sckstrm.h \
 		scrolbar.h \
 		scrolwin.h \
-		serbase.h \
 		settings.h \
-		setup.h \
 		sizer.h \
 		slider.h \
+		snglinst.h \
 		socket.h \
 		spinbutt.h \
 		spinctrl.h \
+		splash.h \
 		splitter.h \
+		stack.h \
 		statbmp.h \
 		statbox.h \
 		statline.h \
@@ -395,21 +456,27 @@ ALL_HEADERS = \
 		strconv.h \
 		stream.h \
 		string.h \
+		sysopt.h \
 		tab.h \
 		tabctrl.h \
 		taskbar.h \
 		tbarbase.h \
 		tbarsmpl.h \
+		textbuf.h \
 		textctrl.h \
 		textdlg.h \
 		textfile.h \
+		tglbtn.h \
 		thread.h \
 		time.h \
 		timer.h \
 		tipdlg.h \
+		tipwin.h \
 		tokenzr.h \
 		toolbar.h \
 		tooltip.h \
+		toplevel.h \
+		treebase.h \
 		treectrl.h \
 		txtstrm.h \
 		types.h \
@@ -419,7 +486,9 @@ ALL_HEADERS = \
 		validate.h \
 		valtext.h \
 		variant.h \
+		vector.h \
 		version.h \
+		volume.h \
 		wave.h \
 		wfstream.h \
 		window.h \
@@ -432,7 +501,7 @@ ALL_HEADERS = \
 		wxexpr.h \
 		wxhtml.h \
 		wxprec.h \
-		xpmhand.h \
+		xpmdecod.h \
 		zipstrm.h \
 		zstream.h \
 		gtk/accel.h \
@@ -473,13 +542,13 @@ ALL_HEADERS = \
 		gtk/menuitem.h \
 		gtk/minifram.h \
 		gtk/notebook.h \
-		gtk/palette.h \
 		gtk/pen.h \
+		gtk/popupwin.h \
 		gtk/radiobox.h \
 		gtk/radiobut.h \
 		gtk/region.h \
 		gtk/scrolbar.h \
-		gtk/settings.h \
+		gtk/scrolwin.h \
 		gtk/slider.h \
 		gtk/spinbutt.h \
 		gtk/spinctrl.h \
@@ -489,12 +558,15 @@ ALL_HEADERS = \
 		gtk/stattext.h \
 		gtk/tbargtk.h \
 		gtk/textctrl.h \
+		gtk/tglbtn.h \
 		gtk/timer.h \
 		gtk/tooltip.h \
+		gtk/toplevel.h \
 		gtk/treectrl.h \
 		gtk/wave.h \
 		gtk/win_gtk.h \
 		gtk/window.h \
+		generic/accel.h \
 		generic/calctrl.h \
 		generic/caret.h \
 		generic/choicdgg.h \
@@ -503,36 +575,40 @@ ALL_HEADERS = \
 		generic/dirctrlg.h \
 		generic/dirdlgg.h \
 		generic/dragimgg.h \
+		generic/fdrepdlg.h \
 		generic/filedlgg.h \
 		generic/fontdlgg.h \
 		generic/grid.h \
+		generic/gridctrl.h \
 		generic/gridg.h \
 		generic/helpext.h \
 		generic/helphtml.h \
-		generic/helpwxht.h \
-		generic/helpxlp.h \
 		generic/imaglist.h \
 		generic/laywin.h \
 		generic/listctrl.h \
 		generic/msgdlgg.h \
 		generic/notebook.h \
+		generic/paletteg.h \
 		generic/panelg.h \
-		generic/plot.h \
 		generic/printps.h \
 		generic/prntdlgg.h \
 		generic/progdlgg.h \
 		generic/sashwin.h \
 		generic/scrolwin.h \
+		generic/spinctlg.h \
+		generic/splash.h \
 		generic/splitter.h \
 		generic/statusbr.h \
 		generic/tabg.h \
 		generic/textdlgg.h \
-		generic/treectrl.h \
+		generic/timer.h \
+		generic/treectlg.h \
 		generic/wizard.h \
 		unix/execute.h \
 		unix/fontutil.h \
 		unix/gsockunx.h \
 		unix/mimetype.h \
+		unix/utilsx11.h \
 		html/forcelnk.h \
 		html/helpctrl.h \
 		html/helpdata.h \
@@ -554,32 +630,45 @@ ALL_HEADERS = \
 COMMONOBJS = \
 		parser.o \
 		appcmn.o \
+		artprov.o \
+		artstd.o \
 		choiccmn.o \
 		clipcmn.o \
+		clntdata.o \
 		cmdline.o \
+		cmdproc.o \
 		cmndata.o \
 		config.o \
+		containr.o \
+		cshelp.o \
 		ctrlcmn.o \
 		ctrlsub.o \
 		datetime.o \
 		datstrm.o \
 		db.o \
+		dbgrid.o \
 		dbtable.o \
 		dcbase.o \
+		dircmn.o \
 		dlgcmn.o \
 		dndcmn.o \
 		dobjcmn.o \
 		docmdi.o \
 		docview.o \
+		dseldlg.o \
 		dynarray.o \
 		dynlib.o \
+		dynload.o \
+		effects.o \
 		encconv.o \
 		event.o \
 		extended.o \
+		fddlgcmn.o \
 		ffile.o \
 		file.o \
 		fileconf.o \
 		filefn.o \
+		filename.o \
 		filesys.o \
 		fontcmn.o \
 		fontmap.o \
@@ -588,21 +677,27 @@ COMMONOBJS = \
 		fs_mem.o \
 		fs_zip.o \
 		ftp.o \
+		gaugecmn.o \
 		gdicmn.o \
 		geometry.o \
 		gifdecod.o \
 		hash.o \
+		hashmap.o \
 		helpbase.o \
 		http.o \
+		iconbndl.o \
 		imagall.o \
 		imagbmp.o \
 		image.o \
+		imagfill.o \
 		imaggif.o \
+		imagiff.o \
 		imagjpeg.o \
 		imagpcx.o \
 		imagpng.o \
 		imagpnm.o \
 		imagtiff.o \
+		imagxpm.o \
 		intl.o \
 		ipcbase.o \
 		layout.o \
@@ -610,33 +705,42 @@ COMMONOBJS = \
 		list.o \
 		log.o \
 		longlong.o \
+		matrix.o \
 		memory.o \
 		menucmn.o \
 		mimecmn.o \
 		module.o \
 		mstream.o \
+		nbkbase.o \
 		object.o \
-		objstrm.o \
 		paper.o \
+		popupcmn.o \
 		prntbase.o \
 		process.o \
 		protocol.o \
+		quantize.o \
+		radiocmn.o \
+		regex.o \
 		resource.o \
 		sckaddr.o \
 		sckfile.o \
 		sckipc.o \
 		sckstrm.o \
-		serbase.o \
 		sizer.o \
 		socket.o \
+		statbar.o \
 		strconv.o \
 		stream.o \
 		string.o \
+		sysopt.o \
 		tbarbase.o \
+		textbuf.o \
 		textcmn.o \
 		textfile.o \
 		timercmn.o \
 		tokenzr.o \
+		toplvcmn.o \
+		treebase.o \
 		txtstrm.o \
 		unzip.o \
 		url.o \
@@ -649,134 +753,38 @@ COMMONOBJS = \
 		wincmn.o \
 		wxchar.o \
 		wxexpr.o \
+		xpmdecod.o \
 		zipstrm.o \
 		zstream.o
 
-COMMONDEPS = \
-		parser.d \
-		appcmn.d \
-		choiccmn.d \
-		clipcmn.d \
-		cmdline.d \
-		cmndata.d \
-		config.d \
-		ctrlcmn.d \
-		ctrlsub.d \
-		datetime.d \
-		datstrm.d \
-		db.d \
-		dbtable.d \
-		dcbase.d \
-		dlgcmn.d \
-		dndcmn.d \
-		dobjcmn.d \
-		docmdi.d \
-		docview.d \
-		dynarray.d \
-		dynlib.d \
-		encconv.d \
-		event.d \
-		extended.d \
-		ffile.d \
-		file.d \
-		fileconf.d \
-		filefn.d \
-		filesys.d \
-		fontcmn.d \
-		fontmap.d \
-		framecmn.d \
-		fs_inet.d \
-		fs_mem.d \
-		fs_zip.d \
-		ftp.d \
-		gdicmn.d \
-		geometry.d \
-		gifdecod.d \
-		hash.d \
-		helpbase.d \
-		http.d \
-		imagall.d \
-		imagbmp.d \
-		image.d \
-		imaggif.d \
-		imagjpeg.d \
-		imagpcx.d \
-		imagpng.d \
-		imagpnm.d \
-		imagtiff.d \
-		intl.d \
-		ipcbase.d \
-		layout.d \
-		lboxcmn.d \
-		list.d \
-		log.d \
-		longlong.d \
-		memory.d \
-		menucmn.d \
-		mimecmn.d \
-		module.d \
-		mstream.d \
-		object.d \
-		objstrm.d \
-		paper.d \
-		prntbase.d \
-		process.d \
-		protocol.d \
-		resource.d \
-		sckaddr.d \
-		sckfile.d \
-		sckipc.d \
-		sckstrm.d \
-		serbase.d \
-		sizer.d \
-		socket.d \
-		strconv.d \
-		stream.d \
-		string.d \
-		tbarbase.d \
-		textcmn.d \
-		textfile.d \
-		timercmn.d \
-		tokenzr.d \
-		txtstrm.d \
-		unzip.d \
-		url.d \
-		utilscmn.d \
-		valgen.d \
-		validate.d \
-		valtext.d \
-		variant.d \
-		wfstream.d \
-		wincmn.d \
-		wxchar.d \
-		wxexpr.d \
-		zipstrm.d \
-		zstream.d
-
-GENERICOBJS = \
+GUIOBJS = \
+		accel.o \
 		busyinfo.o \
 		calctrl.o \
 		caret.o \
 		choicdgg.o \
 		colrdlgg.o \
+		dcbuffer.o \
 		dcpsg.o \
 		dirctrlg.o \
 		dirdlgg.o \
 		dragimgg.o \
+		fdrepdlg.o \
 		filedlgg.o \
+		fontdlgg.o \
 		grid.o \
+		gridctrl.o \
 		gridsel.o \
 		helpext.o \
 		helphtml.o \
-		helpwxht.o \
 		imaglist.o \
 		laywin.o \
 		listctrl.o \
 		logg.o \
 		msgdlgg.o \
 		numdlgg.o \
+		paletteg.o \
 		panelg.o \
-		plot.o \
 		printps.o \
 		prntdlgg.o \
 		progdlgg.o \
@@ -784,61 +792,19 @@ GENERICOBJS = \
 		propform.o \
 		proplist.o \
 		sashwin.o \
-		scrolwin.o \
+		scrlwing.o \
+		spinctlg.o \
+		splash.o \
 		splitter.o \
 		statusbr.o \
 		tabg.o \
 		tbarsmpl.o \
 		textdlgg.o \
 		tipdlg.o \
-		treectrl.o \
+		tipwin.o \
+		treectlg.o \
 		treelay.o \
-		wizard.o
-
-GENERICDEPS = \
-		busyinfo.d \
-		calctrl.d \
-		caret.d \
-		choicdgg.d \
-		colrdlgg.d \
-		dcpsg.d \
-		dirctrlg.d \
-		dirdlgg.d \
-		dragimgg.d \
-		filedlgg.d \
-		grid.d \
-		gridsel.d \
-		helpext.d \
-		helphtml.d \
-		helpwxht.d \
-		imaglist.d \
-		laywin.d \
-		listctrl.d \
-		logg.d \
-		msgdlgg.d \
-		numdlgg.d \
-		panelg.d \
-		plot.d \
-		printps.d \
-		prntdlgg.d \
-		progdlgg.d \
-		prop.d \
-		propform.d \
-		proplist.d \
-		sashwin.d \
-		scrolwin.d \
-		splitter.d \
-		statusbr.d \
-		tabg.d \
-		tbarsmpl.d \
-		textdlgg.d \
-		tipdlg.d \
-		treectrl.d \
-		treelay.d \
-		wizard.d
-
-GUIOBJS = \
-		accel.o \
+		wizard.o \
 		app.o \
 		bitmap.o \
 		bmpbuttn.o \
@@ -860,6 +826,7 @@ GUIOBJS = \
 		dcscreen.o \
 		dialog.o \
 		dnd.o \
+		evtloop.o \
 		font.o \
 		fontdlg.o \
 		frame.o \
@@ -874,12 +841,13 @@ GUIOBJS = \
 		menu.o \
 		minifram.o \
 		notebook.o \
-		palette.o \
 		pen.o \
+		popupwin.o \
 		radiobox.o \
 		radiobut.o \
 		region.o \
 		scrolbar.o \
+		scrolwin.o \
 		settings.o \
 		slider.o \
 		spinbutt.o \
@@ -890,74 +858,92 @@ GUIOBJS = \
 		stattext.o \
 		tbargtk.o \
 		textctrl.o \
+		tglbtn.o \
 		timer.o \
 		tooltip.o \
+		toplevel.o \
 		utilsgtk.o \
 		utilsres.o \
 		wave.o \
 		win_gtk.o \
 		window.o
 
-GUIDEPS = \
-		accel.d \
-		app.d \
-		bitmap.d \
-		bmpbuttn.d \
-		brush.d \
-		button.d \
-		checkbox.d \
-		checklst.d \
-		choice.d \
-		clipbrd.d \
-		colour.d \
-		combobox.d \
-		control.d \
-		cursor.d \
-		data.d \
-		dataobj.d \
-		dc.d \
-		dcclient.d \
-		dcmemory.d \
-		dcscreen.d \
-		dialog.d \
-		dnd.d \
-		font.d \
-		fontdlg.d \
-		frame.d \
-		gauge.d \
-		gdiobj.d \
-		gsockgtk.d \
-		icon.d \
-		joystick.d \
-		listbox.d \
-		main.d \
-		mdi.d \
-		menu.d \
-		minifram.d \
-		notebook.d \
-		palette.d \
-		pen.d \
-		radiobox.d \
-		radiobut.d \
-		region.d \
-		scrolbar.d \
-		settings.d \
-		slider.d \
-		spinbutt.d \
-		spinctrl.d \
-		statbmp.d \
-		statbox.d \
-		statline.d \
-		stattext.d \
-		tbargtk.d \
-		textctrl.d \
-		timer.d \
-		tooltip.d \
-		utilsgtk.d \
-		utilsres.d \
-		wave.d \
-		win_gtk.d \
-		window.d
+GUI_LOWLEVEL_OBJS = \
+		accel.o \
+		busyinfo.o \
+		calctrl.o \
+		caret.o \
+		choicdgg.o \
+		colrdlgg.o \
+		dcbuffer.o \
+		dcpsg.o \
+		dirctrlg.o \
+		dirdlgg.o \
+		dragimgg.o \
+		fdrepdlg.o \
+		filedlgg.o \
+		fontdlgg.o \
+		grid.o \
+		gridctrl.o \
+		gridsel.o \
+		helpext.o \
+		helphtml.o \
+		imaglist.o \
+		laywin.o \
+		listctrl.o \
+		logg.o \
+		msgdlgg.o \
+		numdlgg.o \
+		paletteg.o \
+		panelg.o \
+		printps.o \
+		prntdlgg.o \
+		progdlgg.o \
+		prop.o \
+		propform.o \
+		proplist.o \
+		sashwin.o \
+		scrlwing.o \
+		spinctlg.o \
+		splash.o \
+		splitter.o \
+		tabg.o \
+		tbarsmpl.o \
+		textdlgg.o \
+		tipdlg.o \
+		tipwin.o \
+		treectlg.o \
+		treelay.o \
+		wizard.o \
+		app.o \
+		bitmap.o \
+		brush.o \
+		clipbrd.o \
+		colour.o \
+		cursor.o \
+		data.o \
+		dataobj.o \
+		dc.o \
+		dcclient.o \
+		dcmemory.o \
+		dcscreen.o \
+		dnd.o \
+		evtloop.o \
+		font.o \
+		gdiobj.o \
+		gsockgtk.o \
+		icon.o \
+		main.o \
+		pen.o \
+		popupwin.o \
+		region.o \
+		settings.o \
+		timer.o \
+		tooltip.o \
+		toplevel.o \
+		utilsgtk.o \
+		win_gtk.o \
+		window.o
 
 UNIXOBJS = \
 		dialup.o \
@@ -966,18 +952,10 @@ UNIXOBJS = \
 		fontutil.o \
 		gsocket.o \
 		mimetype.o \
+		snglinst.o \
 		threadpsx.o \
-		utilsunx.o
-
-UNIXDEPS = \
-		dialup.d \
-		dir.d \
-		fontenum.d \
-		fontutil.d \
-		gsocket.d \
-		mimetype.d \
-		threadpsx.d \
-		utilsunx.d
+		utilsunx.o \
+		utilsx11.o
 
 HTMLOBJS = \
 		helpctrl.o \
@@ -998,28 +976,7 @@ HTMLOBJS = \
 		m_list.o \
 		m_meta.o \
 		m_pre.o \
+		m_style.o \
 		m_tables.o \
 		winpars.o
 
-HTMLDEPS = \
-		helpctrl.d \
-		helpdata.d \
-		helpfrm.d \
-		htmlcell.d \
-		htmlfilt.d \
-		htmlpars.d \
-		htmltag.d \
-		htmlwin.d \
-		htmprint.d \
-		m_dflist.d \
-		m_fonts.d \
-		m_hline.d \
-		m_image.d \
-		m_layout.d \
-		m_links.d \
-		m_list.d \
-		m_meta.d \
-		m_pre.d \
-		m_tables.d \
-		winpars.d
-