]> git.saurik.com Git - wxWidgets.git/blobdiff - src/mac/files.lst
implemented menu drawing in the GTK theme
[wxWidgets.git] / src / mac / files.lst
index e0bc24193e50038b66e1c251d56bcc0c9bc792a1..259e2d48defbb2d01e03dbaa1fbc1690441c69c0 100644 (file)
@@ -1,5 +1,5 @@
-# This file was automatically generated by tmake at 11:57, 2000/09/08
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE OS2.T!
+# This file was automatically generated by tmake 
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
                generic/calctrl.cpp \
@@ -8,12 +8,16 @@ ALL_SOURCES = \
                generic/colrdlgg.cpp \
                generic/dcpsg.cpp \
                generic/dirctrlg.cpp \
+               generic/dirdlgg.cpp \
+               generic/dragimgg.cpp \
+               generic/fdrepdlg.cpp \
+               generic/fontdlgg.cpp \
                generic/grid.cpp \
+               generic/gridctrl.cpp \
                generic/gridsel.cpp \
                generic/helpext.cpp \
                generic/helphtml.cpp \
                generic/helpwxht.cpp \
-               generic/helpxlp.cpp \
                generic/imaglist.cpp \
                generic/laywin.cpp \
                generic/listctrl.cpp \
@@ -28,22 +32,29 @@ 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/tipwin.cpp \
                generic/treectlg.cpp \
                generic/treelay.cpp \
                generic/wizard.cpp \
                common/appcmn.cpp \
+               common/bmpbase.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 \
@@ -52,21 +63,26 @@ ALL_SOURCES = \
                common/db.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 \
@@ -75,16 +91,19 @@ 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/imagall.cpp \
                common/imagbmp.cpp \
                common/image.cpp \
                common/imaggif.cpp \
+               common/imagiff.cpp \
                common/imagjpeg.cpp \
                common/imagpcx.cpp \
                common/imagpng.cpp \
@@ -98,34 +117,41 @@ 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/odbc.cpp \
                common/paper.cpp \
+               common/popupcmn.cpp \
                common/prntbase.cpp \
                common/process.cpp \
                common/protocol.cpp \
                common/quantize.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 \
@@ -139,8 +165,90 @@ ALL_SOURCES = \
                common/wincmn.cpp \
                common/wxchar.cpp \
                common/wxexpr.cpp \
+               common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
+               mac/accel.cpp \
+               mac/aga.cpp \
+               mac/app.cpp \
+               mac/bitmap.cpp \
+               mac/bmpbuttn.cpp \
+               mac/brush.cpp \
+               mac/button.cpp \
+               mac/checkbox.cpp \
+               mac/checklst.cpp \
+               mac/choice.cpp \
+               mac/clipbrd.cpp \
+               mac/colordlg.cpp \
+               mac/colour.cpp \
+               mac/combobox.cpp \
+               mac/control.cpp \
+               mac/cursor.cpp \
+               mac/data.cpp \
+               mac/dataobj.cpp \
+               mac/dc.cpp \
+               mac/dcclient.cpp \
+               mac/dcmemory.cpp \
+               mac/dcprint.cpp \
+               mac/dcscreen.cpp \
+               mac/dialog.cpp \
+               mac/dirdlg.cpp \
+               mac/dirmac.cpp \
+               mac/dnd.cpp \
+               mac/filedlg.cpp \
+               mac/font.cpp \
+               mac/fontdlg.cpp \
+               mac/fontenum.cpp \
+               mac/fontutil.cpp \
+               mac/frame.cpp \
+               mac/gauge.cpp \
+               mac/gdiobj.cpp \
+               mac/gsocket.c \
+               mac/icon.cpp \
+               mac/joystick.cpp \
+               mac/listbox.cpp \
+               mac/macnotfy.cpp \
+               mac/mdi.cpp \
+               mac/menu.cpp \
+               mac/menuitem.cpp \
+               mac/metafile.cpp \
+               mac/mimetmac.cpp \
+               mac/minifram.cpp \
+               mac/msgdlg.cpp \
+               mac/notebmac.cpp \
+               mac/palette.cpp \
+               mac/pen.cpp \
+               mac/pnghand.cpp \
+               mac/print.cpp \
+               mac/printdlg.cpp \
+               mac/printmac.cpp \
+               mac/radiobox.cpp \
+               mac/radiobut.cpp \
+               mac/region.cpp \
+               mac/scrolbar.cpp \
+               mac/settings.cpp \
+               mac/slider.cpp \
+               mac/spinbutt.cpp \
+               mac/statbmp.cpp \
+               mac/statbox.cpp \
+               mac/statbrma.cpp \
+               mac/statlmac.cpp \
+               mac/stattext.cpp \
+               mac/tabctrl.cpp \
+               mac/taskbar.cpp \
+               mac/textctrl.cpp \
+               mac/thread.cpp \
+               mac/timer.cpp \
+               mac/toolbar.cpp \
+               mac/tooltip.cpp \
+               mac/toplevel.cpp \
+               mac/uma.cpp \
+               mac/utils.cpp \
+               mac/utilsexc.cpp \
+               mac/wave.cpp \
+               mac/window.cpp \
+               unix/snglinst.cpp \
+               unix/utilsunx.cpp \
                html/helpctrl.cpp \
                html/helpdata.cpp \
                html/helpfrm.cpp \
@@ -159,6 +267,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
 
@@ -176,16 +285,20 @@ 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 \
@@ -196,6 +309,8 @@ ALL_HEADERS = \
                datetime.inl \
                datstrm.h \
                db.h \
+               dbgrid.h \
+               dbkeyg.h \
                dbtable.h \
                dc.h \
                dcclient.h \
@@ -209,6 +324,7 @@ ALL_HEADERS = \
                dialog.h \
                dialup.h \
                dir.h \
+               dirctrl.h \
                dirdlg.h \
                dnd.h \
                docmdi.h \
@@ -216,14 +332,17 @@ ALL_HEADERS = \
                dragimag.h \
                dynarray.h \
                dynlib.h \
+               dynload.h \
                encconv.h \
                event.h \
                expr.h \
+               fdrepdlg.h \
                ffile.h \
                file.h \
                fileconf.h \
                filedlg.h \
                filefn.h \
+               filename.h \
                filesys.h \
                font.h \
                fontdlg.h \
@@ -244,16 +363,16 @@ ALL_HEADERS = \
                grid.h \
                gsocket.h \
                hash.h \
+               hashmap.h \
                help.h \
                helpbase.h \
-               helpchm.h \
                helphtml.h \
                helpwin.h \
-               helpxlp.h \
                icon.h \
                imagbmp.h \
                image.h \
                imaggif.h \
+               imagiff.h \
                imagjpeg.h \
                imaglist.h \
                imagpcx.h \
@@ -279,6 +398,7 @@ ALL_HEADERS = \
                mdi.h \
                memconf.h \
                memory.h \
+               memtext.h \
                menu.h \
                menuitem.h \
                metafile.h \
@@ -289,13 +409,14 @@ ALL_HEADERS = \
                mstream.h \
                notebook.h \
                object.h \
-               objstrm.h \
                odbc.h \
                ownerdrw.h \
                palette.h \
                panel.h \
                paper.h \
                pen.h \
+               platform.h \
+               popupwin.h \
                print.h \
                printdlg.h \
                prntbase.h \
@@ -306,6 +427,7 @@ ALL_HEADERS = \
                proplist.h \
                radiobox.h \
                radiobut.h \
+               regex.h \
                region.h \
                resource.h \
                sashwin.h \
@@ -314,15 +436,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 \
@@ -331,21 +454,26 @@ 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 \
@@ -356,7 +484,9 @@ ALL_HEADERS = \
                validate.h \
                valtext.h \
                variant.h \
+               vector.h \
                version.h \
+               volume.h \
                wave.h \
                wfstream.h \
                window.h \
@@ -369,9 +499,92 @@ ALL_HEADERS = \
                wxexpr.h \
                wxhtml.h \
                wxprec.h \
-               xpmhand.h \
+               xpmdecod.h \
                zipstrm.h \
                zstream.h \
+               mac/accel.h \
+               mac/aga.h \
+               mac/app.h \
+               mac/bitmap.h \
+               mac/bmpbuttn.h \
+               mac/brush.h \
+               mac/button.h \
+               mac/checkbox.h \
+               mac/checklst.h \
+               mac/choice.h \
+               mac/clipbrd.h \
+               mac/colordlg.h \
+               mac/colour.h \
+               mac/combobox.h \
+               mac/control.h \
+               mac/cursor.h \
+               mac/dataform.h \
+               mac/dataobj.h \
+               mac/dataobj2.h \
+               mac/dc.h \
+               mac/dcclient.h \
+               mac/dcmemory.h \
+               mac/dcprint.h \
+               mac/dcscreen.h \
+               mac/dialog.h \
+               mac/dirdlg.h \
+               mac/dnd.h \
+               mac/filedlg.h \
+               mac/font.h \
+               mac/fontdlg.h \
+               mac/frame.h \
+               mac/gauge.h \
+               mac/gdiobj.h \
+               mac/glcanvas.h \
+               mac/gsockmac.h \
+               mac/helpxxxx.h \
+               mac/icon.h \
+               mac/imaglist.h \
+               mac/joystick.h \
+               mac/listbox.h \
+               mac/listctrl.h \
+               mac/macnotfy.h \
+               mac/macsock.h \
+               mac/mdi.h \
+               mac/menu.h \
+               mac/menuitem.h \
+               mac/metafile.h \
+               mac/mimetype.h \
+               mac/minifram.h \
+               mac/msgdlg.h \
+               mac/notebook.h \
+               mac/palette.h \
+               mac/pen.h \
+               mac/pnghand.h \
+               mac/pngread.h \
+               mac/print.h \
+               mac/printdlg.h \
+               mac/printmac.h \
+               mac/private.h \
+               mac/radiobox.h \
+               mac/radiobut.h \
+               mac/region.h \
+               mac/scrolbar.h \
+               mac/settings.h \
+               mac/slider.h \
+               mac/spinbutt.h \
+               mac/statbmp.h \
+               mac/statbox.h \
+               mac/statline.h \
+               mac/stattext.h \
+               mac/statusbr.h \
+               mac/tabctrl.h \
+               mac/taskbar.h \
+               mac/textctrl.h \
+               mac/timer.h \
+               mac/toolbar.h \
+               mac/tooltip.h \
+               mac/toplevel.h \
+               mac/treectrl.h \
+               mac/uma.h \
+               mac/wave.h \
+               mac/window.h \
+               generic/accel.h \
                generic/calctrl.h \
                generic/caret.h \
                generic/choicdgg.h \
@@ -380,31 +593,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/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/timer.h \
                generic/treectlg.h \
                generic/wizard.h \
+               unix/execute.h \
+               unix/fontutil.h \
+               unix/gsockunx.h \
+               unix/mimetype.h \
                html/forcelnk.h \
                html/helpctrl.h \
                html/helpdata.h \
@@ -426,11 +648,15 @@ ALL_HEADERS = \
 COMMONOBJS = \
                parser.o \
                appcmn.o \
+               bmpbase.o \
                choiccmn.o \
                clipcmn.o \
+               clntdata.o \
                cmdline.o \
+               cmdproc.o \
                cmndata.o \
                config.o \
+               containr.o \
                cshelp.o \
                ctrlcmn.o \
                ctrlsub.o \
@@ -439,17 +665,21 @@ COMMONOBJS = \
                db.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 \
@@ -463,16 +693,19 @@ 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 \
                imagall.o \
                imagbmp.o \
                image.o \
                imaggif.o \
+               imagiff.o \
                imagjpeg.o \
                imagpcx.o \
                imagpng.o \
@@ -492,29 +725,35 @@ COMMONOBJS = \
                mimecmn.o \
                module.o \
                mstream.o \
+               nbkbase.o \
                object.o \
-               objstrm.o \
+               odbc.o \
                paper.o \
+               popupcmn.o \
                prntbase.o \
                process.o \
                protocol.o \
                quantize.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 \
@@ -528,117 +767,10 @@ 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 \
-               cshelp.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 \
-               effects.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 \
-               imagxpm.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 \
-               quantize.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 \
-               treebase.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
-
-# Not included for Mac OS X
-#              gridg.o
 GENERICOBJS = \
                busyinfo.o \
                calctrl.o \
@@ -649,14 +781,14 @@ GENERICOBJS = \
                dirctrlg.o \
                dirdlgg.o \
                dragimgg.o \
-               filedlgg.o \
+               fdrepdlg.o \
                fontdlgg.o \
                grid.o \
+               gridctrl.o \
                gridsel.o \
                helpext.o \
                helphtml.o \
                helpwxht.o \
-               helpxlp.o \
                imaglist.o \
                laywin.o \
                listctrl.o \
@@ -671,7 +803,8 @@ GENERICOBJS = \
                propform.o \
                proplist.o \
                sashwin.o \
-               scrolwin.o \
+               scrlwing.o \
+               spinctlg.o \
                splash.o \
                splitter.o \
                statusbr.o \
@@ -684,52 +817,16 @@ GENERICOBJS = \
                treelay.o \
                wizard.o
 
-GENERICDEPS = \
-               busyinfo.d \
-               calctrl.d \
-               caret.d \
-               choicdgg.d \
-               colrdlgg.d \
-               dcpsg.d \
-               dirctrlg.d \
-               grid.d \
-               gridsel.d \
-               helpext.d \
-               helphtml.d \
-               helpwxht.d \
-               helpxlp.d \
-               imaglist.d \
-               laywin.d \
-               listctrl.d \
-               logg.d \
-               msgdlgg.d \
-               numdlgg.d \
-               panelg.d \
-               printps.d \
-               prntdlgg.d \
-               progdlgg.d \
-               prop.d \
-               propform.d \
-               proplist.d \
-               sashwin.d \
-               scrolwin.d \
-               splash.d \
-               splitter.d \
-               statusbr.d \
-               tbarsmpl.d \
-               textdlgg.d \
-               tipdlg.d \
-               treectlg.d \
-               treelay.d \
-               wizard.d
-
-# Not included for Mac OS X
-#              dirmac.o
-#              filedlg.o
-#              notebook.o
-#              statline.o
-#              treectrl.o
 GUIOBJS = \
+               DirectoryCopy.o \
+               FSpCompat.o \
+               FileCopy.o \
+               FullPath.o \
+               IterateDirectory.o \
+               MoreDesktopMgr.o \
+               MoreFiles.o \
+               MoreFilesExtras.o \
+               Search.o \
                accel.o \
                aga.o \
                app.o \
@@ -754,8 +851,10 @@ GUIOBJS = \
                dcprint.o \
                dcscreen.o \
                dialog.o \
-               dir.o \
+               dirdlg.o \
+               dirmac.o \
                dnd.o \
+               filedlg.o \
                font.o \
                fontdlg.o \
                fontenum.o \
@@ -768,7 +867,6 @@ GUIOBJS = \
                joystick.o \
                listbox.o \
                macnotfy.o \
-               main.o \
                mdi.o \
                menu.o \
                menuitem.o \
@@ -790,7 +888,6 @@ GUIOBJS = \
                settings.o \
                slider.o \
                spinbutt.o \
-               spinctrl.o \
                statbmp.o \
                statbox.o \
                statbrma.o \
@@ -803,95 +900,16 @@ GUIOBJS = \
                timer.o \
                toolbar.o \
                tooltip.o \
+               toplevel.o \
                uma.o \
                utils.o \
                utilsexc.o \
                wave.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
-
-# Not included for Mac OS X
-#              dir.o
-#              fontenum.o
-#              fontutil.o
-#              gsocket.o
-#              mimetype.o
-#              threadpsx.o
 UNIXOBJS = \
-               dialup.o \
-               utilsunx.o \
-               dl_macosx.o
-
-UNIXDEPS = \
-               dialup.d \
-               dir.d \
-               fontenum.d \
-               fontutil.d \
-               gsocket.d \
-               mimetype.d \
-               threadpsx.d \
-               utilsunx.d \
-               dl_macosx.d
+               snglinst.o \
+               utilsunx.o
 
 HTMLOBJS = \
                helpctrl.o \
@@ -912,28 +930,11 @@ 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
-
+MACRESOURCES = \
+               apprsrc.r \
+               carbrsrc.r \
+               corersrc.r