From 0b2e45b16264cf196e069adb1137cd47e426284d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 23 Mar 2003 01:56:46 +0000
Subject: [PATCH] regenerated the makefiles with the latest filelist.txt

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/files.lst        |   6 ++
 src/gtk1/files.lst       |   6 ++
 src/mac/carbon/files.lst |   8 ++
 src/mac/files.lst        |   8 ++
 src/motif/files.lst      |   9 ++
 src/msw/files.lst        |  19 +++-
 src/msw/makebase.vc      |  13 +--
 src/msw/makefile.b32     |  20 +++-
 src/msw/makefile.bcc     |   9 +-
 src/msw/makefile.dos     |  23 ++---
 src/msw/makefile.g95     |   1 -
 src/msw/makefile.sc      |   6 +-
 src/msw/makefile.vc      |   1 -
 src/msw/makefile.wat     |  20 +++-
 src/os2/files.lst        |   8 ++
 src/wxBase.dsp           |   4 +
 src/wxUniv.dsp           |  28 ++++++
 src/wxWindows.dsp        | 207 ++++++++++++++++++---------------------
 src/x11/files.lst        |   8 ++
 19 files changed, 252 insertions(+), 152 deletions(-)

diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index eaae85b72a..26e5bd64a3 100644
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -75,6 +75,7 @@ ALL_SOURCES = \
 		common/dobjcmn.cpp \
 		common/docmdi.cpp \
 		common/docview.cpp \
+		common/dpycmn.cpp \
 		common/dseldlg.cpp \
 		common/dynarray.cpp \
 		common/dynlib.cpp \
@@ -331,6 +332,7 @@ ALL_HEADERS = \
 		dir.h \
 		dirctrl.h \
 		dirdlg.h \
+		display.h \
 		dnd.h \
 		docmdi.h \
 		docview.h \
@@ -405,6 +407,7 @@ ALL_HEADERS = \
 		listimpl.cpp \
 		log.h \
 		longlong.h \
+		math.h \
 		matrix.h \
 		mdi.h \
 		memconf.h \
@@ -440,6 +443,7 @@ ALL_HEADERS = \
 		quantize.h \
 		radiobox.h \
 		radiobut.h \
+		rawbmp.h \
 		regex.h \
 		region.h \
 		resource.h \
@@ -553,6 +557,7 @@ ALL_HEADERS = \
 		gtk/menu.h \
 		gtk/menuitem.h \
 		gtk/minifram.h \
+		gtk/msgdlg.h \
 		gtk/notebook.h \
 		gtk/pen.h \
 		gtk/popupwin.h \
@@ -667,6 +672,7 @@ COMMONOBJS = \
 		dobjcmn.o \
 		docmdi.o \
 		docview.o \
+		dpycmn.o \
 		dseldlg.o \
 		dynarray.o \
 		dynlib.o \
diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst
index eaae85b72a..26e5bd64a3 100644
--- a/src/gtk1/files.lst
+++ b/src/gtk1/files.lst
@@ -75,6 +75,7 @@ ALL_SOURCES = \
 		common/dobjcmn.cpp \
 		common/docmdi.cpp \
 		common/docview.cpp \
+		common/dpycmn.cpp \
 		common/dseldlg.cpp \
 		common/dynarray.cpp \
 		common/dynlib.cpp \
@@ -331,6 +332,7 @@ ALL_HEADERS = \
 		dir.h \
 		dirctrl.h \
 		dirdlg.h \
+		display.h \
 		dnd.h \
 		docmdi.h \
 		docview.h \
@@ -405,6 +407,7 @@ ALL_HEADERS = \
 		listimpl.cpp \
 		log.h \
 		longlong.h \
+		math.h \
 		matrix.h \
 		mdi.h \
 		memconf.h \
@@ -440,6 +443,7 @@ ALL_HEADERS = \
 		quantize.h \
 		radiobox.h \
 		radiobut.h \
+		rawbmp.h \
 		regex.h \
 		region.h \
 		resource.h \
@@ -553,6 +557,7 @@ ALL_HEADERS = \
 		gtk/menu.h \
 		gtk/menuitem.h \
 		gtk/minifram.h \
+		gtk/msgdlg.h \
 		gtk/notebook.h \
 		gtk/pen.h \
 		gtk/popupwin.h \
@@ -667,6 +672,7 @@ COMMONOBJS = \
 		dobjcmn.o \
 		docmdi.o \
 		docview.o \
+		dpycmn.o \
 		dseldlg.o \
 		dynarray.o \
 		dynlib.o \
diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst
index c4a0bf92a5..a21cb9a8a4 100644
--- a/src/mac/carbon/files.lst
+++ b/src/mac/carbon/files.lst
@@ -45,6 +45,7 @@ ALL_SOURCES = \
 		generic/treectlg.cpp \
 		generic/treelay.cpp \
 		generic/wizard.cpp \
+		common/accesscmn.cpp \
 		common/appcmn.cpp \
 		common/artprov.cpp \
 		common/artstd.cpp \
@@ -71,6 +72,7 @@ ALL_SOURCES = \
 		common/dobjcmn.cpp \
 		common/docmdi.cpp \
 		common/docview.cpp \
+		common/dpycmn.cpp \
 		common/dseldlg.cpp \
 		common/dynarray.cpp \
 		common/dynlib.cpp \
@@ -278,6 +280,7 @@ ALL_SOURCES = \
 
 ALL_HEADERS = \
 		accel.h \
+		access.h \
 		app.h \
 		arrimpl.cpp \
 		artprov.h \
@@ -334,6 +337,7 @@ ALL_HEADERS = \
 		dir.h \
 		dirctrl.h \
 		dirdlg.h \
+		display.h \
 		dnd.h \
 		docmdi.h \
 		docview.h \
@@ -408,6 +412,7 @@ ALL_HEADERS = \
 		listimpl.cpp \
 		log.h \
 		longlong.h \
+		math.h \
 		matrix.h \
 		mdi.h \
 		memconf.h \
@@ -443,6 +448,7 @@ ALL_HEADERS = \
 		quantize.h \
 		radiobox.h \
 		radiobut.h \
+		rawbmp.h \
 		regex.h \
 		region.h \
 		resource.h \
@@ -666,6 +672,7 @@ ALL_HEADERS = \
 		protocol/protocol.h
 
 COMMONOBJS = \
+		accesscmn.o \
 		appcmn.o \
 		artprov.o \
 		artstd.o \
@@ -692,6 +699,7 @@ COMMONOBJS = \
 		dobjcmn.o \
 		docmdi.o \
 		docview.o \
+		dpycmn.o \
 		dseldlg.o \
 		dynarray.o \
 		dynlib.o \
diff --git a/src/mac/files.lst b/src/mac/files.lst
index c4a0bf92a5..a21cb9a8a4 100644
--- a/src/mac/files.lst
+++ b/src/mac/files.lst
@@ -45,6 +45,7 @@ ALL_SOURCES = \
 		generic/treectlg.cpp \
 		generic/treelay.cpp \
 		generic/wizard.cpp \
+		common/accesscmn.cpp \
 		common/appcmn.cpp \
 		common/artprov.cpp \
 		common/artstd.cpp \
@@ -71,6 +72,7 @@ ALL_SOURCES = \
 		common/dobjcmn.cpp \
 		common/docmdi.cpp \
 		common/docview.cpp \
+		common/dpycmn.cpp \
 		common/dseldlg.cpp \
 		common/dynarray.cpp \
 		common/dynlib.cpp \
@@ -278,6 +280,7 @@ ALL_SOURCES = \
 
 ALL_HEADERS = \
 		accel.h \
+		access.h \
 		app.h \
 		arrimpl.cpp \
 		artprov.h \
@@ -334,6 +337,7 @@ ALL_HEADERS = \
 		dir.h \
 		dirctrl.h \
 		dirdlg.h \
+		display.h \
 		dnd.h \
 		docmdi.h \
 		docview.h \
@@ -408,6 +412,7 @@ ALL_HEADERS = \
 		listimpl.cpp \
 		log.h \
 		longlong.h \
+		math.h \
 		matrix.h \
 		mdi.h \
 		memconf.h \
@@ -443,6 +448,7 @@ ALL_HEADERS = \
 		quantize.h \
 		radiobox.h \
 		radiobut.h \
+		rawbmp.h \
 		regex.h \
 		region.h \
 		resource.h \
@@ -666,6 +672,7 @@ ALL_HEADERS = \
 		protocol/protocol.h
 
 COMMONOBJS = \
+		accesscmn.o \
 		appcmn.o \
 		artprov.o \
 		artstd.o \
@@ -692,6 +699,7 @@ COMMONOBJS = \
 		dobjcmn.o \
 		docmdi.o \
 		docview.o \
+		dpycmn.o \
 		dseldlg.o \
 		dynarray.o \
 		dynlib.o \
diff --git a/src/motif/files.lst b/src/motif/files.lst
index 7a4fcad484..1823467ad8 100644
--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@@ -48,6 +48,7 @@ ALL_SOURCES = \
 		generic/treectlg.cpp \
 		generic/treelay.cpp \
 		generic/wizard.cpp \
+		common/accesscmn.cpp \
 		common/appcmn.cpp \
 		common/artprov.cpp \
 		common/artstd.cpp \
@@ -75,6 +76,7 @@ ALL_SOURCES = \
 		common/dobjcmn.cpp \
 		common/docmdi.cpp \
 		common/docview.cpp \
+		common/dpycmn.cpp \
 		common/dseldlg.cpp \
 		common/dynarray.cpp \
 		common/dynlib.cpp \
@@ -268,6 +270,8 @@ ALL_SOURCES = \
 
 ALL_HEADERS = \
 		accel.h \
+		access.h \
+		access.h \
 		app.h \
 		arrimpl.cpp \
 		artprov.h \
@@ -324,6 +328,7 @@ ALL_HEADERS = \
 		dir.h \
 		dirctrl.h \
 		dirdlg.h \
+		display.h \
 		dnd.h \
 		docmdi.h \
 		docview.h \
@@ -398,6 +403,7 @@ ALL_HEADERS = \
 		listimpl.cpp \
 		log.h \
 		longlong.h \
+		math.h \
 		matrix.h \
 		mdi.h \
 		memconf.h \
@@ -433,6 +439,7 @@ ALL_HEADERS = \
 		quantize.h \
 		radiobox.h \
 		radiobut.h \
+		rawbmp.h \
 		regex.h \
 		region.h \
 		resource.h \
@@ -634,6 +641,7 @@ ALL_HEADERS = \
 		x11/pen.h
 
 COMMONOBJS = \
+		accesscmn.o \
 		appcmn.o \
 		artprov.o \
 		artstd.o \
@@ -661,6 +669,7 @@ COMMONOBJS = \
 		dobjcmn.o \
 		docmdi.o \
 		docview.o \
+		dpycmn.o \
 		dseldlg.o \
 		dynarray.o \
 		dynlib.o \
diff --git a/src/msw/files.lst b/src/msw/files.lst
index 5396abecca..968c6563b5 100644
--- a/src/msw/files.lst
+++ b/src/msw/files.lst
@@ -32,6 +32,7 @@ ALL_SOURCES = \
 		generic/treectlg.cpp \
 		generic/treelay.cpp \
 		generic/wizard.cpp \
+		common/accesscmn.cpp \
 		common/appcmn.cpp \
 		common/artprov.cpp \
 		common/artstd.cpp \
@@ -58,6 +59,7 @@ ALL_SOURCES = \
 		common/dobjcmn.cpp \
 		common/docmdi.cpp \
 		common/docview.cpp \
+		common/dpycmn.cpp \
 		common/dseldlg.cpp \
 		common/dynarray.cpp \
 		common/dynlib.cpp \
@@ -163,6 +165,7 @@ ALL_SOURCES = \
 		common/zipstrm.cpp \
 		common/zstream.cpp \
 		msw/accel.cpp \
+		msw/ole/access.cpp \
 		msw/app.cpp \
 		msw/ole/automtn.cpp \
 		msw/bitmap.cpp \
@@ -178,7 +181,6 @@ ALL_SOURCES = \
 		msw/colour.cpp \
 		msw/combobox.cpp \
 		msw/control.cpp \
-		msw/curico.cpp \
 		msw/cursor.cpp \
 		msw/data.cpp \
 		msw/ole/dataobj.cpp \
@@ -193,6 +195,7 @@ ALL_SOURCES = \
 		msw/dib.cpp \
 		msw/dir.cpp \
 		msw/dirdlg.cpp \
+		msw/display.cpp \
 		msw/dragimag.cpp \
 		msw/ole/dropsrc.cpp \
 		msw/ole/droptgt.cpp \
@@ -294,6 +297,7 @@ ALL_SOURCES = \
 
 ALL_HEADERS = \
 		accel.h \
+		access.h \
 		app.h \
 		arrimpl.cpp \
 		artprov.h \
@@ -350,6 +354,7 @@ ALL_HEADERS = \
 		dir.h \
 		dirctrl.h \
 		dirdlg.h \
+		display.h \
 		dnd.h \
 		docmdi.h \
 		docview.h \
@@ -424,6 +429,7 @@ ALL_HEADERS = \
 		listimpl.cpp \
 		log.h \
 		longlong.h \
+		math.h \
 		matrix.h \
 		mdi.h \
 		memconf.h \
@@ -459,6 +465,7 @@ ALL_HEADERS = \
 		quantize.h \
 		radiobox.h \
 		radiobut.h \
+		rawbmp.h \
 		regex.h \
 		region.h \
 		resource.h \
@@ -536,6 +543,7 @@ ALL_HEADERS = \
 		zipstrm.h \
 		zstream.h \
 		msw/accel.h \
+		msw/access.h \
 		msw/app.h \
 		msw/bitmap.h \
 		msw/bmpbuttn.h \
@@ -550,8 +558,6 @@ ALL_HEADERS = \
 		msw/colour.h \
 		msw/combobox.h \
 		msw/control.h \
-		msw/curico.h \
-		msw/curicop.h \
 		msw/cursor.h \
 		msw/dc.h \
 		msw/dcclient.h \
@@ -629,6 +635,7 @@ ALL_HEADERS = \
 		msw/wave.h \
 		msw/window.h \
 		msw/winundef.h \
+		msw/ole/access.h \
 		msw/ole/automtn.h \
 		msw/ole/dataform.h \
 		msw/ole/dataobj.h \
@@ -701,6 +708,7 @@ ALL_HEADERS = \
 		protocol/protocol.h
 
 COMMONOBJS = \
+		accesscmn.o \
 		appcmn.o \
 		artprov.o \
 		artstd.o \
@@ -727,6 +735,7 @@ COMMONOBJS = \
 		dobjcmn.o \
 		docmdi.o \
 		docview.o \
+		dpycmn.o \
 		dseldlg.o \
 		dynarray.o \
 		dynlib.o \
@@ -881,7 +890,6 @@ GUIOBJS = \
 		colour.o \
 		combobox.o \
 		control.o \
-		curico.o \
 		cursor.o \
 		data.o \
 		dc.o \
@@ -895,6 +903,7 @@ GUIOBJS = \
 		dib.o \
 		dir.o \
 		dirdlg.o \
+		display.o \
 		dragimag.o \
 		enhmeta.o \
 		evtloop.o \
@@ -988,6 +997,7 @@ GUI_LOWLEVEL_OBJS = \
 		dialup.o \
 		dib.o \
 		dirdlg.o \
+		display.o \
 		enhmeta.o \
 		evtloop.o \
 		font.o \
@@ -1044,6 +1054,7 @@ HTMLOBJS = \
 		winpars.o
 
 OLEOBJS = \
+		access.o \
 		automtn.o \
 		dataobj.o \
 		dropsrc.o \
diff --git a/src/msw/makebase.vc b/src/msw/makebase.vc
index 670c54fcf3..0f544f5fce 100644
--- a/src/msw/makebase.vc
+++ b/src/msw/makebase.vc
@@ -143,17 +143,13 @@ MSWOBJS = ..\msw\$D\dde.obj \
 
 OBJECTS = $(COMMONOBJS) $(MSWOBJS) 
 
-ARCHINCDIR=$(WXDIR)\lib\$(_WXINC_BUILD)$(_WXINC_DLLSUFFIX)$(_WXINC_SUFFIX)$(LIBEXT)
+ARCHINCDIR=$(WXDIR)\lib\base$(INCEXT)
 SETUP_H=$(ARCHINCDIR)\wx\setup.h
 
 # Normal, static library
 #all:    dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)
 all:    dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib $(LIBTARGET)
 
-$(ARCHINCDIR)\wx:
-    mkdir $(ARCHINCDIR)
-    mkdir $(ARCHINCDIR)\wx
-
 $(WXDIR)\include\wx\msw\setup.h:
     cd $(WXDIR)\include\wx\msw
     if not exist setup.h copy setup0.h setup.h
@@ -162,7 +158,7 @@ $(WXDIR)\include\wx\msw\setup.h:
 $(SETUP_H): $(WXDIR)\include\wx\msw\setup.h
     copy $(WXDIR)\include\wx\msw\setup.h $@
 
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(ARCHINCDIR)\wx $(WXDIR)\$D
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D 
 
 $D:
     mkdir $D
@@ -173,9 +169,6 @@ $(COMMDIR)\$D:
 $(MSWDIR)\$D:
     mkdir $(MSWDIR)\$D
 
-$(WXDIR)\$D:
-    mkdir $(WXDIR)\$D
-
 ### Static library
 
 $(WXDIR)\lib\$(WXLIBNAME).lib:      $(DUMMYOBJ) $(OBJECTS) 
@@ -201,7 +194,7 @@ $(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
 ..\common\lex_yy.c:    ..\common\doslex.c
     copy "..\common"\doslex.c "..\common"\lex_yy.c
 
-$(OBJECTS): $(SETUP_H)
+$(OBJECTS): $(WXDIR)/include/wx/setup.h
 
 ..\common\$D\unzip.obj:     ..\common\unzip.c
         cl @<<
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 9e78bf3f83..8f4fbe0f0b 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -105,6 +105,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 		$(MSWDIR)\wizard.obj
 
 MSWOBJS = $(MSWDIR)\accel.obj \
+		$(MSWDIR)\access.obj \
 		$(MSWDIR)\app.obj \
 		$(MSWDIR)\automtn.obj \
 		$(MSWDIR)\bitmap.obj \
@@ -120,7 +121,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\colour.obj \
 		$(MSWDIR)\combobox.obj \
 		$(MSWDIR)\control.obj \
-		$(MSWDIR)\curico.obj \
 		$(MSWDIR)\cursor.obj \
 		$(MSWDIR)\data.obj \
 		$(MSWDIR)\dataobj.obj \
@@ -135,6 +135,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\dib.obj \
 		$(MSWDIR)\dir.obj \
 		$(MSWDIR)\dirdlg.obj \
+		$(MSWDIR)\display.obj \
 		$(MSWDIR)\dragimag.obj \
 		$(MSWDIR)\dropsrc.obj \
 		$(MSWDIR)\droptgt.obj \
@@ -279,6 +280,7 @@ MSWUNIVOBJS = $(MSWDIR)\app.obj \
 		$(MSWDIR)\dib.obj \
 		$(MSWDIR)\dir.obj \
 		$(MSWDIR)\dirdlg.obj \
+		$(MSWDIR)\display.obj \
 		$(MSWDIR)\dropsrc.obj \
 		$(MSWDIR)\droptgt.obj \
 		$(MSWDIR)\enhmeta.obj \
@@ -382,7 +384,8 @@ HTMLOBJS = $(MSWDIR)\helpctrl.obj \
 
 COMMONOBJS = \
         $(MSWDIR)\y_tab.obj \
-        $(MSWDIR)\appcmn.obj \
+        $(MSWDIR)\accesscmn.obj \
+		$(MSWDIR)\appcmn.obj \
 		$(MSWDIR)\artprov.obj \
 		$(MSWDIR)\artstd.obj \
 		$(MSWDIR)\choiccmn.obj \
@@ -408,6 +411,7 @@ COMMONOBJS = \
 		$(MSWDIR)\dobjcmn.obj \
 		$(MSWDIR)\docmdi.obj \
 		$(MSWDIR)\docview.obj \
+		$(MSWDIR)\dpycmn.obj \
 		$(MSWDIR)\dseldlg.obj \
 		$(MSWDIR)\dynarray.obj \
 		$(MSWDIR)\dynlib.obj \
@@ -628,6 +632,8 @@ $(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
 
 $(MSWDIR)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF)
 
+$(MSWDIR)\display.obj: $(MSWDIR)\display.$(SRCSUFF)
+
 $(MSWDIR)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF)
 
 $(MSWDIR)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF)
@@ -717,6 +723,8 @@ $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
 $(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF)
 
+$(MSWDIR)\access.obj: $(OLEDIR)\access.$(SRCSUFF)
+
 $(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
 
 $(MSWDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
@@ -747,8 +755,6 @@ $(MSWDIR)\combobox.obj: $(MSWDIR)\combobox.$(SRCSUFF)
 
 $(MSWDIR)\control.obj: $(MSWDIR)\control.$(SRCSUFF)
 
-$(MSWDIR)\curico.obj: $(MSWDIR)\curico.$(SRCSUFF)
-
 $(MSWDIR)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF)
 
 $(MSWDIR)\data.obj: $(MSWDIR)\data.$(SRCSUFF)
@@ -777,6 +783,8 @@ $(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
 
 $(MSWDIR)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF)
 
+$(MSWDIR)\display.obj: $(MSWDIR)\display.$(SRCSUFF)
+
 $(MSWDIR)\dragimag.obj: $(MSWDIR)\dragimag.$(SRCSUFF)
 
 $(MSWDIR)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF)
@@ -1026,6 +1034,8 @@ $(MSWDIR)\win32.obj: $(UNIVTHEMEDIR)\win32.$(SRCSUFF)
 ########################################################
 # Common objects (always compiled)
 
+$(MSWDIR)\accesscmn.obj: $(COMMDIR)\accesscmn.$(SRCSUFF)
+
 $(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF)
 
 $(MSWDIR)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF)
@@ -1078,6 +1088,8 @@ $(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
 
 $(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
 
+$(MSWDIR)\dpycmn.obj: $(COMMDIR)\dpycmn.$(SRCSUFF)
+
 $(MSWDIR)\dseldlg.obj: $(COMMDIR)\dseldlg.$(SRCSUFF)
 
 $(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index de53a83735..931426abdc 100644
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -107,6 +107,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 
 COMMONOBJS = \
 		$(MSWDIR)\y_tab.obj \
+		$(MSWDIR)\accesscmn.obj \
 		$(MSWDIR)\appcmn.obj \
 		$(MSWDIR)\artprov.obj \
 		$(MSWDIR)\artstd.obj \
@@ -130,6 +131,7 @@ COMMONOBJS = \
 		$(MSWDIR)\dobjcmn.obj \
 		$(MSWDIR)\docmdi.obj \
 		$(MSWDIR)\docview.obj \
+		$(MSWDIR)\dpycmn.obj \
 		$(MSWDIR)\dseldlg.obj \
 		$(MSWDIR)\dynarray.obj \
 		$(MSWDIR)\dynlib.obj \
@@ -234,7 +236,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\colour.obj \
 		$(MSWDIR)\combobox.obj \
 		$(MSWDIR)\control.obj \
-		$(MSWDIR)\curico.obj \
 		$(MSWDIR)\cursor.obj \
 		$(MSWDIR)\data.obj \
 		$(MSWDIR)\dc.obj \
@@ -369,8 +370,6 @@ $(MSWDIR)\combobox.obj: $(MSWDIR)\combobox.$(SRCSUFF)
 
 $(MSWDIR)\control.obj: $(MSWDIR)\control.$(SRCSUFF)
 
-$(MSWDIR)\curico.obj: $(MSWDIR)\curico.$(SRCSUFF)
-
 $(MSWDIR)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF)
 
 $(MSWDIR)\data.obj: $(MSWDIR)\data.$(SRCSUFF)
@@ -518,6 +517,8 @@ $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 ########################################################
 # Common objects (always compiled)
 
+$(MSWDIR)\accesscmn.obj: $(COMMDIR)\accesscmn.$(SRCSUFF)
+
 $(MSWDIR)\appcmn.obj: $(COMMDIR)\appcmn.$(SRCSUFF)
 
 $(MSWDIR)\artprov.obj: $(COMMDIR)\artprov.$(SRCSUFF)
@@ -564,6 +565,8 @@ $(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
 
 $(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
 
+$(MSWDIR)\dpycmn.obj: $(COMMDIR)\dpycmn.$(SRCSUFF)
+
 $(MSWDIR)\dseldlg.obj: $(COMMDIR)\dseldlg.$(SRCSUFF)
 
 $(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 106ca48017..3fd9f07a2b 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -91,6 +91,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 # we can't have all objects in one list because the library becomes too big
 COMMONOBJS1 = \
 		$(COMMDIR)\y_tab.obj \
+		$(COMMDIR)\accesscmn.obj \
 		$(COMMDIR)\appcmn.obj \
 		$(COMMDIR)\artprov.obj \
 		$(COMMDIR)\artstd.obj \
@@ -115,6 +116,7 @@ COMMONOBJS1 = \
 		$(COMMDIR)\dobjcmn.obj \
 		$(COMMDIR)\docmdi.obj \
 		$(COMMDIR)\docview.obj \
+		$(COMMDIR)\dpycmn.obj \
 		$(COMMDIR)\dseldlg.obj \
 		$(COMMDIR)\dynarray.obj \
 		$(COMMDIR)\dynlib.obj \
@@ -222,7 +224,6 @@ MSWOBJS1 = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\colour.obj \
 		$(MSWDIR)\combobox.obj \
 		$(MSWDIR)\control.obj \
-		$(MSWDIR)\curico.obj \
 		$(MSWDIR)\cursor.obj \
 		$(MSWDIR)\data.obj \
 		$(MSWDIR)\dc.obj \
@@ -442,11 +443,6 @@ $(MSWDIR)/control.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/curico.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(MSWDIR)/cursor.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -502,11 +498,6 @@ $(MSWDIR)/dib.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/dibutils.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(MSWDIR)/dir.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -807,6 +798,11 @@ $(MSWDIR)/window.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/accesscmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/appcmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -927,6 +923,11 @@ $(COMMDIR)/docview.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/dpycmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/dseldlg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 1be7587c1a..f02b03774c 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -304,7 +304,6 @@ MSWOBJS     = \
 		$(MSWDIR)/colour.$(OBJSUFF) \
 		$(MSWDIR)/combobox.$(OBJSUFF) \
 		$(MSWDIR)/control.$(OBJSUFF) \
-		$(MSWDIR)/curico.$(OBJSUFF) \
 		$(MSWDIR)/cursor.$(OBJSUFF) \
 		$(MSWDIR)/data.$(OBJSUFF) \
 		$(MSWDIR)/dc.$(OBJSUFF) \
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 426b57d914..d1e48df4d5 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,4 +1,3 @@
-;    Last change:  JS   18 Mar 103    2:45 pm
 
 
 # This file was automatically generated by tmake 
@@ -60,6 +59,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 
 COMMONOBJS = \
 		$(COMMDIR)\y_tab.obj \
+		$(COMMDIR)\accesscmn.obj \
 		$(COMMDIR)\appcmn.obj \
 		$(COMMDIR)\artprov.obj \
 		$(COMMDIR)\artstd.obj \
@@ -86,6 +86,7 @@ COMMONOBJS = \
 		$(COMMDIR)\dobjcmn.obj \
 		$(COMMDIR)\docmdi.obj \
 		$(COMMDIR)\docview.obj \
+		$(COMMDIR)\dpycmn.obj \
 		$(COMMDIR)\dseldlg.obj \
 		$(COMMDIR)\dynarray.obj \
 		$(COMMDIR)\dynlib.obj \
@@ -192,6 +193,7 @@ COMMONOBJS = \
 		$(COMMDIR)\zstream.obj
 
 MSWOBJS = $(MSWDIR)\accel.obj \
+		$(MSWDIR)\ole\access.obj \
 		$(MSWDIR)\app.obj \
 		$(MSWDIR)\ole\automtn.obj \
 		$(MSWDIR)\bitmap.obj \
@@ -207,7 +209,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\colour.obj \
 		$(MSWDIR)\combobox.obj \
 		$(MSWDIR)\control.obj \
-		$(MSWDIR)\curico.obj \
 		$(MSWDIR)\cursor.obj \
 		$(MSWDIR)\data.obj \
 		$(MSWDIR)\ole\dataobj.obj \
@@ -222,6 +223,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\dib.obj \
 		$(MSWDIR)\dir.obj \
 		$(MSWDIR)\dirdlg.obj \
+		$(MSWDIR)\display.obj \
 		$(MSWDIR)\dragimag.obj \
 		$(MSWDIR)\ole\dropsrc.obj \
 		$(MSWDIR)\ole\droptgt.obj \
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index c6a6c8fd54..ee4909f248 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -287,7 +287,6 @@ MSWOBJS = $(MSWDIR)\$D\accel.obj \
 		$(MSWDIR)\$D\colour.obj \
 		$(MSWDIR)\$D\combobox.obj \
 		$(MSWDIR)\$D\control.obj \
-		$(MSWDIR)\$D\curico.obj \
 		$(MSWDIR)\$D\cursor.obj \
 		$(MSWDIR)\$D\data.obj \
 		$(OLEDIR)\$D\dataobj.obj \
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index ee6096abbb..aa911ed252 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -82,6 +82,7 @@ NONESSENTIALOBJS= $(OUTPUTDIR)\accel.obj &
 
 COMMONOBJS = &
 	$(OUTPUTDIR)\y_tab.obj &
+	$(OUTPUTDIR)\accesscmn.obj &
 	$(OUTPUTDIR)\appcmn.obj &
 	$(OUTPUTDIR)\artprov.obj &
 	$(OUTPUTDIR)\artstd.obj &
@@ -108,6 +109,7 @@ COMMONOBJS = &
 	$(OUTPUTDIR)\dobjcmn.obj &
 	$(OUTPUTDIR)\docmdi.obj &
 	$(OUTPUTDIR)\docview.obj &
+	$(OUTPUTDIR)\dpycmn.obj &
 	$(OUTPUTDIR)\dseldlg.obj &
 	$(OUTPUTDIR)\dynarray.obj &
 	$(OUTPUTDIR)\dynlib.obj &
@@ -214,6 +216,7 @@ COMMONOBJS = &
 	$(OUTPUTDIR)\zstream.obj
 
 MSWOBJS = $(OUTPUTDIR)\accel.obj &
+	$(OUTPUTDIR)\access.obj &
 	$(OUTPUTDIR)\app.obj &
 	$(OUTPUTDIR)\automtn.obj &
 	$(OUTPUTDIR)\bitmap.obj &
@@ -229,7 +232,6 @@ MSWOBJS = $(OUTPUTDIR)\accel.obj &
 	$(OUTPUTDIR)\colour.obj &
 	$(OUTPUTDIR)\combobox.obj &
 	$(OUTPUTDIR)\control.obj &
-	$(OUTPUTDIR)\curico.obj &
 	$(OUTPUTDIR)\cursor.obj &
 	$(OUTPUTDIR)\data.obj &
 	$(OUTPUTDIR)\dataobj.obj &
@@ -244,6 +246,7 @@ MSWOBJS = $(OUTPUTDIR)\accel.obj &
 	$(OUTPUTDIR)\dib.obj &
 	$(OUTPUTDIR)\dir.obj &
 	$(OUTPUTDIR)\dirdlg.obj &
+	$(OUTPUTDIR)\display.obj &
 	$(OUTPUTDIR)\dragimag.obj &
 	$(OUTPUTDIR)\dropsrc.obj &
 	$(OUTPUTDIR)\droptgt.obj &
@@ -380,6 +383,9 @@ cleanall:   clean
 $(OUTPUTDIR)\accel.obj:     $(MSWDIR)\accel.cpp
   *$(CXX) $(CXXFLAGS) $<
 
+$(OUTPUTDIR)\access.obj:     $(OLEDIR)\access.cpp
+  *$(CXX) $(CXXFLAGS) $<
+
 $(OUTPUTDIR)\app.obj:     $(MSWDIR)\app.cpp
   *$(CXX) $(CXXFLAGS) $<
 
@@ -425,9 +431,6 @@ $(OUTPUTDIR)\combobox.obj:     $(MSWDIR)\combobox.cpp
 $(OUTPUTDIR)\control.obj:     $(MSWDIR)\control.cpp
   *$(CXX) $(CXXFLAGS) $<
 
-$(OUTPUTDIR)\curico.obj:     $(MSWDIR)\curico.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
 $(OUTPUTDIR)\cursor.obj:     $(MSWDIR)\cursor.cpp
   *$(CXX) $(CXXFLAGS) $<
 
@@ -470,6 +473,9 @@ $(OUTPUTDIR)\dir.obj:     $(MSWDIR)\dir.cpp
 $(OUTPUTDIR)\dirdlg.obj:     $(MSWDIR)\dirdlg.cpp
   *$(CXX) $(CXXFLAGS) $<
 
+$(OUTPUTDIR)\display.obj:     $(MSWDIR)\display.cpp
+  *$(CXX) $(CXXFLAGS) $<
+
 $(OUTPUTDIR)\dragimag.obj:     $(MSWDIR)\dragimag.cpp
   *$(CXX) $(CXXFLAGS) $<
 
@@ -709,6 +715,9 @@ $(OUTPUTDIR)\window.obj:     $(MSWDIR)\window.cpp
 ########################################################
 # Common objects (always compiled)
 
+$(OUTPUTDIR)\accesscmn.obj:     $(COMMDIR)\accesscmn.cpp
+  *$(CXX) $(CXXFLAGS) $<
+
 $(OUTPUTDIR)\appcmn.obj:     $(COMMDIR)\appcmn.cpp
   *$(CXX) $(CXXFLAGS) $<
 
@@ -787,6 +796,9 @@ $(OUTPUTDIR)\docmdi.obj:     $(COMMDIR)\docmdi.cpp
 $(OUTPUTDIR)\docview.obj:     $(COMMDIR)\docview.cpp
   *$(CXX) $(CXXFLAGS) $<
 
+$(OUTPUTDIR)\dpycmn.obj:     $(COMMDIR)\dpycmn.cpp
+  *$(CXX) $(CXXFLAGS) $<
+
 $(OUTPUTDIR)\dseldlg.obj:     $(COMMDIR)\dseldlg.cpp
   *$(CXX) $(CXXFLAGS) $<
 
diff --git a/src/os2/files.lst b/src/os2/files.lst
index 4242bb5203..9f0681f12d 100644
--- a/src/os2/files.lst
+++ b/src/os2/files.lst
@@ -43,6 +43,7 @@ ALL_SOURCES = \
 		generic/treectlg.cpp \
 		generic/treelay.cpp \
 		generic/wizard.cpp \
+		common/accesscmn.cpp \
 		common/appcmn.cpp \
 		common/artprov.cpp \
 		common/artstd.cpp \
@@ -69,6 +70,7 @@ ALL_SOURCES = \
 		common/dobjcmn.cpp \
 		common/docmdi.cpp \
 		common/docview.cpp \
+		common/dpycmn.cpp \
 		common/dseldlg.cpp \
 		common/dynarray.cpp \
 		common/dynlib.cpp \
@@ -271,6 +273,7 @@ ALL_SOURCES = \
 
 ALL_HEADERS = \
 		accel.h \
+		access.h \
 		app.h \
 		arrimpl.cpp \
 		artprov.h \
@@ -327,6 +330,7 @@ ALL_HEADERS = \
 		dir.h \
 		dirctrl.h \
 		dirdlg.h \
+		display.h \
 		dnd.h \
 		docmdi.h \
 		docview.h \
@@ -401,6 +405,7 @@ ALL_HEADERS = \
 		listimpl.cpp \
 		log.h \
 		longlong.h \
+		math.h \
 		matrix.h \
 		mdi.h \
 		memconf.h \
@@ -436,6 +441,7 @@ ALL_HEADERS = \
 		quantize.h \
 		radiobox.h \
 		radiobut.h \
+		rawbmp.h \
 		regex.h \
 		region.h \
 		resource.h \
@@ -643,6 +649,7 @@ ALL_HEADERS = \
 
 COMMONOBJS = \
 		parser.o \
+		accesscmn.o \
 		appcmn.o \
 		artprov.o \
 		artstd.o \
@@ -669,6 +676,7 @@ COMMONOBJS = \
 		dobjcmn.o \
 		docmdi.o \
 		docview.o \
+		dpycmn.o \
 		dseldlg.o \
 		dynarray.o \
 		dynlib.o \
diff --git a/src/wxBase.dsp b/src/wxBase.dsp
index 93c3275ab5..31c005a171 100644
--- a/src/wxBase.dsp
+++ b/src/wxBase.dsp
@@ -856,6 +856,10 @@ SOURCE=..\include\wx\longlong.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\math.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\memconf.h
 # End Source File
 # Begin Source File
diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index a7195abe46..5b4c70bb67 100644
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -85,6 +85,10 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\common\accesscmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\appcmn.cpp
 # End Source File
 # Begin Source File
@@ -193,6 +197,10 @@ SOURCE=.\common\docview.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\dpycmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\dseldlg.cpp
 # End Source File
 # Begin Source File
@@ -960,6 +968,10 @@ SOURCE=.\msw\dirdlg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\display.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\enhmeta.cpp
 # End Source File
 # Begin Source File
@@ -1331,6 +1343,10 @@ SOURCE=..\include\wx\accel.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\access.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\app.h
 # End Source File
 # Begin Source File
@@ -1551,6 +1567,10 @@ SOURCE=..\include\wx\dirdlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\display.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\dnd.h
 # End Source File
 # Begin Source File
@@ -1843,6 +1863,10 @@ SOURCE=..\include\wx\longlong.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\math.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\matrix.h
 # End Source File
 # Begin Source File
@@ -1983,6 +2007,10 @@ SOURCE=..\include\wx\radiobut.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\rawbmp.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\regex.h
 # End Source File
 # Begin Source File
diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index 63cc1d5661..49a9dfb439 100644
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -2,8 +2,8 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
 CFG=wxWindows - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -32,6 +32,8 @@ CFG=wxWindows - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
 
 !IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
 
@@ -46,13 +48,10 @@ CFG=wxWindows - Win32 Debug
 # PROP Intermediate_Dir "../ReleaseUnicodeDll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
 # ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
-MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
 BSC32=bscmake.exe
@@ -75,20 +74,17 @@ LINK32=link.exe
 # PROP Intermediate_Dir "../DebugUnicodeDll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
 # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
-MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw250ud.dll"
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll"
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
@@ -103,10 +99,8 @@ LINK32=link.exe
 # PROP Output_Dir "../lib"
 # PROP Intermediate_Dir "../ReleaseUnicode"
 # PROP Target_Dir ""
-CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
-RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -128,10 +122,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "../lib"
 # PROP Intermediate_Dir "../DebugUnicode"
 # PROP Target_Dir ""
-CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
-RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -154,13 +146,10 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "../ReleaseDll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
 # ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
-MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
 BSC32=bscmake.exe
@@ -183,20 +172,17 @@ LINK32=link.exe
 # PROP Intermediate_Dir "../DebugDll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
 # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
-MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw250d.dll"
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll"
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
@@ -211,10 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "../lib"
 # PROP Intermediate_Dir "../Release"
 # PROP Target_Dir ""
-CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -236,10 +220,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "../lib"
 # PROP Intermediate_Dir "../Debug"
 # PROP Target_Dir ""
-CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -374,9 +356,7 @@ SOURCE=.\common\docview.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\dosyacc.c
-# ADD CPP /W1 /D "USE_DEFINE" /D "IDE_INVOKED"
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\common\dpycmn.cpp
 # End Source File
 # Begin Source File
 
@@ -408,11 +388,6 @@ SOURCE=.\common\event.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\fddlgcmn.cpp
 # End Source File
 # Begin Source File
@@ -741,11 +716,6 @@ SOURCE=.\common\txtstrm.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\url.cpp
 # End Source File
 # Begin Source File
@@ -796,6 +766,24 @@ SOURCE=.\common\zipstrm.cpp
 
 SOURCE=.\common\zstream.cpp
 # End Source File
+
+# Begin Source File
+
+SOURCE=.\common\extended.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\unzip.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+
+# Begin Source File
+
+SOURCE=.\common\dosyacc.c
+# ADD CPP /W1 /D "USE_DEFINE" /D "IDE_INVOKED"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
 # End Group
 # Begin Group "Generic Files"
 
@@ -924,6 +912,7 @@ SOURCE=.\generic\treelay.cpp
 
 SOURCE=.\generic\wizard.cpp
 # End Source File
+
 # End Group
 # Begin Group "wxHTML Files"
 
@@ -1008,42 +997,16 @@ SOURCE=.\html\m_tables.cpp
 
 SOURCE=.\html\winpars.cpp
 # End Source File
+
 # End Group
 # Begin Group "MSW Files"
 
 # PROP Default_Filter ""
-# Begin Group "OLE Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\msw\ole\access.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\automtn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\dataobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\dropsrc.cpp
-# End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\droptgt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\oleutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\uuid.cpp
+SOURCE=.\msw\dummy.cpp
+# ADD CPP /Yc"wx/wxprec.h"
 # End Source File
-# End Group
 # Begin Source File
 
 SOURCE=.\msw\accel.cpp
@@ -1106,10 +1069,6 @@ SOURCE=.\msw\control.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\curico.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\cursor.cpp
 # End Source File
 # Begin Source File
@@ -1162,12 +1121,11 @@ SOURCE=.\msw\dirdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\dragimag.cpp
+SOURCE=.\msw\display.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\dummy.cpp
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=.\msw\dragimag.cpp
 # End Source File
 # Begin Source File
 
@@ -1223,16 +1181,6 @@ SOURCE=.\msw\glcanvas.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\helpbest.cpp
 # End Source File
 # Begin Source File
@@ -1463,6 +1411,51 @@ SOURCE=.\msw\wave.cpp
 
 SOURCE=.\msw\window.cpp
 # End Source File
+
+# Begin Source File
+
+SOURCE=.\msw\gsocket.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\gsockmsw.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+
+# Begin Group "OLE Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\msw\ole\access.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\automtn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\dataobj.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\dropsrc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\droptgt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\oleutils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\uuid.cpp
+# End Source File
+
+# End Group
 # End Group
 # Begin Group "Headers"
 
@@ -1473,9 +1466,7 @@ SOURCE=.\msw\window.cpp
 # Begin Source File
 
 SOURCE=..\include\wx\msw\setup.h
-
 !IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
-
 # Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
 
@@ -1483,9 +1474,7 @@ InputPath=..\include\wx\msw\setup.h
 	copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h
 
 # End Custom Build
-
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
-
 # Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
 
@@ -1493,9 +1482,7 @@ InputPath=..\include\wx\msw\setup.h
 	copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h
 
 # End Custom Build
-
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
-
 # Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
 
@@ -1503,9 +1490,7 @@ InputPath=..\include\wx\msw\setup.h
 	copy "$(InputPath)" ..\lib\mswu\wx\setup.h
 
 # End Custom Build
-
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
-
 # Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
 
@@ -1513,9 +1498,7 @@ InputPath=..\include\wx\msw\setup.h
 	copy "$(InputPath)" ..\lib\mswud\wx\setup.h
 
 # End Custom Build
-
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"
-
 # Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
 
@@ -1523,9 +1506,7 @@ InputPath=..\include\wx\msw\setup.h
 	copy "$(InputPath)" ..\lib\mswdll\wx\setup.h
 
 # End Custom Build
-
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
-
 # Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
 
@@ -1533,9 +1514,7 @@ InputPath=..\include\wx\msw\setup.h
 	copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h
 
 # End Custom Build
-
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
-
 # Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
 
@@ -1543,9 +1522,7 @@ InputPath=..\include\wx\msw\setup.h
 	copy "$(InputPath)" ..\lib\msw\wx\setup.h
 
 # End Custom Build
-
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
-
 # Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
 
@@ -1553,9 +1530,7 @@ InputPath=..\include\wx\msw\setup.h
 	copy "$(InputPath)" ..\lib\mswd\wx\setup.h
 
 # End Custom Build
-
 !ENDIF 
-
 # End Source File
 # End Group
 # Begin Group "Common"
@@ -1791,6 +1766,10 @@ SOURCE=..\include\wx\dirdlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\display.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\dnd.h
 # End Source File
 # Begin Source File
@@ -2083,6 +2062,10 @@ SOURCE=..\include\wx\longlong.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\math.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\matrix.h
 # End Source File
 # Begin Source File
@@ -2223,6 +2206,10 @@ SOURCE=..\include\wx\radiobut.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\rawbmp.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\regex.h
 # End Source File
 # Begin Source File
@@ -2521,6 +2508,7 @@ SOURCE=..\include\wx\zipstrm.h
 
 SOURCE=..\include\wx\zstream.h
 # End Source File
+
 # End Group
 # Begin Group "MSW"
 
@@ -2531,6 +2519,10 @@ SOURCE=..\include\wx\msw\accel.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\access.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\app.h
 # End Source File
 # Begin Source File
@@ -2587,14 +2579,6 @@ SOURCE=..\include\wx\msw\control.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\curico.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\curicop.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\cursor.h
 # End Source File
 # Begin Source File
@@ -2631,10 +2615,6 @@ SOURCE=..\include\wx\msw\dib.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\dibutils.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\dirdlg.h
 # End Source File
 # Begin Source File
@@ -2901,6 +2881,7 @@ SOURCE=..\include\wx\msw\window.h
 
 SOURCE=..\include\wx\msw\winundef.h
 # End Source File
+
 # End Group
 # Begin Group "Generic"
 
@@ -3065,6 +3046,7 @@ SOURCE=..\include\wx\generic\treectlg.h
 
 SOURCE=..\include\wx\generic\wizard.h
 # End Source File
+
 # End Group
 # Begin Group "HTML"
 
@@ -3121,6 +3103,7 @@ SOURCE=..\include\wx\html\m_templ.h
 
 SOURCE=..\include\wx\html\winpars.h
 # End Source File
+
 # End Group
 # End Group
 # End Target
diff --git a/src/x11/files.lst b/src/x11/files.lst
index 2eee452729..4703f06cd7 100644
--- a/src/x11/files.lst
+++ b/src/x11/files.lst
@@ -79,6 +79,7 @@ ALL_SOURCES = \
 		generic/treectlg.cpp \
 		generic/treelay.cpp \
 		generic/wizard.cpp \
+		common/accesscmn.cpp \
 		common/appcmn.cpp \
 		common/artprov.cpp \
 		common/artstd.cpp \
@@ -106,6 +107,7 @@ ALL_SOURCES = \
 		common/dobjcmn.cpp \
 		common/docmdi.cpp \
 		common/docview.cpp \
+		common/dpycmn.cpp \
 		common/dseldlg.cpp \
 		common/dynarray.cpp \
 		common/dynlib.cpp \
@@ -243,6 +245,7 @@ ALL_SOURCES = \
 
 ALL_HEADERS = \
 		accel.h \
+		access.h \
 		app.h \
 		arrimpl.cpp \
 		artprov.h \
@@ -299,6 +302,7 @@ ALL_HEADERS = \
 		dir.h \
 		dirctrl.h \
 		dirdlg.h \
+		display.h \
 		dnd.h \
 		docmdi.h \
 		docview.h \
@@ -373,6 +377,7 @@ ALL_HEADERS = \
 		listimpl.cpp \
 		log.h \
 		longlong.h \
+		math.h \
 		matrix.h \
 		mdi.h \
 		memconf.h \
@@ -408,6 +413,7 @@ ALL_HEADERS = \
 		quantize.h \
 		radiobox.h \
 		radiobut.h \
+		rawbmp.h \
 		regex.h \
 		region.h \
 		resource.h \
@@ -649,6 +655,7 @@ GUI_LOWLEVEL_OBJS = \
 		window.o
 
 COMMONOBJS = \
+		accesscmn.o \
 		appcmn.o \
 		artprov.o \
 		artstd.o \
@@ -676,6 +683,7 @@ COMMONOBJS = \
 		dobjcmn.o \
 		docmdi.o \
 		docview.o \
+		dpycmn.o \
 		dseldlg.o \
 		dynarray.o \
 		dynlib.o \
-- 
2.45.2