regenerated from tmake templates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/files.lst b/src/files.lst
index 0546b8fd3fbc6825f311a7676b0c14c2a81b74fc..c65328e9baa5214c09105a913eec364b91fd9cf2 100644 (file)
--- a/src/files.lst
+++ b/src/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:20, 2001/02/08
+# This file was automatically generated by tmake at 18:20, 2001/05/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
 ALL_SOURCES = \
                common/init.cpp \
@@ -7,6 +7,9 @@ ALL_SOURCES = \
                common/config.cpp \
                common/datetime.cpp \
                common/datstrm.cpp \
+               common/db.cpp \
+               common/dbtable.cpp \
+               common/dircmn.cpp \
                common/dynarray.cpp \
                common/dynlib.cpp \
                common/encconv.cpp \
@@ -30,6 +33,7 @@ ALL_SOURCES = \
                common/list.cpp \
                common/log.cpp \
                common/longlong.cpp \
+               common/memory.cpp \
                common/mimecmn.cpp \
                common/module.cpp \
                common/mstream.cpp \
@@ -75,6 +79,8 @@ ALL_HEADERS = \
                datetime.h \
                datetime.inl \
                datstrm.h \
+               db.h \
+               dbtable.h \
                dde.h \
                debug.h \
                defs.h \
@@ -151,6 +157,9 @@ BASE_OBJS = \
                config.o \
                datetime.o \
                datstrm.o \
+               db.o \
+               dbtable.o \
+               dircmn.o \
                dynarray.o \
                dynlib.o \
                encconv.o \
@@ -174,6 +183,7 @@ BASE_OBJS = \
                list.o \
                log.o \
                longlong.o \
+               memory.o \
                mimecmn.o \
                module.o \
                mstream.o \
@@ -210,6 +220,9 @@ BASE_DEPS = \
                config.d \
                datetime.d \
                datstrm.d \
+               db.d \
+               dbtable.d \
+               dircmn.d \
                dynarray.d \
                dynlib.d \
                encconv.d \
@@ -233,6 +246,7 @@ BASE_DEPS = \
                list.d \
                log.d \
                longlong.d \
+               memory.d \
                mimecmn.d \
                module.d \
                mstream.d \
@@ -276,6 +290,9 @@ BASE_DEPS = \
                config.d \
                datetime.d \
                datstrm.d \
+               db.d \
+               dbtable.d \
+               dircmn.d \
                dynarray.d \
                dynlib.d \
                encconv.d \
@@ -299,6 +316,7 @@ BASE_DEPS = \
                list.d \
                log.d \
                longlong.d \
+               memory.d \
                mimecmn.d \
                module.d \
                mstream.d \

diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index 7146561693c488edb0408f65ca36b91a5b3d4306..6cba3b8e682df374086236791fe5f8680348a80f 100644 (file)
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:44, 2001/05/09
+# This file was automatically generated by tmake at 18:20, 2001/05/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -12,6 +12,7 @@ ALL_SOURCES = \
                generic/dragimgg.cpp \
                generic/filedlgg.cpp \
                generic/grid.cpp \
+               generic/gridctrl.cpp \
                generic/gridsel.cpp \
                generic/helpext.cpp \
                generic/helphtml.cpp \
@@ -56,6 +57,7 @@ ALL_SOURCES = \
                common/db.cpp \
                common/dbtable.cpp \
                common/dcbase.cpp \
+               common/dircmn.cpp \
                common/dlgcmn.cpp \
                common/dndcmn.cpp \
                common/dobjcmn.cpp \
@@ -318,6 +320,7 @@ ALL_HEADERS = \
                gifdecod.h \
                glcanvas.h \
                grid.h \
+               gridctrl.h \
                gsocket.h \
                hash.h \
                help.h \
@@ -523,6 +526,7 @@ ALL_HEADERS = \
                generic/filedlgg.h \
                generic/fontdlgg.h \
                generic/grid.h \
+               generic/gridctrl.h \
                generic/gridg.h \
                generic/helpext.h \
                generic/helphtml.h \
@@ -585,6 +589,7 @@ COMMONOBJS = \
                db.o \
                dbtable.o \
                dcbase.o \
+               dircmn.o \
                dlgcmn.o \
                dndcmn.o \
                dobjcmn.o \
@@ -694,6 +699,7 @@ COMMONDEPS = \
                db.d \
                dbtable.d \
                dcbase.d \
+               dircmn.d \
                dlgcmn.d \
                dndcmn.d \
                dobjcmn.d \
@@ -799,6 +805,7 @@ GENERICOBJS = \
                dragimgg.o \
                filedlgg.o \
                grid.o \
+               gridctrl.o \
                gridsel.o \
                helpext.o \
                helphtml.o \
@@ -842,6 +849,7 @@ GENERICDEPS = \
                dragimgg.d \
                filedlgg.d \
                grid.d \
+               gridctrl.d \
                gridsel.d \
                helpext.d \
                helphtml.d \

diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst
index 7146561693c488edb0408f65ca36b91a5b3d4306..6cba3b8e682df374086236791fe5f8680348a80f 100644 (file)
--- a/src/gtk1/files.lst
+++ b/src/gtk1/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:44, 2001/05/09
+# This file was automatically generated by tmake at 18:20, 2001/05/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -12,6 +12,7 @@ ALL_SOURCES = \
                generic/dragimgg.cpp \
                generic/filedlgg.cpp \
                generic/grid.cpp \
+               generic/gridctrl.cpp \
                generic/gridsel.cpp \
                generic/helpext.cpp \
                generic/helphtml.cpp \
@@ -56,6 +57,7 @@ ALL_SOURCES = \
                common/db.cpp \
                common/dbtable.cpp \
                common/dcbase.cpp \
+               common/dircmn.cpp \
                common/dlgcmn.cpp \
                common/dndcmn.cpp \
                common/dobjcmn.cpp \
@@ -318,6 +320,7 @@ ALL_HEADERS = \
                gifdecod.h \
                glcanvas.h \
                grid.h \
+               gridctrl.h \
                gsocket.h \
                hash.h \
                help.h \
@@ -523,6 +526,7 @@ ALL_HEADERS = \
                generic/filedlgg.h \
                generic/fontdlgg.h \
                generic/grid.h \
+               generic/gridctrl.h \
                generic/gridg.h \
                generic/helpext.h \
                generic/helphtml.h \
@@ -585,6 +589,7 @@ COMMONOBJS = \
                db.o \
                dbtable.o \
                dcbase.o \
+               dircmn.o \
                dlgcmn.o \
                dndcmn.o \
                dobjcmn.o \
@@ -694,6 +699,7 @@ COMMONDEPS = \
                db.d \
                dbtable.d \
                dcbase.d \
+               dircmn.d \
                dlgcmn.d \
                dndcmn.d \
                dobjcmn.d \
@@ -799,6 +805,7 @@ GENERICOBJS = \
                dragimgg.o \
                filedlgg.o \
                grid.o \
+               gridctrl.o \
                gridsel.o \
                helpext.o \
                helphtml.o \
@@ -842,6 +849,7 @@ GENERICDEPS = \
                dragimgg.d \
                filedlgg.d \
                grid.d \
+               gridctrl.d \
                gridsel.d \
                helpext.d \
                helphtml.d \

diff --git a/src/motif/files.lst b/src/motif/files.lst
index 7d281c481cba0c4571926ed6cb7aa004188aa5f6..aa1ab5f71c28af907d409c52e0a94f256375a811 100644 (file)
--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:44, 2001/05/09
+# This file was automatically generated by tmake at 18:20, 2001/05/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -12,6 +12,7 @@ ALL_SOURCES = \
                generic/dragimgg.cpp \
                generic/fontdlgg.cpp \
                generic/grid.cpp \
+               generic/gridctrl.cpp \
                generic/gridsel.cpp \
                generic/helpext.cpp \
                generic/helphtml.cpp \
@@ -59,6 +60,7 @@ ALL_SOURCES = \
                common/db.cpp \
                common/dbtable.cpp \
                common/dcbase.cpp \
+               common/dircmn.cpp \
                common/dlgcmn.cpp \
                common/dndcmn.cpp \
                common/dobjcmn.cpp \
@@ -314,6 +316,7 @@ ALL_HEADERS = \
                gifdecod.h \
                glcanvas.h \
                grid.h \
+               gridctrl.h \
                gsocket.h \
                hash.h \
                help.h \
@@ -518,6 +521,7 @@ ALL_HEADERS = \
                generic/filedlgg.h \
                generic/fontdlgg.h \
                generic/grid.h \
+               generic/gridctrl.h \
                generic/gridg.h \
                generic/helpext.h \
                generic/helphtml.h \
@@ -580,6 +584,7 @@ COMMONOBJS = \
                db.o \
                dbtable.o \
                dcbase.o \
+               dircmn.o \
                dlgcmn.o \
                dndcmn.o \
                dobjcmn.o \
@@ -689,6 +694,7 @@ COMMONDEPS = \
                db.d \
                dbtable.d \
                dcbase.d \
+               dircmn.d \
                dlgcmn.d \
                dndcmn.d \
                dobjcmn.d \
@@ -794,6 +800,7 @@ GENERICOBJS = \
                dragimgg.o \
                fontdlgg.o \
                grid.o \
+               gridctrl.o \
                gridsel.o \
                helpext.o \
                helphtml.o \
@@ -840,6 +847,7 @@ GENERICDEPS = \
                dragimgg.d \
                fontdlgg.d \
                grid.d \
+               gridctrl.d \
                gridsel.d \
                helpext.d \
                helphtml.d \

diff --git a/src/msw/files.lst b/src/msw/files.lst
index 28072701e094b8ebabc971e374a80325bde80722..b7a5c6c7d1ae98437e8fec435230fa1ee2527c33 100644 (file)
--- a/src/msw/files.lst
+++ b/src/msw/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:55, 2001/05/18
+# This file was automatically generated by tmake at 18:20, 2001/05/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
@@ -7,6 +7,7 @@ ALL_SOURCES = \
                generic/dirctrlg.cpp \
                generic/dragimgg.cpp \
                generic/grid.cpp \
+               generic/gridctrl.cpp \
                generic/gridsel.cpp \
                generic/laywin.cpp \
                generic/logg.cpp \
@@ -42,6 +43,7 @@ ALL_SOURCES = \
                common/db.cpp \
                common/dbtable.cpp \
                common/dcbase.cpp \
+               common/dircmn.cpp \
                common/dlgcmn.cpp \
                common/dndcmn.cpp \
                common/dobjcmn.cpp \
@@ -337,6 +339,7 @@ ALL_HEADERS = \
                gifdecod.h \
                glcanvas.h \
                grid.h \
+               gridctrl.h \
                gsocket.h \
                hash.h \
                help.h \
@@ -572,6 +575,7 @@ ALL_HEADERS = \
                generic/filedlgg.h \
                generic/fontdlgg.h \
                generic/grid.h \
+               generic/gridctrl.h \
                generic/gridg.h \
                generic/helpext.h \
                generic/helphtml.h \
@@ -634,6 +638,7 @@ COMMONOBJS = \
                db.o \
                dbtable.o \
                dcbase.o \
+               dircmn.o \
                dlgcmn.o \
                dndcmn.o \
                dobjcmn.o \
@@ -743,6 +748,7 @@ COMMONDEPS = \
                db.d \
                dbtable.d \
                dcbase.d \
+               dircmn.d \
                dlgcmn.d \
                dndcmn.d \
                dobjcmn.d \
@@ -843,6 +849,7 @@ GENERICOBJS = \
                dirctrlg.o \
                dragimgg.o \
                grid.o \
+               gridctrl.o \
                gridsel.o \
                laywin.o \
                logg.o \
@@ -872,6 +879,7 @@ GENERICDEPS = \
                dirctrlg.d \
                dragimgg.d \
                grid.d \
+               gridctrl.d \
                gridsel.d \
                laywin.d \
                logg.d \

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index e4646be2ff8a99fd16fb653672beddb3a88041e9..d641cf2cea67b7631d0f7dd99799214b6760e65e 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 00:44, 2001/05/09
+# This file was automatically generated by tmake at 18:20, 2001/05/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -49,6 +49,7 @@ PERIPH_TARGET=ctl3d $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
 !endif
 
+#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
 PERIPH_LIBS=
 PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET)
@@ -76,6 +77,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\dirctrlg.obj \
                $(MSWDIR)\dragimgg.obj \
                $(MSWDIR)\grid.obj \
+               $(MSWDIR)\gridctrl.obj \
                $(MSWDIR)\gridsel.obj \
                $(MSWDIR)\laywin.obj \
                $(MSWDIR)\logg.obj \
@@ -125,6 +127,7 @@ COMMONOBJS = \
                $(MSWDIR)\db.obj \
                $(MSWDIR)\dbtable.obj \
                $(MSWDIR)\dcbase.obj \
+               $(MSWDIR)\dircmn.obj \
                $(MSWDIR)\dlgcmn.obj \
                $(MSWDIR)\dndcmn.obj \
                $(MSWDIR)\dobjcmn.obj \
@@ -370,12 +373,15 @@ nul
 $(PERIPH_LIBS) $(LIBS)
 wxb32
 !
+       -erase $(WXLIBDIR)\version.res
+        brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
         implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
 
 !endif
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+version.res
 
 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 
@@ -626,6 +632,8 @@ $(MSWDIR)\dbtable.obj: $(COMMDIR)\dbtable.$(SRCSUFF)
 
 $(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
 
+$(MSWDIR)\dircmn.obj: $(COMMDIR)\dircmn.$(SRCSUFF)
+
 $(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
 
 $(MSWDIR)\dndcmn.obj: $(COMMDIR)\dndcmn.$(SRCSUFF)
@@ -830,6 +838,8 @@ $(MSWDIR)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF)
 
 $(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
 
+$(MSWDIR)\gridctrl.obj: $(GENDIR)\gridctrl.$(SRCSUFF)
+
 $(MSWDIR)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
 
 $(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index ab0e016f951a7bf694444e41248b94c28b63c3e0..7ee433465d45601e22e64d560d8f761aaf74ee17 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 00:44, 2001/05/09
+# This file was automatically generated by tmake at 18:20, 2001/05/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -73,6 +73,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\dirdlgg.obj \
                $(MSWDIR)\dragimgg.obj \
                $(MSWDIR)\grid.obj \
+               $(MSWDIR)\gridctrl.obj \
                $(MSWDIR)\gridsel.obj \
                $(MSWDIR)\imaglist.obj \
                $(MSWDIR)\laywin.obj \
@@ -114,6 +115,7 @@ COMMONOBJS = \
                $(MSWDIR)\datetime.obj \
                $(MSWDIR)\datstrm.obj \
                $(MSWDIR)\dcbase.obj \
+               $(MSWDIR)\dircmn.obj \
                $(MSWDIR)\dlgcmn.obj \
                $(MSWDIR)\dndcmn.obj \
                $(MSWDIR)\dobjcmn.obj \
@@ -146,6 +148,7 @@ COMMONOBJS = \
                $(MSWDIR)\imagbmp.obj \
                $(MSWDIR)\image.obj \
                $(MSWDIR)\imaggif.obj \
+               $(MSWDIR)\imagxpm.obj \
                $(MSWDIR)\intl.obj \
                $(MSWDIR)\ipcbase.obj \
                $(MSWDIR)\layout.obj \
@@ -499,6 +502,8 @@ $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
 
 $(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
 
+$(MSWDIR)\dircmn.obj: $(COMMDIR)\dircmn.$(SRCSUFF)
+
 $(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
 
 $(MSWDIR)\dndcmn.obj: $(COMMDIR)\dndcmn.$(SRCSUFF)
@@ -563,6 +568,8 @@ $(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
 
 $(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
 
+$(MSWDIR)\imagxpm.obj: $(COMMDIR)\imagxpm.$(SRCSUFF)
+
 $(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
 
 $(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
@@ -671,6 +678,8 @@ $(MSWDIR)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF)
 
 $(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
 
+$(MSWDIR)\gridctrl.obj: $(GENDIR)\gridctrl.$(SRCSUFF)
+
 $(MSWDIR)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
 
 $(MSWDIR)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF)

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index f2247e551d817b7fbaf92055fddb5d651548c330..6ac12fa84d6c6685a554d045c676bea0ed7d9cff 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:44, 2001/05/09
+# This file was automatically generated by tmake at 18:20, 2001/05/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -56,6 +56,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\dirdlgg.obj \
                $(GENDIR)\dragimgg.obj \
                $(GENDIR)\grid.obj \
+               $(GENDIR)\gridctrl.obj \
                $(GENDIR)\gridsel.obj \
                $(GENDIR)\imaglist.obj \
                $(GENDIR)\laywin.obj \
@@ -98,6 +99,7 @@ COMMONOBJS1 = \
                $(COMMDIR)\datetime.obj \
                $(COMMDIR)\datstrm.obj \
                $(COMMDIR)\dcbase.obj \
+               $(COMMDIR)\dircmn.obj \
                $(COMMDIR)\dlgcmn.obj \
                $(COMMDIR)\dndcmn.obj \
                $(COMMDIR)\dobjcmn.obj \
@@ -804,6 +806,11 @@ $(COMMDIR)/dcbase.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/dircmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/dlgcmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1224,6 +1231,11 @@ $(GENDIR)/grid.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/gridctrl.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/gridsel.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 18b92106520663972b02704ca9b00ce25369f554..ae10387ffc83ba0bf7a5c1599e082bfe63f510c6 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:44, 2001/05/09
+# This file was automatically generated by tmake at 18:20, 2001/05/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -25,7 +25,7 @@ WXDLL = $(WXDIR)/lib/wx$(WXVERSION).dll
 WXDEF = wx$(WXVERSION).def
 DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
                  $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
-                     $(WXDIR)/lib/libtiff.a
+                    $(WXDIR)/lib/libtiff.a
 DLL_LDFLAGS = -L$(WXDIR)/lib
 DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
              -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
@@ -73,6 +73,7 @@ GENERICOBJS = \
                $(GENDIR)/dirctrlg.$(OBJSUFF) \
                $(GENDIR)/dragimgg.$(OBJSUFF) \
                $(GENDIR)/grid.$(OBJSUFF) \
+               $(GENDIR)/gridctrl.$(OBJSUFF) \
                $(GENDIR)/gridsel.$(OBJSUFF) \
                $(GENDIR)/laywin.$(OBJSUFF) \
                $(GENDIR)/logg.$(OBJSUFF) \
@@ -111,6 +112,7 @@ COMMONOBJS  = \
                $(COMMDIR)/db.$(OBJSUFF) \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \
+               $(COMMDIR)/dircmn.$(OBJSUFF) \
                $(COMMDIR)/dlgcmn.$(OBJSUFF) \
                $(COMMDIR)/dndcmn.$(OBJSUFF) \
                $(COMMDIR)/dobjcmn.$(OBJSUFF) \

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 2d4e6ed4827b4755b429cddef29d35374d45e023..37e24f27933a1654cffe1a5402c1e6b1e09d1c88 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 00:44, 2001/05/09
+# This file was automatically generated by tmake at 18:20, 2001/05/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -22,7 +22,6 @@ OPTIONS=
 
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
-XPMDIR=$(WXDIR)\src\xpm
 OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
@@ -32,6 +31,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\dirctrlg.obj \
                $(GENDIR)\dragimgg.obj \
                $(GENDIR)\grid.obj \
+               $(GENDIR)\gridctrl.obj \
                $(GENDIR)\gridsel.obj \
                $(GENDIR)\laywin.obj \
                $(GENDIR)\logg.obj \
@@ -70,6 +70,7 @@ COMMONOBJS = \
                $(COMMDIR)\db.obj \
                $(COMMDIR)\dbtable.obj \
                $(COMMDIR)\dcbase.obj \
+               $(COMMDIR)\dircmn.obj \
                $(COMMDIR)\dlgcmn.obj \
                $(COMMDIR)\dndcmn.obj \
                $(COMMDIR)\dobjcmn.obj \
@@ -266,20 +267,8 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\wave.obj \
                $(MSWDIR)\window.obj
 
-XPMOBJECTS =   $(XPMDIR)\crbuffri.obj\
-               $(XPMDIR)\crdatfri.obj\
-               $(XPMDIR)\create.obj $(XPMDIR)\crifrbuf.obj\
-               $(XPMDIR)\crifrdat.obj\
-               $(XPMDIR)\data.obj\
-               $(XPMDIR)\hashtab.obj $(XPMDIR)\misc.obj\
-               $(XPMDIR)\parse.obj $(XPMDIR)\rdftodat.obj\
-               $(XPMDIR)\rdftoi.obj\
-               $(XPMDIR)\rgb.obj $(XPMDIR)\scan.obj\
-               $(XPMDIR)\simx.obj $(XPMDIR)\wrffrdat.obj\
-               $(XPMDIR)\wrffrp.obj $(XPMDIR)\wrffri.obj
-
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # $(XPMOBJECTS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 all: $(LIBTARGET)
 

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index e3b0479255bf45f61e38b0ce078e694e188cd228..35f0b0f0f84b86fac54049c3156a6b2fdc2596b0 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 00:44, 2001/05/09
+# This file was automatically generated by tmake at 18:20, 2001/05/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -89,6 +89,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
                ..\generic\$D\dirctrlg.obj \
                ..\generic\$D\dragimgg.obj \
                ..\generic\$D\grid.obj \
+               ..\generic\$D\gridctrl.obj \
                ..\generic\$D\gridsel.obj \
                ..\generic\$D\laywin.obj \
                ..\generic\$D\logg.obj \
@@ -149,6 +150,7 @@ COMMONOBJS = \
                ..\common\$D\db.obj \
                ..\common\$D\dbtable.obj \
                ..\common\$D\dcbase.obj \
+               ..\common\$D\dircmn.obj \
                ..\common\$D\dlgcmn.obj \
                ..\common\$D\dndcmn.obj \
                ..\common\$D\dobjcmn.obj \
@@ -464,7 +466,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
     $(LINKFLAGS)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
-    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib  $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
+    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
        delayimp.lib
        /delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
        /delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 43e5b5ce18a6b45726b5f5c2eae3c51eadfd2550..54eb3129e0317f6bb68de2ebe50b207422d52404 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 00:44, 2001/05/09
+# This file was automatically generated by tmake at 18:20, 2001/05/27
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -29,11 +29,10 @@ LIBTARGET   = $(WXLIB)\wx.lib
 DUMMY=dummydll
 # ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
 
-EXTRATARGETS = xpm png zlib jpeg tiff
-EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib clean_jpeg clean_tiff
+EXTRATARGETS = png zlib jpeg tiff
+EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
-XPMDIR=$(WXDIR)\src\xpm
 JPEGDIR=$(WXDIR)\src\jpeg
 TIFFDIR=$(WXDIR)\src\tiff
 MSWDIR=$(WXDIR)\src\msw
@@ -47,6 +46,7 @@ GENERICOBJS= busyinfo.obj &
        dirctrlg.obj &
        dragimgg.obj &
        grid.obj &
+       gridctrl.obj &
        gridsel.obj &
        laywin.obj &
        logg.obj &
@@ -107,6 +107,7 @@ COMMONOBJS = &
        db.obj &
        dbtable.obj &
        dcbase.obj &
+       dircmn.obj &
        dlgcmn.obj &
        dndcmn.obj &
        dobjcmn.obj &
@@ -694,6 +695,9 @@ dbtable.obj:     $(COMMDIR)\dbtable.cpp
 dcbase.obj:     $(COMMDIR)\dcbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dircmn.obj:     $(COMMDIR)\dircmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dlgcmn.obj:     $(COMMDIR)\dlgcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1008,6 +1012,9 @@ dragimgg.obj:     $(GENDIR)\dragimgg.cpp
 grid.obj:     $(GENDIR)\grid.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+gridctrl.obj:     $(GENDIR)\gridctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 gridsel.obj:     $(GENDIR)\gridsel.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1073,73 +1080,6 @@ wizard.obj:     $(GENDIR)\wizard.cpp
 
 
 
-crbuffri.obj: $(XPMDIR)\crbuffri.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-crbuffrp.obj: $(XPMDIR)\crbuffrp.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-crdatfri.obj: $(XPMDIR)\crdatfri.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-crdatfrp.obj: $(XPMDIR)\crdatfrp.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-create.obj: $(XPMDIR)\create.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-crifrbuf.obj: $(XPMDIR)\crifrbuf.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-crifrdat.obj: $(XPMDIR)\crifrdat.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-crpfrbuf.obj: $(XPMDIR)\crpfrbuf.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-crpfrdat.obj: $(XPMDIR)\crpfrdat.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-# TODO: what to do about this clash of filename????
-#data.obj: $(XPMDIR)\data.c
-#  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-hashtab.obj: $(XPMDIR)\hashtab.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-misc.obj: $(XPMDIR)\misc.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-parse.obj: $(XPMDIR)\parse.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-rdftodat.obj: $(XPMDIR)\rdftodat.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-rdftoi.obj: $(XPMDIR)\rdftoi.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-rdftop.obj: $(XPMDIR)\rdftop.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-rgb.obj: $(XPMDIR)\rgb.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-scan.obj: $(XPMDIR)\scan.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-simx.obj: $(XPMDIR)\simx.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-wrffrdat.obj: $(XPMDIR)\wrffrdat.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-wrffri.obj: $(XPMDIR)\wrffri.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-wrffrp.obj: $(XPMDIR)\wrffrp.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
   trees$(O)
 OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
@@ -1189,16 +1129,6 @@ uncompr.obj: uncompr.c zlib.h zconf.h
 zutil.obj: zutil.c zutil.h zlib.h zconf.h
        $(CC) -c $(CFLAGS) $*.c
 
-xpm:   .SYMBOLIC
-    cd $(WXDIR)\src\xpm
-    wmake -f makefile.wat all
-    cd $(WXDIR)\src\msw
-
-clean_xpm:   .SYMBOLIC
-    cd $(WXDIR)\src\xpm
-    wmake -f makefile.wat clean
-    cd $(WXDIR)\src\msw
-
 png:   .SYMBOLIC
     cd $(WXDIR)\src\png
     wmake -f makefile.wat all