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 508bdee46c9efa0d9822fabbada6d788c9b7f1ab..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/gridctrl.cpp \
                generic/gridsel.cpp \
                generic/helpext.cpp \

-               generic/helphtml.cpp \

                generic/imaglist.cpp \
                generic/laywin.cpp \
                generic/listctrl.cpp \
                generic/imaglist.cpp \
                generic/laywin.cpp \
                generic/listctrl.cpp \


@@ -43,7 +42,6 @@ ALL_SOURCES = \
                generic/tipdlg.cpp \
                generic/tipwin.cpp \
                generic/treectlg.cpp \
                generic/tipdlg.cpp \
                generic/tipwin.cpp \
                generic/treectlg.cpp \

-               generic/treelay.cpp \

                generic/wizard.cpp \
                common/accesscmn.cpp \
                common/appcmn.cpp \
                generic/wizard.cpp \
                common/accesscmn.cpp \
                common/appcmn.cpp \


@@ -61,6 +59,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 \


@@ -154,6 +153,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 \


@@ -178,7 +178,6 @@ ALL_SOURCES = \
                common/zstream.cpp \
                motif/accel.cpp \
                motif/app.cpp \
                common/zstream.cpp \
                motif/accel.cpp \
                motif/app.cpp \

-               motif/bitmap.cpp \

                motif/bmpbuttn.cpp \
                motif/bmpmotif.cpp \
                motif/button.cpp \
                motif/bmpbuttn.cpp \
                motif/bmpmotif.cpp \
                motif/button.cpp \


@@ -217,7 +216,6 @@ ALL_SOURCES = \
                motif/palette.cpp \
                motif/radiobox.cpp \
                motif/radiobut.cpp \
                motif/palette.cpp \
                motif/radiobox.cpp \
                motif/radiobut.cpp \

-               motif/region.cpp \

                motif/scrolbar.cpp \
                motif/settings.cpp \
                motif/slider.cpp \
                motif/scrolbar.cpp \
                motif/settings.cpp \
                motif/slider.cpp \


@@ -231,8 +229,11 @@ ALL_SOURCES = \
                motif/toplevel.cpp \
                motif/utils.cpp \
                motif/window.cpp \
                motif/toplevel.cpp \
                motif/utils.cpp \
                motif/window.cpp \

+               x11/bitmap.cpp \

                x11/brush.cpp \
                x11/pen.cpp \
                x11/brush.cpp \
                x11/pen.cpp \

+               x11/region.cpp \
+               x11/utilsx.cpp \

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


@@ -240,6 +241,7 @@ 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/utilsx11.cpp \
                unix/threadpsx.cpp \
                unix/utilsunx.cpp \
                unix/utilsx11.cpp \


@@ -365,7 +367,6 @@ ALL_HEADERS = \
                hashmap.h \
                help.h \
                helpbase.h \
                hashmap.h \
                help.h \
                helpbase.h \

-               helphtml.h \

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


@@ -505,7 +506,6 @@ ALL_HEADERS = \
                zstream.h \
                motif/accel.h \
                motif/app.h \
                zstream.h \
                motif/accel.h \
                motif/app.h \

-               motif/bitmap.h \

                motif/bmpbuttn.h \
                motif/bmpmotif.h \
                motif/button.h \
                motif/bmpbuttn.h \
                motif/bmpmotif.h \
                motif/button.h \


@@ -519,6 +519,7 @@ ALL_HEADERS = \
                motif/cursor.h \
                motif/dataform.h \
                motif/dataobj.h \
                motif/cursor.h \
                motif/dataform.h \
                motif/dataobj.h \

+               motif/dataobj2.h \

                motif/dc.h \
                motif/dcclient.h \
                motif/dcmemory.h \
                motif/dc.h \
                motif/dcclient.h \
                motif/dcmemory.h \


@@ -544,7 +545,6 @@ ALL_HEADERS = \
                motif/private.h \
                motif/radiobox.h \
                motif/radiobut.h \
                motif/private.h \
                motif/radiobox.h \
                motif/radiobut.h \

-               motif/region.h \

                motif/scrolbar.h \
                motif/settings.h \
                motif/slider.h \
                motif/scrolbar.h \
                motif/settings.h \
                motif/slider.h \


@@ -574,7 +574,6 @@ ALL_HEADERS = \
                generic/gridctrl.h \
                generic/gridg.h \
                generic/helpext.h \
                generic/gridctrl.h \
                generic/gridg.h \
                generic/helpext.h \

-               generic/helphtml.h \

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


@@ -602,6 +601,7 @@ ALL_HEADERS = \
                unix/fontutil.h \
                unix/gsockunx.h \
                unix/mimetype.h \
                unix/fontutil.h \
                unix/gsockunx.h \
                unix/mimetype.h \

+               unix/taskbarx11.h \

                unix/utilsx11.h \
                html/forcelnk.h \
                html/helpctrl.h \
                unix/utilsx11.h \
                html/forcelnk.h \
                html/helpctrl.h \


@@ -620,8 +620,11 @@ ALL_HEADERS = \
                protocol/ftp.h \
                protocol/http.h \
                protocol/protocol.h \
                protocol/ftp.h \
                protocol/http.h \
                protocol/protocol.h \

+               x11/bitmap.h \

                x11/brush.h \
                x11/brush.h \

-               x11/pen.h
+               x11/pen.h \
+               x11/privx.h \
+               x11/region.h

 
 COMMONOBJS = \
                accesscmn.o \
 
 COMMONOBJS = \
                accesscmn.o \


@@ -640,6 +643,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 \


@@ -733,6 +737,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 \


@@ -773,7 +778,6 @@ GENERICOBJS = \
                gridctrl.o \
                gridsel.o \
                helpext.o \
                gridctrl.o \
                gridsel.o \
                helpext.o \

-               helphtml.o \

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


@@ -799,14 +803,12 @@ GENERICOBJS = \
                tipdlg.o \
                tipwin.o \
                treectlg.o \
                tipdlg.o \
                tipwin.o \
                treectlg.o \

-               treelay.o \

                wizard.o
 
 GUIOBJS = \
                xmcombo.o \
                accel.o \
                app.o \
                wizard.o
 
 GUIOBJS = \
                xmcombo.o \
                accel.o \
                app.o \

-               bitmap.o \

                bmpbuttn.o \
                bmpmotif.o \
                button.o \
                bmpbuttn.o \
                bmpmotif.o \
                button.o \


@@ -845,7 +847,6 @@ GUIOBJS = \
                palette.o \
                radiobox.o \
                radiobut.o \
                palette.o \
                radiobox.o \
                radiobut.o \

-               region.o \

                scrolbar.o \
                settings.o \
                slider.o \
                scrolbar.o \
                settings.o \
                slider.o \


@@ -859,8 +860,11 @@ GUIOBJS = \
                toplevel.o \
                utils.o \
                window.o \
                toplevel.o \
                utils.o \
                window.o \

+               bitmap.o \

                brush.o \
                brush.o \

-               pen.o
+               pen.o \
+               region.o \
+               utilsx.o

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


@@ -870,6 +874,7 @@ UNIXOBJS = \
                gsocket.o \
                mimetype.o \
                snglinst.o \
                gsocket.o \
                mimetype.o \
                snglinst.o \

+               taskbarx11.o \

                threadpsx.o \
                utilsunx.o \
                utilsx11.o
                threadpsx.o \
                utilsunx.o \
                utilsx11.o