regenerated with tmake after adding datacmn.cpp

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

diff --git a/src/files.lst b/src/files.lst
index ed695b888bf1110fec508a91a045be71217699d4..9e01926773724aa0190a3b24bc33f25883312470 100644 (file)
--- 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 0bc3f919de5027e81608af14d09298c5ad057f9d..10b246e187332fa622a297d00031203ede36a5b4 100644 (file)
--- 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 0bc3f919de5027e81608af14d09298c5ad057f9d..10b246e187332fa622a297d00031203ede36a5b4 100644 (file)
--- 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 6cdb0cad99bd8163c80d376d7d179262f41150e6..ebbd3012e336632e5477c95a4234a041028cc548 100644 (file)
--- 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 6cdb0cad99bd8163c80d376d7d179262f41150e6..ebbd3012e336632e5477c95a4234a041028cc548 100644 (file)
--- 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 23ea9e577b03bc3de7c443380f55a65f8399e661..4415e7ef86a0c132b1d9ed77285e8d1fdc5094d9 100644 (file)
--- 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 1783db3cc5ac97b5f014fd16f3431fa19e7b8502..4a121b3f4a301d8c316675a38800514cf0c8116a 100644 (file)
--- 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 a53cb0db6256a0be47d99f7cfab40eae48fce9ea..9efe841a1c2cc9fb11d434a767910a3441f6fe74 100644 (file)
--- 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 63cfd7ab1cc754674a395f19d3ad6ee76d904196..4fd539d71c4a02be6e22560f49cf9f58e80fda23 100644 (file)
--- 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 b762acfad2818ebc1cb0f3232aa9fe1485af913e..8e0dfe314ed9dcf0711d90061821ba1764d250c2 100644 (file)
--- 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 4956c7b66aa81f85cb3091c85a669b4d3a8d54e5..8e663169b31903cc0774aab55d225791616d894b 100644 (file)
--- 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 5bbba8fbea4fe43427739ff0cac382a7b9b0e42f..64eaaa7594733ba7564d28b0f07168eee75142fa 100644 (file)
--- 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 f17fd7b4aef440d5db0318e5b2df70c1ca4cd05e..7583a0ee300a080ca9a068ed1a482d9f67d16163 100644 (file)
--- 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 48d8368c2fa32bb354cda3e2fc41c91e209ccb22..82934e0aa45eea834535e2c5f8250968903771c7 100644 (file)
--- 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 baaa40eae116e20b98fb8406b091fe1f50ee79cc..85f0732c6706695ed1fec6aadb152c793c985f53 100644 (file)
--- 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 f991c8be9a838c42d0dd7e3bbe33935424a6e231..88431a26aac5f2dd47d1d8f22af7a66c7ed46504 100644 (file)
--- 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 0ba2770acdacbe3d7c61db33773c8ceef625f386..72035afc13f3a1839470e3fe1610e0a6afeb729a 100644 (file)
--- 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 666cfd7a63be6a33a05186425bc08c7cb79054ba..228c41d4934dc9205b09f0e12660be91ba9a9c8f 100644 (file)
--- 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 7c1808e07c8d312ae451cddc3a1caa5fe0fd56fa..d4ba62b6e55804bc6a3764ef09f53eb6b165bcc2 100644 (file)
--- 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 fa1a58c7d258a27b9279437f47eb4f8cf1ac2d77..d5a6e0ac498888facd19128f2f44c43590301a7f 100644 (file)
--- 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 5ab5924fd95b5befe381eba4414817b9c4e9eb84..5a06666a79ff99e853585c3388ffd47a814df675 100644 (file)
--- 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 0a4110ba81b522e00429838c417ccd4d051cf529..6663e0a38fafae336ebb0cce45b84a012f4e3a4d 100644 (file)
--- 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 e5c5cc3eab7e7b7558993de316342495cb03a496..40b89bd8244436fe07ba29af9164f8d03a382afb 100644 (file)
--- 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 \