Used wxRegion code from wxX11.

[wxWidgets.git] / src / x11 / files.lst

diff --git a/src/x11/files.lst b/src/x11/files.lst
index b4ebffb14909b65a94e9cface289aee9f40c3bac..a7d9c25cf2cd1ec2f3346e209a2400b7b262e456 100644 (file)
--- a/src/x11/files.lst
+++ b/src/x11/files.lst
@@ -1,12 +1,45 @@
 # This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE X11.T!
 ALL_SOURCES = \
 # This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE X11.T!
 ALL_SOURCES = \

+               x11/app.cpp \
+               x11/bitmap.cpp \
+               x11/brush.cpp \
+               x11/clipbrd.cpp \
+               x11/colour.cpp \
+               x11/cursor.cpp \
+               x11/data.cpp \
+               x11/dataobj.cpp \
+               x11/dc.cpp \
+               x11/dcclient.cpp \
+               x11/dcmemory.cpp \
+               x11/dcscreen.cpp \
+               x11/evtloop.cpp \
+               x11/font.cpp \
+               x11/gdiobj.cpp \
+               x11/glcanvas.cpp \
+               x11/gsockx11.c \
+               x11/icon.cpp \
+               x11/joystick.cpp \
+               x11/main.cpp \
+               x11/minifram.cpp \
+               x11/nanox.c \
+               x11/palette.cpp \
+               x11/pen.cpp \
+               x11/popupwin.cpp \
+               x11/region.cpp \
+               x11/reparent.cpp \
+               x11/settings.cpp \
+               x11/toplevel.cpp \
+               x11/utils.cpp \
+               x11/utilsx.cpp \
+               x11/window.cpp \

                generic/accel.cpp \
                generic/busyinfo.cpp \
                generic/calctrl.cpp \
                generic/caret.cpp \
                generic/choicdgg.cpp \
                generic/colrdlgg.cpp \
                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/dcpsg.cpp \
                generic/dirctrlg.cpp \
                generic/dirdlgg.cpp \


@@ -18,39 +51,34 @@ ALL_SOURCES = \
                generic/gridctrl.cpp \
                generic/gridsel.cpp \
                generic/helpext.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/imaglist.cpp \
                generic/laywin.cpp \
                generic/listctrl.cpp \
                generic/logg.cpp \

+               generic/mdig.cpp \

                generic/msgdlgg.cpp \
                generic/msgdlgg.cpp \

-               generic/notebook.cpp \

                generic/numdlgg.cpp \
                generic/numdlgg.cpp \

-               generic/paletteg.cpp \

                generic/panelg.cpp \
                generic/printps.cpp \
                generic/prntdlgg.cpp \
                generic/progdlgg.cpp \
                generic/panelg.cpp \
                generic/printps.cpp \
                generic/prntdlgg.cpp \
                generic/progdlgg.cpp \

-               generic/prop.cpp \
-               generic/propform.cpp \
-               generic/proplist.cpp \

                generic/sashwin.cpp \
                generic/scrlwing.cpp \
                generic/spinctlg.cpp \
                generic/splash.cpp \
                generic/splitter.cpp \
                generic/sashwin.cpp \
                generic/scrlwing.cpp \
                generic/spinctlg.cpp \
                generic/splash.cpp \
                generic/splitter.cpp \

-               generic/statline.cpp \
-               generic/statusbr.cpp \

                generic/tabg.cpp \
                generic/tbarsmpl.cpp \
                generic/textdlgg.cpp \
                generic/tabg.cpp \
                generic/tbarsmpl.cpp \
                generic/textdlgg.cpp \

+               generic/timer.cpp \

                generic/tipdlg.cpp \
                generic/tipwin.cpp \
                generic/treectlg.cpp \
                generic/tipdlg.cpp \
                generic/tipwin.cpp \
                generic/treectlg.cpp \

-               generic/treelay.cpp \

                generic/wizard.cpp \
                generic/wizard.cpp \

+               common/accesscmn.cpp \

                common/appcmn.cpp \
                common/appcmn.cpp \

+               common/artprov.cpp \
+               common/artstd.cpp \

                common/bmpbase.cpp \
                common/choiccmn.cpp \
                common/clipcmn.cpp \
                common/bmpbase.cpp \
                common/choiccmn.cpp \
                common/clipcmn.cpp \


@@ -63,6 +91,7 @@ ALL_SOURCES = \
                common/cshelp.cpp \
                common/ctrlcmn.cpp \
                common/ctrlsub.cpp \
                common/cshelp.cpp \
                common/ctrlcmn.cpp \
                common/ctrlsub.cpp \

+               common/datacmn.cpp \

                common/datetime.cpp \
                common/datstrm.cpp \
                common/db.cpp \
                common/datetime.cpp \
                common/datstrm.cpp \
                common/db.cpp \


@@ -75,6 +104,7 @@ ALL_SOURCES = \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \

+               common/dpycmn.cpp \

                common/dseldlg.cpp \
                common/dynarray.cpp \
                common/dynlib.cpp \
                common/dseldlg.cpp \
                common/dynarray.cpp \
                common/dynlib.cpp \


@@ -105,9 +135,11 @@ ALL_SOURCES = \
                common/hashmap.cpp \
                common/helpbase.cpp \
                common/http.cpp \
                common/hashmap.cpp \
                common/helpbase.cpp \
                common/http.cpp \

+               common/iconbndl.cpp \

                common/imagall.cpp \
                common/imagbmp.cpp \
                common/image.cpp \
                common/imagall.cpp \
                common/imagbmp.cpp \
                common/image.cpp \

+               common/imagfill.cpp \

                common/imaggif.cpp \
                common/imagiff.cpp \
                common/imagjpeg.cpp \
                common/imaggif.cpp \
                common/imagiff.cpp \
                common/imagjpeg.cpp \


@@ -128,10 +160,10 @@ ALL_SOURCES = \
                common/menucmn.cpp \
                common/mimecmn.cpp \
                common/module.cpp \
                common/menucmn.cpp \
                common/mimecmn.cpp \
                common/module.cpp \

+               common/msgout.cpp \

                common/mstream.cpp \
                common/nbkbase.cpp \
                common/object.cpp \
                common/mstream.cpp \
                common/nbkbase.cpp \
                common/object.cpp \

-               common/odbc.cpp \

                common/paper.cpp \
                common/popupcmn.cpp \
                common/prntbase.cpp \
                common/paper.cpp \
                common/popupcmn.cpp \
                common/prntbase.cpp \


@@ -140,11 +172,12 @@ ALL_SOURCES = \
                common/quantize.cpp \
                common/radiocmn.cpp \
                common/regex.cpp \
                common/quantize.cpp \
                common/radiocmn.cpp \
                common/regex.cpp \

-               common/resource.cpp \
+               common/rgncmn.cpp \

                common/sckaddr.cpp \
                common/sckfile.cpp \
                common/sckipc.cpp \
                common/sckstrm.cpp \
                common/sckaddr.cpp \
                common/sckfile.cpp \
                common/sckipc.cpp \
                common/sckstrm.cpp \

+               common/settcmn.cpp \

                common/sizer.cpp \
                common/socket.cpp \
                common/statbar.cpp \
                common/sizer.cpp \
                common/socket.cpp \
                common/statbar.cpp \


@@ -152,6 +185,7 @@ ALL_SOURCES = \
                common/stream.cpp \
                common/string.cpp \
                common/sysopt.cpp \
                common/stream.cpp \
                common/string.cpp \
                common/sysopt.cpp \

+               common/taskbarcmn.cpp \

                common/tbarbase.cpp \
                common/textbuf.cpp \
                common/textcmn.cpp \
                common/tbarbase.cpp \
                common/textbuf.cpp \
                common/textcmn.cpp \


@@ -171,40 +205,9 @@ ALL_SOURCES = \
                common/wfstream.cpp \
                common/wincmn.cpp \
                common/wxchar.cpp \
                common/wfstream.cpp \
                common/wincmn.cpp \
                common/wxchar.cpp \

-               common/wxexpr.cpp \

                common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
                common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \

-               x11/accel.cpp \
-               x11/app.cpp \
-               x11/bitmap.cpp \
-               x11/brush.cpp \
-               x11/clipbrd.cpp \
-               x11/colour.cpp \
-               x11/cursor.cpp \
-               x11/data.cpp \
-               x11/dataobj.cpp \
-               x11/dc.cpp \
-               x11/dcclient.cpp \
-               x11/dcmemory.cpp \
-               x11/dcscreen.cpp \
-               x11/font.cpp \
-               x11/gdiobj.cpp \
-               x11/glcanvas.cpp \
-               x11/gsockx11.c \
-               x11/icon.cpp \
-               x11/joystick.cpp \
-               x11/main.cpp \
-               x11/minifram.cpp \
-               x11/palette.cpp \
-               x11/pen.cpp \
-               x11/region.cpp \
-               x11/settings.cpp \
-               x11/timer.cpp \
-               x11/toolbar.cpp \
-               x11/toplevel.cpp \
-               x11/utils.cpp \
-               x11/window.cpp \

                unix/dialup.cpp \
                unix/dir.cpp \
                unix/fontenum.cpp \
                unix/dialup.cpp \
                unix/dir.cpp \
                unix/fontenum.cpp \


@@ -212,8 +215,10 @@ ALL_SOURCES = \
                unix/gsocket.c \
                unix/mimetype.cpp \
                unix/snglinst.cpp \
                unix/gsocket.c \
                unix/mimetype.cpp \
                unix/snglinst.cpp \

+               unix/taskbarx11.cpp \

                unix/threadpsx.cpp \
                unix/utilsunx.cpp \
                unix/threadpsx.cpp \
                unix/utilsunx.cpp \

+               unix/utilsx11.cpp \

                html/helpctrl.cpp \
                html/helpdata.cpp \
                html/helpfrm.cpp \
                html/helpctrl.cpp \
                html/helpdata.cpp \
                html/helpfrm.cpp \


@@ -230,7 +235,6 @@ ALL_SOURCES = \
                html/m_layout.cpp \
                html/m_links.cpp \
                html/m_list.cpp \
                html/m_layout.cpp \
                html/m_links.cpp \
                html/m_list.cpp \

-               html/m_meta.cpp \

                html/m_pre.cpp \
                html/m_style.cpp \
                html/m_tables.cpp \
                html/m_pre.cpp \
                html/m_style.cpp \
                html/m_tables.cpp \


@@ -238,12 +242,15 @@ ALL_SOURCES = \
 
 ALL_HEADERS = \
                accel.h \
 
 ALL_HEADERS = \
                accel.h \

+               access.h \

                app.h \
                arrimpl.cpp \
                app.h \
                arrimpl.cpp \

+               artprov.h \

                bitmap.h \
                bmpbuttn.h \
                brush.h \
                buffer.h \
                bitmap.h \
                bmpbuttn.h \
                brush.h \
                buffer.h \

+               build.h \

                busyinfo.h \
                button.h \
                calctrl.h \
                busyinfo.h \
                button.h \
                calctrl.h \


@@ -269,7 +276,6 @@ ALL_HEADERS = \
                ctrlsub.h \
                cursor.h \
                dataobj.h \
                ctrlsub.h \
                cursor.h \
                dataobj.h \

-               date.h \

                datetime.h \
                datetime.inl \
                datstrm.h \
                datetime.h \
                datetime.inl \
                datstrm.h \


@@ -278,6 +284,7 @@ ALL_HEADERS = \
                dbkeyg.h \
                dbtable.h \
                dc.h \
                dbkeyg.h \
                dbtable.h \
                dc.h \

+               dcbuffer.h \

                dcclient.h \
                dcmemory.h \
                dcprint.h \
                dcclient.h \
                dcmemory.h \
                dcprint.h \


@@ -291,6 +298,7 @@ ALL_HEADERS = \
                dir.h \
                dirctrl.h \
                dirdlg.h \
                dir.h \
                dirctrl.h \
                dirdlg.h \

+               display.h \

                dnd.h \
                docmdi.h \
                docview.h \
                dnd.h \
                docmdi.h \
                docview.h \


@@ -298,10 +306,11 @@ ALL_HEADERS = \
                dynarray.h \
                dynlib.h \
                dynload.h \
                dynarray.h \
                dynlib.h \
                dynload.h \

+               effects.h \

                encconv.h \
                event.h \
                encconv.h \
                event.h \

-               expr.h \

                fdrepdlg.h \
                fdrepdlg.h \

+               features.h \

                ffile.h \
                file.h \
                fileconf.h \
                ffile.h \
                file.h \
                fileconf.h \


@@ -331,9 +340,9 @@ ALL_HEADERS = \
                hashmap.h \
                help.h \
                helpbase.h \
                hashmap.h \
                help.h \
                helpbase.h \

-               helphtml.h \

                helpwin.h \
                icon.h \
                helpwin.h \
                icon.h \

+               iconbndl.h \

                imagbmp.h \
                image.h \
                imaggif.h \
                imagbmp.h \
                image.h \
                imaggif.h \


@@ -346,7 +355,9 @@ ALL_HEADERS = \
                imagtiff.h \
                imagxpm.h \
                intl.h \
                imagtiff.h \
                imagxpm.h \
                intl.h \

+               iosfwrap.h \

                ioswrap.h \
                ioswrap.h \

+               ipc.h \

                ipcbase.h \
                isql.h \
                isqlext.h \
                ipcbase.h \
                isql.h \
                isqlext.h \


@@ -354,11 +365,13 @@ ALL_HEADERS = \
                layout.h \
                laywin.h \
                list.h \
                layout.h \
                laywin.h \
                list.h \

+               listbase.h \

                listbox.h \
                listctrl.h \
                listimpl.cpp \
                log.h \
                longlong.h \
                listbox.h \
                listctrl.h \
                listimpl.cpp \
                log.h \
                longlong.h \

+               math.h \

                matrix.h \
                mdi.h \
                memconf.h \
                matrix.h \
                mdi.h \
                memconf.h \


@@ -371,10 +384,10 @@ ALL_HEADERS = \
                minifram.h \
                module.h \
                msgdlg.h \
                minifram.h \
                module.h \
                msgdlg.h \

+               msgout.h \

                mstream.h \
                notebook.h \
                object.h \
                mstream.h \
                notebook.h \
                object.h \

-               odbc.h \

                ownerdrw.h \
                palette.h \
                panel.h \
                ownerdrw.h \
                palette.h \
                panel.h \


@@ -387,14 +400,12 @@ ALL_HEADERS = \
                prntbase.h \
                process.h \
                progdlg.h \
                prntbase.h \
                process.h \
                progdlg.h \

-               prop.h \
-               propform.h \
-               proplist.h \
+               quantize.h \

                radiobox.h \
                radiobut.h \
                radiobox.h \
                radiobut.h \

+               rawbmp.h \

                regex.h \
                region.h \
                regex.h \
                region.h \

-               resource.h \

                sashwin.h \
                sckaddr.h \
                sckipc.h \
                sashwin.h \
                sckaddr.h \
                sckipc.h \


@@ -431,7 +442,7 @@ ALL_HEADERS = \
                textfile.h \
                tglbtn.h \
                thread.h \
                textfile.h \
                tglbtn.h \
                thread.h \

-               time.h \
+               thrimpl.cpp \

                timer.h \
                tipdlg.h \
                tipwin.h \
                timer.h \
                tipdlg.h \
                tipwin.h \


@@ -451,6 +462,7 @@ ALL_HEADERS = \
                variant.h \
                vector.h \
                version.h \
                variant.h \
                vector.h \
                version.h \

+               volume.h \

                wave.h \
                wfstream.h \
                window.h \
                wave.h \
                wfstream.h \
                window.h \


@@ -460,13 +472,11 @@ ALL_HEADERS = \
                wx_cw_cm.h \
                wx_cw_d.h \
                wxchar.h \
                wx_cw_cm.h \
                wx_cw_d.h \
                wxchar.h \

-               wxexpr.h \

                wxhtml.h \
                wxprec.h \
                xpmdecod.h \
                zipstrm.h \
                zstream.h \
                wxhtml.h \
                wxprec.h \
                xpmdecod.h \
                zipstrm.h \
                zstream.h \

-               x11/accel.h \

                x11/app.h \
                x11/bitmap.h \
                x11/brush.h \
                x11/app.h \
                x11/bitmap.h \
                x11/brush.h \


@@ -475,6 +485,7 @@ ALL_HEADERS = \
                x11/cursor.h \
                x11/dataform.h \
                x11/dataobj.h \
                x11/cursor.h \
                x11/dataform.h \
                x11/dataobj.h \

+               x11/dataobj2.h \

                x11/dc.h \
                x11/dcclient.h \
                x11/dcmemory.h \
                x11/dc.h \
                x11/dcclient.h \
                x11/dcmemory.h \


@@ -491,12 +502,50 @@ ALL_HEADERS = \
                x11/pen.h \
                x11/print.h \
                x11/private.h \
                x11/pen.h \
                x11/print.h \
                x11/private.h \

+               x11/privx.h \

                x11/region.h \
                x11/region.h \

-               x11/settings.h \
-               x11/timer.h \
-               x11/toolbar.h \
+               x11/reparent.h \
+               x11/textctrl.h \

                x11/toplevel.h \
                x11/window.h \
                x11/toplevel.h \
                x11/window.h \

+               univ/app.h \
+               univ/bmpbuttn.h \
+               univ/button.h \
+               univ/checkbox.h \
+               univ/checklst.h \
+               univ/choice.h \
+               univ/colschem.h \
+               univ/combobox.h \
+               univ/control.h \
+               univ/dialog.h \
+               univ/frame.h \
+               univ/gauge.h \
+               univ/inpcons.h \
+               univ/inphand.h \
+               univ/listbox.h \
+               univ/menu.h \
+               univ/menuitem.h \
+               univ/notebook.h \
+               univ/radiobox.h \
+               univ/radiobut.h \
+               univ/renderer.h \
+               univ/scrarrow.h \
+               univ/scrolbar.h \
+               univ/scrthumb.h \
+               univ/scrtimer.h \
+               univ/setup.h \
+               univ/slider.h \
+               univ/spinbutt.h \
+               univ/statbmp.h \
+               univ/statbox.h \
+               univ/statline.h \
+               univ/stattext.h \
+               univ/statusbr.h \
+               univ/textctrl.h \
+               univ/theme.h \
+               univ/toolbar.h \
+               univ/toplevel.h \
+               univ/window.h \

                generic/accel.h \
                generic/calctrl.h \
                generic/caret.h \
                generic/accel.h \
                generic/calctrl.h \
                generic/caret.h \


@@ -513,11 +562,10 @@ ALL_HEADERS = \
                generic/gridctrl.h \
                generic/gridg.h \
                generic/helpext.h \
                generic/gridctrl.h \
                generic/gridg.h \
                generic/helpext.h \

-               generic/helphtml.h \
-               generic/helpwxht.h \

                generic/imaglist.h \
                generic/laywin.h \
                generic/listctrl.h \
                generic/imaglist.h \
                generic/laywin.h \
                generic/listctrl.h \

+               generic/mdig.h \

                generic/msgdlgg.h \
                generic/notebook.h \
                generic/paletteg.h \
                generic/msgdlgg.h \
                generic/notebook.h \
                generic/paletteg.h \


@@ -530,15 +578,19 @@ ALL_HEADERS = \
                generic/spinctlg.h \
                generic/splash.h \
                generic/splitter.h \
                generic/spinctlg.h \
                generic/splash.h \
                generic/splitter.h \

+               generic/statline.h \

                generic/statusbr.h \
                generic/tabg.h \
                generic/textdlgg.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 \
                generic/treectlg.h \
                generic/wizard.h \
                unix/execute.h \
                unix/fontutil.h \
                unix/gsockunx.h \
                unix/mimetype.h \

+               unix/taskbarx11.h \
+               unix/utilsx11.h \

                html/forcelnk.h \
                html/helpctrl.h \
                html/helpdata.h \
                html/forcelnk.h \
                html/helpctrl.h \
                html/helpdata.h \


@@ -557,9 +609,45 @@ ALL_HEADERS = \
                protocol/http.h \
                protocol/protocol.h
 
                protocol/http.h \
                protocol/protocol.h
 

+GUI_LOWLEVEL_OBJS = \
+               app.o \
+               bitmap.o \
+               brush.o \
+               clipbrd.o \
+               colour.o \
+               cursor.o \
+               data.o \
+               dataobj.o \
+               dc.o \
+               dcclient.o \
+               dcmemory.o \
+               dcscreen.o \
+               evtloop.o \
+               font.o \
+               gdiobj.o \
+               glcanvas.o \
+               gsockx11.o \
+               icon.o \
+               joystick.o \
+               main.o \
+               minifram.o \
+               nanox.o \
+               palette.o \
+               pen.o \
+               popupwin.o \
+               region.o \
+               reparent.o \
+               settings.o \
+               toplevel.o \
+               utils.o \
+               utilsx.o \
+               window.o
+

 COMMONOBJS = \
 COMMONOBJS = \

-               parser.o \
+               accesscmn.o \

                appcmn.o \
                appcmn.o \

+               artprov.o \
+               artstd.o \

                bmpbase.o \
                choiccmn.o \
                clipcmn.o \
                bmpbase.o \
                choiccmn.o \
                clipcmn.o \


@@ -572,6 +660,7 @@ COMMONOBJS = \
                cshelp.o \
                ctrlcmn.o \
                ctrlsub.o \
                cshelp.o \
                ctrlcmn.o \
                ctrlsub.o \

+               datacmn.o \

                datetime.o \
                datstrm.o \
                db.o \
                datetime.o \
                datstrm.o \
                db.o \


@@ -584,6 +673,7 @@ COMMONOBJS = \
                dobjcmn.o \
                docmdi.o \
                docview.o \
                dobjcmn.o \
                docmdi.o \
                docview.o \

+               dpycmn.o \

                dseldlg.o \
                dynarray.o \
                dynlib.o \
                dseldlg.o \
                dynarray.o \
                dynlib.o \


@@ -614,9 +704,11 @@ COMMONOBJS = \
                hashmap.o \
                helpbase.o \
                http.o \
                hashmap.o \
                helpbase.o \
                http.o \

+               iconbndl.o \

                imagall.o \
                imagbmp.o \
                image.o \
                imagall.o \
                imagbmp.o \
                image.o \

+               imagfill.o \

                imaggif.o \
                imagiff.o \
                imagjpeg.o \
                imaggif.o \
                imagiff.o \
                imagjpeg.o \


@@ -637,10 +729,10 @@ COMMONOBJS = \
                menucmn.o \
                mimecmn.o \
                module.o \
                menucmn.o \
                mimecmn.o \
                module.o \

+               msgout.o \

                mstream.o \
                nbkbase.o \
                object.o \
                mstream.o \
                nbkbase.o \
                object.o \

-               odbc.o \

                paper.o \
                popupcmn.o \
                prntbase.o \
                paper.o \
                popupcmn.o \
                prntbase.o \


@@ -649,11 +741,12 @@ COMMONOBJS = \
                quantize.o \
                radiocmn.o \
                regex.o \
                quantize.o \
                radiocmn.o \
                regex.o \

-               resource.o \
+               rgncmn.o \

                sckaddr.o \
                sckfile.o \
                sckipc.o \
                sckstrm.o \
                sckaddr.o \
                sckfile.o \
                sckipc.o \
                sckstrm.o \

+               settcmn.o \

                sizer.o \
                socket.o \
                statbar.o \
                sizer.o \
                socket.o \
                statbar.o \


@@ -661,6 +754,7 @@ COMMONOBJS = \
                stream.o \
                string.o \
                sysopt.o \
                stream.o \
                string.o \
                sysopt.o \

+               taskbarcmn.o \

                tbarbase.o \
                textbuf.o \
                textcmn.o \
                tbarbase.o \
                textbuf.o \
                textcmn.o \


@@ -680,7 +774,6 @@ COMMONOBJS = \
                wfstream.o \
                wincmn.o \
                wxchar.o \
                wfstream.o \
                wincmn.o \
                wxchar.o \

-               wxexpr.o \

                xpmdecod.o \
                zipstrm.o \
                zstream.o
                xpmdecod.o \
                zipstrm.o \
                zstream.o


@@ -692,6 +785,7 @@ GENERICOBJS = \
                caret.o \
                choicdgg.o \
                colrdlgg.o \
                caret.o \
                choicdgg.o \
                colrdlgg.o \

+               dcbuffer.o \

                dcpsg.o \
                dirctrlg.o \
                dirdlgg.o \
                dcpsg.o \
                dirctrlg.o \
                dirdlgg.o \


@@ -703,71 +797,31 @@ GENERICOBJS = \
                gridctrl.o \
                gridsel.o \
                helpext.o \
                gridctrl.o \
                gridsel.o \
                helpext.o \

-               helphtml.o \
-               helpwxht.o \

                imaglist.o \
                laywin.o \
                listctrl.o \
                logg.o \
                imaglist.o \
                laywin.o \
                listctrl.o \
                logg.o \

+               mdig.o \

                msgdlgg.o \
                msgdlgg.o \

-               notebook.o \

                numdlgg.o \
                numdlgg.o \

-               paletteg.o \

                panelg.o \
                printps.o \
                prntdlgg.o \
                progdlgg.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 \
                sashwin.o \
                scrlwing.o \
                spinctlg.o \
                splash.o \
                splitter.o \

-               statline.o \
-               statusbr.o \

                tabg.o \
                tbarsmpl.o \
                textdlgg.o \
                tabg.o \
                tbarsmpl.o \
                textdlgg.o \

+               timer.o \

                tipdlg.o \
                tipwin.o \
                treectlg.o \
                tipdlg.o \
                tipwin.o \
                treectlg.o \

-               treelay.o \

                wizard.o
 
                wizard.o
 

-GUIOBJS = \
-               accel.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 \
-               font.o \
-               gdiobj.o \
-               glcanvas.o \
-               gsockx11.o \
-               icon.o \
-               joystick.o \
-               main.o \
-               minifram.o \
-               palette.o \
-               pen.o \
-               region.o \
-               settings.o \
-               timer.o \
-               toolbar.o \
-               toplevel.o \
-               utils.o \
-               window.o
-

 UNIXOBJS = \
                dialup.o \
                dir.o \
 UNIXOBJS = \
                dialup.o \
                dir.o \


@@ -776,8 +830,10 @@ UNIXOBJS = \
                gsocket.o \
                mimetype.o \
                snglinst.o \
                gsocket.o \
                mimetype.o \
                snglinst.o \

+               taskbarx11.o \

                threadpsx.o \
                threadpsx.o \

-               utilsunx.o
+               utilsunx.o \
+               utilsx11.o

 
 HTMLOBJS = \
                helpctrl.o \
 
 HTMLOBJS = \
                helpctrl.o \


@@ -796,7 +852,6 @@ HTMLOBJS = \
                m_layout.o \
                m_links.o \
                m_list.o \
                m_layout.o \
                m_links.o \
                m_list.o \

-               m_meta.o \

                m_pre.o \
                m_style.o \
                m_tables.o \
                m_pre.o \
                m_style.o \
                m_tables.o \