From bfe835d075811cc32e8e1340e8c84bdcd014def2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 10 Apr 2003 21:08:29 +0000 Subject: [PATCH] regenerated with tmake after adding datacmn.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/files.lst | 2 ++ src/gtk/files.lst | 2 ++ src/gtk1/files.lst | 2 ++ src/mac/carbon/files.lst | 2 ++ src/mac/files.lst | 2 ++ src/mgl/files.lst | 2 ++ src/mgl/makefile.wat | 4 ++++ src/microwin/files.lst | 2 ++ src/motif/app.cpp | 4 ++++ src/motif/files.lst | 2 ++ src/msw/files.lst | 2 ++ src/msw/makebase.b32 | 3 +++ src/msw/makefile.b32 | 3 +++ src/msw/makefile.bcc | 3 +++ src/msw/makefile.dos | 6 ++++++ src/msw/makefile.g95 | 1 + src/msw/makefile.sc | 1 + src/msw/makefile.vc | 1 + src/msw/makefile.wat | 14 ++++++++++++++ src/wxBase.dsp | 4 ++++ src/wxUniv.dsp | 4 ++++ src/wxWindows.dsp | 4 ++++ src/x11/files.lst | 2 ++ 23 files changed, 72 insertions(+) diff --git a/src/files.lst b/src/files.lst index ed695b888b..9e01926773 100644 --- a/src/files.lst +++ b/src/files.lst @@ -6,6 +6,7 @@ ALL_SOURCES = \ common/clntdata.cpp \ common/cmdline.cpp \ common/config.cpp \ + common/datacmn.cpp \ common/datetime.cpp \ common/datstrm.cpp \ common/db.cpp \ @@ -195,6 +196,7 @@ BASE_OBJS = \ clntdata.o \ cmdline.o \ config.o \ + datacmn.o \ datetime.o \ datstrm.o \ db.o \ diff --git a/src/gtk/files.lst b/src/gtk/files.lst index 0bc3f919de..10b246e187 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -59,6 +59,7 @@ ALL_SOURCES = \ common/cshelp.cpp \ common/ctrlcmn.cpp \ common/ctrlsub.cpp \ + common/datacmn.cpp \ common/datetime.cpp \ common/datstrm.cpp \ common/db.cpp \ @@ -649,6 +650,7 @@ COMMONOBJS = \ cshelp.o \ ctrlcmn.o \ ctrlsub.o \ + datacmn.o \ datetime.o \ datstrm.o \ db.o \ diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index 0bc3f919de..10b246e187 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -59,6 +59,7 @@ ALL_SOURCES = \ common/cshelp.cpp \ common/ctrlcmn.cpp \ common/ctrlsub.cpp \ + common/datacmn.cpp \ common/datetime.cpp \ common/datstrm.cpp \ common/db.cpp \ @@ -649,6 +650,7 @@ COMMONOBJS = \ cshelp.o \ ctrlcmn.o \ ctrlsub.o \ + datacmn.o \ datetime.o \ datstrm.o \ db.o \ diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst index 6cdb0cad99..ebbd3012e3 100644 --- a/src/mac/carbon/files.lst +++ b/src/mac/carbon/files.lst @@ -57,6 +57,7 @@ ALL_SOURCES = \ common/cshelp.cpp \ common/ctrlcmn.cpp \ common/ctrlsub.cpp \ + common/datacmn.cpp \ common/datetime.cpp \ common/datstrm.cpp \ common/db.cpp \ @@ -673,6 +674,7 @@ COMMONOBJS = \ cshelp.o \ ctrlcmn.o \ ctrlsub.o \ + datacmn.o \ datetime.o \ datstrm.o \ db.o \ diff --git a/src/mac/files.lst b/src/mac/files.lst index 6cdb0cad99..ebbd3012e3 100644 --- a/src/mac/files.lst +++ b/src/mac/files.lst @@ -57,6 +57,7 @@ ALL_SOURCES = \ common/cshelp.cpp \ common/ctrlcmn.cpp \ common/ctrlsub.cpp \ + common/datacmn.cpp \ common/datetime.cpp \ common/datstrm.cpp \ common/db.cpp \ @@ -673,6 +674,7 @@ COMMONOBJS = \ cshelp.o \ ctrlcmn.o \ ctrlsub.o \ + datacmn.o \ datetime.o \ datstrm.o \ db.o \ diff --git a/src/mgl/files.lst b/src/mgl/files.lst index 23ea9e577b..4415e7ef86 100644 --- a/src/mgl/files.lst +++ b/src/mgl/files.lst @@ -60,6 +60,7 @@ ALL_SOURCES = \ common/cshelp.cpp \ common/ctrlcmn.cpp \ common/ctrlsub.cpp \ + common/datacmn.cpp \ common/datetime.cpp \ common/datstrm.cpp \ common/db.cpp \ @@ -569,6 +570,7 @@ COMMONOBJS = \ cshelp.o \ ctrlcmn.o \ ctrlsub.o \ + datacmn.o \ datetime.o \ datstrm.o \ db.o \ diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat index 1783db3cc5..4a121b3f4a 100644 --- a/src/mgl/makefile.wat +++ b/src/mgl/makefile.wat @@ -102,6 +102,7 @@ COMMONOBJS = & cshelp.obj & ctrlcmn.obj & ctrlsub.obj & + datacmn.obj & datetime.obj & datstrm.obj & db.obj & @@ -579,6 +580,9 @@ ctrlcmn.obj: $(COMMDIR)\ctrlcmn.cpp ctrlsub.obj: $(COMMDIR)\ctrlsub.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +datacmn.obj: $(COMMDIR)\datacmn.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + datetime.obj: $(COMMDIR)\datetime.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< diff --git a/src/microwin/files.lst b/src/microwin/files.lst index a53cb0db62..9efe841a1c 100644 --- a/src/microwin/files.lst +++ b/src/microwin/files.lst @@ -57,6 +57,7 @@ ALL_SOURCES = \ common/cshelp.cpp \ common/ctrlcmn.cpp \ common/ctrlsub.cpp \ + common/datacmn.cpp \ common/datetime.cpp \ common/datstrm.cpp \ common/db.cpp \ @@ -640,6 +641,7 @@ COMMONOBJS = \ cshelp.o \ ctrlcmn.o \ ctrlsub.o \ + datacmn.o \ datetime.o \ datstrm.o \ db.o \ diff --git a/src/motif/app.cpp b/src/motif/app.cpp index 63cfd7ab1c..4fd539d71c 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -306,6 +306,9 @@ void wxApp::ExitMainLoop() // Is a message/event pending? bool wxApp::Pending() { +<<<<<<< app.cpp + return XtAppPending( (XtAppContext) GetAppContext() ) != 0; +======= return m_eventLoop->Pending(); #if 0 XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() )); @@ -314,6 +317,7 @@ bool wxApp::Pending() // is found. return ((XtAppPending( (XtAppContext) GetAppContext() ) & XtIMXEvent) != 0) ; #endif +>>>>>>> 1.57 } // Dispatch a message. diff --git a/src/motif/files.lst b/src/motif/files.lst index b762acfad2..8e0dfe314e 100644 --- a/src/motif/files.lst +++ b/src/motif/files.lst @@ -60,6 +60,7 @@ ALL_SOURCES = \ common/cshelp.cpp \ common/ctrlcmn.cpp \ common/ctrlsub.cpp \ + common/datacmn.cpp \ common/datetime.cpp \ common/datstrm.cpp \ common/db.cpp \ @@ -643,6 +644,7 @@ COMMONOBJS = \ cshelp.o \ ctrlcmn.o \ ctrlsub.o \ + datacmn.o \ datetime.o \ datstrm.o \ db.o \ diff --git a/src/msw/files.lst b/src/msw/files.lst index 4956c7b66a..8e663169b3 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -43,6 +43,7 @@ ALL_SOURCES = \ common/cshelp.cpp \ common/ctrlcmn.cpp \ common/ctrlsub.cpp \ + common/datacmn.cpp \ common/datetime.cpp \ common/datstrm.cpp \ common/db.cpp \ @@ -709,6 +710,7 @@ COMMONOBJS = \ cshelp.o \ ctrlcmn.o \ ctrlsub.o \ + datacmn.o \ datetime.o \ datstrm.o \ db.o \ diff --git a/src/msw/makebase.b32 b/src/msw/makebase.b32 index 5bbba8fbea..64eaaa7594 100644 --- a/src/msw/makebase.b32 +++ b/src/msw/makebase.b32 @@ -62,6 +62,7 @@ COMMONOBJS = \ $(MSWDIR)\clntdata.obj \ $(MSWDIR)\cmdline.obj \ $(MSWDIR)\config.obj \ + $(MSWDIR)\datacmn.obj \ $(MSWDIR)\datetime.obj \ $(MSWDIR)\datstrm.obj \ $(MSWDIR)\db.obj \ @@ -231,6 +232,8 @@ $(MSWDIR)\cmdline.obj: $(COMMDIR)\cmdline.$(SRCSUFF) $(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF) +$(MSWDIR)\datacmn.obj: $(COMMDIR)\datacmn.$(SRCSUFF) + $(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF) $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF) diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index f17fd7b4ae..7583a0ee30 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -390,6 +390,7 @@ COMMONOBJS = \ $(MSWDIR)\cshelp.obj \ $(MSWDIR)\ctrlcmn.obj \ $(MSWDIR)\ctrlsub.obj \ + $(MSWDIR)\datacmn.obj \ $(MSWDIR)\datetime.obj \ $(MSWDIR)\datstrm.obj \ $(MSWDIR)\db.obj \ @@ -1042,6 +1043,8 @@ $(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF) $(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF) +$(MSWDIR)\datacmn.obj: $(COMMDIR)\datacmn.$(SRCSUFF) + $(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF) $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF) diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index 48d8368c2f..82934e0aa4 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -117,6 +117,7 @@ COMMONOBJS = \ $(MSWDIR)\cshelp.obj \ $(MSWDIR)\ctrlcmn.obj \ $(MSWDIR)\ctrlsub.obj \ + $(MSWDIR)\datacmn.obj \ $(MSWDIR)\datetime.obj \ $(MSWDIR)\datstrm.obj \ $(MSWDIR)\dcbase.obj \ @@ -527,6 +528,8 @@ $(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF) $(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF) +$(MSWDIR)\datacmn.obj: $(COMMDIR)\datacmn.$(SRCSUFF) + $(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF) $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index baaa40eae1..85f0732c67 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -102,6 +102,7 @@ COMMONOBJS1 = \ $(COMMDIR)\cshelp.obj \ $(COMMDIR)\ctrlcmn.obj \ $(COMMDIR)\ctrlsub.obj \ + $(COMMDIR)\datacmn.obj \ $(COMMDIR)\datetime.obj \ $(COMMDIR)\datstrm.obj \ $(COMMDIR)\dcbase.obj \ @@ -866,6 +867,11 @@ $(COMMDIR)/ctrlsub.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/datacmn.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(COMMDIR)/datetime.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index f991c8be9a..88431a26aa 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -110,6 +110,7 @@ COMMONOBJS_BASE = \ $(COMMDIR)/clntdata.$(OBJSUFF) \ $(COMMDIR)/cmdline.$(OBJSUFF) \ $(COMMDIR)/config.$(OBJSUFF) \ + $(COMMDIR)/datacmn.$(OBJSUFF) \ $(COMMDIR)/datetime.$(OBJSUFF) \ $(COMMDIR)/datstrm.$(OBJSUFF) \ $(COMMDIR)/db.$(OBJSUFF) \ diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index 0ba2770acd..72035afc13 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -70,6 +70,7 @@ COMMONOBJS = \ $(COMMDIR)\cshelp.obj \ $(COMMDIR)\ctrlcmn.obj \ $(COMMDIR)\ctrlsub.obj \ + $(COMMDIR)\datacmn.obj \ $(COMMDIR)\datetime.obj \ $(COMMDIR)\datstrm.obj \ $(COMMDIR)\db.obj \ diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 666cfd7a63..228c41d493 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -148,6 +148,7 @@ COMMONOBJS = \ $(COMMDIR)\$D\cshelp.obj \ $(COMMDIR)\$D\ctrlcmn.obj \ $(COMMDIR)\$D\ctrlsub.obj \ + $(COMMDIR)\$D\datacmn.obj \ $(COMMDIR)\$D\datetime.obj \ $(COMMDIR)\$D\datstrm.obj \ $(COMMDIR)\$D\db.obj \ diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index 7c1808e07c..d4ba62b6e5 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -77,6 +77,7 @@ NONESSENTIALOBJS= $(OUTPUTDIR)\accel.obj & $(OUTPUTDIR)\timer.obj COMMONOBJS = & + $(OUTPUTDIR)\y_tab.obj & $(OUTPUTDIR)\accesscmn.obj & $(OUTPUTDIR)\appcmn.obj & $(OUTPUTDIR)\artprov.obj & @@ -92,6 +93,7 @@ COMMONOBJS = & $(OUTPUTDIR)\cshelp.obj & $(OUTPUTDIR)\ctrlcmn.obj & $(OUTPUTDIR)\ctrlsub.obj & + $(OUTPUTDIR)\datacmn.obj & $(OUTPUTDIR)\datetime.obj & $(OUTPUTDIR)\datstrm.obj & $(OUTPUTDIR)\db.obj & @@ -755,6 +757,9 @@ $(OUTPUTDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.cpp $(OUTPUTDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.cpp *$(CXX) $(CXXFLAGS) $< +$(OUTPUTDIR)\datacmn.obj: $(COMMDIR)\datacmn.cpp + *$(CXX) $(CXXFLAGS) $< + $(OUTPUTDIR)\datetime.obj: $(COMMDIR)\datetime.cpp *$(CXX) $(CXXFLAGS) $< @@ -1105,6 +1110,15 @@ $(OUTPUTDIR)\zstream.obj: $(COMMDIR)\zstream.cpp +$(OUTPUTDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c + *$(CC) $(CFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c + +$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c + copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c + +$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c + copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c + ######################################################## # Generic objects (not always compiled, depending on # whether platforms have native implementations) diff --git a/src/wxBase.dsp b/src/wxBase.dsp index fa1a58c7d2..d5a6e0ac49 100644 --- a/src/wxBase.dsp +++ b/src/wxBase.dsp @@ -264,6 +264,10 @@ SOURCE=.\common\config.cpp # End Source File # Begin Source File +SOURCE=.\common\datacmn.cpp +# End Source File +# Begin Source File + SOURCE=.\common\datetime.cpp # End Source File # Begin Source File diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp index 5ab5924fd9..5a06666a79 100644 --- a/src/wxUniv.dsp +++ b/src/wxUniv.dsp @@ -149,6 +149,10 @@ SOURCE=.\common\ctrlsub.cpp # End Source File # Begin Source File +SOURCE=.\common\datacmn.cpp +# End Source File +# Begin Source File + SOURCE=.\common\datetime.cpp # End Source File # Begin Source File diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 0a4110ba81..6663e0a38f 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -308,6 +308,10 @@ SOURCE=.\common\ctrlsub.cpp # End Source File # Begin Source File +SOURCE=.\common\datacmn.cpp +# End Source File +# Begin Source File + SOURCE=.\common\datetime.cpp # End Source File # Begin Source File diff --git a/src/x11/files.lst b/src/x11/files.lst index e5c5cc3eab..40b89bd824 100644 --- a/src/x11/files.lst +++ b/src/x11/files.lst @@ -92,6 +92,7 @@ ALL_SOURCES = \ common/cshelp.cpp \ common/ctrlcmn.cpp \ common/ctrlsub.cpp \ + common/datacmn.cpp \ common/datetime.cpp \ common/datstrm.cpp \ common/db.cpp \ @@ -661,6 +662,7 @@ COMMONOBJS = \ cshelp.o \ ctrlcmn.o \ ctrlsub.o \ + datacmn.o \ datetime.o \ datstrm.o \ db.o \ -- 2.45.2