compilation fix for Mac and reformatted the code

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

diff --git a/src/motif/files.lst b/src/motif/files.lst
index 1823467ad89c89ce35737eff8072634ccd157b42..91ad6317f6bcc6475aa304f61cafaf3fa2983aa5 100644 (file)
--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@@ -17,7 +17,6 @@ ALL_SOURCES = \
                generic/gridctrl.cpp \
                generic/gridsel.cpp \
                generic/helpext.cpp \
-               generic/helphtml.cpp \
                generic/imaglist.cpp \
                generic/laywin.cpp \
                generic/listctrl.cpp \
@@ -30,9 +29,6 @@ ALL_SOURCES = \
                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 \
@@ -46,7 +42,6 @@ ALL_SOURCES = \
                generic/tipdlg.cpp \
                generic/tipwin.cpp \
                generic/treectlg.cpp \
-               generic/treelay.cpp \
                generic/wizard.cpp \
                common/accesscmn.cpp \
                common/appcmn.cpp \
@@ -64,6 +59,7 @@ ALL_SOURCES = \
                common/cshelp.cpp \
                common/ctrlcmn.cpp \
                common/ctrlsub.cpp \
+               common/datacmn.cpp \
                common/datetime.cpp \
                common/datstrm.cpp \
                common/db.cpp \
@@ -144,7 +140,7 @@ ALL_SOURCES = \
                common/quantize.cpp \
                common/radiocmn.cpp \
                common/regex.cpp \
-               common/resource.cpp \
+               common/rgncmn.cpp \
                common/sckaddr.cpp \
                common/sckfile.cpp \
                common/sckipc.cpp \
@@ -157,6 +153,7 @@ ALL_SOURCES = \
                common/stream.cpp \
                common/string.cpp \
                common/sysopt.cpp \
+               common/taskbarcmn.cpp \
                common/tbarbase.cpp \
                common/textbuf.cpp \
                common/textcmn.cpp \
@@ -176,14 +173,13 @@ ALL_SOURCES = \
                common/wfstream.cpp \
                common/wincmn.cpp \
                common/wxchar.cpp \
-               common/wxexpr.cpp \
                common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
                motif/accel.cpp \
                motif/app.cpp \
-               motif/bitmap.cpp \
                motif/bmpbuttn.cpp \
+               motif/bmpmotif.cpp \
                motif/button.cpp \
                motif/checkbox.cpp \
                motif/checklst.cpp \
@@ -210,7 +206,6 @@ ALL_SOURCES = \
                motif/glcanvas.cpp \
                motif/gsockmot.c \
                motif/icon.cpp \
-               motif/joystick.cpp \
                motif/listbox.cpp \
                motif/main.cpp \
                motif/mdi.cpp \
@@ -221,7 +216,6 @@ ALL_SOURCES = \
                motif/palette.cpp \
                motif/radiobox.cpp \
                motif/radiobut.cpp \
-               motif/region.cpp \
                motif/scrolbar.cpp \
                motif/settings.cpp \
                motif/slider.cpp \
@@ -235,8 +229,11 @@ ALL_SOURCES = \
                motif/toplevel.cpp \
                motif/utils.cpp \
                motif/window.cpp \
+               x11/bitmap.cpp \
                x11/brush.cpp \
                x11/pen.cpp \
+               x11/region.cpp \
+               x11/utilsx.cpp \
                unix/dialup.cpp \
                unix/dir.cpp \
                unix/fontenum.cpp \
@@ -244,6 +241,7 @@ ALL_SOURCES = \
                unix/gsocket.c \
                unix/mimetype.cpp \
                unix/snglinst.cpp \
+               unix/taskbarx11.cpp \
                unix/threadpsx.cpp \
                unix/utilsunx.cpp \
                unix/utilsx11.cpp \
@@ -305,7 +303,6 @@ ALL_HEADERS = \
                ctrlsub.h \
                cursor.h \
                dataobj.h \
-               date.h \
                datetime.h \
                datetime.inl \
                datstrm.h \
@@ -339,7 +336,6 @@ ALL_HEADERS = \
                effects.h \
                encconv.h \
                event.h \
-               expr.h \
                fdrepdlg.h \
                features.h \
                ffile.h \
@@ -371,7 +367,6 @@ ALL_HEADERS = \
                hashmap.h \
                help.h \
                helpbase.h \
-               helphtml.h \
                helpwin.h \
                icon.h \
                iconbndl.h \
@@ -420,7 +415,6 @@ ALL_HEADERS = \
                mstream.h \
                notebook.h \
                object.h \
-               odbc.h \
                ownerdrw.h \
                palette.h \
                panel.h \
@@ -433,16 +427,12 @@ ALL_HEADERS = \
                prntbase.h \
                process.h \
                progdlg.h \
-               prop.h \
-               propform.h \
-               proplist.h \
                quantize.h \
                radiobox.h \
                radiobut.h \
                rawbmp.h \
                regex.h \
                region.h \
-               resource.h \
                sashwin.h \
                sckaddr.h \
                sckipc.h \
@@ -480,7 +470,6 @@ ALL_HEADERS = \
                tglbtn.h \
                thread.h \
                thrimpl.cpp \
-               time.h \
                timer.h \
                tipdlg.h \
                tipwin.h \
@@ -510,7 +499,6 @@ ALL_HEADERS = \
                wx_cw_cm.h \
                wx_cw_d.h \
                wxchar.h \
-               wxexpr.h \
                wxhtml.h \
                wxprec.h \
                xpmdecod.h \
@@ -518,20 +506,20 @@ ALL_HEADERS = \
                zstream.h \
                motif/accel.h \
                motif/app.h \
-               motif/bitmap.h \
                motif/bmpbuttn.h \
+               motif/bmpmotif.h \
                motif/button.h \
                motif/checkbox.h \
                motif/checklst.h \
                motif/choice.h \
                motif/clipbrd.h \
-               motif/colordlg.h \
                motif/colour.h \
                motif/combobox.h \
                motif/control.h \
                motif/cursor.h \
                motif/dataform.h \
                motif/dataobj.h \
+               motif/dataobj2.h \
                motif/dc.h \
                motif/dcclient.h \
                motif/dcmemory.h \
@@ -541,27 +529,22 @@ ALL_HEADERS = \
                motif/dnd.h \
                motif/filedlg.h \
                motif/font.h \
-               motif/fontdlg.h \
                motif/frame.h \
                motif/gauge.h \
                motif/gdiobj.h \
                motif/glcanvas.h \
                motif/icon.h \
-               motif/joystick.h \
                motif/listbox.h \
                motif/mdi.h \
                motif/menu.h \
                motif/menuitem.h \
-               motif/metafile.h \
                motif/minifram.h \
                motif/msgdlg.h \
                motif/palette.h \
                motif/print.h \
-               motif/printdlg.h \
                motif/private.h \
                motif/radiobox.h \
                motif/radiobut.h \
-               motif/region.h \
                motif/scrolbar.h \
                motif/settings.h \
                motif/slider.h \
@@ -591,7 +574,6 @@ ALL_HEADERS = \
                generic/gridctrl.h \
                generic/gridg.h \
                generic/helpext.h \
-               generic/helphtml.h \
                generic/imaglist.h \
                generic/laywin.h \
                generic/listctrl.h \
@@ -619,6 +601,7 @@ ALL_HEADERS = \
                unix/fontutil.h \
                unix/gsockunx.h \
                unix/mimetype.h \
+               unix/taskbarx11.h \
                unix/utilsx11.h \
                html/forcelnk.h \
                html/helpctrl.h \
@@ -637,8 +620,11 @@ ALL_HEADERS = \
                protocol/ftp.h \
                protocol/http.h \
                protocol/protocol.h \
+               x11/bitmap.h \
                x11/brush.h \
-               x11/pen.h
+               x11/pen.h \
+               x11/privx.h \
+               x11/region.h
 
 COMMONOBJS = \
                accesscmn.o \
@@ -657,6 +643,7 @@ COMMONOBJS = \
                cshelp.o \
                ctrlcmn.o \
                ctrlsub.o \
+               datacmn.o \
                datetime.o \
                datstrm.o \
                db.o \
@@ -737,7 +724,7 @@ COMMONOBJS = \
                quantize.o \
                radiocmn.o \
                regex.o \
-               resource.o \
+               rgncmn.o \
                sckaddr.o \
                sckfile.o \
                sckipc.o \
@@ -750,6 +737,7 @@ COMMONOBJS = \
                stream.o \
                string.o \
                sysopt.o \
+               taskbarcmn.o \
                tbarbase.o \
                textbuf.o \
                textcmn.o \
@@ -769,7 +757,6 @@ COMMONOBJS = \
                wfstream.o \
                wincmn.o \
                wxchar.o \
-               wxexpr.o \
                xpmdecod.o \
                zipstrm.o \
                zstream.o
@@ -791,7 +778,6 @@ GENERICOBJS = \
                gridctrl.o \
                gridsel.o \
                helpext.o \
-               helphtml.o \
                imaglist.o \
                laywin.o \
                listctrl.o \
@@ -804,9 +790,6 @@ GENERICOBJS = \
                printps.o \
                prntdlgg.o \
                progdlgg.o \
-               prop.o \
-               propform.o \
-               proplist.o \
                sashwin.o \
                scrlwing.o \
                spinctlg.o \
@@ -820,15 +803,14 @@ GENERICOBJS = \
                tipdlg.o \
                tipwin.o \
                treectlg.o \
-               treelay.o \
                wizard.o
 
 GUIOBJS = \
                xmcombo.o \
                accel.o \
                app.o \
-               bitmap.o \
                bmpbuttn.o \
+               bmpmotif.o \
                button.o \
                checkbox.o \
                checklst.o \
@@ -855,7 +837,6 @@ GUIOBJS = \
                glcanvas.o \
                gsockmot.o \
                icon.o \
-               joystick.o \
                listbox.o \
                main.o \
                mdi.o \
@@ -866,7 +847,6 @@ GUIOBJS = \
                palette.o \
                radiobox.o \
                radiobut.o \
-               region.o \
                scrolbar.o \
                settings.o \
                slider.o \
@@ -880,8 +860,11 @@ GUIOBJS = \
                toplevel.o \
                utils.o \
                window.o \
+               bitmap.o \
                brush.o \
-               pen.o
+               pen.o \
+               region.o \
+               utilsx.o
 
 UNIXOBJS = \
                dialup.o \
@@ -891,6 +874,7 @@ UNIXOBJS = \
                gsocket.o \
                mimetype.o \
                snglinst.o \
+               taskbarx11.o \
                threadpsx.o \
                utilsunx.o \
                utilsx11.o