From bf84b0be84321486b6e9d67f610fa3d623987112 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 15 Dec 1999 19:40:22 +0000 Subject: [PATCH] added datetime.h/cpp to filelist and regenerated the makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 39 ++++++++++++++++++++++------------ distrib/msw/tmake/filelist.txt | 15 +++++++------ include/wx/msw/setup0.h | 37 ++++++++++++++++++++++++++------ src/msw/makefile.b32 | 15 +++++++------ src/msw/makefile.bcc | 14 ++++++++---- src/msw/makefile.dos | 26 +++++++++++++++++------ src/msw/makefile.g95 | 7 +++--- src/msw/makefile.sc | 7 +++--- src/msw/makefile.vc | 8 ++++--- src/msw/makefile.wat | 19 +++++++++++------ 10 files changed, 127 insertions(+), 60 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9ef4059f39..48148399f6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # -# This file was automatically generated by tmake at 17:53, 1999/12/09 +# This file was automatically generated by tmake at 19:00, 1999/12/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # @@ -133,6 +133,7 @@ DISTDIR = ./_dist_dir/wx$(TOOLKIT) BASE_HEADERS = \ app.h \ date.h \ + datetime.h \ debug.h \ defs.h \ dir.h \ @@ -195,6 +196,7 @@ WX_HEADERS = \ cursor.h \ dataobj.h \ date.h \ + datetime.h \ datstrm.h \ db.h \ dbtable.h \ @@ -280,7 +282,6 @@ WX_HEADERS = \ panel.h \ paper.h \ pen.h \ - pnghand.h \ print.h \ printdlg.h \ prntbase.h \ @@ -537,8 +538,6 @@ MSW_HEADERS = \ msw/notebook.h \ msw/palette.h \ msw/pen.h \ - msw/pnghand.h \ - msw/pngread.h \ msw/printdlg.h \ msw/printwin.h \ msw/private.h \ @@ -659,6 +658,7 @@ GTK_GENERICOBJS = \ splitter.o \ statusbr.o \ tabg.o \ + tbarsmpl.o \ textdlgg.o \ tipdlg.o \ treectrl.o \ @@ -694,6 +694,7 @@ GTK_GENERICDEPS = \ splitter.d \ statusbr.d \ tabg.d \ + tbarsmpl.d \ textdlgg.d \ tipdlg.d \ treectrl.d \ @@ -709,6 +710,7 @@ GTK_COMMONOBJS = \ ctrlcmn.o \ ctrlsub.o \ date.o \ + datetime.o \ datstrm.o \ db.o \ dbtable.o \ @@ -752,6 +754,7 @@ GTK_COMMONOBJS = \ lboxcmn.o \ list.o \ log.o \ + longlong.o \ memory.o \ menucmn.o \ mimetype.o \ @@ -775,7 +778,6 @@ GTK_COMMONOBJS = \ stream.o \ string.o \ tbarbase.o \ - tbarsmpl.o \ textcmn.o \ textfile.o \ time.o \ @@ -806,6 +808,7 @@ GTK_COMMONDEPS = \ ctrlcmn.d \ ctrlsub.d \ date.d \ + datetime.d \ datstrm.d \ db.d \ dbtable.d \ @@ -849,6 +852,7 @@ GTK_COMMONDEPS = \ lboxcmn.d \ list.d \ log.d \ + longlong.d \ memory.d \ menucmn.d \ mimetype.d \ @@ -872,7 +876,6 @@ GTK_COMMONDEPS = \ stream.d \ string.d \ tbarbase.d \ - tbarsmpl.d \ textcmn.d \ textfile.d \ time.d \ @@ -1046,6 +1049,7 @@ MOTIF_GENERICOBJS = \ statline.o \ statusbr.o \ tabg.o \ + tbarsmpl.o \ textdlgg.o \ tipdlg.o \ treectrl.o \ @@ -1084,6 +1088,7 @@ MOTIF_GENERICDEPS = \ statline.d \ statusbr.d \ tabg.d \ + tbarsmpl.d \ textdlgg.d \ tipdlg.d \ treectrl.d \ @@ -1099,6 +1104,7 @@ MOTIF_COMMONOBJS = \ ctrlcmn.o \ ctrlsub.o \ date.o \ + datetime.o \ datstrm.o \ db.o \ dbtable.o \ @@ -1142,6 +1148,7 @@ MOTIF_COMMONOBJS = \ lboxcmn.o \ list.o \ log.o \ + longlong.o \ memory.o \ menucmn.o \ mimetype.o \ @@ -1165,7 +1172,6 @@ MOTIF_COMMONOBJS = \ stream.o \ string.o \ tbarbase.o \ - tbarsmpl.o \ textcmn.o \ textfile.o \ time.o \ @@ -1196,6 +1202,7 @@ MOTIF_COMMONDEPS = \ ctrlcmn.d \ ctrlsub.d \ date.d \ + datetime.d \ datstrm.d \ db.d \ dbtable.d \ @@ -1239,6 +1246,7 @@ MOTIF_COMMONDEPS = \ lboxcmn.d \ list.d \ log.d \ + longlong.d \ memory.d \ menucmn.d \ mimetype.d \ @@ -1262,7 +1270,6 @@ MOTIF_COMMONDEPS = \ stream.d \ string.d \ tbarbase.d \ - tbarsmpl.d \ textcmn.d \ textfile.d \ time.d \ @@ -1410,7 +1417,7 @@ MSW_GENERICOBJS = \ scrolwin.o \ splitter.o \ statusbr.o \ - tabg.o \ + tbarsmpl.o \ textdlgg.o \ tipdlg.o \ wizard.o @@ -1432,7 +1439,7 @@ MSW_GENERICDEPS = \ scrolwin.d \ splitter.d \ statusbr.d \ - tabg.d \ + tbarsmpl.d \ textdlgg.d \ tipdlg.d \ wizard.d @@ -1447,6 +1454,7 @@ MSW_COMMONOBJS = \ ctrlcmn.o \ ctrlsub.o \ date.o \ + datetime.o \ datstrm.o \ db.o \ dbtable.o \ @@ -1490,6 +1498,7 @@ MSW_COMMONOBJS = \ lboxcmn.o \ list.o \ log.o \ + longlong.o \ memory.o \ menucmn.o \ mimetype.o \ @@ -1514,7 +1523,6 @@ MSW_COMMONOBJS = \ stream.o \ string.o \ tbarbase.o \ - tbarsmpl.o \ textcmn.o \ textfile.o \ time.o \ @@ -1545,6 +1553,7 @@ MSW_COMMONDEPS = \ ctrlcmn.d \ ctrlsub.d \ date.d \ + datetime.d \ datstrm.d \ db.d \ dbtable.d \ @@ -1588,6 +1597,7 @@ MSW_COMMONDEPS = \ lboxcmn.d \ list.d \ log.d \ + longlong.d \ memory.d \ menucmn.d \ mimetype.d \ @@ -1612,7 +1622,6 @@ MSW_COMMONDEPS = \ stream.d \ string.d \ tbarbase.d \ - tbarsmpl.d \ textcmn.d \ textfile.d \ time.d \ @@ -1693,7 +1702,6 @@ MSW_GUIOBJS = \ palette.o \ pen.o \ penwin.o \ - pnghand.o \ printdlg.o \ printwin.o \ radiobox.o \ @@ -1785,7 +1793,6 @@ MSW_GUIDEPS = \ palette.d \ pen.d \ penwin.d \ - pnghand.d \ printdlg.d \ printwin.d \ radiobox.d \ @@ -1822,6 +1829,7 @@ BASE_OBJS = \ appcmn.o \ config.o \ date.o \ + datetime.o \ dynarray.o \ dynlib.o \ event.o \ @@ -1835,6 +1843,7 @@ BASE_OBJS = \ intl.o \ list.o \ log.o \ + longlong.o \ mimetype.o \ module.o \ object.o \ @@ -1859,6 +1868,7 @@ BASE_DEPS = \ appcmn.d \ config.d \ date.d \ + datetime.d \ dynarray.d \ dynlib.d \ event.d \ @@ -1872,6 +1882,7 @@ BASE_DEPS = \ intl.d \ list.d \ log.d \ + longlong.d \ mimetype.d \ module.d \ object.d \ diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index 9d487aa267..8422c6a7dc 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -85,8 +85,9 @@ scrolwin.cpp G splitter.cpp G statline.cpp G U,R statusbr.cpp G -tabg.cpp G +tabg.cpp G 16 numdlgg.cpp G +tbarsmpl.cpp G textdlgg.cpp G tipdlg.cpp G treectrl.cpp G 16 @@ -100,6 +101,7 @@ config.cpp C B ctrlcmn.cpp C ctrlsub.cpp C date.cpp C B +datetime.cpp C B datstrm.cpp C db.cpp C dbtable.cpp C @@ -144,6 +146,7 @@ layout.cpp C lboxcmn.cpp C list.cpp C B log.cpp C B +longlong.cpp C B memory.cpp C menucmn.cpp C mimetype.cpp C 32,B @@ -168,7 +171,6 @@ stream.cpp C B strconv.cpp C B string.cpp C B tbarbase.cpp C -tbarsmpl.cpp C textcmn.cpp C textfile.cpp C B time.cpp C B @@ -456,6 +458,7 @@ ctrlsub.h W cursor.h W dataobj.h W date.h W B +datetime.h W B datstrm.h W db.h W dbtable.h W @@ -878,7 +881,7 @@ caret.h N choicdgg.h N colrdlgg.h N dcpsg.h N -dirdlgg.h N +dirdlgg.h N 16 fontdlgg.h N filedlgg.h N grid.h N @@ -889,7 +892,7 @@ helphtml.h N helpxlp.h N imaglist.h N laywin.h N -listctrl.h N +listctrl.h N 16 msgdlgg.h N notebook.h N panelg.h N @@ -900,9 +903,9 @@ sashwin.h N scrolwin.h N splitter.h N statusbr.h N -tabg.h N +tabg.h N 16 textdlgg.h N -treectrl.h N +treectrl.h N 16 wizard.h N # vi: set noet ts=16 nolist: diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 6c0d6b4b07..561b2e4415 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -70,8 +70,37 @@ // Recommended setting: 1 #define wxUSE_CONFIG_NATIVE 1 +// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows +// to connect/disconnect from the network and be notified whenever the dial-up +// network connection is established/terminated. +// +// Default is 1. +// +// Recommended setting: 1 #define wxUSE_DIALUP_MANAGER 1 - // Use wxDialUpManager class + +// ---------------------------------------------------------------------------- +// Optional controls +// ---------------------------------------------------------------------------- + +// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar +// classes at all. Otherwise, use the native toolbar class unless +// wxUSE_TOOLBAR_NATIVE is 0. Additionally, the generic toolbar class which +// supports some features which might not be supported by the native wxToolBar +// class may be compiled in if wxUSE_TOOLBAR_SIMPLE is 1. +// +// Default is 1 for all settings. +// +// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE and 0 for +// wxUSE_TOOLBAR_SIMPLE (the default is 1 mainly for backwards compatibility). +#define wxUSE_TOOLBAR 1 +#define wxUSE_TOOLBAR_NATIVE 1 +#define wxUSE_TOOLBAR_SIMPLE 1 + +// ---------------------------------------------------------------------------- +// Postscript support settings +// ---------------------------------------------------------------------------- + #define wxUSE_POSTSCRIPT 0 // 0 for no PostScript device context #define wxUSE_AFM_FOR_POSTSCRIPT 0 @@ -310,12 +339,6 @@ // text entry dialog and wxGetTextFromUser function #define wxUSE_TEXTDLG 1 -// use generic wxToolBar class instead of the native one? -#define wxUSE_TOOLBAR 0 - -// wxToolBar class -#define wxUSE_TOOLBAR 1 - // wxStatusBar class #define wxUSE_STATUSBAR 1 diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 26aac15094..629d11bc93 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 17:26, 1999/12/12 +# This file was automatically generated by tmake at 19:00, 1999/12/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # @@ -93,7 +93,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ $(MSWDIR)\scrolwin.obj \ $(MSWDIR)\splitter.obj \ $(MSWDIR)\statusbr.obj \ - $(MSWDIR)\tabg.obj \ + $(MSWDIR)\tbarsmpl.obj \ $(MSWDIR)\textdlgg.obj \ $(MSWDIR)\tipdlg.obj \ $(MSWDIR)\wizard.obj @@ -119,6 +119,7 @@ COMMONOBJS = \ $(MSWDIR)\ctrlcmn.obj \ $(MSWDIR)\ctrlsub.obj \ $(MSWDIR)\date.obj \ + $(MSWDIR)\datetime.obj \ $(MSWDIR)\datstrm.obj \ $(MSWDIR)\db.obj \ $(MSWDIR)\dbtable.obj \ @@ -162,6 +163,7 @@ COMMONOBJS = \ $(MSWDIR)\lboxcmn.obj \ $(MSWDIR)\list.obj \ $(MSWDIR)\log.obj \ + $(MSWDIR)\longlong.obj \ $(MSWDIR)\memory.obj \ $(MSWDIR)\menucmn.obj \ $(MSWDIR)\mimetype.obj \ @@ -186,7 +188,6 @@ COMMONOBJS = \ $(MSWDIR)\stream.obj \ $(MSWDIR)\string.obj \ $(MSWDIR)\tbarbase.obj \ - $(MSWDIR)\tbarsmpl.obj \ $(MSWDIR)\textcmn.obj \ $(MSWDIR)\textfile.obj \ $(MSWDIR)\time.obj \ @@ -582,6 +583,8 @@ $(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF) $(MSWDIR)\date.obj: $(COMMDIR)\date.$(SRCSUFF) +$(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF) + $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF) $(MSWDIR)\db.obj: $(COMMDIR)\db.$(SRCSUFF) @@ -668,6 +671,8 @@ $(MSWDIR)\list.obj: $(COMMDIR)\list.$(SRCSUFF) $(MSWDIR)\log.obj: $(COMMDIR)\log.$(SRCSUFF) +$(MSWDIR)\longlong.obj: $(COMMDIR)\longlong.$(SRCSUFF) + $(MSWDIR)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF) $(MSWDIR)\menucmn.obj: $(COMMDIR)\menucmn.$(SRCSUFF) @@ -716,8 +721,6 @@ $(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF) $(MSWDIR)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF) -$(MSWDIR)\tbarsmpl.obj: $(COMMDIR)\tbarsmpl.$(SRCSUFF) - $(MSWDIR)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF) $(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF) @@ -792,7 +795,7 @@ $(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF) $(MSWDIR)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF) -$(MSWDIR)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF) +$(MSWDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF) $(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF) diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index 07d7d1ade6..879c8a1374 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 17:26, 1999/12/12 +# This file was automatically generated by tmake at 19:00, 1999/12/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T! # @@ -93,6 +93,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ $(MSWDIR)\splitter.obj \ $(MSWDIR)\statusbr.obj \ $(MSWDIR)\tabg.obj \ + $(MSWDIR)\tbarsmpl.obj \ $(MSWDIR)\textdlgg.obj \ $(MSWDIR)\tipdlg.obj \ $(MSWDIR)\treectrl.obj \ @@ -108,6 +109,7 @@ COMMONOBJS = \ $(MSWDIR)\ctrlcmn.obj \ $(MSWDIR)\ctrlsub.obj \ $(MSWDIR)\date.obj \ + $(MSWDIR)\datetime.obj \ $(MSWDIR)\datstrm.obj \ $(MSWDIR)\db.obj \ $(MSWDIR)\dbtable.obj \ @@ -144,6 +146,7 @@ COMMONOBJS = \ $(MSWDIR)\lboxcmn.obj \ $(MSWDIR)\list.obj \ $(MSWDIR)\log.obj \ + $(MSWDIR)\longlong.obj \ $(MSWDIR)\memory.obj \ $(MSWDIR)\menucmn.obj \ $(MSWDIR)\module.obj \ @@ -159,7 +162,6 @@ COMMONOBJS = \ $(MSWDIR)\stream.obj \ $(MSWDIR)\string.obj \ $(MSWDIR)\tbarbase.obj \ - $(MSWDIR)\tbarsmpl.obj \ $(MSWDIR)\textcmn.obj \ $(MSWDIR)\textfile.obj \ $(MSWDIR)\time.obj \ @@ -474,6 +476,8 @@ $(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF) $(MSWDIR)\date.obj: $(COMMDIR)\date.$(SRCSUFF) +$(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF) + $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF) $(MSWDIR)\db.obj: $(COMMDIR)\db.$(SRCSUFF) @@ -546,6 +550,8 @@ $(MSWDIR)\list.obj: $(COMMDIR)\list.$(SRCSUFF) $(MSWDIR)\log.obj: $(COMMDIR)\log.$(SRCSUFF) +$(MSWDIR)\longlong.obj: $(COMMDIR)\longlong.$(SRCSUFF) + $(MSWDIR)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF) $(MSWDIR)\menucmn.obj: $(COMMDIR)\menucmn.$(SRCSUFF) @@ -576,8 +582,6 @@ $(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF) $(MSWDIR)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF) -$(MSWDIR)\tbarsmpl.obj: $(COMMDIR)\tbarsmpl.$(SRCSUFF) - $(MSWDIR)\textcmn.obj: $(COMMDIR)\textcmn.$(SRCSUFF) $(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF) @@ -662,6 +666,8 @@ $(MSWDIR)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF) $(MSWDIR)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF) +$(MSWDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF) + $(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF) $(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 56bcbd6c5d..93fe174b99 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 17:26, 1999/12/12 +# This file was automatically generated by tmake at 19:00, 1999/12/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T! # @@ -78,6 +78,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ $(GENDIR)\splitter.obj \ $(GENDIR)\statusbr.obj \ $(GENDIR)\tabg.obj \ + $(GENDIR)\tbarsmpl.obj \ $(GENDIR)\textdlgg.obj \ $(GENDIR)\tipdlg.obj \ $(GENDIR)\treectrl.obj \ @@ -94,6 +95,7 @@ COMMONOBJS1 = \ $(COMMDIR)\ctrlcmn.obj \ $(COMMDIR)\ctrlsub.obj \ $(COMMDIR)\date.obj \ + $(COMMDIR)\datetime.obj \ $(COMMDIR)\datstrm.obj \ $(COMMDIR)\db.obj \ $(COMMDIR)\dbtable.obj \ @@ -130,6 +132,7 @@ COMMONOBJS1 = \ $(COMMDIR)\lboxcmn.obj \ $(COMMDIR)\list.obj \ $(COMMDIR)\log.obj \ + $(COMMDIR)\longlong.obj \ $(COMMDIR)\memory.obj \ $(COMMDIR)\menucmn.obj \ $(COMMDIR)\module.obj \ @@ -148,7 +151,6 @@ COMMONOBJS2 = \ $(COMMDIR)\stream.obj \ $(COMMDIR)\string.obj \ $(COMMDIR)\tbarbase.obj \ - $(COMMDIR)\tbarsmpl.obj \ $(COMMDIR)\textcmn.obj \ $(COMMDIR)\textfile.obj \ $(COMMDIR)\time.obj \ @@ -766,6 +768,11 @@ $(COMMDIR)/date.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/datetime.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/datstrm.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -946,6 +953,11 @@ $(COMMDIR)/log.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/longlong.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/memory.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -1026,11 +1038,6 @@ $(COMMDIR)/tbarbase.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(COMMDIR)/tbarsmpl.obj: $*.$(SRCSUFF) - cl @<< -$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) -<< - $(COMMDIR)/textcmn.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -1226,6 +1233,11 @@ $(GENDIR)/tabg.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(GENDIR)/tbarsmpl.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(GENDIR)/textdlgg.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 0b311bec39..faa9e4d8fb 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 17:26, 1999/12/12 +# This file was automatically generated by tmake at 19:00, 1999/12/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # @@ -67,7 +67,7 @@ GENERICOBJS = \ $(GENDIR)/scrolwin.$(OBJSUFF) \ $(GENDIR)/splitter.$(OBJSUFF) \ $(GENDIR)/statusbr.$(OBJSUFF) \ - $(GENDIR)/tabg.$(OBJSUFF) \ + $(GENDIR)/tbarsmpl.$(OBJSUFF) \ $(GENDIR)/textdlgg.$(OBJSUFF) \ $(GENDIR)/tipdlg.$(OBJSUFF) \ $(GENDIR)/wizard.$(OBJSUFF) @@ -82,6 +82,7 @@ COMMONOBJS = \ $(COMMDIR)/ctrlcmn.$(OBJSUFF) \ $(COMMDIR)/ctrlsub.$(OBJSUFF) \ $(COMMDIR)/date.$(OBJSUFF) \ + $(COMMDIR)/datetime.$(OBJSUFF) \ $(COMMDIR)/datstrm.$(OBJSUFF) \ $(COMMDIR)/db.$(OBJSUFF) \ $(COMMDIR)/dbtable.$(OBJSUFF) \ @@ -125,6 +126,7 @@ COMMONOBJS = \ $(COMMDIR)/lboxcmn.$(OBJSUFF) \ $(COMMDIR)/list.$(OBJSUFF) \ $(COMMDIR)/log.$(OBJSUFF) \ + $(COMMDIR)/longlong.$(OBJSUFF) \ $(COMMDIR)/memory.$(OBJSUFF) \ $(COMMDIR)/menucmn.$(OBJSUFF) \ $(COMMDIR)/mimetype.$(OBJSUFF) \ @@ -148,7 +150,6 @@ COMMONOBJS = \ $(COMMDIR)/stream.$(OBJSUFF) \ $(COMMDIR)/string.$(OBJSUFF) \ $(COMMDIR)/tbarbase.$(OBJSUFF) \ - $(COMMDIR)/tbarsmpl.$(OBJSUFF) \ $(COMMDIR)/textcmn.$(OBJSUFF) \ $(COMMDIR)/textfile.$(OBJSUFF) \ $(COMMDIR)/time.$(OBJSUFF) \ diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index dbae1c97cf..0fe7a031f4 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 17:26, 1999/12/12 +# This file was automatically generated by tmake at 19:00, 1999/12/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T! # Symantec C++ makefile for the msw objects @@ -41,7 +41,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \ $(GENDIR)\scrolwin.obj \ $(GENDIR)\splitter.obj \ $(GENDIR)\statusbr.obj \ - $(GENDIR)\tabg.obj \ + $(GENDIR)\tbarsmpl.obj \ $(GENDIR)\textdlgg.obj \ $(GENDIR)\tipdlg.obj \ $(GENDIR)\wizard.obj @@ -56,6 +56,7 @@ COMMONOBJS = \ $(COMMDIR)\ctrlcmn.obj \ $(COMMDIR)\ctrlsub.obj \ $(COMMDIR)\date.obj \ + $(COMMDIR)\datetime.obj \ $(COMMDIR)\datstrm.obj \ $(COMMDIR)\db.obj \ $(COMMDIR)\dbtable.obj \ @@ -99,6 +100,7 @@ COMMONOBJS = \ $(COMMDIR)\lboxcmn.obj \ $(COMMDIR)\list.obj \ $(COMMDIR)\log.obj \ + $(COMMDIR)\longlong.obj \ $(COMMDIR)\memory.obj \ $(COMMDIR)\menucmn.obj \ $(COMMDIR)\mimetype.obj \ @@ -123,7 +125,6 @@ COMMONOBJS = \ $(COMMDIR)\stream.obj \ $(COMMDIR)\string.obj \ $(COMMDIR)\tbarbase.obj \ - $(COMMDIR)\tbarsmpl.obj \ $(COMMDIR)\textcmn.obj \ $(COMMDIR)\textfile.obj \ $(COMMDIR)\time.obj \ diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 9bdafd4d3c..f6d9912f26 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 17:26, 1999/12/12 +# This file was automatically generated by tmake at 19:00, 1999/12/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -98,7 +98,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \ ..\generic\$D\scrolwin.obj \ ..\generic\$D\splitter.obj \ ..\generic\$D\statusbr.obj \ - ..\generic\$D\tabg.obj \ + ..\generic\$D\tbarsmpl.obj \ ..\generic\$D\textdlgg.obj \ ..\generic\$D\tipdlg.obj \ ..\generic\$D\wizard.obj @@ -122,6 +122,7 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \ ..\generic\$D\printps.obj \ ..\generic\$D\prntdlgg.obj \ ..\generic\$D\statline.obj \ + ..\generic\$D\tabg.obj \ ..\generic\$D\treectrl.obj COMMONOBJS = \ @@ -134,6 +135,7 @@ COMMONOBJS = \ ..\common\$D\ctrlcmn.obj \ ..\common\$D\ctrlsub.obj \ ..\common\$D\date.obj \ + ..\common\$D\datetime.obj \ ..\common\$D\datstrm.obj \ ..\common\$D\db.obj \ ..\common\$D\dbtable.obj \ @@ -177,6 +179,7 @@ COMMONOBJS = \ ..\common\$D\lboxcmn.obj \ ..\common\$D\list.obj \ ..\common\$D\log.obj \ + ..\common\$D\longlong.obj \ ..\common\$D\memory.obj \ ..\common\$D\menucmn.obj \ ..\common\$D\mimetype.obj \ @@ -201,7 +204,6 @@ COMMONOBJS = \ ..\common\$D\stream.obj \ ..\common\$D\string.obj \ ..\common\$D\tbarbase.obj \ - ..\common\$D\tbarsmpl.obj \ ..\common\$D\textcmn.obj \ ..\common\$D\textfile.obj \ ..\common\$D\time.obj \ diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index ba46839796..5d1c441705 100644 --- 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 17:26, 1999/12/12 +# This file was automatically generated by tmake at 19:00, 1999/12/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! # @@ -54,7 +54,7 @@ GENERICOBJS= busyinfo.obj & scrolwin.obj & splitter.obj & statusbr.obj & - tabg.obj & + tbarsmpl.obj & textdlgg.obj & tipdlg.obj & wizard.obj @@ -78,6 +78,7 @@ NONESSENTIALOBJS= caret.obj & printps.obj & prntdlgg.obj & statline.obj & + tabg.obj & treectrl.obj COMMONOBJS = & @@ -90,6 +91,7 @@ COMMONOBJS = & ctrlcmn.obj & ctrlsub.obj & date.obj & + datetime.obj & datstrm.obj & db.obj & dbtable.obj & @@ -132,6 +134,7 @@ COMMONOBJS = & lboxcmn.obj & list.obj & log.obj & + longlong.obj & memory.obj & menucmn.obj & mimetype.obj & @@ -156,7 +159,6 @@ COMMONOBJS = & stream.obj & string.obj & tbarbase.obj & - tbarsmpl.obj & textcmn.obj & textfile.obj & time.obj & @@ -632,6 +634,9 @@ ctrlsub.obj: $(COMMDIR)\ctrlsub.cpp date.obj: $(COMMDIR)\date.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +datetime.obj: $(COMMDIR)\datetime.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + datstrm.obj: $(COMMDIR)\datstrm.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -758,6 +763,9 @@ list.obj: $(COMMDIR)\list.cpp log.obj: $(COMMDIR)\log.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +longlong.obj: $(COMMDIR)\longlong.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + memory.obj: $(COMMDIR)\memory.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -830,9 +838,6 @@ string.obj: $(COMMDIR)\string.cpp tbarbase.obj: $(COMMDIR)\tbarbase.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -tbarsmpl.obj: $(COMMDIR)\tbarsmpl.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - textcmn.obj: $(COMMDIR)\textcmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -952,7 +957,7 @@ splitter.obj: $(GENDIR)\splitter.cpp statusbr.obj: $(GENDIR)\statusbr.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -tabg.obj: $(GENDIR)\tabg.cpp +tbarsmpl.obj: $(GENDIR)\tbarsmpl.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< textdlgg.obj: $(GENDIR)\textdlgg.cpp -- 2.45.2