Fix cvs conflict.

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

diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index 52150b4e4f3630df2762ee1ce1519dd64305a98a..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 20:56, 2000/03/01
+# 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 \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \


@@ -7,10 +7,12 @@ ALL_SOURCES = \
                generic/choicdgg.cpp \
                generic/colrdlgg.cpp \
                generic/dcpsg.cpp \
                generic/choicdgg.cpp \
                generic/colrdlgg.cpp \
                generic/dcpsg.cpp \

+               generic/dirctrlg.cpp \

                generic/dirdlgg.cpp \
                generic/dragimgg.cpp \
                generic/filedlgg.cpp \
                generic/grid.cpp \
                generic/dirdlgg.cpp \
                generic/dragimgg.cpp \
                generic/filedlgg.cpp \
                generic/grid.cpp \

+               generic/gridsel.cpp \

                generic/helpext.cpp \
                generic/helphtml.cpp \
                generic/helpwxht.cpp \
                generic/helpext.cpp \
                generic/helphtml.cpp \
                generic/helpwxht.cpp \


@@ -20,8 +22,8 @@ ALL_SOURCES = \
                generic/logg.cpp \
                generic/msgdlgg.cpp \
                generic/numdlgg.cpp \
                generic/logg.cpp \
                generic/msgdlgg.cpp \
                generic/numdlgg.cpp \

+               generic/paletteg.cpp \

                generic/panelg.cpp \
                generic/panelg.cpp \

-               generic/plot.cpp \

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


@@ -29,14 +31,15 @@ ALL_SOURCES = \
                generic/propform.cpp \
                generic/proplist.cpp \
                generic/sashwin.cpp \
                generic/propform.cpp \
                generic/proplist.cpp \
                generic/sashwin.cpp \

-               generic/scrolwin.cpp \
+               generic/splash.cpp \

                generic/splitter.cpp \
                generic/statusbr.cpp \
                generic/tabg.cpp \
                generic/tbarsmpl.cpp \
                generic/textdlgg.cpp \
                generic/tipdlg.cpp \
                generic/splitter.cpp \
                generic/statusbr.cpp \
                generic/tabg.cpp \
                generic/tbarsmpl.cpp \
                generic/textdlgg.cpp \
                generic/tipdlg.cpp \

-               generic/treectrl.cpp \
+               generic/tipwin.cpp \
+               generic/treectlg.cpp \

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


@@ -45,6 +48,7 @@ ALL_SOURCES = \
                common/cmdline.cpp \
                common/cmndata.cpp \
                common/config.cpp \
                common/cmdline.cpp \
                common/cmndata.cpp \
                common/config.cpp \

+               common/cshelp.cpp \

                common/ctrlcmn.cpp \
                common/ctrlsub.cpp \
                common/datetime.cpp \
                common/ctrlcmn.cpp \
                common/ctrlsub.cpp \
                common/datetime.cpp \


@@ -59,6 +63,7 @@ ALL_SOURCES = \
                common/docview.cpp \
                common/dynarray.cpp \
                common/dynlib.cpp \
                common/docview.cpp \
                common/dynarray.cpp \
                common/dynlib.cpp \

+               common/effects.cpp \

                common/encconv.cpp \
                common/event.cpp \
                common/extended.c \
                common/encconv.cpp \
                common/event.cpp \
                common/extended.c \


@@ -66,6 +71,7 @@ ALL_SOURCES = \
                common/file.cpp \
                common/fileconf.cpp \
                common/filefn.cpp \
                common/file.cpp \
                common/fileconf.cpp \
                common/filefn.cpp \

+               common/filename.cpp \

                common/filesys.cpp \
                common/fontcmn.cpp \
                common/fontmap.cpp \
                common/filesys.cpp \
                common/fontcmn.cpp \
                common/fontmap.cpp \


@@ -89,6 +95,7 @@ ALL_SOURCES = \
                common/imagpng.cpp \
                common/imagpnm.cpp \
                common/imagtiff.cpp \
                common/imagpng.cpp \
                common/imagpnm.cpp \
                common/imagtiff.cpp \

+               common/imagxpm.cpp \

                common/intl.cpp \
                common/ipcbase.cpp \
                common/layout.cpp \
                common/intl.cpp \
                common/ipcbase.cpp \
                common/layout.cpp \


@@ -96,6 +103,7 @@ ALL_SOURCES = \
                common/list.cpp \
                common/log.cpp \
                common/longlong.cpp \
                common/list.cpp \
                common/log.cpp \
                common/longlong.cpp \

+               common/matrix.cpp \

                common/memory.cpp \
                common/menucmn.cpp \
                common/mimecmn.cpp \
                common/memory.cpp \
                common/menucmn.cpp \
                common/mimecmn.cpp \


@@ -107,6 +115,7 @@ ALL_SOURCES = \
                common/prntbase.cpp \
                common/process.cpp \
                common/protocol.cpp \
                common/prntbase.cpp \
                common/process.cpp \
                common/protocol.cpp \

+               common/quantize.cpp \

                common/resource.cpp \
                common/sckaddr.cpp \
                common/sckfile.cpp \
                common/resource.cpp \
                common/sckaddr.cpp \
                common/sckfile.cpp \


@@ -123,6 +132,7 @@ ALL_SOURCES = \
                common/textfile.cpp \
                common/timercmn.cpp \
                common/tokenzr.cpp \
                common/textfile.cpp \
                common/timercmn.cpp \
                common/tokenzr.cpp \

+               common/treebase.cpp \

                common/txtstrm.cpp \
                common/unzip.c \
                common/url.cpp \
                common/txtstrm.cpp \
                common/unzip.c \
                common/url.cpp \


@@ -135,6 +145,7 @@ ALL_SOURCES = \
                common/wincmn.cpp \
                common/wxchar.cpp \
                common/wxexpr.cpp \
                common/wincmn.cpp \
                common/wxchar.cpp \
                common/wxexpr.cpp \

+               common/xpmdecod.cpp \

                common/zipstrm.cpp \
                common/zstream.cpp \
                gtk/accel.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
                gtk/accel.cpp \


@@ -166,18 +177,19 @@ ALL_SOURCES = \
                gtk/gdiobj.cpp \
                gtk/gsockgtk.c \
                gtk/icon.cpp \
                gtk/gdiobj.cpp \
                gtk/gsockgtk.c \
                gtk/icon.cpp \

+               gtk/joystick.cpp \

                gtk/listbox.cpp \
                gtk/main.cpp \
                gtk/mdi.cpp \
                gtk/menu.cpp \
                gtk/minifram.cpp \
                gtk/notebook.cpp \
                gtk/listbox.cpp \
                gtk/main.cpp \
                gtk/mdi.cpp \
                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/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 \
                gtk/settings.cpp \
                gtk/slider.cpp \
                gtk/spinbutt.cpp \


@@ -188,6 +200,7 @@ ALL_SOURCES = \
                gtk/stattext.cpp \
                gtk/tbargtk.cpp \
                gtk/textctrl.cpp \
                gtk/stattext.cpp \
                gtk/tbargtk.cpp \
                gtk/textctrl.cpp \

+               gtk/tglbtn.cpp \

                gtk/timer.cpp \
                gtk/tooltip.cpp \
                gtk/utilsgtk.cpp \
                gtk/timer.cpp \
                gtk/tooltip.cpp \
                gtk/utilsgtk.cpp \


@@ -222,19 +235,7 @@ ALL_SOURCES = \
                html/m_meta.cpp \
                html/m_pre.cpp \
                html/m_tables.cpp \
                html/m_meta.cpp \
                html/m_pre.cpp \
                html/m_tables.cpp \

-               html/winpars.cpp \
-               ogl/basic.cpp \
-               ogl/basic2.cpp \
-               ogl/bmpshape.cpp \
-               ogl/canvas.cpp \
-               ogl/composit.cpp \
-               ogl/constrnt.cpp \
-               ogl/divided.cpp \
-               ogl/drawn.cpp \
-               ogl/lines.cpp \
-               ogl/mfutils.cpp \
-               ogl/ogldiag.cpp \
-               ogl/oglmisc.cpp
+               html/winpars.cpp

 
 ALL_HEADERS = \
                accel.h \
 
 ALL_HEADERS = \
                accel.h \


@@ -261,6 +262,7 @@ ALL_HEADERS = \
                confbase.h \
                config.h \
                control.h \
                confbase.h \
                config.h \
                control.h \

+               cshelp.h \

                ctrlsub.h \
                cursor.h \
                dataobj.h \
                ctrlsub.h \
                cursor.h \
                dataobj.h \


@@ -297,9 +299,11 @@ ALL_HEADERS = \
                fileconf.h \
                filedlg.h \
                filefn.h \
                fileconf.h \
                filedlg.h \
                filefn.h \

+               filename.h \

                filesys.h \
                font.h \
                fontdlg.h \
                filesys.h \
                font.h \
                fontdlg.h \

+               fontenc.h \

                fontenum.h \
                fontmap.h \
                fontutil.h \
                fontenum.h \
                fontmap.h \
                fontutil.h \


@@ -318,6 +322,7 @@ ALL_HEADERS = \
                hash.h \
                help.h \
                helpbase.h \
                hash.h \
                help.h \
                helpbase.h \

+               helpchm.h \

                helphtml.h \
                helpwin.h \
                helpxlp.h \
                helphtml.h \
                helpwin.h \
                helpxlp.h \


@@ -331,6 +336,7 @@ ALL_HEADERS = \
                imagpng.h \
                imagpnm.h \
                imagtiff.h \
                imagpng.h \
                imagpnm.h \
                imagtiff.h \

+               imagxpm.h \

                intl.h \
                ioswrap.h \
                ipcbase.h \
                intl.h \
                ioswrap.h \
                ipcbase.h \


@@ -366,7 +372,6 @@ ALL_HEADERS = \
                panel.h \
                paper.h \
                pen.h \
                panel.h \
                paper.h \
                pen.h \

-               plot.h \

                print.h \
                printdlg.h \
                prntbase.h \
                print.h \
                printdlg.h \
                prntbase.h \


@@ -393,6 +398,7 @@ ALL_HEADERS = \
                socket.h \
                spinbutt.h \
                spinctrl.h \
                socket.h \
                spinbutt.h \
                spinctrl.h \

+               splash.h \

                splitter.h \
                statbmp.h \
                statbox.h \
                splitter.h \
                statbmp.h \
                statbox.h \


@@ -410,13 +416,16 @@ ALL_HEADERS = \
                textctrl.h \
                textdlg.h \
                textfile.h \
                textctrl.h \
                textdlg.h \
                textfile.h \

+               tglbtn.h \

                thread.h \
                time.h \
                timer.h \
                tipdlg.h \
                thread.h \
                time.h \
                timer.h \
                tipdlg.h \

+               tipwin.h \

                tokenzr.h \
                toolbar.h \
                tooltip.h \
                tokenzr.h \
                toolbar.h \
                tooltip.h \

+               treebase.h \

                treectrl.h \
                txtstrm.h \
                types.h \
                treectrl.h \
                txtstrm.h \
                types.h \


@@ -439,7 +448,7 @@ ALL_HEADERS = \
                wxexpr.h \
                wxhtml.h \
                wxprec.h \
                wxexpr.h \
                wxhtml.h \
                wxprec.h \

-               xpmhand.h \
+               xpmdecod.h \

                zipstrm.h \
                zstream.h \
                gtk/accel.h \
                zipstrm.h \
                zstream.h \
                gtk/accel.h \


@@ -480,12 +489,12 @@ ALL_HEADERS = \
                gtk/menuitem.h \
                gtk/minifram.h \
                gtk/notebook.h \
                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/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 \
                gtk/settings.h \
                gtk/slider.h \
                gtk/spinbutt.h \


@@ -496,6 +505,7 @@ ALL_HEADERS = \
                gtk/stattext.h \
                gtk/tbargtk.h \
                gtk/textctrl.h \
                gtk/stattext.h \
                gtk/tbargtk.h \
                gtk/textctrl.h \

+               gtk/tglbtn.h \

                gtk/timer.h \
                gtk/tooltip.h \
                gtk/treectrl.h \
                gtk/timer.h \
                gtk/tooltip.h \
                gtk/treectrl.h \


@@ -507,6 +517,7 @@ ALL_HEADERS = \
                generic/choicdgg.h \
                generic/colrdlgg.h \
                generic/dcpsg.h \
                generic/choicdgg.h \
                generic/colrdlgg.h \
                generic/dcpsg.h \

+               generic/dirctrlg.h \

                generic/dirdlgg.h \
                generic/dragimgg.h \
                generic/filedlgg.h \
                generic/dirdlgg.h \
                generic/dragimgg.h \
                generic/filedlgg.h \


@@ -522,18 +533,19 @@ ALL_HEADERS = \
                generic/listctrl.h \
                generic/msgdlgg.h \
                generic/notebook.h \
                generic/listctrl.h \
                generic/msgdlgg.h \
                generic/notebook.h \

+               generic/paletteg.h \

                generic/panelg.h \
                generic/panelg.h \

-               generic/plot.h \

                generic/printps.h \
                generic/prntdlgg.h \
                generic/progdlgg.h \
                generic/sashwin.h \
                generic/scrolwin.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 \
                generic/textdlgg.h \
                generic/splitter.h \
                generic/statusbr.h \
                generic/tabg.h \
                generic/textdlgg.h \

-               generic/treectrl.h \
+               generic/treectlg.h \

                generic/wizard.h \
                unix/execute.h \
                unix/fontutil.h \
                generic/wizard.h \
                unix/execute.h \
                unix/fontutil.h \


@@ -552,21 +564,6 @@ ALL_HEADERS = \
                html/htmprint.h \
                html/m_templ.h \
                html/winpars.h \
                html/htmprint.h \
                html/m_templ.h \
                html/winpars.h \

-               ogl/basic.h \
-               ogl/basicp.h \
-               ogl/bmpshape.h \
-               ogl/canvas.h \
-               ogl/composit.h \
-               ogl/constrnt.h \
-               ogl/divided.h \
-               ogl/drawn.h \
-               ogl/drawnp.h \
-               ogl/lines.h \
-               ogl/linesp.h \
-               ogl/mfutils.h \
-               ogl/misc.h \
-               ogl/ogl.h \
-               ogl/ogldiag.h \

                protocol/file.h \
                protocol/ftp.h \
                protocol/http.h \
                protocol/file.h \
                protocol/ftp.h \
                protocol/http.h \


@@ -580,6 +577,7 @@ COMMONOBJS = \
                cmdline.o \
                cmndata.o \
                config.o \
                cmdline.o \
                cmndata.o \
                config.o \

+               cshelp.o \

                ctrlcmn.o \
                ctrlsub.o \
                datetime.o \
                ctrlcmn.o \
                ctrlsub.o \
                datetime.o \


@@ -594,6 +592,7 @@ COMMONOBJS = \
                docview.o \
                dynarray.o \
                dynlib.o \
                docview.o \
                dynarray.o \
                dynlib.o \

+               effects.o \

                encconv.o \
                event.o \
                extended.o \
                encconv.o \
                event.o \
                extended.o \


@@ -601,6 +600,7 @@ COMMONOBJS = \
                file.o \
                fileconf.o \
                filefn.o \
                file.o \
                fileconf.o \
                filefn.o \

+               filename.o \

                filesys.o \
                fontcmn.o \
                fontmap.o \
                filesys.o \
                fontcmn.o \
                fontmap.o \


@@ -624,6 +624,7 @@ COMMONOBJS = \
                imagpng.o \
                imagpnm.o \
                imagtiff.o \
                imagpng.o \
                imagpnm.o \
                imagtiff.o \

+               imagxpm.o \

                intl.o \
                ipcbase.o \
                layout.o \
                intl.o \
                ipcbase.o \
                layout.o \


@@ -631,6 +632,7 @@ COMMONOBJS = \
                list.o \
                log.o \
                longlong.o \
                list.o \
                log.o \
                longlong.o \

+               matrix.o \

                memory.o \
                menucmn.o \
                mimecmn.o \
                memory.o \
                menucmn.o \
                mimecmn.o \


@@ -642,6 +644,7 @@ COMMONOBJS = \
                prntbase.o \
                process.o \
                protocol.o \
                prntbase.o \
                process.o \
                protocol.o \

+               quantize.o \

                resource.o \
                sckaddr.o \
                sckfile.o \
                resource.o \
                sckaddr.o \
                sckfile.o \


@@ -658,6 +661,7 @@ COMMONOBJS = \
                textfile.o \
                timercmn.o \
                tokenzr.o \
                textfile.o \
                timercmn.o \
                tokenzr.o \

+               treebase.o \

                txtstrm.o \
                unzip.o \
                url.o \
                txtstrm.o \
                unzip.o \
                url.o \


@@ -670,6 +674,7 @@ COMMONOBJS = \
                wincmn.o \
                wxchar.o \
                wxexpr.o \
                wincmn.o \
                wxchar.o \
                wxexpr.o \

+               xpmdecod.o \

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


@@ -681,6 +686,7 @@ COMMONDEPS = \
                cmdline.d \
                cmndata.d \
                config.d \
                cmdline.d \
                cmndata.d \
                config.d \

+               cshelp.d \

                ctrlcmn.d \
                ctrlsub.d \
                datetime.d \
                ctrlcmn.d \
                ctrlsub.d \
                datetime.d \


@@ -695,6 +701,7 @@ COMMONDEPS = \
                docview.d \
                dynarray.d \
                dynlib.d \
                docview.d \
                dynarray.d \
                dynlib.d \

+               effects.d \

                encconv.d \
                event.d \
                extended.d \
                encconv.d \
                event.d \
                extended.d \


@@ -702,6 +709,7 @@ COMMONDEPS = \
                file.d \
                fileconf.d \
                filefn.d \
                file.d \
                fileconf.d \
                filefn.d \

+               filename.d \

                filesys.d \
                fontcmn.d \
                fontmap.d \
                filesys.d \
                fontcmn.d \
                fontmap.d \


@@ -725,6 +733,7 @@ COMMONDEPS = \
                imagpng.d \
                imagpnm.d \
                imagtiff.d \
                imagpng.d \
                imagpnm.d \
                imagtiff.d \

+               imagxpm.d \

                intl.d \
                ipcbase.d \
                layout.d \
                intl.d \
                ipcbase.d \
                layout.d \


@@ -732,6 +741,7 @@ COMMONDEPS = \
                list.d \
                log.d \
                longlong.d \
                list.d \
                log.d \
                longlong.d \

+               matrix.d \

                memory.d \
                menucmn.d \
                mimecmn.d \
                memory.d \
                menucmn.d \
                mimecmn.d \


@@ -743,6 +753,7 @@ COMMONDEPS = \
                prntbase.d \
                process.d \
                protocol.d \
                prntbase.d \
                process.d \
                protocol.d \

+               quantize.d \

                resource.d \
                sckaddr.d \
                sckfile.d \
                resource.d \
                sckaddr.d \
                sckfile.d \


@@ -759,6 +770,7 @@ COMMONDEPS = \
                textfile.d \
                timercmn.d \
                tokenzr.d \
                textfile.d \
                timercmn.d \
                tokenzr.d \

+               treebase.d \

                txtstrm.d \
                unzip.d \
                url.d \
                txtstrm.d \
                unzip.d \
                url.d \


@@ -771,6 +783,7 @@ COMMONDEPS = \
                wincmn.d \
                wxchar.d \
                wxexpr.d \
                wincmn.d \
                wxchar.d \
                wxexpr.d \

+               xpmdecod.d \

                zipstrm.d \
                zstream.d
 
                zipstrm.d \
                zstream.d
 


@@ -781,10 +794,12 @@ GENERICOBJS = \
                choicdgg.o \
                colrdlgg.o \
                dcpsg.o \
                choicdgg.o \
                colrdlgg.o \
                dcpsg.o \

+               dirctrlg.o \

                dirdlgg.o \
                dragimgg.o \
                filedlgg.o \
                grid.o \
                dirdlgg.o \
                dragimgg.o \
                filedlgg.o \
                grid.o \

+               gridsel.o \

                helpext.o \
                helphtml.o \
                helpwxht.o \
                helpext.o \
                helphtml.o \
                helpwxht.o \


@@ -794,8 +809,8 @@ GENERICOBJS = \
                logg.o \
                msgdlgg.o \
                numdlgg.o \
                logg.o \
                msgdlgg.o \
                numdlgg.o \

+               paletteg.o \

                panelg.o \
                panelg.o \

-               plot.o \

                printps.o \
                prntdlgg.o \
                progdlgg.o \
                printps.o \
                prntdlgg.o \
                progdlgg.o \


@@ -803,14 +818,15 @@ GENERICOBJS = \
                propform.o \
                proplist.o \
                sashwin.o \
                propform.o \
                proplist.o \
                sashwin.o \

-               scrolwin.o \
+               splash.o \

                splitter.o \
                statusbr.o \
                tabg.o \
                tbarsmpl.o \
                textdlgg.o \
                tipdlg.o \
                splitter.o \
                statusbr.o \
                tabg.o \
                tbarsmpl.o \
                textdlgg.o \
                tipdlg.o \

-               treectrl.o \
+               tipwin.o \
+               treectlg.o \

                treelay.o \
                wizard.o
 
                treelay.o \
                wizard.o
 


@@ -821,10 +837,12 @@ GENERICDEPS = \
                choicdgg.d \
                colrdlgg.d \
                dcpsg.d \
                choicdgg.d \
                colrdlgg.d \
                dcpsg.d \

+               dirctrlg.d \

                dirdlgg.d \
                dragimgg.d \
                filedlgg.d \
                grid.d \
                dirdlgg.d \
                dragimgg.d \
                filedlgg.d \
                grid.d \

+               gridsel.d \

                helpext.d \
                helphtml.d \
                helpwxht.d \
                helpext.d \
                helphtml.d \
                helpwxht.d \


@@ -834,8 +852,8 @@ GENERICDEPS = \
                logg.d \
                msgdlgg.d \
                numdlgg.d \
                logg.d \
                msgdlgg.d \
                numdlgg.d \

+               paletteg.d \

                panelg.d \
                panelg.d \

-               plot.d \

                printps.d \
                prntdlgg.d \
                progdlgg.d \
                printps.d \
                prntdlgg.d \
                progdlgg.d \


@@ -843,14 +861,15 @@ GENERICDEPS = \
                propform.d \
                proplist.d \
                sashwin.d \
                propform.d \
                proplist.d \
                sashwin.d \

-               scrolwin.d \
+               splash.d \

                splitter.d \
                statusbr.d \
                tabg.d \
                tbarsmpl.d \
                textdlgg.d \
                tipdlg.d \
                splitter.d \
                statusbr.d \
                tabg.d \
                tbarsmpl.d \
                textdlgg.d \
                tipdlg.d \

-               treectrl.d \
+               tipwin.d \
+               treectlg.d \

                treelay.d \
                wizard.d
 
                treelay.d \
                wizard.d
 


@@ -884,18 +903,19 @@ GUIOBJS = \
                gdiobj.o \
                gsockgtk.o \
                icon.o \
                gdiobj.o \
                gsockgtk.o \
                icon.o \

+               joystick.o \

                listbox.o \
                main.o \
                mdi.o \
                menu.o \
                minifram.o \
                notebook.o \
                listbox.o \
                main.o \
                mdi.o \
                menu.o \
                minifram.o \
                notebook.o \

-               palette.o \

                pen.o \
                radiobox.o \
                radiobut.o \
                region.o \
                scrolbar.o \
                pen.o \
                radiobox.o \
                radiobut.o \
                region.o \
                scrolbar.o \

+               scrolwin.o \

                settings.o \
                slider.o \
                spinbutt.o \
                settings.o \
                slider.o \
                spinbutt.o \


@@ -906,6 +926,7 @@ GUIOBJS = \
                stattext.o \
                tbargtk.o \
                textctrl.o \
                stattext.o \
                tbargtk.o \
                textctrl.o \

+               tglbtn.o \

                timer.o \
                tooltip.o \
                utilsgtk.o \
                timer.o \
                tooltip.o \
                utilsgtk.o \


@@ -944,18 +965,19 @@ GUIDEPS = \
                gdiobj.d \
                gsockgtk.d \
                icon.d \
                gdiobj.d \
                gsockgtk.d \
                icon.d \

+               joystick.d \

                listbox.d \
                main.d \
                mdi.d \
                menu.d \
                minifram.d \
                notebook.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 \
                pen.d \
                radiobox.d \
                radiobut.d \
                region.d \
                scrolbar.d \

+               scrolwin.d \

                settings.d \
                slider.d \
                spinbutt.d \
                settings.d \
                slider.d \
                spinbutt.d \


@@ -966,6 +988,7 @@ GUIDEPS = \
                stattext.d \
                tbargtk.d \
                textctrl.d \
                stattext.d \
                tbargtk.d \
                textctrl.d \

+               tglbtn.d \

                timer.d \
                tooltip.d \
                utilsgtk.d \
                timer.d \
                tooltip.d \
                utilsgtk.d \


@@ -1038,31 +1061,3 @@ HTMLDEPS = \
                m_tables.d \
                winpars.d
 
                m_tables.d \
                winpars.d
 

-OGLOBJS = \
-               basic.o \
-               basic2.o \
-               bmpshape.o \
-               canvas.o \
-               composit.o \
-               constrnt.o \
-               divided.o \
-               drawn.o \
-               lines.o \
-               mfutils.o \
-               ogldiag.o \
-               oglmisc.o
-
-OGLDEPS = \
-               basic.d \
-               basic2.d \
-               bmpshape.d \
-               canvas.d \
-               composit.d \
-               constrnt.d \
-               divided.d \
-               drawn.d \
-               lines.d \
-               mfutils.d \
-               ogldiag.d \
-               oglmisc.d
-