Fix cvs conflict.

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

diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index 8613937647443ada6d2a2800a2c9b4c7e141d67a..7146561693c488edb0408f65ca36b91a5b3d4306 100644 (file)
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:13, 2000/09/12
+# This file was automatically generated by tmake at 00:44, 2001/05/09
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -22,8 +22,8 @@ ALL_SOURCES = \
                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,7 +31,6 @@ ALL_SOURCES = \
                generic/propform.cpp \
                generic/proplist.cpp \
                generic/sashwin.cpp \
-               generic/scrolwin.cpp \
                generic/splash.cpp \
                generic/splitter.cpp \
                generic/statusbr.cpp \
@@ -96,6 +95,7 @@ ALL_SOURCES = \
                common/imagpng.cpp \
                common/imagpnm.cpp \
                common/imagtiff.cpp \
+               common/imagxpm.cpp \
                common/intl.cpp \
                common/ipcbase.cpp \
                common/layout.cpp \
@@ -145,6 +145,7 @@ ALL_SOURCES = \
                common/wincmn.cpp \
                common/wxchar.cpp \
                common/wxexpr.cpp \
+               common/xpmdecod.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
                gtk/accel.cpp \
@@ -183,12 +184,12 @@ ALL_SOURCES = \
                gtk/menu.cpp \
                gtk/minifram.cpp \
                gtk/notebook.cpp \
-               gtk/palette.cpp \
                gtk/pen.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 \
@@ -199,6 +200,7 @@ ALL_SOURCES = \
                gtk/stattext.cpp \
                gtk/tbargtk.cpp \
                gtk/textctrl.cpp \
+               gtk/tglbtn.cpp \
                gtk/timer.cpp \
                gtk/tooltip.cpp \
                gtk/utilsgtk.cpp \
@@ -334,6 +336,7 @@ ALL_HEADERS = \
                imagpng.h \
                imagpnm.h \
                imagtiff.h \
+               imagxpm.h \
                intl.h \
                ioswrap.h \
                ipcbase.h \
@@ -369,7 +372,6 @@ ALL_HEADERS = \
                panel.h \
                paper.h \
                pen.h \
-               plot.h \
                print.h \
                printdlg.h \
                prntbase.h \
@@ -396,6 +398,7 @@ ALL_HEADERS = \
                socket.h \
                spinbutt.h \
                spinctrl.h \
+               splash.h \
                splitter.h \
                statbmp.h \
                statbox.h \
@@ -413,6 +416,7 @@ ALL_HEADERS = \
                textctrl.h \
                textdlg.h \
                textfile.h \
+               tglbtn.h \
                thread.h \
                time.h \
                timer.h \
@@ -444,7 +448,7 @@ ALL_HEADERS = \
                wxexpr.h \
                wxhtml.h \
                wxprec.h \
-               xpmhand.h \
+               xpmdecod.h \
                zipstrm.h \
                zstream.h \
                gtk/accel.h \
@@ -485,12 +489,12 @@ ALL_HEADERS = \
                gtk/menuitem.h \
                gtk/minifram.h \
                gtk/notebook.h \
-               gtk/palette.h \
                gtk/pen.h \
                gtk/radiobox.h \
                gtk/radiobut.h \
                gtk/region.h \
                gtk/scrolbar.h \
+               gtk/scrolwin.h \
                gtk/settings.h \
                gtk/slider.h \
                gtk/spinbutt.h \
@@ -501,6 +505,7 @@ ALL_HEADERS = \
                gtk/stattext.h \
                gtk/tbargtk.h \
                gtk/textctrl.h \
+               gtk/tglbtn.h \
                gtk/timer.h \
                gtk/tooltip.h \
                gtk/treectrl.h \
@@ -528,13 +533,14 @@ ALL_HEADERS = \
                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/splash.h \
                generic/splitter.h \
                generic/statusbr.h \
                generic/tabg.h \
@@ -618,6 +624,7 @@ COMMONOBJS = \
                imagpng.o \
                imagpnm.o \
                imagtiff.o \
+               imagxpm.o \
                intl.o \
                ipcbase.o \
                layout.o \
@@ -667,6 +674,7 @@ COMMONOBJS = \
                wincmn.o \
                wxchar.o \
                wxexpr.o \
+               xpmdecod.o \
                zipstrm.o \
                zstream.o
 
@@ -725,6 +733,7 @@ COMMONDEPS = \
                imagpng.d \
                imagpnm.d \
                imagtiff.d \
+               imagxpm.d \
                intl.d \
                ipcbase.d \
                layout.d \
@@ -732,6 +741,7 @@ COMMONDEPS = \
                list.d \
                log.d \
                longlong.d \
+               matrix.d \
                memory.d \
                menucmn.d \
                mimecmn.d \
@@ -773,6 +783,7 @@ COMMONDEPS = \
                wincmn.d \
                wxchar.d \
                wxexpr.d \
+               xpmdecod.d \
                zipstrm.d \
                zstream.d
 
@@ -798,8 +809,8 @@ GENERICOBJS = \
                logg.o \
                msgdlgg.o \
                numdlgg.o \
+               paletteg.o \
                panelg.o \
-               plot.o \
                printps.o \
                prntdlgg.o \
                progdlgg.o \
@@ -807,7 +818,6 @@ GENERICOBJS = \
                propform.o \
                proplist.o \
                sashwin.o \
-               scrolwin.o \
                splash.o \
                splitter.o \
                statusbr.o \
@@ -842,8 +852,8 @@ GENERICDEPS = \
                logg.d \
                msgdlgg.d \
                numdlgg.d \
+               paletteg.d \
                panelg.d \
-               plot.d \
                printps.d \
                prntdlgg.d \
                progdlgg.d \
@@ -851,7 +861,6 @@ GENERICDEPS = \
                propform.d \
                proplist.d \
                sashwin.d \
-               scrolwin.d \
                splash.d \
                splitter.d \
                statusbr.d \
@@ -901,12 +910,12 @@ GUIOBJS = \
                menu.o \
                minifram.o \
                notebook.o \
-               palette.o \
                pen.o \
                radiobox.o \
                radiobut.o \
                region.o \
                scrolbar.o \
+               scrolwin.o \
                settings.o \
                slider.o \
                spinbutt.o \
@@ -917,6 +926,7 @@ GUIOBJS = \
                stattext.o \
                tbargtk.o \
                textctrl.o \
+               tglbtn.o \
                timer.o \
                tooltip.o \
                utilsgtk.o \
@@ -962,12 +972,12 @@ GUIDEPS = \
                menu.d \
                minifram.d \
                notebook.d \
-               palette.d \
                pen.d \
                radiobox.d \
                radiobut.d \
                region.d \
                scrolbar.d \
+               scrolwin.d \
                settings.d \
                slider.d \
                spinbutt.d \
@@ -978,6 +988,7 @@ GUIDEPS = \
                stattext.d \
                tbargtk.d \
                textctrl.d \
+               tglbtn.d \
                timer.d \
                tooltip.d \
                utilsgtk.d \