From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Thu, 16 Mar 2006 08:19:57 +0000 (+0000)
Subject: Rebuild build files so all night/Tinderbox/Coverity builds could sleep well.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/87853604296c0140cd25a909929de916626be29a

Rebuild build files so all night/Tinderbox/Coverity builds could sleep well.


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

diff --git a/build/mgl/makefile.wat b/build/mgl/makefile.wat
index 48bc6fcf5d..cfa42bf061 100644
--- a/build/mgl/makefile.wat
+++ b/build/mgl/makefile.wat
@@ -198,7 +198,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_dcmemory.obj &
 	$(OBJS)\monodll_dcscreen.obj &
 	$(OBJS)\monodll_dirmgl.obj &
-	$(OBJS)\monodll_display.obj &
 	$(OBJS)\monodll_evtloop.obj &
 	$(OBJS)\monodll_font.obj &
 	$(OBJS)\monodll_fontenum.obj &
@@ -482,7 +481,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_dcmemory.obj &
 	$(OBJS)\monolib_dcscreen.obj &
 	$(OBJS)\monolib_dirmgl.obj &
-	$(OBJS)\monolib_display.obj &
 	$(OBJS)\monolib_evtloop.obj &
 	$(OBJS)\monolib_font.obj &
 	$(OBJS)\monolib_fontenum.obj &
@@ -699,7 +697,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_dcmemory.obj &
 	$(OBJS)\coredll_dcscreen.obj &
 	$(OBJS)\coredll_dirmgl.obj &
-	$(OBJS)\coredll_display.obj &
 	$(OBJS)\coredll_evtloop.obj &
 	$(OBJS)\coredll_font.obj &
 	$(OBJS)\coredll_fontenum.obj &
@@ -888,7 +885,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_dcmemory.obj &
 	$(OBJS)\corelib_dcscreen.obj &
 	$(OBJS)\corelib_dirmgl.obj &
-	$(OBJS)\corelib_display.obj &
 	$(OBJS)\corelib_evtloop.obj &
 	$(OBJS)\corelib_font.obj &
 	$(OBJS)\corelib_fontenum.obj &
@@ -3404,9 +3400,6 @@ $(OBJS)\monodll_dcscreen.obj :  .AUTODEPEND ..\..\src\mgl\dcscreen.cpp
 $(OBJS)\monodll_dirmgl.obj :  .AUTODEPEND ..\..\src\mgl\dirmgl.cpp
 	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_display.obj :  .AUTODEPEND ..\..\src\mgl\display.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_evtloop.obj :  .AUTODEPEND ..\..\src\mgl\evtloop.cpp
 	$(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -4430,9 +4423,6 @@ $(OBJS)\monolib_dcscreen.obj :  .AUTODEPEND ..\..\src\mgl\dcscreen.cpp
 $(OBJS)\monolib_dirmgl.obj :  .AUTODEPEND ..\..\src\mgl\dirmgl.cpp
 	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_display.obj :  .AUTODEPEND ..\..\src\mgl\display.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_evtloop.obj :  .AUTODEPEND ..\..\src\mgl\evtloop.cpp
 	$(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -5684,9 +5674,6 @@ $(OBJS)\coredll_dcscreen.obj :  .AUTODEPEND ..\..\src\mgl\dcscreen.cpp
 $(OBJS)\coredll_dirmgl.obj :  .AUTODEPEND ..\..\src\mgl\dirmgl.cpp
 	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
-$(OBJS)\coredll_display.obj :  .AUTODEPEND ..\..\src\mgl\display.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
 $(OBJS)\coredll_evtloop.obj :  .AUTODEPEND ..\..\src\mgl\evtloop.cpp
 	$(CXX) -bt=dos -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
@@ -6224,9 +6211,6 @@ $(OBJS)\corelib_dcscreen.obj :  .AUTODEPEND ..\..\src\mgl\dcscreen.cpp
 $(OBJS)\corelib_dirmgl.obj :  .AUTODEPEND ..\..\src\mgl\dirmgl.cpp
 	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
-$(OBJS)\corelib_display.obj :  .AUTODEPEND ..\..\src\mgl\display.cpp
-	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
 $(OBJS)\corelib_evtloop.obj :  .AUTODEPEND ..\..\src\mgl\evtloop.cpp
 	$(CXX) -bt=dos -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
diff --git a/build/msw/config.bcc b/build/msw/config.bcc
index b6e1ddbc57..499851f1fe 100644
--- a/build/msw/config.bcc
+++ b/build/msw/config.bcc
@@ -120,7 +120,7 @@ USE_ODBC = 0
 
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 !ifndef USE_QA
-USE_QA = USE_QA_DEFAULT
+USE_QA = 0
 !endif
 
 # Enable exceptions in compiled code. [0,1]
diff --git a/build/msw/config.gcc b/build/msw/config.gcc
index 4f17fdf8dc..debf0f0692 100644
--- a/build/msw/config.gcc
+++ b/build/msw/config.gcc
@@ -77,7 +77,7 @@ USE_OPENGL = 0
 USE_ODBC = 0
 
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
-USE_QA = USE_QA_DEFAULT
+USE_QA = 0
 
 # Enable exceptions in compiled code. [0,1]
 USE_EXCEPTIONS = 1
diff --git a/build/msw/config.vc b/build/msw/config.vc
index 92a30d5e70..ce90f1558c 100644
--- a/build/msw/config.vc
+++ b/build/msw/config.vc
@@ -88,7 +88,7 @@ USE_OPENGL = 0
 USE_ODBC = 0
 
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
-USE_QA = USE_QA_DEFAULT
+USE_QA = 1
 
 # Enable exceptions in compiled code. [0,1]
 USE_EXCEPTIONS = 1
diff --git a/build/msw/config.wat b/build/msw/config.wat
index 2d521fc825..f11223b4d0 100644
--- a/build/msw/config.wat
+++ b/build/msw/config.wat
@@ -81,7 +81,7 @@ USE_OPENGL = 0
 USE_ODBC = 0
 
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
-USE_QA = USE_QA_DEFAULT
+USE_QA = 0
 
 # Enable exceptions in compiled code. [0,1]
 USE_EXCEPTIONS = 1
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index b1f43c109b..02431aa778 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1540,6 +1540,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_datavcmn.obj \
 	$(OBJS)\monodll_calctrl.obj \
 	$(OBJS)\monodll_datectlg.obj \
 	$(OBJS)\monodll_grid.obj \
@@ -1565,6 +1566,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_datavcmn.obj \
 	$(OBJS)\monodll_calctrl.obj \
 	$(OBJS)\monodll_datectlg.obj \
 	$(OBJS)\monodll_grid.obj \
@@ -2073,6 +2075,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_datavcmn.obj \
 	$(OBJS)\monolib_calctrl.obj \
 	$(OBJS)\monolib_datectlg.obj \
 	$(OBJS)\monolib_grid.obj \
@@ -2098,6 +2101,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_datavcmn.obj \
 	$(OBJS)\monolib_calctrl.obj \
 	$(OBJS)\monolib_datectlg.obj \
 	$(OBJS)\monolib_grid.obj \
@@ -2944,6 +2948,7 @@ __advdll___depname = \
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\advdll_datavcmn.obj \
 	$(OBJS)\advdll_calctrl.obj \
 	$(OBJS)\advdll_datectlg.obj \
 	$(OBJS)\advdll_grid.obj \
@@ -2969,6 +2974,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\advdll_datavcmn.obj \
 	$(OBJS)\advdll_calctrl.obj \
 	$(OBJS)\advdll_datectlg.obj \
 	$(OBJS)\advdll_grid.obj \
@@ -2997,6 +3003,7 @@ __advlib___depname = \
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\advlib_datavcmn.obj \
 	$(OBJS)\advlib_calctrl.obj \
 	$(OBJS)\advlib_datectlg.obj \
 	$(OBJS)\advlib_grid.obj \
@@ -3022,6 +3029,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\advlib_datavcmn.obj \
 	$(OBJS)\advlib_calctrl.obj \
 	$(OBJS)\advlib_datectlg.obj \
 	$(OBJS)\advlib_grid.obj \
@@ -5660,6 +5668,11 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -7403,6 +7416,11 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -10370,6 +10388,9 @@ $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
 $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
+$(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
 $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -10439,6 +10460,9 @@ $(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 
+$(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
 $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 529435dff2..fd50e96d24 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1554,6 +1554,7 @@ endif
 endif
 ifeq ($(WXUNIV),0)
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_datavcmn.o \
 	$(OBJS)\monodll_calctrl.o \
 	$(OBJS)\monodll_datectlg.o \
 	$(OBJS)\monodll_grid.o \
@@ -1579,6 +1580,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_datavcmn.o \
 	$(OBJS)\monodll_calctrl.o \
 	$(OBJS)\monodll_datectlg.o \
 	$(OBJS)\monodll_grid.o \
@@ -2093,6 +2095,7 @@ endif
 endif
 ifeq ($(WXUNIV),0)
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_datavcmn.o \
 	$(OBJS)\monolib_calctrl.o \
 	$(OBJS)\monolib_datectlg.o \
 	$(OBJS)\monolib_grid.o \
@@ -2118,6 +2121,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_datavcmn.o \
 	$(OBJS)\monolib_calctrl.o \
 	$(OBJS)\monolib_datectlg.o \
 	$(OBJS)\monolib_grid.o \
@@ -2992,6 +2996,7 @@ endif
 endif
 ifeq ($(WXUNIV),0)
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\advdll_datavcmn.o \
 	$(OBJS)\advdll_calctrl.o \
 	$(OBJS)\advdll_datectlg.o \
 	$(OBJS)\advdll_grid.o \
@@ -3017,6 +3022,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\advdll_datavcmn.o \
 	$(OBJS)\advdll_calctrl.o \
 	$(OBJS)\advdll_datectlg.o \
 	$(OBJS)\advdll_grid.o \
@@ -3049,6 +3055,7 @@ endif
 endif
 ifeq ($(WXUNIV),0)
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\advlib_datavcmn.o \
 	$(OBJS)\advlib_calctrl.o \
 	$(OBJS)\advlib_datectlg.o \
 	$(OBJS)\advlib_grid.o \
@@ -3074,6 +3081,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\advlib_datavcmn.o \
 	$(OBJS)\advlib_calctrl.o \
 	$(OBJS)\advlib_datectlg.o \
 	$(OBJS)\advlib_grid.o \
@@ -5864,6 +5872,11 @@ $(OBJS)\monodll_vscroll.o: ../../src/generic/vscroll.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_datavcmn.o: ../../src/common/datavcmn.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_calctrl.o: ../../src/generic/calctrl.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -7707,6 +7720,11 @@ $(OBJS)\monolib_vscroll.o: ../../src/generic/vscroll.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_datavcmn.o: ../../src/common/datavcmn.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_calctrl.o: ../../src/generic/calctrl.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10874,6 +10892,9 @@ $(OBJS)\advdll_version_rc.o: ../../src/msw/version.rc
 $(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\advdll_datavcmn.o: ../../src/common/datavcmn.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advdll_calctrl.o: ../../src/generic/calctrl.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -10943,6 +10964,9 @@ $(OBJS)\advlib_dummy.o: ../../src/msw/dummy.cpp
 $(OBJS)\advlib_datectrl.o: ../../src/msw/datectrl.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\advlib_datavcmn.o: ../../src/common/datavcmn.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advlib_calctrl.o: ../../src/generic/calctrl.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 7a13385b0a..ffb70f0c31 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1699,6 +1699,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_datavcmn.obj \
 	$(OBJS)\monodll_calctrl.obj \
 	$(OBJS)\monodll_datectlg.obj \
 	$(OBJS)\monodll_grid.obj \
@@ -1724,6 +1725,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_datavcmn.obj \
 	$(OBJS)\monodll_calctrl.obj \
 	$(OBJS)\monodll_datectlg.obj \
 	$(OBJS)\monodll_grid.obj \
@@ -2238,6 +2240,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_datavcmn.obj \
 	$(OBJS)\monolib_calctrl.obj \
 	$(OBJS)\monolib_datectlg.obj \
 	$(OBJS)\monolib_grid.obj \
@@ -2263,6 +2266,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_datavcmn.obj \
 	$(OBJS)\monolib_calctrl.obj \
 	$(OBJS)\monolib_datectlg.obj \
 	$(OBJS)\monolib_grid.obj \
@@ -3151,6 +3155,7 @@ __RUNTIME_LIBS_195 = $(__THREADSFLAG)
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\advdll_datavcmn.obj \
 	$(OBJS)\advdll_calctrl.obj \
 	$(OBJS)\advdll_datectlg.obj \
 	$(OBJS)\advdll_grid.obj \
@@ -3176,6 +3181,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\advdll_datavcmn.obj \
 	$(OBJS)\advdll_calctrl.obj \
 	$(OBJS)\advdll_datectlg.obj \
 	$(OBJS)\advdll_grid.obj \
@@ -3210,6 +3216,7 @@ __RUNTIME_LIBS_208 = $(__THREADSFLAG)
 !endif
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\advlib_datavcmn.obj \
 	$(OBJS)\advlib_calctrl.obj \
 	$(OBJS)\advlib_datectlg.obj \
 	$(OBJS)\advlib_grid.obj \
@@ -3235,6 +3242,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\advlib_datavcmn.obj \
 	$(OBJS)\advlib_calctrl.obj \
 	$(OBJS)\advlib_datectlg.obj \
 	$(OBJS)\advlib_grid.obj \
@@ -5969,6 +5977,11 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -7712,6 +7725,11 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -10679,6 +10697,9 @@ $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
 $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
+$(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
 $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -10748,6 +10769,9 @@ $(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
+$(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
 $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index ba7c4ea81b..7ddbec68b0 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -584,6 +584,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 ____ADVANCED_SRC_FILENAMES_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
+	$(OBJS)\monodll_datavcmn.obj &
 	$(OBJS)\monodll_calctrl.obj &
 	$(OBJS)\monodll_datectlg.obj &
 	$(OBJS)\monodll_grid.obj &
@@ -609,6 +610,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
+	$(OBJS)\monodll_datavcmn.obj &
 	$(OBJS)\monodll_calctrl.obj &
 	$(OBJS)\monodll_datectlg.obj &
 	$(OBJS)\monodll_grid.obj &
@@ -1127,6 +1129,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
+	$(OBJS)\monolib_datavcmn.obj &
 	$(OBJS)\monolib_calctrl.obj &
 	$(OBJS)\monolib_datectlg.obj &
 	$(OBJS)\monolib_grid.obj &
@@ -1152,6 +1155,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
+	$(OBJS)\monolib_datavcmn.obj &
 	$(OBJS)\monolib_calctrl.obj &
 	$(OBJS)\monolib_datectlg.obj &
 	$(OBJS)\monolib_grid.obj &
@@ -2036,6 +2040,7 @@ __advdll___depname = &
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
+	$(OBJS)\advdll_datavcmn.obj &
 	$(OBJS)\advdll_calctrl.obj &
 	$(OBJS)\advdll_datectlg.obj &
 	$(OBJS)\advdll_grid.obj &
@@ -2061,6 +2066,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
+	$(OBJS)\advdll_datavcmn.obj &
 	$(OBJS)\advdll_calctrl.obj &
 	$(OBJS)\advdll_datectlg.obj &
 	$(OBJS)\advdll_grid.obj &
@@ -2095,6 +2101,7 @@ __advlib___depname = &
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
+	$(OBJS)\advlib_datavcmn.obj &
 	$(OBJS)\advlib_calctrl.obj &
 	$(OBJS)\advlib_datectlg.obj &
 	$(OBJS)\advlib_grid.obj &
@@ -2120,6 +2127,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
+	$(OBJS)\advlib_datavcmn.obj &
 	$(OBJS)\advlib_calctrl.obj &
 	$(OBJS)\advlib_datectlg.obj &
 	$(OBJS)\advlib_grid.obj &
@@ -6064,6 +6072,11 @@ $(OBJS)\monodll_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7907,6 +7920,11 @@ $(OBJS)\monolib_vscroll.obj :  .AUTODEPEND ..\..\src\generic\vscroll.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -11074,6 +11092,9 @@ $(OBJS)\advdll_version.res :  .AUTODEPEND ..\..\src\msw\version.rc
 $(OBJS)\advdll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
+$(OBJS)\advdll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -11143,6 +11164,9 @@ $(OBJS)\advlib_dummy.obj :  .AUTODEPEND ..\..\src\msw\dummy.cpp
 $(OBJS)\advlib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
+$(OBJS)\advlib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp
index ef17a73be2..d76331b5a2 100644
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -452,6 +452,10 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\src\common\datavcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\taskbarcmn.cpp
 # End Source File
 # End Group
@@ -1157,6 +1161,10 @@ SOURCE=..\..\include\wx\calctrl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\dataview.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\datectrl.h
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 2dd850874a..2d0de36433 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -8455,6 +8455,10 @@ SOURCE=..\..\include\wx\dataobj.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\dataview.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\datectrl.h
 # End Source File
 # Begin Source File
@@ -8523,6 +8527,10 @@ SOURCE=..\..\include\wx\display.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\display_impl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\dnd.h
 # End Source File
 # Begin Source File
@@ -9019,6 +9027,10 @@ SOURCE=..\..\include\wx\wizard.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\wupdlock.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\wxhtml.h
 # End Source File
 # Begin Source File
diff --git a/build/os2/makefile.wat b/build/os2/makefile.wat
index e48edda601..d0f209e33d 100644
--- a/build/os2/makefile.wat
+++ b/build/os2/makefile.wat
@@ -204,7 +204,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_dcprint.obj &
 	$(OBJS)\monodll_dcscreen.obj &
 	$(OBJS)\monodll_dialog.obj &
-	$(OBJS)\monodll_display.obj &
 	$(OBJS)\monodll_dnd.obj &
 	$(OBJS)\monodll_evtloop.obj &
 	$(OBJS)\monodll_filedlg.obj &
@@ -678,7 +677,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_dcprint.obj &
 	$(OBJS)\monolib_dcscreen.obj &
 	$(OBJS)\monolib_dialog.obj &
-	$(OBJS)\monolib_display.obj &
 	$(OBJS)\monolib_dnd.obj &
 	$(OBJS)\monolib_evtloop.obj &
 	$(OBJS)\monolib_filedlg.obj &
@@ -1102,7 +1100,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_dcprint.obj &
 	$(OBJS)\coredll_dcscreen.obj &
 	$(OBJS)\coredll_dialog.obj &
-	$(OBJS)\coredll_display.obj &
 	$(OBJS)\coredll_dnd.obj &
 	$(OBJS)\coredll_evtloop.obj &
 	$(OBJS)\coredll_filedlg.obj &
@@ -1451,7 +1448,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_dcprint.obj &
 	$(OBJS)\corelib_dcscreen.obj &
 	$(OBJS)\corelib_dialog.obj &
-	$(OBJS)\corelib_display.obj &
 	$(OBJS)\corelib_dnd.obj &
 	$(OBJS)\corelib_evtloop.obj &
 	$(OBJS)\corelib_filedlg.obj &
@@ -4219,9 +4215,6 @@ $(OBJS)\monodll_dcprint.obj :  .AUTODEPEND ..\..\src\os2\dcprint.cpp
 $(OBJS)\monodll_dcscreen.obj :  .AUTODEPEND ..\..\src\os2\dcscreen.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_display.obj :  .AUTODEPEND ..\..\src\os2\display.cpp
-	$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_dnd.obj :  .AUTODEPEND ..\..\src\os2\dnd.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -5855,9 +5848,6 @@ $(OBJS)\monolib_dcprint.obj :  .AUTODEPEND ..\..\src\os2\dcprint.cpp
 $(OBJS)\monolib_dcscreen.obj :  .AUTODEPEND ..\..\src\os2\dcscreen.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_display.obj :  .AUTODEPEND ..\..\src\os2\display.cpp
-	$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_dnd.obj :  .AUTODEPEND ..\..\src\os2\dnd.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -7731,9 +7721,6 @@ $(OBJS)\coredll_dcprint.obj :  .AUTODEPEND ..\..\src\os2\dcprint.cpp
 $(OBJS)\coredll_dcscreen.obj :  .AUTODEPEND ..\..\src\os2\dcscreen.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
-$(OBJS)\coredll_display.obj :  .AUTODEPEND ..\..\src\os2\display.cpp
-	$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
 $(OBJS)\coredll_dnd.obj :  .AUTODEPEND ..\..\src\os2\dnd.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
@@ -8823,9 +8810,6 @@ $(OBJS)\corelib_dcprint.obj :  .AUTODEPEND ..\..\src\os2\dcprint.cpp
 $(OBJS)\corelib_dcscreen.obj :  .AUTODEPEND ..\..\src\os2\dcscreen.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 
-$(OBJS)\corelib_display.obj :  .AUTODEPEND ..\..\src\os2\display.cpp
-	$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
 $(OBJS)\corelib_dnd.obj :  .AUTODEPEND ..\..\src\os2\dnd.cpp
 	$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<