regenerated with tmake after adding datacmn.cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-04-10 21:08:29 +00:00
parent 6a76384f2d
commit bfe835d075
23 changed files with 72 additions and 0 deletions

View File

@ -6,6 +6,7 @@ ALL_SOURCES = \
common/clntdata.cpp \ common/clntdata.cpp \
common/cmdline.cpp \ common/cmdline.cpp \
common/config.cpp \ common/config.cpp \
common/datacmn.cpp \
common/datetime.cpp \ common/datetime.cpp \
common/datstrm.cpp \ common/datstrm.cpp \
common/db.cpp \ common/db.cpp \
@ -195,6 +196,7 @@ BASE_OBJS = \
clntdata.o \ clntdata.o \
cmdline.o \ cmdline.o \
config.o \ config.o \
datacmn.o \
datetime.o \ datetime.o \
datstrm.o \ datstrm.o \
db.o \ db.o \

View File

@ -59,6 +59,7 @@ ALL_SOURCES = \
common/cshelp.cpp \ common/cshelp.cpp \
common/ctrlcmn.cpp \ common/ctrlcmn.cpp \
common/ctrlsub.cpp \ common/ctrlsub.cpp \
common/datacmn.cpp \
common/datetime.cpp \ common/datetime.cpp \
common/datstrm.cpp \ common/datstrm.cpp \
common/db.cpp \ common/db.cpp \
@ -649,6 +650,7 @@ COMMONOBJS = \
cshelp.o \ cshelp.o \
ctrlcmn.o \ ctrlcmn.o \
ctrlsub.o \ ctrlsub.o \
datacmn.o \
datetime.o \ datetime.o \
datstrm.o \ datstrm.o \
db.o \ db.o \

View File

@ -59,6 +59,7 @@ ALL_SOURCES = \
common/cshelp.cpp \ common/cshelp.cpp \
common/ctrlcmn.cpp \ common/ctrlcmn.cpp \
common/ctrlsub.cpp \ common/ctrlsub.cpp \
common/datacmn.cpp \
common/datetime.cpp \ common/datetime.cpp \
common/datstrm.cpp \ common/datstrm.cpp \
common/db.cpp \ common/db.cpp \
@ -649,6 +650,7 @@ COMMONOBJS = \
cshelp.o \ cshelp.o \
ctrlcmn.o \ ctrlcmn.o \
ctrlsub.o \ ctrlsub.o \
datacmn.o \
datetime.o \ datetime.o \
datstrm.o \ datstrm.o \
db.o \ db.o \

View File

@ -57,6 +57,7 @@ ALL_SOURCES = \
common/cshelp.cpp \ common/cshelp.cpp \
common/ctrlcmn.cpp \ common/ctrlcmn.cpp \
common/ctrlsub.cpp \ common/ctrlsub.cpp \
common/datacmn.cpp \
common/datetime.cpp \ common/datetime.cpp \
common/datstrm.cpp \ common/datstrm.cpp \
common/db.cpp \ common/db.cpp \
@ -673,6 +674,7 @@ COMMONOBJS = \
cshelp.o \ cshelp.o \
ctrlcmn.o \ ctrlcmn.o \
ctrlsub.o \ ctrlsub.o \
datacmn.o \
datetime.o \ datetime.o \
datstrm.o \ datstrm.o \
db.o \ db.o \

View File

@ -57,6 +57,7 @@ ALL_SOURCES = \
common/cshelp.cpp \ common/cshelp.cpp \
common/ctrlcmn.cpp \ common/ctrlcmn.cpp \
common/ctrlsub.cpp \ common/ctrlsub.cpp \
common/datacmn.cpp \
common/datetime.cpp \ common/datetime.cpp \
common/datstrm.cpp \ common/datstrm.cpp \
common/db.cpp \ common/db.cpp \
@ -673,6 +674,7 @@ COMMONOBJS = \
cshelp.o \ cshelp.o \
ctrlcmn.o \ ctrlcmn.o \
ctrlsub.o \ ctrlsub.o \
datacmn.o \
datetime.o \ datetime.o \
datstrm.o \ datstrm.o \
db.o \ db.o \

View File

@ -60,6 +60,7 @@ ALL_SOURCES = \
common/cshelp.cpp \ common/cshelp.cpp \
common/ctrlcmn.cpp \ common/ctrlcmn.cpp \
common/ctrlsub.cpp \ common/ctrlsub.cpp \
common/datacmn.cpp \
common/datetime.cpp \ common/datetime.cpp \
common/datstrm.cpp \ common/datstrm.cpp \
common/db.cpp \ common/db.cpp \
@ -569,6 +570,7 @@ COMMONOBJS = \
cshelp.o \ cshelp.o \
ctrlcmn.o \ ctrlcmn.o \
ctrlsub.o \ ctrlsub.o \
datacmn.o \
datetime.o \ datetime.o \
datstrm.o \ datstrm.o \
db.o \ db.o \

View File

@ -102,6 +102,7 @@ COMMONOBJS = &
cshelp.obj & cshelp.obj &
ctrlcmn.obj & ctrlcmn.obj &
ctrlsub.obj & ctrlsub.obj &
datacmn.obj &
datetime.obj & datetime.obj &
datstrm.obj & datstrm.obj &
db.obj & db.obj &
@ -579,6 +580,9 @@ ctrlcmn.obj: $(COMMDIR)\ctrlcmn.cpp
ctrlsub.obj: $(COMMDIR)\ctrlsub.cpp ctrlsub.obj: $(COMMDIR)\ctrlsub.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
datacmn.obj: $(COMMDIR)\datacmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
datetime.obj: $(COMMDIR)\datetime.cpp datetime.obj: $(COMMDIR)\datetime.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<

View File

@ -57,6 +57,7 @@ ALL_SOURCES = \
common/cshelp.cpp \ common/cshelp.cpp \
common/ctrlcmn.cpp \ common/ctrlcmn.cpp \
common/ctrlsub.cpp \ common/ctrlsub.cpp \
common/datacmn.cpp \
common/datetime.cpp \ common/datetime.cpp \
common/datstrm.cpp \ common/datstrm.cpp \
common/db.cpp \ common/db.cpp \
@ -640,6 +641,7 @@ COMMONOBJS = \
cshelp.o \ cshelp.o \
ctrlcmn.o \ ctrlcmn.o \
ctrlsub.o \ ctrlsub.o \
datacmn.o \
datetime.o \ datetime.o \
datstrm.o \ datstrm.o \
db.o \ db.o \

View File

@ -306,6 +306,9 @@ void wxApp::ExitMainLoop()
// Is a message/event pending? // Is a message/event pending?
bool wxApp::Pending() bool wxApp::Pending()
{ {
<<<<<<< app.cpp
return XtAppPending( (XtAppContext) GetAppContext() ) != 0;
=======
return m_eventLoop->Pending(); return m_eventLoop->Pending();
#if 0 #if 0
XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() )); XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() ));
@ -314,6 +317,7 @@ bool wxApp::Pending()
// is found. // is found.
return ((XtAppPending( (XtAppContext) GetAppContext() ) & XtIMXEvent) != 0) ; return ((XtAppPending( (XtAppContext) GetAppContext() ) & XtIMXEvent) != 0) ;
#endif #endif
>>>>>>> 1.57
} }
// Dispatch a message. // Dispatch a message.

View File

@ -60,6 +60,7 @@ ALL_SOURCES = \
common/cshelp.cpp \ common/cshelp.cpp \
common/ctrlcmn.cpp \ common/ctrlcmn.cpp \
common/ctrlsub.cpp \ common/ctrlsub.cpp \
common/datacmn.cpp \
common/datetime.cpp \ common/datetime.cpp \
common/datstrm.cpp \ common/datstrm.cpp \
common/db.cpp \ common/db.cpp \
@ -643,6 +644,7 @@ COMMONOBJS = \
cshelp.o \ cshelp.o \
ctrlcmn.o \ ctrlcmn.o \
ctrlsub.o \ ctrlsub.o \
datacmn.o \
datetime.o \ datetime.o \
datstrm.o \ datstrm.o \
db.o \ db.o \

View File

@ -43,6 +43,7 @@ ALL_SOURCES = \
common/cshelp.cpp \ common/cshelp.cpp \
common/ctrlcmn.cpp \ common/ctrlcmn.cpp \
common/ctrlsub.cpp \ common/ctrlsub.cpp \
common/datacmn.cpp \
common/datetime.cpp \ common/datetime.cpp \
common/datstrm.cpp \ common/datstrm.cpp \
common/db.cpp \ common/db.cpp \
@ -709,6 +710,7 @@ COMMONOBJS = \
cshelp.o \ cshelp.o \
ctrlcmn.o \ ctrlcmn.o \
ctrlsub.o \ ctrlsub.o \
datacmn.o \
datetime.o \ datetime.o \
datstrm.o \ datstrm.o \
db.o \ db.o \

View File

@ -62,6 +62,7 @@ COMMONOBJS = \
$(MSWDIR)\clntdata.obj \ $(MSWDIR)\clntdata.obj \
$(MSWDIR)\cmdline.obj \ $(MSWDIR)\cmdline.obj \
$(MSWDIR)\config.obj \ $(MSWDIR)\config.obj \
$(MSWDIR)\datacmn.obj \
$(MSWDIR)\datetime.obj \ $(MSWDIR)\datetime.obj \
$(MSWDIR)\datstrm.obj \ $(MSWDIR)\datstrm.obj \
$(MSWDIR)\db.obj \ $(MSWDIR)\db.obj \
@ -231,6 +232,8 @@ $(MSWDIR)\cmdline.obj: $(COMMDIR)\cmdline.$(SRCSUFF)
$(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF) $(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
$(MSWDIR)\datacmn.obj: $(COMMDIR)\datacmn.$(SRCSUFF)
$(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF) $(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF)
$(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF) $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)

View File

@ -390,6 +390,7 @@ COMMONOBJS = \
$(MSWDIR)\cshelp.obj \ $(MSWDIR)\cshelp.obj \
$(MSWDIR)\ctrlcmn.obj \ $(MSWDIR)\ctrlcmn.obj \
$(MSWDIR)\ctrlsub.obj \ $(MSWDIR)\ctrlsub.obj \
$(MSWDIR)\datacmn.obj \
$(MSWDIR)\datetime.obj \ $(MSWDIR)\datetime.obj \
$(MSWDIR)\datstrm.obj \ $(MSWDIR)\datstrm.obj \
$(MSWDIR)\db.obj \ $(MSWDIR)\db.obj \
@ -1042,6 +1043,8 @@ $(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
$(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF) $(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
$(MSWDIR)\datacmn.obj: $(COMMDIR)\datacmn.$(SRCSUFF)
$(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF) $(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF)
$(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF) $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)

View File

@ -117,6 +117,7 @@ COMMONOBJS = \
$(MSWDIR)\cshelp.obj \ $(MSWDIR)\cshelp.obj \
$(MSWDIR)\ctrlcmn.obj \ $(MSWDIR)\ctrlcmn.obj \
$(MSWDIR)\ctrlsub.obj \ $(MSWDIR)\ctrlsub.obj \
$(MSWDIR)\datacmn.obj \
$(MSWDIR)\datetime.obj \ $(MSWDIR)\datetime.obj \
$(MSWDIR)\datstrm.obj \ $(MSWDIR)\datstrm.obj \
$(MSWDIR)\dcbase.obj \ $(MSWDIR)\dcbase.obj \
@ -527,6 +528,8 @@ $(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
$(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF) $(MSWDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.$(SRCSUFF)
$(MSWDIR)\datacmn.obj: $(COMMDIR)\datacmn.$(SRCSUFF)
$(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF) $(MSWDIR)\datetime.obj: $(COMMDIR)\datetime.$(SRCSUFF)
$(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF) $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)

View File

@ -102,6 +102,7 @@ COMMONOBJS1 = \
$(COMMDIR)\cshelp.obj \ $(COMMDIR)\cshelp.obj \
$(COMMDIR)\ctrlcmn.obj \ $(COMMDIR)\ctrlcmn.obj \
$(COMMDIR)\ctrlsub.obj \ $(COMMDIR)\ctrlsub.obj \
$(COMMDIR)\datacmn.obj \
$(COMMDIR)\datetime.obj \ $(COMMDIR)\datetime.obj \
$(COMMDIR)\datstrm.obj \ $(COMMDIR)\datstrm.obj \
$(COMMDIR)\dcbase.obj \ $(COMMDIR)\dcbase.obj \
@ -866,6 +867,11 @@ $(COMMDIR)/ctrlsub.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<< <<
$(COMMDIR)/datacmn.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(COMMDIR)/datetime.obj: $*.$(SRCSUFF) $(COMMDIR)/datetime.obj: $*.$(SRCSUFF)
cl @<< cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

View File

@ -110,6 +110,7 @@ COMMONOBJS_BASE = \
$(COMMDIR)/clntdata.$(OBJSUFF) \ $(COMMDIR)/clntdata.$(OBJSUFF) \
$(COMMDIR)/cmdline.$(OBJSUFF) \ $(COMMDIR)/cmdline.$(OBJSUFF) \
$(COMMDIR)/config.$(OBJSUFF) \ $(COMMDIR)/config.$(OBJSUFF) \
$(COMMDIR)/datacmn.$(OBJSUFF) \
$(COMMDIR)/datetime.$(OBJSUFF) \ $(COMMDIR)/datetime.$(OBJSUFF) \
$(COMMDIR)/datstrm.$(OBJSUFF) \ $(COMMDIR)/datstrm.$(OBJSUFF) \
$(COMMDIR)/db.$(OBJSUFF) \ $(COMMDIR)/db.$(OBJSUFF) \

View File

@ -70,6 +70,7 @@ COMMONOBJS = \
$(COMMDIR)\cshelp.obj \ $(COMMDIR)\cshelp.obj \
$(COMMDIR)\ctrlcmn.obj \ $(COMMDIR)\ctrlcmn.obj \
$(COMMDIR)\ctrlsub.obj \ $(COMMDIR)\ctrlsub.obj \
$(COMMDIR)\datacmn.obj \
$(COMMDIR)\datetime.obj \ $(COMMDIR)\datetime.obj \
$(COMMDIR)\datstrm.obj \ $(COMMDIR)\datstrm.obj \
$(COMMDIR)\db.obj \ $(COMMDIR)\db.obj \

View File

@ -148,6 +148,7 @@ COMMONOBJS = \
$(COMMDIR)\$D\cshelp.obj \ $(COMMDIR)\$D\cshelp.obj \
$(COMMDIR)\$D\ctrlcmn.obj \ $(COMMDIR)\$D\ctrlcmn.obj \
$(COMMDIR)\$D\ctrlsub.obj \ $(COMMDIR)\$D\ctrlsub.obj \
$(COMMDIR)\$D\datacmn.obj \
$(COMMDIR)\$D\datetime.obj \ $(COMMDIR)\$D\datetime.obj \
$(COMMDIR)\$D\datstrm.obj \ $(COMMDIR)\$D\datstrm.obj \
$(COMMDIR)\$D\db.obj \ $(COMMDIR)\$D\db.obj \

View File

@ -77,6 +77,7 @@ NONESSENTIALOBJS= $(OUTPUTDIR)\accel.obj &
$(OUTPUTDIR)\timer.obj $(OUTPUTDIR)\timer.obj
COMMONOBJS = & COMMONOBJS = &
$(OUTPUTDIR)\y_tab.obj &
$(OUTPUTDIR)\accesscmn.obj & $(OUTPUTDIR)\accesscmn.obj &
$(OUTPUTDIR)\appcmn.obj & $(OUTPUTDIR)\appcmn.obj &
$(OUTPUTDIR)\artprov.obj & $(OUTPUTDIR)\artprov.obj &
@ -92,6 +93,7 @@ COMMONOBJS = &
$(OUTPUTDIR)\cshelp.obj & $(OUTPUTDIR)\cshelp.obj &
$(OUTPUTDIR)\ctrlcmn.obj & $(OUTPUTDIR)\ctrlcmn.obj &
$(OUTPUTDIR)\ctrlsub.obj & $(OUTPUTDIR)\ctrlsub.obj &
$(OUTPUTDIR)\datacmn.obj &
$(OUTPUTDIR)\datetime.obj & $(OUTPUTDIR)\datetime.obj &
$(OUTPUTDIR)\datstrm.obj & $(OUTPUTDIR)\datstrm.obj &
$(OUTPUTDIR)\db.obj & $(OUTPUTDIR)\db.obj &
@ -755,6 +757,9 @@ $(OUTPUTDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.cpp
$(OUTPUTDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.cpp $(OUTPUTDIR)\ctrlsub.obj: $(COMMDIR)\ctrlsub.cpp
*$(CXX) $(CXXFLAGS) $< *$(CXX) $(CXXFLAGS) $<
$(OUTPUTDIR)\datacmn.obj: $(COMMDIR)\datacmn.cpp
*$(CXX) $(CXXFLAGS) $<
$(OUTPUTDIR)\datetime.obj: $(COMMDIR)\datetime.cpp $(OUTPUTDIR)\datetime.obj: $(COMMDIR)\datetime.cpp
*$(CXX) $(CXXFLAGS) $< *$(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 # Generic objects (not always compiled, depending on
# whether platforms have native implementations) # whether platforms have native implementations)

View File

@ -264,6 +264,10 @@ SOURCE=.\common\config.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\common\datacmn.cpp
# End Source File
# Begin Source File
SOURCE=.\common\datetime.cpp SOURCE=.\common\datetime.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

View File

@ -149,6 +149,10 @@ SOURCE=.\common\ctrlsub.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\common\datacmn.cpp
# End Source File
# Begin Source File
SOURCE=.\common\datetime.cpp SOURCE=.\common\datetime.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

View File

@ -308,6 +308,10 @@ SOURCE=.\common\ctrlsub.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\common\datacmn.cpp
# End Source File
# Begin Source File
SOURCE=.\common\datetime.cpp SOURCE=.\common\datetime.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

View File

@ -92,6 +92,7 @@ ALL_SOURCES = \
common/cshelp.cpp \ common/cshelp.cpp \
common/ctrlcmn.cpp \ common/ctrlcmn.cpp \
common/ctrlsub.cpp \ common/ctrlsub.cpp \
common/datacmn.cpp \
common/datetime.cpp \ common/datetime.cpp \
common/datstrm.cpp \ common/datstrm.cpp \
common/db.cpp \ common/db.cpp \
@ -661,6 +662,7 @@ COMMONOBJS = \
cshelp.o \ cshelp.o \
ctrlcmn.o \ ctrlcmn.o \
ctrlsub.o \ ctrlsub.o \
datacmn.o \
datetime.o \ datetime.o \
datstrm.o \ datstrm.o \
db.o \ db.o \